diff --git a/remote-api/.gitbugtraq b/remote-api/.gitbugtraq
new file mode 100644
index 00000000000..bacffb702d6
--- /dev/null
+++ b/remote-api/.gitbugtraq
@@ -0,0 +1,4 @@
+# For SmartGit
+[bugtraq "jira"]
+ url = https://issues.alfresco.com/jira/browse/%BUGID%
+ logRegex = ([A-Z]+-\\d+)
diff --git a/remote-api/.gitignore b/remote-api/.gitignore
new file mode 100644
index 00000000000..756a7325d22
--- /dev/null
+++ b/remote-api/.gitignore
@@ -0,0 +1,39 @@
+*.class
+
+# Eclipse
+.classpath
+.settings
+.project
+
+# Intellij
+.idea/
+*.iml
+*.iws
+
+# Mac
+.DS_Store
+
+# Maven
+target
+*.log
+*.log.*
+
+# Mobile Tools for Java (J2ME)
+
+.mtj
+.tmp/
+
+# Package Files #
+
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+
+hs_err_pid*
+
+# Development
+alf_data/
+/src/main/resources/alfresco-global.properties
+/src/main/resources/alfresco/extension/custom-log4j.properties
\ No newline at end of file
diff --git a/remote-api/.travis.settings.xml b/remote-api/.travis.settings.xml
new file mode 100644
index 00000000000..e8f11969355
--- /dev/null
+++ b/remote-api/.travis.settings.xml
@@ -0,0 +1,10 @@
+<settings>
+    <!-- required to push artifacts to repositories -->
+    <servers>
+        <server>
+            <id>alfresco-public</id>
+            <username>${env.MAVEN_USERNAME}</username>
+            <password>${env.MAVEN_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>
diff --git a/remote-api/.travis.yml b/remote-api/.travis.yml
new file mode 100644
index 00000000000..f2a014b7cd4
--- /dev/null
+++ b/remote-api/.travis.yml
@@ -0,0 +1,65 @@
+dist: xenial
+sudo: required
+language: java
+jdk:
+  - openjdk11
+services:
+  - docker
+
+cache:
+  directories:
+    - $HOME/.m2
+# the cache can grow constantly
+before_cache:
+  - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-remote-api
+  - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-repository
+
+branches:
+  only:
+    - master
+    - /support\/.*/
+    - /feature\/.*/
+
+stages:
+  - test
+  - release
+
+before_install:
+  - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300'
+  - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8
+
+install: travis_retry mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+
+jobs:
+  include:
+    - stage: test
+      name: "WhiteSource scan"
+      # only on support branches or master and if it is not a PR
+      if: fork = false AND (branch = master OR branch =~ /support\/SP\/.*/) AND type != pull_request
+      script:
+        # Download the latest version of WhiteSource Unified Agent
+        - curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar
+        # Run WhiteSource Unified Agent
+        - java -jar wss-unified-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config
+    - name: "AppContext01TestSuite"
+      script: travis_wait 20 mvn test -B -Dtest=AppContext01TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+    - name: "AppContext02TestSuite"
+      script: travis_wait 20 mvn test -B -Dtest=AppContext02TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+    - name: "AppContext03TestSuite"
+      script: travis_wait 20 mvn test -B -Dtest=AppContext03TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+    - name: "AppContext04TestSuite"
+      script: travis_wait 20 mvn test -B -Dtest=AppContext04TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+    - name: "AppContextExtraTestSuite"
+      script: travis_wait 20 mvn test -B -Dtest=AppContextExtraTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+    - stage: release
+      name: "Push to Nexus"
+      if: fork = false AND (branch = master OR branch =~ /support\/.*/) AND type != pull_request AND commit_message !~ /\[no-release\]/
+      before_install:
+        - "cp .travis.settings.xml $HOME/.m2/settings.xml"
+      script:
+        # Use full history for release
+        - git checkout -B "${TRAVIS_BRANCH}"
+        # Add email to link commits to user
+        - git config user.email "${GIT_EMAIL}"
+        # Skip building of release commits
+        - mvn --batch-mode -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DskipTests -Darguments=-DskipTests release:clean release:prepare release:perform
diff --git a/remote-api/.whitesource b/remote-api/.whitesource
new file mode 100644
index 00000000000..f0569521415
--- /dev/null
+++ b/remote-api/.whitesource
@@ -0,0 +1,8 @@
+{
+  "generalSettings": {
+    "shouldScanRepo": true
+  },
+  "checkRunSettings": {
+    "vulnerableCheckRunConclusionLevel": "failure"
+  }
+}
\ No newline at end of file
diff --git a/remote-api/.wss-unified-agent.config b/remote-api/.wss-unified-agent.config
new file mode 100644
index 00000000000..4dbb9c72bd2
--- /dev/null
+++ b/remote-api/.wss-unified-agent.config
@@ -0,0 +1,228 @@
+####################################################################
+# WhiteSource Unified-Agent configuration file
+####################################################################
+##########################################
+# GENERAL SCAN MODE: Files and Package Managers
+##########################################
+  
+checkPolicies=true
+forceCheckAllDependencies=true
+forceUpdate=true
+forceUpdate.failBuildOnPolicyViolation=true
+offline=false
+#ignoreSourceFiles=true
+#scanComment=
+#updateInventory=false
+#resolveAllDependencies=false
+#failErrorLevel=ALL
+#requireKnownSha1=false
+#generateScanReport=true
+#scanReportTimeoutMinutes=10
+#excludeDependenciesFromNodes=.*commons-io.*,.*maven-model
+   
+#projectPerFolder=true
+#projectPerFolderIncludes=
+#projectPerFolderExcludes=
+   
+#wss.connectionTimeoutMinutes=60
+# Change the below URL to your WhiteSource server.
+# Use the 'WhiteSource Server URL' which can be retrieved
+# from your 'Profile' page on the 'Server URLs' panel.
+# Then, add the '/agent' path to it.
+wss.url=https://saas.whitesourcesoftware.com/agent
+  
+#npm.resolveDependencies=false
+#npm.ignoreSourceFiles=false
+#npm.includeDevDependencies=true
+#npm.runPreStep=true
+#npm.ignoreNpmLsErrors=true
+#npm.ignoreScripts=true
+#npm.yarnProject=true
+#npm.accessToken=
+#npm.identifyByNameAndVersion=true
+ 
+#bower.resolveDependencies=false
+#bower.ignoreSourceFiles=true
+#bower.runPreStep=true
+   
+#nuget.resolvePackagesConfigFiles=false
+#nuget.resolveCsProjFiles=false
+#nuget.resolveDependencies=false
+#nuget.restoreDependencies=true
+#nuget.ignoreSourceFiles=true
+#nuget.runPreStep=true
+#nuget.resolveNuspecFiles=false
+   
+#python.resolveDependencies=false
+#python.ignoreSourceFiles=false
+#python.ignorePipInstallErrors=true
+#python.installVirtualenv=true
+#python.resolveHierarchyTree=false
+#python.requirementsFileIncludes=requirements.txt
+#python.resolveSetupPyFiles=true
+#python.runPipenvPreStep=true
+#python.pipenvDevDependencies=true
+#python.IgnorePipenvInstallErrors=true
+   
+#maven.ignoredScopes=test provided
+maven.resolveDependencies=true
+#maven.ignoreSourceFiles=true
+#maven.aggregateModules=true
+maven.ignorePomModules=false
+#maven.runPreStep=true
+#maven.ignoreMvnTreeErrors=true
+#maven.environmentPath=
+#maven.m2RepositoryPath=
+  
+#gradle.ignoredScopes=
+#gradle.resolveDependencies=false
+#gradle.runAssembleCommand=false
+#gradle.runPreStep=true
+#gradle.ignoreSourceFiles=true
+#gradle.aggregateModules=true
+#gradle.preferredEnvironment=wrapper
+#gradle.localRepositoryPath=
+ 
+#paket.resolveDependencies=false
+#paket.ignoredGroups=
+#paket.ignoreSourceFiles=false
+#paket.runPreStep=true
+#paket.exePath=
+ 
+#go.resolveDependencies=false
+#go.collectDependenciesAtRuntime=true
+#go.dependencyManager=
+#go.ignoreSourceFiles=true
+#go.glide.ignoreTestPackages=false
+#go.gogradle.enableTaskAlias=true
+ 
+#ruby.resolveDependencies = false
+#ruby.ignoreSourceFiles = false
+#ruby.installMissingGems = true
+#ruby.runBundleInstall = true
+#ruby.overwriteGemFile = true
+ 
+#sbt.resolveDependencies=false
+#sbt.ignoreSourceFiles=true
+#sbt.aggregateModules=true
+#sbt.runPreStep=true
+#sbt.targetFolder=
+ 
+#php.resolveDependencies=false
+#php.runPreStep=true
+#php.includeDevDependencies=true
+ 
+#html.resolveDependencies=false
+ 
+#cocoapods.resolveDependencies=false
+#cocoapods.runPreStep=true
+#cocoapods.ignoreSourceFiles=false
+ 
+#hex.resolveDependencies=false
+#hex.runPreStep=true
+#hex.ignoreSourceFiles=false
+#hex.aggregateModules=true
+ 
+##################################
+# Organization tokens:
+##################################
+apiKey=
+ 
+#userKey is required if WhiteSource administrator has enabled "Enforce user level access" option
+#userKey=
+   
+projectName=alfresco-remote-api
+projectVersion=
+projectToken=
+   
+productName=ACS Community
+productVersion=
+productToken=
+#updateType=APPEND
+#requesterEmail=user@provider.com
+    
+#########################################################################################
+# Includes/Excludes Glob patterns - PLEASE USE ONLY ONE EXCLUDE LINE AND ONE INCLUDE LINE
+#########################################################################################
+#includes=**/*.c **/*.cc **/*.cp **/*.cpp **/*.cxx **/*.c++ **/*.h **/*.hpp **/*.hxx
+   
+#includes=**/*.m **/*.mm  **/*.js **/*.php
+includes=**/*.jar
+#includes=**/*.gem **/*.rb
+#includes=**/*.dll **/*.cs **/*.nupkg
+#includes=**/*.tgz **/*.deb **/*.gzip **/*.rpm **/*.tar.bz2
+#includes=**/*.zip **/*.tar.gz **/*.egg **/*.whl **/*.py
+   
+## Exclude file extensions or specific directories by adding **/*.<extension> or **<excluded_dir>/**
+excludes=**/*sources.jar **/*javadoc.jar
+   
+case.sensitive.glob=false
+followSymbolicLinks=true
+    
+##################################
+# Archive properties
+##################################
+#archiveExtractionDepth=2
+#archiveIncludes=**/*.war **/*.ear
+#archiveExcludes=**/*sources.jar
+    
+##################################
+# Proxy settings
+##################################
+#proxy.host=
+#proxy.port=
+#proxy.user=
+#proxy.pass=
+    
+##################################
+# SCM settings
+##################################
+#scm.type=
+#scm.user=
+#scm.pass=
+#scm.ppk=
+#scm.url=
+#scm.branch=
+#scm.tag=
+#scm.npmInstall=
+#scm.npmInstallTimeoutMinutes=
+#scm.repositoriesFile=
+   
+##############################################
+# SCAN MODE: Linux package manager settings
+##############################################
+#scanPackageManager=true
+  
+##################################
+# SCAN MODE: Docker images
+##################################
+#docker.scanImages=true
+#docker.includes=.*.*
+#docker.excludes=
+#docker.pull.enable=true
+#docker.pull.images=.*.*
+#docker.pull.maxImages=10
+#docker.pull.tags=.*.*
+#docker.pull.digest=
+#docker.delete.force=true
+#docker.login.sudo=false
+ 
+#docker.aws.enable=true
+#docker.aws.registryIds=
+ 
+##################################
+# SCAN MODE: Docker containers
+##################################
+#docker.scanContainers=true
+#docker.containerIncludes=.*.*
+#docker.containerExcludes=
+ 
+################################
+# Serverless settings
+################################
+#serverless.provider=
+#serverless.scanFunctions=true
+#serverless.includes=
+#serverless.excludes=
+#serverless.region=
+#serverless.maxFunctions=10
diff --git a/remote-api/CONTRIBUTING.md b/remote-api/CONTRIBUTING.md
new file mode 100644
index 00000000000..8d059e27ca0
--- /dev/null
+++ b/remote-api/CONTRIBUTING.md
@@ -0,0 +1,16 @@
+### Contributing
+Thanks for your interest in contributing to this project!
+
+The following is a set of guidelines for contributing to this library. Most of them will make the life of the reviewer easier and therefore decrease the time required for the patch be included in the next version.
+
+Because this project forms a part of Alfresco Content Services, the guidelines are hosted in the [Alfresco Social Community](http://community.alfresco.com/community/ecm) where they can be referenced from multiple projects.
+
+Read an [overview on how this project is goverened](https://community.alfresco.com/docs/DOC-6385-project-overview-repository).
+
+You can report an issue in the ALF project of the [Alfresco issue tracker](http://issues.alfresco.com).
+
+Read [instructions for a good issue report](https://community.alfresco.com/docs/DOC-6263-reporting-an-issue).
+
+Read [instructions for making a contribution](https://community.alfresco.com/docs/DOC-6269-submitting-contributions).
+
+Please follow [the coding standards](https://community.alfresco.com/docs/DOC-4658-coding-standards).
diff --git a/remote-api/LICENSE b/remote-api/LICENSE
new file mode 100644
index 00000000000..65c5ca88a67
--- /dev/null
+++ b/remote-api/LICENSE
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/remote-api/README.md b/remote-api/README.md
new file mode 100644
index 00000000000..8065f12c9de
--- /dev/null
+++ b/remote-api/README.md
@@ -0,0 +1,41 @@
+### Alfresco Remote API
+[![Build Status](https://travis-ci.com/Alfresco/alfresco-remote-api.svg?branch=master)](https://travis-ci.com/Alfresco/alfresco-remote-api)
+
+Remote API is a library packaged as a jar file which is part of [Alfresco Content Services Repository](https://community.alfresco.com/docs/DOC-6385-project-overview-repository).
+The library contains the following:
+* REST API framework
+* WebScript implementations including [V1 REST APIs](https://community.alfresco.com/community/ecm/blog/2017/05/02/v1-rest-api-10-things-you-should-know)
+* [OpenCMIS](https://chemistry.apache.org/java/opencmis.html) implementations
+
+### Building and testing
+The project can be built by running Maven command:
+~~~
+mvn clean install
+~~~
+The tests are combined in test classes split by test type or Spring application context used in the test, see classes in _src/test/java/org/alfresco_. All of these classes as well as individual tests can be run by specifying the test class name and a set of DB connection properties, for example:
+~~~
+mvn clean test -Dtest=SomeTest -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql:alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+~~~
+
+### Artifacts
+The artifacts can be obtained by:
+* downloading from [Alfresco repository](https://artifacts.alfresco.com/nexus/content/groups/public)
+* getting as Maven dependency by adding the dependency to your pom file:
+~~~
+<dependency>
+  <groupId>org.alfresco</groupId>
+  <artifactId>alfresco-remote-api</artifactId>
+  <version>version</version>
+</dependency>
+~~~
+and Alfresco Maven repository:
+~~~
+<repository>
+  <id>alfresco-maven-repo</id>
+  <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+</repository>
+~~~
+The SNAPSHOT version of the artifact is **never** published.
+
+### Contributing guide
+Please use [this guide](CONTRIBUTING.md) to make a contribution to the project.
diff --git a/remote-api/l10n.properties b/remote-api/l10n.properties
new file mode 100644
index 00000000000..5ee676302f9
--- /dev/null
+++ b/remote-api/l10n.properties
@@ -0,0 +1,8 @@
+# Branch specific configuration file for localisation scripts
+
+
+MESSAGE_SEARCH_PATH="src/main/resources/alfresco/messages/admin-console*.properties src/main/resources/alfresco/messages/custommodel-restapi-messages*.properties src/main/resources/alfresco/messages/rest-framework-messages*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post*.properties src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put*.properties"
+
+
+EXCLUDED_FILES="src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.properties"
+
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
new file mode 100644
index 00000000000..4a02dbaae00
--- /dev/null
+++ b/remote-api/pom.xml
@@ -0,0 +1,618 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>alfresco-remote-api</artifactId>
+    <name>Alfresco Remote API</name>
+    <version>8.213-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>alfresco-super-pom</artifactId>
+        <version>12</version>
+    </parent>
+
+    <scm>
+        <connection>scm:git:https://github.com/Alfresco/alfresco-remote-api.git</connection>
+        <developerConnection>scm:git:https://github.com/Alfresco/alfresco-remote-api.git</developerConnection>
+        <url>https://github.com/Alfresco/alfresco-remote-api</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <distributionManagement>
+        <repository>
+            <id>alfresco-public</id>
+            <url>https://artifacts.alfresco.com/nexus/content/repositories/releases</url>
+        </repository>
+        <snapshotRepository>
+            <id>alfresco-public</id>
+            <url>https://artifacts.alfresco.com/nexus/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <properties>
+        <licenseName>community</licenseName>
+
+        <maven.build.sourceVersion>11</maven.build.sourceVersion>
+
+        <dir.root>${project.build.directory}/alf_data</dir.root>
+        <img.exe>convert</img.exe>
+
+        <dependency.alfresco-repository.version>8.243</dependency.alfresco-repository.version>
+        <dependency.alfresco-data-model.version>8.135</dependency.alfresco-data-model.version>
+        <dependency.alfresco-core.version>8.37</dependency.alfresco-core.version>
+
+        <dependency.alfresco-pdf-renderer.version>1.1</dependency.alfresco-pdf-renderer.version>
+        <dependency.jackson.version>2.11.1</dependency.jackson.version>
+        <dependency.jackson-databind.version>2.10.1</dependency.jackson-databind.version>
+
+        <dependency.webscripts.version>8.5</dependency.webscripts.version>
+        <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
+        <dependency.spring.version>5.2.7.RELEASE</dependency.spring.version>
+        <dependency.postgresql.version>42.2.14</dependency.postgresql.version>
+        <dependency.cxf.version>3.3.7</dependency.cxf.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Newer cxf libs, see REPO-3131 -->
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-frontend-jaxws</artifactId>
+                <version>${dependency.cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+                <version>${dependency.cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-rs-client</artifactId>
+                <version>${dependency.cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-transports-http</artifactId>
+                <version>${dependency.cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-ws-policy</artifactId>
+                <version>${dependency.cxf.version}</version>
+            </dependency>
+            <!-- upgrade dependency from TIKA -->
+            <dependency>
+                <groupId>com.github.junrar</groupId>
+                <artifactId>junrar</artifactId>
+                <version>4.0.0</version>
+            </dependency>
+            <!-- upgrade dependency from TIKA -->
+            <dependency>
+                <groupId>org.jsoup</groupId>
+                <artifactId>jsoup</artifactId>
+                <version>1.13.1</version>
+            </dependency>
+            <!-- update dependency from opencmis-extension -->
+            <dependency>
+                <groupId>commons-httpclient</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>3.1-HTTPCLIENT-1265</version>
+            </dependency>
+            <!-- newer dependency from camel-jackson -->
+            <dependency>
+                <groupId>com.fasterxml.jackson.module</groupId>
+                <artifactId>jackson-module-jaxb-annotations</artifactId>
+                <version>${dependency.jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>4.5.12</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>4.4.13</version>
+            </dependency>
+            <!-- REPO-4986, REPO-4987 -->
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-jms</artifactId>
+                <version>${dependency.spring.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-repository</artifactId>
+            <version>${dependency.alfresco-repository.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-data-model</artifactId>
+            <version>${dependency.alfresco-data-model.version}</version>
+            <exclusions>
+                <!-- Duplicate classes from com.sun.activation:jakarta.activation-->
+                <exclusion>
+                    <groupId>com.sun.activation</groupId>
+                    <artifactId>javax.activation</artifactId>
+                </exclusion>
+                <!-- REPO-4998 - Exclusion due to classpath conflicts between org.codehaus.woodstox:woodstox-core-asl and com.fasterxml.woodstox:woodstox-core -->
+                <exclusion>
+                  <groupId>org.codehaus.woodstox</groupId>
+                  <artifactId>woodstox-core-asl</artifactId>
+                </exclusion>
+                <!-- Duplicate classes from jakarta.annotation:jakarta.annotation-api-->
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
+                <!-- REPO-5009 Excluded to avoid duplicated classes with javax.jws:javax.jws-api -->
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+                </exclusion>
+                <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jta_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${dependency.jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${dependency.jackson-databind.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${dependency.jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-csv</artifactId>
+            <version>1.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.santuario</groupId>
+            <artifactId>xmlsec</artifactId>
+            <version>1.5.8</version>
+        </dependency>
+        <!-- newer version, see REPO-3133 -->
+        <dependency>
+            <groupId>org.alfresco.surf</groupId>
+            <artifactId>spring-webscripts</artifactId>
+            <version>${dependency.webscripts.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml</groupId>
+            <artifactId>jaxrpc-api</artifactId>
+            <version>1.1</version>
+        </dependency>
+
+        <!-- This is needed at runtime by Web Client, so not really a test dependency -->
+        <dependency>
+            <groupId>org.apache.chemistry.opencmis</groupId>
+            <artifactId>chemistry-opencmis-test-tck</artifactId>
+            <version>${dependency.opencmis.version}</version>
+            <exclusions>
+                <!-- Duplicate classes from com.sun.activation:jakarta.activation-->
+                <exclusion>
+                    <groupId>com.sun.activation</groupId>
+                    <artifactId>javax.activation</artifactId>
+                </exclusion>
+                <!-- REPO-5009 Excluded to avoid duplicated classes with javax.jws:javax.jws-api -->
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+                </exclusion>
+                <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jta_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
+            <!-- <scope>test</scope> -->
+        </dependency>
+        <!-- the cxf libs were updated, see dependencyManagement section -->
+
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.4.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${dependency.spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-repository</artifactId>
+            <version>${dependency.alfresco-repository.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-core</artifactId>
+            <version>${dependency.alfresco-core.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+            <exclusions>
+                <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
+                <exclusion>
+                    <groupId>javax.transaction</groupId>
+                    <artifactId>jta</artifactId>
+                </exclusion>
+                <!-- Duplicates classes from jakarta.xml.bind:jakarta.xml.bind-api -->
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco.surf</groupId>
+            <artifactId>spring-webscripts</artifactId>
+            <version>${dependency.webscripts.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${dependency.postgresql.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>8.2.0.v20160908</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.orbit</groupId>
+                    <artifactId>javax.servlet</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-security</artifactId>
+            <version>8.2.0.v20160908</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+            <version>8.2.0.v20160908</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco.cmis.client</groupId>
+            <artifactId>alfresco-opencmis-extension</artifactId>
+            <version>2.0</version>
+            <scope>test</scope>
+            <exclusions>
+              <!-- REPO-5009 Excluded to avoid duplicated classes with javax.jws:javax.jws-api -->
+              <exclusion>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+              </exclusion>
+              <!-- MNT-20557: Excluding javax.annotation:javax.annotation-api, jakarta.annotation:jakarta.annotation-api will be used instead -->
+              <exclusion>
+                  <groupId>javax.annotation</groupId>
+                  <artifactId>javax.annotation-api</artifactId>
+              </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+    <profiles>
+         <!-- Profiles to extract the alfresco-pdf-renderer -->
+		<profile>
+			<id>win-alfresco-pdf-renderer-test</id>
+			<activation>
+				<os>
+					<family>windows</family>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.alfresco</groupId>
+					<artifactId>alfresco-pdf-renderer</artifactId>
+					<version>${dependency.alfresco-pdf-renderer.version}</version>
+					<classifier>win64</classifier>
+					<type>tgz</type>
+				</dependency>
+			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<inherited>false</inherited>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>extract-alfresco-pdf-renderer-test</id>
+								<phase>generate-test-resources</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<skip>${skipTests}</skip>
+									<target>
+										<echo message="Extracting alfresco-pdf-renderer (windows) for testing..." />
+										<mkdir dir="${project.build.directory}/test-binaries/alfresco-pdf-renderer" />
+										<untar compression="gzip" src="${settings.localRepository}/org/alfresco/alfresco-pdf-renderer/${dependency.alfresco-pdf-renderer.version}/alfresco-pdf-renderer-${dependency.alfresco-pdf-renderer.version}-win64.tgz" dest="${project.build.directory}/test-binaries/alfresco-pdf-renderer" />
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			<properties>
+				<alfresco-pdf-renderer.exe>${project.build.directory}/test-binaries/alfresco-pdf-renderer/alfresco-pdf-renderer</alfresco-pdf-renderer.exe>
+			</properties>
+		</profile>
+		<profile>
+			<id>linux-alfresco-pdf-renderer-test</id>
+			<activation>
+				<os>
+					<family>linux</family>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.alfresco</groupId>
+					<artifactId>alfresco-pdf-renderer</artifactId>
+					<version>${dependency.alfresco-pdf-renderer.version}</version>
+					<classifier>linux</classifier>
+					<type>tgz</type>
+				</dependency>
+			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<inherited>false</inherited>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>extract-alfresco-pdf-renderer-test</id>
+								<phase>generate-test-resources</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<skip>${skipTests}</skip>
+									<target>
+										<echo message="Extracting alfresco-pdf-renderer (linux) for testing..." />
+										<mkdir dir="${project.build.directory}/test-binaries/alfresco-pdf-renderer" />
+										<exec failonerror="true" executable="tar" dir="${project.build.directory}/test-binaries/alfresco-pdf-renderer">
+											<arg value="xf" />
+											<arg value="${settings.localRepository}/org/alfresco/alfresco-pdf-renderer/${dependency.alfresco-pdf-renderer.version}/alfresco-pdf-renderer-${dependency.alfresco-pdf-renderer.version}-linux.tgz" />
+										</exec>
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			<properties>
+				<alfresco-pdf-renderer.exe>${project.build.directory}/test-binaries/alfresco-pdf-renderer/alfresco-pdf-renderer</alfresco-pdf-renderer.exe>
+			</properties>
+		</profile>
+		<profile>
+			<id>osx-alfresco-pdf-renderer-test</id>
+			<activation>
+				<os>
+					<family>mac</family>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.alfresco</groupId>
+					<artifactId>alfresco-pdf-renderer</artifactId>
+					<version>${dependency.alfresco-pdf-renderer.version}</version>
+					<classifier>osx</classifier>
+					<type>tgz</type>
+				</dependency>
+			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<inherited>false</inherited>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>extract-alfresco-pdf-renderer-test</id>
+								<phase>generate-test-resources</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<skip>${skipTests}</skip>
+									<target>
+										<echo message="Extracting alfresco-pdf-renderer (OS-X) for testing..." />
+										<mkdir dir="${project.build.directory}/test-binaries/alfresco-pdf-renderer" />
+										<exec failonerror="true" executable="tar" dir="${project.build.directory}/test-binaries/alfresco-pdf-renderer">
+											<arg value="xf" />
+											<arg value="${settings.localRepository}/org/alfresco/alfresco-pdf-renderer/${dependency.alfresco-pdf-renderer.version}/alfresco-pdf-renderer-${dependency.alfresco-pdf-renderer.version}-osx.tgz" />
+										</exec>
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			<properties>
+				<alfresco-pdf-renderer.exe>${project.build.directory}/test-binaries/alfresco-pdf-renderer/alfresco-pdf-renderer</alfresco-pdf-renderer.exe>
+			</properties>
+		</profile>
+    </profiles>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>license-maven-plugin</artifactId>
+                    <version>2.0.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <!-- Create a jar of test classes -->
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>create-test-jar</id>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+                        <configuration>
+                            <!-- To prevent tests alfresco.log to be created in project roots and bother while synchronizing with SCM -->
+                            <workingDirectory>${project.build.directory}</workingDirectory>
+                            <systemPropertyVariables>
+                                <alfresco-pdf-renderer.exe>${alfresco-pdf-renderer.exe}</alfresco-pdf-renderer.exe>
+
+                                <!-- Database related properties -->
+                                <db.url>${db.url}</db.url>
+                                <db.driver>${db.driver}</db.driver>
+                                <db.name>${db.name}</db.name>
+                                <db.username>${db.username}</db.username>
+                                <db.password>${db.password}</db.password>
+                                <dir.root>${dir.root}</dir.root>
+                                <img.exe>${img.exe}</img.exe>
+                                <!-- BDE-91 -->
+                                <alfresco.rmi.services.retries>30</alfresco.rmi.services.retries>
+                                <alfresco.rmi.services.retryInterval>2000</alfresco.rmi.services.retryInterval>
+                                <!-- FTR used in TransferWebScriptTest -->
+                                <transferservice.receiver.enabled>true</transferservice.receiver.enabled>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- We still use committed generated sources -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/generated</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- ACE-3329 Create _en.properties message files  -->
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                 <executions>
+                    <execution>
+                        <id>duplicate-english-messages</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <target>
+                        <copy todir="${project.build.outputDirectory}">
+                            <fileset dir="${basedir}/src/main/resources" includes="alfresco/messages/**/*.properties,alfresco/templates/webscripts/**/*.properties" />
+                            <mapper type="regexp" from="^([^_]*).properties$" to="\1_en.properties" />
+                        </copy>
+                    </target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+                <configuration>
+                    <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
+                    <organizationName>Alfresco Software Limited</organizationName>
+                    <failOnMissingHeader>true</failOnMissingHeader>
+                    <failOnNotUptodateHeader>true</failOnNotUptodateHeader>
+                    <licenseResolver>classpath://alfresco</licenseResolver>
+                    <licenseName>${licenseName}</licenseName>
+                    <roots>
+                        <root>src</root>
+                    </roots>
+                    <includes>
+                        <include>**/*.java</include>
+                        <include>**/*.jsp</include>
+                    </includes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>check-licenses</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>check-file-header</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.alfresco</groupId>
+                        <artifactId>alfresco-license-headers</artifactId>
+                        <version>1.0</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/remote-api/src/main/antlr3/org/alfresco/rest/antlr/WhereClause.g b/remote-api/src/main/antlr3/org/alfresco/rest/antlr/WhereClause.g
new file mode 100644
index 00000000000..6e2f8bf4722
--- /dev/null
+++ b/remote-api/src/main/antlr3/org/alfresco/rest/antlr/WhereClause.g
@@ -0,0 +1,154 @@
+grammar WhereClause;
+
+options
+{
+  // antlr will generate java lexer and parser
+  language = Java;
+  // generated parser should create abstract syntax tree
+  output = AST;
+}
+
+//package, we have to add package declaration on top of it
+@lexer::header {
+package org.alfresco.rest.antlr;
+import java.util.Map;
+import java.util.HashMap;
+import org.alfresco.rest.framework.resource.parameters.where.InvalidQueryException;
+import org.alfresco.rest.framework.resource.parameters.where.WhereCompiler;
+}
+
+@lexer::members {
+
+    @Override
+    public void recover(RecognitionException e)
+    {
+        throw new InvalidQueryException(WhereCompiler.resolveMessage(e));
+    }
+}
+//package, we have to add package declaration on top of it
+@parser::header {
+package org.alfresco.rest.antlr;
+import org.alfresco.rest.framework.resource.parameters.where.InvalidQueryException;
+}
+
+@parser::members {
+
+  // These methods are here to force the parser to error instead of suppressing problems.
+//	  @Override
+//	  public void reportError(RecognitionException e) {
+//      System.out.println("CUSTOM ERROR...\n" + e);
+//      throw new InvalidQueryException(e.getMessage());
+//	  }
+
+    @Override
+    protected Object recoverFromMismatchedToken(IntStream input, int ttype, BitSet follow) throws RecognitionException
+    {
+        throw new MismatchedTokenException(ttype, input);
+    }
+
+    @Override
+    public Object recoverFromMismatchedSet(IntStream input, RecognitionException e, BitSet follow) throws RecognitionException
+    {
+        throw e;
+    }
+//
+//    @Override
+//    public String getErrorMessage(RecognitionException e, String[] tokenNames)
+//    {
+//      System.out.println("THROW ME...\n" + e);
+//      throw new InvalidQueryException(e.getMessage());
+//    }
+// End of methods here to force the parser to error instead of supressing problems.
+}
+
+@rulecatch
+{
+catch(RecognitionException e)
+{
+   throw e;
+}
+}
+// ***************** lexer rules:
+NEGATION: ('not'|'NOT')WS;
+EXISTS: 'exists'|'EXISTS';
+IN: WS('in'|'IN');
+MATCHES: WS('matches'|'MATCHES');
+BETWEEN: WS('between'|'BETWEEN');
+OR: WS('or'|'OR')WS;
+AND: WS('and'|'AND')WS;
+EQUALS: WS?'='WS?;
+LESSTHAN: WS?'<'WS?;
+GREATERTHAN: WS?'>'WS?;
+LESSTHANOREQUALS: WS?'<='WS?;
+GREATERTHANOREQUALS: WS?'>='WS?;
+LEFTPAREN: '(';
+RIGHTPAREN: ')';
+COMMA: ',';
+COLON: ':';
+SINGLEQUOTE: '\'';
+PROPERTYVALUE: (SINGLEQUOTE (~SINGLEQUOTE|'\\'SINGLEQUOTE)* SINGLEQUOTE) |IDENTIFIERDIGIT+;
+PROPERTYNAME: '/'? IDENTIFIER ('/'IDENTIFIER)*;
+fragment IDENTIFIERLETTERORDIGIT: (IDENTIFIERLETTER | IDENTIFIERDIGIT);
+fragment IDENTIFIER : (IDENTIFIERLETTER (IDENTIFIERLETTERORDIGIT* | (IDENTIFIERLETTERORDIGIT* COLON IDENTIFIERLETTERORDIGIT*)));
+WS : ( ' ' | '\t' | '\r' | '\n' )+ { $channel = HIDDEN; };
+fragment IDENTIFIERLETTER  // any Unicode character that is a Java letter (see below)
+    :    '\u0041'..'\u005a' // A-Z
+    |    '\u005f'           // _
+    |    '\u0061'..'\u007a' // a-z
+    |    '\u00c0'..'\u00d6' // À-Ö
+    |    '\u00d8'..'\u00f6' // Ø-ö
+    |    '\u00f8'..'\u00ff' // ø-ÿ
+    |    '\u0100'..'\u1fff'
+    |    '\u3040'..'\u318f'
+    |    '\u3300'..'\u337f'
+    |    '\u3400'..'\u3d2d'
+    |    '\u4e00'..'\u9fff'
+    |    '\uf900'..'\ufaff'
+    ;
+fragment IDENTIFIERDIGIT
+    :    '\u0030'..'\u0039'   // 0-9
+    |    '\u0660'..'\u0669'   // Arabic 0-9
+    |    '\u06f0'..'\u06f9'   // Arabic-Indic 0-9
+    |    '\u0966'..'\u096f'   // Devanagari 0-9
+    |    '\u09e6'..'\u09ef'   // Bengali 0-9
+    |    '\u0a66'..'\u0a6f'   // Gurmukhi 0-9
+    |    '\u0ae6'..'\u0aef'   // Gujarati 0-9
+    |    '\u0b66'..'\u0b6f'   // Oriya 0-9
+    |    '\u0be7'..'\u0bef'   // Tamil 0-9
+    |    '\u0c66'..'\u0c6f'   // Telugu 0-9
+    |    '\u0ce6'..'\u0cef'   // Kannada 0-9
+    |    '\u0d66'..'\u0d6f'   // Malayalam 0-9
+    |    '\u0e50'..'\u0e59'   // Thai 0-9
+    |    '\u0ed0'..'\u0ed9'   // Lao 0-9
+    |    '\u1040'..'\u1049'   // Myanmar 0-9
+    ;
+
+// ***************** parser rules:
+whereclause : WS? LEFTPAREN! WS? predicate RIGHTPAREN! WS?;
+predicate : simplepredicate
+          | simplepredicate (AND simplepredicate)+ -> ^(AND simplepredicate+)
+          | simplepredicate (OR simplepredicate)+ -> ^(OR simplepredicate+);
+simplepredicate : allowedpredicates -> allowedpredicates
+                | NEGATION allowedpredicates -> ^(NEGATION allowedpredicates);
+allowedpredicates : comparisonpredicate | existspredicate | betweenpredicate | inpredicate | matchespredicate;
+comparisonpredicate: PROPERTYNAME comparisonoperator value -> ^(comparisonoperator PROPERTYNAME value);
+comparisonoperator: EQUALS|LESSTHAN|GREATERTHAN|LESSTHANOREQUALS|GREATERTHANOREQUALS;
+existspredicate: EXISTS LEFTPAREN WS? PROPERTYNAME RIGHTPAREN -> ^(EXISTS PROPERTYNAME);
+betweenpredicate: PROPERTYNAME BETWEEN LEFTPAREN WS? propertyvaluepair RIGHTPAREN -> ^(BETWEEN PROPERTYNAME propertyvaluepair);
+inpredicate: PROPERTYNAME IN LEFTPAREN WS? propertyvaluelist RIGHTPAREN -> ^(IN PROPERTYNAME propertyvaluelist);
+matchespredicate: PROPERTYNAME MATCHES LEFTPAREN WS? value RIGHTPAREN -> ^(MATCHES PROPERTYNAME value);
+propertyvaluepair: value COMMA value -> value+;
+propertyvaluelist: value (COMMA value)* -> value+;
+value: a=PROPERTYVALUE -> ^(PROPERTYVALUE[$a] )
+      | b=PROPERTYNAME -> ^(PROPERTYVALUE[$b] ); //rewrite this a propertyvalue
+selectClause:  PROPERTYNAME (COMMA PROPERTYNAME)* -> PROPERTYNAME+;
+// ****
+// SOME NOTES
+// () - Parentheses. Used to group several elements, so they are treated as one single token
+// ? - Any token followed by ? occurs 0 or 1 times
+// * - Any token followed by * can occur 0 or more times
+// + - Any token followed by + can occur 1 or more times
+// . - Any character/token can occur one time
+// ~ - Any character/token following the ~ may not occur at the current place
+// .. - Between two characters .. spans a range which accepts every character between both boundaries inclusive
+// ****
diff --git a/remote-api/src/main/apptest/apptest.readme.txt b/remote-api/src/main/apptest/apptest.readme.txt
new file mode 100644
index 00000000000..be519b842cd
--- /dev/null
+++ b/remote-api/src/main/apptest/apptest.readme.txt
@@ -0,0 +1,33 @@
+AppClientTest is a tool for testing an AtomPub Service.
+
+http://code.google.com/p/feedvalidator/wiki/AppClientTest
+
+1) To install and test installation...
+
+$ svn co http://feedvalidator.googlecode.com/svn/trunk/apptestsuite/client/validator/ validator
+$ python validator/appclienttest.py --output=results.html "http://bitworking.org/projects/apptestsite/app.cgi/service/;service_document" 
+$ firefox results.html
+
+The above has been encapsulated in...
+
+/projects/remote-api/source/test/apptest/install.sh
+
+2) To execute appclienttest against Alfresco
+
+/projects/remote-api/source/test/apptest/test.sh
+
+
+3) Note: appclienttest.py arguments...
+
+ -h, --help          show this help message and exit
+  --credentials=FILE  FILE that contains a name and password on separate lines
+                      with an optional third line with the authentication type
+                      of 'ClientLogin <service>'.
+  --output=FILE       FILE to store test results
+  --verbose           Print extra information while running.
+  --quiet             Do not print anything while running.
+  --debug             Print low level HTTP information while running.
+  --html              Output is formatted in HTML
+  --record=DIR        Record all the responses to be used later in playback
+                      mode.
+  --playback=DIR      Playback responses stored from a previous run.
diff --git a/remote-api/src/main/apptest/credentials.txt b/remote-api/src/main/apptest/credentials.txt
new file mode 100644
index 00000000000..295182ad9ce
--- /dev/null
+++ b/remote-api/src/main/apptest/credentials.txt
@@ -0,0 +1,2 @@
+admin
+admin
\ No newline at end of file
diff --git a/remote-api/src/main/apptest/install.sh b/remote-api/src/main/apptest/install.sh
new file mode 100644
index 00000000000..acf50596312
--- /dev/null
+++ b/remote-api/src/main/apptest/install.sh
@@ -0,0 +1,5 @@
+# ! /bin/sh
+
+svn co http://feedvalidator.googlecode.com/svn/trunk/apptestsuite/client/validator/ validator
+python validator/appclienttest.py --html --verbose --output=results.html "http://bitworking.org/projects/apptestsite/app.cgi/service/;service_document" 
+open results.html
diff --git a/remote-api/src/main/apptest/results.html b/remote-api/src/main/apptest/results.html
new file mode 100644
index 00000000000..820d37fc152
--- /dev/null
+++ b/remote-api/src/main/apptest/results.html
@@ -0,0 +1,2963 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8">
+    <link href="validator/res/base.css" type="text/css" rel="stylesheet">
+    <script type="text/javascript" src="validator/res/jquery-1.2.3.js"></script>
+    <script type="text/javascript" src="validator/res/report.js" ></script>
+    <link href="validator/res/prettify.css" type="text/css" rel="stylesheet" />
+    <script type="text/javascript" src="validator/res/prettify.js"></script>
+    <title>AppClientTest - Results</title>
+  </head>
+<body>
+  <h1>Test Report</h1>
+  <dl>
+    <dt>Date</dt>
+    <dd>Thu May  7 14:22:03 2009</dd>
+  </dl>
+  <div class='legend'>
+  <h3>Legend</h3>
+  <dl>
+     <dt><img src='validator/res/info.gif'> Informational</dt>
+     <dd>Information on what was being tested.</dd>
+     <dt><img src='validator/res/warning.gif'> Warning</dt>
+     <dd>Warnings indicate behavior that, while legal, may cause<br/>
+       either performance or interoperability problems in the field.</dd>
+     <dt><img src='validator/res/error.gif'> Error</dt>
+     <dd>Errors are violations of either the Atom, AtomPub<br/> or HTTP specifications.</dd>
+     <dt><img src='validator/res/log.gif'> Log</dt>
+     <dd>Detailed information on the transaction to help you<br/> debug your service.</dd>
+     <dt><img src='validator/res/success.gif'> Success</dt>
+     <dd>A specific sub-test has been passed successfully.</dd>
+     
+  </div>
+  <h2>Entry Collection</h2><p>Find the first entry collection listed in an Introspection document and run the Entry collection tests against it.</p>
+<ol>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/repository
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/repository
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:21:47 GMT
+content-type: application/atom+xml;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;service xmlns="http://www.w3.org/2007/app" xmlns:alf="http://www.alfresco.org" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+  &lt;workspace cmis:repositoryRelationship="self"&gt;
+    &lt;atom:title&gt;Main Repository&lt;/atom:title&gt;
+
+    &lt;cmis:repositoryInfo&gt; 
+      &lt;cmis:repositoryId&gt;418bc6ad-eb45-4259-ad52-086966fe8775&lt;/cmis:repositoryId&gt;
+      &lt;cmis:repositoryName&gt;Main Repository&lt;/cmis:repositoryName&gt;
+      &lt;cmis:repositoryRelationship&gt;self&lt;/cmis:repositoryRelationship&gt;
+      &lt;cmis:repositoryDescription/&gt;   
+      &lt;cmis:vendorName&gt;Alfresco&lt;/cmis:vendorName&gt; 
+      &lt;cmis:productName&gt;Alfresco Repository (Labs)&lt;/cmis:productName&gt;
+      &lt;cmis:productVersion&gt;3.2.0 (_Preview2_dev @build-number@)&lt;/cmis:productVersion&gt;
+      &lt;cmis:rootFolderId&gt;http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home&lt;/cmis:rootFolderId&gt; 
+      &lt;cmis:capabilities&gt;
+        &lt;cmis:capabilityMultifiling&gt;true&lt;/cmis:capabilityMultifiling&gt;
+        &lt;cmis:capabilityUnfiling&gt;false&lt;/cmis:capabilityUnfiling&gt;
+        &lt;cmis:capabilityVersionSpecificFiling&gt;false&lt;/cmis:capabilityVersionSpecificFiling&gt;        
+        &lt;cmis:capabilityPWCUpdateable&gt;true&lt;/cmis:capabilityPWCUpdateable&gt;
+        &lt;cmis:capabilityPWCSearchable&gt;true&lt;/cmis:capabilityPWCSearchable&gt;
+        &lt;cmis:capabilityAllVersionsSearchable&gt;false&lt;/cmis:capabilityAllVersionsSearchable&gt;
+        &lt;cmis:capabilityQuery&gt;bothcombined&lt;/cmis:capabilityQuery&gt;
+        &lt;cmis:capabilityJoin&gt;none&lt;/cmis:capabilityJoin&gt;
+        &lt;cmis:capabilityChanges&gt;none&lt;/cmis:capabilityChanges&gt;
+        &lt;cmis:changesIncomplete&gt;false&lt;/cmis:changesIncomplete&gt;
+        &lt;cmis:capabilityACL&gt;none&lt;/cmis:capabilityACL&gt;
+      &lt;/cmis:capabilities&gt; 
+      &lt;cmis:cmisVersionSupported&gt;0.61&lt;/cmis:cmisVersionSupported&gt;
+      &lt;cmis:repositorySpecificInformation/&gt;
+    &lt;/cmis:repositoryInfo&gt;
+
+    &lt;collection cmis:collectionType="rootchildren" href="http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children"&gt; 
+      &lt;atom:title&gt;root collection&lt;/atom:title&gt; 
+    &lt;/collection&gt; 
+    &lt;collection cmis:collectionType="rootdescendants" href="http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/descendants"&gt; 
+      &lt;atom:title&gt;root collection&lt;/atom:title&gt; 
+    &lt;/collection&gt; 
+    &lt;collection cmis:collectionType="checkedout" href="http://localhost:8080/alfresco/service/api/checkedout"&gt; 
+      &lt;atom:title&gt;checkedout collection&lt;/atom:title&gt; 
+      &lt;atom:accept&gt;application/atom+xml;type=entry&lt;/atom:accept&gt;
+    &lt;/collection&gt; 
+    &lt;collection cmis:collectionType="unfiled" href="http://localhost:8080/alfresco/service/api/unfiled"&gt; 
+      &lt;atom:title&gt;unfiled collection&lt;/atom:title&gt; 
+      &lt;atom:accept&gt;application/atom+xml;type=entry&lt;/atom:accept&gt;
+    &lt;/collection&gt;
+    &lt;collection cmis:collectionType="typeschildren" href="http://localhost:8080/alfresco/service/api/types"&gt; 
+      &lt;atom:title&gt;type collection&lt;/atom:title&gt; 
+    &lt;/collection&gt;
+    &lt;collection cmis:collectionType="typesdescendants" href="http://localhost:8080/alfresco/service/api/types"&gt; 
+      &lt;atom:title&gt;type collection&lt;/atom:title&gt; 
+    &lt;/collection&gt; 
+    &lt;collection cmis:collectionType="query" href="http://localhost:8080/alfresco/service/api/query"&gt; 
+      &lt;atom:title&gt;query collection&lt;/atom:title&gt; 
+      &lt;atom:accept&gt;application/cmisquery+xml&lt;/atom:accept&gt;
+    &lt;/collection&gt;
+     
+  &lt;/workspace&gt; 
+&lt;/service&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Error'><img src='validator/res/error.gif'> [RFC4287] <span class='Error'>line 40, column 6: Undefined app:collection element: atom:accept (3 occurrences)</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 4: atom_title should contain a xml:lang element (8 occurrences)</span></li>
+</ol>
+<h2>Basic Entry Manipulation</h2><p>Add and remove three entries to the collection</p>
+<ol>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>Service Document: http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:21:50 GMT
+content-type: application/atom+xml;type=feed;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;feed xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;generator version="3.2.0 (_Preview2_dev @build-number@)"&gt;Alfresco (Labs)&lt;/generator&gt;
+&lt;icon&gt;http://localhost:8080/alfresco/images/logo/AlfrescoLogo16.ico&lt;/icon&gt;
+&lt;id&gt;urn:uuid:38381008-9909-4210-958d-53476656d919-children&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/38381008-9909-4210-958d-53476656d919" rel="source"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children?pageNo=1&amp;amp;pageSize=0&amp;amp;guest=&amp;amp;format=atomfeed" rel="first" type="application/atom+xml;type=feed"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children?pageNo=1&amp;amp;pageSize=0&amp;amp;guest=&amp;amp;format=atomfeed" rel="last" type="application/atom+xml;type=feed"/&gt;
+&lt;title&gt;Company Home Children&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:58.833+01:00&lt;/updated&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/content&gt;
+&lt;id&gt;urn:uuid:8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/F/st_sites" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:54:14.297+01:00&lt;/published&gt;
+&lt;summary&gt;Site Collaboration Spaces&lt;/summary&gt;
+&lt;title&gt;Sites&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:54:14.529+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Sites&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:14.529+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:14.297+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;F/st_sites&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:54:14.529+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;07c77166-1478-41f6-8516-9d246195af7a&lt;/content&gt;
+&lt;id&gt;urn:uuid:07c77166-1478-41f6-8516-9d246195af7a&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:58.839+01:00&lt;/published&gt;
+&lt;summary&gt;User managed definitions&lt;/summary&gt;
+&lt;title&gt;Data Dictionary&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:58.901+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Data Dictionary&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:58.901+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:58.839+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/07c77166-1478-41f6-8516-9d246195af7a&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:58.901+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/content&gt;
+&lt;id&gt;urn:uuid:7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:59.235+01:00&lt;/published&gt;
+&lt;summary&gt;The guest root space&lt;/summary&gt;
+&lt;title&gt;Guest Home&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:59.329+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Guest Home&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.329+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.235+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:59.329+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;43009267-2ea4-4da1-868f-e3110de3d89b&lt;/content&gt;
+&lt;id&gt;urn:uuid:43009267-2ea4-4da1-868f-e3110de3d89b&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:59.331+01:00&lt;/published&gt;
+&lt;summary&gt;User Homes&lt;/summary&gt;
+&lt;title&gt;User Homes&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:59.350+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;User Homes&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.350+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.331+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:59.350+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/content&gt;
+&lt;id&gt;urn:uuid:cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:54:36.952+01:00&lt;/published&gt;
+&lt;summary&gt;CMIS Tests (summary)&lt;/summary&gt;
+&lt;title&gt;CMIS Tests&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:54:37.007+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;CMIS Tests&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:37.007+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:36.952+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:54:37.007+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;41aad918-1d38-4711-8904-f75c72dca106&lt;/content&gt;
+&lt;id&gt;urn:uuid:41aad918-1d38-4711-8904-f75c72dca106&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:18:29.101+01:00&lt;/published&gt;
+&lt;summary&gt;Web Content Management Spaces&lt;/summary&gt;
+&lt;title&gt;Web Projects&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:18:31.477+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Web Projects&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:18:31.477+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:18:29.101+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/41aad918-1d38-4711-8904-f75c72dca106&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:18:31.477+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;cmis:hasMoreItems&gt;false&lt;/cmis:hasMoreItems&gt;
+&lt;opensearch:totalResults&gt;6&lt;/opensearch:totalResults&gt;
+&lt;opensearch:startIndex&gt;0&lt;/opensearch:startIndex&gt;
+&lt;opensearch:itemsPerPage&gt;0&lt;/opensearch:itemsPerPage&gt;
+&lt;/feed&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Error'><img src='validator/res/error.gif'> [RFC4287] <span class='Error'>line 6, column 58: id is not a valid UUID</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 8, column 134: Unregistered link relationship
+line 19, column 156: Unregistered link relationship (42 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 11, column 0: title should contain a xml:lang element (7 occurrences)
+line 15, column 0: content should contain a xml:lang element (6 occurrences)
+line 27, column 0: summary should contain a xml:lang element (6 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>Create new entry #1</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+POST http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children
+content-type: application/atom+xml
+slug: dcghgffkjh
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom"&gt;
+&lt;title&gt;Iñtërnâtiônàlizætiøn - 1&lt;/title&gt;
+&lt;id&gt;tag:bitworking.org,2008-02-26:1241702511.039212&lt;/id&gt;
+&lt;updated&gt;2005-07-10T12:29:29Z&lt;/updated&gt;
+&lt;author&gt;
+&lt;name&gt;Joe Gregorio&lt;/name&gt;
+&lt;/author&gt;
+&lt;content type="xhtml"&gt;
+&lt;div xmlns="http://www.w3.org/1999/xhtml"&gt;
+&lt;p&gt;&lt;i&gt;A test of utf-8&lt;/i&gt;&lt;/p&gt;
+&lt;/div&gt;
+&lt;/content&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 201
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:21:53 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:52.635+01:00&lt;/published&gt;
+&lt;summary&gt;dcghgffkjh&lt;/summary&gt;
+&lt;title&gt;dcghgffkjh&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:52.869+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;dcghgffkjh&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:52.635+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;dcghgffkjh&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:52.869+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;cmis:allowableActions&gt;
+&lt;cmis:canDelete&gt;true&lt;/cmis:canDelete&gt;
+&lt;cmis:canUpdateProperties&gt;true&lt;/cmis:canUpdateProperties&gt;
+&lt;cmis:canGetProperties&gt;true&lt;/cmis:canGetProperties&gt;
+&lt;cmis:canGetRelationships&gt;true&lt;/cmis:canGetRelationships&gt;
+&lt;cmis:canGetParents&gt;true&lt;/cmis:canGetParents&gt;
+&lt;cmis:canMove&gt;true&lt;/cmis:canMove&gt;
+&lt;cmis:canDeleteVersion&gt;true&lt;/cmis:canDeleteVersion&gt;
+&lt;cmis:canDeleteContent&gt;true&lt;/cmis:canDeleteContent&gt;
+&lt;cmis:canCheckout&gt;true&lt;/cmis:canCheckout&gt;
+&lt;cmis:canCancelCheckout&gt;false&lt;/cmis:canCancelCheckout&gt;
+&lt;cmis:canCheckin&gt;false&lt;/cmis:canCheckin&gt;
+&lt;cmis:canSetContent&gt;true&lt;/cmis:canSetContent&gt;
+&lt;cmis:canGetAllVersions&gt;true&lt;/cmis:canGetAllVersions&gt;
+&lt;cmis:canAddToFolder&gt;true&lt;/cmis:canAddToFolder&gt;
+&lt;cmis:canRemoveFromFolder&gt;true&lt;/cmis:canRemoveFromFolder&gt;
+&lt;cmis:canViewContent&gt;true&lt;/cmis:canViewContent&gt;
+&lt;cmis:canAddPolicy&gt;false&lt;/cmis:canAddPolicy&gt;
+&lt;cmis:canGetAppliedPolicies&gt;false&lt;/cmis:canGetAppliedPolicies&gt;
+&lt;cmis:canRemovePolicy&gt;false&lt;/cmis:canRemovePolicy&gt;
+&lt;cmis:canCreateRelationship&gt;true&lt;/cmis:canCreateRelationship&gt;
+&lt;/cmis:allowableActions&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:52.869+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 7, column 320: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 14, column 0: summary should contain a xml:lang element
+line 15, column 0: title should contain a xml:lang element</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc5023#section-9.2'>[RFC5023] Section 9.2</a> <span class='Warning'>Content-Location: not returned in response headers.</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:21:53 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:52.635+01:00&lt;/published&gt;
+&lt;summary&gt;dcghgffkjh&lt;/summary&gt;
+&lt;title&gt;dcghgffkjh&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:52.869+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;dcghgffkjh&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:52.635+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;dcghgffkjh&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:52.869+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:52.869+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 7, column 320: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 14, column 0: summary should contain a xml:lang element
+line 15, column 0: title should contain a xml:lang element</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>Create new entry #2</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+POST http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children
+content-type: application/atom+xml
+slug: cajgclekci
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom"&gt;
+&lt;title&gt;Iñtërnâtiônàlizætiøn - 2&lt;/title&gt;
+&lt;id&gt;tag:bitworking.org,2008-02-26:1241702515.965076&lt;/id&gt;
+&lt;updated&gt;2005-07-10T12:29:29Z&lt;/updated&gt;
+&lt;author&gt;
+&lt;name&gt;Joe Gregorio&lt;/name&gt;
+&lt;/author&gt;
+&lt;content type="xhtml"&gt;
+&lt;div xmlns="http://www.w3.org/1999/xhtml"&gt;
+&lt;p&gt;&lt;i&gt;A test of utf-8&lt;/i&gt;&lt;/p&gt;
+&lt;/div&gt;
+&lt;/content&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 201
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:21:56 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:56.005+01:00&lt;/published&gt;
+&lt;summary&gt;cajgclekci&lt;/summary&gt;
+&lt;title&gt;cajgclekci&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:56.047+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;cajgclekci&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:56.005+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;cajgclekci&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:56.047+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;cmis:allowableActions&gt;
+&lt;cmis:canDelete&gt;true&lt;/cmis:canDelete&gt;
+&lt;cmis:canUpdateProperties&gt;true&lt;/cmis:canUpdateProperties&gt;
+&lt;cmis:canGetProperties&gt;true&lt;/cmis:canGetProperties&gt;
+&lt;cmis:canGetRelationships&gt;true&lt;/cmis:canGetRelationships&gt;
+&lt;cmis:canGetParents&gt;true&lt;/cmis:canGetParents&gt;
+&lt;cmis:canMove&gt;true&lt;/cmis:canMove&gt;
+&lt;cmis:canDeleteVersion&gt;true&lt;/cmis:canDeleteVersion&gt;
+&lt;cmis:canDeleteContent&gt;true&lt;/cmis:canDeleteContent&gt;
+&lt;cmis:canCheckout&gt;true&lt;/cmis:canCheckout&gt;
+&lt;cmis:canCancelCheckout&gt;false&lt;/cmis:canCancelCheckout&gt;
+&lt;cmis:canCheckin&gt;false&lt;/cmis:canCheckin&gt;
+&lt;cmis:canSetContent&gt;true&lt;/cmis:canSetContent&gt;
+&lt;cmis:canGetAllVersions&gt;true&lt;/cmis:canGetAllVersions&gt;
+&lt;cmis:canAddToFolder&gt;true&lt;/cmis:canAddToFolder&gt;
+&lt;cmis:canRemoveFromFolder&gt;true&lt;/cmis:canRemoveFromFolder&gt;
+&lt;cmis:canViewContent&gt;true&lt;/cmis:canViewContent&gt;
+&lt;cmis:canAddPolicy&gt;false&lt;/cmis:canAddPolicy&gt;
+&lt;cmis:canGetAppliedPolicies&gt;false&lt;/cmis:canGetAppliedPolicies&gt;
+&lt;cmis:canRemovePolicy&gt;false&lt;/cmis:canRemovePolicy&gt;
+&lt;cmis:canCreateRelationship&gt;true&lt;/cmis:canCreateRelationship&gt;
+&lt;/cmis:allowableActions&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:56.047+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 7, column 320: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 14, column 0: summary should contain a xml:lang element
+line 15, column 0: title should contain a xml:lang element</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc5023#section-9.2'>[RFC5023] Section 9.2</a> <span class='Warning'>Content-Location: not returned in response headers.</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:21:56 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:56.005+01:00&lt;/published&gt;
+&lt;summary&gt;cajgclekci&lt;/summary&gt;
+&lt;title&gt;cajgclekci&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:56.047+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;cajgclekci&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:56.005+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;cajgclekci&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:56.047+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:56.047+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 7, column 320: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 14, column 0: summary should contain a xml:lang element
+line 15, column 0: title should contain a xml:lang element</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>Create new entry #3</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+POST http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children
+content-type: application/atom+xml
+slug: kabiabakfg
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom"&gt;
+&lt;title&gt;Iñtërnâtiônàlizætiøn - 3&lt;/title&gt;
+&lt;id&gt;tag:bitworking.org,2008-02-26:1241702517.5035069&lt;/id&gt;
+&lt;updated&gt;2005-07-10T12:29:29Z&lt;/updated&gt;
+&lt;author&gt;
+&lt;name&gt;Joe Gregorio&lt;/name&gt;
+&lt;/author&gt;
+&lt;content type="xhtml"&gt;
+&lt;div xmlns="http://www.w3.org/1999/xhtml"&gt;
+&lt;p&gt;&lt;i&gt;A test of utf-8&lt;/i&gt;&lt;/p&gt;
+&lt;/div&gt;
+&lt;/content&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 201
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:21:59 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:57.724+01:00&lt;/published&gt;
+&lt;summary&gt;kabiabakfg&lt;/summary&gt;
+&lt;title&gt;kabiabakfg&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:59.210+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;kabiabakfg&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:57.724+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;kabiabakfg&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:59.210+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;cmis:allowableActions&gt;
+&lt;cmis:canDelete&gt;true&lt;/cmis:canDelete&gt;
+&lt;cmis:canUpdateProperties&gt;true&lt;/cmis:canUpdateProperties&gt;
+&lt;cmis:canGetProperties&gt;true&lt;/cmis:canGetProperties&gt;
+&lt;cmis:canGetRelationships&gt;true&lt;/cmis:canGetRelationships&gt;
+&lt;cmis:canGetParents&gt;true&lt;/cmis:canGetParents&gt;
+&lt;cmis:canMove&gt;true&lt;/cmis:canMove&gt;
+&lt;cmis:canDeleteVersion&gt;true&lt;/cmis:canDeleteVersion&gt;
+&lt;cmis:canDeleteContent&gt;true&lt;/cmis:canDeleteContent&gt;
+&lt;cmis:canCheckout&gt;true&lt;/cmis:canCheckout&gt;
+&lt;cmis:canCancelCheckout&gt;false&lt;/cmis:canCancelCheckout&gt;
+&lt;cmis:canCheckin&gt;false&lt;/cmis:canCheckin&gt;
+&lt;cmis:canSetContent&gt;true&lt;/cmis:canSetContent&gt;
+&lt;cmis:canGetAllVersions&gt;true&lt;/cmis:canGetAllVersions&gt;
+&lt;cmis:canAddToFolder&gt;true&lt;/cmis:canAddToFolder&gt;
+&lt;cmis:canRemoveFromFolder&gt;true&lt;/cmis:canRemoveFromFolder&gt;
+&lt;cmis:canViewContent&gt;true&lt;/cmis:canViewContent&gt;
+&lt;cmis:canAddPolicy&gt;false&lt;/cmis:canAddPolicy&gt;
+&lt;cmis:canGetAppliedPolicies&gt;false&lt;/cmis:canGetAppliedPolicies&gt;
+&lt;cmis:canRemovePolicy&gt;false&lt;/cmis:canRemovePolicy&gt;
+&lt;cmis:canCreateRelationship&gt;true&lt;/cmis:canCreateRelationship&gt;
+&lt;/cmis:allowableActions&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:59.210+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 7, column 320: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 14, column 0: summary should contain a xml:lang element
+line 15, column 0: title should contain a xml:lang element</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc5023#section-9.2'>[RFC5023] Section 9.2</a> <span class='Warning'>Content-Location: not returned in response headers.</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:21:59 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:57.724+01:00&lt;/published&gt;
+&lt;summary&gt;kabiabakfg&lt;/summary&gt;
+&lt;title&gt;kabiabakfg&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:59.210+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;kabiabakfg&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:57.724+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;kabiabakfg&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:59.210+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:59.210+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 7, column 320: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 14, column 0: summary should contain a xml:lang element
+line 15, column 0: title should contain a xml:lang element</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:22:00 GMT
+content-type: application/atom+xml;type=feed;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;feed xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;generator version="3.2.0 (_Preview2_dev @build-number@)"&gt;Alfresco (Labs)&lt;/generator&gt;
+&lt;icon&gt;http://localhost:8080/alfresco/images/logo/AlfrescoLogo16.ico&lt;/icon&gt;
+&lt;id&gt;urn:uuid:38381008-9909-4210-958d-53476656d919-children&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/38381008-9909-4210-958d-53476656d919" rel="source"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children?pageNo=1&amp;amp;pageSize=0&amp;amp;guest=&amp;amp;format=atomfeed" rel="first" type="application/atom+xml;type=feed"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children?pageNo=1&amp;amp;pageSize=0&amp;amp;guest=&amp;amp;format=atomfeed" rel="last" type="application/atom+xml;type=feed"/&gt;
+&lt;title&gt;Company Home Children&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:58.833+01:00&lt;/updated&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/content&gt;
+&lt;id&gt;urn:uuid:8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/F/st_sites" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:54:14.297+01:00&lt;/published&gt;
+&lt;summary&gt;Site Collaboration Spaces&lt;/summary&gt;
+&lt;title&gt;Sites&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:54:14.529+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Sites&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:14.529+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:14.297+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;F/st_sites&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:54:14.529+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;07c77166-1478-41f6-8516-9d246195af7a&lt;/content&gt;
+&lt;id&gt;urn:uuid:07c77166-1478-41f6-8516-9d246195af7a&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:58.839+01:00&lt;/published&gt;
+&lt;summary&gt;User managed definitions&lt;/summary&gt;
+&lt;title&gt;Data Dictionary&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:58.901+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Data Dictionary&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:58.901+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:58.839+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/07c77166-1478-41f6-8516-9d246195af7a&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:58.901+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/content&gt;
+&lt;id&gt;urn:uuid:7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:59.235+01:00&lt;/published&gt;
+&lt;summary&gt;The guest root space&lt;/summary&gt;
+&lt;title&gt;Guest Home&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:59.329+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Guest Home&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.329+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.235+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:59.329+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;43009267-2ea4-4da1-868f-e3110de3d89b&lt;/content&gt;
+&lt;id&gt;urn:uuid:43009267-2ea4-4da1-868f-e3110de3d89b&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:59.331+01:00&lt;/published&gt;
+&lt;summary&gt;User Homes&lt;/summary&gt;
+&lt;title&gt;User Homes&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:59.350+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;User Homes&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.350+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.331+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:59.350+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/content&gt;
+&lt;id&gt;urn:uuid:cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:54:36.952+01:00&lt;/published&gt;
+&lt;summary&gt;CMIS Tests (summary)&lt;/summary&gt;
+&lt;title&gt;CMIS Tests&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:54:37.007+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;CMIS Tests&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:37.007+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:36.952+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:54:37.007+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;41aad918-1d38-4711-8904-f75c72dca106&lt;/content&gt;
+&lt;id&gt;urn:uuid:41aad918-1d38-4711-8904-f75c72dca106&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:18:29.101+01:00&lt;/published&gt;
+&lt;summary&gt;Web Content Management Spaces&lt;/summary&gt;
+&lt;title&gt;Web Projects&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:18:31.477+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Web Projects&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:18:31.477+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:18:29.101+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/41aad918-1d38-4711-8904-f75c72dca106&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:18:31.477+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:52.635+01:00&lt;/published&gt;
+&lt;summary&gt;dcghgffkjh&lt;/summary&gt;
+&lt;title&gt;dcghgffkjh&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:52.869+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;dcghgffkjh&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:52.635+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;dcghgffkjh&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:52.869+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:52.869+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:56.005+01:00&lt;/published&gt;
+&lt;summary&gt;cajgclekci&lt;/summary&gt;
+&lt;title&gt;cajgclekci&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:56.047+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;cajgclekci&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:56.005+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;cajgclekci&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:56.047+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:56.047+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:57.724+01:00&lt;/published&gt;
+&lt;summary&gt;kabiabakfg&lt;/summary&gt;
+&lt;title&gt;kabiabakfg&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:59.210+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;kabiabakfg&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:57.724+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;kabiabakfg&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:59.210+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:59.210+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;cmis:hasMoreItems&gt;false&lt;/cmis:hasMoreItems&gt;
+&lt;opensearch:totalResults&gt;9&lt;/opensearch:totalResults&gt;
+&lt;opensearch:startIndex&gt;0&lt;/opensearch:startIndex&gt;
+&lt;opensearch:itemsPerPage&gt;0&lt;/opensearch:itemsPerPage&gt;
+&lt;/feed&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Error'><img src='validator/res/error.gif'> [RFC4287] <span class='Error'>line 6, column 58: id is not a valid UUID</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 8, column 134: Unregistered link relationship
+line 19, column 156: Unregistered link relationship (63 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 11, column 0: title should contain a xml:lang element (10 occurrences)
+line 15, column 0: content should contain a xml:lang element (9 occurrences)
+line 27, column 0: summary should contain a xml:lang element (9 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>Check order of entries in the collection document</span></li>
+  <li class='Error'><img src='validator/res/error.gif'> <a href='http://tools.ietf.org/html/rfc5023#section-10'>[RFC5023] Section 10</a> <span class='Error'>Failed to preserve order of entries, was expecting urn:uuid:a56de7d2-ddea-431c-bd2d-5664126ad5b4, but found urn:uuid:9f28d574-f3ef-43b1-b346-be7aaf79d719</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc5023#section-9.7'>[RFC5023] Section 9.7</a> <span class='Warning'>Slug was ignored</span></li>
+  <li class='Success'><img src='validator/res/success.gif'>  <span class='Success'>Member contained an 'edit' link</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>Update entry #2 and write back to the collection</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+PUT http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:22:00 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:56.005+01:00&lt;/published&gt;
+&lt;summary&gt;cajgclekci&lt;/summary&gt;
+&lt;title&gt;Internationalization - 2&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:22:00.918+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;Internationalization - 2&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:56.005+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Internationalization - 2&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:22:00.918+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;cmis:allowableActions&gt;
+&lt;cmis:canDelete&gt;true&lt;/cmis:canDelete&gt;
+&lt;cmis:canUpdateProperties&gt;true&lt;/cmis:canUpdateProperties&gt;
+&lt;cmis:canGetProperties&gt;true&lt;/cmis:canGetProperties&gt;
+&lt;cmis:canGetRelationships&gt;true&lt;/cmis:canGetRelationships&gt;
+&lt;cmis:canGetParents&gt;true&lt;/cmis:canGetParents&gt;
+&lt;cmis:canMove&gt;true&lt;/cmis:canMove&gt;
+&lt;cmis:canDeleteVersion&gt;true&lt;/cmis:canDeleteVersion&gt;
+&lt;cmis:canDeleteContent&gt;true&lt;/cmis:canDeleteContent&gt;
+&lt;cmis:canCheckout&gt;true&lt;/cmis:canCheckout&gt;
+&lt;cmis:canCancelCheckout&gt;false&lt;/cmis:canCancelCheckout&gt;
+&lt;cmis:canCheckin&gt;false&lt;/cmis:canCheckin&gt;
+&lt;cmis:canSetContent&gt;true&lt;/cmis:canSetContent&gt;
+&lt;cmis:canGetAllVersions&gt;true&lt;/cmis:canGetAllVersions&gt;
+&lt;cmis:canAddToFolder&gt;true&lt;/cmis:canAddToFolder&gt;
+&lt;cmis:canRemoveFromFolder&gt;true&lt;/cmis:canRemoveFromFolder&gt;
+&lt;cmis:canViewContent&gt;true&lt;/cmis:canViewContent&gt;
+&lt;cmis:canAddPolicy&gt;false&lt;/cmis:canAddPolicy&gt;
+&lt;cmis:canGetAppliedPolicies&gt;false&lt;/cmis:canGetAppliedPolicies&gt;
+&lt;cmis:canRemovePolicy&gt;false&lt;/cmis:canRemovePolicy&gt;
+&lt;cmis:canCreateRelationship&gt;true&lt;/cmis:canCreateRelationship&gt;
+&lt;/cmis:allowableActions&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:22:00.918+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Success'><img src='validator/res/success.gif'>  <span class='Success'>Updated Entry #2</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>Check order of entries in the collection document</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:22:00 GMT
+content-type: application/atom+xml;type=feed;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;feed xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;generator version="3.2.0 (_Preview2_dev @build-number@)"&gt;Alfresco (Labs)&lt;/generator&gt;
+&lt;icon&gt;http://localhost:8080/alfresco/images/logo/AlfrescoLogo16.ico&lt;/icon&gt;
+&lt;id&gt;urn:uuid:38381008-9909-4210-958d-53476656d919-children&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/38381008-9909-4210-958d-53476656d919" rel="source"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children?pageNo=1&amp;amp;pageSize=0&amp;amp;guest=&amp;amp;format=atomfeed" rel="first" type="application/atom+xml;type=feed"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children?pageNo=1&amp;amp;pageSize=0&amp;amp;guest=&amp;amp;format=atomfeed" rel="last" type="application/atom+xml;type=feed"/&gt;
+&lt;title&gt;Company Home Children&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:58.833+01:00&lt;/updated&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/content&gt;
+&lt;id&gt;urn:uuid:8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/F/st_sites" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:54:14.297+01:00&lt;/published&gt;
+&lt;summary&gt;Site Collaboration Spaces&lt;/summary&gt;
+&lt;title&gt;Sites&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:54:14.529+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Sites&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:14.529+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:14.297+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;F/st_sites&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:54:14.529+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;07c77166-1478-41f6-8516-9d246195af7a&lt;/content&gt;
+&lt;id&gt;urn:uuid:07c77166-1478-41f6-8516-9d246195af7a&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:58.839+01:00&lt;/published&gt;
+&lt;summary&gt;User managed definitions&lt;/summary&gt;
+&lt;title&gt;Data Dictionary&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:58.901+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Data Dictionary&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:58.901+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:58.839+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/07c77166-1478-41f6-8516-9d246195af7a&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:58.901+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/content&gt;
+&lt;id&gt;urn:uuid:7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:59.235+01:00&lt;/published&gt;
+&lt;summary&gt;The guest root space&lt;/summary&gt;
+&lt;title&gt;Guest Home&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:59.329+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Guest Home&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.329+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.235+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:59.329+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;43009267-2ea4-4da1-868f-e3110de3d89b&lt;/content&gt;
+&lt;id&gt;urn:uuid:43009267-2ea4-4da1-868f-e3110de3d89b&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:59.331+01:00&lt;/published&gt;
+&lt;summary&gt;User Homes&lt;/summary&gt;
+&lt;title&gt;User Homes&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:59.350+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;User Homes&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.350+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.331+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:59.350+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/content&gt;
+&lt;id&gt;urn:uuid:cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:54:36.952+01:00&lt;/published&gt;
+&lt;summary&gt;CMIS Tests (summary)&lt;/summary&gt;
+&lt;title&gt;CMIS Tests&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:54:37.007+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;CMIS Tests&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:37.007+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:36.952+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:54:37.007+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;41aad918-1d38-4711-8904-f75c72dca106&lt;/content&gt;
+&lt;id&gt;urn:uuid:41aad918-1d38-4711-8904-f75c72dca106&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:18:29.101+01:00&lt;/published&gt;
+&lt;summary&gt;Web Content Management Spaces&lt;/summary&gt;
+&lt;title&gt;Web Projects&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:18:31.477+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Web Projects&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:18:31.477+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:18:29.101+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/41aad918-1d38-4711-8904-f75c72dca106&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:18:31.477+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:52.635+01:00&lt;/published&gt;
+&lt;summary&gt;dcghgffkjh&lt;/summary&gt;
+&lt;title&gt;dcghgffkjh&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:52.869+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;dcghgffkjh&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:52.635+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;dcghgffkjh&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:52.869+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:52.869+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:57.724+01:00&lt;/published&gt;
+&lt;summary&gt;kabiabakfg&lt;/summary&gt;
+&lt;title&gt;kabiabakfg&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:59.210+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;kabiabakfg&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:57.724+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;kabiabakfg&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:59.210+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:59.210+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:56.005+01:00&lt;/published&gt;
+&lt;summary&gt;cajgclekci&lt;/summary&gt;
+&lt;title&gt;Internationalization - 2&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:22:00.918+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;Internationalization - 2&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:56.005+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Internationalization - 2&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:22:00.918+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:22:00.918+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;cmis:hasMoreItems&gt;false&lt;/cmis:hasMoreItems&gt;
+&lt;opensearch:totalResults&gt;9&lt;/opensearch:totalResults&gt;
+&lt;opensearch:startIndex&gt;0&lt;/opensearch:startIndex&gt;
+&lt;opensearch:itemsPerPage&gt;0&lt;/opensearch:itemsPerPage&gt;
+&lt;/feed&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Error'><img src='validator/res/error.gif'> [RFC4287] <span class='Error'>line 6, column 58: id is not a valid UUID</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 8, column 134: Unregistered link relationship
+line 19, column 156: Unregistered link relationship (63 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 11, column 0: title should contain a xml:lang element (10 occurrences)
+line 15, column 0: content should contain a xml:lang element (9 occurrences)
+line 27, column 0: summary should contain a xml:lang element (9 occurrences)</span></li>
+  <li class='Error'><img src='validator/res/error.gif'> <a href='http://tools.ietf.org/html/rfc5023#section-10'>[RFC5023] Section 10</a> <span class='Error'>Failed to preserve order of entries, was expecting urn:uuid:9ef7edfc-8298-4643-a9b1-8bfdeb32904d, but found urn:uuid:9f28d574-f3ef-43b1-b346-be7aaf79d719</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:22:01 GMT
+content-type: application/atom+xml;type=feed;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;feed xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;generator version="3.2.0 (_Preview2_dev @build-number@)"&gt;Alfresco (Labs)&lt;/generator&gt;
+&lt;icon&gt;http://localhost:8080/alfresco/images/logo/AlfrescoLogo16.ico&lt;/icon&gt;
+&lt;id&gt;urn:uuid:38381008-9909-4210-958d-53476656d919-children&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/38381008-9909-4210-958d-53476656d919" rel="source"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children?pageNo=1&amp;amp;pageSize=0&amp;amp;guest=&amp;amp;format=atomfeed" rel="first" type="application/atom+xml;type=feed"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/path/workspace/SpacesStore/Company%20Home/children?pageNo=1&amp;amp;pageSize=0&amp;amp;guest=&amp;amp;format=atomfeed" rel="last" type="application/atom+xml;type=feed"/&gt;
+&lt;title&gt;Company Home Children&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:58.833+01:00&lt;/updated&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/content&gt;
+&lt;id&gt;urn:uuid:8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/F/st_sites" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:54:14.297+01:00&lt;/published&gt;
+&lt;summary&gt;Site Collaboration Spaces&lt;/summary&gt;
+&lt;title&gt;Sites&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:54:14.529+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Sites&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:14.529+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:14.297+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;F/st_sites&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:54:14.529+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;07c77166-1478-41f6-8516-9d246195af7a&lt;/content&gt;
+&lt;id&gt;urn:uuid:07c77166-1478-41f6-8516-9d246195af7a&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:58.839+01:00&lt;/published&gt;
+&lt;summary&gt;User managed definitions&lt;/summary&gt;
+&lt;title&gt;Data Dictionary&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:58.901+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Data Dictionary&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:58.901+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:58.839+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/07c77166-1478-41f6-8516-9d246195af7a&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:58.901+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/content&gt;
+&lt;id&gt;urn:uuid:7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:59.235+01:00&lt;/published&gt;
+&lt;summary&gt;The guest root space&lt;/summary&gt;
+&lt;title&gt;Guest Home&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:59.329+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Guest Home&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.329+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.235+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:59.329+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;43009267-2ea4-4da1-868f-e3110de3d89b&lt;/content&gt;
+&lt;id&gt;urn:uuid:43009267-2ea4-4da1-868f-e3110de3d89b&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:59.331+01:00&lt;/published&gt;
+&lt;summary&gt;User Homes&lt;/summary&gt;
+&lt;title&gt;User Homes&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:59.350+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;User Homes&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.350+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.331+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:59.350+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/content&gt;
+&lt;id&gt;urn:uuid:cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:54:36.952+01:00&lt;/published&gt;
+&lt;summary&gt;CMIS Tests (summary)&lt;/summary&gt;
+&lt;title&gt;CMIS Tests&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:54:37.007+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;CMIS Tests&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:37.007+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:36.952+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:54:37.007+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;41aad918-1d38-4711-8904-f75c72dca106&lt;/content&gt;
+&lt;id&gt;urn:uuid:41aad918-1d38-4711-8904-f75c72dca106&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:18:29.101+01:00&lt;/published&gt;
+&lt;summary&gt;Web Content Management Spaces&lt;/summary&gt;
+&lt;title&gt;Web Projects&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:18:31.477+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Web Projects&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:18:31.477+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:18:29.101+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/41aad918-1d38-4711-8904-f75c72dca106&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:18:31.477+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:52.635+01:00&lt;/published&gt;
+&lt;summary&gt;dcghgffkjh&lt;/summary&gt;
+&lt;title&gt;dcghgffkjh&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:52.869+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;dcghgffkjh&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:52.635+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;dcghgffkjh&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:52.869+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:52.869+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:57.724+01:00&lt;/published&gt;
+&lt;summary&gt;kabiabakfg&lt;/summary&gt;
+&lt;title&gt;kabiabakfg&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:59.210+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;kabiabakfg&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:57.724+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;kabiabakfg&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:59.210+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:59.210+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;entry&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:56.005+01:00&lt;/published&gt;
+&lt;summary&gt;cajgclekci&lt;/summary&gt;
+&lt;title&gt;Internationalization - 2&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:22:00.918+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;Internationalization - 2&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:56.005+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Internationalization - 2&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:22:00.918+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:22:00.918+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;
+&lt;cmis:hasMoreItems&gt;false&lt;/cmis:hasMoreItems&gt;
+&lt;opensearch:totalResults&gt;9&lt;/opensearch:totalResults&gt;
+&lt;opensearch:startIndex&gt;0&lt;/opensearch:startIndex&gt;
+&lt;opensearch:itemsPerPage&gt;0&lt;/opensearch:itemsPerPage&gt;
+&lt;/feed&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Error'><img src='validator/res/error.gif'> [RFC4287] <span class='Error'>line 6, column 58: id is not a valid UUID</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 8, column 134: Unregistered link relationship
+line 19, column 156: Unregistered link relationship (63 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 11, column 0: title should contain a xml:lang element (10 occurrences)
+line 15, column 0: content should contain a xml:lang element (9 occurrences)
+line 27, column 0: summary should contain a xml:lang element (9 occurrences)</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:22:01 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/content&gt;
+&lt;id&gt;urn:uuid:8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/F/st_sites" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:54:14.297+01:00&lt;/published&gt;
+&lt;summary&gt;Site Collaboration Spaces&lt;/summary&gt;
+&lt;title&gt;Sites&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:54:14.529+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Sites&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:14.529+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:14.297+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;F/st_sites&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/8ed1cc95-85b5-4c78-ad5f-7a1ddd642aeb&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:54:14.529+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 8, column 156: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 16, column 0: summary should contain a xml:lang element
+line 17, column 0: title should contain a xml:lang element</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:22:01 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;07c77166-1478-41f6-8516-9d246195af7a&lt;/content&gt;
+&lt;id&gt;urn:uuid:07c77166-1478-41f6-8516-9d246195af7a&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/07c77166-1478-41f6-8516-9d246195af7a/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:58.839+01:00&lt;/published&gt;
+&lt;summary&gt;User managed definitions&lt;/summary&gt;
+&lt;title&gt;Data Dictionary&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:58.901+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Data Dictionary&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:58.901+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:58.839+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/07c77166-1478-41f6-8516-9d246195af7a&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:58.901+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 8, column 156: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 16, column 0: summary should contain a xml:lang element
+line 17, column 0: title should contain a xml:lang element</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:22:01 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/content&gt;
+&lt;id&gt;urn:uuid:7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:59.235+01:00&lt;/published&gt;
+&lt;summary&gt;The guest root space&lt;/summary&gt;
+&lt;title&gt;Guest Home&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:59.329+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Guest Home&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.329+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.235+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/7d56fcd8-6efd-4593-b3db-d3d1b0459d43&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:59.329+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 8, column 156: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 16, column 0: summary should contain a xml:lang element
+line 17, column 0: title should contain a xml:lang element</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:22:01 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;43009267-2ea4-4da1-868f-e3110de3d89b&lt;/content&gt;
+&lt;id&gt;urn:uuid:43009267-2ea4-4da1-868f-e3110de3d89b&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:53:59.331+01:00&lt;/published&gt;
+&lt;summary&gt;User Homes&lt;/summary&gt;
+&lt;title&gt;User Homes&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:53:59.350+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;User Homes&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.350+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:53:59.331+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/43009267-2ea4-4da1-868f-e3110de3d89b&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:53:59.350+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 8, column 156: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 16, column 0: summary should contain a xml:lang element
+line 17, column 0: title should contain a xml:lang element</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:22:01 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/content&gt;
+&lt;id&gt;urn:uuid:cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T09:54:36.952+01:00&lt;/published&gt;
+&lt;summary&gt;CMIS Tests (summary)&lt;/summary&gt;
+&lt;title&gt;CMIS Tests&lt;/title&gt;
+&lt;updated&gt;2009-05-07T09:54:37.007+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;CMIS Tests&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:37.007+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T09:54:36.952+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/cb6dc8da-1282-4f96-aa63-e97865359ec5&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T09:54:37.007+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 8, column 156: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 16, column 0: summary should contain a xml:lang element
+line 17, column 0: title should contain a xml:lang element</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:22:01 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;System&lt;/name&gt;&lt;/author&gt;
+&lt;content&gt;41aad918-1d38-4711-8904-f75c72dca106&lt;/content&gt;
+&lt;id&gt;urn:uuid:41aad918-1d38-4711-8904-f75c72dca106&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/parent" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/children" rel="children"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/41aad918-1d38-4711-8904-f75c72dca106/descendants" rel="descendants"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/type/folder" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:18:29.101+01:00&lt;/published&gt;
+&lt;summary&gt;Web Content Management Spaces&lt;/summary&gt;
+&lt;title&gt;Web Projects&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:18:31.477+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Web Projects&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ParentId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/38381008-9909-4210-958d-53476656d919&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:18:31.477+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyId cmis:name="AllowedChildObjectTypeIds"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:18:29.101+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;System&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;folder&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/41aad918-1d38-4711-8904-f75c72dca106&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:18:31.477+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 8, column 156: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 16, column 0: summary should contain a xml:lang element
+line 17, column 0: title should contain a xml:lang element</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:22:01 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:52.635+01:00&lt;/published&gt;
+&lt;summary&gt;dcghgffkjh&lt;/summary&gt;
+&lt;title&gt;dcghgffkjh&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:52.869+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;dcghgffkjh&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:52.635+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;dcghgffkjh&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:52.869+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:52.869+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 7, column 320: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 14, column 0: summary should contain a xml:lang element
+line 15, column 0: title should contain a xml:lang element</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>Remove entry</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+DELETE http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9f28d574-f3ef-43b1-b346-be7aaf79d719
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+date: Thu, 07 May 2009 13:22:03 GMT
+status: 204
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:22:03 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:57.724+01:00&lt;/published&gt;
+&lt;summary&gt;kabiabakfg&lt;/summary&gt;
+&lt;title&gt;kabiabakfg&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:21:59.210+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;kabiabakfg&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:57.724+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;kabiabakfg&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:59.210+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:21:59.210+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 7, column 320: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 14, column 0: summary should contain a xml:lang element
+line 15, column 0: title should contain a xml:lang element</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>Remove entry</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+DELETE http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/a56de7d2-ddea-431c-bd2d-5664126ad5b4
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+date: Thu, 07 May 2009 13:22:03 GMT
+status: 204
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+GET http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+status: 200
+content-location: http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d
+transfer-encoding: chunked
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+date: Thu, 07 May 2009 13:22:03 GMT
+content-type: application/atom+xml;type=entry;charset=UTF-8
+
+
+</code></pre>
+<pre><code class='prettyprint'>&lt;?xml version="1.0" ?&gt;&lt;entry xmlns="http://www.w3.org/2005/Atom" xmlns:alf="http://www.alfresco.org" xmlns:app="http://www.w3.org/2007/app" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901"&gt;
+&lt;author&gt;&lt;name&gt;admin&lt;/name&gt;&lt;/author&gt;
+&lt;content src="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" type="text/xhtml"/&gt;&lt;id&gt;urn:uuid:9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/id&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d" rel="self"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="enclosure" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d" rel="edit"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="edit-media" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/permissions" rel="allowableactions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/associations" rel="relationships"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/parents" rel="parents"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/versions" rel="allversions"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content" rel="stream" type="text/xhtml"/&gt;&lt;link href="http://localhost:8080/alfresco/service/api/type/document" rel="type"/&gt;
+&lt;link href="http://localhost:8080/alfresco/service/api/repository" rel="repository"/&gt;
+&lt;published&gt;2009-05-07T14:21:56.005+01:00&lt;/published&gt;
+&lt;summary&gt;cajgclekci&lt;/summary&gt;
+&lt;title&gt;Internationalization - 2&lt;/title&gt;
+&lt;updated&gt;2009-05-07T14:22:00.918+01:00&lt;/updated&gt;
+&lt;cmis:object&gt;
+&lt;cmis:properties&gt;
+&lt;cmis:propertyString cmis:name="BaseType"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamFilename"&gt;&lt;cmis:value&gt;Internationalization - 2&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyString cmis:name="CheckinComment"/&gt;
+&lt;cmis:propertyInteger cmis:name="ContentStreamLength"&gt;&lt;cmis:value&gt;68&lt;/cmis:value&gt;&lt;/cmis:propertyInteger&gt;
+&lt;cmis:propertyString cmis:name="VersionLabel"/&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamAllowed"&gt;&lt;cmis:value&gt;ALLOWED&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyUri cmis:name="ContentStreamUri"&gt;&lt;cmis:value&gt;http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d/content&lt;/cmis:value&gt;&lt;/cmis:propertyUri&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestVersion"&gt;&lt;cmis:value&gt;true&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="ContentStreamMimeType"&gt;&lt;cmis:value&gt;text/xhtml&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsVersionSeriesCheckedOut"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyBoolean cmis:name="IsMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="VersionSeriesCheckedOutBy"/&gt;
+&lt;cmis:propertyDateTime cmis:name="CreationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:21:56.005+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyString cmis:name="ChangeToken"/&gt;
+&lt;cmis:propertyString cmis:name="LastModifiedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyBoolean cmis:name="IsLatestMajorVersion"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyString cmis:name="Name"&gt;&lt;cmis:value&gt;Internationalization - 2&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyBoolean cmis:name="IsImmutable"&gt;&lt;cmis:value&gt;false&lt;/cmis:value&gt;&lt;/cmis:propertyBoolean&gt;
+&lt;cmis:propertyDateTime cmis:name="LastModificationDate"&gt;&lt;cmis:value&gt;2009-05-07T14:22:00.918+01:00&lt;/cmis:value&gt;&lt;/cmis:propertyDateTime&gt;
+&lt;cmis:propertyUri cmis:name="Uri"/&gt;
+&lt;cmis:propertyString cmis:name="CreatedBy"&gt;&lt;cmis:value&gt;admin&lt;/cmis:value&gt;&lt;/cmis:propertyString&gt;
+&lt;cmis:propertyId cmis:name="VersionSeriesCheckedOutId"/&gt;
+&lt;cmis:propertyId cmis:name="ObjectTypeId"&gt;&lt;cmis:value&gt;document&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;cmis:propertyId cmis:name="ObjectId"&gt;&lt;cmis:value&gt;workspace://SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d&lt;/cmis:value&gt;&lt;/cmis:propertyId&gt;
+&lt;/cmis:properties&gt;
+&lt;/cmis:object&gt;
+&lt;cmis:terminator/&gt;
+&lt;app:edited&gt;2009-05-07T14:22:00.918+01:00&lt;/app:edited&gt;
+&lt;alf:icon&gt;http://localhost:8080/alfresco/images/filetypes/_default.gif&lt;/alf:icon&gt;
+&lt;/entry&gt;</code></pre></span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No ETag: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> <a href='http://tools.ietf.org/html/rfc2616#section-13.3.4'>[RFC2616] Section 13.3.4</a> <span class='Warning'>No Last-Modified: header was sent with the response.</span></li>
+  <li class='Warning'><img src='validator/res/warning.gif'> [RFC4287] <span class='Warning'>line 2, column 0: Use of unknown namespace: http://docs.oasis-open.org/ns/cmis/core/200901
+line 2, column 0: Use of unknown namespace: http://www.alfresco.org
+line 7, column 320: Unregistered link relationship (7 occurrences)</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>line 4, column 0: content should contain a xml:lang element
+line 14, column 0: summary should contain a xml:lang element
+line 15, column 0: title should contain a xml:lang element</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>Remove entry</span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Request <span class='Log'><pre><code>
+DELETE http://localhost:8080/alfresco/service/api/node/workspace/SpacesStore/9ef7edfc-8298-4643-a9b1-8bfdeb32904d
+
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Log'><img src='validator/res/log.gif'> Response <span class='Log'><pre><code>
+
+date: Thu, 07 May 2009 13:22:03 GMT
+status: 204
+server: Apache-Coyote/1.1
+pragma: no-cache
+cache-control: no-cache
+
+
+</code></pre>
+<pre><code class='prettyprint'></code></pre></span></li>
+  <li class='Success'><img src='validator/res/success.gif'>  <span class='Success'>Removed all entries that we're previously added.</span></li>
+  <li class='Info'><img src='validator/res/info.gif'>   <span class='Info'>Didn't find any Media Collections that would accept GIF images</span></li>
+</ol>
+
diff --git a/remote-api/src/main/apptest/test.sh b/remote-api/src/main/apptest/test.sh
new file mode 100644
index 00000000000..bb9e5fcd91f
--- /dev/null
+++ b/remote-api/src/main/apptest/test.sh
@@ -0,0 +1,4 @@
+# ! /bin/sh
+
+python validator/appclienttest.py --html --credentials=credentials.txt --verbose --output=results.html "http://localhost:8080/alfresco/service/api/repository" 
+open results.html
diff --git a/remote-api/src/main/generated/WhereClause.tokens b/remote-api/src/main/generated/WhereClause.tokens
new file mode 100644
index 00000000000..c3763e00406
--- /dev/null
+++ b/remote-api/src/main/generated/WhereClause.tokens
@@ -0,0 +1,24 @@
+AND=4
+BETWEEN=5
+COLON=6
+COMMA=7
+EQUALS=8
+EXISTS=9
+GREATERTHAN=10
+GREATERTHANOREQUALS=11
+IDENTIFIER=12
+IDENTIFIERDIGIT=13
+IDENTIFIERLETTER=14
+IDENTIFIERLETTERORDIGIT=15
+IN=16
+LEFTPAREN=17
+LESSTHAN=18
+LESSTHANOREQUALS=19
+MATCHES=20
+NEGATION=21
+OR=22
+PROPERTYNAME=23
+PROPERTYVALUE=24
+RIGHTPAREN=25
+SINGLEQUOTE=26
+WS=27
diff --git a/remote-api/src/main/generated/org/alfresco/rest/antlr/WhereClauseLexer.java b/remote-api/src/main/generated/org/alfresco/rest/antlr/WhereClauseLexer.java
new file mode 100644
index 00000000000..7dc51bddf6e
--- /dev/null
+++ b/remote-api/src/main/generated/org/alfresco/rest/antlr/WhereClauseLexer.java
@@ -0,0 +1,1840 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+// $ANTLR 3.4 org/alfresco/rest/antlr/WhereClause.g 2013-05-24 09:01:14
+
+package org.alfresco.rest.antlr;
+import java.util.Map;
+import java.util.HashMap;
+import org.alfresco.rest.framework.resource.parameters.where.InvalidQueryException;
+import org.alfresco.rest.framework.resource.parameters.where.WhereCompiler;
+
+
+import org.antlr.runtime.*;
+import java.util.Stack;
+import java.util.List;
+import java.util.ArrayList;
+
+@SuppressWarnings({"all", "warnings", "unchecked"})
+public class WhereClauseLexer extends Lexer {
+    public static final int EOF=-1;
+    public static final int AND=4;
+    public static final int BETWEEN=5;
+    public static final int COLON=6;
+    public static final int COMMA=7;
+    public static final int EQUALS=8;
+    public static final int EXISTS=9;
+    public static final int GREATERTHAN=10;
+    public static final int GREATERTHANOREQUALS=11;
+    public static final int IDENTIFIER=12;
+    public static final int IDENTIFIERDIGIT=13;
+    public static final int IDENTIFIERLETTER=14;
+    public static final int IDENTIFIERLETTERORDIGIT=15;
+    public static final int IN=16;
+    public static final int LEFTPAREN=17;
+    public static final int LESSTHAN=18;
+    public static final int LESSTHANOREQUALS=19;
+    public static final int MATCHES=20;
+    public static final int NEGATION=21;
+    public static final int OR=22;
+    public static final int PROPERTYNAME=23;
+    public static final int PROPERTYVALUE=24;
+    public static final int RIGHTPAREN=25;
+    public static final int SINGLEQUOTE=26;
+    public static final int WS=27;
+
+
+        @Override
+        public void recover(RecognitionException e)
+        {
+            throw new InvalidQueryException(WhereCompiler.resolveMessage(e));
+        }
+
+
+    // delegates
+    // delegators
+    public Lexer[] getDelegates() {
+        return new Lexer[] {};
+    }
+
+    public WhereClauseLexer() {} 
+    public WhereClauseLexer(CharStream input) {
+        this(input, new RecognizerSharedState());
+    }
+    public WhereClauseLexer(CharStream input, RecognizerSharedState state) {
+        super(input,state);
+    }
+    public String getGrammarFileName() { return "org/alfresco/rest/antlr/WhereClause.g"; }
+
+    // $ANTLR start "NEGATION"
+    public final void mNEGATION() throws RecognitionException {
+        try {
+            int _type = NEGATION;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:72:9: ( ( 'not' | 'NOT' ) WS )
+            // org/alfresco/rest/antlr/WhereClause.g:72:11: ( 'not' | 'NOT' ) WS
+            {
+            // org/alfresco/rest/antlr/WhereClause.g:72:11: ( 'not' | 'NOT' )
+            int alt1=2;
+            int LA1_0 = input.LA(1);
+
+            if ( (LA1_0=='n') ) {
+                alt1=1;
+            }
+            else if ( (LA1_0=='N') ) {
+                alt1=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 1, 0, input);
+
+                throw nvae;
+
+            }
+            switch (alt1) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:72:12: 'not'
+                    {
+                    match("not"); 
+
+
+
+                    }
+                    break;
+                case 2 :
+                    // org/alfresco/rest/antlr/WhereClause.g:72:18: 'NOT'
+                    {
+                    match("NOT"); 
+
+
+
+                    }
+                    break;
+
+            }
+
+
+            mWS(); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "NEGATION"
+
+    // $ANTLR start "EXISTS"
+    public final void mEXISTS() throws RecognitionException {
+        try {
+            int _type = EXISTS;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:73:7: ( 'exists' | 'EXISTS' )
+            int alt2=2;
+            int LA2_0 = input.LA(1);
+
+            if ( (LA2_0=='e') ) {
+                alt2=1;
+            }
+            else if ( (LA2_0=='E') ) {
+                alt2=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 2, 0, input);
+
+                throw nvae;
+
+            }
+            switch (alt2) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:73:9: 'exists'
+                    {
+                    match("exists"); 
+
+
+
+                    }
+                    break;
+                case 2 :
+                    // org/alfresco/rest/antlr/WhereClause.g:73:18: 'EXISTS'
+                    {
+                    match("EXISTS"); 
+
+
+
+                    }
+                    break;
+
+            }
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "EXISTS"
+
+    // $ANTLR start "IN"
+    public final void mIN() throws RecognitionException {
+        try {
+            int _type = IN;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:74:3: ( WS ( 'in' | 'IN' ) )
+            // org/alfresco/rest/antlr/WhereClause.g:74:5: WS ( 'in' | 'IN' )
+            {
+            mWS(); 
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:74:7: ( 'in' | 'IN' )
+            int alt3=2;
+            int LA3_0 = input.LA(1);
+
+            if ( (LA3_0=='i') ) {
+                alt3=1;
+            }
+            else if ( (LA3_0=='I') ) {
+                alt3=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 3, 0, input);
+
+                throw nvae;
+
+            }
+            switch (alt3) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:74:8: 'in'
+                    {
+                    match("in"); 
+
+
+
+                    }
+                    break;
+                case 2 :
+                    // org/alfresco/rest/antlr/WhereClause.g:74:13: 'IN'
+                    {
+                    match("IN"); 
+
+
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "IN"
+
+    // $ANTLR start "MATCHES"
+    public final void mMATCHES() throws RecognitionException {
+        try {
+            int _type = MATCHES;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:75:8: ( WS ( 'matches' | 'MATCHES' ) )
+            // org/alfresco/rest/antlr/WhereClause.g:75:10: WS ( 'matches' | 'MATCHES' )
+            {
+            mWS(); 
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:75:12: ( 'matches' | 'MATCHES' )
+            int alt4=2;
+            int LA4_0 = input.LA(1);
+
+            if ( (LA4_0=='m') ) {
+                alt4=1;
+            }
+            else if ( (LA4_0=='M') ) {
+                alt4=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 4, 0, input);
+
+                throw nvae;
+
+            }
+            switch (alt4) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:75:13: 'matches'
+                    {
+                    match("matches"); 
+
+
+
+                    }
+                    break;
+                case 2 :
+                    // org/alfresco/rest/antlr/WhereClause.g:75:23: 'MATCHES'
+                    {
+                    match("MATCHES"); 
+
+
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "MATCHES"
+
+    // $ANTLR start "BETWEEN"
+    public final void mBETWEEN() throws RecognitionException {
+        try {
+            int _type = BETWEEN;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:76:8: ( WS ( 'between' | 'BETWEEN' ) )
+            // org/alfresco/rest/antlr/WhereClause.g:76:10: WS ( 'between' | 'BETWEEN' )
+            {
+            mWS(); 
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:76:12: ( 'between' | 'BETWEEN' )
+            int alt5=2;
+            int LA5_0 = input.LA(1);
+
+            if ( (LA5_0=='b') ) {
+                alt5=1;
+            }
+            else if ( (LA5_0=='B') ) {
+                alt5=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 5, 0, input);
+
+                throw nvae;
+
+            }
+            switch (alt5) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:76:13: 'between'
+                    {
+                    match("between"); 
+
+
+
+                    }
+                    break;
+                case 2 :
+                    // org/alfresco/rest/antlr/WhereClause.g:76:23: 'BETWEEN'
+                    {
+                    match("BETWEEN"); 
+
+
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "BETWEEN"
+
+    // $ANTLR start "OR"
+    public final void mOR() throws RecognitionException {
+        try {
+            int _type = OR;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:77:3: ( WS ( 'or' | 'OR' ) WS )
+            // org/alfresco/rest/antlr/WhereClause.g:77:5: WS ( 'or' | 'OR' ) WS
+            {
+            mWS(); 
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:77:7: ( 'or' | 'OR' )
+            int alt6=2;
+            int LA6_0 = input.LA(1);
+
+            if ( (LA6_0=='o') ) {
+                alt6=1;
+            }
+            else if ( (LA6_0=='O') ) {
+                alt6=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 6, 0, input);
+
+                throw nvae;
+
+            }
+            switch (alt6) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:77:8: 'or'
+                    {
+                    match("or"); 
+
+
+
+                    }
+                    break;
+                case 2 :
+                    // org/alfresco/rest/antlr/WhereClause.g:77:13: 'OR'
+                    {
+                    match("OR"); 
+
+
+
+                    }
+                    break;
+
+            }
+
+
+            mWS(); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "OR"
+
+    // $ANTLR start "AND"
+    public final void mAND() throws RecognitionException {
+        try {
+            int _type = AND;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:78:4: ( WS ( 'and' | 'AND' ) WS )
+            // org/alfresco/rest/antlr/WhereClause.g:78:6: WS ( 'and' | 'AND' ) WS
+            {
+            mWS(); 
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:78:8: ( 'and' | 'AND' )
+            int alt7=2;
+            int LA7_0 = input.LA(1);
+
+            if ( (LA7_0=='a') ) {
+                alt7=1;
+            }
+            else if ( (LA7_0=='A') ) {
+                alt7=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 7, 0, input);
+
+                throw nvae;
+
+            }
+            switch (alt7) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:78:9: 'and'
+                    {
+                    match("and"); 
+
+
+
+                    }
+                    break;
+                case 2 :
+                    // org/alfresco/rest/antlr/WhereClause.g:78:15: 'AND'
+                    {
+                    match("AND"); 
+
+
+
+                    }
+                    break;
+
+            }
+
+
+            mWS(); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "AND"
+
+    // $ANTLR start "EQUALS"
+    public final void mEQUALS() throws RecognitionException {
+        try {
+            int _type = EQUALS;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:79:7: ( ( WS )? '=' ( WS )? )
+            // org/alfresco/rest/antlr/WhereClause.g:79:9: ( WS )? '=' ( WS )?
+            {
+            // org/alfresco/rest/antlr/WhereClause.g:79:9: ( WS )?
+            int alt8=2;
+            int LA8_0 = input.LA(1);
+
+            if ( ((LA8_0 >= '\t' && LA8_0 <= '\n')||LA8_0=='\r'||LA8_0==' ') ) {
+                alt8=1;
+            }
+            switch (alt8) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:79:9: WS
+                    {
+                    mWS(); 
+
+
+                    }
+                    break;
+
+            }
+
+
+            match('='); 
+
+            // org/alfresco/rest/antlr/WhereClause.g:79:15: ( WS )?
+            int alt9=2;
+            int LA9_0 = input.LA(1);
+
+            if ( ((LA9_0 >= '\t' && LA9_0 <= '\n')||LA9_0=='\r'||LA9_0==' ') ) {
+                alt9=1;
+            }
+            switch (alt9) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:79:15: WS
+                    {
+                    mWS(); 
+
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "EQUALS"
+
+    // $ANTLR start "LESSTHAN"
+    public final void mLESSTHAN() throws RecognitionException {
+        try {
+            int _type = LESSTHAN;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:80:9: ( ( WS )? '<' ( WS )? )
+            // org/alfresco/rest/antlr/WhereClause.g:80:11: ( WS )? '<' ( WS )?
+            {
+            // org/alfresco/rest/antlr/WhereClause.g:80:11: ( WS )?
+            int alt10=2;
+            int LA10_0 = input.LA(1);
+
+            if ( ((LA10_0 >= '\t' && LA10_0 <= '\n')||LA10_0=='\r'||LA10_0==' ') ) {
+                alt10=1;
+            }
+            switch (alt10) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:80:11: WS
+                    {
+                    mWS(); 
+
+
+                    }
+                    break;
+
+            }
+
+
+            match('<'); 
+
+            // org/alfresco/rest/antlr/WhereClause.g:80:17: ( WS )?
+            int alt11=2;
+            int LA11_0 = input.LA(1);
+
+            if ( ((LA11_0 >= '\t' && LA11_0 <= '\n')||LA11_0=='\r'||LA11_0==' ') ) {
+                alt11=1;
+            }
+            switch (alt11) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:80:17: WS
+                    {
+                    mWS(); 
+
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "LESSTHAN"
+
+    // $ANTLR start "GREATERTHAN"
+    public final void mGREATERTHAN() throws RecognitionException {
+        try {
+            int _type = GREATERTHAN;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:81:12: ( ( WS )? '>' ( WS )? )
+            // org/alfresco/rest/antlr/WhereClause.g:81:14: ( WS )? '>' ( WS )?
+            {
+            // org/alfresco/rest/antlr/WhereClause.g:81:14: ( WS )?
+            int alt12=2;
+            int LA12_0 = input.LA(1);
+
+            if ( ((LA12_0 >= '\t' && LA12_0 <= '\n')||LA12_0=='\r'||LA12_0==' ') ) {
+                alt12=1;
+            }
+            switch (alt12) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:81:14: WS
+                    {
+                    mWS(); 
+
+
+                    }
+                    break;
+
+            }
+
+
+            match('>'); 
+
+            // org/alfresco/rest/antlr/WhereClause.g:81:20: ( WS )?
+            int alt13=2;
+            int LA13_0 = input.LA(1);
+
+            if ( ((LA13_0 >= '\t' && LA13_0 <= '\n')||LA13_0=='\r'||LA13_0==' ') ) {
+                alt13=1;
+            }
+            switch (alt13) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:81:20: WS
+                    {
+                    mWS(); 
+
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "GREATERTHAN"
+
+    // $ANTLR start "LESSTHANOREQUALS"
+    public final void mLESSTHANOREQUALS() throws RecognitionException {
+        try {
+            int _type = LESSTHANOREQUALS;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:82:17: ( ( WS )? '<=' ( WS )? )
+            // org/alfresco/rest/antlr/WhereClause.g:82:19: ( WS )? '<=' ( WS )?
+            {
+            // org/alfresco/rest/antlr/WhereClause.g:82:19: ( WS )?
+            int alt14=2;
+            int LA14_0 = input.LA(1);
+
+            if ( ((LA14_0 >= '\t' && LA14_0 <= '\n')||LA14_0=='\r'||LA14_0==' ') ) {
+                alt14=1;
+            }
+            switch (alt14) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:82:19: WS
+                    {
+                    mWS(); 
+
+
+                    }
+                    break;
+
+            }
+
+
+            match("<="); 
+
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:82:26: ( WS )?
+            int alt15=2;
+            int LA15_0 = input.LA(1);
+
+            if ( ((LA15_0 >= '\t' && LA15_0 <= '\n')||LA15_0=='\r'||LA15_0==' ') ) {
+                alt15=1;
+            }
+            switch (alt15) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:82:26: WS
+                    {
+                    mWS(); 
+
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "LESSTHANOREQUALS"
+
+    // $ANTLR start "GREATERTHANOREQUALS"
+    public final void mGREATERTHANOREQUALS() throws RecognitionException {
+        try {
+            int _type = GREATERTHANOREQUALS;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:83:20: ( ( WS )? '>=' ( WS )? )
+            // org/alfresco/rest/antlr/WhereClause.g:83:22: ( WS )? '>=' ( WS )?
+            {
+            // org/alfresco/rest/antlr/WhereClause.g:83:22: ( WS )?
+            int alt16=2;
+            int LA16_0 = input.LA(1);
+
+            if ( ((LA16_0 >= '\t' && LA16_0 <= '\n')||LA16_0=='\r'||LA16_0==' ') ) {
+                alt16=1;
+            }
+            switch (alt16) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:83:22: WS
+                    {
+                    mWS(); 
+
+
+                    }
+                    break;
+
+            }
+
+
+            match(">="); 
+
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:83:29: ( WS )?
+            int alt17=2;
+            int LA17_0 = input.LA(1);
+
+            if ( ((LA17_0 >= '\t' && LA17_0 <= '\n')||LA17_0=='\r'||LA17_0==' ') ) {
+                alt17=1;
+            }
+            switch (alt17) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:83:29: WS
+                    {
+                    mWS(); 
+
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "GREATERTHANOREQUALS"
+
+    // $ANTLR start "LEFTPAREN"
+    public final void mLEFTPAREN() throws RecognitionException {
+        try {
+            int _type = LEFTPAREN;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:84:10: ( '(' )
+            // org/alfresco/rest/antlr/WhereClause.g:84:12: '('
+            {
+            match('('); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "LEFTPAREN"
+
+    // $ANTLR start "RIGHTPAREN"
+    public final void mRIGHTPAREN() throws RecognitionException {
+        try {
+            int _type = RIGHTPAREN;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:85:11: ( ')' )
+            // org/alfresco/rest/antlr/WhereClause.g:85:13: ')'
+            {
+            match(')'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "RIGHTPAREN"
+
+    // $ANTLR start "COMMA"
+    public final void mCOMMA() throws RecognitionException {
+        try {
+            int _type = COMMA;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:86:6: ( ',' )
+            // org/alfresco/rest/antlr/WhereClause.g:86:8: ','
+            {
+            match(','); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "COMMA"
+
+    // $ANTLR start "COLON"
+    public final void mCOLON() throws RecognitionException {
+        try {
+            int _type = COLON;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:87:6: ( ':' )
+            // org/alfresco/rest/antlr/WhereClause.g:87:8: ':'
+            {
+            match(':'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "COLON"
+
+    // $ANTLR start "SINGLEQUOTE"
+    public final void mSINGLEQUOTE() throws RecognitionException {
+        try {
+            int _type = SINGLEQUOTE;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:88:12: ( '\\'' )
+            // org/alfresco/rest/antlr/WhereClause.g:88:14: '\\''
+            {
+            match('\''); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "SINGLEQUOTE"
+
+    // $ANTLR start "PROPERTYVALUE"
+    public final void mPROPERTYVALUE() throws RecognitionException {
+        try {
+            int _type = PROPERTYVALUE;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:89:14: ( ( SINGLEQUOTE (~ SINGLEQUOTE | '\\\\' SINGLEQUOTE )* SINGLEQUOTE ) | ( IDENTIFIERDIGIT )+ )
+            int alt20=2;
+            int LA20_0 = input.LA(1);
+
+            if ( (LA20_0=='\'') ) {
+                alt20=1;
+            }
+            else if ( ((LA20_0 >= '0' && LA20_0 <= '9')||(LA20_0 >= '\u0660' && LA20_0 <= '\u0669')||(LA20_0 >= '\u06F0' && LA20_0 <= '\u06F9')||(LA20_0 >= '\u0966' && LA20_0 <= '\u096F')||(LA20_0 >= '\u09E6' && LA20_0 <= '\u09EF')||(LA20_0 >= '\u0A66' && LA20_0 <= '\u0A6F')||(LA20_0 >= '\u0AE6' && LA20_0 <= '\u0AEF')||(LA20_0 >= '\u0B66' && LA20_0 <= '\u0B6F')||(LA20_0 >= '\u0BE7' && LA20_0 <= '\u0BEF')||(LA20_0 >= '\u0C66' && LA20_0 <= '\u0C6F')||(LA20_0 >= '\u0CE6' && LA20_0 <= '\u0CEF')||(LA20_0 >= '\u0D66' && LA20_0 <= '\u0D6F')||(LA20_0 >= '\u0E50' && LA20_0 <= '\u0E59')||(LA20_0 >= '\u0ED0' && LA20_0 <= '\u0ED9')||(LA20_0 >= '\u1040' && LA20_0 <= '\u1049')) ) {
+                alt20=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 20, 0, input);
+
+                throw nvae;
+
+            }
+            switch (alt20) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:89:16: ( SINGLEQUOTE (~ SINGLEQUOTE | '\\\\' SINGLEQUOTE )* SINGLEQUOTE )
+                    {
+                    // org/alfresco/rest/antlr/WhereClause.g:89:16: ( SINGLEQUOTE (~ SINGLEQUOTE | '\\\\' SINGLEQUOTE )* SINGLEQUOTE )
+                    // org/alfresco/rest/antlr/WhereClause.g:89:17: SINGLEQUOTE (~ SINGLEQUOTE | '\\\\' SINGLEQUOTE )* SINGLEQUOTE
+                    {
+                    mSINGLEQUOTE(); 
+
+
+                    // org/alfresco/rest/antlr/WhereClause.g:89:29: (~ SINGLEQUOTE | '\\\\' SINGLEQUOTE )*
+                    loop18:
+                    do {
+                        int alt18=3;
+                        int LA18_0 = input.LA(1);
+
+                        if ( (LA18_0=='\\') ) {
+                            int LA18_2 = input.LA(2);
+
+                            if ( (LA18_2=='\'') ) {
+                                int LA18_4 = input.LA(3);
+
+                                if ( ((LA18_4 >= '\u0000' && LA18_4 <= '\uFFFF')) ) {
+                                    alt18=2;
+                                }
+
+                                else {
+                                    alt18=1;
+                                }
+
+
+                            }
+                            else if ( ((LA18_2 >= '\u0000' && LA18_2 <= '&')||(LA18_2 >= '(' && LA18_2 <= '\uFFFF')) ) {
+                                alt18=1;
+                            }
+
+
+                        }
+                        else if ( ((LA18_0 >= '\u0000' && LA18_0 <= '&')||(LA18_0 >= '(' && LA18_0 <= '[')||(LA18_0 >= ']' && LA18_0 <= '\uFFFF')) ) {
+                            alt18=1;
+                        }
+
+
+                        switch (alt18) {
+                    	case 1 :
+                    	    // org/alfresco/rest/antlr/WhereClause.g:89:30: ~ SINGLEQUOTE
+                    	    {
+                    	    if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '\u0019')||(input.LA(1) >= '\u001B' && input.LA(1) <= '\uFFFF') ) {
+                    	        input.consume();
+                    	    }
+                    	    else {
+                    	        MismatchedSetException mse = new MismatchedSetException(null,input);
+                    	        recover(mse);
+                    	        throw mse;
+                    	    }
+
+
+                    	    }
+                    	    break;
+                    	case 2 :
+                    	    // org/alfresco/rest/antlr/WhereClause.g:89:43: '\\\\' SINGLEQUOTE
+                    	    {
+                    	    match('\\'); 
+
+                    	    mSINGLEQUOTE(); 
+
+
+                    	    }
+                    	    break;
+
+                    	default :
+                    	    break loop18;
+                        }
+                    } while (true);
+
+
+                    mSINGLEQUOTE(); 
+
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // org/alfresco/rest/antlr/WhereClause.g:89:75: ( IDENTIFIERDIGIT )+
+                    {
+                    // org/alfresco/rest/antlr/WhereClause.g:89:75: ( IDENTIFIERDIGIT )+
+                    int cnt19=0;
+                    loop19:
+                    do {
+                        int alt19=2;
+                        int LA19_0 = input.LA(1);
+
+                        if ( ((LA19_0 >= '0' && LA19_0 <= '9')||(LA19_0 >= '\u0660' && LA19_0 <= '\u0669')||(LA19_0 >= '\u06F0' && LA19_0 <= '\u06F9')||(LA19_0 >= '\u0966' && LA19_0 <= '\u096F')||(LA19_0 >= '\u09E6' && LA19_0 <= '\u09EF')||(LA19_0 >= '\u0A66' && LA19_0 <= '\u0A6F')||(LA19_0 >= '\u0AE6' && LA19_0 <= '\u0AEF')||(LA19_0 >= '\u0B66' && LA19_0 <= '\u0B6F')||(LA19_0 >= '\u0BE7' && LA19_0 <= '\u0BEF')||(LA19_0 >= '\u0C66' && LA19_0 <= '\u0C6F')||(LA19_0 >= '\u0CE6' && LA19_0 <= '\u0CEF')||(LA19_0 >= '\u0D66' && LA19_0 <= '\u0D6F')||(LA19_0 >= '\u0E50' && LA19_0 <= '\u0E59')||(LA19_0 >= '\u0ED0' && LA19_0 <= '\u0ED9')||(LA19_0 >= '\u1040' && LA19_0 <= '\u1049')) ) {
+                            alt19=1;
+                        }
+
+
+                        switch (alt19) {
+                    	case 1 :
+                    	    // org/alfresco/rest/antlr/WhereClause.g:
+                    	    {
+                    	    if ( (input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= '\u0660' && input.LA(1) <= '\u0669')||(input.LA(1) >= '\u06F0' && input.LA(1) <= '\u06F9')||(input.LA(1) >= '\u0966' && input.LA(1) <= '\u096F')||(input.LA(1) >= '\u09E6' && input.LA(1) <= '\u09EF')||(input.LA(1) >= '\u0A66' && input.LA(1) <= '\u0A6F')||(input.LA(1) >= '\u0AE6' && input.LA(1) <= '\u0AEF')||(input.LA(1) >= '\u0B66' && input.LA(1) <= '\u0B6F')||(input.LA(1) >= '\u0BE7' && input.LA(1) <= '\u0BEF')||(input.LA(1) >= '\u0C66' && input.LA(1) <= '\u0C6F')||(input.LA(1) >= '\u0CE6' && input.LA(1) <= '\u0CEF')||(input.LA(1) >= '\u0D66' && input.LA(1) <= '\u0D6F')||(input.LA(1) >= '\u0E50' && input.LA(1) <= '\u0E59')||(input.LA(1) >= '\u0ED0' && input.LA(1) <= '\u0ED9')||(input.LA(1) >= '\u1040' && input.LA(1) <= '\u1049') ) {
+                    	        input.consume();
+                    	    }
+                    	    else {
+                    	        MismatchedSetException mse = new MismatchedSetException(null,input);
+                    	        recover(mse);
+                    	        throw mse;
+                    	    }
+
+
+                    	    }
+                    	    break;
+
+                    	default :
+                    	    if ( cnt19 >= 1 ) break loop19;
+                                EarlyExitException eee =
+                                    new EarlyExitException(19, input);
+                                throw eee;
+                        }
+                        cnt19++;
+                    } while (true);
+
+
+                    }
+                    break;
+
+            }
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "PROPERTYVALUE"
+
+    // $ANTLR start "PROPERTYNAME"
+    public final void mPROPERTYNAME() throws RecognitionException {
+        try {
+            int _type = PROPERTYNAME;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:90:13: ( ( '/' )? IDENTIFIER ( '/' IDENTIFIER )* )
+            // org/alfresco/rest/antlr/WhereClause.g:90:15: ( '/' )? IDENTIFIER ( '/' IDENTIFIER )*
+            {
+            // org/alfresco/rest/antlr/WhereClause.g:90:15: ( '/' )?
+            int alt21=2;
+            int LA21_0 = input.LA(1);
+
+            if ( (LA21_0=='/') ) {
+                alt21=1;
+            }
+            switch (alt21) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:90:15: '/'
+                    {
+                    match('/'); 
+
+                    }
+                    break;
+
+            }
+
+
+            mIDENTIFIER(); 
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:90:31: ( '/' IDENTIFIER )*
+            loop22:
+            do {
+                int alt22=2;
+                int LA22_0 = input.LA(1);
+
+                if ( (LA22_0=='/') ) {
+                    alt22=1;
+                }
+
+
+                switch (alt22) {
+            	case 1 :
+            	    // org/alfresco/rest/antlr/WhereClause.g:90:32: '/' IDENTIFIER
+            	    {
+            	    match('/'); 
+
+            	    mIDENTIFIER(); 
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop22;
+                }
+            } while (true);
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "PROPERTYNAME"
+
+    // $ANTLR start "IDENTIFIERLETTERORDIGIT"
+    public final void mIDENTIFIERLETTERORDIGIT() throws RecognitionException {
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:91:33: ( ( IDENTIFIERLETTER | IDENTIFIERDIGIT ) )
+            // org/alfresco/rest/antlr/WhereClause.g:
+            {
+            if ( (input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||input.LA(1)=='_'||(input.LA(1) >= 'a' && input.LA(1) <= 'z')||(input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')||(input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00F6')||(input.LA(1) >= '\u00F8' && input.LA(1) <= '\u1FFF')||(input.LA(1) >= '\u3040' && input.LA(1) <= '\u318F')||(input.LA(1) >= '\u3300' && input.LA(1) <= '\u337F')||(input.LA(1) >= '\u3400' && input.LA(1) <= '\u3D2D')||(input.LA(1) >= '\u4E00' && input.LA(1) <= '\u9FFF')||(input.LA(1) >= '\uF900' && input.LA(1) <= '\uFAFF') ) {
+                input.consume();
+            }
+            else {
+                MismatchedSetException mse = new MismatchedSetException(null,input);
+                recover(mse);
+                throw mse;
+            }
+
+
+            }
+
+
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "IDENTIFIERLETTERORDIGIT"
+
+    // $ANTLR start "IDENTIFIER"
+    public final void mIDENTIFIER() throws RecognitionException {
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:92:21: ( ( IDENTIFIERLETTER ( ( IDENTIFIERLETTERORDIGIT )* | ( ( IDENTIFIERLETTERORDIGIT )* COLON ( IDENTIFIERLETTERORDIGIT )* ) ) ) )
+            // org/alfresco/rest/antlr/WhereClause.g:92:23: ( IDENTIFIERLETTER ( ( IDENTIFIERLETTERORDIGIT )* | ( ( IDENTIFIERLETTERORDIGIT )* COLON ( IDENTIFIERLETTERORDIGIT )* ) ) )
+            {
+            // org/alfresco/rest/antlr/WhereClause.g:92:23: ( IDENTIFIERLETTER ( ( IDENTIFIERLETTERORDIGIT )* | ( ( IDENTIFIERLETTERORDIGIT )* COLON ( IDENTIFIERLETTERORDIGIT )* ) ) )
+            // org/alfresco/rest/antlr/WhereClause.g:92:24: IDENTIFIERLETTER ( ( IDENTIFIERLETTERORDIGIT )* | ( ( IDENTIFIERLETTERORDIGIT )* COLON ( IDENTIFIERLETTERORDIGIT )* ) )
+            {
+            mIDENTIFIERLETTER(); 
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:92:41: ( ( IDENTIFIERLETTERORDIGIT )* | ( ( IDENTIFIERLETTERORDIGIT )* COLON ( IDENTIFIERLETTERORDIGIT )* ) )
+            int alt26=2;
+            alt26 = dfa26.predict(input);
+            switch (alt26) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:92:42: ( IDENTIFIERLETTERORDIGIT )*
+                    {
+                    // org/alfresco/rest/antlr/WhereClause.g:92:42: ( IDENTIFIERLETTERORDIGIT )*
+                    loop23:
+                    do {
+                        int alt23=2;
+                        int LA23_0 = input.LA(1);
+
+                        if ( ((LA23_0 >= '0' && LA23_0 <= '9')||(LA23_0 >= 'A' && LA23_0 <= 'Z')||LA23_0=='_'||(LA23_0 >= 'a' && LA23_0 <= 'z')||(LA23_0 >= '\u00C0' && LA23_0 <= '\u00D6')||(LA23_0 >= '\u00D8' && LA23_0 <= '\u00F6')||(LA23_0 >= '\u00F8' && LA23_0 <= '\u1FFF')||(LA23_0 >= '\u3040' && LA23_0 <= '\u318F')||(LA23_0 >= '\u3300' && LA23_0 <= '\u337F')||(LA23_0 >= '\u3400' && LA23_0 <= '\u3D2D')||(LA23_0 >= '\u4E00' && LA23_0 <= '\u9FFF')||(LA23_0 >= '\uF900' && LA23_0 <= '\uFAFF')) ) {
+                            alt23=1;
+                        }
+
+
+                        switch (alt23) {
+                    	case 1 :
+                    	    // org/alfresco/rest/antlr/WhereClause.g:
+                    	    {
+                    	    if ( (input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||input.LA(1)=='_'||(input.LA(1) >= 'a' && input.LA(1) <= 'z')||(input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')||(input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00F6')||(input.LA(1) >= '\u00F8' && input.LA(1) <= '\u1FFF')||(input.LA(1) >= '\u3040' && input.LA(1) <= '\u318F')||(input.LA(1) >= '\u3300' && input.LA(1) <= '\u337F')||(input.LA(1) >= '\u3400' && input.LA(1) <= '\u3D2D')||(input.LA(1) >= '\u4E00' && input.LA(1) <= '\u9FFF')||(input.LA(1) >= '\uF900' && input.LA(1) <= '\uFAFF') ) {
+                    	        input.consume();
+                    	    }
+                    	    else {
+                    	        MismatchedSetException mse = new MismatchedSetException(null,input);
+                    	        recover(mse);
+                    	        throw mse;
+                    	    }
+
+
+                    	    }
+                    	    break;
+
+                    	default :
+                    	    break loop23;
+                        }
+                    } while (true);
+
+
+                    }
+                    break;
+                case 2 :
+                    // org/alfresco/rest/antlr/WhereClause.g:92:69: ( ( IDENTIFIERLETTERORDIGIT )* COLON ( IDENTIFIERLETTERORDIGIT )* )
+                    {
+                    // org/alfresco/rest/antlr/WhereClause.g:92:69: ( ( IDENTIFIERLETTERORDIGIT )* COLON ( IDENTIFIERLETTERORDIGIT )* )
+                    // org/alfresco/rest/antlr/WhereClause.g:92:70: ( IDENTIFIERLETTERORDIGIT )* COLON ( IDENTIFIERLETTERORDIGIT )*
+                    {
+                    // org/alfresco/rest/antlr/WhereClause.g:92:70: ( IDENTIFIERLETTERORDIGIT )*
+                    loop24:
+                    do {
+                        int alt24=2;
+                        int LA24_0 = input.LA(1);
+
+                        if ( ((LA24_0 >= '0' && LA24_0 <= '9')||(LA24_0 >= 'A' && LA24_0 <= 'Z')||LA24_0=='_'||(LA24_0 >= 'a' && LA24_0 <= 'z')||(LA24_0 >= '\u00C0' && LA24_0 <= '\u00D6')||(LA24_0 >= '\u00D8' && LA24_0 <= '\u00F6')||(LA24_0 >= '\u00F8' && LA24_0 <= '\u1FFF')||(LA24_0 >= '\u3040' && LA24_0 <= '\u318F')||(LA24_0 >= '\u3300' && LA24_0 <= '\u337F')||(LA24_0 >= '\u3400' && LA24_0 <= '\u3D2D')||(LA24_0 >= '\u4E00' && LA24_0 <= '\u9FFF')||(LA24_0 >= '\uF900' && LA24_0 <= '\uFAFF')) ) {
+                            alt24=1;
+                        }
+
+
+                        switch (alt24) {
+                    	case 1 :
+                    	    // org/alfresco/rest/antlr/WhereClause.g:
+                    	    {
+                    	    if ( (input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||input.LA(1)=='_'||(input.LA(1) >= 'a' && input.LA(1) <= 'z')||(input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')||(input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00F6')||(input.LA(1) >= '\u00F8' && input.LA(1) <= '\u1FFF')||(input.LA(1) >= '\u3040' && input.LA(1) <= '\u318F')||(input.LA(1) >= '\u3300' && input.LA(1) <= '\u337F')||(input.LA(1) >= '\u3400' && input.LA(1) <= '\u3D2D')||(input.LA(1) >= '\u4E00' && input.LA(1) <= '\u9FFF')||(input.LA(1) >= '\uF900' && input.LA(1) <= '\uFAFF') ) {
+                    	        input.consume();
+                    	    }
+                    	    else {
+                    	        MismatchedSetException mse = new MismatchedSetException(null,input);
+                    	        recover(mse);
+                    	        throw mse;
+                    	    }
+
+
+                    	    }
+                    	    break;
+
+                    	default :
+                    	    break loop24;
+                        }
+                    } while (true);
+
+
+                    mCOLON(); 
+
+
+                    // org/alfresco/rest/antlr/WhereClause.g:92:101: ( IDENTIFIERLETTERORDIGIT )*
+                    loop25:
+                    do {
+                        int alt25=2;
+                        int LA25_0 = input.LA(1);
+
+                        if ( ((LA25_0 >= '0' && LA25_0 <= '9')||(LA25_0 >= 'A' && LA25_0 <= 'Z')||LA25_0=='_'||(LA25_0 >= 'a' && LA25_0 <= 'z')||(LA25_0 >= '\u00C0' && LA25_0 <= '\u00D6')||(LA25_0 >= '\u00D8' && LA25_0 <= '\u00F6')||(LA25_0 >= '\u00F8' && LA25_0 <= '\u1FFF')||(LA25_0 >= '\u3040' && LA25_0 <= '\u318F')||(LA25_0 >= '\u3300' && LA25_0 <= '\u337F')||(LA25_0 >= '\u3400' && LA25_0 <= '\u3D2D')||(LA25_0 >= '\u4E00' && LA25_0 <= '\u9FFF')||(LA25_0 >= '\uF900' && LA25_0 <= '\uFAFF')) ) {
+                            alt25=1;
+                        }
+
+
+                        switch (alt25) {
+                    	case 1 :
+                    	    // org/alfresco/rest/antlr/WhereClause.g:
+                    	    {
+                    	    if ( (input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||input.LA(1)=='_'||(input.LA(1) >= 'a' && input.LA(1) <= 'z')||(input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')||(input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00F6')||(input.LA(1) >= '\u00F8' && input.LA(1) <= '\u1FFF')||(input.LA(1) >= '\u3040' && input.LA(1) <= '\u318F')||(input.LA(1) >= '\u3300' && input.LA(1) <= '\u337F')||(input.LA(1) >= '\u3400' && input.LA(1) <= '\u3D2D')||(input.LA(1) >= '\u4E00' && input.LA(1) <= '\u9FFF')||(input.LA(1) >= '\uF900' && input.LA(1) <= '\uFAFF') ) {
+                    	        input.consume();
+                    	    }
+                    	    else {
+                    	        MismatchedSetException mse = new MismatchedSetException(null,input);
+                    	        recover(mse);
+                    	        throw mse;
+                    	    }
+
+
+                    	    }
+                    	    break;
+
+                    	default :
+                    	    break loop25;
+                        }
+                    } while (true);
+
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+            }
+
+
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "IDENTIFIER"
+
+    // $ANTLR start "WS"
+    public final void mWS() throws RecognitionException {
+        try {
+            int _type = WS;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // org/alfresco/rest/antlr/WhereClause.g:94:4: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // org/alfresco/rest/antlr/WhereClause.g:94:6: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            {
+            // org/alfresco/rest/antlr/WhereClause.g:94:6: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            int cnt27=0;
+            loop27:
+            do {
+                int alt27=2;
+                int LA27_0 = input.LA(1);
+
+                if ( ((LA27_0 >= '\t' && LA27_0 <= '\n')||LA27_0=='\r'||LA27_0==' ') ) {
+                    alt27=1;
+                }
+
+
+                switch (alt27) {
+            	case 1 :
+            	    // org/alfresco/rest/antlr/WhereClause.g:
+            	    {
+            	    if ( (input.LA(1) >= '\t' && input.LA(1) <= '\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
+            	        input.consume();
+            	    }
+            	    else {
+            	        MismatchedSetException mse = new MismatchedSetException(null,input);
+            	        recover(mse);
+            	        throw mse;
+            	    }
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    if ( cnt27 >= 1 ) break loop27;
+                        EarlyExitException eee =
+                            new EarlyExitException(27, input);
+                        throw eee;
+                }
+                cnt27++;
+            } while (true);
+
+
+             _channel = HIDDEN; 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "WS"
+
+    // $ANTLR start "IDENTIFIERLETTER"
+    public final void mIDENTIFIERLETTER() throws RecognitionException {
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:96:5: ( '\\u0041' .. '\\u005a' | '\\u005f' | '\\u0061' .. '\\u007a' | '\\u00c0' .. '\\u00d6' | '\\u00d8' .. '\\u00f6' | '\\u00f8' .. '\\u00ff' | '\\u0100' .. '\\u1fff' | '\\u3040' .. '\\u318f' | '\\u3300' .. '\\u337f' | '\\u3400' .. '\\u3d2d' | '\\u4e00' .. '\\u9fff' | '\\uf900' .. '\\ufaff' )
+            // org/alfresco/rest/antlr/WhereClause.g:
+            {
+            if ( (input.LA(1) >= 'A' && input.LA(1) <= 'Z')||input.LA(1)=='_'||(input.LA(1) >= 'a' && input.LA(1) <= 'z')||(input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')||(input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00F6')||(input.LA(1) >= '\u00F8' && input.LA(1) <= '\u1FFF')||(input.LA(1) >= '\u3040' && input.LA(1) <= '\u318F')||(input.LA(1) >= '\u3300' && input.LA(1) <= '\u337F')||(input.LA(1) >= '\u3400' && input.LA(1) <= '\u3D2D')||(input.LA(1) >= '\u4E00' && input.LA(1) <= '\u9FFF')||(input.LA(1) >= '\uF900' && input.LA(1) <= '\uFAFF') ) {
+                input.consume();
+            }
+            else {
+                MismatchedSetException mse = new MismatchedSetException(null,input);
+                recover(mse);
+                throw mse;
+            }
+
+
+            }
+
+
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "IDENTIFIERLETTER"
+
+    // $ANTLR start "IDENTIFIERDIGIT"
+    public final void mIDENTIFIERDIGIT() throws RecognitionException {
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:110:5: ( '\\u0030' .. '\\u0039' | '\\u0660' .. '\\u0669' | '\\u06f0' .. '\\u06f9' | '\\u0966' .. '\\u096f' | '\\u09e6' .. '\\u09ef' | '\\u0a66' .. '\\u0a6f' | '\\u0ae6' .. '\\u0aef' | '\\u0b66' .. '\\u0b6f' | '\\u0be7' .. '\\u0bef' | '\\u0c66' .. '\\u0c6f' | '\\u0ce6' .. '\\u0cef' | '\\u0d66' .. '\\u0d6f' | '\\u0e50' .. '\\u0e59' | '\\u0ed0' .. '\\u0ed9' | '\\u1040' .. '\\u1049' )
+            // org/alfresco/rest/antlr/WhereClause.g:
+            {
+            if ( (input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= '\u0660' && input.LA(1) <= '\u0669')||(input.LA(1) >= '\u06F0' && input.LA(1) <= '\u06F9')||(input.LA(1) >= '\u0966' && input.LA(1) <= '\u096F')||(input.LA(1) >= '\u09E6' && input.LA(1) <= '\u09EF')||(input.LA(1) >= '\u0A66' && input.LA(1) <= '\u0A6F')||(input.LA(1) >= '\u0AE6' && input.LA(1) <= '\u0AEF')||(input.LA(1) >= '\u0B66' && input.LA(1) <= '\u0B6F')||(input.LA(1) >= '\u0BE7' && input.LA(1) <= '\u0BEF')||(input.LA(1) >= '\u0C66' && input.LA(1) <= '\u0C6F')||(input.LA(1) >= '\u0CE6' && input.LA(1) <= '\u0CEF')||(input.LA(1) >= '\u0D66' && input.LA(1) <= '\u0D6F')||(input.LA(1) >= '\u0E50' && input.LA(1) <= '\u0E59')||(input.LA(1) >= '\u0ED0' && input.LA(1) <= '\u0ED9')||(input.LA(1) >= '\u1040' && input.LA(1) <= '\u1049') ) {
+                input.consume();
+            }
+            else {
+                MismatchedSetException mse = new MismatchedSetException(null,input);
+                recover(mse);
+                throw mse;
+            }
+
+
+            }
+
+
+        }
+        finally {
+        	// do for sure before leaving
+        }
+    }
+    // $ANTLR end "IDENTIFIERDIGIT"
+
+    public void mTokens() throws RecognitionException {
+        // org/alfresco/rest/antlr/WhereClause.g:1:8: ( NEGATION | EXISTS | IN | MATCHES | BETWEEN | OR | AND | EQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS | LEFTPAREN | RIGHTPAREN | COMMA | COLON | SINGLEQUOTE | PROPERTYVALUE | PROPERTYNAME | WS )
+        int alt28=20;
+        alt28 = dfa28.predict(input);
+        switch (alt28) {
+            case 1 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:10: NEGATION
+                {
+                mNEGATION(); 
+
+
+                }
+                break;
+            case 2 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:19: EXISTS
+                {
+                mEXISTS(); 
+
+
+                }
+                break;
+            case 3 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:26: IN
+                {
+                mIN(); 
+
+
+                }
+                break;
+            case 4 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:29: MATCHES
+                {
+                mMATCHES(); 
+
+
+                }
+                break;
+            case 5 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:37: BETWEEN
+                {
+                mBETWEEN(); 
+
+
+                }
+                break;
+            case 6 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:45: OR
+                {
+                mOR(); 
+
+
+                }
+                break;
+            case 7 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:48: AND
+                {
+                mAND(); 
+
+
+                }
+                break;
+            case 8 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:52: EQUALS
+                {
+                mEQUALS(); 
+
+
+                }
+                break;
+            case 9 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:59: LESSTHAN
+                {
+                mLESSTHAN(); 
+
+
+                }
+                break;
+            case 10 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:68: GREATERTHAN
+                {
+                mGREATERTHAN(); 
+
+
+                }
+                break;
+            case 11 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:80: LESSTHANOREQUALS
+                {
+                mLESSTHANOREQUALS(); 
+
+
+                }
+                break;
+            case 12 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:97: GREATERTHANOREQUALS
+                {
+                mGREATERTHANOREQUALS(); 
+
+
+                }
+                break;
+            case 13 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:117: LEFTPAREN
+                {
+                mLEFTPAREN(); 
+
+
+                }
+                break;
+            case 14 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:127: RIGHTPAREN
+                {
+                mRIGHTPAREN(); 
+
+
+                }
+                break;
+            case 15 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:138: COMMA
+                {
+                mCOMMA(); 
+
+
+                }
+                break;
+            case 16 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:144: COLON
+                {
+                mCOLON(); 
+
+
+                }
+                break;
+            case 17 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:150: SINGLEQUOTE
+                {
+                mSINGLEQUOTE(); 
+
+
+                }
+                break;
+            case 18 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:162: PROPERTYVALUE
+                {
+                mPROPERTYVALUE(); 
+
+
+                }
+                break;
+            case 19 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:176: PROPERTYNAME
+                {
+                mPROPERTYNAME(); 
+
+
+                }
+                break;
+            case 20 :
+                // org/alfresco/rest/antlr/WhereClause.g:1:189: WS
+                {
+                mWS(); 
+
+
+                }
+                break;
+
+        }
+
+    }
+
+
+    protected DFA26 dfa26 = new DFA26(this);
+    protected DFA28 dfa28 = new DFA28(this);
+    static final String DFA26_eotS =
+        "\2\2\2\uffff";
+    static final String DFA26_eofS =
+        "\4\uffff";
+    static final String DFA26_minS =
+        "\2\60\2\uffff";
+    static final String DFA26_maxS =
+        "\2\ufaff\2\uffff";
+    static final String DFA26_acceptS =
+        "\2\uffff\1\1\1\2";
+    static final String DFA26_specialS =
+        "\4\uffff}>";
+    static final String[] DFA26_transitionS = {
+            "\12\1\1\3\6\uffff\32\1\4\uffff\1\1\1\uffff\32\1\105\uffff\27"+
+            "\1\1\uffff\37\1\1\uffff\u1f08\1\u1040\uffff\u0150\1\u0170\uffff"+
+            "\u0080\1\u0080\uffff\u092e\1\u10d2\uffff\u5200\1\u5900\uffff"+
+            "\u0200\1",
+            "\12\1\1\3\6\uffff\32\1\4\uffff\1\1\1\uffff\32\1\105\uffff\27"+
+            "\1\1\uffff\37\1\1\uffff\u1f08\1\u1040\uffff\u0150\1\u0170\uffff"+
+            "\u0080\1\u0080\uffff\u092e\1\u10d2\uffff\u5200\1\u5900\uffff"+
+            "\u0200\1",
+            "",
+            ""
+    };
+
+    static final short[] DFA26_eot = DFA.unpackEncodedString(DFA26_eotS);
+    static final short[] DFA26_eof = DFA.unpackEncodedString(DFA26_eofS);
+    static final char[] DFA26_min = DFA.unpackEncodedStringToUnsignedChars(DFA26_minS);
+    static final char[] DFA26_max = DFA.unpackEncodedStringToUnsignedChars(DFA26_maxS);
+    static final short[] DFA26_accept = DFA.unpackEncodedString(DFA26_acceptS);
+    static final short[] DFA26_special = DFA.unpackEncodedString(DFA26_specialS);
+    static final short[][] DFA26_transition;
+
+    static {
+        int numStates = DFA26_transitionS.length;
+        DFA26_transition = new short[numStates][];
+        for (int i=0; i<numStates; i++) {
+            DFA26_transition[i] = DFA.unpackEncodedString(DFA26_transitionS[i]);
+        }
+    }
+
+    class DFA26 extends DFA {
+
+        public DFA26(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 26;
+            this.eot = DFA26_eot;
+            this.eof = DFA26_eof;
+            this.min = DFA26_min;
+            this.max = DFA26_max;
+            this.accept = DFA26_accept;
+            this.special = DFA26_special;
+            this.transition = DFA26_transition;
+        }
+        public String getDescription() {
+            return "92:41: ( ( IDENTIFIERLETTERORDIGIT )* | ( ( IDENTIFIERLETTERORDIGIT )* COLON ( IDENTIFIERLETTERORDIGIT )* ) )";
+        }
+    }
+    static final String DFA28_eotS =
+        "\1\uffff\4\17\1\25\1\uffff\1\34\1\36\4\uffff\1\37\1\20\2\uffff\4"+
+        "\17\13\uffff\1\20\4\17\1\uffff\4\17\2\54\1\uffff";
+    static final String DFA28_eofS =
+        "\55\uffff";
+    static final String DFA28_minS =
+        "\1\11\1\157\1\117\1\170\1\130\1\11\1\uffff\2\75\4\uffff\1\0\1\57"+
+        "\2\uffff\1\164\1\124\1\151\1\111\13\uffff\1\57\2\11\1\163\1\123"+
+        "\1\uffff\1\164\1\124\1\163\1\123\2\57\1\uffff";
+    static final String DFA28_maxS =
+        "\1\ufaff\1\157\1\117\1\170\1\130\1\157\1\uffff\2\75\4\uffff\1\uffff"+
+        "\1\ufaff\2\uffff\1\164\1\124\1\151\1\111\13\uffff\1\ufaff\2\40\1"+
+        "\163\1\123\1\uffff\1\164\1\124\1\163\1\123\2\ufaff\1\uffff";
+    static final String DFA28_acceptS =
+        "\6\uffff\1\10\2\uffff\1\15\1\16\1\17\1\20\2\uffff\1\23\1\22\4\uffff"+
+        "\1\24\1\3\1\4\1\5\1\6\1\7\1\13\1\11\1\14\1\12\1\21\5\uffff\1\1\6"+
+        "\uffff\1\2";
+    static final String DFA28_specialS =
+        "\15\uffff\1\0\37\uffff}>";
+    static final String[] DFA28_transitionS = {
+            "\2\5\2\uffff\1\5\22\uffff\1\5\6\uffff\1\15\1\11\1\12\2\uffff"+
+            "\1\13\2\uffff\1\17\12\20\1\14\1\uffff\1\7\1\6\1\10\2\uffff\4"+
+            "\17\1\4\10\17\1\2\14\17\4\uffff\1\17\1\uffff\4\17\1\3\10\17"+
+            "\1\1\14\17\105\uffff\27\17\1\uffff\37\17\1\uffff\u0568\17\12"+
+            "\16\u0086\17\12\16\u026c\17\12\16\166\17\12\16\166\17\12\16"+
+            "\166\17\12\16\166\17\12\16\167\17\11\16\166\17\12\16\166\17"+
+            "\12\16\166\17\12\16\u00e0\17\12\16\166\17\12\16\u0166\17\12"+
+            "\16\u0fb6\17\u1040\uffff\u0150\17\u0170\uffff\u0080\17\u0080"+
+            "\uffff\u092e\17\u10d2\uffff\u5200\17\u5900\uffff\u0200\17",
+            "\1\21",
+            "\1\22",
+            "\1\23",
+            "\1\24",
+            "\2\5\2\uffff\1\5\22\uffff\1\5\33\uffff\1\7\1\6\1\10\2\uffff"+
+            "\1\32\1\30\6\uffff\1\26\3\uffff\1\27\1\uffff\1\31\21\uffff\1"+
+            "\32\1\30\6\uffff\1\26\3\uffff\1\27\1\uffff\1\31",
+            "",
+            "\1\33",
+            "\1\35",
+            "",
+            "",
+            "",
+            "",
+            "\0\20",
+            "\1\17\12\40\1\17\6\uffff\32\17\4\uffff\1\17\1\uffff\32\17\105"+
+            "\uffff\27\17\1\uffff\37\17\1\uffff\u0568\17\12\40\u0086\17\12"+
+            "\40\u026c\17\12\40\166\17\12\40\166\17\12\40\166\17\12\40\166"+
+            "\17\12\40\167\17\11\40\166\17\12\40\166\17\12\40\166\17\12\40"+
+            "\u00e0\17\12\40\166\17\12\40\u0166\17\12\40\u0fb6\17\u1040\uffff"+
+            "\u0150\17\u0170\uffff\u0080\17\u0080\uffff\u092e\17\u10d2\uffff"+
+            "\u5200\17\u5900\uffff\u0200\17",
+            "",
+            "",
+            "\1\41",
+            "\1\42",
+            "\1\43",
+            "\1\44",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "\1\17\12\40\1\17\6\uffff\32\17\4\uffff\1\17\1\uffff\32\17\105"+
+            "\uffff\27\17\1\uffff\37\17\1\uffff\u0568\17\12\40\u0086\17\12"+
+            "\40\u026c\17\12\40\166\17\12\40\166\17\12\40\166\17\12\40\166"+
+            "\17\12\40\167\17\11\40\166\17\12\40\166\17\12\40\166\17\12\40"+
+            "\u00e0\17\12\40\166\17\12\40\u0166\17\12\40\u0fb6\17\u1040\uffff"+
+            "\u0150\17\u0170\uffff\u0080\17\u0080\uffff\u092e\17\u10d2\uffff"+
+            "\u5200\17\u5900\uffff\u0200\17",
+            "\2\45\2\uffff\1\45\22\uffff\1\45",
+            "\2\45\2\uffff\1\45\22\uffff\1\45",
+            "\1\46",
+            "\1\47",
+            "",
+            "\1\50",
+            "\1\51",
+            "\1\52",
+            "\1\53",
+            "\14\17\6\uffff\32\17\4\uffff\1\17\1\uffff\32\17\105\uffff\27"+
+            "\17\1\uffff\37\17\1\uffff\u1f08\17\u1040\uffff\u0150\17\u0170"+
+            "\uffff\u0080\17\u0080\uffff\u092e\17\u10d2\uffff\u5200\17\u5900"+
+            "\uffff\u0200\17",
+            "\14\17\6\uffff\32\17\4\uffff\1\17\1\uffff\32\17\105\uffff\27"+
+            "\17\1\uffff\37\17\1\uffff\u1f08\17\u1040\uffff\u0150\17\u0170"+
+            "\uffff\u0080\17\u0080\uffff\u092e\17\u10d2\uffff\u5200\17\u5900"+
+            "\uffff\u0200\17",
+            ""
+    };
+
+    static final short[] DFA28_eot = DFA.unpackEncodedString(DFA28_eotS);
+    static final short[] DFA28_eof = DFA.unpackEncodedString(DFA28_eofS);
+    static final char[] DFA28_min = DFA.unpackEncodedStringToUnsignedChars(DFA28_minS);
+    static final char[] DFA28_max = DFA.unpackEncodedStringToUnsignedChars(DFA28_maxS);
+    static final short[] DFA28_accept = DFA.unpackEncodedString(DFA28_acceptS);
+    static final short[] DFA28_special = DFA.unpackEncodedString(DFA28_specialS);
+    static final short[][] DFA28_transition;
+
+    static {
+        int numStates = DFA28_transitionS.length;
+        DFA28_transition = new short[numStates][];
+        for (int i=0; i<numStates; i++) {
+            DFA28_transition[i] = DFA.unpackEncodedString(DFA28_transitionS[i]);
+        }
+    }
+
+    class DFA28 extends DFA {
+
+        public DFA28(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 28;
+            this.eot = DFA28_eot;
+            this.eof = DFA28_eof;
+            this.min = DFA28_min;
+            this.max = DFA28_max;
+            this.accept = DFA28_accept;
+            this.special = DFA28_special;
+            this.transition = DFA28_transition;
+        }
+        public String getDescription() {
+            return "1:1: Tokens : ( NEGATION | EXISTS | IN | MATCHES | BETWEEN | OR | AND | EQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS | LEFTPAREN | RIGHTPAREN | COMMA | COLON | SINGLEQUOTE | PROPERTYVALUE | PROPERTYNAME | WS );";
+        }
+        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
+            IntStream input = _input;
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA28_13 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA28_13 >= '\u0000' && LA28_13 <= '\uFFFF')) ) {s = 16;}
+
+                        else s = 31;
+
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 28, _s, input);
+            error(nvae);
+            throw nvae;
+        }
+
+    }
+ 
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/generated/org/alfresco/rest/antlr/WhereClauseParser.java b/remote-api/src/main/generated/org/alfresco/rest/antlr/WhereClauseParser.java
new file mode 100644
index 00000000000..36ec9f85bad
--- /dev/null
+++ b/remote-api/src/main/generated/org/alfresco/rest/antlr/WhereClauseParser.java
@@ -0,0 +1,2216 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+// $ANTLR 3.4 org/alfresco/rest/antlr/WhereClause.g 2013-05-24 09:01:14
+
+package org.alfresco.rest.antlr;
+import org.alfresco.rest.framework.resource.parameters.where.InvalidQueryException;
+
+
+import org.antlr.runtime.*;
+import java.util.Stack;
+import java.util.List;
+import java.util.ArrayList;
+
+import org.antlr.runtime.tree.*;
+
+
+@SuppressWarnings({"all", "warnings", "unchecked"})
+public class WhereClauseParser extends Parser {
+    public static final String[] tokenNames = new String[] {
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "AND", "BETWEEN", "COLON", "COMMA", "EQUALS", "EXISTS", "GREATERTHAN", "GREATERTHANOREQUALS", "IDENTIFIER", "IDENTIFIERDIGIT", "IDENTIFIERLETTER", "IDENTIFIERLETTERORDIGIT", "IN", "LEFTPAREN", "LESSTHAN", "LESSTHANOREQUALS", "MATCHES", "NEGATION", "OR", "PROPERTYNAME", "PROPERTYVALUE", "RIGHTPAREN", "SINGLEQUOTE", "WS"
+    };
+
+    public static final int EOF=-1;
+    public static final int AND=4;
+    public static final int BETWEEN=5;
+    public static final int COLON=6;
+    public static final int COMMA=7;
+    public static final int EQUALS=8;
+    public static final int EXISTS=9;
+    public static final int GREATERTHAN=10;
+    public static final int GREATERTHANOREQUALS=11;
+    public static final int IDENTIFIER=12;
+    public static final int IDENTIFIERDIGIT=13;
+    public static final int IDENTIFIERLETTER=14;
+    public static final int IDENTIFIERLETTERORDIGIT=15;
+    public static final int IN=16;
+    public static final int LEFTPAREN=17;
+    public static final int LESSTHAN=18;
+    public static final int LESSTHANOREQUALS=19;
+    public static final int MATCHES=20;
+    public static final int NEGATION=21;
+    public static final int OR=22;
+    public static final int PROPERTYNAME=23;
+    public static final int PROPERTYVALUE=24;
+    public static final int RIGHTPAREN=25;
+    public static final int SINGLEQUOTE=26;
+    public static final int WS=27;
+
+    // delegates
+    public Parser[] getDelegates() {
+        return new Parser[] {};
+    }
+
+    // delegators
+
+
+    public WhereClauseParser(TokenStream input) {
+        this(input, new RecognizerSharedState());
+    }
+    public WhereClauseParser(TokenStream input, RecognizerSharedState state) {
+        super(input, state);
+    }
+
+protected TreeAdaptor adaptor = new CommonTreeAdaptor();
+
+public void setTreeAdaptor(TreeAdaptor adaptor) {
+    this.adaptor = adaptor;
+}
+public TreeAdaptor getTreeAdaptor() {
+    return adaptor;
+}
+    public String[] getTokenNames() { return WhereClauseParser.tokenNames; }
+    public String getGrammarFileName() { return "org/alfresco/rest/antlr/WhereClause.g"; }
+
+
+       
+      // These methods are here to force the parser to error instead of suppressing problems.
+    //	  @Override
+    //	  public void reportError(RecognitionException e) {
+    //      System.out.println("CUSTOM ERROR...\n" + e);
+    //      throw new InvalidQueryException(e.getMessage());
+    //	  }
+
+        @Override
+        protected Object recoverFromMismatchedToken(IntStream input, int ttype, BitSet follow) throws RecognitionException
+        {
+            throw new MismatchedTokenException(ttype, input);
+        }
+            
+        @Override
+        public Object recoverFromMismatchedSet(IntStream input, RecognitionException e, BitSet follow) throws RecognitionException
+        {
+            throw e;
+        }
+    //    
+    //    @Override
+    //    public String getErrorMessage(RecognitionException e, String[] tokenNames) 
+    //    {
+    //      System.out.println("THROW ME...\n" + e);
+    //      throw new InvalidQueryException(e.getMessage());
+    //    }
+    // End of methods here to force the parser to error instead of supressing problems.
+
+
+    public static class whereclause_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+
+    // $ANTLR start "whereclause"
+    // org/alfresco/rest/antlr/WhereClause.g:128:1: whereclause : ( WS )? LEFTPAREN ! ( WS )? predicate RIGHTPAREN ! ( WS )? ;
+    public final WhereClauseParser.whereclause_return whereclause() throws RecognitionException {
+        WhereClauseParser.whereclause_return retval = new WhereClauseParser.whereclause_return();
+        retval.start = input.LT(1);
+
+
+        Object root_0 = null;
+
+        Token WS1=null;
+        Token LEFTPAREN2=null;
+        Token WS3=null;
+        Token RIGHTPAREN5=null;
+        Token WS6=null;
+        WhereClauseParser.predicate_return predicate4 =null;
+
+
+        Object WS1_tree=null;
+        Object LEFTPAREN2_tree=null;
+        Object WS3_tree=null;
+        Object RIGHTPAREN5_tree=null;
+        Object WS6_tree=null;
+
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:128:13: ( ( WS )? LEFTPAREN ! ( WS )? predicate RIGHTPAREN ! ( WS )? )
+            // org/alfresco/rest/antlr/WhereClause.g:128:15: ( WS )? LEFTPAREN ! ( WS )? predicate RIGHTPAREN ! ( WS )?
+            {
+            root_0 = (Object)adaptor.nil();
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:128:15: ( WS )?
+            int alt1=2;
+            int LA1_0 = input.LA(1);
+
+            if ( (LA1_0==WS) ) {
+                alt1=1;
+            }
+            switch (alt1) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:128:15: WS
+                    {
+                    WS1=(Token)match(input,WS,FOLLOW_WS_in_whereclause779); 
+                    WS1_tree = 
+                    (Object)adaptor.create(WS1)
+                    ;
+                    adaptor.addChild(root_0, WS1_tree);
+
+
+                    }
+                    break;
+
+            }
+
+
+            LEFTPAREN2=(Token)match(input,LEFTPAREN,FOLLOW_LEFTPAREN_in_whereclause782); 
+
+            // org/alfresco/rest/antlr/WhereClause.g:128:30: ( WS )?
+            int alt2=2;
+            int LA2_0 = input.LA(1);
+
+            if ( (LA2_0==WS) ) {
+                alt2=1;
+            }
+            switch (alt2) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:128:30: WS
+                    {
+                    WS3=(Token)match(input,WS,FOLLOW_WS_in_whereclause785); 
+                    WS3_tree = 
+                    (Object)adaptor.create(WS3)
+                    ;
+                    adaptor.addChild(root_0, WS3_tree);
+
+
+                    }
+                    break;
+
+            }
+
+
+            pushFollow(FOLLOW_predicate_in_whereclause788);
+            predicate4=predicate();
+
+            state._fsp--;
+
+            adaptor.addChild(root_0, predicate4.getTree());
+
+            RIGHTPAREN5=(Token)match(input,RIGHTPAREN,FOLLOW_RIGHTPAREN_in_whereclause790); 
+
+            // org/alfresco/rest/antlr/WhereClause.g:128:56: ( WS )?
+            int alt3=2;
+            int LA3_0 = input.LA(1);
+
+            if ( (LA3_0==WS) ) {
+                alt3=1;
+            }
+            switch (alt3) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:128:56: WS
+                    {
+                    WS6=(Token)match(input,WS,FOLLOW_WS_in_whereclause793); 
+                    WS6_tree = 
+                    (Object)adaptor.create(WS6)
+                    ;
+                    adaptor.addChild(root_0, WS6_tree);
+
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+            retval.stop = input.LT(-1);
+
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+        }
+
+        catch(RecognitionException e)
+        {
+           throw e;
+        }
+
+        finally {
+        	// do for sure before leaving
+        }
+        return retval;
+    }
+    // $ANTLR end "whereclause"
+
+
+    public static class predicate_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+
+    // $ANTLR start "predicate"
+    // org/alfresco/rest/antlr/WhereClause.g:129:1: predicate : ( simplepredicate | simplepredicate ( AND simplepredicate )+ -> ^( AND ( simplepredicate )+ ) | simplepredicate ( OR simplepredicate )+ -> ^( OR ( simplepredicate )+ ) );
+    public final WhereClauseParser.predicate_return predicate() throws RecognitionException {
+        WhereClauseParser.predicate_return retval = new WhereClauseParser.predicate_return();
+        retval.start = input.LT(1);
+
+
+        Object root_0 = null;
+
+        Token AND9=null;
+        Token OR12=null;
+        WhereClauseParser.simplepredicate_return simplepredicate7 =null;
+
+        WhereClauseParser.simplepredicate_return simplepredicate8 =null;
+
+        WhereClauseParser.simplepredicate_return simplepredicate10 =null;
+
+        WhereClauseParser.simplepredicate_return simplepredicate11 =null;
+
+        WhereClauseParser.simplepredicate_return simplepredicate13 =null;
+
+
+        Object AND9_tree=null;
+        Object OR12_tree=null;
+        RewriteRuleTokenStream stream_OR=new RewriteRuleTokenStream(adaptor,"token OR");
+        RewriteRuleTokenStream stream_AND=new RewriteRuleTokenStream(adaptor,"token AND");
+        RewriteRuleSubtreeStream stream_simplepredicate=new RewriteRuleSubtreeStream(adaptor,"rule simplepredicate");
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:129:11: ( simplepredicate | simplepredicate ( AND simplepredicate )+ -> ^( AND ( simplepredicate )+ ) | simplepredicate ( OR simplepredicate )+ -> ^( OR ( simplepredicate )+ ) )
+            int alt6=3;
+            alt6 = dfa6.predict(input);
+            switch (alt6) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:129:13: simplepredicate
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+
+                    pushFollow(FOLLOW_simplepredicate_in_predicate801);
+                    simplepredicate7=simplepredicate();
+
+                    state._fsp--;
+
+                    adaptor.addChild(root_0, simplepredicate7.getTree());
+
+                    }
+                    break;
+                case 2 :
+                    // org/alfresco/rest/antlr/WhereClause.g:130:13: simplepredicate ( AND simplepredicate )+
+                    {
+                    pushFollow(FOLLOW_simplepredicate_in_predicate815);
+                    simplepredicate8=simplepredicate();
+
+                    state._fsp--;
+
+                    stream_simplepredicate.add(simplepredicate8.getTree());
+
+                    // org/alfresco/rest/antlr/WhereClause.g:130:29: ( AND simplepredicate )+
+                    int cnt4=0;
+                    loop4:
+                    do {
+                        int alt4=2;
+                        int LA4_0 = input.LA(1);
+
+                        if ( (LA4_0==AND) ) {
+                            alt4=1;
+                        }
+
+
+                        switch (alt4) {
+                    	case 1 :
+                    	    // org/alfresco/rest/antlr/WhereClause.g:130:30: AND simplepredicate
+                    	    {
+                    	    AND9=(Token)match(input,AND,FOLLOW_AND_in_predicate818);  
+                    	    stream_AND.add(AND9);
+
+
+                    	    pushFollow(FOLLOW_simplepredicate_in_predicate820);
+                    	    simplepredicate10=simplepredicate();
+
+                    	    state._fsp--;
+
+                    	    stream_simplepredicate.add(simplepredicate10.getTree());
+
+                    	    }
+                    	    break;
+
+                    	default :
+                    	    if ( cnt4 >= 1 ) break loop4;
+                                EarlyExitException eee =
+                                    new EarlyExitException(4, input);
+                                throw eee;
+                        }
+                        cnt4++;
+                    } while (true);
+
+
+                    // AST REWRITE
+                    // elements: AND, simplepredicate
+                    // token labels: 
+                    // rule labels: retval
+                    // token list labels: 
+                    // rule list labels: 
+                    // wildcard labels: 
+                    retval.tree = root_0;
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+                    root_0 = (Object)adaptor.nil();
+                    // 130:52: -> ^( AND ( simplepredicate )+ )
+                    {
+                        // org/alfresco/rest/antlr/WhereClause.g:130:55: ^( AND ( simplepredicate )+ )
+                        {
+                        Object root_1 = (Object)adaptor.nil();
+                        root_1 = (Object)adaptor.becomeRoot(
+                        stream_AND.nextNode()
+                        , root_1);
+
+                        if ( !(stream_simplepredicate.hasNext()) ) {
+                            throw new RewriteEarlyExitException();
+                        }
+                        while ( stream_simplepredicate.hasNext() ) {
+                            adaptor.addChild(root_1, stream_simplepredicate.nextTree());
+
+                        }
+                        stream_simplepredicate.reset();
+
+                        adaptor.addChild(root_0, root_1);
+                        }
+
+                    }
+
+
+                    retval.tree = root_0;
+
+                    }
+                    break;
+                case 3 :
+                    // org/alfresco/rest/antlr/WhereClause.g:131:13: simplepredicate ( OR simplepredicate )+
+                    {
+                    pushFollow(FOLLOW_simplepredicate_in_predicate845);
+                    simplepredicate11=simplepredicate();
+
+                    state._fsp--;
+
+                    stream_simplepredicate.add(simplepredicate11.getTree());
+
+                    // org/alfresco/rest/antlr/WhereClause.g:131:29: ( OR simplepredicate )+
+                    int cnt5=0;
+                    loop5:
+                    do {
+                        int alt5=2;
+                        int LA5_0 = input.LA(1);
+
+                        if ( (LA5_0==OR) ) {
+                            alt5=1;
+                        }
+
+
+                        switch (alt5) {
+                    	case 1 :
+                    	    // org/alfresco/rest/antlr/WhereClause.g:131:30: OR simplepredicate
+                    	    {
+                    	    OR12=(Token)match(input,OR,FOLLOW_OR_in_predicate848);  
+                    	    stream_OR.add(OR12);
+
+
+                    	    pushFollow(FOLLOW_simplepredicate_in_predicate850);
+                    	    simplepredicate13=simplepredicate();
+
+                    	    state._fsp--;
+
+                    	    stream_simplepredicate.add(simplepredicate13.getTree());
+
+                    	    }
+                    	    break;
+
+                    	default :
+                    	    if ( cnt5 >= 1 ) break loop5;
+                                EarlyExitException eee =
+                                    new EarlyExitException(5, input);
+                                throw eee;
+                        }
+                        cnt5++;
+                    } while (true);
+
+
+                    // AST REWRITE
+                    // elements: simplepredicate, OR
+                    // token labels: 
+                    // rule labels: retval
+                    // token list labels: 
+                    // rule list labels: 
+                    // wildcard labels: 
+                    retval.tree = root_0;
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+                    root_0 = (Object)adaptor.nil();
+                    // 131:51: -> ^( OR ( simplepredicate )+ )
+                    {
+                        // org/alfresco/rest/antlr/WhereClause.g:131:54: ^( OR ( simplepredicate )+ )
+                        {
+                        Object root_1 = (Object)adaptor.nil();
+                        root_1 = (Object)adaptor.becomeRoot(
+                        stream_OR.nextNode()
+                        , root_1);
+
+                        if ( !(stream_simplepredicate.hasNext()) ) {
+                            throw new RewriteEarlyExitException();
+                        }
+                        while ( stream_simplepredicate.hasNext() ) {
+                            adaptor.addChild(root_1, stream_simplepredicate.nextTree());
+
+                        }
+                        stream_simplepredicate.reset();
+
+                        adaptor.addChild(root_0, root_1);
+                        }
+
+                    }
+
+
+                    retval.tree = root_0;
+
+                    }
+                    break;
+
+            }
+            retval.stop = input.LT(-1);
+
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+        }
+
+        catch(RecognitionException e)
+        {
+           throw e;
+        }
+
+        finally {
+        	// do for sure before leaving
+        }
+        return retval;
+    }
+    // $ANTLR end "predicate"
+
+
+    public static class simplepredicate_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+
+    // $ANTLR start "simplepredicate"
+    // org/alfresco/rest/antlr/WhereClause.g:132:1: simplepredicate : ( allowedpredicates -> allowedpredicates | NEGATION allowedpredicates -> ^( NEGATION allowedpredicates ) );
+    public final WhereClauseParser.simplepredicate_return simplepredicate() throws RecognitionException {
+        WhereClauseParser.simplepredicate_return retval = new WhereClauseParser.simplepredicate_return();
+        retval.start = input.LT(1);
+
+
+        Object root_0 = null;
+
+        Token NEGATION15=null;
+        WhereClauseParser.allowedpredicates_return allowedpredicates14 =null;
+
+        WhereClauseParser.allowedpredicates_return allowedpredicates16 =null;
+
+
+        Object NEGATION15_tree=null;
+        RewriteRuleTokenStream stream_NEGATION=new RewriteRuleTokenStream(adaptor,"token NEGATION");
+        RewriteRuleSubtreeStream stream_allowedpredicates=new RewriteRuleSubtreeStream(adaptor,"rule allowedpredicates");
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:132:17: ( allowedpredicates -> allowedpredicates | NEGATION allowedpredicates -> ^( NEGATION allowedpredicates ) )
+            int alt7=2;
+            int LA7_0 = input.LA(1);
+
+            if ( (LA7_0==EXISTS||LA7_0==PROPERTYNAME) ) {
+                alt7=1;
+            }
+            else if ( (LA7_0==NEGATION) ) {
+                alt7=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 7, 0, input);
+
+                throw nvae;
+
+            }
+            switch (alt7) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:132:19: allowedpredicates
+                    {
+                    pushFollow(FOLLOW_allowedpredicates_in_simplepredicate868);
+                    allowedpredicates14=allowedpredicates();
+
+                    state._fsp--;
+
+                    stream_allowedpredicates.add(allowedpredicates14.getTree());
+
+                    // AST REWRITE
+                    // elements: allowedpredicates
+                    // token labels: 
+                    // rule labels: retval
+                    // token list labels: 
+                    // rule list labels: 
+                    // wildcard labels: 
+                    retval.tree = root_0;
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+                    root_0 = (Object)adaptor.nil();
+                    // 132:37: -> allowedpredicates
+                    {
+                        adaptor.addChild(root_0, stream_allowedpredicates.nextTree());
+
+                    }
+
+
+                    retval.tree = root_0;
+
+                    }
+                    break;
+                case 2 :
+                    // org/alfresco/rest/antlr/WhereClause.g:133:19: NEGATION allowedpredicates
+                    {
+                    NEGATION15=(Token)match(input,NEGATION,FOLLOW_NEGATION_in_simplepredicate892);  
+                    stream_NEGATION.add(NEGATION15);
+
+
+                    pushFollow(FOLLOW_allowedpredicates_in_simplepredicate894);
+                    allowedpredicates16=allowedpredicates();
+
+                    state._fsp--;
+
+                    stream_allowedpredicates.add(allowedpredicates16.getTree());
+
+                    // AST REWRITE
+                    // elements: NEGATION, allowedpredicates
+                    // token labels: 
+                    // rule labels: retval
+                    // token list labels: 
+                    // rule list labels: 
+                    // wildcard labels: 
+                    retval.tree = root_0;
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+                    root_0 = (Object)adaptor.nil();
+                    // 133:46: -> ^( NEGATION allowedpredicates )
+                    {
+                        // org/alfresco/rest/antlr/WhereClause.g:133:49: ^( NEGATION allowedpredicates )
+                        {
+                        Object root_1 = (Object)adaptor.nil();
+                        root_1 = (Object)adaptor.becomeRoot(
+                        stream_NEGATION.nextNode()
+                        , root_1);
+
+                        adaptor.addChild(root_1, stream_allowedpredicates.nextTree());
+
+                        adaptor.addChild(root_0, root_1);
+                        }
+
+                    }
+
+
+                    retval.tree = root_0;
+
+                    }
+                    break;
+
+            }
+            retval.stop = input.LT(-1);
+
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+        }
+
+        catch(RecognitionException e)
+        {
+           throw e;
+        }
+
+        finally {
+        	// do for sure before leaving
+        }
+        return retval;
+    }
+    // $ANTLR end "simplepredicate"
+
+
+    public static class allowedpredicates_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+
+    // $ANTLR start "allowedpredicates"
+    // org/alfresco/rest/antlr/WhereClause.g:134:1: allowedpredicates : ( comparisonpredicate | existspredicate | betweenpredicate | inpredicate | matchespredicate );
+    public final WhereClauseParser.allowedpredicates_return allowedpredicates() throws RecognitionException {
+        WhereClauseParser.allowedpredicates_return retval = new WhereClauseParser.allowedpredicates_return();
+        retval.start = input.LT(1);
+
+
+        Object root_0 = null;
+
+        WhereClauseParser.comparisonpredicate_return comparisonpredicate17 =null;
+
+        WhereClauseParser.existspredicate_return existspredicate18 =null;
+
+        WhereClauseParser.betweenpredicate_return betweenpredicate19 =null;
+
+        WhereClauseParser.inpredicate_return inpredicate20 =null;
+
+        WhereClauseParser.matchespredicate_return matchespredicate21 =null;
+
+
+
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:134:19: ( comparisonpredicate | existspredicate | betweenpredicate | inpredicate | matchespredicate )
+            int alt8=5;
+            int LA8_0 = input.LA(1);
+
+            if ( (LA8_0==PROPERTYNAME) ) {
+                switch ( input.LA(2) ) {
+                case BETWEEN:
+                    {
+                    alt8=3;
+                    }
+                    break;
+                case IN:
+                    {
+                    alt8=4;
+                    }
+                    break;
+                case MATCHES:
+                    {
+                    alt8=5;
+                    }
+                    break;
+                case EQUALS:
+                case GREATERTHAN:
+                case GREATERTHANOREQUALS:
+                case LESSTHAN:
+                case LESSTHANOREQUALS:
+                    {
+                    alt8=1;
+                    }
+                    break;
+                default:
+                    NoViableAltException nvae =
+                        new NoViableAltException("", 8, 1, input);
+
+                    throw nvae;
+
+                }
+
+            }
+            else if ( (LA8_0==EXISTS) ) {
+                alt8=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 8, 0, input);
+
+                throw nvae;
+
+            }
+            switch (alt8) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:134:21: comparisonpredicate
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+
+                    pushFollow(FOLLOW_comparisonpredicate_in_allowedpredicates909);
+                    comparisonpredicate17=comparisonpredicate();
+
+                    state._fsp--;
+
+                    adaptor.addChild(root_0, comparisonpredicate17.getTree());
+
+                    }
+                    break;
+                case 2 :
+                    // org/alfresco/rest/antlr/WhereClause.g:134:43: existspredicate
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+
+                    pushFollow(FOLLOW_existspredicate_in_allowedpredicates913);
+                    existspredicate18=existspredicate();
+
+                    state._fsp--;
+
+                    adaptor.addChild(root_0, existspredicate18.getTree());
+
+                    }
+                    break;
+                case 3 :
+                    // org/alfresco/rest/antlr/WhereClause.g:134:61: betweenpredicate
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+
+                    pushFollow(FOLLOW_betweenpredicate_in_allowedpredicates917);
+                    betweenpredicate19=betweenpredicate();
+
+                    state._fsp--;
+
+                    adaptor.addChild(root_0, betweenpredicate19.getTree());
+
+                    }
+                    break;
+                case 4 :
+                    // org/alfresco/rest/antlr/WhereClause.g:134:80: inpredicate
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+
+                    pushFollow(FOLLOW_inpredicate_in_allowedpredicates921);
+                    inpredicate20=inpredicate();
+
+                    state._fsp--;
+
+                    adaptor.addChild(root_0, inpredicate20.getTree());
+
+                    }
+                    break;
+                case 5 :
+                    // org/alfresco/rest/antlr/WhereClause.g:134:94: matchespredicate
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+
+                    pushFollow(FOLLOW_matchespredicate_in_allowedpredicates925);
+                    matchespredicate21=matchespredicate();
+
+                    state._fsp--;
+
+                    adaptor.addChild(root_0, matchespredicate21.getTree());
+
+                    }
+                    break;
+
+            }
+            retval.stop = input.LT(-1);
+
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+        }
+
+        catch(RecognitionException e)
+        {
+           throw e;
+        }
+
+        finally {
+        	// do for sure before leaving
+        }
+        return retval;
+    }
+    // $ANTLR end "allowedpredicates"
+
+
+    public static class comparisonpredicate_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+
+    // $ANTLR start "comparisonpredicate"
+    // org/alfresco/rest/antlr/WhereClause.g:135:1: comparisonpredicate : PROPERTYNAME comparisonoperator value -> ^( comparisonoperator PROPERTYNAME value ) ;
+    public final WhereClauseParser.comparisonpredicate_return comparisonpredicate() throws RecognitionException {
+        WhereClauseParser.comparisonpredicate_return retval = new WhereClauseParser.comparisonpredicate_return();
+        retval.start = input.LT(1);
+
+
+        Object root_0 = null;
+
+        Token PROPERTYNAME22=null;
+        WhereClauseParser.comparisonoperator_return comparisonoperator23 =null;
+
+        WhereClauseParser.value_return value24 =null;
+
+
+        Object PROPERTYNAME22_tree=null;
+        RewriteRuleTokenStream stream_PROPERTYNAME=new RewriteRuleTokenStream(adaptor,"token PROPERTYNAME");
+        RewriteRuleSubtreeStream stream_comparisonoperator=new RewriteRuleSubtreeStream(adaptor,"rule comparisonoperator");
+        RewriteRuleSubtreeStream stream_value=new RewriteRuleSubtreeStream(adaptor,"rule value");
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:135:20: ( PROPERTYNAME comparisonoperator value -> ^( comparisonoperator PROPERTYNAME value ) )
+            // org/alfresco/rest/antlr/WhereClause.g:135:22: PROPERTYNAME comparisonoperator value
+            {
+            PROPERTYNAME22=(Token)match(input,PROPERTYNAME,FOLLOW_PROPERTYNAME_in_comparisonpredicate931);  
+            stream_PROPERTYNAME.add(PROPERTYNAME22);
+
+
+            pushFollow(FOLLOW_comparisonoperator_in_comparisonpredicate933);
+            comparisonoperator23=comparisonoperator();
+
+            state._fsp--;
+
+            stream_comparisonoperator.add(comparisonoperator23.getTree());
+
+            pushFollow(FOLLOW_value_in_comparisonpredicate935);
+            value24=value();
+
+            state._fsp--;
+
+            stream_value.add(value24.getTree());
+
+            // AST REWRITE
+            // elements: value, comparisonoperator, PROPERTYNAME
+            // token labels: 
+            // rule labels: retval
+            // token list labels: 
+            // rule list labels: 
+            // wildcard labels: 
+            retval.tree = root_0;
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+            root_0 = (Object)adaptor.nil();
+            // 135:60: -> ^( comparisonoperator PROPERTYNAME value )
+            {
+                // org/alfresco/rest/antlr/WhereClause.g:135:63: ^( comparisonoperator PROPERTYNAME value )
+                {
+                Object root_1 = (Object)adaptor.nil();
+                root_1 = (Object)adaptor.becomeRoot(stream_comparisonoperator.nextNode(), root_1);
+
+                adaptor.addChild(root_1, 
+                stream_PROPERTYNAME.nextNode()
+                );
+
+                adaptor.addChild(root_1, stream_value.nextTree());
+
+                adaptor.addChild(root_0, root_1);
+                }
+
+            }
+
+
+            retval.tree = root_0;
+
+            }
+
+            retval.stop = input.LT(-1);
+
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+        }
+
+        catch(RecognitionException e)
+        {
+           throw e;
+        }
+
+        finally {
+        	// do for sure before leaving
+        }
+        return retval;
+    }
+    // $ANTLR end "comparisonpredicate"
+
+
+    public static class comparisonoperator_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+
+    // $ANTLR start "comparisonoperator"
+    // org/alfresco/rest/antlr/WhereClause.g:136:1: comparisonoperator : ( EQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS );
+    public final WhereClauseParser.comparisonoperator_return comparisonoperator() throws RecognitionException {
+        WhereClauseParser.comparisonoperator_return retval = new WhereClauseParser.comparisonoperator_return();
+        retval.start = input.LT(1);
+
+
+        Object root_0 = null;
+
+        Token set25=null;
+
+        Object set25_tree=null;
+
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:136:19: ( EQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS )
+            // org/alfresco/rest/antlr/WhereClause.g:
+            {
+            root_0 = (Object)adaptor.nil();
+
+
+            set25=(Token)input.LT(1);
+
+            if ( input.LA(1)==EQUALS||(input.LA(1) >= GREATERTHAN && input.LA(1) <= GREATERTHANOREQUALS)||(input.LA(1) >= LESSTHAN && input.LA(1) <= LESSTHANOREQUALS) ) {
+                input.consume();
+                adaptor.addChild(root_0, 
+                (Object)adaptor.create(set25)
+                );
+                state.errorRecovery=false;
+            }
+            else {
+                MismatchedSetException mse = new MismatchedSetException(null,input);
+                throw mse;
+            }
+
+
+            }
+
+            retval.stop = input.LT(-1);
+
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+        }
+
+        catch(RecognitionException e)
+        {
+           throw e;
+        }
+
+        finally {
+        	// do for sure before leaving
+        }
+        return retval;
+    }
+    // $ANTLR end "comparisonoperator"
+
+
+    public static class existspredicate_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+
+    // $ANTLR start "existspredicate"
+    // org/alfresco/rest/antlr/WhereClause.g:137:1: existspredicate : EXISTS LEFTPAREN ( WS )? PROPERTYNAME RIGHTPAREN -> ^( EXISTS PROPERTYNAME ) ;
+    public final WhereClauseParser.existspredicate_return existspredicate() throws RecognitionException {
+        WhereClauseParser.existspredicate_return retval = new WhereClauseParser.existspredicate_return();
+        retval.start = input.LT(1);
+
+
+        Object root_0 = null;
+
+        Token EXISTS26=null;
+        Token LEFTPAREN27=null;
+        Token WS28=null;
+        Token PROPERTYNAME29=null;
+        Token RIGHTPAREN30=null;
+
+        Object EXISTS26_tree=null;
+        Object LEFTPAREN27_tree=null;
+        Object WS28_tree=null;
+        Object PROPERTYNAME29_tree=null;
+        Object RIGHTPAREN30_tree=null;
+        RewriteRuleTokenStream stream_LEFTPAREN=new RewriteRuleTokenStream(adaptor,"token LEFTPAREN");
+        RewriteRuleTokenStream stream_PROPERTYNAME=new RewriteRuleTokenStream(adaptor,"token PROPERTYNAME");
+        RewriteRuleTokenStream stream_EXISTS=new RewriteRuleTokenStream(adaptor,"token EXISTS");
+        RewriteRuleTokenStream stream_RIGHTPAREN=new RewriteRuleTokenStream(adaptor,"token RIGHTPAREN");
+        RewriteRuleTokenStream stream_WS=new RewriteRuleTokenStream(adaptor,"token WS");
+
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:137:16: ( EXISTS LEFTPAREN ( WS )? PROPERTYNAME RIGHTPAREN -> ^( EXISTS PROPERTYNAME ) )
+            // org/alfresco/rest/antlr/WhereClause.g:137:18: EXISTS LEFTPAREN ( WS )? PROPERTYNAME RIGHTPAREN
+            {
+            EXISTS26=(Token)match(input,EXISTS,FOLLOW_EXISTS_in_existspredicate965);  
+            stream_EXISTS.add(EXISTS26);
+
+
+            LEFTPAREN27=(Token)match(input,LEFTPAREN,FOLLOW_LEFTPAREN_in_existspredicate967);  
+            stream_LEFTPAREN.add(LEFTPAREN27);
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:137:35: ( WS )?
+            int alt9=2;
+            int LA9_0 = input.LA(1);
+
+            if ( (LA9_0==WS) ) {
+                alt9=1;
+            }
+            switch (alt9) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:137:35: WS
+                    {
+                    WS28=(Token)match(input,WS,FOLLOW_WS_in_existspredicate969);  
+                    stream_WS.add(WS28);
+
+
+                    }
+                    break;
+
+            }
+
+
+            PROPERTYNAME29=(Token)match(input,PROPERTYNAME,FOLLOW_PROPERTYNAME_in_existspredicate972);  
+            stream_PROPERTYNAME.add(PROPERTYNAME29);
+
+
+            RIGHTPAREN30=(Token)match(input,RIGHTPAREN,FOLLOW_RIGHTPAREN_in_existspredicate974);  
+            stream_RIGHTPAREN.add(RIGHTPAREN30);
+
+
+            // AST REWRITE
+            // elements: EXISTS, PROPERTYNAME
+            // token labels: 
+            // rule labels: retval
+            // token list labels: 
+            // rule list labels: 
+            // wildcard labels: 
+            retval.tree = root_0;
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+            root_0 = (Object)adaptor.nil();
+            // 137:63: -> ^( EXISTS PROPERTYNAME )
+            {
+                // org/alfresco/rest/antlr/WhereClause.g:137:66: ^( EXISTS PROPERTYNAME )
+                {
+                Object root_1 = (Object)adaptor.nil();
+                root_1 = (Object)adaptor.becomeRoot(
+                stream_EXISTS.nextNode()
+                , root_1);
+
+                adaptor.addChild(root_1, 
+                stream_PROPERTYNAME.nextNode()
+                );
+
+                adaptor.addChild(root_0, root_1);
+                }
+
+            }
+
+
+            retval.tree = root_0;
+
+            }
+
+            retval.stop = input.LT(-1);
+
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+        }
+
+        catch(RecognitionException e)
+        {
+           throw e;
+        }
+
+        finally {
+        	// do for sure before leaving
+        }
+        return retval;
+    }
+    // $ANTLR end "existspredicate"
+
+
+    public static class betweenpredicate_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+
+    // $ANTLR start "betweenpredicate"
+    // org/alfresco/rest/antlr/WhereClause.g:138:1: betweenpredicate : PROPERTYNAME BETWEEN LEFTPAREN ( WS )? propertyvaluepair RIGHTPAREN -> ^( BETWEEN PROPERTYNAME propertyvaluepair ) ;
+    public final WhereClauseParser.betweenpredicate_return betweenpredicate() throws RecognitionException {
+        WhereClauseParser.betweenpredicate_return retval = new WhereClauseParser.betweenpredicate_return();
+        retval.start = input.LT(1);
+
+
+        Object root_0 = null;
+
+        Token PROPERTYNAME31=null;
+        Token BETWEEN32=null;
+        Token LEFTPAREN33=null;
+        Token WS34=null;
+        Token RIGHTPAREN36=null;
+        WhereClauseParser.propertyvaluepair_return propertyvaluepair35 =null;
+
+
+        Object PROPERTYNAME31_tree=null;
+        Object BETWEEN32_tree=null;
+        Object LEFTPAREN33_tree=null;
+        Object WS34_tree=null;
+        Object RIGHTPAREN36_tree=null;
+        RewriteRuleTokenStream stream_LEFTPAREN=new RewriteRuleTokenStream(adaptor,"token LEFTPAREN");
+        RewriteRuleTokenStream stream_PROPERTYNAME=new RewriteRuleTokenStream(adaptor,"token PROPERTYNAME");
+        RewriteRuleTokenStream stream_RIGHTPAREN=new RewriteRuleTokenStream(adaptor,"token RIGHTPAREN");
+        RewriteRuleTokenStream stream_BETWEEN=new RewriteRuleTokenStream(adaptor,"token BETWEEN");
+        RewriteRuleTokenStream stream_WS=new RewriteRuleTokenStream(adaptor,"token WS");
+        RewriteRuleSubtreeStream stream_propertyvaluepair=new RewriteRuleSubtreeStream(adaptor,"rule propertyvaluepair");
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:138:17: ( PROPERTYNAME BETWEEN LEFTPAREN ( WS )? propertyvaluepair RIGHTPAREN -> ^( BETWEEN PROPERTYNAME propertyvaluepair ) )
+            // org/alfresco/rest/antlr/WhereClause.g:138:19: PROPERTYNAME BETWEEN LEFTPAREN ( WS )? propertyvaluepair RIGHTPAREN
+            {
+            PROPERTYNAME31=(Token)match(input,PROPERTYNAME,FOLLOW_PROPERTYNAME_in_betweenpredicate988);  
+            stream_PROPERTYNAME.add(PROPERTYNAME31);
+
+
+            BETWEEN32=(Token)match(input,BETWEEN,FOLLOW_BETWEEN_in_betweenpredicate990);  
+            stream_BETWEEN.add(BETWEEN32);
+
+
+            LEFTPAREN33=(Token)match(input,LEFTPAREN,FOLLOW_LEFTPAREN_in_betweenpredicate992);  
+            stream_LEFTPAREN.add(LEFTPAREN33);
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:138:50: ( WS )?
+            int alt10=2;
+            int LA10_0 = input.LA(1);
+
+            if ( (LA10_0==WS) ) {
+                alt10=1;
+            }
+            switch (alt10) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:138:50: WS
+                    {
+                    WS34=(Token)match(input,WS,FOLLOW_WS_in_betweenpredicate994);  
+                    stream_WS.add(WS34);
+
+
+                    }
+                    break;
+
+            }
+
+
+            pushFollow(FOLLOW_propertyvaluepair_in_betweenpredicate997);
+            propertyvaluepair35=propertyvaluepair();
+
+            state._fsp--;
+
+            stream_propertyvaluepair.add(propertyvaluepair35.getTree());
+
+            RIGHTPAREN36=(Token)match(input,RIGHTPAREN,FOLLOW_RIGHTPAREN_in_betweenpredicate999);  
+            stream_RIGHTPAREN.add(RIGHTPAREN36);
+
+
+            // AST REWRITE
+            // elements: propertyvaluepair, BETWEEN, PROPERTYNAME
+            // token labels: 
+            // rule labels: retval
+            // token list labels: 
+            // rule list labels: 
+            // wildcard labels: 
+            retval.tree = root_0;
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+            root_0 = (Object)adaptor.nil();
+            // 138:83: -> ^( BETWEEN PROPERTYNAME propertyvaluepair )
+            {
+                // org/alfresco/rest/antlr/WhereClause.g:138:86: ^( BETWEEN PROPERTYNAME propertyvaluepair )
+                {
+                Object root_1 = (Object)adaptor.nil();
+                root_1 = (Object)adaptor.becomeRoot(
+                stream_BETWEEN.nextNode()
+                , root_1);
+
+                adaptor.addChild(root_1, 
+                stream_PROPERTYNAME.nextNode()
+                );
+
+                adaptor.addChild(root_1, stream_propertyvaluepair.nextTree());
+
+                adaptor.addChild(root_0, root_1);
+                }
+
+            }
+
+
+            retval.tree = root_0;
+
+            }
+
+            retval.stop = input.LT(-1);
+
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+        }
+
+        catch(RecognitionException e)
+        {
+           throw e;
+        }
+
+        finally {
+        	// do for sure before leaving
+        }
+        return retval;
+    }
+    // $ANTLR end "betweenpredicate"
+
+
+    public static class inpredicate_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+
+    // $ANTLR start "inpredicate"
+    // org/alfresco/rest/antlr/WhereClause.g:139:1: inpredicate : PROPERTYNAME IN LEFTPAREN ( WS )? propertyvaluelist RIGHTPAREN -> ^( IN PROPERTYNAME propertyvaluelist ) ;
+    public final WhereClauseParser.inpredicate_return inpredicate() throws RecognitionException {
+        WhereClauseParser.inpredicate_return retval = new WhereClauseParser.inpredicate_return();
+        retval.start = input.LT(1);
+
+
+        Object root_0 = null;
+
+        Token PROPERTYNAME37=null;
+        Token IN38=null;
+        Token LEFTPAREN39=null;
+        Token WS40=null;
+        Token RIGHTPAREN42=null;
+        WhereClauseParser.propertyvaluelist_return propertyvaluelist41 =null;
+
+
+        Object PROPERTYNAME37_tree=null;
+        Object IN38_tree=null;
+        Object LEFTPAREN39_tree=null;
+        Object WS40_tree=null;
+        Object RIGHTPAREN42_tree=null;
+        RewriteRuleTokenStream stream_LEFTPAREN=new RewriteRuleTokenStream(adaptor,"token LEFTPAREN");
+        RewriteRuleTokenStream stream_PROPERTYNAME=new RewriteRuleTokenStream(adaptor,"token PROPERTYNAME");
+        RewriteRuleTokenStream stream_IN=new RewriteRuleTokenStream(adaptor,"token IN");
+        RewriteRuleTokenStream stream_RIGHTPAREN=new RewriteRuleTokenStream(adaptor,"token RIGHTPAREN");
+        RewriteRuleTokenStream stream_WS=new RewriteRuleTokenStream(adaptor,"token WS");
+        RewriteRuleSubtreeStream stream_propertyvaluelist=new RewriteRuleSubtreeStream(adaptor,"rule propertyvaluelist");
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:139:12: ( PROPERTYNAME IN LEFTPAREN ( WS )? propertyvaluelist RIGHTPAREN -> ^( IN PROPERTYNAME propertyvaluelist ) )
+            // org/alfresco/rest/antlr/WhereClause.g:139:14: PROPERTYNAME IN LEFTPAREN ( WS )? propertyvaluelist RIGHTPAREN
+            {
+            PROPERTYNAME37=(Token)match(input,PROPERTYNAME,FOLLOW_PROPERTYNAME_in_inpredicate1015);  
+            stream_PROPERTYNAME.add(PROPERTYNAME37);
+
+
+            IN38=(Token)match(input,IN,FOLLOW_IN_in_inpredicate1017);  
+            stream_IN.add(IN38);
+
+
+            LEFTPAREN39=(Token)match(input,LEFTPAREN,FOLLOW_LEFTPAREN_in_inpredicate1019);  
+            stream_LEFTPAREN.add(LEFTPAREN39);
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:139:40: ( WS )?
+            int alt11=2;
+            int LA11_0 = input.LA(1);
+
+            if ( (LA11_0==WS) ) {
+                alt11=1;
+            }
+            switch (alt11) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:139:40: WS
+                    {
+                    WS40=(Token)match(input,WS,FOLLOW_WS_in_inpredicate1021);  
+                    stream_WS.add(WS40);
+
+
+                    }
+                    break;
+
+            }
+
+
+            pushFollow(FOLLOW_propertyvaluelist_in_inpredicate1024);
+            propertyvaluelist41=propertyvaluelist();
+
+            state._fsp--;
+
+            stream_propertyvaluelist.add(propertyvaluelist41.getTree());
+
+            RIGHTPAREN42=(Token)match(input,RIGHTPAREN,FOLLOW_RIGHTPAREN_in_inpredicate1026);  
+            stream_RIGHTPAREN.add(RIGHTPAREN42);
+
+
+            // AST REWRITE
+            // elements: PROPERTYNAME, IN, propertyvaluelist
+            // token labels: 
+            // rule labels: retval
+            // token list labels: 
+            // rule list labels: 
+            // wildcard labels: 
+            retval.tree = root_0;
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+            root_0 = (Object)adaptor.nil();
+            // 139:73: -> ^( IN PROPERTYNAME propertyvaluelist )
+            {
+                // org/alfresco/rest/antlr/WhereClause.g:139:76: ^( IN PROPERTYNAME propertyvaluelist )
+                {
+                Object root_1 = (Object)adaptor.nil();
+                root_1 = (Object)adaptor.becomeRoot(
+                stream_IN.nextNode()
+                , root_1);
+
+                adaptor.addChild(root_1, 
+                stream_PROPERTYNAME.nextNode()
+                );
+
+                adaptor.addChild(root_1, stream_propertyvaluelist.nextTree());
+
+                adaptor.addChild(root_0, root_1);
+                }
+
+            }
+
+
+            retval.tree = root_0;
+
+            }
+
+            retval.stop = input.LT(-1);
+
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+        }
+
+        catch(RecognitionException e)
+        {
+           throw e;
+        }
+
+        finally {
+        	// do for sure before leaving
+        }
+        return retval;
+    }
+    // $ANTLR end "inpredicate"
+
+
+    public static class matchespredicate_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+
+    // $ANTLR start "matchespredicate"
+    // org/alfresco/rest/antlr/WhereClause.g:140:1: matchespredicate : PROPERTYNAME MATCHES LEFTPAREN ( WS )? value RIGHTPAREN -> ^( MATCHES PROPERTYNAME value ) ;
+    public final WhereClauseParser.matchespredicate_return matchespredicate() throws RecognitionException {
+        WhereClauseParser.matchespredicate_return retval = new WhereClauseParser.matchespredicate_return();
+        retval.start = input.LT(1);
+
+
+        Object root_0 = null;
+
+        Token PROPERTYNAME43=null;
+        Token MATCHES44=null;
+        Token LEFTPAREN45=null;
+        Token WS46=null;
+        Token RIGHTPAREN48=null;
+        WhereClauseParser.value_return value47 =null;
+
+
+        Object PROPERTYNAME43_tree=null;
+        Object MATCHES44_tree=null;
+        Object LEFTPAREN45_tree=null;
+        Object WS46_tree=null;
+        Object RIGHTPAREN48_tree=null;
+        RewriteRuleTokenStream stream_LEFTPAREN=new RewriteRuleTokenStream(adaptor,"token LEFTPAREN");
+        RewriteRuleTokenStream stream_PROPERTYNAME=new RewriteRuleTokenStream(adaptor,"token PROPERTYNAME");
+        RewriteRuleTokenStream stream_RIGHTPAREN=new RewriteRuleTokenStream(adaptor,"token RIGHTPAREN");
+        RewriteRuleTokenStream stream_MATCHES=new RewriteRuleTokenStream(adaptor,"token MATCHES");
+        RewriteRuleTokenStream stream_WS=new RewriteRuleTokenStream(adaptor,"token WS");
+        RewriteRuleSubtreeStream stream_value=new RewriteRuleSubtreeStream(adaptor,"rule value");
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:140:17: ( PROPERTYNAME MATCHES LEFTPAREN ( WS )? value RIGHTPAREN -> ^( MATCHES PROPERTYNAME value ) )
+            // org/alfresco/rest/antlr/WhereClause.g:140:19: PROPERTYNAME MATCHES LEFTPAREN ( WS )? value RIGHTPAREN
+            {
+            PROPERTYNAME43=(Token)match(input,PROPERTYNAME,FOLLOW_PROPERTYNAME_in_matchespredicate1042);  
+            stream_PROPERTYNAME.add(PROPERTYNAME43);
+
+
+            MATCHES44=(Token)match(input,MATCHES,FOLLOW_MATCHES_in_matchespredicate1044);  
+            stream_MATCHES.add(MATCHES44);
+
+
+            LEFTPAREN45=(Token)match(input,LEFTPAREN,FOLLOW_LEFTPAREN_in_matchespredicate1046);  
+            stream_LEFTPAREN.add(LEFTPAREN45);
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:140:50: ( WS )?
+            int alt12=2;
+            int LA12_0 = input.LA(1);
+
+            if ( (LA12_0==WS) ) {
+                alt12=1;
+            }
+            switch (alt12) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:140:50: WS
+                    {
+                    WS46=(Token)match(input,WS,FOLLOW_WS_in_matchespredicate1048);  
+                    stream_WS.add(WS46);
+
+
+                    }
+                    break;
+
+            }
+
+
+            pushFollow(FOLLOW_value_in_matchespredicate1051);
+            value47=value();
+
+            state._fsp--;
+
+            stream_value.add(value47.getTree());
+
+            RIGHTPAREN48=(Token)match(input,RIGHTPAREN,FOLLOW_RIGHTPAREN_in_matchespredicate1053);  
+            stream_RIGHTPAREN.add(RIGHTPAREN48);
+
+
+            // AST REWRITE
+            // elements: PROPERTYNAME, value, MATCHES
+            // token labels: 
+            // rule labels: retval
+            // token list labels: 
+            // rule list labels: 
+            // wildcard labels: 
+            retval.tree = root_0;
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+            root_0 = (Object)adaptor.nil();
+            // 140:71: -> ^( MATCHES PROPERTYNAME value )
+            {
+                // org/alfresco/rest/antlr/WhereClause.g:140:74: ^( MATCHES PROPERTYNAME value )
+                {
+                Object root_1 = (Object)adaptor.nil();
+                root_1 = (Object)adaptor.becomeRoot(
+                stream_MATCHES.nextNode()
+                , root_1);
+
+                adaptor.addChild(root_1, 
+                stream_PROPERTYNAME.nextNode()
+                );
+
+                adaptor.addChild(root_1, stream_value.nextTree());
+
+                adaptor.addChild(root_0, root_1);
+                }
+
+            }
+
+
+            retval.tree = root_0;
+
+            }
+
+            retval.stop = input.LT(-1);
+
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+        }
+
+        catch(RecognitionException e)
+        {
+           throw e;
+        }
+
+        finally {
+        	// do for sure before leaving
+        }
+        return retval;
+    }
+    // $ANTLR end "matchespredicate"
+
+
+    public static class propertyvaluepair_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+
+    // $ANTLR start "propertyvaluepair"
+    // org/alfresco/rest/antlr/WhereClause.g:141:1: propertyvaluepair : value COMMA value -> ( value )+ ;
+    public final WhereClauseParser.propertyvaluepair_return propertyvaluepair() throws RecognitionException {
+        WhereClauseParser.propertyvaluepair_return retval = new WhereClauseParser.propertyvaluepair_return();
+        retval.start = input.LT(1);
+
+
+        Object root_0 = null;
+
+        Token COMMA50=null;
+        WhereClauseParser.value_return value49 =null;
+
+        WhereClauseParser.value_return value51 =null;
+
+
+        Object COMMA50_tree=null;
+        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
+        RewriteRuleSubtreeStream stream_value=new RewriteRuleSubtreeStream(adaptor,"rule value");
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:141:18: ( value COMMA value -> ( value )+ )
+            // org/alfresco/rest/antlr/WhereClause.g:141:20: value COMMA value
+            {
+            pushFollow(FOLLOW_value_in_propertyvaluepair1069);
+            value49=value();
+
+            state._fsp--;
+
+            stream_value.add(value49.getTree());
+
+            COMMA50=(Token)match(input,COMMA,FOLLOW_COMMA_in_propertyvaluepair1071);  
+            stream_COMMA.add(COMMA50);
+
+
+            pushFollow(FOLLOW_value_in_propertyvaluepair1073);
+            value51=value();
+
+            state._fsp--;
+
+            stream_value.add(value51.getTree());
+
+            // AST REWRITE
+            // elements: value
+            // token labels: 
+            // rule labels: retval
+            // token list labels: 
+            // rule list labels: 
+            // wildcard labels: 
+            retval.tree = root_0;
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+            root_0 = (Object)adaptor.nil();
+            // 141:38: -> ( value )+
+            {
+                if ( !(stream_value.hasNext()) ) {
+                    throw new RewriteEarlyExitException();
+                }
+                while ( stream_value.hasNext() ) {
+                    adaptor.addChild(root_0, stream_value.nextTree());
+
+                }
+                stream_value.reset();
+
+            }
+
+
+            retval.tree = root_0;
+
+            }
+
+            retval.stop = input.LT(-1);
+
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+        }
+
+        catch(RecognitionException e)
+        {
+           throw e;
+        }
+
+        finally {
+        	// do for sure before leaving
+        }
+        return retval;
+    }
+    // $ANTLR end "propertyvaluepair"
+
+
+    public static class propertyvaluelist_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+
+    // $ANTLR start "propertyvaluelist"
+    // org/alfresco/rest/antlr/WhereClause.g:142:1: propertyvaluelist : value ( COMMA value )* -> ( value )+ ;
+    public final WhereClauseParser.propertyvaluelist_return propertyvaluelist() throws RecognitionException {
+        WhereClauseParser.propertyvaluelist_return retval = new WhereClauseParser.propertyvaluelist_return();
+        retval.start = input.LT(1);
+
+
+        Object root_0 = null;
+
+        Token COMMA53=null;
+        WhereClauseParser.value_return value52 =null;
+
+        WhereClauseParser.value_return value54 =null;
+
+
+        Object COMMA53_tree=null;
+        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
+        RewriteRuleSubtreeStream stream_value=new RewriteRuleSubtreeStream(adaptor,"rule value");
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:142:18: ( value ( COMMA value )* -> ( value )+ )
+            // org/alfresco/rest/antlr/WhereClause.g:142:20: value ( COMMA value )*
+            {
+            pushFollow(FOLLOW_value_in_propertyvaluelist1084);
+            value52=value();
+
+            state._fsp--;
+
+            stream_value.add(value52.getTree());
+
+            // org/alfresco/rest/antlr/WhereClause.g:142:26: ( COMMA value )*
+            loop13:
+            do {
+                int alt13=2;
+                int LA13_0 = input.LA(1);
+
+                if ( (LA13_0==COMMA) ) {
+                    alt13=1;
+                }
+
+
+                switch (alt13) {
+            	case 1 :
+            	    // org/alfresco/rest/antlr/WhereClause.g:142:27: COMMA value
+            	    {
+            	    COMMA53=(Token)match(input,COMMA,FOLLOW_COMMA_in_propertyvaluelist1087);  
+            	    stream_COMMA.add(COMMA53);
+
+
+            	    pushFollow(FOLLOW_value_in_propertyvaluelist1089);
+            	    value54=value();
+
+            	    state._fsp--;
+
+            	    stream_value.add(value54.getTree());
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop13;
+                }
+            } while (true);
+
+
+            // AST REWRITE
+            // elements: value
+            // token labels: 
+            // rule labels: retval
+            // token list labels: 
+            // rule list labels: 
+            // wildcard labels: 
+            retval.tree = root_0;
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+            root_0 = (Object)adaptor.nil();
+            // 142:41: -> ( value )+
+            {
+                if ( !(stream_value.hasNext()) ) {
+                    throw new RewriteEarlyExitException();
+                }
+                while ( stream_value.hasNext() ) {
+                    adaptor.addChild(root_0, stream_value.nextTree());
+
+                }
+                stream_value.reset();
+
+            }
+
+
+            retval.tree = root_0;
+
+            }
+
+            retval.stop = input.LT(-1);
+
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+        }
+
+        catch(RecognitionException e)
+        {
+           throw e;
+        }
+
+        finally {
+        	// do for sure before leaving
+        }
+        return retval;
+    }
+    // $ANTLR end "propertyvaluelist"
+
+
+    public static class value_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+
+    // $ANTLR start "value"
+    // org/alfresco/rest/antlr/WhereClause.g:143:1: value : (a= PROPERTYVALUE -> ^( PROPERTYVALUE[$a] ) |b= PROPERTYNAME -> ^( PROPERTYVALUE[$b] ) );
+    public final WhereClauseParser.value_return value() throws RecognitionException {
+        WhereClauseParser.value_return retval = new WhereClauseParser.value_return();
+        retval.start = input.LT(1);
+
+
+        Object root_0 = null;
+
+        Token a=null;
+        Token b=null;
+
+        Object a_tree=null;
+        Object b_tree=null;
+        RewriteRuleTokenStream stream_PROPERTYNAME=new RewriteRuleTokenStream(adaptor,"token PROPERTYNAME");
+        RewriteRuleTokenStream stream_PROPERTYVALUE=new RewriteRuleTokenStream(adaptor,"token PROPERTYVALUE");
+
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:143:6: (a= PROPERTYVALUE -> ^( PROPERTYVALUE[$a] ) |b= PROPERTYNAME -> ^( PROPERTYVALUE[$b] ) )
+            int alt14=2;
+            int LA14_0 = input.LA(1);
+
+            if ( (LA14_0==PROPERTYVALUE) ) {
+                alt14=1;
+            }
+            else if ( (LA14_0==PROPERTYNAME) ) {
+                alt14=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 14, 0, input);
+
+                throw nvae;
+
+            }
+            switch (alt14) {
+                case 1 :
+                    // org/alfresco/rest/antlr/WhereClause.g:143:8: a= PROPERTYVALUE
+                    {
+                    a=(Token)match(input,PROPERTYVALUE,FOLLOW_PROPERTYVALUE_in_value1104);  
+                    stream_PROPERTYVALUE.add(a);
+
+
+                    // AST REWRITE
+                    // elements: PROPERTYVALUE
+                    // token labels: 
+                    // rule labels: retval
+                    // token list labels: 
+                    // rule list labels: 
+                    // wildcard labels: 
+                    retval.tree = root_0;
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+                    root_0 = (Object)adaptor.nil();
+                    // 143:24: -> ^( PROPERTYVALUE[$a] )
+                    {
+                        // org/alfresco/rest/antlr/WhereClause.g:143:27: ^( PROPERTYVALUE[$a] )
+                        {
+                        Object root_1 = (Object)adaptor.nil();
+                        root_1 = (Object)adaptor.becomeRoot(
+                        (Object)adaptor.create(PROPERTYVALUE, a)
+                        , root_1);
+
+                        adaptor.addChild(root_0, root_1);
+                        }
+
+                    }
+
+
+                    retval.tree = root_0;
+
+                    }
+                    break;
+                case 2 :
+                    // org/alfresco/rest/antlr/WhereClause.g:144:9: b= PROPERTYNAME
+                    {
+                    b=(Token)match(input,PROPERTYNAME,FOLLOW_PROPERTYNAME_in_value1124);  
+                    stream_PROPERTYNAME.add(b);
+
+
+                    // AST REWRITE
+                    // elements: 
+                    // token labels: 
+                    // rule labels: retval
+                    // token list labels: 
+                    // rule list labels: 
+                    // wildcard labels: 
+                    retval.tree = root_0;
+                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+                    root_0 = (Object)adaptor.nil();
+                    // 144:24: -> ^( PROPERTYVALUE[$b] )
+                    {
+                        // org/alfresco/rest/antlr/WhereClause.g:144:27: ^( PROPERTYVALUE[$b] )
+                        {
+                        Object root_1 = (Object)adaptor.nil();
+                        root_1 = (Object)adaptor.becomeRoot(
+                        (Object)adaptor.create(PROPERTYVALUE, b)
+                        , root_1);
+
+                        adaptor.addChild(root_0, root_1);
+                        }
+
+                    }
+
+
+                    retval.tree = root_0;
+
+                    }
+                    break;
+
+            }
+            retval.stop = input.LT(-1);
+
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+        }
+
+        catch(RecognitionException e)
+        {
+           throw e;
+        }
+
+        finally {
+        	// do for sure before leaving
+        }
+        return retval;
+    }
+    // $ANTLR end "value"
+
+
+    public static class selectClause_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+
+    // $ANTLR start "selectClause"
+    // org/alfresco/rest/antlr/WhereClause.g:145:1: selectClause : PROPERTYNAME ( COMMA PROPERTYNAME )* -> ( PROPERTYNAME )+ ;
+    public final WhereClauseParser.selectClause_return selectClause() throws RecognitionException {
+        WhereClauseParser.selectClause_return retval = new WhereClauseParser.selectClause_return();
+        retval.start = input.LT(1);
+
+
+        Object root_0 = null;
+
+        Token PROPERTYNAME55=null;
+        Token COMMA56=null;
+        Token PROPERTYNAME57=null;
+
+        Object PROPERTYNAME55_tree=null;
+        Object COMMA56_tree=null;
+        Object PROPERTYNAME57_tree=null;
+        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
+        RewriteRuleTokenStream stream_PROPERTYNAME=new RewriteRuleTokenStream(adaptor,"token PROPERTYNAME");
+
+        try {
+            // org/alfresco/rest/antlr/WhereClause.g:145:13: ( PROPERTYNAME ( COMMA PROPERTYNAME )* -> ( PROPERTYNAME )+ )
+            // org/alfresco/rest/antlr/WhereClause.g:145:16: PROPERTYNAME ( COMMA PROPERTYNAME )*
+            {
+            PROPERTYNAME55=(Token)match(input,PROPERTYNAME,FOLLOW_PROPERTYNAME_in_selectClause1140);  
+            stream_PROPERTYNAME.add(PROPERTYNAME55);
+
+
+            // org/alfresco/rest/antlr/WhereClause.g:145:29: ( COMMA PROPERTYNAME )*
+            loop15:
+            do {
+                int alt15=2;
+                int LA15_0 = input.LA(1);
+
+                if ( (LA15_0==COMMA) ) {
+                    alt15=1;
+                }
+
+
+                switch (alt15) {
+            	case 1 :
+            	    // org/alfresco/rest/antlr/WhereClause.g:145:30: COMMA PROPERTYNAME
+            	    {
+            	    COMMA56=(Token)match(input,COMMA,FOLLOW_COMMA_in_selectClause1143);  
+            	    stream_COMMA.add(COMMA56);
+
+
+            	    PROPERTYNAME57=(Token)match(input,PROPERTYNAME,FOLLOW_PROPERTYNAME_in_selectClause1145);  
+            	    stream_PROPERTYNAME.add(PROPERTYNAME57);
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop15;
+                }
+            } while (true);
+
+
+            // AST REWRITE
+            // elements: PROPERTYNAME
+            // token labels: 
+            // rule labels: retval
+            // token list labels: 
+            // rule list labels: 
+            // wildcard labels: 
+            retval.tree = root_0;
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
+
+            root_0 = (Object)adaptor.nil();
+            // 145:51: -> ( PROPERTYNAME )+
+            {
+                if ( !(stream_PROPERTYNAME.hasNext()) ) {
+                    throw new RewriteEarlyExitException();
+                }
+                while ( stream_PROPERTYNAME.hasNext() ) {
+                    adaptor.addChild(root_0, 
+                    stream_PROPERTYNAME.nextNode()
+                    );
+
+                }
+                stream_PROPERTYNAME.reset();
+
+            }
+
+
+            retval.tree = root_0;
+
+            }
+
+            retval.stop = input.LT(-1);
+
+
+            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+
+        }
+
+        catch(RecognitionException e)
+        {
+           throw e;
+        }
+
+        finally {
+        	// do for sure before leaving
+        }
+        return retval;
+    }
+    // $ANTLR end "selectClause"
+
+    // Delegated rules
+
+
+    protected DFA6 dfa6 = new DFA6(this);
+    static final String DFA6_eotS =
+        "\107\uffff";
+    static final String DFA6_eofS =
+        "\107\uffff";
+    static final String DFA6_minS =
+        "\1\11\1\5\1\21\1\11\3\21\2\27\1\5\1\21\3\27\2\4\1\27\1\31\3\21\3"+
+        "\27\2\7\1\27\2\7\1\27\2\31\3\uffff\1\4\3\27\2\4\1\27\1\31\2\27\2"+
+        "\4\1\27\2\7\1\27\2\7\1\27\2\31\1\4\2\31\2\7\2\27\3\4\2\31\2\7\1"+
+        "\4";
+    static final String DFA6_maxS =
+        "\1\27\1\24\1\21\1\27\3\21\1\30\1\33\1\24\1\21\3\33\2\31\1\27\1\31"+
+        "\3\21\1\30\1\33\1\30\2\7\1\30\2\31\1\30\2\31\3\uffff\1\31\3\33\2"+
+        "\31\1\27\1\31\2\30\2\31\1\30\2\7\1\30\2\31\1\30\7\31\2\30\10\31";
+    static final String DFA6_acceptS =
+        "\40\uffff\1\1\1\2\1\3\44\uffff";
+    static final String DFA6_specialS =
+        "\107\uffff}>";
+    static final String[] DFA6_transitionS = {
+            "\1\2\13\uffff\1\3\1\uffff\1\1",
+            "\1\4\2\uffff\1\7\1\uffff\2\7\4\uffff\1\5\1\uffff\2\7\1\6",
+            "\1\10",
+            "\1\12\15\uffff\1\11",
+            "\1\13",
+            "\1\14",
+            "\1\15",
+            "\1\17\1\16",
+            "\1\21\3\uffff\1\20",
+            "\1\22\2\uffff\1\25\1\uffff\2\25\4\uffff\1\23\1\uffff\2\25\1"+
+            "\24",
+            "\1\26",
+            "\1\31\1\30\2\uffff\1\27",
+            "\1\34\1\33\2\uffff\1\32",
+            "\1\37\1\36\2\uffff\1\35",
+            "\1\41\21\uffff\1\42\2\uffff\1\40",
+            "\1\41\21\uffff\1\42\2\uffff\1\40",
+            "\1\21",
+            "\1\43",
+            "\1\44",
+            "\1\45",
+            "\1\46",
+            "\1\50\1\47",
+            "\1\52\3\uffff\1\51",
+            "\1\31\1\30",
+            "\1\53",
+            "\1\53",
+            "\1\34\1\33",
+            "\1\54\21\uffff\1\55",
+            "\1\54\21\uffff\1\55",
+            "\1\37\1\36",
+            "\1\56",
+            "\1\56",
+            "",
+            "",
+            "",
+            "\1\41\21\uffff\1\42\2\uffff\1\40",
+            "\1\61\1\60\2\uffff\1\57",
+            "\1\64\1\63\2\uffff\1\62",
+            "\1\67\1\66\2\uffff\1\65",
+            "\1\41\21\uffff\1\42\2\uffff\1\40",
+            "\1\41\21\uffff\1\42\2\uffff\1\40",
+            "\1\52",
+            "\1\70",
+            "\1\72\1\71",
+            "\1\74\1\73",
+            "\1\41\21\uffff\1\42\2\uffff\1\40",
+            "\1\41\21\uffff\1\42\2\uffff\1\40",
+            "\1\61\1\60",
+            "\1\75",
+            "\1\75",
+            "\1\64\1\63",
+            "\1\76\21\uffff\1\77",
+            "\1\76\21\uffff\1\77",
+            "\1\67\1\66",
+            "\1\100",
+            "\1\100",
+            "\1\41\21\uffff\1\42\2\uffff\1\40",
+            "\1\101",
+            "\1\101",
+            "\1\54\21\uffff\1\55",
+            "\1\54\21\uffff\1\55",
+            "\1\103\1\102",
+            "\1\105\1\104",
+            "\1\41\21\uffff\1\42\2\uffff\1\40",
+            "\1\41\21\uffff\1\42\2\uffff\1\40",
+            "\1\41\21\uffff\1\42\2\uffff\1\40",
+            "\1\106",
+            "\1\106",
+            "\1\76\21\uffff\1\77",
+            "\1\76\21\uffff\1\77",
+            "\1\41\21\uffff\1\42\2\uffff\1\40"
+    };
+
+    static final short[] DFA6_eot = DFA.unpackEncodedString(DFA6_eotS);
+    static final short[] DFA6_eof = DFA.unpackEncodedString(DFA6_eofS);
+    static final char[] DFA6_min = DFA.unpackEncodedStringToUnsignedChars(DFA6_minS);
+    static final char[] DFA6_max = DFA.unpackEncodedStringToUnsignedChars(DFA6_maxS);
+    static final short[] DFA6_accept = DFA.unpackEncodedString(DFA6_acceptS);
+    static final short[] DFA6_special = DFA.unpackEncodedString(DFA6_specialS);
+    static final short[][] DFA6_transition;
+
+    static {
+        int numStates = DFA6_transitionS.length;
+        DFA6_transition = new short[numStates][];
+        for (int i=0; i<numStates; i++) {
+            DFA6_transition[i] = DFA.unpackEncodedString(DFA6_transitionS[i]);
+        }
+    }
+
+    class DFA6 extends DFA {
+
+        public DFA6(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 6;
+            this.eot = DFA6_eot;
+            this.eof = DFA6_eof;
+            this.min = DFA6_min;
+            this.max = DFA6_max;
+            this.accept = DFA6_accept;
+            this.special = DFA6_special;
+            this.transition = DFA6_transition;
+        }
+        public String getDescription() {
+            return "129:1: predicate : ( simplepredicate | simplepredicate ( AND simplepredicate )+ -> ^( AND ( simplepredicate )+ ) | simplepredicate ( OR simplepredicate )+ -> ^( OR ( simplepredicate )+ ) );";
+        }
+    }
+ 
+
+    public static final BitSet FOLLOW_WS_in_whereclause779 = new BitSet(new long[]{0x0000000000020000L});
+    public static final BitSet FOLLOW_LEFTPAREN_in_whereclause782 = new BitSet(new long[]{0x0000000008A00200L});
+    public static final BitSet FOLLOW_WS_in_whereclause785 = new BitSet(new long[]{0x0000000000A00200L});
+    public static final BitSet FOLLOW_predicate_in_whereclause788 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_RIGHTPAREN_in_whereclause790 = new BitSet(new long[]{0x0000000008000002L});
+    public static final BitSet FOLLOW_WS_in_whereclause793 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_simplepredicate_in_predicate801 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_simplepredicate_in_predicate815 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_AND_in_predicate818 = new BitSet(new long[]{0x0000000000A00200L});
+    public static final BitSet FOLLOW_simplepredicate_in_predicate820 = new BitSet(new long[]{0x0000000000000012L});
+    public static final BitSet FOLLOW_simplepredicate_in_predicate845 = new BitSet(new long[]{0x0000000000400000L});
+    public static final BitSet FOLLOW_OR_in_predicate848 = new BitSet(new long[]{0x0000000000A00200L});
+    public static final BitSet FOLLOW_simplepredicate_in_predicate850 = new BitSet(new long[]{0x0000000000400002L});
+    public static final BitSet FOLLOW_allowedpredicates_in_simplepredicate868 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NEGATION_in_simplepredicate892 = new BitSet(new long[]{0x0000000000800200L});
+    public static final BitSet FOLLOW_allowedpredicates_in_simplepredicate894 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_comparisonpredicate_in_allowedpredicates909 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_existspredicate_in_allowedpredicates913 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_betweenpredicate_in_allowedpredicates917 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_inpredicate_in_allowedpredicates921 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_matchespredicate_in_allowedpredicates925 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_PROPERTYNAME_in_comparisonpredicate931 = new BitSet(new long[]{0x00000000000C0D00L});
+    public static final BitSet FOLLOW_comparisonoperator_in_comparisonpredicate933 = new BitSet(new long[]{0x0000000001800000L});
+    public static final BitSet FOLLOW_value_in_comparisonpredicate935 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EXISTS_in_existspredicate965 = new BitSet(new long[]{0x0000000000020000L});
+    public static final BitSet FOLLOW_LEFTPAREN_in_existspredicate967 = new BitSet(new long[]{0x0000000008800000L});
+    public static final BitSet FOLLOW_WS_in_existspredicate969 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_PROPERTYNAME_in_existspredicate972 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_RIGHTPAREN_in_existspredicate974 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_PROPERTYNAME_in_betweenpredicate988 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_BETWEEN_in_betweenpredicate990 = new BitSet(new long[]{0x0000000000020000L});
+    public static final BitSet FOLLOW_LEFTPAREN_in_betweenpredicate992 = new BitSet(new long[]{0x0000000009800000L});
+    public static final BitSet FOLLOW_WS_in_betweenpredicate994 = new BitSet(new long[]{0x0000000001800000L});
+    public static final BitSet FOLLOW_propertyvaluepair_in_betweenpredicate997 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_RIGHTPAREN_in_betweenpredicate999 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_PROPERTYNAME_in_inpredicate1015 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_IN_in_inpredicate1017 = new BitSet(new long[]{0x0000000000020000L});
+    public static final BitSet FOLLOW_LEFTPAREN_in_inpredicate1019 = new BitSet(new long[]{0x0000000009800000L});
+    public static final BitSet FOLLOW_WS_in_inpredicate1021 = new BitSet(new long[]{0x0000000001800000L});
+    public static final BitSet FOLLOW_propertyvaluelist_in_inpredicate1024 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_RIGHTPAREN_in_inpredicate1026 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_PROPERTYNAME_in_matchespredicate1042 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_MATCHES_in_matchespredicate1044 = new BitSet(new long[]{0x0000000000020000L});
+    public static final BitSet FOLLOW_LEFTPAREN_in_matchespredicate1046 = new BitSet(new long[]{0x0000000009800000L});
+    public static final BitSet FOLLOW_WS_in_matchespredicate1048 = new BitSet(new long[]{0x0000000001800000L});
+    public static final BitSet FOLLOW_value_in_matchespredicate1051 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_RIGHTPAREN_in_matchespredicate1053 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_value_in_propertyvaluepair1069 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_COMMA_in_propertyvaluepair1071 = new BitSet(new long[]{0x0000000001800000L});
+    public static final BitSet FOLLOW_value_in_propertyvaluepair1073 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_value_in_propertyvaluelist1084 = new BitSet(new long[]{0x0000000000000082L});
+    public static final BitSet FOLLOW_COMMA_in_propertyvaluelist1087 = new BitSet(new long[]{0x0000000001800000L});
+    public static final BitSet FOLLOW_value_in_propertyvaluelist1089 = new BitSet(new long[]{0x0000000000000082L});
+    public static final BitSet FOLLOW_PROPERTYVALUE_in_value1104 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_PROPERTYNAME_in_value1124 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_PROPERTYNAME_in_selectClause1140 = new BitSet(new long[]{0x0000000000000082L});
+    public static final BitSet FOLLOW_COMMA_in_selectClause1143 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_PROPERTYNAME_in_selectClause1145 = new BitSet(new long[]{0x0000000000000082L});
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/heartbeat/RenditionsDataCollector.java b/remote-api/src/main/java/org/alfresco/heartbeat/RenditionsDataCollector.java
new file mode 100644
index 00000000000..d2ce91c411d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/heartbeat/RenditionsDataCollector.java
@@ -0,0 +1,139 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.heartbeat;
+
+import org.alfresco.heartbeat.datasender.HBData;
+import org.alfresco.heartbeat.jobs.HeartBeatJobScheduler;
+import org.alfresco.repo.descriptor.DescriptorDAO;
+import org.alfresco.repo.thumbnail.ThumbnailDefinition;
+import org.alfresco.util.PropertyCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * This class collects rendition request counts for HeartBeat. A rendition (such as "doclib") is always to the same
+ * target mimetype, but there may be different source mimetypes. As a result that may be multiple sets of data with
+ * the same rendition. It is also likely there will be multiple renditions reported in the same batch of data.
+ * <ul>
+ *  <li>Collector ID: <b>acs.repository.renditions</b></li>
+ *  <li>Data:
+ *      <ul>
+ *          <li><b>rendition:</b> String - The name of the rendition.</li>
+ *          <li><b>count:</b> Integer - The number of times a rendition and sourceMimetype combination has been requested.</li>
+ *          <li><b>sourceMimetype:</b> String - The source mimetype for the rendition.</li>
+ *          <li><b>targetMimetype:</b> String - The target mimetype for the rendition.</li>
+ *      </ul>
+ *  </li>
+ * </ul>
+ *
+ * @author adavis
+ */
+public class RenditionsDataCollector extends HBBaseDataCollector implements InitializingBean
+{
+    private static final Log logger = LogFactory.getLog(RenditionsDataCollector.class);
+
+    private DescriptorDAO currentRepoDescriptorDAO;
+
+    // Map keyed on rendition id to a Map keyed on source mimetypes to a count of the number of times it has been requested.
+    private final Map<ThumbnailDefinition, Map<String, AtomicInteger>> renditionRequests = new ConcurrentHashMap<>();
+
+    public RenditionsDataCollector(String collectorId, String collectorVersion, String cronExpression,
+                                    HeartBeatJobScheduler hbJobScheduler)
+    {
+        super(collectorId, collectorVersion, cronExpression, hbJobScheduler);
+    }
+
+    public void setCurrentRepoDescriptorDAO(DescriptorDAO currentRepoDescriptorDAO)
+    {
+        this.currentRepoDescriptorDAO = currentRepoDescriptorDAO;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        PropertyCheck.mandatory(this, "currentRepoDescriptorDAO", currentRepoDescriptorDAO);
+    }
+
+    public void recordRenditionRequest(ThumbnailDefinition rendition, String sourceMimetype)
+    {
+        // Increment the count of renditions. Atomically creates missing parts of the Map structures.
+        renditionRequests.computeIfAbsent(rendition,
+                k -> new ConcurrentHashMap<>()).computeIfAbsent(sourceMimetype,
+                k -> new AtomicInteger()).incrementAndGet();
+    }
+
+    @Override
+    public List<HBData> collectData()
+    {
+        List<HBData> collectedData = new LinkedList<>();
+
+        String systemId = this.currentRepoDescriptorDAO.getDescriptor().getId();
+        String collectorId = this.getCollectorId();
+        String collectorVersion = this.getCollectorVersion();
+        Date timestamp = new Date();
+
+        // We don't mind if new renditions are added while we iterate, as we will pick them up next time.
+        for (ThumbnailDefinition rendition : renditionRequests.keySet())
+        {
+            String renditionName = rendition.getName();
+            String targetMimetype = rendition.getMimetype();
+            for (Map.Entry<String, AtomicInteger> entry: renditionRequests.remove(rendition).entrySet())
+            {
+                String sourceMimetype = entry.getKey();
+                AtomicInteger count = entry.getValue();
+
+                Map<String, Object> values = new HashMap<>();
+                values.put("rendition", renditionName);
+                values.put("count", count.intValue());
+                values.put("sourceMimetype", sourceMimetype);
+                values.put("targetMimetype", targetMimetype);
+
+                // Decided it would be simpler to be able to combine results in Kibana from different nodes
+                // and days if the data was flattened (denormalized) out at this point. It is very likely
+                // that different nodes would have different sets of sourceMimetypes which would make summing
+                // the counts harder to do, if there was a single entry for each rendition with a nested
+                // structure for each sourceMimetype.
+                collectedData.add(new HBData(systemId, collectorId, collectorVersion, timestamp, values));
+
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug(renditionName+" "+count+" "+sourceMimetype+" "+targetMimetype);
+                }
+            }
+        }
+
+        return collectedData;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/AbstractBaseUrlGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/AbstractBaseUrlGenerator.java
new file mode 100644
index 00000000000..ae064a0122b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/AbstractBaseUrlGenerator.java
@@ -0,0 +1,196 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
+import org.alfresco.repo.tenant.TenantUtil;
+
+/**
+ * Generates an OpenCMIS base url based on the request, repository id and binding.
+ *  
+ * @author steveglover
+ *
+ */
+public abstract class AbstractBaseUrlGenerator implements BaseUrlGenerator
+{
+    private boolean overrideContext;
+    private String contextOverride;
+    private boolean overrideServletPath;
+    private String servletPathOverride;
+    private PathGenerator pathGenerator;
+
+	public void setPathGenerator(PathGenerator pathGenerator)
+	{
+		this.pathGenerator = pathGenerator;
+	}
+
+	public void setOverrideContext(boolean overrideContext)
+	{
+		this.overrideContext = overrideContext;
+	}
+	
+	private String fixup(String urlSegment)
+	{
+		StringBuilder sb = new StringBuilder();
+		int beginIndex = 0;
+		int endIndex = urlSegment.length();
+		if(urlSegment != null)
+		{
+			if(!urlSegment.equals("") && !urlSegment.startsWith("/"))
+			{
+				sb.append("/");
+			}
+			if(urlSegment.endsWith("/"))
+			{
+				endIndex -= 1;
+			}
+		}
+		sb.append(urlSegment.substring(beginIndex, endIndex));
+		return sb.toString();
+	}
+
+	public void setContextOverride(String contextOverride)
+	{
+		this.contextOverride = fixup(contextOverride);
+	}
+
+	public void setOverrideServletPath(boolean overrideServletPath)
+	{
+		this.overrideServletPath = overrideServletPath;
+	}
+
+	public void setServletPathOverride(String servletPathOverride)
+	{
+		this.servletPathOverride = fixup(servletPathOverride);
+	}
+    
+    protected abstract String getServerPath(HttpServletRequest request);
+
+	public String getContextPath(HttpServletRequest httpReq)
+	{
+		if(overrideContext)
+		{
+			return contextOverride;
+		}
+		else
+		{
+			return httpReq.getContextPath();
+		}
+	}
+
+	public String getServletPath(HttpServletRequest req)
+	{
+		if(overrideServletPath)
+		{
+			return servletPathOverride;
+		}
+		else
+		{
+			return req.getServletPath();
+		}
+	}
+	
+	@Override
+    public String getRequestURI(HttpServletRequest req, String repositoryId, String operation, String id)
+    {
+        StringBuilder url = new StringBuilder();
+
+        String contextPath = getContextPath(req);
+        if(contextPath != null && !contextPath.equals(""))
+        {
+    		url.append(contextPath);
+        }
+
+        String servletPath = getServletPath(req);
+        if(servletPath != null && !servletPath.equals(""))
+        {
+    		url.append(servletPath);
+        	url.append("/");
+        }
+        
+        if(url.length() == 0 || url.charAt(0) != '/')
+        {
+        	url.append("/");
+        }
+
+		if(repositoryId != null)
+		{
+			url.append(repositoryId == null ? TenantUtil.DEFAULT_TENANT : repositoryId);
+			url.append("/");
+		}
+		
+		if(operation != null)
+		{
+			url.append(operation);
+			url.append("/");
+		}
+		
+		if(id != null)
+		{
+			url.append(id);
+		}
+		
+		int length = url.length();
+		if(length > 0 && url.charAt(length - 1) == '/')
+		{
+			url.deleteCharAt(length - 1);
+		}
+
+        return url.toString();
+    }
+
+	@Override
+    public String getBaseUrl(HttpServletRequest req, String repositoryId, Binding binding)
+    {
+        StringBuilder url = new StringBuilder();
+		String serverPath = getServerPath(req);
+		url.append(serverPath);
+
+        String contextPath = getContextPath(req);
+        if(contextPath != null && !contextPath.equals(""))
+        {
+    		url.append(contextPath);
+        }
+
+        String servletPath = getServletPath(req);
+        if(servletPath != null && !servletPath.equals(""))
+        {
+    		url.append(servletPath);
+        	url.append("/");
+        }
+        
+        if(url.length() > 0 && url.charAt(url.length() - 1) != '/')
+        {
+        	url.append("/");
+        }
+
+        pathGenerator.generatePath(req, url, repositoryId, binding);
+
+        return url.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/AtomPubCMISDispatcher.java b/remote-api/src/main/java/org/alfresco/opencmis/AtomPubCMISDispatcher.java
new file mode 100644
index 00000000000..0ec6c3a6584
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/AtomPubCMISDispatcher.java
@@ -0,0 +1,52 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import javax.servlet.http.HttpServlet;
+
+import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
+import org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet;
+
+/**
+ * Dispatches OpenCMIS requests to the OpenCMIS AtomPub servlet.
+ * 
+ * @author steveglover
+ *
+ */
+public class AtomPubCMISDispatcher extends CMISServletDispatcher
+{
+    @Override
+    protected Binding getBinding()
+    {
+    	return Binding.atom;
+    }
+
+	protected HttpServlet getServlet()
+	{
+		HttpServlet servlet = new CmisAtomPubServlet();
+		return servlet;
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/BaseUrlGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/BaseUrlGenerator.java
new file mode 100644
index 00000000000..e679829d76d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/BaseUrlGenerator.java
@@ -0,0 +1,44 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
+
+/**
+ * Generates an OpenCMIS base url based on the request, repository id and binding.
+ * 
+ * @author steveglover
+ *
+ */
+public interface BaseUrlGenerator
+{
+	String getContextPath(HttpServletRequest httpReq);
+	String getServletPath(HttpServletRequest req);
+	String getBaseUrl(HttpServletRequest req, String repositoryId, Binding binding);
+	String getRequestURI(HttpServletRequest req, String repositoryId, String operation, String id);
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/BrowserCMISDispatcher.java b/remote-api/src/main/java/org/alfresco/opencmis/BrowserCMISDispatcher.java
new file mode 100644
index 00000000000..6092a1a9438
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/BrowserCMISDispatcher.java
@@ -0,0 +1,52 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import javax.servlet.http.HttpServlet;
+
+import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
+import org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet;
+
+/**
+ * Dispatches OpenCMIS requests to the OpenCMIS Browser Binding servlet.
+ * 
+ * @author steveglover
+ *
+ */
+public class BrowserCMISDispatcher extends CMISServletDispatcher
+{
+    @Override
+    protected Binding getBinding()
+    {
+    	return Binding.browser;
+    }
+
+	protected HttpServlet getServlet()
+	{
+		HttpServlet servlet = new CmisBrowserBindingServlet();
+		return servlet;
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/CMISDispatcher.java b/remote-api/src/main/java/org/alfresco/opencmis/CMISDispatcher.java
new file mode 100644
index 00000000000..b5c93468ee2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/CMISDispatcher.java
@@ -0,0 +1,42 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import java.io.IOException;
+
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * Dispatches OpenCMIS requests to the appropriate handler.
+ * 
+ * @author steveglover
+ *
+ */
+public interface CMISDispatcher
+{
+	public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException;
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/CMISDispatcherRegistry.java b/remote-api/src/main/java/org/alfresco/opencmis/CMISDispatcherRegistry.java
new file mode 100644
index 00000000000..f89a2d0a9b1
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/CMISDispatcherRegistry.java
@@ -0,0 +1,120 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import org.apache.chemistry.opencmis.commons.enums.BindingType;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * A registry of OpenCMIS bindings to dispatchers.
+ * 
+ * @author steveglover
+ *
+ */
+public interface CMISDispatcherRegistry
+{
+	/*
+	 * Supported CMIS bindings
+	 */
+	public static enum Binding
+	{
+		atom, browser;
+		
+		public BindingType getOpenCmisBinding()
+		{
+			BindingType bindingType = null;
+
+			if(this == atom)
+			{
+				bindingType = BindingType.ATOMPUB;
+			}
+			else if(this == browser)
+			{
+				bindingType = BindingType.BROWSER;
+			}
+
+			return bindingType;
+		}
+	};
+	
+	public static class Endpoint
+	{
+		private Binding binding;
+		private String version;
+
+		public Endpoint(Binding binding, String version)
+		{
+			super();
+			this.binding = binding;
+			this.version = version;
+		}
+		
+		public Binding getBinding()
+		{
+			return binding;
+		}
+		
+		public String getVersion()
+		{
+			return version;
+		}
+		
+		@Override
+		public int hashCode()
+		{
+			final int prime = 31;
+			int result = 1;
+			result = prime * result
+					+ ((binding == null) ? 0 : binding.hashCode());
+			result = prime * result
+					+ ((version == null) ? 0 : version.hashCode());
+			return result;
+		}
+		
+		@Override
+		public boolean equals(Object obj)
+		{
+			if (this == obj)
+				return true;
+			if (obj == null)
+				return false;
+			if (getClass() != obj.getClass())
+				return false;
+			Endpoint other = (Endpoint) obj;
+			if (binding != other.binding)
+				return false;
+			if (version == null) {
+				if (other.version != null)
+					return false;
+			} else if (!version.equals(other.version))
+				return false;
+			return true;
+		}
+	}
+	
+	public void registerDispatcher(Endpoint endpoint, CMISDispatcher dispatcher);
+	public CMISDispatcher getDispatcher(WebScriptRequest req);
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/CMISDispatcherRegistryImpl.java b/remote-api/src/main/java/org/alfresco/opencmis/CMISDispatcherRegistryImpl.java
new file mode 100644
index 00000000000..468dddc8a14
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/CMISDispatcherRegistryImpl.java
@@ -0,0 +1,84 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * A registry of OpenCMIS bindings to dispatchers.
+ * 
+ * @author steveglover
+ *
+ */
+public class CMISDispatcherRegistryImpl implements CMISDispatcherRegistry
+{
+	private Map<Endpoint, CMISDispatcher> registry = new HashMap<Endpoint, CMISDispatcher>();
+
+	@Override
+	public void registerDispatcher(Endpoint endpoint, CMISDispatcher dispatcher)
+	{
+		registry.put(endpoint, dispatcher);
+	}
+
+	@Override
+	public CMISDispatcher getDispatcher(WebScriptRequest req)
+	{
+		CMISDispatcher dispatcher = null;
+
+		Match match = req.getServiceMatch();
+		Map<String, String> templateVars = match.getTemplateVars();
+		String bindingStr = templateVars.get("binding");
+		String apiVersion = templateVars.get("apiVersion");
+		if(bindingStr != null && apiVersion != null)
+		{
+			Binding binding = null;
+			try
+			{
+				binding = Binding.valueOf(bindingStr);
+			}
+			catch(IllegalArgumentException e)
+			{
+				// nothing to do, binding remains null
+			}
+			
+			if(binding != null)
+			{
+				Endpoint endpoint = new Endpoint(binding, apiVersion);
+				dispatcher = registry.get(endpoint);
+			}
+			else
+			{
+				// TODO
+			}
+		}
+
+		return dispatcher;
+	}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletRequest.java b/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletRequest.java
new file mode 100644
index 00000000000..9a7ea910dfd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletRequest.java
@@ -0,0 +1,643 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.Part;
+
+import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantAdminService;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.web.scripts.TenantWebScriptServletRequest;
+import org.alfresco.service.descriptor.Descriptor;
+import org.apache.chemistry.opencmis.commons.impl.Constants;
+import org.apache.chemistry.opencmis.server.shared.Dispatcher;
+import org.apache.commons.collections.map.HashedMap;
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRuntime;
+
+/**
+ * Wraps an OpenCMIS HttpServletRequest, mapping urls and adding servlet attributes specific to the Alfresco implementation of OpenCMIS.
+ */
+@SuppressWarnings("rawtypes")
+public class CMISHttpServletRequest implements HttpServletRequest
+{
+	protected WebScriptRequest req;
+	protected HttpServletRequest httpReq;
+	protected String networkId;
+	protected String operation;
+	protected String id; // object id (or path for browser binding)
+	protected String serviceName;
+	protected BaseUrlGenerator baseUrlGenerator;
+	protected Binding binding;
+	protected Descriptor currentDescriptor;
+
+	public CMISHttpServletRequest(WebScriptRequest req, String serviceName, BaseUrlGenerator baseUrlGenerator, Binding binding, Descriptor currentDescriptor,
+	        TenantAdminService tenantAdminService)
+	{
+		this.req = req;
+		this.serviceName = serviceName;
+		this.baseUrlGenerator = baseUrlGenerator;
+		this.binding = binding;
+
+		String pathInfo = req.getPathInfo();
+		WebScriptRequest baseReq = getBaseRequest(req);
+		if(!pathInfo.startsWith("/cmis") && (baseReq instanceof TenantWebScriptServletRequest))
+		{
+			TenantWebScriptServletRequest servletReq = (TenantWebScriptServletRequest)baseReq;
+
+			String tenant = servletReq.getTenant();
+			if(tenant.equalsIgnoreCase(TenantUtil.DEFAULT_TENANT))
+            {
+			    String user = AuthenticationUtil.getFullyAuthenticatedUser();
+                String domain = tenantAdminService.getUserDomain(user);
+                if(domain == null || domain.equals(TenantService.DEFAULT_DOMAIN))
+                {
+                    this.networkId = tenant;
+                }
+                else
+                {
+                    this.networkId = domain;
+                }
+            }
+			else
+			{
+			    this.networkId = tenant;
+			}
+		}
+
+		Match match = req.getServiceMatch();
+		Map<String, String> templateVars = match.getTemplateVars();
+
+        HttpServletRequest httpReq = WebScriptServletRuntime.getHttpServletRequest(req);
+		this.httpReq = httpReq;
+		this.operation = templateVars.get("operation");
+		this.id = templateVars.get("id");
+
+    	addAttributes();
+	}
+	
+	/*
+	 * Recursively unwrap req if it is a WrappingWebScriptRequest
+	 */
+	private WebScriptRequest getBaseRequest(WebScriptRequest req)
+	{
+		WebScriptRequest ret = req;
+		while(ret instanceof WrappingWebScriptRequest)
+		{
+			WrappingWebScriptRequest wrapping = (WrappingWebScriptRequest)req;
+			ret = wrapping.getNext();
+		}
+		return ret;
+	}
+
+	protected void addAttributes()
+	{
+		if(networkId != null)
+		{
+			httpReq.setAttribute(Constants.PARAM_REPOSITORY_ID, networkId);
+		}
+		httpReq.setAttribute("serviceName", serviceName);
+	}
+
+	@Override
+	public Object getAttribute(String arg0)
+	{
+		if(arg0.equals(Dispatcher.BASE_URL_ATTRIBUTE))
+		{
+			return baseUrlGenerator.getBaseUrl(this, networkId, binding);
+		}
+		else
+		{
+			return httpReq.getAttribute(arg0);
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Enumeration getAttributeNames()
+	{
+		Enumeration e = httpReq.getAttributeNames();
+		List attrNames = new ArrayList();
+		while(e.hasMoreElements())
+		{
+			attrNames.add(e.nextElement());
+		}
+		attrNames.add(Dispatcher.BASE_URL_ATTRIBUTE);
+		final Iterator it = attrNames.iterator();
+
+	    return new Enumeration()
+	    {
+	        public boolean hasMoreElements()
+	        {
+	            return it.hasNext();
+	        }
+
+	        public Object nextElement()
+	        {
+	            return it.next();
+	        }
+	    };
+	}
+
+	@Override
+	public String getCharacterEncoding()
+	{
+		return httpReq.getCharacterEncoding();
+	}
+
+	@Override
+	public int getContentLength()
+	{
+		return httpReq.getContentLength();
+	}
+
+	@Override
+	public String getContentType()
+	{
+		return httpReq.getContentType();
+	}
+
+	@Override
+	public ServletInputStream getInputStream() throws IOException
+	{
+		return httpReq.getInputStream();
+	}
+
+	@Override
+	public String getLocalAddr()
+	{
+		return httpReq.getLocalAddr();
+	}
+
+	@Override
+	public String getLocalName()
+	{
+		return httpReq.getLocalName();
+	}
+
+	@Override
+	public int getLocalPort()
+	{
+		return httpReq.getLocalPort();
+	}
+	
+	@Override
+	public Locale getLocale()
+	{
+		return httpReq.getLocale();
+	}
+
+	@Override
+	public Enumeration getLocales()
+	{
+		return httpReq.getLocales();
+	}
+
+	@Override
+	public String getParameter(String arg0)
+	{
+		if(arg0.equals(Constants.PARAM_REPOSITORY_ID))
+		{
+			return networkId;
+		}
+		return httpReq.getParameter(arg0);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Map getParameterMap()
+	{
+		Map map = httpReq.getParameterMap();
+		Map ret = new HashedMap(map);
+		if(networkId != null)
+		{
+			ret.put(Constants.PARAM_REPOSITORY_ID, new String[] { networkId });
+		}
+		return ret;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Enumeration getParameterNames()
+	{
+		final Enumeration e = httpReq.getParameterNames();
+		List l = new ArrayList();
+		while(e.hasMoreElements())
+		{
+			l.add(e.nextElement());
+		}
+		if(networkId != null)
+		{
+			l.add(Constants.PARAM_REPOSITORY_ID);
+		}
+		final Iterator it = l.iterator();
+		Enumeration ret = new Enumeration()
+		{
+			@Override
+			public boolean hasMoreElements()
+			{
+				return it.hasNext();
+			}
+
+			@Override
+			public Object nextElement()
+			{
+				return it.next();
+			}
+		};
+
+		return ret;
+	}
+
+	@Override
+	public String[] getParameterValues(String arg0)
+	{
+		return httpReq.getParameterValues(arg0);
+	}
+
+	@Override
+	public String getProtocol()
+	{
+		return httpReq.getProtocol();
+	}
+
+	@Override
+	public BufferedReader getReader() throws IOException
+	{
+		return httpReq.getReader();
+	}
+
+	@SuppressWarnings("deprecation")
+	@Override
+	public String getRealPath(String arg0)
+	{
+		return httpReq.getRealPath(arg0);
+	}
+
+	@Override
+	public String getRemoteAddr()
+	{
+		return httpReq.getRemoteAddr();
+	}
+
+	@Override
+	public String getRemoteHost()
+	{
+		return httpReq.getRemoteHost();
+	}
+
+	@Override
+	public int getRemotePort()
+	{
+		return httpReq.getRemotePort();
+	}
+
+	@Override
+	public RequestDispatcher getRequestDispatcher(String arg0)
+	{
+		return httpReq.getRequestDispatcher(arg0);
+	}
+
+	@Override
+	public String getScheme()
+	{
+		return httpReq.getScheme();
+	}
+
+	@Override
+	public String getServerName() 
+	{
+		return httpReq.getServerName();
+	}
+
+	@Override
+	public int getServerPort()
+	{
+		return httpReq.getServerPort();
+	}
+
+	@Override
+	public boolean isSecure()
+	{
+		return httpReq.isSecure();
+	}
+
+	@Override
+	public void removeAttribute(String arg0)
+	{
+		httpReq.removeAttribute(arg0);
+	}
+
+	@Override
+	public void setAttribute(String arg0, Object arg1)
+	{
+		httpReq.setAttribute(arg0, arg1);
+	}
+
+	@Override
+	public void setCharacterEncoding(String arg0) throws UnsupportedEncodingException
+	{
+		httpReq.setCharacterEncoding(arg0);
+	}
+
+	@Override
+	public String getAuthType()
+	{
+		return httpReq.getAuthType();
+	}
+
+	@Override
+	public String getContextPath()
+	{
+		String contextPath = baseUrlGenerator.getContextPath(httpReq);
+		return contextPath;
+	}
+
+	@Override
+	public Cookie[] getCookies()
+	{
+		return httpReq.getCookies();
+	}
+
+	@Override
+	public long getDateHeader(String arg0)
+	{
+		return httpReq.getDateHeader(arg0);
+	}
+
+	@Override
+	public String getHeader(String arg0)
+	{
+		return httpReq.getHeader(arg0);
+	}
+
+	@Override
+	public Enumeration getHeaderNames()
+	{
+		return httpReq.getHeaderNames();
+	}
+
+	@Override
+	public Enumeration getHeaders(String arg0)
+	{
+		return httpReq.getHeaders(arg0);
+	}
+
+	@Override
+	public int getIntHeader(String arg0)
+	{
+		return httpReq.getIntHeader(arg0);
+	}
+
+	@Override
+	public String getMethod()
+	{
+		return httpReq.getMethod();
+	}
+
+	@Override
+	public String getPathInfo()
+	{
+		StringBuilder sb = new StringBuilder("/");
+		sb.append(networkId == null ? TenantUtil.DEFAULT_TENANT : networkId);
+		if(operation != null)
+		{
+			sb.append("/");
+			sb.append(operation);
+		}
+		return sb.toString();
+	}
+
+	@Override
+	public String getPathTranslated()
+	{
+		return httpReq.getPathTranslated();
+	}
+
+	@Override
+	public String getQueryString()
+	{
+        StringBuilder queryString = new StringBuilder();
+        String reqQueryString = httpReq.getQueryString();
+
+        if(networkId != null && networkId.length() > 0)
+        {
+            if (reqQueryString != null)
+            {
+	            queryString.append(reqQueryString + "&");
+            }
+	        queryString.append("repositoryId=" + networkId);
+            if(operation == null || operation.isEmpty())
+            {
+            	queryString.append("&cmisselector=");
+	            queryString.append(Constants.SELECTOR_REPOSITORY_INFO);
+            }
+            return queryString.toString();
+        }
+        return reqQueryString;
+	}
+
+	@Override
+	public String getRemoteUser()
+	{
+		return httpReq.getRemoteUser();
+	}
+
+	@Override
+	public String getRequestURI()
+	{
+		String requestURI = baseUrlGenerator.getRequestURI(httpReq, networkId, operation, id);
+		return requestURI;
+	}
+
+	@Override
+	public StringBuffer getRequestURL()
+	{
+		return httpReq.getRequestURL();
+	}
+
+	@Override
+	public String getRequestedSessionId()
+	{
+		return httpReq.getRequestedSessionId();
+	}
+
+	@Override
+	public String getServletPath()
+	{
+		String servletPath = baseUrlGenerator.getServletPath(httpReq);
+		return servletPath;
+	}
+
+	@Override
+	public HttpSession getSession()
+	{
+		return httpReq.getSession();
+	}
+
+	@Override
+	public HttpSession getSession(boolean arg0)
+	{
+		return httpReq.getSession(arg0);
+	}
+
+	@Override
+	public Principal getUserPrincipal()
+	{
+		return httpReq.getUserPrincipal();
+	}
+
+	@Override
+	public boolean isRequestedSessionIdFromCookie()
+	{
+		return httpReq.isRequestedSessionIdFromCookie();
+	}
+
+	@Override
+	public boolean isRequestedSessionIdFromURL()
+	{
+		return httpReq.isRequestedSessionIdFromURL();
+	}
+
+	@Override
+	public boolean isRequestedSessionIdFromUrl()
+	{
+		return httpReq.isRequestedSessionIdFromURL();
+	}
+	
+	@Override
+	public boolean isRequestedSessionIdValid()
+	{
+		return httpReq.isRequestedSessionIdValid();
+	}
+
+	@Override
+	public boolean isUserInRole(String arg0)
+	{
+		return httpReq.isUserInRole(arg0);
+	}
+
+	@Override
+	public boolean authenticate(HttpServletResponse response) throws IOException, ServletException
+	{
+		return httpReq.authenticate(response);
+	}
+
+	@Override
+	public void login(String username, String password) throws ServletException
+	{
+		httpReq.login(username, password);
+	}
+
+	@Override
+	public void logout() throws ServletException
+	{
+		httpReq.logout();
+	}
+
+	@Override
+	public Collection<Part> getParts() throws IOException, ServletException
+	{
+		return httpReq.getParts();
+	}
+
+	@Override
+	public Part getPart(String name) throws IOException, ServletException
+	{
+		return httpReq.getPart(name);
+	}
+
+	@Override
+	public ServletContext getServletContext()
+	{
+		return httpReq.getServletContext();
+	}
+
+	@Override
+	public AsyncContext startAsync() throws IllegalStateException
+	{
+		return httpReq.startAsync();
+	}
+
+	@Override
+	public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException
+	{
+		return httpReq.startAsync(servletRequest, servletResponse);
+	}
+
+	@Override
+	public boolean isAsyncStarted()
+	{
+		return httpReq.isAsyncStarted();
+	}
+
+	@Override
+	public boolean isAsyncSupported()
+	{
+		return httpReq.isAsyncSupported();
+	}
+
+	@Override
+	public AsyncContext getAsyncContext()
+	{
+		return httpReq.getAsyncContext();
+	}
+
+	@Override
+	public DispatcherType getDispatcherType()
+	{
+		return httpReq.getDispatcherType();
+	}
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletResponse.java b/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletResponse.java
new file mode 100644
index 00000000000..d458b73d6b0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/CMISHttpServletResponse.java
@@ -0,0 +1,302 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRuntime;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.Set;
+
+/**
+ * Wraps an OpenCMIS HttpServletResponse for specific mapping to the Alfresco implementation of OpenCMIS.
+ * 
+ * @author janv
+ */
+public class CMISHttpServletResponse implements HttpServletResponse
+{
+    protected HttpServletResponse httpResp;
+
+    protected Set<String> nonAttachContentTypes = Collections.emptySet(); // pre-configured whitelist, eg. images & pdf
+
+    private final static String HDR_CONTENT_DISPOSITION = "Content-Disposition";
+
+    private final static String ATTACHMENT = "attachment";
+    private final static String INLINE = "inline";
+
+	public CMISHttpServletResponse(WebScriptResponse res, Set<String> nonAttachContentTypes)
+	{
+		httpResp = WebScriptServletRuntime.getHttpServletResponse(res);
+        this.nonAttachContentTypes = nonAttachContentTypes;
+	}
+
+    @Override
+    public void addCookie(Cookie cookie)
+    {
+        httpResp.addCookie(cookie);
+    }
+
+    @Override
+    public boolean containsHeader(String name)
+    {
+        return httpResp.containsHeader(name);
+    }
+
+    @Override
+    public String encodeURL(String url)
+    {
+        return httpResp.encodeURL(url);
+    }
+
+    @Override
+    public String encodeRedirectURL(String url)
+    {
+        return httpResp.encodeRedirectURL(url);
+    }
+
+    @Override
+    public String encodeUrl(String url)
+    {
+        return encodeUrl(url);
+    }
+
+    @Override
+    public String encodeRedirectUrl(String url)
+    {
+        return httpResp.encodeRedirectUrl(url);
+    }
+
+    @Override
+    public void sendError(int sc, String msg) throws IOException
+    {
+        httpResp.sendError(sc, msg);
+    }
+
+    @Override
+    public void sendError(int sc) throws IOException
+    {
+        httpResp.sendError(sc);
+    }
+
+    @Override
+    public void sendRedirect(String location) throws IOException
+    {
+        httpResp.sendRedirect(location);
+    }
+
+    @Override
+    public void setDateHeader(String name, long date)
+    {
+        httpResp.setDateHeader(name, date);
+    }
+
+    @Override
+    public void addDateHeader(String name, long date)
+    {
+        httpResp.addDateHeader(name, date);
+    }
+
+    @Override
+    public void setHeader(String name, String value)
+    {
+        httpResp.setHeader(name, getStringHeaderValue(name, value, httpResp.getContentType()));
+    }
+
+    @Override
+    public void addHeader(String name, String value)
+    {
+        httpResp.addHeader(name, getStringHeaderValue(name, value, httpResp.getContentType()));
+    }
+    
+    
+
+    private String getStringHeaderValue(String name, String value, String contentType)
+    {
+        if (HDR_CONTENT_DISPOSITION.equals(name))
+        {
+            if (! nonAttachContentTypes.contains(contentType))
+            {
+                if (value.startsWith(INLINE))
+                {
+                    // force attachment
+                    value = ATTACHMENT+value.substring(INLINE.length());
+                }
+                else if (! value.startsWith(ATTACHMENT))
+                {
+                    throw new AlfrescoRuntimeException("Unexpected - header could not be set: "+name+" = "+value);
+                }
+            }
+        }
+
+        return value;
+    }
+
+    @Override
+    public void setIntHeader(String name, int value)
+    {
+        httpResp.setIntHeader(name, value);
+    }
+
+    @Override
+    public void addIntHeader(String name, int value)
+    {
+        httpResp.addIntHeader(name, value);
+    }
+
+    @Override
+    public void setStatus(int sc)
+    {
+        httpResp.setStatus(sc);
+    }
+
+    @Override
+    public void setStatus(int sc, String sm)
+    {
+        httpResp.setStatus(sc, sm);
+    }
+
+    @Override
+    public int getStatus()
+    {
+        return httpResp.getStatus();
+    }
+
+    @Override
+    public String getHeader(String name)
+    {
+        return httpResp.getHeader(name);
+    }
+
+    @Override
+    public Collection<String> getHeaders(String name)
+    {
+        return httpResp.getHeaders(name);
+    }
+
+    @Override
+    public Collection<String> getHeaderNames()
+    {
+        return httpResp.getHeaderNames();
+    }
+
+    @Override
+    public String getCharacterEncoding()
+    {
+        return httpResp.getCharacterEncoding();
+    }
+
+    @Override
+    public String getContentType()
+    {
+        return httpResp.getContentType();
+    }
+
+    @Override
+    public ServletOutputStream getOutputStream() throws IOException
+    {
+        return httpResp.getOutputStream();
+    }
+
+    @Override
+    public PrintWriter getWriter() throws IOException
+    {
+        return httpResp.getWriter();
+    }
+
+    @Override
+    public void setCharacterEncoding(String charset)
+    {
+        httpResp.setCharacterEncoding(charset);
+    }
+
+    @Override
+    public void setContentLength(int len)
+    {
+        httpResp.setContentLength(len);
+    }
+
+    @Override
+    public void setContentType(String type)
+    {
+        httpResp.setContentType(type);
+    }
+
+    @Override
+    public void setBufferSize(int size)
+    {
+        httpResp.setBufferSize(size);
+    }
+
+    @Override
+    public int getBufferSize()
+    {
+        return httpResp.getBufferSize();
+    }
+
+    @Override
+    public void flushBuffer() throws IOException
+    {
+        httpResp.flushBuffer();
+    }
+
+    @Override
+    public void resetBuffer()
+    {
+        httpResp.resetBuffer();
+    }
+
+    @Override
+    public boolean isCommitted()
+    {
+        return httpResp.isCommitted();
+    }
+
+    @Override
+    public void reset()
+    {
+        httpResp.reset();
+    }
+
+    @Override
+    public void setLocale(Locale loc)
+    {
+        httpResp.setLocale(loc);
+    }
+
+    @Override
+    public Locale getLocale()
+    {
+        return httpResp.getLocale();
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/CMISServletDispatcher.java b/remote-api/src/main/java/org/alfresco/opencmis/CMISServletDispatcher.java
new file mode 100644
index 00000000000..d803a919512
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/CMISServletDispatcher.java
@@ -0,0 +1,601 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletRegistration;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
+import org.alfresco.opencmis.CMISDispatcherRegistry.Endpoint;
+import org.alfresco.repo.tenant.TenantAdminService;
+import org.alfresco.service.descriptor.Descriptor;
+import org.alfresco.service.descriptor.DescriptorService;
+import org.apache.chemistry.opencmis.commons.enums.CmisVersion;
+import org.apache.chemistry.opencmis.commons.server.CmisServiceFactory;
+import org.apache.chemistry.opencmis.server.impl.CmisRepositoryContextListener;
+import org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRuntime;
+
+/**
+ * Dispatches OpenCMIS requests to a servlet e.g. the OpenCMIS AtomPub servlet.
+ * 
+ * @author steveglover
+ *
+ */
+public abstract class CMISServletDispatcher implements CMISDispatcher
+{
+	private DescriptorService descriptorService;
+    private Descriptor currentDescriptor;
+    protected CmisServiceFactory cmisServiceFactory;
+    protected HttpServlet servlet;
+	protected CMISDispatcherRegistry registry;
+	protected String serviceName;
+	protected BaseUrlGenerator baseUrlGenerator;
+	protected String version;
+	protected CmisVersion cmisVersion;
+	protected TenantAdminService tenantAdminService;
+
+    private Set<String> nonAttachContentTypes = Collections.emptySet(); // pre-configured whitelist, eg. images & pdf
+
+	public void setTenantAdminService(TenantAdminService tenantAdminService)
+	{
+        this.tenantAdminService = tenantAdminService;
+    }
+
+    public void setDescriptorService(DescriptorService descriptorService)
+	{
+		this.descriptorService = descriptorService;
+	}
+
+	public void setVersion(String version)
+	{
+		this.version = version;
+	}
+
+	public void setBaseUrlGenerator(BaseUrlGenerator baseUrlGenerator)
+	{
+		this.baseUrlGenerator = baseUrlGenerator;
+	}
+
+	public void setRegistry(CMISDispatcherRegistry registry)
+	{
+		this.registry = registry;
+	}
+
+	public void setCmisServiceFactory(CmisServiceFactory cmisServiceFactory)
+    {
+        this.cmisServiceFactory = cmisServiceFactory;
+    }
+	
+	public void setServiceName(String serviceName)
+	{
+		this.serviceName = serviceName;
+	}
+
+	public String getServiceName()
+	{
+		return serviceName;
+	}
+	
+	public void setCmisVersion(String cmisVersion)
+    {
+        this.cmisVersion = CmisVersion.fromValue(cmisVersion);
+    }
+
+    public void setNonAttachContentTypes(Set<String> nonAttachWhiteList)
+    {
+        this.nonAttachContentTypes = nonAttachWhiteList;
+    }
+
+    protected synchronized Descriptor getCurrentDescriptor()
+	{
+		if(this.currentDescriptor == null)
+		{
+			this.currentDescriptor = descriptorService.getCurrentRepositoryDescriptor();
+		}
+
+		return this.currentDescriptor;
+	}
+	
+	public void init()
+	{
+		Endpoint endpoint = new Endpoint(getBinding(), version);
+		registry.registerDispatcher(endpoint, this);
+
+		try
+		{
+			// fake the CMIS servlet
+			ServletConfig config = getServletConfig();
+	    	this.servlet = getServlet();
+	    	servlet.init(config);
+		}
+		catch(ServletException e)
+		{
+			throw new AlfrescoRuntimeException("Failed to initialise CMIS servlet dispatcher", e);
+		}
+	}
+
+	/*
+	 *  Implement getBinding to provide the appropriate CMIS binding.
+	 */
+    protected abstract Binding getBinding();
+    
+	/*
+	 *  Implement getServlet to provide the appropriate servlet implementation.
+	 */
+	protected abstract HttpServlet getServlet();
+
+	protected Object getServletAttribute(String attrName)
+	{
+		if(attrName.equals(CmisRepositoryContextListener.SERVICES_FACTORY))
+		{
+			return cmisServiceFactory;
+		}
+
+		return null;
+	}
+	
+    protected ServletConfig getServletConfig()
+    {
+    	ServletConfig config = new CMISServletConfig();
+    	return config;
+    }
+
+    protected CMISHttpServletRequest getHttpRequest(WebScriptRequest req)
+	{
+		String serviceName = getServiceName();
+		CMISHttpServletRequest httpReqWrapper = new CMISHttpServletRequest(req, serviceName, baseUrlGenerator,
+		        getBinding(), currentDescriptor, tenantAdminService);
+    	return httpReqWrapper;
+	}
+
+	protected CMISHttpServletResponse getHttpResponse(WebScriptResponse res)
+	{
+		CMISHttpServletResponse httpResWrapper = new CMISHttpServletResponse(res, nonAttachContentTypes);
+
+		return httpResWrapper;
+	}
+
+	public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+	{
+		try
+		{
+			// wrap request & response
+			CMISHttpServletResponse httpResWrapper = getHttpResponse(res);
+	    	CMISHttpServletRequest httpReqWrapper = getHttpRequest(req);
+
+	    	servlet.service(httpReqWrapper, httpResWrapper);
+		}
+		catch(ServletException e)
+		{
+			throw new AlfrescoRuntimeException("", e);
+		}
+	}
+
+    /**
+     * Fake a CMIS servlet config.
+     * 
+     * @author steveglover
+     *
+     */
+	@SuppressWarnings("rawtypes")
+    private class CMISServletConfig implements ServletConfig
+    {
+		private List parameterNames = new ArrayList();
+
+    	@SuppressWarnings("unchecked")
+		CMISServletConfig()
+    	{
+    		parameterNames.add(CmisAtomPubServlet.PARAM_CALL_CONTEXT_HANDLER);
+            parameterNames.add(CmisAtomPubServlet.PARAM_CMIS_VERSION);
+		}
+
+		@Override
+		public String getInitParameter(String arg0)
+		{
+			if(arg0.equals(CmisAtomPubServlet.PARAM_CALL_CONTEXT_HANDLER))
+			{
+				return PublicApiCallContextHandler.class.getName();
+			}
+			else if(arg0.equals(CmisAtomPubServlet.PARAM_CMIS_VERSION))
+			{
+				return (cmisVersion != null ? cmisVersion.value() : CmisVersion.CMIS_1_0.value());
+			}
+			return null;
+		}
+
+		@Override
+		public Enumeration getInitParameterNames()
+		{
+			final Iterator it = parameterNames.iterator();
+
+			Enumeration e = new Enumeration()
+			{
+				@Override
+				public boolean hasMoreElements()
+				{
+					return it.hasNext();
+				}
+
+				@Override
+				public Object nextElement()
+				{
+					return it.next();
+				}
+			};
+			return e;
+		}
+
+		// fake a servlet context. Note that getAttribute is the only method that the servlet uses,
+		// hence the other methods are not implemented.
+		@Override
+		public ServletContext getServletContext()
+		{
+			return new ServletContext()
+			{
+
+				@Override
+				public Object getAttribute(String arg0)
+				{
+					return getServletAttribute(arg0);
+				}
+
+				@Override
+				public Enumeration getAttributeNames()
+				{
+					return null;
+				}
+
+				@Override
+				public String getContextPath()
+				{
+					return null;
+				}
+
+				@Override
+				public ServletContext getContext(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public String getInitParameter(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public Enumeration getInitParameterNames()
+				{
+					return null;
+				}
+
+				@Override
+				public boolean setInitParameter(String name, String value)
+				{
+					return false;
+				}
+
+				@Override
+				public int getMajorVersion()
+				{
+					return 0;
+				}
+
+				@Override
+				public String getMimeType(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public int getMinorVersion()
+				{
+					return 0;
+				}
+
+				@Override
+				public int getEffectiveMajorVersion()
+				{
+					return 0;
+				}
+
+				@Override
+				public int getEffectiveMinorVersion()
+				{
+					return 0;
+				}
+
+				@Override
+				public RequestDispatcher getNamedDispatcher(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public String getRealPath(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public RequestDispatcher getRequestDispatcher(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public URL getResource(String arg0) throws MalformedURLException
+				{
+					return null;
+				}
+
+				@Override
+				public InputStream getResourceAsStream(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public Set getResourcePaths(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public String getServerInfo()
+				{
+					return null;
+				}
+
+				@Override
+				public Servlet getServlet(String arg0) throws ServletException
+				{
+					return null;
+				}
+
+				@Override
+				public String getServletContextName()
+				{
+					return null;
+				}
+
+				@Override
+				public ServletRegistration.Dynamic addServlet(String servletName, String className)
+				{
+					return null;
+				}
+
+				@Override
+				public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet)
+				{
+					return null;
+				}
+
+				@Override
+				public ServletRegistration.Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass)
+				{
+					return null;
+				}
+
+				@Override
+				public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException
+				{
+					return null;
+				}
+
+				@Override
+				public ServletRegistration getServletRegistration(String servletName)
+				{
+					return null;
+				}
+
+				@Override
+				public Map<String, ? extends ServletRegistration> getServletRegistrations()
+				{
+					return null;
+				}
+
+				@Override
+				public FilterRegistration.Dynamic addFilter(String filterName, String className)
+				{
+					return null;
+				}
+
+				@Override
+				public FilterRegistration.Dynamic addFilter(String filterName, Filter filter)
+				{
+					return null;
+				}
+
+				@Override
+				public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass)
+				{
+					return null;
+				}
+
+				@Override
+				public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException
+				{
+					return null;
+				}
+
+				@Override
+				public FilterRegistration getFilterRegistration(String filterName)
+				{
+					return null;
+				}
+
+				@Override
+				public Map<String, ? extends FilterRegistration> getFilterRegistrations()
+				{
+					return null;
+				}
+
+				@Override
+				public SessionCookieConfig getSessionCookieConfig()
+				{
+					return null;
+				}
+
+				@Override
+				public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes)
+				{
+
+				}
+
+				@Override
+				public Set<SessionTrackingMode> getDefaultSessionTrackingModes()
+				{
+					return null;
+				}
+
+				@Override
+				public Set<SessionTrackingMode> getEffectiveSessionTrackingModes()
+				{
+					return null;
+				}
+
+				@Override
+				public void addListener(String className)
+				{
+
+				}
+
+				@Override
+				public <T extends EventListener> void addListener(T t)
+				{
+
+				}
+
+				@Override
+				public void addListener(Class<? extends EventListener> listenerClass)
+				{
+
+				}
+
+				@Override
+				public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException
+				{
+					return null;
+				}
+
+				@Override
+				public JspConfigDescriptor getJspConfigDescriptor()
+				{
+					return null;
+				}
+
+				@Override
+				public ClassLoader getClassLoader()
+				{
+					return null;
+				}
+
+				@Override
+				public void declareRoles(String... roleNames)
+				{
+
+				}
+
+				@Override
+				public Enumeration getServletNames()
+				{
+					return null;
+				}
+
+				@Override
+				public Enumeration getServlets()
+				{
+					return null;
+				}
+
+				@Override
+				public void log(String arg0)
+				{
+				}
+
+				@Override
+				public void log(Exception arg0, String arg1)
+				{
+				}
+
+				@Override
+				public void log(String arg0, Throwable arg1)
+				{
+				}
+
+				@Override
+				public void removeAttribute(String arg0)
+				{
+				}
+
+				@Override
+				public void setAttribute(String arg0, Object arg1)
+				{
+				}
+			};
+		}
+
+		@Override
+		public String getServletName()
+		{
+			return "OpenCMIS";
+		}
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/CMISWebScript.java b/remote-api/src/main/java/org/alfresco/opencmis/CMISWebScript.java
new file mode 100644
index 00000000000..beddd717f75
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/CMISWebScript.java
@@ -0,0 +1,61 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import java.io.IOException;
+
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * An Alfresco web script that handles dispatch of OpenCMIS requests.
+ * 
+ * @author steveglover
+ *
+ */
+public class CMISWebScript extends AbstractWebScript
+{
+	private CMISDispatcherRegistry registry;
+	
+    public void setRegistry(CMISDispatcherRegistry registry)
+    {
+		this.registry = registry;
+	}
+
+	public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        CMISDispatcher dispatcher = registry.getDispatcher(req);
+        if(dispatcher == null)
+        {
+        	res.setStatus(404);	
+        }
+        else
+        {
+        	dispatcher.execute(req, res);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/DefaultBaseUrlGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/DefaultBaseUrlGenerator.java
new file mode 100644
index 00000000000..098c7223826
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/DefaultBaseUrlGenerator.java
@@ -0,0 +1,74 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Generates an OpenCMIS base url based on the request, repository id and binding. The url scheme, host and port
+ * are overridden by a property from repository.properties or in an override file.
+ * 
+ * @author steveglover
+ *
+ */
+public class DefaultBaseUrlGenerator extends AbstractBaseUrlGenerator
+{
+    private boolean overrideServer;
+    private String serverOverride;
+
+	public DefaultBaseUrlGenerator()
+	{
+	}
+
+	public void setOverrideServer(boolean overrideServer)
+	{
+		this.overrideServer = overrideServer;
+	}
+
+	public void setServerOverride(String serverOverride)
+	{
+		this.serverOverride = serverOverride;
+	}
+	
+	protected String getServerPath(HttpServletRequest request)
+	{
+		if(overrideServer)
+		{
+			return serverOverride;
+		}
+		else
+		{
+			StringBuilder sb = new StringBuilder();
+			sb.append(request.getScheme());
+			sb.append("://");
+			sb.append(request.getServerName());
+			sb.append(":");
+			sb.append(request.getServerPort());
+			return sb.toString();
+		}
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/DefaultPathGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/DefaultPathGenerator.java
new file mode 100644
index 00000000000..b5b59f7f23d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/DefaultPathGenerator.java
@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
+import org.alfresco.repo.tenant.TenantUtil;
+
+/**
+ * Default generator for OpenCMIS paths based on the repositoryId and binding.
+ * 
+ * @author steveglover
+ *
+ */
+public class DefaultPathGenerator implements PathGenerator
+{
+	public void generatePath(HttpServletRequest req, StringBuilder url, String repositoryId, Binding binding)
+	{
+	    url.append(binding.toString());
+	    url.append("/");
+	    if(repositoryId != null)
+	    {
+	        url.append(repositoryId);
+	    }
+	    else
+	    {
+	        url.append(TenantUtil.DEFAULT_TENANT);
+	    }
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/PathGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/PathGenerator.java
new file mode 100644
index 00000000000..f7031cdc476
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/PathGenerator.java
@@ -0,0 +1,41 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
+
+/**
+ * Generates an OpenCMIS path based on the repositoryId and binding.
+ * 
+ * @author steveglover
+ *
+ */
+public interface PathGenerator
+{
+	public void generatePath(HttpServletRequest req, StringBuilder url, String repositoryId, Binding binding);
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/ProxyBaseUrlGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/ProxyBaseUrlGenerator.java
new file mode 100644
index 00000000000..2b5c25bbb6f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/ProxyBaseUrlGenerator.java
@@ -0,0 +1,101 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Generates an OpenCMIS base url based on the request, repository id and binding. The url scheme, host and port
+ * are overridden by any proxy http header parameters, if present.
+ * 
+ * @author steveglover
+ *
+ */
+public class ProxyBaseUrlGenerator extends AbstractBaseUrlGenerator
+{
+    public static final String FORWARDED_HOST_HEADER = "X-Forwarded-Host";
+    public static final String FORWARDED_PROTO_HEADER = "X-Forwarded-Proto";
+    public static final String HTTPS_SCHEME = "https";
+    public static final String HTTP_SCHEME = "http";
+
+	@Override
+	protected String getServerPath(HttpServletRequest request)
+	{
+        String scheme = request.getHeader(FORWARDED_PROTO_HEADER);
+        String serverName;
+        int serverPort;
+
+        if (!HTTP_SCHEME.equalsIgnoreCase(scheme) && !HTTPS_SCHEME.equalsIgnoreCase(scheme))
+        {
+            scheme = request.getScheme();
+        }
+
+        serverName = request.getServerName();
+        serverPort = request.getServerPort();
+
+        String host = request.getHeader(FORWARDED_HOST_HEADER);
+        if ((host != null) && (host.length() > 0))
+        {
+            int index = host.indexOf(':');
+            if (index < 0)
+            {
+                serverName = host;
+                serverPort = getDefaultPort(scheme);
+            }
+            else
+            {
+                serverName = host.substring(0, index);
+                try
+                {
+                    serverPort = Integer.parseInt(host.substring(index + 1));
+                }
+                catch (NumberFormatException e)
+                {
+                    serverPort = getDefaultPort(scheme);
+                }
+            }
+        }
+
+		StringBuilder sb = new StringBuilder();
+		sb.append(scheme);
+		sb.append("://");
+		sb.append(serverName);
+		sb.append(":");
+		sb.append(serverPort);
+		return sb.toString();
+	}
+
+    private int getDefaultPort(String scheme)
+    {
+        if (HTTPS_SCHEME.equalsIgnoreCase(scheme))
+        {
+            return 443;
+        }
+
+        return 80;
+    }
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/PublicApiAlfrescoCmisService.java b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiAlfrescoCmisService.java
new file mode 100644
index 00000000000..aa5efe6beb6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiAlfrescoCmisService.java
@@ -0,0 +1,225 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.tenant.Network;
+import org.alfresco.repo.tenant.NetworksService;
+import org.alfresco.repo.tenant.TenantAdminService;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.util.FileFilterMode;
+import org.alfresco.util.FileFilterMode.Client;
+import org.apache.chemistry.opencmis.commons.data.Acl;
+import org.apache.chemistry.opencmis.commons.data.ContentStream;
+import org.apache.chemistry.opencmis.commons.data.ExtensionsData;
+import org.apache.chemistry.opencmis.commons.data.Properties;
+import org.apache.chemistry.opencmis.commons.data.RepositoryInfo;
+import org.apache.chemistry.opencmis.commons.enums.VersioningState;
+import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryInfoImpl;
+import org.apache.chemistry.opencmis.commons.spi.Holder;
+
+/**
+ * Override OpenCMIS service object - for public api
+ * 
+ * @author sglover
+ * @since PublicApi1.0
+ */
+public class PublicApiAlfrescoCmisService extends AlfrescoCmisServiceImpl
+{
+	protected CMISConnector connector;
+    protected TenantAdminService tenantAdminService;
+    protected NetworksService networksService;
+    
+    public PublicApiAlfrescoCmisService(CMISConnector connector, TenantAdminService tenantAdminService, NetworksService networksService)
+    {
+        super(connector);
+        
+        this.connector = connector;
+        this.networksService = networksService;
+        this.tenantAdminService = tenantAdminService;
+    }
+    
+    @Override
+    public String create(String repositoryId, Properties properties, String folderId,
+                ContentStream contentStream, VersioningState versioningState,
+                List<String> policies, ExtensionsData extension)
+    {
+        FileFilterMode.setClient(Client.cmis);
+        try
+        {
+            return super.create(
+                        repositoryId,
+                        properties,
+                        folderId,
+                        contentStream,
+                        versioningState,
+                        policies,
+                        extension);
+        }
+        finally
+        {
+            FileFilterMode.clearClient();
+        }
+    }
+
+
+    /**
+     * Overridden to capture content upload for publishing to analytics service.
+     */
+    @Override
+    public String createDocument(String repositoryId, Properties properties, String folderId,
+                ContentStream contentStream, VersioningState versioningState,
+                List<String> policies, Acl addAces, Acl removeAces, ExtensionsData extension)
+    {
+        String newId = super.createDocument(
+                    repositoryId,
+                    properties,
+                    folderId,
+                    contentStream,
+                    versioningState,
+                    policies,
+                    addAces,
+                    removeAces,
+                    extension);
+        return newId;
+    }
+
+    /**
+     * Overridden to capture content upload for publishing to analytics service.
+     */
+    @Override
+    public void setContentStream(String repositoryId, Holder<String> objectId,
+                Boolean overwriteFlag, Holder<String> changeToken, ContentStream contentStream,
+                ExtensionsData extension)
+    {
+        FileFilterMode.setClient(Client.cmis);
+        try
+        {
+            super.setContentStream(repositoryId, objectId, overwriteFlag, changeToken, contentStream, extension);
+        }
+        finally
+        {
+            FileFilterMode.clearClient();
+        }
+    }
+
+    @Override
+    public List<RepositoryInfo> getRepositoryInfos(ExtensionsData extension)
+    {
+    	// for currently authenticated user
+    	PagingResults<Network> networks = networksService.getNetworks(new PagingRequest(0, Integer.MAX_VALUE));
+    	List<Network> page = networks.getPage();
+        final List<RepositoryInfo> repoInfos = new ArrayList<RepositoryInfo>(page.size() + 1);
+        for (Network network : page)
+        {
+            repoInfos.add(getRepositoryInfo(network));
+        }
+        return repoInfos;
+    }
+    
+    @Override
+    public RepositoryInfo getRepositoryInfo(String repositoryId, ExtensionsData extension)
+    {
+    	Network network = null;
+    	
+    	try
+    	{
+            checkRepositoryId(repositoryId);
+            network = networksService.getNetwork(repositoryId);
+    	}
+    	catch(Exception e)
+    	{
+    		// ACE-2540: Avoid information leak. Same response if repository does not exist or if user is not a member
+            throw new CmisObjectNotFoundException("Unknown repository '" + repositoryId + "'!");
+    	}
+
+        return getRepositoryInfo(network);
+    }
+
+    private RepositoryInfo getRepositoryInfo(final Network network)
+    {
+    	final String networkId = network.getTenantDomain();
+        final String tenantDomain = (networkId.equals(TenantUtil.SYSTEM_TENANT) || networkId.equals(TenantUtil.DEFAULT_TENANT)) ? TenantService.DEFAULT_DOMAIN : networkId;
+
+        return TenantUtil.runAsSystemTenant(new TenantRunAsWork<RepositoryInfo>()
+        {
+            public RepositoryInfo doWork()
+            {
+                RepositoryInfoImpl repoInfo = (RepositoryInfoImpl)connector.getRepositoryInfo(getContext().getCmisVersion());
+
+                repoInfo.setId(!networkId.equals("") ? networkId : TenantUtil.SYSTEM_TENANT);
+                repoInfo.setName(tenantDomain);
+                repoInfo.setDescription(tenantDomain);
+
+                return repoInfo;
+            }
+        }, tenantDomain);
+    }
+
+    @Override
+    public void checkRepositoryId(String repositoryId)
+    {
+        if(repositoryId.equals(TenantUtil.DEFAULT_TENANT) || repositoryId.equals(TenantUtil.SYSTEM_TENANT))
+        {
+            // TODO check for super admin
+            return;
+        }
+
+        if(!tenantAdminService.existsTenant(repositoryId) || !tenantAdminService.isEnabledTenant(repositoryId))
+        {
+            throw new CmisObjectNotFoundException("Unknown repository '" + repositoryId + "'!");
+        }
+    }
+    
+    @Override
+    public void beforeCall()
+    {
+        // NOTE: Don't invoke super beforeCall to exclude authentication which is already supported by
+        //       Web Script F/W
+        //super.beforeCall();
+    }
+    
+    @Override
+    public void afterCall()
+    {
+        // NOTE: Don't invoke super afterCall to exclude authentication which is already supported by
+        //       Web Script F/W
+        //super.afterCall();
+    }
+    
+    @Override
+    public void close()
+    {
+    	super.close();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/PublicApiAlfrescoCmisServiceFactory.java b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiAlfrescoCmisServiceFactory.java
new file mode 100644
index 00000000000..658f5f75420
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiAlfrescoCmisServiceFactory.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import org.alfresco.repo.tenant.NetworksService;
+import org.alfresco.repo.tenant.TenantAdminService;
+
+/**
+ * Override factory for OpenCMIS service objects - for public api
+ * 
+ * @author steveglover
+ * @author janv
+ * @since PublicApi1.0
+ */
+public class PublicApiAlfrescoCmisServiceFactory extends AlfrescoCmisServiceFactory
+{
+    private TenantAdminService tenantAdminService;
+    private NetworksService networksService;
+
+    public void setNetworksService(NetworksService networksService)
+    {
+		this.networksService = networksService;
+	}
+
+	public void setTenantAdminService(TenantAdminService tenantAdminService)
+    {
+        this.tenantAdminService = tenantAdminService;
+    }
+    
+    @Override
+    protected AlfrescoCmisService getCmisServiceTarget(CMISConnector connector)
+    {
+        return new PublicApiAlfrescoCmisService(connector, tenantAdminService, networksService);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/PublicApiAtomPubCMISDispatcher.java b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiAtomPubCMISDispatcher.java
new file mode 100644
index 00000000000..bdbfc5c7a44
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiAtomPubCMISDispatcher.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Dispatches OpenCMIS requests to the OpenCMIS AtomPub servlet.
+ * 
+ * @author steveglover
+ *
+ */
+public class PublicApiAtomPubCMISDispatcher extends AtomPubCMISDispatcher
+{
+	@Override
+	protected CMISHttpServletRequest getHttpRequest(WebScriptRequest req)
+	{
+		String serviceName = getServiceName();
+		CMISHttpServletRequest httpReqWrapper = new PublicApiCMISHttpServletRequest(req, serviceName, baseUrlGenerator,
+		        getBinding(), getCurrentDescriptor(), tenantAdminService);
+    	return httpReqWrapper;
+	}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/PublicApiBrowserCMISDispatcher.java b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiBrowserCMISDispatcher.java
new file mode 100644
index 00000000000..660dca0f1e6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiBrowserCMISDispatcher.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Cloud-specific browser binding OpenCMIS dispatcher.
+ * 
+ * @author steveglover
+ *
+ */
+public class PublicApiBrowserCMISDispatcher extends BrowserCMISDispatcher
+{
+	@Override
+	protected CMISHttpServletRequest getHttpRequest(WebScriptRequest req)
+	{
+		String serviceName = getServiceName();
+		CMISHttpServletRequest httpReqWrapper = new PublicApiCMISHttpServletRequest(req, serviceName,
+		        baseUrlGenerator, getBinding(), getCurrentDescriptor(), tenantAdminService);
+    	return httpReqWrapper;
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/PublicApiCMISHttpServletRequest.java b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiCMISHttpServletRequest.java
new file mode 100644
index 00000000000..ac175201a5c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiCMISHttpServletRequest.java
@@ -0,0 +1,67 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import java.util.Map;
+
+import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
+import org.alfresco.repo.tenant.TenantAdminService;
+import org.alfresco.service.descriptor.Descriptor;
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Wraps an OpenCMIS HttpServletRequest, mapping urls and adding servlet attributes specific to the Alfresco implementation of OpenCMIS.
+ */
+public class PublicApiCMISHttpServletRequest extends CMISHttpServletRequest
+{
+	public PublicApiCMISHttpServletRequest(WebScriptRequest req, String serviceName, BaseUrlGenerator baseUrlGenerator,
+			Binding binding, Descriptor currentDescriptor, TenantAdminService tenantAdminService)
+	{
+		super(req, serviceName, baseUrlGenerator, binding, currentDescriptor, tenantAdminService);
+	}
+
+	protected void addAttributes()
+	{
+		super.addAttributes();
+
+		Match match = req.getServiceMatch();
+		Map<String, String> templateVars = match.getTemplateVars();
+		String apiScope = templateVars.get("apiScope");
+		String apiVersion = templateVars.get("apiVersion");
+
+		if(apiScope != null)
+		{
+			httpReq.setAttribute("apiScope", apiScope);
+		}
+
+		if(apiVersion != null)
+		{
+			httpReq.setAttribute("apiVersion", apiVersion);
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/PublicApiPathGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiPathGenerator.java
new file mode 100644
index 00000000000..b88cffe4371
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/PublicApiPathGenerator.java
@@ -0,0 +1,63 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
+
+/**
+ * Cloud generator for OpenCMIS paths based on the repositoryId and binding.
+ * 
+ * @author steveglover
+ *
+ */
+public class PublicApiPathGenerator implements PathGenerator
+{
+	public void generatePath(HttpServletRequest req, StringBuilder url, String repositoryId, Binding binding)
+	{
+		url.append("{repositoryId}");
+	    url.append("/");
+	    
+	    String scope = (String)req.getAttribute("apiScope");
+	    String serviceName = (String)req.getAttribute("serviceName");
+	    String apiVersion = (String)req.getAttribute("apiVersion");
+	    if(scope == null)
+	    {
+	    	scope = "public";
+	    }
+	    url.append(scope);
+	    url.append("/");
+	    url.append(serviceName);
+	    url.append("/");
+	    url.append("versions");
+	    url.append("/");
+	    url.append(apiVersion);
+	    url.append("/");
+	    url.append(binding.toString());
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/opencmis/SysAdminParamsBaseUrlGenerator.java b/remote-api/src/main/java/org/alfresco/opencmis/SysAdminParamsBaseUrlGenerator.java
new file mode 100644
index 00000000000..d3c34ebf75a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/opencmis/SysAdminParamsBaseUrlGenerator.java
@@ -0,0 +1,90 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.repo.admin.SysAdminParams;
+
+/**
+ * Generates an OpenCMIS base url based on the request, repository id and binding. The url scheme, host and port
+ * are overridden by sys admin parameters.
+ * 
+ * @author steveglover
+ *
+ */
+public class SysAdminParamsBaseUrlGenerator extends AbstractBaseUrlGenerator
+{
+	private SysAdminParams sysAdminParams;
+	
+	protected String getServerPath(HttpServletRequest request)
+	{
+		StringBuilder sb = new StringBuilder();
+		sb.append(getServerScheme(request));
+		sb.append("://");
+		sb.append(getServerName(request));
+		sb.append(":");
+		sb.append(getServerPort(request));
+		return sb.toString();
+	}
+
+	protected String getServerScheme(HttpServletRequest request)
+	{
+		String scheme = sysAdminParams.getAlfrescoProtocol();
+        if (scheme == null)
+        {
+            scheme = request.getScheme();
+        }
+        scheme = request.getScheme();
+        return scheme;
+	}
+
+	protected String getServerName(HttpServletRequest request)
+	{
+		String hostname = sysAdminParams.getAlfrescoHost();
+        if (hostname == null)
+        {
+        	hostname = request.getScheme();
+        }
+        hostname = request.getServerName();
+        return hostname;
+	}
+	
+	protected int getServerPort(HttpServletRequest request)
+	{
+        Integer port = sysAdminParams.getAlfrescoPort();
+        if (port == null)
+        {
+            port = request.getServerPort();
+        }
+        if (port == null)
+        {
+            port = request.getServerPort();
+        }
+        return port;
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/SessionUser.java b/remote-api/src/main/java/org/alfresco/repo/SessionUser.java
new file mode 100644
index 00000000000..14717d3a19c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/SessionUser.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo;
+
+import java.io.Serializable;
+
+/**
+ * Contract implemented by any object that represents an Alfresco "user" that
+ * can be persisted in an HTTP Session. 
+ * 
+ * @author Kevin Roast
+ */
+public interface SessionUser extends Serializable
+{
+    /**
+     * Return the user name
+     * 
+     * @return user name
+     */
+    String getUserName();
+    
+    /**
+     * Return the ticket
+     * 
+     * @return ticket
+     */
+    String getTicket();
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/imap/scripts/ServerStatusWebScript.java b/remote-api/src/main/java/org/alfresco/repo/imap/scripts/ServerStatusWebScript.java
new file mode 100644
index 00000000000..e33416e7c80
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/imap/scripts/ServerStatusWebScript.java
@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.imap.scripts;
+
+import java.io.IOException;
+
+import org.alfresco.repo.imap.ImapService;
+import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * Shows the availability of the IMAP server via web script request.
+ */
+public class ServerStatusWebScript extends AbstractWebScript implements ApplicationContextAware
+{
+    private ApplicationContext applicationContext;
+    
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
+    {
+        this.applicationContext = applicationContext;
+    }
+    
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        ChildApplicationContextFactory subsystem = (ChildApplicationContextFactory)applicationContext.getBean("imap");
+        
+        // note: getting property (rather than getting imapService bean to check isEnabled) does not cause subsystem startup (if stopped)
+        // hence providing ability for subsystem to be disabled (whilst still supporting ability to check status and/or dynamically start via JMX)
+        String isEnabled = (String)subsystem.getProperty("imap.server.enabled");
+        
+        if (new Boolean(isEnabled).booleanValue())
+        {
+            res.getWriter().write("enabled");
+        }
+        else
+        {
+            res.getWriter().write("disabled");
+        }
+        res.getWriter().flush();
+        res.getWriter().close();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/surf/policy/SurfConfigCleaner.java b/remote-api/src/main/java/org/alfresco/repo/surf/policy/SurfConfigCleaner.java
new file mode 100644
index 00000000000..6cf5ed7bf56
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/surf/policy/SurfConfigCleaner.java
@@ -0,0 +1,102 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.surf.policy;
+
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy;
+import org.alfresco.repo.policy.JavaBehaviour;
+import org.alfresco.repo.policy.PolicyComponent;
+import org.alfresco.repo.web.scripts.bean.ADMRemoteStore;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * Delete Node Policy to remove surf-config files for a deleted user.
+ * 
+ * @author Dmitry Velichkevich
+ * @author Kevin Roast
+ */
+public class SurfConfigCleaner extends ADMRemoteStore implements BeforeDeleteNodePolicy
+{
+    private PolicyComponent policyComponent;
+
+    public void init()
+    {
+        this.policyComponent.bindClassBehaviour(
+                BeforeDeleteNodePolicy.QNAME,
+                ContentModel.TYPE_PERSON,
+                new JavaBehaviour(this, BeforeDeleteNodePolicy.QNAME.getLocalName()));
+    }
+
+    @Override
+    public void beforeDeleteNode(NodeRef nodeRef)
+    {
+        final String userName = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_USERNAME);
+        final NodeRef componentsRef = getGlobalComponentsNodeRef();
+        final NodeRef usersFolderRef = getGlobalUserFolderNodeRef();
+        
+        // Remove the user Surf config folder, contains dynamic page definitions such as dashboard.xml
+        // For example, qname path to user folder:
+        //  /app:company_home/st:sites/cm:surf-config/cm:pages/cm:user/cm:admin
+        //                                                                ^^^^^ encoded username
+        if (usersFolderRef != null)
+        {
+            NodeRef userFolderNodeRef = nodeService.getChildByName(usersFolderRef, ContentModel.ASSOC_CONTAINS, encodePath(userName));
+            if (userFolderNodeRef != null)
+            {
+                // CLOUD-2053: Need to set as temporary to delete node instead of archiving.
+                nodeService.addAspect(userFolderNodeRef, ContentModel.ASPECT_TEMPORARY, null);
+                nodeService.deleteNode(userFolderNodeRef);
+            }
+        }
+        
+        // Remove each component Surf config file related to the user, such as the dashboard dashlet component references
+        // For example, qname path to user component file:
+        //  /app:company_home/st:sites/cm:surf-config/cm:components/cm:page.component-1-1.user~admin~dashboard.xml
+        //                                                                                     ^^^^^ encoded username
+        if (componentsRef != null)
+        {
+            List<FileInfo> configNodes = getFileNodes(
+                    fileFolderService.getFileInfo(componentsRef),
+                    buildUserConfigSearchPattern(userName),
+                    true).getPage();
+            
+            for (FileInfo fileInfo : configNodes)
+            {
+                // CLOUD-2053: Need to set as temporary to delete node instead of archiving.
+                nodeService.addAspect(fileInfo.getNodeRef(), ContentModel.ASPECT_TEMPORARY, null);
+                nodeService.deleteNode(fileInfo.getNodeRef());
+            }
+        }
+    }
+
+    public void setPolicyComponent(PolicyComponent policyComponent)
+    {
+        this.policyComponent = policyComponent;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/auth/AuthenticationListener.java b/remote-api/src/main/java/org/alfresco/repo/web/auth/AuthenticationListener.java
new file mode 100644
index 00000000000..54df637f314
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/auth/AuthenticationListener.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.auth;
+
+/**
+ * AuthenticationListener implementations can receive notifications of successful and unsuccessful 
+ * authentication requests, made during web script, WebDav or Sharepoint requests.
+ * 
+ * @author Alex Miller
+ */
+public interface AuthenticationListener
+{
+    /**
+     * A user was successfully authenticated credentials.
+     */
+    public void userAuthenticated(WebCredentials credentials);
+
+    /**
+     * An authentication attempt, using credentials, failed with exception, ex.
+     */
+    public void authenticationFailed(WebCredentials credentials, Exception ex);
+
+    /**
+     * An authentication attempt, using credentials, failed. 
+     */
+    public void authenticationFailed(WebCredentials credentials);
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/auth/BasicAuthCredentials.java b/remote-api/src/main/java/org/alfresco/repo/web/auth/BasicAuthCredentials.java
new file mode 100644
index 00000000000..262ab358f7a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/auth/BasicAuthCredentials.java
@@ -0,0 +1,81 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.auth;
+
+import org.apache.commons.codec.digest.DigestUtils;
+
+/**
+ * {@link WebCredentials} holding username and the md5 hash of the password.
+ *
+ * @author Alex Miller
+ */
+public class BasicAuthCredentials implements WebCredentials
+{
+    private static final long serialVersionUID = 2626445241420904072L;
+
+    private String userName;
+    private String password;
+    
+    /**
+     * Default constructor 
+     */
+    public BasicAuthCredentials(String userName, String password)
+    {
+        this.userName = userName;
+        this.password = DigestUtils.md5Hex(password);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((this.password == null) ? 0 : this.password.hashCode());
+        result = prime * result + ((this.userName == null) ? 0 : this.userName.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
+        BasicAuthCredentials other = (BasicAuthCredentials) obj;
+        if (this.password == null)
+        {
+            if (other.password != null) { return false; }
+        }
+        else if (!this.password.equals(other.password)) { return false; }
+        if (this.userName == null)
+        {
+            if (other.userName != null) { return false; }
+        }
+        else if (!this.userName.equals(other.userName)) { return false; }
+        return true;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/auth/GuestCredentials.java b/remote-api/src/main/java/org/alfresco/repo/web/auth/GuestCredentials.java
new file mode 100644
index 00000000000..34267828521
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/auth/GuestCredentials.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.auth;
+
+
+/**
+ * {@link WebCredentials} representing a guest user.
+ *
+ * @author Alex Miller
+ */
+public class GuestCredentials implements WebCredentials
+{
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return getClass().equals(obj.getClass());
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return getClass().hashCode();
+    }
+
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/auth/KerberosCredentials.java b/remote-api/src/main/java/org/alfresco/repo/web/auth/KerberosCredentials.java
new file mode 100644
index 00000000000..d7b37427e2e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/auth/KerberosCredentials.java
@@ -0,0 +1,52 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.auth;
+
+import org.alfresco.jlan.server.auth.spnego.NegTokenInit;
+import org.alfresco.jlan.server.auth.spnego.NegTokenTarg;
+
+/**
+ * {@link WebCredentials} implementation for holding Kerberos credentials.
+ */
+public class KerberosCredentials implements WebCredentials
+{
+    private static final long serialVersionUID = 4625258932647351551L;
+
+    private NegTokenInit negToken;
+    private NegTokenTarg negTokenTarg;
+
+    public KerberosCredentials(NegTokenInit negToken, NegTokenTarg negTokenTarg)
+    {
+        this.negToken = negToken;
+        this.negTokenTarg = negTokenTarg;
+    }
+
+    public KerberosCredentials(NegTokenInit negToken)
+    {
+        this.negToken = negToken;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/auth/NoopAuthenticationListener.java b/remote-api/src/main/java/org/alfresco/repo/web/auth/NoopAuthenticationListener.java
new file mode 100644
index 00000000000..5cc7d8af3fb
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/auth/NoopAuthenticationListener.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.auth;
+
+
+/**
+ * {@link AuthenticationListener} that does nothing.
+ *
+ * @author Alex Miller
+ */
+public class NoopAuthenticationListener implements AuthenticationListener
+{
+    @Override
+    public void userAuthenticated(WebCredentials credentials)
+    {
+        // Noop
+    }
+
+    @Override
+    public void authenticationFailed(WebCredentials credentials)
+    {
+        // Noop
+    }
+
+    @Override
+    public void authenticationFailed(WebCredentials credentials, Exception ex)
+    {
+        // Noop
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/auth/TenantAuthentication.java b/remote-api/src/main/java/org/alfresco/repo/web/auth/TenantAuthentication.java
new file mode 100644
index 00000000000..3ee0e25d7a8
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/auth/TenantAuthentication.java
@@ -0,0 +1,38 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.auth;
+
+public interface TenantAuthentication
+{
+    /**
+     * Authenticate user against tenant
+     * 
+     * @param username String
+     * @param tenant String
+     * @return  true => authenticated, false => not authenticated
+     */
+    boolean authenticateTenant(String username, String tenant);
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/auth/TicketCredentials.java b/remote-api/src/main/java/org/alfresco/repo/web/auth/TicketCredentials.java
new file mode 100644
index 00000000000..15c91f302fb
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/auth/TicketCredentials.java
@@ -0,0 +1,68 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.auth;
+
+
+/**
+ * {@link WebCredentials} class for holding Alfresco tickets.
+ *
+ * @author Alex Miller
+ */
+public class TicketCredentials implements WebCredentials
+{
+    private static final long serialVersionUID = -8255499275655719748L;
+
+    private String ticket;
+
+    public TicketCredentials(String ticket)
+    {
+        this.ticket = ticket;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((this.ticket == null) ? 0 : this.ticket.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
+        TicketCredentials other = (TicketCredentials) obj;
+        if (this.ticket == null)
+        {
+            if (other.ticket != null) { return false; }
+        }
+        else if (!this.ticket.equals(other.ticket)) { return false; }
+        return true;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/auth/UnknownCredentials.java b/remote-api/src/main/java/org/alfresco/repo/web/auth/UnknownCredentials.java
new file mode 100644
index 00000000000..4ac54349ea6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/auth/UnknownCredentials.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.auth;
+
+
+/**
+ * {@link WebCredentials} where credentials are undetermined.
+ *
+ * @author Alex Miller
+ */
+public class UnknownCredentials implements WebCredentials
+{
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return getClass().equals(obj.getClass());
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return getClass().hashCode();
+    }
+
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/auth/WebCredentials.java b/remote-api/src/main/java/org/alfresco/repo/web/auth/WebCredentials.java
new file mode 100644
index 00000000000..64305057089
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/auth/WebCredentials.java
@@ -0,0 +1,40 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.auth;
+
+import java.io.Serializable;
+
+/**
+ * WebScriptCredentials interface.
+ * 
+ * Passed to {@link AuthenticationListener}s with credentials used in an authentication attempt.
+ *
+ * @author Alex Miller
+ */
+public interface WebCredentials extends Serializable
+{
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/BeanProxyFilter.java b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/BeanProxyFilter.java
new file mode 100644
index 00000000000..5d0535ec50d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/BeanProxyFilter.java
@@ -0,0 +1,91 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.filter.beans;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * An adapter from the servlet filter world into the Spring dependency injected world. Simply looks up a
+ * {@link DependencyInjectedFilter} with a configured bean name and delegates the
+ * {@link #doFilter(ServletRequest, ServletResponse, FilterChain)} call to that. This allows us to swap in and out
+ * different implementations for different 'hook points' in web.xml.
+ * 
+ * @author dward
+ */
+public class BeanProxyFilter implements Filter
+{
+    /**
+     * Name of the init parameter that carries the proxied bean name 
+     */
+    private static final String INIT_PARAM_BEAN_NAME = "beanName";
+    
+    private DependencyInjectedFilter filter;
+    private ServletContext context;    
+    
+    /**
+     * Initialize the filter.
+     * 
+     * @param args
+     *            FilterConfig
+     * @throws ServletException
+     *             the servlet exception
+     * @exception ServletException
+     */
+    public void init(FilterConfig args) throws ServletException
+    {
+        WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(args.getServletContext());
+        this.filter = (DependencyInjectedFilter)ctx.getBean(args.getInitParameter(INIT_PARAM_BEAN_NAME));
+        this.context = args.getServletContext();
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.Filter#destroy()
+     */
+    public void destroy()
+    {
+        this.filter = null;
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
+     */
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
+            ServletException
+    {
+        this.filter.doFilter(this.context, request, response, chain);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/DependencyInjectedFilter.java b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/DependencyInjectedFilter.java
new file mode 100644
index 00000000000..ebe501ef0f9
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/DependencyInjectedFilter.java
@@ -0,0 +1,63 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.filter.beans;
+
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+/**
+ * A bean-like equivalent of a servlet filter, designed to be managed by a Spring container.
+ * 
+ * @see BeanProxyFilter
+ * @author dward
+ */
+public interface DependencyInjectedFilter
+{
+    /**
+     * The <code>doFilter</code> method of the Filter is called by the container each time a request/response pair is
+     * passed through the chain due to a client request for a resource at the end of the chain. The FilterChain passed
+     * in to this method allows the Filter to pass on the request and response to the next entity in the chain.
+     * <p>
+     * A typical implementation of this method would follow the following pattern:- <br>
+     * 1. Examine the request<br>
+     * 2. Optionally wrap the request object with a custom implementation to filter content or headers for input
+     * filtering <br>
+     * 3. Optionally wrap the response object with a custom implementation to filter content or headers for output
+     * filtering <br>
+     * 4. a) <strong>Either</strong> invoke the next entity in the chain using the FilterChain object (
+     * <code>chain.doFilter()</code>), <br>
+     * 4. b) <strong>or</strong> not pass on the request/response pair to the next entity in the filter chain to block
+     * the request processing<br>
+     * 5. Directly set headers on the response after invocation of the next entity in the filter chain.
+     **/
+    public void doFilter(ServletContext context, ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
+            ServletException;
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/NullFilter.java b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/NullFilter.java
new file mode 100644
index 00000000000..a542cdeb265
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/NullFilter.java
@@ -0,0 +1,79 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.filter.beans;
+
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.alfresco.repo.management.subsystems.ActivateableBean;
+
+/**
+ * A Benign filter that does nothing more than invoke the filter chain. Allows strategic points of the filter chain to
+ * be configured in and out according to the authentication subsystem in use.
+ * 
+ * @author dward
+ */
+public class NullFilter implements DependencyInjectedFilter, ActivateableBean
+{
+    private boolean isActive = true;
+
+    /**
+     * Activates or deactivates the bean
+     * 
+     * @param active
+     *            <code>true</code> if the bean is active and initialization should complete
+     */
+    public void setActive(boolean active)
+    {
+        this.isActive = active;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.management.subsystems.ActivateableBean#isActive()
+     */
+    public boolean isActive()
+    {
+        return this.isActive;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.repo.web.filter.beans.DependencyInjectedFilter#doFilter(javax.servlet.ServletContext,
+     * javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
+     */
+    public void doFilter(ServletContext context, ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException
+    {
+        chain.doFilter(request, response);
+    }
+    
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/SessionSynchronizedFilter.java b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/SessionSynchronizedFilter.java
new file mode 100644
index 00000000000..3d398d0acb3
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/filter/beans/SessionSynchronizedFilter.java
@@ -0,0 +1,83 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.filter.beans;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+/**
+ * A filter that will use the HttpSession (if it exists) as the monitor for a
+ * synchronized block so that only one request per session is processed at any
+ * time.
+ * 
+ * Originally created to avoid having to make 200+ JSF session scoped beans thread
+ * safe.
+ * 
+ * @author Alan Davis
+ * @deprecated 5.0 not exposed in web-client web.xml
+ */
+public class SessionSynchronizedFilter implements Filter
+{
+    @Override
+    public void init(FilterConfig arg0) throws ServletException
+    {
+    }
+
+    @Override
+    public void destroy()
+    {
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response,
+            FilterChain chain) throws IOException, ServletException
+    {
+        HttpSession session = null;
+        if (request instanceof HttpServletRequest)
+        {
+            session = ((HttpServletRequest)request).getSession(false);
+        }
+        if (session != null)
+        {
+            synchronized(session)
+            {
+                chain.doFilter(request, response);
+            }
+        }
+        else
+        {
+            chain.doFilter(request, response);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/AlfrescoRhinoScriptDebugger.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/AlfrescoRhinoScriptDebugger.java
new file mode 100644
index 00000000000..0904fecff88
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/AlfrescoRhinoScriptDebugger.java
@@ -0,0 +1,96 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.mozilla.javascript.ContextFactory;
+import org.mozilla.javascript.tools.debugger.Dim;
+import org.mozilla.javascript.tools.debugger.SwingGui;
+import org.springframework.extensions.webscripts.ScriptDebugger;
+
+
+/**
+ * Alfresco implementation of Rhino JavaScript debugger
+ * 
+ * Provides support for authenticated access to object inspection.
+ * 
+ * @author davidc
+ */
+public class AlfrescoRhinoScriptDebugger extends ScriptDebugger
+{
+    private static final Log logger = LogFactory.getLog(AlfrescoRhinoScriptDebugger.class);
+    
+    // Logger
+    private ContextFactory factory = null;
+    private SwingGui gui = null;
+    
+    
+    @Override
+    protected void initDebugger()
+    {
+        dim = new AlfrescoDim();
+    }
+    
+    @Override
+    public void start()
+    {
+        if (logger.isDebugEnabled())
+        {
+            activate();
+            show();
+        }
+    }
+    
+    @Override
+    protected String getTitle()
+    {
+        return "Alfresco Repository JavaScript Debugger";
+    }
+
+
+    public static class AlfrescoDim extends Dim
+    {
+        /* (non-Javadoc)
+         * @see org.mozilla.javascript.tools.debugger.Dim#objectToString(java.lang.Object)
+         */
+        @Override
+        public String objectToString(final Object arg0)
+        {
+            // execute command in context of currently selected user
+            return AuthenticationUtil.runAs(new RunAsWork<String>()
+            {
+                @SuppressWarnings("synthetic-access")
+                public String doWork() throws Exception
+                {
+                    return AlfrescoDim.super.objectToString(arg0);
+                }
+            }, AuthenticationUtil.getSystemUserName());
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/AlfrescoWebScriptServlet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/AlfrescoWebScriptServlet.java
new file mode 100644
index 00000000000..a09470deaa2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/AlfrescoWebScriptServlet.java
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.springframework.extensions.webscripts.servlet.WebScriptServlet;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class AlfrescoWebScriptServlet extends WebScriptServlet
+{
+    @Override
+    protected void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+    {
+        try
+        {
+            super.service(req, res);
+        }
+        finally
+        {
+            AuthenticationUtil.clearCurrentSecurityContext();
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/BufferedRequest.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/BufferedRequest.java
new file mode 100644
index 00000000000..a655e2b6312
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/BufferedRequest.java
@@ -0,0 +1,405 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import org.springframework.extensions.surf.util.Content;
+import org.springframework.extensions.webscripts.Description.FormatStyle;
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.Runtime;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
+import org.springframework.util.FileCopyUtils;
+
+public class BufferedRequest implements WrappingWebScriptRequest
+{
+    private TempOutputStreamFactory streamFactory;
+    private WebScriptRequest req;
+    private TempOutputStream bufferStream;
+    private InputStream contentStream;
+    private BufferedReader contentReader;
+    
+    public BufferedRequest(WebScriptRequest req, TempOutputStreamFactory streamFactory)
+    {
+        this.req = req;
+        this.streamFactory = streamFactory;
+    }
+
+    private TempOutputStream getBufferedBodyAsTempStream() throws IOException
+    {
+        if (bufferStream == null)
+        {
+            bufferStream = streamFactory.createOutputStream();
+
+            try
+            {
+                // Copy the stream
+                FileCopyUtils.copy(req.getContent().getInputStream(), bufferStream);
+            }
+            catch (IOException e)
+            {
+                bufferStream.destroy();
+                throw e;
+            }
+        }
+
+        return bufferStream;
+    }
+
+    private InputStream bufferInputStream() throws IOException
+    {
+        if (contentReader != null)
+        {
+            throw new IllegalStateException("Reader in use");
+        }
+        if (contentStream == null)
+        {
+            contentStream = getBufferedBodyAsTempStream().getInputStream();
+        }
+
+        return contentStream;
+    }
+
+    public void reset()
+    {
+        if (contentStream != null)
+        {
+            try
+            {
+                contentStream.close();
+            }
+            catch (Exception e)
+            {
+            }
+            contentStream = null;
+        }
+        if (contentReader != null)
+        {
+            try
+            {
+                contentReader.close();
+            }
+            catch (Exception e)
+            {
+            }
+            contentReader = null;
+        }
+    }
+    
+    public void close()
+    {
+        reset();
+        if (bufferStream != null)
+        {
+            try
+            {
+                bufferStream.destroy();
+            }
+            catch (Exception e)
+            {
+            }
+            bufferStream = null;
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WrappingWebScriptRequest#getNext()
+     */
+    @Override
+    public WebScriptRequest getNext()
+    {
+        return req;
+    }
+
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#forceSuccessStatus()
+     */
+    @Override
+    public boolean forceSuccessStatus()
+    {
+        return req.forceSuccessStatus();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getAgent()
+     */
+    @Override
+    public String getAgent()
+    {
+        return req.getAgent();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getContent()
+     */
+    @Override
+    public Content getContent()
+    {
+        final Content wrapped = req.getContent();
+        return new Content(){
+
+            @Override
+            public String getContent() throws IOException
+            {
+                return wrapped.getContent();
+            }
+
+            @Override
+            public String getEncoding()
+            {
+                return wrapped.getEncoding();
+            }
+
+            @Override
+            public String getMimetype()
+            {
+                return wrapped.getMimetype();
+            }
+
+
+            @Override
+            public long getSize()
+            {
+                return wrapped.getSize();
+            }
+     
+            @Override
+            public InputStream getInputStream()
+            {
+                if (BufferedRequest.this.contentReader != null)
+                {
+                    throw new IllegalStateException("Reader in use");
+                }
+                if (BufferedRequest.this.contentStream == null)
+                {
+                    try
+                    {
+                        BufferedRequest.this.contentStream = bufferInputStream();
+                    }
+                    catch (IOException e)
+                    {
+                        throw new RuntimeException(e);
+                    }
+                }
+                return BufferedRequest.this.contentStream;
+            }
+
+            @Override
+            public BufferedReader getReader() throws IOException
+            {
+                if (BufferedRequest.this.contentStream != null)
+                {
+                    throw new IllegalStateException("Input Stream in use");
+                }
+                if (BufferedRequest.this.contentReader == null)
+                {
+                    String encoding = wrapped.getEncoding();
+                    InputStream in = bufferInputStream();
+                    BufferedRequest.this.contentReader = new BufferedReader(new InputStreamReader(in, encoding == null ? "ISO-8859-1" : encoding));
+                }
+                return BufferedRequest.this.contentReader;
+            }
+        };
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getContentType()
+     */
+    @Override
+    public String getContentType()
+    {
+        return req.getContentType();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getContextPath()
+     */
+    @Override
+    public String getContextPath()
+    {
+        return req.getContextPath();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getExtensionPath()
+     */
+    @Override
+    public String getExtensionPath()
+    {
+        return req.getExtensionPath();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getFormat()
+     */
+    @Override
+    public String getFormat()
+    {
+        return req.getFormat();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getFormatStyle()
+     */
+    @Override
+    public FormatStyle getFormatStyle()
+    {
+        return req.getFormatStyle();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getHeader(java.lang.String)
+     */
+    @Override
+    public String getHeader(String name)
+    {
+        return req.getHeader(name);
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getHeaderNames()
+     */
+    @Override
+    public String[] getHeaderNames()
+    {
+        return req.getHeaderNames();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getHeaderValues(java.lang.String)
+     */
+    @Override
+    public String[] getHeaderValues(String name)
+    {
+        return req.getHeaderValues(name);
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getJSONCallback()
+     */
+    @Override
+    public String getJSONCallback()
+    {
+        return req.getJSONCallback();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getParameter(java.lang.String)
+     */
+    @Override
+    public String getParameter(String name)
+    {
+        return req.getParameter(name);
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getParameterNames()
+     */
+    @Override
+    public String[] getParameterNames()
+    {
+        return req.getParameterNames();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getParameterValues(java.lang.String)
+     */
+    @Override
+    public String[] getParameterValues(String name)
+    {
+        return req.getParameterValues(name);
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getPathInfo()
+     */
+    @Override
+    public String getPathInfo()
+    {
+        return req.getPathInfo();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getQueryString()
+     */
+    @Override
+    public String getQueryString()
+    {
+        return req.getQueryString();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getRuntime()
+     */
+    @Override
+    public Runtime getRuntime()
+    {
+        return req.getRuntime();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getServerPath()
+     */
+    @Override
+    public String getServerPath()
+    {
+        return req.getServerPath();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getServiceContextPath()
+     */
+    @Override
+    public String getServiceContextPath()
+    {
+        return req.getServiceContextPath();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getServiceMatch()
+     */
+    @Override
+    public Match getServiceMatch()
+    {
+        return req.getServiceMatch();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getServicePath()
+     */
+    @Override
+    public String getServicePath()
+    {
+        return req.getServicePath();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#getURL()
+     */
+    @Override
+    public String getURL()
+    {
+        return req.getURL();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#isGuest()
+     */
+    @Override
+    public boolean isGuest()
+    {
+        return req.isGuest();
+    }
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptRequest#parseContent()
+     */
+    @Override
+    public Object parseContent()
+    {
+        return req.parseContent();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/BufferedResponse.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/BufferedResponse.java
new file mode 100644
index 00000000000..f5811b01adc
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/BufferedResponse.java
@@ -0,0 +1,281 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.StringBuilderWriter;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Runtime;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.WrappingWebScriptResponse;
+import org.springframework.util.FileCopyUtils;
+
+/**
+ * Transactional Buffered Response
+ */
+public class BufferedResponse implements WrappingWebScriptResponse
+{
+    // Logger
+    protected static final Log logger = LogFactory.getLog(BufferedResponse.class);
+
+    private TempOutputStreamFactory streamFactory;
+    private WebScriptResponse res;
+    private int bufferSize;
+    private TempOutputStream outputStream = null;
+    private StringBuilderWriter outputWriter = null;
+    
+
+    /**
+     * Construct
+     * 
+     * @param res WebScriptResponse
+     * @param bufferSize int
+     */
+    public BufferedResponse(WebScriptResponse res, int bufferSize, TempOutputStreamFactory streamFactory)
+    {
+        this.res = res;
+        this.bufferSize = bufferSize;
+        this.streamFactory = streamFactory;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.web.scripts.WrappingWebScriptResponse#getNext()
+     */
+    public WebScriptResponse getNext()
+    {
+        return res;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptResponse#addHeader(java.lang.String, java.lang.String)
+     */
+    public void addHeader(String name, String value)
+    {
+        res.addHeader(name, value);
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptResponse#encodeScriptUrl(java.lang.String)
+     */
+    public String encodeScriptUrl(String url)
+    {
+        return res.encodeScriptUrl(url);
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptResponse#getEncodeScriptUrlFunction(java.lang.String)
+     */
+    public String getEncodeScriptUrlFunction(String name)
+    {
+        return res.getEncodeScriptUrlFunction(name);
+    }
+
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptResponse#encodeResourceUrl(java.lang.String)
+     */
+    public String encodeResourceUrl(String url)
+    {
+        return res.encodeResourceUrl(url);
+    }
+
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.WebScriptResponse#getEncodeResourceUrlFunction(java.lang.String)
+     */
+    public String getEncodeResourceUrlFunction(String name)
+    {
+        return res.getEncodeResourceUrlFunction(name);
+    }
+    
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptResponse#getOutputStream()
+     */
+    public OutputStream getOutputStream() throws IOException
+    {
+        if (outputStream == null)
+        {
+            if (outputWriter != null)
+            {
+                throw new AlfrescoRuntimeException("Already buffering output writer");
+            }
+            outputStream = streamFactory.createOutputStream();
+        }
+        return outputStream;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptResponse#getRuntime()
+     */
+    public Runtime getRuntime()
+    {
+        return res.getRuntime();
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptResponse#getWriter()
+     */
+    public Writer getWriter() throws IOException
+    {
+        if (outputWriter == null)
+        {
+            if (outputStream != null)
+            {
+                throw new AlfrescoRuntimeException("Already buffering output stream");
+            }
+            outputWriter = new StringBuilderWriter(bufferSize);
+        }
+        return outputWriter;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptResponse#reset()
+     */
+    public void reset()
+    {
+        if (outputStream != null)
+        {
+            outputStream = null;
+        }
+        else if (outputWriter != null)
+        {
+            outputWriter = null;
+        }
+        res.reset();
+    }
+
+    /* (non-Javadoc)
+     * @see org./alfresco.web.scripts.WebScriptResponse#resetjava.lang.String)
+     */
+    public void reset(String preserveHeadersPattern)
+    {
+        if (outputStream != null)
+        {
+            outputStream = null;
+        }
+        else if (outputWriter != null)
+        {
+            outputWriter = null;
+        }
+        res.reset(preserveHeadersPattern);
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptResponse#setCache(org.alfresco.web.scripts.Cache)
+     */
+    public void setCache(Cache cache)
+    {
+        res.setCache(cache);
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptResponse#setContentType(java.lang.String)
+     */
+    public void setContentType(String contentType)
+    {
+        res.setContentType(contentType);
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptResponse#setContentEncoding(java.lang.String)
+     */
+    public void setContentEncoding(String contentEncoding)
+    {
+        res.setContentEncoding(contentEncoding);
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptResponse#setHeader(java.lang.String, java.lang.String)
+     */
+    public void setHeader(String name, String value)
+    {
+        res.setHeader(name, value);
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptResponse#setStatus(int)
+     */
+    public void setStatus(int status)
+    {
+        res.setStatus(status);
+    }
+
+    /**
+     * Write buffered response to underlying response
+     */
+    public void writeResponse()
+    {
+        try
+        {
+            if (logger.isDebugEnabled() && outputStream != null)
+            {
+                logger.debug("Writing Transactional response: size=" + outputStream.getLength());
+            }
+            
+            if (outputWriter != null)
+            {
+                outputWriter.flush();
+                res.getWriter().write(outputWriter.toString());
+            }
+            else if (outputStream != null)
+            {
+                if (logger.isDebugEnabled())
+                    logger.debug("Writing Transactional response: size=" + outputStream.getLength());
+
+                try
+                {
+                    outputStream.flush();
+                    FileCopyUtils.copy(outputStream.getInputStream(), res.getOutputStream());
+                }
+                finally
+                {
+                    outputStream.destroy();
+                }
+            }
+        }
+        catch (IOException e)
+        {
+            throw new AlfrescoRuntimeException("Failed to commit buffered response", e);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/DeclarativeSpreadsheetWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/DeclarativeSpreadsheetWebScript.java
new file mode 100644
index 00000000000..25ad2231d2c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/DeclarativeSpreadsheetWebScript.java
@@ -0,0 +1,427 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.apache.commons.csv.CSVPrinter;
+import org.apache.commons.csv.CSVFormat;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.ClientAnchor;
+import org.apache.poi.ss.usermodel.Comment;
+import org.apache.poi.ss.usermodel.Drawing;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+
+/**
+ * Parent of Declarative Webscripts that generate Excel files,
+ *  usually based on some sort of dictionary model.
+ * 
+ * @author Nick Burch
+ */
+public abstract class DeclarativeSpreadsheetWebScript extends DeclarativeWebScript
+{
+    public static final String MODEL_CSV = "csv";
+    public static final String MODEL_EXCEL = "excel";
+    public static final String PARAM_REQ_DELIMITER = "delimiter";
+    
+    private CSVFormat csvFormat;
+    
+    protected DictionaryService dictionaryService;
+    protected String filenameBase;
+    
+    /**
+     * @param dictionaryService          the DictionaryService to set
+     */
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService;
+    }
+    
+    /**
+     * Identifies the resource for the webscript.
+     */
+    protected abstract Object identifyResource(String format, WebScriptRequest req);
+    
+    /**
+     * If the format is requested as HTML, should an exception be raised,
+     *  or should an HTML version be called?
+     */
+    protected abstract boolean allowHtmlFallback(); 
+    
+    /**
+     * Returns the QNames of the model properties to be output in
+     *  the header, and if they're required or not
+     */
+    protected abstract List<Pair<QName, Boolean>> buildPropertiesForHeader(Object resource, String format, WebScriptRequest req);
+    
+    /**
+     * Populates the body of the Excel Workbook, once the header has been
+     *  output.
+     * This is called if the format is .xls or .xlsx
+     */
+    protected abstract void populateBody(Object resource, Workbook workbook, Sheet sheet, List<QName> properties)
+    		throws IOException;
+    
+    /**
+     * Populates the body of the CSV file, once the header has been
+     *  output.
+     * This is called if the format is .csv
+     */
+    protected abstract void populateBody(Object resource, CSVPrinter csv, List<QName> properties)
+    		throws IOException;
+    
+    /**
+     * Set the CSVFormat
+     * 
+     * @param csvFormat CSVFormat
+     */
+    public void setCsvFormat(CSVFormat csvFormat)
+    {
+        this.csvFormat = csvFormat;
+    }
+    
+    /**
+     * Get the CSVFormat. Returns {@link CSVFormat#EXCEL} if none was set.
+     * 
+     * @return CSVFormat
+     */
+    public CSVFormat getCsvFormat()
+    {
+        if (csvFormat == null)
+        {
+            return CSVFormat.EXCEL
+                    .withQuote('"')
+                    .withRecordSeparator("\n")
+                    .withFirstRecordAsHeader();
+        }
+        else
+        {
+            return csvFormat;
+        }
+    }
+    
+    /**
+     * @see org.springframework.extensions.webscripts.DeclarativeWebScript#executeImpl(org.springframework.extensions.webscripts.WebScriptRequest, org.springframework.extensions.webscripts.Status)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("success", Boolean.TRUE);
+        
+        // What format are they after?
+        String format = req.getFormat();
+        if("csv".equals(format) || "xls".equals(format) ||
+           "xlsx".equals(format) || "excel".equals(format))
+        {
+            // Identify the thing to process
+            Object resource = identifyResource(format, req);
+        	
+            // Generate the spreadsheet
+            try
+            {
+                generateSpreadsheet(resource, format, req, status, model);
+                return model;
+            }
+            catch(IOException e)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, 
+                        "Unable to generate template file", e);
+            }
+        }
+        
+        // If we get here, then it isn't a spreadsheet version
+        if(allowHtmlFallback())
+        {
+	        // There's some sort of help / upload form
+	        return model;
+        }
+        else
+        {
+           throw new WebScriptException("Web Script format '" + format + "' is not supported");
+        }
+    }
+    
+    /**
+     * Generates the spreadsheet, based on the properties in the header
+     *  and a callback for the body.
+     */
+    public void generateSpreadsheet(Object resource, String format, WebScriptRequest req, 
+    		Status status, Map<String, Object> model) throws IOException
+    {
+        Pattern qnameMunger = Pattern.compile("([A-Z][a-z]+)([A-Z].*)");
+        String delimiterParam = req.getParameter(PARAM_REQ_DELIMITER);
+        CSVFormat reqCSVFormat = null;
+
+        if (delimiterParam != null && !delimiterParam.isEmpty())
+        {
+            reqCSVFormat = CSVFormat.EXCEL
+                            .withDelimiter(delimiterParam.charAt(0))
+                            .withQuote('"')
+                            .withRecordSeparator("\n")
+                            .withFirstRecordAsHeader();
+        }
+
+        // Build up the details of the header
+        List<Pair<QName, Boolean>> propertyDetails = buildPropertiesForHeader(resource, format, req);
+        String[] headings = new String[propertyDetails.size()];
+        String[] descriptions = new String[propertyDetails.size()];
+        boolean[] required = new boolean[propertyDetails.size()];
+        for(int i=0; i<headings.length; i++)
+        {
+        	Pair<QName, Boolean> property = propertyDetails.get(i);
+            if(property == null || property.getFirst() == null)
+            {
+                headings[i] = "";
+                required[i] = false;
+            }
+            else
+            {
+                QName column = property.getFirst();
+                required[i] = property.getSecond();
+                
+                // Ask the dictionary service nicely for the details
+                PropertyDefinition pd = dictionaryService.getProperty(column);
+                if(pd != null && pd.getTitle(dictionaryService) != null)
+                {
+                    // Use the friendly titles, which may even be localised!
+                    headings[i] = pd.getTitle(dictionaryService);
+                    descriptions[i] = pd.getDescription(dictionaryService);
+                }
+                else
+                {
+                    // Nothing friendly found, try to munge the raw qname into
+                    //  something we can show to a user...
+                    String raw = column.getLocalName();
+                    raw = raw.substring(0, 1).toUpperCase() + raw.substring(1);
+    
+                    Matcher m = qnameMunger.matcher(raw);
+                    if(m.matches())
+                    {
+                        headings[i] = m.group(1) + " " + m.group(2);
+                    }
+                    else
+                    {
+                        headings[i] = raw;
+                    }
+                }
+            }
+        }
+        
+        // Build a list of just the properties
+        List<QName> properties = new ArrayList<QName>(propertyDetails.size());
+        for(Pair<QName,Boolean> p : propertyDetails)
+        {
+           QName qn = null;
+           if(p != null)
+           {
+              qn = p.getFirst();
+           }
+           properties.add(qn);
+        }
+        
+        // Output
+        if("csv".equals(format))
+        {
+            StringWriter sw = new StringWriter();
+            CSVPrinter csv = new CSVPrinter(sw, reqCSVFormat != null ? reqCSVFormat : getCsvFormat());
+            csv.printRecord(headings);
+            
+            populateBody(resource, csv, properties);
+            
+            model.put(MODEL_CSV, sw.toString());
+        }
+        else
+        {
+            Workbook wb;
+            if("xlsx".equals(format))
+            {
+                wb = new XSSFWorkbook();
+                // TODO Properties
+            }
+            else
+            {
+                wb = new HSSFWorkbook();
+                // TODO Properties
+            }
+            
+            // Add our header row
+            Sheet sheet = wb.createSheet("Export");
+            Row hr = sheet.createRow(0);
+            sheet.createFreezePane(0, 1);
+            
+            Font fb = wb.createFont();
+            fb.setBold(true);
+            Font fi = wb.createFont();
+            fi.setBold(true);
+            fi.setItalic(true);
+            
+            CellStyle csReq = wb.createCellStyle();
+            csReq.setFont(fb);
+            CellStyle csOpt = wb.createCellStyle();
+            csOpt.setFont(fi);
+            
+            // Populate the header
+            Drawing draw = null;
+            for(int i=0; i<headings.length; i++)
+            {
+                Cell c = hr.createCell(i);
+                c.setCellValue(headings[i]);
+                
+                if(required[i])
+                {
+                	c.setCellStyle(csReq);
+                }
+                else
+                {
+                	c.setCellStyle(csOpt);
+                }
+                
+                if(headings[i].length() == 0)
+                {
+                    sheet.setColumnWidth(i, 3*250);
+                }
+                else
+                {
+                    sheet.setColumnWidth(i, 18*250);
+                }
+                
+                if(descriptions[i] != null && descriptions[i].length() > 0)
+                {
+                    // Add a description for it too
+                    if(draw == null)
+                    {
+                        draw = sheet.createDrawingPatriarch();
+                    }
+                    ClientAnchor ca = wb.getCreationHelper().createClientAnchor();
+                    ca.setCol1(c.getColumnIndex());
+                    ca.setCol2(c.getColumnIndex()+1);
+                    ca.setRow1(hr.getRowNum());
+                    ca.setRow2(hr.getRowNum()+2);
+                    
+                    Comment cmt = draw.createCellComment(ca);
+                    cmt.setAuthor("");
+                    cmt.setString(wb.getCreationHelper().createRichTextString(descriptions[i]));
+                    cmt.setVisible(false);
+                    c.setCellComment(cmt);
+                }
+            }
+            
+            // Have the contents populated
+            populateBody(resource, wb, sheet, properties);
+            
+            // Save it for the template
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            wb.write(baos);
+            model.put(MODEL_EXCEL, baos.toByteArray());
+        }
+    }
+
+    @Override
+    protected Map<String, Object> createTemplateParameters(WebScriptRequest req, WebScriptResponse res,
+            Map<String, Object> customParams)
+    {
+        Map<String, Object> model = super.createTemplateParameters(req, res, customParams);
+        // We sometimes need to monkey around to do the binary output... 
+        model.put("req", req);
+        model.put("res", res);
+        model.put("writeExcel", new WriteExcel(res, model, req.getFormat(), filenameBase));
+        return model;
+    }
+    
+    public static class WriteExcel 
+    {
+        private String format;
+        private String filenameBase;
+        private WebScriptResponse res;
+        private Map<String, Object> model;
+        private WriteExcel(WebScriptResponse res, Map<String, Object> model, String format, String filenameBase)
+        {
+            this.res = res;
+            this.model = model;
+            this.format = format;
+            this.filenameBase = filenameBase;
+        }
+        public void write() throws IOException
+        {
+            String filename = filenameBase + "." + format;
+            
+            // If it isn't a CSV, reset so we can send binary
+            if(! "csv".equals(format))
+            {
+                res.reset();
+            }
+            
+            // Tell the browser it's a file download
+            res.addHeader("Content-Disposition", "attachment; filename=" + filename);
+            
+            // Now send that data
+            if("csv".equals(format))
+            {
+                res.getWriter().append((String)model.get(MODEL_CSV));
+            }
+            else
+            {
+                // Set the mimetype, as we've reset
+                if("xlsx".equals(format))
+                {
+                    res.setContentType(MimetypeMap.MIMETYPE_OPENXML_SPREADSHEET);
+                } else {
+                    res.setContentType(MimetypeMap.MIMETYPE_EXCEL);
+                }
+                
+                // Send the raw excel bytes
+                byte[] excel = (byte[])model.get(MODEL_EXCEL);
+                res.getOutputStream().write(excel);
+            }
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/ExtensibilityContainer.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/ExtensibilityContainer.java
new file mode 100644
index 00000000000..1b77dbf91da
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/ExtensibilityContainer.java
@@ -0,0 +1,869 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+
+
+import java.io.IOException;
+
+import java.io.Writer;
+
+import java.util.ArrayList;
+
+import java.util.HashMap;
+
+import java.util.List;
+
+import java.util.Map;
+
+import java.util.ResourceBundle;
+
+
+
+import org.apache.commons.logging.Log;
+
+import org.apache.commons.logging.LogFactory;
+
+import org.dom4j.Element;
+
+import org.springframework.extensions.config.ConfigImpl;
+
+import org.springframework.extensions.config.ConfigSection;
+
+import org.springframework.extensions.config.ConfigService;
+
+import org.springframework.extensions.config.evaluator.Evaluator;
+
+import org.springframework.extensions.config.xml.XMLConfigService;
+
+import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
+
+import org.springframework.extensions.surf.extensibility.BasicExtensionModule;
+
+import org.springframework.extensions.surf.extensibility.ExtensibilityModel;
+
+import org.springframework.extensions.surf.extensibility.HandlesExtensibility;
+
+import org.springframework.extensions.surf.extensibility.WebScriptExtensibilityModuleHandler;
+
+import org.springframework.extensions.surf.extensibility.impl.ExtensibilityModelImpl;
+
+import org.springframework.extensions.surf.extensibility.impl.MarkupDirective;
+
+import org.springframework.extensions.webscripts.Authenticator;
+
+import org.springframework.extensions.webscripts.ExtendedScriptConfigModel;
+
+import org.springframework.extensions.webscripts.ExtendedTemplateConfigModel;
+
+import org.springframework.extensions.webscripts.ScriptConfigModel;
+
+import org.springframework.extensions.webscripts.TemplateConfigModel;
+
+import org.springframework.extensions.webscripts.WebScriptPropertyResourceBundle;
+
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+
+
+/**
+
+ * <p>A simple extensibility {@link org.springframework.extensions.webscripts.Container} for processing WebScripts. This extends the {@link RepositoryContainer} and
+
+ * implements the {@link HandlesExtensibility} interface to provide extensibility capabilities.</p>
+
+ * 
+
+ * @author David Draper
+
+ */
+
+public class ExtensibilityContainer extends RepositoryContainer implements HandlesExtensibility
+
+{
+
+    private static final Log logger = LogFactory.getLog(ExtensibilityContainer.class);
+
+    
+
+    public boolean isExtensibilitySuppressed()
+
+    {
+
+      return false;
+
+    }
+
+    
+
+    /**
+
+     * <p>Opens a new {@link ExtensibilityModel}, defers execution to the extended {@link RepositoryContainer} and
+
+     * then closes the {@link ExtensibilityModel}.</p>
+
+     */
+
+    @Override
+
+    public void executeScript(WebScriptRequest scriptReq, 
+
+                              WebScriptResponse scriptRes, 
+
+                              Authenticator auth) throws IOException
+
+    {
+
+        ExtensibilityModel extModel = this.openExtensibilityModel();
+
+        try
+
+        {
+
+            super.executeScript(scriptReq, scriptRes, auth);
+
+        }
+
+        finally
+
+        {
+
+            // It's only necessary to close the model if it's actually been used. Not all WebScripts will make use of the
+
+            // model. An example of this would be the StreamContent WebScript. It is important not to attempt to close
+
+            // an unused model since the WebScript executed may have already flushed the response if it has overridden
+
+            // the default .execute() method.
+
+            if (this.modelUsed.get())
+
+            {
+
+                try
+
+                {
+
+                    this.closeExtensibilityModel(extModel, scriptRes.getWriter());
+
+                }
+
+                catch (IOException e)
+
+                {
+
+                    logger.error("An error occurred getting the Writer when closing an ExtensibilityModel", e);
+
+                }
+
+            }
+
+        }
+
+    }
+
+
+
+    /**
+
+     * <p>This keeps track of whether or not the {@link ExtensibilityModel} for the current thread has been used. The
+
+     * thread local value will only be set to <code>true</code> if the <code>getCurrentExtensibilityModel</code> method
+
+     * is called.</p>
+
+     */
+
+    private ThreadLocal<Boolean> modelUsed = new ThreadLocal<Boolean>();
+
+    
+
+    /**
+
+     * <p>A {@link WebScriptExtensibilityModuleHandler} is required for retrieving information on what
+
+     * {@link BasicExtensionModule} instances have been configured and the extension files that need 
+
+     * to be processed. This variable should be set thorugh the Spring application context configuration.</p>
+
+     */
+
+    private WebScriptExtensibilityModuleHandler extensibilityModuleHandler = null;
+
+    
+
+    /**
+
+     * <p>Sets the {@link WebScriptExtensibilityModuleHandler} for this {@link org.springframework.extensions.webscripts.Container}.</p>
+
+     * @param extensibilityModuleHandler WebScriptExtensibilityModuleHandler
+
+     */
+
+    public void setExtensibilityModuleHandler(WebScriptExtensibilityModuleHandler extensibilityModuleHandler)
+
+    {
+
+        this.extensibilityModuleHandler = extensibilityModuleHandler;
+
+    }
+
+
+
+    /**
+
+     * <p>Maintains a list of all the {@link ExtensibilityModel} instances being used across all the 
+
+     * available threads.</p>
+
+     */
+
+    private ThreadLocal<ExtensibilityModel> extensibilityModel = new ThreadLocal<ExtensibilityModel>();
+
+    
+
+    /**
+
+     * <p>Creates a new {@link ExtensibilityModel} and sets it on the current thread</p>
+
+     */
+
+    public ExtensibilityModel openExtensibilityModel()
+
+    {
+
+        if (logger.isDebugEnabled())
+
+        {
+
+            logger.debug("Opening for thread: " + Thread.currentThread().getName());
+
+        }
+
+        this.extendedBundleCache.set(new HashMap<String, WebScriptPropertyResourceBundle>());
+
+        this.evaluatedModules.set(null);
+
+        this.fileBeingProcessed.set(null);
+
+        this.globalConfig.set(null);
+
+        this.sections.set(null);
+
+        this.sectionsByArea.set(null);
+
+        
+
+        ExtensibilityModel model = new ExtensibilityModelImpl(null, this);
+
+        this.extensibilityModel.set(model); 
+
+        this.modelUsed.set(Boolean.FALSE);
+
+        return model;
+
+    }
+
+
+
+    /**
+
+     * <p>Flushes the {@link ExtensibilityModel} provided and sets its parent as the current {@link ExtensibilityModel}
+
+     * for the current thread.</p>
+
+     */
+
+    public void closeExtensibilityModel(ExtensibilityModel model, Writer out)
+
+    {
+
+        if (logger.isDebugEnabled())
+
+        {
+
+            logger.debug("Closing for thread: " + Thread.currentThread().getName());
+
+        }
+
+        
+
+        model.flushModel(out);
+
+        this.modelUsed.set(Boolean.FALSE);
+
+        this.extensibilityModel.set(null);
+
+    }
+
+
+
+    /**
+
+     * <p>Returns the {@link ExtensibilityModel} for the current thread.</p>
+
+     */
+
+    public ExtensibilityModel getCurrentExtensibilityModel()
+
+    {
+
+        if (logger.isDebugEnabled())
+
+        {
+
+            logger.debug("Getting current for thread: " + Thread.currentThread().getName());
+
+        }
+
+        this.modelUsed.set(Boolean.TRUE);
+
+        return this.extensibilityModel.get();
+
+    }
+
+
+
+    /**
+
+     * <p>This method is implemented to perform no action as it is not necessary for a standalone WebScript
+
+     * container to add dependencies for processing.</p>
+
+     */
+
+    public void updateExtendingModuleDependencies(String pathBeingProcessed, Map<String, Object> model)
+
+    {
+
+        // NOT REQUIRED FOR STANDALONE WEBSCRIPT CONTAINER
+
+    }
+
+
+
+    /**
+
+     * <p>A thread-safe cache of extended {@link ResourceBundle} instances for the current request.</p>
+
+     */
+
+    private ThreadLocal<Map<String, WebScriptPropertyResourceBundle>> extendedBundleCache = new ThreadLocal<Map<String, WebScriptPropertyResourceBundle>>(); 
+
+    
+
+    /**
+
+     * <p>Checks the cache to see if it has cached an extended bundle (that is a basic {@link ResourceBundle} that
+
+     * has had extension modules applied to it. Extended bundles can only be safely cached once per request as the modules
+
+     * applied can vary for each request.</p>
+
+     * 
+
+     * @param webScriptId The id of the WebScript to retrieve the extended bundle for.
+
+     * @return A cached bundle or <code>null</code> if the bundle has not previously been cached.
+
+     */
+
+    public ResourceBundle getCachedExtendedBundle(String webScriptId)
+
+    {
+
+        ResourceBundle cachedExtendedBundle = null;
+
+        Map<String, WebScriptPropertyResourceBundle> threadLocal = this.extendedBundleCache.get();
+
+        if (threadLocal != null)
+
+        {
+
+            cachedExtendedBundle = this.extendedBundleCache.get().get(webScriptId);
+
+        }
+
+        return cachedExtendedBundle;
+
+    }
+
+    
+
+    /**
+
+     * <p>Adds a new extended bundle to the cache. An extended bundle is a WebScript {@link ResourceBundle} that has had 
+
+     * {@link ResourceBundle} instances merged into it from extension modules that have been applied. These can only be cached 
+
+     * for the lifetime of the request as different modules may be applied to the same WebScript for different requests.</p>
+
+     * 
+
+     * @param webScriptId The id of the WebScript to cache the extended bundle against.
+
+     * @param extensionBundle The extended bundle to cache.
+
+     */
+
+    public void addExtensionBundleToCache(String webScriptId, WebScriptPropertyResourceBundle extensionBundle)
+
+    {
+
+        Map<String, WebScriptPropertyResourceBundle> threadLocal = this.extendedBundleCache.get();
+
+        if (threadLocal == null)
+
+        {
+
+            // This should never be the case because when a new model is opened this value should be reset
+
+            // but we will double-check to avoid the potential of NPEs...
+
+            threadLocal = new HashMap<String, WebScriptPropertyResourceBundle>();
+
+            this.extendedBundleCache.set(threadLocal);
+
+        }
+
+        threadLocal.put(webScriptId, extensionBundle);
+
+    }
+
+    
+
+    /**
+
+     * <p>A {@link ThreadLocal} reference to the file currently being processed in the model.</p>
+
+     */
+
+    private ThreadLocal<String> fileBeingProcessed = new ThreadLocal<String>();
+
+    
+
+    /**
+
+     * <p>Returns the path of the file currently being processed in the model by the current thread. 
+
+     * This information is primarily provided for the purposes of generating debug information.</p>
+
+     * 
+
+     * @return The path of the file currently being processed.
+
+     */
+
+    public String getFileBeingProcessed()
+
+    {
+
+        return this.fileBeingProcessed.get();
+
+    }
+
+
+
+    /**
+
+     * <p>Sets the path of the file currently being processed in the model by the current thread. 
+
+     * This information should be collected to assist with providing debug information.</p>
+
+     * @param file The path of the file currently being processed.
+
+     */
+
+    public void setFileBeingProcessed(String file)
+
+    {
+
+        this.fileBeingProcessed.set(file);
+
+    }
+
+    
+
+    /**
+
+     * <p>Retrieves an files for the evaluated modules that are extending the WebScript files being processed.</p>
+
+     */
+
+    public List<String> getExtendingModuleFiles(String pathBeingProcessed)
+
+    {
+
+        List<String> extendingModuleFiles = new ArrayList<String>();
+
+        for (BasicExtensionModule module: this.getEvaluatedModules())
+
+        {
+
+            extendingModuleFiles.addAll(this.extensibilityModuleHandler.getExtendingModuleFiles(module, pathBeingProcessed));
+
+        }
+
+        return extendingModuleFiles;
+
+    }
+
+
+
+    /**
+
+     * <p>The list of {@link org.springframework.extensions.surf.types.ExtensionModule} instances that have been evaluated as applicable to
+
+     * this RequestContext. This is set to <code>null</code> when during instantiation and is only
+
+     * properly set the first time the <code>getEvaluatedModules</code> method is invoked. This ensures
+
+     * that module evaluation only occurs once per request.</p>
+
+     */
+
+    private ThreadLocal<List<BasicExtensionModule>> evaluatedModules = new ThreadLocal<List<BasicExtensionModule>>();
+
+    
+
+    /**
+
+     * <p>Retrieve the list of {@link org.springframework.extensions.surf.types.ExtensionModule} instances that have been evaluated as applicable
+
+     * for the current request. If this list has not yet been populated then use the {@link org.springframework.extensions.surf.extensibility.ExtensibilityModuleHandler}
+
+     * configured in the Spring application context to evaluate them.</p>
+
+     * 
+
+     * @return A list of {@link org.springframework.extensions.surf.types.ExtensionModule} instances that are applicable to the current request.
+
+     */
+
+    public List<BasicExtensionModule> getEvaluatedModules()
+
+    {
+
+        List<BasicExtensionModule> evaluatedModules = this.evaluatedModules.get();
+
+        if (evaluatedModules == null)
+
+        {
+
+            if (this.extensibilityModuleHandler == null)
+
+            {
+
+                if (logger.isErrorEnabled())
+
+                {
+
+                    logger.error("No 'extensibilityModuleHandler' has been configured for this request context. Extensions cannot be processed");
+
+                }
+
+                evaluatedModules = new ArrayList<BasicExtensionModule>();
+
+                this.evaluatedModules.set(evaluatedModules);
+
+            }
+
+            else
+
+            {
+
+                evaluatedModules = this.extensibilityModuleHandler.getExtensionModules();
+
+                this.evaluatedModules.set(evaluatedModules);
+
+            }
+
+        }
+
+        return evaluatedModules;
+
+    }
+
+    
+
+    /**
+
+     * <p>This is a local {@link ConfigImpl} instance that will only be used when extension modules are employed. It will
+
+     * initially be populated with the default "static" global configuration taken from the {@link ConfigService} associated
+
+     * with this {@link org.springframework.extensions.surf.RequestContext} but then updated to include global configuration provided by extension modules that
+
+     * have been evaluated to be applied to the current request.</p>
+
+     */
+
+    private ThreadLocal<ConfigImpl> globalConfig = new ThreadLocal<ConfigImpl>();
+
+    
+
+    /**
+
+     * <p>This map represents {@link ConfigSection} instances mapped by area. It  will only be used when extension modules are 
+
+     * employed. It will initially be populated with the default "static" configuration taken from the {@link ConfigService} associated
+
+     * with this {@link org.springframework.extensions.surf.RequestContext} but then updated to include configuration provided by extension modules that have been evaluated
+
+     * to be applied to the current request.</p>
+
+     */
+
+    private ThreadLocal<Map<String, List<ConfigSection>>> sectionsByArea = new ThreadLocal<Map<String,List<ConfigSection>>>();
+
+    
+
+    /**
+
+     * <p>A list of {@link ConfigSection} instances that are only applicable to the current request. It  will only be used when extension modules are 
+
+     * employed. It will initially be populated with the default "static" configuration taken from the {@link ConfigService} associated
+
+     * with this {@link org.springframework.extensions.surf.RequestContext} but then updated to include configuration provided by extension modules that have been evaluated
+
+     * to be applied to the current request.</p>
+
+     */
+
+    private ThreadLocal<List<ConfigSection>> sections = new ThreadLocal<List<ConfigSection>>();
+
+    
+
+    /**
+
+     * <p>Creates a new {@link ExtendedScriptConfigModel} instance using the local configuration generated for this request.
+
+     * If configuration for the request will be generated if it does not yet exist. It is likely that this method will be
+
+     * called multiple times within the context of a single request and although the configuration containers will always
+
+     * be the same a new {@link ExtendedScriptConfigModel} instance will always be created as the the supplied <code>xmlConfig</code>
+
+     * string could be different for each call (because each WebScript invoked in the request will supply different
+
+     * configuration.</p>
+
+     */
+
+    public ScriptConfigModel getExtendedScriptConfigModel(String xmlConfig)
+
+    {
+
+        if (this.globalConfig.get() == null && this.sectionsByArea.get() == null && this.sections.get() == null)
+
+        {
+
+            this.getConfigExtensions();
+
+        }
+
+        return new ExtendedScriptConfigModel(getConfigService(), xmlConfig, this.globalConfig.get(), this.sectionsByArea.get(), this.sections.get());
+
+    }
+
+    
+
+    /**
+
+     * <p>Creates a new {@link TemplateConfigModel} instance using the local configuration generated for this request.
+
+     * If configuration for the request will be generated if it does not yet exist. It is likely that this method will be
+
+     * called multiple times within the context of a single request and although the configuration containers will always
+
+     * be the same a new {@link TemplateConfigModel} instance will always be created as the the supplied <code>xmlConfig</code>
+
+     * string could be different for each call (because each WebScript invoked in the request will supply different
+
+     * configuration.</p>
+
+     */
+
+    public TemplateConfigModel getExtendedTemplateConfigModel(String xmlConfig)
+
+    {
+
+        if (this.globalConfig.get() == null && this.sectionsByArea.get() == null && this.sections.get() == null)
+
+        {
+
+            this.getConfigExtensions();
+
+        }
+
+        return new ExtendedTemplateConfigModel(getConfigService(), xmlConfig, this.globalConfig.get(), this.sectionsByArea.get(), this.sections.get());
+
+    }
+
+    
+
+    /**
+
+     * <p>Creates and populates the request specific configuration container objects (<code>globalConfig</code>, <code>sectionsByArea</code> & 
+
+     * <code>sections</code> with a combination of the default static configuration (taken from files accessed by the {@link ConfigService}) and
+
+     * dynamic configuration taken from extension modules evaluated for the current request. </p>  
+
+     */
+
+    private void getConfigExtensions()
+
+    {
+
+        // Extended configuration is only possible if config service is an XMLConfigService...
+
+        // 
+
+        // ...also, it's only necessary to populate the configuration containers if they have not already been populated. This test should also
+
+        // be carried out by the two methods ("getExtendedTemplateConfigModel" & "getExtendedTemplateConfigModel") to prevent duplication
+
+        // of effort... but in case other methods attempt to access it we will make these additional tests. 
+
+        if (getConfigService() instanceof XMLConfigService && this.globalConfig == null && this.sectionsByArea == null && this.sections == null)
+
+        {
+
+            // Cast the config service for ease of access
+
+            XMLConfigService xmlConfigService = (XMLConfigService) getConfigService();
+
+            
+
+            // Get the current configuration from the ConfigService - we don't want to permanently pollute
+
+            // the standard configuration with additions from the modules...
+
+            this.globalConfig.set(new ConfigImpl((ConfigImpl)xmlConfigService.getGlobalConfig())); // Make a copy of the current global config
+
+            
+
+            // Initialise these with the config service values...
+
+            this.sectionsByArea.set(new HashMap<String, List<ConfigSection>>(xmlConfigService.getSectionsByArea())); 
+
+            this.sections.set(new ArrayList<ConfigSection>(xmlConfigService.getSections()));
+
+            
+
+            // Check to see if there are any modules that we need to apply...
+
+            List<BasicExtensionModule> evaluatedModules = this.getEvaluatedModules();
+
+            if (evaluatedModules != null && !evaluatedModules.isEmpty())
+
+            {
+
+                for (BasicExtensionModule currModule: evaluatedModules)
+
+                {
+
+                    for (Element currentConfigElement: currModule.getConfigurations())
+
+                    {
+
+                        // Set up containers for our request specific configuration - this will contain data taken from the evaluated modules...
+
+                        Map<String, ConfigElementReader> parsedElementReaders = new HashMap<String, ConfigElementReader>();
+
+                        Map<String, Evaluator> parsedEvaluators = new HashMap<String, Evaluator>();
+
+                        List<ConfigSection> parsedConfigSections = new ArrayList<ConfigSection>();
+
+                        
+
+                        // Parse and process the parses configuration...
+
+                        String currentArea = xmlConfigService.parseFragment(currentConfigElement, parsedElementReaders, parsedEvaluators, parsedConfigSections);
+
+                        for (Map.Entry<String, Evaluator> entry : parsedEvaluators.entrySet())
+
+                        {
+
+                            // add the evaluators to the config service
+
+                            parsedEvaluators.put(entry.getKey(), entry.getValue());
+
+                        }
+
+                        for (Map.Entry<String, ConfigElementReader> entry : parsedElementReaders.entrySet())
+
+                        {
+
+                            // add the element readers to the config service
+
+                            parsedElementReaders.put(entry.getKey(), entry.getValue());
+
+                        }
+
+                        for (ConfigSection section : parsedConfigSections)
+
+                        {
+
+                            // Update local configuration with our updated data...
+
+                            xmlConfigService.addConfigSection(section, currentArea, this.globalConfig.get(), this.sectionsByArea.get(), this.sections.get());
+
+                        }
+
+                    }
+
+                }
+
+            }
+
+        }
+
+    }
+
+    
+
+    /**
+
+     * <p>Adds the <{@code}@markup> directive to the container which allows FreeMarker templates to be extended.</p>
+
+     */
+
+    public void addExtensibilityDirectives(Map<String, Object> freeMarkerModel, ExtensibilityModel extModel)
+
+    {
+
+        MarkupDirective mud = new MarkupDirective("markup", extModel);
+
+        freeMarkerModel.put("markup", mud);
+
+    }
+
+}
+
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/FileTypeImageUtils.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/FileTypeImageUtils.java
new file mode 100644
index 00000000000..6a33e735236
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/FileTypeImageUtils.java
@@ -0,0 +1,138 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+import org.alfresco.api.AlfrescoPublicApi;   
+import org.alfresco.service.cmr.repository.FileTypeImageSize;
+
+/**
+ * Contains utility methods
+ * 
+ * @author Roy Wetherall
+ */
+@AlfrescoPublicApi
+public class FileTypeImageUtils
+{
+    private static final String IMAGE_PREFIX16 = "/images/filetypes/";
+    private static final String IMAGE_PREFIX32 = "/images/filetypes32/";
+    private static final String IMAGE_PREFIX64 = "/images/filetypes64/";
+    private static final String IMAGE_POSTFIX_GIF = ".gif";
+    private static final String IMAGE_POSTFIX_PNG = ".png";
+    private static final String DEFAULT_FILE_IMAGE16 = IMAGE_PREFIX16 + "_default" + IMAGE_POSTFIX_GIF;
+    private static final String DEFAULT_FILE_IMAGE32 = IMAGE_PREFIX32 + "_default" + IMAGE_POSTFIX_GIF;
+    private static final String DEFAULT_FILE_IMAGE64 = IMAGE_PREFIX64 + "_default" + IMAGE_POSTFIX_PNG;
+    
+    private static final Map<String, String> s_fileExtensionMap = new HashMap<String, String>(89, 1.0f);
+
+    /**
+     * Return the image path to the filetype icon for the specified file name string
+     * 
+     * @param sc         ServletContext
+     * @param name       File name to build filetype icon path for
+     * @param small      True for the small 16x16 icon or false for the large 32x32 
+     * 
+     * @return the image path for the specified node type or the default icon if not found
+     */
+    public static String getFileTypeImage(ServletContext sc, String name, boolean small)
+    {
+       return getFileTypeImage(sc, name, (small ? FileTypeImageSize.Small : FileTypeImageSize.Medium));
+    }
+    
+    /**
+     * Return the image path to the filetype icon for the specified file name string
+     * 
+     * @param sc         ServletContext
+     * @param name       File name to build filetype icon path for
+     * @param size       Size of the icon to return
+     * 
+     * @return the image path for the specified node type or the default icon if not found
+     */
+    public static String getFileTypeImage(ServletContext sc, String name, FileTypeImageSize size)
+    {
+       String image = null;
+       String defaultImage = null;
+       switch (size)
+       {
+          case Small:
+             defaultImage = DEFAULT_FILE_IMAGE16; break;
+          case Medium:
+             defaultImage = DEFAULT_FILE_IMAGE32; break;
+          case Large:
+             defaultImage = DEFAULT_FILE_IMAGE64; break;
+       }
+       
+       int extIndex = name.lastIndexOf('.');
+       if (extIndex != -1 && name.length() > extIndex + 1)
+       {
+          String ext = name.substring(extIndex + 1).toLowerCase();
+          String key = ext + ' ' + size.toString();
+          
+          // found file extension for appropriate size image
+          synchronized (s_fileExtensionMap)
+          {
+             image = s_fileExtensionMap.get(key);
+             if (image == null)
+             {
+                // not found create for first time
+                if (size != FileTypeImageSize.Large)
+                {
+                   image = (size == FileTypeImageSize.Small ? IMAGE_PREFIX16 : IMAGE_PREFIX32) +
+                            ext + IMAGE_POSTFIX_GIF;
+                }
+                else
+                {
+                   image = IMAGE_PREFIX64 + ext + IMAGE_POSTFIX_PNG;
+                }
+                
+                // does this image exist on the web-server?
+                if (sc != null && sc.getResourceAsStream(image) != null)
+                {
+                   // found the image for this extension - save it for later
+                   s_fileExtensionMap.put(key, image);
+                }
+                else if (sc == null)
+                {
+                   // we have no ServerContext so return the default image but don't cache it
+                   image = defaultImage;
+                }
+                else
+                {
+                   // not found, save the default image for this extension instead
+                   s_fileExtensionMap.put(key, defaultImage);
+                   image = defaultImage;
+                }
+             }
+          }
+       }
+       
+       return (image != null ? image : defaultImage);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/RegistryAsynchronouslyRefreshedCache.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RegistryAsynchronouslyRefreshedCache.java
new file mode 100644
index 00000000000..8ea938bdb5c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RegistryAsynchronouslyRefreshedCache.java
@@ -0,0 +1,102 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import org.alfresco.repo.cache.AbstractMTAsynchronouslyRefreshedCache;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.util.PropertyCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.extensions.webscripts.Registry;
+
+/**
+ * Asynchronously refreshed cache for repository webscripts.
+ * <p/>
+ * This does not stop gratuitous calls to <i>refresh</i> but will ensure that, once an instance has been created,
+ * a version of the registry is returned even if it is slighly out of date.  This can be changed so that it waits
+ * for reset but is probably not required.
+ * 
+ * @author Derek Hulley
+ * @since 4.2.0
+ */
+public class RegistryAsynchronouslyRefreshedCache extends  AbstractMTAsynchronouslyRefreshedCache<Registry> implements InitializingBean
+{
+    private static Log logger = LogFactory.getLog(RegistryAsynchronouslyRefreshedCache.class);
+    
+    private ObjectFactory<Registry> registryFactory;
+    private RetryingTransactionHelper retryingTransactionHelper;
+
+    /**
+     * @param registryFactory               factory for web script registries
+     */
+    public void setRegistryFactory(ObjectFactory<Registry> registryFactory)
+    {
+        this.registryFactory = registryFactory;
+    }
+    
+    /**
+     * @param retryingTransactionHelper     the retryingTransactionHelper to set
+     */
+    public void setRetryingTransactionHelper(RetryingTransactionHelper retryingTransactionHelper)
+    {
+        this.retryingTransactionHelper = retryingTransactionHelper;
+    }
+
+    @Override
+    protected Registry buildCache(final String tenantId)
+    {
+        return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Registry>()
+        {
+            @Override
+            public Registry execute() throws Throwable
+            {
+                return doBuildCache(tenantId);
+            }
+        }, true, false);
+    }
+
+    /**
+     * This method is thread safe as per contract of {@link #buildCache(String)}.
+     */
+    private Registry doBuildCache(String tenantId)
+    {
+        Registry registry = registryFactory.getObject();
+        registry.reset();
+        logger.info("Fetching web script registry for tenant " + tenantId);
+        return registry;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        PropertyCheck.mandatory(this, "registryFactory", registryFactory);
+        PropertyCheck.mandatory(this, "retryingTransactionHelper", retryingTransactionHelper);
+        super.afterPropertiesSet();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepoClassPathStore.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepoClassPathStore.java
new file mode 100644
index 00000000000..a5d43f2db6b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepoClassPathStore.java
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import java.io.IOException;
+
+import org.springframework.extensions.webscripts.ClassPathStore;
+
+import freemarker.cache.TemplateLoader;
+
+/**
+ * Extension of the SpringSurf ClassPathStore to ensure that the examination of
+ * last modified dates on classpath bound resources does not cause a performance
+ * degredation in REST heavy client applications.
+ * <p>
+ * In the repository, due to the possibility of Repository bound resources, all
+ * WebScript search path lists have the "delay" set to either zero seconds (no delay)
+ * or something close to that. This means that the FreeMarker template cache is
+ * always or often requesting the last modified date of a classpath resource - and
+ * the resources do not change. Note that the /extension classpath store still uses
+ * the original ClassPathStore. Otherwise all stores can be refreshed as usual via
+ * the Refresh WebScripts command.
+ * 
+ * @author Kevin Roast
+ */
+public class RepoClassPathStore extends ClassPathStore
+{
+    @Override
+    public TemplateLoader getTemplateLoader()
+    {
+        return new ClassPathTemplateLoader();
+    }
+    
+    @Override
+    public long lastModified(String documentPath)
+        throws IOException
+    {
+        return -1L;
+    }
+    
+    /**
+     * Class Path Store implementation of a Template Loader
+     * <p>
+     * Retrieves templates either from classes in the class path or classes inside of JAR files
+     * within the class path
+     * <p>
+     * This implementation always returns a fixed last modified date of -1.
+     */
+    private class ClassPathTemplateLoader extends ClassPathStore.ClassPathTemplateLoader
+    {
+        /**
+         * @see freemarker.cache.TemplateLoader#getLastModified(java.lang.Object)
+         */
+        public long getLastModified(Object templateSource)
+        {
+            return -1L;
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepoStore.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepoStore.java
new file mode 100644
index 00000000000..44283e1c328
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepoStore.java
@@ -0,0 +1,1109 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.regex.Pattern;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.model.filefolder.FileFolderServiceImpl;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantAdminService;
+import org.alfresco.repo.tenant.TenantDeployer;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.QueryParameterDefinition;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.util.ISO9075;
+import org.alfresco.util.SearchLanguageConversion;
+import org.springframework.extensions.webscripts.AbstractStore;
+import org.springframework.extensions.webscripts.ScriptContent;
+import org.springframework.extensions.webscripts.ScriptLoader;
+import org.springframework.extensions.webscripts.WebScript;
+import org.springframework.extensions.webscripts.WebScriptException;
+
+import freemarker.cache.TemplateLoader;
+
+
+/**
+ * Repository based Web Script Store
+ * 
+ * @author davidc
+ */
+public class RepoStore extends AbstractStore implements TenantDeployer
+{
+    protected boolean mustExist = false;
+    protected StoreRef repoStore;
+    protected String repoPath;
+    protected Map<String, NodeRef> baseNodeRefs;
+
+    // dependencies
+    protected RetryingTransactionHelper retryingTransactionHelper;
+    protected SearchService searchService;
+    protected NodeService nodeService;
+    protected ContentService contentService;
+    protected FileFolderService fileService;
+    protected NamespaceService namespaceService;
+    protected PermissionService permissionService;
+    protected TenantAdminService tenantAdminService;
+
+    
+    /**
+     * Sets helper that provides transaction callbacks
+     */
+    public void setTransactionHelper(RetryingTransactionHelper retryingTransactionHelper)
+    {
+        this.retryingTransactionHelper = retryingTransactionHelper;
+    }
+    
+    /**
+     * Sets the search service
+     */
+    public void setSearchService(SearchService searchService)
+    {
+        this.searchService = searchService;
+    }
+    
+    /**
+     * Sets the node service
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    /**
+     * Sets the content service
+     */
+    public void setContentService(ContentService contentService)
+    {
+        this.contentService = contentService;
+    }
+
+    /**
+     * Sets the file service
+     */
+    public void setFileFolderService(FileFolderService fileService)
+    {
+        this.fileService = fileService;
+    }
+
+    /**
+     * Sets the namespace service
+     */
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+    
+    /**
+     * Sets the permission service
+     */
+    public void setPermissionService(PermissionService permissionService)
+    {
+        this.permissionService = permissionService;
+    }
+    
+    /**
+     * Sets the tenant admin service
+     */
+    public void setTenantAdminService(TenantAdminService tenantAdminService)
+    {
+        this.tenantAdminService = tenantAdminService;
+    }
+
+    /**
+     * Sets whether the repo store must exist
+     * 
+     * @param mustExist boolean
+     */
+    public void setMustExist(boolean mustExist)
+    {
+        this.mustExist = mustExist;
+    }
+    
+    /**
+     * Sets the repo store
+     */
+    public void setStore(String repoStore)
+    {
+        this.repoStore = new StoreRef(repoStore);
+    }
+    
+    /**
+     * Sets the repo path
+     * 
+     * @param repoPath  repoPath
+     */
+    public void setPath(String repoPath)
+    {
+        this.repoPath = repoPath;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#init()
+     * @see org.alfresco.repo.tenant.TenantDeployer#init()
+     */
+    public void init()
+    {
+        if (baseNodeRefs == null)
+        {
+    		baseNodeRefs = new HashMap<String, NodeRef>(1);
+    	}
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.tenant.TenantDeployer#destroy()
+     */
+    public void destroy()
+    {
+        baseNodeRefs.remove(tenantAdminService.getCurrentUserDomain());
+    }
+    
+    private NodeRef getBaseNodeRef()
+    {
+        String tenantDomain = tenantAdminService.getCurrentUserDomain();
+        NodeRef baseNodeRef = baseNodeRefs.get(tenantDomain);
+        if (baseNodeRef == null)
+        {
+            baseNodeRef = AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<NodeRef>()
+            {
+            	public NodeRef doWork() throws Exception
+                {
+    	            return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<NodeRef>()
+    	            {
+                        public NodeRef execute() throws Exception
+                        {
+                            NodeRef repoStoreRootNodeRef = nodeService.getRootNode(repoStore);
+                            List<NodeRef> nodeRefs = searchService.selectNodes(
+                                    repoStoreRootNodeRef,
+                                    repoPath,
+                                    new QueryParameterDefinition[] {},
+                                    namespaceService,
+                                    false,
+                                    SearchService.LANGUAGE_XPATH);
+                            if (nodeRefs.size() == 1)
+                            {
+                                return nodeRefs.get(0);
+                            }
+                            else if (nodeRefs.size() > 1)
+                            {
+                                throw new WebScriptException(
+                                        "Web Script Store " + repoStore.toString() + repoPath + " must exist; multiple entries found.");
+                            }
+                            else
+                            {
+                                throw new WebScriptException(
+                                        "Web Script Store " + repoStore.toString() + repoPath + " must exist; it was not found");
+                            }
+                        }
+                    }, true, false);
+                }
+    	    }, AuthenticationUtil.getSystemUserName());
+    		
+    		// TODO clear on deleteTenant
+    		baseNodeRefs.put(tenantDomain, baseNodeRef);
+    	}
+    	return baseNodeRef;
+    }
+    
+    private boolean isContentPresent(NodeRef nodeRef)
+    {
+        ContentReader reader = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT); 
+        if ((reader != null && reader.exists()))
+        {
+            return true;
+        }
+        return false;
+    }
+    
+    private String getBaseDir()
+    {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<String>()
+        {
+            public String doWork() throws Exception
+            {
+                return getPath(getBaseNodeRef());
+            }
+        }, AuthenticationUtil.getSystemUserName());
+    }
+        
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#isSecure()
+     */
+    public boolean isSecure()
+    {
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#exists()
+     */
+    public boolean exists()
+    {
+        return (getBaseNodeRef() != null);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#getBasePath()
+     */
+    public String getBasePath()
+    {
+        return repoStore.toString() + repoPath;
+    }
+
+    /**
+     * Gets the display path for the specified node
+     * 
+     * @param nodeRef NodeRef
+     * @return  display path
+     */
+    protected String getPath(NodeRef nodeRef)
+    {
+        return nodeService.getPath(nodeRef).toDisplayPath(nodeService, permissionService) +
+               "/" + nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
+    }
+    
+    /**
+     * Gets the node ref for the specified path within this repo store
+     * 
+     * @param documentPath String
+     * @return  node ref
+     */
+    protected NodeRef findNodeRef(String documentPath)
+    {
+        NodeRef node = null;
+        try
+        {
+            String[] pathElements = documentPath.split("/");
+            List<String> pathElementsList = Arrays.asList(pathElements);
+            FileInfo file = fileService.resolveNamePath(getBaseNodeRef(), pathElementsList);
+            node = file.getNodeRef();
+        }
+        catch (FileNotFoundException e)
+        {
+            // NOTE: return null
+        }
+        return node;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#getScriptDocumentPaths(org.alfresco.web.scripts.WebScript)
+     */
+    public String[] getScriptDocumentPaths(final WebScript script)
+    {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<String[]>()
+        {
+            public String[] doWork() throws Exception
+            {
+                return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<String[]>()
+                {
+                    public String[] execute() throws Exception
+                    {
+                        int baseDirLength = getBaseDir().length() +1;
+                        List<String> documentPaths = null;
+                        String scriptPath = script.getDescription().getScriptPath();
+                        NodeRef scriptNodeRef = (scriptPath.length() == 0) ? getBaseNodeRef() : findNodeRef(scriptPath);
+                        if (scriptNodeRef != null)
+                        {
+                            org.alfresco.service.cmr.repository.Path repoScriptPath = nodeService.getPath(scriptNodeRef);
+                            String id = script.getDescription().getId().substring(scriptPath.length() + (scriptPath.length() > 0 ? 1 : 0));
+                            NodeRef repoStoreRootNodeRef = nodeService.getRootNode(repoStore);
+                            List<NodeRef> nodeRefs = searchService.selectNodes(
+                                    repoStoreRootNodeRef,
+                                    repoScriptPath.toPrefixString(namespaceService)+"//*[like(@cm:name, '"+SearchLanguageConversion.convert(SearchLanguageConversion.DEF_LUCENE, SearchLanguageConversion.DEF_XPATH_LIKE, id+"*")+"', false)]",
+                                    new QueryParameterDefinition[] {},
+                                    namespaceService,
+                                    false,
+                                    SearchService.LANGUAGE_XPATH);
+                            documentPaths = new ArrayList<String>(nodeRefs.size());
+                            for (NodeRef nodeRef : nodeRefs)
+                            {
+                            	if (isContentPresent(nodeRef))
+                            	{
+                            		String name = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
+                            		if (name.startsWith(id))
+                            		{
+                            			String nodeDir = getPath(nodeRef);
+                            			String documentPath = nodeDir.substring(baseDirLength);
+                            			documentPaths.add(documentPath);
+                            		}
+                            	}
+                            }
+                            
+                            
+//                            String query = "+PATH:\"" + repoScriptPath.toPrefixString(namespaceService) +
+//                                           "//*\" +QNAME:" + lucenifyNamePattern(id) + "*";
+//                            ResultSet resultSet = searchService.query(repoStore, SearchService.LANGUAGE_LUCENE, query);
+//                            try
+//                            {
+//                                documentPaths = new ArrayList<String>(resultSet.length());
+//                                List<NodeRef> nodes = resultSet.getNodeRefs();
+//                                for (NodeRef nodeRef : nodes)
+//                                {
+//                                    String name = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
+//                                    if (name.startsWith(id))
+//                                    {
+//                                        String nodeDir = getPath(nodeRef);
+//                                        String documentPath = nodeDir.substring(baseDirLength);
+//                                        documentPaths.add(documentPath);
+//                                    }
+//                                }
+//                            }
+//                            finally
+//                            {
+//                                resultSet.close();
+//                            }
+                        }
+                        
+                        return documentPaths != null ? documentPaths.toArray(new String[documentPaths.size()]) : new String[0];
+                    }
+                }, true, false);
+            }
+        }, AuthenticationUtil.getSystemUserName());
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#getDocumentPaths(java.lang.String, boolean, java.lang.String)
+     */
+    public String[] getDocumentPaths(String path, boolean includeSubPaths, String documentPattern)
+    {
+        if ((documentPattern == null) || (documentPattern.length() == 0))
+        {
+            documentPattern = "*";
+        }
+        
+        String matcher = documentPattern.replace(".","\\.").replace("*",".*");
+        final Pattern pattern = Pattern.compile(matcher);
+        
+        String encPath = encodePathISO9075(path);
+//        final StringBuilder query = new StringBuilder(128);
+//        query.append("+PATH:\"").append(repoPath)
+//             .append(encPath.length() != 0 ? ('/' + encPath) : "")
+//             .append((includeSubPaths ? '/' : ""))
+//             .append("/*\" +QNAME:")
+//             .append(lucenifyNamePattern(documentPattern));
+        final StringBuilder xpath = new StringBuilder(128);
+        xpath.append(repoPath);
+        xpath.append(encPath.length() != 0 ? ('/' + encPath) : "");
+        xpath.append((includeSubPaths ? '/' : ""));
+        xpath.append("/*[like(@cm:name, '"+SearchLanguageConversion.convert(SearchLanguageConversion.DEF_LUCENE, SearchLanguageConversion.DEF_XPATH_LIKE, documentPattern+"*")+"', false)]");
+        
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<String[]>()
+        {
+            public String[] doWork() throws Exception
+            {
+                return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<String[]>()
+                {
+                    public String[] execute() throws Exception
+                    {
+                        int baseDirLength = getBaseDir().length() +1;
+                        
+                        List<String> documentPaths;
+                        
+                        NodeRef repoStoreRootNodeRef = nodeService.getRootNode(repoStore);
+                        List<NodeRef> nodeRefs = searchService.selectNodes(
+                                repoStoreRootNodeRef,
+                                xpath.toString(),
+                                new QueryParameterDefinition[] {},
+                                namespaceService,
+                                false,
+                                SearchService.LANGUAGE_XPATH);
+                        documentPaths = new ArrayList<String>(nodeRefs.size());
+                      for (NodeRef nodeRef : nodeRefs)
+                      {
+                          if (isContentPresent(nodeRef))
+                          {
+                                String name = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
+                                if (pattern.matcher(name).matches())
+                                {
+                                    String nodeDir = getPath(nodeRef);
+                                    String documentPath = nodeDir.substring(baseDirLength);
+                                    documentPaths.add(documentPath);
+                                }
+                          }
+                      }
+//                        ResultSet resultSet = searchService.query(repoStore, SearchService.LANGUAGE_LUCENE, query.toString());
+//                        try
+//                        {
+//                            documentPaths = new ArrayList<String>(resultSet.length());
+//                            List<NodeRef> nodes = resultSet.getNodeRefs();
+//                            for (NodeRef nodeRef : nodes)
+//                            {
+//                                String name = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
+//                                if (pattern.matcher(name).matches())
+//                                {
+//                                    String nodeDir = getPath(nodeRef);
+//                                    String documentPath = nodeDir.substring(baseDirLength);
+//                                    documentPaths.add(documentPath);
+//                                }
+//                            }
+//                        }
+//                        finally
+//                        {
+//                            resultSet.close();
+//                        }
+                        return documentPaths.toArray(new String[documentPaths.size()]);
+                    }
+                }, true, false);
+            }
+        }, AuthenticationUtil.getSystemUserName());
+    }
+    
+    /**
+     * Helper to encode the elements of a path to be used as a Lucene PATH statement
+     * using the ISO9075 encoding. Note that leading and trailing '/' elements will NOT
+     * be preserved.
+     * 
+     * @param path  Path to encode, elements separated by '/'
+     * 
+     * @return the encoded path, a minimum of the empty string will be returned
+     */
+    public static String encodePathISO9075(String path)
+    {
+        if (path == null || path.length() == 0)
+        {
+            return "";
+        }
+        StringBuilder result = new StringBuilder(path.length() + 16);
+        for (StringTokenizer t = new StringTokenizer(path, "/"); t.hasMoreTokens(); /**/)
+        {
+            result.append(ISO9075.encode(t.nextToken()));
+            if (t.hasMoreTokens())
+            {
+                result.append('/');
+            }
+        }
+        return result.toString();
+    }
+    
+    /**
+     * ALF-7059: Because we can't quote QNAME patterns, and because characters like minus have special meaning, we have
+     * to pass the document 'pattern' though the Lucene escaper, preserving the wildcard parts. Also, because you can't
+     * search for whitespace in a QNAME, we have to replace whitespace with the ? wildcard
+     * 
+     * @param pattern String
+     * @return String
+     */
+    private static String lucenifyNamePattern(String pattern)
+    {
+        // Assume already escaped if the pattern includes a backslash
+        if (pattern.indexOf('\\') != -1)
+        {
+            return pattern;
+        }
+        StringBuilder result = new StringBuilder(pattern.length() * 2);
+        StringTokenizer tkn = new StringTokenizer(pattern, "\t\r\n *", true);
+        while (tkn.hasMoreTokens())
+        {
+            String token = tkn.nextToken();
+            if (token.length() == 1)
+            {
+                char c = token.charAt(0);
+                if (Character.isWhitespace(c))
+                {
+                    // We can't include whitespace in a QNAME expression so we will have to use a wildcard character and
+                    // filter the results later
+                    result.append('?');
+                }
+                else if (c == '*')
+                {
+                    result.append(c);
+                }
+                else
+                {
+                    result.append(SearchLanguageConversion.escapeLuceneQuery(token));
+                }
+            }
+            else
+            {
+                result.append(SearchLanguageConversion.escapeLuceneQuery(token));
+            }
+        }
+        return result.toString();
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#getDescriptionDocumentPaths()
+     */
+    public String[] getDescriptionDocumentPaths()
+    {
+        return getDocumentPaths("/", true, DESC_PATH_PATTERN);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#getAllDocumentPaths()
+     */
+    public String[] getAllDocumentPaths()
+    {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<String[]>()
+        {
+            public String[] doWork() throws Exception
+            {
+                return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<String[]>()
+                {
+                    public String[] execute() throws Exception
+                    {
+                        int baseDirLength = getBaseDir().length() +1;
+                        
+                        List<String> documentPaths;
+                        
+                        NodeRef repoStoreRootNodeRef = nodeService.getRootNode(repoStore);
+                        List<NodeRef> nodeRefs = searchService.selectNodes(
+                                repoStoreRootNodeRef,
+                                repoPath +
+                                "//*[subtypeOf('{http://www.alfresco.org/model/content/1.0}content')]\"",
+                                new QueryParameterDefinition[] {},
+                                namespaceService,
+                                false,
+                                SearchService.LANGUAGE_XPATH);
+                        documentPaths = new ArrayList<String>(nodeRefs.size());
+                      for (NodeRef nodeRef : nodeRefs)
+                      {
+                          if (isContentPresent(nodeRef))
+                          {
+                                String nodeDir = getPath(nodeRef);
+                                documentPaths.add(nodeDir.substring(baseDirLength));
+                          }
+                      }
+                        
+//                        String query = "+PATH:\"" + repoPath +
+//                                       "//*\" +TYPE:\"{http://www.alfresco.org/model/content/1.0}content\"";
+//                        ResultSet resultSet = searchService.query(repoStore, SearchService.LANGUAGE_LUCENE, query);
+//                        try
+//                        {
+//                            documentPaths = new ArrayList<String>(resultSet.length());
+//                            List<NodeRef> nodes = resultSet.getNodeRefs();
+//                            for (NodeRef nodeRef : nodes)
+//                            {
+//                                String nodeDir = getPath(nodeRef);
+//                                documentPaths.add(nodeDir.substring(baseDirLength));
+//                            }
+//                        }
+//                        finally
+//                        {
+//                            resultSet.close();
+//                        }
+                        
+                        return documentPaths.toArray(new String[documentPaths.size()]);
+                    }
+                }, true, false);
+            }
+        }, AuthenticationUtil.getSystemUserName());
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#lastModified(java.lang.String)
+     */
+    public long lastModified(final String documentPath) throws IOException
+    {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Long>()
+        {
+            public Long doWork() throws Exception
+            {
+                return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Long>()
+                {
+                    public Long execute() throws Exception
+                    {
+                        ContentReader reader = contentService.getReader(
+                                findNodeRef(documentPath), ContentModel.PROP_CONTENT);
+                        return reader.getLastModified();
+                    }
+                }, true, false);
+            }
+        }, AuthenticationUtil.getSystemUserName());            
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#hasDocument(java.lang.String)
+     */
+    public boolean hasDocument(final String documentPath)
+    {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Boolean>()
+        {
+            public Boolean doWork() throws Exception
+            {
+                return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Boolean>()
+                {
+                    public Boolean execute() throws Exception
+                    {
+                        NodeRef nodeRef = findNodeRef(documentPath);
+                        return (nodeRef != null);
+                    }
+                }, true, false);
+            }
+        }, AuthenticationUtil.getSystemUserName());
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#getDescriptionDocument(java.lang.String)
+     */
+    public InputStream getDocument(final String documentPath)      
+        throws IOException
+    {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<InputStream>()
+        {
+            public InputStream doWork() throws Exception
+            {
+                return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<InputStream>()
+                {
+                    public InputStream execute() throws Exception
+                    {
+                        NodeRef nodeRef = findNodeRef(documentPath);
+                        if (nodeRef == null)
+                        {
+                            throw new IOException("Document " + documentPath + " does not exist.");
+                        }
+                        ContentReader reader = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT);
+                        if (reader == null || !reader.exists())
+                        {
+                            throw new IOException("Failed to read content at " + documentPath + " (content reader does not exist)");
+                        }
+                        return reader.getContentInputStream();
+                    }
+                }, true, false);
+            }
+        }, AuthenticationUtil.getSystemUserName());
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#createDocument(java.lang.String, java.lang.String)
+     */
+    public void createDocument(String documentPath, String content) throws IOException
+    {
+        String[] pathElements = documentPath.split("/");
+        String[] folderElements = new String[pathElements.length -1];
+        System.arraycopy(pathElements, 0, folderElements, 0, pathElements.length -1);
+        List<String> folderElementsList = Arrays.asList(folderElements);
+        
+        // create folder
+        FileInfo pathInfo;
+        if (folderElementsList.size() == 0)
+        {
+            pathInfo = fileService.getFileInfo(getBaseNodeRef());
+        }
+        else
+        {
+            pathInfo = FileFolderServiceImpl.makeFolders(fileService, getBaseNodeRef(), folderElementsList, ContentModel.TYPE_FOLDER);
+        }
+
+        // create file
+        String fileName = pathElements[pathElements.length -1];
+        if (fileService.searchSimple(pathInfo.getNodeRef(), fileName) != null)
+        {
+            throw new IOException("Document " + documentPath + " already exists");
+        }
+        FileInfo fileInfo = fileService.create(pathInfo.getNodeRef(), fileName, ContentModel.TYPE_CONTENT);
+        ContentWriter writer = fileService.getWriter(fileInfo.getNodeRef());
+        writer.putContent(content);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#updateDocument(java.lang.String, java.lang.String)
+     */
+    public void updateDocument(String documentPath, String content) throws IOException
+    {
+        String[] pathElements = documentPath.split("/");
+        
+        // get parent folder
+        NodeRef parentRef;
+        if (pathElements.length == 1)
+        {
+            parentRef = getBaseNodeRef();
+        }
+        else
+        {
+            parentRef = findNodeRef(documentPath.substring(0, documentPath.lastIndexOf('/')));
+        }
+
+        // update file
+        String fileName = pathElements[pathElements.length -1];
+        if (fileService.searchSimple(parentRef, fileName) == null)
+        {
+            throw new IOException("Document " + documentPath + " does not exists");
+        }
+        FileInfo fileInfo = fileService.create(parentRef, fileName, ContentModel.TYPE_CONTENT);
+        ContentWriter writer = fileService.getWriter(fileInfo.getNodeRef());
+        writer.putContent(content);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#removeDocument(java.lang.String)
+     */
+    public boolean removeDocument(String documentPath)
+        throws IOException
+    {
+        // TODO: Implement remove for Repository Store
+        return false;
+    }    
+    
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#getTemplateLoader()
+     */
+    public TemplateLoader getTemplateLoader()
+    {
+        return new RepoTemplateLoader();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Store#getScriptLoader()
+     */
+    public ScriptLoader getScriptLoader()
+    {
+        return new RepoScriptLoader();
+    }        
+    
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.tenant.TenantDeployer#onEnableTenant()
+     */
+    public void onEnableTenant()
+    {
+        init();
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.tenant.TenantDeployer#onDisableTenant()
+     */
+    public void onDisableTenant()
+    {
+        destroy();
+    }
+    
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString()
+    {
+        return repoPath;
+    }
+    
+    /**
+     * Repository path based template loader
+     * 
+     * @author davidc
+     */
+    private class RepoTemplateLoader implements TemplateLoader
+    {
+        /* (non-Javadoc)
+         * @see freemarker.cache.TemplateLoader#findTemplateSource(java.lang.String)
+         */
+        public Object findTemplateSource(final String name)
+            throws IOException
+        {
+            return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
+            {
+                public Object doWork() throws Exception
+                {
+                    return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
+                    {
+                        public Object execute() throws Exception
+                        {
+                            RepoTemplateSource source = null;
+                            NodeRef nodeRef = findNodeRef(name);
+                            if (nodeRef != null)
+                            {
+                                source = new RepoTemplateSource(nodeRef);
+                            }
+                            return source;
+                        }
+                    }, true);
+                }
+            }, AuthenticationUtil.getSystemUserName());
+        }
+
+        /* (non-Javadoc)
+         * @see freemarker.cache.TemplateLoader#getLastModified(java.lang.Object)
+         */
+        public long getLastModified(Object templateSource)
+        {
+            return ((RepoTemplateSource)templateSource).lastModified();
+        }
+        
+        /* (non-Javadoc)
+         * @see freemarker.cache.TemplateLoader#getReader(java.lang.Object, java.lang.String)
+         */
+        public Reader getReader(Object templateSource, String encoding) throws IOException
+        {
+            return ((RepoTemplateSource)templateSource).getReader();
+        }
+
+        /* (non-Javadoc)
+         * @see freemarker.cache.TemplateLoader#closeTemplateSource(java.lang.Object)
+         */
+        public void closeTemplateSource(Object arg0) throws IOException
+        {
+        }
+    }
+
+    /**
+     * Repository (content) node template source
+     *
+     * @author davidc
+     */
+    private class RepoTemplateSource
+    {
+        protected final NodeRef nodeRef;
+
+        /**
+         * Construct
+         * 
+         * @param ref NodeRef
+         */
+        private RepoTemplateSource(NodeRef ref)
+        {
+            this.nodeRef = ref;
+        }
+        
+        /* (non-Javadoc)
+         * @see java.lang.Object#equals(java.lang.Object)
+         */
+        public boolean equals(Object o)
+        {
+            if (o instanceof RepoTemplateSource)
+            {
+                return nodeRef.equals(((RepoTemplateSource)o).nodeRef);
+            }
+            else
+            {
+                return false;
+            }
+        }
+        
+        /* (non-Javadoc)
+         * @see java.lang.Object#hashCode()
+         */
+        public int hashCode()
+        {
+            return nodeRef.hashCode();
+        }
+        
+        /* (non-Javadoc)
+         * @see java.lang.Object#toString()
+         */
+        public String toString()
+        {
+            return nodeRef.toString();
+        }
+        
+        /**
+         * Gets the last modified time of the content
+         * 
+         * @return  last modified time
+         */
+        public long lastModified()
+        {
+            return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Long>()
+            {
+                public Long doWork() throws Exception
+                {
+                    return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Long>()
+                    {
+                        public Long execute() throws Exception
+                        {
+                            ContentReader reader = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT);
+                            return reader.getLastModified();
+                        }
+                    });
+                }
+            }, AuthenticationUtil.getSystemUserName());            
+        }
+        
+        /**
+         * Gets the content reader
+         * 
+         * @return  content reader
+         * @throws IOException
+         */
+        public Reader getReader() throws IOException
+        {
+            return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Reader>()
+            {
+                public Reader doWork() throws Exception
+                {
+                    return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Reader>()
+                    {
+                        public Reader execute() throws Exception
+                        {
+                            ContentReader reader = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT);
+                            return new InputStreamReader(reader.getContentInputStream(), reader.getEncoding());
+                        }
+                    });
+                }
+            }, AuthenticationUtil.getSystemUserName());            
+        }
+    }
+        
+    /**
+     * Repository path based script loader
+     * 
+     * @author davidc
+     */
+    private class RepoScriptLoader implements ScriptLoader
+    {
+        /* (non-Javadoc)
+         * @see org.alfresco.web.scripts.ScriptLoader#getScriptLocation(java.lang.String)
+         */
+        public ScriptContent getScript(final String path)
+        {
+            return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<ScriptContent>()
+            {
+                public ScriptContent doWork() throws Exception
+                {
+                    return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<ScriptContent>()
+                    {
+                        public ScriptContent execute() throws Exception
+                        {
+                            ScriptContent location = null;
+                            NodeRef nodeRef = findNodeRef(path);
+                            if (nodeRef != null)
+                            {
+                                location = new RepoScriptContent(path, nodeRef);
+                            }
+                            return location;
+                        }
+                    }, true, false);
+                }
+            }, AuthenticationUtil.getSystemUserName());
+        }
+    }
+    
+    /**
+     * Repo path script location
+     * 
+     * @author davidc
+     */
+    private class RepoScriptContent implements ScriptContent
+    {
+        protected String path;
+        protected NodeRef nodeRef;
+
+        /**
+         * Construct
+         * 
+         * @param path String
+         * @param nodeRef NodeRef
+         */
+        public RepoScriptContent(String path, NodeRef nodeRef)
+        {
+            this.path = path;
+            this.nodeRef = nodeRef;
+        }
+        
+        /* (non-Javadoc)
+         * @see org.alfresco.service.cmr.repository.ScriptLocation#getInputStream()
+         */
+        public InputStream getInputStream()
+        {
+            return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<InputStream>()
+            {
+                public InputStream doWork() throws Exception
+                {
+                    return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<InputStream>()
+                    {
+                        public InputStream execute() throws Exception
+                        {
+                            ContentReader reader = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT);
+                            return reader.getContentInputStream();
+                        }
+                    });
+                }
+            }, AuthenticationUtil.getSystemUserName());            
+        }
+
+        /* (non-Javadoc)
+         * @see org.alfresco.service.cmr.repository.ScriptLocation#getReader()
+         */
+        public Reader getReader()
+        {
+            ContentReader reader = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT);
+            try
+            {
+                return new InputStreamReader(getInputStream(), reader.getEncoding());
+            }
+            catch (UnsupportedEncodingException e)
+            {
+                throw new AlfrescoRuntimeException("Unsupported Encoding", e);
+            }
+        }
+
+        /* (non-Javadoc)
+         * @see org.alfresco.web.scripts.ScriptContent#getPath()
+         */
+		public String getPath()
+		{
+            return repoStore + getBaseDir() + "/" + path;
+		}
+		
+		/* (non-Javadoc)
+		 * @see org.alfresco.web.scripts.ScriptContent#getPathDescription()
+		 */
+		public String getPathDescription()
+		{
+		    return "/" + path + " (in repository store " + repoStore.toString() + getBaseDir() + ")";
+		}
+		
+        /* (non-Javadoc)
+         * @see org.alfresco.web.scripts.ScriptContent#isCachable()
+         */
+        public boolean isCachable()
+        {
+            return false;
+        }
+        
+        /* (non-Javadoc)
+         * @see org.alfresco.web.scripts.ScriptContent#isSecure()
+         */
+        public boolean isSecure()
+        {
+            return false;
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryContainer.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryContainer.java
new file mode 100644
index 00000000000..7686f302c4d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryContainer.java
@@ -0,0 +1,755 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.SocketException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.transaction.Status;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.error.ExceptionStackUtil;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
+import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.transaction.TooBusyException;
+import org.alfresco.repo.web.scripts.bean.LoginPost;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.TemplateService;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.descriptor.DescriptorService;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.TempFileProvider;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.extensions.webscripts.AbstractRuntimeContainer;
+import org.springframework.extensions.webscripts.Authenticator;
+import org.springframework.extensions.webscripts.Description;
+import org.springframework.extensions.webscripts.Description.RequiredAuthentication;
+import org.springframework.extensions.webscripts.Description.RequiredTransaction;
+import org.springframework.extensions.webscripts.Description.RequiredTransactionParameters;
+import org.springframework.extensions.webscripts.Description.TransactionCapability;
+import org.springframework.extensions.webscripts.ServerModel;
+import org.springframework.extensions.webscripts.WebScript;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+
+/**
+ * Repository (server-tier) container for Web Scripts
+ * 
+ * @author steveglover
+ * @author davidc
+ */
+public class RepositoryContainer extends AbstractRuntimeContainer
+{
+    // Logger
+    protected static final Log logger = LogFactory.getLog(RepositoryContainer.class);
+
+    /** Component Dependencies */
+    private Repository repository;
+    private RepositoryImageResolver imageResolver;
+    private TransactionService transactionService;
+    private RetryingTransactionHelper fallbackTransactionHelper;
+    private AuthorityService authorityService;
+    private DescriptorService descriptorService;
+
+    private boolean encryptTempFiles = false;
+    private String tempDirectoryName = null;
+    private int memoryThreshold = 4 * 1024 * 1024; // 4mb
+    private long maxContentSize = (long) 4 * 1024 * 1024 * 1024; // 4gb
+    private TempOutputStreamFactory streamFactory = null;
+    private TempOutputStreamFactory responseStreamFactory = null;
+    private String preserveHeadersPattern = null;
+
+    private Class<?>[] notPublicExceptions = new Class<?>[] {};
+    private Class<?>[] publicExceptions = new Class<?>[] {};
+
+    /*
+     * Shame init is already used (by TenantRepositoryContainer).
+     */
+    public void setup()
+    {
+        File tempDirectory = TempFileProvider.getTempDir(tempDirectoryName);
+        this.streamFactory = new TempOutputStreamFactory(tempDirectory, memoryThreshold, maxContentSize, encryptTempFiles, false);
+        this.responseStreamFactory = new TempOutputStreamFactory(tempDirectory, memoryThreshold, maxContentSize, encryptTempFiles, true);
+    }
+
+    public void setEncryptTempFiles(Boolean encryptTempFiles)
+    {
+		if(encryptTempFiles != null)
+		{
+			this.encryptTempFiles = encryptTempFiles.booleanValue();
+		}
+	}
+
+	public void setTempDirectoryName(String tempDirectoryName)
+	{
+		this.tempDirectoryName = tempDirectoryName;
+	}
+
+	public void setMemoryThreshold(Integer memoryThreshold)
+	{
+		if(memoryThreshold != null)
+		{
+			this.memoryThreshold = memoryThreshold.intValue();
+		}
+	}
+
+	public void setMaxContentSize(Long maxContentSize)
+	{
+		if(maxContentSize != null)
+		{
+			this.maxContentSize = maxContentSize.longValue();
+		}
+	}
+
+    public void setPreserveHeadersPattern(String preserveHeadersPattern)
+    {
+        this.preserveHeadersPattern = preserveHeadersPattern;
+    }
+
+	/**
+     * @param repository Repository
+     */
+    public void setRepository(Repository repository)
+    {
+        this.repository = repository;
+    }
+
+    /**
+     * @param imageResolver RepositoryImageResolver
+     */
+    public void setRepositoryImageResolver(RepositoryImageResolver imageResolver)
+    {
+        this.imageResolver = imageResolver;
+    }
+    
+    /**
+     * @param transactionService TransactionService
+     */
+    public void setTransactionService(TransactionService transactionService)
+    {
+        this.transactionService = transactionService;
+    }
+
+    /**
+     * @param fallbackTransactionHelper an unlimited transaction helper used to generate error responses
+     */
+    public void setFallbackTransactionHelper(RetryingTransactionHelper fallbackTransactionHelper)
+    {
+        this.fallbackTransactionHelper = fallbackTransactionHelper;
+    }
+
+    /**
+     * @param descriptorService DescriptorService
+     */
+    public void setDescriptorService(DescriptorService descriptorService)
+    {
+        this.descriptorService = descriptorService;
+    }
+
+    /**
+     * @param authorityService AuthorityService
+     */
+    public void setAuthorityService(AuthorityService authorityService)
+    {
+        this.authorityService = authorityService;
+    }
+
+    /**
+     * Exceptions which may contain information that cannot be displayed in UI 
+     * 
+     * @param notPublicExceptions - {@link Class}&lt;?&gt;[] instance which contains list of not public exceptions
+     */
+    public void setNotPublicExceptions(List<Class<?>> notPublicExceptions)
+    {
+        this.notPublicExceptions = new Class<?>[] {};
+        if((null != notPublicExceptions) && !notPublicExceptions.isEmpty())
+        {
+            this.notPublicExceptions = notPublicExceptions.toArray(this.notPublicExceptions);
+        }
+    }
+
+    public Class<?>[] getNotPublicExceptions()
+    {
+        return notPublicExceptions;
+    }
+
+    /**
+     * Exceptions which may contain information that need to display in UI
+     *
+     * @param publicExceptions - {@link Class}&lt;?&gt;[] instance which contains list of public exceptions
+     */
+    public void setPublicExceptions(List<Class<?>> publicExceptions)
+    {
+        this.publicExceptions = new Class<?>[] {};
+        if((null != publicExceptions) && !publicExceptions.isEmpty())
+        {
+            this.publicExceptions = publicExceptions.toArray(this.publicExceptions);
+        }
+    }
+
+    public Class<?>[] getPublicExceptions()
+    {
+        return publicExceptions;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Container#getDescription()
+     */
+    public ServerModel getDescription()
+    {
+        return new RepositoryServerModel(descriptorService.getCurrentRepositoryDescriptor(), descriptorService.getServerDescriptor());
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.AbstractRuntimeContainer#getScriptParameters()
+     */
+    public Map<String, Object> getScriptParameters()
+    {
+        Map<String, Object> params = new HashMap<String, Object>();
+        params.putAll(super.getScriptParameters());
+        addRepoParameters(params);
+        return params;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.web.scripts.AbstractRuntimeContainer#getTemplateParameters()
+     */
+    public Map<String, Object> getTemplateParameters()
+    {
+        // Ensure we have a transaction - we might be generating the status template after the main transaction failed
+        return fallbackTransactionHelper.doInTransaction(new RetryingTransactionCallback<Map<String, Object>>()
+        {
+            public Map<String, Object> execute() throws Throwable
+            {
+                Map<String, Object> params = new HashMap<String, Object>();
+                params.putAll(RepositoryContainer.super.getTemplateParameters());
+                params.put(TemplateService.KEY_IMAGE_RESOLVER, imageResolver.getImageResolver());
+                addRepoParameters(params);
+                return params;
+            }
+        }, true);
+    }
+
+    /**
+     * Add Repository specific parameters
+     * 
+     * @param params Map<String, Object>
+     */
+    private void addRepoParameters(Map<String, Object> params)
+    {
+        if (AlfrescoTransactionSupport.getTransactionId() != null &&
+            AuthenticationUtil.getFullAuthentication() != null)
+        {
+            NodeRef rootHome = repository.getRootHome();
+            if (rootHome != null)
+            {
+                params.put("roothome", rootHome);
+            }
+            NodeRef companyHome = repository.getCompanyHome();
+            if (companyHome != null)
+            {
+                params.put("companyhome", companyHome);
+            }
+            NodeRef person = repository.getFullyAuthenticatedPerson();
+            if (person != null)
+            {
+                params.put("person", person);
+                NodeRef userHome = repository.getUserHome(person);
+                if (userHome != null)
+                {
+                    params.put("userhome", userHome);
+                }
+            }
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.RuntimeContainer#executeScript(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse, org.alfresco.web.scripts.Authenticator)
+     */
+    public void executeScript(WebScriptRequest scriptReq, WebScriptResponse scriptRes, final Authenticator auth)
+        throws IOException
+    {
+        try
+        {
+            executeScriptInternal(scriptReq, scriptRes, auth);
+        }
+        catch (RuntimeException e)
+        {
+            Throwable hideCause = ExceptionStackUtil.getCause(e, notPublicExceptions);
+            Throwable displayCause = ExceptionStackUtil.getCause(e, publicExceptions);
+            if (displayCause == null && hideCause != null)
+            {
+                AlfrescoRuntimeException alf = null;
+                if (e instanceof AlfrescoRuntimeException)
+                {
+                    alf = (AlfrescoRuntimeException) e;
+                }
+                else
+                {
+                    // The message will not have a numerical identifier
+                    alf = new AlfrescoRuntimeException("WebScript execution failed", e);
+                }
+                String num = alf.getNumericalId();
+                logger.error("Server error (" + num + ")", e);
+                throw new RuntimeException("Server error (" + num + ").  Details can be found in the server logs.");
+            }
+            else
+            {
+                throw e;
+            }
+        }
+    }
+    
+    protected void executeScriptInternal(WebScriptRequest scriptReq, WebScriptResponse scriptRes, final Authenticator auth)
+        throws IOException
+    {
+        final WebScript script = scriptReq.getServiceMatch().getWebScript();
+        final Description desc = script.getDescription();
+        final boolean debug = logger.isDebugEnabled();
+		        
+        // Escalate the webscript declared level of authentication to the container required authentication
+        // eg. must be guest if MT is enabled unless credentials are empty
+        RequiredAuthentication containerRequiredAuthentication = getRequiredAuthentication();
+        final RequiredAuthentication required = (desc.getRequiredAuthentication().compareTo(containerRequiredAuthentication) < 0 && !auth.emptyCredentials() ? containerRequiredAuthentication : desc.getRequiredAuthentication());
+        final boolean isGuest = scriptReq.isGuest();
+        
+        if (required == RequiredAuthentication.none)
+        {
+            // TODO revisit - cleared here, in-lieu of WebClient clear
+            //AuthenticationUtil.clearCurrentSecurityContext();
+            
+            transactionedExecuteAs(script, scriptReq, scriptRes);
+        }
+        else if ((required == RequiredAuthentication.user || required == RequiredAuthentication.admin) && isGuest)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_UNAUTHORIZED, "Web Script " + desc.getId() + " requires user authentication; however, a guest has attempted access.");
+        }
+        else
+        {
+            try
+            {
+                AuthenticationUtil.pushAuthentication();
+                
+                //
+                // Determine if user already authenticated
+                //
+                if (debug)
+                {
+                    String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
+                    logger.debug("Current authentication: " + (currentUser == null ? "unauthenticated" : "authenticated as " + currentUser));
+                    logger.debug("Authentication required: " + required);
+                    logger.debug("Guest login requested: " + isGuest);
+                }
+                
+                //
+                // Apply appropriate authentication to Web Script invocation
+                //
+                RetryingTransactionCallback<Boolean> authWork = new RetryingTransactionCallback<Boolean>()
+                {
+                    public Boolean execute() throws Exception
+                    {
+                        if (auth == null || auth.authenticate(required, isGuest))
+                        {
+                            // The user will now have been authenticated, based on HTTP Auth, Ticket etc
+                            // Check that the user they authenticated as has appropriate access to the script
+                            
+                            // Check to see if they supplied HTTP Auth or Ticket as guest, on a script that needs more
+                            if (required == RequiredAuthentication.user || required == RequiredAuthentication.admin)
+                            {
+                                String authenticatedUser = AuthenticationUtil.getFullyAuthenticatedUser();
+                                String runAsUser = AuthenticationUtil.getRunAsUser();
+                                
+                                if ( (authenticatedUser == null) ||
+                                     (authenticatedUser.equals(runAsUser) && authorityService.hasGuestAuthority()) ||
+                                     (!authenticatedUser.equals(runAsUser) && authorityService.isGuestAuthority(authenticatedUser)) )
+                                {
+                                    throw new WebScriptException(HttpServletResponse.SC_UNAUTHORIZED, "Web Script " + desc.getId() + " requires user authentication; however, a guest has attempted access.");
+                                }
+                            }
+                            
+                            // Check to see if they're admin or system on an Admin only script
+                            if (required == RequiredAuthentication.admin && !(authorityService.hasAdminAuthority() || AuthenticationUtil.getFullyAuthenticatedUser().equals(AuthenticationUtil.getSystemUserName())))
+                            {
+                                throw new WebScriptException(HttpServletResponse.SC_UNAUTHORIZED, "Web Script " + desc.getId() + " requires admin authentication; however, a non-admin has attempted access.");
+                            }
+                            
+                            if (debug)
+                            {
+                                String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
+                                logger.debug("Authentication: " + (currentUser == null ? "unauthenticated" : "authenticated as " + currentUser));
+                            }
+                            
+                            return true;
+                        }
+                        return false;
+                    }        
+                };
+                
+                boolean readOnly = transactionService.isReadOnly();
+                boolean requiresNew = !readOnly && AlfrescoTransactionSupport.getTransactionReadState() == TxnReadState.TXN_READ_ONLY;
+                if (transactionService.getRetryingTransactionHelper().doInTransaction(authWork, readOnly, requiresNew))
+                {
+                    // Execute Web Script if authentication passed
+                    // The Web Script has its own txn management with potential runAs() user
+                    transactionedExecuteAs(script, scriptReq, scriptRes);
+                }
+                else
+                {
+                    throw new WebScriptException(HttpServletResponse.SC_UNAUTHORIZED, "Authentication failed for Web Script " + desc.getId());
+                }
+            }
+            finally
+            {
+                //
+                // Reset authentication for current thread
+                //
+                AuthenticationUtil.popAuthentication();
+                
+                if (debug)
+                {
+                    String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
+                    logger.debug("Authentication reset: " + (currentUser == null ? "unauthenticated" : "authenticated as " + currentUser));
+                }
+            }
+        }
+    }
+
+    /**
+     * Execute script within required level of transaction
+     * 
+     * @param script WebScript
+     * @param scriptReq WebScriptRequest
+     * @param scriptRes WebScriptResponse
+     * @throws IOException
+     */
+    protected void transactionedExecute(final WebScript script, final WebScriptRequest scriptReq, final WebScriptResponse scriptRes)
+        throws IOException
+    {
+        try
+        {
+            final Description description = script.getDescription();
+            if (description.getRequiredTransaction() == RequiredTransaction.none)
+            {
+                script.execute(scriptReq, scriptRes);
+            }
+            else
+            {
+                final BufferedRequest bufferedReq;
+                final BufferedResponse bufferedRes;
+                RequiredTransactionParameters trxParams = description.getRequiredTransactionParameters();
+                if (trxParams.getCapability() == TransactionCapability.readwrite)
+                {
+                    if (trxParams.getBufferSize() > 0)
+                    {
+                        if (logger.isDebugEnabled())
+                            logger.debug("Creating Transactional Response for ReadWrite transaction; buffersize=" + trxParams.getBufferSize());
+
+                        // create buffered request and response that allow transaction retrying
+                        bufferedReq = new BufferedRequest(scriptReq, streamFactory);
+                        bufferedRes = new BufferedResponse(scriptRes, trxParams.getBufferSize(), responseStreamFactory);
+                    }
+                    else
+                    {
+                        if (logger.isDebugEnabled())
+                            logger.debug("Transactional Response bypassed for ReadWrite - buffersize=0");
+                        bufferedReq = null;
+                        bufferedRes = null;
+                    }
+                }
+                else
+                {
+                    bufferedReq = null;
+                    bufferedRes = null;
+                }
+            
+                // encapsulate script within transaction
+                RetryingTransactionCallback<Object> work = new RetryingTransactionCallback<Object>()
+                {
+                    public Object execute() throws Exception
+                    {
+                        try
+                        {
+                            if (logger.isDebugEnabled())
+                                logger.debug("Begin retry transaction block: " + description.getRequiredTransaction() + "," 
+                                        + description.getRequiredTransactionParameters().getCapability());
+
+                            if (bufferedRes == null)
+                            {
+                                script.execute(scriptReq, scriptRes);                            
+                            }
+                            else
+                            {
+                                // Reset the request and response in case of a transaction retry
+                                bufferedReq.reset();
+                                // REPO-4388 don't reset specified headers
+                                bufferedRes.reset(preserveHeadersPattern);
+                                script.execute(bufferedReq, bufferedRes);
+                            }
+                        }
+                        catch(Exception e)
+                        {
+                            if (logger.isDebugEnabled())
+                            {
+                                logger.debug("Transaction exception: " + description.getRequiredTransaction() + ": " + e.getMessage());
+                                // Note: user transaction shouldn't be null, but just in case inside this exception handler
+                                UserTransaction userTrx = RetryingTransactionHelper.getActiveUserTransaction();
+                                if (userTrx != null)
+                                {
+                                    logger.debug("Transaction status: " + userTrx.getStatus());
+                                }
+                            }
+                           
+                            UserTransaction userTrx = RetryingTransactionHelper.getActiveUserTransaction();
+                            if (userTrx != null)
+                            {
+                                if (userTrx.getStatus() != Status.STATUS_MARKED_ROLLBACK)
+                                {
+                                    if (logger.isDebugEnabled())
+                                        logger.debug("Marking web script transaction for rollback");
+                                    try
+                                    {
+                                        userTrx.setRollbackOnly();
+                                    }
+                                    catch(Throwable re)
+                                    {
+                                        if (logger.isDebugEnabled())
+                                            logger.debug("Caught and ignoring exception during marking for rollback: " + re.getMessage());
+                                    }
+                                }
+                            }
+                        
+                            // re-throw original exception for retry
+                            throw e;
+                        }
+                        finally
+                        {
+                           if (logger.isDebugEnabled())
+                                logger.debug("End retry transaction block: " + description.getRequiredTransaction() + "," 
+                                        + description.getRequiredTransactionParameters().getCapability());
+                        }
+                    
+                        return null;
+                    }        
+                };
+        
+                boolean readonly = description.getRequiredTransactionParameters().getCapability() == TransactionCapability.readonly;
+                boolean requiresNew = description.getRequiredTransaction() == RequiredTransaction.requiresnew;
+            
+                // log a warning if we detect a GET webscript being run in a readwrite transaction, GET calls should
+                // NOT have any side effects so this scenario as a warning sign something maybe amiss, see ALF-10179.
+                if (logger.isDebugEnabled() && !readonly && "GET".equalsIgnoreCase(description.getMethod()))
+                {
+                    logger.debug("Webscript with URL '" + scriptReq.getURL() + 
+                               "' is a GET request but it's descriptor has declared a readwrite transaction is required");
+                }
+            
+                try
+                {
+                    RetryingTransactionHelper transactionHelper = transactionService.getRetryingTransactionHelper();
+                    if(script instanceof LoginPost)
+                    {
+                        //login script requires read-write transaction because of authorization intercepter
+                        transactionHelper.setForceWritable(true);
+                    }
+                    transactionHelper.doInTransaction(work, readonly, requiresNew);
+                }
+                catch (TooBusyException e)
+                {
+                    // Map TooBusyException to a 503 status code
+                    throw new WebScriptException(HttpServletResponse.SC_SERVICE_UNAVAILABLE, e.getMessage(), e);
+                }
+                finally
+                {
+                    // Get rid of any temporary files
+                    if (bufferedReq != null)
+                    {
+                        bufferedReq.close();
+                    }
+                }
+
+                // Ensure a response is always flushed after successful execution
+                if (bufferedRes != null)
+                {
+                    bufferedRes.writeResponse();
+                }
+            
+            }
+        }
+        catch (IOException ioe)
+        {
+            Throwable socketException = ExceptionStackUtil.getCause(ioe, SocketException.class);
+            Class<?> clientAbortException = null;
+            try
+            {
+                clientAbortException = Class.forName("org.apache.catalina.connector.ClientAbortException");
+            }
+            catch (ClassNotFoundException e)
+            {
+                // do nothing
+            }
+            // Note: if you need to look for more exceptions in the stack, then create a static array and pass it in
+            if ((socketException != null && socketException.getMessage().contains("Broken pipe")) || (clientAbortException != null && ExceptionStackUtil.getCause(ioe, clientAbortException) != null))
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.warn("Client has cut off communication", ioe);
+                }
+                else
+                {
+                    logger.info("Client has cut off communication");
+                }
+            }
+            else
+            {
+                throw ioe;
+            }
+        }
+    }
+    
+    /**
+     * Execute script within required level of transaction as required effective user.
+     * 
+     * @param script WebScript
+     * @param scriptReq WebScriptRequest
+     * @param scriptRes WebScriptResponse
+     * @throws IOException
+     */
+    private void transactionedExecuteAs(final WebScript script, final WebScriptRequest scriptReq,
+            final WebScriptResponse scriptRes) throws IOException
+    {
+        String runAs = script.getDescription().getRunAs();
+        if (runAs == null)
+        {
+            transactionedExecute(script, scriptReq, scriptRes);
+        }
+        else
+        {
+            RunAsWork<Object> work = new RunAsWork<Object>()
+            {
+                public Object doWork() throws Exception
+                {
+                    transactionedExecute(script, scriptReq, scriptRes);
+                    return null;
+                }
+            };
+            AuthenticationUtil.runAs(work, runAs);
+        }
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.AbstractRuntimeContainer#onApplicationEvent(org.springframework.context.ApplicationEvent)
+     */
+    @Override
+    public void onApplicationEvent(ApplicationEvent event)
+    {
+        if (event instanceof ContextRefreshedEvent)
+        {
+            ContextRefreshedEvent refreshEvent = (ContextRefreshedEvent)event;
+            ApplicationContext refreshContext = refreshEvent.getApplicationContext();
+            if (refreshContext != null && refreshContext.equals(applicationContext))
+            {
+                RunAsWork<Object> work = new RunAsWork<Object>()
+                {
+                    public Object doWork() throws Exception
+                    {
+                        reset();
+                        return null;
+                    }
+                };
+                AuthenticationUtil.runAs(work, AuthenticationUtil.getSystemUserName());
+            }
+        }
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.AbstractRuntimeContainer#getRequiredAuthentication()
+     */
+    @Override
+    public RequiredAuthentication getRequiredAuthentication()
+    {
+        if (AuthenticationUtil.isMtEnabled())
+        {
+            return RequiredAuthentication.guest; // user or guest (ie. at least guest)
+        }
+        
+        return RequiredAuthentication.none;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.RuntimeContainer#authenticate(org.alfresco.web.scripts.Authenticator, org.alfresco.web.scripts.Description.RequiredAuthentication)
+     */
+    @Override
+    public boolean authenticate(Authenticator auth, RequiredAuthentication required)
+    {
+        if (auth != null)
+        {
+            AuthenticationUtil.clearCurrentSecurityContext();
+            
+            return auth.authenticate(required, false);
+        }
+        
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.AbstractRuntimeContainer#reset()
+     */
+    @Override
+    public void reset() 
+    {
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
+        {
+            public Object execute() throws Exception
+            {
+                internalReset();
+                return null;
+            }
+        }, true, false);
+    }
+    
+    private void internalReset()
+    {
+        super.reset();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryImageResolver.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryImageResolver.java
new file mode 100644
index 00000000000..04053ac6d33
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryImageResolver.java
@@ -0,0 +1,80 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import javax.servlet.ServletContext;
+
+import org.alfresco.service.cmr.repository.FileTypeImageSize;
+import org.alfresco.service.cmr.repository.TemplateImageResolver;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.web.context.ServletContextAware;
+
+
+/**
+ * Web Scripts Image Resolver
+ * 
+ * @author davidc
+ */
+public class RepositoryImageResolver
+    implements ServletContextAware, InitializingBean
+{
+    private ServletContext servletContext;
+    private TemplateImageResolver imageResolver;
+    
+    
+    /* (non-Javadoc)
+     * @see org.springframework.web.context.ServletContextAware#setServletContext(javax.servlet.ServletContext)
+     */
+    public void setServletContext(ServletContext context)
+    {
+        this.servletContext = context;
+    }
+
+    /* (non-Javadoc)
+     * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+     */
+    @SuppressWarnings("serial")
+    public void afterPropertiesSet()
+        throws Exception
+    {
+        this.imageResolver = new TemplateImageResolver()
+        {
+            public String resolveImagePathForName(String filename, FileTypeImageSize size)
+            {
+                return FileTypeImageUtils.getFileTypeImage(servletContext, filename, size);
+            }  
+        };        
+    }
+
+    /**
+     * @return  image resolver
+     */
+    public TemplateImageResolver getImageResolver()
+    {
+        return this.imageResolver;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessor.java
new file mode 100644
index 00000000000..8e3b34208cd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessor.java
@@ -0,0 +1,206 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.jscript.ValueConverter;
+import org.alfresco.scripts.ScriptException;
+import org.alfresco.service.cmr.repository.ScriptLocation;
+import org.alfresco.service.cmr.repository.ScriptService;
+import org.springframework.extensions.webscripts.MultiScriptLoader;
+import org.springframework.extensions.webscripts.ScriptContent;
+import org.springframework.extensions.webscripts.ScriptLoader;
+import org.springframework.extensions.webscripts.ScriptProcessor;
+import org.springframework.extensions.webscripts.SearchPath;
+import org.springframework.extensions.webscripts.Store;
+import org.springframework.extensions.webscripts.WebScriptException;
+
+
+/**
+ * Repository (server-tier) Web Script Processor
+ * 
+ * @author davidc
+ */
+public class RepositoryScriptProcessor implements ScriptProcessor
+{
+    // dependencies
+    protected ScriptService scriptService;
+    protected ScriptLoader scriptLoader;
+    protected SearchPath searchPath;
+
+    // Javascript Converter
+    private final ValueConverter valueConverter = new ValueConverter();
+
+    
+    /**
+     * @param scriptService ScriptService
+     */
+    public void setScriptService(ScriptService scriptService)
+    {
+        this.scriptService = scriptService;
+    }
+
+    /**
+     * @param searchPath SearchPath
+     */
+    public void setSearchPath(SearchPath searchPath)
+    {
+        this.searchPath = searchPath;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ScriptProcessor#findScript(java.lang.String)
+     */
+    public ScriptContent findScript(String path)
+    {
+        return scriptLoader.getScript(path);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ScriptProcessor#executeScript(java.lang.String, java.util.Map)
+     */
+    public Object executeScript(String path, Map<String, Object> model)
+        throws ScriptException
+    {
+        // locate script within web script stores
+        ScriptContent scriptContent = findScript(path);
+        if (scriptContent == null)
+        {
+            throw new WebScriptException("Unable to locate script " + path);
+        }
+        // execute script
+        return executeScript(scriptContent, model);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ScriptProcessor#executeScript(org.alfresco.web.scripts.ScriptContent, java.util.Map)
+     */
+    public Object executeScript(ScriptContent content, Map<String, Object> model)
+    {
+        return scriptService.executeScript("javascript", new RepositoryScriptLocation(content), model);        
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ScriptProcessor#unwrapValue(java.lang.Object)
+     */
+    public Object unwrapValue(Object value)
+    {
+        return valueConverter.convertValueForJava(value);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ScriptProcessor#reset()
+     */
+    public void reset()
+    {
+        init();
+        this.scriptService.resetScriptProcessors();
+    }
+    
+    /**
+     * Register script loader from each Web Script Store with Script Processor
+     */
+    private void init()
+    {
+        List<ScriptLoader> loaders = new ArrayList<ScriptLoader>();
+        for (Store apiStore : searchPath.getStores())
+        {
+            ScriptLoader loader = apiStore.getScriptLoader();
+            if (loader == null)
+            {
+                throw new WebScriptException("Unable to retrieve script loader for Web Script store " + apiStore.getBasePath());
+            }
+            loaders.add(loader);
+        }
+        scriptLoader = new MultiScriptLoader(loaders.toArray(new ScriptLoader[loaders.size()]));
+    }
+
+    
+    /**
+     * Script Location Facade
+     */
+    private static class RepositoryScriptLocation implements ScriptLocation
+    {
+        private ScriptContent content;
+        
+        private RepositoryScriptLocation(ScriptContent content)
+        {
+            this.content = content;
+        }
+        
+        /* (non-Javadoc)
+         * @see org.alfresco.service.cmr.repository.ScriptLocation#getInputStream()
+         */
+        public InputStream getInputStream()
+        {
+            return content.getInputStream();
+        }
+
+        /* (non-Javadoc)
+         * @see org.alfresco.service.cmr.repository.ScriptLocation#getReader()
+         */
+        public Reader getReader()
+        {
+            return content.getReader();
+        }
+        
+        /* (non-Javadoc)
+         * @see org.alfresco.service.cmr.repository.ScriptLocation#isCachable()
+         */
+        public boolean isCachable()
+        {
+            return content.isCachable();
+        }
+        
+        /* (non-Javadoc)
+         * @see org.alfresco.service.cmr.repository.ScriptLocation#isSecure()
+         */
+        public boolean isSecure()
+        {
+            return content.isSecure();
+        }
+        
+        /* (non-Javadoc)
+         * @see org.alfresco.service.cmr.repository.ScriptLocation#getPath()
+         */
+        public String getPath()
+        {
+            return content.getPath();
+        }
+        
+        @Override
+        public String toString()
+        {
+        	return content.getPathDescription();
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessorFactory.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessorFactory.java
new file mode 100644
index 00000000000..69e67fa58e9
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryScriptProcessorFactory.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import org.springframework.extensions.webscripts.ScriptProcessor;
+import org.springframework.extensions.webscripts.ScriptProcessorFactory;
+
+/**
+ * @author Kevin Roast
+ */
+public class RepositoryScriptProcessorFactory implements ScriptProcessorFactory
+{
+    private ScriptProcessor scriptProcessor;
+    
+    
+    /**
+     * @param scriptProcessor       the ScriptProcessor to set
+     */
+    public void setScriptProcessor(ScriptProcessor scriptProcessor)
+    {
+        this.scriptProcessor = scriptProcessor;
+    }
+
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.ScriptProcessorFactory#newInstance()
+     */
+    public ScriptProcessor newInstance()
+    {
+        return scriptProcessor;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryServerModel.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryServerModel.java
new file mode 100644
index 00000000000..a23b391c674
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryServerModel.java
@@ -0,0 +1,142 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import org.alfresco.service.descriptor.Descriptor;
+import org.springframework.extensions.webscripts.ServerModel;
+
+
+/**
+ * Script / Template Model representing Repository Server meta-data
+ * 
+ * @author davidc
+ */
+public class RepositoryServerModel implements ServerModel
+{
+    private Descriptor currentDescriptor;
+    private Descriptor serverDescriptor;
+    
+    /**
+     * Construct
+     * 
+     * @param currentDescriptor Descriptor
+     * @param serverDescriptor Descriptor
+     */
+    /*package*/ RepositoryServerModel(Descriptor currentDescriptor, Descriptor serverDescriptor)
+    {
+        this.currentDescriptor = currentDescriptor;
+        this.serverDescriptor = serverDescriptor;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ServerModel#getContainerName()
+     */
+    public String getContainerName()
+    {
+        return "Repository";
+    }
+
+    /*(non-Javadoc)
+     * @see org.alfresco.web.scripts.ServerModel#getId()
+     */
+    public String getId()
+    {
+        return currentDescriptor.getId();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ServerModel#getName()
+     */
+    public String getName()
+    {
+        return currentDescriptor.getName();
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ServerModel#getVersionMajor()
+     */
+    public String getVersionMajor()
+    {
+        return currentDescriptor.getVersionMajor();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ServerModel#getVersionMinor()
+     */
+    public String getVersionMinor()
+    {
+        return currentDescriptor.getVersionMinor();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ServerModel#getVersionRevision()
+     */
+    public String getVersionRevision()
+    {
+        return currentDescriptor.getVersionRevision();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ServerModel#getVersionLabel()
+     */
+    public String getVersionLabel()
+    {
+        return currentDescriptor.getVersionLabel();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ServerModel#getVersionBuild()
+     */
+    public String getVersionBuild()
+    {
+        return currentDescriptor.getVersionBuild();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ServerModel#getVersion()
+     */
+    public String getVersion()
+    {
+        return currentDescriptor.getVersion();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ServerModel#getEdition()
+     */
+    public String getEdition()
+    {
+        return serverDescriptor.getEdition();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.ServerModel#getSchema()
+     */
+    public int getSchema()
+    {
+        return currentDescriptor.getSchema();
+    }
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java
new file mode 100644
index 00000000000..a5e4a058e52
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessor.java
@@ -0,0 +1,261 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.processor.ProcessorExtension;
+import org.alfresco.repo.template.FreeMarkerProcessor;
+import org.alfresco.repo.template.QNameAwareObjectWrapper;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.extensions.surf.util.AbstractLifecycleBean;
+import org.springframework.extensions.webscripts.SearchPath;
+import org.springframework.extensions.webscripts.Store;
+import org.springframework.extensions.webscripts.TemplateProcessor;
+import org.springframework.extensions.webscripts.WebScriptException;
+
+import freemarker.cache.MultiTemplateLoader;
+import freemarker.cache.StrongCacheStorage;
+import freemarker.cache.TemplateLoader;
+import freemarker.core.TemplateClassResolver;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateExceptionHandler;
+import freemarker.template.Version;
+
+
+/**
+ * Repository (server-tier) Web Script Template Processor
+ * 
+ * @author davidc
+ */
+public class RepositoryTemplateProcessor extends FreeMarkerProcessor
+    implements TemplateProcessor, ApplicationContextAware, ApplicationListener
+{
+    private ProcessorLifecycle lifecycle = new ProcessorLifecycle();
+    protected SearchPath searchPath;
+    protected String defaultEncoding;
+    protected Configuration templateConfig;
+    protected FreeMarkerProcessor freeMarkerProcessor;
+    private int updateDelay = 1;
+
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.template.FreeMarkerProcessor#setDefaultEncoding(java.lang.String)
+     */
+    @Override
+    public void setDefaultEncoding(String defaultEncoding)
+    {
+        this.defaultEncoding = defaultEncoding;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.TemplateProcessor#getDefaultEncoding()
+     */
+    public String getDefaultEncoding()
+    {
+        return this.defaultEncoding;
+    }
+    
+    /**
+     * @param updateDelay the time in seconds between checks on the modified date for cached templates
+     */
+    public void setUpdateDelay(int updateDelay)
+    {
+        this.updateDelay = updateDelay;
+    }
+    
+    /**
+     * @deprecated
+     * @param cacheSize not used anymore
+     */
+    @Deprecated
+    public void setCacheSize(int cacheSize)
+    {
+    }
+
+    /**
+     * @param searchPath SearchPath
+     */
+    public void setSearchPath(SearchPath searchPath)
+    {
+        this.searchPath = searchPath;
+    }
+    
+    /**
+     * Set the freemarker processor
+     * 
+     * @param freeMarkerProcessor   the free marker processor
+     */
+    public void setFreeMarkerProcessor(FreeMarkerProcessor freeMarkerProcessor)
+    {
+        this.freeMarkerProcessor = freeMarkerProcessor;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.template.FreeMarkerProcessor#getConfig()
+     */
+    @Override
+    protected Configuration getConfig()
+    {
+        return templateConfig;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.TemplateProcessor#reset()
+     */
+    public void reset()
+    {
+        if (templateConfig != null)
+        {
+            templateConfig.clearTemplateCache();
+        }
+        initConfig();
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.TemplateProcessor#hasTemplate(java.lang.String)
+     */
+    public boolean hasTemplate(String templatePath)
+    {
+        boolean hasTemplate = false;
+        try
+        {
+            Template template = templateConfig.getTemplate(templatePath);
+            hasTemplate = (template != null);
+        }
+        catch(FileNotFoundException e)
+        {
+            // NOTE: return false as template is not found
+        }
+        catch(IOException e)
+        {
+            throw new WebScriptException("Failed to retrieve template " + templatePath, e);
+        }
+        return hasTemplate;
+    }
+    
+    /**
+     * Initialise FreeMarker Configuration
+     */
+    protected void initConfig()
+    {
+        Configuration config = new Configuration();
+        
+        // setup template cache
+        config.setCacheStorage(new StrongCacheStorage());
+        config.setTemplateUpdateDelay(updateDelay);
+        
+        // setup template loaders
+        List<TemplateLoader> loaders = new ArrayList<TemplateLoader>();
+        for (Store apiStore : searchPath.getStores())
+        {
+            TemplateLoader loader = apiStore.getTemplateLoader();
+            if (loader == null)
+            {
+                throw new WebScriptException("Unable to retrieve template loader for Web Script store " + apiStore.getBasePath());
+            }
+            loaders.add(loader);
+        }
+        MultiTemplateLoader loader = new MultiTemplateLoader(loaders.toArray(new TemplateLoader[loaders.size()]));
+        config.setTemplateLoader(loader);
+        
+        // use our custom object wrapper that can deal with QNameMap objects directly
+        config.setObjectWrapper(new QNameAwareObjectWrapper());
+        
+        // rethrow any exception so we can deal with them
+        config.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
+        
+        // turn off locale sensitive lookup - to save numerous wasted calls to nodeservice.exists()
+        config.setLocalizedLookup(false);
+        
+        // set template encoding
+        if (defaultEncoding != null)
+        {
+            config.setDefaultEncoding(defaultEncoding);
+        }
+        
+        // set output encoding
+        config.setOutputEncoding("UTF-8");
+        config.setIncompatibleImprovements(new Version(2, 3, 20));
+        config.setNewBuiltinClassResolver(TemplateClassResolver.SAFER_RESOLVER);
+        
+        templateConfig = config;
+    }
+    
+    /**
+     * Tempory fix to initialise this template processor with the freeMarker extensions expected by
+     * the templates.    
+     */
+    private void initProcessorExtensions()
+    {
+        for (ProcessorExtension processorExtension : this.freeMarkerProcessor.getProcessorExtensions())
+        {
+            this.registerProcessorExtension(processorExtension);
+        }
+    }
+        
+    /* (non-Javadoc)
+     * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
+     */
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
+    {
+        lifecycle.setApplicationContext(applicationContext);
+    }
+
+    /* (non-Javadoc)
+     * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
+     */
+    public void onApplicationEvent(ApplicationEvent event)
+    {
+        lifecycle.onApplicationEvent(event);
+    }
+
+    /**
+     * Hooks into Spring Application Lifecycle
+     */
+    private class ProcessorLifecycle extends AbstractLifecycleBean
+    {
+        @Override
+        protected void onBootstrap(ApplicationEvent event)
+        {
+            initProcessorExtensions();
+        }
+
+        @Override
+        protected void onShutdown(ApplicationEvent event)
+        {
+        }
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessorFactory.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessorFactory.java
new file mode 100644
index 00000000000..5aeb0d3208d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/RepositoryTemplateProcessorFactory.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import org.springframework.extensions.webscripts.TemplateProcessor;
+import org.springframework.extensions.webscripts.TemplateProcessorFactory;
+
+/**
+ * @author Kevin Roast
+ */
+public class RepositoryTemplateProcessorFactory implements TemplateProcessorFactory
+{
+    private TemplateProcessor templateProcessor;
+    
+    
+    /**
+     * @param templateProcessor     the TemplateProcessor to set
+     */
+    public void setTemplateProcessor(TemplateProcessor templateProcessor)
+    {
+        this.templateProcessor = templateProcessor;
+    }
+
+    /* (non-Javadoc)
+     * @see org.springframework.extensions.webscripts.TemplateProcessorFactory#newInstance()
+     */
+    public TemplateProcessor newInstance()
+    {
+        return templateProcessor;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/TempOutputStream.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TempOutputStream.java
new file mode 100644
index 00000000000..e9f6df704e0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TempOutputStream.java
@@ -0,0 +1,383 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.Key;
+
+import javax.crypto.Cipher;
+import javax.crypto.CipherInputStream;
+import javax.crypto.CipherOutputStream;
+import javax.crypto.KeyGenerator;
+import javax.crypto.spec.IvParameterSpec;
+
+import org.alfresco.repo.content.ContentLimitViolationException;
+import org.alfresco.util.TempFileProvider;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * An output stream implementation that keeps the data in memory if is less then
+ * the specified <b>memoryThreshold</b> otherwise it writes it to a temp file.
+ * <p/>
+ *
+ * Close the stream before any call to
+ * {@link TempOutputStream}.getInputStream().
+ * <p/>
+ * 
+ * If <b>deleteTempFileOnClose</b> is false then use proper try-finally patterns
+ * to ensure that the temp file is destroyed after it is no longer needed.
+ * 
+ * <pre>
+ *   <code>try
+ *   {
+ *      StreamUtils.copy(new BufferedInputStream(new FileInputStream(file)), tempOutputStream);
+ *      tempOutputStream.close();
+ *   }
+ *   finally
+ *   {
+ *       tempOutputStream.destroy();
+ *   }
+ *   </code>
+ * </pre>
+ */
+public class TempOutputStream extends OutputStream
+{
+    private static final Log logger = LogFactory.getLog(TempOutputStream.class);
+
+    private static final int DEFAULT_MEMORY_THRESHOLD = 4 * 1024 * 1024; // 4mb
+    private static final String ALGORITHM = "AES";
+    private static final String MODE = "CTR";
+    private static final String PADDING = "PKCS5Padding";
+    private static final String TRANSFORMATION = ALGORITHM + '/' + MODE + '/' + PADDING;
+    private static final int KEY_SIZE = 128;
+    public static final String TEMP_FILE_PREFIX = "tempStreamFile-";
+
+    private final File tempDir;
+    private final int memoryThreshold;
+    private final long maxContentSize;
+    private boolean encrypt;
+    private boolean deleteTempFileOnClose;
+
+    private long length = 0;
+    private OutputStream outputStream;
+    private File tempFile;
+    private TempByteArrayOutputStream tempStream;
+
+    private Key symKey;
+    private byte[] iv;
+
+    /**
+     * Creates a TempOutputStream.
+     * 
+     * @param tempDir
+     *            the temporary directory, i.e. <code>isDir == true</code>, that
+     *            will be used as * parent directory for creating temp file backed
+     *            streams
+     * @param memoryThreshold
+     *            the memory threshold in B
+     * @param maxContentSize
+     *            the max content size in B
+     * @param encrypt
+     *            true if temp files should be encrypted
+     * @param deleteTempFileOnClose
+     *            true if temp files should be deleted on output stream close
+     *            (useful if we need to cache the content for further reads). If
+     *            this is false then we need to make sure we call
+     *            {@link TempOutputStream}.destroy to clean up properly.
+     */
+    public TempOutputStream(File tempDir, int memoryThreshold, long maxContentSize, boolean encrypt, boolean deleteTempFileOnClose)
+    {
+        this.tempDir = tempDir;
+        this.memoryThreshold = (memoryThreshold < 0) ? DEFAULT_MEMORY_THRESHOLD : memoryThreshold;
+        this.maxContentSize = maxContentSize;
+        this.encrypt = encrypt;
+        this.deleteTempFileOnClose = deleteTempFileOnClose;
+
+        this.tempStream = new TempByteArrayOutputStream();
+        this.outputStream = this.tempStream;
+    }
+
+    /**
+     * Returns the data as an InputStream
+     */
+    public InputStream getInputStream() throws IOException
+    {
+        if (tempFile != null)
+        {
+            if (encrypt)
+            {
+                final Cipher cipher;
+                try
+                {
+                    cipher = Cipher.getInstance(TRANSFORMATION);
+                    cipher.init(Cipher.DECRYPT_MODE, symKey, new IvParameterSpec(iv));
+                }
+                catch (Exception e)
+                {
+                    destroy();
+
+                    if (logger.isErrorEnabled())
+                    {
+                        logger.error("Cannot initialize decryption cipher", e);
+                    }
+
+                    throw new IOException("Cannot initialize decryption cipher", e);
+                }
+
+                return new BufferedInputStream(new CipherInputStream(new FileInputStream(tempFile), cipher));
+            }
+            return new BufferedInputStream(new FileInputStream(tempFile));
+        }
+        else
+        {
+            return new ByteArrayInputStream(tempStream.getBuffer(), 0, tempStream.getCount());
+        }
+    }
+
+    @Override
+    public void write(int b) throws IOException
+    {
+        update(1);
+        outputStream.write(b);
+    }
+
+    @Override
+    public void write(byte[] b, int off, int len) throws IOException
+    {
+        update(len);
+        outputStream.write(b, off, len);
+    }
+
+    @Override
+    public void flush() throws IOException
+    {
+        outputStream.flush();
+    }
+
+    @Override
+    public void close() throws IOException
+    {
+        close(deleteTempFileOnClose);
+    }
+
+    /**
+     * Closes the stream and removes the backing file (if present).
+     * <p/>
+     * 
+     * If <b>deleteTempFileOnClose</b> is false then use proper try-finally patterns
+     * to ensure that the temp file is destroyed after it is no longer needed.
+     *
+     * <pre>
+     *   <code>try
+     *   {
+     *      StreamUtils.copy(new BufferedInputStream(new FileInputStream(file)), tempOutputStream);
+     *      tempOutputStream.close();
+     *   }
+     *   finally
+     *   {
+     *       tempOutputStream.destroy();
+     *   }
+     *   </code>
+     * </pre>
+     */
+    public void destroy() throws IOException
+    {
+        close(true);
+    }
+
+    public long getLength()
+    {
+        return length;
+    }
+
+    private void closeOutputStream()
+    {
+        if (outputStream != null)
+        {
+            try
+            {
+                outputStream.flush();
+            }
+            catch (IOException e)
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Flushing the output stream failed", e);
+                }
+            }
+
+            try
+            {
+                outputStream.close();
+            }
+            catch (IOException e)
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Closing the output stream failed", e);
+                }
+            }
+        }
+    }
+
+    private void deleteTempFile()
+    {
+        if (tempFile != null)
+        {
+            try
+            {
+                boolean isDeleted = tempFile.delete();
+                if (!isDeleted)
+                {
+                    if (logger.isDebugEnabled())
+                    {
+                        logger.debug("Temp file could not be deleted: " + tempFile.getAbsolutePath());
+                    }
+                }
+                else
+                {
+                    if (logger.isDebugEnabled())
+                    {
+                        logger.debug("Deleted temp file: " + tempFile.getAbsolutePath());
+                    }
+                }
+            }
+            finally
+            {
+                tempFile = null;
+            }
+        }
+    }
+
+    private void close(boolean deleteTempFileOnClose)
+    {
+        closeOutputStream();
+
+        if (deleteTempFileOnClose)
+        {
+            deleteTempFile();
+        }
+    }
+
+    private BufferedOutputStream createOutputStream(File file) throws IOException
+    {
+        BufferedOutputStream fileOutputStream;
+        if (encrypt)
+        {
+            try
+            {
+                // Generate a symmetric key
+                final KeyGenerator keyGen = KeyGenerator.getInstance(ALGORITHM);
+                keyGen.init(KEY_SIZE);
+                symKey = keyGen.generateKey();
+
+                Cipher cipher = Cipher.getInstance(TRANSFORMATION);
+                cipher.init(Cipher.ENCRYPT_MODE, symKey);
+
+                iv = cipher.getIV();
+
+                fileOutputStream = new BufferedOutputStream(new CipherOutputStream(new FileOutputStream(file), cipher));
+            }
+            catch (Exception e)
+            {
+                if (logger.isErrorEnabled())
+                {
+                    logger.error("Cannot initialize encryption cipher", e);
+                }
+
+                throw new IOException("Cannot initialize encryption cipher", e);
+            }
+        }
+        else
+        {
+            fileOutputStream = new BufferedOutputStream(new FileOutputStream(file));
+        }
+
+        return fileOutputStream;
+    }
+
+    private void update(int len) throws IOException
+    {
+        if (maxContentSize > -1 && length + len > maxContentSize)
+        {
+            destroy();
+            throw new ContentLimitViolationException("Content size violation, limit = " + maxContentSize);
+        }
+
+        if (tempFile == null && (tempStream.getCount() + len) > memoryThreshold)
+        {
+            File file = TempFileProvider.createTempFile(TEMP_FILE_PREFIX, ".bin", tempDir);
+
+            BufferedOutputStream fileOutputStream = createOutputStream(file);
+            fileOutputStream.write(this.tempStream.getBuffer(), 0, this.tempStream.getCount());
+            fileOutputStream.flush();
+
+            try
+            {
+                tempStream.close();
+            }
+            catch (IOException e)
+            {
+                // Ignore exception
+            }
+            tempStream = null;
+
+            tempFile = file;
+            outputStream = fileOutputStream;
+        }
+
+        length += len;
+    }
+
+    private static class TempByteArrayOutputStream extends ByteArrayOutputStream
+    {
+        /**
+         * @return The internal buffer where data is stored
+         */
+        public byte[] getBuffer()
+        {
+            return buf;
+        }
+
+        /**
+         * @return The number of valid bytes in the buffer.
+         */
+        public int getCount()
+        {
+            return count;
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/TempOutputStreamFactory.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TempOutputStreamFactory.java
new file mode 100644
index 00000000000..2300bb8b033
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TempOutputStreamFactory.java
@@ -0,0 +1,105 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import java.io.File;
+
+/**
+ * Factory for {@link TempOutputStream}
+ */
+public class TempOutputStreamFactory
+{
+    /**
+     * A temporary directory, i.e. <code>isDir == true</code>, that will be used as
+     * parent directory for creating temp file backed streams.
+     */
+    private final File tempDir;
+    private int memoryThreshold;
+    private long maxContentSize;
+    private boolean encrypt;
+    private boolean deleteTempFileOnClose;
+
+    /**
+     * Creates a {@link TempOutputStream} factory.
+     * 
+     * @param tempDir
+     *            the temporary directory, i.e. <code>isDir == true</code>, that
+     *            will be used as * parent directory for creating temp file backed
+     *            streams
+     * @param memoryThreshold
+     *            the memory threshold in B
+     * @param maxContentSize
+     *            the max content size in B
+     * @param encrypt
+     *            true if temp files should be encrypted
+     * @param deleteTempFileOnClose
+     *            true if temp files should be deleted on output stream close
+     *            (useful if we need to cache the content for further reads). If
+     *            this is false then we need to make sure we call
+     *            {@link TempOutputStream}.destroy to clean up properly.
+     */
+    public TempOutputStreamFactory(File tempDir, int memoryThreshold, long maxContentSize, boolean encrypt, boolean deleteTempFileOnClose)
+    {
+        this.tempDir = tempDir;
+        this.memoryThreshold = memoryThreshold;
+        this.maxContentSize = maxContentSize;
+        this.encrypt = encrypt;
+        this.deleteTempFileOnClose = deleteTempFileOnClose;
+    }
+
+    /**
+     * Creates a new {@link TempOutputStream} object
+     */
+    public TempOutputStream createOutputStream()
+    {
+        return new TempOutputStream(tempDir, memoryThreshold, maxContentSize, encrypt, deleteTempFileOnClose);
+    }
+
+    public File getTempDir()
+    {
+        return tempDir;
+    }
+
+    public int getMemoryThreshold()
+    {
+        return memoryThreshold;
+    }
+
+    public long getMaxContentSize()
+    {
+        return maxContentSize;
+    }
+
+    public boolean isEncrypt()
+    {
+        return encrypt;
+    }
+
+    public boolean isDeleteTempFileOnClose()
+    {
+        return deleteTempFileOnClose;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantRepositoryContainer.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantRepositoryContainer.java
new file mode 100644
index 00000000000..82ca94a9cd0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantRepositoryContainer.java
@@ -0,0 +1,130 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import org.alfresco.repo.cache.AsynchronouslyRefreshedCache;
+import org.alfresco.repo.tenant.TenantAdminService;
+import org.alfresco.repo.tenant.TenantDeployer;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.transaction.TransactionService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Registry;
+
+/**
+ * Tenant-aware Repository (server-tier) container for Web Scripts
+ * 
+ * @author davidc
+ */
+public class TenantRepositoryContainer extends RepositoryContainer implements TenantDeployer
+{
+    // Logger
+    protected static final Log logger = LogFactory.getLog(TenantRepositoryContainer.class);
+
+    /* Component Dependencies */
+    protected TenantAdminService tenantAdminService;
+    protected TransactionService transactionService;
+    private AsynchronouslyRefreshedCache<Registry> registryCache;
+
+    /**
+     * @param registryCache                 asynchronously maintained cache for script registries
+     */
+    public void setWebScriptsRegistryCache(AsynchronouslyRefreshedCache<Registry> registryCache)
+    {
+        this.registryCache = registryCache;
+    }
+    
+    /**
+     * @param tenantAdminService            service to sort out tenant context
+     */
+    public void setTenantAdminService(TenantAdminService tenantAdminService)
+    {
+        this.tenantAdminService = tenantAdminService;
+    }
+    
+    /**
+     * @param transactionService            service to give transactions when reading from the container
+     */
+    public void setTransactionService(TransactionService transactionService)
+    {
+        super.setTransactionService(transactionService);
+        this.transactionService = transactionService;
+    }
+
+    @Override
+    public Registry getRegistry()
+    {
+        Registry registry = registryCache.get();
+        boolean isUpToDate = registryCache.isUpToDate();
+        if (!isUpToDate && logger.isDebugEnabled())
+        {
+            logger.debug("Retrieved out of date web script registry for tenant " + tenantAdminService.getCurrentUserDomain());
+        }
+        return registry;
+    }
+    
+    @Override
+    public void onEnableTenant()
+    {
+        init();
+    }
+    
+    @Override
+    public void onDisableTenant()
+    {
+        destroy();
+    }
+    
+    @Override
+    public void init()
+    {
+        tenantAdminService.register(this);
+        registryCache.refresh();
+        
+        super.reset();
+    }
+    
+    @Override
+    public void destroy()
+    {
+        registryCache.refresh();
+    }
+    
+    @Override
+    public void reset()
+    {
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
+        {
+            public Object execute() throws Exception
+            {
+                destroy();
+                init();
+
+                return null;
+            }
+        }, true, false);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java
new file mode 100644
index 00000000000..608f4fe6681
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java
@@ -0,0 +1,110 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.extensions.webscripts.servlet.WebScriptServlet;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRuntime;
+
+
+/**
+ * Entry point for web scripts which can accept a tenant id in their servlet path
+ * 
+ * @author davidc
+ */
+public class TenantWebScriptServlet extends WebScriptServlet
+{
+//    public static final String SYSTEM_TENANT = "-system-";
+//    public static final String DEFAULT_TENANT = "-default-";
+    
+    private static final long serialVersionUID = 2954663814419046489L;
+    
+    // Logger
+    private static final Log logger = LogFactory.getLog(TenantWebScriptServlet.class);
+    
+    protected WebScriptServletRuntime getRuntime(HttpServletRequest req, HttpServletResponse res)
+    {
+        WebScriptServletRuntime runtime = new TenantWebScriptServletRuntime(container, authenticatorFactory, req, res, serverProperties);
+        return runtime;
+    }
+
+    /* (non-Javadoc) 
+     * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    protected void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+    {
+        if (logger.isDebugEnabled())
+            logger.debug("Processing tenant request ("  + req.getMethod() + ") " + req.getRequestURL() + (req.getQueryString() != null ? "?" + req.getQueryString() : ""));
+        
+        if (req.getCharacterEncoding() == null)
+        {
+            req.setCharacterEncoding("UTF-8");
+        }
+        
+        setLanguageFromRequestHeader(req);
+        
+        try
+        {
+        	WebScriptServletRuntime runtime = getRuntime(req, res);
+            runtime.executeScript();
+        }
+        catch (IllegalStateException e) 
+        {
+           if(e.getMessage().contains("getOutputStream() has already been called for this response"))
+           {
+               if(logger.isDebugEnabled())
+               {
+                   logger.warn("Client has cut off communication", e);
+               }
+               else
+               {
+                   logger.warn("Client has cut off communication");
+               }
+           }
+           else
+           {
+               throw e;
+           }
+        }		
+        finally
+        {
+            // clear threadlocal
+            I18NUtil.setLocale(null);
+            // clear authentication and tenant context
+            AuthenticationUtil.clearCurrentSecurityContext();
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServletRequest.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServletRequest.java
new file mode 100644
index 00000000000..6dcfcf2e2f7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServletRequest.java
@@ -0,0 +1,117 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.extensions.config.ServerProperties;
+import org.springframework.extensions.surf.util.URLDecoder;
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.Runtime;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+
+
+/**
+ * Web Script Request which can handle a tenant id in their servlet path
+ * 
+ * @author davidc
+ */
+public class TenantWebScriptServletRequest extends WebScriptServletRequest
+{
+    protected String tenant;
+    protected String pathInfo;
+    
+    protected void parse()
+    {
+        String realPathInfo = getRealPathInfo();
+        
+        // remove tenant
+        int idx = realPathInfo.indexOf('/', 1);
+        tenant = realPathInfo.substring(1, idx == -1 ? realPathInfo.length() : idx);
+        pathInfo = realPathInfo.substring(tenant.length() + 1);
+    }
+
+    /**
+     * Construction
+     *
+     * @param container Runtime
+     * @param req HttpServletRequest
+     * @param serviceMatch Match
+     * @param serverProperties ServerProperties
+     */
+    public TenantWebScriptServletRequest(Runtime container, HttpServletRequest req, Match serviceMatch, ServerProperties serverProperties)
+    {
+        super(container, req, serviceMatch, serverProperties);
+        parse();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptRequest#getServiceContextPath()
+     */
+    public String getServiceContextPath()
+    {
+        return getHttpServletRequest().getContextPath() + getHttpServletRequest().getServletPath() + "/" + tenant;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptRequest#getPathInfo()
+     */
+    public String getPathInfo()
+    {
+        return pathInfo;
+    }
+
+    public String getTenant()
+    {
+        return tenant;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptRequest#getPathInfo()
+     */
+    protected String getRealPathInfo()
+    {
+        // NOTE: Don't use req.getPathInfo() - it truncates the path at first semi-colon in Tomcat
+        final String requestURI = getHttpServletRequest().getRequestURI();
+        final String serviceContextPath = getHttpServletRequest().getContextPath() + getHttpServletRequest().getServletPath();
+        String pathInfo;
+        
+        if (serviceContextPath.length() > requestURI.length())
+        {
+            // NOTE: assume a redirect has taken place e.g. tomcat welcome-page
+            // NOTE: this is unlikely, and we'll take the hit if the path contains a semi-colon
+            pathInfo = getHttpServletRequest().getPathInfo();
+        }
+        else
+        {
+            pathInfo = URLDecoder.decode(requestURI.substring(serviceContextPath.length()));
+        }
+        
+        return pathInfo;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServletRuntime.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServletRuntime.java
new file mode 100644
index 00000000000..4daad92b953
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/TenantWebScriptServletRuntime.java
@@ -0,0 +1,108 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.extensions.config.ServerProperties;
+import org.springframework.extensions.surf.util.URLDecoder;
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.RuntimeContainer;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.servlet.ServletAuthenticatorFactory;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRuntime;
+
+
+/**
+ * HTTP Servlet Web Script Runtime which can handle a tenant id in a web script path
+ * 
+ * @author davidc
+ */
+public class TenantWebScriptServletRuntime extends WebScriptServletRuntime
+{
+    public TenantWebScriptServletRuntime(RuntimeContainer container, ServletAuthenticatorFactory authFactory, HttpServletRequest req, HttpServletResponse res, ServerProperties serverProperties)
+    {
+        super(container, authFactory, req, res, serverProperties);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptRuntime#getScriptUrl()
+     */
+    @Override
+    protected String getScriptUrl()
+    {
+        // NOTE: Don't use req.getPathInfo() - it truncates the path at first semi-colon in Tomcat
+        final String requestURI = req.getRequestURI();
+        final String serviceContextPath = req.getContextPath() + req.getServletPath();
+        String pathInfo;
+        
+        if (serviceContextPath.length() > requestURI.length())
+        {
+            // NOTE: assume a redirect has taken place e.g. tomcat welcome-page
+            // NOTE: this is unlikely, and we'll take the hit if the path contains a semi-colon
+            pathInfo = req.getPathInfo();
+        }
+        else
+        {
+            pathInfo = URLDecoder.decode(requestURI.substring(serviceContextPath.length()));
+        }
+        
+        // ensure tenant is specified at beginning of path
+        // NOTE: must contain at least root / and single character for tenant name
+        if (pathInfo.length() < 2)
+        {
+            throw new WebScriptException("Missing tenant name in path: " + pathInfo);
+        }
+        // remove tenant
+        int idx = pathInfo.indexOf('/', 1);
+        pathInfo = pathInfo.substring(idx == -1 ? pathInfo.length() : idx);
+        return pathInfo;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptRuntime#createRequest(org.alfresco.web.scripts.WebScriptMatch)
+     */
+    @Override
+    protected WebScriptRequest createRequest(Match match)
+    {
+        // TODO: construct org.springframework.extensions.webscripts.servlet.WebScriptServletResponse when
+        //       org.alfresco.web.scripts.WebScriptServletResponse (deprecated) is removed
+        servletReq = new TenantWebScriptServletRequest(this, req, match, serverProperties);
+        return servletReq;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptContainer#getName()
+     */
+    public String getName()
+    {
+        return "TenantServletRuntime";
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/WebScriptUtil.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/WebScriptUtil.java
new file mode 100644
index 00000000000..aa73ba61cea
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/WebScriptUtil.java
@@ -0,0 +1,184 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+
+import org.alfresco.repo.nodelocator.CompanyHomeNodeLocator;
+import org.alfresco.repo.nodelocator.NodeLocatorService;
+import org.alfresco.repo.nodelocator.SharedHomeNodeLocator;
+import org.alfresco.repo.nodelocator.SitesHomeNodeLocator;
+import org.alfresco.repo.nodelocator.UserHomeNodeLocator;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.util.ISO8601DateFormat;
+import org.json.JSONObject;
+import org.springframework.extensions.surf.util.Content;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Nick Smith
+ * @since 4.0
+ *
+ */
+public class WebScriptUtil
+{
+    // General Keys
+    public static final String DATA_KEY = "data";
+
+    // NodeRef Keys
+    public static final String STORE_PROTOCOL = "store_protocol";
+    public static final String STORE_ID = "store_id";
+    public static final String NODE_ID = "node_id";
+
+    //Date/Calendar Keys
+    public static final String DATE_TIME= "dateTime";
+    public static final String FORMAT= "format";
+    public static final String TIME_ZONE= "timeZone";
+    public static final String ISO8601 = "ISO8601";
+
+    public static String getContent(WebScriptRequest request) throws IOException
+    {
+        Content content = request.getContent();
+        return content.getContent();
+    }
+
+    public static Map<String, Object> buildCalendarModel(Calendar calendar)
+    {
+        Map<String, Object> model = buildDateModel(calendar.getTime());
+        model.put(TIME_ZONE, calendar.getTimeZone().getID());
+        return model;
+    }
+
+    public static Map<String, Object> buildDateModel(Date dateTime)
+    {
+        String dateStr = ISO8601DateFormat.format(dateTime);
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put(DATE_TIME, dateStr);
+        model.put(FORMAT, ISO8601);
+        return model;
+    }
+    
+    public static Calendar getCalendar(JSONObject json) throws ParseException
+    {
+        Date date = getDate(json);
+        if(date == null)
+        {
+            return null;
+        }
+        Calendar calendar = Calendar.getInstance();
+        String timeZone = json.optString(TIME_ZONE);
+        if(timeZone != null)
+        {
+            TimeZone zone = TimeZone.getTimeZone(timeZone);
+            calendar.setTimeZone(zone);
+        }
+        calendar.setTime(date);
+        return calendar;
+    }
+    
+    public static Date getDate(JSONObject json) throws ParseException
+    {
+        if(json == null)
+        {
+            return null;
+        }
+        String dateTime = json.optString(DATE_TIME);
+        if(dateTime == null)
+        {
+            return null;
+        }
+        String format = json.optString(FORMAT);
+        if(format!= null && ISO8601.equals(format) == false)
+        {
+            SimpleDateFormat dateFormat = new SimpleDateFormat(format);
+            return dateFormat.parse(dateTime);
+        }
+        return ISO8601DateFormat.parse(dateTime);
+    }
+    
+
+    public static Map<String, Object> createBaseModel(Map<String, Object> result)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put(DATA_KEY, result);
+        return model;
+    }
+    
+    public static Map<String, Object> createBaseModel(List<Map<String, Object>> results)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put(DATA_KEY, results);
+        return model;
+    }
+    
+    public static NodeRef getNodeRef(Map<String, String> params)
+    {
+        String protocol = params.get(STORE_PROTOCOL);
+        String storeId= params.get(STORE_ID);
+        String nodeId= params.get(NODE_ID);
+        if(protocol == null || storeId == null || nodeId==null )
+        {
+            return null;
+        }
+        return new NodeRef(protocol, storeId, nodeId);
+    }
+
+
+    public static NodeRef resolveNodeReference(String reference, NodeLocatorService nodeLocatorService)
+    {
+        NodeRef nodeRef = null;
+        switch (reference)
+        {
+        case "alfresco://company/home":
+            nodeRef = nodeLocatorService.getNode(CompanyHomeNodeLocator.NAME, null, null);
+            break;
+        case "alfresco://user/home":
+            nodeRef = nodeLocatorService.getNode(UserHomeNodeLocator.NAME, null, null);
+            break;
+        case "alfresco://company/shared":
+            nodeRef = nodeLocatorService.getNode(SharedHomeNodeLocator.NAME, null, null);
+            break;
+        case "alfresco://sites/home":
+            nodeRef = nodeLocatorService.getNode(SitesHomeNodeLocator.NAME, null, null);
+            break;
+        default:
+            nodeRef = new NodeRef(reference);
+            break;
+        }
+
+        return nodeRef;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/AbstractActionWebscript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/AbstractActionWebscript.java
new file mode 100644
index 00000000000..d62d44d2417
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/AbstractActionWebscript.java
@@ -0,0 +1,160 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.action;
+
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+import org.alfresco.repo.action.ActionImpl;
+import org.alfresco.repo.action.ActionTrackingServiceImpl;
+import org.alfresco.repo.action.RuntimeActionService;
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.action.ActionStatus;
+import org.alfresco.service.cmr.action.ActionTrackingService;
+import org.alfresco.service.cmr.action.ExecutionSummary;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * @author Nick Burch
+ * @since 3.4
+ */
+public abstract class AbstractActionWebscript extends DeclarativeWebScript
+{
+    protected NodeService nodeService;
+    protected ActionService actionService;
+    protected RuntimeActionService runtimeActionService;
+    protected ActionTrackingService actionTrackingService;
+    
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public void setActionService(ActionService actionService) 
+    {
+        this.actionService = actionService;
+    }
+
+    public void setRuntimeActionService(RuntimeActionService runtimeActionService) 
+    {
+        this.runtimeActionService = runtimeActionService;
+    }
+
+    public void setActionTrackingService(ActionTrackingService actionTrackingService) 
+    {
+        this.actionTrackingService = actionTrackingService;
+    }
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+       RunningActionModelBuilder modelBuilder = new RunningActionModelBuilder(
+             nodeService, actionService, actionTrackingService
+       );
+       return buildModel(modelBuilder, req, status, cache);
+    }
+    
+    protected abstract Map<String, Object> buildModel(
+          RunningActionModelBuilder modelBuilder,
+          WebScriptRequest req,
+          Status status, Cache cache
+    );
+    
+    
+    /**
+     * Takes a running action ID, and returns an 
+     *  ExecutionSummary object for it. Note - doesn't
+     *  check to see if the object exists in the
+     *  cache though!
+     */
+    public static ExecutionSummary getSummaryFromKey(String key)
+    {
+       return WrappedActionTrackingService.getSummaryFromKey(key);
+    }
+    
+    /**
+     * Returns the ExecutionSummary for the given action if it
+     *  is currently executing, or null if it isn't
+     */
+    public static ExecutionSummary getSummaryFromAction(Action action)
+    {
+       // Is it running?
+       if(action.getExecutionStatus() == ActionStatus.Running) {
+          return WrappedActionTrackingService.buildExecutionSummary(action);
+       }
+       // Has it been given a execution id?
+       // (eg has already finished, but this one was run)
+       if( ((ActionImpl)action).getExecutionInstance() != -1 ) {
+          return WrappedActionTrackingService.buildExecutionSummary(action);
+       }
+       // Not running, and hasn't run, we can't help
+       return null;
+    }
+    
+    /**
+     * Returns the running action ID for the given
+     *  ExecutionSummary
+     */
+    public static String getRunningId(ExecutionSummary summary)
+    {
+       return WrappedActionTrackingService.getRunningId(summary);
+    }
+    
+    /**
+     * So we can get at protected methods, which we need as
+     *  we use the same naming scheme as the cache in the
+     *  interests of simplicity.
+     */
+    private static class WrappedActionTrackingService extends ActionTrackingServiceImpl
+    {
+       private static String getRunningId(ExecutionSummary summary)
+       {
+          return ActionTrackingServiceImpl.generateCacheKey(summary);
+       }
+       
+       protected static ExecutionSummary buildExecutionSummary(Action action)
+       {
+          return ActionTrackingServiceImpl.buildExecutionSummary(action);
+       }
+       
+       private static ExecutionSummary getSummaryFromKey(String key)
+       {
+          try {
+             // Try to have the key turned into a summary for us
+             return ActionTrackingServiceImpl.buildExecutionSummary(key);
+          } catch(NoSuchElementException e) {
+             // Wrong format
+             return null;
+          }
+       }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/AbstractExecuteActionWebscript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/AbstractExecuteActionWebscript.java
new file mode 100644
index 00000000000..227fea41948
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/AbstractExecuteActionWebscript.java
@@ -0,0 +1,86 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.action;
+
+import java.util.Map;
+
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ExecutionSummary;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * @author Nick Burch
+ * @since 3.4
+ */
+public abstract class AbstractExecuteActionWebscript extends AbstractActionWebscript
+{
+    protected Map<String, Object> buildModel(
+          RunningActionModelBuilder modelBuilder,
+          WebScriptRequest req,
+          Status status, Cache cache)
+    {
+        try { 
+           // Have the action to run be identified
+           Action action = identifyAction(req, status, cache);
+           if(action == null) {
+              throw new WebScriptException(
+                    Status.STATUS_NOT_FOUND, 
+                    "No Runnable Action found with the supplied details"
+              );
+           }
+           
+           // Ask for it to be run in the background
+           // It will be available to execute once the webscript finishes
+           actionService.executeAction(
+                 action, null, 
+                 false, true
+           );
+   
+           // Return the details if we can
+           ExecutionSummary summary = getSummaryFromAction(action);
+           if(summary == null) {
+              throw new WebScriptException(
+                    Status.STATUS_EXPECTATION_FAILED, 
+                    "Action failed to be added to the pending queue"
+              );
+           }
+           
+           return modelBuilder.buildSimpleModel(summary);
+       } catch(Exception e) {
+          // Transaction broke
+          throw new RuntimeException(e);
+       }
+    }
+    
+    protected abstract Action identifyAction(
+          WebScriptRequest req,
+          Status status, Cache cache
+    );
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionDelete.java
new file mode 100644
index 00000000000..cacbe6bd731
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionDelete.java
@@ -0,0 +1,79 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.action;
+
+import java.util.Map;
+
+import org.alfresco.service.cmr.action.ExecutionDetails;
+import org.alfresco.service.cmr.action.ExecutionSummary;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Nick Burch
+ * @since 3.4
+ */
+public class RunningActionDelete extends AbstractActionWebscript
+{
+   @Override
+   protected Map<String, Object> buildModel(
+         RunningActionModelBuilder modelBuilder, WebScriptRequest req,
+         Status status, Cache cache) {
+      // Which action did they ask for?
+      String actionTrackingId = 
+         req.getServiceMatch().getTemplateVars().get("action_tracking_id");
+
+      // Check it exists
+      ExecutionSummary action = 
+         getSummaryFromKey(actionTrackingId);
+      if(action == null) {
+         throw new WebScriptException(
+               Status.STATUS_NOT_FOUND, 
+               "No Running Action found with that tracking id"
+         );
+      }
+      
+      ExecutionDetails details =
+         actionTrackingService.getExecutionDetails(action);
+      if(details == null) {
+         throw new WebScriptException(
+               Status.STATUS_NOT_FOUND, 
+               "No Running Action found with that tracking id"
+         );
+      }
+      
+      // Request the cancel
+      actionTrackingService.requestActionCancellation(action);
+      
+      // Report it as having been cancelled
+      status.setCode(Status.STATUS_NO_CONTENT);
+      status.setMessage("Action cancellation requested");
+      status.setRedirect(true);
+      return null;
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionGet.java
new file mode 100644
index 00000000000..2c58011948e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionGet.java
@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.action;
+
+import java.util.Map;
+
+import org.alfresco.service.cmr.action.ExecutionSummary;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Nick Burch
+ * @since 3.4
+ */
+public class RunningActionGet extends AbstractActionWebscript
+{
+   @Override
+   protected Map<String, Object> buildModel(
+         RunningActionModelBuilder modelBuilder, WebScriptRequest req,
+         Status status, Cache cache) {
+      // Which action did they ask for?
+      String actionTrackingId = 
+         req.getServiceMatch().getTemplateVars().get("action_tracking_id");
+
+      ExecutionSummary action = 
+         getSummaryFromKey(actionTrackingId);
+      
+      // Get the details, if we can
+      Map<String,Object> model = modelBuilder.buildSimpleModel(action);
+      
+      if(model == null) {
+         throw new WebScriptException(
+               Status.STATUS_NOT_FOUND, 
+               "No Running Action found with that tracking id"
+         );
+      }
+      
+      return model;
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionModelBuilder.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionModelBuilder.java
new file mode 100644
index 00000000000..b17813bb6ae
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionModelBuilder.java
@@ -0,0 +1,145 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.action;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.action.ActionTrackingService;
+import org.alfresco.service.cmr.action.ExecutionDetails;
+import org.alfresco.service.cmr.action.ExecutionSummary;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.util.ISO8601DateFormat;
+
+/**
+ * Builds up models for running actions
+ *  
+ * @author Nick Burch
+ * @since 3.4
+ */
+public class RunningActionModelBuilder 
+{
+    protected static final String MODEL_DATA_ITEM = "runningAction";
+    protected static final String MODEL_DATA_LIST = "runningActions";
+    
+    protected static final String ACTION_ID = "id";
+    protected static final String ACTION_TYPE = "type";
+    protected static final String ACTION_INSTANCE = "instance";
+    protected static final String ACTION_NODE_REF = "nodeRef";
+    protected static final String ACTION_STARTED_AT = "startedAt";
+    protected static final String ACTION_RUNNING_ON = "runningOn";
+    protected static final String ACTION_CANCEL_REQUESTED = "cancelRequested";
+    protected static final String ACTION_KEY = "key";
+    
+    
+    protected NodeService nodeService;
+    protected ActionService actionService;
+    protected ActionTrackingService actionTrackingService;
+
+    public RunningActionModelBuilder(NodeService nodeService, ActionService actionService,
+                                   ActionTrackingService actionTrackingService) 
+    {
+       this.nodeService = nodeService;
+       this.actionService = actionService;
+       this.actionTrackingService = actionTrackingService;
+    }
+    
+    
+    /**
+     * Build a model containing a single running action
+     */
+    protected Map<String,Object> buildSimpleModel(ExecutionSummary summary)
+    {
+       Map<String, Object> ram = buildModel(summary);
+       if(ram != null) {
+          Map<String, Object> model = new HashMap<String,Object>();
+          model.put(MODEL_DATA_ITEM, ram);
+          return model;
+       }
+       return null;
+    }
+    
+    /**
+     * Build a model containing a list of running actions for the given
+     *  list of Running Actions
+     */
+    protected Map<String,Object> buildSimpleList(List<ExecutionSummary> runningActions)
+    {
+        List<Map<String,Object>> models = new ArrayList<Map<String,Object>>();
+        
+        for(ExecutionSummary summary : runningActions) {
+           Map<String, Object> ram = buildModel(summary);
+           if(ram != null) {
+              models.add(ram);
+           }
+        }
+        
+        // Finish up
+        Map<String, Object> model = new HashMap<String,Object>();
+        model.put(MODEL_DATA_LIST, models);
+        return model;
+    }
+    
+    /**
+     * Build a model for a single action
+     */
+    private Map<String,Object> buildModel(ExecutionSummary summary)
+    {
+        if(summary == null) {
+           return null;
+        }
+        
+        // Get the details, if we can
+        ExecutionDetails details = actionTrackingService.getExecutionDetails(summary);
+        
+        // Only record if still running - may have finished
+        //  between getting the list and now
+        if(details != null) {
+           Map<String, Object> ram = new HashMap<String,Object>();
+           ram.put(ACTION_ID, summary.getActionId());
+           ram.put(ACTION_TYPE, summary.getActionType());
+           ram.put(ACTION_INSTANCE, summary.getExecutionInstance());
+           ram.put(ACTION_KEY, AbstractActionWebscript.getRunningId(summary));
+           
+           ram.put(ACTION_NODE_REF, details.getPersistedActionRef());
+           ram.put(ACTION_RUNNING_ON, details.getRunningOn());
+           ram.put(ACTION_CANCEL_REQUESTED, details.isCancelRequested());
+           
+           if(details.getStartedAt() != null) {
+              ram.put(ACTION_STARTED_AT, ISO8601DateFormat.format(details.getStartedAt()));
+           } else {
+              ram.put(ACTION_STARTED_AT, null);
+           }
+           
+           return ram;
+        }
+        
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionsGet.java
new file mode 100644
index 00000000000..28ae98ff52e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionsGet.java
@@ -0,0 +1,67 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.action;
+
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ExecutionSummary;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Nick Burch
+ * @since 3.4
+ */
+public class RunningActionsGet extends AbstractActionWebscript
+{
+   @Override
+   protected Map<String, Object> buildModel(
+         RunningActionModelBuilder modelBuilder, WebScriptRequest req,
+         Status status, Cache cache) {
+      List<ExecutionSummary> actions = null;
+      
+      // Do they want all actions, or only certain ones?
+      String type = req.getParameter("type");
+      String nodeRef = req.getParameter("nodeRef");
+      
+      if(type != null) {
+         actions = actionTrackingService.getExecutingActions(type);
+      } else if(nodeRef != null) {
+         NodeRef actionNodeRef = new NodeRef(nodeRef);
+         Action action = runtimeActionService.createAction(actionNodeRef);
+         actions = actionTrackingService.getExecutingActions(action); 
+      } else {
+         actions = actionTrackingService.getAllExecutingActions();
+      }
+      
+      // Build the model list
+      return modelBuilder.buildSimpleList(actions);
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionsPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionsPost.java
new file mode 100644
index 00000000000..445de8656c0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningActionsPost.java
@@ -0,0 +1,79 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.action;
+
+import java.io.IOException;
+
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Nick Burch
+ * @since 3.4
+ */
+public class RunningActionsPost extends AbstractExecuteActionWebscript
+{
+   @Override
+   protected Action identifyAction(WebScriptRequest req, Status status,
+         Cache cache) {
+      // Which action did they ask for?
+      String nodeRef = req.getParameter("nodeRef");
+      if(nodeRef == null) {
+         try {
+            JSONObject json = new JSONObject(new JSONTokener(req.getContent().getContent()));
+            if(! json.has("nodeRef")) {
+               throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not find required 'nodeRef' parameter");
+            }
+            nodeRef = json.getString("nodeRef");
+         }
+         catch (IOException iox)
+         {
+             throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not read content from request.", iox);
+         }
+         catch (JSONException je)
+         {
+             throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from request.", je);
+         }
+      }
+      
+      // Does it exist in the repo?
+      NodeRef actionNodeRef = new NodeRef(nodeRef);
+      if(! nodeService.exists(actionNodeRef)) {
+         return null;
+      }
+      
+      // Load the specified action
+      Action action = runtimeActionService.createAction(actionNodeRef);
+      return action;
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningReplicationActionsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningReplicationActionsGet.java
new file mode 100644
index 00000000000..c4d97fc6af6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningReplicationActionsGet.java
@@ -0,0 +1,81 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.action;
+
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.replication.ReplicationDefinitionImpl;
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ExecutionSummary;
+import org.alfresco.service.cmr.replication.ReplicationDefinition;
+import org.alfresco.service.cmr.replication.ReplicationService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Nick Burch
+ * @since 3.4
+ */
+public class RunningReplicationActionsGet extends AbstractActionWebscript
+{
+   private ReplicationService replicationService;
+   
+   @Override
+   protected Map<String, Object> buildModel(
+         RunningActionModelBuilder modelBuilder, WebScriptRequest req,
+         Status status, Cache cache) {
+      List<ExecutionSummary> actions = null;
+      
+      // Do they want all replication actions, or only certain ones?
+      String name = req.getParameter("name");
+      
+      if(name != null) {
+         // Try to find a replication definition with this name
+         ReplicationDefinition rd = replicationService.loadReplicationDefinition(name);
+         
+         // Look up what's running
+         if(rd != null) {
+            actions = actionTrackingService.getExecutingActions(rd);
+         }
+      } else {
+         // All replication actions
+         actions = actionTrackingService.getExecutingActions(
+               ReplicationDefinitionImpl.EXECUTOR_NAME
+         );
+      }
+      
+      // Build the model list
+      return modelBuilder.buildSimpleList(actions);
+   }
+
+   public void setReplicationService(ReplicationService replicationService) 
+   {
+      this.replicationService = replicationService;
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningReplicationActionsPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningReplicationActionsPost.java
new file mode 100644
index 00000000000..2176f2d99dc
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/action/RunningReplicationActionsPost.java
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.action;
+
+import java.io.IOException;
+
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.replication.ReplicationDefinition;
+import org.alfresco.service.cmr.replication.ReplicationService;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Nick Burch
+ * @since 3.4
+ */
+public class RunningReplicationActionsPost extends AbstractExecuteActionWebscript
+{
+   private ReplicationService replicationService;
+   
+   @Override
+   protected Action identifyAction(WebScriptRequest req, Status status,
+         Cache cache) {
+      // Which action did they ask for?
+      String name = req.getParameter("name");
+      if(name == null) {
+         try {
+            JSONObject json = new JSONObject(new JSONTokener(req.getContent().getContent()));
+            if(! json.has("name")) {
+               throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not find required 'name' parameter");
+            }
+            name = json.getString("name");
+         }
+         catch (IOException iox)
+         {
+             throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not read content from request.", iox);
+         }
+         catch (JSONException je)
+         {
+             throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from request.", je);
+         }
+      }
+      
+      // Load the specified replication definition
+      ReplicationDefinition replicationDefinition = 
+         replicationService.loadReplicationDefinition(name);
+      return replicationDefinition;
+   }
+
+   public void setReplicationService(ReplicationService replicationService) 
+   {
+      this.replicationService = replicationService;
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/activities/TemplateWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/activities/TemplateWebScript.java
new file mode 100644
index 00000000000..2a2919daa60
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/activities/TemplateWebScript.java
@@ -0,0 +1,111 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.activities;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.SearchPath;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+ 
+/**
+ * Java-backed WebScript to get a Template from a Template Store
+ */
+public class TemplateWebScript extends DeclarativeWebScript
+{
+    // Logger
+    protected static final Log logger = LogFactory.getLog(TemplateWebScript.class);
+    
+    private SearchPath searchPath;
+    
+    public void setSearchPath(SearchPath searchPath)
+    {
+        this.searchPath = searchPath;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+        
+        // process extension
+        String path = req.getExtensionPath(); // required
+        
+        if ((path == null) || (path.length() == 0))
+        {
+            String msg = "Failed to getTemplate: missing {path}";
+            logger.error(msg);
+            throw new AlfrescoRuntimeException(msg);
+        }
+        else
+        {        
+            if (path.endsWith(".ftl"))
+            {    
+                try
+                {
+                    InputStream is = searchPath.getDocument(path);
+                    if (is != null)
+                    {         
+                        BufferedReader br = null;
+                        try
+                        {
+                            br = new BufferedReader(new InputStreamReader(is));
+                            String line = null;
+                            StringBuffer sb = new StringBuffer();
+                            while(((line = br.readLine()) !=null)) 
+                            {
+                                sb.append(line);
+                            }
+                    
+                            model.put("template", sb.toString());
+                        }
+                        finally
+                        {
+                            if (br != null) { br.close(); };
+                        }
+                    }
+                }
+                catch (IOException ioe)
+                {
+                    logger.error("Failed to getTemplate: " + ioe);
+                }
+           }
+        }
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/activities/TemplatesWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/activities/TemplatesWebScript.java
new file mode 100644
index 00000000000..3e04944cafa
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/activities/TemplatesWebScript.java
@@ -0,0 +1,95 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.activities;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.SearchPath;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.Store;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+ 
+/**
+ * Java-backed WebScript to get list of Activity Templates from a Template Store
+ */
+public class TemplatesWebScript extends DeclarativeWebScript
+{
+    private SearchPath searchPath;
+    
+    public void setSearchPath(SearchPath searchPath)
+    {
+        this.searchPath = searchPath;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        String path = "/";
+        String templatePattern = "*.ftl";
+        
+        // process extension
+        String p = req.getExtensionPath(); // optional
+        
+        if ((p != null) && (p.length() > 0))
+        {
+            int idx = p.lastIndexOf("/");
+            if (idx != -1)
+            {
+                path = p.substring(0, idx);
+                templatePattern = p.substring(idx+1) + ".ftl";
+            }
+        }
+        
+        Set<String> templatePaths = new HashSet<String>();
+        for (Store apiStore : searchPath.getStores())
+        {
+            try
+            {
+                for (String templatePath : apiStore.getDocumentPaths(path, false, templatePattern))
+                {
+                    templatePaths.add(templatePath);
+                }
+            }
+            catch (IOException e)
+            {
+                throw new WebScriptException("Failed to search for templates from store " + apiStore, e);
+            }
+        }
+
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("paths", templatePaths);
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/activities/feed/SiteFeedRetrieverWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/activities/feed/SiteFeedRetrieverWebScript.java
new file mode 100644
index 00000000000..7cc99d54ffc
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/activities/feed/SiteFeedRetrieverWebScript.java
@@ -0,0 +1,138 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.activities.feed;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.activities.feed.FeedTaskProcessor;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.util.JSONtoFmModel;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONException;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Java-backed WebScript to retrieve Activity Site Feed
+ */
+public class SiteFeedRetrieverWebScript extends DeclarativeWebScript
+{
+    private static final Log logger = LogFactory.getLog(SiteFeedRetrieverWebScript.class);
+    
+    private ActivityService activityService;
+   
+    public void setActivityService(ActivityService activityService)
+    {
+        this.activityService = activityService;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        // retrieve requested format
+        String format = req.getFormat();
+        if (format == null || format.length() == 0)
+        {
+            format = getDescription().getDefaultFormat();
+        }
+        
+        String extensionPath = req.getExtensionPath();
+        String[] extParts = extensionPath == null ? new String[1] : extensionPath.split("/");
+        
+        String siteId = null;
+        if (extParts.length == 1)
+        {
+           siteId = extParts[0];
+        }
+        else
+        {
+            throw new AlfrescoRuntimeException("Unexpected extension: " + extensionPath);
+        }
+        
+        // map feed collection format to feed entry format (if not the same), eg.
+        //     atomfeed -> atomentry
+        //     atom     -> atomentry
+        if (format.equals("atomfeed") || format.equals("atom"))
+        {
+           format = "atomentry";
+        }
+        
+        Map<String, Object> model = new HashMap<String, Object>();
+        
+        try
+        {
+            List<String> feedEntries = activityService.getSiteFeedEntries(siteId);
+            
+            
+            if (format.equals(FeedTaskProcessor.FEED_FORMAT_JSON))
+            { 
+                model.put("feedEntries", feedEntries);
+                model.put("siteId", siteId);
+            }
+            else
+            {
+                List<Map<String, Object>> activityFeedModels = new ArrayList<Map<String, Object>>();
+                try
+                { 
+                    for (String feedEntry : feedEntries)
+                    {
+                        activityFeedModels.add(JSONtoFmModel.convertJSONObjectToMap(feedEntry));
+                    }
+                }
+                catch (JSONException je)
+                {    
+                    throw new AlfrescoRuntimeException("Unable to get user feed entries: " + je.getMessage());
+                }
+                
+                model.put("feedEntries", activityFeedModels);
+                model.put("siteId", siteId);
+            }
+        }
+        catch (AccessDeniedException ade)
+        {
+            // implies that site either does not exist or is private (and current user is not admin or a member) - hence return 401 (unauthorised)
+            String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
+            status.setCode(Status.STATUS_UNAUTHORIZED);
+            logger.warn("Unable to get site feed entries for '" + siteId + "' (site does not exist or is private) - currently logged in as '" + currentUser +"'");
+            
+            model.put("feedEntries", null);
+            model.put("siteId", "");
+        }
+        
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/activities/feed/UserFeedRetrieverWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/activities/feed/UserFeedRetrieverWebScript.java
new file mode 100644
index 00000000000..8da6c68744b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/activities/feed/UserFeedRetrieverWebScript.java
@@ -0,0 +1,217 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.activities.feed;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.repo.activities.feed.FeedTaskProcessor;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.service.cmr.subscriptions.PagingFollowingResults;
+import org.alfresco.service.cmr.subscriptions.SubscriptionService;
+import org.alfresco.util.JSONtoFmModel;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONException;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Java-backed WebScript to retrieve Activity User Feed
+ */
+public class UserFeedRetrieverWebScript extends DeclarativeWebScript
+{
+    private static final Log logger = LogFactory.getLog(UserFeedRetrieverWebScript.class);
+
+    // URL request parameter names
+    public static final String PARAM_SITE_ID = "s";
+    public static final String PARAM_EXCLUDE_THIS_USER = "exclUser";
+    public static final String PARAM_EXCLUDE_OTHER_USERS = "exclOthers";
+    public static final String PARAM_ONLY_FOLLOWING = "following";
+    public static final String PARAM_ACTIVITY_FILTER = "activityFilter";
+    
+    private ActivityService activityService;
+    private SubscriptionService subscriptionService;
+    
+    private boolean userNamesAreCaseSensitive = false;
+    
+    public void setActivityService(ActivityService activityService)
+    {
+        this.activityService = activityService;
+    }
+    
+    public void setSubscriptionService(SubscriptionService subscriptionService)
+    {
+        this.subscriptionService = subscriptionService;
+    }   
+    
+    public void setUserNamesAreCaseSensitive(boolean userNamesAreCaseSensitive)
+    {
+        this.userNamesAreCaseSensitive = userNamesAreCaseSensitive;
+	}
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        // retrieve requested format
+        String format = req.getFormat();
+        if (format == null || format.length() == 0)
+        {
+            format = getDescription().getDefaultFormat();
+        }
+        
+        // process extension
+        String extensionPath = req.getExtensionPath();
+        String[] extParts = extensionPath == null ? new String[1] : extensionPath.split("/");
+        
+        String feedUserId = null;
+        if (extParts.length == 1)
+        {
+            feedUserId = extParts[0];
+        }
+        else if (extParts.length > 1)
+        {
+            throw new AlfrescoRuntimeException("Unexpected extension: " + extensionPath);
+        }
+        
+        // process arguments
+        String siteId = req.getParameter(PARAM_SITE_ID); // optional
+        String exclThisUserStr = req.getParameter(PARAM_EXCLUDE_THIS_USER); // optional
+        String exclOtherUsersStr = req.getParameter(PARAM_EXCLUDE_OTHER_USERS); // optional
+        String onlyFollowingStr = req.getParameter(PARAM_ONLY_FOLLOWING); // optional
+        String activityFilterStr = req.getParameter(PARAM_ACTIVITY_FILTER); // optional
+        
+        boolean exclThisUser = false;
+        if ((exclThisUserStr != null) && (exclThisUserStr.equalsIgnoreCase("true") || exclThisUserStr.equalsIgnoreCase("t")))
+        {
+            exclThisUser = true;
+        }
+        
+        boolean exclOtherUsers = false;
+        if ((exclOtherUsersStr != null) && (exclOtherUsersStr.equalsIgnoreCase("true") || exclOtherUsersStr.equalsIgnoreCase("t")))
+        {
+            exclOtherUsers = true;
+        }
+        
+        Set<String> userFilter = null;
+        if ((onlyFollowingStr != null) && (onlyFollowingStr.equalsIgnoreCase("true") || onlyFollowingStr.equalsIgnoreCase("t")))
+        {
+            userFilter = new HashSet<String>();
+            if (subscriptionService.isActive()) {
+                PagingFollowingResults following = subscriptionService.getFollowing(AuthenticationUtil.getRunAsUser(), new PagingRequest(-1, null));
+                if (following.getPage() != null)
+                {
+                    for (String userName : following.getPage())
+                    {
+                        userFilter.add(this.userNamesAreCaseSensitive ? userName : userName.toLowerCase());
+                    }
+                }
+            }
+        }
+        
+        Set<String> activityFilter = null;
+        if (activityFilterStr != null)
+        {
+            activityFilter = new HashSet<String>();
+            String[] activities = activityFilterStr.split(",");
+            for (String s : activities)
+            {
+                if (s.trim().length() > 0)
+                {
+                    activityFilter.add(s.trim());
+                }
+            }
+            if (activityFilter.size() == 0)
+            {
+                activityFilter = null;
+            }
+        }
+        
+        if ((feedUserId == null) || (feedUserId.length() == 0))
+        {
+            feedUserId = AuthenticationUtil.getFullyAuthenticatedUser();
+        }
+        
+        // map feed collection format to feed entry format (if not the same), eg.
+        //     atomfeed -> atomentry
+        //     atom     -> atomentry
+        if (format.equals("atomfeed") || format.equals("atom"))
+        {
+            format = "atomentry";
+        }
+        
+        Map<String, Object> model = new HashMap<String, Object>();
+        
+        try
+        {
+            List<String> feedEntries = activityService.getUserFeedEntries(feedUserId, siteId, exclThisUser, exclOtherUsers, userFilter, activityFilter);
+            
+            if (format.equals(FeedTaskProcessor.FEED_FORMAT_JSON))
+            {
+                model.put("feedEntries", feedEntries);
+                model.put("siteId", siteId);
+            }
+            else
+            {
+                List<Map<String, Object>> activityFeedModels = new ArrayList<Map<String, Object>>();
+                try
+                {
+                    for (String feedEntry : feedEntries)
+                    {
+                        activityFeedModels.add(JSONtoFmModel.convertJSONObjectToMap(feedEntry));
+                    }
+                }
+                catch (JSONException je)
+                {
+                    throw new AlfrescoRuntimeException("Unable to get user feed entries: " + je.getMessage());
+                }
+                
+                model.put("feedEntries", activityFeedModels);
+                model.put("feedUserId", feedUserId);
+            }
+        }
+        catch (AccessDeniedException ade)
+        {
+            status.setCode(Status.STATUS_UNAUTHORIZED);
+            logger.warn("Unable to get user feed entries for '" + feedUserId + "' - currently logged in as '" + AuthenticationUtil.getFullyAuthenticatedUser() +"'");
+            return null;
+        }
+        
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/AbstractAdminWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/AbstractAdminWebScript.java
new file mode 100644
index 00000000000..015a06a4b54
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/AbstractAdminWebScript.java
@@ -0,0 +1,122 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.admin;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.alfresco.service.cmr.admin.RepoAdminService;
+import org.alfresco.service.cmr.admin.RepoUsage;
+import org.alfresco.service.cmr.admin.RepoUsageStatus.RepoUsageLevel;
+import org.alfresco.service.descriptor.DescriptorService;
+import org.alfresco.service.license.LicenseDescriptor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+
+/**
+ * Abstract implementation for scripts that access the {@link RepoAdminService}.
+ * 
+ * @author Derek Hulley
+ * @since 3.4
+ */
+public abstract class AbstractAdminWebScript extends DeclarativeWebScript
+{
+    public static final String JSON_KEY_LAST_UPDATE = "lastUpdate";
+    public static final String JSON_KEY_USERS = "users";
+    public static final String JSON_KEY_DOCUMENTS = "documents";
+    public static final String JSON_KEY_LICENSE_MODE = "licenseMode";
+    public static final String JSON_KEY_READ_ONLY = "readOnly";
+    public static final String JSON_KEY_UPDATED = "updated";
+    public static final String JSON_KEY_LICENSE_VALID_UNTIL = "licenseValidUntil";
+    public static final String JSON_KEY_LICENSE_HOLDER = "licenseHolder";
+    public static final String JSON_KEY_LEVEL = "level";
+    public static final String JSON_KEY_WARNINGS = "warnings";
+    public static final String JSON_KEY_ERRORS = "errors";
+
+    /**
+     * Logger that can be used by subclasses.
+     */
+    protected final Log logger = LogFactory.getLog(this.getClass());
+    
+    protected RepoAdminService repoAdminService;
+    protected DescriptorService descriptorService;
+
+    /**
+     * @param repoAdminService  the service that provides the functionality
+     */
+    public void setRepoAdminService(RepoAdminService repoAdminService)
+    {
+        this.repoAdminService = repoAdminService;
+    }
+
+    /**
+     * @param descriptorService  the service that provides the functionality
+     */
+    public void setDescriptorService(DescriptorService descriptorService)
+    {
+        this.descriptorService = descriptorService;
+    }
+
+    /**
+     * Return an I18N'd message for the given key or the key itself if not present
+     * 
+     * @param args              arguments to replace the variables in the message
+     */
+    protected String getI18NMessage(String key, Object ... args)
+    {
+        return I18NUtil.getMessage(key, args);
+    }
+    
+    /**
+     * Helper to assign JSON return variables based on the repository usage data.
+     */
+    protected void putUsageInModel(
+            Map<String, Object> model,
+            RepoUsage repoUsage,
+            boolean updated)
+    {
+        model.put(JSON_KEY_LAST_UPDATE, repoUsage.getLastUpdate());
+        model.put(JSON_KEY_USERS, repoUsage.getUsers());
+        model.put(JSON_KEY_DOCUMENTS, repoUsage.getDocuments());
+        model.put(JSON_KEY_LICENSE_MODE, repoUsage.getLicenseMode());
+        model.put(JSON_KEY_READ_ONLY, repoUsage.isReadOnly());
+        model.put(JSON_KEY_LICENSE_VALID_UNTIL, repoUsage.getLicenseExpiryDate());
+        model.put(JSON_KEY_UPDATED, updated);
+
+        // Add license holder
+        LicenseDescriptor license = descriptorService.getLicenseDescriptor();
+        if (license != null)
+        {
+            model.put(JSON_KEY_LICENSE_HOLDER, license.getHolderOrganisation());
+        }
+
+        model.put(JSON_KEY_LEVEL, RepoUsageLevel.OK.ordinal());
+        model.put(JSON_KEY_WARNINGS, Collections.emptyList());
+        model.put(JSON_KEY_ERRORS, Collections.emptyList());
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/DynamicInterpreterExtension.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/DynamicInterpreterExtension.java
new file mode 100644
index 00000000000..70916a417a4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/DynamicInterpreterExtension.java
@@ -0,0 +1,121 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.admin;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import org.alfresco.repo.admin.BaseInterpreter;
+import org.alfresco.repo.processor.BaseProcessorExtension;
+
+/**
+ * Console Interpeter script extension - dynamically binds to the configured BaseInterpreter instance.
+ * This avoids the need for a specific bean class per script interpreter.
+ * 
+ * @see org.alfresco.repo.admin.BaseInterpreter
+ * See script beans configured in 'web-scripts-application-context.xml'.
+ * 
+ * @author Kevin Roast
+ * @since 5.1
+ */
+public class DynamicInterpreterExtension extends BaseProcessorExtension
+{
+    private BaseInterpreter interpreter;
+    private long duration;
+    private String result = "";
+    private String command = "";
+    
+    /**
+     * Set the BaseInterpreter to use when executing commands and retrieving the command result.
+     * 
+     * @param interpreter   For example, repoAdminInterpreter
+     */
+    public void setInterpreter(BaseInterpreter interpreter)
+    {
+        this.interpreter = interpreter;
+    }
+    
+    private BaseInterpreter getInterpreter()
+    {
+        return this.interpreter;
+    }
+    
+    /**
+     * Script execute command gateway.
+     * 
+     * @param command string to execute
+     */
+    public void executeCmd(String command)
+    {
+        this.command = command;
+        this.interpretCommand(command);
+    }
+    
+    /**
+     * @return the command duration
+     */
+    public long getDuration()
+    {
+        return this.duration;
+    }
+
+    /**
+     * @return the command result
+     */
+    public String getResult()
+    {
+        return this.result;
+    }
+
+    /**
+     * @return the command last executed
+     */
+    public String getCommand()
+    {
+        return this.command;
+    }
+
+    /**
+     * Interpret console command using the configured Interpreter
+     *
+     * @param command  command
+     */
+    private void interpretCommand(String command)
+    {
+        try
+        {
+            long startms = System.currentTimeMillis();
+            this.result = getInterpreter().interpretCommand(command);
+            this.duration = System.currentTimeMillis() - startms;
+        }
+        catch (Throwable e)
+        {
+            StringWriter stackTrace = new StringWriter();
+            e.printStackTrace(new PrintWriter(stackTrace));
+            this.result = stackTrace.toString();
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/NodeBrowserPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/NodeBrowserPost.java
new file mode 100644
index 00000000000..ca13383a9ff
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/NodeBrowserPost.java
@@ -0,0 +1,1414 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.admin;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.coci.CheckOutCheckInService;
+import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.AccessPermission;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.OwnableService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.NamespaceException;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.GUID;
+import org.alfresco.util.ISO9075;
+import org.springframework.extensions.surf.util.URLEncoder;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+
+/**
+ * Admin Console NodeBrowser WebScript POST controller.
+ * <p>
+ * Implements a low-level node browser client for the Admin Console tool.
+ * 
+ * @author Kevin Roast
+ * @since 5.1
+ */
+public class NodeBrowserPost extends DeclarativeWebScript implements Serializable
+{
+    private static final long serialVersionUID = 8464392337270665212L;
+
+    // stores and node
+    transient private List<StoreRef> stores = null;
+
+    // supporting repository services
+    transient private TransactionService transactionService;
+    transient private NodeService nodeService;
+    transient private DictionaryService dictionaryService;
+    transient private SearchService searchService;
+    transient private NamespaceService namespaceService;
+    transient private PermissionService permissionService;
+    transient private OwnableService ownableService;
+    transient private LockService lockService;
+    transient private CheckOutCheckInService cociService;
+
+    /**
+     * @param transactionService        transaction service
+     */
+    public void setTransactionService(TransactionService transactionService)
+    {
+        this.transactionService = transactionService;
+    }
+
+    protected TransactionService getTransactionService()
+    {
+        return transactionService;
+    }
+
+    /**
+     * @param nodeService node service
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    protected NodeService getNodeService()
+    {
+        return nodeService;
+    }
+
+    /**
+     * @param searchService search service
+     */
+    public void setSearchService(SearchService searchService)
+    {
+        this.searchService = searchService;
+    }
+
+    protected SearchService getSearchService()
+    {
+        return searchService;
+    }
+
+    /**
+     * @param dictionaryService dictionary service
+     */
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService;
+    }
+
+    protected DictionaryService getDictionaryService()
+    {
+        return dictionaryService;
+    }
+
+    /**
+     * @param namespaceService namespace service
+     */
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+
+    protected NamespaceService getNamespaceService()
+    {
+        return this.namespaceService;
+    }
+
+    /**
+     * @param permissionService permission service
+     */
+    public void setPermissionService(PermissionService permissionService)
+    {
+        this.permissionService = permissionService;
+    }
+
+    protected PermissionService getPermissionService()
+    {
+        return permissionService;
+    }
+
+    public void setOwnableService(OwnableService ownableService)
+    {
+        this.ownableService = ownableService;
+    }
+
+    protected OwnableService getOwnableService()
+    {
+        return ownableService;
+    }
+    
+    public void setLockService(LockService lockService)
+    {
+        this.lockService = lockService;
+    }
+    
+    protected LockService getLockService()
+    {
+        return this.lockService;
+    }
+    
+    public void setCheckOutCheckInService(CheckOutCheckInService cociService)
+    {
+        this.cociService = cociService;
+    }
+    
+    protected CheckOutCheckInService getCheckOutCheckInService()
+    {
+        return this.cociService;
+    }
+
+    /**
+     * Gets the list of repository stores
+     * 
+     * @return stores
+     */
+    public List<StoreRef> getStores()
+    {
+        if (stores == null)
+        {
+            stores = getNodeService().getStores();
+        }
+        return stores;
+    }
+
+    /**
+     * Gets the current node type
+     * 
+     * @return node type
+     */
+    public QName getNodeType(NodeRef nodeRef)
+    {
+        return getNodeService().getType(nodeRef);
+    }
+
+    /**
+     * Gets the current node primary path
+     * 
+     * @return primary path
+     */
+    public String getPrimaryPath(NodeRef nodeRef)
+    {
+        Path primaryPath = getNodeService().getPath(nodeRef);
+        return ISO9075.decode(primaryPath.toString());
+    }
+
+    /**
+     * Gets the current node primary path
+     * 
+     * @return primary path
+     */
+    public String getPrimaryPrefixedPath(NodeRef nodeRef)
+    {
+        Path primaryPath = getNodeService().getPath(nodeRef);
+        return ISO9075.decode(primaryPath.toPrefixString(getNamespaceService()));
+    }
+
+    /**
+     * Gets the current node primary parent reference
+     * 
+     * @return primary parent ref
+     */
+    public NodeRef getPrimaryParent(NodeRef nodeRef)
+    {
+        Path primaryPath = getNodeService().getPath(nodeRef);
+        Path.Element element = primaryPath.last();
+        NodeRef parentRef = ((Path.ChildAssocElement) element).getRef().getParentRef();
+        return parentRef;
+    }
+
+    /**
+     * Gets the current node aspects
+     * 
+     * @return node aspects
+     */
+    public List<Aspect> getAspects(NodeRef nodeRef)
+    {
+        Set<QName> qnames = getNodeService().getAspects(nodeRef);
+        List<Aspect> aspects = new ArrayList<Aspect>(qnames.size());
+        for (QName qname : qnames)
+        {
+            aspects.add(new Aspect(qname));
+        }
+        return aspects;
+    }
+
+    /**
+     * Gets the current node parents
+     * 
+     * @return node parents
+     */
+    public List<ChildAssociation> getParents(NodeRef nodeRef)
+    {
+        List<ChildAssociationRef> parents = getNodeService().getParentAssocs(nodeRef);
+        List<ChildAssociation> assocs = new ArrayList<ChildAssociation>(parents.size());
+        for (ChildAssociationRef ref : parents)
+        {
+            assocs.add(new ChildAssociation(ref));
+        }
+        return assocs;
+    }
+
+    /**
+     * Gets the current node properties
+     * 
+     * @return properties
+     */
+    public List<Property> getProperties(NodeRef nodeRef)
+    {
+        Map<QName, Serializable> propertyValues = getNodeService().getProperties(nodeRef);
+        List<Property> properties = new ArrayList<Property>(propertyValues.size());
+        for (Map.Entry<QName, Serializable> property : propertyValues.entrySet())
+        {
+            properties.add(new Property(property.getKey(), property.getValue(), nodeRef));
+        }
+        return properties;
+    }
+
+    /**
+     * Gets whether the current node inherits its permissions from a parent node
+     * 
+     * @return true => inherits permissions
+     */
+    public boolean getInheritPermissions(NodeRef nodeRef)
+    {
+        Boolean inheritPermissions = this.getPermissionService().getInheritParentPermissions(nodeRef);
+        return inheritPermissions.booleanValue();
+    }
+
+    /**
+     * Gets the current node permissions
+     * 
+     * @return the permissions
+     */
+    public List<Permission> getPermissions(NodeRef nodeRef)
+    {
+        List<Permission> permissions = null;
+        AccessStatus readPermissions = this.getPermissionService().hasPermission(nodeRef, PermissionService.READ_PERMISSIONS);
+        if (readPermissions.equals(AccessStatus.ALLOWED))
+        {
+            List<Permission> nodePermissions = new ArrayList<Permission>();
+            for (Iterator<AccessPermission> iterator = getPermissionService().getAllSetPermissions(nodeRef).iterator(); iterator
+                    .hasNext();)
+            {
+                AccessPermission ap = iterator.next();
+                nodePermissions.add(new Permission(ap.getPermission(), ap.getAuthority(), ap.getAccessStatus().toString()));
+            }
+            permissions = nodePermissions;
+        }
+        else
+        {
+            List<Permission> noReadPermissions = new ArrayList<Permission>(1);
+            noReadPermissions.add(new NoReadPermissionGranted());
+            permissions = noReadPermissions;
+        }
+        return permissions;
+    }
+
+    /**
+     * Gets the current node permissions
+     * 
+     * @return the permissions
+     */
+    public List<Permission> getStorePermissionMasks(NodeRef nodeRef)
+    {
+        List<Permission> permissionMasks = new ArrayList<Permission>(1);
+        permissionMasks.add(new NoStoreMask());
+        return permissionMasks;
+    }
+
+    /**
+     * Gets the current node children
+     * 
+     * @return node children
+     */
+    public List<ChildAssociation> getChildren(NodeRef nodeRef)
+    {
+        List<ChildAssociationRef> refs = getNodeService().getChildAssocs(nodeRef);
+        List<ChildAssociation> assocs = new ArrayList<ChildAssociation>(refs.size());
+        for (ChildAssociationRef ref : refs)
+        {
+            assocs.add(new ChildAssociation(ref));
+        }
+        return assocs;
+    }
+
+    /**
+     * Gets the current node associations
+     * 
+     * @return associations
+     */
+    public List<PeerAssociation> getAssocs(NodeRef nodeRef)
+    {
+        List<AssociationRef> refs = null;
+        try
+        {
+            refs = getNodeService().getTargetAssocs(nodeRef, RegexQNamePattern.MATCH_ALL);
+        }
+        catch (UnsupportedOperationException err)
+        {
+           // some stores do not support associations
+           // but we doesn't want NPE in code below
+           refs = new ArrayList<AssociationRef>();
+        }
+        List<PeerAssociation> assocs = new ArrayList<PeerAssociation>(refs.size());
+        for (AssociationRef ref : refs)
+        {
+            assocs.add(new PeerAssociation(ref.getTypeQName(), ref.getSourceRef(), ref.getTargetRef()));
+        }
+        return assocs;
+    }
+
+    /**
+     * Gets the current source associations
+     * 
+     * @return associations
+     */
+    public List<PeerAssociation> getSourceAssocs(NodeRef nodeRef)
+    {
+        List<AssociationRef> refs = null;
+        try
+        {
+            refs = getNodeService().getSourceAssocs(nodeRef, RegexQNamePattern.MATCH_ALL);
+        }
+        catch (UnsupportedOperationException err)
+        {
+           // some stores do not support associations
+           // but we doesn't want NPE in code below
+           refs = new ArrayList<AssociationRef>(); 
+        }
+        List<PeerAssociation> assocs = new ArrayList<PeerAssociation>(refs.size());
+        for (AssociationRef ref : refs)
+        {
+            assocs.add(new PeerAssociation(ref.getTypeQName(), ref.getSourceRef(), ref.getTargetRef()));
+        }
+        return assocs;
+    }
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> result = new HashMap<>(16);
+        
+        // gather inputs
+        Map<String, String> returnParams = new HashMap<>(16);
+        String store        = req.getParameter("nodebrowser-store");
+        String searcher     = req.getParameter("nodebrowser-search");
+        String query        = req.getParameter("nodebrowser-query");
+        String maxResults   = req.getParameter("nodebrowser-query-maxresults");
+        String skipCount    = req.getParameter("nodebrowser-query-skipcount");
+        String error = null;
+        
+        StoreRef storeRef = new StoreRef(store);
+        
+        // always a list of assoc refs from some result
+        List<ChildAssociationRef> assocRefs = Collections.<ChildAssociationRef>emptyList();
+        NodeRef currentNode = null;
+        
+        // what action should be processed?
+        long timeStart = System.currentTimeMillis();
+        String actionValue = req.getParameter("nodebrowser-action-value");
+        String action = req.getParameter("nodebrowser-action");
+        final String execute = req.getParameter("nodebrowser-execute");
+        final String executeValue = req.getParameter("nodebrowser-execute-value");
+        String message = null;
+        try
+        {
+            // 'execute' is an action that performs an operation on a node e.g. delete
+            // the 'executeValue' param provides context
+            // this is done before the view action to ensure node state is correct
+            if (execute != null)
+            {
+                switch (execute)
+                {
+                    case "delete":
+                    {
+                        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+                        {
+                            @Override
+                            public Void execute() throws Throwable
+                            {
+                                // delete the node using the standard NodeService
+                                nodeService.deleteNode(new NodeRef(executeValue));
+                                return null;
+                            }
+                        }, false, true);
+                        message = "nodebrowser.message.delete";
+                        break;
+                    }
+                    case "fdelete":
+                    {
+                        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+                        {
+                            @Override
+                            public Void execute() throws Throwable
+                            {
+                                // delete the node - but ensure that it is not archived
+                                NodeRef ref = new NodeRef(executeValue);
+                                nodeService.addAspect(ref, ContentModel.ASPECT_TEMPORARY, null);
+                                nodeService.deleteNode(ref);
+                                return null;
+                            }
+                        }, false, true);
+                        message = "nodebrowser.message.delete";
+                        break;
+                    }
+                    case "restore":
+                    {
+                        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+                        {
+                            @Override
+                            public Void execute() throws Throwable
+                            {
+                                nodeService.restoreNode(new NodeRef(executeValue), null, null, null);
+                                return null;
+                            }
+                        }, false, true);
+                        message = "nodebrowser.message.restore";
+                        break;
+                    }
+                    case "take-ownership":
+                    {
+                        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+                        {
+                            @Override
+                            public Void execute() throws Throwable
+                            {
+                                ownableService.takeOwnership(new NodeRef(executeValue));
+                                return null;
+                            }
+                        }, false, true);
+                        message = "nodebrowser.message.take-ownership";
+                        break;
+                    }
+                    case "delete-permissions":
+                    {
+                        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+                        {
+                            @Override
+                            public Void execute() throws Throwable
+                            {
+                                NodeRef ref = new NodeRef(executeValue);
+                                permissionService.deletePermissions(ref);
+                                permissionService.setInheritParentPermissions(ref, true);
+                                return null;
+                            }
+                        }, false, true);
+                        message = "nodebrowser.message.delete-permissions";
+                        break;
+                    }
+                    case "delete-property":
+                    {
+                        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+                        {
+                            @Override
+                            public Void execute() throws Throwable
+                            {
+                                // argument value contains "NodeRef|QName" packed string
+                                String[] parts = executeValue.split("\\|");
+                                nodeService.removeProperty(new NodeRef(parts[0]), QName.createQName(parts[1]));
+                                return null;
+                            }
+                        }, false, true);
+                        message = "nodebrowser.message.delete-property";
+                        break;
+                    }
+                    case "unlock":
+                    {
+                        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+                        {
+                            @Override
+                            public Void execute() throws Throwable
+                            {
+                                NodeRef ref = new NodeRef(executeValue);
+                                if (cociService.isCheckedOut(ref))
+                                {
+                                    NodeRef wcRef = cociService.getWorkingCopy(ref);
+                                    if (wcRef != null)
+                                    {
+                                        cociService.cancelCheckout(wcRef);
+                                    }
+                                }
+                                else
+                                {
+                                    lockService.unlock(ref);
+                                }
+                                return null;
+                            }
+                        }, false, true);
+                        message = "nodebrowser.message.unlock";
+                        break;
+                    }
+                }
+            }
+            
+            // 'action' is a view action that request an update of the admin console view state e.g. 'search' or 'children'
+            // the 'actionValue' param provides context as may other parameters such as 'query'
+            switch (action)
+            {
+                // on Execute btn press and query present, perform search
+                case "search":
+                {
+                    if (query != null && query.trim().length() != 0)
+                    {
+                        switch (searcher)
+                        {
+                            case "noderef":
+                            {
+                                // ensure node exists - or throw error
+                                NodeRef nodeRef = new NodeRef(query);
+                                boolean exists = getNodeService().exists(nodeRef);
+                                if (!exists)
+                                {
+                                    throw new AlfrescoRuntimeException("Node " + nodeRef + " does not exist.");
+                                }
+                                currentNode = nodeRef;
+                                // this is not really a search for results, it is a direct node reference
+                                // so gather the child assocs as usual and update the action value for the UI location
+                                assocRefs = getNodeService().getChildAssocs(currentNode);
+                                actionValue = query;
+                                action = "parent";
+                                break;
+                            }
+                            case "selectnodes":
+                            {
+                                List<NodeRef> nodes = getSearchService().selectNodes(
+                                        getNodeService().getRootNode(storeRef), query, null, getNamespaceService(), false);
+                                assocRefs = new ArrayList<>(nodes.size());
+                                for (NodeRef node: nodes)
+                                {
+                                    assocRefs.add(getNodeService().getPrimaryParent(node));
+                                }
+                                break;
+                            }
+                            default:
+                            {
+                                // perform search
+                                SearchParameters params = new SearchParameters();
+                                params.setQuery(query);
+                                params.addStore(storeRef);
+                                params.setLanguage(searcher);
+                                if (maxResults != null && maxResults.length() != 0)
+                                {
+                                    params.setMaxItems(Integer.parseInt(maxResults));
+                                    params.setLimit(Integer.parseInt(maxResults));
+                                }
+                                if (skipCount != null && skipCount.length() != 0)
+                                {
+                                    params.setSkipCount(Integer.parseInt(skipCount));
+                                }
+                                ResultSet rs = getSearchService().query(params);
+                                assocRefs = rs.getChildAssocRefs();
+                                break;
+                            }
+                        }
+                    }
+                    break;
+                }
+                case "root":
+                {
+                    // iterate the properties and children of a store root node
+                    currentNode = getNodeService().getRootNode(storeRef);
+                    assocRefs = getNodeService().getChildAssocs(currentNode);
+                    break;
+                }
+                case "parent":
+                case "children":
+                {
+                    currentNode = new NodeRef(actionValue);
+                    assocRefs = getNodeService().getChildAssocs(currentNode);
+                    break;
+                }
+            }
+            
+            // get the required information from the assocRefs list and wrap objects
+            List<ChildAssocRefWrapper> wrappers = new ArrayList<>(assocRefs.size());
+            for (ChildAssociationRef ref : assocRefs)
+            {
+                wrappers.add(new ChildAssocRefWrapper(ref));
+            }
+            result.put("children", wrappers);
+        }
+        catch (Throwable e)
+        {
+            // empty child list on error - current node will still be null
+            result.put("children", new ArrayList<>(0));
+            error = e.getMessage();
+        }
+        
+        // current node info if any
+        if (currentNode != null)
+        {
+            // node info
+            Map<String, Object> info = new HashMap<>(8);
+            info.put("nodeRef", currentNode.toString());
+            info.put("path", getNodeService().getPath(currentNode).toPrefixString(getNamespaceService()));
+            info.put("type", getNodeService().getType(currentNode).toPrefixString(getNamespaceService()));
+            ChildAssociationRef parent = getNodeService().getPrimaryParent(currentNode);
+            info.put("parent", parent.getParentRef() != null ? parent.getParentRef().toString() : "");
+            result.put("info", info);
+            
+            // node properties
+            result.put("properties", getProperties(currentNode));
+            
+            // parents
+            List<ChildAssociationRef> parents = getNodeService().getParentAssocs(currentNode);
+            List<ChildAssociation> assocs = new ArrayList<ChildAssociation>(parents.size());
+            for (ChildAssociationRef ref : parents)
+            {
+                assocs.add(new ChildAssociation(ref));
+            }
+            result.put("parents", assocs);
+            
+            // aspects
+            List<Aspect> aspects = getAspects(currentNode);
+            result.put("aspects", aspects);
+            
+            // target assocs
+            List<PeerAssociation> targetAssocs = getAssocs(currentNode);
+            result.put("assocs", targetAssocs);
+            
+            // source assocs
+            List<PeerAssociation> sourceAssocs = getSourceAssocs(currentNode);
+            result.put("sourceAssocs", sourceAssocs);
+            
+            // permissions
+            Map<String, Object> permissionInfo = new HashMap<String, Object>();
+            permissionInfo.put("entries", getPermissions(currentNode));
+            permissionInfo.put("owner", getOwnableService().getOwner(currentNode));
+            permissionInfo.put("inherit", getInheritPermissions(currentNode));
+            result.put("permissions", permissionInfo);
+        }
+        
+        // store result in session for the resulting GET request webscript
+        final String resultId = GUID.generate();
+        HttpServletRequest request = ((WebScriptServletRequest)req).getHttpServletRequest();
+        HttpSession session = request.getSession();
+        session.putValue(resultId, result);
+        
+        // return params
+        returnParams.put("resultId", resultId);
+        returnParams.put("action", action);
+        returnParams.put("actionValue", actionValue);
+        returnParams.put("query", query);
+        returnParams.put("store", store);
+        returnParams.put("searcher", searcher);
+        returnParams.put("maxResults", maxResults);
+        returnParams.put("skipCount", skipCount);
+        returnParams.put("in", Long.toString(System.currentTimeMillis()-timeStart));
+        returnParams.put("e", error);
+        returnParams.put("m", message);
+        
+        // redirect as all admin console pages do (follow standard pattern)
+        // The logic to generate the navigation section and server meta-data is all tied into alfresco-common.lib.js
+        // which is great for writing JS based JMX surfaced pages, but not so great for Java backed WebScripts. 
+        status.setCode(301);
+        status.setRedirect(true);
+        status.setLocation(buildUrl(req, returnParams, execute != null && execute.length() != 0 ? execute : action));
+        
+        return null;
+    }
+    
+    private static String buildUrl(WebScriptRequest req, Map<String, String> params, String hash)
+    {
+        StringBuilder url = new StringBuilder(256);
+        
+        url.append(req.getServicePath());
+        if (!params.isEmpty())
+        {
+            boolean first = true;
+            for (String key: params.keySet())
+            {
+                String val = params.get(key);
+                if (val != null && val.length() != 0)
+                {
+                    url.append(first ? '?' : '&');
+                    url.append(key);
+                    url.append('=');
+                    url.append(URLEncoder.encode(val));
+                    first = false;
+                }
+            }
+        }
+        if (hash != null && hash.length() != 0)
+        {
+            url.append('#').append(hash);
+        }
+        
+        return url.toString();
+    }
+    
+    /**
+     * Node wrapper class
+     */
+    public class Node implements Serializable
+    {
+        private static final long serialVersionUID = 12608347204513848L;
+
+        private String qnamePath;
+        
+        private String prefixedQNamePath;
+        
+        private NodeRef nodeRef;
+        
+        private NodeRef parentNodeRef;
+        
+        private QNameBean childAssoc;
+        
+        private QNameBean type;
+        
+        public Node(NodeRef nodeRef)
+        {
+            this.nodeRef = nodeRef;
+            Path path = getNodeService().getPath(nodeRef);
+            this.qnamePath = path.toString();
+            this.prefixedQNamePath = path.toPrefixString(getNamespaceService());
+            this.parentNodeRef = getPrimaryParent(nodeRef);
+            ChildAssociationRef ref = getNodeService().getPrimaryParent(nodeRef);
+            this.childAssoc = ref.getQName() != null ? new QNameBean(ref.getQName()) : null;
+            this.type = new QNameBean(getNodeService().getType(nodeRef));
+        }
+
+        public String getQnamePath()
+        {
+            return qnamePath;
+        }
+
+        public String getPrefixedQNamePath()
+        {
+            return prefixedQNamePath;
+        }
+
+        public NodeRef getNodeRef()
+        {
+            return nodeRef;
+        }
+
+        public String getId()
+        {
+            return nodeRef.getId();
+        }
+
+        public String getName()
+        {
+            return childAssoc != null ? childAssoc.getName() : "";
+        }
+
+        public String getPrefixedName()
+        {
+            return childAssoc != null ? childAssoc.getPrefixedName() : "";
+        }
+
+        public QNameBean getType()
+        {
+            return type;
+        }
+
+        public void setNodeRef(NodeRef nodeRef)
+        {
+            this.nodeRef = nodeRef;
+        }
+
+        public NodeRef getParentNodeRef()
+        {
+            return parentNodeRef;
+        }
+
+        public void setParentNodeRef(NodeRef parentNodeRef)
+        {
+            this.parentNodeRef = parentNodeRef;
+        }
+    }
+
+    /**
+     * Qname wrapper class
+     */
+    public class QNameBean implements Serializable
+    {
+        private static final long serialVersionUID = 6982292337846270774L;
+        
+        protected QName name;
+        private String prefixString = null;
+
+        public QNameBean(QName name)
+        {
+            this.name = name;
+        }
+        
+        public String getName()
+        {
+            return name.toString();
+        }
+        
+        public String getPrefixedName()
+        {
+            try
+            {
+                return prefixString != null ? prefixString : (prefixString = name.toPrefixString(getNamespaceService()));
+            }
+            catch(NamespaceException e)
+            {
+                return name.getLocalName();
+            }
+        }
+        
+        public String toString()
+        {
+            return getName();
+        }
+    }
+
+    /**
+     * Aspect wrapper class
+     */
+    public class Aspect extends QNameBean implements Serializable
+    {
+        private static final long serialVersionUID = -6448182941386934326L;
+
+        public Aspect(QName name)
+        {
+            super(name);
+        }
+    }
+
+    /**
+     * Association wrapper class
+     */
+    public class Association implements Serializable
+    {
+        private static final long serialVersionUID = 1078430803027004L;
+        
+        protected QNameBean name;
+        protected QNameBean typeName;
+        
+        public Association(QName name, QName typeName)
+        {
+            this.name = name != null ? new QNameBean(name) : null;
+            this.typeName = new QNameBean(typeName);
+        }
+
+        public QNameBean getName()
+        {
+            return name;
+        }
+
+        public QNameBean getTypeName()
+        {
+            return typeName;
+        }
+    }
+
+    /**
+     * Child assoc wrapper class
+     */
+    public class ChildAssociation extends Association implements Serializable
+    {
+        private static final long serialVersionUID = -52439282250891063L;
+        
+        protected NodeRef childRef;
+        protected NodeRef parentRef;
+        protected QNameBean childType;
+        protected QNameBean parentType;
+        protected boolean primary;
+        
+        // from Association
+        protected QNameBean name;
+        protected QNameBean typeName;
+
+        public ChildAssociation(ChildAssociationRef ref)
+        {
+            super(ref.getQName() != null ? ref.getQName() : null,
+                    ref.getTypeQName() != null ? ref.getTypeQName() : null);
+            
+            this.childRef = ref.getChildRef();
+            this.parentRef = ref.getParentRef(); // could be null
+            if (childRef != null)
+                this.childType = new QNameBean(getNodeType(childRef));
+            if (parentRef != null)
+                this.parentType = new QNameBean(getNodeType(parentRef));
+            this.primary = ref.isPrimary();
+        }
+
+        public NodeRef getChildRef()
+        {
+            return childRef;
+        }
+
+        public QNameBean getChildTypeName()
+        {
+            return childType;
+        }
+
+        public NodeRef getParentRef()
+        {
+            return parentRef;
+        }
+
+        public QNameBean getParentTypeName()
+        {
+            return parentType;
+        }
+
+        public boolean isPrimary()
+        {
+            return primary;
+        }
+
+        public boolean getPrimary()
+        {
+            return this.isPrimary();
+        }
+    }
+
+    /**
+     * Wrapper to resolve Assoc Type and QName to short form with resolved prefix 
+     */
+    public class ChildAssocRefWrapper implements Serializable
+    {
+        private static final long serialVersionUID = 4321292337846270665L;
+        
+        final private ChildAssociationRef ref;
+        private String qname = null;
+        private String typeqname = null;
+        
+        public ChildAssocRefWrapper(ChildAssociationRef r)
+        {
+            ref = r;
+        }
+        
+        public String getTypeQName()
+        {
+            return typeqname != null ? typeqname : (
+                    typeqname = ref.getTypeQName() != null ? ref.getTypeQName().toPrefixString(getNamespaceService()) : "");
+        }
+    
+        public String getQName()
+        {
+            return qname != null ? qname : (
+                    qname = ref.getQName() != null ? ref.getQName().toPrefixString(getNamespaceService()) : "");
+        }
+    
+        public NodeRef getChildRef()
+        {
+            return ref.getChildRef();
+        }
+    
+        public NodeRef getParentRef()
+        {
+            return ref.getParentRef();
+        }
+    
+        public boolean isPrimary()
+        {
+            return ref.isPrimary();
+        }
+        
+        public boolean isChildLocked()
+        {
+            return lockService != null && lockService.getLockType(ref.getChildRef()) != null;
+        }
+    }
+    
+    /**
+     * Peer assoc wrapper class
+     */
+    public class PeerAssociation extends Association implements Serializable
+    {
+        private static final long serialVersionUID = 4833278311416507L;
+        
+        protected NodeRef sourceRef;
+        protected NodeRef targetRef;
+        protected QNameBean sourceType;
+        protected QNameBean targetType;
+        
+        // from Association
+        protected QNameBean name;
+        protected QNameBean typeName;
+        
+        public PeerAssociation(QName typeName, NodeRef sourceRef, NodeRef targetRef)
+        {
+            super(null, typeName);
+            
+            this.sourceRef = sourceRef;
+            this.targetRef = targetRef;
+            if (sourceRef != null)
+                this.sourceType = new QNameBean(getNodeType(sourceRef));
+            if (targetRef != null)
+                this.targetType = new QNameBean(getNodeType(targetRef));
+        }
+
+        public NodeRef getSourceRef()
+        {
+            return sourceRef;
+        }
+
+        public QNameBean getSourceTypeName()
+        {
+            return sourceType;
+        }
+
+        public NodeRef getTargetRef()
+        {
+            return targetRef;
+        }
+
+        public QNameBean getTargetTypeName()
+        {
+            return targetType;
+        }
+    }
+
+    /**
+     * Property wrapper class
+     */
+    public class Property implements Serializable
+    {
+        private static final long serialVersionUID = 7755924782250077L;
+        
+        private QNameBean name;
+
+        private boolean isCollection = false;
+
+        private List<Value> values;
+
+        private boolean residual;
+        
+        private QNameBean typeName;
+        
+        /**
+         * Construct
+         * 
+         * @param qname property name
+         * @param value property values
+         */
+        @SuppressWarnings("unchecked")
+        public Property(QName qname, Serializable value, NodeRef nodeRef)
+        {
+            this.name = new QNameBean(qname);
+
+            residual = true;
+
+            PropertyDefinition propDef = getDictionaryService().getProperty(qname);
+            if (propDef != null)
+            {
+                QName qn = propDef.getDataType().getName();
+                typeName = qn != null ? new QNameBean(propDef.getDataType().getName()) : null;
+
+                // ALF-21950 We need to check if the property belongs to the type of the node or to their ancestors
+                if(propDef.getContainerClass().isAspect())
+                {
+                    residual = false;
+                }
+                else
+                {
+                    ClassDefinition classDef = getDictionaryService().getClass(getNodeService().getType(nodeRef));
+                    boolean found = false;
+
+                    while(classDef != null)
+                    {
+                        found = searchInClassDefinition(qname, classDef);
+                        if(found)
+                        {
+                            break;
+                        }
+                        classDef = classDef.getParentClassDefinition();
+                    }
+                    residual = !found;
+                }
+            }
+
+            // handle multi/single values
+            final List<Value> values;
+            if (value instanceof Collection)
+            {
+                Collection<Serializable> oldValues = (Collection<Serializable>) value;
+                values = new ArrayList<Value>(oldValues.size());
+                isCollection = true;
+                for (Serializable multiValue : oldValues)
+                {
+                    values.add(new Value(multiValue instanceof QName ? new QNameBean((QName) multiValue) : multiValue));
+                }
+            }
+            else
+            {
+                values = Collections.singletonList(new Value(value instanceof QName ? new QNameBean((QName) value) : value));
+            }
+            this.values = values;
+        }
+
+        private boolean searchInClassDefinition(QName qname, ClassDefinition classDef)
+        {
+            if (classDef != null)
+            {
+                for (QName definedPropQName : classDef.getProperties().keySet())
+                {
+                    if(qname.isMatch(definedPropQName))
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        /**
+         * Gets the property name
+         * 
+         * @return name
+         */
+        public QNameBean getName()
+        {
+            return name;
+        }
+
+        public QNameBean getTypeName()
+        {
+            return typeName;
+        }
+
+        /**
+         * Gets the prefixed property name
+         * 
+         * @return prefixed name
+         */
+        public String getPrefixedName()
+        {
+            return name.getPrefixedName();
+        }
+
+        /**
+         * Gets the property value
+         * 
+         * @return value
+         */
+        public List<Value> getValues()
+        {
+            return values;
+        }
+
+        /**
+         * Determines whether the property is residual
+         * 
+         * @return true => property is not defined in dictionary
+         */
+        public boolean getResidual()
+        {
+            return residual;
+        }
+
+        /**
+         * Determines whether the property is of ANY type
+         * 
+         * @return true => is any
+         */
+        public boolean isAny()
+        {
+            return (getTypeName() == null) ? false : getTypeName().getName().equals(DataTypeDefinition.ANY.toString());
+        }
+
+        /**
+         * Determines whether the property is a collection
+         * 
+         * @return true => is collection
+         */
+        public boolean isCollection()
+        {
+            return isCollection;
+        }
+
+        /**
+         * Value wrapper
+         */
+        public class Value implements Serializable
+        {
+            private static final long serialVersionUID = 47235536691732705L;
+            
+            private Serializable value;
+
+            /**
+             * Construct
+             * 
+             * @param value value
+             */
+            public Value(Serializable value)
+            {
+                this.value = value;
+            }
+
+            /**
+             * Gets the value
+             * 
+             * @return the value
+             */
+            public Serializable getValue()
+            {
+                return value;
+            }
+
+            /**
+             * Gets the value datatype
+             * 
+             * @return the value datatype
+             */
+            public String getDataType()
+            {
+                String datatype = null;
+                if (Property.this.getTypeName() != null)
+                {
+                    datatype = Property.this.getTypeName().getName();
+                }
+                if (datatype == null || datatype.equals(DataTypeDefinition.ANY.toString()))
+                {
+                    if (value != null)
+                    {
+                        DataTypeDefinition dataTypeDefinition = getDictionaryService().getDataType(value.getClass());
+                        if (dataTypeDefinition != null)
+                        {
+                            datatype = getDictionaryService().getDataType(value.getClass()).getName().toString();
+                        }
+                    }
+                }
+                return datatype;
+            }
+
+            /**
+             * Determines whether the value is content
+             * 
+             * @return true => is content
+             */
+            public boolean isContent()
+            {
+                String datatype = getDataType();
+                return (datatype == null) ? false : datatype.equals(DataTypeDefinition.CONTENT.toString());
+            }
+
+            /**
+             * Determines whether the value is a node ref
+             * 
+             * @return true => is node ref
+             */
+            public boolean isNodeRef()
+            {
+                String datatype = getDataType();
+                return (datatype == null) ? false : datatype.equals(DataTypeDefinition.NODE_REF.toString()) || datatype.equals(DataTypeDefinition.CATEGORY.toString());
+            }
+
+            /**
+             * Determines whether the value is null
+             * 
+             * @return true => value is null
+             */
+            public boolean isNullValue()
+            {
+                return value == null;
+            }
+        }
+    }
+
+    /**
+     * Permission bean
+     */
+    public static class Permission implements Serializable
+    {
+        private static final long serialVersionUID = 1235536691732705L;
+        
+        private final String permission;
+        private final String authority;
+        private final String accessStatus;
+        
+        public Permission(String permission, String authority, String accessStatus)
+        {
+            this.permission = permission;
+            this.authority = authority;
+            this.accessStatus = accessStatus;
+        }
+
+        public String getPermission()
+        {
+            return permission;
+        }
+        
+        public String getAuthority()
+        {
+            return authority;
+        }
+        
+        public String getAccessStatus()
+        {
+            return accessStatus;
+        }
+    }
+
+    /**
+     * Permission representing the fact that "Read Permissions" has not been granted
+     */
+    public static class NoReadPermissionGranted extends Permission implements Serializable
+    {
+        private static final long serialVersionUID = 1236786691732705L;
+        
+        public NoReadPermissionGranted()
+        {
+            super(PermissionService.READ_PERMISSIONS, "[Current Authority]", "Not Granted");
+        }
+    }
+
+    public static class NoStoreMask extends Permission implements Serializable
+    {
+        private static final long serialVersionUID = 3125536691732705L;
+        
+        public NoStoreMask()
+        {
+            super("All <No Mask>", "All", "Allowed");
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/RepoRestrictionsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/RepoRestrictionsGet.java
new file mode 100644
index 00000000000..5a339f821e2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/RepoRestrictionsGet.java
@@ -0,0 +1,59 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.admin;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.admin.RepoUsage;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * GET the repository {@link RepoUsage restrictions}.
+ * 
+ * @author Derek Hulley
+ * @since 3.4
+ */
+public class RepoRestrictionsGet extends AbstractAdminWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>(7);
+        
+        RepoUsage restrictions = repoAdminService.getRestrictions();
+        putUsageInModel(model, restrictions, false);
+        
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+        }
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/RepoUsageGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/RepoUsageGet.java
new file mode 100644
index 00000000000..64dd0241aaf
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/RepoUsageGet.java
@@ -0,0 +1,81 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.admin;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.service.cmr.admin.RepoUsage;
+import org.alfresco.service.cmr.admin.RepoUsageStatus;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * GET the repository {@link RepoUsage usage}.
+ * 
+ * @author Derek Hulley
+ * @since 3.4
+ */
+public class RepoUsageGet extends AbstractAdminWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(final WebScriptRequest req, final Status status, final Cache cache)
+    {
+        // Runas system to obtain the info
+        RunAsWork<Map<String, Object>> runAs = new RunAsWork<Map<String,Object>>()
+        {
+            @Override
+            public Map<String, Object> doWork() throws Exception
+            {
+                Map<String, Object> model = new HashMap<String, Object>(7);
+                
+                RepoUsageStatus usageStatus = repoAdminService.getUsageStatus();
+                RepoUsage usage = usageStatus.getUsage();
+                
+                putUsageInModel(
+                        model,
+                        usage,
+                        false);
+              
+                // Add usage messages
+                model.put(JSON_KEY_LEVEL, usageStatus.getLevel().ordinal());
+                model.put(JSON_KEY_WARNINGS, usageStatus.getWarnings());
+                model.put(JSON_KEY_ERRORS, usageStatus.getErrors());
+              
+                // Done
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+                }
+                return model;
+            }
+        };
+        return AuthenticationUtil.runAs(runAs, AuthenticationUtil.getSystemUserName());
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/RepoUsagePost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/RepoUsagePost.java
new file mode 100644
index 00000000000..b9a134de622
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/admin/RepoUsagePost.java
@@ -0,0 +1,62 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.admin;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.admin.RepoUsage;
+import org.alfresco.service.cmr.admin.RepoUsage.UsageType;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * GET the repository {@link RepoUsage usage}.
+ * 
+ * @author Derek Hulley
+ * @since 3.4
+ */
+public class RepoUsagePost extends AbstractAdminWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>(7);
+        
+        boolean updated = repoAdminService.updateUsage(UsageType.USAGE_ALL);
+        RepoUsage repoUsage = repoAdminService.getUsage();
+        
+        putUsageInModel(model, repoUsage, updated);
+        
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+        }
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/AbstractArchivedNodeWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/AbstractArchivedNodeWebScript.java
new file mode 100644
index 00000000000..c294dadbf3b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/AbstractArchivedNodeWebScript.java
@@ -0,0 +1,201 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.archive;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.node.archive.ArchivedNodesCannedQueryBuilder;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.util.ScriptPagingDetails;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is an abstract base class for the various webscript controllers in the
+ * NodeArchiveService.
+ * 
+ * @author Neil McErlean, Jamal Kaabi-Mofrad
+ * @since 3.5
+ */
+public abstract class AbstractArchivedNodeWebScript extends DeclarativeWebScript
+{
+    public static final String NAME          = "name";
+    public static final String TITLE         = "title";
+    public static final String DESCRIPTION   = "description";
+    public static final String NODEREF       = "nodeRef";
+    public static final String ARCHIVED_BY   = "archivedBy";
+    public static final String ARCHIVED_DATE = "archivedDate";
+    public static final String DISPLAY_PATH  = "displayPath";
+    public static final String USER_NAME     = "userName";
+    public static final String FIRST_NAME    = "firstName";
+    public static final String LAST_NAME     = "lastName";
+    public static final String NODE_TYPE     = "nodeType";
+    public static final String DELETED_NODES = "deletedNodes";
+    
+    public static final int DEFAULT_MAX_ITEMS_PER_PAGE = 50;
+    
+    // Injected services
+    protected ServiceRegistry serviceRegistry;
+    protected NodeArchiveService nodeArchiveService;
+    protected int maxSizeView = 1000;
+    
+    /**
+     * Sets the serviceRegistry instance
+     * 
+     * @param serviceRegistry the serviceRegistry to set
+     */
+    public void setServiceRegistry(ServiceRegistry serviceRegistry)
+    {
+        this.serviceRegistry = serviceRegistry;
+    }
+
+    /**
+     * Sets the nodeArchiveService instance
+     * 
+     * @param nodeArchiveService the nodeArchiveService to set
+     */
+    public void setNodeArchiveService(NodeArchiveService nodeArchiveService)
+    {
+        this.nodeArchiveService = nodeArchiveService;
+    }
+
+    /**
+     * Sets the maxSizeView
+     * 
+     * @param maxSizeView the maxSizeView
+     */
+    public void setMaxSizeView(int maxSizeView)
+    {
+        this.maxSizeView = maxSizeView;
+    }
+    
+    protected StoreRef parseRequestForStoreRef(WebScriptRequest req)
+    {
+        // get the parameters that represent the StoreRef, we know they are present
+        // otherwise this webscript would not have matched
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String storeType = templateVars.get("store_type");
+        String storeId = templateVars.get("store_id");
+
+        // create the StoreRef and ensure it is valid
+        StoreRef storeRef = new StoreRef(storeType, storeId);
+
+        return storeRef;
+    }
+
+    protected NodeRef parseRequestForNodeRef(WebScriptRequest req)
+    {
+        // get the parameters that represent the NodeRef. They may not all be there
+        // for all deletednodes webscripts.
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String storeType = templateVars.get("store_type");
+        String storeId = templateVars.get("store_id");
+        String id = templateVars.get("id");
+
+        if (id == null || id.trim().length() == 0)
+        {
+            return null;
+        }
+        else
+        {
+            return new NodeRef(storeType, storeId, id);
+        }
+    }
+    
+    /**
+     * Retrieves the named parameter as an integer, if the parameter is not present the default value is returned
+     * 
+     * @param req The WebScript request
+     * @param paramName The name of parameter to look for
+     * @param defaultValue The default value that should be returned if parameter is not present in request or if it is not positive
+     * @return The request parameter or default value
+     */
+    protected int getIntParameter(WebScriptRequest req, String paramName, int defaultValue)
+    {
+        String paramString = req.getParameter(paramName);
+        
+        if (paramString != null)
+        {
+            try
+            {
+                int param = Integer.valueOf(paramString);
+                
+                if (param >= 0)
+                {
+                    return param;
+                }
+            }
+            catch (NumberFormatException e) 
+            {
+                throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
+            }
+        }
+        
+        return defaultValue;
+    }
+    
+    /**
+     * * This method gets all nodes from the archive which were originally
+     * contained within the specified StoreRef.
+     * 
+     * @param storeRef mandatory store ref
+     * @param paging mandatory paging
+     * @param filter optional filter
+     */
+    protected PagingResults<NodeRef> getArchivedNodesFrom(StoreRef storeRef, ScriptPagingDetails paging, String filter)
+    {
+        NodeService nodeService = serviceRegistry.getNodeService();
+        NodeRef archiveStoreRootNodeRef = nodeService.getStoreArchiveNode(storeRef);
+
+        // Create canned query
+        ArchivedNodesCannedQueryBuilder queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(
+                    archiveStoreRootNodeRef, paging).filter(filter)
+                    .sortOrderAscending(false).build();
+
+        // Query the DB
+        PagingResults<NodeRef> result = nodeArchiveService.listArchivedNodes(queryBuilder);
+
+        return result;
+    }
+    
+    protected void validatePermission(NodeRef nodeRef, String currentUser)
+    {
+        if (!nodeArchiveService.hasFullAccess(nodeRef))
+        {
+            throw new WebScriptException(Status.STATUS_FORBIDDEN, "You don't have permission to act on the node.");
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodePut.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodePut.java
new file mode 100644
index 00000000000..64e995759dd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodePut.java
@@ -0,0 +1,97 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.archive;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.node.archive.RestoreNodeReport;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the archivednode.put webscript.
+ * 
+ * @author Neil Mc Erlean
+ * @since 3.5
+ */
+public class ArchivedNodePut extends AbstractArchivedNodeWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+        
+        // Current user
+        String userID = AuthenticationUtil.getFullyAuthenticatedUser();
+        if (userID == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_UNAUTHORIZED, "Web Script ["
+                        + req.getServiceMatch().getWebScript().getDescription()
+                        + "] requires user authentication.");
+        }
+
+        NodeRef nodeRefToBeRestored = parseRequestForNodeRef(req);
+        if (nodeRefToBeRestored == null)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "nodeRef not recognised. Could not restore.");
+        }
+        
+        // check if the current user has the permission to restore the node
+        validatePermission(nodeRefToBeRestored, userID);
+        
+        RestoreNodeReport report = nodeArchiveService.restoreArchivedNode(nodeRefToBeRestored);
+
+        // Handling of some error scenarios
+        if (report.getStatus().equals(RestoreNodeReport.RestoreStatus.FAILURE_INVALID_ARCHIVE_NODE))
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find archive node: " + nodeRefToBeRestored);
+        }
+        else if (report.getStatus().equals(RestoreNodeReport.RestoreStatus.FAILURE_PERMISSION))
+        {
+            throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "Unable to restore archive node: " + nodeRefToBeRestored);
+        }
+        else if (report.getStatus().equals(RestoreNodeReport.RestoreStatus.FAILURE_DUPLICATE_CHILD_NODE_NAME))
+        {
+            throw new WebScriptException(HttpServletResponse.SC_CONFLICT, "Unable to restore archive node: " + nodeRefToBeRestored +". Duplicate child node name");
+        }
+        else if (report.getStatus().equals(RestoreNodeReport.RestoreStatus.FAILURE_INVALID_PARENT) ||
+                 report.getStatus().equals(RestoreNodeReport.RestoreStatus.FAILURE_INTEGRITY) ||
+                 report.getStatus().equals(RestoreNodeReport.RestoreStatus.FAILURE_OTHER))
+        {
+            throw new WebScriptException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Unable to restore archive node: " + nodeRefToBeRestored);
+        }
+        
+        model.put("restoreNodeReport", report);
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodeState.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodeState.java
new file mode 100644
index 00000000000..1cab5d2b3ac
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodeState.java
@@ -0,0 +1,164 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.archive;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.PathUtil;
+
+/**
+ * A simple POJO class for the state of an archived node. For easier passing to the FTL model.
+ * 
+ * @author Neil McErlean
+ * @since 3.5
+ */
+public class ArchivedNodeState
+{
+    private NodeRef archivedNodeRef;
+    private String archivedBy;
+    private Date archivedDate;
+    private String name;
+    private String title;
+    private String description;
+    private String displayPath;
+    private String firstName;
+    private String lastName;
+    private String nodeType;
+    private boolean isContentType;
+    
+    /**
+     * To prevent unauthorised construction.
+     */
+    private ArchivedNodeState() { /* Intentionally empty*/ }
+    
+    public static ArchivedNodeState create(NodeRef archivedNode, ServiceRegistry serviceRegistry)
+    {
+        ArchivedNodeState result = new ArchivedNodeState();
+        
+        NodeService nodeService = serviceRegistry.getNodeService();
+        Map<QName, Serializable> properties = nodeService.getProperties(archivedNode);
+
+        result.archivedNodeRef = archivedNode;
+        result.archivedBy = (String) properties.get(ContentModel.PROP_ARCHIVED_BY);
+        result.archivedDate = (Date) properties.get(ContentModel.PROP_ARCHIVED_DATE);
+        result.name = (String) properties.get(ContentModel.PROP_NAME);
+        result.title = (String) properties.get(ContentModel.PROP_TITLE);
+        result.description = (String) properties.get(ContentModel.PROP_DESCRIPTION);
+        QName type = nodeService.getType(archivedNode);
+        result.isContentType = (type.equals(ContentModel.TYPE_CONTENT) || serviceRegistry.getDictionaryService().isSubClass(type, ContentModel.TYPE_CONTENT));
+        result.nodeType = type.toPrefixString(serviceRegistry.getNamespaceService());
+
+        PersonService personService = serviceRegistry.getPersonService();
+        if (result.archivedBy != null && personService.personExists(result.archivedBy))
+        {
+            NodeRef personNodeRef = personService.getPerson(result.archivedBy, false);
+            Map<QName, Serializable> personProps = nodeService.getProperties(personNodeRef);
+            
+            result.firstName = (String) personProps.get(ContentModel.PROP_FIRSTNAME);
+            result.lastName = (String) personProps.get(ContentModel.PROP_LASTNAME);
+        }
+        
+        ChildAssociationRef originalParentAssoc = (ChildAssociationRef) properties.get(ContentModel.PROP_ARCHIVED_ORIGINAL_PARENT_ASSOC);
+        
+        if (serviceRegistry.getPermissionService().hasPermission(originalParentAssoc.getParentRef(), PermissionService.READ).equals(AccessStatus.ALLOWED)
+                && nodeService.exists(originalParentAssoc.getParentRef()))
+        {
+           result.displayPath = PathUtil.getDisplayPath(nodeService.getPath(originalParentAssoc.getParentRef()), true);
+        }
+        else
+        {
+           result.displayPath = "";
+        }
+        
+        return result;
+    }
+    
+    public NodeRef getNodeRef()
+    {
+        return this.archivedNodeRef;
+    }
+    
+    public String getArchivedBy()
+    {
+        return this.archivedBy;
+    }
+    
+    public Date getArchivedDate()
+    {
+        return this.archivedDate;
+    }
+    
+    public String getName()
+    {
+        return this.name;
+    }
+    
+    public String getTitle()
+    {
+        return this.title;
+    }
+    
+    public String getDescription()
+    {
+        return this.description;
+    }
+    
+    public String getDisplayPath()
+    {
+        return this.displayPath;
+    }
+    
+    public String getFirstName()
+    {
+        return this.firstName;
+    }
+    
+    public String getLastName()
+    {
+        return this.lastName;
+    }
+    
+    public String getNodeType()
+    {
+        return this.nodeType;
+    }
+    
+    public boolean getIsContentType()
+    {
+        return this.isContentType;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodesDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodesDelete.java
new file mode 100644
index 00000000000..40e1fd47ac5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodesDelete.java
@@ -0,0 +1,110 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.archive;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.util.ScriptPagingDetails;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the deletednodes.delete web script.
+ * 
+ * @author Neil McErlean
+ * @since 3.5
+ */
+public class ArchivedNodesDelete extends AbstractArchivedNodeWebScript
+{
+    private static Log log = LogFactory.getLog(ArchivedNodesDelete.class);
+    
+    public static final String PURGED_NODES = "purgedNodes";
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+        
+        // Current user
+        String userID = AuthenticationUtil.getFullyAuthenticatedUser();
+        if (userID == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_UNAUTHORIZED, "Web Script ["
+                        + req.getServiceMatch().getWebScript().getDescription()
+                        + "] requires user authentication.");
+        }
+
+        StoreRef storeRef = parseRequestForStoreRef(req);
+        NodeRef nodeRef = parseRequestForNodeRef(req);
+        
+        List<NodeRef> nodesToBePurged = new ArrayList<NodeRef>();
+        if (nodeRef != null)
+        {
+            // check if the current user has the permission to purge the node
+            validatePermission(nodeRef, userID);
+            
+            // If there is a specific NodeRef, then that is the only Node that should be purged.
+            // In this case, the NodeRef points to the actual node to be purged i.e. the node in
+            // the archive store.
+            nodesToBePurged.add(nodeRef);
+        }
+        else
+        {
+            // But if there is no specific NodeRef and instead there is only a StoreRef, then
+            // all nodes which were originally in that StoreRef should be purged.
+            // Create paging
+            ScriptPagingDetails paging = new ScriptPagingDetails(maxSizeView, 0);
+            PagingResults<NodeRef> result = getArchivedNodesFrom(storeRef, paging, null);
+            nodesToBePurged.addAll(result.getPage());            
+        }
+        
+        if (log.isDebugEnabled())
+        {
+            log.debug("Purging " + nodesToBePurged.size() + " nodes");
+        }
+        
+        // Now having identified the nodes to be purged, we simply have to do it.
+        nodeArchiveService.purgeArchivedNodes(nodesToBePurged);
+
+        model.put(PURGED_NODES, nodesToBePurged);
+        
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodesFilter.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodesFilter.java
new file mode 100644
index 00000000000..667d00d13df
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodesFilter.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.archive;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * This interface defines a filter for ArchivedNodes.
+ * 
+ * @author Neil Mc Erlean
+ * @since 3.5
+ */
+public interface ArchivedNodesFilter
+{
+    /**
+     * This method checks whether or not the specified {@link NodeRef} should be included,
+     * as defined by the concrete filter implementation.
+     * @param nodeRef the NodeRef to be checked for filtering.
+     * @return <code>true</code> if the {@link NodeRef} is acceptable, else <code>false</code>.
+     */
+    boolean accept(NodeRef nodeRef);
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodesGet.java
new file mode 100644
index 00000000000..437aa717ac8
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/ArchivedNodesGet.java
@@ -0,0 +1,99 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.archive;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.query.PagingResults;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.util.ModelUtil;
+import org.alfresco.util.ScriptPagingDetails;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the archivednodes.get web script.
+ * 
+ * @author Neil McErlean, Jamal Kaabi-Mofrad
+ * @since 3.5
+ */
+public class ArchivedNodesGet extends AbstractArchivedNodeWebScript
+{
+    private static final String MAX_ITEMS = "maxItems";
+    private static final String SKIP_COUNT = "skipCount";
+    private static final String NAME_FILTER = "nf";
+
+    List<ArchivedNodesFilter> nodeFilters = new ArrayList<ArchivedNodesFilter>();
+
+    /**
+     * This method is used to inject {@link org.alfresco.repo.web.scripts.archive.ArchivedNodesFilter node filters} on this GET call.
+     * 
+     */
+    public void setArchivedNodeFilters(List<ArchivedNodesFilter> nodeFilters)
+    {
+        this.nodeFilters = nodeFilters;
+    }
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+        
+        // We want to get all nodes in the archive which were originally
+        // contained in the following StoreRef.
+        StoreRef storeRef = parseRequestForStoreRef(req);
+        
+        // Create paging
+        ScriptPagingDetails paging = new ScriptPagingDetails(getIntParameter(req, MAX_ITEMS, DEFAULT_MAX_ITEMS_PER_PAGE),
+                    getIntParameter(req, SKIP_COUNT, 0));
+        
+        PagingResults<NodeRef> result = getArchivedNodesFrom(storeRef, paging, req.getParameter(NAME_FILTER));
+        List<NodeRef> nodeRefs = result.getPage();
+
+        List<ArchivedNodeState> deletedNodes = new ArrayList<ArchivedNodeState>(nodeRefs.size());
+        for (NodeRef archivedNode : nodeRefs)
+        {
+            ArchivedNodeState state = ArchivedNodeState.create(archivedNode, serviceRegistry);
+            deletedNodes.add(state);
+        }
+
+        // Now do the paging
+        // ALF-19111. Note: Archived nodes CQ, supports Paging, 
+        // so no need to use the ModelUtil.page method to build the page again.        
+        model.put(DELETED_NODES, deletedNodes);
+        // Because we haven't used ModelUtil.page method, we need to set the total items manually.
+        paging.setTotalItems(deletedNodes.size());
+        model.put("paging", ModelUtil.buildPaging(paging));
+        
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/NodeTypeFilter.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/NodeTypeFilter.java
new file mode 100644
index 00000000000..a4888ab9f41
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/archive/NodeTypeFilter.java
@@ -0,0 +1,93 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.archive;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * This class is used to filter nodes based on node type.
+ * 
+ * @author Neil McErlean
+ * @since 3.5
+ */
+public class NodeTypeFilter implements ArchivedNodesFilter
+{
+    private NodeService nodeService;
+    private NamespaceService namespaceService;
+    private List<QName> excludedTypes;
+    
+    /**
+     * This method sets the NamespaceService object.
+     * @param namespaceService the namespaceService.
+     */
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+    
+    /**
+     * This method sets the NodeService object.
+     * @param nodeService the node service.
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+    
+    /**
+     * Sets the List of node types to exclude. These node types should be in the
+     * short form e.g. cm:myType.
+     * 
+     * @param excludedTypesStg a List of node types which are to be excluded.
+     */
+    public void setExcludedTypes(List<String> excludedTypesStg)
+    {
+        // Convert the Strings to QNames.
+        this.excludedTypes = new ArrayList<QName>(excludedTypesStg.size());
+        for (String s : excludedTypesStg)
+        {
+            QName typeQName = QName.createQName(s, namespaceService);
+            this.excludedTypes.add(typeQName);
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.repo.web.scripts.archive.ArchivedNodesFilter#accept(org.alfresco.service.cmr.repository.NodeRef)
+     */
+    public boolean accept(NodeRef nodeRef)
+    {
+        boolean typeIsExcluded = this.excludedTypes.contains(nodeService.getType(nodeRef));
+        return !typeIsExcluded;
+    }
+}
+
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AbstractAuditWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AbstractAuditWebScript.java
new file mode 100644
index 00000000000..7d9f4c00248
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AbstractAuditWebScript.java
@@ -0,0 +1,299 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.audit;
+
+import java.util.Map;
+
+import org.alfresco.service.cmr.audit.AuditService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Abstract implementation for scripts that access the {@link AuditService}.
+ * 
+ * @author Derek Hulley
+ * @since 3.4
+ */
+public abstract class AbstractAuditWebScript extends DeclarativeWebScript
+{
+    public static final String PARAM_APPLICATION = "application";
+    public static final String PARAM_PATH="path";
+    public static final String PARAM_ENABLE = "enable";
+    public static final String PARAM_VALUE = "value";
+    public static final String PARAM_VALUE_TYPE = "valueType";
+    public static final String PARAM_FROM_TIME = "fromTime";
+    public static final String PARAM_TO_TIME = "toTime";
+    public static final String PARAM_FROM_ID = "fromId";
+    public static final String PARAM_TO_ID = "toId";
+    public static final String PARAM_USER = "user";
+    public static final String PARAM_FORWARD = "forward";
+    public static final String PARAM_LIMIT = "limit";
+    public static final String PARAM_VERBOSE = "verbose";
+
+    public static final Long DEFAULT_FROM_TIME = null;
+    public static final Long DEFAULT_TO_TIME = null;
+    public static final Long DEFAULT_FROM_ID = null;
+    public static final Long DEFAULT_TO_ID = null;
+    public static final String DEFAULT_USER = null;
+    public static final boolean DEFAULT_FORWARD = true;
+    public static final int DEFAULT_LIMIT = 100;
+    public static final boolean DEFAULT_VERBOSE = false;
+    public static final boolean DEFAULT_ENABLE = false;
+    
+    public static final String JSON_KEY_ENABLED = "enabled";
+    public static final String JSON_KEY_APPLICATIONS = "applications";
+    public static final String JSON_KEY_NAME = "name";
+    public static final String JSON_KEY_PATH = "path";
+    public static final String JSON_KEY_CLEARED = "cleared";
+    public static final String JSON_KEY_DELETED = "deleted";
+    
+    public static final String JSON_KEY_ENTRY_COUNT = "count";
+    public static final String JSON_KEY_ENTRIES = "entries";
+    public static final String JSON_KEY_ENTRY_ID = "id";
+    public static final String JSON_KEY_ENTRY_APPLICATION = "application";
+    public static final String JSON_KEY_ENTRY_USER = "user";
+    public static final String JSON_KEY_ENTRY_TIME = "time";
+    public static final String JSON_KEY_ENTRY_VALUES = "values";
+
+    /**
+     * Logger that can be used by subclasses.
+     */
+    protected final Log logger = LogFactory.getLog(this.getClass());
+    
+    protected AuditService auditService;
+    
+    /**
+     * @param auditService      the service that provides the actual data
+     */
+    public void setAuditService(AuditService auditService)
+    {
+        this.auditService = auditService;
+    }
+
+    /**
+     * Return an I18N'd message for the given key or the key itself if not present
+     * 
+     * @param args              arguments to replace the variables in the message
+     */
+    protected String getI18NMessage(String key, Object ... args)
+    {
+        return I18NUtil.getMessage(key, args);
+    }
+    
+    /**
+     * Get the application name from the request.
+     * 
+     * @return                  Returns the application name or <tt>null</tt> if not present
+     */
+    protected final String getParamAppName(WebScriptRequest req)
+    {
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String app = templateVars.get(PARAM_APPLICATION);
+        if (app == null || app.length() == 0)
+        {
+            return null;
+        }
+        else
+        {
+            return app;
+        }
+    }
+    
+    /**
+     * Get the entry id from the request.
+     * 
+     * @return Returns the id or <tt>null</tt> if not present
+     */
+    protected Long getId(WebScriptRequest req)
+    {
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String id = templateVars.get("id");
+        if (id == null || id.length() == 0)
+        {
+            return null;
+        }
+        else
+        {
+            try
+            {
+                return Long.parseLong(id);
+            }
+            catch (NumberFormatException e)
+            {
+                return null;
+            }
+        }
+    }
+    
+    /**
+     * Get the path from the request.
+     * 
+     * @return                  Returns the path or <tt>null</tt> if not present
+     */
+    protected String getParamPath(WebScriptRequest req)
+    {
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String paramPath = templateVars.get(PARAM_PATH);
+        if (paramPath == null || paramPath.length() == 0)
+        {
+            paramPath = null;
+        }
+        else if (!paramPath.startsWith("/"))
+        {
+            // It won't ever, so we can expect to be here all the time
+            paramPath = "/" + paramPath;
+        }
+        return paramPath;
+    }
+    
+    protected boolean getParamEnableDisable(WebScriptRequest req)
+    {
+        return getBooleanParam(req.getParameter(PARAM_ENABLE), DEFAULT_ENABLE);
+    }
+    
+    protected String getParamValue(WebScriptRequest req)
+    {
+        return req.getParameter(PARAM_VALUE);
+    }
+    
+    protected String getParamValueType(WebScriptRequest req)
+    {
+        return req.getParameter(PARAM_VALUE_TYPE);
+    }
+    
+    /**
+     * @see #DEFAULT_FROM_TIME
+     */
+    protected Long getParamFromTime(WebScriptRequest req)
+    {
+        return getLongParam(req.getParameter(PARAM_FROM_TIME), DEFAULT_FROM_TIME);
+    }
+    
+    /**
+     * @see #DEFAULT_TO_TIME
+     */
+    protected Long getParamToTime(WebScriptRequest req)
+    {
+        return getLongParam(req.getParameter(PARAM_TO_TIME), DEFAULT_TO_TIME);
+    }
+    
+    /**
+     * @see #DEFAULT_FROM_ID
+     */
+    protected Long getParamFromId(WebScriptRequest req)
+    {
+        return getLongParam(req.getParameter(PARAM_FROM_ID), DEFAULT_FROM_ID);
+    }
+    
+    /**
+     * @see #DEFAULT_TO_ID
+     */
+    protected Long getParamToId(WebScriptRequest req)
+    {
+        return getLongParam(req.getParameter(PARAM_TO_ID), DEFAULT_TO_ID);
+    }
+    
+    /**
+     * @see #DEFAULT_USER
+     */
+    protected String getParamUser(WebScriptRequest req)
+    {
+        return req.getParameter(PARAM_USER);
+    }
+    
+    /**
+     * @see #DEFAULT_FORWARD
+     */
+    protected boolean getParamForward(WebScriptRequest req)
+    {
+        return getBooleanParam(req.getParameter(PARAM_FORWARD), DEFAULT_FORWARD);
+    }
+    
+    /**
+     * @see #DEFAULT_LIMIT
+     */
+    protected int getParamLimit(WebScriptRequest req)
+    {
+        return getIntParam(req.getParameter(PARAM_LIMIT), DEFAULT_LIMIT);
+    }
+    
+    /**
+     * @see #DEFAULT_VERBOSE
+     */
+    protected boolean getParamVerbose(WebScriptRequest req)
+    {
+        return getBooleanParam(req.getParameter(PARAM_VERBOSE), DEFAULT_VERBOSE);
+    }
+
+    private Long getLongParam(String paramStr, Long defaultVal)
+    {
+        if (paramStr == null)
+        {
+            // note: defaultVal can be null
+            return defaultVal;
+        }
+        try
+        {
+            return Long.parseLong(paramStr);
+        }
+        catch (NumberFormatException e)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, e.getMessage());
+        }
+    }
+
+    private boolean getBooleanParam(String paramStr, boolean defaultVal)
+    {
+        if (paramStr == null)
+        {
+            return defaultVal;
+        }
+
+        // note: will return false if paramStr does not equals "true" (ignoring case)
+        return Boolean.parseBoolean(paramStr);
+    }
+
+    private int getIntParam(String paramStr, int defaultVal)
+    {
+        if (paramStr == null)
+        {
+            return defaultVal;
+        }
+        try
+        {
+            return Integer.parseInt(paramStr);
+        }
+        catch (NumberFormatException e)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, e.getMessage());
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditClearPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditClearPost.java
new file mode 100644
index 00000000000..7575941bb79
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditClearPost.java
@@ -0,0 +1,74 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.audit;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.audit.AuditService.AuditApplication;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Derek Hulley
+ * @since 3.4
+ */
+public class AuditClearPost extends AbstractAuditWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>(7);
+        
+        String appName = getParamAppName(req);
+        if (appName == null)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "audit.err.app.notProvided");
+        }
+        AuditApplication app = auditService.getAuditApplications().get(appName);
+        if (app == null)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "audit.err.app.notFound", appName);
+        }
+        // Get from/to times
+        Long fromTime = getParamFromTime(req);           // might be null
+        Long toTime = getParamToTime(req);               // might be null
+        
+        // Clear
+        int cleared = auditService.clearAudit(appName, fromTime, toTime);
+        
+        model.put(JSON_KEY_CLEARED, cleared);
+        
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+        }
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditControlGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditControlGet.java
new file mode 100644
index 00000000000..eddf01c133a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditControlGet.java
@@ -0,0 +1,81 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.audit;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.audit.AuditService.AuditApplication;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Derek Hulley
+ * @since 3.4
+ */
+public class AuditControlGet extends AbstractAuditWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>(7);
+        
+        String appName = getParamAppName(req);
+        String path = getParamPath(req);
+        boolean enabledGlobal = auditService.isAuditEnabled();
+        Map<String, AuditApplication> appsByName = auditService.getAuditApplications();
+        
+        // Check that the application exists
+        if (appName != null)
+        {
+            if (path == null)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "audit.err.path.notProvided");
+            }
+            
+            AuditApplication app = appsByName.get(appName);
+            if (app == null)
+            {
+                throw new WebScriptException(Status.STATUS_NOT_FOUND, "audit.err.app.notFound", appName);
+            }
+            // Discard all the other applications
+            appsByName = Collections.singletonMap(appName, app);
+        }
+        
+        model.put(JSON_KEY_ENABLED, enabledGlobal);
+        model.put(JSON_KEY_APPLICATIONS, appsByName.values());
+        
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+        }
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditControlPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditControlPost.java
new file mode 100644
index 00000000000..156f96d308b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditControlPost.java
@@ -0,0 +1,77 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.audit;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Derek Hulley
+ * @since 3.4
+ */
+public class AuditControlPost extends AbstractAuditWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>(7);
+
+        String appName = getParamAppName(req);
+        String path = getParamPath(req);
+        
+        boolean enable = getParamEnableDisable(req);
+        
+        if (appName == null)
+        {
+            // Global operation
+            auditService.setAuditEnabled(enable);
+        }
+        else
+        {
+            // Apply to a specific application
+            if (enable)
+            {
+                auditService.enableAudit(appName, path);
+            }
+            else
+            {
+                auditService.disableAudit(appName, path);
+            }
+        }
+        model.put(JSON_KEY_ENABLED, enable);
+        
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+        }
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditEntryDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditEntryDelete.java
new file mode 100644
index 00000000000..05c07ca274f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditEntryDelete.java
@@ -0,0 +1,111 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.audit;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.audit.AuditQueryParameters;
+import org.alfresco.service.cmr.audit.AuditService.AuditApplication;
+import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Mark Rogers
+ * @since 4.2
+ */
+public class AuditEntryDelete extends AbstractAuditWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>(7);
+        
+        Long id = getId(req);
+        if (id == null)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "audit.err.entry.id.notProvided");
+        }
+        final List<Long> auditEntryIds = new ArrayList<Long>();
+               
+        // Need to check that the audit entry actually exists - otherwise we get into a concurrency retry loop
+        AuditQueryParameters params = new  AuditQueryParameters();
+        AuditQueryCallback callback = new AuditQueryCallback(){
+
+			@Override
+			public boolean valuesRequired() {
+				return false;
+			}
+
+			@Override
+			public boolean handleAuditEntry(Long entryId,
+					String applicationName, 
+					String user, long time,
+					Map<String, Serializable> values) {
+				auditEntryIds.add(entryId);
+				return false;
+			}
+
+			@Override
+			public boolean handleAuditEntryError(Long entryId, String errorMsg,
+					Throwable error) 
+			{
+				return true;
+			}
+        
+        };
+        
+        params.setToId(id);
+        params.setFromId(id);
+        auditService.auditQuery(callback, params, 1);
+        
+        if(auditEntryIds.size() > 0)
+        {
+          // 
+            int deleted = auditService.clearAudit(auditEntryIds);
+        
+            model.put(JSON_KEY_DELETED, deleted);
+        
+            // Done
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+            }
+            return model;
+        }
+        else
+        {
+        	// Not found
+        	 throw new WebScriptException(Status.STATUS_NOT_FOUND, "audit.err.entry.id.notfound", id);
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditQueryGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditQueryGet.java
new file mode 100644
index 00000000000..82cdbebb23f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/audit/AuditQueryGet.java
@@ -0,0 +1,197 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.audit;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.audit.AuditQueryParameters;
+import org.alfresco.service.cmr.audit.AuditService.AuditApplication;
+import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback;
+import org.alfresco.service.cmr.repository.MLText;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.repository.datatype.TypeConversionException;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Derek Hulley
+ * @since 3.4
+ */
+public class AuditQueryGet extends AbstractAuditWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        final Map<String, Object> model = new HashMap<String, Object>(7);
+        
+        String appName = getParamAppName(req);
+        String path = getParamPath(req);
+        
+        Serializable value = getParamValue(req);
+        String valueType = getParamValueType(req);
+        Long fromTime = getParamFromTime(req);
+        Long toTime = getParamToTime(req);
+        Long fromId = getParamFromId(req);
+        Long toId = getParamToId(req);
+        String user = getParamUser(req);
+        boolean forward = getParamForward(req);
+        int limit = getParamLimit(req);
+        final boolean verbose = getParamVerbose(req);
+        
+        if (appName == null)
+        {
+            Map<String, AuditApplication> appsByName = auditService.getAuditApplications();
+            AuditApplication app = appsByName.get(appName);
+            if (app == null)
+            {
+                throw new WebScriptException(Status.STATUS_NOT_FOUND, "audit.err.app.notFound", appName);
+            }
+        }
+        
+        // Transform the value to the correct type
+        if (value != null && valueType != null)
+        {
+            try
+            {
+                @SuppressWarnings("unchecked")
+                Class<? extends Serializable> clazz = (Class<? extends Serializable>) Class.forName(valueType);
+                value = DefaultTypeConverter.INSTANCE.convert(clazz, value);
+            }
+            catch (ClassNotFoundException e)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "audit.err.value.classNotFound", valueType);
+            }
+            catch (Throwable e)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "audit.err.value.convertFailed", value, valueType);
+            }
+        }
+        
+        // Execute the query
+        AuditQueryParameters params = new AuditQueryParameters();
+        params.setApplicationName(appName);
+        params.setFromTime(fromTime);
+        params.setToTime(toTime);
+        params.setFromId(fromId);
+        params.setToId(toId);
+        params.setUser(user);
+        params.setForward(forward);
+        if (path != null || value != null)
+        {
+            params.addSearchKey(path, value);
+        }
+        
+        final List<Map<String, Object>> entries = new ArrayList<Map<String,Object>>(limit);
+        AuditQueryCallback callback = new AuditQueryCallback()
+        {
+            @Override
+            public boolean valuesRequired()
+            {
+                return verbose;
+            }
+            
+            @Override
+            public boolean handleAuditEntryError(Long entryId, String errorMsg, Throwable error)
+            {
+                return true;
+            }
+            
+            @Override
+            public boolean handleAuditEntry(
+                    Long entryId,
+                    String applicationName,
+                    String user,
+                    long time,
+                    Map<String, Serializable> values)
+            {
+                Map<String, Object> entry = new HashMap<String, Object>(11);
+                entry.put(JSON_KEY_ENTRY_ID, entryId);
+                entry.put(JSON_KEY_ENTRY_APPLICATION, applicationName);
+                if (user != null)
+                {
+                    entry.put(JSON_KEY_ENTRY_USER, user);
+                }
+                entry.put(JSON_KEY_ENTRY_TIME, new Date(time));
+                if (values != null)
+                {
+                    // Convert values to Strings
+                    Map<String, String> valueStrings = new HashMap<String, String>(values.size() * 2);
+                    for (Map.Entry<String, Serializable> mapEntry : values.entrySet())
+                    {
+                        String key = mapEntry.getKey();
+                        Serializable value = mapEntry.getValue();
+                        try
+                        {
+                            String valueString = DefaultTypeConverter.INSTANCE.convert(String.class, value);
+                            valueStrings.put(key, valueString);
+                        }
+                        catch (ClassCastException e)
+                        {
+                            // Fix for symptoms of MNT-20992. It is possible to have MLText values whose underlying
+                            // map's keys are not Locale, as MLText map keys should be. In this case we can expect
+                            // a ClassCastException.
+                            if (!(value instanceof MLText))
+                            {
+                                // Rethrow if the exception was not caused by the expected MLText conversion.
+                                throw e;
+                            }
+                            valueStrings.put(key, value.toString());
+                        }
+                        catch (TypeConversionException e)
+                        {
+                            // Use the toString()
+                            valueStrings.put(key, value.toString());
+                        }
+                        
+                    }
+                    entry.put(JSON_KEY_ENTRY_VALUES, valueStrings);
+                }
+                entries.add(entry);
+                
+                return true;
+            }
+        };
+        
+        auditService.auditQuery(callback, params, limit);
+        
+        model.put(JSON_KEY_ENTRY_COUNT, entries.size());
+        model.put(JSON_KEY_ENTRIES, entries);
+        
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+        }
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/ADMRemoteStore.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/ADMRemoteStore.java
new file mode 100644
index 00000000000..2fd361d67d6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/ADMRemoteStore.java
@@ -0,0 +1,1162 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.bean;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.io.Writer;
+import java.net.SocketException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.CannedQueryPageDetails;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.model.filefolder.HiddenAspect;
+import org.alfresco.repo.policy.BehaviourFilter;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.service.cmr.model.FileExistsException;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileFolderUtil;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentIOException;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.OwnableService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.URLDecoder;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * ADM Remote Store service.
+ * <p>
+ * This implementation of the RemoteStore is tied to the current SiteService implementation.
+ * <p>
+ * It remaps incoming generic document path requests to the appropriate folder structure
+ * in the Sites folder. Dashboard pages and component bindings are remapped to take advantage
+ * of inherited permissions in the appropriate root site folder, ensuring that only valid
+ * users can write to the appropriate configuration objects.
+ * 
+ * @see BaseRemoteStore for the available API methods.
+ * 
+ * @author Kevin Roast
+ */
+public class ADMRemoteStore extends BaseRemoteStore
+{
+    private static final Log logger = LogFactory.getLog(ADMRemoteStore.class);
+    
+    // name of the surf config folder
+    private static final String SURF_CONFIG = "surf-config";
+
+    // patterns used to match site and user specific configuration locations
+    private static final String PATH_COMPONENTS = "components";
+    private static final String PATH_PAGES      = "pages";
+    private static final String PATH_USER       = "user";
+    private static final String PATH_SITE       = "site";
+    private static final String USER_CONFIG = ".*\\." + PATH_USER + "~(.*)~.*";
+    private static final String USER_CONFIG_PATTERN = USER_CONFIG.replaceAll("\\.\\*", "*").replace("\\", "");
+    private static final Pattern USER_PATTERN_1 = Pattern.compile(".*/" + PATH_COMPONENTS + "/" + USER_CONFIG);
+    private static final Pattern USER_PATTERN_2 = Pattern.compile(".*/" + PATH_PAGES + "/" + PATH_USER + "/(.*?)(/.*)?$");
+    private static final Pattern SITE_PATTERN_1 = Pattern.compile(".*/" + PATH_COMPONENTS + "/.*\\." + PATH_SITE + "~(.*)~.*");
+    private static final Pattern SITE_PATTERN_2 = Pattern.compile(".*/" + PATH_PAGES + "/" + PATH_SITE + "/(.*?)(/.*)?$");
+    
+    
+    // service beans
+    protected NodeService nodeService;
+    protected NodeService unprotNodeService;
+    protected FileFolderService fileFolderService;
+    protected NamespaceService namespaceService;
+    protected SiteService siteService;
+    protected ContentService contentService;
+    protected HiddenAspect hiddenAspect;
+    protected PermissionService permissionService;
+    protected OwnableService ownableService;
+    private BehaviourFilter behaviourFilter;
+    
+    /**
+     * Date format pattern used to parse HTTP date headers in RFC 1123 format.
+     */
+    private static final String PATTERN_RFC1123 = "EEE, dd MMM yyyy HH:mm:ss zzz";
+    private static final TimeZone GMT = TimeZone.getTimeZone("GMT");
+
+
+    /**
+     * @param nodeService       the NodeService to set
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    /**
+     * @param nodeService       the NodeService to set
+     */
+    public void setUnprotectedNodeService(NodeService nodeService)
+    {
+        this.unprotNodeService = nodeService;
+    }
+
+    /**
+     * @param fileFolderService the FileFolderService to set
+     */
+    public void setFileFolderService(FileFolderService fileFolderService)
+    {
+        this.fileFolderService = fileFolderService;
+    }
+
+    /**
+     * @param namespaceService  the NamespaceService to set
+     */
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+    
+    /**
+     * @param siteService       the SiteService to set
+     */
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+    
+    /**
+     * @param contentService    the ContentService to set
+     */
+    public void setContentService(ContentService contentService)
+    {
+        this.contentService = contentService; 
+    }
+    
+    public void setHiddenAspect(HiddenAspect hiddenAspect)
+    {
+        this.hiddenAspect = hiddenAspect;
+    }
+    
+    public void setBehaviourFilter(BehaviourFilter behaviourFilter)
+    {
+        this.behaviourFilter = behaviourFilter;
+    }
+
+    public void setPermissionService(PermissionService permissionService)
+    {
+        this.permissionService = permissionService;
+    }
+
+    public void setOwnableService(OwnableService ownableService)
+    {
+        this.ownableService = ownableService;
+    }
+
+    /**
+     * Gets the last modified timestamp for the document.
+     * <p>
+     * The output will be the last modified date as a long toString().
+     * 
+     * @param path  document path to an existing document
+     */
+    @Override
+    protected void lastModified(final WebScriptResponse res, final String store, final String path)
+        throws IOException
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @SuppressWarnings("synthetic-access")
+            public Void doWork() throws Exception
+            {
+                final String encpath = encodePath(path);
+                final FileInfo fileInfo = resolveFilePath(encpath);
+                if (fileInfo == null)
+                {
+                    throw new WebScriptException("Unable to locate file: " + encpath);
+                }
+                
+                Writer out = res.getWriter();
+                out.write(Long.toString(fileInfo.getModifiedDate().getTime()));
+                out.close();
+                if (logger.isDebugEnabled())
+                    logger.debug("lastModified: " + Long.toString(fileInfo.getModifiedDate().getTime()));
+                return null;
+            }
+        }, AuthenticationUtil.getSystemUserName());
+    }
+
+    /**
+     * Gets a document.
+     * <p>
+     * The output will be the document content stream.
+     * 
+     * @param path  document path
+     */
+    @Override
+    protected void getDocument(final WebScriptResponse res, final String store, final String path)
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @SuppressWarnings("synthetic-access")
+            public Void doWork() throws Exception
+            {
+                final String encpath = encodePath(path);
+                final FileInfo fileInfo = resolveFilePath(encpath);
+                if (fileInfo == null || fileInfo.isFolder())
+                {
+                    res.setStatus(Status.STATUS_NOT_FOUND);
+                    return null;
+                }
+                
+                final ContentReader reader;
+                try
+                {
+                    reader = contentService.getReader(fileInfo.getNodeRef(), ContentModel.PROP_CONTENT);
+                    if (reader == null || !reader.exists())
+                    {
+                        throw new WebScriptException("No content found for file: " + encpath);
+                    }
+                    
+                    // establish mimetype
+                    String mimetype = reader.getMimetype();
+                    if (mimetype == null || mimetype.length() == 0)
+                    {
+                        mimetype = MimetypeMap.MIMETYPE_BINARY;
+                        int extIndex = encpath.lastIndexOf('.');
+                        if (extIndex != -1)
+                        {
+                            String ext = encpath.substring(extIndex + 1);
+                            String mt = mimetypeService.getMimetypesByExtension().get(ext);
+                            if (mt != null)
+                            {
+                                mimetype = mt;
+                            }
+                        }
+                    }
+                    
+                    // set mimetype for the content and the character encoding + length for the stream
+                    res.setContentType(mimetype);
+                    res.setContentEncoding(reader.getEncoding());
+                    SimpleDateFormat formatter = new SimpleDateFormat(PATTERN_RFC1123, Locale.US);
+                    formatter.setTimeZone(GMT);
+                    res.setHeader("Last-Modified", formatter.format(fileInfo.getModifiedDate()));
+                    res.setHeader("Content-Length", Long.toString(reader.getSize()));
+                    
+                    if (logger.isDebugEnabled())
+                        logger.debug("getDocument: " + fileInfo.toString());
+                    
+                    // get the content and stream directly to the response output stream
+                    // assuming the repository is capable of streaming in chunks, this should allow large files
+                    // to be streamed directly to the browser response stream.
+                    try
+                    {
+                        reader.getContent(res.getOutputStream());
+                    }
+                    catch (SocketException e1)
+                    {
+                        // the client cut the connection - our mission was accomplished apart from a little error message
+                        if (logger.isDebugEnabled())
+                            logger.debug("Client aborted stream read:\n\tnode: " + encpath + "\n\tcontent: " + reader);
+                    }
+                    catch (ContentIOException e2)
+                    {
+                        if (logger.isInfoEnabled())
+                            logger.info("Client aborted stream read:\n\tnode: " + encpath + "\n\tcontent: " + reader);
+                    }
+                    catch (Throwable err)
+                    {
+                       if (err.getCause() instanceof SocketException)
+                       {
+                          if (logger.isDebugEnabled())
+                              logger.debug("Client aborted stream read:\n\tnode: " + encpath + "\n\tcontent: " + reader);
+                       }
+                       else
+                       {
+                           if (logger.isInfoEnabled())
+                               logger.info(err.getMessage());
+                           res.setStatus(Status.STATUS_INTERNAL_SERVER_ERROR);
+                       }
+                    }
+                }
+                catch (AccessDeniedException ae)
+                {
+                    res.setStatus(Status.STATUS_UNAUTHORIZED);
+                }
+                return null;
+            }
+        }, AuthenticationUtil.getSystemUserName());
+    }
+
+    /**
+     * Determines if the document exists.
+     * 
+     * The output will be either the string "true" or the string "false".
+     * 
+     * @param path  document path
+     */
+    @Override
+    protected void hasDocument(final WebScriptResponse res, final String store, final String path) throws IOException
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @SuppressWarnings("synthetic-access")
+            public Void doWork() throws Exception
+            {
+                final String encpath = encodePath(path);
+                final FileInfo fileInfo = resolveFilePath(encpath);
+                
+                Writer out = res.getWriter();
+                out.write(Boolean.toString(fileInfo != null && !fileInfo.isFolder()));
+                out.close();
+                if (logger.isDebugEnabled())
+                    logger.debug("hasDocument: " + Boolean.toString(fileInfo != null && !fileInfo.isFolder()));
+                return null;
+            }
+        }, AuthenticationUtil.getSystemUserName());
+    }
+
+    /**
+     * Creates a document.
+     * <p>
+     * Create methods are user authenticated, so the creation of site config must be
+     * allowed for the current user.
+     * 
+     * @param path          document path
+     * @param content       content of the document to write
+     */
+    @Override
+    protected void createDocument(final WebScriptResponse res, final String store, final String path, final InputStream content)
+    {
+        try
+        {
+            writeDocument(path, content);
+        }
+        catch (AccessDeniedException ae)
+        {
+            res.setStatus(Status.STATUS_UNAUTHORIZED);
+            throw ae;
+        }
+        catch (FileExistsException feeErr)
+        {
+            res.setStatus(Status.STATUS_CONFLICT);
+            throw feeErr;
+        }
+    }
+    
+    /**
+     * Creates multiple XML documents encapsulated in a single one. 
+     * 
+     * @param res       WebScriptResponse
+     * @param store       String
+     * @param in       XML document containing multiple document contents to write
+     */
+    @Override
+    protected void createDocuments(WebScriptResponse res, String store, InputStream in)
+    {
+        try
+        {
+            DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); 
+            Document document;
+            document = documentBuilder.parse(in);
+            Element docEl = document.getDocumentElement();
+            Transformer transformer = ADMRemoteStore.this.transformer.get();
+            for (Node n = docEl.getFirstChild(); n != null; n = n.getNextSibling())
+            {
+                if (!(n instanceof Element))
+                {
+                    continue;
+                }
+                final String path = ((Element) n).getAttribute("path");
+                
+                // Turn the first element child into a document
+                Document doc = documentBuilder.newDocument();
+                Node child;
+                for (child = n.getFirstChild(); child != null ; child=child.getNextSibling())
+                {
+                   if (child instanceof Element)
+                   {
+                       doc.appendChild(doc.importNode(child, true));
+                       break;
+                   }
+                }
+                ByteArrayOutputStream out = new ByteArrayOutputStream(512);
+                transformer.transform(new DOMSource(doc), new StreamResult(out));
+                out.close();
+                
+                writeDocument(path, new ByteArrayInputStream(out.toByteArray()));
+            }
+        }
+        catch (AccessDeniedException ae)
+        {
+            res.setStatus(Status.STATUS_UNAUTHORIZED);
+            throw ae;
+        }
+        catch (FileExistsException feeErr)
+        {
+            res.setStatus(Status.STATUS_CONFLICT);
+            throw feeErr;
+        }
+        catch (Exception e)
+        {
+            // various annoying checked SAX/IO exceptions related to XML processing can be thrown
+            // none of them should occur if the XML document is well formed
+            logger.error(e);
+            res.setStatus(Status.STATUS_INTERNAL_SERVER_ERROR);
+            throw new AlfrescoRuntimeException(e.getMessage(), e);
+        }
+    }
+    
+    protected void writeDocument(final String path, final InputStream content)
+    {
+        final String encpath = encodePath(path);
+        final int off = encpath.lastIndexOf('/');
+        if (off != -1)
+        {
+            // check we actually are the user we are creating a user specific path for
+            final String runAsUser = getPathRunAsUser(path);
+            AuthenticationUtil.runAs(new RunAsWork<Void>()
+            {
+                @SuppressWarnings("synthetic-access")
+                public Void doWork() throws Exception
+                {
+                    final FileInfo parentFolder = resolveNodePath(encpath, true, false);
+                    if (parentFolder == null)
+                    {
+                        throw new IllegalStateException("Unable to aquire parent folder reference for path: " + path);
+                    }
+                    
+                    // ALF-17729 / ALF-17796 - disable auditable on parent folder
+                    NodeRef parentFolderRef = parentFolder.getNodeRef();
+                    behaviourFilter.disableBehaviour(parentFolderRef, ContentModel.ASPECT_AUDITABLE);
+                    
+                    try
+                    {
+                        final String name = encpath.substring(off + 1);
+                        // existence check - convert to an UPDATE - could occur if multiple threads request
+                        // a write to the same document - a valid possibility but rare
+                        if (nodeService.getChildByName(parentFolderRef, ContentModel.ASSOC_CONTAINS, name) == null)
+                        {
+                            FileInfo fileInfo = fileFolderService.create(
+                                    parentFolderRef, name, ContentModel.TYPE_CONTENT);
+                            final NodeRef nodeRef = fileInfo.getNodeRef();
+                            // MNT-16371: Revoke ownership privileges for surf-config folder contents, to tighten access for former SiteManagers.
+                            ownableService.setOwner(nodeRef, AuthenticationUtil.getAdminUserName());
+
+                            Map<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>(1, 1.0f);
+                            aspectProperties.put(ContentModel.PROP_IS_INDEXED, false);
+                            unprotNodeService.addAspect(nodeRef, ContentModel.ASPECT_INDEX_CONTROL, aspectProperties);
+                            ContentWriter writer = contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
+                            writer.guessMimetype(fileInfo.getName());
+                            writer.putContent(content);
+                            if (logger.isDebugEnabled())
+                                logger.debug("createDocument: " + fileInfo.toString());
+                        }
+                        else
+                        {
+                            ContentWriter writer = contentService.getWriter(
+                                    nodeService.getChildByName(parentFolderRef, ContentModel.ASSOC_CONTAINS, name),
+                                    ContentModel.PROP_CONTENT,
+                                    true);
+                            writer.guessMimetype(name);
+                            writer.putContent(content);
+                            if (logger.isDebugEnabled())
+                                logger.debug("createDocument (updated): " + name);
+                        }
+                    }
+                    finally
+                    {
+                        behaviourFilter.enableBehaviour(parentFolderRef, ContentModel.ASPECT_AUDITABLE);
+                    }
+                    
+                    return null;
+                }
+            }, runAsUser);
+        }
+    }
+    
+    /**
+     * Get the RunAs user need to execute a Write operation on the given path.
+     * 
+     * @param path  Document path
+     * @return runas user - will be the Full Authenticated User or System as required
+     */
+    protected String getPathRunAsUser(final String path)
+    {
+        // check we actually are the user we are creating a user specific path for
+        String runAsUser = AuthenticationUtil.getFullyAuthenticatedUser();
+        String userId = null;
+        Matcher matcher;
+        if ((matcher = USER_PATTERN_1.matcher(path)).matches())
+        {
+            userId = matcher.group(1);
+        }
+        else if ((matcher = USER_PATTERN_2.matcher(path)).matches())
+        {
+            userId = matcher.group(1);
+        }
+        if (userId != null && userId.equals(runAsUser))
+        {
+            runAsUser = AuthenticationUtil.getSystemUserName();
+        }
+        return runAsUser;
+    }
+
+    /**
+     * Updates an existing document.
+     * <p>
+     * Update methods are user authenticated, so the modification of site config must be
+     * allowed for the current user.
+     * 
+     * @param path          document path to update
+     * @param content       content to update the document with
+     */
+    @Override
+    protected void updateDocument(final WebScriptResponse res, String store, final String path, final InputStream content)
+    {
+        final String runAsUser = getPathRunAsUser(path);
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @SuppressWarnings("synthetic-access")
+            public Void doWork() throws Exception
+            {
+                final String encpath = encodePath(path);
+                final FileInfo fileInfo = resolveFilePath(encpath);
+                if (fileInfo == null || fileInfo.isFolder())
+                {
+                    res.setStatus(Status.STATUS_NOT_FOUND);
+                    return null;
+                }
+                
+                try
+                {
+                    ContentWriter writer = contentService.getWriter(fileInfo.getNodeRef(), ContentModel.PROP_CONTENT, true);
+                    writer.putContent(content);
+                    if (logger.isDebugEnabled())
+                        logger.debug("updateDocument: " + fileInfo.toString());
+                }
+                catch (AccessDeniedException ae)
+                {
+                    res.setStatus(Status.STATUS_UNAUTHORIZED);
+                    throw ae;
+                }
+                return null;
+            }
+        }, runAsUser);
+    }
+    
+    /**
+     * Deletes an existing document.
+     * <p>
+     * Delete methods are user authenticated, so the deletion of the document must be
+     * allowed for the current user.
+     * 
+     * @param path  document path
+     */
+    @Override
+    protected void deleteDocument(final WebScriptResponse res, final String store, final String path)
+    {
+        final String encpath = encodePath(path);
+        final FileInfo fileInfo = resolveFilePath(encpath);
+        if (fileInfo == null || fileInfo.isFolder())
+        {
+            res.setStatus(Status.STATUS_NOT_FOUND);
+            return;
+        }
+        
+        final String runAsUser = getPathRunAsUser(path);
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @SuppressWarnings("synthetic-access")
+            public Void doWork() throws Exception
+            {
+                try
+                {
+                    final NodeRef fileRef = fileInfo.getNodeRef();
+                    // MNT-16371: Revoke ownership privileges for surf-config folder contents, to tighten access for former SiteManagers.
+                    nodeService.addAspect(fileRef, ContentModel.ASPECT_TEMPORARY, null);
+
+                    // ALF-17729
+                    NodeRef parentFolderRef = unprotNodeService.getPrimaryParent(fileRef).getParentRef();
+                    behaviourFilter.disableBehaviour(parentFolderRef, ContentModel.ASPECT_AUDITABLE);
+
+                    try
+                    {
+                        nodeService.deleteNode(fileRef);
+                    }
+                    finally
+                    {
+                        behaviourFilter.enableBehaviour(parentFolderRef, ContentModel.ASPECT_AUDITABLE);
+                    }
+
+                    if (logger.isDebugEnabled())
+                        logger.debug("deleteDocument: " + fileInfo.toString());
+                }
+                catch (AccessDeniedException ae)
+                {
+                    res.setStatus(Status.STATUS_UNAUTHORIZED);
+                    throw ae;
+                }
+                return null;
+            }
+        }, runAsUser);
+    }
+
+    /**
+     * Lists the document paths under a given path.
+     * <p>
+     * The output will be the list of relative document paths found under the path.
+     * Separated by newline characters.
+     * 
+     * @param path      document path
+     * @param recurse   true to peform a recursive list, false for direct children only.
+     * 
+     * @throws IOException if an error occurs listing the documents
+     */
+    @Override
+    protected void listDocuments(final WebScriptResponse res, final String store, final String path, final boolean recurse)
+        throws IOException
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @SuppressWarnings("synthetic-access")
+            public Void doWork() throws Exception
+            {
+                res.setContentType("text/plain;charset=UTF-8");
+                
+                final String encpath = encodePath(path);
+                final FileInfo fileInfo = resolveNodePath(encpath, false, true);
+                if (fileInfo == null || !fileInfo.isFolder())
+                {
+                    res.setStatus(Status.STATUS_NOT_FOUND);
+                    return null;
+                }
+                
+                try
+                {
+                    outputFileNodes(res.getWriter(), fileInfo, aquireSurfConfigRef(encpath, false), "*", recurse);
+                }
+                catch (AccessDeniedException ae)
+                {
+                    res.setStatus(Status.STATUS_UNAUTHORIZED);
+                }
+                finally
+                {
+                    res.getWriter().close();
+                }
+                return null;
+            }
+        }, AuthenticationUtil.getSystemUserName());
+    }
+    
+    /**
+     * Lists the document paths matching a file pattern under a given path.
+     * 
+     * The output will be the list of relative document paths found under the path that
+     * match the given file pattern. Separated by newline characters.
+     * 
+     * @param path      document path
+     * @param pattern   file pattern to match - allows wildcards e.g. page.*.site.xml
+     * 
+     * @throws IOException if an error occurs listing the documents
+     */
+    @Override
+    protected void listDocuments(final WebScriptResponse res, final String store, final String path, final String pattern)
+        throws IOException
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @SuppressWarnings("synthetic-access")
+            public Void doWork() throws Exception
+            {
+                res.setContentType("text/plain;charset=UTF-8");
+                
+                String filePattern;
+                if (pattern == null || pattern.length() == 0)
+                {
+                    filePattern = "*";
+                }
+                else
+                {
+                    // need to ensure match pattern is path encoded - but don't encode * character!
+                    StringBuilder buf = new StringBuilder(pattern.length());
+                    for (StringTokenizer t = new StringTokenizer(pattern, "*"); t.hasMoreTokens(); /**/)
+                    {
+                        buf.append(encodePath(t.nextToken()));
+                        if (t.hasMoreTokens())
+                        {
+                            buf.append('*');
+                        }
+                    }
+                    // ensure the escape character is itself escaped
+                    filePattern = buf.toString().replace("\\", "\\\\");
+                }
+                
+                // ensure we pass in the file pattern as it is used as part of the folder match - i.e.
+                // for a site component set e.g. /alfresco/site-data/components/page.*.site~xyz~dashboard.xml
+                final String encpath = encodePath(path);
+                final FileInfo fileInfo = resolveNodePath(encpath, filePattern, false, true);
+                if (fileInfo == null || !fileInfo.isFolder())
+                {
+                    res.setStatus(Status.STATUS_NOT_FOUND);
+                    return null;
+                }
+                
+                if (logger.isDebugEnabled())
+                    logger.debug("listDocuments() pattern: " + filePattern);
+                
+                try
+                {
+                    outputFileNodes(
+                            res.getWriter(), fileInfo,
+                            aquireSurfConfigRef(encpath + "/" + filePattern, false),
+                            filePattern, false);
+                }
+                catch (AccessDeniedException ae)
+                {
+                    res.setStatus(Status.STATUS_UNAUTHORIZED);
+                }
+                finally
+                {
+                    res.getWriter().close();
+                }
+                return null;
+            }
+        }, AuthenticationUtil.getSystemUserName());
+    }
+
+    /**
+     * @param path      cm:name based root relative path
+     *                  example: /alfresco/site-data/pages/customise-user-dashboard.xml
+     * 
+     * @return FileInfo representing the file/folder at the specified path location
+     *         or null if the supplied path does not exist in the store
+     */
+    private FileInfo resolveFilePath(final String path)
+    {
+        return resolveNodePath(path, false, false);
+    }
+    
+   /**
+     * @param path      cm:name based root relative path
+     *                  example: /alfresco/site-data/pages/customise-user-dashboard.xml
+     *                           /alfresco/site-data/components
+     * @param create    if true create the config and folder dirs for the given path returning
+     *                  the FileInfo for the last parent in the path, if false only attempt to
+     *                  resolve the folder path if it exists returning the last element.
+     * @param isFolder  True if the path is for a folder, false if it ends in a filename
+     * 
+     * @return FileInfo representing the file/folder at the specified path location (see create
+     *         parameter above) or null if the supplied path does not exist in the store.
+     */
+    private FileInfo resolveNodePath(final String path, final boolean create, final boolean isFolder)
+    {
+        return resolveNodePath(path, null, create, isFolder);
+    }
+    
+    /**
+     * @param path      cm:name based root relative path
+     *                  example: /alfresco/site-data/pages/customise-user-dashboard.xml
+     *                           /alfresco/site-data/components
+     * @param pattern   optional pattern that is used as part of the match to aquire the surf-config
+     *                  folder under the appropriate sites or user location.
+     * @param create    if true create the config and folder dirs for the given path returning
+     *                  the FileInfo for the last parent in the path, if false only attempt to
+     *                  resolve the folder path if it exists returning the last element.
+     * @param isFolder  True if the path is for a folder, false if it ends in a filename
+     * 
+     * @return FileInfo representing the file/folder at the specified path location (see create
+     *         parameter above) or null if the supplied path does not exist in the store.
+     */
+    private FileInfo resolveNodePath(final String path, final String pattern, final boolean create, final boolean isFolder)
+    {
+        if (logger.isDebugEnabled())
+            logger.debug("Resolving path: " + path);
+
+        final String adminUserName = AuthenticationUtil.getAdminUserName();
+
+        FileInfo result = null;
+        if (path != null)
+        {
+            // break down the path into its component elements
+            List<String> pathElements = new ArrayList<String>(4);
+            final StringTokenizer t = new StringTokenizer(path, "/");
+            // the store requires paths of the form /alfresco/site-data/<objecttype>[/<folder>]/<file>.xml
+            if (t.countTokens() >= 3)
+            {
+                t.nextToken();  // skip /alfresco
+                t.nextToken();  // skip /site-data
+                // collect remaining folder path (and file)
+                while (t.hasMoreTokens())
+                {
+                    pathElements.add(t.nextToken());
+                }
+                
+                NodeRef surfConfigRef = aquireSurfConfigRef(path + (pattern != null ? ("/" + pattern) : ""), create);
+                try
+                {
+                    if (surfConfigRef != null)
+                    {
+                        if (create)
+                        {
+                            List<String> folders = isFolder ? pathElements : pathElements.subList(0, pathElements.size() - 1);
+                            
+                            List<FileFolderUtil.PathElementDetails> folderDetails = new ArrayList<>(pathElements.size());
+                            Map<QName, Serializable> prop = new HashMap<>(2);
+                            prop.put(ContentModel.PROP_IS_INDEXED, false);
+                            prop.put(ContentModel.PROP_IS_CONTENT_INDEXED, false);
+                            for (String element : folders)
+                            {
+                                Map<QName, Map<QName, Serializable>> aspects = Collections.singletonMap(ContentModel.ASPECT_INDEX_CONTROL, prop);
+                                folderDetails.add(new FileFolderUtil.PathElementDetails(element, aspects));
+                            }
+                            // ensure folders exist down to the specified parent
+                            // ALF-17729 / ALF-17796 - disable auditable on parent folders
+                            Set<NodeRef> allCreatedFolders = new LinkedHashSet<>();
+                            result = FileFolderUtil.makeFolders(
+                                    this.fileFolderService,nodeService,
+                                    surfConfigRef,
+                                    folderDetails,
+                                    ContentModel.TYPE_FOLDER,
+                                    behaviourFilter,
+                                    new HashSet<QName>(Arrays.asList(new QName[]{ContentModel.ASPECT_AUDITABLE})), allCreatedFolders);
+
+                            // MNT-16371: Revoke ownership privileges for surf-config folder, to tighten access for former SiteManagers.
+                            for(NodeRef nodeRef : allCreatedFolders)
+                            {
+                                ownableService.setOwner(nodeRef, adminUserName);
+                            }
+                        }
+                        else
+                        {
+                            // perform the cm:name path lookup against our config root node
+                            result = this.fileFolderService.resolveNamePath(surfConfigRef, pathElements);
+                        }
+                    }
+                }
+                catch (FileNotFoundException fnfErr)
+                {
+                    // this is a valid condition - we return null to indicate failed lookup
+                }
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Aquire (optionally create) the NodeRef to the "surf-config" folder as appropriate
+     * for the given path.
+     * <p>
+     * Disassmbles the path to correct match either user, site or generic folder path.
+     * 
+     * @param path String
+     * @param create boolean
+     * 
+     * @return NodeRef to the "surf-config" folder, or null if it does not exist yet.
+     */
+    private NodeRef aquireSurfConfigRef(final String path, final boolean create)
+    {
+        // remap the path into the appropriate Sites or site relative folder location
+        // by first matching the path to appropriate user or site regex
+        final boolean debug = logger.isDebugEnabled();
+        String userId = null;
+        String siteName = null;
+        Matcher matcher;
+        if (debug)
+        {
+            // user data is stored directly under the Sites folder along with
+            // other generic config files - there is actually no need to match
+            // anything other than site specific config other than for debug
+            if ((matcher = USER_PATTERN_1.matcher(path)).matches())
+            {
+                userId = matcher.group(1);
+            }
+            else if ((matcher = USER_PATTERN_2.matcher(path)).matches())
+            {
+                userId = matcher.group(1);
+            }
+            else if ((matcher = SITE_PATTERN_1.matcher(path)).matches())
+            {
+                siteName = matcher.group(1);
+            }
+            else if ((matcher = SITE_PATTERN_2.matcher(path)).matches())
+            {
+                siteName = matcher.group(1);
+            }
+        }
+        else if ((matcher = SITE_PATTERN_1.matcher(path)).matches())
+        {
+            siteName = matcher.group(1);
+        }
+        else if ((matcher = SITE_PATTERN_2.matcher(path)).matches())
+        {
+            siteName = matcher.group(1);
+        }
+        
+        NodeRef surfConfigRef = null;
+        if (siteName != null)
+        {
+            if (debug) logger.debug("...resolved site path id: " + siteName);
+            NodeRef siteRef = getSiteNodeRef(siteName);
+            if (siteRef != null)
+            {
+                surfConfigRef = getSurfConfigNodeRef(siteRef, create);
+            }
+        }
+        else
+        {
+            if (debug)
+            {
+                if (userId != null)
+                {
+                    logger.debug("...resolved user path id: " + userId);
+                }
+                else
+                {
+                    logger.debug("...resolved to generic path.");
+                }
+            }
+            surfConfigRef = getSurfConfigNodeRef(getRootNodeRef(), create);
+        }
+        return surfConfigRef;
+    }
+    
+    /**
+     * Return the "surf-config" noderef under the given root. No attempt will be made
+     * to create the node if it does not exist yet.
+     * 
+     * @param rootRef   Root node reference where the "surf-config" folder should live
+     * 
+     * @return surf-config folder ref if found, null otherwise
+     */
+    private NodeRef getSurfConfigNodeRef(final NodeRef rootRef)
+    {
+        return getSurfConfigNodeRef(rootRef, false);
+    }
+    
+    /**
+     * Return the "surf-config" noderef under the given root. Optionally create the
+     * folder if it does not exist yet. NOTE: must only be set to create if within a
+     * WRITE transaction context.
+     * <p>
+     * Adds the "isIndexed = false" property to the surf-config folder node.
+     * 
+     * @param rootRef   Root node reference where the "surf-config" folder should live
+     * @param create    True to create the folder if missing, false otherwise
+     * 
+     * @return surf-config folder ref if found, null otherwise if not creating
+     */
+    protected NodeRef getSurfConfigNodeRef(final NodeRef rootRef, final boolean create)
+    {
+        NodeRef surfConfigRef = this.unprotNodeService.getChildByName(
+                rootRef, ContentModel.ASSOC_CONTAINS, SURF_CONFIG);
+        if (create && surfConfigRef == null)
+        {
+            if (logger.isDebugEnabled())
+                logger.debug("'surf-config' folder not found under path, creating...");
+            QName assocQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, SURF_CONFIG);
+            Map<QName, Serializable> properties = new HashMap<QName, Serializable>(1, 1.0f);
+            properties.put(ContentModel.PROP_NAME, (Serializable) SURF_CONFIG);
+            ChildAssociationRef ref = this.unprotNodeService.createNode(
+                    rootRef, ContentModel.ASSOC_CONTAINS, assocQName, ContentModel.TYPE_FOLDER, properties);
+            surfConfigRef = ref.getChildRef();
+            // surf-config needs to be hidden - applies index control aspect as part of the hidden aspect
+            hiddenAspect.hideNode(ref.getChildRef(), false, false, false);
+
+            // MNT-16371: Revoke inherited permission
+            permissionService.setInheritParentPermissions(surfConfigRef, false);
+            String siteName = siteService.getSiteShortName(rootRef);
+            if (siteName != null)
+            {
+                // Revoke ownership privileges for surf-config folder, to tighten access for former SiteManagers.
+                ownableService.setOwner(surfConfigRef, AuthenticationUtil.getAdminUserName());
+                // Set site manager group permission
+                String siteManagerGroup = siteService.getSiteRoleGroup(siteName, SiteModel.SITE_MANAGER);
+                permissionService.setPermission(surfConfigRef, siteManagerGroup, SiteModel.SITE_MANAGER, true);
+            }
+        }
+        return surfConfigRef;
+    }
+
+    /**
+     * @return NodeRef to the shared components config folder
+     */
+    protected NodeRef getGlobalComponentsNodeRef()
+    {
+        NodeRef result = null;
+        
+        NodeRef surfRef = getSurfConfigNodeRef(siteService.getSiteRoot());
+        if (surfRef != null)
+        {
+            result = nodeService.getChildByName(surfRef, ContentModel.ASSOC_CONTAINS, PATH_COMPONENTS);
+        }
+        
+        return result;
+    }
+
+    /**
+     * @return NodeRef to the shared user config folder
+     */
+    protected NodeRef getGlobalUserFolderNodeRef()
+    {
+        NodeRef result = null;
+        
+        NodeRef surfRef = getSurfConfigNodeRef(siteService.getSiteRoot());
+        if (surfRef != null)
+        {
+            NodeRef pagesRef = nodeService.getChildByName(surfRef, ContentModel.ASSOC_CONTAINS, PATH_PAGES);
+            if (pagesRef != null)
+            {
+                result = nodeService.getChildByName(pagesRef, ContentModel.ASSOC_CONTAINS, PATH_USER);
+            }
+        }
+        
+        return result;
+    }
+
+    /**
+     * Generate the search pattern for a Surf config location for a user name.
+     * 
+     * @param userName  to build pattern for
+     * @return the search pattern
+     */
+    protected String buildUserConfigSearchPattern(String userName)
+    {
+        return USER_CONFIG_PATTERN.replace("(*)", encodePath(userName));
+    }
+
+    /**
+     * @return the Sites folder root node reference
+     */
+    private NodeRef getRootNodeRef()
+    {
+        return this.siteService.getSiteRoot();
+    }
+    
+    /**
+     * @param shortName     Site shortname
+     * 
+     * @return the given Site folder node reference
+     */
+    private NodeRef getSiteNodeRef(String shortName)
+    {
+        SiteInfo siteInfo = this.siteService.getSite(shortName); 
+        return siteInfo != null ? siteInfo.getNodeRef() : null;
+    }
+    
+    /**
+     * Output the matching file paths a node contains based on a pattern search.
+     * 
+     * @param out Writer for output - relative paths separated by newline characters
+     * @param surfConfigRef Surf-Config folder
+     * @param fileInfo The FileInfo node to use as the parent
+     * @param pattern Optional pattern to match filenames against ("*" is match all)
+     * @param recurse True to recurse sub-directories
+     * @throws IOException
+     */
+    private void outputFileNodes(Writer out, FileInfo fileInfo, NodeRef surfConfigRef, String pattern, boolean recurse) throws IOException
+    {
+        if (surfConfigRef != null)
+        {
+            final boolean debug = logger.isDebugEnabled();
+            PagingResults<FileInfo> files = getFileNodes(fileInfo, pattern, recurse);
+            
+            final Map<NodeRef, String> nameCache = new HashMap<NodeRef, String>();
+            for (final FileInfo file : files.getPage())
+            {
+                // walking up the parent tree manually until the "surf-config" parent is hit
+                // and manually appending the rest of the cm:name path down to the node.
+                final StringBuilder displayPath = new StringBuilder(64);
+                NodeRef ref = unprotNodeService.getPrimaryParent(file.getNodeRef()).getParentRef();
+                while (!ref.equals(surfConfigRef))
+                {
+                    String name = nameCache.get(ref);
+                    if (name == null)
+                    {
+                        name = (String) unprotNodeService.getProperty(ref, ContentModel.PROP_NAME);
+                        nameCache.put(ref, name);
+                    }
+                    displayPath.insert(0, '/');
+                    displayPath.insert(0, name);
+                    ref = unprotNodeService.getPrimaryParent(ref).getParentRef();
+                }
+                
+                out.write("/alfresco/site-data/");
+                out.write(URLDecoder.decode(displayPath.toString()));
+                out.write(URLDecoder.decode(file.getName()));
+                out.write('\n');
+                if (debug) logger.debug("   /alfresco/site-data/" + displayPath.toString() + file.getName());
+            }
+        }
+    }
+    
+    protected PagingResults<FileInfo> getFileNodes(FileInfo fileInfo, String pattern, boolean recurse)
+    {
+        return fileFolderService.list(
+                fileInfo.getNodeRef(), true, false,
+                pattern, null, null,
+                new PagingRequest(CannedQueryPageDetails.DEFAULT_PAGE_SIZE));
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java
new file mode 100644
index 00000000000..660d92482b6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java
@@ -0,0 +1,116 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.bean;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.sync.events.types.Event;
+import org.alfresco.sync.events.types.RepositoryEventImpl;
+import org.alfresco.sync.repo.events.EventPreparator;
+import org.alfresco.sync.repo.events.EventPublisher;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * Common code between Get based login and POST based login
+ */
+/* package scope */ abstract class AbstractLoginBean extends DeclarativeWebScript
+{
+    // dependencies
+    private AuthenticationService authenticationService;
+    protected EventPublisher eventPublisher;
+    
+    /**
+     * @param authenticationService AuthenticationService
+     */
+    public void setAuthenticationService(AuthenticationService authenticationService)
+    {
+        this.authenticationService = authenticationService;
+    }
+
+    /**
+     * @param eventPublisher EventPublisher
+     */
+    public void setEventPublisher(EventPublisher eventPublisher)
+    {
+        this.eventPublisher = eventPublisher;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status) 
+    {
+    	return null;
+    }
+    
+    protected Map<String, Object> login(final String username, String password)
+    {
+        try
+        {
+            // get ticket
+            authenticationService.authenticate(username, password.toCharArray());
+
+            eventPublisher.publishEvent(new EventPreparator(){
+                @Override
+                public Event prepareEvent(String user, String networkId, String transactionId)
+                {
+                	// TODO need to fix up to pass correct seqNo and alfrescoClientId
+                    return new RepositoryEventImpl(-1l, "login", transactionId, networkId, new Date().getTime(),
+                    		username, null);
+                }
+            });
+            
+            // add ticket to model for javascript and template access
+            Map<String, Object> model = new HashMap<String, Object>(7, 1.0f);
+            model.put("username", username);
+            model.put("ticket",  authenticationService.getCurrentTicket());
+            
+            return model;
+        }
+        catch(AuthenticationException e)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "Login failed");
+        }
+        finally
+        {
+            AuthenticationUtil.clearCurrentSecurityContext();
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/Authentication.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/Authentication.java
new file mode 100644
index 00000000000..5f4a2d3360c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/Authentication.java
@@ -0,0 +1,64 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.bean;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * WebScript java backed bean implementation - to return information about the
+ * authentication system, such as account mutability.
+ * 
+ * @author Kevin Roast
+ */
+public class Authentication extends DeclarativeWebScript
+{
+    private MutableAuthenticationService authenticationService;
+    
+    public void setAuthenticationService(AuthenticationService authenticationService)
+    {
+        this.authenticationService = (MutableAuthenticationService)authenticationService;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        Map<String, Object> model = new HashMap<String, Object>(2);
+        
+        model.put("creationAllowed", this.authenticationService.isAuthenticationCreationAllowed());
+        
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java
new file mode 100644
index 00000000000..17e333683e8
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java
@@ -0,0 +1,566 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.bean;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+
+/**
+ * Remote Store service.
+ * <p>
+ * Responsible for providing remote HTTP based access to a store. Designed to be accessed
+ * from a web-tier application to remotely mirror a WebScript Store instance.
+ * <p>
+ * Request format:
+ * <pre>
+ *      <servicepath>/<method>/<path>[?<args>]
+ *      <servicepath>/<method>/s/<store>/<path>[?<args>]
+ *      <servicepath>/<method>/s/<store>/w/<webapp>/<path>[?<args>]
+ * </pre><p>
+ * Example:
+ * <pre>
+ *      /service/remotestore/lastmodified/sites/xyz/pages/page.xml
+ * </pre><p>
+ * where:
+ * <pre>
+ *      /service/remotestore -> service path
+ *      /lastmodified        -> method name
+ *      /sites/../page.xml   -> document path
+ * </pre><p>
+ * optional request parameters:
+ * <pre>
+ *      s                    -> the store id
+ * </pre><p>
+ * Note: path is relative to the root path as configured for this webscript bean
+ * <p>
+ * Further URL arguments may be provided if required by specific API methods.
+ * <p>
+ * For content create and update the request should be POSTed and the content sent as the
+ * payload of the request content.
+ * <p>
+ * Supported API methods:
+ * <pre>
+ *      GET lastmodified -> return timestamp of a document in ms since 1970 as a long string value
+ *      GET has -> return true or false string as existence for a document
+ *      GET get -> return raw document content - in addition the appropriate HTTP headers for the
+ *                 character encoding, content type, length and modified date will be set
+ *      GET list -> return the list of available document paths under a path - UTF-8 response text
+ *      GET listall -> return the list of available document paths (recursively) under a given path
+ *                     - UTF-8 response text
+ *      GET listpattern -> return the list of document paths matching a file pattern under a given path
+ *                         - UTF-8 response text
+ *      POST create -> create a new document with request content payload
+ *      POST createmulti -> create multiple new documents with request content payload
+ *      POST update -> update an existing document with request content payload
+ *      DELETE delete -> delete an existing document 
+ * </pre>
+ * @author Kevin Roast
+ */
+public abstract class BaseRemoteStore extends AbstractWebScript
+{
+    public static final String TOKEN_STORE = "s";
+    
+	public static final String REQUEST_PARAM_STORE = "s";
+	
+	private static final Log logger = LogFactory.getLog(BaseRemoteStore.class);
+    
+    protected String defaultStore;
+    protected MimetypeService mimetypeService;
+    
+    protected static final TransformerFactory TRANSFORMER_FACTORY = TransformerFactory.newInstance();
+    protected static ThreadLocal<Transformer> transformer = new ThreadLocal<Transformer>()
+    {
+        @Override
+        protected Transformer initialValue()
+        {
+            try
+            {
+                return TRANSFORMER_FACTORY.newTransformer();
+            }
+            catch (TransformerConfigurationException e)
+            {
+                throw new RuntimeException(e);
+            }
+        }        
+    };
+    
+    
+    /**
+     * @param defaultStore     the default store name of the store to process document requests against
+     */
+    public void setStore(String defaultStore)
+    {
+        this.defaultStore = defaultStore;
+    }
+    
+    /**
+     * @param mimetypeService   the MimetypeService to set
+     */
+    public void setMimetypeService(MimetypeService mimetypeService)
+    {
+        this.mimetypeService = mimetypeService; 
+    }
+    
+    /**
+     * Execute the webscript based on the request parameters
+     */
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        // NOTE: This web script must be executed in a HTTP Servlet environment
+
+        // Unwrap to a WebScriptServletRequest if we have one
+        WebScriptServletRequest webScriptServletRequest = null;
+        WebScriptRequest current = req;
+        do
+        {
+            if (current instanceof WebScriptServletRequest)
+            {
+                webScriptServletRequest = (WebScriptServletRequest) current;
+                current = null;
+            }
+            else if (current instanceof WrappingWebScriptRequest)
+            {
+                current = ((WrappingWebScriptRequest) req).getNext();
+            }
+            else
+            {
+                current = null;
+            }
+        }
+        while (current != null);
+
+        if (webScriptServletRequest == null)
+        {
+            throw new WebScriptException("Remote Store access must be executed in HTTP Servlet environment");
+        }
+        
+        HttpServletRequest httpReq = webScriptServletRequest.getHttpServletRequest();
+                
+        // the request path for the remote store
+        String extPath = req.getExtensionPath();
+        
+        // values that we need to determine
+        String methodName = null;
+        String store = null;
+        StringBuilder pathBuilder = new StringBuilder(128);
+        
+        // tokenize the path and figure out tokenized values
+        StringTokenizer tokenizer = new StringTokenizer(extPath, "/");
+        if (tokenizer.hasMoreTokens())
+        {
+        	methodName = tokenizer.nextToken();
+        	
+        	if (tokenizer.hasMoreTokens())
+        	{
+        		String el = tokenizer.nextToken();
+        		
+        		if (TOKEN_STORE.equals(el))
+        		{
+        			// if the token is TOKEN_STORE, then the next token is the id of the store
+        			store = tokenizer.nextToken();
+        			
+        			// reset element
+        			el = (tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null);
+        		}
+        		
+        		while (el != null)
+        		{
+        			pathBuilder.append('/');
+        			pathBuilder.append(el);
+        			
+        			el = (tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null);
+        		}        		
+        	}
+        }
+        else
+        {
+        	throw new WebScriptException("Unable to tokenize web path: " + extPath);
+        }
+        
+        // if we don't have a store, check whether it came in on a request parameter
+        if (store == null)
+        {
+            store = req.getParameter(REQUEST_PARAM_STORE);
+            if (store == null)
+            {
+            	store = this.defaultStore;
+            }
+            if (store == null)
+            {
+            	// not good, we should have a store by this point
+            	// this means that a store was not passed in and that we also didn't have a configured store
+            	throw new WebScriptException("Unable to determine which store to operate against." +
+            	        " A store was not specified and a default was not provided.");
+            }
+        }
+        
+        String path = pathBuilder.toString();
+        
+        long start = 0;
+        if (logger.isDebugEnabled())
+        {
+        	logger.debug("Remote method: " + methodName.toUpperCase() + "   Store Id: " + store + "   Path: " + path);
+        	start = System.nanoTime();
+        }
+        
+        try
+        {
+            // generate enum from string method name - so we can use a fast switch table lookup
+            APIMethod method = APIMethod.valueOf(methodName.toUpperCase());
+            switch (method)
+            {
+                case LASTMODIFIED:
+                    validatePath(path);
+                    lastModified(res, store, path);
+                    break;
+                
+                case HAS:
+                    validatePath(path);
+                    hasDocument(res, store, path);
+                    break;
+                
+                case GET:
+                    validatePath(path);
+                    getDocument(res, store, path);
+                    break;
+                
+                case LIST:
+                    listDocuments(res, store, path, false);
+                    break;
+                
+                case LISTALL:
+                    listDocuments(res, store, path, true);
+                    break;
+                
+                case LISTPATTERN:
+                    listDocuments(res, store, path, req.getParameter("m"));
+                    break;
+                
+                case CREATE:
+                    validatePath(path);
+                    if (logger.isDebugEnabled())
+                        logger.debug("CREATE: content length=" + httpReq.getContentLength());
+                    createDocument(res, store, path, httpReq.getInputStream());
+                    break;
+                
+                case CREATEMULTI:
+                    if (logger.isDebugEnabled())
+                        logger.debug("CREATEMULTI: content length=" + httpReq.getContentLength());
+                    createDocuments(res, store, httpReq.getInputStream());
+                    break;
+                
+                case UPDATE:
+                    validatePath(path);
+                    if (logger.isDebugEnabled())
+                        logger.debug("UPDATE: content length=" + httpReq.getContentLength());
+                    updateDocument(res, store, path, httpReq.getInputStream());
+                    break;
+                
+                case DELETE:
+                    validatePath(path);
+                    deleteDocument(res, store, path);
+                    break;
+            }
+        }
+        catch (IllegalArgumentException enumErr)
+        {
+            throw new WebScriptException("Unknown method specified to remote store API: " + methodName);
+        }
+        catch (IOException ioErr)
+        {
+            throw new WebScriptException("Error during remote store API: " + ioErr.getMessage());
+        }
+        
+        if (logger.isDebugEnabled())
+        {
+            long end = System.nanoTime();
+            logger.debug("Time to execute method: " + (end - start)/1000000f + "ms");
+        }
+    }
+
+    /**
+     * Validate we have a path argument.
+     */
+    private static void validatePath(String path)
+    {
+        if (path == null)
+        {
+            throw new WebScriptException("Remote Store expecting document path elements.");
+        }
+    }
+    
+    /**
+     * Helper to break down webscript extension path into path component elements
+     */
+    protected List<String> getPathParts(String[] extPaths)
+    {
+        List<String> pathParts = new ArrayList<String>(extPaths.length - 1);
+        for (int i=1; i<extPaths.length; i++)
+        {
+            pathParts.add(extPaths[i]);
+        }
+        return pathParts;
+    }
+    
+    /**
+     * Gets the last modified timestamp for the document.
+     * 
+     * The output will be the last modified date as a long toString().
+     * 
+     * @param store the store id
+     * @param path  document path to an existing document
+     */
+    protected abstract void lastModified(WebScriptResponse res, String store, String path)
+        throws IOException;
+    
+    /**
+     * Determines if the document exists.
+     * 
+     * The output will be either the string "true" or the string "false".
+     * 
+     * @param store the store id
+     * @param path  document path
+     */
+    protected abstract void hasDocument(WebScriptResponse res, String store, String path)
+        throws IOException;
+
+    /**
+     * Gets a document.
+     * 
+     * The output will be the document content stream.
+     * 
+     * @param store the store id
+     * @param path  document path
+     *
+     * @throws IOException if an error occurs retrieving the document
+     */
+    protected abstract void getDocument(WebScriptResponse res, String store, String path)
+        throws IOException;
+    
+    /**
+     * Lists the document paths under a given path.
+     * 
+     * The output will be the list of relative document paths found under the path.
+     * Separated by newline characters.
+     * 
+     * @param store     the store id
+     * @param path      document path
+     * @param recurse   true to peform a recursive list, false for direct children only.
+     * 
+     * @throws IOException if an error occurs listing the documents
+     */
+    protected abstract void listDocuments(WebScriptResponse res, String store, String path, boolean recurse)
+        throws IOException;
+    
+    /**
+     * Lists the document paths matching a file pattern under a given path.
+     * 
+     * The output will be the list of relative document paths found under the path that
+     * match the given file pattern. Separated by newline characters.
+     * 
+     * @param store     the store id
+     * @param path      document path
+     * @param pattern   file pattern to match - allows wildcards e.g. *.xml or site*.xml
+     * 
+     * @throws IOException if an error occurs listing the documents
+     */
+    protected abstract void listDocuments(WebScriptResponse res, String store, String path, String pattern)
+        throws IOException;
+    
+    /**
+     * Creates a document.
+     * 
+     * @param store         the store id
+     * @param path          document path
+     * @param content       content of the document to write
+     * 
+     */
+    protected abstract void createDocument(WebScriptResponse res, String store, String path, InputStream content);
+    
+    /**
+     * Creates multiple XML documents encapsulated in a single one. 
+     *
+     * @param res          WebScriptResponse
+     * @param store         the store id
+     * @param content       content of the document to write
+     * 
+     */
+    protected abstract void createDocuments(WebScriptResponse res, String store, InputStream content);
+
+    /**
+     * Updates an existing document.
+     * 
+     * @param store the store id
+     * @param path  document path
+     * @param content       content to update the document with
+     * 
+     */
+    protected abstract void updateDocument(WebScriptResponse res, String store, String path, InputStream content);
+    
+    /**
+     * Deletes an existing document.
+     * 
+     * @param store the store id
+     * @param path  document path
+     * 
+     */
+    protected abstract void deleteDocument(WebScriptResponse res, String store, String path);
+    
+    
+    /**
+     * Enum representing the available API methods on the Store.
+     */
+    private enum APIMethod
+    {
+        LASTMODIFIED,
+        HAS,
+        GET,
+        LIST,
+        LISTALL,
+        LISTPATTERN,
+        CREATE,
+        CREATEMULTI,
+        UPDATE,
+        DELETE
+    };
+    
+    
+    protected static String encodePath(final String s)
+    {
+        StringBuilder sb = null;      //create on demand
+        char ch;
+        final int len = s.length();
+        for (int i = 0; i < len; i++)
+        {
+            ch = s.charAt(i);
+            
+            if (('A' <= ch && ch <= 'Z') ||             // 'A'..'Z'
+                ('a' <= ch && ch <= 'z') ||             // 'a'..'z'
+                ('0' <= ch && ch <= '9') ||             // '0'..'9'
+                ch == '/' ||
+                ch == '\'' || ch == ' ' ||
+                ch == '.' || ch == '~' ||
+                ch == '-' || ch == '_' ||
+                ch == '@' || ch == '!' ||
+                ch == '(' || ch == ')' ||
+                ch == ';' || ch == ',' ||
+                ch == '+' || ch == '$')
+            {
+                if (sb != null)
+                {
+                    sb.append(ch);
+                }
+            }
+            else if ((int)ch <= 0x007f)                 // other ASCII
+            {
+                if (sb == null)
+                {
+                    final String soFar = s.substring(0, i);
+                    sb = new StringBuilder(len + 16);
+                    sb.append(soFar);
+                }
+                sb.append(hex[ch]);
+            }
+            else if ((int)ch <= 0x07FF)                 // non-ASCII <= 0x7FF
+            {
+                if (sb == null)
+                {
+                    final String soFar = s.substring(0, i);
+                    sb = new StringBuilder(len + 16);
+                    sb.append(soFar);
+                }
+                sb.append(hex[0xc0 | (ch >> 6)]);
+                sb.append(hex[0x80 | (ch & 0x3F)]);
+            }
+            else                                        // 0x7FF < ch <= 0xFFFF
+            {
+                if (sb == null)
+                {
+                    final String soFar = s.substring(0, i);
+                    sb = new StringBuilder(len + 16);
+                    sb.append(soFar);
+                }
+                sb.append(hex[0xe0 | (ch >> 12)]);
+                sb.append(hex[0x80 | ((ch >> 6) & 0x3F)]);
+                sb.append(hex[0x80 | (ch & 0x3F)]);
+            }
+        }
+        return (sb != null ? sb.toString() : s);
+    }
+    
+    private final static String[] hex = {
+        "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07",
+        "%08", "%09", "%0a", "%0b", "%0c", "%0d", "%0e", "%0f",
+        "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17",
+        "%18", "%19", "%1a", "%1b", "%1c", "%1d", "%1e", "%1f",
+        "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27",
+        "%28", "%29", "%2a", "%2b", "%2c", "%2d", "%2e", "%2f",
+        "%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37",
+        "%38", "%39", "%3a", "%3b", "%3c", "%3d", "%3e", "%3f",
+        "%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47",
+        "%48", "%49", "%4a", "%4b", "%4c", "%4d", "%4e", "%4f",
+        "%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57",
+        "%58", "%59", "%5a", "%5b", "%5c", "%5d", "%5e", "%5f",
+        "%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67",
+        "%68", "%69", "%6a", "%6b", "%6c", "%6d", "%6e", "%6f",
+        "%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77",
+        "%78", "%79", "%7a", "%7b", "%7c", "%7d", "%7e", "%7f",
+        "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87",
+        "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f",
+        "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97",
+        "%98", "%99", "%9a", "%9b", "%9c", "%9d", "%9e", "%9f",
+        "%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%a6", "%a7",
+        "%a8", "%a9", "%aa", "%ab", "%ac", "%ad", "%ae", "%af",
+        "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7",
+        "%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf",
+        "%c0", "%c1", "%c2", "%c3", "%c4", "%c5", "%c6", "%c7",
+        "%c8", "%c9", "%ca", "%cb", "%cc", "%cd", "%ce", "%cf",
+        "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",
+        "%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df",
+        "%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7",
+        "%e8", "%e9", "%ea", "%eb", "%ec", "%ed", "%ee", "%ef",
+        "%f0", "%f1", "%f2", "%f3", "%f4", "%f5", "%f6", "%f7",
+        "%f8", "%f9", "%fa", "%fb", "%fc", "%fd", "%fe", "%ff"
+    };
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java
new file mode 100644
index 00000000000..4987a91c508
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java
@@ -0,0 +1,414 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.bean;
+
+import java.io.StringWriter;
+import java.io.Writer;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import org.alfresco.repo.template.TemplateNode;
+import org.alfresco.repo.web.scripts.RepositoryImageResolver;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.util.GUID;
+import org.alfresco.util.SearchLanguageConversion;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.extensions.surf.util.ParameterCheck;
+import org.springframework.extensions.surf.util.URLEncoder;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * Alfresco Keyword (simple) Search Service
+ * 
+ * @author davidc
+ */
+public class KeywordSearch extends DeclarativeWebScript
+{
+    // Logger
+    private static final Log logger = LogFactory.getLog(KeywordSearch.class);
+
+    // search parameters 
+    // TODO: allow configuration of search store
+    protected static final StoreRef SEARCH_STORE = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
+    protected static final int DEFAULT_ITEMS_PER_PAGE = 10;
+    protected static final String QUERY_FORMAT = "query_";
+
+    // dependencies
+    protected ServiceRegistry serviceRegistry;
+    protected RepositoryImageResolver imageResolver;
+    protected SearchService searchService;
+    protected NodeService nodeService;
+
+    public void setSearchService(SearchService searchService)
+    {
+        this.searchService = searchService;
+    }
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public void setRepositoryImageResolver(RepositoryImageResolver imageResolver)
+    {
+        this.imageResolver = imageResolver;
+    }
+
+    public void setServiceRegistry(ServiceRegistry serviceRegistry)
+    {
+        this.serviceRegistry = serviceRegistry;
+    }
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        //
+        // process arguments
+        //
+        
+        String searchTerms = req.getParameter("q");
+        ParameterCheck.mandatoryString("q", searchTerms);
+        String startPageArg = req.getParameter("p");
+        int startPage = 1;
+        try
+        {
+            startPage = new Integer(startPageArg);
+        }
+        catch(NumberFormatException e)
+        {
+            // NOTE: use default startPage
+        }
+        String itemsPerPageArg = req.getParameter("c");
+        int itemsPerPage = DEFAULT_ITEMS_PER_PAGE;
+        try
+        {
+            itemsPerPage = new Integer(itemsPerPageArg);
+        }
+        catch(NumberFormatException e)
+        {
+            // NOTE: use default itemsPerPage
+        }
+        Locale locale = I18NUtil.getLocale();
+        String language = req.getParameter("l");
+        if (language != null && language.length() > 0)
+        {
+            // NOTE: Simple conversion from XML Language Id to Java Locale Id
+            locale = new Locale(language.replace("-", "_"));
+        }
+        
+        //
+        // execute the search
+        //
+        
+        SearchResult results = search(searchTerms, startPage, itemsPerPage, locale, req);
+        
+        //
+        // create model
+        //
+        
+        Map<String, Object> model = new HashMap<String, Object>(7, 1.0f);
+        model.put("search", results);
+        return model;
+    }
+    
+    /**
+     * Execute the search
+     */
+    private SearchResult search(String searchTerms, int startPage, int itemsPerPage, Locale locale, WebScriptRequest req)
+    {
+        SearchResult searchResult = null;
+        ResultSet results = null;
+        
+        try
+        {
+            // construct search statement
+            String[] terms = searchTerms.split(" "); 
+            searchTerms = searchTerms.replaceAll("\"", "&quot;"); 
+
+            // Escape special characters in the terms, so that they can't confuse the parser 
+            for (int i=0; i<terms.length; i++) 
+            { 
+                terms[i] = SearchLanguageConversion.escapeLuceneQuery(terms[i]); 
+            } 
+
+            Map<String, Object> statementModel = new HashMap<String, Object>(7, 1.0f);
+            statementModel.put("args", createArgs(req));
+            statementModel.put("terms", terms);
+            Writer queryWriter = new StringWriter(1024);
+            renderFormatTemplate(QUERY_FORMAT, statementModel, queryWriter);
+            String query = queryWriter.toString();
+            
+            // execute query
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Search parameters: searchTerms=" + searchTerms + ", startPage=" + startPage + ", itemsPerPage=" + itemsPerPage + ", search locale=" + locale.toString());
+                logger.debug("Issuing lucene search: " + query);
+            }
+
+            SearchParameters parameters = new SearchParameters();
+            parameters.addStore(SEARCH_STORE);
+            parameters.setLanguage(SearchService.LANGUAGE_LUCENE);
+            parameters.setQuery(query);
+            if (locale != null)
+            {
+                parameters.addLocale(locale);
+            }
+            results = searchService.query(parameters);
+            int totalResults = results.length();
+            
+            if (logger.isDebugEnabled())
+                logger.debug("Results: " + totalResults + " rows (limited: " + results.getResultSetMetaData().getLimitedBy() + ")");
+            
+            // are we out-of-range
+            int totalPages = (totalResults / itemsPerPage);
+            totalPages += (totalResults % itemsPerPage != 0) ? 1 : 0;
+            if (totalPages != 0 && (startPage < 1 || startPage > totalPages))
+            {
+                throw new WebScriptException("Start page " + startPage + " is outside boundary of " + totalPages + " pages");
+            }
+
+            // construct search result
+            searchResult = new SearchResult();
+            searchResult.setSearchTerms(searchTerms);
+            searchResult.setLocale(locale);
+            searchResult.setItemsPerPage(itemsPerPage);
+            searchResult.setStartPage(startPage);
+            searchResult.setTotalResults(totalResults);
+            if (totalResults == 0)
+            {
+                searchResult.setTotalPages(0);
+                searchResult.setStartIndex(0);
+                searchResult.setTotalPageItems(0);
+            }
+            else
+            {
+                searchResult.setTotalPages(totalPages);
+                searchResult.setStartIndex(((startPage -1) * itemsPerPage) + 1);
+                searchResult.setTotalPageItems(Math.min(itemsPerPage, totalResults - searchResult.getStartIndex() + 1));
+            }
+            SearchTemplateNode[] nodes = new SearchTemplateNode[searchResult.getTotalPageItems()];
+            for (int i = 0; i < searchResult.getTotalPageItems(); i++)
+            {
+                NodeRef node = results.getNodeRef(i + searchResult.getStartIndex() - 1);
+                // Make the search resilient to invalid nodes
+                if (!nodeService.exists(node))
+                {
+                    continue;
+                }
+                float score = results.getScore(i + searchResult.getStartIndex() - 1);
+                nodes[i] = new SearchTemplateNode(node, score);
+            }
+            searchResult.setResults(nodes);
+            return searchResult;
+        }
+        finally
+        {
+            if (results != null)
+            {
+                results.close();
+            }
+        }        
+    }
+
+    /**
+     * Search Result
+     *  
+     * @author davidc
+     */
+    public static class SearchResult
+    {
+        private String id;
+        private String searchTerms;
+        private Locale locale;
+        private int itemsPerPage;
+        private int totalPages;
+        private int totalResults;
+        private int totalPageItems;
+        private int startPage;
+        private int startIndex;
+        private SearchTemplateNode[] results;
+        
+        
+        public int getItemsPerPage()
+        {
+            return itemsPerPage;
+        }
+        
+        /*package*/ void setItemsPerPage(int itemsPerPage)
+        {
+            this.itemsPerPage = itemsPerPage;
+        }
+
+        public TemplateNode[] getResults()
+        {
+            return results;
+        }
+
+        /*package*/ void setResults(SearchTemplateNode[] results)
+        {
+            this.results = results;
+        }
+
+        public int getStartIndex()
+        {
+            return startIndex;
+        }
+
+        /*package*/ void setStartIndex(int startIndex)
+        {
+            this.startIndex = startIndex;
+        }
+
+        public int getStartPage()
+        {
+            return startPage;
+        }
+
+        /*package*/ void setStartPage(int startPage)
+        {
+            this.startPage = startPage;
+        }
+
+        public int getTotalPageItems()
+        {
+            return totalPageItems;
+        }
+
+        /*package*/ void setTotalPageItems(int totalPageItems)
+        {
+            this.totalPageItems = totalPageItems;
+        }
+
+        public int getTotalPages()
+        {
+            return totalPages;
+        }
+
+        /*package*/ void setTotalPages(int totalPages)
+        {
+            this.totalPages = totalPages;
+        }
+
+        public int getTotalResults()
+        {
+            return totalResults;
+        }
+
+        /*package*/ void setTotalResults(int totalResults)
+        {
+            this.totalResults = totalResults;
+        }
+
+        public String getSearchTerms()
+        {
+            return searchTerms;
+        }
+
+        /*package*/ void setSearchTerms(String searchTerms)
+        {
+            this.searchTerms = searchTerms;
+        }
+
+        public Locale getLocale()
+        {
+            return locale;
+        }
+        
+        /**
+         * @return XML 1.0 Language Identification
+         */
+        public String getLocaleId()
+        {
+            return locale.toString().replace('_', '-');
+        }
+
+        /*package*/ void setLocale(Locale locale)
+        {
+            this.locale = locale;
+        }
+
+        public String getId()
+        {
+            if (id == null)
+            {
+                id = GUID.generate();
+            }
+            return id;
+        }
+    }
+    
+    /**
+     * Search result row template node
+     */
+    public class SearchTemplateNode extends TemplateNode
+    {
+        protected final static String URL = "/api/node/content/{0}/{1}/{2}/{3}";
+        
+        private static final long serialVersionUID = -1791913270786140012L;
+        private float score;
+
+        /**
+         * Construct
+         */
+        public SearchTemplateNode(NodeRef nodeRef, float score)
+        {
+            super(nodeRef, serviceRegistry, KeywordSearch.this.imageResolver.getImageResolver());
+            this.score = score;
+        }
+        
+        /**
+         * Gets the result row score
+         */
+        public float getScore()
+        {
+            return score;
+        }
+
+        @Override
+        public String getUrl()
+        {
+            return MessageFormat.format(URL, new Object[] {
+                getNodeRef().getStoreRef().getProtocol(),
+                getNodeRef().getStoreRef().getIdentifier(),
+                getNodeRef().getId(),
+                URLEncoder.encode(getName()) } );
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/Login.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/Login.java
new file mode 100644
index 00000000000..7c4bd1a6ee9
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/Login.java
@@ -0,0 +1,72 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.bean;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Login and establish a ticket
+ * 
+ * @author davidc
+ */
+public class Login extends AbstractLoginBean
+{   
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        // extract username and password
+        String username = req.getParameter("u");
+        if (username == null || username.length() == 0)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "Username not specified");
+        }
+        String password = req.getParameter("pw");
+        if (password == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "Password not specified");
+        }
+
+        try
+        {
+            return login(username, password);
+        }
+        catch(WebScriptException e)
+        {
+            status.setCode(e.getStatus());
+            status.setMessage(e.getMessage());
+            status.setRedirect(true);
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginPost.java
new file mode 100644
index 00000000000..32d60054664
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginPost.java
@@ -0,0 +1,100 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.bean;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.surf.util.Content;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Post based login script
+ */
+public class LoginPost extends AbstractLoginBean
+{
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        // Extract user and password from JSON POST
+        Content c = req.getContent();
+        if (c == null)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Missing POST body.");
+        }
+        
+        // TODO accept xml type.
+        
+        // extract username and password from JSON object
+        JSONObject json;
+        try
+        {
+            json = new JSONObject(c.getContent());
+            String username = json.getString("username");
+            String password = json.getString("password");
+
+            if (username == null || username.length() == 0)
+            {
+                throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "Username not specified");
+            }
+
+            if (password == null)
+            {
+                throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "Password not specified");
+            }
+
+            try
+            {
+                return login(username, password);
+            }
+            catch(WebScriptException e)
+            {
+                status.setCode(e.getStatus());
+                status.setMessage(e.getMessage());
+                status.setRedirect(true);
+                return null;
+            }
+        } 
+        catch (JSONException jErr)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                    "Unable to parse JSON POST body: " + jErr.getMessage());
+        }
+        catch (IOException ioErr)
+        {
+            throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR,
+                    "Unable to retrieve POST body: " + ioErr.getMessage());
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginTicket.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginTicket.java
new file mode 100644
index 00000000000..7915500cca5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginTicket.java
@@ -0,0 +1,103 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.bean;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.TicketComponent;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * Login Ticket
+ * 
+ * @author davidc
+ */
+public class LoginTicket extends DeclarativeWebScript
+{
+    // dependencies
+    private TicketComponent ticketComponent;
+    
+    /**
+     * @param ticketComponent TicketComponent
+     */
+    public void setTicketComponent(TicketComponent ticketComponent)
+    {
+        this.ticketComponent = ticketComponent;
+    }
+    
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        // retrieve ticket from request and current ticket
+        String ticket = req.getExtensionPath();
+        if (ticket == null || ticket.length() == 0)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "Ticket not specified");
+        }
+        
+        // construct model for ticket
+        Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
+        model.put("ticket",  ticket);
+        
+        try
+        {
+            String ticketUser = ticketComponent.validateTicket(ticket);
+            
+            String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
+
+            // do not go any further if tickets are different 
+            // or the user is not fully authenticated
+            if (currentUser == null || !currentUser.equals(ticketUser))
+            {
+                status.setRedirect(true);
+                status.setCode(HttpServletResponse.SC_NOT_FOUND);
+                status.setMessage("Ticket not found");
+            }
+        }
+        catch (AuthenticationException e)
+        {
+            status.setRedirect(true);
+            status.setCode(HttpServletResponse.SC_NOT_FOUND);
+            status.setMessage("Ticket not found");
+        }
+        
+        return model;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginTicketDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginTicketDelete.java
new file mode 100644
index 00000000000..19503c7a2ef
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/LoginTicketDelete.java
@@ -0,0 +1,115 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.bean;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.TicketComponent;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * Delete Login Ticket
+ * 
+ * @author davidc
+ */
+public class LoginTicketDelete extends DeclarativeWebScript
+{
+    // dependencies
+    private AuthenticationService authenticationService;
+    private TicketComponent ticketComponent;
+    
+    /**
+     * @param ticketComponent TicketComponent
+     */
+    public void setTicketComponent(TicketComponent ticketComponent)
+    {
+        this.ticketComponent = ticketComponent;
+    }
+
+    /**
+     * @param authenticationService AuthenticationService
+     */
+    public void setAuthenticationService(AuthenticationService authenticationService)
+    {
+        this.authenticationService = authenticationService;
+    }
+
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        // retrieve ticket from request and current ticket
+        String ticket = req.getExtensionPath();
+        if (ticket == null || ticket.length() == 0)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "Ticket not specified");
+        }
+        
+        // construct model for ticket
+        Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
+        model.put("ticket",  ticket);
+        
+        try
+        {
+            String ticketUser = ticketComponent.validateTicket(ticket);
+
+            // do not go any further if tickets are different
+            if (!AuthenticationUtil.getFullyAuthenticatedUser().equals(ticketUser))
+            {
+                status.setCode(HttpServletResponse.SC_NOT_FOUND);
+                status.setMessage("Ticket not found");
+            }
+            else
+            {
+                // delete the ticket
+                authenticationService.invalidateTicket(ticket);
+                status.setMessage("Deleted Ticket " + ticket);
+            }
+        }
+        catch(AuthenticationException e)
+        {
+            status.setCode(HttpServletResponse.SC_NOT_FOUND);
+            status.setMessage("Ticket not found");
+        }
+
+        status.setRedirect(true);
+        return model;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/SearchEngines.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/SearchEngines.java
new file mode 100644
index 00000000000..9169c5476b5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/SearchEngines.java
@@ -0,0 +1,211 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.bean;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigService;
+import org.springframework.extensions.surf.util.I18NUtil;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.web.scripts.config.OpenSearchConfigElement;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+/**
+ * List of (server-side) registered Search Engines
+ * 
+ * @author davidc
+ */
+public class SearchEngines extends DeclarativeWebScript
+{
+    // url argument values
+    public static final String URL_ARG_DESCRIPTION = "description";
+    public static final String URL_ARG_TEMPLATE = "template";
+    public static final String URL_ARG_ALL = "all";
+    
+    // Logger
+    private static final Log logger = LogFactory.getLog(SearchEngines.class);
+
+    // dependencies
+    protected ConfigService configService;
+    protected SearchProxy searchProxy;
+
+    /**
+     * @param configService ConfigService
+     */
+    public void setConfigService(ConfigService configService)
+    {
+        this.configService = configService;
+    }
+
+    /**
+     * @param searchProxy SearchProxy
+     */
+    public void setSearchProxy(SearchProxy searchProxy)
+    {
+        this.searchProxy = searchProxy;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    @SuppressWarnings("deprecation")
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        String urlType = req.getParameter("type");
+        if (urlType == null || urlType.length() == 0)
+        {
+            urlType = URL_ARG_DESCRIPTION;
+        }
+        else if (!urlType.equals(URL_ARG_DESCRIPTION) && !urlType.equals(URL_ARG_TEMPLATE) && !urlType.equals(URL_ARG_ALL))
+        {
+            urlType = URL_ARG_DESCRIPTION;
+        }
+                
+        //
+        // retrieve open search engines configuration
+        //
+
+        Set<UrlTemplate> urls = getUrls(urlType);
+        Map<String, Object> model = new HashMap<String, Object>(7, 1.0f);
+        model.put("urltype", urlType);
+        model.put("engines", urls);
+        return model;
+    }
+    
+    /**
+     * Retrieve registered search engines
+     * 
+     * @return  set of search engines
+     */
+    private Set<UrlTemplate> getUrls(String urlType)
+    {
+        if (logger.isDebugEnabled())
+            logger.debug("Search Engine parameters: urltype=" + urlType);
+
+        Set<UrlTemplate> urls = new HashSet<UrlTemplate>();
+        Config config = configService.getConfig("OpenSearch");
+
+        OpenSearchConfigElement searchConfig = (OpenSearchConfigElement)config.getConfigElement(OpenSearchConfigElement.CONFIG_ELEMENT_ID);
+        for (OpenSearchConfigElement.EngineConfig engineConfig : searchConfig.getEngines())
+        {
+            Map<String, String> engineUrls = engineConfig.getUrls();
+            for (Map.Entry<String, String> engineUrl : engineUrls.entrySet())
+            {
+                String type = engineUrl.getKey();
+                String url = searchProxy.createUrl(engineConfig, type);
+                
+                if ((urlType.equals(URL_ARG_ALL)) ||
+                    (urlType.equals(URL_ARG_DESCRIPTION) && type.equals(MimetypeMap.MIMETYPE_OPENSEARCH_DESCRIPTION)) ||
+                    (urlType.equals(URL_ARG_TEMPLATE) && !type.equals(MimetypeMap.MIMETYPE_OPENSEARCH_DESCRIPTION)))
+                {
+                    String label = engineConfig.getLabel();
+                    String labelId = engineConfig.getLabelId();
+                    if (labelId != null && labelId.length() > 0)
+                    {
+                        String i18nLabel = I18NUtil.getMessage(labelId);
+                        if (i18nLabel == null && label == null)
+                        {
+                            label = (i18nLabel == null) ? "$$" + labelId + "$$" : i18nLabel;
+                        }
+                    }
+                    urls.add(new UrlTemplate(label, type, url));
+                }
+
+                // TODO: Extract URL templates from OpenSearch description
+                else if (urlType.equals(URL_ARG_TEMPLATE) && 
+                         type.equals(MimetypeMap.MIMETYPE_OPENSEARCH_DESCRIPTION))
+                {            
+                }
+            }
+        }
+        
+        if (logger.isDebugEnabled())
+            logger.debug("Retrieved " + urls.size() + " engine registrations");
+        
+        return urls;
+    }
+
+    /**
+     * Model object for representing a registered search engine
+     */
+    public static class UrlTemplate
+    {
+        private String type;
+        private String label;
+        private String url;
+        private UrlTemplate engine;
+        
+        public UrlTemplate(String label, String type, String url)
+        {
+            this.label = label;
+            this.type = type;
+            this.url = url;
+            this.engine = null;
+        }
+
+        public UrlTemplate(String label, String type, String url, UrlTemplate engine)
+        {
+            this(label, type, url);
+            this.engine = engine;
+        }
+
+        public String getLabel()
+        {
+            return label;
+        }
+        
+        public String getType()
+        {
+            return type;
+        }
+        
+        public String getUrl()
+        {
+            return url;
+        }
+        
+        public String getUrlType()
+        {
+            return (type.equals(MimetypeMap.MIMETYPE_OPENSEARCH_DESCRIPTION) ? "description" : "template");
+        }
+
+        public UrlTemplate getEngine()
+        {
+            return engine;
+        }
+    }
+            
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/SearchProxy.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/SearchProxy.java
new file mode 100644
index 00000000000..f0eaf4473af
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/SearchProxy.java
@@ -0,0 +1,342 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.bean;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.net.URLConnection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.web.scripts.config.OpenSearchConfigElement;
+import org.alfresco.repo.web.scripts.config.OpenSearchConfigElement.EngineConfig;
+import org.alfresco.repo.web.scripts.config.OpenSearchConfigElement.ProxyConfig;
+import org.alfresco.web.app.servlet.HTTPProxy;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.dom4j.Attribute;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.XPath;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.SAXReader;
+import org.dom4j.io.XMLWriter;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigService;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.FormatRegistry;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRuntime;
+
+
+/**
+ * Alfresco OpenSearch Proxy Service
+ * 
+ * Provides the ability to submit a request to a registered search engine
+ * via the Alfresco server.
+ * 
+ * @author davidc
+ */
+public class SearchProxy extends AbstractWebScript implements InitializingBean
+{
+    // Logger
+    private static final Log logger = LogFactory.getLog(SearchProxy.class);
+
+    // dependencies
+    protected FormatRegistry formatRegistry;
+    protected ConfigService configService;
+    protected OpenSearchConfigElement searchConfig; 
+    protected String proxyPath;
+    
+    /**
+     * @param formatRegistry FormatRegistry
+     */
+    public void setFormatRegistry(FormatRegistry formatRegistry)
+    {
+        this.formatRegistry = formatRegistry;
+    }
+
+    /**
+     * @param configService ConfigService
+     */
+    public void setConfigService(ConfigService configService)
+    {
+        this.configService = configService;
+    }
+        
+    /* (non-Javadoc)
+     * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+     */
+    public void afterPropertiesSet() throws Exception
+    {
+        Config config = configService.getConfig("OpenSearch");
+        searchConfig = (OpenSearchConfigElement)config.getConfigElement(OpenSearchConfigElement.CONFIG_ELEMENT_ID);
+        if (searchConfig == null)
+        {
+            throw new WebScriptException("OpenSearch configuration not found");
+        }
+        ProxyConfig proxyConfig = searchConfig.getProxy();
+        if (proxyConfig == null)
+        {
+            throw new WebScriptException("OpenSearch proxy configuration not found");
+        }
+        proxyPath = proxyConfig.getUrl();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScript#execute(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    public void execute(WebScriptRequest req, WebScriptResponse res)
+        throws IOException
+    {
+        String extensionPath = req.getExtensionPath();
+        String[] extensionPaths = extensionPath.split("/");
+        if (extensionPaths.length != 2)
+        {
+            throw new WebScriptException("OpenSearch engine has not been specified as /{engine}/{format}");
+        }
+        
+        // retrieve search engine configuration
+        String engine = extensionPaths[0];
+        EngineConfig engineConfig = searchConfig.getEngine(engine);
+        if (engineConfig == null)
+        {
+            throw new WebScriptException("OpenSearch engine '" + engine + "' does not exist");
+        }
+        
+        // retrieve engine url as specified by format
+        String format = extensionPaths[1];
+        String mimetype = formatRegistry.getMimeType(null, format);
+        if (mimetype == null)
+        {
+            throw new WebScriptException("Format '" + format + "' does not map to a registered mimetype");
+        }
+        Map<String, String> engineUrls = engineConfig.getUrls();
+        String engineUrl = engineUrls.get(mimetype);
+        if (engineUrl == null)
+        {
+            throw new WebScriptException("Url mimetype '" + mimetype + "' does not exist for engine '" + engine + "'");
+        }
+
+        // replace template url arguments with actual arguments specified on request
+        int engineUrlArgIdx = engineUrl.indexOf("?");
+        if (engineUrlArgIdx != -1)
+        {
+            engineUrl = engineUrl.substring(0, engineUrlArgIdx);
+        }
+        if (req.getQueryString() != null)
+        {
+            engineUrl += "?" + req.getQueryString();
+        }
+        
+        if (logger.isDebugEnabled())
+            logger.debug("Mapping engine '" + engine + "' (mimetype '" + mimetype + "') to url '" + engineUrl + "'");        
+        
+        // issue request against search engine
+        // NOTE: This web script must be executed in a HTTP servlet environment
+        if (!(res.getRuntime() instanceof WebScriptServletRuntime))
+        {
+            throw new WebScriptException("Search Proxy must be executed in HTTP Servlet environment");
+        }
+        
+        HttpServletResponse servletRes = WebScriptServletRuntime.getHttpServletResponse(res);
+        SearchEngineHttpProxy proxy = new SearchEngineHttpProxy(req.getServerPath() + req.getServiceContextPath(),
+                engine, engineUrl, servletRes, Collections.singletonMap("User-Agent", req.getHeader("User-Agent")));
+        proxy.service();
+    }
+    
+    /**
+     * OpenSearch HTTPProxy
+     * 
+     * This proxy remaps OpenSearch links (e.g. previous, next) found in search results.
+     * 
+     * @author davidc
+     */
+    private class SearchEngineHttpProxy extends HTTPProxy
+    {
+        private final static String ATOM_NS_URI = "http://www.w3.org/2005/Atom";
+        private final static String ATOM_NS_PREFIX = "atom";
+        private final static String ATOM_LINK_XPATH = "atom:link[@rel=\"first\" or @rel=\"last\" or @rel=\"next\" or @rel=\"previous\" or @rel=\"self\" or @rel=\"alternate\"]";
+        private String engine;
+        private String rootPath;
+        private Map<String, String> headers;
+        
+        /**
+         * Construct
+         * 
+         * @param rootPath String
+         * @param engine String
+         * @param engineUrl String
+         * @param response HttpServletResponse
+         * @param headers request headers
+         * @throws MalformedURLException
+         */
+        public SearchEngineHttpProxy(String rootPath, String engine, String engineUrl, HttpServletResponse response, Map<String, String> headers)
+            throws MalformedURLException
+        {
+            super(engineUrl.startsWith("/") ? rootPath + engineUrl : engineUrl, response);
+            this.engine = engine;
+            this.rootPath = rootPath;
+            this.headers = headers;
+        }
+        
+        /* (non-Javadoc)
+         * @see org.alfresco.web.app.servlet.HTTPProxy#setRequestHeaders(java.net.URLConnection)
+         */
+        @Override
+        protected void setRequestHeaders(URLConnection urlConnection)
+        {
+            if (headers != null)
+            {
+                for (Map.Entry<String, String> entry: headers.entrySet())
+                {
+                    urlConnection.setRequestProperty(entry.getKey(), entry.getValue());
+                }
+            }
+        }
+
+        /* (non-Javadoc)
+         * @see org.alfresco.web.app.servlet.HTTPProxy#writeResponse(java.io.InputStream, java.io.OutputStream)
+         */
+        @Override
+        protected void writeResponse(InputStream input, OutputStream output)
+            throws IOException
+        {
+            if (response.getContentType().startsWith(MimetypeMap.MIMETYPE_ATOM) ||
+                response.getContentType().startsWith(MimetypeMap.MIMETYPE_RSS))
+            {
+                // Only post-process ATOM and RSS feeds
+                // Replace all navigation links with "proxied" versions
+                SAXReader reader = new SAXReader();
+                try
+                {
+                    Document document = reader.read(input);
+                    Element rootElement = document.getRootElement();
+        
+                    XPath xpath = rootElement.createXPath(ATOM_LINK_XPATH);
+                    Map<String,String> uris = new HashMap<String,String>();
+                    uris.put(ATOM_NS_PREFIX, ATOM_NS_URI);
+                    xpath.setNamespaceURIs(uris);
+        
+                    List nodes = xpath.selectNodes(rootElement);
+                    Iterator iter = nodes.iterator();
+                    while (iter.hasNext())
+                    {
+                        Element element = (Element)iter.next();
+                        Attribute hrefAttr = element.attribute("href");
+                        String mimetype = element.attributeValue("type");
+                        if (mimetype == null || mimetype.length() == 0)
+                        {
+                            mimetype = MimetypeMap.MIMETYPE_HTML;
+                        }
+                        String url = createUrl(engine, hrefAttr.getValue(), mimetype);
+                        if (url.startsWith("/"))
+                        {
+                            url = rootPath + url;
+                        }
+                        hrefAttr.setValue(url);
+                    }
+                    
+                    OutputFormat outputFormat = OutputFormat.createPrettyPrint();
+                    XMLWriter writer = new XMLWriter(output, outputFormat);
+                    writer.write(rootElement);
+                    writer.flush();                
+                }
+                catch(DocumentException e)
+                {
+                    throw new IOException(e.toString());
+                }
+            }
+            else
+            {
+                super.writeResponse(input, output);
+            }
+        }
+    }
+    
+    /**
+     * Construct a "proxied" search engine url
+     * 
+     * @param engine  engine name (as identified by <engine proxy="<name>">)
+     * @param mimetype  url to proxy (as identified by mimetype)
+     * @return  "proxied" url
+     */
+    public String createUrl(OpenSearchConfigElement.EngineConfig engine, String mimetype)
+    {
+        Map<String, String> urls = engine.getUrls();
+        String url = urls.get(mimetype);
+        if (url != null)
+        {
+            String proxy = engine.getProxy();
+            if (proxy != null && !mimetype.equals(MimetypeMap.MIMETYPE_OPENSEARCH_DESCRIPTION))
+            {
+                url = createUrl(proxy, url, mimetype);
+            }
+        }
+        return url;
+    }
+ 
+    /**
+     * Construct a "proxied" search engine url
+     * 
+     * @param engine  engine name (as identified by <engine proxy="<name>">)
+     * @param url  engine url
+     * @param mimetype  mimetype of url
+     * @return  "proxied" url
+     */
+    public String createUrl(String engine, String url, String mimetype)
+    {
+        String format = formatRegistry.getFormat(null, mimetype);
+        if (format == null)
+        {
+            throw new WebScriptException("Mimetype '" + mimetype + "' is not registered.");
+        }
+        
+        String proxyUrl = null;
+        int argIdx = url.indexOf("?");
+        if (argIdx == -1)
+        {
+            proxyUrl = proxyPath + "/" + engine + "/" + format;  
+        }
+        else
+        {
+            proxyUrl = proxyPath + "/" + engine + "/" + format + url.substring(argIdx);  
+        }
+        return proxyUrl;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/Touch.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/Touch.java
new file mode 100644
index 00000000000..dbdb782f6d0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bean/Touch.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.bean;
+
+import java.io.IOException;
+
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * WebScript java backed bean implementation - to simple return a STATUS_OK message
+ * as a touch point for SSO authentication mechanisms on the web-tier. Such as NTLM.
+ * 
+ * @author Kevin Roast
+ */
+public class Touch extends AbstractWebScript
+{
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScript#execute(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        res.setStatus(Status.STATUS_OK);
+        res.getWriter().close();
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/AbstractBlogWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/AbstractBlogWebScript.java
new file mode 100644
index 00000000000..fa0e0d157a1
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/AbstractBlogWebScript.java
@@ -0,0 +1,311 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.alfresco.repo.activities.post.lookup.PostLookup;
+import org.alfresco.repo.blog.BlogServiceImpl;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.service.cmr.blog.BlogPostInfo;
+import org.alfresco.service.cmr.blog.BlogService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONStringer;
+import org.json.JSONWriter;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Neil Mc Erlean
+ * @since 4.0
+ */
+public abstract class AbstractBlogWebScript extends DeclarativeWebScript
+{
+    // Various common parameter strings in the blog webscripts.
+    protected static final String CONTAINER            = "container";
+    protected static final String CONTENT              = "content";
+    protected static final String DATA                 = "data";
+    protected static final String DRAFT                = "draft";
+    protected static final String EXTERNAL_BLOG_CONFIG = "externalBlogConfig";
+    protected static final String POST                 = "post";
+    protected static final String ITEM                 = "item";
+    protected static final String NODE                 = "node";
+    protected static final String PAGE                 = "page";
+    protected static final String SITE                 = "site";
+    protected static final String TAGS                 = "tags";
+    protected static final String TITLE                = "title";
+    
+    private static Log logger = LogFactory.getLog(AbstractBlogWebScript.class);
+    
+    // Injected services
+    protected Repository repository;
+    protected BlogService blogService;
+    protected NodeService nodeService;
+    protected SiteService siteService;
+    protected ActivityService activityService;
+    
+    //TODO Remove this after full refactor
+    protected ServiceRegistry services;
+    
+    public void setServiceRegistry(ServiceRegistry services)
+    {
+        this.services = services;
+    }
+    
+    public void setRepository(Repository repository)
+    {
+        this.repository = repository;
+    }
+    
+    public void setBlogService(BlogService blogService)
+    {
+        this.blogService = blogService;
+    }
+    
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+    
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+    
+    public void setActivityService(ActivityService activityService)
+    {
+        this.activityService = activityService;
+    }
+
+    /**
+     * Generates an activity entry for the discussion item
+     * 
+     * @param event One of created, updated, deleted
+     * @param blog Either post or reply
+     * @param site site
+     * @param req request
+     * @param json json
+     * @param nodeRef NodeRef
+     */
+    protected void addActivityEntry(String event, BlogPostInfo blog, 
+          SiteInfo site, WebScriptRequest req, JSONObject json, NodeRef nodeRef)
+    {
+       // We can only add activities against a site
+       if (site == null)
+       {
+          logger.info("Unable to add activity entry for blog " + event + " as no site given");
+          return;
+       }
+       
+       // What page is this for?
+       String page = req.getParameter("page");
+       if (page == null && json != null)
+       {
+          if (json.containsKey("page"))
+          {
+             page = (String)json.get("page");
+          }
+       }
+       if (page == null)
+       {
+          // Default
+          page = "blog-postview";
+       }
+       if (page.indexOf('?') == -1)
+       {
+          page += "?postId=" + blog.getSystemName();
+       }
+       
+       // Get the title
+       String title = blog.getTitle();
+       
+       try
+       {
+          JSONWriter jsonWriter = new JSONStringer()
+              .object()
+                  .key(TITLE).value(title)
+                  .key(PAGE).value(page);
+          
+          if (nodeRef != null)
+          {
+              // ALF-10182: the nodeRef needs to be included in the activity
+              // post to ensure read permissions are respected.
+              jsonWriter.key(PostLookup.JSON_NODEREF).value(nodeRef.toString());
+          }
+          
+          String data = jsonWriter.endObject().toString();
+          
+          activityService.postActivity(
+                "org.alfresco.blog.post-" + event,
+                site.getShortName(),
+                "blog", data);
+       }
+       catch(Exception e)
+       {
+          // Warn, but carry on
+          logger.warn("Error adding blog post " + event + " to activities feed", e);
+       }
+    }
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache) 
+    {
+       Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+       if (templateVars == null)
+       {
+          String error = "No parameters supplied";
+          throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+       }
+       
+       
+       // Parse the JSON, if supplied
+       JSONObject json = null;
+       String contentType = req.getContentType();
+       if (contentType != null && contentType.indexOf(';') != -1)
+       {
+          contentType = contentType.substring(0, contentType.indexOf(';'));
+       }
+       if (MimetypeMap.MIMETYPE_JSON.equals(contentType))
+       {
+          JSONParser parser = new JSONParser();
+          try
+          {
+             json = (JSONObject)parser.parse(req.getContent().getContent());
+          }
+          catch (IOException io)
+          {
+             throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid JSON: " + io.getMessage());
+          }
+          catch (ParseException pe)
+          {
+             throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid JSON: " + pe.getMessage());
+          }
+       }
+       
+       
+       // Did they request it by node reference or site?
+       NodeRef nodeRef = null;
+       SiteInfo site = null;
+       BlogPostInfo blog = null;
+       
+       if (templateVars.containsKey("site"))
+       {
+          // Site, and Optionally Blog Post
+          String siteName = templateVars.get("site");
+          site = siteService.getSite(siteName);
+          if (site == null)
+          {
+             String error = "Could not find site: " + siteName;
+             throw new WebScriptException(Status.STATUS_NOT_FOUND, error);
+          }
+          
+          // Did they give a blog post name too?
+          if (templateVars.containsKey("path"))
+          {
+             String name = templateVars.get("path");
+             blog = blogService.getBlogPost(siteName, name);
+             
+             if (blog == null)
+             {
+                String error = "Could not find blog '" + name + "' for site '" + 
+                               site.getShortName() + "'";
+                throw new WebScriptException(Status.STATUS_NOT_FOUND, error);
+             }
+             nodeRef = blog.getNodeRef();
+          }
+          else
+          {
+             // The NodeRef is the container (if it exists)
+             if (siteService.hasContainer(siteName, BlogServiceImpl.BLOG_COMPONENT))
+             {
+                nodeRef = siteService.getContainer(siteName, BlogServiceImpl.BLOG_COMPONENT);
+             }
+          }
+       }
+       else if (templateVars.containsKey("store_type") && 
+                templateVars.containsKey("store_id") &&
+                templateVars.containsKey("id"))
+       {
+          // NodeRef, should be a Blog Post
+          StoreRef store = new StoreRef(
+                templateVars.get("store_type"),
+                templateVars.get("store_id"));
+          
+          nodeRef = new NodeRef(store, templateVars.get("id"));
+          if (! nodeService.exists(nodeRef))
+          {
+             String error = "Could not find node: " + nodeRef;
+             throw new WebScriptException(Status.STATUS_NOT_FOUND, error);
+          }
+          
+          // Try to build the appropriate object for it
+          blog = blogService.getForNodeRef(nodeRef);
+          
+          // See if it's actually attached to a site
+          if (blog != null)
+          {
+             NodeRef container = blog.getContainerNodeRef();
+             if (container != null)
+             {
+                NodeRef maybeSite = nodeService.getPrimaryParent(container).getParentRef();
+                if (maybeSite != null)
+                {
+                   // Try to make it a site, will return Null if it isn't one
+                   site = siteService.getSite(maybeSite);
+                }
+             }
+          }
+       }
+       else
+       {
+          String error = "Unsupported template parameters found";
+          throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+       }
+       
+       // Have the real work done
+       return executeImpl(site, nodeRef, blog, req, json, status, cache); 
+    }
+    
+    protected abstract Map<String, Object> executeImpl(SiteInfo site,
+          NodeRef nodeRef, BlogPostInfo blog, WebScriptRequest req, 
+          JSONObject json, Status status, Cache cache);
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/BlogLibJs.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/BlogLibJs.java
new file mode 100644
index 00000000000..4759c7fce20
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/BlogLibJs.java
@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.model.BlogIntegrationModel;
+import org.alfresco.service.namespace.QName;
+import org.json.simple.JSONObject;
+
+/**
+ * This class is a port of a previous JavaScript library.
+ * 
+ * @author Neil Mc Erlean (based on previous JavaScript)
+ * @since 4.0
+ * @deprecated This class should not be extended or reused as it may be refactored.
+ */
+public class BlogLibJs
+{
+    /**
+     * Fetches the blog properties from the json object and adds them to an array
+     * using the correct property names as indexes.
+     */
+    public static Map<QName, Serializable> getBlogPropertiesArray(JSONObject json)
+    {
+        Map<QName, Serializable> arr = new HashMap<QName, Serializable>();
+        
+        putJSONEntryInMap(json, arr, "blogType",        BlogIntegrationModel.PROP_BLOG_IMPLEMENTATION);
+        putJSONEntryInMap(json, arr, "blogId",          BlogIntegrationModel.PROP_ID);
+        putJSONEntryInMap(json, arr, "blogName",        BlogIntegrationModel.PROP_NAME);
+        putJSONEntryInMap(json, arr, "blogDescription", BlogIntegrationModel.PROP_DESCRIPTION);
+        putJSONEntryInMap(json, arr, "blogUrl",         BlogIntegrationModel.PROP_URL);
+        putJSONEntryInMap(json, arr, "username",        BlogIntegrationModel.PROP_USER_NAME);
+        putJSONEntryInMap(json, arr, "password",        BlogIntegrationModel.PROP_PASSWORD);
+        return arr;
+    }
+
+    private static void putJSONEntryInMap(JSONObject json,
+            Map<QName, Serializable> arr, String jsonKey, QName mapKey)
+    {
+         if (json.containsKey(jsonKey))
+         {
+             arr.put(mapKey, (Serializable)json.get(jsonKey));
+         }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/BlogPostLibJs.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/BlogPostLibJs.java
new file mode 100644
index 00000000000..7e818eeee46
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/BlogPostLibJs.java
@@ -0,0 +1,132 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.model.BlogIntegrationModel;
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * This class is a port of a previous JavaScript library.
+ * 
+ * @author Neil Mc Erlean (based on previous JavaScript)
+ * @since 4.0
+ */
+public class BlogPostLibJs
+{
+    //FIXME It will be refactored when the other services are ported from JavaScript to Java.
+    
+    /**
+     * Checks whether a blog configuration is available
+     * This should at some point also check whether the configuration is enabled.
+     * 
+     * @param node the node that should be checked. Will check all parents if
+     *        the node itself doesn't contain a configuration.
+     * @return {boolean} whether a configuration could be found.
+     */
+    public static boolean hasExternalBlogConfiguration(NodeRef node, ServiceRegistry services)
+    {
+        if (node == null)
+        {
+            return false;
+        }
+        else if (services.getNodeService().hasAspect(node, BlogIntegrationModel.ASPECT_BLOG_DETAILS))
+        {
+            return true;
+        }
+        else
+        {
+            return hasExternalBlogConfiguration(services.getNodeService().getPrimaryParent(node).getParentRef(), services);
+        }
+    }
+    
+    public static Map<String, Object> getBlogPostData(NodeRef node, ServiceRegistry services)
+    {
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put("node", node);
+        String creator = (String)services.getNodeService().getProperty(node, ContentModel.PROP_CREATOR);
+        //ALF-18527
+        NodeRef person = services.getPersonService().getPersonOrNull(creator);
+        if (person != null)
+        {
+            data.put("author", person);
+        }
+        
+        data.put("commentCount", CommentsLibJs.getCommentsCount(node, services));
+       
+        // is the post published
+        Serializable published = services.getNodeService().getProperty(node, ContentModel.PROP_PUBLISHED);
+        boolean isPublished = published != null;
+        if (isPublished)
+        {
+           data.put("releasedDate", published);
+        }
+       
+        // draft
+        data.put("isDraft", !isPublished);
+       
+        // set the isUpdated flag
+        Date updatedDate = (Date) services.getNodeService().getProperty(node, ContentModel.PROP_UPDATED);
+        boolean isUpdated = updatedDate != null;
+        data.put("isUpdated", isUpdated);
+        if (isUpdated)
+        {
+           data.put("updatedDate", updatedDate);
+        }
+       
+        // fetch standard created/modified dates
+        data.put("createdDate", services.getNodeService().getProperty(node, ContentModel.PROP_CREATED));
+        data.put("modifiedDate", services.getNodeService().getProperty(node, ContentModel.PROP_MODIFIED));
+       
+        // does the external post require an update?
+        Date lastUpdate = (Date) services.getNodeService().getProperty(node, BlogIntegrationModel.PROP_LAST_UPDATE);
+        if (isPublished && lastUpdate != null)
+        {
+            // we either use the release or updated date
+            Date modifiedDate = (Date) data.get("releasedDate");
+            
+            if (isUpdated)
+            {
+                modifiedDate = (Date) data.get("updatedDate");
+            }
+            data.put("outOfDate", modifiedDate.getTime() - lastUpdate.getTime() > 5000L);
+        }
+        else
+        {
+            data.put("outOfDate", false);
+        }
+        
+        data.put("tags", services.getTaggingService().getTags(node));
+       
+       return data;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/CommentsLibJs.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/CommentsLibJs.java
new file mode 100644
index 00000000000..1da8eea028f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/CommentsLibJs.java
@@ -0,0 +1,99 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.model.ForumModel;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.RegexQNamePattern;
+
+/**
+ * This class is a port of a previous JavaScript library used by the blog webscript containers.
+ * 
+ * @author Neil Mc Erlean (based on existing JavaScript code)
+ * @since 4.0
+ */
+class CommentsLibJs
+{
+    // TODO It will likely be refactored into the Blog REST API class framework.
+    
+    private static final String COMMENTS_TOPIC_NAME = "Comments";
+
+    public static int getCommentsCount(NodeRef node, ServiceRegistry services)
+    {
+       return getComments(node, services).size();
+    }
+    
+    /**
+     * Returns all comment nodes for a given node.
+     * @return an array of comments.
+     */
+    public static List<ChildAssociationRef> getComments(NodeRef node, ServiceRegistry services)
+    {
+        List<ChildAssociationRef> result = new ArrayList<ChildAssociationRef>();
+        
+        NodeRef commentsFolder = getCommentsFolder(node, services);
+        if (commentsFolder != null)
+        {
+            List<ChildAssociationRef> children = services.getNodeService().getChildAssocs(commentsFolder, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);
+            if (!children.isEmpty())
+            {
+                result = children;
+            }
+        }
+        
+        return result;
+    }
+    
+    /**
+     * Returns the folder that contains all the comments.
+     * 
+     * We currently use the fm:discussable aspect where we
+     * add a "Comments" topic to it.
+     */
+    public static NodeRef getCommentsFolder(NodeRef node, ServiceRegistry services)
+    {
+        //FIXME These methods are from the original JavaScript. Should use the (soon to arrive) CommentService.
+        NodeRef result = null;
+        if (services.getNodeService().hasAspect(node, ForumModel.ASPECT_DISCUSSABLE))
+        {
+            List<ChildAssociationRef> forumFolders = services.getNodeService().getChildAssocs(node, ForumModel.ASSOC_DISCUSSION, RegexQNamePattern.MATCH_ALL);
+            // The JavaScript was retrieving the first child under this child-assoc so we'll do the same.
+            NodeRef forumFolder = forumFolders.get(0).getChildRef();
+            
+            List<ChildAssociationRef> topicFolder = services.getNodeService().getChildAssocs(forumFolder, ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, COMMENTS_TOPIC_NAME));
+            result = topicFolder.isEmpty() ? null : topicFolder.get(0).getChildRef();
+        }
+        return result;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/blog/BlogGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/blog/BlogGet.java
new file mode 100644
index 00000000000..6cf3bd97322
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/blog/BlogGet.java
@@ -0,0 +1,81 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs.blog;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.repo.web.scripts.blogs.AbstractBlogWebScript;
+import org.alfresco.service.cmr.blog.BlogPostInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the blog.get web script.
+ * 
+ * @author Neil Mc Erlean (based on existing JavaScript webscript controllers)
+ * @since 4.0
+ */
+public class BlogGet extends AbstractBlogWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(SiteInfo site, NodeRef containerNodeRef,
+         BlogPostInfo blog, WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+    {
+       if (blog != null)
+       {
+          // They appear to have supplied a blog post itself...
+          // Oh well, let's hope for the best!
+       }
+          
+       if (containerNodeRef == null && site != null)
+       {
+          // They want to know about a blog container on a
+          //  site where nothing has lazy-created the container
+          // Give them info on the site for now, should be close enough!
+          containerNodeRef = site.getNodeRef();
+       }
+       
+       if (containerNodeRef == null)
+       {
+          // Looks like they've asked for something that isn't there 
+          throw new WebScriptException(Status.STATUS_NOT_FOUND, "Blog Not Found");
+       }
+
+       // Build the response
+       // (For now, we just supply the noderef, but when we have a 
+       //  proper blog details object we'll use that)
+       Map<String, Object> model = new HashMap<String, Object>();
+       model.put(ITEM, containerNodeRef);
+
+       return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/blog/BlogPut.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/blog/BlogPut.java
new file mode 100644
index 00000000000..e3a01ebd2b5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/blog/BlogPut.java
@@ -0,0 +1,104 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs.blog;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.model.BlogIntegrationModel;
+import org.alfresco.repo.blog.BlogServiceImpl;
+import org.alfresco.repo.web.scripts.blogs.AbstractBlogWebScript;
+import org.alfresco.repo.web.scripts.blogs.BlogLibJs;
+import org.alfresco.service.cmr.blog.BlogPostInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.namespace.QName;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the blog.put web script.
+ * 
+ * TODO Push most of the logic from this into the BlogService
+ * 
+ * @author Neil Mc Erlean (based on existing JavaScript webscript controllers)
+ * @since 4.0
+ */
+public class BlogPut extends AbstractBlogWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(SiteInfo site, NodeRef containerNodeRef,
+         BlogPostInfo blog, WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+    {
+       if (blog != null)
+       {
+          // They appear to have supplied a blog post itself...
+          // Oh well, let's hope for the best!
+           throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Blog post should not be updated via this web script.");
+       }
+       
+       if (site != null && containerNodeRef == null)
+       {
+          // Force the lazy creation
+          // This is a bit icky, but it'll have to do for now...
+          containerNodeRef = siteService.createContainer(
+                site.getShortName(), BlogServiceImpl.BLOG_COMPONENT, null, null);
+       }
+        
+       // Do the work
+       updateBlog(containerNodeRef, json);
+
+       // Record it as done
+       Map<String, Object> model = new HashMap<String, Object>();
+       model.put("item", containerNodeRef);
+
+       return model;
+    }
+    
+    /**
+     * Creates a post inside the passed forum node.
+     */
+    @SuppressWarnings("deprecation")
+    private void updateBlog(NodeRef node, JSONObject json)
+    {
+        Map<QName, Serializable> arr = BlogLibJs.getBlogPropertiesArray(json);
+        
+        if (nodeService.hasAspect(node, BlogIntegrationModel.ASPECT_BLOG_DETAILS))
+        {
+            Map<QName, Serializable> properties = nodeService.getProperties(node);
+            properties.putAll(arr);
+            nodeService.setProperties(node, properties);
+        }
+        else
+        {
+            nodeService.addAspect(node, BlogIntegrationModel.ASPECT_BLOG_DETAILS, arr);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/post/BlogPostDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/post/BlogPostDelete.java
new file mode 100644
index 00000000000..2c492101db5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/post/BlogPostDelete.java
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs.post;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import org.alfresco.repo.web.scripts.blogs.AbstractBlogWebScript;
+import org.alfresco.service.cmr.blog.BlogPostInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the blog-posts.get web script.
+ * 
+ * @author Neil Mc Erlean (based on existing JavaScript webscript controllers)
+ * @since 4.0
+ */
+public class BlogPostDelete extends AbstractBlogWebScript
+{
+    protected static final String MSG_BLOG_DELETED = "blog-post.msg.deleted";
+    
+    @Override
+    protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nodeRef,
+         BlogPostInfo blog, WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+    {
+        final ResourceBundle rb = getResources();
+        
+        if (blog == null)
+        {
+           throw new WebScriptException(Status.STATUS_NOT_FOUND, "Blog Post Not Found");
+        }
+        
+        // TODO Get this from the BlogPostInfo Object
+        final boolean isDraftBlogPost = blogService.isDraftBlogPost(blog.getNodeRef());
+        
+        // Have it deleted
+        blogService.deleteBlogPost(blog);
+        
+        // If we're in a site, and it isn't a draft, add an activity
+        if (site != null && !isDraftBlogPost)
+        {
+            addActivityEntry("deleted", blog, site, req, json, nodeRef);
+        }
+
+        // Report it as deleted
+        Map<String, Object> model = new HashMap<String, Object>();
+        String message = rb.getString(MSG_BLOG_DELETED);
+        model.put("message",MessageFormat.format(message, blog.getNodeRef()));
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/post/BlogPostGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/post/BlogPostGet.java
new file mode 100644
index 00000000000..1e3f0f81518
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/post/BlogPostGet.java
@@ -0,0 +1,88 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs.post;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.repo.web.scripts.blogs.AbstractBlogWebScript;
+import org.alfresco.repo.web.scripts.blogs.BlogPostLibJs;
+import org.alfresco.service.cmr.blog.BlogPostInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the blog-posts.get web script.
+ * 
+ * @author Neil Mc Erlean (based on existing JavaScript webscript controllers)
+ * @since 4.0
+ */
+public class BlogPostGet extends AbstractBlogWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nodeRef,
+         BlogPostInfo blog, WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+    {
+        if (blog == null)
+        {
+           throw new WebScriptException(Status.STATUS_NOT_FOUND, "Blog Post Not Found");
+        }
+
+        // Build the response
+        Map<String, Object> model = new HashMap<String, Object>();
+        
+        // TODO Fetch this from the BlogPostInfo object
+        NodeRef node = blog.getNodeRef();
+        Map<String, Object> item = BlogPostLibJs.getBlogPostData(node, services);
+        model.put(ITEM, item);
+        model.put(POST, blog);
+        
+        model.put("externalBlogConfig", BlogPostLibJs.hasExternalBlogConfiguration(node, services));
+        
+        int contentLength = -1;
+        String arg = req.getParameter("contentLength");
+        if (arg != null)
+        {
+            try
+            {
+                contentLength = Integer.parseInt(arg);
+            }
+            catch (NumberFormatException ignored)
+            {
+                // Intentionally empty
+            }
+        }
+        
+        model.put("contentLength", contentLength);
+        
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/AbstractGetBlogWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/AbstractGetBlogWebScript.java
new file mode 100644
index 00000000000..2f9a8ec0771
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/AbstractGetBlogWebScript.java
@@ -0,0 +1,229 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs.posts;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.web.scripts.blogs.AbstractBlogWebScript;
+import org.alfresco.repo.web.scripts.blogs.BlogPostLibJs;
+import org.alfresco.service.cmr.blog.BlogPostInfo;
+import org.alfresco.service.cmr.blog.BlogService.RangedDateProperty;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.util.Pair;
+import org.alfresco.util.ScriptPagingDetails;
+import org.alfresco.util.UrlUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.surf.util.URLDecoder;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Neil Mc Erlean (based on existing JavaScript webscript controllers)
+ * @since 4.0
+ */
+public abstract class AbstractGetBlogWebScript extends AbstractBlogWebScript
+{
+    private static final Log log = LogFactory.getLog(AbstractGetBlogWebScript.class);
+
+    @Override
+    protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nonSiteContainer,
+         BlogPostInfo blog, WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+        
+        // process additional parameters. <index, count>
+        PagingRequest pagingReq = parsePagingParams(req);
+        pagingReq.setRequestTotalCountMax(pagingReq.getSkipCount() + pagingReq.getRequestTotalCountMax());
+        
+        // begin and end date.
+        // Legacy note: these dates are URL query parameters in int form.
+        Date fromDate = parseDateParam(req, "fromDate");
+        Date toDate = parseDateParam(req, "toDate");
+        
+        String tag = req.getParameter("tag");
+        if (tag == null || tag.length() == 0) 
+        {
+           tag = null;
+        }
+        else
+        {
+           // Tags can be full unicode strings, so decode
+           tag = URLDecoder.decode(tag);
+        }
+        
+        // One webscript (blog-posts-new.get) uses a 'numdays' parameter as a 'fromDate'.
+        // This is a hacky solution to this special case. FIXME
+        if (this.getClass().equals(BlogPostsNewGet.class))
+        {
+            // Default is for 'now' minus seven days.
+            final long oneDayInMilliseconds = 24 * 60 * 60 * 1000;
+            final long sevenDaysInMilliseconds = 7 * oneDayInMilliseconds;
+            fromDate = new Date(System.currentTimeMillis() - sevenDaysInMilliseconds);
+            
+            // But if there is a numdays parameter then that changes the fromDate
+            String numDays = req.getServiceMatch().getTemplateVars().get("numdays");
+            if (numDays != null)
+            {
+                Integer numDaysInt = Integer.parseInt(numDays);
+                fromDate = new Date(System.currentTimeMillis() - (numDaysInt * oneDayInMilliseconds));
+            }
+        }
+        
+        // Fetch and assign the data
+        PagingResults<BlogPostInfo> blogPostList = 
+           getBlogPostList(site, nonSiteContainer, fromDate, toDate, tag, pagingReq);
+        
+        // We need the container for various bits
+        NodeRef container = nonSiteContainer;
+        if(container == null)
+        {
+           // Container mustn't exist yet
+           // Fake it with the site for permissions checking reasons
+           container = site.getNodeRef();
+        }
+                                          
+        if (log.isDebugEnabled())
+        {
+            StringBuilder msg = new StringBuilder();
+            msg.append("Retrieved ").append(blogPostList.getPage().size()).append(" blog posts in page.");
+            log.debug(msg.toString());
+        }
+        
+        createFtlModel(req, model, container, pagingReq, blogPostList);
+        
+        return model;
+    }
+
+    protected void createFtlModel(WebScriptRequest req, Map<String, Object> model, NodeRef node, PagingRequest pagingReq,
+                                  PagingResults<BlogPostInfo> blogPostList)
+    {
+        Map<String, Object> blogPostsData = new HashMap<String, Object>();
+        
+        final Pair<Integer, Integer> totalResultCount = blogPostList.getTotalResultCount();
+        int total = blogPostList.getPage().size();
+        if (totalResultCount != null && totalResultCount.getFirst() != null)
+        {
+           total = totalResultCount.getFirst();
+        }
+        //FIXME What to do? null
+        blogPostsData.put("total", total);
+        blogPostsData.put("pageSize", pagingReq.getMaxItems());
+        blogPostsData.put("startIndex", pagingReq.getSkipCount());
+        blogPostsData.put("itemCount", blogPostList.getPage().size());
+        
+        if (total == pagingReq.getRequestTotalCountMax())
+        {
+            blogPostsData.put("totalRecordsUpper", true);
+        }
+        else
+        {
+            blogPostsData.put("totalRecordsUpper", false);
+        }
+        
+        List<Map<String, Object>> blogPostDataSets = new ArrayList<Map<String, Object>>(blogPostList.getPage().size());
+        for (BlogPostInfo postInfo : blogPostList.getPage())
+        {
+            Map<String, Object> data = BlogPostLibJs.getBlogPostData(postInfo.getNodeRef(), services);
+            blogPostDataSets.add(data);
+        }
+        blogPostsData.put("items", blogPostDataSets);
+
+        model.put("data", blogPostsData);
+
+        // fetch the contentLength param
+        String contentLengthStr = req.getParameter("contentLength");
+        int contentLength = contentLengthStr == null ? -1 : Integer.parseInt(contentLengthStr);
+        model.put("contentLength", contentLength);
+        
+        // assign the blog node
+        model.put("blog", node);
+        model.put("externalBlogConfig", BlogPostLibJs.hasExternalBlogConfiguration(node, services));
+    }
+    
+    private PagingRequest parsePagingParams(WebScriptRequest req)
+    {
+        return ScriptPagingDetails.buildPagingRequest(req, 1000);
+    }
+
+    private Date parseDateParam(WebScriptRequest req, String paramName)
+    {
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String dateStr = templateVars.get(paramName);
+        if(dateStr == null)
+        {
+           // Try on the parameters instead
+           dateStr = req.getParameter(paramName);
+        }
+        
+        // Parse if available
+        Date result = null;
+        if (dateStr != null)
+        {
+            result = new Date(Long.parseLong(dateStr));
+        }
+        return result;
+    }
+    
+    
+    /**
+     * Fetches all posts of the given blog
+     */
+    private PagingResults<BlogPostInfo> getBlogPostList(SiteInfo site, NodeRef nonSiteContainer, 
+          Date fromDate, Date toDate, String tag, PagingRequest pagingReq)
+    {
+        // Currently we only support CannedQuery-based gets without tags:
+        if (tag == null || tag.trim().isEmpty())
+        {
+            return getBlogResultsImpl(site, nonSiteContainer, fromDate, toDate, pagingReq);
+        }
+        else
+        {
+            RangedDateProperty dateRange = new RangedDateProperty(fromDate, toDate, ContentModel.PROP_CREATED);  
+            if(site != null)
+            {
+               return blogService.findBlogPosts(site.getShortName(), dateRange, tag, pagingReq);
+            }
+            else
+            {
+               return blogService.findBlogPosts(nonSiteContainer, dateRange, tag, pagingReq);
+            }
+        }
+    }
+    
+    protected abstract PagingResults<BlogPostInfo> getBlogResultsImpl(
+          SiteInfo site, NodeRef nonSiteContainer, Date fromDate, Date toDate, PagingRequest pagingReq);
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsGet.java
new file mode 100644
index 00000000000..8d38f0bdc8d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsGet.java
@@ -0,0 +1,61 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs.posts;
+
+import java.util.Date;
+
+import org.alfresco.query.EmptyPagingResults;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.service.cmr.blog.BlogPostInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+
+/**
+ * This class is the controller for the blog-posts.get web script.
+ * 
+ * @author Neil Mc Erlean (based on existing JavaScript webscript controllers)
+ * @since 4.0
+ */
+public class BlogPostsGet extends AbstractGetBlogWebScript
+{
+    @SuppressWarnings("deprecation")
+    @Override
+    protected PagingResults<BlogPostInfo> getBlogResultsImpl(
+          SiteInfo site, NodeRef node, Date fromDate, Date toDate, PagingRequest pagingReq)
+    {
+        // As it uses deprecated methods, this bit can be a bit hacky...
+        if (node == null)
+        {
+           // Site based request, but no container exists yet
+           return new EmptyPagingResults<BlogPostInfo>();
+        }
+       
+        // This intentionally uses the deprecated method in the foundation service.
+        // In fact the method is there specifically for this class.
+        return blogService.getMyDraftsAndAllPublished(node, fromDate, toDate, pagingReq);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsMyDraftsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsMyDraftsGet.java
new file mode 100644
index 00000000000..3152c8390ca
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsMyDraftsGet.java
@@ -0,0 +1,59 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs.posts;
+
+import java.util.Date;
+
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.blog.BlogPostInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+
+/**
+ * This class is the controller for the blog-posts-mydrafts.get web script.
+ * Based on the original JavaScript webscript controller
+ * 
+ * @author Neil Mc Erlean (based on existing JavaScript webscript controllers)
+ * @since 4.0
+ */
+public class BlogPostsMyDraftsGet extends AbstractGetBlogWebScript
+{
+    @Override
+    protected PagingResults<BlogPostInfo> getBlogResultsImpl(SiteInfo site, NodeRef node, Date fromDate, Date toDate, PagingRequest pagingReq)
+    {
+        String user = AuthenticationUtil.getFullyAuthenticatedUser();
+        if(site != null)
+        {
+           return blogService.getDrafts(site.getShortName(), user, pagingReq);
+        }
+        else
+        {
+           return blogService.getDrafts(node, user, pagingReq);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsMyPublishedGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsMyPublishedGet.java
new file mode 100644
index 00000000000..d226a12fc4d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsMyPublishedGet.java
@@ -0,0 +1,59 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs.posts;
+
+import java.util.Date;
+
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.blog.BlogPostInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+
+/**
+ * This class is the controller for the blog-posts-mypublished.get web script.
+ * 
+ * @author Neil Mc Erlean (based on existing JavaScript webscript controllers)
+ * @since 4.0
+ */
+public class BlogPostsMyPublishedGet extends AbstractGetBlogWebScript
+{
+    @Override
+    protected PagingResults<BlogPostInfo> getBlogResultsImpl(
+          SiteInfo site, NodeRef node, Date fromDate, Date toDate, PagingRequest pagingReq)
+    {
+        String fullyAuthenticatedUser = AuthenticationUtil.getFullyAuthenticatedUser();
+        if(site != null)
+        {
+           return blogService.getPublished(site.getShortName(), fromDate, toDate, fullyAuthenticatedUser, pagingReq);
+        }
+        else
+        {
+           return blogService.getPublished(node, fromDate, toDate, fullyAuthenticatedUser, pagingReq);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsNewGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsNewGet.java
new file mode 100644
index 00000000000..2166418dcfe
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsNewGet.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs.posts;
+
+import java.util.Date;
+
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.service.cmr.blog.BlogPostInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+
+/**
+ * This class is the controller for the blog-posts-publishedext.get web script.
+ * 
+ * @author Neil Mc Erlean (based on existing JavaScript webscript controllers)
+ * @since 4.0
+ */
+public class BlogPostsNewGet extends AbstractGetBlogWebScript
+{
+    @Override
+    protected PagingResults<BlogPostInfo> getBlogResultsImpl(
+          SiteInfo site, NodeRef node, Date fromDate, Date toDate, PagingRequest pagingReq)
+    {
+       if(site != null)
+       {
+          return blogService.getPublished(site.getShortName(), fromDate, toDate, null, pagingReq);
+       }
+       else
+       {
+          return blogService.getPublished(node, fromDate, toDate, null, pagingReq);
+       }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPerMonthGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPerMonthGet.java
new file mode 100644
index 00000000000..7b45916e9c8
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPerMonthGet.java
@@ -0,0 +1,170 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs.posts;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.service.cmr.blog.BlogPostInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the blog-posts-mypublished.get web script.
+ * 
+ * @author Neil Mc Erlean (based on existing JavaScript webscript controllers)
+ * @since 4.0
+ */
+public class BlogPostsPerMonthGet extends AbstractGetBlogWebScript
+{
+    @Override
+    protected PagingResults<BlogPostInfo> getBlogResultsImpl(
+          SiteInfo site, NodeRef node, Date fromDate, Date toDate, PagingRequest pagingReq)
+    {
+        if(site != null)
+        {
+           return blogService.getPublished(site.getShortName(), fromDate, toDate, null, pagingReq);
+        }
+        else
+        {
+           return blogService.getPublished(node, fromDate, toDate, null, pagingReq);
+        }
+    }
+
+    @Override
+    protected void createFtlModel(WebScriptRequest req, Map<String, Object> model, NodeRef node, PagingRequest pagingReq, PagingResults<BlogPostInfo> blogPostList)
+    {
+        model.put(DATA, getBlogPostMonths(blogPostList));
+    }
+    
+    
+    /**
+     * Ported from blog-posts-per-month.get.js
+     */
+    @SuppressWarnings("deprecation")
+    private Date getBeginOfMonthDate(Date date)
+    {
+        //TODO These date processing methods are copied almost verbatim from JavaScript to preserve behaviour.
+        // However they should be updated to use java.util.Calendar as the current implementation assumes a Gregorian calendar.
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(date.getYear(), date.getMonth(), 1);
+        return calendar.getTime();
+    }
+    
+    /**
+     * Returns the date representing the last second of a month (23:59:59)
+     * Ported from blog-posts-per-month.get.js
+     */
+    @SuppressWarnings("deprecation")
+    private Date getEndOfMonthDate(Date date)
+    {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(date.getYear(), date.getMonth(), date.getDay());
+        // In Gregorian calendar, this would be 31 for January, 30 for March, 28 or 29 for February.
+        int lastDayOfSpecifiedMonth = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+        calendar.set(date.getYear(), date.getMonth(), lastDayOfSpecifiedMonth, 23, 59, 59);
+        
+        return calendar.getTime();
+    }
+    
+    /**
+     * Create an object containing information about the month specified by date.
+     * Ported from blog-posts-per-month.get.js
+     */
+    @SuppressWarnings("deprecation")
+    private Map<String, Object> getMonthDataObject(Date date)
+    {
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put("year", date.getYear() + 1900);
+        data.put("month", date.getMonth());
+        data.put("firstPostInMonth", date);
+        data.put("beginOfMonth", getBeginOfMonthDate(date));
+        data.put("endOfMonth", getEndOfMonthDate(date));
+        data.put("count", 1);
+        
+        return data;
+    }
+    
+    /**
+     * Fetches data for each month for which posts exist, plus the count of each.
+     * Note: If no posts could be found, this method will return the current month
+     *       but with a count of posts equals zero.
+     * Ported from blog-posts-per-month.get.js
+     */
+    @SuppressWarnings("deprecation")
+    private List<Map<String, Object>> getBlogPostMonths(PagingResults<BlogPostInfo> nodes)
+    {
+        // will hold the months information
+        List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
+       
+        // do we have posts?
+        if (!nodes.getPage().isEmpty())
+        {
+            int currYear = -1;
+            int currMonth = -1;
+            Map<String, Object> currData = null;
+            for (int x = 0; x < nodes.getPage().size(); x++)
+            {
+                NodeRef node = nodes.getPage().get(x).getNodeRef();
+                Date date = (Date) nodeService.getProperty(node, ContentModel.PROP_PUBLISHED);
+                
+                // is this a new month?
+                if (currYear != date.getYear() + 1900 || currMonth != date.getMonth())
+                {
+                    currYear = date.getYear() + 1900;
+                    currMonth = date.getMonth();
+                    currData = getMonthDataObject(date);
+                    data.add(currData);
+                }
+                // otherwise just increment the counter
+                else
+                {
+                    Object countObj = currData.get("count");
+                    Integer countInt = countObj == null ? 0 : (Integer)countObj;
+                    
+                    currData.put("count", countInt + 1);
+                }
+            }
+        }
+        // if not, add the current month with count = 0
+        else
+        {
+            Map<String, Object> emptyData = getMonthDataObject(new Date());
+            emptyData.put("count", 0);
+            data.add(emptyData);
+        }
+        
+        return data;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPost.java
new file mode 100644
index 00000000000..0cd2843f7d0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPost.java
@@ -0,0 +1,304 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs.posts;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.web.scripts.blogs.AbstractBlogWebScript;
+import org.alfresco.repo.web.scripts.blogs.BlogPostLibJs;
+import org.alfresco.service.cmr.blog.BlogPostInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.tagging.TaggingService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the blog-posts.post web script.
+ * 
+ * @author Neil Mc Erlean (based on existing JavaScript webscript controllers)
+ * @since 4.0
+ */
+public class BlogPostsPost extends AbstractBlogWebScript
+{
+    private static final Log log = LogFactory.getLog(BlogPostsPost.class);
+
+    // Injected services
+    private TaggingService taggingService;
+    
+    public void setTaggingService(TaggingService taggingService)
+    {
+        this.taggingService = taggingService;
+    }
+    
+    @Override
+    protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nodeRef,
+         BlogPostInfo blog, WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+        
+        // If they're doing Path Based rather than Site Based, ensure
+        //  that the Container is a Tag Scope
+        if(site == null && nodeRef != null)
+        {
+           ensureTagScope(nodeRef);
+        }
+
+        // Have the Blog Post created
+        JsonParams jsonPostParams = parsePostParams(json);
+        BlogPostInfo post = createBlogPost(jsonPostParams, site, nodeRef);
+        
+        Map<String, Object> blogPostData = BlogPostLibJs.getBlogPostData(post.getNodeRef(), services);
+        model.put(ITEM, blogPostData);
+        model.put(EXTERNAL_BLOG_CONFIG, BlogPostLibJs.hasExternalBlogConfiguration(nodeRef, services));
+        
+        boolean isDraft = blogPostData.get("isDraft") != null &&
+                          ((Boolean)blogPostData.get("isDraft")).booleanValue();
+        if (jsonPostParams.getSite() != null &&
+                jsonPostParams.getContainer() != null &&
+                jsonPostParams.getPage() != null &&
+                !isDraft)
+        {
+            addActivityEntry("created", post, site, req, json, post.getNodeRef());
+        }
+        
+        return model;
+    }
+    
+    private JsonParams parsePostParams(JSONObject json)
+    {
+       JsonParams result = new JsonParams();
+       if (json.containsKey(TITLE))
+       {
+          result.setTitle((String)json.get(TITLE));
+       }
+       if (json.containsKey(CONTENT))
+       {
+          result.setContent((String)json.get(CONTENT));
+       }
+       if (json.containsKey(DRAFT))
+       {
+          Object draft = json.get(DRAFT);
+          if (draft instanceof Boolean)
+          {
+             result.setIsDraft((Boolean)draft);
+          }
+          else
+          {
+             result.setIsDraft( Boolean.parseBoolean((String)draft) );
+          }
+       }
+       
+       // If there are no tags, this is a java.lang.String "".
+       // If there are any tags, it's a JSONArray of strings. One or more.
+       if (json.containsKey(TAGS))
+       {
+          Object tagsObj = json.get(TAGS);
+          List<String> tags = new ArrayList<String>();
+          if (tagsObj instanceof JSONArray)
+          {
+             JSONArray tagsJsonArray = (JSONArray)tagsObj;
+             for (int i = 0; i < tagsJsonArray.size(); i++)
+             {
+                tags.add( (String)tagsJsonArray.get(i) );
+             }
+          }
+          else
+          {
+             tags.add(tagsObj.toString());
+          }
+          result.setTags(tags);
+       }
+       if (json.containsKey(SITE))
+       {
+          result.setSite((String)json.get(SITE));
+       }
+       if (json.containsKey(PAGE))
+       {
+          result.setPage((String)json.get(PAGE));
+       }
+       if (json.containsKey(CONTAINER))
+       {
+          result.setContainer((String)json.get(CONTAINER));
+       }
+
+       return result;
+    }
+    
+    /**
+     * Taken from JS
+     * @param node NodeRef
+     */
+    private void ensureTagScope(NodeRef node)
+    {
+       if (!taggingService.isTagScope(node))
+       {
+           taggingService.addTagScope(node);
+       }
+       
+       
+       // also check the parent (the site!)
+       NodeRef parent = nodeService.getPrimaryParent(node).getParentRef();
+       if (!taggingService.isTagScope(parent))
+       {
+           taggingService.addTagScope(parent);
+       }
+    }
+    
+    /**
+     * Creates a blog post
+     */
+    private BlogPostInfo createBlogPost(JsonParams jsonParams, SiteInfo site, NodeRef blogNode)
+    {
+        String titleParam = jsonParams.getTitle() == null ? "" : jsonParams.getTitle();
+        String contentParam = jsonParams.getContent() == null ? "" : jsonParams.getContent();
+        boolean isDraftParam = jsonParams.getIsDraft();
+        
+        if (log.isDebugEnabled())
+        {
+            StringBuilder msg = new StringBuilder();
+            msg.append("Creating blog-post '").append(titleParam).append("'");
+            if (isDraftParam)
+            {
+                msg.append(" DRAFT");
+            }
+            log.debug(msg.toString());
+        }
+        
+        List<String> tagsParam = new ArrayList<String>();
+        if (jsonParams.getTags() != null)
+        {
+            tagsParam.addAll(jsonParams.getTags());
+        }
+        
+        BlogPostInfo newPostNode;
+        if(site != null)
+        {
+           newPostNode = blogService.createBlogPost(
+                 site.getShortName(), titleParam, contentParam, isDraftParam);
+        }
+        else
+        {
+           newPostNode = blogService.createBlogPost(
+                 blogNode, titleParam, contentParam, isDraftParam);
+        }
+        
+        // Ignore empty string tags
+        List<String> nonEmptyTags = new ArrayList<String>();
+        for (String tag : tagsParam)
+        {
+            if (!tag.trim().isEmpty())
+            {
+                nonEmptyTags.add(tag);
+            }
+        }
+        if (!nonEmptyTags.isEmpty())
+        {
+            taggingService.setTags(newPostNode.getNodeRef(), nonEmptyTags);
+        }
+        
+        return newPostNode;
+    }
+    
+    /**
+     * A simple POJO class for the parsed JSON from the POST body.
+     */
+    class JsonParams
+    {
+        private String title;
+        private String content;
+        private boolean isDraft = false;
+        private List<String> tags;
+        private String site;
+        private String container;
+        private String page;
+        
+        public String getTitle()
+        {
+            return title;
+        }
+        public void setTitle(String title)
+        {
+            this.title = title;
+        }
+        public String getContent()
+        {
+            return content;
+        }
+        public void setContent(String content)
+        {
+            this.content = content;
+        }
+        public boolean getIsDraft()
+        {
+            return isDraft;
+        }
+        public void setIsDraft(boolean isDraft)
+        {
+            this.isDraft = isDraft;
+        }
+        public List<String> getTags()
+        {
+            return tags;
+        }
+        public void setTags(List<String> tags)
+        {
+            this.tags = tags;
+        }
+        public String getSite()
+        {
+            return site;
+        }
+        public void setSite(String site)
+        {
+            this.site = site;
+        }
+        public String getContainer()
+        {
+            return container;
+        }
+        public void setContainer(String container)
+        {
+            this.container = container;
+        }
+        public String getPage()
+        {
+            return page;
+        }
+        public void setPage(String page)
+        {
+            this.page = page;
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bulkimport/AbstractBulkFileSystemImportWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bulkimport/AbstractBulkFileSystemImportWebScript.java
new file mode 100644
index 00000000000..3e98a9d142f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bulkimport/AbstractBulkFileSystemImportWebScript.java
@@ -0,0 +1,222 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.bulkimport;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.Date;
+
+import org.alfresco.repo.bulkimport.BulkFilesystemImporter;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.WebScriptException;
+
+/**
+ * contains common fields and methods for the import web scripts.
+ */
+public class AbstractBulkFileSystemImportWebScript extends DeclarativeWebScript
+{
+    protected static final Log logger = LogFactory.getLog(BulkFilesystemImporter.class);
+    
+    protected static final String WEB_SCRIPT_URI_BULK_FILESYSTEM_IMPORT_STATUS = "/bulkfsimport/status";
+    
+	protected static final String PARAMETER_TARGET_NODEREF = "targetNodeRef";
+	protected static final String PARAMETER_TARGET_PATH    = "targetPath";
+
+	protected static final String COMPANY_HOME_NAME = "Company Home";
+	protected static final String COMPANY_HOME_PATH = "/" + COMPANY_HOME_NAME;
+    
+    // Web scripts parameters (common)
+	protected static final String PARAMETER_REPLACE_EXISTING        = "replaceExisting";
+	protected static final String PARAMETER_EXISTING_FILE_MODE      = "existingFileMode";
+	protected static final String PARAMETER_VALUE_REPLACE_EXISTING 	= "replaceExisting";
+	protected static final String PARAMETER_SOURCE_DIRECTORY       	= "sourceDirectory";
+	protected static final String PARAMETER_DISABLE_RULES		    = "disableRules";
+	protected static final String PARAMETER_VALUE_DISABLE_RULES		= "disableRules";
+
+	protected static final String IMPORT_ALREADY_IN_PROGRESS_MODEL_KEY = "importInProgress";
+	protected static final String IMPORT_ALREADY_IN_PROGRESS_ERROR_KEY ="bfsit.error.importAlreadyInProgress";
+
+	protected static final String PARAMETER_BATCH_SIZE              = "batchSize";
+	protected static final String PARAMETER_NUM_THREADS             = "numThreads";
+	
+	protected FileFolderService fileFolderService;
+	protected Repository repository;
+	   
+	protected volatile boolean importInProgress;
+    
+	protected NodeRef getTargetNodeRef(String targetNodeRefStr, String targetPath) throws FileNotFoundException
+	{
+		NodeRef targetNodeRef;
+		
+		if (targetNodeRefStr == null || targetNodeRefStr.trim().length() == 0)
+        {
+            if (targetPath == null || targetPath.trim().length() == 0)
+            {
+                throw new WebScriptException("Error: neither parameter '" + PARAMETER_TARGET_NODEREF +
+                                           "' nor parameter '" + PARAMETER_TARGET_PATH +
+                                           "' was provided, but at least one is required !");
+            }
+    		targetNodeRef = convertPathToNodeRef(targetPath.trim());
+        }
+        else
+        {
+            targetNodeRef = new NodeRef(targetNodeRefStr.trim());
+        }
+
+		return targetNodeRef;
+	}
+
+	protected NodeRef convertPathToNodeRef(String targetPath) throws FileNotFoundException
+	{
+	    NodeRef result          = null;
+	    NodeRef companyHome     = repository.getCompanyHome();
+	    String  cleanTargetPath = targetPath.replaceAll("/+", "/");
+		
+	    if (cleanTargetPath.startsWith(COMPANY_HOME_PATH))
+	        cleanTargetPath = cleanTargetPath.substring(COMPANY_HOME_PATH.length());
+	    
+	    if (cleanTargetPath.startsWith("/"))
+	        cleanTargetPath = cleanTargetPath.substring(1);
+	    
+	    if (cleanTargetPath.endsWith("/"))
+	        cleanTargetPath = cleanTargetPath.substring(0, cleanTargetPath.length() - 1);
+	    
+	    if (cleanTargetPath.length() == 0)
+	        result = companyHome;
+	    else
+	    {
+	    	FileInfo info = fileFolderService.resolveNamePath(companyHome, Arrays.asList(cleanTargetPath.split("/")));
+	        if(info == null)
+	        	throw new WebScriptException("could not determine NodeRef for path :'"+cleanTargetPath+"'");
+	        
+	        result = info.getNodeRef();
+	    }
+	    
+	    return(result);
+	}
+
+	protected String buildTextMessage(Throwable t)
+	{
+	    StringBuffer result        = new StringBuffer();
+	    String       timeOfFailure = (new Date()).toString();
+	    String       hostName      = null;
+	    String       ipAddress     = null;
+	
+	    try
+	    {
+	        hostName  = InetAddress.getLocalHost().getHostName();
+	        ipAddress = InetAddress.getLocalHost().getHostAddress();
+	    }
+	    catch (UnknownHostException uhe)
+	    {
+	        hostName  = "unknown";
+	        ipAddress = "unknown";
+	    }
+	
+	    result.append("\nTime of failure:             " + timeOfFailure);
+	    result.append("\nHost where failure occurred: " + hostName + " (" + ipAddress + ")");
+	    
+	    if (t != null)
+	    {
+	        result.append("\nRoot exception:");
+	        result.append(renderExceptionStackAsText(t));
+	    }
+	    else
+	    {
+	        result.append("\nNo exception was provided.");
+	    }
+	
+	    return(result.toString());
+	}
+
+	private String renderExceptionStackAsText( Throwable t)
+	{
+	    StringBuffer result = new StringBuffer();
+	
+	    if (t != null)
+	    {
+	        String    message = t.getMessage();
+	        Throwable cause   = t.getCause();
+	
+	        if (cause != null)
+	        {
+	            result.append(renderExceptionStackAsText(cause));
+	            result.append("\nWrapped by:");
+	        }
+	
+	        if (message == null)
+	        {
+	            message = "";
+	        }
+	
+	        result.append("\n");
+	        result.append(t.getClass().getName());
+	        result.append(": ");
+	        result.append(message);
+	        result.append("\n");
+	        result.append(renderStackTraceElements(t.getStackTrace()));
+	    }
+	
+	    return(result.toString());
+	}
+
+	private String renderStackTraceElements(StackTraceElement[] elements)
+	{
+	    StringBuffer result = new StringBuffer();
+	
+	    if (elements != null)
+	    {
+	        for (int i = 0; i < elements.length; i++)
+	        {
+	            result.append("\tat " + elements[i].toString() + "\n");
+	        }
+	    }
+	
+	    return(result.toString());
+	}
+	
+	// boilerplate setters
+
+	public void setFileFolderService(FileFolderService fileFolderService)
+	{
+		this.fileFolderService = fileFolderService;
+	}
+
+	public void setRepository(Repository repository)
+	{
+		this.repository = repository;
+	}
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bulkimport/BulkFilesystemImportStatusWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bulkimport/BulkFilesystemImportStatusWebScript.java
new file mode 100644
index 00000000000..11b8fa95ace
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bulkimport/BulkFilesystemImportStatusWebScript.java
@@ -0,0 +1,88 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.bulkimport;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.repo.bulkimport.BulkFilesystemImporter;
+import org.alfresco.service.cmr.admin.RepoUsage.LicenseMode;
+import org.alfresco.service.descriptor.DescriptorService;
+import org.alfresco.service.license.LicenseDescriptor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Web Script class that provides status information on the bulk filesystem import process.
+ *
+ * @since 4.0
+ */
+public class BulkFilesystemImportStatusWebScript extends DeclarativeWebScript
+{
+    private final static Log logger = LogFactory.getLog(BulkFilesystemImportStatusWebScript.class);
+    
+    // Output parameters (for Freemarker)
+    private final static String RESULT_IMPORT_STATUS = "importStatus";
+    private final static String IS_ENTERPRISE = "isEnterprise";
+    
+    // Attributes
+    private BulkFilesystemImporter bulkImporter;
+    private DescriptorService descriptorService;
+
+	public void setBulkImporter(BulkFilesystemImporter bulkImporter)
+	{
+		this.bulkImporter = bulkImporter;
+	}
+	
+    public void setDescriptorService(DescriptorService descriptorService)
+    {
+		this.descriptorService = descriptorService;
+	}
+
+	/**
+     * @see org.springframework.extensions.webscripts.DeclarativeWebScript#executeImpl(WebScriptRequest, Status, Cache)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest request, Status status, Cache cache)
+    {
+        Map<String, Object> result = new HashMap<String, Object>();
+        
+        cache.setNeverCache(true);
+        
+        LicenseDescriptor licenseDescriptor = descriptorService.getLicenseDescriptor();
+        boolean isEnterprise = (licenseDescriptor == null ? false : (licenseDescriptor.getLicenseMode() == LicenseMode.ENTERPRISE));
+
+        result.put(IS_ENTERPRISE, Boolean.valueOf(isEnterprise));
+        result.put(RESULT_IMPORT_STATUS, bulkImporter.getStatus());
+        
+        return(result);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/bulkimport/copy/BulkFilesystemImportWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bulkimport/copy/BulkFilesystemImportWebScript.java
new file mode 100644
index 00000000000..ef7461193df
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/bulkimport/copy/BulkFilesystemImportWebScript.java
@@ -0,0 +1,238 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.bulkimport.copy;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.repo.bulkimport.BulkImportParameters;
+import org.alfresco.repo.bulkimport.NodeImporter;
+import org.alfresco.repo.bulkimport.impl.MultiThreadedBulkFilesystemImporter;
+import org.alfresco.repo.bulkimport.impl.StreamingNodeImporterFactory;
+import org.alfresco.repo.web.scripts.bulkimport.AbstractBulkFileSystemImportWebScript;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Web Script class that invokes a BulkFilesystemImporter implementation.
+ *
+ * @since 4.0
+ */
+public class BulkFilesystemImportWebScript extends AbstractBulkFileSystemImportWebScript
+{
+    private MultiThreadedBulkFilesystemImporter bulkImporter;
+	private StreamingNodeImporterFactory nodeImporterFactory;
+
+	public void setBulkImporter(MultiThreadedBulkFilesystemImporter bulkImporter)
+	{
+		this.bulkImporter = bulkImporter;
+	}
+
+	public void setNodeImporterFactory(StreamingNodeImporterFactory nodeImporterFactory)
+	{
+		this.nodeImporterFactory = nodeImporterFactory;
+	}
+
+    /**
+     * @see org.springframework.extensions.webscripts.DeclarativeWebScript#executeImpl(org.springframework.extensions.webscripts.WebScriptRequest, org.springframework.extensions.webscripts.Status, org.springframework.extensions.webscripts.Cache)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(final WebScriptRequest request, final Status status, final Cache cache)
+    {
+        Map<String, Object> model  = new HashMap<String, Object>();
+        String targetNodeRefStr = null;
+        String targetPath = null;
+        String sourceDirectoryStr = null;
+        @Deprecated String replaceExistingStr = null;
+        String existingFileModeStr = null;
+        String batchSizeStr = null;
+        String numThreadsStr = null;
+        String disableRulesStr = null;
+
+        cache.setNeverCache(true);
+        
+        try
+        {
+            if(!bulkImporter.getStatus().inProgress())
+            {
+                NodeRef targetNodeRef = null;
+                File sourceDirectory = null;
+                boolean replaceExisting = false;
+                BulkImportParameters.ExistingFileMode existingFileMode = null;
+                int batchSize = bulkImporter.getDefaultBatchSize();
+                int numThreads = bulkImporter.getDefaultNumThreads();
+                boolean disableRules = false;
+                
+                // Retrieve, validate and convert parameters
+                targetNodeRefStr = request.getParameter(PARAMETER_TARGET_NODEREF);
+                targetPath = request.getParameter(PARAMETER_TARGET_PATH);
+                sourceDirectoryStr = request.getParameter(PARAMETER_SOURCE_DIRECTORY);
+                replaceExistingStr = request.getParameter(PARAMETER_REPLACE_EXISTING);
+                existingFileModeStr = request.getParameter(PARAMETER_EXISTING_FILE_MODE);
+
+                batchSizeStr = request.getParameter(PARAMETER_BATCH_SIZE);
+                numThreadsStr = request.getParameter(PARAMETER_NUM_THREADS);
+                disableRulesStr = request.getParameter(PARAMETER_DISABLE_RULES);
+
+                targetNodeRef = getTargetNodeRef(targetNodeRefStr, targetPath);
+                
+                if (sourceDirectoryStr == null || sourceDirectoryStr.trim().length() == 0)
+                {
+                    throw new RuntimeException("Error: mandatory parameter '" + PARAMETER_SOURCE_DIRECTORY + "' was not provided.");
+                }
+                
+                sourceDirectory = new File(sourceDirectoryStr.trim());
+
+                if (replaceExistingStr != null && existingFileModeStr != null)
+                {
+                    // Check that we haven't had both the deprecated and new (existingFileMode)
+                    // parameters supplied.
+                    throw new IllegalStateException(
+                            String.format("Only one of these parameters may be used, not both: %s, %s",
+                                    PARAMETER_REPLACE_EXISTING,
+                                    PARAMETER_EXISTING_FILE_MODE));
+                }
+
+                if (replaceExistingStr != null && replaceExistingStr.trim().length() > 0)
+                {
+                    replaceExisting = PARAMETER_VALUE_REPLACE_EXISTING.equals(replaceExistingStr);
+                }
+
+                if (existingFileModeStr != null && existingFileModeStr.trim().length() > 0)
+                {
+                    existingFileMode = BulkImportParameters.ExistingFileMode.valueOf(existingFileModeStr);
+                }
+
+                if (disableRulesStr != null && disableRulesStr.trim().length() > 0)
+                {
+                    disableRules = PARAMETER_VALUE_DISABLE_RULES.equals(disableRulesStr);
+                }
+
+                // Initiate the import
+                NodeImporter nodeImporter = nodeImporterFactory.getNodeImporter(sourceDirectory);
+                BulkImportParameters bulkImportParameters = new BulkImportParameters();
+                
+                if (numThreadsStr != null && numThreadsStr.trim().length() > 0)
+                {
+                	try
+                	{
+                		numThreads = Integer.parseInt(numThreadsStr);
+                		if(numThreads < 1)
+                		{
+                            throw new RuntimeException("Error: parameter '" + PARAMETER_NUM_THREADS + "' must be an integer > 0.");
+                		}
+                        bulkImportParameters.setNumThreads(numThreads);
+                	}
+                	catch(NumberFormatException e)
+                	{
+                        throw new RuntimeException("Error: parameter '" + PARAMETER_NUM_THREADS + "' must be an integer > 0.");
+                	}
+                }
+                
+                if (batchSizeStr != null && batchSizeStr.trim().length() > 0)
+                {
+                	try
+                	{
+                		batchSize = Integer.parseInt(batchSizeStr);
+                		if(batchSize < 1)
+                		{
+                            throw new RuntimeException("Error: parameter '" + PARAMETER_BATCH_SIZE + "' must be an integer > 0.");
+                		}
+                        bulkImportParameters.setBatchSize(batchSize);
+                	}
+                	catch(NumberFormatException e)
+                	{
+                        throw new RuntimeException("Error: parameter '" + PARAMETER_BATCH_SIZE + "' must be an integer > 0.");
+                	}
+                }
+
+                if (existingFileMode != null)
+                {
+                    bulkImportParameters.setExistingFileMode(existingFileMode);
+                }
+                else
+                {
+                    // Fall back to the old/deprecated way.
+                    bulkImportParameters.setReplaceExisting(replaceExisting);
+                }
+
+                bulkImportParameters.setTarget(targetNodeRef);
+                bulkImportParameters.setDisableRulesService(disableRules);
+
+                bulkImporter.asyncBulkImport(bulkImportParameters, nodeImporter);
+
+                // ACE-3047 fix, since bulk import is started asynchronously there is a chance that client 
+                // will get into the status page before import is actually started.
+                // In this case wrong information (for previous import) will be displayed.
+                // So lets ensure that import started before redirecting client to status page.
+                int i = 0;
+                while (!bulkImporter.getStatus().inProgress() && i < 10)
+                {
+                	Thread.sleep(100);
+                	i++;
+                }
+                
+                // redirect to the status Web Script
+                status.setCode(Status.STATUS_MOVED_TEMPORARILY);
+                status.setRedirect(true);
+                status.setLocation(request.getServiceContextPath() + WEB_SCRIPT_URI_BULK_FILESYSTEM_IMPORT_STATUS);
+            }
+            else
+            {
+            	model.put(IMPORT_ALREADY_IN_PROGRESS_MODEL_KEY, I18NUtil.getMessage(IMPORT_ALREADY_IN_PROGRESS_ERROR_KEY));
+            }
+        }
+        catch (WebScriptException wse)
+        {
+        	status.setCode(Status.STATUS_BAD_REQUEST, wse.getMessage());
+        	status.setRedirect(true);
+        }
+        catch (FileNotFoundException fnfe)
+        {
+        	status.setCode(Status.STATUS_BAD_REQUEST,"The repository path '" + targetPath + "' does not exist !");
+        	status.setRedirect(true);
+        }
+        catch(IllegalArgumentException iae)
+        {
+        	status.setCode(Status.STATUS_BAD_REQUEST,iae.getMessage());
+        	status.setRedirect(true);
+        }
+        catch (Throwable t)
+        {
+            throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR, buildTextMessage(t), t);
+        }
+        
+        return model;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarListingWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarListingWebScript.java
new file mode 100644
index 00000000000..d9be3a030e9
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarListingWebScript.java
@@ -0,0 +1,277 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.calendar;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.repo.calendar.CalendarModel;
+import org.alfresco.service.cmr.calendar.CalendarEntry;
+import org.alfresco.service.cmr.calendar.CalendarRecurrenceHelper;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ISO8601DateFormat;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+/**
+ * This class provides functionality common across the webscripts
+ *  which list events.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public abstract class AbstractCalendarListingWebScript extends AbstractCalendarWebScript
+{
+   protected static final String RESULT_EVENT = "event"; 
+   protected static final String RESULT_NAME  = "name"; 
+   protected static final String RESULT_TITLE = "title"; 
+   protected static final String RESULT_START = "start"; 
+   protected static final String RESULT_END = "end"; 
+   
+   /**
+    * Returns a Comparator for (re-)sorting events, typically used after
+    *  expanding out recurring instances.
+    */
+   protected static Comparator<Map<String, Object>> getEventDetailsSorter()
+   {
+      return new Comparator<Map<String, Object>>() 
+      {
+         public int compare(Map<String, Object> resultA,
+               Map<String, Object> resultB) 
+         {
+        	 DateTimeFormatter fmtNoTz  = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss.SSS");
+        	 DateTimeFormatter fmtTz  =   DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZZ");
+        	 
+        	 String startA = (String)resultA.get(RESULT_START);
+        	 String startB = (String)resultB.get(RESULT_START);
+        
+        	 startA = startA.replace("Z", "+00:00");
+        	 startB = startB.replace("Z", "+00:00");
+        	 
+        	 //check and parse iso8601 date without time zone (All day events are stripped of time zone)
+        	 DateTime sa = startA.length()>23?fmtTz.parseDateTime(startA):fmtNoTz.parseDateTime(startA);
+        	 DateTime sb = startB.length()>23?fmtTz.parseDateTime(startB):fmtNoTz.parseDateTime(startB);
+
+            int cmp = sa.compareTo(sb);
+            if (cmp == 0)
+            {
+            	String endA = (String)resultA.get(RESULT_END);
+            	String endB = (String)resultB.get(RESULT_END);
+            	
+            	DateTime ea = endA.length()>23?fmtTz.parseDateTime(endA):fmtNoTz.parseDateTime(endA);
+            	DateTime eb = endB.length()>23?fmtTz.parseDateTime(endB):fmtNoTz.parseDateTime(endB);
+
+               cmp = ea.compareTo(eb);
+               if (cmp == 0)
+               {
+                  String nameA = (String)resultA.get(RESULT_NAME);
+                  String nameB = (String)resultB.get(RESULT_NAME);
+                  return nameA.compareTo(nameB);
+               }
+               return cmp;
+            }
+            return cmp;
+         }
+      };
+   }
+
+   /**
+    * Do what's needed for recurring events.
+    * 
+    * @return If dates have been tweaked, and a sort may be required 
+    */
+   protected boolean handleRecurring(CalendarEntry entry, Map<String, Object> entryResult, 
+         List<Map<String, Object>> allResults, Date from, Date until, boolean repeatingFirstOnly)
+   {
+      if (entry.getRecurrenceRule() == null)
+      {
+         // Nothing to do
+         return false;
+      }
+      
+      // If no date is given, start looking for occurrences from the event itself
+      if (from == null)
+      {
+         from = entry.getStart();
+      }
+      
+      // Do we need to limit ourselves?
+      // Should we limit ourselves?
+      if (!repeatingFirstOnly)
+      {
+         if (until == null)
+         {
+            // If no end date was given, only allow repeating instances 
+            // for next 60 days, to keep the list sane
+            // (It's normally only used for a month view anyway)
+            Calendar c = Calendar.getInstance();
+            c.setTime(from);
+            c.add(Calendar.DATE, 60);
+            until = c.getTime();
+         }
+      }
+      
+      // How long is it?
+      long duration = entry.getEnd().getTime() - entry.getStart().getTime();
+      
+      // if some instances were deleted from series ignore them
+      Set<QName> childNodeTypeQNames = new HashSet<QName>();
+      childNodeTypeQNames.add(CalendarModel.TYPE_IGNORE_EVENT);
+      List<ChildAssociationRef> ignoreEventList = nodeService.getChildAssocs(entry.getNodeRef(), childNodeTypeQNames);
+      Set<Date> ignoredDates = new HashSet<Date>();
+      for (ChildAssociationRef ignoreEvent : ignoreEventList)
+      {
+          NodeRef nodeRef = ignoreEvent.getChildRef();
+          Date ignoredDate = (Date) nodeService.getProperty(nodeRef, CalendarModel.PROP_IGNORE_EVENT_DATE);
+          ignoredDates.add(ignoredDate);
+      }
+      
+      // Get it's recurring instances
+      List<Date> dates = CalendarRecurrenceHelper.getRecurrencesOnOrAfter(
+            entry, from, until, repeatingFirstOnly, ignoredDates);
+      if (dates == null)
+      {
+         dates = new ArrayList<Date>();
+      }
+      
+      // Add on the original event time itself if needed
+      if (entry.getStart().getTime() >= from.getTime())
+      {
+         if (dates.size() == 0 || dates.get(0).getTime() != entry.getStart().getTime())
+         {
+            // Original event is after the start time, and not on the recurring list
+            dates.add(0, entry.getStart());
+         }
+      }
+      
+      // If we got no dates, then no recurrences in the period so zap
+      if (dates.size() == 0)
+      {
+         allResults.remove(entryResult);
+         return false; // Remains sorted despite delete
+      }
+
+      // if some instances were updated
+      SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMdd");
+      childNodeTypeQNames = new HashSet<QName>();
+      childNodeTypeQNames.add(CalendarModel.TYPE_UPDATED_EVENT);
+      List<ChildAssociationRef> updatedEventList = nodeService.getChildAssocs(entry.getNodeRef(), childNodeTypeQNames);
+      Map<String, Object> updatedDates = new HashMap<String, Object>();
+      for (ChildAssociationRef updatedEvent : updatedEventList)
+      {
+          NodeRef nodeRef = updatedEvent.getChildRef();
+          Date updatedDate = (Date) nodeService.getProperty(nodeRef, CalendarModel.PROP_UPDATED_EVENT_DATE);
+          Date newStart = (Date) nodeService.getProperty(nodeRef, CalendarModel.PROP_UPDATED_START);
+          Date newEnd = (Date) nodeService.getProperty(nodeRef, CalendarModel.PROP_UPDATED_END);
+          String newWhere = (String) nodeService.getProperty(nodeRef, CalendarModel.PROP_UPDATED_WHERE);
+          String newWhat = (String) nodeService.getProperty(nodeRef, CalendarModel.PROP_UPDATED_WHAT);
+          updatedDates.put(fmt.format(updatedDate), new Date[] { newStart, newEnd });
+          updatedDates.put(fmt.format(updatedDate).toString() + "where", newWhere);
+          updatedDates.put(fmt.format(updatedDate).toString() + "what", newWhat);
+      }
+      
+      // first occurrence can be edited as separate event
+      Date liveEntry = dates.get(0);
+      
+      // If first result only, alter title and finish
+      if (repeatingFirstOnly)
+      {
+         entryResult.put(RESULT_TITLE, entry.getTitle() + " (Repeating)");
+         
+         updateRepeating(entry, updatedDates, entryResult, duration, fmt, liveEntry);
+         return true; // Date has been changed
+      }
+      else
+      {
+         // Otherwise generate one entry per extra date
+         for (int i = 1; i < dates.size(); i++)
+         {
+            // Clone the properties
+            Map<String, Object> newResult = new HashMap<String, Object>(entryResult);
+            
+            Date extra = dates.get(i);
+            
+            updateRepeating(entry, updatedDates, newResult, duration, fmt, extra);
+            
+            // Save as a new event
+            allResults.add(newResult);
+         }
+         
+         updateRepeating(entry, updatedDates, entryResult, duration, fmt, liveEntry);
+      }
+      
+      // TODO Skip ignored instances
+      
+      // New dates have been added
+      return true;
+   }
+   
+   private void updateRepeatingStartEnd(Date newStart, long duration, Map<String, Object> result)
+   {
+      Date newEnd = new Date(newStart.getTime() + duration);
+      result.put(RESULT_START,  ISO8601DateFormat.format(newStart));
+      result.put(RESULT_END, ISO8601DateFormat.format(newEnd));
+      String legacyDateFormat = "yyyy-MM-dd";
+      SimpleDateFormat ldf = new SimpleDateFormat(legacyDateFormat);
+      String legacyTimeFormat ="HH:mm";
+      SimpleDateFormat ltf = new SimpleDateFormat(legacyTimeFormat);
+      result.put("legacyDateFrom", ldf.format(newStart));
+      result.put("legacyTimeFrom", ltf.format(newStart));
+      result.put("legacyDateTo", ldf.format(newEnd));
+      result.put("legacyTimeTo", ltf.format(newEnd));
+   }
+   
+   private void updateRepeating(CalendarEntry entry, Map<String, Object> updatedDates, Map<String, Object> entryResult, long duration, SimpleDateFormat fmt, Date date)
+   {
+      if (updatedDates.keySet().contains(fmt.format(date)))
+      {
+         // there is day that was edited
+         Date[] newValues = (Date[]) updatedDates.get(fmt.format(date));
+         long newDuration = newValues[1].getTime() - newValues[0].getTime();
+
+         entryResult.put(RESULT_TITLE, (String) updatedDates.get(fmt.format(date).toString() + "what"));
+         entryResult.put("where", (String) updatedDates.get(fmt.format(date).toString() + "where"));
+         
+         updateRepeatingStartEnd(newValues[0], newDuration, entryResult);
+      }
+      else
+      {
+         // Update entry
+         updateRepeatingStartEnd(date, duration, entryResult);
+      }
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java
new file mode 100644
index 00000000000..330f2bf7b1f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java
@@ -0,0 +1,563 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.calendar;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.StringWriter;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TimeZone;
+
+import org.alfresco.query.PagingRequest;
+import org.alfresco.repo.calendar.CalendarModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.service.cmr.calendar.CalendarEntry;
+import org.alfresco.service.cmr.calendar.CalendarService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.GUID;
+import org.alfresco.util.ISO8601DateFormat;
+import org.alfresco.util.ScriptPagingDetails;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
+import org.json.JSONException;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.json.JSONWriter;
+
+/**
+ * @author Nick Burch
+ * @since 4.0
+ */
+public abstract class AbstractCalendarWebScript extends DeclarativeWebScript
+{
+    private static final String ALL_DAY_DATETIME_PATTERN = "yyyy-MM-dd'T00:00:00.000'";
+
+    private static final DateTimeFormatter ALL_DAY_DATETIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd'T00:00:00.000'");
+
+    public static final String CALENDAR_SERVICE_ACTIVITY_APP_NAME = "calendar";
+    
+    protected static final String MSG_EVENT_NOT_FOUND = "calendar.err.event.not.found";
+    protected static final String MSG_INVALID_JSON = "calendar.err.invalid.json";
+    
+    protected static final String PARAM_TIMEZONE = "timeZone";
+    protected static final String PARAM_START_AT = "startAt";
+    protected static final String PARAM_END_AT   = "endAt";
+    protected static final String PARAM_ISO8601  = "iso8601";
+    
+    private static Log logger = LogFactory.getLog(AbstractCalendarWebScript.class);
+    
+    /**
+     * When no maximum or paging info is given, what should we use?
+     */
+    protected static final int MAX_QUERY_ENTRY_COUNT = 1000;
+   
+    // Injected services
+    protected NodeService nodeService;
+    protected SiteService siteService;
+    protected ActivityService activityService;
+    protected CalendarService calendarService;
+    
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+    
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+    
+    public void setActivityService(ActivityService activityService)
+    {
+        this.activityService = activityService;
+    }
+    
+    public void setCalendarService(CalendarService calendarService)
+    {
+        this.calendarService = calendarService;
+    }
+    
+    /**
+     * Gets the date from the String, trying the various formats
+     *  (New and Legacy) until one works...
+     */
+    protected Date parseDate(String date)
+    {
+       // Is there one at all?
+       if (date == null || date.length() == 0)
+       {
+          return null;
+       }
+       
+       // Today's Date - special case 
+       if (date.equalsIgnoreCase("NOW"))
+       {
+           // We want all of today, so go back to midnight
+           Calendar c = Calendar.getInstance();
+           c.set(Calendar.HOUR_OF_DAY, 0);
+           c.set(Calendar.MINUTE, 0);
+           c.set(Calendar.SECOND, 0);
+           c.set(Calendar.MILLISECOND, 0);
+           return c.getTime();
+       }
+       
+       // Try as ISO8601
+       try
+       {
+          return ISO8601DateFormat.parse(date);
+       }
+       catch (Exception e) {}
+       
+       // Try YYYY/MM/DD
+       SimpleDateFormat slashtime = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+       SimpleDateFormat slash = new SimpleDateFormat("yyyy/MM/dd");
+       try
+       {
+          return slashtime.parse(date);
+       }
+       catch (ParseException e) {}
+       try
+       {
+          return slash.parse(date);
+       }
+       catch (ParseException e) {}
+       
+       // Try YYYY-MM-DD
+       SimpleDateFormat dashtime = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+       SimpleDateFormat dash = new SimpleDateFormat("yyyy-MM-dd");
+       try
+       {
+          return dashtime.parse(date);
+       }
+       catch (ParseException e) {}
+       try
+       {
+          return dash.parse(date);
+       }
+       catch (ParseException e) {}
+
+       // We don't know what it is, object
+       throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid date '" + date + "'");
+    }
+    
+    /**
+     * Extracts the Start and End details, along with the All Day flag
+     *  from the JSON, and returns if the event is all day or not
+     */
+    protected boolean extractDates(CalendarEntry entry, JSONObject json) throws JSONException
+    {
+       boolean isAllDay = false;
+       if (json.containsKey("allday"))
+       {
+          isAllDay = true;
+       }
+       
+       if (json.containsKey(PARAM_START_AT) && json.containsKey(PARAM_END_AT))
+       {
+          // New style ISO8601 based dates and times
+          Object startAtO = json.get(PARAM_START_AT);
+          Object endAtO = json.get(PARAM_END_AT);
+          
+          // Grab the details
+          String startAt;
+          String endAt;
+          String timezoneName = null;
+          if(startAtO instanceof JSONObject)
+          {
+             // "startAt": { "iso8601":"2011-...." }
+             JSONObject startAtJSON = (JSONObject)startAtO; 
+             JSONObject endAtJSON = (JSONObject)endAtO; 
+             startAt = (String)startAtJSON.get(PARAM_ISO8601); 
+             endAt = (String)endAtJSON.get(PARAM_ISO8601);
+             
+             if(startAtJSON.containsKey(PARAM_TIMEZONE))
+             {
+                timezoneName = (String)startAtJSON.get(PARAM_TIMEZONE);
+                if(endAtJSON.containsKey(PARAM_TIMEZONE))
+                {
+                   String endTZ = (String)endAtJSON.get(PARAM_TIMEZONE);
+                   if(! endTZ.equals(timezoneName))
+                   {
+                      throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Timezones must match");
+                   }
+                }
+             }
+          }
+          else
+          {
+             // "startAt": "2011-...."
+             startAt = (String)json.get(PARAM_START_AT);
+             endAt = (String)json.get(PARAM_END_AT);
+          }
+          if(json.containsKey(PARAM_TIMEZONE))
+          {
+             timezoneName = (String)json.get(PARAM_TIMEZONE);
+          }
+          
+          
+          // Is this an all day event?
+          if (json.containsKey("allday"))
+          {
+             // Store it as UTC midnight to midnight
+             // Reset the time part to ensure that
+             String utcMidnight = "T00:00:00Z";
+             startAt = startAt.substring(0, 10) + utcMidnight;
+             endAt = endAt.substring(0, 10) + utcMidnight;
+             entry.setStart(ISO8601DateFormat.parse(startAt));
+             entry.setEnd(ISO8601DateFormat.parse(endAt));
+          }
+          else
+          {
+             // Regular event start and end rules
+             
+             // Do we have explicit timezone information?
+             if (timezoneName != null)
+             {
+                // Get the specified timezone
+                TimeZone tz = TimeZone.getTimeZone(timezoneName);
+                
+                // Grab the dates and times in the specified timezone
+                entry.setStart(ISO8601DateFormat.parse(startAt, tz));
+                entry.setEnd(ISO8601DateFormat.parse(endAt, tz));
+             }
+             else
+             {
+                // Offset info is either in the date, or we just have to guess
+                entry.setStart(parseDate(startAt));
+                entry.setEnd(parseDate(endAt));
+             }
+          }
+       }
+       else if (json.containsKey("allday"))
+       {
+          // Old style all-day event
+          Date start = parseDate(getOrNull(json, "from"));
+          Date end = parseDate(getOrNull(json, "to"));
+          // Store it as UTC midnight to midnight
+          // Reset the time part to ensure that
+          String isoStartAt = ISO8601DateFormat.format(start);
+          String isoEndAt =  ISO8601DateFormat.format(end);
+    	  String utcMidnight = "T00:00:00Z";
+          isoStartAt = isoStartAt.substring(0, 10) + utcMidnight;
+          isoEndAt = isoEndAt.substring(0, 10) + utcMidnight;
+          entry.setStart(ISO8601DateFormat.parse(isoStartAt));
+          entry.setEnd(ISO8601DateFormat.parse(isoEndAt));
+    	  
+    	 
+       }
+       else
+       {
+          // Old style regular event
+          entry.setStart(parseDate((String)json.get("from") + " " + (String)json.get("start")));
+          entry.setEnd(parseDate((String)json.get("to") + " " + (String)json.get("end")));
+       }
+       
+       return isAllDay;
+    }
+    
+    protected String getOrNull(JSONObject json, String key) throws JSONException
+    {
+       if (json.containsKey(key))
+       {
+          return (String)json.get(key);
+       }
+       return null;
+    }
+    
+    /**
+     * Builds up a listing Paging request, either using the defaults or
+     *  the paging options specified
+     */
+    protected PagingRequest buildPagingRequest(WebScriptRequest req)
+    {
+       return new ScriptPagingDetails(req, MAX_QUERY_ENTRY_COUNT);
+    }
+    
+    /**
+     * Normally the Calendar webscripts return a 200 with JSON
+     *  containing the error message. Override this to switch to
+     *  using HTTP status codes instead
+     */
+    protected boolean useJSONErrors()
+    {
+       return true;
+    }
+    
+    /**
+     * Equivalent of <i>jsonError</i> in the old JavaScript controllers
+     */
+    protected Map<String,Object> buildError(String message)
+    {
+       HashMap<String, Object> result = new HashMap<String, Object>();
+       result.put("error", message);
+       
+       HashMap<String, Object> model = new HashMap<String, Object>();
+       model.put("error", message);
+       model.put("result", result);
+       
+       return model;
+    }
+
+    /**
+     * Generates an activity entry for the entry
+     */
+    protected String addActivityEntry(String event, CalendarEntry entry, SiteInfo site, 
+          WebScriptRequest req, JSONObject json)
+    {
+       SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
+       String dateOpt = "?date=" + fmt.format(entry.getStart());
+       
+       // What page is this for?
+       String page = req.getParameter("page");
+       if (page == null && json != null)
+       {
+          if (json.containsKey("page"))
+          {
+             page = (String)json.get("page");
+          }
+       }
+       if (page == null)
+       {
+          // Default
+          page = "calendar";
+       }
+       
+       try
+       {
+          StringWriter activityJson = new StringWriter();
+          JSONWriter activity = new JSONWriter(activityJson);
+          activity.startObject();
+          activity.writeValue("title", entry.getTitle());
+          activity.writeValue("page", page + dateOpt);
+          activity.endObject();
+          
+          activityService.postActivity(
+                "org.alfresco.calendar.event-" + event,
+                site.getShortName(),
+                CALENDAR_SERVICE_ACTIVITY_APP_NAME,
+                activityJson.toString());
+       }
+       catch (Exception e)
+       {
+          // Warn, but carry on
+          logger.warn("Error adding event " + event + " to activities feed", e);
+       }
+       
+       // Return the date we used
+       return dateOpt;
+    }
+    
+    /**
+     * For an event that is a recurring event, have an ignored child event
+     *  generated for it
+     */
+    protected NodeRef createIgnoreEvent(WebScriptRequest req, CalendarEntry parent)
+    {
+       // Get the date to be ignored
+       Map<QName,Serializable> props = new HashMap<QName, Serializable>();
+       Date date = parseDate(req.getParameter("date"));
+       props.put(CalendarModel.PROP_IGNORE_EVENT_DATE, date);
+       
+       // Create a child node of the event
+       NodeRef ignored = nodeService.createNode(
+             parent.getNodeRef(), CalendarModel.ASSOC_IGNORE_EVENT_LIST,
+             QName.createQName(GUID.generate()), CalendarModel.TYPE_IGNORE_EVENT, props
+       ).getChildRef();
+       
+       // No further setup is needed
+       return ignored;
+    }
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req,
+          Status status, Cache cache) 
+    {
+       Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+       if (templateVars == null)
+       {
+          String error = "No parameters supplied";
+          if (useJSONErrors())
+          {
+             return buildError(error);
+          }
+          else
+          {
+             throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+          }
+       }
+       
+       
+       // Parse the JSON, if supplied
+       JSONObject json = null;
+       String contentType = req.getContentType();
+       if (contentType != null && contentType.indexOf(';') != -1)
+       {
+          contentType = contentType.substring(0, contentType.indexOf(';'));
+       }
+       if (MimetypeMap.MIMETYPE_JSON.equals(contentType))
+       {
+          JSONParser parser = new JSONParser();
+          try
+          {
+             json = (JSONObject)parser.parse(req.getContent().getContent());
+          }
+          catch (IOException io)
+          {
+             return buildError("Invalid JSON: " + io.getMessage());
+          }
+          catch (org.json.simple.parser.ParseException je)
+          {
+             return buildError("Invalid JSON: " + je.getMessage());
+          }
+       }
+       
+       
+       // Get the site short name. Try quite hard to do so...
+       String siteName = templateVars.get("siteid");
+       if (siteName == null)
+       {
+          siteName = templateVars.get("site");
+       }
+       if (siteName == null)
+       {
+          siteName = req.getParameter("site");
+       }
+       if (siteName == null && json != null)
+       {
+          if (json.containsKey("siteid"))
+          {
+             siteName = (String)json.get("siteid");
+          }
+          else if (json.containsKey("site"))
+          {
+             siteName = (String)json.get("site");
+          }
+       }
+       if (siteName == null)
+       {
+          String error = "No site given";
+          if (useJSONErrors())
+          {
+             return buildError("No site given");
+          }
+          else
+          {
+             throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+          }
+       }
+       
+       // Grab the requested site
+       SiteInfo site = siteService.getSite(siteName);
+       if (site == null)
+       {
+          String error = "Could not find site: " + siteName;
+          if (useJSONErrors())
+          {
+             return buildError(error);
+          }
+          else
+          {
+             throw new WebScriptException(Status.STATUS_NOT_FOUND, error);
+          }
+       }
+       
+       // Event name is optional
+       String eventName = templateVars.get("eventname");
+       
+       // Have the real work done
+       return executeImpl(site, eventName, req, json, status, cache); 
+    }
+    
+       
+    /**
+     * Removes the time zone for a given date if the Calendar Entry is an all day event
+     * 
+     * @return ISO 8601 formatted date String
+     */
+    protected String removeTimeZoneIfRequired(Date date, Boolean isAllDay, Boolean removeTimezone)
+    {
+        return removeTimeZoneIfRequired(date, isAllDay, removeTimezone, null);
+    }
+
+    /**
+     * Removes the time zone for a given date if the Calendar Entry is an all day event
+     * 
+     * @return ISO 8601 formatted date String if datePattern is null
+     */
+    protected String removeTimeZoneIfRequired(Date date, Boolean isAllDay, Boolean removeTimezone, String datePattern)
+    {
+        if (removeTimezone)
+        {
+            DateTime dateTime = new DateTime(date, DateTimeZone.UTC);
+
+            if (null == datePattern)
+            {
+                return dateTime.toString((isAllDay) ? (ALL_DAY_DATETIME_FORMATTER) : (ISODateTimeFormat.dateTime()));
+            }
+            else
+            {
+                // For Legacy Dates and Times.
+                return dateTime.toString(DateTimeFormat.forPattern(datePattern));
+            }
+        }
+
+        // This is for all other cases, including the case, when UTC time zone is configured
+
+        if (!isAllDay && (null == datePattern))
+        {
+            return ISO8601DateFormat.format(date);
+        }
+
+        DateFormat simpleDateFormat = new SimpleDateFormat((null != datePattern) ? (datePattern) : (ALL_DAY_DATETIME_PATTERN));
+
+        return simpleDateFormat.format(date);
+    }
+
+    protected abstract Map<String, Object> executeImpl(SiteInfo site, 
+          String eventName, WebScriptRequest req, JSONObject json, 
+          Status status, Cache cache);
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntriesListGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntriesListGet.java
new file mode 100644
index 00000000000..a2853aac9d6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntriesListGet.java
@@ -0,0 +1,162 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.calendar;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.calendar.CalendarModel;
+import org.alfresco.service.cmr.calendar.CalendarEntry;
+import org.alfresco.service.cmr.calendar.CalendarEntryDTO;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the slingshot calendar eventList.get webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class CalendarEntriesListGet extends AbstractCalendarListingWebScript
+{
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, String eventName,
+         WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+   {
+      // Evil format needed for compatibility with old API...
+      SimpleDateFormat formatter = new SimpleDateFormat("MM/dd/yyyy");
+      
+      // Decide on date ranges and repeating rules
+      Date fromDate = parseDate(req.getParameter("from"));
+      Date toDate = parseDate(req.getParameter("to"));
+      
+      boolean resortNeeded = false;
+      boolean repeatingFirstOnly = true;
+      String repeatingEvents = req.getParameter("repeating");
+      if (repeatingEvents != null)
+      {
+         if ("first".equals(repeatingEvents))
+         {
+            repeatingFirstOnly = true;
+         }
+         else if ("all".equals(repeatingEvents))
+         {
+            repeatingFirstOnly = false;
+            resortNeeded = true;
+         }
+      }
+      
+      
+      // Get the entries for the list
+      PagingRequest paging = buildPagingRequest(req);
+      PagingResults<CalendarEntry> entries = calendarService.listCalendarEntries(
+            new String[] {site.getShortName()}, fromDate, toDate, paging);
+      
+      // For each one in our page, grab details of any ignored instances
+      List<Map<String,Object>> results = new ArrayList<Map<String,Object>>();
+      for (CalendarEntry entry : entries.getPage())
+      {
+         Map<String, Object> result = new HashMap<String, Object>();
+         result.put(RESULT_EVENT, entry);
+         result.put(RESULT_NAME,  entry.getSystemName());
+         result.put(RESULT_TITLE, entry.getTitle());
+         boolean isAllDay = CalendarEntryDTO.isAllDay(entry);
+         boolean removeTimezone = isAllDay && !entry.isOutlook();
+         result.put(RESULT_START, removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone));
+         result.put(RESULT_END,   removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone));
+         if (isAllDay)
+         {
+             long dayLong = 86400000;
+             Date newDay = new Date(entry.getEnd().getTime()+dayLong);
+             result.put("allDayEnd", newDay);
+         }
+         
+         String legacyDateFormat = "M/d/yyyy";
+         String legacyTimeFormat ="HH:mm";
+         result.put("legacyDateFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyDateFormat));
+         result.put("legacyTimeFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyTimeFormat));
+         result.put("legacyDateTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyDateFormat));
+         result.put("legacyTimeTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyTimeFormat));
+        
+         
+         result.put("fromDate", entry.getStart());
+         result.put("tags", entry.getTags());
+         
+         List<ChildAssociationRef> ignores = nodeService.getChildAssocs(
+               entry.getNodeRef(), CalendarModel.TYPE_IGNORE_EVENT, 
+               ContentModel.ASSOC_CONTAINS, true);
+         
+         List<String> ignoreEvents = new ArrayList<String>();
+         List<Date> ignoreEventDates = new ArrayList<Date>();
+         for (ChildAssociationRef ref : ignores)
+         {
+            Date date = (Date)nodeService.getProperty(ref.getChildRef(), CalendarModel.PROP_IGNORE_EVENT_DATE);
+            if (date != null)
+            {
+               ignoreEventDates.add(date);
+               ignoreEvents.add(formatter.format(date));
+            }
+         }
+         result.put("ignoreEvents", ignoreEvents);
+         result.put("ignoreEventDates", ignoreEventDates);
+         
+         // For repeating events, push forward if needed
+         boolean orderChanged = handleRecurring(entry, result, results, fromDate, toDate, repeatingFirstOnly);
+         if (orderChanged)
+         {
+            resortNeeded = true;
+         }
+         
+         // All done with this one
+         results.add(result);
+      }
+      
+      // If they asked for repeating events to be expanded, then do so
+      if (resortNeeded)
+      {
+          Collections.sort(results, getEventDetailsSorter());
+      }
+      
+      // All done
+      Map<String, Object> model = new HashMap<String, Object>();
+      model.put("events", results);
+      model.put("siteId", site.getShortName());
+      model.put("site", site);
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryDelete.java
new file mode 100644
index 00000000000..f7442686569
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryDelete.java
@@ -0,0 +1,88 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.calendar;
+
+import java.util.Map;
+
+import org.alfresco.service.cmr.calendar.CalendarEntry;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the slingshot calendar event.delete webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class CalendarEntryDelete extends AbstractCalendarWebScript
+{
+   /**
+    * This WebScript uses HTTP status codes for errors
+    */
+   @Override
+   protected boolean useJSONErrors() 
+   {
+      return false;
+   }
+
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, String eventName,
+         WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+   {
+      CalendarEntry entry = calendarService.getCalendarEntry(
+            site.getShortName(), eventName);
+      
+      if (entry == null)
+      {
+         status.setCode(Status.STATUS_NOT_FOUND);
+         return null;
+      }
+      
+      // Special case for "deleting" an instance of a recurring event 
+      if (req.getParameter("date") != null && entry.getRecurrenceRule() != null)
+      {
+         // Have an ignored event generated
+         createIgnoreEvent(req, entry);
+         
+         // Mark as ignored
+         status.setCode(Status.STATUS_NO_CONTENT, "Recurring entry ignored");
+         return null;
+      }
+      
+      // Delete the calendar entry
+      calendarService.deleteCalendarEntry(entry);
+      
+      // Record this in the activity feed
+      addActivityEntry("deleted", entry, site, req, json);
+
+      // All done
+      status.setCode(Status.STATUS_NO_CONTENT, "Entry deleted");
+      return null;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java
new file mode 100644
index 00000000000..4b87fdbc678
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java
@@ -0,0 +1,310 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.calendar;
+
+import java.text.DateFormat;
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.TimeZone;
+
+import org.alfresco.repo.calendar.CalendarModel;
+import org.alfresco.service.cmr.calendar.CalendarEntry;
+import org.alfresco.service.cmr.calendar.CalendarEntryDTO;
+import org.alfresco.service.cmr.calendar.CalendarRecurrenceHelper;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the slingshot calendar event.get webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class CalendarEntryGet extends AbstractCalendarWebScript
+{
+   private static Log logger = LogFactory.getLog(CalendarEntryGet.class);
+   private PermissionService permissionService;
+   
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, String eventName,
+         WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+   {
+      final ResourceBundle rb = getResources();
+
+      CalendarEntry entry = calendarService.getCalendarEntry(
+            site.getShortName(), eventName);
+      
+      if (entry == null)
+      {
+         String message = rb.getString(MSG_EVENT_NOT_FOUND);
+         return buildError(MessageFormat.format(message, eventName));
+      }
+
+      Date date = parseDate(req.getParameter("date"));
+      if (date != null)
+      {
+         // if some instances were updated
+         SimpleDateFormat fdt = new SimpleDateFormat("yyyyMMdd");
+         Set<QName> childNodeTypeQNames = new HashSet<QName>();
+         childNodeTypeQNames.add(CalendarModel.TYPE_UPDATED_EVENT);
+         List<ChildAssociationRef> updatedEventList = nodeService.getChildAssocs(entry.getNodeRef(), childNodeTypeQNames);
+         for (ChildAssociationRef updatedEvent : updatedEventList)
+         {
+            NodeRef nodeRef = updatedEvent.getChildRef();
+            Date updatedDate = (Date) nodeService.getProperty(nodeRef, CalendarModel.PROP_UPDATED_EVENT_DATE);
+            if (fdt.format(updatedDate).equals(fdt.format(date)))
+            {
+               entry.setStart((Date) nodeService.getProperty(nodeRef, CalendarModel.PROP_UPDATED_START));
+               entry.setEnd((Date) nodeService.getProperty(nodeRef, CalendarModel.PROP_UPDATED_END));
+               entry.setTitle((String) nodeService.getProperty(nodeRef, CalendarModel.PROP_UPDATED_WHAT));
+               entry.setLocation((String) nodeService.getProperty(nodeRef, CalendarModel.PROP_UPDATED_WHERE));
+               break;
+            }
+         }
+      }
+
+      // Build the object
+      Map<String, Object> result = new HashMap<String, Object>();
+      result.put("name", entry.getSystemName());
+      result.put("what", entry.getTitle());
+      result.put("description", entry.getDescription());
+      result.put("location", entry.getLocation());
+      boolean isAllDay = CalendarEntryDTO.isAllDay(entry);
+      boolean removeTimezone = isAllDay && !entry.isOutlook();
+      result.put("from", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone));
+      result.put("to", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone));
+      
+      String legacyDateFormat = "M/d/yyyy";
+      String legacyTimeFormat ="HH:mm";
+      result.put("legacyDateFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyDateFormat));
+      result.put("legacyTimeFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyTimeFormat));
+      result.put("legacyDateTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyDateFormat));
+      result.put("legacyTimeTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyTimeFormat));
+      
+      result.put("tags", entry.getTags());
+      result.put("isoutlook", entry.isOutlook());
+      result.put("outlookuid", entry.getOutlookUID());
+      result.put("allday", isAllDay);
+      result.put("docfolder", entry.getSharePointDocFolder());
+      result.put("recurrence", buildRecurrenceString(entry));
+      
+      // Replace nulls with blank strings for the JSON
+      for (String key : result.keySet())
+      {
+         if (result.get(key) == null)
+         {
+            result.put(key, "");
+         }
+      }
+      
+      // Check the permissions the user has on the entry
+      AccessStatus canEdit = permissionService.hasPermission(entry.getNodeRef(), PermissionService.WRITE);
+      AccessStatus canDelete = permissionService.hasPermission(entry.getNodeRef(), PermissionService.DELETE);
+      result.put("canEdit", (canEdit == AccessStatus.ALLOWED));
+      result.put("canDelete", (canDelete == AccessStatus.ALLOWED));
+      
+      // All done
+      Map<String, Object> model = new HashMap<String, Object>();
+      model.put("result", result);
+      return model;
+   }
+   
+   /**
+    * This method replicates the pre-existing behaviour for recurring events. 
+    * Rather than try to render the text for them on the client, we instead
+    *  statically render the description text here on the server.
+    * When we properly support recurring events in the client (and not just
+    *  for SharePoint ones), this can be replaced.
+    */
+   protected String buildRecurrenceString(CalendarEntry event)
+   {
+      // If there's no recurrence rules, then there's nothing to do
+      String recurrence = event.getRecurrenceRule();
+      if (recurrence == null || recurrence.trim().length() == 0)
+      {
+         return null;
+      }
+      
+      // Get our days of the week, in the current locale, for each outlook two letter code
+      Map<String,String> days = 
+         CalendarRecurrenceHelper.buildLocalRecurrenceDaysOfTheWeek(I18NUtil.getLocale());
+      
+      // Get our weeks names, in the current locale
+      Map<Integer, String> weeks =
+    		  CalendarRecurrenceHelper.buildLocalRecurrenceWeekNames(I18NUtil.getLocale());
+      
+      // Turn the string into a useful map
+      Map<String,String> params = CalendarRecurrenceHelper.extractRecurrenceRule(event);
+      
+      // To hold our result
+      StringBuffer text = new StringBuffer();
+      
+      // Handle the different frequencies
+      if (params.containsKey("FREQ"))
+      {
+         String freq = params.get("FREQ");
+         String interval = params.get("INTERVAL");
+         if (interval == null)
+         {
+            interval = "1";
+         }
+         
+         if ("WEEKLY".equals(freq))
+         {
+            if ("1".equals(interval))
+            {
+               text.append("Occurs each week on ");
+            }
+            else
+            {
+               text.append("Occurs every " + interval + " weeks on ");
+            }
+            
+            for (String day : params.get("BYDAY").split(","))
+            {
+               text.append(days.get(day));
+               text.append(", ");
+            }
+         }
+         else if ("DAILY".equals(freq))
+         {
+            if ("1".equals(interval))
+            {
+               text.append("Occurs every day ");
+            }
+            else
+            {
+               text.append("Occurs every " + interval + " days ");
+            }
+         }
+         else if ("MONTHLY".equals(freq))
+         {
+            if (params.get("BYMONTHDAY") != null)
+            {
+               text.append("Occurs day " + params.get("BYMONTHDAY"));
+            }
+            else if (params.get("BYSETPOS") != null)
+            {
+            	text.append("Occurs the ");
+            	text.append(weeks.get((Integer.parseInt(params.get("BYSETPOS")))) + " ");
+                buildParams(params, text, days);
+            }
+            text.append(" of every " + interval + " month(s) ");
+         }
+         else if ("YEARLY".equals(freq))
+         {
+            if (params.get("BYMONTHDAY") != null)
+            {
+               text.append("Occurs every " + params.get("BYMONTHDAY"));
+               text.append("." + params.get("BYMONTH") + " ");
+            }
+            else
+            {
+              text.append("Occurs the ");
+              text.append(weeks.get((Integer.parseInt(params.get("BYSETPOS")))) + " ");
+              buildParams(params, text, days);
+              text.append(" of " +  params.get("BYMONTH") + " month ");
+            }
+         }
+         else
+         {
+            logger.warn("Unsupported recurrence frequency " + freq);
+         }
+      }
+      
+      // And the rest
+      DateFormat dFormat = SimpleDateFormat.getDateInstance(
+            SimpleDateFormat.MEDIUM, I18NUtil.getLocale());
+      
+      DateFormat tFormat = SimpleDateFormat.getTimeInstance(
+            SimpleDateFormat.SHORT, I18NUtil.getLocale());
+      
+      text.append("effective " + dFormat.format(event.getStart()));
+      
+      if (params.containsKey("COUNT"))
+      {
+         // Nothing to do, is already handled in the recurrence date 
+      }
+      if (event.getLastRecurrence() != null)
+      {
+         text.append(" until " + dFormat.format(event.getLastRecurrence()));
+      }
+      
+      text.append(" from " + tFormat.format(event.getStart()));
+      text.append(" to " + tFormat.format(event.getEnd()));
+      
+      // Add timezone in which recurrence rule was parsed
+      TimeZone timeZone = TimeZone.getDefault();
+	  boolean daylight = timeZone.inDaylightTime(new Date());
+	  String tzDisplayName = timeZone.getDisplayName(daylight, TimeZone.SHORT);
+	  
+      text.append(" ("+tzDisplayName+")");
+      
+      // All done
+      return text.toString();
+   }
+   
+   private static StringBuffer buildParams(Map<String, String> params,  StringBuffer text, Map<String, String> days)
+   {
+       int day = params.get("BYDAY").split(",").length;
+       if(day == 7){
+           text.append(CalendarRecurrenceHelper.DAY);
+       }
+       if(day == 5){
+   	   text.append(CalendarRecurrenceHelper.WEEKDAYS);
+       }
+       if(day == 2){
+   	   text.append(CalendarRecurrenceHelper.WEEKENDS);
+       }
+       if(day != 7 && day != 5 && day != 2){
+   	   text.append(days.get(params.get("BYDAY")));
+       }
+       return text;
+   }
+   
+   public void setPermissionService(PermissionService permissionService)
+   {
+      this.permissionService = permissionService;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryPost.java
new file mode 100644
index 00000000000..d1eb1cc0abe
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryPost.java
@@ -0,0 +1,133 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.calendar;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.StringTokenizer;
+
+import org.alfresco.service.cmr.calendar.CalendarEntry;
+import org.alfresco.service.cmr.calendar.CalendarEntryDTO;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.JSONException;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the slingshot calendar event.post webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class CalendarEntryPost extends AbstractCalendarWebScript
+{
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, String eventName,
+         WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+   {
+      final ResourceBundle rb = getResources();
+      CalendarEntry entry = new CalendarEntryDTO();
+      
+      // TODO Handle All Day events properly, including timezones
+      boolean isAllDay = false;
+
+      try
+      {
+         // Grab the properties
+         entry.setTitle(getOrNull(json, "what"));
+         entry.setDescription(getOrNull(json, "desc"));
+         entry.setLocation(getOrNull(json, "where"));
+         entry.setSharePointDocFolder(getOrNull(json, "docfolder"));
+         
+         // Handle the dates
+         isAllDay = extractDates(entry, json);
+         
+         // Handle tags
+         if (json.containsKey("tags"))
+         {
+            StringTokenizer st = new StringTokenizer((String)json.get("tags"), ",");
+            while (st.hasMoreTokens())
+            {
+               entry.getTags().add(st.nextToken());
+            }
+         }
+      }
+      catch (JSONException je)
+      {
+         String message = rb.getString(MSG_INVALID_JSON);
+         return buildError(MessageFormat.format(message, je.getMessage()));
+      }
+      
+      // Have it added
+      entry = calendarService.createCalendarEntry(site.getShortName(), entry);
+      
+      
+      // Generate the activity feed for this
+      String dateOpt = addActivityEntry("created", entry, site, req, json);
+      
+      
+      // Build the return object
+      Map<String, Object> result = new HashMap<String, Object>();
+      result.put("name", entry.getTitle());
+      result.put("desc", entry.getDescription());
+      result.put("where", entry.getLocation());
+      
+      result.put("from", removeTimeZoneIfRequired(entry.getStart(), isAllDay, isAllDay));
+      result.put("to", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, isAllDay));
+      
+      String legacyDateFormat = "yyyy-MM-dd";
+      String legacyTimeFormat ="HH:mm";
+      result.put("legacyDateFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, isAllDay, legacyDateFormat));
+      result.put("legacyTimeFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, isAllDay, legacyTimeFormat));
+      result.put("legacyDateTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, isAllDay, legacyDateFormat));
+      result.put("legacyTimeTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, isAllDay, legacyTimeFormat));
+      
+      result.put("uri", "calendar/event/" + site.getShortName() + "/" +
+                        entry.getSystemName() + dateOpt);
+      
+      result.put("tags", entry.getTags());
+      result.put("allday", isAllDay);
+      result.put("docfolder", entry.getSharePointDocFolder());
+      
+      // Replace nulls with blank strings for the JSON
+      for (String key : result.keySet())
+      {
+         if (result.get(key) == null)
+         {
+            result.put(key, "");
+         }
+      }
+      
+      // All done
+      Map<String, Object> model = new HashMap<String, Object>();
+      model.put("result", result);
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryPut.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryPut.java
new file mode 100644
index 00000000000..1d7fb54fc4f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryPut.java
@@ -0,0 +1,201 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.calendar;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.StringTokenizer;
+
+import org.alfresco.service.cmr.calendar.CalendarEntry;
+import org.alfresco.service.cmr.calendar.CalendarEntryDTO;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.JSONException;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the slingshot calendar event.put webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class CalendarEntryPut extends AbstractCalendarWebScript
+{
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, String eventName,
+         WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+   {
+      final ResourceBundle rb = getResources();
+       
+      CalendarEntry entry = calendarService.getCalendarEntry(
+            site.getShortName(), eventName);
+      
+      if (entry == null)
+      {
+         String message = rb.getString(MSG_EVENT_NOT_FOUND);
+         return buildError(MessageFormat.format(message, eventName));
+      }
+      
+      // TODO Handle All Day events properly, including timezones
+      boolean isAllDay = false;
+
+      try
+      {
+         // Doc folder is a bit special
+         String docFolder = (String)json.get("docfolder");
+         
+         // Editing recurring events is special and a little bit odd...
+         if (entry.getRecurrenceRule() != null && !json.containsKey("recurrenceRule"))
+         {
+            // Have an ignored event generated
+            // Will allow us to override this one instance
+            createIgnoreEvent(req, entry);
+            
+            // Create a new entry for this one case
+            CalendarEntry newEntry = new CalendarEntryDTO();
+            newEntry.setOutlook(true);
+            
+            if ("*NOT_CHANGE*".equals(docFolder))
+            {
+               newEntry.setSharePointDocFolder(entry.getSharePointDocFolder());
+            }
+            
+            // From here on, "edit" the new version
+            entry = newEntry;
+         }
+         
+         // Doc folder is a bit special
+         if ("*NOT_CHANGE*".equals(docFolder))
+         {
+            // Nothing to change
+         }
+         else
+         {
+            entry.setSharePointDocFolder(docFolder);
+         }
+            
+         
+         // Grab the properties
+         entry.setTitle(getOrNull(json, "what"));
+         entry.setDescription(getOrNull(json, "desc"));
+         entry.setLocation(getOrNull(json, "where"));
+         
+         // Handle the dates
+         isAllDay = extractDates(entry, json);
+         
+         // Recurring properties, only changed if keys present
+         if (json.containsKey("recurrenceRule"))
+         {
+            if (json.get("recurrenceRule") == null)
+            {
+               entry.setRecurrenceRule(null);
+            }
+            else
+            {
+               entry.setRecurrenceRule((String)json.get("recurrenceRule"));
+            }
+         }
+         if (json.containsKey("recurrenceLastMeeting"))
+         {
+            if (json.get("recurrenceLastMeeting") == null)
+            {
+               entry.setLastRecurrence(null);
+            }
+            else
+            {
+               entry.setLastRecurrence(
+                     parseDate((String)json.get("recurrenceLastMeeting")));
+            }
+         }
+         
+         // Handle tags
+         if (json.containsKey("tags"))
+         {
+            entry.getTags().clear();
+            
+            StringTokenizer st = new StringTokenizer((String)json.get("tags"), ",");
+            while (st.hasMoreTokens())
+            {
+               entry.getTags().add(st.nextToken());
+            }
+         }
+      }
+      catch (JSONException je)
+      {
+         String message = rb.getString(MSG_INVALID_JSON);
+         return buildError(MessageFormat.format(message, je.getMessage()));
+      }
+      
+      // Have it edited
+      entry = calendarService.updateCalendarEntry(entry);
+      
+      
+      // Generate the activity feed for this
+      String dateOpt = addActivityEntry("updated", entry, site, req, json);
+      
+      
+      // Build the return object
+      Map<String, Object> result = new HashMap<String, Object>();
+      result.put("summary", entry.getTitle());
+      result.put("description", entry.getDescription());
+      result.put("location", entry.getLocation());
+      boolean removeTimezone = isAllDay && !entry.isOutlook();
+      result.put("dtstart", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone));
+      result.put("dtend", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone));
+      
+      String legacyDateFormat = "yyyy-MM-dd";
+      String legacyTimeFormat ="HH:mm";
+      result.put("legacyDateFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyDateFormat));
+      result.put("legacyTimeFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyTimeFormat));
+      result.put("legacyDateTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyDateFormat));
+      result.put("legacyTimeTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyTimeFormat));
+      
+      result.put("uri", "calendar/event/" + site.getShortName() + "/" +
+                        entry.getSystemName() + dateOpt);
+      
+      result.put("tags", entry.getTags());
+      result.put("allday", isAllDay);
+      result.put("docfolder", entry.getSharePointDocFolder());
+      
+      // Replace nulls with blank strings for the JSON
+      for (String key : result.keySet())
+      {
+         if (result.get(key) == null)
+         {
+            result.put(key, "");
+         }
+      }
+      
+      // All done
+      Map<String, Object> model = new HashMap<String, Object>();
+      model.put("result", result);
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java
new file mode 100644
index 00000000000..fc4c3c2fa7b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java
@@ -0,0 +1,313 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.calendar;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.calendar.CalendarServiceImpl;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.service.cmr.calendar.CalendarEntry;
+import org.alfresco.service.cmr.calendar.CalendarEntryDTO;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the slingshot calendar userevents.get webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class UserCalendarEntriesGet extends AbstractCalendarListingWebScript
+{
+   private PermissionService permissionService;
+    
+   @Override
+   protected Map<String, Object> executeImpl(WebScriptRequest req,
+         Status status, Cache cache) 
+   {
+      Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+      
+      // Site is optional
+      SiteInfo site = null;
+      String siteName = templateVars.get("site");
+      if (siteName != null)
+      {
+         site = siteService.getSite(siteName);
+         
+         // MNT-3053 fix, siteName was provided in request but it doesn't exists or user has no permissions to access it.
+         if (site == null)
+         {
+             status.setCode(HttpServletResponse.SC_NOT_FOUND, "Site '" + siteName + "' does not exist or user has no permissions to access it.");
+             return null;
+         }
+      }
+      
+      return executeImpl(site, null, req, null, status, cache);
+   }
+   
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo singleSite, String eventName,
+         WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+   {
+      // Did they restrict by date?
+      Date fromDate = parseDate(req.getParameter("from"));
+      Date toDate = parseDate(req.getParameter("to"));
+      
+      // What should we do about repeating events? First or all?
+      boolean repeatingFirstOnly = true;
+      String repeatingEvents = req.getParameter("repeating");
+      if (repeatingEvents != null)
+      {
+         if ("first".equals(repeatingEvents))
+         {
+            repeatingFirstOnly = true;
+         }
+         else if ("all".equals(repeatingEvents))
+         {
+            repeatingFirstOnly = false;
+         }
+      }
+      else
+      {
+         // Fall back to the icky old way of guessing it from 
+         //  the format of the from date, which differs between uses!
+         if (fromDate != null)
+         {
+            String fromDateS = req.getParameter("from");
+            if (fromDateS.indexOf('-') != -1)
+            {
+               // Apparently this is the site calendar dashlet...
+               repeatingFirstOnly = true;
+            }
+            if (fromDateS.indexOf('/') != -1)
+            {
+               // This is something else, wants all events in range
+               repeatingFirstOnly = false;
+            }
+         }
+      }
+      
+      // One site, or all the user's ones?
+      List<SiteInfo> sites = new ArrayList<SiteInfo>();
+      if (singleSite != null)
+      {
+         // Just one
+         sites.add(singleSite);
+      }
+      else
+      {
+         // All their sites (with optional limit)
+         int max = 0;
+         String strMax = req.getParameter("size");
+         if (strMax != null && strMax.length() != 0)
+         {
+             max = Integer.parseInt(strMax);
+         }
+         sites = siteService.listSites(AuthenticationUtil.getRunAsUser(), max);
+      }
+      
+      // We need to know the Site Names, and the NodeRefs of the calendar containers
+      String[] siteShortNames = new String[sites.size()];
+      Map<NodeRef, SiteInfo> containerLookup = new HashMap<NodeRef, SiteInfo>();
+      for (int i=0; i<sites.size(); i++)
+      {
+         SiteInfo site = sites.get(i);
+         siteShortNames[i] = site.getShortName();
+         
+         try
+         {
+            containerLookup.put(
+                siteService.getContainer(site.getShortName(), CalendarServiceImpl.CALENDAR_COMPONENT), 
+                site);
+         }
+         catch (AccessDeniedException e)
+         {
+            // You can see the site, but not the calendar, so skip it
+            // This means you won't have any events in it anyway
+         }
+      }
+      
+      
+      // Get the entries for the list
+      PagingRequest paging = buildPagingRequest(req);
+      PagingResults<CalendarEntry> entries = 
+         calendarService.listCalendarEntries(siteShortNames, fromDate, toDate, paging);
+
+      boolean resortNeeded = false;
+      List<Map<String, Object>> results = new ArrayList<Map<String,Object>>();
+      for (CalendarEntry entry : entries.getPage())
+      {
+         // Build the object
+         Map<String, Object> result = new HashMap<String, Object>();
+         boolean isAllDay = CalendarEntryDTO.isAllDay(entry);
+         boolean removeTimezone = isAllDay && !entry.isOutlook();
+         result.put(RESULT_EVENT,  entry);
+         result.put(RESULT_NAME,   entry.getSystemName());
+         result.put(RESULT_TITLE,  entry.getTitle());
+         result.put("description", entry.getDescription());
+         result.put("where",       entry.getLocation());
+         result.put(RESULT_START,  removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone));
+         result.put(RESULT_END,    removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone));
+         
+         String legacyDateFormat = "yyyy-MM-dd";
+         String legacyTimeFormat ="HH:mm";
+         result.put("legacyDateFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyDateFormat));
+         result.put("legacyTimeFrom", removeTimeZoneIfRequired(entry.getStart(), isAllDay, removeTimezone, legacyTimeFormat));
+         result.put("legacyDateTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyDateFormat));
+         result.put("legacyTimeTo", removeTimeZoneIfRequired(entry.getEnd(), isAllDay, removeTimezone, legacyTimeFormat));
+        
+         
+         
+         result.put("duration", buildDuration(entry));
+         result.put("tags", entry.getTags());
+         result.put("isoutlook", entry.isOutlook());
+         result.put("allday", CalendarEntryDTO.isAllDay(entry));
+         
+         // Identify the site
+         SiteInfo site = containerLookup.get(entry.getContainerNodeRef());
+         result.put("site", site);
+         result.put("siteName", site.getShortName());
+         result.put("siteTitle", site.getTitle());
+         
+         // Check the permissions the user has on the entry
+         AccessStatus canEdit = permissionService.hasPermission(entry.getNodeRef(), PermissionService.WRITE);
+         AccessStatus canDelete = permissionService.hasPermission(entry.getNodeRef(), PermissionService.DELETE);
+         result.put("canEdit", (canEdit == AccessStatus.ALLOWED));
+         result.put("canDelete", (canDelete == AccessStatus.ALLOWED));
+         
+         // Replace nulls with blank strings for the JSON
+         for (String key : result.keySet())
+         {
+            if (result.get(key) == null)
+            {
+               result.put(key, "");
+            }
+         }
+         
+         // Save this one
+         results.add(result);
+         
+         // Handle recurring as needed
+         boolean orderChanged = handleRecurring(entry, result, results, fromDate, toDate, repeatingFirstOnly);
+         if (orderChanged)
+         {
+            resortNeeded = true;
+         }
+      }
+      
+      // If the recurring events meant dates changed, re-sort
+      if (resortNeeded)
+      {
+         Collections.sort(results, getEventDetailsSorter());
+      }
+      
+      // All done
+      Map<String, Object> model = new HashMap<String, Object>();
+      model.put("events", results);
+      return model;
+   }
+
+   private static final long DURATION_SECOND = 1000; 
+   private static final long DURATION_MINUTE = 60 * DURATION_SECOND;
+   private static final long DURATION_HOUR = 60 * DURATION_MINUTE;
+   private static final long DURATION_DAY = 24 * DURATION_HOUR;
+   private static final long DURATION_WEEK = 7 * DURATION_DAY;
+   
+   /**
+    * Builds the duration in iCal format, eg PT2H15M
+    */
+   private String buildDuration(CalendarEntry entry)
+   {
+      StringBuffer duration = new StringBuffer();
+      duration.append("P");
+      
+      long timeDiff = entry.getEnd().getTime() - entry.getStart().getTime();
+      
+      int weeks = (int)Math.floor(timeDiff / DURATION_WEEK);
+      if (weeks > 0)
+      {
+         duration.append(weeks);
+         duration.append("W");
+         timeDiff -= weeks * DURATION_WEEK;
+      }
+      
+      int days = (int)Math.floor(timeDiff / DURATION_DAY);
+      if (days > 0)
+      {
+         duration.append(days);
+         duration.append("D");
+         timeDiff -= days * DURATION_DAY;
+      }
+      
+      duration.append("T");
+      
+      int hours = (int)Math.floor(timeDiff / DURATION_HOUR);
+      if (hours > 0)
+      {
+         duration.append(hours);
+         duration.append("H");
+         timeDiff -= hours * DURATION_HOUR;
+      }
+      
+      int minutes = (int)Math.floor(timeDiff / DURATION_MINUTE);
+      if (minutes > 0)
+      {
+         duration.append(minutes);
+         duration.append("M");
+         timeDiff -= minutes * DURATION_MINUTE;
+      }
+      
+      int seconds = (int)Math.floor(timeDiff / DURATION_SECOND);
+      if (seconds > 0)
+      {
+         duration.append(seconds);
+         timeDiff -= minutes * DURATION_MINUTE;
+      }
+      
+      return duration.toString();
+   }
+   
+   public void setPermissionService(PermissionService permissionService)
+   {
+      this.permissionService = permissionService;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/comment/ScriptCommentService.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/comment/ScriptCommentService.java
new file mode 100644
index 00000000000..2dd2356c226
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/comment/ScriptCommentService.java
@@ -0,0 +1,128 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.comment;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.jscript.BaseScopableProcessorExtension;
+import org.alfresco.repo.jscript.Scopeable;
+import org.alfresco.repo.jscript.ScriptNode;
+import org.alfresco.repo.policy.BehaviourFilter;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.RegexQNamePattern;
+
+/**
+ * Temporary comment service API to start encapsulation of comment logic.
+ * 
+ * NOTE:  this has been added to resolve a specific issue and needs re-consideration 
+ * 
+ * @author Roy Wetherall
+ */
+public class ScriptCommentService extends BaseScopableProcessorExtension
+{
+    private static final String COMMENTS_TOPIC_NAME = "Comments";
+    
+    private ServiceRegistry serviceRegistry;
+    private NodeService nodeService;
+    private BehaviourFilter behaviourFilter;
+    private PermissionService permissionService;
+    
+    public void setServiceRegistry(ServiceRegistry serviceRegistry)
+    {
+        this.serviceRegistry = serviceRegistry;
+        this.nodeService = serviceRegistry.getNodeService();
+        this.permissionService = serviceRegistry.getPermissionService();
+    }
+    
+    public void setBehaviourFilter(BehaviourFilter behaviourFilter)
+    {
+        this.behaviourFilter = behaviourFilter;
+    }
+    
+    public ScriptNode createCommentsFolder(ScriptNode node)
+    {
+        final NodeRef nodeRef = node.getNodeRef();
+        if (permissionService.hasPermission(nodeRef, PermissionService.ADD_CHILDREN) == AccessStatus.DENIED)
+        {
+            throw new AccessDeniedException("User '" + AuthenticationUtil.getFullyAuthenticatedUser() + "' doesn't have permission to create discussion on node '" + nodeRef + "'");
+        }
+        
+        //Run as system user to allow Contributor create discussions
+        NodeRef commentsFolder = AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<NodeRef>()
+        {
+            public NodeRef doWork() throws Exception
+            {
+                NodeRef commentsFolder = null;
+                
+                // ALF-5240: turn off auditing round the discussion node creation to prevent
+                // the source document from being modified by the first user leaving a comment
+                behaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
+                
+                try
+                {
+                    nodeService.addAspect(nodeRef, QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "discussable"), null);
+                    nodeService.addAspect(nodeRef, QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "commentsRollup"), null);
+                    List<ChildAssociationRef> assocs = nodeService.getChildAssocs(nodeRef, QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "discussion"), RegexQNamePattern.MATCH_ALL);
+                    if (assocs.size() != 0)
+                    {
+                        NodeRef forumFolder = assocs.get(0).getChildRef();
+                        
+                        Map<QName, Serializable> props = new HashMap<QName, Serializable>(1, 1.0f);
+                        props.put(ContentModel.PROP_NAME, COMMENTS_TOPIC_NAME);
+                        commentsFolder = nodeService.createNode(
+                                forumFolder,
+                                ContentModel.ASSOC_CONTAINS, 
+                                QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, COMMENTS_TOPIC_NAME), 
+                                QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "topic"),
+                                props).getChildRef();
+                    }
+                }
+                finally
+                {
+                    behaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
+                }
+                
+                return commentsFolder;
+            }
+    
+        }, AuthenticationUtil.getSystemUserName()); 
+        
+        return new ScriptNode(commentsFolder, serviceRegistry, getScope());
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/comments/AbstractCommentsWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/comments/AbstractCommentsWebScript.java
new file mode 100644
index 00000000000..dd59553c6d5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/comments/AbstractCommentsWebScript.java
@@ -0,0 +1,349 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.comments;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.policy.BehaviourFilter;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONStringer;
+import org.json.JSONWriter;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the abstract controller for the comments web scripts (delete
+ * and post)
+ * 
+ * @author Ramona Popa
+ * @since 4.2.6
+ */
+public abstract class AbstractCommentsWebScript extends DeclarativeWebScript
+{
+
+    protected final static String COMMENTS_TOPIC_NAME = "Comments";
+
+    private static Log logger = LogFactory.getLog(CommentsPost.class);
+
+    protected final static String JSON_KEY_SITE = "site";
+    protected final static String JSON_KEY_SITE_ID = "siteid";
+    protected final static String JSON_KEY_ITEM_TITLE = "itemTitle";
+    protected final static String JSON_KEY_PAGE = "page";
+    protected final static String JSON_KEY_TITLE = "title";
+    protected final static String JSON_KEY_PAGE_PARAMS = "pageParams";
+    protected final static String JSON_KEY_NODEREF = "nodeRef";
+    protected final static String JSON_KEY_CONTENT = "content";
+
+    protected final static String COMMENT_CREATED_ACTIVITY = "org.alfresco.comments.comment-created";
+    protected final static String COMMENT_DELETED_ACTIVITY = "org.alfresco.comments.comment-deleted";
+
+    protected ServiceRegistry serviceRegistry;
+    protected NodeService nodeService;
+    protected ContentService contentService;
+    protected PersonService personService;
+    protected SiteService siteService;
+    protected PermissionService permissionService;
+    protected ActivityService activityService;
+
+    protected BehaviourFilter behaviourFilter;
+
+    protected static final String PARAM_MESSAGE = "message";
+    protected static final String PARAM_NODE = "node";
+    protected static final String PARAM_ITEM = "item";
+
+    public void setServiceRegistry(ServiceRegistry serviceRegistry)
+    {
+        this.serviceRegistry = serviceRegistry;
+        this.nodeService = serviceRegistry.getNodeService();
+        this.siteService = serviceRegistry.getSiteService();
+        this.contentService = serviceRegistry.getContentService();
+        this.personService = serviceRegistry.getPersonService();
+        this.permissionService = serviceRegistry.getPermissionService();
+    }
+
+    public void setBehaviourFilter(BehaviourFilter behaviourFilter)
+    {
+        this.behaviourFilter = behaviourFilter;
+    }
+
+    public void setActivityService(ActivityService activityService)
+    {
+        this.activityService = activityService;
+    }
+
+    /**
+     * returns the nodeRef from  web script request
+     * @param req
+     * @return
+     */
+    protected NodeRef parseRequestForNodeRef(WebScriptRequest req)
+    {
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String storeType = templateVars.get("store_type");
+        String storeId = templateVars.get("store_id");
+        String nodeId = templateVars.get("id");
+
+        // create the NodeRef and ensure it is valid
+        StoreRef storeRef = new StoreRef(storeType, storeId);
+        return new NodeRef(storeRef, nodeId);
+    }
+
+    /**
+     * get the value from JSON for given key if exists
+     * @param json
+     * @param key
+     * @return
+     */
+    protected String getOrNull(JSONObject json, String key)
+    {
+        if (json != null && json.containsKey(key))
+        {
+            return (String) json.get(key);
+        }
+        return null;
+    }
+
+    /**
+     * parse JSON from request
+     * @param req
+     * @return
+     */
+    protected JSONObject parseJSON(WebScriptRequest req)
+    {
+        JSONObject json = null;
+        String contentType = req.getContentType();
+        if (contentType != null && contentType.indexOf(';') != -1)
+        {
+            contentType = contentType.substring(0, contentType.indexOf(';'));
+        }
+        if (MimetypeMap.MIMETYPE_JSON.equals(contentType))
+        {
+            JSONParser parser = new JSONParser();
+            try
+            {
+                json = (JSONObject) parser.parse(req.getContent().getContent());
+            }
+            catch (IOException io)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid JSON: " + io.getMessage());
+            }
+            catch (ParseException pe)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid JSON: " + pe.getMessage());
+            }
+        }
+        return json;
+    }
+
+    /**
+     * parse JSON for a given input string
+     * @param input
+     * @return
+     */
+    protected JSONObject parseJSONFromString(String input)
+    {
+        JSONObject json = null;
+
+        JSONParser parser = new JSONParser();
+        try
+        {
+            if (input != null)
+            {
+                json = (JSONObject) parser.parse(input);
+                return json;
+            }
+        }
+        catch (ParseException pe)
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Invalid JSON: " + pe.getMessage());
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Post an activity entry for the comment added or deleted
+     * 
+     * @param json
+     *            - is not sent null with this activity type - only for delete
+     * @param req
+     * @param nodeRef
+     * @param activityType
+     */
+    protected void postActivity(JSONObject json, WebScriptRequest req, NodeRef nodeRef, String activityType)
+    {
+        String jsonActivityData = "";
+        String siteId = "";
+        String page = "";
+        String title = "";
+
+        if (nodeRef == null)
+        {
+            // in case we don't have an parent nodeRef provided we do not need
+            // to post activity for parent node
+            return;
+        }
+
+        String strNodeRef = nodeRef.toString();
+
+        SiteInfo siteInfo = getSiteInfo(req, COMMENT_CREATED_ACTIVITY.equals(activityType));
+
+        // post an activity item, but only if we've got a site
+        if (siteInfo == null || siteInfo.getShortName() == null || siteInfo.getShortName().length() == 0)
+        {
+            return;
+        }
+        else
+        {
+            siteId = siteInfo.getShortName();
+        }
+
+        // json is not sent null with this activity type - only for delete
+        if (COMMENT_CREATED_ACTIVITY.equals(activityType))
+        {
+            try
+            {
+                org.json.JSONObject params = new org.json.JSONObject(getOrNull(json, JSON_KEY_PAGE_PARAMS));
+                String strParams = "";
+
+                Iterator<?> itr = params.keys();
+                while (itr.hasNext())
+                {
+                    String strParam = itr.next().toString();
+                    strParams += strParam + "=" + params.getString(strParam) + "&";
+                }
+                page = getOrNull(json, JSON_KEY_PAGE) + "?" + (strParams != "" ? strParams.substring(0, strParams.length() - 1) : "");
+                title = getOrNull(json, JSON_KEY_ITEM_TITLE);
+
+            }
+            catch (Exception e)
+            {
+                logger.warn("Error parsing JSON", e);
+            }
+        }
+        else
+        {
+            // COMMENT_DELETED_ACTIVITY
+            title = req.getParameter(JSON_KEY_ITEM_TITLE);
+            page = req.getParameter(JSON_KEY_PAGE) + "?" + JSON_KEY_NODEREF + "=" + strNodeRef;
+        }
+
+        try
+        {
+            JSONWriter jsonWriter = new JSONStringer().object();
+            jsonWriter.key(JSON_KEY_TITLE).value(title);
+            jsonWriter.key(JSON_KEY_PAGE).value(page);
+            jsonWriter.key(JSON_KEY_NODEREF).value(strNodeRef);
+
+            jsonActivityData = jsonWriter.endObject().toString();
+            activityService.postActivity(activityType, siteId, COMMENTS_TOPIC_NAME, jsonActivityData);
+        }
+        catch (Exception e)
+        {
+            logger.warn("Error adding comment to activities feed", e);
+        }
+
+    }
+
+    /**
+     * returns SiteInfo needed for post activity
+     * @param req
+     * @return
+     */
+    protected SiteInfo getSiteInfo(WebScriptRequest req, boolean searchForSiteInJSON)
+    {
+        String siteName = req.getParameter(JSON_KEY_SITE);
+
+        if (siteName == null && searchForSiteInJSON )
+        {
+            JSONObject json = parseJSON(req);
+            if (json != null){
+                if (json.containsKey(JSON_KEY_SITE))
+                {
+                    siteName = (String) json.get(JSON_KEY_SITE);
+                }
+                else if (json.containsKey(JSON_KEY_SITE_ID))
+                {
+                    siteName = (String) json.get(JSON_KEY_SITE_ID);
+                }
+            }
+        }
+        if (siteName != null)
+        {
+            SiteInfo site = siteService.getSite(siteName);
+            return site;
+        }
+
+        return null;
+    }
+
+    /**
+     * Overrides DeclarativeWebScript with parse request for nodeRef 
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        // get requested node
+        NodeRef nodeRef = parseRequestForNodeRef(req);
+
+        // Have the real work done
+        return executeImpl(nodeRef, req, status, cache);
+    }
+
+    /**
+     * 
+     * @param nodeRef
+     * @param req
+     * @param status
+     * @param cache
+     * @return
+     */
+    protected abstract Map<String, Object> executeImpl(NodeRef nodeRef, WebScriptRequest req, Status status, Cache cache);
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/comments/CommentDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/comments/CommentDelete.java
new file mode 100644
index 00000000000..3434ef77886
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/comments/CommentDelete.java
@@ -0,0 +1,156 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.comments;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.model.ForumModel;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the comment.delete web script.
+ * 
+ * @author Ramona Popa
+ * @since 4.2.6
+ */
+
+public class CommentDelete extends AbstractCommentsWebScript
+{
+
+    private static Log logger = LogFactory.getLog(CommentDelete.class);
+
+    /**
+     * Overrides AbstractCommentsWebScript to delete comment
+     */
+    @Override
+    protected Map<String, Object> executeImpl(NodeRef nodeRef, WebScriptRequest req, Status status, Cache cache)
+    {
+        String pageParams = req.getParameter(JSON_KEY_PAGE_PARAMS);
+
+        JSONObject jsonPageParams = parseJSONFromString(pageParams);
+
+        String parentNodeRefStr = getOrNull(jsonPageParams, JSON_KEY_NODEREF);
+        NodeRef parentNodeRef = null;
+        if (parentNodeRefStr != null)
+        {
+            parentNodeRef = new NodeRef((String) getOrNull(jsonPageParams, JSON_KEY_NODEREF));
+        }
+
+        if (parentNodeRef == null)
+        {
+            // find the parent content node for the comment
+            // Example would be a blog post which will have the following structure:
+            // blog post -> forum node -> topic node -> the actual comment node
+            NodeRef topicNodeRef = nodeService.getPrimaryParent(nodeRef).getParentRef();
+            if (topicNodeRef == null || !nodeService.getType(topicNodeRef).equals(ForumModel.TYPE_TOPIC))
+            {
+                throw new IllegalArgumentException("The NodeRef specified is not a child of the topic.");
+            }
+            NodeRef forumNodeRef = nodeService.getPrimaryParent(topicNodeRef).getParentRef();
+            if (forumNodeRef == null || !nodeService.getType(forumNodeRef).equals(ForumModel.TYPE_FORUM))
+            {
+                throw new IllegalArgumentException("The NodeRef specified doesn't belong to a correct structure of forums.");
+            }
+            parentNodeRef = nodeService.getPrimaryParent(forumNodeRef).getParentRef();
+        }
+
+        if (parentNodeRef != null)
+        {
+            this.behaviourFilter.disableBehaviour(parentNodeRef, ContentModel.ASPECT_AUDITABLE);
+        }
+
+        try
+        {
+            // delete node
+            deleteComment(nodeRef);
+
+            if (nodeService.exists(nodeRef))
+            {
+                // comment was not removed
+                status.setCode(Status.STATUS_INTERNAL_SERVER_ERROR, "Unable to delete node: " + nodeRef);
+                return null;
+            }
+
+            // generate response model for a comment node
+            Map<String, Object> model = generateModel(nodeRef);
+
+            // post an activity item - it is ok to send json as null since the
+            // infos that we need are as parameters on request
+            postActivity(null, req, parentNodeRef, COMMENT_DELETED_ACTIVITY);
+
+            status.setCode(Status.STATUS_OK);
+            return model;
+
+        }
+        finally
+        {
+            if (parentNodeRef != null)
+            {
+                this.behaviourFilter.enableBehaviour(parentNodeRef, ContentModel.ASPECT_AUDITABLE);
+            }
+        }
+    }
+
+    /**
+     * deletes comment node
+     * 
+     * @param commentNodeRef
+     */
+    private void deleteComment(NodeRef commentNodeRef)
+    {
+        QName nodeType = nodeService.getType(commentNodeRef);
+        if (!nodeType.equals(ForumModel.TYPE_POST))
+        {
+            throw new IllegalArgumentException("Node to delete is not a comment node.");
+        }
+
+        nodeService.deleteNode(commentNodeRef);
+    }
+
+    /**
+     * generates model for delete comment script
+     * 
+     * @param commentNodeRef
+     * @return
+     */
+    private Map<String, Object> generateModel(NodeRef commentNodeRef)
+    {
+        Map<String, Object> model = new HashMap<String, Object>(2, 1.0f);
+
+        model.put(PARAM_MESSAGE, "Node " + commentNodeRef + " deleted");
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/comments/CommentsPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/comments/CommentsPost.java
new file mode 100644
index 00000000000..1c46b8e7974
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/comments/CommentsPost.java
@@ -0,0 +1,279 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.comments;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.model.ForumModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.RegexQNamePattern;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the comments.post web script.
+ * 
+ * @author Sergey Scherbovich (based on existing JavaScript webscript controller)
+ * @since 4.1.7.1
+ */
+public class CommentsPost extends AbstractCommentsWebScript
+{
+    /**
+     *  Overrides AbstractCommentsWebScript to add comment
+     */
+    @Override
+    protected Map<String, Object> executeImpl(NodeRef nodeRef, WebScriptRequest req, Status status, Cache cache)
+    {
+        // get json object from request
+        JSONObject json = parseJSON(req);
+
+        /* MNT-10231, MNT-9771 fix */
+        this.behaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
+
+        try
+        {
+            // add a comment
+            NodeRef commentNodeRef = addComment(nodeRef, json);
+
+            // generate response model for a comment node
+            Map<String, Object> model = generateModel(nodeRef, commentNodeRef);
+
+            // post an activity item
+            postActivity(json, req, nodeRef, COMMENT_CREATED_ACTIVITY);
+
+            return model;
+        }
+        finally
+        {
+            this.behaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
+        }
+    }
+
+    /**
+     * add the comment from json to given nodeRef
+     * 
+     * @param nodeRef
+     * @param json
+     * @return
+     */
+    private NodeRef addComment(NodeRef nodeRef, JSONObject json)
+    {
+        // fetch the parent to add the node to
+        NodeRef commentsFolder = getOrCreateCommentsFolder(nodeRef);
+        
+        // get a unique name
+        String name = getUniqueChildName("comment");
+        
+        // create the comment
+        NodeRef commentNodeRef = nodeService.createNode(commentsFolder, 
+                ContentModel.ASSOC_CONTAINS, 
+                QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName.createValidLocalName(name)), 
+                ForumModel.TYPE_POST).getChildRef();
+            
+        // fetch the title required to create a comment
+        String title = getOrNull(json, JSON_KEY_TITLE);
+        HashMap<QName, Serializable> props = new HashMap<QName, Serializable>(1, 1.0f);
+        props.put(ContentModel.PROP_TITLE, title != null ? title : "");
+        nodeService.addProperties(commentNodeRef, props);
+        
+        ContentWriter writer = contentService.getWriter(commentNodeRef, ContentModel.PROP_CONTENT, true);
+        // fetch the content of a comment
+        String contentString = getOrNull(json, JSON_KEY_CONTENT);
+        
+        writer.setMimetype(MimetypeMap.MIMETYPE_HTML);
+        writer.putContent(contentString);
+        
+        return commentNodeRef;
+    }
+    
+    /**
+     * generates an comment item value
+     * 
+     * @param commentNodeRef
+     * @return
+     */
+    private Map<String, Object> generateItemValue(NodeRef commentNodeRef)
+    {
+        Map<String, Object> result = new HashMap<String, Object>(4, 1.0f);
+        
+        String creator = (String)this.nodeService.getProperty(commentNodeRef, ContentModel.PROP_CREATOR);
+        
+        Serializable created = this.nodeService.getProperty(commentNodeRef, ContentModel.PROP_CREATED);
+        Serializable modified = this.nodeService.getProperty(commentNodeRef, ContentModel.PROP_MODIFIED);
+        
+        boolean isUpdated = false;
+        if (created instanceof Date && modified instanceof Date)
+        {
+           isUpdated = ((Date)modified).getTime() - ((Date)created).getTime() > 5000;
+        }
+
+        // TODO refactor v0 Comments API to use CommentService (see ACE-5437)
+        Serializable owner = this.nodeService.getProperty(commentNodeRef, ContentModel.PROP_OWNER);
+        String currentUser = this.serviceRegistry.getAuthenticationService().getCurrentUserName();
+        
+        boolean isSiteManager = this.permissionService.hasPermission(commentNodeRef, SiteModel.SITE_MANAGER) == (AccessStatus.ALLOWED);
+        boolean isCoordinator = this.permissionService.hasPermission(commentNodeRef, PermissionService.COORDINATOR) == (AccessStatus.ALLOWED);
+        boolean canEditComment = isSiteManager || isCoordinator || currentUser.equals(creator) || currentUser.equals(owner);
+        
+        result.put("node", commentNodeRef);
+        result.put("author", this.personService.getPerson(creator));
+        result.put("isUpdated", isUpdated);
+        result.put("canEditComment", canEditComment);
+        
+        return result;
+    }
+    
+    /**
+     * generates the response model for adding a comment
+     * 
+     * @param nodeRef
+     * @param commentNodeRef
+     * @return
+     */
+    private Map<String, Object> generateModel(NodeRef nodeRef, NodeRef commentNodeRef)
+    {
+        Map<String, Object> model = new HashMap<String, Object>(2, 1.0f);
+
+        model.put(PARAM_NODE, nodeRef);
+        model.put(PARAM_ITEM, generateItemValue(commentNodeRef));
+
+        return model;
+    }
+
+    /**
+     * 
+     * @param nodeRef
+     * @return
+     */
+    private NodeRef getOrCreateCommentsFolder(NodeRef nodeRef)
+    {
+        NodeRef commentsFolder = getCommentsFolder(nodeRef);
+        // create a comment folder if it doesn't exist
+        if (commentsFolder == null)
+        {
+            commentsFolder = createCommentsFolder(nodeRef);
+        }
+        return commentsFolder;
+    }
+    
+    /**
+     * returns the nodeRef of the existing one
+     * 
+     * @param nodeRef
+     * @return
+     */
+    private NodeRef getCommentsFolder(NodeRef nodeRef)
+    {
+        if (nodeService.hasAspect(nodeRef, ForumModel.ASPECT_DISCUSSABLE))
+        {
+            List<ChildAssociationRef> assocs = nodeService.getChildAssocs(nodeRef, ForumModel.ASSOC_DISCUSSION, RegexQNamePattern.MATCH_ALL);
+            ChildAssociationRef firstAssoc = assocs.get(0);
+            
+            return nodeService.getChildByName(firstAssoc.getChildRef(), ContentModel.ASSOC_CONTAINS, COMMENTS_TOPIC_NAME);
+        }
+        else
+        {
+            return null;
+        }
+    }
+
+    private String getUniqueChildName(String prefix)
+    {
+        return prefix + "-" + System.currentTimeMillis();
+    }
+    
+    /**
+     * creates the comments folder if it does not exists
+     * 
+     * @param nodeRef
+     * @return
+     */
+    private NodeRef createCommentsFolder(final NodeRef nodeRef)
+    {
+        NodeRef commentsFolder = AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<NodeRef>()
+        {
+            public NodeRef doWork() throws Exception
+            {
+                NodeRef commentsFolder = null;
+                AuthenticationUtil.pushAuthentication();
+                
+                // ALF-5240: turn off auditing round the discussion node creation to prevent
+                // the source document from being modified by the first user leaving a comment
+                behaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
+                
+                try
+                {  
+                    // MNT-12082: set System user for creating forumFolder and commentsFolder nodes
+                    AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
+                    
+                    nodeService.addAspect(nodeRef, QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "discussable"), null);
+                    nodeService.addAspect(nodeRef, QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "commentsRollup"), null);
+                    List<ChildAssociationRef> assocs = nodeService.getChildAssocs(nodeRef, QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "discussion"), RegexQNamePattern.MATCH_ALL);
+                    if (assocs.size() != 0)
+                    {
+                        NodeRef forumFolder = assocs.get(0).getChildRef();
+                        
+                        Map<QName, Serializable> props = new HashMap<QName, Serializable>(1, 1.0f);
+                        props.put(ContentModel.PROP_NAME, COMMENTS_TOPIC_NAME);
+                        commentsFolder = nodeService.createNode(
+                                forumFolder,
+                                ContentModel.ASSOC_CONTAINS, 
+                                QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, COMMENTS_TOPIC_NAME), 
+                                QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "topic"),
+                                props).getChildRef();
+                    }
+                }
+                finally
+                {
+                    AuthenticationUtil.popAuthentication();
+                    behaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
+                }
+                
+                return commentsFolder;
+            }
+    
+        }, AuthenticationUtil.getSystemUserName()); 
+        
+        return commentsFolder;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/config/OpenSearchConfigElement.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/config/OpenSearchConfigElement.java
new file mode 100644
index 00000000000..c111d23a784
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/config/OpenSearchConfigElement.java
@@ -0,0 +1,284 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.config;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.element.ConfigElementAdapter;
+
+
+/**
+ * Custom config element that represents the config data for open search
+ * 
+ * @author davidc
+ */
+public class OpenSearchConfigElement extends ConfigElementAdapter
+{
+    public static final String CONFIG_ELEMENT_ID = "opensearch";
+
+    private ProxyConfig proxy;
+    private Set<EngineConfig> engines = new HashSet<EngineConfig>(8, 10f);
+    private Map<String, EngineConfig> enginesByProxy = new HashMap<String, EngineConfig>();
+        
+    
+    /**
+     * Default constructor
+     */
+    public OpenSearchConfigElement()
+    {
+        super(CONFIG_ELEMENT_ID);
+    }
+
+    /**
+     * Constructor
+     * 
+     * @param name  Name of the element this config element represents
+     */
+    public OpenSearchConfigElement(String name)
+    {
+        super(name);
+    }
+
+    /**
+     * @see ConfigElement#getChildren()
+     */
+    public List<ConfigElement> getChildren()
+    {
+        throw new ConfigException("Reading the open search config via the generic interfaces is not supported");
+    }
+
+    /**
+     * @see ConfigElement#combine(ConfigElement)
+     */
+    public ConfigElement combine(ConfigElement configElement)
+    {
+        OpenSearchConfigElement newElement = (OpenSearchConfigElement) configElement;
+        OpenSearchConfigElement combinedElement = new OpenSearchConfigElement();
+
+        // add all the plugins from this element
+        for (EngineConfig plugin : this.getEngines())
+        {
+            combinedElement.addEngine(plugin);
+        }
+
+        // add all the plugins from the given element
+        for (EngineConfig plugin : newElement.getEngines())
+        {
+            combinedElement.addEngine(plugin);
+        }
+        
+        // set the proxy configuration
+        ProxyConfig proxyConfig = this.getProxy();
+        if (proxyConfig != null)
+        {
+            combinedElement.setProxy(proxyConfig);
+        }
+
+        return combinedElement;
+    }
+
+    /**
+     * Sets the proxy configuration
+     * 
+     * @param proxyConfig ProxyConfig
+     */
+    /*package*/ void setProxy(ProxyConfig proxyConfig)
+    {
+        this.proxy = proxyConfig;
+    }
+    
+    /**
+     * Gets the proxy configuration
+     * 
+     * @return The proxy configuration
+     */
+    public ProxyConfig getProxy()
+    {
+        return this.proxy;
+    }
+    
+    /**
+     * @return Returns a set of the engines
+     */
+    public Set<EngineConfig> getEngines()
+    {
+        return this.engines;
+    }
+    
+    /**
+     * @param proxy  name of engine proxy
+     * @return  associated engine config (or null, if none registered against proxy)
+     */
+    public EngineConfig getEngine(String proxy)
+    {
+       return this.enginesByProxy.get(proxy); 
+    }
+
+    /**
+     * Adds an engine
+     * 
+     * @param engineConfig  A pre-configured engine config object
+     */
+    /*package*/ void addEngine(EngineConfig engineConfig)
+    {
+        this.engines.add(engineConfig);
+        String proxy = engineConfig.getProxy();
+        if (proxy != null && proxy.length() > 0)
+        {
+            this.enginesByProxy.put(proxy, engineConfig);
+        }
+    }
+
+
+    /**
+     * Inner class representing the configuration of an OpenSearch engine
+     * 
+     * @author davidc
+     */
+    public static class EngineConfig
+    {
+        protected String label;
+        protected String labelId;
+        protected String proxy;
+        protected Map<String, String> urls = new HashMap<String, String>(8, 10f);
+
+        
+        /**
+         * Construct
+         * 
+         * @param label String
+         * @param labelId String
+         */
+        public EngineConfig(String label, String labelId)
+        {
+            if ((label == null || label.length() == 0) && (labelId == null || labelId.length() == 0))
+            {
+                throw new IllegalArgumentException("'label' or 'label-id' must be specified");
+            }
+            this.label = label;
+            this.labelId = labelId;
+        }
+
+        /**
+         * Construct
+         * 
+         * @param label String
+         * @param labelId String
+         * @param proxy String
+         */
+        public EngineConfig(String label, String labelId, String proxy)
+        {
+            this(label, labelId);
+            this.proxy = proxy;
+        }
+
+        /**
+         * @return  I18N label id
+         */
+        public String getLabelId()
+        {
+            return labelId;
+        }
+
+        /**
+         * @return  label
+         */
+        public String getLabel()
+        {
+            return label;
+        }
+
+        /**
+         * @return  proxy
+         */
+        public String getProxy()
+        {
+            return proxy;
+        }
+        
+        /**
+         * Gets the urls supported by this engine
+         * 
+         * @return  urls
+         */
+        public Map<String, String> getUrls()
+        {
+            return urls;
+        }
+
+        /**
+         * Adds a url
+         * 
+         * @param mimetype  mime type
+         * @param uri  uri
+         */
+        /*package*/ void addUrl(String mimetype, String uri)
+        {
+            this.urls.put(mimetype, uri);
+        }
+        
+    }
+
+    
+    /**
+     * Inner class representing the configuration of the OpenSearch proxy
+     * 
+     * @author davidc
+     */
+    public static class ProxyConfig
+    {
+        protected String url;
+        
+        /**
+         * Construct
+         * 
+         * @param url String
+         */
+        public ProxyConfig(String url)
+        {
+            if (url == null || url.length() == 0)
+            {
+                throw new IllegalArgumentException("'url' must be specified");
+            }
+            this.url = url;
+        }
+
+        /**
+         * @return  url
+         */
+        public String getUrl()
+        {
+            return url;
+        }
+    }
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/config/OpenSearchElementReader.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/config/OpenSearchElementReader.java
new file mode 100644
index 00000000000..aea1e0b4bef
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/config/OpenSearchElementReader.java
@@ -0,0 +1,120 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.config;
+
+import java.util.Iterator;
+
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.xml.elementreader.ConfigElementReader;
+import org.alfresco.repo.web.scripts.config.OpenSearchConfigElement.EngineConfig;
+import org.alfresco.repo.web.scripts.config.OpenSearchConfigElement.ProxyConfig;
+import org.dom4j.Element;
+
+
+/**
+ * Custom element reader to parse config for the open search
+ * 
+ * @author davidc
+ */
+public class OpenSearchElementReader implements ConfigElementReader
+{
+    public static final String ELEMENT_OPENSEARCH = "opensearch";
+    public static final String ELEMENT_ENGINES = "engines";
+    public static final String ELEMENT_ENGINE = "engine";
+    public static final String ELEMENT_URL = "url";
+    public static final String ELEMENT_PROXY = "proxy";
+    public static final String ATTR_TYPE = "type";
+    public static final String ATTR_LABEL = "label";
+    public static final String ATTR_LABEL_ID = "label-id";
+    public static final String ATTR_PROXY = "proxy";
+
+    
+    /**
+     * @see org.springframework.extensions.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+     */
+    @SuppressWarnings("unchecked")
+    public ConfigElement parse(Element element)
+    {
+        OpenSearchConfigElement configElement = null;
+
+        if (element != null)
+        {
+            String elementName = element.getName();
+            if (elementName.equals(ELEMENT_OPENSEARCH) == false)
+            {
+                throw new ConfigException("OpenSearchElementReader can only parse " + ELEMENT_OPENSEARCH
+                        + "elements, the element passed was '" + elementName + "'");
+            }
+
+            // go through the registered engines
+            configElement = new OpenSearchConfigElement();
+            Element pluginsElem = element.element(ELEMENT_ENGINES);
+            if (pluginsElem != null)
+            {
+                Iterator<Element> engines = pluginsElem.elementIterator(ELEMENT_ENGINE);
+                while(engines.hasNext())
+                {
+                    // construct engine
+                    Element engineElem = engines.next();
+                    String label = engineElem.attributeValue(ATTR_LABEL);
+                    String labelId = engineElem.attributeValue(ATTR_LABEL_ID);
+                    String proxy = engineElem.attributeValue(ATTR_PROXY);
+                    EngineConfig engineCfg = new EngineConfig(label, labelId, proxy);
+                
+                    // construct urls for engine
+                    Iterator<Element> urlsConfig = engineElem.elementIterator(ELEMENT_URL);
+                    while (urlsConfig.hasNext())
+                    {
+                        Element urlConfig = urlsConfig.next();
+                        String type = urlConfig.attributeValue(ATTR_TYPE);
+                        String url = urlConfig.getTextTrim();
+                        engineCfg.addUrl(type, url);
+                    }
+
+                    // register engine config
+                    configElement.addEngine(engineCfg);
+                }
+            }
+            
+            // extract proxy configuration
+            String url = null;
+            Element proxyElem = element.element(ELEMENT_PROXY);
+            if (proxyElem != null)
+            {
+                Element urlElem = proxyElem.element(ELEMENT_URL);
+                if (urlElem != null)
+                {
+                    url = urlElem.getTextTrim();
+                    ProxyConfig proxyCfg = new ProxyConfig(url);
+                    configElement.setProxy(proxyCfg);
+                }
+            }
+        }
+
+        return configElement;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentGet.java
new file mode 100644
index 00000000000..83e32679d76
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentGet.java
@@ -0,0 +1,170 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.content;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.web.context.ServletContextAware;
+
+
+/**
+ * Content Retrieval Service
+ * 
+ * Stream content from the Repository.
+ * 
+ * @author davidc
+ */
+public class ContentGet extends StreamContent implements ServletContextAware
+{
+    // Logger
+    @SuppressWarnings("unused")
+    private static final Log logger = LogFactory.getLog(ContentGet.class);
+    
+    // Component dependencies
+    private ServletContext servletContext;
+    private DictionaryService dictionaryService;
+    private NamespaceService namespaceService;
+    private ContentService contentService;
+
+    /**
+     * @param servletContext ServletContext
+     */
+    public void setServletContext(ServletContext servletContext)
+    {
+        this.servletContext = servletContext;
+    }
+
+    /**
+     * @param dictionaryService DictionaryService
+     */
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService; 
+    }
+
+    /**
+     * @param namespaceService NamespaceService
+     */
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService; 
+    }
+    
+    /**
+     * @param contentService ContentService
+     */
+    public void setContentService(ContentService contentService)
+    {
+        this.contentService = contentService;
+    }
+
+    /**
+     * @see org.springframework.extensions.webscripts.WebScript#execute(WebScriptRequest, WebScriptResponse)
+     */
+    public void execute(WebScriptRequest req, WebScriptResponse res)
+        throws IOException
+    {
+        // create map of args
+        String[] names = req.getParameterNames();
+        Map<String, String> args = new HashMap<String, String>(names.length, 1.0f);
+        for (String name : names)
+        {
+            args.put(name, req.getParameter(name));
+        }
+        
+        // create map of template vars
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        
+        // create object reference from url
+        ObjectReference reference = createObjectReferenceFromUrl(args, templateVars);
+        NodeRef nodeRef = reference.getNodeRef();
+        if (nodeRef == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find " + reference.toString());
+        }
+        
+        // determine attachment
+        boolean attach = Boolean.valueOf(req.getParameter("a"));
+        
+        // render content
+        QName propertyQName = ContentModel.PROP_CONTENT;
+        String contentPart = templateVars.get("property");
+        if (contentPart.length() > 0 && contentPart.charAt(0) == ';')
+        {
+            if (contentPart.length() < 2)
+            {
+                throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "Content property malformed");
+            }
+            String propertyName = contentPart.substring(1);
+            if (propertyName.length() > 0)
+            {
+                propertyQName = QName.createQName(propertyName, namespaceService);
+            }
+        }
+
+        // Stream the content
+        streamContentLocal(req, res, nodeRef, attach, propertyQName, null);
+    }
+
+    protected void streamContentLocal(WebScriptRequest req, WebScriptResponse res, NodeRef nodeRef, boolean attach, QName propertyQName, Map<String, Object> model) throws IOException
+    {
+        String userAgent = req.getHeader("User-Agent");
+        userAgent = userAgent != null ? userAgent.toLowerCase() : "";
+        boolean rfc5987Supported = (userAgent.contains("msie") ||
+                userAgent.contains(" trident/") ||
+                userAgent.contains(" chrome/") ||
+                userAgent.contains(" firefox/") ||
+                userAgent.contains(" safari/"));
+
+        if (attach && rfc5987Supported)
+        {
+            String name = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
+            
+            // maintain the original name of the node during the download - do not modify it - see MNT-16510
+            streamContent(req, res, nodeRef, propertyQName, attach, name, model);
+        }
+        else
+        {
+            streamContent(req, res, nodeRef, propertyQName, attach, null, model);
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentInfo.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentInfo.java
new file mode 100644
index 00000000000..2e34694c244
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentInfo.java
@@ -0,0 +1,109 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.content;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * Content Info Service Get info about content from the Repository.
+ * 
+ * @author alex.malinovsky
+ */
+public class ContentInfo extends StreamContent
+{
+    @Override
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        // create empty map of args
+        Map<String, String> args = new HashMap<String, String>(0, 1.0f);
+        // create map of template vars
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        // create object reference from url
+        ObjectReference reference = createObjectReferenceFromUrl(args, templateVars);
+        NodeRef nodeRef = reference.getNodeRef();
+        if (nodeRef == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find " + reference.toString());
+        }
+
+        // render content
+        QName propertyQName = ContentModel.PROP_CONTENT;
+
+        // Stream the content
+        streamContent(req, res, nodeRef, propertyQName, false, null, null);
+    }
+
+    protected void streamContentImpl(WebScriptRequest req, WebScriptResponse res, 
+            ContentReader reader, NodeRef nodeRef, QName propertyQName, 
+            boolean attach, Date modified, String eTag, String attachFileName)
+            throws IOException
+    {
+        delegate.setAttachment(req, res, attach, attachFileName);
+
+        // establish mimetype
+        String mimetype = reader.getMimetype();
+        String extensionPath = req.getExtensionPath();
+        if (mimetype == null || mimetype.length() == 0)
+        {
+            mimetype = MimetypeMap.MIMETYPE_BINARY;
+            int extIndex = extensionPath.lastIndexOf('.');
+            if (extIndex != -1)
+            {
+                String ext = extensionPath.substring(extIndex + 1);
+                mimetype = mimetypeService.getMimetype(ext);
+            }
+        }
+
+        // set mimetype for the content and the character encoding + length for the stream
+        res.setContentType(mimetype);
+        res.setContentEncoding(reader.getEncoding());
+        res.setHeader("Content-Length", Long.toString(reader.getSize()));
+
+        // set caching
+        Cache cache = new Cache();
+        cache.setNeverCache(false);
+        cache.setMustRevalidate(true);
+        cache.setMaxAge(0L);
+        cache.setLastModified(modified);
+        cache.setETag(eTag);
+        res.setCache(cache);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java
new file mode 100644
index 00000000000..efbd743aa4d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java
@@ -0,0 +1,587 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.content;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.SocketException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.content.filestore.FileContentReader;
+import org.alfresco.sync.repo.events.EventPublisher;
+import org.alfresco.repo.web.util.HttpRangeProcessor;
+import org.alfresco.rest.framework.resource.content.CacheDirective;
+import org.alfresco.service.cmr.repository.ContentIOException;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.TempFileProvider;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.ResourceLoaderAware;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.extensions.surf.util.URLEncoder;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.util.FileCopyUtils;
+
+
+/**
+ * Can be used when the binary data of a content property needs to be streamed back to the client
+ * as the result of executing a web script.
+ * 
+ * These methods are taken from the StreamContent class so they can be reused by other webscripts.
+ *
+ */
+
+public class ContentStreamer implements ResourceLoaderAware
+{
+    // Logger
+    private static final Log logger = LogFactory.getLog(ContentStreamer.class);
+
+    public static final String KEY_ALLOW_BROWSER_TO_CACHE = "allowBrowserToCache";
+    public static final String KEY_CACHE_DIRECTIVE = "cacheDirective";
+
+    /**
+     * format definied by RFC 822, see http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3
+     */
+    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("EEE', 'dd' 'MMM' 'yyyy' 'HH:mm:ss' 'Z", Locale.US);
+
+    private static final String HEADER_CONTENT_RANGE = "Content-Range";
+    private static final String HEADER_CONTENT_LENGTH = "Content-Length";
+    private static final String HEADER_ACCEPT_RANGES = "Accept-Ranges";
+    private static final String HEADER_RANGE = "Range";
+    private static final String HEADER_USER_AGENT = "User-Agent";
+
+    /**
+     * Services
+     */
+    // protected PermissionService permissionService;
+    protected NodeService nodeService;
+    protected ContentService contentService;
+    protected MimetypeService mimetypeService;
+    protected ResourceLoader resourceLoader;
+    protected EventPublisher eventPublisher;
+    protected SiteService siteService;
+
+    /**
+     * @param mimetypeService MimetypeService
+     */
+    public void setMimetypeService(MimetypeService mimetypeService)
+    {
+        this.mimetypeService = mimetypeService;
+    }
+
+    /**
+     * @param nodeService NodeService
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    /**
+     * @param eventPublisher EventPublisher
+     */
+    public void setEventPublisher(EventPublisher eventPublisher)
+    {
+        this.eventPublisher = eventPublisher;
+    }
+
+    /**
+     * @param siteService SiteService
+     */
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+
+    @Override
+    public void setResourceLoader(ResourceLoader resourceLoader)
+    {
+        this.resourceLoader = resourceLoader;
+    }
+
+    /**
+     * @param contentService ContentService
+     */
+    public void setContentService(ContentService contentService)
+
+    {
+        this.contentService = contentService;
+    }
+
+
+    /**
+     * Streams content back to client from a given File.
+     * 
+     * @param req               The request
+     * @param res               The response
+     * @param file              The file whose content is to be streamed.
+     * @param modifiedTime      The modified datetime to use for the streamed content. If <tt>null</tt> the
+     *                          file's timestamp will be used.
+     * @param attach            Indicates whether the content should be streamed as an attachment or not
+     * @param attachFileName    Optional file name to use when attach is <code>true</code>
+     * @throws IOException
+     */
+    public void streamContent(WebScriptRequest req, 
+                                 WebScriptResponse res, 
+                                 File file, 
+                                 Long modifiedTime,
+                                 boolean attach, 
+                                 String attachFileName,
+                                 Map<String, Object> model) throws IOException
+    {
+        if (logger.isDebugEnabled())
+            logger.debug("Retrieving content from file " + file.getAbsolutePath() + " (attach: " + attach + ")");
+        
+        // determine mimetype from file extension
+        String filePath = file.getAbsolutePath();
+        String mimetype = MimetypeMap.MIMETYPE_BINARY;
+        int extIndex = filePath.lastIndexOf('.');
+        if (extIndex != -1)
+        {
+            mimetype = mimetypeService.getMimetype(filePath.substring(extIndex + 1));
+        }
+        
+        // setup file reader and stream
+        FileContentReader reader = new FileContentReader(file);
+        reader.setMimetype(mimetype);
+        reader.setEncoding("UTF-8");
+        
+        long lastModified = modifiedTime == null ? file.lastModified() : modifiedTime;
+        Date lastModifiedDate = new Date(lastModified);
+        
+        streamContentImpl(req, res, reader, null, null, attach, lastModifiedDate, String.valueOf(lastModifiedDate.getTime()), attachFileName, model);
+    }
+
+    /**
+     * Streams the content on a given node's content property to the response of the web script.
+     *
+     * @param req            Request
+     * @param res            Response
+     * @param nodeRef        The node reference
+     * @param propertyQName  The content property name
+     * @param attach         Indicates whether the content should be streamed as an attachment or not
+     * @param attachFileName Optional file name to use when attach is <code>true</code>
+     * @throws IOException
+     */
+    public void streamContent(WebScriptRequest req,
+                WebScriptResponse res,
+                NodeRef nodeRef,
+                QName propertyQName,
+                boolean attach,
+                String attachFileName,
+                Map<String, Object> model) throws IOException
+    {
+        if (logger.isDebugEnabled())
+            logger.debug("Retrieving content from node ref " + nodeRef.toString() + " (property: " + propertyQName.toString() + ") (attach: " + attach + ")");
+
+        // TODO
+        // This was commented out to accomadate records management permissions.  We need to review how we cope with this
+        // hard coded permission checked.
+
+        // check that the user has at least READ_CONTENT access - else redirect to the login page
+        //        if (permissionService.hasPermission(nodeRef, PermissionService.READ_CONTENT) == AccessStatus.DENIED)
+        //        {
+        //            throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "Permission denied");
+        //        }
+
+        // check If-Modified-Since header and set Last-Modified header as appropriate
+        Date modified = (Date) nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIED);
+        if (modified != null)
+        {
+            long modifiedSince = -1;
+            String modifiedSinceStr = req.getHeader("If-Modified-Since");
+            if (modifiedSinceStr != null)
+            {
+                try
+                {
+                    modifiedSince = dateFormat.parse(modifiedSinceStr).getTime();
+                }
+                catch (Throwable e)
+                {
+                    if (logger.isInfoEnabled())
+                        logger.info("Browser sent badly-formatted If-Modified-Since header: " + modifiedSinceStr);
+                }
+
+                if (modifiedSince > 0L)
+                {
+                    // round the date to the ignore millisecond value which is not supplied by header
+                    long modDate = (modified.getTime() / 1000L) * 1000L;
+                    if (modDate <= modifiedSince)
+                    {
+                        res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+                        return;
+                    }
+                }
+            }
+        }
+
+        // get the content reader
+        ContentReader reader = contentService.getReader(nodeRef, propertyQName);
+        if (reader == null || !reader.exists())
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to locate content for node ref " + nodeRef + " (property: " + propertyQName.toString() + ")");
+        }
+
+        // Stream the content
+        streamContentImpl(req, res, reader, nodeRef, propertyQName, attach, modified, modified == null ? null : Long.toString(modified.getTime()), attachFileName, model);
+    }
+
+    /**
+     * Streams content back to client from a given resource path.
+     * 
+     * @param req               The request
+     * @param res               The response
+     * @param resourcePath      The classpath resource path the content is required for
+     * @param attach            Indicates whether the content should be streamed as an attachment or not
+     * @throws IOException
+     */
+    public void streamContent(WebScriptRequest req, 
+                                 WebScriptResponse res, 
+                                 String resourcePath,
+                                 boolean attach,
+                                 Map<String, Object> model) throws IOException
+    {
+        streamContent(req, res, resourcePath, attach, null, model);
+    }
+
+    /**
+     * Streams content back to client from a given resource path.
+     * 
+     * @param req               The request
+     * @param res               The response
+     * @param resourcePath      The classpath resource path the content is required for.
+     * @param attach            Indicates whether the content should be streamed as an attachment or not
+     * @param attachFileName    Optional file name to use when attach is <code>true</code>
+     * @throws IOException
+     */
+    protected void streamContent(WebScriptRequest req, 
+                                 WebScriptResponse res, 
+                                 String resourcePath,
+                                 boolean attach, 
+                                 String attachFileName,
+                                 Map<String, Object> model) throws IOException
+    {
+        if (logger.isDebugEnabled())
+            logger.debug("Retrieving content from resource path " + resourcePath + " (attach: " + attach + ")");
+        
+        // get extension of resource
+        String ext = "";
+        int extIndex = resourcePath.lastIndexOf('.');
+        if (extIndex != -1)
+        {
+            ext = resourcePath.substring(extIndex);
+        }
+        
+        // We need to retrieve the modification date/time from the resource itself.
+        StringBuilder sb = new StringBuilder("classpath:").append(resourcePath);
+        final String classpathResource = sb.toString();
+        
+        long resourceLastModified = resourceLoader.getResource(classpathResource).lastModified();
+        
+        // create temporary file 
+        File file = TempFileProvider.createTempFile("streamContent-", ext);
+    
+        InputStream is = resourceLoader.getResource(classpathResource).getInputStream();
+        OutputStream os = new FileOutputStream(file);
+        FileCopyUtils.copy(is, os);
+        
+        // stream the contents of the file, but using the modifiedDate of the original resource.
+        streamContent(req, res, file, resourceLastModified, attach, attachFileName, model);
+    }
+
+    /**
+     * Stream content implementation
+     * 
+     * @param req               The request
+     * @param res               The response
+     * @param reader            The reader
+     * @param nodeRef           The content nodeRef if applicable
+     * @param propertyQName     The content property if applicable
+     * @param attach            Indicates whether the content should be streamed as an attachment or not
+     * @param modified          Modified date of content
+     * @param eTag              ETag to use
+     * @param attachFileName    Optional file name to use when attach is <code>true</code>
+     * @throws IOException
+     */
+    public void streamContentImpl(WebScriptRequest req, 
+                                    WebScriptResponse res, 
+                                    ContentReader reader, 
+                                    final NodeRef nodeRef,
+                                    final QName propertyQName,
+                                    final boolean attach,
+                                    final Date modified, 
+                                    String eTag, 
+                                    final String attachFileName, 
+                                    Map<String, Object> model) throws IOException
+    {
+        setAttachment(req, res, attach, attachFileName);
+    
+        // establish mimetype
+        String mimetype = reader.getMimetype();
+        String extensionPath = req.getExtensionPath();
+        if (mimetype == null || mimetype.length() == 0)
+        {
+            mimetype = MimetypeMap.MIMETYPE_BINARY;
+            int extIndex = extensionPath.lastIndexOf('.');
+            if (extIndex != -1)
+            {
+                String ext = extensionPath.substring(extIndex + 1);
+                mimetype = mimetypeService.getMimetype(ext);
+            }
+        }
+        
+        res.setHeader(HEADER_ACCEPT_RANGES, "bytes");
+        try
+        {
+            boolean processedRange = false;
+            String range = req.getHeader(HEADER_CONTENT_RANGE);
+            final long size = reader.getSize();
+            final String encoding = reader.getEncoding();
+                  
+//            if (attach)
+//            {
+//                final String finalMimetype = mimetype;
+//                
+//                eventPublisher.publishEvent(new EventPreparator(){
+//                    @Override
+//                    public Event prepareEvent(String user, String networkId, String transactionId)
+//                    {
+//                        String siteId = siteService.getSiteShortName(nodeRef);
+//                        
+//                        return new ContentEventImpl(ContentEvent.DOWNLOAD, user, networkId, transactionId,
+//                                    nodeRef.getId(), siteId, propertyQName.toString(), Client.asType(ClientType.webclient), attachFileName, finalMimetype, size, encoding);
+//                    }
+//                });
+//            }
+            
+            if (range == null)
+            {
+               range = req.getHeader(HEADER_RANGE);
+            }
+            if (range != null)
+            {
+               if (logger.isDebugEnabled())
+                  logger.debug("Found content range header: " + range);
+               
+               // ensure the range header is starts with "bytes=" and process the range(s)
+               if (range.length() > 6)
+               {
+                  if (range.indexOf(',') != -1 && (nodeRef == null || propertyQName == null))
+                  {
+                       if (logger.isInfoEnabled())
+                           logger.info("Multi-range only supported for nodeRefs");
+                  }
+                  else {
+                      HttpRangeProcessor rangeProcessor = new HttpRangeProcessor(contentService);
+                      processedRange = rangeProcessor.processRange(
+                            res, reader, range.substring(6), nodeRef, propertyQName,
+                            mimetype, req.getHeader(HEADER_USER_AGENT));
+                  }
+               }
+            }
+            if (processedRange == false)
+            {
+               if (logger.isDebugEnabled())
+                  logger.debug("Sending complete file content...");
+               
+               // set mimetype for the content and the character encoding for the stream
+               res.setContentType(mimetype);
+               res.setContentEncoding(encoding);
+               
+               // return the complete entity range
+               res.setHeader(HEADER_CONTENT_RANGE, "bytes 0-" + Long.toString(size-1L) + "/" + Long.toString(size));
+               res.setHeader(HEADER_CONTENT_LENGTH, Long.toString(size));
+               
+               // set caching
+               setResponseCache(res, modified, eTag, model);
+               
+               // get the content and stream directly to the response output stream
+               // assuming the repository is capable of streaming in chunks, this should allow large files
+               // to be streamed directly to the browser response stream.
+               reader.getContent( res.getOutputStream() );
+            }
+        }
+        catch (SocketException e1)
+        {
+            // the client cut the connection - our mission was accomplished apart from a little error message
+            if (logger.isInfoEnabled())
+                logger.info("Client aborted stream read:\n\tcontent: " + reader);
+        }
+        catch (ContentIOException e2)
+        {
+            if (logger.isInfoEnabled())
+                logger.info("Client aborted stream read:\n\tcontent: " + reader);
+        }
+    }
+
+    /**
+     * Set attachment header
+     * 
+     * @param req WebScriptRequest
+     * @param res WebScriptResponse
+     * @param attach boolean
+     * @param attachFileName String
+     */
+    public void setAttachment(WebScriptRequest req, WebScriptResponse res, boolean attach, String attachFileName)
+    {
+        if (attach == true)
+        {
+            String headerValue = "attachment";
+            if (attachFileName != null && attachFileName.length() > 0)
+            {
+                if (logger.isDebugEnabled())
+                    logger.debug("Attaching content using filename: " + attachFileName);
+
+                if (req == null)
+                {
+                    headerValue += "; filename*=UTF-8''" + URLEncoder.encode(attachFileName)
+                            + "; filename=\"" + filterNameForQuotedString(attachFileName) + "\"";
+                }
+                else
+                {
+                    String userAgent = req.getHeader(HEADER_USER_AGENT);
+                    boolean isLegacy = (null != userAgent) && (userAgent.contains("MSIE 8") || userAgent.contains("MSIE 7"));
+                    if (isLegacy)
+                    {
+                        headerValue += "; filename=\"" + URLEncoder.encode(attachFileName);
+                    }
+                    else
+                    {
+                        headerValue += "; filename=\"" + filterNameForQuotedString(attachFileName) + "\"; filename*=UTF-8''"
+                                + URLEncoder.encode(attachFileName);
+                    }
+                }
+            }
+            
+            // set header based on filename - will force a Save As from the browse if it doesn't recognize it
+            // this is better than the default response of the browser trying to display the contents
+            res.setHeader("Content-Disposition", headerValue);
+        }
+    }
+    
+    protected String filterNameForQuotedString(String s)
+    {
+        StringBuilder sb = new StringBuilder();
+        for(int i = 0; i < s.length(); i++)
+        {
+            char c = s.charAt(i);
+            if(isValidQuotedStringHeaderParamChar(c))
+            {
+                sb.append(c);
+            }
+            else
+            {
+                sb.append(" ");
+            }
+        }
+        return sb.toString();
+    }
+    
+    protected boolean isValidQuotedStringHeaderParamChar(char c)
+    {
+        // see RFC2616 section 2.2: 
+        // qdtext         = <any TEXT except <">>
+        // TEXT           = <any OCTET except CTLs, but including LWS>
+        // CTL            = <any US-ASCII control character (octets 0 - 31) and DEL (127)>
+        // A CRLF is allowed in the definition of TEXT only as part of a header field continuation.
+        // Note: we dis-allow header field continuation
+        return     (c < 256)  // message header param fields must be ISO-8859-1. Lower 256 codepoints of Unicode represent ISO-8859-1
+                && (c != 127) // CTL - see RFC2616 section 2.2
+                && (c != '"') // <">
+                && (c > 31);  // CTL - see RFC2616 section 2.2
+    }
+
+    /**
+     * Set the cache settings on the response
+     * 
+     * @param res WebScriptResponse
+     * @param modified Date
+     * @param eTag String
+     */
+    protected void setResponseCache(WebScriptResponse res, Date modified, String eTag, Map<String, Object> model)
+    {
+        Cache cache = new Cache();
+
+        Object obj;
+        if (model != null && (obj = model.get(KEY_CACHE_DIRECTIVE)) instanceof CacheDirective)
+        {
+            CacheDirective cacheDirective = (CacheDirective) obj;
+            cache.setNeverCache(cacheDirective.isNeverCache());
+            cache.setMustRevalidate(cacheDirective.isMustRevalidate());
+            cache.setMaxAge(cacheDirective.getMaxAge());
+            cache.setLastModified(cacheDirective.getLastModified());
+            cache.setETag(cacheDirective.getETag());
+            cache.setIsPublic(cacheDirective.isPublic());
+        }
+        else if (model == null || !getBooleanValue(model.get(KEY_ALLOW_BROWSER_TO_CACHE)))
+        {
+            // if 'allowBrowserToCache' is null or false
+            cache.setNeverCache(false);
+            cache.setMustRevalidate(true);
+            cache.setMaxAge(0L);
+            cache.setLastModified(modified);
+            cache.setETag(eTag);
+        }
+        else
+        {
+            cache.setNeverCache(false);
+            cache.setMustRevalidate(false);
+            cache.setMaxAge(Long.valueOf(31536000));// one year
+            cache.setLastModified(modified);
+            cache.setETag(eTag);
+        }
+
+        res.setCache(cache);
+    }
+
+    private boolean getBooleanValue(Object obj)
+    {
+        if (obj instanceof String)
+        {
+            return Boolean.valueOf((String) obj);
+        }
+        return Boolean.TRUE.equals(obj);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/MimetypeDescriptionsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/MimetypeDescriptionsGet.java
new file mode 100644
index 00000000000..c5fd0d63371
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/MimetypeDescriptionsGet.java
@@ -0,0 +1,99 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.content;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * Returns the descriptions of all the mimetypes known to the system.
+ * This is normally used so that things outside of the repo tier (eg Share)
+ *  can display user-facing descriptions of the mimetypes in the system.
+ * 
+ * @author Nick Burch
+ * @since 4.0.1
+ */
+public class MimetypeDescriptionsGet extends DeclarativeWebScript
+{
+    public static final String MODEL_MIMETYPES = "mimetypes";
+    public static final String MODEL_DEFAULT_EXTENSIONS = "defaultExtensions";
+    public static final String MODEL_OTHER_EXTENSIONS = "otherExtensions";
+   
+    private MimetypeService mimetypeService;
+
+    /**
+     * Sets the Mimetype Service to be used to get the
+     *  list of mime types
+     */
+    public void setMimetypeService(MimetypeService mimetypeService) {
+       this.mimetypeService = mimetypeService;
+    }
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+       // Get the mimetypes and their descriptions
+       Map<String,String> mimetypes = mimetypeService.getDisplaysByMimetype();
+       
+       // Fetch all the extensions known to the system
+       Map<String,String> extensions = mimetypeService.getMimetypesByExtension();
+       //  And the default extensions
+       Map<String,String> defaultExtensions = mimetypeService.getExtensionsByMimetype();
+       
+       // For each mimetype, work out the non-default extensions
+       Map<String, List<String>> otherExtensions = new HashMap<String, List<String>>();
+       for (String extension : extensions.keySet())
+       {
+           String mimetype = extensions.get(extension);
+           
+           // If this isn't the default, record it
+           if (! extension.equals(defaultExtensions.get(mimetype)))
+           {
+               if (! otherExtensions.containsKey(mimetype))
+               {
+                   otherExtensions.put(mimetype, new ArrayList<String>());
+               }
+               otherExtensions.get(mimetype).add(extension);
+           }
+       }
+
+       // Return the model
+       Map<String, Object> model = new HashMap<String, Object>();
+       model.put(MODEL_MIMETYPES, mimetypes);
+       model.put(MODEL_DEFAULT_EXTENSIONS, defaultExtensions);
+       model.put(MODEL_OTHER_EXTENSIONS, otherExtensions);
+       return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/MimetypesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/MimetypesGet.java
new file mode 100644
index 00000000000..d9a0b0a278f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/MimetypesGet.java
@@ -0,0 +1,171 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.content;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.content.metadata.MetadataExtracter;
+import org.alfresco.repo.content.metadata.MetadataExtracterRegistry;
+import org.alfresco.repo.content.transform.LocalTransformServiceRegistry;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.transform.client.registry.TransformServiceRegistry;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * Lists mimetypes.
+ * 
+ * @author Nick Burch
+ * @since 3.4.b
+ */
+public class MimetypesGet extends DeclarativeWebScript
+{
+    public static final String MODEL_MIMETYPES = "mimetypes";
+    public static final String MODEL_EXTENSIONS = "extensions";
+    public static final String MODEL_MIMETYPE_DETAILS = "details";
+   
+    private MimetypeService mimetypeService;
+    private TransformServiceRegistry localTransformServiceRegistry;
+    private MetadataExtracterRegistry metadataExtracterRegistry;
+
+    /**
+     * Sets the Mimetype Service to be used to get the
+     *  list of mime types
+     */
+    public void setMimetypeService(MimetypeService mimetypeService) {
+       this.mimetypeService = mimetypeService;
+    }
+
+    public void setLocalTransformServiceRegistry(TransformServiceRegistry localTransformServiceRegistry)
+    {
+        this.localTransformServiceRegistry = localTransformServiceRegistry;
+    }
+
+    /**
+     * Sets the Metadata Extractor Registry to be used to
+     *  decide what extractors exist
+     */
+    public void setMetadataExtracterRegistry(
+         MetadataExtracterRegistry metadataExtracterRegistry) {
+       this.metadataExtracterRegistry = metadataExtracterRegistry;
+    }
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+       // First up, get the list of mimetypes
+       // We want it to be sorted
+       String[] mimetypesA = mimetypeService.getMimetypes().toArray(new String[0]);
+       Arrays.sort(mimetypesA);
+       List<String> mimetypes = new ArrayList<String>(
+             Arrays.asList(mimetypesA)
+       );
+       
+       // Now their extensions
+       Map<String,String> extensions = new HashMap<String, String>();
+       for(String mimetype : mimetypes)
+       {
+          String ext = mimetypeService.getExtension(mimetype);
+          extensions.put(mimetype, ext);
+       }
+       
+       // Now details on those it was requested for
+       Map<String,Map<String,List<String>>> details = new HashMap<String, Map<String,List<String>>>();
+       String reqMimetype = req.getParameter("mimetype");
+       for(String mimetype : mimetypes)
+       {
+          if(mimetype.equals(reqMimetype) || "*".equals(reqMimetype))
+          {
+             Map<String,List<String>> mtd = new HashMap<String, List<String>>();
+             mtd.put("extractors", getExtractors(mimetype));
+             mtd.put("transformFrom", getTransformersFrom(mimetype, -1, mimetypes));
+             mtd.put("transformTo", getTransformersTo(mimetype, -1, mimetypes));
+             details.put(mimetype, mtd);
+          }
+       }
+       
+       // Return the model
+       Map<String, Object> model = new HashMap<String, Object>();
+       model.put(MODEL_MIMETYPES, mimetypes);
+       model.put(MODEL_EXTENSIONS, extensions);
+       model.put(MODEL_MIMETYPE_DETAILS, details);
+       return model;
+    }
+    
+    protected List<String> getExtractors(String mimetype)
+    {
+       List<String> exts = new ArrayList<String>();
+       MetadataExtracter extractor = metadataExtracterRegistry.getExtracter(mimetype);
+       if(extractor != null) {
+          exts.add( extractor.getClass().getName() );
+       }
+       return exts;
+    }
+
+    protected List<String> getTransformersFrom(String mimetype, long sourceSize, List<String> allMimetypes)
+    {
+       List<String> transforms = new ArrayList<String>();
+       for(String toMT : allMimetypes)
+       {
+          if(toMT.equals(mimetype))
+             continue;
+          
+          String details = getTransformer(mimetype, sourceSize, toMT);
+          if(details != null)
+             transforms.add(toMT + " = " + details);
+       }
+       return transforms;
+    }
+
+    protected List<String> getTransformersTo(String mimetype, long sourceSize, List<String> allMimetypes)
+    {
+       List<String> transforms = new ArrayList<String>();
+       for(String fromMT : allMimetypes)
+       {
+          if(fromMT.equals(mimetype))
+             continue;
+          
+          String details = getTransformer(fromMT, sourceSize, mimetype);
+          if(details != null)
+             transforms.add(fromMT + " = " + details);
+       }
+       return transforms;
+    }
+
+    /** Note - for now, only does the best one, not all */
+    protected String getTransformer(String from, long sourceSize, String to)
+    {
+        return localTransformServiceRegistry.findTransformerName(from, sourceSize, to, Collections.emptyMap(), null);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/StreamACP.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/StreamACP.java
new file mode 100644
index 00000000000..07740135e7a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/StreamACP.java
@@ -0,0 +1,244 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.content;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.exporter.ACPExportPackageHandler;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.view.ExporterCrawlerParameters;
+import org.alfresco.service.cmr.view.ExporterService;
+import org.alfresco.service.cmr.view.Location;
+import org.alfresco.util.GUID;
+import org.alfresco.util.TempFileProvider;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+
+/**
+ * Base class for Java backed webscripts that wish to generate an ACP and 
+ * stream the contents back to the caller.
+ * <p>
+ * The default implementation generates an ACP file containing the provided
+ * NodeRefs and all their respective children.
+ * 
+ * @author Gavin Cornwell
+ */
+public class StreamACP extends StreamContent
+{
+    /** Logger */
+    private static Log logger = LogFactory.getLog(StreamACP.class);
+    
+    protected static final String TEMP_FILE_PREFIX = "export_";
+    protected static final String MULTIPART_FORMDATA = "multipart/form-data";
+    protected static final String ZIP_EXTENSION = "zip";
+    
+    protected static final String PARAM_NODE_REFS = "nodeRefs";
+    
+    protected ExporterService exporterService;
+    
+    /**
+     * Sets the ExporterService to use
+     * 
+     * @param exporterService The ExporterService
+     */
+    public void setExporterService(ExporterService exporterService) 
+    {
+        this.exporterService = exporterService;
+    }
+    
+    /**
+     * @see org.springframework.extensions.webscripts.WebScript#execute(org.springframework.extensions.webscripts.WebScriptRequest, org.springframework.extensions.webscripts.WebScriptResponse)
+     */
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        File tempACPFile = null;
+        try
+        {
+            NodeRef[] nodeRefs = null;
+            String contentType = req.getContentType();
+            if (MULTIPART_FORMDATA.equals(contentType))
+            {
+                // get nodeRefs parameter from form
+                nodeRefs = getNodeRefs(req.getParameter(PARAM_NODE_REFS));
+            }
+            else
+            {
+                // presume the request is a JSON request so get nodeRefs from JSON body
+                nodeRefs = getNodeRefs(new JSONObject(new JSONTokener(req.getContent().getContent())));
+            }
+            
+            // setup the ACP parameters
+            ExporterCrawlerParameters params = new ExporterCrawlerParameters();
+            params.setCrawlSelf(true);
+            params.setCrawlChildNodes(true);
+            params.setExportFrom(new Location(nodeRefs));
+            
+            // create an ACP of the nodes
+            tempACPFile = createACP(params, ACPExportPackageHandler.ACP_EXTENSION, false);
+                
+            // stream the ACP back to the client as an attachment (forcing save as)
+            streamContent(req, res, tempACPFile, true, tempACPFile.getName(), null);
+        } 
+        catch (IOException ioe)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                    "Could not read content from req.", ioe);
+        }
+        catch (JSONException je)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                        "Could not parse JSON from req.", je);
+        }
+        finally
+        {
+           // try and delete the temporary file
+           if (tempACPFile != null)
+           {
+               if (logger.isDebugEnabled())
+                   logger.debug("Deleting temporary archive: " + tempACPFile.getAbsolutePath());
+               
+               tempACPFile.delete();
+           }
+        }
+    }
+    
+    /**
+     * Converts the given comma delimited string of NodeRefs to an array
+     * of NodeRefs. If the string is null a WebScriptException is thrown.
+     * 
+     * @param nodeRefsParam Comma delimited string of NodeRefs
+     * @return Array of NodeRef objects
+     */
+    protected NodeRef[] getNodeRefs(String nodeRefsParam)
+    {
+        // check the list of NodeRefs is present
+        if (nodeRefsParam == null)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                "Mandatory 'nodeRefs' parameter was not provided in form data");
+        }
+        
+        List<NodeRef> listNodeRefs = new ArrayList<NodeRef>(8);
+        StringTokenizer tokenizer = new StringTokenizer(nodeRefsParam, ",");
+        while (tokenizer.hasMoreTokens())
+        {
+            listNodeRefs.add(new NodeRef(tokenizer.nextToken().trim()));
+        }
+        
+        NodeRef[] nodeRefs = new NodeRef[listNodeRefs.size()];
+        nodeRefs = listNodeRefs.toArray(nodeRefs);
+        
+        return nodeRefs;
+    }
+    
+    /**
+     * Attempts to retrieve and convert a JSON array of
+     * NodeRefs from the given JSON object. If the nodeRefs
+     * property is not present a WebScriptException is thrown.
+     * 
+     * @param json JSONObject
+     * @return Array of NodeRef objects
+     */
+    protected NodeRef[] getNodeRefs(JSONObject json) throws JSONException
+    {
+        // check the list of NodeRefs is present
+        if (!json.has(PARAM_NODE_REFS))
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                "Mandatory 'nodeRefs' parameter was not provided in request body");
+        }
+
+        NodeRef[] nodeRefs = new NodeRef[0];
+        JSONArray jsonArray = json.getJSONArray(PARAM_NODE_REFS);
+        if (jsonArray.length() != 0)
+        {
+            // build the list of NodeRefs
+            nodeRefs = new NodeRef[jsonArray.length()];
+            for (int i = 0; i < jsonArray.length(); i++)
+            {
+                NodeRef nodeRef = new NodeRef(jsonArray.getString(i));
+                nodeRefs[i] = nodeRef;
+            }
+        }
+        
+        return nodeRefs;
+    }
+    
+    /**
+     * Returns an ACP file containing the nodes represented by the given list of NodeRefs.
+     * 
+     * @param params The parameters for the ACP exporter
+     * @param extension The file extenstion to use for the ACP file
+     * @param keepFolderStructure Determines whether the folder structure is maintained for
+     *        the content inside the ACP file
+     * @return File object representing the created ACP
+     */
+    protected File createACP(ExporterCrawlerParameters params, String extension, boolean keepFolderStructure)
+    {
+        try
+        {
+            // generate temp file and folder name
+            File dataFile = new File(GUID.generate());
+            File contentDir = new File(GUID.generate());
+            
+            // setup export package handler
+            File acpFile = TempFileProvider.createTempFile(TEMP_FILE_PREFIX, "." + extension);
+            ACPExportPackageHandler handler = new ACPExportPackageHandler(new FileOutputStream(acpFile), 
+                 dataFile, contentDir, this.mimetypeService);
+            handler.setExportAsFolders(keepFolderStructure);
+            handler.setNodeService(this.nodeService);
+
+            // perform the actual export
+            this.exporterService.exportView(handler, params, null);
+            
+            if (logger.isDebugEnabled())
+                logger.debug("Created temporary archive: " + acpFile.getAbsolutePath());
+            
+            return acpFile;
+        }
+        catch (FileNotFoundException fnfe)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, 
+                        "Failed to create archive", fnfe);
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/StreamContent.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/StreamContent.java
new file mode 100644
index 00000000000..77cafae3b8c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/StreamContent.java
@@ -0,0 +1,477 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.content;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.ScriptProcessor;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.WebScriptStatus;
+
+/**
+ * Web script 'type' that can be used when the binary data of a content property needs to be streamed back to the client
+ * as the result of executing the web script.
+ * 
+ * Many of these methods have been moved into the ContentStreamer class so they can be reused by other webscripts.
+ * 
+ * @author Roy Wetherall
+ */
+public class StreamContent extends AbstractWebScript
+{
+    // Logger
+    private static final Log logger = LogFactory.getLog(StreamContent.class);
+    
+    /** Services */
+    protected PermissionService permissionService;
+    protected NodeService nodeService;
+    protected MimetypeService mimetypeService;
+    protected ContentStreamer delegate;
+    protected Repository repository;
+    
+    /**
+     * @param mimetypeService MimetypeService
+     */
+    public void setMimetypeService(MimetypeService mimetypeService)
+    {
+        this.mimetypeService = mimetypeService; 
+    }
+      /**
+     * @param permissionService PermissionService
+     */
+    public void setPermissionService(PermissionService permissionService)
+    {
+        this.permissionService = permissionService; 
+    }
+
+    /**
+     * @param nodeService NodeService
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService; 
+    }
+    
+    /**
+     * @param delegate ContentStreamer
+     */
+    public void setDelegate(ContentStreamer delegate)
+    {
+        this.delegate = delegate;
+    }
+    
+    /**
+     * @param repository Repository
+     */
+    public void setRepository(Repository repository)
+    {
+        this.repository = repository;
+    }
+    
+    /**
+     * @see org.springframework.extensions.webscripts.WebScript#execute(org.springframework.extensions.webscripts.WebScriptRequest, org.springframework.extensions.webscripts.WebScriptResponse)
+     */
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        // retrieve requested format
+        String format = req.getFormat();
+
+        try
+        {
+            // construct model for script / template
+            Status status = new Status();
+            Cache cache = new Cache(getDescription().getRequiredCache());
+            Map<String, Object> model = executeImpl(req, status, cache);
+            if (model == null)
+            {
+                model = new HashMap<String, Object>(8, 1.0f);
+            }
+            model.put("status", status);
+            model.put("cache", cache);
+            
+            // execute script if it exists
+            ScriptDetails executeScript = getExecuteScript(req.getContentType());
+            if (executeScript != null)
+            {
+                if (logger.isDebugEnabled())
+                    logger.debug("Executing script " + executeScript.getContent().getPathDescription());
+                
+                Map<String, Object> scriptModel = createScriptParameters(req, res, executeScript, model);
+                // add return model allowing script to add items to template model
+                Map<String, Object> returnModel = new HashMap<String, Object>(8, 1.0f);
+                scriptModel.put("model", returnModel);
+                executeScript(executeScript.getContent(), scriptModel);
+                mergeScriptModelIntoTemplateModel(executeScript.getContent().getPath(), returnModel, model);
+            }
+            
+            // is a redirect to a status specific template required?
+            if (status.getRedirect())
+            {
+                // create model for template rendering
+                Map<String, Object> templateModel = createTemplateParameters(req, res, model);
+                sendStatus(req, res, status, cache, format, templateModel);
+            }
+            else
+            {         
+                // Get the attachement property value    
+                Boolean attachBoolean = (Boolean)model.get("attach");
+                boolean attach = false;
+                if (attachBoolean != null)
+                {
+                    attach = attachBoolean.booleanValue();
+                }
+                
+                String contentPath = (String)model.get("contentPath");
+                if (contentPath == null)
+                {
+                    // Get the content parameters from the model
+                    NodeRef nodeRef = (NodeRef)model.get("contentNode");
+                    if (nodeRef == null)
+                    {
+                        throw new WebScriptException(
+                                "The content node was not specified so the content cannot be streamed to the client: " +
+                                executeScript.getContent().getPathDescription());
+                    }
+                    QName propertyQName = null;
+                    String contentProperty = (String)model.get("contentProperty");
+                    if (contentProperty == null)
+                    {
+                        // default to the standard content property
+                        propertyQName = ContentModel.PROP_CONTENT;
+                    }
+                    else
+                    {
+                        propertyQName = QName.createQName(contentProperty);
+                    }
+                
+                    // Stream the content
+                    delegate.streamContent(req, res, nodeRef, propertyQName, attach, null, model);
+                }
+                else
+                {
+                    // Stream the content
+                    delegate.streamContent(req, res, contentPath, attach, model);
+                }
+            }
+        }
+        catch(Throwable e)
+        {
+            throw createStatusException(e, req, res);
+        }
+    }
+    
+    /**
+     * Set attachment header
+     * 
+     * @param res WebScriptResponse
+     * @param attach boolean
+     * @param attachFileName String
+     */
+    protected void setAttachment(WebScriptResponse res, boolean attach, String attachFileName)
+    {
+        delegate.setAttachment(null, res, attach, attachFileName);
+    }
+    
+    /**
+     * Streams content back to client from a given File. The Last-Modified header will reflect the
+     * given file's modification timestamp.
+     * 
+     * @param req               The request
+     * @param res               The response
+     * @param file              The file whose content is to be streamed.
+     * @throws IOException
+     */
+    protected void streamContent(WebScriptRequest req, WebScriptResponse res, File file) throws IOException {
+        streamContent(req, res, file, false, null, null);
+    }
+    
+    /**
+     * Streams content back to client from a given File. The Last-Modified header will reflect the
+     * given file's modification timestamp.
+     * 
+     * @param req               The request
+     * @param res               The response
+     * @param file              The file whose content is to be streamed.
+     * @param attach            Indicates whether the content should be streamed as an attachment or not
+     * @param attachFileName    Optional file name to use when attach is <code>true</code>
+     * @throws IOException
+     */
+    protected void streamContent(WebScriptRequest req,
+                                 WebScriptResponse res, 
+                                 File file, 
+                                 boolean attach,
+                                 String attachFileName,
+                                 Map<String, Object> model) throws IOException
+    {
+        delegate.streamContent(req, res, file, null, attach, attachFileName, model);
+    }
+    
+    /**
+     * Streams the content on a given node's content property to the response of the web script.
+     * 
+     * @param req               Request
+     * @param res               Response
+     * @param nodeRef           The node reference
+     * @param propertyQName     The content property name
+     * @param attach            Indicates whether the content should be streamed as an attachment or not
+     * @param attachFileName    Optional file name to use when attach is <code>true</code>
+     * @throws IOException 
+     */
+    protected void streamContent(WebScriptRequest req, 
+                                 WebScriptResponse res, 
+                                 NodeRef nodeRef, 
+                                 QName propertyQName,
+                                 boolean attach, 
+                                 String attachFileName,
+                                 Map<String, Object> model) throws IOException
+     {
+        delegate.streamContent(req, res, nodeRef, propertyQName, attach, attachFileName, model);
+     }
+    
+    /**
+     * Stream content implementation
+     * 
+     * @param req               The request
+     * @param res               The response
+     * @param reader            The reader
+     * @param nodeRef           The content nodeRef if applicable
+     * @param propertyQName     The content property if applicable
+     * @param attach            Indicates whether the content should be streamed as an attachment or not
+     * @param modified          Modified date of content
+     * @param eTag              ETag to use
+     * @param attachFileName    Optional file name to use when attach is <code>true</code>
+     * @throws IOException
+     */
+    protected void streamContentImpl(WebScriptRequest req, 
+                                    WebScriptResponse res, 
+                                    ContentReader reader, 
+                                    NodeRef nodeRef,
+                                    QName propertyQName,
+                                    boolean attach,
+                                    Date modified, 
+                                    String eTag, 
+                                    String attachFileName, 
+                                    Map<String, Object> model) throws IOException
+    {
+        delegate.streamContentImpl(req, res, reader, nodeRef, propertyQName, attach, modified, eTag, attachFileName, model);
+    }
+    
+    /**
+     * Merge script generated model into template-ready model
+     *
+     * @param scriptPath   path to script
+     * @param scriptModel  script model
+     * @param templateModel  template model
+     */
+    final private void mergeScriptModelIntoTemplateModel(String scriptPath, Map<String, Object> scriptModel, Map<String, Object> templateModel)
+    {
+        int i = scriptPath.lastIndexOf(".");
+        if (i != -1)
+        {
+            String extension = scriptPath.substring(i+1);
+            ScriptProcessor processor = getContainer().getScriptProcessorRegistry().getScriptProcessorByExtension(extension);
+            if (processor != null)
+            {
+                for (Map.Entry<String, Object> entry : scriptModel.entrySet())
+                {
+                    // retrieve script model value
+                    Object value = entry.getValue();
+                    Object templateValue = processor.unwrapValue(value);
+                    templateModel.put(entry.getKey(), templateValue);
+                }
+            }
+        }
+    }
+
+    /**
+     * Execute custom Java logic
+     * 
+     * @param req  Web Script request
+     * @param status Web Script status
+     * @return  custom service model
+     * @deprecated
+     */
+    protected Map<String, Object> executeImpl(WebScriptRequest req, WebScriptStatus status)
+    {
+        return null;
+    }
+
+    /**
+     * Execute custom Java logic
+     * 
+     * @param req  Web Script request
+     * @param status Web Script status
+     * @return  custom service model
+     * @deprecated
+     */
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        return executeImpl(req, new WebScriptStatus(status));
+    }
+
+    /**
+     * Execute custom Java logic
+     * 
+     * @param  req  Web Script request
+     * @param  status Web Script status
+     * @param  cache  Web Script cache
+     * @return  custom service model
+     */
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        // NOTE: Redirect to those web scripts implemented before cache support and v2.9
+        return executeImpl(req, status);
+    }
+    
+    /**
+     * Render a template (of given format) to the Web Script Response
+     * 
+     * @param format  template format (null, default format)  
+     * @param model  data model to render
+     * @param writer  where to output
+     */
+    final protected void renderFormatTemplate(String format, Map<String, Object> model, Writer writer)
+    {
+        format = (format == null) ? "" : format;
+        String templatePath = getDescription().getId() + "." + format + ".ftl";
+
+        if (logger.isDebugEnabled())
+            logger.debug("Rendering template '" + templatePath + "'");
+
+        renderTemplate(templatePath, model, writer);
+    }
+
+    protected ObjectReference createObjectReferenceFromUrl(Map<String, String> args, Map<String, String> templateArgs)
+    {
+        String objectId = args.get("noderef");
+        if (objectId != null)
+        {
+            return new ObjectReference(objectId);
+        }
+        
+        StoreRef storeRef = null;
+        String store_type = templateArgs.get("store_type");
+        String store_id = templateArgs.get("store_id");
+        if (store_type != null && store_id != null)
+        {
+            storeRef = new StoreRef(store_type, store_id);
+        }
+        
+        String id = templateArgs.get("id");
+        if (storeRef != null && id != null)
+        {
+            return new ObjectReference(storeRef, id);
+        }
+        
+        String nodepath = templateArgs.get("nodepath");
+        if (nodepath == null)
+        {
+            nodepath = args.get("nodepath");
+        }
+        if (storeRef != null && nodepath != null)
+        {
+            return new ObjectReference(storeRef, nodepath.split("/"));
+        }
+        
+        return null;
+    }
+    
+    
+    class ObjectReference
+    {
+        private NodeRef ref;
+        
+        ObjectReference(String nodeRef)
+        {
+            this.ref = new NodeRef(nodeRef);
+        }
+
+        ObjectReference(StoreRef ref, String id)
+        {
+            String[] relativePath = id.split("/");
+
+            // bug fix MNT-16380
+            // for using a relative path to a node id eg. 18cc-.../folder1/.../folderN/fileA.txt
+            // if only one slash we don't have a relative path
+            if (relativePath.length <= 2)
+            {
+                if (id.indexOf('/') != -1)
+                {
+                    id = id.substring(0, id.indexOf('/'));
+                }
+                this.ref = new NodeRef(ref, id);
+            }
+            else
+            {
+                String[] reference = new String[relativePath.length + 2];
+                reference[0] = ref.getProtocol();
+                reference[1] = ref.getIdentifier();
+                System.arraycopy(relativePath, 0, reference, 2, relativePath.length);
+                this.ref = repository.findNodeRef("node", reference);
+            }
+        }
+        
+        ObjectReference(StoreRef ref, String[] path)
+        {
+            String[] reference = new String[path.length + 2];
+            reference[0] = ref.getProtocol();
+            reference[1] = ref.getIdentifier();
+            System.arraycopy(path, 0, reference, 2, path.length);
+            this.ref = repository.findNodeRef("path", reference);
+        }
+        
+        public NodeRef getNodeRef()
+        {
+            return this.ref;
+        }
+        
+        @Override
+        public String toString()
+        {
+            return ref != null ? ref.toString() : super.toString();
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/StreamJMXDump.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/StreamJMXDump.java
new file mode 100644
index 00000000000..1e02e9fec52
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/content/StreamJMXDump.java
@@ -0,0 +1,127 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.content;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Date;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import javax.management.MBeanServerConnection;
+
+import org.alfresco.repo.management.JmxDumpUtil;
+import org.alfresco.util.TempFileProvider;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.util.FileCopyUtils;
+
+/**
+ * WebScript java backed bean implementation to stream the JMX property
+ * dump as a .zip content file. 
+ * 
+ * @author Kevin Roast
+ */
+public class StreamJMXDump extends StreamContent
+{
+    /** Logger */
+    private static Log logger = LogFactory.getLog(StreamJMXDump.class);
+    
+    /** The MBean server. */
+    private MBeanServerConnection mbeanServer;
+    
+    
+    /**
+     * @param mBeanServer       MBeanServerConnection bean
+     */
+    public void setMBeanServer(MBeanServerConnection mBeanServer)
+    {
+        this.mbeanServer = mBeanServer;
+    }
+    
+    /**
+     * @see org.springframework.extensions.webscripts.WebScript#execute(org.springframework.extensions.webscripts.WebScriptRequest, org.springframework.extensions.webscripts.WebScriptResponse)
+     */
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        PrintWriter tempFileOut = null;
+        ZipOutputStream zout = null;
+        try
+        {
+            // content type and caching
+            res.setContentType("application/zip");
+            Cache cache = new Cache();
+            cache.setNeverCache(true);
+            cache.setMustRevalidate(true);
+            cache.setMaxAge(0L);
+            res.setCache(cache);
+            
+            Date date = new Date();
+            String attachFileName = "jmxdump_" + (date.getYear()+1900) + '_' + (date.getMonth()+1) + '_' + (date.getDate());
+            String headerValue = "attachment; filename=\"" + attachFileName + ".zip\"";
+            
+            // set header based on filename - will force a Save As from the browse if it doesn't recognize it
+            // this is better than the default response of the browser trying to display the contents
+            res.setHeader("Content-Disposition", headerValue);
+            
+            // write JMX data to temp file
+            File tempFile = TempFileProvider.createTempFile("jmxdump", ".txt");
+            tempFileOut = new PrintWriter(tempFile);
+            JmxDumpUtil.dumpConnection(mbeanServer, tempFileOut);
+            tempFileOut.flush();
+            tempFileOut.close();
+            tempFileOut = null;
+            
+            // zip output
+            zout = new ZipOutputStream(res.getOutputStream());
+            ZipEntry zipEntry = new ZipEntry(attachFileName + ".txt");
+            zout.putNextEntry(zipEntry);
+            FileCopyUtils.copy(new FileInputStream(tempFile), zout);
+            zout = null;
+        } 
+        catch (IOException ioe)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                    "Could not output JMX dump: " + ioe.getMessage(), ioe);
+        }
+        finally
+        {
+            if (tempFileOut != null) tempFileOut.close();
+            try
+            {
+                if (zout != null) zout.close();
+            }
+            catch (IOException e1) {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/custommodel/CustomModelUploadPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/custommodel/CustomModelUploadPost.java
new file mode 100644
index 00000000000..0ce8b2ea965
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/custommodel/CustomModelUploadPost.java
@@ -0,0 +1,313 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.custommodel;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+
+import javax.xml.parsers.DocumentBuilder;
+
+import org.alfresco.repo.dictionary.CustomModelServiceImpl;
+import org.alfresco.repo.dictionary.M2Model;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.rest.api.CustomModels;
+import org.alfresco.rest.api.model.CustomModel;
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.service.cmr.dictionary.CustomModelService;
+import org.alfresco.service.cmr.dictionary.DictionaryException;
+import org.alfresco.util.TempFileProvider;
+import org.alfresco.util.XMLUtil;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.servlet.FormData;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
+/**
+ * Custom model upload POST. This class is the controller for the
+ * "cmm-upload.post" web scripts.
+ * 
+ * @author Jamal Kaabi-Mofrad
+ */
+public class CustomModelUploadPost extends DeclarativeWebScript
+{
+    private static final String SHARE_EXT_MODULE_ROOT_ELEMENT = "module";
+    private static final String TEMP_FILE_PREFIX = "cmmExport";
+    private static final String TEMP_FILE_SUFFIX = ".zip";
+    private static final int BUFFER_SIZE = 10 * 1024;
+
+    private CustomModels customModels;
+    private CustomModelService customModelService;
+
+    public void setCustomModels(CustomModels customModels)
+    {
+        this.customModels = customModels;
+    }
+
+    public void setCustomModelService(CustomModelService customModelService)
+    {
+        this.customModelService = customModelService;
+    }
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        if (!customModelService.isModelAdmin(AuthenticationUtil.getFullyAuthenticatedUser()))
+        {
+            throw new WebScriptException(Status.STATUS_FORBIDDEN, PermissionDeniedException.DEFAULT_MESSAGE_ID);
+        }
+
+        FormData formData = (FormData) req.parseContent();
+        if (formData == null || !formData.getIsMultiPart())
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "cmm.rest_api.model.import_not_multi_part_req");
+        }
+
+        ImportResult resultData = null;
+        boolean processed = false;
+        for (FormData.FormField field : formData.getFields())
+        {
+            if (field.getIsFile())
+            {
+                final String fileName = field.getFilename();
+                File tempFile = createTempFile(field.getInputStream());
+                try (ZipFile zipFile = new ZipFile(tempFile, StandardCharsets.UTF_8))
+                {
+                    resultData = processUpload(zipFile, field.getFilename());
+                }
+                catch (ZipException ze)
+                {
+                    throw new WebScriptException(Status.STATUS_BAD_REQUEST, "cmm.rest_api.model.import_not_zip_format", new Object[] { fileName });
+                }
+                catch (IOException io)
+                {
+                    throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR, "cmm.rest_api.model.import_process_zip_file_failure", io);
+                }
+                finally
+                {
+                    // now the import is done, delete the temp file
+                    tempFile.delete();
+                }
+                processed = true;
+                break;
+            }
+
+        }
+
+        if (!processed)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "cmm.rest_api.model.import_no_zip_file_uploaded");
+        }
+
+        // If we get here, then importing the custom model didn't throw any exceptions.
+        Map<String, Object> model = new HashMap<>(2);
+        model.put("importedModelName", resultData.getImportedModelName());
+        model.put("shareExtXMLFragment", resultData.getShareExtXMLFragment());
+
+        return model;
+    }
+
+    protected File createTempFile(InputStream inputStream)
+    {
+        try
+        {
+            File tempFile = TempFileProvider.createTempFile(inputStream, TEMP_FILE_PREFIX, TEMP_FILE_SUFFIX);
+            return tempFile;
+        }
+        catch (Exception ex)
+        {
+            throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR, "cmm.rest_api.model.import_process_zip_file_failure", ex);
+        }
+    }
+
+    protected ImportResult processUpload(ZipFile zipFile, String filename) throws IOException
+    {
+        if (zipFile.size() > 2)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "cmm.rest_api.model.import_invalid_zip_package");
+        }
+
+        CustomModel customModel = null;
+        String shareExtModule = null;
+        Enumeration<? extends ZipEntry> entries = zipFile.entries();
+        while (entries.hasMoreElements())
+        {
+            ZipEntry entry = entries.nextElement();
+
+            if (!entry.isDirectory())
+            {
+                final String entryName = entry.getName();
+                try (InputStream input = new BufferedInputStream(zipFile.getInputStream(entry), BUFFER_SIZE))
+                {
+                    if (!(entryName.endsWith(CustomModelServiceImpl.SHARE_EXT_MODULE_SUFFIX)) && customModel == null)
+                    {
+                        try
+                        {
+                            M2Model m2Model = M2Model.createModel(input);
+                            customModel = importModel(m2Model);
+                        }
+                        catch (DictionaryException ex)
+                        {
+                            if (shareExtModule == null)
+                            {
+                                // Get the input stream again, as the zip file doesn't support reset.
+                                try (InputStream moduleInputStream = new BufferedInputStream(zipFile.getInputStream(entry), BUFFER_SIZE))
+                                {
+                                    shareExtModule = getExtensionModule(moduleInputStream, entryName);
+                                }
+
+                                if (shareExtModule == null)
+                                {
+                                    throw new WebScriptException(Status.STATUS_BAD_REQUEST, "cmm.rest_api.model.import_invalid_zip_entry_format", new Object[] { entryName });
+                                }
+                            }
+                            else
+                            {
+                                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "cmm.rest_api.model.import_invalid_model_entry", new Object[] { entryName });
+                            }
+                        }
+                    }
+                    else
+                    {
+                        shareExtModule = getExtensionModule(input, entryName);
+                        if (shareExtModule == null)
+                        {
+                            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "cmm.rest_api.model.import_invalid_ext_module_entry", new Object[] { entryName });
+                        }
+                    }
+                }
+            }
+        }
+
+        return new ImportResult(customModel, shareExtModule);
+    }
+
+    protected CustomModel importModel(M2Model m2Model)
+    {
+        CustomModel model = null;
+        try
+        {
+            model = customModels.createCustomModel(m2Model);
+        }
+        catch (Exception ex)
+        {
+            int statusCode;
+            if (ex instanceof ConstraintViolatedException)
+            {
+                statusCode = Status.STATUS_CONFLICT;
+            }
+            else if (ex instanceof InvalidArgumentException)
+            {
+                statusCode = Status.STATUS_BAD_REQUEST;
+            }
+            else
+            {
+                statusCode = Status.STATUS_INTERNAL_SERVER_ERROR;
+            }
+            String msg = ex.getMessage();
+            // remove log numbers. regEx => match 8 or more integers
+            msg = (msg != null) ? msg.replaceAll("\\d{8,}", "").trim() : "cmm.rest_api.model.import_failure";
+
+            throw new WebScriptException(statusCode, msg);
+        }
+
+        return model;
+    }
+
+    protected String getExtensionModule(InputStream inputStream, String fileName)
+    {
+        Element rootElement = null;
+        try
+        {
+            final DocumentBuilder db = XMLUtil.getDocumentBuilder();
+            rootElement = db.parse(inputStream).getDocumentElement();
+        }
+        catch (IOException io)
+        {
+            throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR, "cmm.rest_api.model.import_process_ext_module_file_failure", io);
+        }
+        catch (SAXException ex)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "cmm.rest_api.model.import_invalid_ext_module_entry", new Object[] { fileName }, ex);
+        }
+
+        if (rootElement != null && SHARE_EXT_MODULE_ROOT_ELEMENT.equals(rootElement.getNodeName()))
+        {
+            StringWriter sw = new StringWriter();
+            XMLUtil.print(rootElement, sw, false);
+
+            return sw.toString();
+        }
+
+        return null;
+    }
+
+    /**
+     * Simple POJO for model import result.
+     *
+     * @author Jamal Kaabi-Mofrad
+     */
+    public static class ImportResult
+    {
+        private String importedModelName;
+        private String shareExtXMLFragment;
+
+        public ImportResult(CustomModel customModel, String shareExtXMLFragment)
+        {
+            this.shareExtXMLFragment = shareExtXMLFragment;
+            if (customModel != null)
+            {
+                this.importedModelName = customModel.getName();
+            }
+        }
+
+        public String getImportedModelName()
+        {
+            return this.importedModelName;
+        }
+
+        public String getShareExtXMLFragment()
+        {
+            return this.shareExtXMLFragment;
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractAssociationGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractAssociationGet.java
new file mode 100644
index 00000000000..ca3e93217e0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractAssociationGet.java
@@ -0,0 +1,75 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/*
+ * Webscript to get the Associationdefinition for a given classname and association-name
+ * @author Viachaslau Tsikhanovich
+ */
+
+public abstract class AbstractAssociationGet extends DictionaryWebServiceBase
+{
+    private static final String MODEL_PROP_KEY_ASSOCIATION_DETAILS = "assocdefs";
+
+    /**
+     * Override method from DeclarativeWebScript
+     */
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>(1);
+        QName classQname = getClassQname(req);
+        QName associationQname = getAssociationQname(req);
+
+        if (this.dictionaryservice.getClass(classQname).getAssociations().get(associationQname) != null)
+        {
+            model.put(MODEL_PROP_KEY_ASSOCIATION_DETAILS, this.dictionaryservice.getClass(classQname).getAssociations().get(associationQname));
+            model.put(MODEL_PROP_KEY_MESSAGE_LOOKUP, this.dictionaryservice);
+        }
+
+        return model;
+    }
+
+    /**
+     * @param req - webscript request
+     * @return qualified name for association
+     */
+    protected abstract QName getAssociationQname(WebScriptRequest req);
+
+    /**
+     * @param req - webscript request
+     * @return  qualified name for class
+     */
+    protected abstract QName getClassQname(WebScriptRequest req);
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractAssociationsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractAssociationsGet.java
new file mode 100644
index 00000000000..72322f9e468
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractAssociationsGet.java
@@ -0,0 +1,136 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Associationdefinitions for a given classname 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public abstract class AbstractAssociationsGet extends DictionaryWebServiceBase
+{
+	private static final String MODEL_PROP_KEY_ASSOCIATION_DETAILS = "assocdefs";
+	private static final String MODEL_PROP_KEY_INDIVIDUAL_PROPERTY_DEFS = "individualproperty";
+	private static final String REQ_URL_TEMPL_VAR_NAMESPACE_PREFIX = "nsp";
+	private static final String REQ_URL_TEMPL_VAR_NAME = "n";
+	private static final String REQ_URL_TEMPL_VAR_ASSOCIATION_FILTER = "af";
+    
+    /**
+     * Override  method from DeclarativeWebScript
+     */
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        String associationFilter = req.getParameter(REQ_URL_TEMPL_VAR_ASSOCIATION_FILTER);
+        String namespacePrefix = req.getParameter(REQ_URL_TEMPL_VAR_NAMESPACE_PREFIX);
+        String name = req.getParameter(REQ_URL_TEMPL_VAR_NAME);
+    	
+        Map<String, Object> model = new HashMap<String, Object>();
+        Map<QName, AssociationDefinition> assocdef = new HashMap<QName, AssociationDefinition>();
+        QName associationQname = null;
+        QName classQname = getClassQname(req);
+       
+        if(associationFilter == null)
+        {
+        	associationFilter = "all";
+        }
+        
+        //validate association filter
+        if(isValidAssociationFilter(associationFilter) == false)
+        {
+        	throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the associationFilter - " + associationFilter + " - parameter in the URL");
+        }
+        
+        // validate  for the presence of both name and namespaceprefix 
+        if((name == null && namespacePrefix != null) || 
+           (name != null && namespacePrefix == null))
+        {
+        	throw new WebScriptException(Status.STATUS_NOT_FOUND, "Missing either name or namespaceprefix parameter in the URL - both combination of name and namespaceprefix is needed");
+        }
+        
+        // check for association filters
+        if(associationFilter.equals("child"))
+    	{
+    		model.put(MODEL_PROP_KEY_ASSOCIATION_DETAILS, this.dictionaryservice.getClass(classQname).getChildAssociations().values());
+    	}
+        else if(associationFilter.equals("general"))
+    	{
+    		for(AssociationDefinition assocname:this.dictionaryservice.getClass(classQname).getAssociations().values())
+	        {
+    			if(assocname.isChild() == false)
+    			{
+    				assocdef.put(assocname.getName(), assocname);
+    			}
+	        }
+    		model.put(MODEL_PROP_KEY_ASSOCIATION_DETAILS, assocdef.values());
+    	}
+        else if(associationFilter.equals("all"))
+    	{
+    		model.put(MODEL_PROP_KEY_ASSOCIATION_DETAILS, this.dictionaryservice.getClass(classQname).getAssociations().values());
+        }
+
+        // if both namespaceprefix and name parameters are given then, the combination namespaceprefix_name is used as the index to create the qname
+        if(name != null && namespacePrefix != null)
+        {        	
+        	// validate the class combination namespaceprefix_name
+        	associationQname = getAssociationQname(namespacePrefix, name);
+        	
+        	if(this.dictionaryservice.getClass(classQname).getAssociations().get(associationQname)== null)
+        	{
+        		throw new WebScriptException(Status.STATUS_NOT_FOUND, "not a Valid - namespaceprefix_name combination");
+        	}
+        	
+        	model.put(MODEL_PROP_KEY_INDIVIDUAL_PROPERTY_DEFS, this.dictionaryservice.getClass(classQname).getAssociations().get(associationQname));
+        }
+
+        model.put(MODEL_PROP_KEY_MESSAGE_LOOKUP, this.dictionaryservice);
+        
+        return model;
+    }
+    
+    /**
+     * @param req - webscript request
+     * @return  qualified name for class
+     */
+    protected abstract QName getClassQname(WebScriptRequest req);
+    
+    /**
+     * @param namespacePrefix - namespace prefix
+     * @param name - name
+     * @return  qualified name for association
+     */
+    protected abstract QName getAssociationQname(String namespacePrefix, String name);
+    
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractClassGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractClassGet.java
new file mode 100644
index 00000000000..4fcc732bfd8
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractClassGet.java
@@ -0,0 +1,80 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Classdefinitions for a classname eg. =>cm_author
+ * 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public abstract class AbstractClassGet extends DictionaryWebServiceBase
+{
+    private static final String MODEL_PROP_KEY_CLASS_DETAILS = "classdefs";
+    private static final String MODEL_PROP_KEY_PROPERTY_DETAILS = "propertydefs";
+    private static final String MODEL_PROP_KEY_ASSOCIATION_DETAILS = "assocdefs";
+
+    /**
+     * Override method from DeclarativeWebScript
+     */
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        Map<String, Object> model = new HashMap<String, Object>(3);
+        Map<QName, ClassDefinition> classdef = new HashMap<QName, ClassDefinition>();
+        Map<QName, Collection<PropertyDefinition>> propdef = new HashMap<QName, Collection<PropertyDefinition>>();
+        Map<QName, Collection<AssociationDefinition>> assocdef = new HashMap<QName, Collection<AssociationDefinition>>();
+
+        QName classQname = getClassQname(req);
+        classdef.put(classQname, this.dictionaryservice.getClass(classQname));
+        propdef.put(classQname, this.dictionaryservice.getClass(classQname).getProperties().values());
+        assocdef.put(classQname, this.dictionaryservice.getClass(classQname).getAssociations().values());
+
+        model.put(MODEL_PROP_KEY_CLASS_DETAILS, classdef.values());
+        model.put(MODEL_PROP_KEY_PROPERTY_DETAILS, propdef.values());
+        model.put(MODEL_PROP_KEY_ASSOCIATION_DETAILS, assocdef.values());
+        model.put(MODEL_PROP_KEY_MESSAGE_LOOKUP, this.dictionaryservice);
+
+        return model;
+    }
+
+    /**
+     * @param req - webscript request
+     * @return  qualified name for class
+     */
+    protected abstract QName getClassQname(WebScriptRequest req);
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractClassesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractClassesGet.java
new file mode 100644
index 00000000000..99de37b784e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractClassesGet.java
@@ -0,0 +1,193 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Classdefinitions using classfilter , namespaceprefix and name
+ * 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public abstract class AbstractClassesGet extends DictionaryWebServiceBase
+{
+    private static final String MODEL_PROP_KEY_CLASS_DEFS = "classdefs";
+    private static final String MODEL_PROP_KEY_PROPERTY_DETAILS = "propertydefs";
+    private static final String MODEL_PROP_KEY_ASSOCIATION_DETAILS = "assocdefs";
+
+    private static final String CLASS_FILTER_OPTION_TYPE1 = "all";
+    private static final String CLASS_FILTER_OPTION_TYPE2 = "aspect";
+    private static final String CLASS_FILTER_OPTION_TYPE3 = "type";
+
+    private static final String REQ_URL_TEMPL_VAR_CLASS_FILTER = "cf";
+    private static final String REQ_URL_TEMPL_VAR_NAMESPACE_PREFIX = "nsp";
+    private static final String REQ_URL_TEMPL_VAR_NAME = "n";
+
+    /**
+     * Override method from DeclarativeWebScript
+     */
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        String classFilter = getValidInput(req.getParameter(REQ_URL_TEMPL_VAR_CLASS_FILTER));
+        String namespacePrefix = getValidInput(req.getParameter(REQ_URL_TEMPL_VAR_NAMESPACE_PREFIX));
+        String name = getValidInput(req.getParameter(REQ_URL_TEMPL_VAR_NAME));
+
+        Map<QName, ClassDefinition> classdef = new HashMap<QName, ClassDefinition>();
+        Map<QName, Collection<PropertyDefinition>> propdef = new HashMap<QName, Collection<PropertyDefinition>>();
+        Map<QName, Collection<AssociationDefinition>> assocdef = new HashMap<QName, Collection<AssociationDefinition>>();
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        List<QName> qnames = new ArrayList<QName>();
+        QName classQname = null;
+        QName myModel = null;
+
+        // if classfilter is not given, then it defaults to all
+        if (classFilter == null)
+        {
+            classFilter = "all";
+        }
+
+        // validate classfilter
+        if (isValidClassFilter(classFilter) == false)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the classfilter - " + classFilter + " provided in the URL");
+        }
+
+        // name alone has no meaning without namespaceprefix
+        if (namespacePrefix == null && name != null)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Missing namespaceprefix parameter in the URL - both combination of name and namespaceprefix is needed");
+        }
+
+        // validate the namespaceprefix and name parameters => if namespaceprefix is given, then name has to be validated along with it
+        if (namespacePrefix != null)
+        {
+            // validate name parameter if present along with the namespaceprefix
+            if (name != null)
+            {
+                classQname = getClassQname(namespacePrefix, name);
+                classdef.put(classQname, this.dictionaryservice.getClass(classQname));
+                propdef.put(classQname, this.dictionaryservice.getClass(classQname).getProperties().values());
+                assocdef.put(classQname, this.dictionaryservice.getClass(classQname).getAssociations().values());
+            }
+            else
+            {
+                // if name is not given then the model is extracted from the namespaceprefix, there can be more than one model associated with one namespaceprefix
+                String namespaceUri = namespaceService.getNamespaceURI(namespacePrefix);
+                for (QName qnameObj : this.dictionaryservice.getAllModels())
+                {
+                    if (qnameObj.getNamespaceURI().equals(namespaceUri))
+                    {
+                        name = qnameObj.getLocalName();
+                        myModel = getQNameForModel(namespacePrefix, name);
+
+                        // check the classfilter to pull out either all or type or aspects
+                        if (classFilter.equalsIgnoreCase(CLASS_FILTER_OPTION_TYPE1))
+                        {
+                            qnames.addAll(this.dictionaryservice.getAspects(myModel));
+                            qnames.addAll(this.dictionaryservice.getTypes(myModel));
+                        }
+                        else if (classFilter.equalsIgnoreCase(CLASS_FILTER_OPTION_TYPE3))
+                        {
+                            qnames.addAll(this.dictionaryservice.getTypes(myModel));
+                        }
+                        else if (classFilter.equalsIgnoreCase(CLASS_FILTER_OPTION_TYPE2))
+                        {
+                            qnames.addAll(this.dictionaryservice.getAspects(myModel));
+                        }
+                    }
+                }
+            }
+        }
+
+        // if namespacePrefix is null, then check the classfilter to pull out either all or type or aspects
+        if (myModel == null)
+        {
+            if (classFilter.equalsIgnoreCase(CLASS_FILTER_OPTION_TYPE1))
+            {
+                qnames.addAll(this.dictionaryservice.getAllAspects());
+                qnames.addAll(this.dictionaryservice.getAllTypes());
+            }
+            else if (classFilter.equalsIgnoreCase(CLASS_FILTER_OPTION_TYPE3))
+            {
+                qnames.addAll(this.dictionaryservice.getAllTypes());
+            }
+            else if (classFilter.equalsIgnoreCase(CLASS_FILTER_OPTION_TYPE2))
+            {
+                qnames.addAll(this.dictionaryservice.getAllAspects());
+            }
+        }
+
+        if (classdef.isEmpty() == true)
+        {
+            for (QName qnameObj : qnames)
+            {
+                classdef.put(qnameObj, this.dictionaryservice.getClass(qnameObj));
+                propdef.put(qnameObj, this.dictionaryservice.getClass(qnameObj).getProperties().values());
+                assocdef.put(qnameObj, this.dictionaryservice.getClass(qnameObj).getAssociations().values());
+            }
+        }
+
+        List<ClassDefinition> classDefinitions = new ArrayList<ClassDefinition>(classdef.values());
+        Collections.sort(classDefinitions, new DictionaryComparators.ClassDefinitionComparator(dictionaryservice));
+        model.put(MODEL_PROP_KEY_CLASS_DEFS, classDefinitions);
+        model.put(MODEL_PROP_KEY_PROPERTY_DETAILS, reorderedValues(classDefinitions, propdef));
+        model.put(MODEL_PROP_KEY_ASSOCIATION_DETAILS, reorderedValues(classDefinitions, assocdef));
+        model.put(MODEL_PROP_KEY_MESSAGE_LOOKUP, dictionaryservice);
+
+        return model;
+    }
+
+    /**
+     * @param namespacePrefix - namespace prefix of the class
+     * @param name - local name of the class
+     * @return qualified name for model
+     */
+    protected abstract QName getQNameForModel(String namespacePrefix, String name);
+
+    /**
+     * @param namespacePrefix namespace prefix
+     * @param name name
+     * @return  qualified name for class
+     */
+    protected abstract QName getClassQname(String namespacePrefix, String name);
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractPropertiesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractPropertiesGet.java
new file mode 100644
index 00000000000..10940bc86d3
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractPropertiesGet.java
@@ -0,0 +1,157 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Propertydefinitions for a given classname eg. =>cm_person
+ * 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public abstract class AbstractPropertiesGet extends DictionaryWebServiceBase
+{
+    private static final String MODEL_PROP_KEY_PROPERTY_DETAILS = "propertydefs";
+    private static final String PARAM_NAME = "name";
+    private static final String REQ_URL_TEMPL_VAR_NAMESPACE_PREFIX = "nsp";
+    
+    /**
+     * This request parameter can be passed to filter the propertes based on 
+     * type. More than one type can be supplied.
+     */
+    private static final String REQ_PARM_ALLOWED_TYPE = "type";
+
+    /**
+     * Override method from DeclarativeWebScript
+     */
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        QName classQName = getClassQName(req);
+
+        String[] names = req.getParameterValues(PARAM_NAME);
+
+        String namespacePrefix = req.getParameter(REQ_URL_TEMPL_VAR_NAMESPACE_PREFIX);
+        String namespaceURI = null;
+        if (namespacePrefix != null)
+        {
+            namespaceURI = this.namespaceService.getNamespaceURI(namespacePrefix);
+        }
+
+        Map<QName, PropertyDefinition> propMap = null;
+        if (classQName == null)
+        {
+            if (names != null)
+            {
+                propMap = new HashMap<QName, PropertyDefinition>(names.length);
+                for (String name : names)
+                {
+                    QName propQName = QName.createQName(name, namespaceService);
+                    PropertyDefinition propDef = dictionaryservice.getProperty(propQName);
+                    if (propDef != null)
+                    {
+                        propMap.put(propQName, propDef);
+                    }
+                }
+            }
+            else
+            {
+                Collection<QName> propQNames = dictionaryservice.getAllProperties(null);
+                propMap = new HashMap<QName, PropertyDefinition>(propQNames.size());
+                for (QName propQName : propQNames)
+                {
+                    propMap.put(propQName, dictionaryservice.getProperty(propQName));
+                }
+            }
+
+        }
+        else
+        {
+            // Get all the property definitions for the class
+            propMap = dictionaryservice.getClass(classQName).getProperties();
+        }
+
+        // Filter the properties by URI
+        List<PropertyDefinition> props = new ArrayList<PropertyDefinition>(propMap.size());
+        for (Map.Entry<QName, PropertyDefinition> entry : propMap.entrySet())
+        {
+            if ((namespaceURI != null && namespaceURI.equals(entry.getKey().getNamespaceURI()) == true) || namespaceURI == null)
+            {
+                props.add(entry.getValue());
+            }
+        }
+
+        // Filter the properties by the allowed types...
+        String[] filterTypes = req.getParameterValues(REQ_PARM_ALLOWED_TYPE);
+        if (filterTypes != null && filterTypes.length > 0)
+        {
+            List<PropertyDefinition> typeFilteredProps = new ArrayList<PropertyDefinition>(props.size());
+            for (PropertyDefinition prop: props)
+            {
+                for (String type: filterTypes)
+                {
+                    DataTypeDefinition dtd = prop.getDataType();
+                    if (dtd.getName().getPrefixString().equals(type))
+                    {
+                        typeFilteredProps.add(prop);
+                        break;
+                    }
+                }
+            }
+            
+            // Important to change the props variable to reference the type filtered properties...
+            props = typeFilteredProps;
+        }
+
+        // Order property definitions by title
+        Collections.sort(props, new DictionaryComparators.PropertyDefinitionComparator(dictionaryservice));
+
+        // Pass list of property definitions to template
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put(MODEL_PROP_KEY_PROPERTY_DETAILS, props);
+        model.put(MODEL_PROP_KEY_MESSAGE_LOOKUP, dictionaryservice);
+        return model;
+    }
+
+    /**
+     * @param req - webscript request
+     * @return  qualified name for class
+     */
+    protected abstract QName getClassQName(WebScriptRequest req);
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractPropertyGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractPropertyGet.java
new file mode 100644
index 00000000000..ba917fc33f7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractPropertyGet.java
@@ -0,0 +1,76 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Propertydefinition for a given classname and propname
+ * 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public abstract class AbstractPropertyGet extends DictionaryWebServiceBase
+{
+    private static final String MODEL_PROP_KEY_PROPERTY_DETAILS = "propertydefs";
+
+    /**
+     * Override method from DeclarativeWebScript
+     */
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>(1);
+        QName classQname = getClassQname(req);
+        QName propertyQname = getPropertyQname(req);
+
+        if (this.dictionaryservice.getClass(classQname).getProperties().get(propertyQname) != null)
+        {
+            model.put(MODEL_PROP_KEY_PROPERTY_DETAILS, this.dictionaryservice.getClass(classQname).getProperties().get(propertyQname));
+            model.put(MODEL_PROP_KEY_MESSAGE_LOOKUP, this.dictionaryservice);
+        }
+
+        return model;
+    }
+
+    /**
+     * @param req - webscript request
+     * @return  qualified name for property
+     */
+    protected abstract QName getPropertyQname(WebScriptRequest req);
+
+    /**
+     * @param req - webscript request
+     * @return  qualified name for class
+     */
+    protected abstract QName getClassQname(WebScriptRequest req);
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractSubClassesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractSubClassesGet.java
new file mode 100644
index 00000000000..53acfc26c04
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AbstractSubClassesGet.java
@@ -0,0 +1,167 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Sub-Classdefinitions using classfilter , namespacePrefix and name
+ * 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public abstract class AbstractSubClassesGet extends DictionaryWebServiceBase
+{
+    private static final String MODEL_PROP_KEY_CLASS_DEFS = "classdefs";
+    private static final String MODEL_PROP_KEY_PROPERTY_DETAILS = "propertydefs";
+    private static final String MODEL_PROP_KEY_ASSOCIATION_DETAILS = "assocdefs";
+
+    private static final String REQ_URL_TEMPL_IMMEDIATE_SUB_TYPE_CHILDREN = "r";
+    // private static final String REQ_URL_TEMPL_VAR_CLASS_FILTER = "cf";
+    private static final String REQ_URL_TEMPL_VAR_NAMESPACE_PREFIX = "nsp";
+    private static final String REQ_URL_TEMPL_VAR_NAME = "n";
+
+    /**
+     * Override method from DeclarativeWebScript
+     */
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        String name = req.getParameter(REQ_URL_TEMPL_VAR_NAME);
+        String namespacePrefix = req.getParameter(REQ_URL_TEMPL_VAR_NAMESPACE_PREFIX);
+        String recursiveValue = getValidInput(req.getParameter(REQ_URL_TEMPL_IMMEDIATE_SUB_TYPE_CHILDREN));
+
+        boolean recursive = true;
+
+        Map<QName, ClassDefinition> classdef = new HashMap<QName, ClassDefinition>();
+        Map<QName, Collection<PropertyDefinition>> propdef = new HashMap<QName, Collection<PropertyDefinition>>();
+        Map<QName, Collection<AssociationDefinition>> assocdef = new HashMap<QName, Collection<AssociationDefinition>>();
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        String namespaceUri = null;
+        Collection<QName> qname = null;
+        boolean ignoreCheck = false;
+
+        // validate recursive parameter => can be either true or false or null
+        if (recursiveValue == null)
+        {
+            recursive = true;
+        }
+        else if (recursiveValue.equalsIgnoreCase("true"))
+        {
+            recursive = true;
+        }
+        else if (recursiveValue.equalsIgnoreCase("false"))
+        {
+            recursive = false;
+        }
+        else
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the value for the parameter recursive=> " + recursiveValue + "  can only be either true or false");
+        }
+
+        qname = getQNameCollection(req, recursive);
+
+        // validate the name parameter
+        if (name != null)
+        {
+            if (isValidModelName(name) == false)
+            {
+                throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the name parameter - " + name + " in the URL");
+            }
+        }
+
+        // validate the name parameter
+        if (namespacePrefix == null && name != null)
+        {
+            namespaceUri = namespaceService.getNamespaceURI(getPrefixFromModelName(name));
+        }
+
+        if (namespacePrefix != null && name == null)
+        {
+            namespaceUri = namespaceService.getNamespaceURI(namespacePrefix);
+        }
+
+        if (namespacePrefix == null && name == null)
+        {
+            namespaceUri = null;
+            ignoreCheck = true;
+        }
+
+        if (namespacePrefix != null && name != null)
+        {
+            validateClassname(namespacePrefix, name);
+            namespaceUri = namespaceService.getNamespaceURI(namespacePrefix);
+        }
+
+        for (QName qnameObj : qname)
+        {
+            if ((ignoreCheck == true) || (qnameObj.getNamespaceURI().equals(namespaceUri)))
+            {
+                classdef.put(qnameObj, this.dictionaryservice.getClass(qnameObj));
+                propdef.put(qnameObj, this.dictionaryservice.getClass(qnameObj).getProperties().values());
+                assocdef.put(qnameObj, this.dictionaryservice.getClass(qnameObj).getAssociations().values());
+            }
+        }
+
+        List<ClassDefinition> classDefinitions = new ArrayList<ClassDefinition>(classdef.values());
+        Collections.sort(classDefinitions, new DictionaryComparators.ClassDefinitionComparator(dictionaryservice));
+        model.put(MODEL_PROP_KEY_CLASS_DEFS, classDefinitions);
+        model.put(MODEL_PROP_KEY_PROPERTY_DETAILS, reorderedValues(classDefinitions, propdef));
+        model.put(MODEL_PROP_KEY_ASSOCIATION_DETAILS, reorderedValues(classDefinitions, assocdef));
+        model.put(MODEL_PROP_KEY_MESSAGE_LOOKUP, this.dictionaryservice);
+        return model;
+
+    }
+
+    /**
+     * @param req - webscript request
+     * @param recursive - flag to get SubAspects or SubTypes recursively
+     * @return collection of qualified names for subclasses
+     */
+    protected abstract Collection<QName> getQNameCollection(WebScriptRequest req, boolean recursive);
+
+    /**
+     * Throws WebScriptException if classname is invalid
+     * @param namespacePrefix - namespace prefix of a class
+     * @param name - localname of a class
+     */
+    protected abstract void validateClassname(String namespacePrefix, String name);
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AssociationGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AssociationGet.java
new file mode 100644
index 00000000000..ef60964eb62
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AssociationGet.java
@@ -0,0 +1,69 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/*
+ * Webscript to get the Associationdefinition for a given classname and association-name
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public class AssociationGet extends AbstractAssociationGet
+{
+    private static final String DICTIONARY_CLASS_NAME = "classname";
+    private static final String DICTIONARY_ASSOCIATION_NAME = "assocname";
+    
+    @Override
+    protected QName getAssociationQname(WebScriptRequest req)
+    {
+        String associationName = req.getServiceMatch().getTemplateVars().get(DICTIONARY_ASSOCIATION_NAME);
+        if(associationName == null)
+        {
+        	throw new WebScriptException(Status.STATUS_NOT_FOUND, "Missing parameter association name in the URL");
+        }
+        
+        return QName.createQName(getFullNamespaceURI(associationName));
+    }
+
+    @Override
+    protected QName getClassQname(WebScriptRequest req)
+    {
+        String className = req.getServiceMatch().getTemplateVars().get(DICTIONARY_CLASS_NAME);
+        
+        // validate the classname
+        if (isValidClassname(className) == false)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the classname - " + className + " - parameter in the URL");
+        }
+		
+        return QName.createQName(getFullNamespaceURI(className));
+    }
+    
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AssociationsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AssociationsGet.java
new file mode 100644
index 00000000000..6c49a106db7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/AssociationsGet.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Associationdefinitions for a given classname 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public class AssociationsGet extends AbstractAssociationsGet
+{
+    private static final String DICTIONARY_CLASS_NAME = "classname";
+    
+    @Override
+    protected QName getClassQname(WebScriptRequest req)
+    {
+        String className = req.getServiceMatch().getTemplateVars().get(DICTIONARY_CLASS_NAME);
+        //validate classname
+        if (isValidClassname(className) == false)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the classname - " + className + " - parameter in the URL");
+        }
+        return QName.createQName(getFullNamespaceURI(className));
+    }
+
+    @Override
+    protected QName getAssociationQname(String namespacePrefix, String name)
+    {
+        return QName.createQName(getFullNamespaceURI(namespacePrefix + "_" + name));
+    }
+    
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/ClassGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/ClassGet.java
new file mode 100644
index 00000000000..8ddf04f6081
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/ClassGet.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Classdefinitions for a classname eg. =>cm_author
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public class ClassGet extends AbstractClassGet
+{	
+    private static final String DICTIONARY_CLASS_NAME = "className";
+    
+    /**
+     * Override method from AbstractClassGet
+     */
+    @Override
+    protected QName getClassQname(WebScriptRequest req)
+    {
+        String className = req.getServiceMatch().getTemplateVars().get(DICTIONARY_CLASS_NAME);
+        //validate the classname and throw appropriate error message
+        if (isValidClassname(className) == false)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the classname - " + className + " - parameter in the URL");
+        }
+        return QName.createQName(getFullNamespaceURI(className));
+    }
+    
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/ClassesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/ClassesGet.java
new file mode 100644
index 00000000000..8fd15c28b9d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/ClassesGet.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+
+/**
+ * Webscript to get the Classdefinitions using classfilter , namespaceprefix and name
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+        
+public class ClassesGet extends AbstractClassesGet
+{
+        
+    @Override
+    protected QName getQNameForModel(String namespacePrefix, String name)
+    {
+        return QName.createQName(getFullNamespaceURI(namespacePrefix + "_" + name));
+    }
+        
+    @Override
+    protected QName getClassQname(String namespacePrefix, String name)
+    {
+        String className = namespacePrefix + "_" + name;
+        if(isValidClassname(className) == false)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the name - " + name + "parameter in the URL");
+        }
+        return QName.createQName(getFullNamespaceURI(className));
+    }
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/DictionaryComparators.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/DictionaryComparators.java
new file mode 100644
index 00000000000..99c76e5ecda
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/DictionaryComparators.java
@@ -0,0 +1,133 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.dictionary;
+
+import java.util.Comparator;
+
+import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.i18n.MessageLookup;
+
+/**
+ * Comparators used when ordering dictionary elements
+ * 
+ * @author Roy Wetherall
+ */
+public interface DictionaryComparators
+{
+    /**
+     * Class definition comparator.
+     * 
+     * Used to order class definitions by title.
+     */
+    public class ClassDefinitionComparator implements Comparator<ClassDefinition>
+    {
+        private final MessageLookup messageLookup;
+
+        public ClassDefinitionComparator(MessageLookup messageLookup)
+        {
+            this.messageLookup = messageLookup;            
+        }
+
+        public int compare(ClassDefinition arg0, ClassDefinition arg1)
+        {
+            int result = 0;
+            
+            String title0 = arg0.getTitle(messageLookup);
+            if (title0 == null)
+            {
+                title0 = arg0.getName().toPrefixString();
+            }
+            String title1 = arg1.getTitle(messageLookup);
+            if (title1 == null)
+            {
+                title1 = arg1.getName().getPrefixString();
+            }
+            
+            if (title0 == null && title1 != null)
+            {
+                result = 1;
+            }
+            else if (title0 != null && title1 == null)
+            {
+                result = -1;
+            }
+            else if (title0 != null && title1 != null)
+            {
+                result = String.CASE_INSENSITIVE_ORDER.compare(title0, title1);
+            }
+            
+            return result;
+        }        
+    }
+    
+    /**
+     * Property definition comparator.
+     * 
+     * Used to order property definitions by title.
+     */
+    public class PropertyDefinitionComparator implements Comparator<PropertyDefinition>
+    {
+        private final MessageLookup messageLookup;
+
+        public PropertyDefinitionComparator(MessageLookup messageLookup)
+        {
+            this.messageLookup = messageLookup;            
+        }
+
+        public int compare(PropertyDefinition arg0, PropertyDefinition arg1)
+        {
+            int result = 0;
+            
+            String title0 = arg0.getTitle(messageLookup);
+            if (title0 == null)
+            {
+                title0 = arg0.getName().toPrefixString();
+            }
+            String title1 = arg1.getTitle(messageLookup);
+            if (title1 == null)
+            {
+                title1 = arg1.getName().getPrefixString();
+            }
+            
+            if (title0 == null && title1 != null)
+            {
+                result = 1;
+            }
+            else if (title0 != null && title1 == null)
+            {
+                result = -1;
+            }
+            else if (title0 != null && title1 != null)
+            {
+                result = String.CASE_INSENSITIVE_ORDER.compare(title0, title1);
+            }
+            
+            return result;
+        }        
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/DictionaryGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/DictionaryGet.java
new file mode 100644
index 00000000000..65c0ddbed4d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/DictionaryGet.java
@@ -0,0 +1,134 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.ModelDefinition;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * WebScript implementation to retrieve a complete dictionary required to implement
+ * a lightweight remote web-tier dictionary. 
+ * 
+ * @author Kevin Roast
+ */
+public class DictionaryGet extends DictionaryWebServiceBase
+{
+    private static final String MODEL_CLASS_DEFS        = "classdefs";
+    private static final String MODEL_PROPERTY_DEFS     = "propertydefs";
+    private static final String MODEL_ASSOCIATION_DEFS  = "assocdefs";
+    
+    /** Set of model namespaces to ignore when outputing dictionary classes and aspects */
+    private Set<String> ignoreNamespaces = Collections.<String>emptySet();
+    
+    /**
+     * Set of model namespaces to ignore when outputing dictionary classes and aspects
+     * 
+     * @param namespaces    Set of model namespaces to ignore
+     */
+    public void setIgnoreNamespaces(Set<String> namespaces)
+    {
+        this.ignoreNamespaces = namespaces;
+    }
+    
+    /**
+     * Execute the webscript
+     * 
+     * @param req       WebScriptRequest
+     * @param status    Status
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        List<QName> qnames = new ArrayList<QName>(256);
+        Set<String> namespaces = new HashSet<String>();
+        Map<QName, ClassDefinition> classdef = new HashMap<QName, ClassDefinition>();
+        Map<QName, Collection<PropertyDefinition>> propdef = new HashMap<QName, Collection<PropertyDefinition>>();
+        Map<QName, Collection<AssociationDefinition>> assocdef = new HashMap<QName, Collection<AssociationDefinition>>();
+        
+        // check configured list of model namespaces to ignore when retrieving all models
+        for (String ns : this.namespaceService.getURIs())
+        {
+            if (!ignoreNamespaces.contains(ns))
+            {
+                namespaces.add(ns);
+            }
+        }
+        // specific model qname provided or will process all available models
+        String strModel = req.getParameter("model");
+        if (strModel != null && strModel.length() != 0)
+        {
+            // handle full QName and prefixed shortname of a model 
+            QName modelQName = (strModel.charAt(0) == QName.NAMESPACE_BEGIN ? QName.createQName(strModel) : QName.createQName(strModel, this.namespaceService));
+            ModelDefinition modelDef = this.dictionaryservice.getModel(modelQName);
+            if (modelDef != null)
+            {
+                qnames.addAll(this.dictionaryservice.getAspects(modelQName));
+                qnames.addAll(this.dictionaryservice.getTypes(modelQName));
+            }
+        }
+        else
+        {
+            // walk all models and extract the aspects and types
+            for (QName qname : this.dictionaryservice.getAllModels())
+            {
+                if (namespaces.contains(qname.getNamespaceURI()))
+                {
+                    qnames.addAll(this.dictionaryservice.getAspects(qname));
+                    qnames.addAll(this.dictionaryservice.getTypes(qname));
+                }
+            }
+        }
+        // get the class definitions and the properties and associations
+        for (QName qname : qnames)
+        {
+            ClassDefinition classDef = this.dictionaryservice.getClass(qname);
+            classdef.put(qname, classDef);
+            propdef.put(qname, classDef.getProperties().values());
+            assocdef.put(qname, classDef.getAssociations().values());
+        }
+        
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put(MODEL_CLASS_DEFS, classdef.values());     
+        model.put(MODEL_PROPERTY_DEFS, propdef.values());          
+        model.put(MODEL_ASSOCIATION_DEFS, assocdef.values());
+        model.put(MODEL_PROP_KEY_MESSAGE_LOOKUP, this.dictionaryservice);
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/DictionaryWebServiceBase.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/DictionaryWebServiceBase.java
new file mode 100644
index 00000000000..fdf1efca3d5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/DictionaryWebServiceBase.java
@@ -0,0 +1,382 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.namespace.InvalidQNameException;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+
+/**
+ * Base class for Dictionary web scripts
+ * 
+ * @author Saravanan Sellathurai
+ */
+public abstract class DictionaryWebServiceBase extends DeclarativeWebScript
+{
+    private static final String NAME_DELIMITER = "_";
+    protected static final String MODEL_PROP_KEY_MESSAGE_LOOKUP = "messages";
+    
+    /** Namespace service */
+    protected NamespaceService namespaceService;
+    
+    /** Dictionary service */
+    protected DictionaryService dictionaryservice;
+    
+    private static final String CLASS_FILTER_OPTION_TYPE1 = "all";
+    private static final String CLASS_FILTER_OPTION_TYPE2 = "aspect";
+    private static final String CLASS_FILTER_OPTION_TYPE3 = "type";
+
+    private static final String ASSOCIATION_FILTER_OPTION_TYPE1 = "all";
+    private static final String ASSOCIATION_FILTER_OPTION_TYPE2 = "general";
+    private static final String ASSOCIATION_FILTER_OPTION_TYPE3 = "child";
+    
+    
+    /**
+     * Set the namespaceService property.
+     * 
+     * @param namespaceservice The namespace service instance to set
+     */
+    public void setNamespaceService(NamespaceService namespaceservice)
+    {
+        this.namespaceService = namespaceservice;
+    }
+    
+    /**
+     * Set the dictionaryService property.
+     * 
+     * @param dictionaryService The dictionary service instance to set
+     */
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryservice = dictionaryService; 
+    }
+    
+    protected QName createClassQName(String className)
+    {
+        QName result = null;
+        int index = className.indexOf(NAME_DELIMITER);
+        if (index > 0)
+        {
+            String prefix = className.substring(0, index);
+            String shortName = className.substring(index+1);
+            String url = namespaceService.getNamespaceURI(prefix);
+            if (url != null && url.length() != 0 && 
+                shortName != null && shortName.length() != 0)
+            {
+                QName classQName = QName.createQName(url, shortName);
+                if (dictionaryservice.getClass(classQName) != null)
+                {
+                    result = classQName;
+                }
+            }
+        }
+        
+        return result;
+    }
+    
+    /**
+     * @param prefix - prefix for class name
+     * @param shortName - short class name
+     * @return qualified name for class name
+     */
+    protected QName createClassQName(String prefix, String shortName)
+    {
+        QName result = null;
+        String url = namespaceService.getNamespaceURI(prefix);
+        if (url != null && url.length() != 0 && shortName != null && shortName.length() != 0)
+        {
+            QName classQName = QName.createQName(url, shortName);
+            if (dictionaryservice.getClass(classQName) != null)
+            {
+                result = classQName;
+            }
+        }
+        return result;
+    }
+    
+    
+    /**
+     * @param qname QName
+     * @return the namespaceuri from a qname 
+     */
+    public String getNamespaceURIfromQname(QName qname)
+    {
+    	return qname.getNamespaceURI();
+    }
+	
+    /**
+     * @param classname     the class name as cm_person
+     * @return String       the full name in the following format {namespaceuri}shorname
+     */
+    public String getFullNamespaceURI(String classname)
+    {
+       	try
+       	{
+			String result = null;
+		   	String prefix = this.getPrefix(classname);
+		   	String url = this.namespaceService.getNamespaceURI(prefix);
+			String name = this.getShortName(classname);
+			result = "{" + url + "}"+ name;
+			return result;
+       	}
+       	catch (Exception e)
+       	{
+       		throw new WebScriptException(Status.STATUS_NOT_FOUND, "The exact classname - " + classname + "  parameter has not been provided in the URL");
+       	}
+    }
+    
+    /**
+     * @param prefix        prefix for classname as cm
+     * @param shorname      the short class name as person
+     * @return String       the full name in the following format {namespaceuri}shorname
+     */
+    public String getFullNamespaceURI(String prefix, String shorname)
+    {
+        try
+        {
+            String result = null;
+            String url = this.namespaceService.getNamespaceURI(prefix);
+            result = "{" + url + "}" + shorname;
+            return result;
+        }
+        catch (Exception e)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "The exact classname - " + prefix + ":" + shorname + "  parameter has not been provided in the URL");
+        }
+    }
+    
+    /**
+     * @param classname - checks whether the classname is valid , gets the classname as input e.g cm_person
+     * @return true - if the class is valid , false - if the class is invalid
+     */
+    public boolean isValidClassname(String classname) 
+    {
+    	QName qname = null;
+    	try
+    	{
+    		qname = QName.createQName(this.getFullNamespaceURI(classname));
+    		return (dictionaryservice.getClass(qname) != null);
+    	}
+    	catch (InvalidQNameException e)
+    	{
+    		//just ignore
+    	}
+    	return false;
+    }
+    
+    /**
+     * Checks whether the classname is valid
+     * @param prefix - gets the prefix as input e.g cm
+     * @param shorname - gets the short classname as input e.g person
+     * @return true - if the class is valid , false - if the class is invalid
+     */
+    public boolean isValidClassname(String prefix, String shorname) 
+    {
+        QName qname = null;
+        try
+        {
+            qname = QName.createQName(this.getFullNamespaceURI(prefix, shorname));
+            return (dictionaryservice.getClass(qname) != null);
+        }
+        catch (InvalidQNameException e)
+        {
+            //just ignore
+        }
+        return false;
+    }
+    
+    /**
+     * @param modelname String
+     * @return modelname from namespaceprefix - returns null if invalid namespaceprefix is given
+     */
+    public String getPrefixFromModelName(String modelname)
+    {
+    	String namespaceprefix = null;
+		for(QName qnameObj:this.dictionaryservice.getAllModels())
+        {
+             if(qnameObj.getLocalName().equals(modelname))
+             {
+                 Collection<String> prefixes = this.namespaceService.getPrefixes(qnameObj.getNamespaceURI());
+                 if (!prefixes.isEmpty())
+                 {
+                     namespaceprefix = prefixes.iterator().next();
+                 }
+            	 break;
+             }
+        }
+		return namespaceprefix;
+    }
+    
+    public boolean isValidAssociationFilter(String af)
+    {
+    	return (af.equalsIgnoreCase(ASSOCIATION_FILTER_OPTION_TYPE1) ||
+          	    af.equalsIgnoreCase(ASSOCIATION_FILTER_OPTION_TYPE2) ||
+          	    af.equalsIgnoreCase(ASSOCIATION_FILTER_OPTION_TYPE3));
+    }
+    
+    /**
+     * @param classname as the input
+     * @return true if it is a aspect or false if it is a Type
+     */
+    public boolean isValidTypeorAspect(String classname)
+    {
+    	try
+    	{
+    		QName qname = QName.createQName(this.getFullNamespaceURI(classname));
+    		return ((this.dictionaryservice.getClass(qname) != null) && 
+    				(this.dictionaryservice.getClass(qname).isAspect()));
+    	}
+    	catch (InvalidQNameException e)
+    	{
+    		// ignore
+    	}
+    	return false;
+	}
+    
+    /**
+     * @param prefix as the input
+     * @param shorname as the input
+     * @return true if it is a aspect or false if it is a Type
+     */
+    public boolean isValidTypeorAspect(String prefix, String shorname)
+    {
+        try
+        {
+            QName qname = QName.createQName(this.getFullNamespaceURI(prefix, shorname));
+            return ((this.dictionaryservice.getClass(qname) != null) && 
+                    (this.dictionaryservice.getClass(qname).isAspect()));
+        }
+        catch (InvalidQNameException e)
+        {
+            // ignore
+        }
+        return false;
+    }
+    
+    /**
+     * @param modelname - gets the modelname as the input (modelname is without prefix ie. cm:contentmodel => where modelname = contentmodel)
+     * @return true if valid or false
+     */
+    public boolean isValidModelName(String modelname)
+    {
+    	boolean value = false;
+    	for (QName qnameObj:this.dictionaryservice.getAllModels())
+		{
+			if (qnameObj.getLocalName().equalsIgnoreCase(modelname))
+			{
+				value = true;
+				break;
+			}
+		}
+    	return value;
+    }
+    
+    /**
+     * @param classname - returns the prefix from the classname of the format namespaceprefix:name eg. cm_person
+     * @return prefix - returns the prefix of the classname
+     */
+    public String getPrefix(String classname)
+    {
+    	String prefix = null;
+        int index = classname.indexOf(NAME_DELIMITER);
+        if (index > 0)
+        {
+            prefix = classname.substring(0, index);
+        }
+        return prefix;
+    }
+    
+    /**
+     * @param classname  String
+     * @return the shortname from the classname of the format cm_person
+     * 			here person represents the shortname
+     */
+    public String getShortName(String classname)
+    {
+    	String shortname = null;
+    	int index = classname.indexOf(NAME_DELIMITER);
+        if (index > 0)
+        {
+        	shortname = classname.substring(index+1);
+        }
+        return shortname;
+    }
+    
+    /**
+     * @param input -gets a string input and validates it
+     * @return null if invalid or the string itself if its valid
+     */
+    public String getValidInput(String input)
+    {
+    	if ((input != null) && (input.length() != 0))
+    	{
+    		return input;
+    	}
+    	else
+    	{
+    		return null;
+    	}
+    }
+  
+   /**
+    * @param classfilter =>valid class filters are all,apect or type
+    * @return true if valid or false if invalid
+    */
+    public boolean isValidClassFilter(String classfilter)
+    {
+    	return (classfilter.equals(CLASS_FILTER_OPTION_TYPE1) || 
+          	    classfilter.equals(CLASS_FILTER_OPTION_TYPE2) || 
+          	    classfilter.equals(CLASS_FILTER_OPTION_TYPE3));
+    }
+   
+    /**
+     * Returns dependent collections (properties or associations)
+     * in order that complies to order of class definitions 
+     * @param sortedClassDefs - list of sorted class definitions
+     * @param dependent - collections that depend on class definitions
+     * @return collection of dependent values
+     */
+    protected <T> Collection<T> reorderedValues(List<ClassDefinition> sortedClassDefs,  Map<QName, T> dependent)
+    {
+        Collection<T> result = new ArrayList<T>(sortedClassDefs.size());
+        for (ClassDefinition classDef : sortedClassDefs)
+        {
+            result.add(dependent.get(classDef.getName()));
+        }
+        return result;
+    }
+   
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/PropertiesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/PropertiesGet.java
new file mode 100644
index 00000000000..c7c0880e9ba
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/PropertiesGet.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Propertydefinitions for a given classname eg. =>cm_person
+ * 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public class PropertiesGet extends AbstractPropertiesGet
+{
+    private static final String DICTIONARY_CLASS_NAME = "classname";
+	
+    @Override
+    protected QName getClassQName(WebScriptRequest req)
+    {
+        QName classQName = null;
+        String className = req.getServiceMatch().getTemplateVars().get(DICTIONARY_CLASS_NAME);
+        if (className != null && className.length() != 0)
+        {            
+            classQName = createClassQName(className);
+            if (classQName == null)
+            {
+                // Error 
+                throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the className - " + className + " - parameter in the URL");
+            }
+        }
+        return classQName;
+    }
+            
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/PropertyGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/PropertyGet.java
new file mode 100644
index 00000000000..105992e86db
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/PropertyGet.java
@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Propertydefinition for a given classname and propname
+ * 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public class PropertyGet extends AbstractPropertyGet
+{
+    private static final String DICTIONARY_CLASS_NAME = "classname";
+    private static final String DICTIONARY_PROPERTY_NAME = "propname";
+    
+    @Override
+    protected QName getPropertyQname(WebScriptRequest req)
+    {
+        String propertyName = req.getServiceMatch().getTemplateVars().get(DICTIONARY_PROPERTY_NAME);
+        //validate the presence of property name
+        if(propertyName == null)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Missing parameter propertyname in the URL");
+        }
+        
+        return QName.createQName(getFullNamespaceURI(propertyName));
+    }
+        
+    @Override
+    protected QName getClassQname(WebScriptRequest req)
+    {
+        String className = req.getServiceMatch().getTemplateVars().get(DICTIONARY_CLASS_NAME);
+		
+        // validate the classname
+        if (isValidClassname(className) == false)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the classname - " + className + " - parameter in the URL");
+        }
+       
+        return QName.createQName(getFullNamespaceURI(className));
+    }
+    
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/SubClassesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/SubClassesGet.java
new file mode 100644
index 00000000000..b2b6ae90618
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/SubClassesGet.java
@@ -0,0 +1,86 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import java.util.Collection;
+
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Sub-Classdefinitions using classfilter , namespacePrefix and name
+ * 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public class SubClassesGet extends AbstractSubClassesGet
+{
+    private static final String DICTIONARY_CLASS_NAME = "classname";
+    	
+    @Override
+    protected Collection<QName> getQNameCollection(WebScriptRequest req, boolean recursive)
+    {
+        QName classQName = null;
+        boolean isAspect = false;
+        String className = req.getServiceMatch().getTemplateVars().get(DICTIONARY_CLASS_NAME);
+        	
+        //validate the className
+        if(isValidClassname(className) == true)
+        {
+            classQName = QName.createQName(getFullNamespaceURI(className));
+            if(isValidTypeorAspect(className) == true) 
+            {
+                isAspect = true;
+            }
+        }
+        else
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the className - " + className + " parameter in the URL");
+        }
+        
+        // collect the subaspects or subtypes of the class
+        if(isAspect == true) 
+        {
+            return this.dictionaryservice.getSubAspects(classQName, recursive);
+    	}
+    	else
+        {
+            return this.dictionaryservice.getSubTypes(classQName, recursive);
+        }
+    }
+        
+    @Override
+    protected void validateClassname(String namespacePrefix, String name)
+    {
+        if(isValidClassname(namespacePrefix + "_" + name) == false)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the namespacePrefix - " + namespacePrefix + " and name - "+ name  + " - parameter in the URL");
+        }
+    }
+   
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/AssociationGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/AssociationGet.java
new file mode 100644
index 00000000000..ff0d56046dd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/AssociationGet.java
@@ -0,0 +1,79 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary.prefixed;
+
+import org.alfresco.repo.web.scripts.dictionary.AbstractAssociationGet;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/*
+ * Webscript to get the Associationdefinition for a given classname and association-name
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public class AssociationGet extends AbstractAssociationGet
+{
+    private static final String DICTIONARY_PREFIX = "prefix";
+    private static final String DICTIONARY_SHORT_CLASS_NAME = "shortClassName";
+    private static final String DICTIONARY_ASSOCIATION_PREFIX = "assocprefix";
+    private static final String DICTIONARY_ASSOCIATION_SHORTNAME = "assocname";
+    
+    @Override
+    protected QName getClassQname(WebScriptRequest req)
+    {
+        String classPrefix = req.getServiceMatch().getTemplateVars().get(DICTIONARY_PREFIX);
+        String shortClassName = req.getServiceMatch().getTemplateVars().get(DICTIONARY_SHORT_CLASS_NAME);
+        
+        //validate the classname
+        if(isValidClassname(classPrefix, shortClassName) == false)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the classname - " + classPrefix + ":" + shortClassName + " - parameter in the URL");
+        }
+       
+        return QName.createQName(getFullNamespaceURI(classPrefix, shortClassName));
+    }
+
+    @Override
+    protected QName getAssociationQname(WebScriptRequest req)
+    {
+        String associationName = req.getServiceMatch().getTemplateVars().get(DICTIONARY_ASSOCIATION_SHORTNAME);
+        String associationPrefix = req.getServiceMatch().getTemplateVars().get(DICTIONARY_ASSOCIATION_PREFIX);
+        
+        if(associationPrefix == null)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Missing parameter association prefix in the URL");
+        }
+        if(associationName == null)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Missing parameter association name in the URL");
+        }
+        
+        return QName.createQName(getFullNamespaceURI(associationPrefix, associationName));
+    }
+    
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/AssociationsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/AssociationsGet.java
new file mode 100644
index 00000000000..889dd1f8008
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/AssociationsGet.java
@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary.prefixed;
+
+import org.alfresco.repo.web.scripts.dictionary.AbstractAssociationsGet;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Associationdefinitions for a given classname 
+ * 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public class AssociationsGet extends AbstractAssociationsGet
+{
+    private static final String DICTIONARY_PREFIX = "prefix";
+    private static final String DICTIONARY_SHORT_CLASS_NAME = "shortClassName";
+    
+    @Override
+    protected QName getClassQname(WebScriptRequest req)
+    {
+        String prefix = req.getServiceMatch().getTemplateVars().get(DICTIONARY_PREFIX);
+        String shortClassName = req.getServiceMatch().getTemplateVars().get(DICTIONARY_SHORT_CLASS_NAME);
+        
+        //validate classname
+        if (isValidClassname(prefix, shortClassName) == false)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the classname - " + prefix + ":" + shortClassName + " - parameter in the URL");
+        }
+        return QName.createQName(getFullNamespaceURI(prefix, shortClassName));
+    }
+        
+    @Override
+    protected QName getAssociationQname(String namespacePrefix, String name)
+    {
+        return QName.createQName(getFullNamespaceURI(namespacePrefix, name));
+    }
+    
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/ClassGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/ClassGet.java
new file mode 100644
index 00000000000..7ddd9ceb08a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/ClassGet.java
@@ -0,0 +1,62 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary.prefixed;
+
+import org.alfresco.repo.web.scripts.dictionary.AbstractClassGet;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Classdefinitions for a classname eg. =>cm_author
+ * 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public class ClassGet extends AbstractClassGet
+{   
+    private static final String DICTIONARY_PREFIX = "prefix";
+    private static final String DICTIONARY_SHORT_CLASS_NAME = "shortClassName";
+    
+    /**
+     * Override method from AbstractClassGet
+     */
+    @Override
+    protected QName getClassQname(WebScriptRequest req)
+    {
+        String prefix = req.getServiceMatch().getTemplateVars().get(DICTIONARY_PREFIX);
+        String shortName = req.getServiceMatch().getTemplateVars().get(DICTIONARY_SHORT_CLASS_NAME);
+        
+        //validate the classname and throw appropriate error message
+        if (isValidClassname(prefix, shortName) == false)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the classname - " + prefix + ":" + shortName + " - parameter in the URL");
+        }
+        return QName.createQName(getFullNamespaceURI(prefix, shortName));
+    }
+    
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/ClassesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/ClassesGet.java
new file mode 100644
index 00000000000..95fc4addda5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/ClassesGet.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary.prefixed;
+
+import org.alfresco.repo.web.scripts.dictionary.AbstractClassesGet;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+
+/**
+ * Webscript to get the Classdefinitions using classfilter , namespaceprefix and name
+ * 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public class ClassesGet extends AbstractClassesGet
+{
+    @Override
+    protected QName getQNameForModel(String namespacePrefix, String name)
+    {
+        return QName.createQName(getFullNamespaceURI(namespacePrefix, name));
+    }
+        
+    @Override
+    protected QName getClassQname(String namespacePrefix, String name)
+    {
+        if(isValidClassname(namespacePrefix, name) == false)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the name - " + name + "parameter in the URL");
+        }
+        return QName.createQName(getFullNamespaceURI(namespacePrefix, name));
+    }
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/PropertiesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/PropertiesGet.java
new file mode 100644
index 00000000000..8ab1576c366
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/PropertiesGet.java
@@ -0,0 +1,63 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary.prefixed;
+
+import org.alfresco.repo.web.scripts.dictionary.AbstractPropertiesGet;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Propertydefinitions for a given classname eg. =>cm_person
+ * 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public class PropertiesGet extends AbstractPropertiesGet
+{
+    private static final String DICTIONARY_PREFIX = "prefix";
+    private static final String DICTIONARY_SHORT_CLASS_NAME = "shortClassName";
+    
+    @Override
+    protected QName getClassQName(WebScriptRequest req)
+    {
+        QName classQName = null;
+        String prefix = req.getServiceMatch().getTemplateVars().get(DICTIONARY_PREFIX);
+        String shortName = req.getServiceMatch().getTemplateVars().get(DICTIONARY_SHORT_CLASS_NAME);
+        if (prefix != null && prefix.length() != 0 && shortName != null && shortName.length()!= 0)
+        {            
+            classQName = createClassQName(prefix, shortName);
+            if (classQName == null)
+            {
+                // Error 
+                throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the className - " + prefix + ":" + shortName + " - parameter in the URL");
+            }
+        }
+        return classQName;
+    }
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/PropertyGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/PropertyGet.java
new file mode 100644
index 00000000000..7e93bf3a15f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/PropertyGet.java
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary.prefixed;
+
+import org.alfresco.repo.web.scripts.dictionary.AbstractPropertyGet;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Propertydefinition for a given classname and propname
+ * 
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public class PropertyGet extends AbstractPropertyGet
+{
+    private static final String DICTIONARY_PREFIX = "prefix";
+    private static final String DICTIONARY_SHORT_CLASS_NAME = "shortClassName";
+    private static final String DICTIONARY_SHORTPROPERTY_NAME = "propname";
+    private static final String DICTIONARY_PROPERTY_FREFIX = "proppref";
+    
+    @Override
+    protected QName getPropertyQname(WebScriptRequest req)
+    {
+        String propertyName = req.getServiceMatch().getTemplateVars().get(DICTIONARY_SHORTPROPERTY_NAME);
+        String propertyPrefix = req.getServiceMatch().getTemplateVars().get(DICTIONARY_PROPERTY_FREFIX);
+        
+        //validate the presence of property name
+        if(propertyName == null)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Missing parameter short propertyname in the URL");
+        }
+        //validate the presence of property prefix
+        if(propertyPrefix == null)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Missing parameter propertyprefix in the URL");
+        }
+        
+        return QName.createQName(getFullNamespaceURI(propertyPrefix, propertyName));
+    }
+
+    @Override
+    protected QName getClassQname(WebScriptRequest req)
+    {
+        String prefix = req.getServiceMatch().getTemplateVars().get(DICTIONARY_PREFIX);
+        String shortClassName = req.getServiceMatch().getTemplateVars().get(DICTIONARY_SHORT_CLASS_NAME);
+        
+        // validate the classname
+        if (isValidClassname(prefix, shortClassName) == false)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the classname - " + prefix + ":" + shortClassName + " - parameter in the URL");
+        }
+        
+        return QName.createQName(getFullNamespaceURI(prefix, shortClassName));
+    }
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/SubClassesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/SubClassesGet.java
new file mode 100644
index 00000000000..f1ab69b12ce
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/dictionary/prefixed/SubClassesGet.java
@@ -0,0 +1,88 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary.prefixed;
+
+import java.util.Collection;
+
+import org.alfresco.repo.web.scripts.dictionary.AbstractSubClassesGet;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript to get the Sub-Classdefinitions using classfilter , namespacePrefix and name
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public class SubClassesGet extends AbstractSubClassesGet
+{
+    private static final String DICTIONARY_PREFIX = "prefix";
+    private static final String DICTIONARY_CLASS_SHORTNAME = "shortClassName";
+
+    @Override
+    protected Collection<QName> getQNameCollection(WebScriptRequest req, boolean recursive)
+    {
+        String prefix = req.getServiceMatch().getTemplateVars().get(DICTIONARY_PREFIX);
+        String shortClassName = req.getServiceMatch().getTemplateVars().get(DICTIONARY_CLASS_SHORTNAME);
+        QName classQName = null;
+        boolean isAspect = false;
+            
+        //validate the className
+        if(isValidClassname(prefix, shortClassName) == true)
+        {
+            classQName = QName.createQName(getFullNamespaceURI(prefix, shortClassName));
+            if(isValidTypeorAspect(prefix, shortClassName) == true) 
+            {
+                isAspect = true;
+            }
+        }
+        else
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the className - " + prefix + ":" + shortClassName + " parameter in the URL");
+        }
+        
+        // collect the subaspects or subtypes of the class
+        if(isAspect == true) 
+        {
+            return this.dictionaryservice.getSubAspects(classQName, recursive);
+        }
+        else
+        {
+            return this.dictionaryservice.getSubTypes(classQName, recursive);
+        }
+    }
+        
+    @Override
+    protected void validateClassname(String namespacePrefix, String name)
+    {
+        if(isValidClassname(namespacePrefix, name) == false)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the namespacePrefix - " + namespacePrefix + " and name - "+ name  + " - parameter in the URL");
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/AbstractDiscussionWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/AbstractDiscussionWebScript.java
new file mode 100644
index 00000000000..11a4927e030
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/AbstractDiscussionWebScript.java
@@ -0,0 +1,603 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.discussion;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.discussion.DiscussionServiceImpl;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteServiceImpl;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.service.cmr.discussion.DiscussionService;
+import org.alfresco.service.cmr.discussion.PostInfo;
+import org.alfresco.service.cmr.discussion.TopicInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.NoSuchPersonException;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.util.Pair;
+import org.alfresco.util.ScriptPagingDetails;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Nick Burch
+ * @since 4.0
+ */
+public abstract class AbstractDiscussionWebScript extends DeclarativeWebScript
+{
+    public static final String DISCUSSIONS_SERVICE_ACTIVITY_APP_NAME = "discussions";
+    
+    /**
+     * When no maximum or paging info is given, what should we use?
+     */
+    protected static final int MAX_QUERY_ENTRY_COUNT = 1000;
+    
+    private static Log logger = LogFactory.getLog(AbstractDiscussionWebScript.class);
+    
+    protected static final String KEY_POSTDATA = "postData";
+    protected static final String KEY_IS_TOPIC_POST = "isTopicPost";
+    protected static final String KEY_TOPIC = "topic";
+    protected static final String KEY_POST = "post";
+    protected static final String KEY_CAN_EDIT = "canEdit";
+    protected static final String KEY_AUTHOR = "author";
+    
+    // Injected services
+    protected NodeService nodeService;
+    protected SiteService siteService;
+    protected PersonService personService;
+    protected ActivityService activityService;
+    protected DiscussionService discussionService;
+    protected PermissionService permissionService;
+    
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+    
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+    
+    public void setPersonService(PersonService personService)
+    {
+        this.personService = personService;
+    }
+    
+    public void setActivityService(ActivityService activityService)
+    {
+        this.activityService = activityService;
+    }
+    
+    public void setDiscussionService(DiscussionService discussionService)
+    {
+        this.discussionService = discussionService;
+    }
+    
+    public void setPermissionService(PermissionService permissionService)
+    {
+        this.permissionService = permissionService;
+    }
+    
+    
+    protected String getOrNull(JSONObject json, String key)
+    {
+       if (json.containsKey(key))
+       {
+          return (String)json.get(key);
+       }
+       return null;
+    }
+    
+    /**
+     * Builds up a listing Paging request, based on the arguments
+     *  specified in the URL
+     */
+    protected PagingRequest buildPagingRequest(WebScriptRequest req)
+    {
+       return new ScriptPagingDetails(req, MAX_QUERY_ENTRY_COUNT);
+    }
+    
+    protected List<String> getTags(JSONObject json)
+    {
+       List<String> tags = null;
+       if (json.containsKey("tags"))
+       {
+          // Is it "tags":"" or "tags":[...] ?
+          if (json.get("tags") instanceof String)
+          {
+             // This is normally an empty string, skip
+             String tagsS = (String)json.get("tags");
+             if ("".equals(tagsS))
+             {
+                // No tags were given
+                return null;
+             }
+             else
+             {
+                // Log, and treat as empty
+                logger.warn("Unexpected tag data: " + tagsS);
+                return null;
+             }
+          }
+          else
+          {
+             tags = new ArrayList<String>();
+             JSONArray jsTags = (JSONArray)json.get("tags");
+             for (int i=0; i<jsTags.size(); i++)
+             {
+                tags.add( (String)jsTags.get(i) );
+             }
+          }
+       }
+       return tags;
+    }
+    
+    /**
+     * Generates an activity entry for the discussion item
+     * 
+     * @param thing Either post or reply
+     * @param event One of created, updated, deleted
+     */
+    protected void addActivityEntry(String thing, String event, TopicInfo topic, 
+          PostInfo post, SiteInfo site, WebScriptRequest req, JSONObject json)
+    {
+       // We can only add activities against a site
+       if (site == null)
+       {
+          logger.info("Unable to add activity entry for " + thing + " " + event + " as no site given");
+          return;
+       }
+       
+       // What page is this for?
+       String page = req.getParameter("page");
+       if (page == null && json != null)
+       {
+          if (json.containsKey("page"))
+          {
+             page = (String)json.get("page");
+          }
+       }
+       if (page == null)
+       {
+          // Default
+          page = "discussions-topicview";
+       }
+       
+       // Get the title
+       String title = topic.getTitle();
+       if (post != null)
+       {
+          String postTitle = post.getTitle();
+          if (postTitle != null && postTitle.length() > 0)
+          {
+             title = postTitle;
+          }
+       }
+       
+       try
+       {
+          JSONObject params = new JSONObject();
+          params.put("topicId", topic.getSystemName());
+          
+          JSONObject activity = new JSONObject();
+          activity.put("title", title);
+          activity.put("page", page + "?topicId=" + topic.getSystemName());
+          activity.put("params", params);
+          
+          activityService.postActivity(
+                "org.alfresco.discussions." + thing + "-" + event,
+                site.getShortName(),
+                DISCUSSIONS_SERVICE_ACTIVITY_APP_NAME,
+                activity.toString());
+       }
+       catch(Exception e)
+       {
+          // Warn, but carry on
+          logger.warn("Error adding discussions " + thing + " " + event + " to activities feed", e);
+       }
+    }
+    
+    /**
+     * Is the current user allowed to edit this post?
+     * In order to be deemed allowed, you first need write
+     *  permissions on the underlying node of the post.
+     * You then also need to either be the cm:creator of
+     *  the post node, or a site manager
+     */
+    protected boolean canUserEditPost(PostInfo post, SiteInfo site)
+    {
+       // Are they OK on the node?
+       AccessStatus canEdit = permissionService.hasPermission(post.getNodeRef(), PermissionService.WRITE); 
+       if (canEdit == AccessStatus.ALLOWED)
+       {
+          // Only the creator and site managers may edit
+          String user = AuthenticationUtil.getFullyAuthenticatedUser();
+          if (post.getCreator().equals(user))
+          {
+             // It's their post
+             return true;
+          }
+          if (site != null)
+          {
+             String role = siteService.getMembersRole(site.getShortName(), user);
+             if (SiteServiceImpl.SITE_MANAGER.equals(role))
+             {
+                // Managers may edit
+                return true;
+             }
+          }
+       }
+       
+       // If in doubt, you may not edit
+       return false;
+    }
+    
+    protected Object buildPerson(String username)
+    {
+       // Empty string needed if the user can't be found
+       Object noSuchPersonResponse = "";
+       
+       if (username == null || username.length() == 0)
+       {
+          return noSuchPersonResponse;
+       }
+       
+       try
+       {
+          // Will turn into a Script Node needed of the person
+          NodeRef person = personService.getPerson(username);
+          return person;
+       }
+       catch(NoSuchPersonException e)
+       {
+          // This is normally caused by the person having been deleted
+          return noSuchPersonResponse;
+       }
+    }
+    
+    /*
+     * Was topicpost.lib.js getReplyPostData
+     * 
+     * TODO Switch the FTL to prefer the Info object rather than the ScriptNode
+     */
+    protected Map<String, Object> renderPost(PostInfo post, SiteInfo site)
+    {
+       Map<String, Object> item = new HashMap<String, Object>();
+       item.put(KEY_IS_TOPIC_POST, false);
+       item.put(KEY_POST, post.getNodeRef());
+       item.put(KEY_CAN_EDIT, canUserEditPost(post, site));
+       item.put(KEY_AUTHOR, buildPerson(post.getCreator()));
+       return item;
+    }
+    
+    /*
+     * Was topicpost.lib.js getTopicPostData / getTopicPostDataFromTopicAndPosts
+     * 
+     * TODO Switch the FTL to prefer the Info object rather than the ScriptNode
+     */
+    protected Map<String, Object> renderTopic(TopicInfo topic, SiteInfo site)
+    {
+       // Fetch the primary post
+       PostInfo primaryPost = discussionService.getPrimaryPost(topic);
+       if (primaryPost == null)
+       {
+          throw new WebScriptException(Status.STATUS_PRECONDITION_FAILED,
+                 "First (primary) post was missing from the topic, can't fetch");
+       }
+       
+       // Fetch the most recent reply
+       PostInfo mostRecentPost = discussionService.getMostRecentPost(topic);
+       
+       // Find out how many replies there are
+       int numReplies;
+       if (mostRecentPost.getNodeRef().equals( primaryPost.getNodeRef() ))
+       {
+          // Only the one post in the topic
+          mostRecentPost = null;
+          numReplies = 0;
+       }
+       else
+       {
+          // Use this trick to get the number of posts in the topic, 
+          //  but without needing to get lots of data and objects
+          PagingRequest paging = new PagingRequest(1);
+          paging.setRequestTotalCountMax(MAX_QUERY_ENTRY_COUNT);
+          PagingResults<PostInfo> posts = discussionService.listPosts(topic, paging);
+          
+          // The primary post is in the list, so exclude from the reply count 
+          numReplies = posts.getTotalResultCount().getFirst() - 1;
+       }
+       
+       // Build the details
+       Map<String, Object> item = new HashMap<String, Object>();
+       item.put(KEY_IS_TOPIC_POST, true);
+       item.put(KEY_TOPIC, topic.getNodeRef());
+       item.put(KEY_POST, primaryPost.getNodeRef());
+       item.put(KEY_CAN_EDIT, canUserEditPost(primaryPost, site));
+       item.put(KEY_AUTHOR, buildPerson(topic.getCreator()));
+       
+       // The reply count is one less than all posts (first is the primary one)
+       item.put("totalReplyCount", numReplies);
+       
+       // Add the topic site 
+       item.put("site", topic.getShortSiteName());
+       
+       // We want details on the most recent post
+       if (mostRecentPost != null)
+       {
+          item.put("lastReply", mostRecentPost.getNodeRef());
+          item.put("lastReplyBy", buildPerson(mostRecentPost.getCreator()));
+       }
+       
+       // Include the tags
+       item.put("tags", topic.getTags());
+       
+       // All done
+       return item;
+    }
+    
+    /*
+     * Renders out the list of topics
+     * TODO Fetch the post data in one go, rather than one at a time
+     */
+    protected Map<String, Object> renderTopics(PagingResults<TopicInfo> topics,
+          PagingRequest paging, SiteInfo site)
+    {
+       return renderTopics(topics.getPage(), topics.getTotalResultCount(), paging, site);
+    }
+    /*
+     * Renders out the list of topics
+     * TODO Fetch the post data in one go, rather than one at a time
+     */
+    protected Map<String, Object> renderTopics(List<TopicInfo> topics, 
+          Pair<Integer,Integer> size, PagingRequest paging, SiteInfo site)
+    {
+       Map<String, Object> model = new HashMap<String, Object>();
+       
+       // Paging info
+       model.put("total", size.getFirst());
+       model.put("pageSize", paging.getMaxItems());
+       model.put("startIndex", paging.getSkipCount());
+       model.put("itemCount", topics.size());
+       
+       // Data
+       List<Map<String,Object>> items = new ArrayList<Map<String,Object>>();
+       for (TopicInfo topic : topics)
+       {
+          // ACE-772 fix of incorrect display of topics into "My Discussions" dashlet.
+          // Into "My Discussions" dashlet forum topic will be displayed only if user is a member of that site.
+          if (null == site && null != topic.getShortSiteName())
+          {
+             String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
+             String siteShortName = topic.getShortSiteName();
+             boolean isSiteMember = siteService.isMember(siteShortName, currentUser);
+
+             if (isSiteMember)
+             {
+                items.add(renderTopic(topic, site));
+             }
+          }
+          // Display all topics on the forum of the site.
+          else
+          {
+             items.add(renderTopic(topic, site));
+          }
+       }
+       model.put("items", items);
+       
+       // All done
+       return model;
+    }
+    
+    protected Map<String, Object> buildCommonModel(SiteInfo site, TopicInfo topic, 
+          PostInfo post, WebScriptRequest req)
+    {
+       // Build the common model parts
+       Map<String, Object> model = new HashMap<String, Object>();
+       model.put(KEY_TOPIC, topic);
+       model.put(KEY_POST, post);
+       
+       // Capture the site details only if site based
+       if (site != null)
+       {
+          model.put("siteId", site.getShortName());
+          model.put("site", site);
+       }
+       
+       // The limit on the length of the content to be returned
+       int contentLength = -1;
+       String contentLengthS = req.getParameter("contentLength");
+       if (contentLengthS != null)
+       {
+          try
+          {
+             contentLength = Integer.parseInt(contentLengthS);
+          }
+          catch (NumberFormatException e)
+          {
+             logger.info("Skipping invalid length " + contentLengthS); 
+          }
+       }
+       model.put("contentLength", contentLength);
+       
+       // All done
+       return model;
+    }
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req,
+          Status status, Cache cache) 
+    {
+       Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+       if (templateVars == null)
+       {
+          String error = "No parameters supplied";
+          throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+       }
+       
+       
+       // Parse the JSON, if supplied
+       JSONObject json = null;
+       String contentType = req.getContentType();
+       if (contentType != null && contentType.indexOf(';') != -1)
+       {
+          contentType = contentType.substring(0, contentType.indexOf(';'));
+       }
+       if (MimetypeMap.MIMETYPE_JSON.equals(contentType))
+       {
+          JSONParser parser = new JSONParser();
+          try
+          {
+             json = (JSONObject)parser.parse(req.getContent().getContent());
+          }
+          catch (IOException io)
+          {
+             throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid JSON: " + io.getMessage());
+          }
+          catch (ParseException pe)
+          {
+             throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid JSON: " + pe.getMessage());
+          }
+       }
+       
+       
+       // Did they request it by node reference or site?
+       NodeRef nodeRef = null;
+       SiteInfo site = null;
+       TopicInfo topic = null;
+       PostInfo post = null;
+       
+       if (templateVars.containsKey("site"))
+       {
+          // Site, and optionally topic
+          String siteName = templateVars.get("site");
+          site = siteService.getSite(siteName);
+          if (site == null)
+          {
+             String error = "Could not find site: " + siteName;
+             throw new WebScriptException(Status.STATUS_NOT_FOUND, error);
+          }
+          
+          // Did they give a topic name too?
+          if (templateVars.containsKey("path"))
+          {
+             String name = templateVars.get("path");
+             topic = discussionService.getTopic(site.getShortName(), name);
+             
+             if (topic == null)
+             {
+                String error = "Could not find topic '" + name + "' for site '" + 
+                               site.getShortName() + "'";
+                throw new WebScriptException(Status.STATUS_NOT_FOUND, error);
+             }
+             nodeRef = topic.getNodeRef();
+          }
+          else
+          {
+             // The NodeRef is the container (if it exists)
+             if (siteService.hasContainer(siteName, DiscussionServiceImpl.DISCUSSION_COMPONENT))
+             {
+                nodeRef = siteService.getContainer(siteName, DiscussionServiceImpl.DISCUSSION_COMPONENT);
+             }
+          }
+       }
+       else if (templateVars.containsKey("store_type") && 
+                templateVars.containsKey("store_id") &&
+                templateVars.containsKey("id"))
+       {
+          // NodeRef, normally Topic or Discussion
+          StoreRef store = new StoreRef(
+                templateVars.get("store_type"),
+                templateVars.get("store_id"));
+          
+          nodeRef = new NodeRef(store, templateVars.get("id"));
+          if (! nodeService.exists(nodeRef))
+          {
+             String error = "Could not find node: " + nodeRef;
+             throw new WebScriptException(Status.STATUS_NOT_FOUND, error);
+          }
+          
+          // Try to build the appropriate object for it
+          Pair<TopicInfo,PostInfo> objects = discussionService.getForNodeRef(nodeRef);
+          if (objects != null)
+          {
+             topic = objects.getFirst();
+             post = objects.getSecond();
+          }
+          
+          // See if it's actually attached to a site
+          if (topic != null)
+          {
+             NodeRef container = topic.getContainerNodeRef();
+             if (container != null)
+             {
+                NodeRef maybeSite = nodeService.getPrimaryParent(container).getParentRef();
+                if (maybeSite != null)
+                {
+                   // Try to make it a site, will return Null if it isn't one
+                   site = siteService.getSite(maybeSite);
+                }
+             }
+          }
+       }
+       else
+       {
+          String error = "Unsupported template parameters found";
+          throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+       }
+       
+       // Have the real work done
+       return executeImpl(site, nodeRef, topic, post, req, json, status, cache); 
+    }
+    
+    protected abstract Map<String, Object> executeImpl(SiteInfo site,
+          NodeRef nodeRef, TopicInfo topic, PostInfo post,
+          WebScriptRequest req, JSONObject json, Status status, Cache cache);
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostDelete.java
new file mode 100644
index 00000000000..68f3350b0c8
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostDelete.java
@@ -0,0 +1,125 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.discussion;
+
+import java.text.MessageFormat;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import org.alfresco.service.cmr.discussion.PostInfo;
+import org.alfresco.service.cmr.discussion.TopicInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the forum post deleting forum-post.delete webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class ForumPostDelete extends AbstractDiscussionWebScript
+{
+   private static final String MSG_NODE_MARKED_REMOVED = "forum-post.msg.marked.removed";
+   private static final String MSG_NODE_DELETED = "forum-post.msg.deleted";
+   private static final String DELETED_POST_TEXT = "[[deleted]]";
+   
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nodeRef,
+         TopicInfo topic, PostInfo post, WebScriptRequest req, JSONObject json,
+         Status status, Cache cache) 
+   {
+      final ResourceBundle rb = getResources();
+      
+      // Build the common model parts
+      Map<String, Object> model = buildCommonModel(site, topic, post, req);
+      
+      
+      // Are we deleting a topic, or a post in it?
+      String message = null;
+      if (post != null)
+      {
+         message = doDeletePost(topic, post, rb);
+      }
+      else if (topic != null)
+      {
+         message = doDeleteTopic(topic, site, req, json, rb);
+      }
+      else
+      {
+         String error = "Node was of the wrong type, only Topic and Post are supported";
+         throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+      }
+   
+      
+      // Finish the model and return
+      model.put("message", message);
+      return model;
+   }
+   
+   private String doDeleteTopic(TopicInfo topic, SiteInfo site, 
+         WebScriptRequest req, JSONObject json, ResourceBundle rb)
+   {
+      // Delete the topic, which removes all its posts too
+      discussionService.deleteTopic(topic);
+      
+      // Add an activity entry for this if it's site based
+      if (site != null)
+      {
+         addActivityEntry("post", "deleted", topic, null, site, req, json);
+      }
+      
+      // All done
+      String message = rb.getString(MSG_NODE_DELETED);
+      
+      return MessageFormat.format(message, topic.getNodeRef());
+   }
+   
+   /**
+    * We can't just delete posts with replies attached to them,
+    *  as that breaks the reply threading.
+    * For that reason, we mark deleted posts with a special
+    *  text contents.
+    * TODO If a post has no replies, then delete it fully
+    */
+   private String doDeletePost(TopicInfo topic, PostInfo post, ResourceBundle rb)
+   {
+      // Set the marker text and save
+      post.setTitle(DELETED_POST_TEXT);
+      post.setContents(DELETED_POST_TEXT);
+      discussionService.updatePost(post);
+      
+      // Note - we don't add activity feed entries for deleted posts
+      //        Only deleted whole topic qualify for that at the moment
+      
+      String message = rb.getString(MSG_NODE_MARKED_REMOVED);
+      return MessageFormat.format(message, post.getNodeRef());
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostGet.java
new file mode 100644
index 00000000000..03ee838c19a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostGet.java
@@ -0,0 +1,74 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.discussion;
+
+import java.util.Map;
+
+import org.alfresco.service.cmr.discussion.PostInfo;
+import org.alfresco.service.cmr.discussion.TopicInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the discussions page fetching forum-post.get webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class ForumPostGet extends AbstractDiscussionWebScript
+{
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nodeRef,
+         TopicInfo topic, PostInfo post, WebScriptRequest req, JSONObject json,
+         Status status, Cache cache) 
+   {
+      // Build the common model parts
+      Map<String, Object> model = buildCommonModel(site, topic, post, req);
+      
+      // Did they want just one post, or the whole of the topic?
+      if (post != null)
+      {
+         model.put(KEY_POSTDATA, renderPost(post, site));
+      }
+      else if (topic != null)
+      {
+         model.put(KEY_POSTDATA, renderTopic(topic, site));
+      }
+      else
+      {
+         String error = "Node was of the wrong type, only Topic and Post are supported";
+         throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+      }
+      
+      // All done
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostPut.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostPut.java
new file mode 100644
index 00000000000..1b53e97b16a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostPut.java
@@ -0,0 +1,140 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.discussion;
+
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.discussion.PostInfo;
+import org.alfresco.service.cmr.discussion.TopicInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the discussions page editing forum-post.put webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class ForumPostPut extends AbstractDiscussionWebScript
+{
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nodeRef,
+         TopicInfo topic, PostInfo post, WebScriptRequest req, JSONObject json,
+         Status status, Cache cache) 
+   {
+      // Build the common model parts
+      Map<String, Object> model = buildCommonModel(site, topic, post, req);
+      
+      // Did they want to change a reply or the whole topic?
+      if (post != null)
+      {
+         // Update the specified post
+         doUpdatePost(post, post.getTopic(), req, json);
+         
+         // Add the activity entry for the reply change
+         addActivityEntry("reply", "updated", post.getTopic(), post, site, req, json);
+         
+         // Build the JSON for just this post
+         model.put(KEY_POSTDATA, renderPost(post, site));
+      }
+      else if (topic != null)
+      {
+         // Update the primary post of the topic
+         post = discussionService.getPrimaryPost(topic);
+         if (post == null)
+         {
+            throw new WebScriptException(Status.STATUS_PRECONDITION_FAILED,
+                  "First (primary) post was missing from the topic, can't fetch");
+         }
+         doUpdatePost(post, topic, req, json);
+         
+         // Add the activity entry for the topic change
+         addActivityEntry("post", "updated", topic, null, site, req, json);
+         
+         // Build the JSON for the whole topic
+         model.put(KEY_POSTDATA, renderTopic(topic, site));
+      }
+      else
+      {
+         String error = "Node was of the wrong type, only Topic and Post are supported";
+         throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+      }
+      
+      // All done
+      return model;
+   }
+   
+   private void doUpdatePost(PostInfo post, TopicInfo topic, WebScriptRequest req, 
+         JSONObject json)
+   {
+       boolean updateTopic = false;
+      // Fetch the details from the JSON
+
+       // Update the titles on the post and it's topic
+      if (json.containsKey("title"))
+      {
+         String title = (String)json.get("title");
+         post.setTitle(title);
+         if (title.length() > 0)
+         {
+            updateTopic = true;
+            topic.setTitle(title);
+         }
+      }
+      
+      // Contents is on the post
+      if (json.containsKey("content"))
+      {
+         post.setContents((String)json.get("content"));
+      }
+      
+      // Tags are on the topic
+      if (json.containsKey("tags"))
+      {
+         topic.getTags().clear();
+         
+         List<String> tags = getTags(json);
+         if (tags != null)
+         {
+            topic.getTags().addAll(tags);
+         }
+         updateTopic = true;
+      }
+      
+      // Save the topic and the post
+      if (updateTopic == true) 
+      {
+          discussionService.updateTopic(topic);
+      }
+      discussionService.updatePost(post);
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostRepliesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostRepliesGet.java
new file mode 100644
index 00000000000..35718fc9343
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostRepliesGet.java
@@ -0,0 +1,111 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.discussion;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.discussion.PostInfo;
+import org.alfresco.service.cmr.discussion.PostWithReplies;
+import org.alfresco.service.cmr.discussion.TopicInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the discussions page creating forum-post-replies.get webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class ForumPostRepliesGet extends AbstractDiscussionWebScript
+{
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nodeRef,
+         TopicInfo topic, PostInfo post, WebScriptRequest req, JSONObject json,
+         Status status, Cache cache) 
+   {
+      // How many levels did they want?
+      int levels = 1;
+      String levelsS = req.getParameter("levels");
+      if (levelsS != null)
+      {
+         try
+         {
+            levels = Integer.parseInt(levelsS);
+         }
+         catch (NumberFormatException e)
+         {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Level depth parameter invalid");
+         }
+      }
+      
+      // Fetch the replies
+      PostWithReplies replies;
+      if (post != null)
+      {
+         replies = discussionService.listPostReplies(post, levels);
+      }
+      else if (topic != null)
+      {
+         replies = discussionService.listPostReplies(topic, levels);
+      }
+      else 
+      {
+         String error = "Node was of the wrong type, only Topic and Post are supported";
+         throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+      }
+      
+      // Build the common model parts
+      Map<String, Object> model = buildCommonModel(site, topic, post, req);
+      
+      // Build the JSON for the replies
+      model.put("data", renderReplies(replies, site).get("children"));  
+      
+      // All done
+      return model;
+   }
+   
+   private Map<String, Object> renderReplies(PostWithReplies replies, SiteInfo site)
+   {
+      Map<String, Object> reply = renderPost(replies.getPost(), site);
+      reply.put("childCount", replies.getReplies().size());
+      
+      List<Map<String,Object>> r = new ArrayList<Map<String,Object>>();
+      for (PostWithReplies child : replies.getReplies())
+      {
+         r.add(renderReplies(child, site));
+      }
+      reply.put("children", r);
+      
+      return reply;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostRepliesPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostRepliesPost.java
new file mode 100644
index 00000000000..a0d3e38247e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumPostRepliesPost.java
@@ -0,0 +1,117 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.discussion;
+
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.discussion.PostInfo;
+import org.alfresco.service.cmr.discussion.TopicInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the discussions page creating forum-post-replies.post webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class ForumPostRepliesPost extends AbstractDiscussionWebScript
+{
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nodeRef,
+         TopicInfo topic, PostInfo post, WebScriptRequest req, JSONObject json,
+         Status status, Cache cache) 
+   {
+      // If they're trying to create a reply to a topic, they actually
+      //  mean to create the reply on the primary post
+      if (post == null)
+      {
+         post = discussionService.getPrimaryPost(topic);
+         if (post == null)
+         {
+            throw new WebScriptException(Status.STATUS_PRECONDITION_FAILED,
+                  "First (primary) post was missing from the topic, can't fetch");
+         }
+      }
+      else if (topic == null)
+      {
+         String error = "Node was of the wrong type, only Topic and Post are supported";
+         throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+      }
+      
+      // Have the reply created
+      PostInfo reply = doCreatePost(post, topic, req, json);
+      
+      // Add the activity entry for the reply change
+      addActivityEntry("reply", "created", topic, reply, site, req, json);
+      
+      // Build the common model parts
+      Map<String, Object> model = buildCommonModel(site, topic, reply, req);
+      
+      // Build the JSON for the new reply post
+      model.put(KEY_POSTDATA, renderPost(reply, site));
+      
+      // All done
+      return model;
+   }
+   
+   private PostInfo doCreatePost(PostInfo post, TopicInfo topic, WebScriptRequest req, 
+         JSONObject json)
+   {
+      // Fetch the details from the JSON
+      String title = null;
+      if (json.containsKey("title"))
+      {
+         title = (String)json.get("title");
+      }
+      
+      String contents = null;
+      if (json.containsKey("content"))
+      {
+         contents = (String)json.get("content");
+      }
+         
+      
+      // Create the reply
+      PostInfo reply = discussionService.createReply(post, contents);
+      
+      // Set the title if needed (it normally isn't)
+      if (title != null && title.length() > 0)
+      {
+         nodeService.setProperty(reply.getNodeRef(), ContentModel.PROP_TITLE, title);
+         reply = discussionService.getPost(topic, reply.getSystemName());
+      }
+      
+      // All done
+      return reply;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicPost.java
new file mode 100644
index 00000000000..6bbe4394d76
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicPost.java
@@ -0,0 +1,110 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.discussion;
+
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.discussion.PostInfo;
+import org.alfresco.service.cmr.discussion.TopicInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the discussions page editing forum-posts.post webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class ForumTopicPost extends AbstractDiscussionWebScript
+{
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nodeRef,
+         TopicInfo topic, PostInfo post, WebScriptRequest req, JSONObject json,
+         Status status, Cache cache) 
+   {
+      // They shouldn't be adding to an existing Post or Topic
+      if (topic != null || post != null)
+      {
+         String error = "Can't create a new Topic inside an existing Topic or Post";
+         throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+      }
+      
+      
+      // Grab the details of the new Topic and Post
+      String title = "";
+      String contents = "";
+      if (json.containsKey("title"))
+      {
+         title = (String)json.get("title");
+      }
+      if (json.containsKey("content"))
+      {
+         contents = (String)json.get("content");
+      }
+      List<String> tags = getTags(json);
+      
+      
+      // Have the topic created
+      if (site != null)
+      {
+         topic = discussionService.createTopic(site.getShortName(), title);
+      }
+      else
+      {
+         topic = discussionService.createTopic(nodeRef, title);
+      }
+      if (tags != null && tags.size() > 0)
+      {
+         topic.getTags().clear();
+         topic.getTags().addAll(tags);
+         discussionService.updateTopic(topic);
+      }
+      
+      
+      // Have the primary post created
+      post = discussionService.createPost(topic, contents);
+      
+      
+      // Record the activity
+      addActivityEntry("post", "created", topic, post, site, req, json);
+      
+      
+      // Build the common model parts
+      Map<String, Object> model = buildCommonModel(site, topic, post, req);
+      
+      // Build the JSON for the whole topic
+      model.put(KEY_POSTDATA, renderTopic(topic, site));
+      
+      // All done
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsFilteredGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsFilteredGet.java
new file mode 100644
index 00000000000..a4e9c406495
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsFilteredGet.java
@@ -0,0 +1,414 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.discussion;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.alfresco.query.EmptyPagingResults;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.discussion.TopicInfoImpl;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.discussion.PostInfo;
+import org.alfresco.service.cmr.discussion.TopicInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.LimitBy;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.ResultSetRow;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.util.ISO9075;
+import org.alfresco.util.Pair;
+import org.alfresco.util.ScriptPagingDetails;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Gets topics matching the filters passed to it in the URL.
+ * 
+ * topics = 'mine' (searches for posts by the user) or 'all' (ignores the author in the search)
+ * history = days in the past to search
+ * resultSize = the number of topics returned in the results
+ * 
+ * @author Jamie Allison
+ */
+public class ForumTopicsFilteredGet extends AbstractDiscussionWebScript
+{
+   //Filter Defaults
+   protected static final String DEFAULT_TOPIC_AUTHOR = "mine";
+   protected static final int DEFAULT_TOPIC_LATEST_POST_DAYS_AGO = 1;
+   protected static final int DEFAULT_MAX_RESULTS = 10;
+
+   protected static final StoreRef SPACES_STORE = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
+
+   protected static final String SEARCH_QUERY = "TYPE:\"{http://www.alfresco.org/model/forum/1.0}post\""
+         + " AND PATH:\"/app:company_home/st:sites/%s/cm:discussions/*/*\""
+         + " AND @cm:created:[\"%s\" TO NOW]";
+
+   /** Spring-injected services */
+   private SearchService searchService;
+
+   /**
+    * Sets the searchService.
+    * 
+    * @param searchService SearchService
+    */
+   public void setSearchService(SearchService searchService)
+   {
+      this.searchService = searchService;
+   }
+
+   /**
+    * Overrides AbstractDiscussionWebScript to allow a null site
+    * 
+    * @param req WebScriptRequest
+    * @param status Status
+    * @param cache Cache
+    * 
+    * @return Map
+    */
+   @Override
+   protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache) 
+   {
+      Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+      if (templateVars == null)
+      {
+         String error = "No parameters supplied";
+         throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+      }
+
+      SiteInfo site = null;
+
+      if (templateVars.containsKey("site"))
+      {
+         // Site, and optionally topic
+         String siteName = templateVars.get("site");
+         site = siteService.getSite(siteName);
+         if (site == null)
+         {
+            String error = "Could not find site: " + siteName;
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, error);
+         }
+      }
+
+      // Have the real work done
+      return executeImpl(site, null, null, null, req, null, null, null); 
+   }
+
+   /**
+    * @param site SiteInfo
+    * @param nodeRef Not required. It is only included because it is overriding the parent class.
+    * @param topic Not required. It is only included because it is overriding the parent class.
+    * @param post Not required. It is only included because it is overriding the parent class.
+    * @param req WebScriptRequest
+    * @param status Not required. It is only included because it is overriding the parent class.
+    * @param cache Not required. It is only included because it is overriding the parent class.
+    * 
+    * @return Map
+    */
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nodeRef, TopicInfo topic,
+         PostInfo post, WebScriptRequest req, JSONObject json, Status status, Cache cache)
+   {
+      // They shouldn't be trying to list of an existing Post or Topic
+      if (topic != null || post != null)
+      {
+         String error = "Can't list Topics inside an existing Topic or Post";
+         throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+      }
+
+      // Set search filter to users topics or all topics
+      String pAuthor = req.getParameter("topics");
+      String author = DEFAULT_TOPIC_AUTHOR;
+      if (pAuthor != null)
+      {
+         author = pAuthor;  
+      }
+      // Set the number of days in the past to search from 
+      String pDaysAgo = req.getParameter("history");
+      int daysAgo = DEFAULT_TOPIC_LATEST_POST_DAYS_AGO;
+      if (pDaysAgo != null)
+      {
+         try
+         {
+            daysAgo = Integer.parseInt(pDaysAgo);
+         }
+         catch (NumberFormatException e)
+         {
+            //do nothing. history has already been preset to the default value.
+         }  
+      }
+      
+      // Get the complete search query
+      Pair<String, String> searchQuery = getSearchQuery(site, author, daysAgo);
+
+      // Get the filtered topics
+      PagingRequest paging = buildPagingRequest(req);
+      PagingResults<TopicInfo> topics = doSearch(searchQuery, false, paging);
+
+      // Build the common model parts
+      Map<String, Object> model = buildCommonModel(site, topic, post, req);
+
+      // Have the topics rendered
+      model.put("data", renderTopics(topics, paging, site));
+
+      // All done
+      return model;
+   }
+
+   /**
+    * Do the actual search
+    * 
+    * @param searchQuery Pair with query string in first and query language in second
+    * @param sortAscending boolean
+    * @param paging PagingRequest
+    */
+   protected PagingResults<TopicInfo> doSearch(Pair<String, String> searchQuery, boolean sortAscending, PagingRequest paging)
+   {
+      ResultSet resultSet = null;
+      PagingResults<TopicInfo> pagedResults = new EmptyPagingResults<TopicInfo>();
+
+      String sortOn = "@{http://www.alfresco.org/model/content/1.0}created";
+
+      // Setup the search parameters
+      SearchParameters sp = new SearchParameters();
+      sp.addStore(SPACES_STORE);
+      sp.setQuery(searchQuery.getFirst());
+      sp.setLanguage(searchQuery.getSecond());
+      sp.addSort(sortOn, sortAscending);
+      if (paging.getMaxItems() > 0)
+      {
+         //Multiply maxItems by 10.  This is to catch topics that have multiple replies and ensure that the maximum number of topics is shown.
+         sp.setLimit(paging.getMaxItems()*10);
+         sp.setLimitBy(LimitBy.FINAL_SIZE);
+      }
+      if (paging.getSkipCount() > 0)
+      {
+         sp.setSkipCount(paging.getSkipCount());
+      }
+
+      try
+      {
+         resultSet = searchService.query(sp);
+         pagedResults = wrap(resultSet, paging);
+      }
+      finally
+      {
+         try
+         {
+            resultSet.close();
+         }
+         catch(Exception e)
+         {
+            //do nothing
+         }
+      }
+
+      return pagedResults;
+   }
+
+   /**
+    * Build the search query from the passed in parameters and SEARCH_QUERY constant
+    * 
+    * @param site SiteInfo
+    * @param author String
+    * @param daysAgo int
+    * @return Pair with the query string in first and query language in second
+    */
+   protected Pair<String, String> getSearchQuery(SiteInfo site, String author, int daysAgo)
+   {
+      String search = String.format(SEARCH_QUERY,
+            (site != null ? "cm:" + ISO9075.encode(site.getShortName()) : "*"),
+            getDateXDaysAgo(daysAgo)
+      );
+
+      // If author equals 'mine' add cm:creator to the search query otherwise leave out
+      if(author.equals(DEFAULT_TOPIC_AUTHOR))
+      {
+         search += " AND @cm:creator:\"" + AuthenticationUtil.getFullyAuthenticatedUser() + "\"";
+      }
+
+      // Add the query string and language to the returned results
+      Pair<String, String> searchQuery = new Pair<String, String>(search, SearchService.LANGUAGE_FTS_ALFRESCO);
+
+      return searchQuery;
+   }
+
+   /**
+    * Get the date x days ago in the format 'yyyy-MM-dd'
+    * 
+    * @param daysAgo int
+    * @return String
+    */
+   protected String getDateXDaysAgo(int daysAgo)
+   {
+      Calendar calendar = Calendar.getInstance();
+      calendar.add(Calendar.DAY_OF_MONTH, (daysAgo * -1));
+      SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+      return sdf.format(calendar.getTime());
+   }
+
+   /**
+    * Builds up a listing Paging request, based on the arguments specified in the URL
+    *  
+    * @param req WebScriptRequest
+    * @return PagingRequest
+    */
+   @Override
+   protected PagingRequest buildPagingRequest(WebScriptRequest req)
+   {
+      // Grab the number of topics to return
+      String pResultSize = req.getParameter("resultSize");
+      int resultSize = DEFAULT_MAX_RESULTS;
+      if (pResultSize != null)
+      {
+         try
+         {
+            resultSize = Integer.parseInt(pResultSize);
+         }
+         catch (NumberFormatException e)
+         {
+            //do nothing. ResultSize has already been preset to the default value.
+         }  
+      }
+      return new ScriptPagingDetails(req, resultSize);
+   }
+
+   /**
+    * Wrap up search results as {@link TopicInfo} instances
+    * 
+    * @param finalResults ResultSet
+    * @param paging PagingRequest
+    */
+   protected PagingResults<TopicInfo> wrap(final ResultSet finalResults, PagingRequest paging)
+   {
+      int maxItems = paging.getMaxItems();
+      Comparator<TopicInfo> lastPostDesc = new Comparator<TopicInfo>()
+      {
+         @Override
+         public int compare(TopicInfo t1, TopicInfo t2)
+         {
+            Date t1LastPostDate = t1.getCreatedAt();
+            if(discussionService.getMostRecentPost(t1) != null)
+            {
+               t1LastPostDate = discussionService.getMostRecentPost(t1).getCreatedAt();
+            }
+
+            Date t2LastPostDate = t2.getCreatedAt();
+            if(discussionService.getMostRecentPost(t2) != null)
+            {
+               t2LastPostDate = discussionService.getMostRecentPost(t2).getCreatedAt();
+            }
+            return t2LastPostDate.compareTo(t1LastPostDate);
+         }
+      };
+
+      final Set<TopicInfo> topics = new TreeSet<TopicInfo>(lastPostDesc);
+
+      for (ResultSetRow row : finalResults)
+      {
+         Pair<TopicInfo, PostInfo> pair = discussionService.getForNodeRef(row.getNodeRef());
+         TopicInfo topic = pair.getFirst();
+         if(topic != null)
+         {
+            String path = nodeService.getPath(topic.getNodeRef()).toDisplayPath(nodeService, permissionService);
+            String site = path.split("/")[3];
+            TopicInfoImpl tii = (TopicInfoImpl)topic;
+            tii.setShortSiteName(site);
+            topics.add(tii);
+            
+            if(topics.size() >= maxItems)
+            {
+               break;
+            }
+         }
+      }
+      
+      // Wrap
+      return new PagingResults<TopicInfo>() 
+      {
+         @Override
+         public boolean hasMoreItems() 
+         {
+            try
+            {
+               return finalResults.hasMore();
+            }
+            catch(UnsupportedOperationException e)
+            {
+               // Not all search results support paging
+               return false;
+            }
+         }
+
+         @Override
+         public Pair<Integer, Integer> getTotalResultCount() 
+         {
+            int skipCount = 0;
+            int itemsRemainingAfterThisPage = 0;
+            try
+            {
+               skipCount = finalResults.getStart();
+            }
+            catch(UnsupportedOperationException e) {}
+            try
+            {
+               itemsRemainingAfterThisPage = finalResults.length();
+            }
+            catch(UnsupportedOperationException e) {}
+
+            final int totalItemsInUnpagedResultSet = skipCount + itemsRemainingAfterThisPage;
+            return new Pair<Integer, Integer>(totalItemsInUnpagedResultSet, totalItemsInUnpagedResultSet);
+         }
+
+         @Override
+         public List<TopicInfo> getPage() 
+         {
+            return new ArrayList<TopicInfo>(topics);
+         }
+
+         @Override
+         public String getQueryExecutionId() 
+         {
+            return null;
+         }
+      };
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsGet.java
new file mode 100644
index 00000000000..662e54f1c45
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsGet.java
@@ -0,0 +1,121 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.discussion;
+
+import java.util.Map;
+
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.service.cmr.discussion.PostInfo;
+import org.alfresco.service.cmr.discussion.TopicInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.surf.util.URLDecoder;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the discussions topics fetching forum-posts.get webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class ForumTopicsGet extends AbstractDiscussionWebScript
+{
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nodeRef,
+         TopicInfo topic, PostInfo post, WebScriptRequest req, JSONObject json,
+         Status status, Cache cache) 
+   {
+      // They shouldn't be trying to list of an existing Post or Topic
+      if (topic != null || post != null)
+      {
+         String error = "Can't list Topics inside an existing Topic or Post";
+         throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+      }
+      
+      // Do we need to list or search?
+      boolean tagSearch = false;
+      String tag = req.getParameter("tag");
+      if (tag != null && tag.length() > 0)
+      {
+         tagSearch = true;
+         
+         // Tags can be full unicode strings, so decode
+         tag = URLDecoder.decode(tag);
+      }
+      
+      // Get the topics
+      boolean oldestTopicsFirst = false;
+      PagingResults<TopicInfo> topics = null;
+      PagingRequest paging = buildPagingRequest(req);
+      if (tagSearch)
+      {
+         // Tag based is a search rather than a listing
+         if (site != null)
+         {
+            topics = discussionService.findTopics(site.getShortName(), null, tag, oldestTopicsFirst, paging);
+         }
+         else
+         {
+            topics = discussionService.findTopics(nodeRef, null, tag, oldestTopicsFirst, paging);
+         }
+      }
+      else
+      {
+         if (site != null)
+         {
+            topics = discussionService.listTopics(site.getShortName(), oldestTopicsFirst, paging);
+         }
+         else
+         {
+            topics = discussionService.listTopics(nodeRef, oldestTopicsFirst, buildPagingRequest(req));
+         }
+      }
+      
+      
+      // If they did a site based search, and the component hasn't
+      //  been created yet, use the site for the permissions checking
+      if (site != null && nodeRef == null)
+      {
+         nodeRef = site.getNodeRef();
+      }
+      
+      
+      // Build the common model parts
+      Map<String, Object> model = buildCommonModel(site, topic, post, req);
+      model.put("forum", nodeRef);
+      
+      // Have the topics rendered
+      model.put("data", renderTopics(topics, paging, site));
+      
+      // All done
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsHotGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsHotGet.java
new file mode 100644
index 00000000000..579bf91a50f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsHotGet.java
@@ -0,0 +1,118 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.discussion;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.service.cmr.discussion.PostInfo;
+import org.alfresco.service.cmr.discussion.TopicInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.util.Pair;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the discussions topics fetching forum-posts-hot.get webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class ForumTopicsHotGet extends AbstractDiscussionWebScript
+{
+   protected static final int RECENT_POSTS_PERIOD_DAYS = 30;
+   protected static final long ONE_DAY_MS = 24*60*60*1000;
+   
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nodeRef,
+         TopicInfo topic, PostInfo post, WebScriptRequest req, JSONObject json,
+         Status status, Cache cache) 
+   {
+      // They shouldn't be trying to list of an existing Post or Topic
+      if (topic != null || post != null)
+      {
+         String error = "Can't list Topics inside an existing Topic or Post";
+         throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+      }
+      
+      // Grab the date range to search over
+      String numDaysS = req.getParameter("numdays");
+      int numDays = RECENT_POSTS_PERIOD_DAYS;
+      if (numDaysS != null)
+      {
+         numDays = Integer.parseInt(numDaysS);  
+      }
+      
+      Date now = new Date();
+      Date since = new Date(now.getTime() - numDays*ONE_DAY_MS);
+      
+      // Get the topics with recent replies
+      PagingResults<Pair<TopicInfo,Integer>> topicsAndCounts = null;
+      PagingRequest paging = buildPagingRequest(req);
+      if (site != null)
+      {
+         topicsAndCounts = discussionService.listHotTopics(site.getShortName(), since, paging);
+      }
+      else
+      {
+         topicsAndCounts = discussionService.listHotTopics(nodeRef, since, paging);
+      }
+      
+      // For this, we actually only need the topics, not their counts too
+      List<TopicInfo> topics = new ArrayList<TopicInfo>();
+      for (Pair<TopicInfo,Integer> tc : topicsAndCounts.getPage())
+      {
+         topics.add(tc.getFirst());
+      }
+      
+      
+      // If they did a site based search, and the component hasn't
+      //  been created yet, use the site for the permissions checking
+      if (site != null && nodeRef == null)
+      {
+         nodeRef = site.getNodeRef();
+      }
+      
+      
+      // Build the common model parts
+      Map<String, Object> model = buildCommonModel(site, topic, post, req);
+      model.put("forum", nodeRef);
+      
+      // Have the topics rendered
+      model.put("data", renderTopics(topics, topicsAndCounts.getTotalResultCount(), paging, site));
+      
+      // All done
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsMineGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsMineGet.java
new file mode 100644
index 00000000000..175b49042a2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsMineGet.java
@@ -0,0 +1,97 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.discussion;
+
+import java.util.Map;
+
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.discussion.PostInfo;
+import org.alfresco.service.cmr.discussion.TopicInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the discussions topics fetching forum-posts-mine.get webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class ForumTopicsMineGet extends AbstractDiscussionWebScript
+{
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nodeRef,
+         TopicInfo topic, PostInfo post, WebScriptRequest req, JSONObject json,
+         Status status, Cache cache) 
+   {
+      // They shouldn't be trying to list of an existing Post or Topic
+      if (topic != null || post != null)
+      {
+         String error = "Can't list Topics inside an existing Topic or Post";
+         throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+      }
+      
+      // Grab the current user to list for
+      String username = AuthenticationUtil.getFullyAuthenticatedUser();
+      
+      // Get the topics for the user, oldest first
+      PagingResults<TopicInfo> topics = null;
+      PagingRequest paging = buildPagingRequest(req);
+      if (site != null)
+      {
+         topics = discussionService.listTopics(site.getShortName(), username, true, paging);
+      }
+      else
+      {
+         topics = discussionService.listTopics(nodeRef, username, true, paging);
+      }
+      
+      
+      // If they did a site based search, and the component hasn't
+      //  been created yet, use the site for the permissions checking
+      if (site != null && nodeRef == null)
+      {
+         nodeRef = site.getNodeRef();
+      }
+      
+      
+      // Build the common model parts
+      Map<String, Object> model = buildCommonModel(site, topic, post, req);
+      model.put("forum", nodeRef);
+      
+      // Have the topics rendered
+      model.put("data", renderTopics(topics, paging, site));
+      
+      // All done
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsRecentGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsRecentGet.java
new file mode 100644
index 00000000000..b9ea4a644df
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsRecentGet.java
@@ -0,0 +1,109 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.discussion;
+
+import java.util.Date;
+import java.util.Map;
+
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.service.cmr.discussion.PostInfo;
+import org.alfresco.service.cmr.discussion.TopicInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the discussions topics fetching forum-posts-new.get webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class ForumTopicsRecentGet extends AbstractDiscussionWebScript
+{
+   protected static final int RECENT_SEARCH_PERIOD_DAYS = 7;
+   protected static final long ONE_DAY_MS = 24*60*60*1000;
+   
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, NodeRef nodeRef,
+         TopicInfo topic, PostInfo post, WebScriptRequest req, JSONObject json,
+         Status status, Cache cache) 
+   {
+      // They shouldn't be trying to list of an existing Post or Topic
+      if (topic != null || post != null)
+      {
+         String error = "Can't list Topics inside an existing Topic or Post";
+         throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+      }
+      
+      // Grab the date range to search over
+      String numDaysS = req.getParameter("numdays");
+      int numDays = RECENT_SEARCH_PERIOD_DAYS;
+      if (numDaysS != null)
+      {
+         numDays = Integer.parseInt(numDaysS);  
+      }
+      
+      Date now = new Date();
+      Date from = new Date(now.getTime() - numDays*ONE_DAY_MS);
+      Date to = new Date(now.getTime() + ONE_DAY_MS);
+      
+      // Get the recent topics, newest first
+      PagingResults<TopicInfo> topics = null;
+      PagingRequest paging = buildPagingRequest(req);
+      if (site != null)
+      {
+         topics = discussionService.listTopics(site.getShortName(), from, to, false, paging);
+      }
+      else
+      {
+         topics = discussionService.listTopics(nodeRef, from, to, false, paging);
+      }
+      
+      
+      // If they did a site based search, and the component hasn't
+      //  been created yet, use the site for the permissions checking
+      if (site != null && nodeRef == null)
+      {
+         nodeRef = site.getNodeRef();
+      }
+      
+      
+      // Build the common model parts
+      Map<String, Object> model = buildCommonModel(site, topic, post, req);
+      model.put("forum", nodeRef);
+      
+      // Have the topics rendered
+      model.put("data", renderTopics(topics, paging, site));
+      
+      // All done
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/doclink/AbstractDocLink.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/doclink/AbstractDocLink.java
new file mode 100644
index 00000000000..c52009827c0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/doclink/AbstractDocLink.java
@@ -0,0 +1,196 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.doclink;
+
+import java.io.StringWriter;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.service.cmr.repository.DocumentLinkService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.util.ParameterCheck;
+import org.alfresco.util.PropertyCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.json.JSONWriter;
+
+/**
+ * This class contains common code for doclink webscripts controllers
+ * 
+ * @author Ana Bozianu
+ * @since 5.1
+ */
+public abstract class AbstractDocLink extends DeclarativeWebScript
+{
+    private static String PARAM_STORE_TYPE = "store_type";
+    private static String PARAM_STORE_ID = "store_id";
+    private static String PARAM_ID = "id";
+    private static String PARAM_SITE = "site";
+    private static String PARAM_CONTAINER = "container";
+    private static String PARAM_PATH = "path";
+
+    private static final String ACTIVITY_TOOL = "documentLinkService";
+
+    protected NodeService nodeService;
+    protected SiteService siteService;
+    protected DocumentLinkService documentLinkService;
+    protected ActivityService activityService;
+    protected ServiceRegistry serviceRegistry;
+
+    private static Log logger = LogFactory.getLog(AbstractDocLink.class);
+
+    protected NodeRef parseNodeRefFromTemplateArgs(Map<String, String> templateVars)
+    {
+        if (templateVars == null)
+        {
+            return null;
+        }
+
+        String storeTypeArg = templateVars.get(PARAM_STORE_TYPE);
+        String storeIdArg = templateVars.get(PARAM_STORE_ID);
+        String idArg = templateVars.get(PARAM_ID);
+
+        if (storeTypeArg != null)
+        {
+            ParameterCheck.mandatoryString("storeTypeArg", storeTypeArg);
+            ParameterCheck.mandatoryString("storeIdArg", storeIdArg);
+            ParameterCheck.mandatoryString("idArg", idArg);
+
+            /*
+             * NodeRef based request
+             * <url>URL_BASE/{store_type}/{store_id}/{id}</url>
+             */
+            return new NodeRef(storeTypeArg, storeIdArg, idArg);
+        }
+        else
+        {
+            String siteArg = templateVars.get(PARAM_SITE);
+            String containerArg = templateVars.get(PARAM_CONTAINER);
+            String pathArg = templateVars.get(PARAM_PATH);
+
+            if (siteArg != null)
+            {
+                ParameterCheck.mandatoryString("siteArg", siteArg);
+                ParameterCheck.mandatoryString("containerArg", containerArg);
+
+                /*
+                 * Site based request <url>URL_BASE/{site}/{container}</url> or
+                 * <url>URL_BASE/{site}/{container}/{path}</url>
+                 */
+                SiteInfo site = siteService.getSite(siteArg);
+                PropertyCheck.mandatory(this, "site", site);
+
+                NodeRef node = siteService.getContainer(site.getShortName(), containerArg);
+                if (node == null)
+                {
+                    throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid 'container' variable");
+                }
+
+                if (pathArg != null)
+                {
+                    // <url>URL_BASE/{site}/{container}/{path}</url>
+                    StringTokenizer st = new StringTokenizer(pathArg, "/");
+                    while (st.hasMoreTokens())
+                    {
+                        String childName = st.nextToken();
+                        node = nodeService.getChildByName(node, ContentModel.ASSOC_CONTAINS, childName);
+                        if (node == null)
+                        {
+                            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid 'path' variable");
+                        }
+                    }
+                }
+
+                return node;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Generates an activity entry for the link
+     */
+
+    protected void addActivityEntry(String activityType, String title, String nodeRef, String site)
+    {
+       try
+       {
+          StringWriter activityJson = new StringWriter();
+          JSONWriter activity = new JSONWriter(activityJson);
+          activity.startObject();
+          activity.writeValue("title", title);
+          activity.writeValue("nodeRef", nodeRef);
+          activity.writeValue("page", "document-details?nodeRef=" + nodeRef);
+          activity.endObject();
+
+          activityService.postActivity(
+                activityType,
+                site,
+                ACTIVITY_TOOL,
+                activityJson.toString());
+       }
+       catch (Exception e)
+       {
+          // Warn, but carry on
+          logger.warn("Error adding link event to activities feed", e);
+       }
+    }
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+
+    public void setDocumentLinkService(DocumentLinkService documentLinkService)
+    {
+        this.documentLinkService = documentLinkService;
+    }
+
+    public void setActivityService(ActivityService activityService)
+    {
+        this.activityService = activityService;
+    }
+
+    public void setServiceRegistry(ServiceRegistry serviceRegistry)
+    {
+        this.serviceRegistry = serviceRegistry;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/doclink/DocLinkPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/doclink/DocLinkPost.java
new file mode 100644
index 00000000000..9b53f9bef11
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/doclink/DocLinkPost.java
@@ -0,0 +1,192 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.doclink;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.activities.ActivityType;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.repo.web.scripts.WebScriptUtil;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.util.ParameterCheck;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.json.simple.parser.ParseException;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the doclink.post webscript doclink.post is a
+ * webscript for creating a link of a document within a target destination
+ * 
+ * @author Ana Bozianu
+ * @since 5.1
+ */
+public class DocLinkPost extends AbstractDocLink
+{
+    private static final String PARAM_DESTINATION_NODE = "destinationNodeRef";
+    private static final String PARAM_MULTIPLE_FILES = "multipleFiles";
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        NodeRef sourceNodeRef = null;
+        NodeRef destinationNodeRef = null;
+
+        /* Parse the template vars */
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        sourceNodeRef = parseNodeRefFromTemplateArgs(templateVars);
+
+        /* Parse the JSON content */
+        JSONObject json = null;
+        String contentType = req.getContentType();
+        if (contentType != null && contentType.indexOf(';') != -1)
+        {
+            contentType = contentType.substring(0, contentType.indexOf(';'));
+        }
+        if (MimetypeMap.MIMETYPE_JSON.equals(contentType))
+        {
+            try
+            {
+                json = (JSONObject) JSONValue.parseWithException(req.getContent().getContent());
+            }
+            catch (IOException io)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid JSON: " + io.getMessage());
+            }
+            catch (ParseException pe)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid JSON: " + pe.getMessage());
+            }
+        }
+        else
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "invalid request content type");
+        }
+
+        /* Parse the destination NodeRef parameter */
+        String destinationNodeParam = (String) json.get(PARAM_DESTINATION_NODE);
+        ParameterCheck.mandatoryString("destinationNodeParam", destinationNodeParam);
+        destinationNodeRef = WebScriptUtil.resolveNodeReference(destinationNodeParam, serviceRegistry.getNodeLocatorService());
+
+        List<NodeRef> nodeRefs = new ArrayList<NodeRef>();
+        if (json.containsKey(PARAM_MULTIPLE_FILES))
+        {
+            JSONArray multipleFiles = (JSONArray) json.get(PARAM_MULTIPLE_FILES);
+            for (int i = 0; i < multipleFiles.size(); i++)
+            {
+                String nodeRefString = (String) multipleFiles.get(i);
+                if (nodeRefString != null)
+                {
+                    try
+                    {
+                        NodeRef nodeRefToCreateLink = new NodeRef(nodeRefString);
+                        nodeRefs.add(nodeRefToCreateLink);
+                    }
+                    catch (AlfrescoRuntimeException ex)
+                    {
+                        throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid Arguments: " + ex.getMessage());
+                    }
+                }
+            }
+        }
+        else
+        {
+            nodeRefs.add(sourceNodeRef);
+        }
+
+        // getSite for destination folder
+        String siteName = siteService.getSiteShortName(destinationNodeRef);
+
+        List<String> linksResults = new ArrayList<String>();
+        NodeRef linkNodeRef = null;
+        int successCount = 0;
+        int failureCount = 0;
+
+        if (nodeRefs != null && nodeRefs.size() > 0)
+        {
+            for (NodeRef sourceNode : nodeRefs)
+            {
+                /* Create link */
+                linkNodeRef = createLink(destinationNodeRef, sourceNode);
+
+                if (linkNodeRef != null)
+                {
+                    String sourceName = (String) nodeService.getProperty(sourceNode, ContentModel.PROP_NAME);
+                    if (siteName != null)
+                    {
+                        addActivityEntry(ActivityType.DOCLINK_CREATED, sourceName, sourceNode.toString(), siteName);
+                    }
+                    linksResults.add(linkNodeRef.toString());
+                    successCount++;
+                }
+            }
+        }
+
+        failureCount = nodeRefs.size() - successCount;
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("results", linksResults);
+        model.put("successCount", successCount);
+        model.put("failureCount", failureCount);
+        model.put("overallSuccess", failureCount == 0);
+        return model;
+    }
+
+    /**
+     * Create link for sourceNodeRef in destinationNodeRef location
+     * 
+     * @param destinationNodeRef
+     * @param sourceNodeRef
+     * @return
+     */
+    private NodeRef createLink(NodeRef destinationNodeRef, NodeRef sourceNodeRef)
+    {
+        NodeRef linkNodeRef = null;
+        try
+        {
+            linkNodeRef = documentLinkService.createDocumentLink(sourceNodeRef, destinationNodeRef);
+        }
+        catch (IllegalArgumentException ex)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid Arguments: " + ex.getMessage());
+        }
+        catch (AccessDeniedException e)
+        {
+            throw new WebScriptException(Status.STATUS_FORBIDDEN, "You don't have permission to perform this operation");
+        }
+        return linkNodeRef;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/doclink/DocLinksDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/doclink/DocLinksDelete.java
new file mode 100644
index 00000000000..78ddc4e3392
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/doclink/DocLinksDelete.java
@@ -0,0 +1,96 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.doclink;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.service.cmr.repository.DeleteLinksStatusReport;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the doclink.post webscript doclink.post is a
+ * webscript for creating a link of a document within a target destination
+ * 
+ * @author Ana Bozianu
+ * @since 5.1
+ */
+public class DocLinksDelete extends AbstractDocLink
+{
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        NodeRef destinationNodeRef = null;
+
+        /* Parse the template vars */
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        destinationNodeRef = parseNodeRefFromTemplateArgs(templateVars);
+
+        /* Delete links */
+        DeleteLinksStatusReport report;
+        try
+        {
+            report = documentLinkService.deleteLinksToDocument(destinationNodeRef);
+        }
+        catch (IllegalArgumentException ex)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid Arguments: " + ex.getMessage());
+        }
+        catch (AccessDeniedException e)
+        {
+            throw new WebScriptException(Status.STATUS_FORBIDDEN, "You don't have permission to perform this operation");
+        }
+
+        /* Build response */
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("total_count", report.getTotalLinksFoundCount());
+        model.put("deleted_count", report.getDeletedLinksCount());
+
+        Map<String, String> errorDetails = new HashMap<String, String>();
+        Iterator<Entry<NodeRef, Throwable>> it = report.getErrorDetails().entrySet().iterator();
+        while (it.hasNext())
+        {
+            Map.Entry<NodeRef, Throwable> pair = it.next();
+
+            Throwable th = pair.getValue();
+
+            errorDetails.put(pair.getKey().toString(), th.getMessage());
+        }
+
+        model.put("error_details", errorDetails);
+        
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/AbstractDownloadWebscript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/AbstractDownloadWebscript.java
new file mode 100644
index 00000000000..bfb4214b7ba
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/AbstractDownloadWebscript.java
@@ -0,0 +1,64 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.download;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.download.DownloadService;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+
+/**
+ * Base class for download related webscripts.
+ *
+ * @author Alex Miller
+ */
+abstract class AbstractDownloadWebscript extends DeclarativeWebScript
+{
+    // Shared dependencies
+    protected DownloadService downloadService;
+    
+    public void setDownloadService(DownloadService downloadSerivce)
+    {
+        this.downloadService = downloadSerivce;
+    }
+    
+    /**
+     * Helper method to embed error informaion in a map.
+     */
+    protected Map<String,Object> buildError(String message)
+    {
+       HashMap<String, Object> result = new HashMap<String, Object>();
+       result.put("error", message);
+       
+       HashMap<String, Object> model = new HashMap<String, Object>();
+       model.put("error", message);
+       model.put("result", result);
+       
+       return model;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/DownloadDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/DownloadDelete.java
new file mode 100644
index 00000000000..66078391545
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/DownloadDelete.java
@@ -0,0 +1,89 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.download;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript for canceling a download.
+ *
+ * @author Alex Miller
+ */
+public class DownloadDelete extends AbstractDownloadWebscript
+{
+
+    protected NodeService nodeService;
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        if (templateVars == null)
+        {
+           String error = "No parameters supplied";
+           throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+        }
+
+        if (! ( templateVars.containsKey("store_type") 
+                && templateVars.containsKey("store_id")
+                && templateVars.containsKey("node_id")) )
+        {
+            String error = "Missing template variables (store_type, store_id or node_id).";
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+        }
+        
+        StoreRef store = new StoreRef(templateVars.get("store_type"), templateVars.get("store_id"));
+        NodeRef nodeRef = new NodeRef(store, templateVars.get("node_id"));
+        if (! nodeService.exists(nodeRef))
+        {
+            String error = "Could not find node: " + nodeRef;
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, error);
+        }
+        
+        downloadService.cancelDownload(nodeRef);
+        
+        status.setCode(HttpServletResponse.SC_OK);
+        
+        return new HashMap<String, Object>();
+        
+    }
+
+    public void setNodeService(NodeService nodeSerivce)
+    {
+        this.nodeService = nodeSerivce;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/DownloadPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/DownloadPost.java
new file mode 100644
index 00000000000..de6b47ccf94
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/DownloadPost.java
@@ -0,0 +1,109 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.download;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Web script for creating a new download.
+ *
+ * @author Alex Miller
+ */
+public class DownloadPost extends AbstractDownloadWebscript
+{
+    @Override
+    protected Map<String,Object> executeImpl(WebScriptRequest req, Status status, Cache cache) {
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        if (templateVars == null)
+        {
+            String error = "No parameters supplied";
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+        }
+        
+        
+        // Parse the JSON, if supplied
+        JSONArray json = null;
+        String contentType = req.getContentType();
+        if (contentType != null && contentType.indexOf(';') != -1)
+        {
+           contentType = contentType.substring(0, contentType.indexOf(';'));
+        }
+        
+        List<NodeRef> nodes = new LinkedList<NodeRef>();
+        if (MimetypeMap.MIMETYPE_JSON.equals(contentType))
+        {
+           JSONParser parser = new JSONParser();
+           try
+           {
+              json = (JSONArray)parser.parse(req.getContent().getContent());
+              for (int i = 0 ; i < json.size() ; i++)
+              {
+                JSONObject obj = (JSONObject)json.get(i);
+                String nodeRefString = (String)obj.get("nodeRef");
+                if (nodeRefString != null) 
+                {
+                    nodes.add(new NodeRef(nodeRefString));
+                }
+              }
+           }
+           catch (IOException io)
+           {
+               throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR, "Unexpected IOException", io);
+           }
+           catch (org.json.simple.parser.ParseException je)
+           {
+               throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Unexpected ParseException", je);
+           }
+        }
+        
+        if (nodes.size() <= 0) 
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "No nodeRefs provided");
+        }
+        
+        NodeRef downloadNode = downloadService.createDownload(nodes.toArray(new NodeRef[nodes.size()]), true);
+        
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("downloadNodeRef", downloadNode);
+
+        return model;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/DownloadStatusGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/DownloadStatusGet.java
new file mode 100644
index 00000000000..78951258df7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/download/DownloadStatusGet.java
@@ -0,0 +1,88 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.download;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.download.DownloadStatus;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript for retrieving the status of a download.
+ *
+ * @author Alex Miller
+ */
+public class DownloadStatusGet extends AbstractDownloadWebscript
+{
+
+    protected NodeService nodeService;
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        if (templateVars == null)
+        {
+           String error = "No parameters supplied";
+           throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+        }
+
+        if (! ( templateVars.containsKey("store_type") 
+                && templateVars.containsKey("store_id")
+                && templateVars.containsKey("node_id")) )
+        {
+            String error = "Missing template variables (store_type, store_id or node_id).";
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+        }
+        
+        StoreRef store = new StoreRef(templateVars.get("store_type"), templateVars.get("store_id"));
+        NodeRef nodeRef = new NodeRef(store, templateVars.get("node_id"));
+        if (! nodeService.exists(nodeRef))
+        {
+            String error = "Could not find node: " + nodeRef;
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, error);
+        }
+        
+        DownloadStatus downloadStatus = downloadService.getDownloadStatus(nodeRef);
+        
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("downloadStatus", downloadStatus);
+        return result;
+        
+    }
+
+    public void setNodeService(NodeService nodeSerivce)
+    {
+        this.nodeService = nodeSerivce;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/AbstractSolrFacetConfigAdminWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/AbstractSolrFacetConfigAdminWebScript.java
new file mode 100644
index 00000000000..6d70623d648
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/AbstractSolrFacetConfigAdminWebScript.java
@@ -0,0 +1,295 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.facet;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.search.impl.solr.facet.SolrFacetModel;
+import org.alfresco.repo.search.impl.solr.facet.SolrFacetProperties.CustomProperties;
+import org.alfresco.repo.search.impl.solr.facet.SolrFacetService;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is an abstract base class for the various web script controllers
+ * in the SolrFacetService.
+ * 
+ * @author Jamal Kaabi-Mofrad
+ */
+public abstract class AbstractSolrFacetConfigAdminWebScript extends DeclarativeWebScript
+{
+    private static final Log logger = LogFactory.getLog(AbstractSolrFacetConfigAdminWebScript.class);
+    
+    protected static final String PARAM_FILTER_ID = "filterID";
+    protected static final String PARAM_FACET_QNAME = "facetQName";
+    protected static final String PARAM_DISPLAY_NAME = "displayName";
+    protected static final String PARAM_DISPLAY_CONTROL = "displayControl";
+    protected static final String PARAM_MAX_FILTERS = "maxFilters";
+    protected static final String PARAM_HIT_THRESHOLD = "hitThreshold";
+    protected static final String PARAM_MIN_FILTER_VALUE_LENGTH = "minFilterValueLength";
+    protected static final String PARAM_SORT_BY = "sortBy";
+    protected static final String PARAM_SCOPE = "scope";
+    protected static final String PARAM_SCOPED_SITES = "scopedSites";
+    protected static final String PARAM_INDEX = "index";
+    protected static final String PARAM_IS_ENABLED = "isEnabled";
+    protected static final String PARAM_CUSTOM_PROPERTIES = "customProperties";
+    protected static final String CUSTOM_PARAM_NAME = "name";
+    protected static final String CUSTOM_PARAM_VALUE = "value";
+
+    // The pattern is equivalent to the pattern defined in the forms-runtime.js
+    protected static final Pattern FILTER_ID_PATTERN = Pattern.compile("([\"\\*\\\\\\>\\<\\?\\/\\:\\|]+)|([\\.]?[\\.]+$)");
+
+    protected SolrFacetService facetService;
+    protected NamespaceService namespaceService;
+
+    /**
+     * @param facetService the facetService to set
+     */
+    public void setFacetService(SolrFacetService facetService)
+    {
+        this.facetService = facetService;
+    }
+
+    /**
+     * @param namespaceService the namespaceService to set
+     */
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+
+    @Override
+    protected Map<String, Object> executeImpl(final WebScriptRequest req, final Status status, final Cache cache)
+    {
+        validateCurrentUser();
+
+        return unprotectedExecuteImpl(req, status, cache);
+    }
+
+    protected void validateCurrentUser()
+    {
+        String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
+        // check the current user access rights
+        if (!facetService.isSearchAdmin(currentUser))
+        {
+            throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "Access denied.");
+        }
+    }
+
+    protected <T> T getValue(Class<T> clazz, Object value, T defaultValue) throws JSONException
+    {
+        if (JSONObject.NULL.equals(value))
+        {
+            return defaultValue;
+        }
+
+        try
+        {
+            return clazz.cast(value);
+        }
+        catch (Exception ex)
+        {
+            throw new JSONException("JSONObject[" + value +"] is not an instance of [" + clazz.getName() +"]");
+        }
+    }
+
+    protected Set<CustomProperties> getCustomProperties(JSONObject customPropsJsonObj) throws JSONException
+    {
+        if (customPropsJsonObj == null)
+        {
+            return null;
+        }
+        JSONArray keys = customPropsJsonObj.names();
+        if (keys == null)
+        {
+            return Collections.emptySet();
+        }
+
+        Set<CustomProperties> customProps = new HashSet<>(keys.length());
+        for (int i = 0, length = keys.length(); i < length; i++)
+        {
+            JSONObject jsonObj = customPropsJsonObj.getJSONObject((String) keys.get(i));
+
+            QName name = resolveToQName(getValue(String.class, jsonObj.opt(CUSTOM_PARAM_NAME), null));
+            validateMandatoryCustomProps(name, CUSTOM_PARAM_NAME);
+            
+            Serializable value = null;
+            Object customPropValue = jsonObj.opt(CUSTOM_PARAM_VALUE);
+            validateMandatoryCustomProps(customPropValue, CUSTOM_PARAM_VALUE);
+            
+            if(customPropValue instanceof JSONArray)
+            {
+                JSONArray array = (JSONArray) customPropValue;
+                ArrayList<Serializable> list = new ArrayList<>(array.length());
+                for(int j = 0; j < array.length(); j++)
+                {
+                    list.add(getSerializableValue(array.get(j)));
+                }
+                value = list;
+            }
+            else
+            {
+                value = getSerializableValue(customPropValue);
+            }
+            
+           customProps.add(new CustomProperties(name, value));
+        }
+
+        if (logger.isDebugEnabled() && customProps.size() > 0)
+        {
+            logger.debug("Processed custom properties:" + customProps);
+        }
+
+        return customProps;
+    }
+
+    protected Set<String> getScopedSites(JSONArray scopedSitesJsonArray) throws JSONException
+    {
+        if (scopedSitesJsonArray == null)
+        {
+            return null;
+        }
+
+        Set<String> scopedSites = new HashSet<String>(scopedSitesJsonArray.length());
+        for (int i = 0, length = scopedSitesJsonArray.length(); i < length; i++)
+        {
+            String site = scopedSitesJsonArray.getString(i);
+            scopedSites.add(site);
+        }
+        return scopedSites;
+    }
+
+    private void validateMandatoryCustomProps(Object obj, String paramName) throws JSONException
+    {
+        if (obj == null)
+        {
+            throw new JSONException("Invalid JSONObject in the Custom Properties JSON. [" + paramName + "] cannot be null.");
+        }
+
+    }
+
+    protected void validateFilterID(String filterID)
+    {
+        Matcher matcher = FILTER_ID_PATTERN.matcher(filterID);
+        if (matcher.find())
+        {
+            throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST,
+                        "Invalid Filter Id. The characters \" * \\ < > ? / : | are not allowed. The Filter Id cannot end with a dot.");
+        }
+    }
+
+    private Serializable getSerializableValue(Object object) throws JSONException
+    {
+        if (!(object instanceof Serializable))
+        {
+            throw new JSONException("Invalid value in the Custom Properties JSON. [" + object + "] must be an instance of Serializable.");
+        }
+        return (Serializable) object;
+    }
+
+    private QName resolveToQName(String qnameStr) throws JSONException
+    {
+        QName typeQName = null;
+        if (qnameStr == null)
+        {
+            return typeQName;
+        }
+        if(qnameStr.charAt(0) == QName.NAMESPACE_BEGIN && qnameStr.indexOf("solrfacetcustomproperty") < 0)
+        {
+            throw new JSONException("Invalid name in the Custom Properties JSON. Namespace URL must be [" + SolrFacetModel.SOLR_FACET_CUSTOM_PROPERTY_URL + "]");
+        }
+        else if(qnameStr.charAt(0) == QName.NAMESPACE_BEGIN)
+        {
+            typeQName = QName.createQName(qnameStr);
+        }
+        else
+        {
+            typeQName = QName.createQName(SolrFacetModel.SOLR_FACET_CUSTOM_PROPERTY_URL, qnameStr);
+        }
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Resolved facet's custom property name [" + qnameStr + "] into [" + typeQName + "]");
+        }
+        return typeQName;
+    }
+    
+    /**
+     * Retrieves the named parameter as an integer, if the parameter is not present the default value is returned.
+     * 
+     * @param req The WebScript request
+     * @param paramName The name of parameter to look for.
+     * @param defaultValue The default value that should be returned if parameter is not present in request or is negative.
+     * @return The request parameter or default value
+     * @throws WebScriptException if the named parameter cannot be converted to int (HTTP rsp 400).
+     */
+    protected int getNonNegativeIntParameter(WebScriptRequest req, String paramName, int defaultValue)
+    {
+        final String paramString = req.getParameter(paramName);
+        
+        final int result;
+        
+        if (paramString != null)
+        {
+            try
+            {
+                final int paramInt = Integer.valueOf(paramString);
+                
+                if   (paramInt < 0) { result = defaultValue; }
+                else                { result = paramInt; }
+            }
+            catch (NumberFormatException e) 
+            {
+                throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
+            }
+        }
+        else { result = defaultValue; }
+        
+        return result;
+    }
+    
+    abstract protected Map<String, Object> unprotectedExecuteImpl(WebScriptRequest req, Status status, Cache cache);
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java
new file mode 100644
index 00000000000..cc5c3977bbb
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java
@@ -0,0 +1,252 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.facet;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.alfresco.repo.i18n.StaticMessageLookup;
+import org.alfresco.repo.search.impl.solr.facet.SolrFacetService.SyntheticPropertyDefinition;
+import org.alfresco.repo.web.scripts.facet.FacetablePropertyFTL.FacetablePropertyFTLComparator;
+import org.alfresco.repo.web.scripts.facet.FacetablePropertyFTL.SpecialFacetablePropertyFTL;
+import org.alfresco.repo.web.scripts.facet.FacetablePropertyFTL.StandardFacetablePropertyFTL;
+import org.alfresco.repo.web.scripts.facet.FacetablePropertyFTL.SyntheticFacetablePropertyFTL;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.i18n.MessageLookup;
+import org.alfresco.service.namespace.NamespaceException;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ModelUtil;
+import org.alfresco.util.ScriptPagingDetails;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the "facetable-properties.get" web script.
+ * 
+ * @since 5.0
+ * @author Neil Mc Erlean
+ */
+public class FacetablePropertiesGet extends AbstractSolrFacetConfigAdminWebScript
+{
+    public static final Log logger = LogFactory.getLog(FacetablePropertiesGet.class);
+    
+    public static final String PROPERTIES_KEY = "properties";
+    
+    private static final String QUERY_PARAM_MAX_ITEMS                  = "maxItems";
+    private static final String QUERY_PARAM_SKIP_COUNT                 = "skipCount";
+    private static final int    DEFAULT_MAX_ITEMS_PER_PAGE = 50;
+    
+    private static final String TEMPLATE_VAR_CLASSNAME = "classname";
+    private static final String QUERY_PARAM_NAMESPACE  = "nsp";
+    private static final String QUERY_PARAM_LOCALE  = "locale";
+    
+    private NamespaceService  namespaceService;
+    private MessageLookup     messageLookup;
+    
+    public FacetablePropertiesGet() { messageLookup = new StaticMessageLookup(); }
+    
+    public void setNamespaceService (NamespaceService service)  { this.namespaceService  = service; }
+    
+    @Override protected Map<String, Object> executeImpl(final WebScriptRequest req, final Status status, final Cache cache)
+    {
+        // Allow all authenticated users in
+        return unprotectedExecuteImpl(req, status, cache);
+    }
+    
+    @Override protected Map<String, Object> unprotectedExecuteImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        // We use any provided locale to localise some elements of the webscript response, but not all.
+        final String userLocaleString = req.getParameter(QUERY_PARAM_LOCALE);
+        final Locale userLocale = (userLocaleString == null) ? Locale.getDefault() : new Locale(userLocaleString);
+        
+        // There are multiple defined URIs for this REST endpoint. Some define a "classname" template var.
+        final Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        final String contentClassName = templateVars.get(TEMPLATE_VAR_CLASSNAME);
+        
+        final QName contentClassQName;
+        try
+        {
+            contentClassQName = contentClassName == null ? null : QName.createQName(contentClassName, namespaceService);
+        } catch (NamespaceException e)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Unrecognised classname: " + contentClassName, e);
+        }
+        
+        // Build an FTL model of facetable properties - this includes normal Alfresco properties and also
+        // 'synthetic' properties like size and mimetype. See below for more details.
+        final Map<String, Object> model = new HashMap<>();
+        
+        final SortedSet<FacetablePropertyFTL<?>> facetableProperties;
+        if (contentClassQName == null)
+        {
+            facetableProperties = toFacetablePropertyModel(facetService.getFacetableProperties(), userLocale);
+            
+            final List<SyntheticPropertyDefinition> facetableSyntheticProperties = facetService.getFacetableSyntheticProperties();
+            facetableProperties.addAll(toFacetablePropertyModel_(facetableSyntheticProperties, userLocale));
+        }
+        else
+        {
+            facetableProperties = toFacetablePropertyModel(facetService.getFacetableProperties(contentClassQName), userLocale);
+            
+            final List<SyntheticPropertyDefinition> facetableSyntheticProperties = facetService.getFacetableSyntheticProperties(contentClassQName);
+            facetableProperties.addAll(toFacetablePropertyModel_(facetableSyntheticProperties, userLocale));
+        }
+        
+        // Always add some hard-coded facetable "properties"
+        // Note: TAG and SITE are Solr specials and don’t have namespaces
+        facetableProperties.add(new SpecialFacetablePropertyFTL("TAG", "Tag"));
+        facetableProperties.add(new SpecialFacetablePropertyFTL("SITE", "Site"));
+        
+        // The webscript allows for some further filtering of results:
+        List<ResultFilter> filters = new ArrayList<>();
+        
+        // Filter by property QName namespace:
+        final String namespaceFilter = req.getParameter(QUERY_PARAM_NAMESPACE);
+        if (namespaceFilter != null)
+        {
+            filters.add(new ResultFilter()
+            {
+                @Override public boolean filter(FacetablePropertyFTL<?> facetableProperty)
+                {
+                    final QName propQName = facetableProperty.getQname();
+                    Collection<String> prefixes = namespaceService.getPrefixes(propQName.getNamespaceURI());
+                    return prefixes.contains(namespaceFilter);
+                }
+            });
+        }
+        
+        List<FacetablePropertyFTL<?>> filteredFacetableProperties = filter(facetableProperties, filters);
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Retrieved " + facetableProperties.size() + " available facets; filtered to " + filteredFacetableProperties.size());
+        }
+        
+        // Create paging
+        ScriptPagingDetails paging = new ScriptPagingDetails(
+                                             getNonNegativeIntParameter(req, QUERY_PARAM_MAX_ITEMS, DEFAULT_MAX_ITEMS_PER_PAGE),
+                                             getNonNegativeIntParameter(req, QUERY_PARAM_SKIP_COUNT, 0));
+        
+        model.put(PROPERTIES_KEY, ModelUtil.page(filteredFacetableProperties, paging));
+        model.put("paging", ModelUtil.buildPaging(paging));
+        
+        return model;
+    }
+    
+    /**
+     * This type defines the (inclusion) filtering of {@link FacetablePropertyFTL property data}
+     * in the response to this webscript.
+     */
+    private static interface ResultFilter
+    {
+        /** @return {@code true} if the specified property should be included. */
+        public boolean filter(FacetablePropertyFTL<?> facetableProperty);
+    }
+    
+    /**
+     * This method returns a new List instance containing only those {@link FacetablePropertyFTL property data}
+     * that satisfy all {@link ResultFilter filters}.
+     */
+    private List<FacetablePropertyFTL<?>> filter(Collection<FacetablePropertyFTL<?>> propsData, List<ResultFilter> filters)
+    {
+        final List<FacetablePropertyFTL<?>> filteredResult = new ArrayList<>();
+        
+        for (FacetablePropertyFTL<?> prop : propsData)
+        {
+            boolean passedAllFilters = true;
+            for (ResultFilter filter : filters)
+            {
+                if (!filter.filter(prop)) { passedAllFilters = false; }
+            }
+            if (passedAllFilters) { filteredResult.add(prop); }
+        }
+        
+        return filteredResult;
+    }
+    
+    /** This method returns a {@link FacetablePropertyFTL} for the specified {@link PropertyDefinition}. */
+    private FacetablePropertyFTL<?> toFacetablePropertyModel(PropertyDefinition propDef, Locale locale)
+    {
+        String title = propDef.getTitle(messageLookup, locale);
+        return new StandardFacetablePropertyFTL(propDef, title);
+    }
+    
+    /** This method returns a {@link FacetablePropertyFTL} for the specified {@link SyntheticPropertyDefinition}. */
+    private FacetablePropertyFTL<?> toFacetablePropertyModel(SyntheticPropertyDefinition propDef,
+                                                          Locale locale)
+    {
+        // Note the hard-coded assumption here that all synthetic properties are defined only
+        // within the cm:content property type. This code is not designed to be extended.
+        // TODO We may need to make this code extensible in a future release.
+        //
+        // See e.g. content-model.properties for usage of this i18n key.
+        final String i18nKeyPrefix = "cm_contentmodel.property.cm_content.cm_content.";
+        final String localisedTitle = I18NUtil.getMessage(i18nKeyPrefix + propDef.syntheticPropertyName, locale);
+        
+        return new SyntheticFacetablePropertyFTL(propDef.containingPropertyDef,
+                                                 localisedTitle,
+                                                 propDef.syntheticPropertyName,
+                                                 propDef.dataTypeDefinition);
+    }
+    
+    private SortedSet<FacetablePropertyFTL<?>> toFacetablePropertyModel(Collection<PropertyDefinition> propDefs,
+                                                                     Locale locale)
+    {
+        SortedSet<FacetablePropertyFTL<?>> result = new TreeSet<>(new FacetablePropertyFTLComparator());
+        for (PropertyDefinition propDef : propDefs)
+        {
+            result.add(toFacetablePropertyModel(propDef, locale));
+        }
+        return result;
+    }
+    
+    // Note: the trailing underscore in this method name is to prevent a clash between this method and the
+    // one that takes a Collection<PropertyDefinition> as Java's type erasure means that both methods would have the
+    // same signature, without the trailing underscore.
+    private SortedSet<FacetablePropertyFTL<?>> toFacetablePropertyModel_(Collection<SyntheticPropertyDefinition> propDefs,
+                                                                      Locale locale)
+    {
+        SortedSet<FacetablePropertyFTL<?>> result = new TreeSet<>(new FacetablePropertyFTLComparator());
+        for (SyntheticPropertyDefinition propDef : propDefs)
+        {
+            result.add(toFacetablePropertyModel(propDef, locale));
+        }
+        return result;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/FacetablePropertyFTL.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/FacetablePropertyFTL.java
new file mode 100644
index 00000000000..981b1722d0e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/FacetablePropertyFTL.java
@@ -0,0 +1,371 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.facet;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * This interface defines a simple POJO/DTO for use in the FTL model and rendering in the JSON API.
+ * @param <T>a type to ensure that the comparator is implemented in a typesafe way.
+ * @since 5.0
+ */
+public abstract class FacetablePropertyFTL<T> implements Comparable<T>
+{
+    /** The localised title for this property. */
+    protected final String localisedTitle;
+    
+    public FacetablePropertyFTL(String localisedTitle) { this.localisedTitle = localisedTitle; }
+    
+    // We use "*Qname*" (small 'n') in these accessors to make the FTL less ambiguous.
+    public abstract String getShortQname();
+    public abstract QName  getQname();
+    public abstract String getDisplayName();
+    public abstract QName  getContainerClassType();
+    public abstract QName  getDataType();
+    public abstract QName  getModelQname();
+    
+    public String getTitle() { return localisedTitle; }
+    
+    /** This class represents a normal Alfresco property which is facetable. */
+    public static class StandardFacetablePropertyFTL extends FacetablePropertyFTL<StandardFacetablePropertyFTL>
+    {
+        /** The Alfresco property definition which declares this facetable property. */
+        protected final PropertyDefinition propDef;
+        
+        /** A display name for this property. */
+        protected final String displayName;
+        
+        /**
+         * @param propDef The {@link PropertyDefinition}.
+         * @param localisedTitle The localised title for this property e.g. "Titre".
+         */
+        public StandardFacetablePropertyFTL(PropertyDefinition propDef, String localisedTitle)
+        {
+            super(localisedTitle);
+            
+            this.propDef        = propDef;
+            this.displayName    = getShortQname() + (localisedTitle == null ? "" : " (" + localisedTitle + ")");
+        }
+        
+        @Override public String getShortQname()         { return propDef.getName().getPrefixString(); }
+        
+        @Override public QName  getQname()              { return propDef.getName(); }
+        
+        @Override public String getDisplayName()        { return displayName; }
+        
+        @Override public QName  getContainerClassType() { return propDef.getContainerClass().getName(); }
+        
+        @Override public QName  getDataType()           { return propDef.getDataType().getName(); }
+        
+        @Override public QName  getModelQname()         { return propDef.getModel().getName(); }
+        
+        @Override public boolean equals(Object obj)
+        {
+            if (this == obj)                  { return true; }
+            if (obj == null)                  { return false; }
+            if (getClass() != obj.getClass()) { return false; }
+            
+            StandardFacetablePropertyFTL other = (StandardFacetablePropertyFTL) obj;
+            if (displayName == null)
+            {
+                if (other.displayName != null) { return false; }
+            } else if (!displayName.equals(other.displayName)) { return false; }
+            if (localisedTitle == null)
+            {
+                if (other.localisedTitle != null)
+                    return false;
+            } else if (!localisedTitle.equals(other.localisedTitle))
+                return false;
+            if (propDef == null)
+            {
+                if (other.propDef != null)
+                    return false;
+            } else if (!propDef.equals(other.propDef))
+                return false;
+            return true;
+        }
+        
+        @Override public int hashCode()
+        {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + ((displayName == null) ? 0 : displayName.hashCode());
+            result = prime * result + ((localisedTitle == null) ? 0 : localisedTitle.hashCode());
+            result = prime * result + ((propDef == null) ? 0 : propDef.hashCode());
+            return result;
+        }
+        
+        @Override public int compareTo(StandardFacetablePropertyFTL that)
+        {
+            final int modelComparison = this.propDef.getModel().getName().compareTo(that.propDef.getModel().getName());
+            final int classComparison = this.propDef.getContainerClass().getName().compareTo(that.propDef.getContainerClass().getName());
+            final int propComparison  = this.propDef.getName().compareTo(that.propDef.getName());
+            
+            final int result;
+            if      (modelComparison != 0) { result = modelComparison; }
+            else if (classComparison != 0) { result = classComparison; }
+            else                           { result = propComparison; }
+            
+            return result;
+        }
+    }
+    
+    /**
+     * This class represents a facetable property, which is not actually an Alfresco
+     * content property, but is closely associated with one.
+     * Examples are the {@code size} and {@code MIME type} fields within the {@code cm:content} property type.
+     */
+    public static class SyntheticFacetablePropertyFTL extends FacetablePropertyFTL<SyntheticFacetablePropertyFTL>
+    {
+        /** The PropertyDefinition which 'contains' this synthetic property. */
+        private final PropertyDefinition containingPropDef;
+        
+        /** This is the name of the synthetic property e.g. "size". Not localised. */
+        private final String syntheticPropertyName;
+        
+        /** The type of this synthetic data property. */
+        private final QName datatype;
+        
+        private final String displayName;
+        
+        /**
+         * @param containingPropDef     The {@link PropertyDefinition}.
+         * @param localisedTitle        The localised title of this synthetic property e.g. "taille".
+         * @param syntheticPropertyName The synthetic property name e.g. "size".
+         * @param datatype              The datatype of the synthetic property.
+         */
+        public SyntheticFacetablePropertyFTL(PropertyDefinition containingPropDef,
+                                             String localisedTitle,
+                                             String syntheticPropertyName,
+                                             QName  datatype)
+        {
+            super(localisedTitle);
+            this.containingPropDef     = containingPropDef;
+            this.syntheticPropertyName = syntheticPropertyName;
+            this.datatype              = datatype;
+            this.displayName           = getShortQname() + (localisedTitle == null ? "" : " (" + localisedTitle + ")");
+        }
+        
+        @Override public String getShortQname()
+        {
+            return containingPropDef.getName().getPrefixString() + "." + this.syntheticPropertyName;
+        }
+        
+        @Override public QName getQname()
+        {
+            final QName containingPropQName = containingPropDef.getName();
+            return QName.createQName(containingPropQName.getNamespaceURI(),
+                                     containingPropQName.getLocalName() + "." + this.syntheticPropertyName);
+        }
+        
+        @Override public QName getDataType()           { return datatype; }
+        
+        @Override public QName getContainerClassType() { return containingPropDef.getContainerClass().getName(); };
+        
+        @Override public QName getModelQname()         { return containingPropDef.getModel().getName(); }
+        
+        @Override public String getDisplayName()       { return displayName; }
+        
+        @Override public int compareTo(SyntheticFacetablePropertyFTL that)
+        {
+            final int modelComparison = this.containingPropDef.getModel().getName().compareTo(that.containingPropDef.getModel().getName());
+            final int classComparison = this.containingPropDef.getContainerClass().getName().compareTo(that.containingPropDef.getContainerClass().getName());
+            final int propComparison  = this.containingPropDef.getName().compareTo(that.containingPropDef.getName());
+            final int displayNameComparison = this.displayName.compareTo(that.displayName);
+            
+            final int result;
+            if      (modelComparison != 0) { result = modelComparison; }
+            else if (classComparison != 0) { result = classComparison; }
+            else if (propComparison != 0)  { result = propComparison; }
+            else                           { result = displayNameComparison; }
+            
+            return result;
+        }
+        
+        @Override public int hashCode()
+        {
+            final int prime = 31;
+            int result = super.hashCode();
+            result = prime
+                    * result
+                    + ((containingPropDef == null) ? 0 : containingPropDef
+                            .hashCode());
+            result = prime * result
+                    + ((datatype == null) ? 0 : datatype.hashCode());
+            result = prime * result
+                    + ((displayName == null) ? 0 : displayName.hashCode());
+            result = prime
+                    * result
+                    + ((syntheticPropertyName == null) ? 0
+                            : syntheticPropertyName.hashCode());
+            return result;
+        }
+        
+        @Override public boolean equals(Object obj)
+        {
+            if (this == obj)
+                return true;
+            if (!super.equals(obj))
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            SyntheticFacetablePropertyFTL other = (SyntheticFacetablePropertyFTL) obj;
+            if (containingPropDef == null)
+            {
+                if (other.containingPropDef != null)
+                    return false;
+            } else if (!containingPropDef.equals(other.containingPropDef))
+                return false;
+            if (datatype == null)
+            {
+                if (other.datatype != null)
+                    return false;
+            } else if (!datatype.equals(other.datatype))
+                return false;
+            if (displayName == null)
+            {
+                if (other.displayName != null)
+                    return false;
+            } else if (!displayName.equals(other.displayName))
+                return false;
+            if (syntheticPropertyName == null)
+            {
+                if (other.syntheticPropertyName != null)
+                    return false;
+            } else if (!syntheticPropertyName
+                    .equals(other.syntheticPropertyName))
+                return false;
+            return true;
+        }
+    }
+    
+    /**
+     * This class represents a hard-coded facetable pseudo-property. It is not an Alfresco property
+     * and yet it is something that Alfresco and SOLR can use for facetting.
+     * Examples are the {@code TAG} and {@code SITE} facets.
+     */
+    public static class SpecialFacetablePropertyFTL extends FacetablePropertyFTL<SpecialFacetablePropertyFTL>
+    {
+        /** This is the name of the property e.g. "SITE". Not localised. */
+        private final String name;
+        
+        private final String displayName;
+
+        
+        /**
+         * @param localisedTitle        The localised title of this synthetic property e.g. "taille".
+         */
+        public SpecialFacetablePropertyFTL(String name, String localisedTitle)
+        {
+            super(localisedTitle);
+            this.name = name;
+            this.displayName = localisedTitle;
+        }
+
+        @Override public String getShortQname()        { return name; }
+        
+        @Override public QName getQname()              { return null; }
+        
+        @Override public QName getDataType()           { return null; }
+        
+        @Override public QName getContainerClassType() { return null; }
+        
+        @Override public QName getModelQname()         { return null; }
+        
+        @Override public String getDisplayName()       { return displayName; }
+        
+        @Override public int compareTo(SpecialFacetablePropertyFTL that)
+        {
+            return this.name.compareTo(that.name);
+        }
+        
+        @Override public int hashCode()
+        {
+            final int prime = 31;
+            int result = super.hashCode();
+            result = prime * result
+                    + ((displayName == null) ? 0 : displayName.hashCode());
+            result = prime * result + ((name == null) ? 0 : name.hashCode());
+            return result;
+        }
+        
+        @Override public boolean equals(Object obj)
+        {
+            if (this == obj)
+                return true;
+            if (!super.equals(obj))
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            SpecialFacetablePropertyFTL other = (SpecialFacetablePropertyFTL) obj;
+            if (displayName == null)
+            {
+                if (other.displayName != null)
+                    return false;
+            } else if (!displayName.equals(other.displayName))
+                return false;
+            if (name == null)
+            {
+                if (other.name != null)
+                    return false;
+            } else if (!name.equals(other.name))
+                return false;
+            return true;
+        }
+    }
+    
+    /**
+     * In order to give deterministic responses when getting facetable properties,
+     * all {@link FacetablePropertyFTL} instances are sorted. This comparator provides
+     * the sorting implementation.
+     */
+    public static class FacetablePropertyFTLComparator implements Comparator<FacetablePropertyFTL<?>>
+    {
+        /** Used when sorting two objects of different types. */
+        private final List<Class<?>> typeOrder = Arrays.asList(new Class<?>[] { SpecialFacetablePropertyFTL.class,
+                                                                                SyntheticFacetablePropertyFTL.class,
+                                                                                StandardFacetablePropertyFTL.class} );
+        
+        @SuppressWarnings({ "rawtypes", "unchecked" })
+        @Override public int compare(FacetablePropertyFTL left, FacetablePropertyFTL right)
+        {
+            // First of all sort by the class according to the list above.
+            if ( !left.getClass().equals(right.getClass())) { return typeOrder.indexOf(left.getClass()) -
+                                                                     typeOrder.indexOf(right.getClass()); }
+            else
+            {
+                // Otherwise we have two facetable properties of the same class.
+                return left.compareTo(right);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminDelete.java
new file mode 100644
index 00000000000..7b048648bbd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminDelete.java
@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.facet;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the "solr-facet-config-admin.delete" web script.
+ * 
+ * @author Jamal Kaabi-Mofrad
+ */
+public class SolrFacetConfigAdminDelete extends AbstractSolrFacetConfigAdminWebScript
+{
+    private static final Log logger = LogFactory.getLog(SolrFacetConfigAdminDelete.class);
+
+    @Override
+    protected Map<String, Object> unprotectedExecuteImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        // get the filterID parameter.
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String filterID = templateVars.get("filterID");
+
+        if (filterID == null)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Filter id not provided");
+        }
+        facetService.deleteFacet(filterID);
+
+        Map<String, Object> model = new HashMap<String, Object>(1);
+        model.put("success", true);
+
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Facet [" + filterID + "] has been deleted successfully");
+        }
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminGet.java
new file mode 100644
index 00000000000..91bf683b1dd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminGet.java
@@ -0,0 +1,86 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.facet;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.repo.search.impl.solr.facet.SolrFacetProperties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the "solr-facet-config-admin.get" web script.
+ * 
+ * @author Jamal Kaabi-Mofrad
+ */
+public class SolrFacetConfigAdminGet extends AbstractSolrFacetConfigAdminWebScript
+{
+    private static final Log logger = LogFactory.getLog(SolrFacetConfigAdminGet.class);
+
+    @Override
+    protected Map<String, Object> executeImpl(final WebScriptRequest req, final Status status, final Cache cache)
+    {
+        // Allow all authenticated users view the filters
+        return unprotectedExecuteImpl(req, status, cache);
+    }
+
+    @Override
+    protected Map<String, Object> unprotectedExecuteImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        // get the filterID parameter.
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String filterID = templateVars.get("filterID");
+
+        Map<String, Object> model = new HashMap<String, Object>(1);
+
+        if (filterID == null)
+        {
+            model.put("filters", facetService.getFacets());
+        }
+        else
+        {
+            SolrFacetProperties fp = facetService.getFacet(filterID);
+            if (fp == null)
+            {
+                throw new WebScriptException(Status.STATUS_NOT_FOUND, "Filter not found");
+            }
+            model.put("filter", fp);
+        }
+
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Retrieved all available facets: " + model.values());
+        }
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminPost.java
new file mode 100644
index 00000000000..31c6adf3f57
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminPost.java
@@ -0,0 +1,133 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.facet;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.repo.search.impl.solr.facet.FacetQNameUtils;
+import org.alfresco.repo.search.impl.solr.facet.SolrFacetProperties;
+import org.alfresco.repo.search.impl.solr.facet.SolrFacetProperties.CustomProperties;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the "solr-facet-config-admin.post" web scripts.
+ * 
+ * @author Jamal Kaabi-Mofrad
+ */
+public class SolrFacetConfigAdminPost extends AbstractSolrFacetConfigAdminWebScript
+{
+    private static final Log logger = LogFactory.getLog(SolrFacetConfigAdminPost.class);
+
+    @Override
+    protected Map<String, Object> unprotectedExecuteImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        try
+        {
+            SolrFacetProperties fp = parseRequestForFacetProperties(req);
+            facetService.createFacetNode(fp);
+
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Created facet node: " + fp);
+            }
+        }
+        catch (Throwable t)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not save the facet configuration.", t);
+        }
+
+        return new HashMap<>(); // Needs to be mutable.
+    }
+
+    private SolrFacetProperties parseRequestForFacetProperties(WebScriptRequest req)
+    {
+        JSONObject json = null;
+        try
+        {
+            json = new JSONObject(new JSONTokener(req.getContent().getContent()));
+
+            final String filterID = json.getString(PARAM_FILTER_ID);
+            validateFilterID(filterID);
+
+            final String facetQNameStr = json.getString(PARAM_FACET_QNAME);
+            // Note: we're using this util class here because we need to be able to deal with
+            //       qnames without a URI e.g. "{}SITE" and *not* have them default to the cm: namespace
+            //       which happens with the 'normal' Alfresco QName code.
+            final QName facetQName = FacetQNameUtils.createQName(facetQNameStr, namespaceService);
+            final String displayName = json.getString(PARAM_DISPLAY_NAME);
+            final String displayControl = json.getString(PARAM_DISPLAY_CONTROL);
+            final int maxFilters = json.getInt(PARAM_MAX_FILTERS);
+            final int hitThreshold = json.getInt(PARAM_HIT_THRESHOLD);
+            final int minFilterValueLength = json.getInt(PARAM_MIN_FILTER_VALUE_LENGTH);
+            final String sortBy = json.getString(PARAM_SORT_BY);
+            // Optional params
+            final String scope = getValue(String.class, json.opt(PARAM_SCOPE), "ALL");
+            final boolean isEnabled = getValue(Boolean.class, json.opt(PARAM_IS_ENABLED), false);
+            JSONArray scopedSitesJsonArray = getValue(JSONArray.class, json.opt(PARAM_SCOPED_SITES), null);
+            final Set<String> scopedSites = getScopedSites(scopedSitesJsonArray);
+            final JSONObject customPropJsonObj = getValue(JSONObject.class, json.opt(PARAM_CUSTOM_PROPERTIES), null);
+            final Set<CustomProperties> customProps = getCustomProperties(customPropJsonObj);
+
+            SolrFacetProperties fp = new SolrFacetProperties.Builder()
+                        .filterID(filterID)
+                        .facetQName(facetQName)
+                        .displayName(displayName)
+                        .displayControl(displayControl)
+                        .maxFilters(maxFilters)
+                        .hitThreshold(hitThreshold)
+                        .minFilterValueLength(minFilterValueLength)
+                        .sortBy(sortBy)
+                        .scope(scope)
+                        .isEnabled(isEnabled)
+                        .scopedSites(scopedSites)
+                        .customProperties(customProps).build();
+            return fp;
+        }
+        catch (IOException e)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not read content from req.", e);
+        }
+        catch (JSONException e)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from req.", e);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminPut.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminPut.java
new file mode 100644
index 00000000000..2c2dd2f3cd7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminPut.java
@@ -0,0 +1,190 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.facet;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.repo.search.impl.solr.facet.Exceptions.UnrecognisedFacetId;
+import org.alfresco.repo.search.impl.solr.facet.FacetQNameUtils;
+import org.alfresco.repo.search.impl.solr.facet.SolrFacetProperties.CustomProperties;
+import org.alfresco.repo.search.impl.solr.facet.SolrFacetProperties;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.collections.CollectionUtils;
+import org.alfresco.util.collections.Function;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the "solr-facet-config-admin.put" web scripts.
+ * 
+ * @author Jamal Kaabi-Mofrad
+ * @author Neil Mc Erlean
+ * @since 5.0
+ */
+public class SolrFacetConfigAdminPut extends AbstractSolrFacetConfigAdminWebScript
+{
+    private static final Log logger = LogFactory.getLog(SolrFacetConfigAdminPost.class);
+
+    protected static final String PARAM_RELATIVE_POS  = "relativePos";
+    protected static final String URL_PARAM_FILTER_ID = "filterID";
+
+    @Override
+    protected Map<String, Object> unprotectedExecuteImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        final String relativePosString = req.getParameter(PARAM_RELATIVE_POS);
+        try
+        {
+            if (relativePosString != null)
+            {
+                // This is a request to 'move' (reposition) the specified facet.
+                
+                // We need the relative position that the facet will move.
+                final int relativePos;
+                
+                try { relativePos = Integer.parseInt(relativePosString); }
+                catch (NumberFormatException nfe)
+                {
+                    throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                                                 "Cannot move facet as could not parse relative position: '" + relativePosString + "'");
+                }
+                
+                // And we need the filterID for the facet we're moving.
+                final Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+                String filterId = templateVars.get(URL_PARAM_FILTER_ID);
+                
+                if (filterId == null) { throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Illegal null filterId"); }
+                
+                // So let's move the filter...
+                try
+                {
+                    // Get the current sequence of filter IDs.
+                    List<SolrFacetProperties> facets = facetService.getFacets();
+                    List<String> facetIDs = CollectionUtils.transform(facets, new Function<SolrFacetProperties, String>()
+                            {
+                                @Override public String apply(SolrFacetProperties value)
+                                {
+                                    return value.getFilterID();
+                                }
+                            });
+                    
+                    List<String> reorderedIDs = CollectionUtils.moveRight(relativePos, filterId, facetIDs);
+                    
+                    this.facetService.reorderFacets(reorderedIDs);
+                    
+                    if (logger.isDebugEnabled()) { logger.debug("Moved facet " + filterId + " to relative position: " + relativePos); }
+                }
+                catch (UnrecognisedFacetId ufi)
+                {
+                    throw new WebScriptException(Status.STATUS_NOT_FOUND, "Unrecognised filter ID: " + ufi.getFacetId());
+                }
+            }
+            // TODO Allow for simultaneous move and update of facet.
+            else
+            {
+                SolrFacetProperties fp = parseRequestForFacetProperties(req);
+                facetService.updateFacet(fp);
+                
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Updated facet node: " + fp);
+                }
+            }
+        }
+        catch (Throwable t)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not update the facet configuration.", t);
+        }
+
+        Map<String, Object> model = new HashMap<String, Object>(1);
+        return model;
+    }
+
+    private SolrFacetProperties parseRequestForFacetProperties(WebScriptRequest req)
+    {
+        JSONObject json = null;
+        try
+        {
+            json = new JSONObject(new JSONTokener(req.getContent().getContent()));
+
+            final String filterID = json.getString(PARAM_FILTER_ID); // Must exist
+
+            final String facetQNameStr = getValue(String.class, json.opt(PARAM_FACET_QNAME), null);
+            
+            // Note that in resolving the QName string here, we expect there to be some facet QNames which are not
+            // really QNames. These are SOLR/SearchService 'specials', examples being "SITE" or "TAG".
+            // These will be resolved here to a QName with no namespace.
+            final QName facetQName = (facetQNameStr == null) ? null : FacetQNameUtils.createQName(facetQNameStr, namespaceService);
+            final String displayName = getValue(String.class, json.opt(PARAM_DISPLAY_NAME), null);
+            final String displayControl = getValue(String.class, json.opt(PARAM_DISPLAY_CONTROL), null);
+            final int maxFilters = getValue(Integer.class, json.opt(PARAM_MAX_FILTERS), -1);
+            final int hitThreshold = getValue(Integer.class, json.opt(PARAM_HIT_THRESHOLD), -1);
+            final int minFilterValueLength = getValue(Integer.class, json.opt(PARAM_MIN_FILTER_VALUE_LENGTH), -1);
+            final String sortBy = getValue(String.class, json.opt(PARAM_SORT_BY), null);
+            final String scope = getValue(String.class, json.opt(PARAM_SCOPE), null);
+            final Boolean isEnabled = getValue(Boolean.class, json.opt(PARAM_IS_ENABLED), null);
+            JSONArray scopedSitesJsonArray = getValue(JSONArray.class, json.opt(PARAM_SCOPED_SITES), null);
+            final Set<String> scopedSites = getScopedSites(scopedSitesJsonArray);
+            final JSONObject customPropJsonObj = getValue(JSONObject.class, json.opt(PARAM_CUSTOM_PROPERTIES), null);
+            final Set<CustomProperties> customProps = getCustomProperties(customPropJsonObj);
+
+            SolrFacetProperties fp = new SolrFacetProperties.Builder()
+                        .filterID(filterID)
+                        .facetQName(facetQName)
+                        .displayName(displayName)
+                        .displayControl(displayControl)
+                        .maxFilters(maxFilters)
+                        .hitThreshold(hitThreshold)
+                        .minFilterValueLength(minFilterValueLength)
+                        .sortBy(sortBy)
+                        .scope(scope)
+                        .isEnabled(isEnabled)
+                        .scopedSites(scopedSites)
+                        .customProperties(customProps).build();
+            return fp;
+        }
+        catch (IOException e)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not read content from req.", e);
+        }
+        catch (JSONException e)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from req.", e);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/groups/package-info.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/groups/package-info.java
new file mode 100644
index 00000000000..89ba167429b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/groups/package-info.java
@@ -0,0 +1,33 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+/**
+ * Provides a unit tests for the web scripts of the REST bindings of the groups service.
+ * @since 3.1
+ */
+@PackageMarker
+package org.alfresco.repo.web.scripts.groups;
+import org.alfresco.util.PackageMarker;
+
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/invitation/InvitationDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/invitation/InvitationDelete.java
new file mode 100644
index 00000000000..e196c9f05e3
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/invitation/InvitationDelete.java
@@ -0,0 +1,159 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.invitation;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.service.cmr.invitation.Invitation;
+import org.alfresco.service.cmr.invitation.InvitationExceptionForbidden;
+import org.alfresco.service.cmr.invitation.InvitationService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Cancel invitation for a web site; This is the controller for the
+ * org/alfresco/repository/site/invitation/invitation.delete.desc.xml webscript
+ */
+public class InvitationDelete extends DeclarativeWebScript
+{
+    // services
+    private InvitationService invitationService;
+    private SiteService siteService;
+
+    public void setInvitationService(InvitationService invitationService)
+    {
+        this.invitationService = invitationService;
+    }
+
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        final String siteShortName = templateVars.get("shortname");
+        final String invitationId = templateVars.get("invitationId");
+        validateParameters(siteShortName, invitationId);
+
+        try
+        {
+            // MNT-9905 Pending Invites created by one site manager aren't visible to other site managers
+            String currentUser = AuthenticationUtil.getRunAsUser();
+
+            if (siteShortName != null && (SiteModel.SITE_MANAGER).equals(siteService.getMembersRole(siteShortName, currentUser)))
+            {
+
+                RunAsWork<Void> runAsSystem = new RunAsWork<Void>()
+                {
+                    @Override
+                    public Void doWork() throws Exception
+                    {
+                        checkAndCancelTheInvitation(invitationId, siteShortName);
+                        return null;
+                    }
+                };
+
+                AuthenticationUtil.runAs(runAsSystem, AuthenticationUtil.getSystemUserName());
+            }
+            else
+            {
+                checkAndCancelTheInvitation(invitationId, siteShortName);
+            }
+        }
+        catch (InvitationExceptionForbidden fe)
+        {
+            throw new WebScriptException(Status.STATUS_FORBIDDEN, "Unable to cancel workflow", fe);
+        }
+        catch (AccessDeniedException ade)
+        {
+            throw new WebScriptException(Status.STATUS_FORBIDDEN, "Unable to cancel workflow", ade);
+        }
+
+        return model;
+    }
+
+    private void validateParameters(String siteShortName, String invitationId)
+    {
+        if ((invitationId == null) || (invitationId.length() == 0))
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid invitation id provided");
+        }
+
+        SiteInfo site = siteService.getSite(siteShortName);
+        if (site == null)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Invalid site id provided");
+        }
+    }
+
+    protected void checkAndCancelTheInvitation(final String invId, String siteShortName)
+    {
+        Invitation invitation = null;
+        try
+        {
+            invitation = invitationService.getInvitation(invId);
+        }
+        catch (org.alfresco.service.cmr.invitation.InvitationExceptionNotFound ienf)
+        {
+            throwInvitationNotFoundException(invId, siteShortName);
+        }
+        if (invitation == null)
+        {
+            throwInvitationNotFoundException(invId, siteShortName);
+        }
+
+        // check that this invitation really belongs to the specified siteShortName
+        if (invitation != null && invitation.getResourceName() != null && !siteShortName.equals(invitation.getResourceName()))
+        {
+            throw new WebScriptException(Status.STATUS_FORBIDDEN, "Unable to cancel workflow");
+        }
+
+        invitationService.cancel(invId);
+    }
+
+    protected void throwInvitationNotFoundException(final String invId, String siteShortName)
+    {
+        throw new WebScriptException(Status.STATUS_NOT_FOUND,
+                "The invitation :" + invId + " for web site :" + siteShortName + ", does not exist.");
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/invitation/package-info.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/invitation/package-info.java
new file mode 100644
index 00000000000..cd343a1d717
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/invitation/package-info.java
@@ -0,0 +1,33 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+/**
+ * Provides a unit tests for the web scripts of the REST bindings of the invitation service.
+ * @since 3.1
+ */
+@PackageMarker
+package org.alfresco.repo.web.scripts.invitation;
+import org.alfresco.util.PackageMarker;
+
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/invite/InviteByTicket.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/invite/InviteByTicket.java
new file mode 100644
index 00000000000..cf563cb3f78
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/invite/InviteByTicket.java
@@ -0,0 +1,234 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.invite;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.invitation.WorkflowModelNominatedInvitation;
+import org.alfresco.repo.invitation.site.InviteInfo;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.template.TemplateNode;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.invitation.Invitation;
+import org.alfresco.service.cmr.invitation.InvitationExceptionNotFound;
+import org.alfresco.service.cmr.invitation.InvitationService;
+import org.alfresco.service.cmr.invitation.NominatedInvitation;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.workflow.WorkflowTask;
+import org.alfresco.service.cmr.workflow.WorkflowTaskQuery;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Web Script which returns invite information given an inviteId and inviteTicket.
+ * 
+ * Note: This Web Script is accessible without authentication.
+ * 
+ * @author glen dot johnson at alfresco dot com
+ */
+public class InviteByTicket extends DeclarativeWebScript
+{
+    // request parameter names
+    private static final String PARAM_INVITEE_USER_NAME = "inviteeUserName";
+    
+    // service instances
+    private ServiceRegistry serviceRegistry;
+    private SiteService siteService;
+    private InvitationService invitationService;
+    private TenantService tenantService;
+    
+    
+    public void setServiceRegistry(ServiceRegistry serviceRegistry)
+    {
+        this.serviceRegistry = serviceRegistry;
+    }
+    
+    public void setInvitationService(InvitationService invitationService)
+    {
+        this.invitationService = invitationService;
+    }
+    
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+    
+    public void setTenantService(TenantService tenantService)
+    {
+        this.tenantService = tenantService;
+    }
+    
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco
+     * .web.scripts.WebScriptRequest,
+     * org.alfresco.web.scripts.WebScriptResponse)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(final WebScriptRequest req, final Status status)
+    {
+        String tenantDomain = TenantService.DEFAULT_DOMAIN;
+        
+        if (tenantService.isEnabled())
+        {
+            String inviteeUserName = req.getParameter(PARAM_INVITEE_USER_NAME);
+            if (inviteeUserName != null)
+            {
+                tenantDomain = tenantService.getUserDomain(inviteeUserName);
+            }
+        }
+        
+        // run as system user
+        String mtAwareSystemUser = tenantService.getDomainUser(AuthenticationUtil.getSystemUserName(), tenantDomain);
+        
+        Map<String, Object> ret = TenantUtil.runAsSystemTenant(new TenantRunAsWork<Map<String, Object>>()
+        {
+            public Map<String, Object> doWork() throws Exception
+            {
+                return execute(req, status);
+            }
+        }, tenantDomain);
+        
+        // authenticate as system for the rest of the webscript
+        AuthenticationUtil.setRunAsUser(mtAwareSystemUser);
+        
+        return ret;
+    }
+    
+    private Map<String, Object> execute(WebScriptRequest req, Status status)
+    {
+        // initialise model to pass on for template to render
+        Map<String, Object> model = new HashMap<String, Object>();
+        
+        // get inviteId and inviteTicket
+        String inviteId = req.getServiceMatch().getTemplateVars().get("inviteId");
+        String inviteTicket = req.getServiceMatch().getTemplateVars().get("inviteTicket");
+        
+        try 
+        {
+            Invitation invitation = invitationService.getInvitation(inviteId);
+            
+            if (invitation instanceof NominatedInvitation)
+            {
+                NominatedInvitation theInvitation = (NominatedInvitation)invitation;
+                String ticket = theInvitation.getTicket();
+                if (ticket == null || (! ticket.equals(inviteTicket)))
+                {
+                    throw new WebScriptException(Status.STATUS_NOT_FOUND, "Ticket mismatch");
+                }
+                // return the invite info
+                model.put("invite", toInviteInfo(theInvitation));
+                return model;
+            }
+            else
+            {
+                // Not a nominated invitation
+                throw new WebScriptException(Status.STATUS_FORBIDDEN, "Not a nominated invitation");
+            }
+        }
+        catch (InvitationExceptionNotFound nfe)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND,
+            "No invite found for given id");
+        }
+    }
+    
+    private InviteInfo toInviteInfo(NominatedInvitation invitation)
+    {
+        final PersonService personService = serviceRegistry.getPersonService();
+        
+        // get the site info
+        SiteInfo siteInfo = siteService.getSite(invitation.getResourceName());
+        String invitationStatus = getInvitationStatus(invitation);
+        
+        NodeRef inviterRef = personService.getPerson(invitation.getInviterUserName());
+        TemplateNode inviterPerson = null;
+        if (inviterRef != null)
+        {
+            inviterPerson = new TemplateNode(inviterRef, serviceRegistry, null); 
+        }
+        
+        // fetch the person node for the invitee
+        NodeRef inviteeRef = personService.getPerson(invitation.getInviteeUserName());
+        TemplateNode inviteePerson = null;
+        if (inviteeRef != null)
+        {
+            inviteePerson = new TemplateNode(inviteeRef, serviceRegistry, null);
+        }
+        
+        InviteInfo ret = new InviteInfo(invitationStatus, 
+                    invitation.getInviterUserName(), 
+                    inviterPerson,
+                    invitation.getInviteeUserName(), 
+                    inviteePerson, 
+                    invitation.getRoleName(),
+                    invitation.getResourceName(), 
+                    siteInfo, 
+                    invitation.getSentInviteDate(),
+                    invitation.getInviteId());
+         
+         return ret;
+    }
+    
+    private String getInvitationStatus(NominatedInvitation invitation)
+    {
+        String invitee = invitation.getInviteeUserName();
+        String site = invitation.getResourceName();
+        // check is invitee is site member
+        boolean isUserMember = serviceRegistry.getSiteService().isMember(site, invitee);
+        
+        WorkflowTaskQuery query = new WorkflowTaskQuery();
+        query.setTaskName(WorkflowModelNominatedInvitation.WF_TASK_ACTIVIT_INVITE_PENDING);
+        query.setProcessId(invitation.getInviteId());
+        // query current workflow's task activitiInvitePendingTask 
+        List<WorkflowTask> pendingInvitationTasks = serviceRegistry.getWorkflowService().queryTasks(query, false);
+        // if it's here - pending invitation
+        if (!pendingInvitationTasks.isEmpty())
+        {
+            return InviteInfo.INVITATION_STATUS_PENDING;
+        }
+        else if (isUserMember)
+        {
+            return InviteInfo.INVITATION_STATUS_ACCEPTED;
+        }
+        else
+        {
+            return InviteInfo.INVITATION_STATUS_REJECTED;
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/invite/InviteResponse.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/invite/InviteResponse.java
new file mode 100644
index 00000000000..33992716217
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/invite/InviteResponse.java
@@ -0,0 +1,183 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.invite;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.service.cmr.invitation.Invitation;
+import org.alfresco.service.cmr.invitation.InvitationExceptionForbidden;
+import org.alfresco.service.cmr.invitation.InvitationExceptionUserError;
+import org.alfresco.service.cmr.invitation.InvitationService;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Web Script invoked by Invitee to either accept (response='accept') an
+ * invitation from a Site Manager (Inviter) to join a Site as a Site
+ * Collaborator, or to reject (response='reject') an invitation that has already
+ * been sent out
+ * 
+ * @author glen dot johnson at alfresco dot com
+ */
+public class InviteResponse extends DeclarativeWebScript
+{
+    private static final String RESPONSE_ACCEPT = "accept";
+    private static final String RESPONSE_REJECT = "reject";
+    private static final String MODEL_PROP_KEY_RESPONSE = "response";
+    private static final String MODEL_PROP_KEY_SITE_SHORT_NAME = "siteShortName";
+    
+    // request parameter names
+    private static final String PARAM_INVITEE_USER_NAME = "inviteeUserName";
+    
+    // properties for services
+    private InvitationService invitationService;
+    private TenantService tenantService;
+    
+    
+    public void setInvitationService(InvitationService invitationService)
+    {
+        this.invitationService = invitationService;
+    }
+    
+    public void setTenantService(TenantService tenantService)
+    {
+        this.tenantService = tenantService;
+    }
+    
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco
+     * .web.scripts.WebScriptRequest,
+     * org.alfresco.web.scripts.WebScriptResponse)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(final WebScriptRequest req, final Status status)
+    {
+        String tenantDomain = TenantService.DEFAULT_DOMAIN;
+        final String inviteeUserName = req.getParameter(PARAM_INVITEE_USER_NAME);
+        
+        if (tenantService.isEnabled())
+        {
+            if (inviteeUserName != null)
+            {
+                tenantDomain = tenantService.getUserDomain(inviteeUserName);
+            }
+        }
+        
+        // run as system user
+        return TenantUtil.runAsSystemTenant(new TenantRunAsWork<Map<String, Object>>()
+        {
+            public Map<String, Object> doWork() throws Exception
+            {
+                String oldUser = null;
+                try
+                {
+                    if (inviteeUserName != null && !inviteeUserName.equals(oldUser))
+                    {
+                        oldUser = AuthenticationUtil.getFullyAuthenticatedUser();
+                        AuthenticationUtil.setFullyAuthenticatedUser(inviteeUserName);
+                    }
+                    return execute(req, status);
+                }
+                finally
+                {
+                    if (oldUser != null && !oldUser.equals(inviteeUserName))
+                    {
+                        AuthenticationUtil.setFullyAuthenticatedUser(oldUser);
+                    }
+                }
+            }
+        }, tenantDomain);
+    }
+    
+    private Map<String, Object> execute(WebScriptRequest req, Status status)
+    {
+        // initialise model to pass on for template to render
+        Map<String, Object> model = new HashMap<String, Object>();
+        
+        String inviteId = req.getServiceMatch().getTemplateVars().get("inviteId");
+        String inviteTicket = req.getServiceMatch().getTemplateVars().get("inviteTicket");
+               
+        // Check that the task is still open.
+        //if(inviteStart)
+        
+        // process response
+        String action = req.getServiceMatch().getTemplateVars().get("action");
+        if (action.equals("accept"))
+        {
+            try
+            {
+                Invitation invitation = invitationService.accept(inviteId, inviteTicket);
+                // add model properties for template to render
+                model.put(MODEL_PROP_KEY_RESPONSE, RESPONSE_ACCEPT);
+                model.put(MODEL_PROP_KEY_SITE_SHORT_NAME, invitation.getResourceName());
+            }
+            catch (InvitationExceptionForbidden fe)
+            {
+                throw new WebScriptException(Status.STATUS_FORBIDDEN, fe.toString());
+            }
+            catch (InvitationExceptionUserError fe)
+            {
+                throw new WebScriptException(Status.STATUS_CONFLICT, fe.toString());
+            }
+        }
+        else if (action.equals("reject"))
+        {
+            try 
+            {
+                Invitation invitation = invitationService.reject(inviteId, "Rejected");
+                // add model properties for template to render
+                model.put(MODEL_PROP_KEY_RESPONSE, RESPONSE_REJECT);
+                model.put(MODEL_PROP_KEY_SITE_SHORT_NAME, invitation.getResourceName());
+            }
+            catch (InvitationExceptionForbidden fe)
+            {
+                throw new WebScriptException(Status.STATUS_FORBIDDEN, fe.toString());
+            }
+            catch (InvitationExceptionUserError fe)
+            {
+                throw new WebScriptException(Status.STATUS_CONFLICT, fe.toString());
+            }
+        }
+        else
+        {
+            /* handle unrecognised method */
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                    "action " + action + " is not supported by this webscript.");
+        }
+        
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/invite/Invites.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/invite/Invites.java
new file mode 100644
index 00000000000..899f05f8398
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/invite/Invites.java
@@ -0,0 +1,323 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.invite;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.invitation.InvitationSearchCriteriaImpl;
+import org.alfresco.repo.invitation.site.InviteInfo;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.template.TemplateNode;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.invitation.Invitation;
+import org.alfresco.service.cmr.invitation.InvitationSearchCriteria;
+import org.alfresco.service.cmr.invitation.InvitationService;
+import org.alfresco.service.cmr.invitation.NominatedInvitation;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.workflow.WorkflowService;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Web Script which returns pending Site invitations matching at least one of
+ * 
+ * (1a) inviter (inviter user name). i.e. pending invitations which have been
+ * sent by that inviter, but which have not been responded to (accepted or
+ * rejected) by the invitee, and have not been cancelled by that inviter
+ * 
+ * (1b) invitee (invitee user name), i.e. pending invitations which have not
+ * been accepted or rejected yet by that inviter
+ * 
+ * (1c) site (site short name), i.e. pending invitations sent out to join that
+ * Site. If only the site is given, then all pending invites are returned,
+ * irrespective of who the inviters or invitees are
+ * 
+ * or
+ * 
+ * (2) matching the given invite ID
+ * 
+ * 
+ * @author glen dot johnson at alfresco dot com
+ */
+public class Invites extends DeclarativeWebScript
+{
+    // request parameter names
+    private static final String PARAM_INVITER_USER_NAME = "inviterUserName";
+    private static final String PARAM_INVITEE_USER_NAME = "inviteeUserName";
+    private static final String PARAM_SITE_SHORT_NAME = "siteShortName";
+    private static final String PARAM_INVITE_ID = "inviteId";
+
+    // model key names
+    private static final String MODEL_KEY_NAME_INVITES = "invites";
+
+    // service instances
+    private WorkflowService workflowService;
+    private ServiceRegistry serviceRegistry;
+    private SiteService siteService;
+    private InvitationService invitationService;
+
+    /**
+     * Set the workflow service property
+     * 
+     * @param workflowService
+     *            the workflow service to set
+     */
+    public void setWorkflowService(WorkflowService workflowService)
+    {
+        this.workflowService = workflowService;
+    }
+
+    public void setServiceRegistry(ServiceRegistry serviceRegistry) 
+    {
+        this.serviceRegistry = serviceRegistry;
+    }
+    
+    public void setSiteService(SiteService siteService) 
+    {
+        this.siteService = siteService;
+    }
+    
+    public void setInvitationService(InvitationService invitationService) 
+    {
+        this.invitationService = invitationService;
+    }
+    
+    public InvitationService getInvitationService() 
+    {
+        return invitationService;
+    }
+    
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco
+     * .web.scripts.WebScriptRequest,
+     * org.alfresco.web.scripts.WebScriptResponse)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req,
+            Status status)
+    {
+        // initialise model to pass on for template to render
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        // Get parameter names
+        String[] paramNames = req.getParameterNames();
+
+        // handle no parameters given on URL
+        if ((paramNames == null) || (paramNames.length == 0))
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                    "No parameters have been provided on URL");
+        }
+
+        // get URL request parameters, checking if at least one has been provided
+
+        // check if 'inviterUserName' parameter provided
+        String inviterUserName = req.getParameter(PARAM_INVITER_USER_NAME);
+        boolean inviterUserNameProvided = (inviterUserName != null)
+                && (inviterUserName.length() != 0);
+
+        // check if 'inviteeUserName' parameter provided
+        String inviteeUserName = req.getParameter(PARAM_INVITEE_USER_NAME);
+        boolean inviteeUserNameProvided = (inviteeUserName != null)
+                && (inviteeUserName.length() != 0);
+
+        // check if 'siteShortName' parameter provided
+        String siteShortName = req.getParameter(PARAM_SITE_SHORT_NAME);
+        boolean siteShortNameProvided = (siteShortName != null)
+                && (siteShortName.length() != 0);
+
+        // check if 'inviteId' parameter provided
+        String inviteId = req.getParameter(PARAM_INVITE_ID);
+        boolean inviteIdProvided = (inviteId != null)
+                && (inviteId.length() != 0);
+
+        // throw web script exception if at least one of 'inviterUserName',
+        // 'inviteeUserName', 'siteShortName',
+        // 'inviteId' URL request parameters has not been provided
+        if (!(inviterUserNameProvided || inviteeUserNameProvided
+                || siteShortNameProvided || inviteIdProvided))
+        {
+            throw new WebScriptException(
+                    Status.STATUS_BAD_REQUEST,
+                    "At least one of the following URL request parameters must be provided in URL "
+                            + "'inviterUserName', 'inviteeUserName', 'siteShortName' or 'inviteId'");
+        }
+        
+        // InviteInfo List to place onto model
+        List<InviteInfo> inviteInfoList = new ArrayList<InviteInfo>();
+
+        // if 'inviteId' has been provided then set that as the workflow query
+        // process ID
+        // - since this is unique don't bother about setting the other workflow
+        // query properties
+        if (inviteIdProvided)
+        {
+            NominatedInvitation invitation = (NominatedInvitation)invitationService.getInvitation(inviteId);
+                Map<String, SiteInfo> siteInfoCache = new HashMap<String, SiteInfo>(2);
+        	inviteInfoList.add(toInviteInfo(siteInfoCache, invitation));
+        }
+        else
+        // 'inviteId' has not been provided, so create the query properties from
+        // the invite URL request
+        // parameters
+        // - because this web script class will terminate with a web script
+        // exception if none of the required
+        // request parameters are provided, at least one of these query
+        // properties will be set
+        // at this point
+        {
+            InvitationSearchCriteriaImpl criteria = new InvitationSearchCriteriaImpl();  
+            criteria.setInvitationType(InvitationSearchCriteria.InvitationType.NOMINATED);
+            criteria.setResourceType(Invitation.ResourceType.WEB_SITE);
+
+
+            if (inviterUserNameProvided)
+            {
+                criteria.setInviter(inviterUserName);
+            }
+            if (inviteeUserNameProvided)
+            {
+                criteria.setInvitee(inviteeUserName);
+            }
+            if (siteShortNameProvided)
+            {
+                criteria.setResourceName(siteShortName);
+            }
+            
+            //MNT-9905 Pending Invites created by one site manager aren't visible to other site managers
+            String currentUser = AuthenticationUtil.getRunAsUser();
+            List<Invitation> invitations;
+
+            if (siteShortNameProvided == true && (SiteModel.SITE_MANAGER).equals(siteService.getMembersRole(siteShortName, currentUser)) && inviterUserNameProvided == false && inviteeUserNameProvided == false)
+            {
+                final InvitationSearchCriteriaImpl crit = criteria;
+
+                RunAsWork<List<Invitation>> runAsSystem = new RunAsWork<List<Invitation>>()
+                {
+                    @Override
+                    public List<Invitation> doWork() throws Exception
+                    {
+                        return invitationService.searchInvitation(crit);
+                    }
+                };
+
+                invitations = AuthenticationUtil.runAs(runAsSystem, AuthenticationUtil.getSystemUserName());
+            }
+            else
+            {
+                invitations = invitationService.searchInvitation(criteria);
+            }
+
+            // Put InviteInfo objects (containing workflow path properties
+            // wf:inviterUserName, wf:inviteeUserName, wf:siteShortName,
+            // and invite id property (from workflow instance id))
+            // onto model for each invite workflow task returned by the query
+            Map<String, SiteInfo> siteInfoCache = new HashMap<String, SiteInfo>(
+                    invitations.size() * 2);
+            for (Invitation invitation : invitations)
+            {
+                inviteInfoList.add(toInviteInfo(siteInfoCache, (NominatedInvitation) invitation));
+            }
+        }
+
+        // put the list of invite infos onto model to be passed onto template
+        // for rendering
+        model.put(MODEL_KEY_NAME_INVITES, inviteInfoList);
+
+        return model;
+    }
+    
+
+    
+    private InviteInfo toInviteInfo(Map<String, SiteInfo> siteInfoCache, final NominatedInvitation invitation)
+    {
+        // get the site info
+        String resourceName = invitation.getResourceName();
+        SiteInfo siteInfo = siteInfoCache.get(resourceName);
+        if (siteInfo == null)
+        {
+            siteInfo = siteService.getSite(resourceName);
+            siteInfoCache.put(resourceName, siteInfo);
+        }
+        String invitationStatus = InviteInfo.INVITATION_STATUS_PENDING;
+        
+        TemplateNode inviterPerson = getPersonIfAllowed(invitation.getInviterUserName());
+        
+        // fetch the person node for the invitee
+        TemplateNode inviteePerson = getPersonIfAllowed(invitation.getInviteeUserName());
+        
+        InviteInfo ret = new InviteInfo(invitationStatus, 
+                    invitation.getInviterUserName(), 
+                    inviterPerson,
+                    invitation.getInviteeUserName(), 
+                    inviteePerson, 
+                    invitation.getRoleName(),
+                    invitation.getResourceName(), 
+                    siteInfo, 
+                    invitation.getSentInviteDate(),
+                    invitation.getInviteId());
+         
+         return ret;
+    }
+    
+    private TemplateNode getPersonIfAllowed(final String userName)
+    {
+        final PersonService personService = serviceRegistry.getPersonService();
+        NodeRef inviterRef = AuthenticationUtil.runAs(new RunAsWork<NodeRef>()
+        {
+            public NodeRef doWork() throws Exception
+            {
+                if (!personService.personExists(userName))
+                {
+                    return null;
+                }
+                return personService.getPerson(userName, false);
+            }
+        }, AuthenticationUtil.getSystemUserName());
+        if (inviterRef != null
+                && serviceRegistry.getPermissionService().hasPermission(inviterRef, PermissionService.READ_PROPERTIES)
+                        .equals(AccessStatus.ALLOWED))
+        {
+            return new TemplateNode(inviterRef, serviceRegistry, null);
+        }
+        return null;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/AbstractLinksWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/AbstractLinksWebScript.java
new file mode 100644
index 00000000000..1af0ea32350
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/AbstractLinksWebScript.java
@@ -0,0 +1,433 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.links;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import org.alfresco.query.PagingRequest;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.service.cmr.links.LinkInfo;
+import org.alfresco.service.cmr.links.LinksService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.NoSuchPersonException;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.util.ScriptPagingDetails;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.json.JSONWriter;
+
+/**
+ * @author Nick Burch
+ * @since 4.0
+ */
+public abstract class AbstractLinksWebScript extends DeclarativeWebScript
+{
+    public static final String LINKS_SERVICE_ACTIVITY_APP_NAME = "links";
+
+    protected static final String PARAM_MESSAGE = "message";
+    protected static final String PARAM_ITEM = "item";
+
+    private static Log logger = LogFactory.getLog(AbstractLinksWebScript.class);
+    
+    // Injected services
+    protected NodeService nodeService;
+    protected SiteService siteService;
+    protected LinksService linksService;
+    protected PersonService personService;
+    protected ActivityService activityService;
+
+    private String protocolsWhiteList = "http,https,ftp,mailto";
+    private ArrayList<String> allowedProtocols;
+    private ArrayList<Pattern> xssPatterns;
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+    
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+    
+    public void setLinksService(LinksService linksService)
+    {
+        this.linksService = linksService;
+    }
+    
+    public void setPersonService(PersonService personService)
+    {
+        this.personService = personService;
+    }
+    
+    public void setActivityService(ActivityService activityService)
+    {
+        this.activityService = activityService;
+    }
+
+    public void setProtocolsWhiteList(String protocolsWhiteList)
+    {
+        this.protocolsWhiteList = protocolsWhiteList;
+    }
+
+    public void setXssRegexp(ArrayList<String> xssRegexp)
+    {
+        xssPatterns = new ArrayList<>(xssRegexp.size());
+        for (String xssRegexpStr : xssRegexp)
+        {
+            xssPatterns.add(Pattern.compile(xssRegexpStr));
+        }
+    }
+
+    private boolean isProtocolAllowed(String protocol)
+    {
+        // will be used default protocol prefix
+        if (protocol.length() == 0)
+        {
+            return true;
+        }
+
+        if (allowedProtocols == null)
+        {
+            allowedProtocols = new ArrayList<String>();
+            for (String delimProtocol : protocolsWhiteList.split(","))
+            {
+                if (delimProtocol.trim().length() == 0)
+                {
+                    continue;
+                }
+                allowedProtocols.add(delimProtocol.trim());
+            }
+        }
+
+        return allowedProtocols.contains(protocol);
+    }
+
+    private boolean isPossibleXSS(String url)
+    {
+        // check for null
+        if (xssPatterns == null)
+        {
+            return false;
+        }
+
+        boolean result = false;
+        for (Pattern pattern : xssPatterns)
+        {
+            if (pattern.matcher(url).matches())
+            {
+                result = true;
+            }
+        }
+        return result;
+    }
+
+    private boolean isUrlCorrect(String url)
+    {
+        //default behavior if url absent
+        if (url == null)
+        {
+            return true;
+        }
+
+        if (url.trim().length() == 0 || isPossibleXSS(url))
+        {
+            return false;
+        }
+
+        int colonPos = url.indexOf(":");
+        colonPos = colonPos > 0 ? colonPos : 0;
+        String protocol = url.substring(0, colonPos);
+
+        boolean result = isProtocolAllowed(protocol);
+        //check for record host:port e.g.: localhost:8080
+        if (!result)
+        {
+            String secondUrlPart = url.substring(colonPos+1);
+            int slashPos = secondUrlPart.indexOf("/");
+            slashPos = slashPos > 0 ? slashPos : secondUrlPart.length();
+            String port = secondUrlPart.substring(0, slashPos);
+
+            Pattern p = Pattern.compile("^[0-9]*$");
+            if (p.matcher(port).matches())
+            {
+                result =  true;
+            }
+        }
+        return result;
+    }
+    
+    
+    protected String getOrNull(JSONObject json, String key)
+    {
+       if (json.containsKey(key))
+       {
+          return (String)json.get(key);
+       }
+       return null;
+    }
+    
+    protected List<String> getTags(JSONObject json)
+    {
+       List<String> tags = null;
+       if (json.containsKey("tags"))
+       {
+          // Is it "tags":"" or "tags":[...] ?
+          if (json.get("tags") instanceof String)
+          {
+             // This is normally an empty string, skip
+             String tagsS = (String)json.get("tags");
+             if ("".equals(tagsS))
+             {
+                // No tags were given
+                return null;
+             }
+             else
+             {
+                // Log, and treat as empty
+                // (We don't support "tags":"a,b,c" in these webscripts)
+                logger.warn("Unexpected tag data: " + tagsS);
+                return null;
+             }
+          }
+          else
+          {
+             tags = new ArrayList<String>();
+             JSONArray jsTags = (JSONArray)json.get("tags");
+             for (int i=0; i<jsTags.size(); i++)
+             {
+                tags.add( (String)jsTags.get(i) );
+             }
+          }
+       }
+       return tags;
+    }
+    
+    /**
+     * Builds up a listing Paging request, based on the arguments
+     *  specified in the URL
+     */
+    protected PagingRequest buildPagingRequest(WebScriptRequest req)
+    {
+       if (req.getParameter("page") == null || req.getParameter("pageSize") == null)
+       {
+          throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Paging size parameters missing");
+       }
+       return new ScriptPagingDetails(req, 100);
+    }
+    
+    /**
+     * Generates an activity entry for the link
+     */
+    protected void addActivityEntry(String event, LinkInfo link, SiteInfo site, 
+          WebScriptRequest req, JSONObject json)
+    {
+       // What page is this for?
+       String page = req.getParameter("page");
+       if (page == null && json != null)
+       {
+          if (json.containsKey("page"))
+          {
+             page = (String)json.get("page");
+          }
+       }
+       if (page == null)
+       {
+          // Default
+          page = "links";
+       }
+       
+       try
+       {
+          StringWriter activityJson = new StringWriter();
+          JSONWriter activity = new JSONWriter(activityJson);
+          activity.startObject();
+          activity.writeValue("title", link.getTitle());
+          activity.writeValue("page", page + "?linkId=" + link.getSystemName());
+          activity.endObject();
+          
+          activityService.postActivity(
+                "org.alfresco.links.link-" + event,
+                site.getShortName(),
+                LINKS_SERVICE_ACTIVITY_APP_NAME,
+                activityJson.toString());
+       }
+       catch (Exception e)
+       {
+          // Warn, but carry on
+          logger.warn("Error adding link " + event + " to activities feed", e);
+       }
+    }
+    
+    protected Map<String, Object> renderLink(LinkInfo link)
+    {
+       Map<String, Object> res = new HashMap<String, Object>();
+       res.put("node", link.getNodeRef());
+       res.put("name", link.getSystemName());
+       res.put("title", link.getTitle());
+       res.put("description", link.getDescription());
+       res.put("url", link.getURL());
+       res.put("createdOn", link.getCreatedAt());
+       res.put("modifiedOn", link.getModifiedAt());
+       res.put("tags", link.getTags());
+       res.put("internal", link.isInternal());
+       
+       // FTL needs a script node of the person, if available
+       String creator = link.getCreator();
+       Object creatorO;
+       if ((null == creator) || !personService.personExists(creator))
+       {
+          creatorO = "";
+       }
+       else
+       {
+          NodeRef person = personService.getPerson(creator);
+          creatorO = person;
+       }
+       res.put("creator", creatorO);
+       
+       // We want blank instead of null
+       for (String key : res.keySet())
+       {
+          if (res.get(key) == null)
+          {
+             res.put(key, "");
+          }
+       }
+       
+       return res;
+    }
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req,
+          Status status, Cache cache) 
+    {
+       Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+       if (templateVars == null)
+       {
+          String error = "No parameters supplied";
+          throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+       }
+       
+       
+       // Parse the JSON, if supplied
+       JSONObject json = null;
+       String contentType = req.getContentType();
+       if (contentType != null && contentType.indexOf(';') != -1)
+       {
+          contentType = contentType.substring(0, contentType.indexOf(';'));
+       }
+       if (MimetypeMap.MIMETYPE_JSON.equals(contentType))
+       {
+          JSONParser parser = new JSONParser();
+          try
+          {
+             json = (JSONObject)parser.parse(req.getContent().getContent());
+          }
+          catch (IOException io)
+          {
+             throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid JSON: " + io.getMessage());
+          }
+          catch(ParseException pe)
+          {
+             throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid JSON: " + pe.getMessage());
+          }
+       }
+       
+       
+       // Get the site short name. Try quite hard to do so...
+       String siteName = templateVars.get("site");
+       if (siteName == null)
+       {
+          siteName = req.getParameter("site");
+       }
+       if (siteName == null && json != null)
+       {
+          if (json.containsKey("siteid"))
+          {
+             siteName = (String)json.get("siteid");
+          }
+          else if (json.containsKey("site"))
+          {
+             siteName = (String)json.get("site");
+          }
+       }
+       if (siteName == null)
+       {
+          String error = "No site given";
+          throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+       }
+       
+       // Grab the requested site
+       SiteInfo site = siteService.getSite(siteName);
+       if (site == null)
+       {
+          String error = "Could not find site: " + siteName;
+          throw new WebScriptException(Status.STATUS_NOT_FOUND, error);
+       }
+       
+       // Link name is optional
+       String linkName = templateVars.get("path");
+
+        //sanitise url
+        if (json != null)
+        {
+            String url = getOrNull(json, "url");
+            if (!isUrlCorrect(url))
+            {
+                String error = "Url not allowed";
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, error);
+            }
+        }
+
+       // Have the real work done
+       return executeImpl(site, linkName, req, json, status, cache); 
+    }
+    
+    protected abstract Map<String, Object> executeImpl(SiteInfo site, 
+          String linkName, WebScriptRequest req, JSONObject json, 
+          Status status, Cache cache);
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinkDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinkDelete.java
new file mode 100644
index 00000000000..de2cdd3e3fa
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinkDelete.java
@@ -0,0 +1,77 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.links;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.service.cmr.links.LinkInfo;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the link deleting link.delete webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class LinkDelete extends AbstractLinksWebScript
+{
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, String linkName,
+         WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+   {
+      Map<String, Object> model = new HashMap<String, Object>();
+      
+      // Try to find the link
+      LinkInfo link = linksService.getLink(site.getShortName(), linkName);
+      if (link == null)
+      {
+         String message = "No link found with that name";
+         throw new WebScriptException(Status.STATUS_NOT_FOUND, message);
+      }
+      
+      // Delete it
+      try
+      {
+         linksService.deleteLink(link);
+      }
+      catch (AccessDeniedException e)
+      {
+         String message = "You don't have permission to delete that link";
+         throw new WebScriptException(Status.STATUS_FORBIDDEN, message);
+      }
+      
+      // Mark it as gone
+      status.setCode(Status.STATUS_NO_CONTENT);
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinkGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinkGet.java
new file mode 100644
index 00000000000..d8174343098
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinkGet.java
@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.links;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.links.LinkInfo;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the link fetching link.get webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class LinkGet extends AbstractLinksWebScript
+{
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, String linkName,
+         WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+   {
+      Map<String, Object> model = new HashMap<String, Object>();
+      
+      // Try to find the link
+      LinkInfo link = linksService.getLink(site.getShortName(), linkName);
+      if (link == null)
+      {
+         String message = "No link found with that name";
+         throw new WebScriptException(Status.STATUS_NOT_FOUND, message);
+      }
+      
+      // Build the model
+      model.put(PARAM_ITEM, renderLink(link));
+      model.put("node", link.getNodeRef());
+      model.put("link", link);
+      model.put("site", site);
+      model.put("siteId", site.getShortName());
+      
+      // All done
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinkPut.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinkPut.java
new file mode 100644
index 00000000000..bc125ad086f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinkPut.java
@@ -0,0 +1,128 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.links;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.regex.Pattern;
+
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.service.cmr.links.LinkInfo;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the link fetching links.put webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class LinkPut extends AbstractLinksWebScript
+{
+   private static final String MSG_ACCESS_DENIED= "links.err.access.denied";
+   private static final String MSG_NOT_FOUND= "links.err.not.found";
+
+    @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, String linkName,
+         WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+   {
+      final ResourceBundle rb = getResources();
+      Map<String, Object> model = new HashMap<String, Object>();
+      
+      // Try to find the link
+      LinkInfo link = linksService.getLink(site.getShortName(), linkName);
+      if (link == null)
+      {
+         String message = "No link found with that name";
+         
+         status.setCode(Status.STATUS_NOT_FOUND);
+         status.setMessage(message);
+         model.put(PARAM_MESSAGE, rb.getString(MSG_NOT_FOUND));
+         return model;
+      }
+
+      // Get the new link details from the JSON
+      // Update the main properties
+      link.setTitle(getOrNull(json, "title"));
+      link.setDescription(getOrNull(json, "description"));
+      String url = getOrNull(json, "url");
+
+      link.setURL(url);
+      
+      // Handle internal / not internal
+      if (json.containsKey("internal"))
+      {
+         link.setInternal(true);
+      }
+      else
+      {
+         link.setInternal(false);
+      }
+      
+      // Do the tags
+      link.getTags().clear();
+      List<String> tags = getTags(json);
+      if (tags != null && tags.size() > 0)
+      {
+         link.getTags().addAll(tags);
+      }
+      
+      
+      // Update the link
+      try
+      {
+         link = linksService.updateLink(link);
+      }
+      catch (AccessDeniedException e)
+      {
+         String message = "You don't have permission to update that link";
+         
+         status.setCode(Status.STATUS_FORBIDDEN);
+         status.setMessage(message);
+         model.put(PARAM_MESSAGE, rb.getString(MSG_ACCESS_DENIED));
+         return model;
+      }
+      
+      // Generate an activity for the change
+      addActivityEntry("updated", link, site, req, json);
+
+      
+      // Build the model
+      model.put(PARAM_MESSAGE, "Node " + link.getNodeRef() + " updated");
+      model.put("link", link);
+      model.put("site", site);
+      model.put("siteId", site.getShortName());
+      
+      // All done
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinksDeletePost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinksDeletePost.java
new file mode 100644
index 00000000000..58f66dbfd77
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinksDeletePost.java
@@ -0,0 +1,130 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.links;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.service.cmr.links.LinkInfo;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the links deleting links-delete.post webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class LinksDeletePost extends AbstractLinksWebScript
+{
+   private static final String MSG_NAME_NOT_FOUND= "links-delete.err.not.found";
+   private static final String MSG_ACCESS_DENIED= "links-delete.access.denied";
+   private static final String MSG_DELETED= "links-delete.msg.deleted";
+    
+   protected static final int RECENT_SEARCH_PERIOD_DAYS = 7;
+   protected static final long ONE_DAY_MS = 24*60*60*1000;
+   
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, String linkName,
+         WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+   {
+      final ResourceBundle rb = getResources();
+      Map<String, Object> model = new HashMap<String, Object>();
+      
+      // Get the requested nodes from the JSON
+      // Silently skips over any invalid ones specified
+      List<LinkInfo> links = new ArrayList<LinkInfo>();
+      if (json.containsKey("items"))
+      {
+         JSONArray items = (JSONArray)json.get("items");
+         for (int i=0; i<items.size(); i++)
+         {
+            String name = (String)items.get(i);
+            LinkInfo link = linksService.getLink(site.getShortName(), name);
+            if (link != null)
+            {
+               links.add(link);
+            }
+         }
+      }
+      
+      
+      // Check we got at least one link, and bail if not
+      if (links.size() == 0)
+      {
+         String message = "No valid link names supplied";
+         
+         status.setCode(Status.STATUS_NOT_FOUND);
+         status.setMessage(message);
+         model.put(PARAM_MESSAGE, rb.getString(MSG_NAME_NOT_FOUND));
+         return model;
+      }
+      
+      
+      // Delete each one in turn
+      for (LinkInfo link : links)
+      {
+         // Do the delete
+         try
+         {
+            linksService.deleteLink(link);
+         }
+         catch (AccessDeniedException e)
+         {
+            String message = "You don't have permission to delete the link with name '" + link.getTitle() + "'";
+            
+            status.setCode(Status.STATUS_FORBIDDEN);
+            status.setMessage(message);
+            
+            message = rb.getString(MSG_ACCESS_DENIED);
+            model.put(PARAM_MESSAGE, MessageFormat.format(message, link.getTitle()));
+            return model;
+         }
+         
+         // Generate the activity entry for it
+         addActivityEntry("deleted", link, site, req, json);
+         
+         // Record a message (only the last one is used though!)
+         String message = rb.getString(MSG_DELETED);
+         model.put(PARAM_MESSAGE, MessageFormat.format(message, link.getNodeRef()));
+      }
+
+      
+      // All done
+      model.put("siteId", site.getShortName());
+      model.put("site", site);
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinksListGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinksListGet.java
new file mode 100644
index 00000000000..89b698bd23e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinksListGet.java
@@ -0,0 +1,178 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.links;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.links.LinksServiceImpl;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.links.LinkInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.surf.util.URLDecoder;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the links listing links.get webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class LinksListGet extends AbstractLinksWebScript
+{
+   protected static final int RECENT_SEARCH_PERIOD_DAYS = 7;
+   protected static final long ONE_DAY_MS = 24*60*60*1000;
+   
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, String linkName,
+         WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+   {
+      // Decide on what kind of request they wanted
+      String filter = req.getParameter("filter");
+      
+      // Tagging?
+      boolean tagFiltering = true;
+      String tag = req.getParameter("tag");
+      if (tag == null || tag.length() == 0)
+      {
+         tagFiltering = false;
+      }
+      
+      // User?
+      boolean userFiltering = false;
+      String user = null;
+      if ("user".equals(filter))
+      {
+         userFiltering = true;
+         user = AuthenticationUtil.getFullyAuthenticatedUser();
+      }
+      
+      // Date?
+      boolean dateFiltering = false;
+      Date from = null;
+      Date to = null;
+      if ("recent".equals(filter))
+      {
+         dateFiltering = true;
+         Date now = new Date();
+         from = new Date(now.getTime() - RECENT_SEARCH_PERIOD_DAYS*ONE_DAY_MS);
+         to = new Date(now.getTime() + ONE_DAY_MS);
+      }
+      
+      
+      // Get the links for the list
+      PagingRequest paging = buildPagingRequest(req);
+      paging.setRequestTotalCountMax(paging.getSkipCount() + paging.getRequestTotalCountMax());
+      PagingResults<LinkInfo> links;
+      if (tagFiltering)
+      {
+         links = linksService.findLinks(site.getShortName(), user, from, to, tag, paging);
+      }
+      else
+      {
+         if (userFiltering)
+         {
+            links = linksService.listLinks(site.getShortName(), user, paging);
+         }
+         else if (dateFiltering)
+         {
+            links = linksService.listLinks(site.getShortName(), from, to, paging);
+         }
+         else
+         {
+            links = linksService.listLinks(site.getShortName(), paging);
+         }
+      }
+
+      
+      // For each one in our page, grab details of any ignored instances
+      List<Map<String,Object>> items = new ArrayList<Map<String,Object>>();
+      for (LinkInfo link : links.getPage())
+      {
+         Map<String, Object> result = renderLink(link);
+         items.add(result);
+      }
+      Map<String, Object> data = new HashMap<String, Object>();
+      data.put("items", items);
+      data.put("pageSize", paging.getMaxItems());
+      data.put("startIndex", paging.getSkipCount());
+      data.put("itemCount", items.size());
+      
+      int total = items.size();
+      if (links.getTotalResultCount() != null && links.getTotalResultCount().getFirst() != null)
+      {
+         total = links.getTotalResultCount().getFirst();
+      }
+      data.put("total", total);
+      
+      if (total == paging.getRequestTotalCountMax())
+      {
+          data.put("totalRecordsUpper", true);
+      }
+      else
+      {
+          data.put("totalRecordsUpper", false);
+      }
+      
+      // We need the container node for permissions checking
+      NodeRef container;
+      if (links.getPage().size() > 0)
+      {
+         container = links.getPage().get(0).getContainerNodeRef();
+      }
+      else
+      {
+         // Find the container (if it's been created yet)
+         container = siteService.getContainer(
+               site.getShortName(), LinksServiceImpl.LINKS_COMPONENT);
+         
+         if (container == null)
+         {
+            // Brand new site, no write operations on links have happened
+            // Fudge it for now with the site itself, the first write call
+            //  will have the container created
+            container = site.getNodeRef();
+         }
+      }
+      
+      // All done
+      Map<String, Object> model = new HashMap<String, Object>();
+      model.put("data", data);
+      model.put("links", container); 
+      model.put("siteId", site.getShortName());
+      model.put("site", site);
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinksPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinksPost.java
new file mode 100644
index 00000000000..381470a6850
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/links/LinksPost.java
@@ -0,0 +1,115 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.links;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.service.cmr.links.LinkInfo;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the link fetching links.post webscript.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class LinksPost extends AbstractLinksWebScript
+{
+   private static final String MSG_ACCESS_DENIED= "links.err.access.denied";
+    
+   @Override
+   protected Map<String, Object> executeImpl(SiteInfo site, String linkName,
+         WebScriptRequest req, JSONObject json, Status status, Cache cache) 
+   {
+      final ResourceBundle rb = getResources();
+      Map<String, Object> model = new HashMap<String, Object>();
+      
+      // Get the new link details from the JSON
+      String title;
+      String description;
+      String url;
+      boolean internal;
+      List<String> tags;
+
+      // Fetch the main properties
+      title = getOrNull(json, "title");
+      description = getOrNull(json, "description");
+      url = getOrNull(json, "url");
+      
+      // Handle internal / not internal
+      internal = json.containsKey("internal");
+      
+      // Do the tags
+      tags = getTags(json);
+      
+      
+      // Create the link
+      LinkInfo link;
+      try
+      {
+         link = linksService.createLink(site.getShortName(), title, description, url, internal);
+      }
+      catch (AccessDeniedException e)
+      {
+         String message = "You don't have permission to create a link";
+         
+         status.setCode(Status.STATUS_FORBIDDEN);
+         status.setMessage(message);
+         model.put(PARAM_MESSAGE, rb.getString(MSG_ACCESS_DENIED));
+         return model;
+      }
+      
+      // Set the tags if required
+      if (tags != null && tags.size() > 0)
+      {
+         link.getTags().addAll(tags);
+         linksService.updateLink(link);
+      }
+      
+      // Generate an activity for the change
+      addActivityEntry("created", link, site, req, json);
+
+      
+      // Build the model
+      model.put(PARAM_MESSAGE, link.getSystemName()); // Really!
+      model.put(PARAM_ITEM, renderLink(link));
+      model.put("node", link.getNodeRef());
+      model.put("link", link);
+      model.put("site", site);
+      model.put("siteId", site.getShortName());
+      
+      // All done
+      return model;
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/metadata/BulkMetadataGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/metadata/BulkMetadataGet.java
new file mode 100644
index 00000000000..a5d1667e39a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/metadata/BulkMetadataGet.java
@@ -0,0 +1,191 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.metadata;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.charset.Charset;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.QName;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.surf.util.Content;
+import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.json.JSONWriter;
+
+/**
+ * This class is the webscript implementation for the url api/bulkmetadata
+ * It returns basic metadata such as title, parent noderef, name, ... for each noderef that is passed in
+ * 
+ * @since 3.4
+ */
+public class BulkMetadataGet extends AbstractWebScript
+{
+    private ServiceRegistry services;
+    private NodeService nodeService;
+    private DictionaryService dictionaryService;
+    private PermissionService permissionService;
+
+    private String getMimeType(ContentData contentProperty)
+    {
+        String mimetype = null;
+
+        if(contentProperty != null)
+        {
+            mimetype = contentProperty.getMimetype();
+        }
+
+        return mimetype;
+    }
+
+    @Override
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        JSONObject jsonIn;
+        JSONArray nodeRefsArray;
+
+        try
+        {
+            Content c = req.getContent();
+            if (c == null)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Missing POST body.");
+            }
+
+            jsonIn = new JSONObject(c.getContent());
+
+            nodeRefsArray = jsonIn.getJSONArray("nodeRefs");
+            if(nodeRefsArray == null || nodeRefsArray.length() == 0)
+            {
+                throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR, "Must provide node refs");   
+            }
+
+            JSONWriter jsonOut = new JSONWriter(res.getWriter());
+    
+            res.setContentType("application/json");
+            res.setContentEncoding(Charset.defaultCharset().displayName());     // TODO: Should be settable on JSONWriter
+            
+            jsonOut.startObject();
+            {
+                jsonOut.startValue("nodes");
+                {
+                    jsonOut.startArray();
+                    {
+                        for(int i = 0; i < nodeRefsArray.length(); i++)
+                        {
+                            NodeRef nodeRef = new NodeRef(nodeRefsArray.getString(i));
+
+                            if(nodeService.exists(nodeRef))
+                            {
+                                NodeRef parentNodeRef = null;
+                                ChildAssociationRef childAssocRef = nodeService.getPrimaryParent(nodeRef);
+                                if(childAssocRef != null)
+                                {
+                                    parentNodeRef = childAssocRef.getParentRef();
+                                }
+                                QName type = nodeService.getType(nodeRef);
+
+                                String shortType = type.toPrefixString(services.getNamespaceService());
+                                Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
+        
+                                jsonOut.startObject();
+                                {
+                                    jsonOut.writeValue("nodeRef", nodeRef.toString());
+                                    jsonOut.writeValue("parentNodeRef", parentNodeRef.toString());
+                                    jsonOut.writeValue("type", type.toString());
+                                    jsonOut.writeValue("shortType", shortType);
+                                    TypeDefinition typeDef = dictionaryService.getType(type);
+                                    jsonOut.writeValue("typeTitle", typeDef.getTitle(dictionaryService));
+
+                                    jsonOut.writeValue("name", (String)properties.get(ContentModel.PROP_NAME));
+                                    jsonOut.writeValue("title", (String)properties.get(ContentModel.PROP_TITLE));
+                                    jsonOut.writeValue("mimeType", getMimeType((ContentData)properties.get(ContentModel.PROP_CONTENT)));
+                                    jsonOut.writeValue("hasWritePermission", permissionService.hasPermission(nodeRef, PermissionService.WRITE) == AccessStatus.ALLOWED);
+                                    jsonOut.writeValue("hasDeletePermission", permissionService.hasPermission(nodeRef, PermissionService.DELETE) == AccessStatus.ALLOWED);
+                                }
+                                jsonOut.endObject();
+                            }
+                            else
+                            {
+                                jsonOut.startObject();
+                                {
+                                    jsonOut.writeValue("nodeRef", nodeRef.toString());
+                                    jsonOut.writeValue("error", "true");
+                                    jsonOut.writeValue("errorCode", "invalidNodeRef");
+                                    jsonOut.writeValue("errorText", I18NUtil.getMessage("msg.invalidNodeRef", nodeRef.toString()));
+                                }
+                                jsonOut.endObject();
+                            }
+                        }
+                    }
+                    jsonOut.endArray();
+                }
+                jsonOut.endValue();
+            }
+            jsonOut.endObject();
+        }
+        catch (JSONException jErr)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                    "Unable to parse JSON POST body: " + jErr.getMessage());
+        }
+
+        res.getWriter().close();
+
+        res.setStatus(Status.STATUS_OK);
+    }
+    
+    /**
+     * Set the service registry
+     * 
+     * @param services  the service registry
+     */
+    public void setServiceRegistry(ServiceRegistry services)
+    {
+        this.services = services;
+        this.nodeService = services.getNodeService();
+        this.dictionaryService = services.getDictionaryService();
+        this.permissionService = services.getPermissionService();
+    }
+        
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/model/filefolder/FileFolderLoaderPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/model/filefolder/FileFolderLoaderPost.java
new file mode 100644
index 00000000000..188353b4c2a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/model/filefolder/FileFolderLoaderPost.java
@@ -0,0 +1,171 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.model.filefolder;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.alfresco.repo.model.filefolder.FileFolderLoader;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * Link to {@link FileFolderLoader}
+ */
+public class FileFolderLoaderPost extends AbstractWebScript implements ApplicationContextAware
+{
+    public static final String KEY_FOLDER_PATH = "folderPath";
+    public static final String KEY_FILE_COUNT = "fileCount";
+    public static final String KEY_FILES_PER_TXN = "filesPerTxn";
+    public static final String KEY_MIN_FILE_SIZE = "minFileSize";
+    public static final String KEY_MAX_FILE_SIZE = "maxFileSize";
+    public static final String KEY_MAX_UNIQUE_DOCUMENTS = "maxUniqueDocuments";
+    public static final String KEY_FORCE_BINARY_STORAGE = "forceBinaryStorage";
+    public static final String KEY_DESCRIPTION_COUNT = "descriptionCount";
+    public static final String KEY_DESCRIPTION_SIZE = "descriptionSize";
+    public static final String KEY_COUNT = "count";
+    
+    public static final int DEFAULT_FILE_COUNT = 100;
+    public static final int DEFAULT_FILES_PER_TXN = 100;
+    public static final long DEFAULT_MIN_FILE_SIZE = 80*1024L;
+    public static final long DEFAULT_MAX_FILE_SIZE = 120*1024L;
+    public static final long DEFAULT_MAX_UNIQUE_DOCUMENTS = Long.MAX_VALUE;
+    public static final int DEFAULT_DESCRIPTION_COUNT = 1;
+    public static final long DEFAULT_DESCRIPTION_SIZE = 128L;
+    public static final boolean DEFAULT_FORCE_BINARY_STORAGE = false;
+    
+    private ApplicationContext applicationContext;
+    
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
+    {
+        this.applicationContext = applicationContext;
+    }
+    
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        FileFolderLoader loader = (FileFolderLoader) applicationContext.getBean("fileFolderLoader");
+        
+        int count = 0;
+        String folderPath = "";
+        try
+        {
+            JSONObject json = new JSONObject(new JSONTokener(req.getContent().getContent()));
+            folderPath = json.getString(KEY_FOLDER_PATH);
+            if (folderPath == null)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, KEY_FOLDER_PATH + " not supplied.");
+            }
+            int fileCount = 100;
+            if (json.has(KEY_FILE_COUNT))
+            {
+                fileCount = json.getInt(KEY_FILE_COUNT);
+            }
+            int filesPerTxn = DEFAULT_FILES_PER_TXN;
+            if (json.has(KEY_FILES_PER_TXN))
+            {
+                filesPerTxn = json.getInt(KEY_FILES_PER_TXN);
+            }
+            long minFileSize = DEFAULT_MIN_FILE_SIZE;
+            if (json.has(KEY_MIN_FILE_SIZE))
+            {
+                minFileSize = json.getInt(KEY_MIN_FILE_SIZE);
+            }
+            long maxFileSize = DEFAULT_MAX_FILE_SIZE;
+            if (json.has(KEY_MAX_FILE_SIZE))
+            {
+                maxFileSize = json.getInt(KEY_MAX_FILE_SIZE);
+            }
+            long maxUniqueDocuments = DEFAULT_MAX_UNIQUE_DOCUMENTS;
+            if (json.has(KEY_MAX_UNIQUE_DOCUMENTS))
+            {
+                maxUniqueDocuments = json.getInt(KEY_MAX_UNIQUE_DOCUMENTS);
+            }
+            boolean forceBinaryStorage = DEFAULT_FORCE_BINARY_STORAGE;
+            if (json.has(KEY_FORCE_BINARY_STORAGE))
+            {
+                forceBinaryStorage = json.getBoolean(KEY_FORCE_BINARY_STORAGE);
+            }
+            int descriptionCount = DEFAULT_DESCRIPTION_COUNT;
+            if (json.has(KEY_DESCRIPTION_COUNT))
+            {
+                descriptionCount = json.getInt(KEY_DESCRIPTION_COUNT);
+            }
+            long descriptionSize = DEFAULT_DESCRIPTION_SIZE;
+            if (json.has(KEY_DESCRIPTION_SIZE))
+            {
+                descriptionSize = json.getLong(KEY_DESCRIPTION_SIZE);
+            }
+            
+            // Perform the load
+            count = loader.createFiles(
+                    folderPath,
+                    fileCount, filesPerTxn,
+                    minFileSize, maxFileSize,
+                    maxUniqueDocuments,
+                    forceBinaryStorage,
+                    descriptionCount, descriptionSize);
+        }
+        catch (FileNotFoundException e)
+        {
+            throw new WebScriptException(Status.STATUS_NOT_FOUND, "Folder not found: ", folderPath);
+        }
+        catch (IOException iox)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not read content from req.", iox);
+        }
+        catch (JSONException je)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from req.", je);
+        }
+        // Write the response
+        OutputStream os = res.getOutputStream();
+        try
+        {
+            JSONObject json = new JSONObject();
+            json.put(KEY_COUNT, count);
+            os.write(json.toString().getBytes("UTF-8"));
+        }
+        catch (JSONException e)
+        {
+            throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR, "Failed to write JSON", e);
+        }
+        finally
+        {
+            os.close();
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/node/NodeFolderPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/node/NodeFolderPost.java
new file mode 100644
index 00000000000..fe8a3862b78
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/node/NodeFolderPost.java
@@ -0,0 +1,223 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.node;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the webscript for creating child folders, of either a Node or a Site Container.
+ * 
+ * @since 4.1
+ */
+public class NodeFolderPost extends DeclarativeWebScript
+{
+    private NodeService nodeService;
+    private SiteService siteService;
+    private NamespaceService namespaceService;
+    private DictionaryService dictionaryService;
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        // Identify the Node they want to create a child of
+        SiteInfo site = null;
+        String container = null;
+        NodeRef parentNodeRef = null;
+        
+        Map<String,String> templateArgs = req.getServiceMatch().getTemplateVars();
+        if (templateArgs.get("site") != null && templateArgs.get("container") != null)
+        {
+            // Site based request
+            site = siteService.getSite(templateArgs.get("site"));
+            if (site == null)
+            {
+                status.setCode(Status.STATUS_NOT_FOUND);
+                status.setRedirect(true);
+                return null;
+            }
+            
+            // Check the container exists
+            container = templateArgs.get("container");
+            NodeRef containerNodeRef = siteService.getContainer(site.getShortName(), container);
+            if (containerNodeRef == null)
+            {
+                status.setCode(Status.STATUS_NOT_FOUND);
+                status.setRedirect(true);
+                return null;
+            }
+            
+            // Work out where to put it
+            if (templateArgs.get("path") != null)
+            {
+                // Nibble our way along the / delimited path, starting from the container
+                parentNodeRef = containerNodeRef;
+                StringTokenizer st = new StringTokenizer(templateArgs.get("path"), "/");
+                while (st.hasMoreTokens())
+                {
+                    String childName = st.nextToken();
+                    parentNodeRef = nodeService.getChildByName(parentNodeRef, ContentModel.ASSOC_CONTAINS, childName);
+                    if (parentNodeRef == null)
+                    {
+                        status.setCode(Status.STATUS_NOT_FOUND);
+                        status.setRedirect(true);
+                        return null;
+                    }
+                }
+            }
+            else
+            {
+                // Direct child of the container
+                parentNodeRef = containerNodeRef;
+            }
+        }
+        else if (templateArgs.get("store_type") != null && templateArgs.get("store_id") != null
+                 && templateArgs.get("id") != null)
+        {
+            // NodeRef based creation
+            parentNodeRef = new NodeRef(templateArgs.get("store_type"), 
+                                    templateArgs.get("store_id"), templateArgs.get("id"));
+            if (! nodeService.exists(parentNodeRef))
+            {
+                status.setCode(Status.STATUS_NOT_FOUND);
+                status.setRedirect(true);
+                return null;
+            }
+        }
+        else
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "No parent details found");
+        }
+        
+        
+        // Process the JSON post details
+        JSONObject json = null;
+        JSONParser parser = new JSONParser();
+        try
+        {
+           json = (JSONObject)parser.parse(req.getContent().getContent());
+        }
+        catch (IOException io)
+        {
+           throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid JSON: " + io.getMessage());
+        }
+        catch (ParseException pe)
+        {
+           throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid JSON: " + pe.getMessage());
+        }
+
+        
+        // Fetch the name, title and description
+        String name = (String)json.get("name");
+        if (name == null)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Name is required");
+        }
+                
+        String title = (String)json.get("title");
+        if (title == null)
+        {
+            title = name;
+        }
+        String description = (String)json.get("description");
+        
+        Map<QName,Serializable> props = new HashMap<QName, Serializable>();
+        props.put(ContentModel.PROP_NAME, name);
+        props.put(ContentModel.PROP_TITLE, title);
+        props.put(ContentModel.PROP_DESCRIPTION, description);
+        
+        
+        // Verify the type is allowed
+        QName type = ContentModel.TYPE_FOLDER;
+        if (json.get("type") != null)
+        {
+            type = QName.createQName( (String)json.get("type"), namespaceService );
+            if (! dictionaryService.isSubClass(type, ContentModel.TYPE_FOLDER))
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Specified type is not a folder");
+            }
+        }
+        
+        
+        // Have the node created
+        NodeRef nodeRef = null;
+        try
+        {
+            nodeRef = nodeService.createNode(parentNodeRef, ContentModel.ASSOC_CONTAINS, 
+                    QName.createQName(name), type, props).getChildRef();
+        }
+        catch (AccessDeniedException e)
+        {
+            throw new WebScriptException(Status.STATUS_FORBIDDEN, "You don't have permission to create the node");
+        }
+        
+        // Report the details
+        Map<String,Object> model = new HashMap<String, Object>();
+        model.put("nodeRef", nodeRef);
+        model.put("site", site);
+        model.put("container", container);
+        model.put("parentNodeRef", parentNodeRef);
+        return model;
+    }
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorGet.java
new file mode 100644
index 00000000000..b21e967918b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorGet.java
@@ -0,0 +1,112 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.nodelocator;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.nodelocator.NodeLocatorService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.springframework.extensions.surf.util.URLDecoder;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Nick Smith
+ * @since 4.0
+ */
+public class NodeLocatorGet extends DeclarativeWebScript
+{
+    private static final String NODE_ID = "node_id";
+    private static final String STORE_ID = "store_id";
+    private static final String STORE_TYPE = "store_type";
+    private static final String NODE_LOCATOR_NAME = "node_locator_name";
+    private NodeLocatorService locatorService;
+    
+    /**
+    * {@inheritDoc}
+    */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        Map<String, String> vars = req.getServiceMatch().getTemplateVars();
+        // getting task id from request parameters
+        String locatorName = vars.get(NODE_LOCATOR_NAME);
+
+        // No locatorname specified -> return 404
+        if (locatorName == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "No NodeLocator strategy was specified!");
+        }
+
+        NodeRef source = null;
+        String storeType = vars.get(STORE_TYPE);
+        String storeId= vars.get(STORE_ID);
+        String nodeId= vars.get(NODE_ID);
+        if (storeType != null && storeId != null && nodeId != null)
+        {
+            source = new NodeRef(storeType, storeId, nodeId);
+        }
+        
+        Map<String, Serializable> params = mapParams(req);
+        
+        NodeRef node = locatorService.getNode(locatorName, source, params);
+        
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("nodeRef", node==null ? null : node.toString());
+        return model;
+    }
+
+    private Map<String, Serializable> mapParams(WebScriptRequest req)
+    {
+        Map<String, Serializable> params = new HashMap<String, Serializable>();
+        for (String key: req.getParameterNames())
+        {
+            String value = req.getParameter(key);
+            if (value != null)
+            {
+                String decodedValue = URLDecoder.decode(value);
+                // TODO Handle type conversions here.
+                params.put(key, decodedValue);
+            }
+        }
+        return params;
+    }
+
+    /**
+     * @param locatorService the locatorService to set
+     */
+    public void setNodeLocatorService(NodeLocatorService locatorService)
+    {
+        this.locatorService = locatorService;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/person/ChangePasswordPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/person/ChangePasswordPost.java
new file mode 100644
index 00000000000..870d1d745de
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/person/ChangePasswordPost.java
@@ -0,0 +1,145 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.person;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.surf.util.Content;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript implementation for the POST method for 'changepassword' API.
+ * 
+ * @author Kevin Roast
+ */
+public class ChangePasswordPost extends DeclarativeWebScript
+{
+    private static final String PARAM_NEWPW = "newpw";
+    private static final String PARAM_OLDPW = "oldpw";
+    private MutableAuthenticationService authenticationService;
+    private AuthorityService authorityService;
+    
+    
+    /**
+     * @param authenticationService    the AuthenticationService to set
+     */
+    public void setAuthenticationService(MutableAuthenticationService authenticationService)
+    {
+        this.authenticationService = authenticationService;
+    }
+    
+    /**
+     * @param authorityService          the AuthorityService to set
+     */
+    public void setAuthorityService(AuthorityService authorityService)
+    {
+        this.authorityService = authorityService;
+    }
+    
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.Status)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        // Extract user name from the URL - cannot be null or webscript desc would not match
+        String userName = req.getExtensionPath();
+        
+        // Extract old and new password details from JSON POST
+        Content c = req.getContent();
+        if (c == null)
+        {
+            throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR, "Missing POST body.");
+        }
+        JSONObject json;
+        try
+        {
+            json = new JSONObject(c.getContent());
+            
+            String oldPassword = null;
+            String newPassword;
+            
+            // admin users can change/set a password without knowing the old one
+            boolean isAdmin = authorityService.hasAdminAuthority();
+            if (!isAdmin || (userName.equalsIgnoreCase(authenticationService.getCurrentUserName())))
+            {
+                if (!json.has(PARAM_OLDPW) || json.getString(PARAM_OLDPW).length() == 0)
+                {
+                    throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                        "Old password 'oldpw' is a required POST parameter.");
+                }
+                oldPassword = json.getString(PARAM_OLDPW);
+            }
+            if (!json.has(PARAM_NEWPW) || json.getString(PARAM_NEWPW).length() == 0)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                    "New password 'newpw' is a required POST parameter.");
+            }
+            newPassword = json.getString(PARAM_NEWPW);
+            
+            // update the password
+            // an Admin user can update without knowing the original pass - but must know their own!
+            if (!isAdmin || (userName.equalsIgnoreCase(authenticationService.getCurrentUserName())))
+            {
+                authenticationService.updateAuthentication(userName, oldPassword.toCharArray(), newPassword.toCharArray());
+            }
+            else
+            {
+                authenticationService.setAuthentication(userName, newPassword.toCharArray());
+            }
+        }
+        catch (AuthenticationException err)
+        {
+            throw new WebScriptException(Status.STATUS_UNAUTHORIZED,
+                    "Do not have appropriate auth or wrong auth details provided.");
+        }
+        catch (JSONException jErr)
+        {
+            throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR,
+                    "Unable to parse JSON POST body: " + jErr.getMessage());
+        }
+        catch (IOException ioErr)
+        {
+            throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR,
+                    "Unable to retrieve POST body: " + ioErr.getMessage());
+        }
+        
+        Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
+        model.put("success", Boolean.TRUE);
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/person/UserCSVUploadGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/person/UserCSVUploadGet.java
new file mode 100644
index 00000000000..66439eda593
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/person/UserCSVUploadGet.java
@@ -0,0 +1,107 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.person;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.repo.web.scripts.DeclarativeSpreadsheetWebScript;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.apache.commons.csv.CSVPrinter;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * Webscript implementation for giving information on uploading
+ *  users via a CSV.
+ * 
+ * @author Nick Burch
+ */
+public class UserCSVUploadGet extends DeclarativeSpreadsheetWebScript
+{
+   public UserCSVUploadGet()
+   {
+      this.filenameBase = "ExampleUserUpload";
+   }
+
+	/**
+	 * We have a HTML version
+	 */
+    @Override
+	protected boolean allowHtmlFallback() {
+		return true;
+	}
+
+    /**
+     * We don't have a resource
+     */
+	@Override
+	protected Object identifyResource(String format, WebScriptRequest req) {
+		return null;
+	}
+
+	@Override
+	protected List<Pair<QName, Boolean>> buildPropertiesForHeader(
+			Object resource, String format, WebScriptRequest req) {
+		List<Pair<QName,Boolean>> properties = 
+			new ArrayList<Pair<QName,Boolean>>(UserCSVUploadPost.COLUMNS.length);
+		boolean required = true;
+		for(QName qname : UserCSVUploadPost.COLUMNS) 
+		{
+			Pair<QName,Boolean> p = null;
+			if(qname != null)
+			{
+				p = new Pair<QName, Boolean>(qname, required);
+			}
+			else
+			{
+				required = false;
+			}
+			properties.add(p);
+		}
+		return properties;
+	}
+
+   @Override
+   protected void populateBody(Object resource, CSVPrinter csv, List<QName> properties) throws IOException {
+       // Just a blank line is needed
+       csv.println();
+   }
+
+   @Override
+   protected void populateBody(Object resource, Workbook workbook, Sheet sheet,
+		       List<QName> properties) throws IOException {
+       // Set the sheet name
+       workbook.setSheetName(0, "UsersToAdd");
+
+       // Add a blank line
+       sheet.createRow(1);
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/person/UserCSVUploadPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/person/UserCSVUploadPost.java
new file mode 100644
index 00000000000..91ebb705808
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/person/UserCSVUploadPost.java
@@ -0,0 +1,604 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.person;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Serializable;
+import java.nio.charset.Charset;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.person.PersonServiceImpl;
+import org.alfresco.repo.tenant.TenantDomainMismatchException;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.lang3.mutable.MutableInt;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.util.PaneInformation;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.DataFormatter;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.servlet.FormData;
+
+/**
+ * Webscript implementation for the POST method for uploading a
+ *  CSV of users to have them created.
+ * 
+ * @author Nick Burch
+ * @since 3.5
+ */
+public class UserCSVUploadPost extends DeclarativeWebScript
+{
+    protected static final QName[] COLUMNS = new QName[] {
+        ContentModel.PROP_USERNAME, ContentModel.PROP_FIRSTNAME, 
+        ContentModel.PROP_LASTNAME, ContentModel.PROP_EMAIL, 
+        null,
+        ContentModel.PROP_PASSWORD, ContentModel.PROP_ORGANIZATION, 
+        ContentModel.PROP_JOBTITLE, ContentModel.PROP_LOCATION,
+        ContentModel.PROP_TELEPHONE, ContentModel.PROP_MOBILE,
+        ContentModel.PROP_SKYPE, ContentModel.PROP_INSTANTMSG,
+        ContentModel.PROP_GOOGLEUSERNAME,
+        ContentModel.PROP_COMPANYADDRESS1, ContentModel.PROP_COMPANYADDRESS2,
+        ContentModel.PROP_COMPANYADDRESS3, ContentModel.PROP_COMPANYPOSTCODE,
+        ContentModel.PROP_COMPANYTELEPHONE, ContentModel.PROP_COMPANYFAX,
+        ContentModel.PROP_COMPANYEMAIL
+    };
+    
+    private static final String ERROR_BAD_FORM = "person.err.userCSV.invalidForm";
+    private static final String ERROR_NO_FILE = "person.err.userCSV.noFile";
+    private static final String ERROR_CORRUPT_FILE = "person.err.userCSV.corruptFile";
+    private static final String ERROR_GENERAL = "person.err.userCSV.general";
+    private static final String ERROR_BLANK_COLUMN = "person.err.userCSV.blankColumn";
+    private static final String MSG_CREATED = "person.msg.userCSV.created";
+    private static final String MSG_EXISTING = "person.msg.userCSV.existing";
+    
+    private static Log logger = LogFactory.getLog(UserCSVUploadPost.class);
+    
+    private MutableAuthenticationService authenticationService;
+    private AuthorityService authorityService;
+    private PersonService personService;
+    private TenantService tenantService;
+    private DictionaryService dictionaryService;
+    private RetryingTransactionHelper retryingTransactionHelper;
+    
+    /**
+     * @param authenticationService    the AuthenticationService to set
+     */
+    public void setAuthenticationService(MutableAuthenticationService authenticationService)
+    {
+        this.authenticationService = authenticationService;
+    }
+    
+    /**
+     * @param authorityService          the AuthorityService to set
+     */
+    public void setAuthorityService(AuthorityService authorityService)
+    {
+        this.authorityService = authorityService;
+    }
+    
+    /**
+     * @param personService          the PersonService to set
+     */
+    public void setPersonService(PersonService personService)
+    {
+        this.personService = personService;
+    }
+    
+    /**
+     * @param tenantService          the TenantService to set
+     */
+    public void setTenantService(TenantService tenantService)
+    {
+        this.tenantService = tenantService;
+    }
+    
+    /**
+     * @param dictionaryService          the DictionaryService to set
+     */
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService;
+    }
+    
+    /**
+     * @param retryingTransactionHelper  the helper for running transactions to set
+     */
+    public void setTransactionHelper(RetryingTransactionHelper retryingTransactionHelper)
+    {
+        this.retryingTransactionHelper = retryingTransactionHelper;
+    }
+    
+    
+    /**
+     * @see DeclarativeWebScript#executeImpl(org.springframework.extensions.webscripts.WebScriptRequest, org.springframework.extensions.webscripts.Status)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        final List<Map<QName,String>> users = new ArrayList<Map<QName,String>>();
+        final ResourceBundle rb = getResources();
+        
+
+        // Try to load the user details from the upload
+        FormData form = (FormData)req.parseContent();
+        if (form == null || !form.getIsMultiPart())
+        {
+            throw new ResourceBundleWebScriptException(Status.STATUS_BAD_REQUEST, rb, ERROR_BAD_FORM);
+        }
+        
+        boolean processed = false;
+        for (FormData.FormField field : form.getFields())
+        {
+            if (field.getIsFile())
+            {
+                processUpload(
+                        field.getInputStream(),
+                        field.getFilename(),
+                        users);
+                processed = true;
+                break;
+            }
+        }
+        
+        if (!processed)
+        {
+            throw new ResourceBundleWebScriptException(Status.STATUS_BAD_REQUEST, rb, ERROR_NO_FILE);
+        }
+        
+        // Should we send emails?
+        boolean sendEmails = true;
+        if (req.getParameter("email") != null)
+        {
+            sendEmails = Boolean.parseBoolean(req.getParameter("email"));
+        }
+        
+        if (form.hasField("email"))
+        {
+            sendEmails = Boolean.parseBoolean(form.getParameters().get("email")[0]);
+        }
+        
+        // Now process the users
+        final MutableInt totalUsers = new MutableInt(0);
+        final MutableInt addedUsers = new MutableInt(0);
+        final Map<String, String> results = new HashMap<String, String>();
+        final boolean doSendEmails = sendEmails;
+
+        // Do the work in a new transaction, so that if we hit a problem
+        //  during the commit stage (eg too many users) then we get to
+        //  hear about it, and handle it ourselves.
+        // Otherwise, commit exceptions occur deep inside RepositoryContainer
+        //  and we can't control the status code
+        RetryingTransactionCallback<Void> work = new RetryingTransactionCallback<Void>()
+        {
+            public Void execute() throws Throwable
+            {
+                try
+                {
+                    doAddUsers(totalUsers, addedUsers, results, users, rb, doSendEmails);
+                    return null;
+                }
+                catch (Throwable t)
+                {
+                    // Make sure we rollback from this
+                    UserTransaction userTrx = RetryingTransactionHelper.getActiveUserTransaction();
+                    if (userTrx != null && userTrx.getStatus() != javax.transaction.Status.STATUS_MARKED_ROLLBACK)
+                    {
+                        try
+                        {
+                            userTrx.setRollbackOnly();
+                        }
+                        catch (Throwable t2) {}
+                    }
+                    // Report the problem further down
+                    throw t;
+                }
+            }
+        };
+        
+        try
+        {
+            retryingTransactionHelper.doInTransaction(work);
+        }
+        catch (Throwable t)
+        {
+            // Tell the client of the problem
+            if (t instanceof WebScriptException)
+            {
+                // We've already wrapped it properly, all good
+                throw (WebScriptException)t;
+            }
+            else
+            {
+                // Something unexpected has ripped up
+                // Return the details with a 200, so that Share does the right thing
+                throw new ResourceBundleWebScriptException(
+                        Status.STATUS_OK, rb, ERROR_GENERAL, t);
+            }
+        }
+
+        
+        // If we get here, then adding the users didn't throw any exceptions,
+        //  so tell the client which users went in and which didn't
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("totalUsers", totalUsers);
+        model.put("addedUsers", addedUsers);
+        model.put("users", results);
+        
+        return model;
+    }
+                
+    private void doAddUsers(final MutableInt totalUsers, final MutableInt addedUsers,
+            final Map<String, String> results, final List<Map<QName,String>> users,
+            final ResourceBundle rb, final boolean sendEmails)
+    {
+        for (Map<QName,String> user : users)
+        {
+            totalUsers.setValue( totalUsers.intValue()+1 );
+            
+            // Grab the username, and do any MT magic on it
+            String username = user.get(ContentModel.PROP_USERNAME);
+            try
+            {
+                username = PersonServiceImpl.updateUsernameForTenancy(username, tenantService);
+            }
+            catch (TenantDomainMismatchException e)
+            {
+                throw new ResourceBundleWebScriptException(
+                        Status.STATUS_OK, rb,
+                        ERROR_GENERAL, e);
+            }
+            
+            // Do they already exist?
+            if (personService.personExists(username))
+            {
+                results.put(username, rb.getString(MSG_EXISTING));
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Not creating user as already exists: " + username + " for " + user);
+                }
+            }
+            else
+            {
+                String password = user.get(ContentModel.PROP_PASSWORD);
+                user.remove(ContentModel.PROP_PASSWORD); // Not for the person service
+                
+                try
+                {
+                    // Add the person
+                    personService.createPerson( (Map<QName,Serializable>)(Map)user );
+                    
+                    // Add the underlying user
+                    authenticationService.createAuthentication(username, password.toCharArray());
+                    
+                    // If required, notify the user
+                    if (sendEmails)
+                    {
+                        personService.notifyPerson(username, password);
+                    }
+                    
+                    if (logger.isDebugEnabled())
+                    {
+                        logger.debug("Creating user from upload: " + username + " for " + user);
+                    }
+                    
+                    // All done
+                    String msg = MessageFormat.format(
+                            rb.getString(MSG_CREATED),
+                            new Object[] { user.get(ContentModel.PROP_EMAIL) });
+                    results.put(username, msg);
+                    addedUsers.setValue( addedUsers.intValue()+1 );
+                }
+                catch (Throwable t)
+                {
+                    throw new ResourceBundleWebScriptException(
+                            Status.STATUS_OK, rb, ERROR_GENERAL, t);
+                }
+            }
+        }
+    }
+    
+    protected void processUpload(InputStream input, String filename, List<Map<QName,String>> users)
+    {
+        try
+        {
+            if (filename != null && filename.length() > 0)
+            {
+                if (filename.endsWith(".csv"))
+                {
+                    processCSVUpload(input, users);
+                    return;
+                }
+                if (filename.endsWith(".xls"))
+                {
+                    processXLSUpload(input, users);
+                    return;
+                }
+                if (filename.endsWith(".xlsx"))
+                {
+                    processXLSXUpload(input, users);
+                    return;
+                }
+            }
+            
+            // If in doubt, assume it's probably a .csv
+            processCSVUpload(input, users);
+        } 
+        catch (IOException e)
+        {
+            // Return the error as a 200 so the user gets a friendly
+            //  display of the error message in share
+            throw new ResourceBundleWebScriptException(
+                    Status.STATUS_OK, getResources(),
+                    ERROR_CORRUPT_FILE, e);
+        }
+    }
+    
+    protected void processCSVUpload(InputStream input, List<Map<QName,String>> users)
+        throws IOException
+    {
+        InputStreamReader reader = new InputStreamReader(input, Charset.forName("UTF-8"));
+        CSVFormat format = CSVFormat.EXCEL;
+        CSVParser csv = format.parse(reader);
+
+        String[][] data = csv.getRecords().stream()
+            .map(record -> {
+                List<String> recordValues = new ArrayList<>();
+                record.iterator().forEachRemaining(recordValues::add);
+                return recordValues.toArray(String[]::new);
+            }).toArray(String[][]::new);
+
+        if (data.length > 0)
+        {
+            processSpreadsheetUpload(data, users);
+        }
+    }
+    
+    protected void processXLSUpload(InputStream input, List<Map<QName,String>> users)
+        throws IOException
+    {
+        Workbook wb = new HSSFWorkbook(input);
+        processSpreadsheetUpload(wb, users);
+    }
+    
+    protected void processXLSXUpload(InputStream input, List<Map<QName,String>> users)
+        throws IOException
+    {
+        Workbook wb = new XSSFWorkbook(input);
+        processSpreadsheetUpload(wb, users);
+    }
+    
+    private void processSpreadsheetUpload(Workbook wb, List<Map<QName,String>> users)
+        throws IOException
+    {
+        if (wb.getNumberOfSheets() > 1)
+        {
+            logger.info("Uploaded Excel file has " + wb.getNumberOfSheets() + 
+                    " sheets, ignoring  all except the first one"); 
+        }
+        
+        int firstRow = 0;
+        Sheet s = wb.getSheetAt(0);
+        DataFormatter df = new DataFormatter();
+        
+        String[][] data = new String[s.getLastRowNum()+1][];
+                                     
+        // If there is a heading freezepane row, skip it
+        PaneInformation pane = s.getPaneInformation();
+        if (pane != null && pane.isFreezePane() && pane.getHorizontalSplitTopRow() > 0)
+        {
+            firstRow = pane.getHorizontalSplitTopRow();
+            logger.debug("Skipping excel freeze header of " + firstRow + " rows");
+        }
+        
+        // Process each row in turn, getting columns up to our limit
+        for (int row=firstRow; row <= s.getLastRowNum(); row++)
+        {
+            Row r = s.getRow(row);
+            if (r != null)
+            {
+                String[] d = new String[COLUMNS.length];
+                for (int cn=0; cn<COLUMNS.length; cn++)
+                {
+                    Cell cell = r.getCell(cn);
+                    if (cell != null && cell.getCellType() != CellType.BLANK)
+                    {
+                        d[cn] = df.formatCellValue(cell);
+                    }
+                }
+                data[row] = d;
+            }
+        }
+        
+        // Handle the contents
+        processSpreadsheetUpload(data, users);
+    }
+    
+    /**
+     * Builds user objects based on the supplied data. If a row is empty, then
+     *  the child String array should be empty too. (Needs to be present so that
+     *  the line number reporting works)
+     */
+    private void processSpreadsheetUpload(String[][] data, List<Map<QName,String>> users)
+    {
+        // What we consider to be the literal string "user name" when detecting
+        //  if a row is an example/header one or not
+        // Note - all of these want to be lower case!
+        List<String> usernameIsUsername = new ArrayList<String>();
+        // The English literals
+        usernameIsUsername.add("username");
+        usernameIsUsername.add("user name");
+        // And the localised form too if found
+        PropertyDefinition unPD = dictionaryService.getProperty(ContentModel.PROP_USERNAME);
+        if (unPD != null)
+        {
+            if(unPD.getTitle(dictionaryService) != null)
+                usernameIsUsername.add(unPD.getTitle(dictionaryService).toLowerCase());
+            if(unPD.getDescription(dictionaryService) != null)
+                usernameIsUsername.add(unPD.getDescription(dictionaryService).toLowerCase());
+        }
+        
+        
+        // Process the contents of the spreadsheet
+        for (int lineNumber=0; lineNumber<data.length; lineNumber++)
+        {
+            Map<QName,String> user = new HashMap<QName, String>();
+            String[] userData = data[lineNumber];
+            
+            if (userData == null || userData.length == 0 || 
+               (userData.length == 1 && userData[0].trim().length() == 0))
+            {
+                // Empty line, skip
+                continue;
+            }
+            
+            boolean required = true;
+            for (int i=0; i<COLUMNS.length; i++)
+            {
+                if (COLUMNS[i] == null)
+                {
+                    required = false;
+                    continue;
+                }
+                
+                String value = null;
+                if (userData.length > i)
+                {
+                    value = userData[i];
+                }
+                if (value == null || value.length() == 0)
+                {
+                    if (required)
+                    {
+                        throw new ResourceBundleWebScriptException(
+                                Status.STATUS_OK, getResources(),
+                                ERROR_BLANK_COLUMN, new Object[] {
+                                        COLUMNS[i].getLocalName(), (i+1), (lineNumber+1)});
+                    }
+                }
+                else
+                {
+                    user.put(COLUMNS[i], value);
+                }
+            }
+
+            // If no password was given, use their surname
+            if (!user.containsKey(ContentModel.PROP_PASSWORD))
+            {
+                user.put(ContentModel.PROP_PASSWORD, "");
+            }
+            
+            // Skip any user who looks like an example file heading
+            // i.e. a username of "username" or "user name"
+            String username = user.get(ContentModel.PROP_USERNAME).toLowerCase();
+            if (usernameIsUsername.contains(username))
+            {
+                // Skip
+            }
+            else
+            {
+                // Looks like a real line, keep it
+                users.add(user);
+            }
+        }
+    }
+    
+    protected static class ResourceBundleWebScriptException extends WebScriptException 
+    {
+        private String message;
+        
+        public ResourceBundleWebScriptException(int status, ResourceBundle rb, String msgId, Object... args)
+        {
+            super(status, msgId, args);
+            buildMessageIfPossible(rb, msgId, args);
+        }
+        
+        public ResourceBundleWebScriptException(int status, ResourceBundle rb, String msgId)
+        {
+            super(status, msgId);
+            buildMessageIfPossible(rb, msgId, new Object[0]);
+        }
+        
+        public ResourceBundleWebScriptException(int status, ResourceBundle rb, String msgId, Throwable cause)
+        {
+            super(status, msgId, cause);
+            buildMessageIfPossible(rb, msgId, new Object[0]);
+        }
+        
+        public String getMessage()
+        {
+            return message;
+        }
+        
+        private void buildMessageIfPossible(ResourceBundle rb, String msgId, Object... args)
+        {
+            String msg = rb.getString(msgId);
+            if (msg != null)
+            {
+                if (args == null || args.length == 0)
+                {
+                    message = msg;
+                }
+                else
+                {
+                    message = MessageFormat.format(msg, args);
+                }
+            }
+            if (getCause() != null)
+            {
+                message = message + "\n" + getCause().getMessage();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/AbstractQuickShareContent.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/AbstractQuickShareContent.java
new file mode 100644
index 00000000000..5aed93f4dfe
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/AbstractQuickShareContent.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.quickshare;
+
+import org.alfresco.service.cmr.quickshare.QuickShareService;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+
+
+/**
+ * QuickShare/PublicView
+ * 
+ * @author janv
+ * @since Cloud/4.2
+ */
+public abstract class AbstractQuickShareContent extends DeclarativeWebScript
+{
+    protected QuickShareService quickShareService;
+    
+    private boolean enabled = true;
+    
+    public void setQuickShareService(QuickShareService quickShareService)
+    {
+        this.quickShareService = quickShareService;
+    }
+    
+    public void setEnabled(boolean enabled)
+    {
+        this.enabled = enabled;
+    }
+    
+    protected boolean isEnabled()
+    {
+        return this.enabled;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/MetaDataGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/MetaDataGet.java
new file mode 100644
index 00000000000..19d146ce1e6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/MetaDataGet.java
@@ -0,0 +1,85 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.quickshare;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.web.scripts.WebScriptUtil;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * QuickShare/PublicView
+ * 
+ * GET web script to get limited metadata (including thumbnail defs) => authenticated web script (using a nodeRef)
+ * 
+ * Note: authenticated web script (equivalent to unauthenticated version - see QuickShareMetaDataGet)
+ * 
+ * @author janv
+ * @since Cloud/4.2
+ */
+public class MetaDataGet extends AbstractQuickShareContent
+{
+    private static final Log logger = LogFactory.getLog(QuickShareMetaDataGet.class);
+    
+    @Override
+    protected Map<String, Object> executeImpl(final WebScriptRequest req, Status status, Cache cache)
+    {
+        // create map of params (template vars)
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+        final NodeRef nodeRef = WebScriptUtil.getNodeRef(params);
+        if (nodeRef == null)
+        {
+            String msg = "A valid NodeRef must be specified!";
+            throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, msg);
+        }
+        
+        try
+        {
+            Map<String, Object> model = quickShareService.getMetaData(nodeRef);
+            
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Retrieved limited metadata: "+nodeRef+" ["+model+"]");
+            }
+            
+            return model;
+        }
+        catch (InvalidNodeRefException inre)
+        {
+            logger.error("Unable to find node: "+inre.getNodeRef());
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find nodeRef: "+inre.getNodeRef());
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareContentGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareContentGet.java
new file mode 100644
index 00000000000..29429860364
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareContentGet.java
@@ -0,0 +1,187 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.quickshare;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.model.QuickShareModel;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.repo.web.scripts.content.ContentGet;
+import org.alfresco.repo.web.scripts.content.StreamContent;
+import org.alfresco.service.cmr.quickshare.InvalidSharedIdException;
+import org.alfresco.service.cmr.quickshare.QuickShareService;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.web.context.ServletContextAware;
+
+
+/**
+ * QuickShare/PublicView
+ * 
+ * GET web script to get stream "shared" content (ie. enabled for public/unauthenticated access) from the repository
+ *
+ * WARNING: **unauthenticated** web script (equivalent to authenticated version - see ContentGet.java)
+ * 
+ * @author janv
+ * @since Cloud/4.2
+ */
+public class QuickShareContentGet extends ContentGet implements ServletContextAware
+{
+    private static final Log logger = LogFactory.getLog(QuickShareContentGet.class);
+    
+    private NodeService nodeService;
+    private NamespaceService namespaceService;
+    private QuickShareService quickShareSerivce;
+    
+    private boolean enabled = true;
+    
+    
+    public void setServletContext(ServletContext servletContext)
+    {
+    }
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+        super.setNodeService(nodeService);
+    }
+    
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+    
+    public void setQuickShareService(QuickShareService quickShareService)
+    {
+        this.quickShareSerivce = quickShareService;
+    }
+    
+    public void setEnabled(boolean enabled)
+    {
+        this.enabled = enabled;
+    }
+    
+    protected boolean isEnabled()
+    {
+        return this.enabled;
+    }
+    
+    
+    @Override
+    public void execute(final WebScriptRequest req, final WebScriptResponse res) throws IOException
+    {
+        if (! isEnabled())
+        {
+            throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "QuickShare is disabled system-wide");
+        }
+        
+        // create map of template vars (params)
+        final Map<String, String> params = req.getServiceMatch().getTemplateVars();
+        final String sharedId = params.get("shared_id");
+        if (sharedId == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "A valid sharedId must be specified !");
+        }
+        
+        try
+        {
+            Pair<String, NodeRef> pair = quickShareSerivce.getTenantNodeRefFromSharedId(sharedId);
+            final String tenantDomain = pair.getFirst();
+            final NodeRef nodeRef = pair.getSecond();
+
+            TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+            {
+                public Void doWork() throws Exception
+                {
+                    if (! nodeService.getAspects(nodeRef).contains(QuickShareModel.ASPECT_QSHARE))
+                    {
+                        throw new InvalidNodeRefException(nodeRef);
+                    }
+
+                    // MNT-21118 (XSS prevention)
+                    // Force the attachment in case of asking for the content file only
+                    // (will be overridden for thumbnails)
+                    executeImpl(nodeRef, params, req, res, null, true);
+                    
+                    return null;
+                }
+            }, tenantDomain);
+            
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("QuickShare - retrieved content: "+sharedId+" ["+nodeRef+"]");
+            }
+
+        }
+        catch (InvalidSharedIdException ex)
+        {
+            logger.error("Unable to find: "+sharedId);
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find: "+sharedId);
+        }
+        catch (InvalidNodeRefException inre)
+        {
+            logger.error("Unable to find: "+sharedId+" ["+inre.getNodeRef()+"]");
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find: "+sharedId);
+        }
+    }
+	
+	protected void executeImpl(NodeRef nodeRef, Map<String, String> templateVars, WebScriptRequest req, WebScriptResponse res, Map<String, Object> model, boolean attach) throws IOException
+	{
+	    // render content
+        QName propertyQName = ContentModel.PROP_CONTENT;
+        String contentPart = templateVars.get("property");
+        if (contentPart.length() > 0 && contentPart.charAt(0) == ';')
+        {
+            if (contentPart.length() < 2)
+            {
+                throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "Content property malformed");
+            }
+            String propertyName = contentPart.substring(1);
+            if (propertyName.length() > 0)
+            {
+                propertyQName = QName.createQName(propertyName, namespaceService);
+            }
+        }
+
+        // Stream the content
+        streamContentLocal(req, res, nodeRef, attach, propertyQName, model);
+	}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareEnabledGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareEnabledGet.java
new file mode 100644
index 00000000000..ad7d9675348
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareEnabledGet.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.quickshare;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * QuickShare/PublicView
+ * 
+ * GET web script to get property system.quickshare.enabled value
+ * 
+ * @author sergey.shcherbovich
+ * @since 4.2
+ */
+public class QuickShareEnabledGet extends AbstractQuickShareContent
+{
+    @Override
+    protected Map<String, Object> executeImpl(final WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+        
+        model.put("enabled", isEnabled());
+        
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareMetaDataGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareMetaDataGet.java
new file mode 100644
index 00000000000..c7b9e12f964
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareMetaDataGet.java
@@ -0,0 +1,87 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.quickshare;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.cmr.quickshare.InvalidSharedIdException;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * QuickShare/PublicView
+ * 
+ * GET web script to get limited metadata (including thumbnail defs) for some "shared" content
+ * 
+ * WARNING: **unauthenticated** web script (equivalent to authenticated version - see MetaDataGet.java)
+ * 
+ * @author janv
+ * @since Cloud/4.2
+ */
+public class QuickShareMetaDataGet extends MetaDataGet
+{
+    private static final Log logger = LogFactory.getLog(QuickShareMetaDataGet.class);
+    
+    @Override
+    protected Map<String, Object> executeImpl(final WebScriptRequest req, Status status, Cache cache)
+    {
+        if (! isEnabled())
+        {
+            throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "QuickShare is disabled system-wide");
+        }
+        
+        // create map of params (template vars)
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+        final String sharedId = params.get("shared_id");
+        if (sharedId == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "A valid sharedId must be specified !");
+        }
+        
+        try
+        {
+            return quickShareService.getMetaData(sharedId);
+        }
+        catch (InvalidSharedIdException ex)
+        {
+            logger.error("Unable to find: "+sharedId);
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find: "+sharedId);
+        }
+        catch (InvalidNodeRefException inre)
+        {
+            logger.error("Unable to find: "+sharedId+" ["+inre.getNodeRef()+"]");
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find: "+sharedId);
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareThumbnailContentGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareThumbnailContentGet.java
new file mode 100644
index 00000000000..3706121f4f1
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/QuickShareThumbnailContentGet.java
@@ -0,0 +1,201 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.quickshare;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.jscript.BaseScopableProcessorExtension;
+import org.alfresco.repo.jscript.ScriptNode;
+import org.alfresco.repo.thumbnail.script.ScriptThumbnailService;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.thumbnail.ThumbnailService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.mozilla.javascript.Scriptable;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+
+/**
+ * QuickShare/PublicView 
+ * 
+ * GET web script to stream "shared" thumbnail content (ie. enabled for public/unauthenticated access) from the repository
+ *
+ * WARNING: **unauthenticated** web script (equivalent to authenticated version - see "thumbnail.get.js")
+ * 
+ * @author janv
+ * @since Cloud/4.2
+ */
+public class QuickShareThumbnailContentGet extends QuickShareContentGet
+{
+    private static final Log logger = LogFactory.getLog(QuickShareContentGet.class);
+    
+    private ThumbnailService thumbnailService;
+    private ScriptThumbnailService scriptThumbnailService;
+    private ServiceRegistry serviceRegistry;
+    
+    public void setThumbnailService(ThumbnailService thumbnailService)
+    {
+        this.thumbnailService = thumbnailService;
+    }
+    
+    public void setScriptThumbnailService(ScriptThumbnailService scriptThumbnailService)
+    {
+        this.scriptThumbnailService = scriptThumbnailService;
+    }
+    
+    public void setServiceRegistry(ServiceRegistry services)
+    {
+        this.serviceRegistry = services;
+    }
+    
+	@Override
+	protected void executeImpl(NodeRef nodeRef, Map<String, String> templateVars, WebScriptRequest req, WebScriptResponse res, Map<String, Object> model, boolean attach) throws IOException
+    {	
+        String thumbnailName = templateVars.get("thumbnailname");
+        if (thumbnailName == null)
+        {
+            logger.error("Thumbnail name was not provided: "+nodeRef);
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find " + nodeRef);
+        }
+        
+        // Indicate whether or not the thumbnail can be cached by the browser. Caching is allowed if the lastModified
+        // argument is provided as this is an indication of request uniqueness and therefore the browser will have
+        // the latest thumbnail image.
+        if (model == null)
+        {
+            model = new HashMap<String, Object>(1);
+        }
+        
+        if (req.getParameter("lastModified") != null)
+        {
+            model.put("allowBrowserToCache", "true");  // note: must be String not boolean
+        }
+        else
+        {
+            model.put("allowBrowserToCache", "false"); // note: must be String not boolean
+        }
+        
+        
+        NodeRef thumbnailNodeRef = thumbnailService.getThumbnailByName(nodeRef, ContentModel.PROP_CONTENT, thumbnailName);
+        
+        if (thumbnailNodeRef == null)
+        {
+            // Get the queue/force create setting
+            boolean qc = false;
+            boolean fc = false;
+            String c = req.getParameter("c");
+            if (c != null)
+            {
+               if (c.equals("queue"))
+               {
+                  qc = true;
+               }
+               else if (c.equals("force"))
+               {
+                  fc = true;
+               }
+            }
+            
+            // Get the place holder flag
+            boolean ph = false;
+            String phString = req.getParameter("ph");
+            if (phString != null)
+            {
+               ph = new Boolean(phString);
+            }
+            
+            Scriptable scope = new BaseScopableProcessorExtension().getScope(); // note: required for ValueConverter (collection)
+            ScriptNode node = new ScriptNode(nodeRef, serviceRegistry, scope);
+            
+            // Queue the creation of the thumbnail if appropriate
+            if (fc)
+            {
+                ScriptNode thumbnailNode = node.createThumbnail(thumbnailName, false);
+                if (thumbnailNode != null)
+                {
+                    thumbnailNodeRef = thumbnailNode.getNodeRef();
+                }
+            }
+            else
+            {
+               if (qc)
+               {
+                   node.createThumbnail(thumbnailName, true);
+               }
+            }
+            
+            if (thumbnailNodeRef == null)
+            {
+                if (ph == true)
+                {
+                    // Try and get the place holder resource. We use a method in the thumbnail service
+                    // that by default gives us a resource based on the content's mime type.
+                    String phPath = null;
+                    ContentData contentData = (ContentData)this.serviceRegistry.getNodeService().getProperty(nodeRef, ContentModel.PROP_CONTENT);
+                    if (contentData != null)
+                    {
+                        phPath = scriptThumbnailService.getMimeAwarePlaceHolderResourcePath(thumbnailName, contentData.getMimetype());
+                    }
+                    
+                    if (phPath == null)
+                    {
+                        // 404 since no thumbnail was found
+                        throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Thumbnail was not found and no place holder resource set for '" + thumbnailName + "'");
+                    }
+                    else
+                    {
+                        // Set the resouce path in the model ready for the content stream to send back to the client
+                        model.put("contentPath", phPath);
+                    }
+                }
+                else
+                {
+                    // 404 since no thumbnail was found
+                    throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Thumbnail was not found");
+                }
+            }
+        }
+
+        // determine attachment
+        attach = Boolean.valueOf(req.getParameter("a"));
+        
+        super.executeImpl(thumbnailNodeRef, templateVars, req, res, model, attach);
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("QuickShare - retrieved thumbnail content: "+thumbnailNodeRef+" ["+nodeRef+","+thumbnailName+"]");
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ReadGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ReadGet.java
new file mode 100644
index 00000000000..5b6ad4bf301
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ReadGet.java
@@ -0,0 +1,88 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.quickshare;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.cmr.quickshare.InvalidSharedIdException;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * QuickShare/PublicView
+ * 
+ * GET web script that returns whether or not a user can read the shared content.
+ * 
+ * @author Alex Miller
+ */
+public class ReadGet extends AbstractQuickShareContent
+{
+    private static final Log logger = LogFactory.getLog(ReadGet.class);
+    
+    @Override
+    protected Map<String, Object> executeImpl(final WebScriptRequest req, Status status, Cache cache)
+    {
+        if (! isEnabled())
+        {
+            throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "QuickShare is disabled system-wide");
+        }
+        
+        // create map of params (template vars)
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+        final String sharedId = params.get("shared_id");
+        if (sharedId == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "A valid sharedId must be specified !");
+        }
+        
+        try
+        {
+            boolean canRead = quickShareService.canRead(sharedId);
+            Map<String, Object> result = new HashMap<String, Object>();
+            result.put("canRead", canRead);
+            return result;            
+        }
+        catch (InvalidSharedIdException ex)
+        {
+            logger.error("Unable to find: "+sharedId);
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find: "+sharedId);
+        }
+        catch (InvalidNodeRefException inre)
+        {
+            logger.error("Unable to find: "+sharedId+" ["+inre.getNodeRef()+"]");
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find: "+sharedId);
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ShareContentGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ShareContentGet.java
new file mode 100644
index 00000000000..c7a4ac31109
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ShareContentGet.java
@@ -0,0 +1,109 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.quickshare;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.util.Pair;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * QuickShare/PublicView
+ * 
+ * GET web script to lookup some context (nodeRef, tenantDomain, siteId) for a given "Share"
+ * 
+ * Note: authenticated web script
+ * 
+ * @author janv
+ * @since Cloud/4.2
+ */
+public class ShareContentGet extends AbstractQuickShareContent
+{
+    private static final Log logger = LogFactory.getLog(ShareContentPost.class);
+    
+    protected SiteService siteService;
+    
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        if (! isEnabled())
+        {
+            throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "QuickShare is disabled system-wide");
+        }
+        
+        // create map of params (template vars)
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+        final String sharedId = params.get("shared_id");
+        if (sharedId == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "A valid sharedId must be specified !");
+        }
+        
+        try
+        {
+            Pair<String, NodeRef> pair = quickShareService.getTenantNodeRefFromSharedId(sharedId);
+            final String tenantDomain = pair.getFirst();
+            final NodeRef nodeRef = pair.getSecond();
+            
+            String siteId = siteService.getSiteShortName(nodeRef);
+            
+            Map<String, Object> model = new HashMap<String, Object>(3);
+            model.put("sharedId", sharedId);
+            model.put("nodeRef", nodeRef.toString());
+            model.put("siteId", siteId);
+            model.put("tenantDomain", tenantDomain);
+            
+            if (logger.isInfoEnabled())
+            {
+                logger.info("QuickShare - get shared context: "+sharedId+" ["+model+"]");
+            }
+            
+            return model;
+        }
+        catch (InvalidNodeRefException inre)
+        {
+            logger.error("Unable to find: "+sharedId+" ["+inre.getNodeRef()+"]");
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find: "+sharedId);
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ShareContentPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ShareContentPost.java
new file mode 100644
index 00000000000..1519d10b73e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/ShareContentPost.java
@@ -0,0 +1,85 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.quickshare;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.web.scripts.WebScriptUtil;
+import org.alfresco.service.cmr.quickshare.QuickShareDTO;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * QuickShare/PublicView
+ * 
+ * POST web script to "Share" access to some content (ie. enable unauthenticated access to this node)
+ * 
+ * Note: authenticated web script
+ * 
+ * @author janv
+ * @since Cloud/4.2
+ */
+public class ShareContentPost extends AbstractQuickShareContent
+{
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        if (! isEnabled())
+        {
+            throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "QuickShare is disabled system-wide");
+        }
+        
+        // create map of params (template vars)
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+        final NodeRef nodeRef = WebScriptUtil.getNodeRef(params);
+        if (nodeRef == null)
+        {
+            String msg = "A valid NodeRef must be specified!";
+            throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, msg);
+        }
+        
+        try
+        {
+            QuickShareDTO dto = quickShareService.shareContent(nodeRef);
+            
+            Map<String, Object> model = new HashMap<String, Object>(1);
+            model.put("sharedDTO", dto);
+            return model;
+        }
+        catch (InvalidNodeRefException inre)
+        {
+        	throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find node: " + nodeRef);
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/UnshareContentDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/UnshareContentDelete.java
new file mode 100644
index 00000000000..d33a4119433
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/UnshareContentDelete.java
@@ -0,0 +1,109 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.quickshare;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.QuickShareModel;
+import org.alfresco.service.cmr.quickshare.InvalidSharedIdException;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * QuickShare/PublicView
+ * 
+ * DELETE web script to "Unshare" access to some content (ie. disable unauthenticated access to this node)
+ * 
+ * Note: authenticated web script
+ * 
+ * @author janv
+ * @since Cloud/4.2
+ */
+public class UnshareContentDelete extends AbstractQuickShareContent
+{
+    private static final Log logger = LogFactory.getLog(ShareContentPost.class);
+
+    private NodeService nodeService;
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        if (! isEnabled())
+        {
+            throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "QuickShare is disabled system-wide");
+        }
+
+        // create map of params (template vars)
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+        final String sharedId = params.get("shared_id");
+        if (sharedId == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "A valid sharedId must be specified !");
+        }
+
+        try
+        {
+            NodeRef nodeRef = quickShareService.getTenantNodeRefFromSharedId(sharedId).getSecond();
+
+            String sharedBy = (String) nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDBY);
+            if (!quickShareService.canDeleteSharedLink(nodeRef, sharedBy))
+            {
+                throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "Can't perform unshare action: " + sharedId);
+            }
+            quickShareService.unshareContent(sharedId);
+
+            Map<String, Object> model = new HashMap<>(1);
+            model.put("success", Boolean.TRUE);
+            return model;
+        }
+        catch (InvalidSharedIdException ex)
+        {
+            logger.error("Unable to find: " + sharedId);
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find: " + sharedId);
+        }
+        catch (InvalidNodeRefException inre)
+        {
+            logger.error("Unable to find: " + sharedId + " [" + inre.getNodeRef() + "]");
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find: " + sharedId);
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/AbstractRatingWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/AbstractRatingWebScript.java
new file mode 100644
index 00000000000..162771d9e06
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/AbstractRatingWebScript.java
@@ -0,0 +1,104 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rating;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.cmr.rating.RatingService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is an abstract base class for the various webscript controllers in the
+ * RatingService.
+ * 
+ * @author Neil McErlean
+ * @since 3.4
+ */
+public abstract class AbstractRatingWebScript extends DeclarativeWebScript
+{
+    // Web script parameters.
+    protected static final String RATING_SCHEME = "ratingScheme";
+    protected static final String RATING = "rating";
+    protected static final String RATED_NODE = "ratedNode";
+    protected static final String NODE_REF = "nodeRef";
+    protected static final String RATINGS = "ratings";
+    
+    protected static final String AVERAGE_RATINGS = "averageRatings";
+    protected static final String RATINGS_TOTALS = "ratingsTotals";
+    protected static final String RATINGS_COUNTS = "ratingsCounts";
+
+    // Injected services
+    protected NodeService nodeService;
+    protected RatingService ratingService;
+
+    /**
+     * Sets the node service instance
+     * 
+     * @param nodeService the node service to set
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    /**
+     * Sets the rating service instance
+     * 
+     * @param ratingService the rating service to set
+     */
+    public void setRatingService(RatingService ratingService)
+    {
+        this.ratingService = ratingService;
+    }
+
+    protected NodeRef parseRequestForNodeRef(WebScriptRequest req)
+    {
+        // get the parameters that represent the NodeRef, we know they are present
+        // otherwise this webscript would not have matched
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String storeType = templateVars.get("store_type");
+        String storeId = templateVars.get("store_id");
+        String nodeId = templateVars.get("id");
+
+        // create the NodeRef and ensure it is valid
+        StoreRef storeRef = new StoreRef(storeType, storeId);
+        NodeRef nodeRef = new NodeRef(storeRef, nodeId);
+
+        if (!this.nodeService.exists(nodeRef))
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find node: " + nodeRef.toString());
+        }
+
+        return nodeRef;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingDefinitionsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingDefinitionsGet.java
new file mode 100644
index 00000000000..11dbe496c32
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingDefinitionsGet.java
@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rating;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.rating.RatingScheme;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller class for the rating.definitions.get webscript.
+ * 
+ * @author Neil McErlean
+ * @since 3.4
+ */
+public class RatingDefinitionsGet extends AbstractRatingWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        Map<String, RatingScheme> schemes = this.ratingService.getRatingSchemes();
+        
+        model.put("schemeDefs", schemes);
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingDelete.java
new file mode 100644
index 00000000000..03977d0bcea
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingDelete.java
@@ -0,0 +1,85 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rating;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.cmr.rating.Rating;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the rating.delete web script.
+ * 
+ * @author Neil McErlean
+ * @since 3.4
+ */
+public class RatingDelete extends AbstractRatingWebScript
+{
+    private final static String AVERAGE_RATING = "averageRating";
+    private final static String RATINGS_TOTAL = "ratingsTotal";
+    private final static String RATINGS_COUNT = "ratingsCount";
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        NodeRef nodeRef = parseRequestForNodeRef(req);
+        String ratingSchemeName = parseRequestForScheme(req);
+        
+        Rating deletedRating = ratingService.removeRatingByCurrentUser(nodeRef, ratingSchemeName);
+        if (deletedRating == null)
+        {
+            // There was no rating in the specified scheme to delete.
+            throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, "Unable to delete non-existent rating: "
+                    + ratingSchemeName + " from " + nodeRef.toString());
+        }
+        
+        model.put(NODE_REF, nodeRef.toString());
+        model.put(AVERAGE_RATING, ratingService.getAverageRating(nodeRef, ratingSchemeName));
+        model.put(RATINGS_TOTAL, ratingService.getTotalRating(nodeRef, ratingSchemeName));
+        model.put(RATINGS_COUNT, ratingService.getRatingsCount(nodeRef, ratingSchemeName));
+      
+        return model;
+    }
+    
+    private String parseRequestForScheme(WebScriptRequest req)
+    {
+        // We know the 'scheme' URL element is there because if it wasn't
+        // the URL would not have matched.
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String scheme = templateVars.get("scheme");
+
+        return scheme;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingPost.java
new file mode 100644
index 00000000000..c54eb1552a3
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingPost.java
@@ -0,0 +1,116 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rating;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.rating.RatingScheme;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the rating.post webscript.
+ * 
+ * @author Neil McErlean
+ * @since 3.4
+ */
+public class RatingPost extends AbstractRatingWebScript
+{
+    // Url format
+    private final static String NODE_RATINGS_URL_FORMAT = "/api/node/{0}/ratings";
+
+    private final static String AVERAGE_RATING = "averageRating";
+    private final static String RATINGS_TOTAL = "ratingsTotal";
+    private final static String RATINGS_COUNT = "ratingsCount";
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        NodeRef nodeRefToBeRated = parseRequestForNodeRef(req);
+
+        JSONObject json = null;
+        try
+        {
+            // read request json
+            json = new JSONObject(new JSONTokener(req.getContent().getContent()));
+            
+            // Check mandatory parameters.
+            if (json.has(RATING) == false)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "rating parameter missing when applying rating");
+            }
+            if (json.has(RATING_SCHEME) == false)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "schemeName parameter missing when applying rating");
+            }
+            
+            // Check that the scheme name actually exists
+            final String schemeName = json.getString(RATING_SCHEME);
+            RatingScheme scheme = ratingService.getRatingScheme(schemeName);
+            if (scheme == null)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Unknown scheme name: " + schemeName);
+            }
+            
+            // Range checking of the rating score will be done within the RatingService.
+            // So we can just apply the rating.
+            final float rating = (float)json.getDouble(RATING);
+            ratingService.applyRating(nodeRefToBeRated, rating, schemeName);
+
+            // We'll return the URL to the ratings of the just-rated node.
+            String ratedNodeUrlFragment = nodeRefToBeRated.toString().replace("://", "/");
+            String ratedNodeUrl = MessageFormat.format(NODE_RATINGS_URL_FORMAT, ratedNodeUrlFragment);
+
+            model.put(RATED_NODE, ratedNodeUrl);
+            model.put(RATING, rating);
+            model.put(RATING_SCHEME, schemeName);
+            model.put(AVERAGE_RATING, ratingService.getAverageRating(nodeRefToBeRated, schemeName));
+            model.put(RATINGS_TOTAL, ratingService.getTotalRating(nodeRefToBeRated, schemeName));
+            model.put(RATINGS_COUNT, ratingService.getRatingsCount(nodeRefToBeRated, schemeName));
+        }
+        catch (IOException iox)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not read content from req.", iox);
+        }
+        catch (JSONException je)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from req.", je);
+        }
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingsGet.java
new file mode 100644
index 00000000000..d119b5ac5da
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rating/RatingsGet.java
@@ -0,0 +1,83 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rating;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.rating.Rating;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the ratings.get web script.
+ * 
+ * @author Neil McErlean
+ * @since 3.4
+ */
+public class RatingsGet extends AbstractRatingWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        NodeRef nodeRef = parseRequestForNodeRef(req);
+        
+        // These are the data for the current user's ratings of this node, if any.
+        List<Rating> myRatings = new ArrayList<Rating>();
+        
+        // These maps hold the average rating, accumulated total of all ratings and
+        // the number of ratings applied for this node as a function of rating scheme.
+        Map<String, Float> averageRatings = new HashMap<String, Float>();
+        Map<String, Float> ratingsTotals = new HashMap<String, Float>();
+        Map<String, Integer> ratingsCounts = new HashMap<String, Integer>();
+
+        for (String schemeName : ratingService.getRatingSchemes().keySet())
+        {
+            final Rating ratingByCurrentUser = ratingService.getRatingByCurrentUser(nodeRef, schemeName);
+            if (ratingByCurrentUser != null)
+            {
+                myRatings.add(ratingByCurrentUser);
+            }
+            averageRatings.put(schemeName, ratingService.getAverageRating(nodeRef, schemeName));
+            ratingsTotals.put(schemeName, ratingService.getTotalRating(nodeRef, schemeName));
+            ratingsCounts.put(schemeName, ratingService.getRatingsCount(nodeRef, schemeName));
+        }
+
+        model.put(NODE_REF, nodeRef.toString());
+        model.put(RATINGS, myRatings);
+        model.put(AVERAGE_RATINGS, averageRatings);
+        model.put(RATINGS_TOTALS, ratingsTotals);
+        model.put(RATINGS_COUNTS, ratingsCounts);
+      
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rendition/patch/PatchThumbnailsAsRenditionsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rendition/patch/PatchThumbnailsAsRenditionsGet.java
new file mode 100644
index 00000000000..6e42a19d7e2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rendition/patch/PatchThumbnailsAsRenditionsGet.java
@@ -0,0 +1,156 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rendition.patch;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.model.RenditionModel;
+import org.alfresco.service.cmr.rendition.RenditionService;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+public class PatchThumbnailsAsRenditionsGet extends DeclarativeWebScript
+{
+    /** Logger */
+    private static Log logger = LogFactory.getLog(PatchThumbnailsAsRenditionsGet.class);
+
+    private static final StoreRef SPACES_STORE = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
+
+    private static final String QUERY = "TYPE:\"" + ContentModel.TYPE_THUMBNAIL +
+                                        "\" AND NOT ASPECT:\"" + RenditionModel.ASPECT_VISIBLE_RENDITION +
+                                        "\" AND NOT ASPECT:\"" + RenditionModel.ASPECT_HIDDEN_RENDITION + "\"";
+    
+    /** Spring-injected services */
+    private NodeService nodeService;
+    private RenditionService renditionService;
+    private SearchService searchService;
+    
+    /**
+     * Sets the nodeService.
+     * 
+     * @param nodeService NodeService
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+    
+    /**
+     * Sets the renditionService.
+     * 
+     * @param renditionService RenditionService
+     */
+    public void setRenditionService(RenditionService renditionService)
+    {
+        this.renditionService = renditionService;
+    }
+    
+    /**
+     * Sets the searchService.
+     * 
+     * @param searchService SearchService
+     */
+    public void setSearchService(SearchService searchService)
+    {
+        this.searchService = searchService;
+    }
+    
+    @Override
+    public Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        if (logger.isInfoEnabled())
+        {
+            logger.debug("Patching legacy thumbnails by applying appropriate rendition aspect");
+        }
+        List<NodeRef> resultNodeRefs = null; 
+        ResultSet types = null;
+
+        try
+        {
+            types = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, QUERY);
+            resultNodeRefs = types.getNodeRefs();
+        }
+        finally
+        {
+            if (types != null) {types.close();}
+        }
+        
+        long patchedNodeRefs = 0;
+        
+        for (NodeRef nodeRef : resultNodeRefs)
+        {
+            if (nodeService.exists(nodeRef) == false ||
+                    renditionService.isRendition(nodeRef))
+            {
+                continue;
+            }
+            
+            // Now add one of the two aspects depending on parent location.
+            ChildAssociationRef sourceNode = renditionService.getSourceNode(nodeRef);
+            ChildAssociationRef primaryParent = nodeService.getPrimaryParent(nodeRef);
+            QName aspectToApply;
+            if (primaryParent.getParentRef().equals(sourceNode.getParentRef()))
+            {
+                aspectToApply = RenditionModel.ASPECT_HIDDEN_RENDITION;
+            }
+            else
+            {
+                aspectToApply = RenditionModel.ASPECT_VISIBLE_RENDITION;
+            }
+
+            if (logger.isDebugEnabled())
+            {
+                StringBuilder msg = new StringBuilder();
+                msg.append("Applying aspect ")
+                    .append(aspectToApply)
+                    .append(" to node ")
+                    .append(nodeRef);
+                logger.debug(msg.toString());
+            }
+            nodeService.addAspect(nodeRef, aspectToApply, null);
+            patchedNodeRefs++;
+        }
+
+        Map<String, Object> model = new HashMap<String, Object>();
+    	model.put("patchedNodeCount", new Long(patchedNodeRefs));
+    	
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/AbstractReplicationWebscript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/AbstractReplicationWebscript.java
new file mode 100644
index 00000000000..4576a0cc4e1
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/AbstractReplicationWebscript.java
@@ -0,0 +1,161 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.replication;
+
+import java.util.Map;
+
+import org.alfresco.service.cmr.action.ActionTrackingService;
+import org.alfresco.service.cmr.action.scheduled.SchedulableAction.IntervalPeriod;
+import org.alfresco.service.cmr.replication.ReplicationDefinition;
+import org.alfresco.service.cmr.replication.ReplicationService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.util.ISO8601DateFormat;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Nick Burch
+ * @since 3.4
+ */
+public abstract class AbstractReplicationWebscript extends DeclarativeWebScript
+{
+    protected NodeService nodeService;
+    protected ReplicationService replicationService;
+    protected ActionTrackingService actionTrackingService;
+    
+    public void setReplicationService(ReplicationService replicationService)
+    {
+        this.replicationService = replicationService;
+    }
+    
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public void setActionTrackingService(ActionTrackingService actionTrackingService) 
+    {
+        this.actionTrackingService = actionTrackingService;
+    }
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+       ReplicationModelBuilder modelBuilder = new ReplicationModelBuilder(
+             nodeService, replicationService, actionTrackingService
+       );
+       return buildModel(modelBuilder, req, status, cache);
+    }
+    
+    /**
+     * Updates properties on the definition, based on the JSON.
+     * Doesn't save the definition
+     * Doesn't change the name
+     */
+    protected void updateDefinitionProperties(ReplicationDefinition replicationDefinition, JSONObject json) 
+    throws JSONException 
+    {
+       if(json.has("description")) {
+          String description = json.getString("description");
+          replicationDefinition.setDescription(description);
+       }
+
+       if(json.has("targetName")) {
+          String targetName = json.getString("targetName");
+          replicationDefinition.setTargetName(targetName);
+       }
+       
+       if(json.has("enabled")) {
+          boolean enabled = json.getBoolean("enabled");
+          replicationDefinition.setEnabled(enabled);
+       }
+       
+       if(json.has("payload")) {
+          replicationDefinition.getPayload().clear();
+          JSONArray payload = json.getJSONArray("payload");
+          for(int i=0; i<payload.length(); i++) {
+             String node = payload.getString(i);
+             replicationDefinition.getPayload().add(
+                   new NodeRef(node)
+             );
+          }
+       }
+
+       
+       // Now for the scheduling parts
+       
+       if(json.has("schedule") && !json.isNull("schedule")) {
+          // Turn on scheduling, if not already enabled
+          replicationService.enableScheduling(replicationDefinition);
+          
+          // Update the properties
+          JSONObject schedule = json.getJSONObject("schedule");
+          
+          if(schedule.has("start") && !schedule.isNull("start")) {
+             // Look for start:.... or start:{"iso8601":....}
+             String startDate = schedule.getString("start");
+             if(schedule.get("start") instanceof JSONObject) {
+                startDate = schedule.getJSONObject("start").getString("iso8601");
+             }
+             
+             replicationDefinition.setScheduleStart( ISO8601DateFormat.parse(startDate) );
+          } else {
+             replicationDefinition.setScheduleStart(null);
+          }
+          
+          if(schedule.has("intervalPeriod") && !schedule.isNull("intervalPeriod")) {
+             replicationDefinition.setScheduleIntervalPeriod(
+                   IntervalPeriod.valueOf(schedule.getString("intervalPeriod"))
+             );
+          } else {
+             replicationDefinition.setScheduleIntervalPeriod(null);
+          }
+          
+          if(schedule.has("intervalCount") && !schedule.isNull("intervalCount")) {
+             replicationDefinition.setScheduleIntervalCount(
+                   schedule.getInt("intervalCount")
+             );
+          } else {
+             replicationDefinition.setScheduleIntervalCount(null);
+          }
+       } else {
+          // Disable scheduling
+          replicationService.disableScheduling(replicationDefinition);
+       }
+    }
+    
+    protected abstract Map<String, Object> buildModel(
+          ReplicationModelBuilder modelBuilder,
+          WebScriptRequest req,
+          Status status, Cache cache
+    );
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionDelete.java
new file mode 100644
index 00000000000..72058c33fa6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionDelete.java
@@ -0,0 +1,70 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.replication;
+
+import java.util.Map;
+
+import org.alfresco.service.cmr.replication.ReplicationDefinition;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * @author Nick Burch
+ * @since 3.4
+ */
+public class ReplicationDefinitionDelete extends AbstractReplicationWebscript
+{
+   @Override
+   protected Map<String, Object> buildModel(ReplicationModelBuilder modelBuilder, 
+                                            WebScriptRequest req, Status status, Cache cache)
+   {
+       // Which definition did they ask for?
+       String replicationDefinitionName = 
+          req.getServiceMatch().getTemplateVars().get("replication_definition_name");
+       ReplicationDefinition replicationDefinition =
+          replicationService.loadReplicationDefinition(replicationDefinitionName);
+      
+       // Does it exist?
+       if(replicationDefinition == null) {
+          throw new WebScriptException(
+                Status.STATUS_NOT_FOUND, 
+                "No Replication Definition found with that name"
+          );
+       }
+       
+       // Delete it
+       replicationService.deleteReplicationDefinition(replicationDefinition);
+       
+       // Report that we have deleted it
+       status.setCode(Status.STATUS_NO_CONTENT);
+       status.setMessage("Replication Definition deleted");
+       status.setRedirect(true);
+       return null;
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionGet.java
new file mode 100644
index 00000000000..5d430d1972c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionGet.java
@@ -0,0 +1,64 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.replication;
+
+import java.util.Map;
+
+import org.alfresco.service.cmr.replication.ReplicationDefinition;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * @author Nick Burch
+ * @since 3.4
+ */
+public class ReplicationDefinitionGet extends AbstractReplicationWebscript
+{
+   @Override
+   protected Map<String, Object> buildModel(ReplicationModelBuilder modelBuilder, 
+                                            WebScriptRequest req, Status status, Cache cache)
+   {
+       // Which definition did they ask for?
+       String replicationDefinitionName = 
+          req.getServiceMatch().getTemplateVars().get("replication_definition_name");
+       ReplicationDefinition replicationDefinition =
+          replicationService.loadReplicationDefinition(replicationDefinitionName);
+       
+       // Does it exist?
+       if(replicationDefinition == null) {
+          throw new WebScriptException(
+                Status.STATUS_NOT_FOUND, 
+                "No Replication Definition found with that name"
+          );
+       }
+      
+       // Have it turned into simple models
+       return modelBuilder.buildDetails(replicationDefinition);
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionPut.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionPut.java
new file mode 100644
index 00000000000..b3c29f121ef
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionPut.java
@@ -0,0 +1,108 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.replication;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.alfresco.service.cmr.replication.ReplicationDefinition;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * @author Nick Burch
+ * @since 3.4
+ */
+public class ReplicationDefinitionPut extends AbstractReplicationWebscript
+{
+   @Override
+   protected Map<String, Object> buildModel(ReplicationModelBuilder modelBuilder, 
+                                            WebScriptRequest req, Status status, Cache cache)
+   {
+       // Which definition did they ask for?
+       String replicationDefinitionName = 
+          req.getServiceMatch().getTemplateVars().get("replication_definition_name");
+       ReplicationDefinition replicationDefinition =
+          replicationService.loadReplicationDefinition(replicationDefinitionName);
+      
+       // Does it exist?
+       if(replicationDefinition == null) {
+          throw new WebScriptException(
+                Status.STATUS_NOT_FOUND, 
+                "No Replication Definition found with that name"
+          );
+       }
+       
+       // Grab the JSON, and prepare to update 
+       try 
+       {
+           JSONObject json = new JSONObject(new JSONTokener(req.getContent().getContent()));
+           
+           // Are they trying to rename?
+           if(json.has("name")) {
+              String jsonName = json.getString("name");
+              if(! jsonName.equals(replicationDefinitionName)) {
+                 // Name has changed, ensure the new name is spare
+                 if(replicationService.loadReplicationDefinition(jsonName) != null) {
+                    throw new WebScriptException(Status.STATUS_BAD_REQUEST, "The specified new name is already in use");
+                 }
+
+                 // Rename it
+                 replicationService.renameReplicationDefinition(
+                       replicationDefinitionName,
+                       jsonName
+                 );
+                 
+                 // And grab the updated version post-rename
+                 replicationDefinition = replicationService.loadReplicationDefinition(jsonName);
+              }
+           }
+           
+           // Update everything else
+           updateDefinitionProperties(replicationDefinition, json);
+           
+           // Save the changes
+           replicationService.saveReplicationDefinition(replicationDefinition);
+       }
+       catch (IOException iox)
+       {
+           throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not read content from request.", iox);
+       }
+       catch (JSONException je)
+       {
+           throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from request.", je);
+       }
+      
+       // Return the new details on it
+       return modelBuilder.buildDetails(replicationDefinition);
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionsGet.java
new file mode 100644
index 00000000000..850af8b975a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionsGet.java
@@ -0,0 +1,66 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.replication;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.replication.ReplicationDefinition;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * @author Nick Burch
+ * @since 3.4
+ */
+public class ReplicationDefinitionsGet extends AbstractReplicationWebscript
+{
+   @Override
+   protected Map<String, Object> buildModel(ReplicationModelBuilder modelBuilder, 
+                                            WebScriptRequest req, Status status, Cache cache)
+   {
+       // Get all the defined replication definitions
+       List<ReplicationDefinition> definitions = replicationService.loadReplicationDefinitions();
+       
+       // How do we need to sort them?
+       Comparator<Map<String,Object>> sorter = new ReplicationModelBuilder.SimpleSorterByName();
+       String sort = req.getParameter("sort");
+       if(sort == null) {
+          // Default was set above
+       } else if(sort.equalsIgnoreCase("status")) {
+          sorter = new ReplicationModelBuilder.SimpleSorterByStatus();
+       } else if(sort.equalsIgnoreCase("lastRun") ||
+             sort.equalsIgnoreCase("lastRunTime")) {
+          sorter = new ReplicationModelBuilder.SimpleSorterByLastRun();
+       }
+       
+       // Have them turned into simple models
+       return modelBuilder.buildSimpleList(definitions, sorter);
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionsPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionsPost.java
new file mode 100644
index 00000000000..511c4d3b02d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionsPost.java
@@ -0,0 +1,95 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.replication;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.alfresco.service.cmr.replication.ReplicationDefinition;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * @author Nick Burch
+ * @since 3.4
+ */
+public class ReplicationDefinitionsPost extends AbstractReplicationWebscript
+{
+   @Override
+   protected Map<String, Object> buildModel(ReplicationModelBuilder modelBuilder, 
+                                            WebScriptRequest req, Status status, Cache cache)
+   {
+       // Create our definition
+       ReplicationDefinition replicationDefinition = null;
+       JSONObject json;
+       
+       try 
+       {
+           json = new JSONObject(new JSONTokener(req.getContent().getContent()));
+           
+           // Check for the required parameters
+           if(! json.has("name"))
+              throw new WebScriptException(Status.STATUS_BAD_REQUEST, "name is required but wasn't supplied");
+           if(! json.has("description"))
+              throw new WebScriptException(Status.STATUS_BAD_REQUEST, "description is required but wasn't supplied");
+           
+           // Ensure one doesn't already exist with that name
+           String name = json.getString("name"); 
+           if(replicationService.loadReplicationDefinition(name) != null)
+           {
+              throw new WebScriptException(Status.STATUS_BAD_REQUEST, "A replication definition already exists with that name");
+           }
+           
+           // Create the definition
+           replicationDefinition = replicationService.createReplicationDefinition(
+                 name, json.getString("description")
+           );
+           
+           // Set the extra parts
+           updateDefinitionProperties(replicationDefinition, json);
+           
+           // Save the changes
+           replicationService.saveReplicationDefinition(replicationDefinition);
+       }
+       catch (IOException iox)
+       {
+           throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not read content from request.", iox);
+       }
+       catch (JSONException je)
+       {
+           throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from request.", je);
+       }
+      
+       // Return the details on it
+       return modelBuilder.buildDetails(replicationDefinition);
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationModelBuilder.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationModelBuilder.java
new file mode 100644
index 00000000000..4e1678a57b3
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationModelBuilder.java
@@ -0,0 +1,377 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.replication;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.web.scripts.action.AbstractActionWebscript;
+import org.alfresco.service.cmr.action.ActionTrackingService;
+import org.alfresco.service.cmr.action.ExecutionDetails;
+import org.alfresco.service.cmr.action.ExecutionSummary;
+import org.alfresco.service.cmr.replication.ReplicationDefinition;
+import org.alfresco.service.cmr.replication.ReplicationService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.util.ISO8601DateFormat;
+
+/**
+ * Builds up models from ReplicationDefinitions, either
+ *  in summary or detail form.
+ *  
+ * @author Nick Burch
+ * @since 3.4
+ */
+public class ReplicationModelBuilder 
+{
+    protected static final String MODEL_DATA_ITEM = "replicationDefinition";
+    protected static final String MODEL_DATA_LIST = "replicationDefinitions";
+    
+    protected static final String DEFINITION_NAME = "name";
+    protected static final String DEFINITION_DESCRIPTION = "description";
+    protected static final String DEFINITION_STATUS = "status";
+    protected static final String DEFINITION_STARTED_AT = "startedAt";
+    protected static final String DEFINITION_ENDED_AT = "endedAt";
+    protected static final String DEFINITION_FAILURE_MESSAGE = "failureMessage";
+    protected static final String DEFINITION_RUNNING_ACTION_ID = "runningActionId";
+    protected static final String DEFINITION_PAYLOAD = "payload";
+    protected static final String DEFINITION_TRANSFER_LOCAL_REPORT = "transferLocalReport";
+    protected static final String DEFINITION_TRANSFER_REMOTE_REPORT = "transferRemoteReport";
+    protected static final String DEFINITION_ENABLED = "enabled";
+    protected static final String DEFINITION_TARGET_NAME = "targetName";
+    
+    protected static final String DEFINITION_SCHEDULE_ENABLED = "scheduleEnabled";
+    protected static final String DEFINITION_SCHEDULE_START  = "scheduleStart";
+    protected static final String DEFINITION_SCHEDULE_PERIOD = "scheduleIntervalPeriod";
+    protected static final String DEFINITION_SCHEDULE_COUNT  = "scheduleIntervalCount";
+    
+    protected NodeService nodeService;
+    protected ReplicationService replicationService;
+    protected ActionTrackingService actionTrackingService;
+
+    public ReplicationModelBuilder(NodeService nodeService, ReplicationService replicationService,
+                                   ActionTrackingService actionTrackingService) 
+    {
+       this.nodeService = nodeService;
+       this.replicationService = replicationService;
+       this.actionTrackingService = actionTrackingService;
+    }
+    
+    
+    /**
+     * Sorts simple definitions by their status
+     */
+    public static class SimpleSorterByStatus implements Comparator<Map<String,Object>> {
+      private SimpleSorterByName nameSorter = new SimpleSorterByName();
+      public int compare(Map<String, Object> simpleA, Map<String, Object> simpleB) {
+         String statusA = (String)simpleA.get(DEFINITION_STATUS);
+         String statusB = (String)simpleB.get(DEFINITION_STATUS);
+         if(statusA == null || statusB == null) {
+            throw new IllegalArgumentException("Status missing during sort");
+         }
+         
+         int compare = statusA.compareTo(statusB);
+         if(compare == 0) {
+            return nameSorter.compare(simpleA, simpleB);
+         }
+         return compare;
+      }       
+    }
+    /**
+     * Sorts simple definitions by their name
+     */
+    public static class SimpleSorterByName implements Comparator<Map<String,Object>> {
+      public int compare(Map<String, Object> simpleA, Map<String, Object> simpleB) {
+         String nameA = (String)simpleA.get(DEFINITION_NAME);
+         String nameB = (String)simpleB.get(DEFINITION_NAME);
+         if(nameA == null || nameB == null) {
+            throw new IllegalArgumentException("Name missing during sort");
+         }
+         return nameA.compareTo(nameB);
+      }       
+    }
+    /**
+     * Sorts simple definitions by their last run time.
+     * Things that have never been run go to the bottom of the list,
+     *  so we see most recently run, least recently run, never run.
+     */
+    public static class SimpleSorterByLastRun implements Comparator<Map<String,Object>> {
+      /** Works on ISO8601 formatted date strings */
+      public int compare(Map<String, Object> simpleA, Map<String, Object> simpleB) {
+         String dateA = (String)simpleA.get(DEFINITION_STARTED_AT);
+         String dateB = (String)simpleB.get(DEFINITION_STARTED_AT);
+         if(dateA == null && dateB == null) {
+            return 0;
+         }
+         if(dateA != null && dateB == null) {
+            return -1;
+         }
+         if(dateA == null && dateB != null) {
+            return 1;
+         }
+         // We want more recent dates first
+         return 0-dateA.compareTo(dateB);
+      }       
+    }
+    
+    
+    /**
+     * Build a model containing a list of simple definitions for the given
+     *  list of Replication Definitions.
+     */
+    protected Map<String,Object> buildSimpleList(List<ReplicationDefinition> replicationDefinitions,
+                                                 Comparator<Map<String,Object>> sorter)
+    {
+        List<Map<String,Object>> models = new ArrayList<Map<String,Object>>();
+        
+        // Only bother looking up the execution status if we
+        //  have some Replication Definitions to render
+        if(replicationDefinitions.size() > 0) {
+           List<ExecutionSummary> executing =
+              actionTrackingService.getExecutingActions(replicationDefinitions.get(0).getActionDefinitionName());
+           
+           for(ReplicationDefinition rd : replicationDefinitions) {
+              // Get the executing detail(s) for this definition
+              ExecutionDetails details = getExecutionDetails(rd, executing);
+              
+              // Set the core details
+              Map<String, Object> rdm = new HashMap<String,Object>();
+              rdm.put(DEFINITION_NAME, rd.getReplicationName());
+              rdm.put(DEFINITION_ENABLED, rd.isEnabled()); 
+              
+              // Do the status
+              setStatus(rd, details, rdm);
+              // In the summary form, we don't need end time or details
+              rdm.remove(DEFINITION_ENDED_AT);
+              rdm.remove(DEFINITION_RUNNING_ACTION_ID);
+              
+              // Add to the list of finished models
+              models.add(rdm);
+           }
+        }
+        
+        // Sort the entries
+        if(sorter != null) {
+           Collections.sort(models, sorter);
+        }
+        
+        // Finish up
+        Map<String, Object> model = new HashMap<String,Object>();
+        model.put(MODEL_DATA_LIST, models);
+        return model;
+    }
+    
+    
+    /**
+     * Build a model containing the full, detailed definition for the given
+     *  Replication Definition.
+     */
+    protected Map<String, Object> buildDetails(ReplicationDefinition rd) {
+       Map<String, Object> rdm = new HashMap<String,Object>();
+       
+       // Set the core details
+       rdm.put(DEFINITION_NAME, rd.getReplicationName());
+       rdm.put(DEFINITION_DESCRIPTION, rd.getDescription());
+       rdm.put(DEFINITION_ENABLED, rd.isEnabled()); 
+       rdm.put(DEFINITION_TARGET_NAME, rd.getTargetName());
+       
+       // Set the scheduling details
+       rdm.put(DEFINITION_SCHEDULE_ENABLED, rd.isSchedulingEnabled());
+       if(rd.isSchedulingEnabled())
+       {
+          rdm.put(DEFINITION_SCHEDULE_START, ISO8601DateFormat.format(rd.getScheduleStart()));
+          
+          rdm.put(DEFINITION_SCHEDULE_COUNT, rd.getScheduleIntervalCount());
+          if(rd.getScheduleIntervalPeriod() != null) {
+             rdm.put(DEFINITION_SCHEDULE_PERIOD, rd.getScheduleIntervalPeriod().toString());
+          } else {
+             rdm.put(DEFINITION_SCHEDULE_PERIOD, null);
+          }
+       }
+       
+       // Set the details of the previous run
+       // These will be null'd out later if replication is in progress
+       rdm.put(DEFINITION_FAILURE_MESSAGE, rd.getExecutionFailureMessage());
+       rdm.put(DEFINITION_TRANSFER_LOCAL_REPORT, rd.getLocalTransferReport());
+       rdm.put(DEFINITION_TRANSFER_REMOTE_REPORT, rd.getRemoteTransferReport());
+       
+       // Do the status
+       // Includes start+end times, and running action details
+       setStatus(rd, rdm);
+       
+       // Only include the payload entries that still exist
+       // Otherwise the freemarker layer gets upset about deleted nodes
+       List<NodeRef> payload = new ArrayList<NodeRef>();
+       for(NodeRef node : rd.getPayload()) {
+          if(nodeService.exists(node))
+             payload.add(node);
+       }
+       rdm.put(DEFINITION_PAYLOAD, payload);
+       
+       // Save in the usual way
+       Map<String, Object> model = new HashMap<String,Object>();
+       model.put(MODEL_DATA_ITEM, rdm);
+       return model;
+    }
+    
+
+    /**
+     * Figures out the status that's one of:
+     *    New|Running|CancelRequested|Completed|Failed|Cancelled
+     * by merging data from the action tracking service. 
+     * Will also set the start and end dates, from either the
+     *  replication definition or action tracking data, depending
+     *  on the status.
+     */
+    protected void setStatus(ReplicationDefinition replicationDefinition, Map<String, Object> model)
+    {
+        // Grab the running instance(s) of the action
+        List<ExecutionSummary> executing =
+           actionTrackingService.getExecutingActions(replicationDefinition);
+        // Now get the details of that
+        ExecutionDetails details = getExecutionDetails(replicationDefinition, executing);
+        // Finally have the status set
+        setStatus(replicationDefinition, details, model);
+    }
+    /**
+     * Figures out the status that's one of:
+     *    New|Running|CancelRequested|Completed|Failed|Cancelled
+     * by merging data from the action tracking service. 
+     * Will also set the start and end dates, from either the
+     *  replication definition or action tracking data, depending
+     *  on the status.
+     */
+    protected void setStatus(ReplicationDefinition replicationDefinition, 
+                             ExecutionDetails details, Map<String, Object> model)
+    {
+        // Is it currently running?
+        if(details == null) {
+           // It isn't running, we can use the persisted details
+           model.put(DEFINITION_STATUS, replicationDefinition.getExecutionStatus().toString());
+           
+           Date startDate = replicationDefinition.getExecutionStartDate();
+           if(startDate != null) {
+              model.put(DEFINITION_STARTED_AT, ISO8601DateFormat.format(startDate));
+           } else {
+              model.put(DEFINITION_STARTED_AT, null);
+           }
+           
+           Date endDate = replicationDefinition.getExecutionEndDate();
+           if(endDate != null) {
+              model.put(DEFINITION_ENDED_AT, ISO8601DateFormat.format(endDate));
+           } else {
+              model.put(DEFINITION_ENDED_AT, null);
+           }
+           
+           // It isn't running
+           model.put(DEFINITION_RUNNING_ACTION_ID, null);
+           
+           return;
+        }
+
+        // As it is running / about to run, return the
+        //  details of the running/pending version
+        if(details.isCancelRequested()) {
+           model.put(DEFINITION_STATUS, "CancelRequested");
+        } else if(details.getStartedAt() == null) {
+           model.put(DEFINITION_STATUS, "Pending");
+        } else {
+           model.put(DEFINITION_STATUS, "Running");
+        }
+        
+        if(details.getStartedAt() != null) {
+           model.put(DEFINITION_STARTED_AT, ISO8601DateFormat.format(details.getStartedAt()));
+        } else {
+           model.put(DEFINITION_STARTED_AT, null);
+        }
+        model.put(DEFINITION_ENDED_AT, null);
+        model.put(DEFINITION_RUNNING_ACTION_ID, 
+              AbstractActionWebscript.getRunningId(details.getExecutionSummary()));
+        
+        // Since it's running / about to run, there shouldn't
+        //  be failure messages or transfer reports
+        // If these currently exist on the model, remove them
+        if(model.containsKey(DEFINITION_FAILURE_MESSAGE))
+           model.put(DEFINITION_FAILURE_MESSAGE, null);
+        if(model.containsKey(DEFINITION_TRANSFER_LOCAL_REPORT))
+           model.put(DEFINITION_TRANSFER_LOCAL_REPORT, null);
+        if(model.containsKey(DEFINITION_TRANSFER_REMOTE_REPORT))
+           model.put(DEFINITION_TRANSFER_REMOTE_REPORT, null);
+    }
+
+    /**
+     * For the given Replication Definition, and list of executing
+     *  actions (which may or may not be only for this definition),
+     *  return a single execution details. 
+     *  
+     * Returns null if no copies of the definition are executing.
+     * Returns a predictable instance if more than one copy is
+     *  executing.
+     */
+    private ExecutionDetails getExecutionDetails(ReplicationDefinition replicationDefinition,
+                                                 List<ExecutionSummary> executing)
+    {
+       // Figure out which of the running actions are us
+       List<ExecutionSummary> ours = new ArrayList<ExecutionSummary>();
+       for(ExecutionSummary es : executing) {
+          if(es.getActionType().equals(replicationDefinition.getActionDefinitionName()) &&
+             es.getActionId().equals(replicationDefinition.getId())) {
+             ours.add(es);
+          }
+       }
+       
+       // Do we have anything running at the moment
+       if(ours.size() == 0) {
+          // Not executing at the moment
+          return null;
+       }
+       
+       // We have at least one copy running
+       ExecutionSummary es;
+       if(executing.size() == 1) {
+          // Only one copy, life is simple
+          es = ours.get(0);
+       } else {
+          // More than one copy runing, joy
+          // Go for the lowest execution instance id, so
+          //  we're predictable
+          es = ours.get(0);
+          for(ExecutionSummary e : ours) {
+             if(e.getExecutionInstance() < es.getExecutionInstance()) {
+                es = e;
+             }
+          }
+       }
+       
+       // Grab the details
+       return actionTrackingService.getExecutionDetails(es);    
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationServiceStatusGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationServiceStatusGet.java
new file mode 100644
index 00000000000..e466b7d4e01
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/replication/ReplicationServiceStatusGet.java
@@ -0,0 +1,66 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.replication;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.replication.ReplicationService;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Neil Mc Erlean
+ * @since 3.5
+ */
+public class ReplicationServiceStatusGet extends DeclarativeWebScript
+{
+    public static final String ENABLED = "enabled";
+
+    private ReplicationService replicationService;
+    
+    /**
+     * Used to inject the {@link ReplicationService}.
+     * 
+     * @param replicationService ReplicationService
+     */
+    public void setReplicationService(ReplicationService replicationService)
+    {
+        this.replicationService = replicationService;
+    }
+    
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+        boolean serviceEnabled = replicationService.isEnabled();
+        
+        model.put(ENABLED, serviceEnabled);
+        
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/AbstractRuleWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/AbstractRuleWebScript.java
new file mode 100644
index 00000000000..c86901bacd4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/AbstractRuleWebScript.java
@@ -0,0 +1,448 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.action.ActionConditionImpl;
+import org.alfresco.repo.action.ActionImpl;
+import org.alfresco.repo.action.CompositeActionImpl;
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ActionCondition;
+import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.action.ParameterDefinition;
+import org.alfresco.service.cmr.action.ParameterizedItemDefinition;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryException;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.rule.Rule;
+import org.alfresco.service.cmr.rule.RuleService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.GUID;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ *
+ */
+public abstract class AbstractRuleWebScript extends DeclarativeWebScript
+{
+
+    public static final SimpleDateFormat dateFormate = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy");
+
+    private static final String RULE_OUTBOUND = "outbound";
+    private static final String ACTION_CHECK_OUT = "check-out";
+
+    private static final String CANNOT_CREATE_RULE = "cannot.create.rule.checkout.outbound";
+    
+    protected NodeService nodeService;
+    protected RuleService ruleService;
+    protected DictionaryService dictionaryService;
+    protected ActionService actionService;
+    protected FileFolderService fileFolderService;
+    protected NamespaceService namespaceService;
+
+    /**
+     * Sets the node service instance
+     * 
+     * @param nodeService the node service to set
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    /**
+     * Set rule service instance 
+     * 
+     * @param ruleService the rule service to set
+     */
+    public void setRuleService(RuleService ruleService)
+    {
+        this.ruleService = ruleService;
+    }
+
+    /**
+     * Set dictionary service instance
+     * 
+     * @param dictionaryService the dictionary service to set 
+     */
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService;
+    }
+
+    /**
+     * Set action service instance
+     * 
+     * @param actionService the action service to set
+     */
+    public void setActionService(ActionService actionService)
+    {
+        this.actionService = actionService;
+    }
+
+    /**
+     * Set file folder service instance
+     * 
+     * @param fileFolderService the fileFolderService to set
+     */
+    public void setFileFolderService(FileFolderService fileFolderService)
+    {
+        this.fileFolderService = fileFolderService;
+    }
+
+    /**
+     * Set namespace service instance
+     * 
+     * @param namespaceService the namespace service to set
+     */
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+
+    /**
+     * Parses the request and providing it's valid returns the NodeRef.
+     * 
+     * @param req The webscript request
+     * @return The NodeRef passed in the request
+     * 
+     */
+    protected NodeRef parseRequestForNodeRef(WebScriptRequest req)
+    {
+        // get the parameters that represent the NodeRef, we know they are present
+        // otherwise this webscript would not have matched
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String storeType = templateVars.get("store_type");
+        String storeId = templateVars.get("store_id");
+        String nodeId = templateVars.get("id");
+
+        // create the NodeRef and ensure it is valid
+        StoreRef storeRef = new StoreRef(storeType, storeId);
+        NodeRef nodeRef = new NodeRef(storeRef, nodeId);
+
+        if (!this.nodeService.exists(nodeRef))
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find node: " + nodeRef.toString());
+        }
+
+        return nodeRef;
+    }
+
+    protected Rule parseJsonRule(JSONObject jsonRule) throws JSONException
+    {
+        Rule result = new Rule();
+
+        if (jsonRule.has("title") == false || jsonRule.getString("title").length() == 0)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Title missing when creating rule");
+        }
+
+        result.setTitle(jsonRule.getString("title"));
+
+        result.setDescription(jsonRule.has("description") ? jsonRule.getString("description") : "");
+
+        if (jsonRule.has("ruleType") == false || jsonRule.getJSONArray("ruleType").length() == 0)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Rule type missing when creating rule");
+        }
+
+        JSONArray types = jsonRule.getJSONArray("ruleType");
+        List<String> ruleTypes = new ArrayList<String>();
+
+        for (int i = 0; i < types.length(); i++)
+        {
+            ruleTypes.add(types.getString(i));
+        }
+
+        result.setRuleTypes(ruleTypes);
+
+        result.applyToChildren(jsonRule.has("applyToChildren") ? jsonRule.getBoolean("applyToChildren") : false);
+
+        result.setExecuteAsynchronously(jsonRule.has("executeAsynchronously") ? jsonRule.getBoolean("executeAsynchronously") : false);
+
+        result.setRuleDisabled(jsonRule.has("disabled") ? jsonRule.getBoolean("disabled") : false);
+
+        JSONObject jsonAction = jsonRule.getJSONObject("action");
+
+        // parse action object
+        Action ruleAction = parseJsonAction(jsonAction);
+
+        result.setAction(ruleAction);
+
+        return result;
+    }
+
+    protected ActionImpl parseJsonAction(JSONObject jsonAction) throws JSONException
+    {
+        ActionImpl result = null;
+
+        String actionId = jsonAction.has("id") ? jsonAction.getString("id") : GUID.generate();
+
+        if (jsonAction.getString("actionDefinitionName").equalsIgnoreCase("composite-action"))
+        {
+            result = new CompositeActionImpl(null, actionId);
+        }
+        else
+        {
+            result = new ActionImpl(null, actionId, jsonAction.getString("actionDefinitionName"));
+        }
+
+        // Post Action Queue parameter
+        if (jsonAction.has("actionedUponNode"))
+        {
+            NodeRef actionedUponNode = new NodeRef(jsonAction.getString("actionedUponNode"));
+            result.setNodeRef(actionedUponNode);
+        }
+
+        if (jsonAction.has("description"))
+        {
+            result.setDescription(jsonAction.getString("description"));
+        }
+
+        if (jsonAction.has("title"))
+        {
+            result.setTitle(jsonAction.getString("title"));
+        }
+
+        if (jsonAction.has("parameterValues"))
+        {
+            JSONObject jsonParameterValues = jsonAction.getJSONObject("parameterValues");
+            result.setParameterValues(parseJsonParameterValues(jsonParameterValues, result.getActionDefinitionName(), true));
+        }
+
+        if (jsonAction.has("executeAsync"))
+        {
+            result.setExecuteAsynchronously(jsonAction.getBoolean("executeAsync"));
+        }
+
+        if (jsonAction.has("runAsUser"))
+        {
+            result.setRunAsUser(jsonAction.getString("runAsUser"));
+        }
+
+        if (jsonAction.has("actions"))
+        {
+            JSONArray jsonActions = jsonAction.getJSONArray("actions");
+
+            for (int i = 0; i < jsonActions.length(); i++)
+            {
+                JSONObject innerJsonAction = jsonActions.getJSONObject(i);
+
+                Action innerAction = parseJsonAction(innerJsonAction);
+
+                // we assume that only composite-action contains actions json array, so should be no cast exception
+                ((CompositeActionImpl) result).addAction(innerAction);
+            }
+        }
+
+        if (jsonAction.has("conditions"))
+        {
+            JSONArray jsonConditions = jsonAction.getJSONArray("conditions");
+
+            for (int i = 0; i < jsonConditions.length(); i++)
+            {
+                JSONObject jsonCondition = jsonConditions.getJSONObject(i);
+
+                // parse action conditions
+                ActionCondition actionCondition = parseJsonActionCondition(jsonCondition);
+
+                result.getActionConditions().add(actionCondition);
+            }
+        }
+
+        if (jsonAction.has("compensatingAction"))
+        {
+            Action compensatingAction = parseJsonAction(jsonAction.getJSONObject("compensatingAction"));
+            result.setCompensatingAction(compensatingAction);
+        }
+
+        return result;
+    }
+
+    protected ActionConditionImpl parseJsonActionCondition(JSONObject jsonActionCondition) throws JSONException
+    {
+        String id = jsonActionCondition.has("id") ? jsonActionCondition.getString("id") : GUID.generate();
+
+        ActionConditionImpl result = new ActionConditionImpl(id, jsonActionCondition.getString("conditionDefinitionName"));
+
+        if (jsonActionCondition.has("invertCondition"))
+        {
+            result.setInvertCondition(jsonActionCondition.getBoolean("invertCondition"));
+        }
+
+        if (jsonActionCondition.has("parameterValues"))
+        {
+            JSONObject jsonParameterValues = jsonActionCondition.getJSONObject("parameterValues");
+
+            result.setParameterValues(parseJsonParameterValues(jsonParameterValues, result.getActionConditionDefinitionName(), false));
+        }
+
+        return result;
+    }
+
+    protected Map<String, Serializable> parseJsonParameterValues(JSONObject jsonParameterValues, String name, boolean isAction) throws JSONException
+    {
+        Map<String, Serializable> parameterValues = new HashMap<String, Serializable>();
+
+        // get parameters names
+        JSONArray names = jsonParameterValues.names();
+        if (names == null)
+        {
+            return null;
+        }
+
+        // Get the action or condition definition
+        ParameterizedItemDefinition definition = null;
+        if (isAction == true)
+        {
+            definition = actionService.getActionDefinition(name);
+        }
+        else
+        {
+            definition = actionService.getActionConditionDefinition(name);
+        }
+        if (definition == null)
+        {
+            throw new AlfrescoRuntimeException("Could not find defintion for action/condition " + name);
+        }
+
+        for (int i = 0; i < names.length(); i++)
+        {
+            String propertyName = names.getString(i);
+            Object propertyValue = jsonParameterValues.get(propertyName);
+            
+            // Get the parameter definition we care about
+            ParameterDefinition paramDef = definition.getParameterDefintion(propertyName);
+            if (paramDef == null && !definition.getAdhocPropertiesAllowed())
+            {
+                throw new AlfrescoRuntimeException("Invalid parameter " + propertyName + " for action/condition " + name);
+            }
+            if (paramDef != null)
+            {
+                QName typeQName = paramDef.getType();
+
+                // Convert the property value
+                Serializable value = convertValue(typeQName, propertyValue);
+                parameterValues.put(propertyName, value);
+            }
+            else
+            {
+                // If there is no parameter definition we can only rely on the .toString() representation of the ad-hoc property
+                parameterValues.put(propertyName, propertyValue.toString());
+            }
+            
+        }
+
+        return parameterValues;
+    }
+    
+    private Serializable convertValue(QName typeQName, Object propertyValue) throws JSONException
+    {        
+        Serializable value = null;
+        
+        DataTypeDefinition typeDef = dictionaryService.getDataType(typeQName);
+        if (typeDef == null)
+        {
+            throw new AlfrescoRuntimeException("Action property type definition " + typeQName.toPrefixString() + " is unknown.");
+        }
+        
+        if (propertyValue instanceof JSONArray)
+        {
+            // Convert property type to java class
+            Class<?> javaClass = null;
+            
+            String javaClassName = typeDef.getJavaClassName();
+            try
+            {
+                javaClass = Class.forName(javaClassName);
+            }
+            catch (ClassNotFoundException e)
+            {
+                throw new DictionaryException("Java class " + javaClassName + " of property type " + typeDef.getName() + " is invalid", e);
+            }
+            
+            int length = ((JSONArray)propertyValue).length();
+            List<Serializable> list = new ArrayList<Serializable>(length);
+            for (int i = 0; i < length; i++)
+            {
+                list.add(convertValue(typeQName, ((JSONArray)propertyValue).get(i)));
+            }
+            value = (Serializable)list;
+        }
+        else
+        {
+            if (typeQName.equals(DataTypeDefinition.QNAME) == true && 
+                typeQName.toString().contains(":") == true)
+            {
+                 value = QName.createQName(propertyValue.toString(), namespaceService);
+            }
+            else
+            {
+                value = (Serializable)DefaultTypeConverter.INSTANCE.convert(dictionaryService.getDataType(typeQName), propertyValue);
+            }
+        }
+        
+        return value;
+    }
+
+    protected void checkRule(Rule rule)
+    {
+        List<String> ruleTypes = rule.getRuleTypes();
+        if (ruleTypes.contains(RULE_OUTBOUND))
+        {
+            List<Action> actions = ((CompositeActionImpl) rule.getAction()).getActions();
+            for (Action action : actions)
+            {
+                if (action.getActionDefinitionName().equalsIgnoreCase(ACTION_CHECK_OUT))
+                {
+                    throw new WebScriptException(CANNOT_CREATE_RULE);
+                }
+            }
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionConditionDefinitionsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionConditionDefinitionsGet.java
new file mode 100644
index 00000000000..1dc47f567c2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionConditionDefinitionsGet.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.action.ActionConditionDefinition;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ *
+ */
+public class ActionConditionDefinitionsGet extends AbstractRuleWebScript
+{
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(ActionConditionDefinitionsGet.class);
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        // get all action condition definitions
+        List<ActionConditionDefinition> actionconditiondefinitions = actionService.getActionConditionDefinitions();
+
+        model.put("actionconditiondefinitions", actionconditiondefinitions);
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionConstraintGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionConstraintGet.java
new file mode 100644
index 00000000000..82a4128bccd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionConstraintGet.java
@@ -0,0 +1,72 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.cmr.action.ParameterConstraint;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ *
+ */
+public class ActionConstraintGet extends AbstractRuleWebScript
+{
+
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(ActionConstraintGet.class);
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        // get request parameters
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String name = templateVars.get("name");
+
+        // get specified parameter constraint
+        ParameterConstraint parameterConstraint = actionService.getParameterConstraint(name);
+
+        if (parameterConstraint == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find parameter constraint with name: " + name);
+        }
+
+        model.put("actionConstraint", parameterConstraint);
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionConstraintsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionConstraintsGet.java
new file mode 100644
index 00000000000..a256541d4f0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionConstraintsGet.java
@@ -0,0 +1,86 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.action.ParameterConstraint;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ *
+ */
+public class ActionConstraintsGet extends AbstractRuleWebScript
+{
+
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(ActionConstraintsGet.class);
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        // get request parameters
+        String[] names = req.getParameterValues("name");
+
+        List<ParameterConstraint> parameterConstraints = null;
+
+        if (names != null && names.length > 0)
+        {
+            // filter is present in request
+            parameterConstraints = new ArrayList<ParameterConstraint>();
+
+            // find specified parameter constraints
+            for (String name : names)
+            {
+                ParameterConstraint parameterConstraint = actionService.getParameterConstraint(name);
+
+                if (parameterConstraint != null)
+                {
+                    parameterConstraints.add(parameterConstraint);
+                }
+            }
+        }
+        else
+        {
+            // no filter was provided, return all parameter constraints
+            parameterConstraints = actionService.getParameterConstraints();
+        }
+
+        model.put("actionConstraints", parameterConstraints);
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionDefinitionsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionDefinitionsGet.java
new file mode 100644
index 00000000000..4c0bba74482
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionDefinitionsGet.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.action.ActionDefinition;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ *
+ */
+public class ActionDefinitionsGet extends AbstractRuleWebScript
+{
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(ActionDefinitionsGet.class);
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        // get all action definitions
+        List<ActionDefinition> actiondefinitions = actionService.getActionDefinitions();
+
+        model.put("actiondefinitions", actiondefinitions);
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionQueuePost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionQueuePost.java
new file mode 100644
index 00000000000..496ba034895
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ActionQueuePost.java
@@ -0,0 +1,109 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.repo.action.ActionImpl;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ *
+ */
+public class ActionQueuePost extends AbstractRuleWebScript
+{
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(ActionQueuePost.class);
+
+    public static final String STATUS = "actionExecStatus";
+    public static final String STATUS_SUCCESS = "success";
+    public static final String STATUS_FAIL = "fail";
+    public static final String STATUS_QUEUED = "queued";
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        // get request parameters
+        boolean async = Boolean.parseBoolean(req.getParameter("async"));
+
+        ActionImpl action = null;
+        JSONObject json = null;
+
+        try
+        {
+            // read request json
+            json = new JSONObject(new JSONTokener(req.getContent().getContent()));
+
+            // parse request json
+            action = parseJsonAction(json);
+            NodeRef actionedUponNode = action.getNodeRef();
+
+            // clear nodeRef for action
+            action.setNodeRef(null);
+            json.remove("actionedUponNode");
+
+            if (async)
+            {
+                model.put(STATUS, STATUS_QUEUED);
+            }
+            else
+            {
+                model.put(STATUS, STATUS_SUCCESS);
+            }
+
+            // Execute action
+            actionService.executeAction(action, actionedUponNode, true, async);
+
+            // Prepair model
+            model.put("actionedUponNode", actionedUponNode.toString());
+            model.put("action", json);
+        }
+        catch (IOException iox)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not read content from req.", iox);
+        }
+        catch (JSONException je)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from req.", je);
+        }
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/InheritedRulesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/InheritedRulesGet.java
new file mode 100644
index 00000000000..56ada32364f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/InheritedRulesGet.java
@@ -0,0 +1,88 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.web.scripts.rule.ruleset.RuleRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.rule.Rule;
+import org.alfresco.service.cmr.rule.RuleType;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ *
+ */
+public class InheritedRulesGet extends AbstractRuleWebScript
+{
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(InheritedRulesGet.class);
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        // get request parameters
+        NodeRef nodeRef = parseRequestForNodeRef(req);
+        String ruleType = req.getParameter("ruleType");
+
+        RuleType type = ruleService.getRuleType(ruleType);
+
+        if (type == null)
+        {
+            ruleType = null;
+        }
+
+        // get all rules (including inherited) filtered by rule type
+        List<Rule> inheritedRules = ruleService.getRules(nodeRef, true, ruleType);
+
+        // get owned rules (excluding inherited) filtered by rule type
+        List<Rule> ownedRules = ruleService.getRules(nodeRef, false, ruleType);
+
+        // remove owned rules
+        inheritedRules.removeAll(ownedRules);
+
+        List<RuleRef> inheritedRuleRefs = new ArrayList<RuleRef>();
+
+        for (Rule rule : inheritedRules)
+        {
+            inheritedRuleRefs.add(new RuleRef(rule, fileFolderService.getFileInfo(ruleService.getOwningNodeRef(rule))));
+        }
+
+        model.put("inheritedRuleRefs", inheritedRuleRefs);
+
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleDelete.java
new file mode 100644
index 00000000000..efc0a19247f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleDelete.java
@@ -0,0 +1,88 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.rule.Rule;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ *
+ */
+public class RuleDelete extends AbstractRuleWebScript
+{
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(RuleDelete.class);
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        NodeRef nodeRef = parseRequestForNodeRef(req);
+
+        // get request parameters
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String ruleId = templateVars.get("rule_id");
+
+        Rule ruleToDelete = null;
+
+        // get all rules for given nodeRef
+        List<Rule> rules = ruleService.getRules(nodeRef, false);
+
+        // filter by rule id
+        for (Rule rule : rules)
+        {
+            if (rule.getNodeRef().getId().equalsIgnoreCase(ruleId))
+            {
+                ruleToDelete = rule;
+                break;
+            }
+        }
+
+        if (ruleToDelete == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find rule with id: " + ruleId);
+        }
+
+        // delete rule
+        ruleService.removeRule(nodeRef, ruleToDelete);
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleGet.java
new file mode 100644
index 00000000000..122bdbb48f1
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleGet.java
@@ -0,0 +1,90 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.web.scripts.rule.ruleset.RuleRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.rule.Rule;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ *
+ */
+public class RuleGet extends AbstractRuleWebScript
+{
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(RuleGet.class);
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        NodeRef nodeRef = parseRequestForNodeRef(req);
+
+        // get request parameters
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String ruleId = templateVars.get("rule_id");
+
+        Rule ruleToReturn = null;
+
+        // get all rules for given nodeRef
+        List<Rule> rules = ruleService.getRules(nodeRef);
+
+        // filter by rule id
+        for (Rule rule : rules)
+        {
+            if (rule.getNodeRef().getId().equalsIgnoreCase(ruleId))
+            {
+                ruleToReturn = rule;
+                break;
+            }
+        }
+
+        if (ruleToReturn == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find rule with id: " + ruleId);
+        }
+
+        RuleRef ruleRefToReturn = new RuleRef(ruleToReturn, fileFolderService.getFileInfo(ruleService.getOwningNodeRef(ruleToReturn)));
+
+        model.put("ruleRef", ruleRefToReturn);
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulePost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulePost.java
new file mode 100644
index 00000000000..a84a1df9ea4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulePost.java
@@ -0,0 +1,94 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.repo.web.scripts.rule.ruleset.RuleRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.rule.Rule;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ *
+ */
+public class RulePost extends AbstractRuleWebScript
+{
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(RulePost.class);
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        // get request parameters
+        NodeRef nodeRef = parseRequestForNodeRef(req);
+
+        Rule rule = null;
+        JSONObject json = null;
+
+        try
+        {
+            // read request json
+            json = new JSONObject(new JSONTokener(req.getContent().getContent()));
+
+            // parse request json
+            rule = parseJsonRule(json);
+
+            // check the rule
+            checkRule(rule);
+
+            // create rule
+            ruleService.saveRule(nodeRef, rule);
+
+            RuleRef ruleRef = new RuleRef(rule, fileFolderService.getFileInfo(ruleService.getOwningNodeRef(rule)));
+
+            model.put("ruleRef", ruleRef);
+        }
+        catch (IOException iox)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not read content from req.", iox);
+        }
+        catch (JSONException je)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from req.", je);
+        }
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulePut.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulePut.java
new file mode 100644
index 00000000000..251a3513066
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulePut.java
@@ -0,0 +1,376 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.action.ActionConditionImpl;
+import org.alfresco.repo.action.ActionImpl;
+import org.alfresco.repo.action.CompositeActionImpl;
+import org.alfresco.repo.web.scripts.rule.ruleset.RuleRef;
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ActionCondition;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.rule.Rule;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ *
+ */
+public class RulePut extends RulePost
+{
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(RulePut.class);
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        // get request parameters
+        NodeRef nodeRef = parseRequestForNodeRef(req);
+
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String ruleId = templateVars.get("rule_id");
+
+        Rule ruleToUpdate = null;
+
+        // get all rules for given nodeRef
+        List<Rule> rules = ruleService.getRules(nodeRef);
+
+        //filter by rule id
+        for (Rule rule : rules)
+        {
+            if (rule.getNodeRef().getId().equalsIgnoreCase(ruleId))
+            {
+                ruleToUpdate = rule;
+                break;
+            }
+        }
+
+        if (ruleToUpdate == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find rule with id: " + ruleId);
+        }
+
+        JSONObject json = null;
+
+        try
+        {
+            // read request json
+            json = new JSONObject(new JSONTokener(req.getContent().getContent()));
+
+            // parse request json
+            updateRuleFromJSON(json, ruleToUpdate);
+
+            // check the rule
+            checkRule(ruleToUpdate);
+
+            // save changes
+            ruleService.saveRule(nodeRef, ruleToUpdate);
+
+            RuleRef updatedRuleRef = new RuleRef(ruleToUpdate, fileFolderService.getFileInfo(ruleService.getOwningNodeRef(ruleToUpdate)));
+
+            model.put("ruleRef", updatedRuleRef);
+        }
+        catch (IOException iox)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not read content from req.", iox);
+        }
+        catch (JSONException je)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from req.", je);
+        }
+
+        return model;
+    }
+
+    protected void updateRuleFromJSON(JSONObject jsonRule, Rule ruleToUpdate) throws JSONException
+    {
+        if (jsonRule.has("title"))
+        {
+            ruleToUpdate.setTitle(jsonRule.getString("title"));
+        }
+
+        if (jsonRule.has("description"))
+        {
+            ruleToUpdate.setDescription(jsonRule.getString("description"));
+        }
+
+        if (jsonRule.has("ruleType"))
+        {
+            JSONArray jsonTypes = jsonRule.getJSONArray("ruleType");
+            List<String> types = new ArrayList<String>();
+
+            for (int i = 0; i < jsonTypes.length(); i++)
+            {
+                types.add(jsonTypes.getString(i));
+            }
+            ruleToUpdate.setRuleTypes(types);
+        }
+
+        if (jsonRule.has("applyToChildren"))
+        {
+            ruleToUpdate.applyToChildren(jsonRule.getBoolean("applyToChildren"));
+        }
+
+        if (jsonRule.has("executeAsynchronously"))
+        {
+            ruleToUpdate.setExecuteAsynchronously(jsonRule.getBoolean("executeAsynchronously"));
+        }
+
+        if (jsonRule.has("disabled"))
+        {
+            ruleToUpdate.setRuleDisabled(jsonRule.getBoolean("disabled"));
+        }
+
+        if (jsonRule.has("action"))
+        {
+            JSONObject jsonAction = jsonRule.getJSONObject("action");
+
+            // update rule action 
+            Action action = updateActionFromJson(jsonAction, (ActionImpl) ruleToUpdate.getAction());
+
+            ruleToUpdate.setAction(action);
+        }
+    }
+
+    protected Action updateActionFromJson(JSONObject jsonAction, ActionImpl actionToUpdate) throws JSONException
+    {
+        ActionImpl result = null;
+
+        if (jsonAction.has("id"))
+        {
+            // update existing action
+            result = actionToUpdate;
+        }
+        else
+        {
+            // create new object as id was not sent by client
+            result = parseJsonAction(jsonAction);
+            return result;
+        }
+
+        if (jsonAction.has("description"))
+        {
+            result.setDescription(jsonAction.getString("description"));
+        }
+
+        if (jsonAction.has("title"))
+        {
+            result.setTitle(jsonAction.getString("title"));
+        }
+
+        if (jsonAction.has("parameterValues"))
+        {
+            JSONObject jsonParameterValues = jsonAction.getJSONObject("parameterValues");
+            result.setParameterValues(parseJsonParameterValues(jsonParameterValues, result.getActionDefinitionName(), true));
+        }
+
+        if (jsonAction.has("executeAsync"))
+        {
+            result.setExecuteAsynchronously(jsonAction.getBoolean("executeAsync"));
+        }
+
+        if (jsonAction.has("runAsUser"))
+        {
+            result.setRunAsUser(jsonAction.getString("runAsUser"));
+        }
+
+        if (jsonAction.has("actions"))
+        {
+            JSONArray jsonActions = jsonAction.getJSONArray("actions");
+            if (jsonActions.length() == 0)
+            {
+                // empty array was sent -> clear list
+                ((CompositeActionImpl) result).getActions().clear();
+            }
+            else
+            {
+                List<Action> existingActions = ((CompositeActionImpl) result).getActions();
+                List<Action> newActions = new ArrayList<Action>();
+
+                for (int i = 0; i < jsonActions.length(); i++)
+                {
+                    JSONObject innerJsonAction = jsonActions.getJSONObject(i);
+
+                    if (innerJsonAction.has("id"))
+                    {
+                        // update existing object
+                        String actionId = innerJsonAction.getString("id");
+
+                        Action existingAction = getAction(existingActions, actionId);
+                        existingActions.remove(existingAction);
+
+                        Action updatedAction = updateActionFromJson(innerJsonAction, (ActionImpl) existingAction);
+                        newActions.add(updatedAction);
+                    }
+                    else
+                    {
+                        //create new action as id was not sent
+                        newActions.add(parseJsonAction(innerJsonAction));
+                    }
+                }
+                existingActions.clear();
+
+                for (Action action : newActions)
+                {
+                    existingActions.add(action);
+                }
+            }
+        }
+
+        if (jsonAction.has("conditions"))
+        {
+            JSONArray jsonConditions = jsonAction.getJSONArray("conditions");
+
+            if (jsonConditions.length() == 0)
+            {
+                // empty array was sent -> clear list
+                result.getActionConditions().clear();
+            }
+            else
+            {
+                List<ActionCondition> existingConditions = result.getActionConditions();
+                List<ActionCondition> newConditions = new ArrayList<ActionCondition>();
+
+                for (int i = 0; i < jsonConditions.length(); i++)
+                {
+                    JSONObject jsonCondition = jsonConditions.getJSONObject(i);
+
+                    if (jsonCondition.has("id"))
+                    {
+                        // update existing object
+                        String conditionId = jsonCondition.getString("id");
+
+                        ActionCondition existingCondition = getCondition(existingConditions, conditionId);
+                        existingConditions.remove(existingCondition);
+
+                        ActionCondition updatedActionCondition = updateActionConditionFromJson(jsonCondition, (ActionConditionImpl) existingCondition);
+                        newConditions.add(updatedActionCondition);
+                    }
+                    else
+                    {
+                        // create new object as id was not sent
+                        newConditions.add(parseJsonActionCondition(jsonCondition));
+                    }
+                }
+
+                existingConditions.clear();
+
+                for (ActionCondition condition : newConditions)
+                {
+                    existingConditions.add(condition);
+                }
+            }
+        }
+
+        if (jsonAction.has("compensatingAction"))
+        {
+            JSONObject jsonCompensatingAction = jsonAction.getJSONObject("compensatingAction");
+            Action compensatingAction = updateActionFromJson(jsonCompensatingAction, (ActionImpl) actionToUpdate.getCompensatingAction());
+
+            actionToUpdate.setCompensatingAction(compensatingAction);
+        }
+        return result;
+    }
+
+    protected ActionCondition updateActionConditionFromJson(JSONObject jsonCondition, ActionConditionImpl conditionToUpdate) throws JSONException
+    {
+        ActionConditionImpl result = null;
+
+        if (jsonCondition.has("id"))
+        {
+            // update exiting object
+            result = conditionToUpdate;
+        }
+        else
+        {
+            // create new onject as id was not sent
+            result = parseJsonActionCondition(jsonCondition);
+            return result;
+        }
+
+        if (jsonCondition.has("invertCondition"))
+        {
+            result.setInvertCondition(jsonCondition.getBoolean("invertCondition"));
+        }
+
+        if (jsonCondition.has("parameterValues"))
+        {
+            JSONObject jsonParameterValues = jsonCondition.getJSONObject("parameterValues");
+            result.setParameterValues(parseJsonParameterValues(jsonParameterValues, result.getActionConditionDefinitionName(), false));
+        }
+
+        return result;
+    }
+
+    private Action getAction(List<Action> actions, String id)
+    {
+        Action result = null;
+        for (Action action : actions)
+        {
+            if (action.getId().equalsIgnoreCase(id))
+            {
+                result = action;
+                break;
+            }
+        }
+
+        return result;
+    }
+
+    private ActionCondition getCondition(List<ActionCondition> conditions, String id)
+    {
+        ActionCondition result = null;
+        for (ActionCondition condition : conditions)
+        {
+            if (condition.getId().equalsIgnoreCase(id))
+            {
+                result = condition;
+                break;
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleTypesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleTypesGet.java
new file mode 100644
index 00000000000..828afa26ad5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RuleTypesGet.java
@@ -0,0 +1,61 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.rule.RuleType;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ *
+ */
+public class RuleTypesGet extends AbstractRuleWebScript
+{
+
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(RuleTypesGet.class);
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        // get all rule types
+        List<RuleType> ruletypes = ruleService.getRuleTypes();
+
+        model.put("ruletypes", ruletypes);
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulesGet.java
new file mode 100644
index 00000000000..1d69ccdf668
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulesGet.java
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.web.scripts.rule.ruleset.RuleRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.rule.Rule;
+import org.alfresco.service.cmr.rule.RuleType;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ *
+ */
+public class RulesGet extends AbstractRuleWebScript
+{
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(RulesGet.class);
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        // get request parameters
+        NodeRef nodeRef = parseRequestForNodeRef(req);
+        String ruleType = req.getParameter("ruleType");
+
+        RuleType type = ruleService.getRuleType(ruleType);
+
+        if (type == null)
+        {
+            ruleType = null;
+        }
+
+        // get all rules (excluding inherited) filtered by rule type
+        List<Rule> rules = ruleService.getRules(nodeRef, false, ruleType);
+
+        List<RuleRef> ruleRefs = new ArrayList<RuleRef>();
+
+        for (Rule rule : rules)
+        {
+            ruleRefs.add(new RuleRef(rule, fileFolderService.getFileInfo(ruleService.getOwningNodeRef(rule))));
+        }
+
+        model.put("ruleRefs", ruleRefs);
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulesetGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulesetGet.java
new file mode 100644
index 00000000000..a7115c52025
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/RulesetGet.java
@@ -0,0 +1,106 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.web.scripts.rule.ruleset.RuleRef;
+import org.alfresco.repo.web.scripts.rule.ruleset.RuleSet;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.rule.Rule;
+import org.alfresco.service.cmr.rule.RuleType;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ *
+ */
+public class RulesetGet extends AbstractRuleWebScript
+{
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(RulesetGet.class);
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        // get request parameters
+        NodeRef nodeRef = parseRequestForNodeRef(req);
+        String ruleType = req.getParameter("ruleType");
+
+        RuleType type = ruleService.getRuleType(ruleType);
+
+        if (type == null)
+        {
+            ruleType = null;
+        }
+
+        RuleSet ruleset = new RuleSet();
+
+        // get all "owned" rules
+        List<Rule> ownedRules = ruleService.getRules(nodeRef, false, ruleType);
+
+        // get all rules (including inherited)
+        List<Rule> inheritedRules = ruleService.getRules(nodeRef, true, ruleType);
+
+        // remove "owned" rules
+        inheritedRules.removeAll(ownedRules);
+
+        List<RuleRef> rulesToSet = new ArrayList<RuleRef>();
+
+        for (Rule rule : ownedRules)
+        {
+            rulesToSet.add(new RuleRef(rule, fileFolderService.getFileInfo(ruleService.getOwningNodeRef(rule))));
+        }
+        ruleset.setRules(rulesToSet);
+
+        List<RuleRef> inheritedRulesToSet = new ArrayList<RuleRef>();
+
+        for (Rule rule : inheritedRules)
+        {
+            inheritedRulesToSet.add(new RuleRef(rule, fileFolderService.getFileInfo(ruleService.getOwningNodeRef(rule))));
+        }
+        ruleset.setInheritedRules(inheritedRulesToSet);
+
+        ruleset.setLinkedToRuleSet(ruleService.getLinkedToRuleNode(nodeRef));
+
+        ruleset.setLinkedFromRuleSets(ruleService.getLinkedFromRuleNodes(nodeRef));
+
+        ruleset.setRulesetNodeRef(nodeRef);
+
+        model.put("ruleset", ruleset);
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ruleset/RuleRef.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ruleset/RuleRef.java
new file mode 100644
index 00000000000..088f435f954
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ruleset/RuleRef.java
@@ -0,0 +1,92 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule.ruleset;
+
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.rule.Rule;
+
+/**
+ * Rule object for REST API
+ * 
+ * @author unknown
+ *
+ */
+public class RuleRef
+{
+
+    /** Serial version UID */
+    private static final long serialVersionUID = -923276130307938661L;
+
+    private FileInfo owningFileInfo;
+
+    private Rule rule;
+
+    public RuleRef(Rule rule, FileInfo owningFileInfo)
+    {
+        this.rule = rule;
+        this.owningFileInfo = owningFileInfo;
+    }
+
+    /**
+     * Set the rule
+     * 
+     * @param rule the rule to set
+     */
+    public void setRule(Rule rule)
+    {
+        this.rule = rule;
+    }
+
+    /**
+     * Return the rule
+     * 
+     * @return rule
+     */
+    public Rule getRule()
+    {
+        return rule;
+    }
+
+    /**
+     * Set the owning file info reference for rule
+     * 
+     * @param owningFileInfo the owning file info reference to set
+     */
+    public void setOwningFileInfo(FileInfo owningFileInfo)
+    {
+        this.owningFileInfo = owningFileInfo;
+    }
+
+    /**
+     * Returns the owning file info reference for a rule.
+     * 
+     * @return the owning file info reference
+     */
+    public FileInfo getOwningFileInfo()
+    {
+        return owningFileInfo;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ruleset/RuleSet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ruleset/RuleSet.java
new file mode 100644
index 00000000000..3b73a68ce87
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/rule/ruleset/RuleSet.java
@@ -0,0 +1,152 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule.ruleset;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * @author unknown
+ *
+ */
+public class RuleSet implements Serializable
+{
+
+    private static final long serialVersionUID = 6985140035928444095L;
+
+    private List<RuleRef> rules = null;
+
+    private List<RuleRef> inheritedRules = null;
+
+    private NodeRef rulesetNodeRef;
+
+    private NodeRef linkedToRuleSet;
+
+    private List<NodeRef> linkedFromRuleSets;
+
+    /**
+     * Set list of the rules "owned" by this rule set
+     * 
+     * @param rules the list of rules to set
+     */
+    public void setRules(List<RuleRef> rules)
+    {
+        this.rules = rules;
+    }
+
+    /**
+     * Get list of the rules "owned" by this rule set
+     * 
+     * @return list of "owned" rules
+     */
+    public List<RuleRef> getRules()
+    {
+        return rules;
+    }
+
+    /**
+     * Set list of the rules inherited by this rule set from parent
+     * 
+     * @param inheritedRules the list of inherited rules to set
+     */
+    public void setInheritedRules(List<RuleRef> inheritedRules)
+    {
+        this.inheritedRules = inheritedRules;
+    }
+
+    /**
+     * Get list of the rules inherited by this rule set from parent
+     * 
+     * @return list of inherited rules
+     */
+    public List<RuleRef> getInheritedRules()
+    {
+        return inheritedRules;
+    }
+
+    /**
+     * Set the nodeRef to which this ruleset belongs
+     * 
+     * @param rulesetNodeRef the ruleset nodeRef to set
+     */
+    public void setRulesetNodeRef(NodeRef rulesetNodeRef)
+    {
+        this.rulesetNodeRef = rulesetNodeRef;
+    }
+
+    /**
+     * Get the nodeRef to which this ruleset belongs
+     * 
+     * @return ruleset nodeRef
+     */
+    public NodeRef getRulesetNodeRef()
+    {
+        return rulesetNodeRef;
+    }
+
+    /**
+     * Set the nodeRef to which this ruleset linked to 
+     * 
+     * @param linkedToRuleSet the nodeRef to set
+     */
+    public void setLinkedToRuleSet(NodeRef linkedToRuleSet)
+    {
+        this.linkedToRuleSet = linkedToRuleSet;
+    }
+
+    /**
+     * Get the nodeRef to which this ruleset linked to
+     * 
+     * @return linked to nodeRef
+     */
+    public NodeRef getLinkedToRuleSet()
+    {
+        return linkedToRuleSet;
+    }
+
+    /**
+     * Set the list of nodeRefs that link to this ruleset
+     * 
+     * @param linkedFromRuleSets the list of nodeRefs to set
+     */
+    public void setLinkedFromRuleSets(List<NodeRef> linkedFromRuleSets)
+    {
+        this.linkedFromRuleSets = linkedFromRuleSets;
+    }
+
+    /**
+     * Get the list of nodeRefs that link to this ruleset
+     * 
+     * @return the list of nodeRefs
+     */
+    public List<NodeRef> getLinkedFromRuleSets()
+    {
+        return linkedFromRuleSets;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java
new file mode 100644
index 00000000000..86c3eb89900
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java
@@ -0,0 +1,331 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.servlet;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.Authorization;
+import org.alfresco.repo.web.auth.AuthenticationListener;
+import org.alfresco.repo.web.auth.BasicAuthCredentials;
+import org.alfresco.repo.web.auth.GuestCredentials;
+import org.alfresco.repo.web.auth.TicketCredentials;
+import org.alfresco.repo.web.auth.WebCredentials;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.Base64;
+import org.springframework.extensions.webscripts.Authenticator;
+import org.springframework.extensions.webscripts.Description.RequiredAuthentication;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.servlet.ServletAuthenticatorFactory;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletResponse;
+
+/**
+ * HTTP Basic Authentication
+ * 
+ * @author davidc
+ */
+public class BasicHttpAuthenticatorFactory implements ServletAuthenticatorFactory
+{
+    // Logger
+    private static Log logger = LogFactory.getLog(BasicHttpAuthenticator.class);
+
+    // Component dependencies
+    protected AuthenticationService authenticationService;
+    protected AuthorityService authorityService;
+    protected AuthenticationListener listener;
+
+    
+    /**
+     * @param authenticationService AuthenticationService
+     */
+    public void setAuthenticationService(AuthenticationService authenticationService)
+    {
+        this.authenticationService = authenticationService;
+    }
+    
+    /**
+     * Set the listener for authentication events, generated by {@link BasicHttpAuthenticator} instances.
+     */
+    public void setAuthenticationListener(AuthenticationListener listener)
+    {
+    	this.listener = listener;
+    }
+
+    public AuthorityService getAuthorityService()
+    {
+        return authorityService;
+    }
+
+    public void setAuthorityService(AuthorityService authorityService)
+    {
+        this.authorityService = authorityService;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.servlet.ServletAuthenticatorFactory#create(org.alfresco.web.scripts.servlet.WebScriptServletRequest, org.alfresco.web.scripts.servlet.WebScriptServletResponse)
+     */
+    public Authenticator create(WebScriptServletRequest req, WebScriptServletResponse res)
+    {
+        return new BasicHttpAuthenticator(req, res, listener);
+    }
+    
+    /**
+     * Generate a {@link WebCredentials} instance from information contained in auth.
+     */
+    private WebCredentials getCredentials(Authorization auth)
+    {
+        if (auth.isTicket()) 
+        {
+            return new TicketCredentials(auth.getTicket());
+        }
+        else
+        {
+            return new BasicAuthCredentials(auth.getUserName(), auth.getPassword());
+        }
+
+    }
+    
+    
+    /**
+     * HTTP Basic Authentication
+     * 
+     * @author davidc
+     */
+    public class BasicHttpAuthenticator implements Authenticator
+    {
+        // dependencies
+        protected WebScriptServletRequest servletReq;
+        protected WebScriptServletResponse servletRes;
+        
+        protected String authorization;
+        protected String ticket;
+        protected AuthenticationListener listener;
+        
+        /**
+         * Construct
+         * 
+         * @param req WebScriptServletRequest
+         * @param res WebScriptServletResponse
+         * @param listener AuthenticationListener
+         */
+        public BasicHttpAuthenticator(WebScriptServletRequest req, WebScriptServletResponse res, AuthenticationListener listener)
+        {
+            this.servletReq = req;
+            this.servletRes = res;
+            
+            HttpServletRequest httpReq = servletReq.getHttpServletRequest();
+            
+            this.listener = listener;
+            
+            this.authorization = httpReq.getHeader("Authorization");
+            this.ticket = httpReq.getParameter("alf_ticket");
+        }
+    
+        /* (non-Javadoc)
+         * @see org.alfresco.web.scripts.Authenticator#authenticate(org.alfresco.web.scripts.Description.RequiredAuthentication, boolean)
+         */
+        public boolean authenticate(RequiredAuthentication required, boolean isGuest)
+        {
+            boolean authorized = false;
+    
+            //
+            // validate credentials
+            // 
+            
+            HttpServletResponse res = servletRes.getHttpServletResponse();
+            
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("HTTP Authorization provided: " + (authorization != null && authorization.length() > 0));
+                logger.debug("URL ticket provided: " + (ticket != null && ticket.length() > 0));
+            }
+
+            boolean doNotReportUrlTicketAuthenticationFailed = true;
+
+            // If they requested explicit guest authentication,
+            //  Authenticate as guest (if allowed)
+            if (isGuest && RequiredAuthentication.guest == required)
+            {
+                if (logger.isDebugEnabled())
+                    logger.debug("Authenticating as Guest");
+    
+                try 
+                {
+                    authenticationService.authenticateAsGuest();
+                    listener.userAuthenticated(new GuestCredentials());
+                    authorized = true;
+                }
+                catch (AuthenticationException ex)
+                {
+                 // failed authentication
+                    listener.authenticationFailed(new GuestCredentials());
+                }
+            }
+            
+            // authenticate as specified by explicit ticket on url
+            else if ((null != ticket) && (ticket.length() > 0) && (doNotReportUrlTicketAuthenticationFailed = isTicketValid()))
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Authenticating (URL argument) ticket " + ticket);
+                }
+
+                // assume a ticket has been passed
+                listener.userAuthenticated(new TicketCredentials(ticket));
+                authorized = true;
+            }
+            
+            // authenticate as specified by HTTP Basic Authentication
+            else if (authorization != null && authorization.length() > 0)
+            {
+                String[] authorizationParts = authorization.split(" ");
+                if (!authorizationParts[0].equalsIgnoreCase("basic"))
+                {
+                    throw new WebScriptException(401, "Authorization '" + authorizationParts[0] + "' not supported.");
+                }
+                
+                String decodedAuthorisation = new String(Base64.decode(authorizationParts[1]));
+                Authorization auth = new Authorization(decodedAuthorisation);
+                try
+                {
+                    if (auth.isTicket())
+                    {
+                        if (logger.isDebugEnabled())
+                            logger.debug("Authenticating (BASIC HTTP) ticket " + auth.getTicket());
+    
+                        // assume a ticket has been passed
+                        authenticationService.validate(auth.getTicket());
+                        listener.userAuthenticated(getCredentials(auth));
+                        authorized = true;
+                    }
+                    else
+                    {
+                        if (logger.isDebugEnabled())
+                            logger.debug("Authenticating (BASIC HTTP) user " + auth.getUserName());
+    
+                        // No longer need a special call to authenticate as guest
+                        // Leave guest name resolution up to the services
+                        authenticationService.authenticate(auth.getUserName(), auth.getPassword().toCharArray());
+                        listener.userAuthenticated(getCredentials(auth));
+                        authorized = true;
+                    }
+                }
+                catch(AuthenticationException e)
+                {
+                    // failed authentication
+                    listener.authenticationFailed(getCredentials(auth));
+                }
+            }
+    
+            //
+            // request credentials if not authorized
+            //
+            
+            if (!authorized)
+            {
+                if(!doNotReportUrlTicketAuthenticationFailed)
+                {
+                    listener.authenticationFailed(new TicketCredentials(ticket));
+                }
+
+                if (logger.isDebugEnabled())
+                    logger.debug("Requesting authorization credentials");
+                
+                res.setStatus(401);
+                res.setHeader("WWW-Authenticate", "Basic realm=\"Alfresco\"");
+            }
+            return authorized;
+        }
+
+        /**
+         * Checks if a user ticket is still valid
+         * 
+         * @return {@link Boolean} value: <code>true</code> if the ticket is still valid, <code>false</code> if the ticket is not valid any more
+         */
+        private boolean isTicketValid()
+        {
+            try
+            {
+                authenticationService.validate(ticket);
+                return true;
+            }
+            catch (AuthenticationException e)
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("User ticket is not valid. Passing to the Basic authentication handling. Reqeust information:\n"
+                            + "    ticket: " + ticket + "\n"
+                            + "    request: " + servletReq.getQueryString() + "\n"
+                            + "    error: " + e, e);
+                }
+
+                return false;
+            }
+        }
+
+        /* (non-Javadoc)
+         * @see org.alfresco.web.scripts.Authenticator#emptyCredentials()
+         */
+        public boolean emptyCredentials()
+        {
+            return ((ticket == null || ticket.length() == 0) && (authorization == null || authorization.length() == 0));
+        }
+
+        protected boolean isBasicAuthHeaderPresentForAdmin()
+        {
+            if (authorization == null || authorization.isEmpty())
+            {
+                return false;
+            }
+            String[] authorizationParts = authorization.split(" ");
+            if (!authorizationParts[0].equalsIgnoreCase("basic"))
+            {
+                return false;
+            }
+
+            String decodedAuthorisation = new String(Base64.decode(authorizationParts[1]));
+            Authorization auth = new Authorization(decodedAuthorisation);
+            if (auth.isTicket() || auth.getUserName() == null || auth.getUserName().isEmpty())
+            {
+                return false;
+            }
+            // optimization: check the admin user name first
+            if (AuthenticationUtil.getAdminUserName().equals(auth.getUserName()))
+            {
+                return true;
+            }
+            // then check the admin group
+            return AuthenticationUtil.runAsSystem(() -> authorityService.isAdminAuthority(auth.getUserName()));
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/servlet/RemoteUserAuthenticatorFactory.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/servlet/RemoteUserAuthenticatorFactory.java
new file mode 100644
index 00000000000..e40e9a72ff0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/servlet/RemoteUserAuthenticatorFactory.java
@@ -0,0 +1,428 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.servlet;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.alfresco.error.ExceptionStackUtil;
+import org.alfresco.repo.SessionUser;
+import org.alfresco.repo.management.subsystems.ActivateableBean;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.external.RemoteUserMapper;
+import org.alfresco.repo.web.auth.AuthenticationListener;
+import org.alfresco.repo.web.auth.TicketCredentials;
+import org.alfresco.repo.web.auth.WebCredentials;
+import org.alfresco.repo.webdav.auth.AuthenticationDriver;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Authenticator;
+import org.springframework.extensions.webscripts.Description.RequiredAuthentication;
+import org.springframework.extensions.webscripts.WebScript;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletResponse;
+
+import net.sf.acegisecurity.DisabledException;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Authenticator to provide Remote User based Header authentication dropping back to Basic Auth otherwise. 
+ * Statelessly authenticating via a secure header now does not require a Session so can be used with
+ * request-level load balancers which was not previously possible.
+ * <p>
+ * @see web-scripts-application-context.xml and web.xml - bean id 'webscripts.authenticator.remoteuser'
+ * <p>
+ * This authenticator can be bound to /service and does not require /wcservice (Session) mapping.
+ * 
+ * @since 5.1
+ * @author Kevin Roast
+ */
+public class RemoteUserAuthenticatorFactory extends BasicHttpAuthenticatorFactory
+{
+    private static Log logger = LogFactory.getLog(RemoteUserAuthenticatorFactory.class);
+    public static final long GET_REMOTE_USER_TIMEOUT_MILLISECONDS_DEFAULT = 10000L; // 10 sec
+
+    protected RemoteUserMapper remoteUserMapper;
+    protected AuthenticationComponent authenticationComponent;
+
+    private boolean alwaysAllowBasicAuthForAdminConsole = true;
+    List<String> adminConsoleScriptFamilies;
+    long getRemoteUserTimeoutMilliseconds = GET_REMOTE_USER_TIMEOUT_MILLISECONDS_DEFAULT;
+
+    public void setRemoteUserMapper(RemoteUserMapper remoteUserMapper)
+    {
+        this.remoteUserMapper = remoteUserMapper;
+    }
+    
+    public void setAuthenticationComponent(AuthenticationComponent authenticationComponent)
+    {
+        this.authenticationComponent = authenticationComponent;
+    }
+
+    public boolean isAlwaysAllowBasicAuthForAdminConsole()
+    {
+        return alwaysAllowBasicAuthForAdminConsole;
+    }
+
+    public void setAlwaysAllowBasicAuthForAdminConsole(boolean alwaysAllowBasicAuthForAdminConsole)
+    {
+        this.alwaysAllowBasicAuthForAdminConsole = alwaysAllowBasicAuthForAdminConsole;
+    }
+
+    public List<String> getAdminConsoleScriptFamilies()
+    {
+        return adminConsoleScriptFamilies;
+    }
+
+    public void setAdminConsoleScriptFamilies(List<String> adminConsoleScriptFamilies)
+    {
+        this.adminConsoleScriptFamilies = adminConsoleScriptFamilies;
+    }
+
+    public long getGetRemoteUserTimeoutMilliseconds()
+    {
+        return getRemoteUserTimeoutMilliseconds;
+    }
+
+    public void setGetRemoteUserTimeoutMilliseconds(long getRemoteUserTimeoutMilliseconds)
+    {
+        this.getRemoteUserTimeoutMilliseconds = getRemoteUserTimeoutMilliseconds;
+    }
+
+    @Override
+    public Authenticator create(WebScriptServletRequest req, WebScriptServletResponse res)
+    {
+        return new RemoteUserAuthenticator(req, res, this.listener);
+    }
+
+    /**
+     * Remote User authenticator - adds header authentication onto Basic Auth. Stateless does not require Session.
+     * 
+     * @author Kevin Roast
+     */
+    public class RemoteUserAuthenticator extends BasicHttpAuthenticator
+    {
+        public RemoteUserAuthenticator(WebScriptServletRequest req, WebScriptServletResponse res, AuthenticationListener listener)
+        {
+            super(req, res, listener);
+        }
+        
+        @Override
+        public boolean authenticate(RequiredAuthentication required, boolean isGuest)
+        {
+            boolean authenticated = false;
+
+            if (logger.isTraceEnabled())
+            {
+                logger.trace("Authenticate level required: " + required + " is guest: " + isGuest);
+            }
+
+            String userId = null;
+            if (isRemoteUserMapperActive())
+            {
+                if (isAlwaysAllowBasicAuthForAdminConsole())
+                {
+                    final boolean useTimeoutForAdminAccessingAdminConsole = shouldUseTimeoutForAdminAccessingAdminConsole(required, isGuest);
+
+                    if (useTimeoutForAdminAccessingAdminConsole && isBasicAuthHeaderPresentForAdmin())
+                    {
+                        return callBasicAuthForAdminConsoleAccess(required, isGuest);
+                    }
+                    try
+                    {
+                        userId = getRemoteUserWithTimeout(useTimeoutForAdminAccessingAdminConsole);
+                    }
+                    catch (AuthenticationTimeoutException e)
+                    {
+                        //return basic auth challenge
+                        return false;
+                    }
+                }
+                else
+                {
+                    // retrieve the remote user if configured and available - authenticate that user directly
+                    userId = getRemoteUser();
+                }
+            }
+
+            if (userId != null)
+            {
+                try
+                {
+                    authenticationComponent.setCurrentUser(userId);
+                    listener.userAuthenticated(new TicketCredentials(authenticationService.getCurrentTicket()));
+                    authenticated = true;
+                }
+                catch (AuthenticationException authErr)
+                {
+                    // don't propagate if the user is disabled
+                    Throwable disabledCause = ExceptionStackUtil.getCause(authErr, DisabledException.class);
+                    if(disabledCause != null)
+                    {
+                    	listener.authenticationFailed(new WebCredentials() {});
+                    }
+                    else
+                    {
+                        throw authErr;
+                    }
+                }
+            }
+            else
+            {
+                // is there a Session which might contain a valid user ticket?
+                HttpSession session = servletReq.getHttpServletRequest().getSession(false);
+                if (session != null)
+                {
+                    try
+                    {
+                        SessionUser user = (SessionUser)session.getAttribute(AuthenticationDriver.AUTHENTICATION_USER);
+                        if (user != null)
+                        {
+                            // Validate the ticket for the current SessionUser
+                            authenticationService.validate(user.getTicket());
+                            if (logger.isDebugEnabled())
+                            {
+                                logger.debug("Ticket is valid. Retaining cached user in session.");
+                            }
+                            listener.userAuthenticated(new TicketCredentials(user.getTicket()));
+                            authenticated = true;
+                        }
+                        else
+                        {
+                            authenticated = super.authenticate(required, isGuest);
+                        }
+                    }
+                    catch (AuthenticationException authErr)
+                    {
+                        if (logger.isDebugEnabled())
+                        {
+                            logger.debug("An Authentication error occur. Removing User session.", authErr);
+                        }
+                        session.removeAttribute(AuthenticationDriver.AUTHENTICATION_USER);
+                        session.invalidate();
+                        listener.authenticationFailed(new WebCredentials() {});
+                    }
+                }
+                else
+                {
+                    authenticated = super.authenticate(required, isGuest);
+                }
+            }
+            return authenticated;
+        }
+
+        private boolean callBasicAuthForAdminConsoleAccess(RequiredAuthentication required, boolean isGuest)
+        {
+            // return REST call, after a timeout/basic auth challenge
+            if (logger.isTraceEnabled())
+            {
+                logger.trace("An Admin Console request has come in with Basic Auth headers present for an admin user.");
+            }
+            // In order to prompt for another password, in case it was not entered correctly,
+            // the output of this method should be returned by the calling "authenticate" method;
+            // This would also mean, that once the admin basic auth header is present,
+            // the authentication chain will not be used for the admin console access
+            return super.authenticate(required, isGuest);
+        }
+
+        private boolean shouldUseTimeoutForAdminAccessingAdminConsole(RequiredAuthentication required, boolean isGuest)
+        {
+            boolean useTimeoutForAdminAccessingAdminConsole = RequiredAuthentication.admin.equals(required) && !isGuest &&
+                servletReq.getServiceMatch() != null && isAdminConsoleWebScript(servletReq.getServiceMatch().getWebScript());
+
+            if (logger.isTraceEnabled())
+            {
+                logger.trace("Should ensure that the admins can login with basic auth: " + useTimeoutForAdminAccessingAdminConsole);
+            }
+            return useTimeoutForAdminAccessingAdminConsole;
+        }
+
+        private boolean isRemoteUserMapperActive()
+        {
+            return remoteUserMapper != null && (!(remoteUserMapper instanceof ActivateableBean) || ((ActivateableBean) remoteUserMapper).isActive());
+        }
+
+        protected boolean isAdminConsoleWebScript(WebScript webScript)
+        {
+            if (webScript == null || adminConsoleScriptFamilies == null || webScript.getDescription() == null
+                || webScript.getDescription().getFamilys() == null)
+            {
+                return false;
+            }
+
+            if (logger.isTraceEnabled())
+            {
+                logger.trace("WebScript: " + webScript + " has these families: " + webScript.getDescription().getFamilys());
+            }
+
+            // intersect the "family" sets defined
+            Set<String> families = new HashSet<String>(webScript.getDescription().getFamilys());
+            families.retainAll(adminConsoleScriptFamilies);
+            final boolean isAdminConsole = !families.isEmpty();
+
+            if (logger.isTraceEnabled() && isAdminConsole)
+            {
+                logger.trace("Detected an Admin Console webscript: " + webScript );
+            }
+
+            return isAdminConsole;
+        }
+
+        protected String getRemoteUserWithTimeout(boolean useTimeout) throws AuthenticationTimeoutException
+        {
+            if (!useTimeout)
+            {
+                return getRemoteUser();
+            }
+
+            String returnedRemoteUser = null;
+            GetRemoteUserRunnable getRemoteUserRunnable = new GetRemoteUserRunnable();
+            Thread workerGettingTheRemoteUser = new Thread(getRemoteUserRunnable);
+            workerGettingTheRemoteUser.start();
+            try
+            {
+                synchronized (workerGettingTheRemoteUser)
+                {
+                    workerGettingTheRemoteUser.join(getRemoteUserTimeoutMilliseconds);
+                }
+            }
+            catch (Exception e)
+            {
+                logger.warn("Exception trying to get the remote user: " + e.getMessage(), e);
+            }
+
+            returnedRemoteUser = getRemoteUserRunnable.getReturnedRemoteUser();
+
+            if (workerGettingTheRemoteUser.isAlive())
+            {
+                // we timed out
+                // we should request basic authentication as the chain can't be usable
+                cleanupThread(workerGettingTheRemoteUser);
+
+                final String message = "Could not get the remote user in a reasonable time: " + getRemoteUserTimeoutMilliseconds + " milliseconds. "
+                    + "Adjust the timeout property 'authentication.getRemoteUserTimeoutMilliseconds' if required.";
+
+                if (logger.isWarnEnabled())
+                {
+                    logger.warn("Returning basic auth challenge for Admin Console. Cause: " + message);
+                }
+                HttpServletResponse res = servletRes.getHttpServletResponse();
+                res.setStatus(401);
+                res.setHeader("WWW-Authenticate", "Basic realm=\"Alfresco\"");
+
+                throw new AuthenticationTimeoutException(message);
+            }
+            return returnedRemoteUser;
+        }
+
+        private void cleanupThread(Thread workerGettingTheRemoteUser)
+        {
+            try
+            {
+                // try to clean up the thread we created, to use resources optimally
+                workerGettingTheRemoteUser.interrupt();
+            }
+            catch (Exception e)
+            {
+                // we can't really handle anything here
+            }
+        }
+
+        /**
+         * Retrieve the remote user from servlet request header when using a secure connection.
+         * The RemoteUserMapper bean must be active and configured.
+         * 
+         * @return remote user ID or null if not active or found
+         */
+        protected String getRemoteUser()
+        {
+            String userId = null;
+            
+            // If the remote user mapper is configured, we may be able to map in an externally authenticated user
+            if (isRemoteUserMapperActive())
+            {
+                userId = remoteUserMapper.getRemoteUser(this.servletReq.getHttpServletRequest());
+            }
+
+            logRemoteUserID(userId);
+
+            return userId;
+        }
+
+        private void logRemoteUserID(String userId)
+        {
+            if (logger.isDebugEnabled())
+            {
+                String message = (userId == null) ?
+                    "No external user ID in request." :
+                    "Extracted external user ID from request: " + AuthenticationUtil.maskUsername(userId);
+                logger.debug(message);
+            }
+        }
+
+        class GetRemoteUserRunnable implements Runnable
+        {
+            private volatile String returnedRemoteUser;
+
+            @Override
+            public void run()
+            {
+                returnedRemoteUser = getRemoteUser();
+            }
+
+            public String getReturnedRemoteUser()
+            {
+                return returnedRemoteUser;
+            }
+        }
+
+    }
+}
+
+class AuthenticationTimeoutException extends Exception
+{
+    static final long serialVersionUID = -3387511013124229948L;
+
+    public AuthenticationTimeoutException()
+    {
+        super();
+    }
+
+    public AuthenticationTimeoutException(String message)
+    {
+        super(message);
+    }
+
+    public AuthenticationTimeoutException(String message, Throwable t)
+    {
+        super(message, t);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/AbstractSiteWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/AbstractSiteWebScript.java
new file mode 100644
index 00000000000..8380efa6dd0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/AbstractSiteWebScript.java
@@ -0,0 +1,84 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.site;
+
+import java.util.Map;
+
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author Nick Burch
+ * @since 4.0
+ */
+public abstract class AbstractSiteWebScript extends DeclarativeWebScript
+{
+    protected SiteService siteService;
+    protected AuthorityService authorityService;
+    
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+    
+    public void setAuthorityService(AuthorityService authorityService)
+    {
+        this.authorityService = authorityService;
+    }
+    
+    
+    protected static String buildSiteGroup(SiteInfo site)
+    {
+        return "GROUP_site_" + site.getShortName();
+    }
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req,
+          Status status, Cache cache) 
+    {
+       // Grab the site
+       String siteName = 
+           req.getServiceMatch().getTemplateVars().get("shortname");
+       SiteInfo site = siteService.getSite(siteName);
+       if (site == null)
+       {
+           throw new WebScriptException(
+                   Status.STATUS_NOT_FOUND, 
+                   "No Site found with that short name");
+       }
+       
+       // Process
+       return executeImpl(site, req, status, cache);
+    }
+    protected abstract Map<String, Object> executeImpl(SiteInfo site,
+          WebScriptRequest req, Status status, Cache cache);
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteAdminSitesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteAdminSitesGet.java
new file mode 100644
index 00000000000..db1d2b33215
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteAdminSitesGet.java
@@ -0,0 +1,181 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.site;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.node.getchildren.FilterProp;
+import org.alfresco.repo.node.getchildren.FilterPropString;
+import org.alfresco.repo.node.getchildren.FilterPropString.FilterTypeString;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.alfresco.util.ScriptPagingDetails;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * This class is the controller for the <i>site-admin-sites.get</i> web script.
+ * 
+ * @author Jamal Kaabi-Mofrad
+ */
+public class SiteAdminSitesGet extends DeclarativeWebScript
+{
+    private static final String NAME_FILTER = "nf";
+    private static final String MAX_ITEMS = "maxItems";
+    private static final String SKIP_COUNT = "skipCount";
+    private static final int DEFAULT_MAX_ITEMS_PER_PAGE = 50;
+
+    private SiteService siteService;
+    private NodeService nodeService;
+    private PersonService personService;
+
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public void setPersonService(PersonService personService)
+    {
+        this.personService = personService;
+    }
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
+        // check the current user access rights
+        if (!siteService.isSiteAdmin(currentUser))
+        {
+            // Note: security, no message to indicate why
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Resource not found.");
+        }
+
+        // Create paging
+        final ScriptPagingDetails paging = new ScriptPagingDetails(getIntParameter(req, MAX_ITEMS,
+                    DEFAULT_MAX_ITEMS_PER_PAGE), getIntParameter(req, SKIP_COUNT, 0));
+
+        // request a total count of found items
+        paging.setRequestTotalCountMax(Integer.MAX_VALUE);
+
+        final List<FilterProp> filterProp = getFilterProperties(req.getParameter(NAME_FILTER));
+
+        final List<Pair<QName, Boolean>> sortProps = new ArrayList<Pair<QName, Boolean>>();
+        sortProps.add(new Pair<QName, Boolean>(ContentModel.PROP_NAME, true));
+
+        PagingResults<SiteInfo> pagingResults = AuthenticationUtil.runAs(
+                    new AuthenticationUtil.RunAsWork<PagingResults<SiteInfo>>()
+                    {
+                        public PagingResults<SiteInfo> doWork() throws Exception
+                        {
+                            return siteService.listSites(filterProp, sortProps, paging);
+                        }
+                    }, AuthenticationUtil.getAdminUserName());
+
+        List<SiteInfo> result = pagingResults.getPage();
+        List<SiteState> sites = new ArrayList<SiteState>(result.size());
+        for (SiteInfo info : result)
+        {
+            sites.add(SiteState.create(info,
+                        siteService.listMembers(info.getShortName(), null, SiteModel.SITE_MANAGER, 0), currentUser,
+                        nodeService, personService));
+        }
+
+        Map<String, Object> sitesData = new HashMap<String, Object>(6);
+
+        // Site data
+        sitesData.put("items", sites);
+        // Paging data
+        sitesData.put("count", result.size());
+        sitesData.put("hasMoreItems", pagingResults.hasMoreItems());
+        sitesData.put("totalItems", (pagingResults.getTotalResultCount() == null ? -1 : pagingResults.getTotalResultCount().getFirst()));
+        sitesData.put("skipCount", paging.getSkipCount());
+        sitesData.put("maxItems", paging.getMaxItems());
+        
+        // Create the model from the site and pagination data
+        Map<String, Object> model = new HashMap<String, Object>(1);
+        model.put("data", sitesData);
+
+        return model;
+    }
+
+    private int getIntParameter(WebScriptRequest req, String paramName, int defaultValue)
+    {
+        String paramString = req.getParameter(paramName);
+
+        if (paramString != null)
+        {
+            try
+            {
+                int param = Integer.valueOf(paramString);
+
+                if (param >= 0)
+                {
+                    return param;
+                }
+            }
+            catch (NumberFormatException e)
+            {
+                throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
+            }
+        }
+
+        return defaultValue;
+    }
+
+    private List<FilterProp> getFilterProperties(String filter)
+    {
+        if (filter == null || filter.isEmpty() || filter.equals("*"))
+        {
+            return null;
+        }
+        List<FilterProp> filterProps = new ArrayList<FilterProp>();
+        filterProps.add(new FilterPropString(ContentModel.PROP_NAME, filter, FilterTypeString.STARTSWITH_IGNORECASE));
+        filterProps.add(new FilterPropString(ContentModel.PROP_TITLE, filter, FilterTypeString.STARTSWITH_IGNORECASE));
+        return filterProps;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteExportGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteExportGet.java
new file mode 100644
index 00000000000..5a537a896ca
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteExportGet.java
@@ -0,0 +1,395 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.site;
+
+import java.io.File;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.exporter.ACPExportPackageHandler;
+import org.alfresco.repo.management.subsystems.ChildApplicationContextManager;
+import org.alfresco.repo.security.authentication.RepositoryAuthenticationDao;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.view.ExporterCrawlerParameters;
+import org.alfresco.service.cmr.view.ExporterService;
+import org.alfresco.service.cmr.view.Location;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * Exports a Site as a zip of ACPs.
+ * 
+ * @author Nick Burch
+ * @since 3.5
+ */
+public class SiteExportGet extends AbstractWebScript
+{
+    private static final List<String> USERS_NOT_TO_EXPORT = Arrays.asList(
+            new String[] { "admin", "guest" });
+    
+    private SiteService siteService;
+    private ExporterService exporterService;
+    private MimetypeService mimetypeService;
+    private AuthorityService authorityService;
+    private ChildApplicationContextManager authenticationContextManager;
+    
+    @Override
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        // Grab the site
+        String siteName = 
+            req.getServiceMatch().getTemplateVars().get("shortname");
+        SiteInfo site = siteService.getSite(siteName);
+        if (site == null)
+        {
+            throw new WebScriptException(
+                    Status.STATUS_NOT_FOUND, 
+                    "No Site found with that short name");
+        }
+        
+        // Set things up to return them a zip file
+        res.setContentType(
+                MimetypeMap.MIMETYPE_ZIP);
+        
+        res.setHeader(
+                "Content-Disposition",
+                "attachment; fileName=" + siteName + "-export.zip");
+        
+        ZipOutputStream mainZip = new ZipOutputStream(
+                res.getOutputStream());
+        CloseIgnoringOutputStream outputForNesting = 
+                new CloseIgnoringOutputStream(mainZip); 
+        
+        // Export the Site's Contents
+        // This includes the site config such as dashboards
+        mainZip.putNextEntry(new ZipEntry("Contents.acp"));
+        doSiteACPExport(site, outputForNesting);
+        
+        // Export the person details for the users who are members of the site's groups
+        // Also includes the list of their site related groups
+        //
+        // If there are no users in this site (other than the built-ins like admin, guest)
+        // then include a special marker entry to that effect.
+        final List<NodeRef> peopleNodes = getPersonNodesInSiteGroup(site);
+        if (peopleNodes.isEmpty())
+        {
+            mainZip.putNextEntry(new ZipEntry("No_Persons_In_Site.txt"));
+            String text = "Person nodes were not exported because the site does not contain\n"+
+                          "any members other than the built-ins e.g. admin, guest.";
+            outputForNesting.write(text.getBytes("ASCII"));
+        }
+        else
+        {
+            mainZip.putNextEntry(new ZipEntry("People.acp"));
+            doPeopleACPExport(peopleNodes, site, outputForNesting);
+        }
+        
+        // Export the Site's groups listings
+        mainZip.putNextEntry(new ZipEntry("Groups.txt"));
+        doGroupExport(site, outputForNesting);
+        
+        // Export the User (authentication) details for the site users that have user(authenticator) nodes associated
+        // Only does this if the repository based authenticator is enabled
+        RepositoryAuthenticationDao authenticationDao = null;
+        for(String contextName : authenticationContextManager.getInstanceIds())
+        {
+            ApplicationContext ctx = authenticationContextManager.getApplicationContext(contextName);
+            try 
+            {
+                authenticationDao = (RepositoryAuthenticationDao)
+                    ctx.getBean(RepositoryAuthenticationDao.class);
+            } catch(NoSuchBeanDefinitionException e) {}
+        }
+        List<NodeRef> userNodes = getUserNodesInSiteGroup(site, authenticationDao);
+        //authenticationDao is initialized only when using a repository-based authentication subsystem
+        if (authenticationDao == null)
+        {
+            mainZip.putNextEntry(new ZipEntry("Users_Skipped_As_Wrong_Authentication.txt"));
+            String text = "Users were not exported because the Authentication\n"+
+                          "Subsystem you are using is not repository based";
+            outputForNesting.write(text.getBytes("ASCII"));
+        }
+        else if (userNodes.isEmpty())
+        {
+            mainZip.putNextEntry(new ZipEntry("No_Users_In_Site.txt"));
+            String text = "User nodes were not exported because the site does not contain\n"+
+                          "any members other than the built-ins e.g. admin, guest.";
+            outputForNesting.write(text.getBytes("ASCII"));
+        }
+        else
+        {
+            mainZip.putNextEntry(new ZipEntry("Users.acp"));
+            doUserACPExport(userNodes, site, outputForNesting);
+        }
+        
+        // Finish up
+        mainZip.close();
+    }
+    
+    protected void doSiteACPExport(SiteInfo site, CloseIgnoringOutputStream writeTo) throws IOException
+    {
+        // Build the parameters
+        ExporterCrawlerParameters parameters = new ExporterCrawlerParameters();
+        parameters.setExportFrom(new Location(site.getNodeRef()));
+        parameters.setCrawlChildNodes(true);
+        parameters.setCrawlSelf(true);
+        parameters.setCrawlContent(true);
+        
+        // And the export handler
+        ACPExportPackageHandler handler = new ACPExportPackageHandler(
+                writeTo,
+                new File(site.getShortName() + ".xml"),
+                new File(site.getShortName()),
+                mimetypeService);
+        
+        // Do the export
+        exporterService.exportView(handler, parameters, null);
+    }
+    
+    protected void doPeopleACPExport(final List<NodeRef> peopleNodes, SiteInfo site, CloseIgnoringOutputStream writeTo) throws IOException
+    {
+        if (!peopleNodes.isEmpty())
+        {
+            // Build the parameters
+            ExporterCrawlerParameters parameters = new ExporterCrawlerParameters();
+            parameters.setExportFrom(new Location(peopleNodes.toArray(new NodeRef[peopleNodes.size()])));
+            parameters.setCrawlChildNodes(true);
+            parameters.setCrawlSelf(true);
+            parameters.setCrawlContent(true);
+            
+            // And the export handler
+            ACPExportPackageHandler handler = new ACPExportPackageHandler(
+                    writeTo,
+                    new File(site.getShortName() + "-people.xml"),
+                    new File(site.getShortName() + "-people"),
+                    mimetypeService);
+            
+            // Do the export
+            exporterService.exportView(handler, parameters, null);
+        }
+    }
+    
+    /**
+     * Gets the NodeRefs for cm:person nodes in the specified site - excluding admin, guest.
+     * @since 4.1.5
+     */
+    private List<NodeRef> getPersonNodesInSiteGroup(SiteInfo site)
+    {
+        // Find the root group
+        String siteGroup = AbstractSiteWebScript.buildSiteGroup(site);
+        
+        // Now get all people in the child groups
+        Set<String> siteUsers = authorityService.getContainedAuthorities(
+                AuthorityType.USER, siteGroup, false);
+        
+        // Turn these all into NodeRefs
+        List<NodeRef> peopleNodes = new ArrayList<NodeRef>(siteUsers.size());
+        for (String authority : siteUsers) 
+        {
+            if (!USERS_NOT_TO_EXPORT.contains(authority))
+            {
+                peopleNodes.add(authorityService.getAuthorityNodeRef(authority));
+            }
+        }
+        return peopleNodes;
+    }
+    
+    /**
+     * Returns the user nodes (authentication nodes) if the authenticationDao exists
+     * @param site
+     * @param authenticationDao
+     * @return
+     */
+    private List<NodeRef> getUserNodesInSiteGroup(SiteInfo site, RepositoryAuthenticationDao authenticationDao) {
+          List<NodeRef> userNodes = new ArrayList<NodeRef>();
+          if(authenticationDao == null) 
+          {
+              return userNodes;
+          }
+          
+          // Identify all the users
+          String siteGroup = AbstractSiteWebScript.buildSiteGroup(site);
+          Set<String> siteUsers = authorityService.getContainedAuthorities(
+                  AuthorityType.USER, siteGroup, false);
+          
+          for (String user : siteUsers)
+          {
+              if (USERS_NOT_TO_EXPORT.contains(user))
+              {
+                  // Don't export these core users like admin
+              }
+              else 
+              {
+                  NodeRef userNodeRef = authenticationDao.getUserOrNull(user);
+                  if(userNodeRef != null)
+                  {
+                      userNodes.add(userNodeRef);
+                  }
+              }
+          }
+          return userNodes;
+    }
+    
+    protected void doGroupExport(SiteInfo site, CloseIgnoringOutputStream writeTo) throws IOException
+    {
+        // Find the root group
+        String siteGroup = AbstractSiteWebScript.buildSiteGroup(site);
+        
+        // Get all the child groups of the site (but not children of them)
+        Set<String> siteGroups = authorityService.getContainedAuthorities(
+              AuthorityType.GROUP, siteGroup, true);
+        
+        // For each group, get all the people
+        // (Flattens any intermediate groups)
+        // Then, invert it to get the groups per person
+        Map<String,List<String>> memberships = new HashMap<String, List<String>>();
+        for(String group : siteGroups)
+        {
+            Set<String> groupUsers = authorityService.getContainedAuthorities(
+                  AuthorityType.USER, group, false);
+            
+            for (String user : groupUsers)
+            {
+                if (!USERS_NOT_TO_EXPORT.contains(user))
+                {
+                    if (!memberships.containsKey(user))
+                    {
+                        memberships.put(user, new ArrayList<String>());
+                    }
+                    memberships.get(user).add(group);
+                }
+            }
+        }
+        
+        // Do a simple text based export
+        //   user=group1,group2
+        PrintWriter out = new PrintWriter(new OutputStreamWriter(writeTo, "UTF-8"));
+        for (String user : memberships.keySet())
+        {
+            out.print(user);
+            out.print('=');
+            
+            boolean first = true;
+            for (String group : memberships.get(user))
+            {
+                if (first)
+                {
+                    first = false;
+                }
+                else
+                {
+                    out.print(',');
+                }
+                out.print(group);
+            }
+            out.println();
+        }
+        out.close();
+    }
+    
+    protected void doUserACPExport(List<NodeRef> userNodes, SiteInfo site,
+            CloseIgnoringOutputStream writeTo) throws IOException
+    {
+        // Build the parameters
+        ExporterCrawlerParameters parameters = new ExporterCrawlerParameters();
+        parameters.setExportFrom(new Location(userNodes.toArray(new NodeRef[userNodes.size()])));
+        parameters.setCrawlChildNodes(true);
+        parameters.setCrawlSelf(true);
+        parameters.setCrawlContent(true);
+        
+        // And the export handler
+        ACPExportPackageHandler handler = new ACPExportPackageHandler(
+                writeTo,
+                new File(site.getShortName() + "-users.xml"),
+                new File(site.getShortName() + "-users"),
+                mimetypeService);
+        
+        // Do the export
+        exporterService.exportView(handler, parameters, null);
+    }
+    
+    protected static class CloseIgnoringOutputStream extends FilterOutputStream
+    {
+        public CloseIgnoringOutputStream(OutputStream out)
+        {
+            super(out);
+        }
+
+        @Override
+        public void close() throws IOException
+        {
+            // Flushes, but doesn't close
+            flush();
+        }
+    }
+    
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+    
+    public void setExporterService(ExporterService exporterService)
+    {
+        this.exporterService = exporterService;
+    }
+    
+    public void setMimetypeService(MimetypeService mimetypeService)
+    {
+        this.mimetypeService = mimetypeService;
+    }
+    
+    public void setAuthorityService(AuthorityService authorityService)
+    {
+        this.authorityService = authorityService;
+    }
+    
+    public void setAuthenticationContextManager(ChildApplicationContextManager authenticationContextManager)
+    {
+        this.authenticationContextManager = authenticationContextManager;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteMembershipsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteMembershipsGet.java
new file mode 100644
index 00000000000..b686c03c121
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteMembershipsGet.java
@@ -0,0 +1,156 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.site;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.security.authority.script.ScriptAuthorityService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteMemberInfo;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Lists the members of a site, optionally filtering by name, role
+ *  or authority type.
+ * 
+ * Based on the old memberships.get.js webscript controller
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class SiteMembershipsGet extends AbstractSiteWebScript
+{
+    private PersonService personService;
+    private ScriptAuthorityService scriptAuthorityService;
+   
+    public void setPersonService(PersonService personService) 
+    {
+      this.personService = personService;
+    }
+
+    public void setScriptAuthorityService(ScriptAuthorityService scriptAuthorityService) 
+    {
+       this.scriptAuthorityService = scriptAuthorityService;
+    }
+
+    @Override
+    protected Map<String, Object> executeImpl(SiteInfo site,
+          WebScriptRequest req, Status status, Cache cache) 
+    {
+       // Grab out filters
+       String nameFilter = req.getParameter("nf");
+       if (nameFilter!=null)
+       {
+           nameFilter = nameFilter.endsWith("*") ? nameFilter : nameFilter+"*";
+       }
+       String roleFilter = req.getParameter("rf");
+       String authorityType = req.getParameter("authorityType");
+       String sizeS = req.getParameter("size");
+       boolean collapseGroups = false;
+       
+       // Sanity check the types
+       if(authorityType != null)
+       {
+          if("USER".equals(authorityType))
+          {
+             collapseGroups = true;
+          }
+          else if("GROUP".equals(authorityType))
+          {
+             // No extra settings needed
+          }
+          else
+          {
+             throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                   "The Authority must be one of USER or GROUP");
+          }
+       }
+
+       // Figure out what to limit to, if anythign
+       int limit = 0;
+       if(sizeS != null)
+       {
+          try
+          {
+             limit = Integer.parseInt(sizeS);
+          }
+          catch(NumberFormatException e)
+          {
+             throw new WebScriptException(Status.STATUS_BAD_REQUEST,
+                   "Invalid size specified");
+          }
+       }
+
+        // Fetch the membership details of the site
+        List<SiteMemberInfo> members = this.siteService.listMembersInfo(site.getShortName(),
+                    nameFilter, roleFilter, limit, collapseGroups);
+
+        // Process it ready for FreeMarker
+        // Note that as usernames may be all numbers, we need to
+        // prefix them with an underscore otherwise FTL can get confused!
+        Map<String, Object> authorities = new HashMap<String, Object>(members.size());      
+        Map<String, Object> memberInfo = new LinkedHashMap<String, Object>(members.size());
+        for (SiteMemberInfo authorityObj : members)
+        {           
+            String ftlSafeName = "_" + authorityObj.getMemberName();
+
+            if (authorityObj.getMemberName().startsWith("GROUP_"))
+            {
+                if (authorityType == null || authorityType.equals("GROUP"))
+                {
+                    // Record the details
+                    authorities.put(ftlSafeName, scriptAuthorityService
+                                .getGroupForFullAuthorityName(authorityObj.getMemberName()));                    
+                    memberInfo.put(ftlSafeName, authorityObj);
+                }
+            }
+            else
+            {
+                if (authorityType == null || authorityType.equals("USER"))
+                {
+                    // Record the details
+                    authorities.put(ftlSafeName,
+                                personService.getPerson(authorityObj.getMemberName()));                  
+                    memberInfo.put(ftlSafeName, authorityObj);                   
+                }
+            }
+        }
+
+        // Pass the details to freemarker
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("site", site);
+        model.put("authorities", authorities);
+        model.put("memberInfo", memberInfo);
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteState.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteState.java
new file mode 100644
index 00000000000..856997466a6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/site/SiteState.java
@@ -0,0 +1,130 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.site;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+
+/**
+ * A simple POJO class for the state of a site. For easier passing to the FTL model.
+ * 
+ * @author jkaabimofrad
+ */
+public class SiteState
+{
+
+    private SiteInfo siteInfo;
+    private List<MemberState> members;
+    private boolean currentUserSiteManager;
+
+    private SiteState()
+    {
+    }
+
+    public static SiteState create(SiteInfo siteInfo, Map<String, String> members, String currentUser,
+                NodeService nodeService, PersonService personService)
+    {
+        SiteState result = new SiteState();
+        result.members = new ArrayList<MemberState>(members.size());
+
+        result.siteInfo = siteInfo;
+
+        boolean found = false;
+        Set<String> siteMembers = members.keySet();
+        for (String userName : siteMembers)
+        {
+            NodeRef person = personService.getPersonOrNull(userName);
+            if (person != null)
+            {
+                String firstName = (String) nodeService.getProperty(person, ContentModel.PROP_FIRSTNAME);
+                String lastName = (String) nodeService.getProperty(person, ContentModel.PROP_LASTNAME);
+                result.members.add(new MemberState(userName, firstName, lastName));
+            }
+            
+            if (!found && userName.equals(currentUser))
+            {
+                found = true;
+                result.currentUserSiteManager = true;
+            }
+        }
+
+        return result;
+    }
+
+    public SiteInfo getSiteInfo()
+    {
+        return this.siteInfo;
+    }
+
+    public List<MemberState> getMembers()
+    {
+        return this.members;
+    }
+
+    public boolean isCurrentUserSiteManager()
+    {
+        return this.currentUserSiteManager;
+    }
+
+    public static class MemberState
+    {
+        private String userName;
+        private String firstName;
+        private String lastName;
+
+        public MemberState(String userName, String firstName, String lastName)
+        {
+            this.userName = userName;
+            this.firstName = firstName;
+            this.lastName = lastName;
+        }
+
+        public String getUserName()
+        {
+            return this.userName;
+        }
+
+        public String getFirstName()
+        {
+            return this.firstName;
+        }
+
+        public String getLastName()
+        {
+            return this.lastName;
+        }
+
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AclChangeSetsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AclChangeSetsGet.java
new file mode 100644
index 00000000000..2bc64f37504
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AclChangeSetsGet.java
@@ -0,0 +1,95 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.solr.AclChangeSet;
+import org.alfresco.repo.solr.SOLRTrackingComponent;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Support for SOLR: Track ACL Change Sets
+ *
+ * @since 4.0
+ */
+public class AclChangeSetsGet extends DeclarativeWebScript
+{
+    protected static final Log logger = LogFactory.getLog(AclChangeSetsGet.class);
+
+    private SOLRTrackingComponent solrTrackingComponent;
+    
+    public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent)
+    {
+        this.solrTrackingComponent = solrTrackingComponent;
+    }
+
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        String fromIdParam = req.getParameter("fromId");
+        String fromTimeParam = req.getParameter("fromTime");
+        String toIdParam = req.getParameter("toId");
+        String toTimeParam = req.getParameter("toTime");
+        String maxResultsParam = req.getParameter("maxResults");
+
+        Long fromId = (fromIdParam == null ? null : Long.valueOf(fromIdParam));
+        Long fromTime = (fromTimeParam == null ? null : Long.valueOf(fromTimeParam));
+        Long toId = (toIdParam == null ? null : Long.valueOf(toIdParam));
+        Long toTime = (toTimeParam == null ? null : Long.valueOf(toTimeParam));
+        int maxResults = (maxResultsParam == null ? 1024 : Integer.valueOf(maxResultsParam));
+        
+        List<AclChangeSet> changesets = solrTrackingComponent.getAclChangeSets(fromId, fromTime, toId, toTime, maxResults);
+        
+        Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
+        model.put("aclChangeSets", changesets);
+
+        Long maxChangeSetCommitTime = solrTrackingComponent.getMaxChangeSetCommitTime();
+        if(maxChangeSetCommitTime != null)
+        {
+            model.put("maxChangeSetCommitTime", maxChangeSetCommitTime);
+        }
+        
+        Long maxChangeSetId = solrTrackingComponent.getMaxChangeSetId();
+        if(maxChangeSetId != null)
+        {
+            model.put("maxChangeSetId", maxChangeSetId);
+        }
+
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+        }
+        
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AclsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AclsGet.java
new file mode 100644
index 00000000000..a2bbdda4e59
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AclsGet.java
@@ -0,0 +1,132 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.solr.Acl;
+import org.alfresco.repo.solr.SOLRTrackingComponent;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.surf.util.Content;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Support for SOLR: Track ACLs
+ *
+ * @since 4.0
+ */
+public class AclsGet extends DeclarativeWebScript
+{
+    protected static final Log logger = LogFactory.getLog(AclsGet.class);
+
+    private SOLRTrackingComponent solrTrackingComponent;
+    
+    public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent)
+    {
+        this.solrTrackingComponent = solrTrackingComponent;
+    }
+
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        try
+        {
+            Map<String, Object> model = buildModel(req);
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+            }
+            return model;
+        }
+        catch(IOException e)
+        {
+            throw new WebScriptException("IO exception parsing request", e);
+        }
+        catch(JSONException e)
+        {
+            throw new WebScriptException("Invalid JSON", e);
+        }
+    }
+    
+    private Map<String, Object> buildModel(WebScriptRequest req) throws JSONException, IOException
+    {
+        List<Long> aclChangeSetIds = null;
+        
+        Content content = req.getContent();
+        if (content == null)
+        {
+            throw new WebScriptException("Request content is empty");
+        }
+        JSONObject o = new JSONObject(content.getContent());
+        JSONArray aclChangeSetIdsJSON = o.has("aclChangeSetIds") ? o.getJSONArray("aclChangeSetIds") : null;
+        if (aclChangeSetIdsJSON == null)
+        {
+            throw new WebScriptException(
+                    Status.STATUS_BAD_REQUEST,
+                    "Parameter 'aclChangeSetIds' not provided in request content.");
+        }
+        else if (aclChangeSetIdsJSON.length() == 0)
+        {
+            throw new WebScriptException(
+                    Status.STATUS_BAD_REQUEST,
+                    "Parameter 'aclChangeSetIds' must hold from 1 or more IDs.");
+        }
+        aclChangeSetIds = new ArrayList<Long>(aclChangeSetIdsJSON.length());
+        for (int i = 0; i < aclChangeSetIdsJSON.length(); i++)
+        {
+            aclChangeSetIds.add(aclChangeSetIdsJSON.getLong(i));
+        }
+
+        String fromIdParam = req.getParameter("fromId");
+        String maxResultsParam = req.getParameter("maxResults");
+
+        Long fromId = (fromIdParam == null ? null : Long.valueOf(fromIdParam));
+        int maxResults = (maxResultsParam == null ? 1024 : Integer.valueOf(maxResultsParam));
+        
+        // Request according to the paging query style required
+        List<Acl> acls = solrTrackingComponent.getAcls(aclChangeSetIds, fromId, maxResults);
+        
+        Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
+        model.put("acls", acls);
+
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+        }
+        
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AclsReadersGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AclsReadersGet.java
new file mode 100644
index 00000000000..4fc6194c000
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AclsReadersGet.java
@@ -0,0 +1,126 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.solr.AclReaders;
+import org.alfresco.repo.solr.SOLRTrackingComponent;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.surf.util.Content;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Support for SOLR: Track ACLs
+ *
+ * @since 4.0
+ */
+public class AclsReadersGet extends DeclarativeWebScript
+{
+    protected static final Log logger = LogFactory.getLog(AclsReadersGet.class);
+
+    private SOLRTrackingComponent solrTrackingComponent;
+    
+    public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent)
+    {
+        this.solrTrackingComponent = solrTrackingComponent;
+    }
+
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        try
+        {
+            Map<String, Object> model = buildModel(req);
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+            }
+            return model;
+        }
+        catch(IOException e)
+        {
+            throw new WebScriptException("IO exception parsing request", e);
+        }
+        catch(JSONException e)
+        {
+            throw new WebScriptException("Invalid JSON", e);
+        }
+    }
+    
+    private Map<String, Object> buildModel(WebScriptRequest req) throws JSONException, IOException
+    {
+        List<Long> aclIds = null;
+        
+        Content content = req.getContent();
+        if (content == null)
+        {
+            throw new WebScriptException("Request content is empty");
+        }
+        JSONObject o = new JSONObject(content.getContent());
+        JSONArray aclIdsJSON = o.has("aclIds") ? o.getJSONArray("aclIds") : null;
+        if (aclIdsJSON == null)
+        {
+            throw new WebScriptException(
+                    Status.STATUS_BAD_REQUEST,
+                    "Parameter 'aclIds' not provided in request content.");
+        }
+        else if (aclIdsJSON.length() == 0)
+        {
+            throw new WebScriptException(
+                    Status.STATUS_BAD_REQUEST,
+                    "Parameter 'aclIds' must hold from 1 or more IDs.");
+        }
+        aclIds = new ArrayList<Long>(aclIdsJSON.length());
+        for (int i = 0; i < aclIdsJSON.length(); i++)
+        {
+            aclIds.add(aclIdsJSON.getLong(i));
+        }
+
+        // Request according to the paging query style required
+        List<AclReaders> aclsReaders = solrTrackingComponent.getAclsReaders(aclIds);
+        
+        Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
+        model.put("aclsReaders", aclsReaders);
+
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+        }
+        
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelGet.java
new file mode 100644
index 00000000000..18169ca2b4b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelGet.java
@@ -0,0 +1,100 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.alfresco.repo.solr.AlfrescoModel;
+import org.alfresco.repo.solr.SOLRTrackingComponent;
+import org.alfresco.service.cmr.dictionary.ModelDefinition;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONException;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * Support for SOLR: Get Alfresco model
+ *
+ * @since 4.0
+ */
+public class AlfrescoModelGet extends AbstractWebScript
+{
+    protected static final Log logger = LogFactory.getLog(AlfrescoModelGet.class);
+
+    private NamespaceService namespaceService;
+    private SOLRTrackingComponent solrTrackingComponent;
+
+    public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent)
+    {
+        this.solrTrackingComponent = solrTrackingComponent;
+    }
+
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+
+    public void execute(WebScriptRequest req, WebScriptResponse res)
+    {
+        try
+        {
+            handle(req, res);
+        }
+        catch(IOException e)
+        {
+            throw new WebScriptException("IO exception parsing request", e);
+        }
+        catch(JSONException e)
+        {
+            throw new WebScriptException("Invalid JSON", e);
+        }
+    }
+    
+    private void handle(WebScriptRequest req, WebScriptResponse res) throws JSONException, IOException
+    {
+        // create map of template vars
+        String modelQName = req.getParameter("modelQName");
+        if(modelQName == null)
+        {
+            throw new WebScriptException(
+                    Status.STATUS_BAD_REQUEST,
+                    "URL parameter 'modelQName' not provided.");
+        }
+
+        ModelDefinition.XMLBindingType bindingType = ModelDefinition.XMLBindingType.DEFAULT;
+        AlfrescoModel model = solrTrackingComponent.getModel(QName.createQName(modelQName));
+        res.setHeader("XAlfresco-modelChecksum", String.valueOf(model.getModelDef().getChecksum(bindingType)));
+        model.getModelDef().toXML(bindingType, res.getOutputStream());
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelsDiff.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelsDiff.java
new file mode 100644
index 00000000000..e946bdf625e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelsDiff.java
@@ -0,0 +1,135 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.solr.AlfrescoModelDiff;
+import org.alfresco.repo.solr.SOLRTrackingComponent;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.surf.util.Content;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Support for SOLR: Track Alfresco model changes
+ *
+ * @since 4.0
+ */
+public class AlfrescoModelsDiff extends DeclarativeWebScript
+{
+    protected static final Log logger = LogFactory.getLog(AlfrescoModelsDiff.class);
+
+    private static final String MSG_IO_EXCEPTION = "IO exception parsing request ";
+
+    private static final String MSG_JSON_EXCEPTION = "Unable to fetch model changes from ";
+
+    private SOLRTrackingComponent solrTrackingComponent;
+    
+    public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent)
+    {
+        this.solrTrackingComponent = solrTrackingComponent;
+    }
+
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        try
+        {
+            Map<String, Object> model = buildModel(req);
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+            }
+            return model;
+        }
+        catch (IOException e)
+        {
+            setExceptionResponse(req, status, MSG_IO_EXCEPTION, Status.STATUS_INTERNAL_SERVER_ERROR, e);
+            return null;
+        }
+        catch (JSONException e)
+        {
+            setExceptionResponse(req, status, MSG_JSON_EXCEPTION, Status.STATUS_BAD_REQUEST, e);
+            return null;
+        }
+    }
+
+    private void setExceptionResponse(WebScriptRequest req, Status responseStatus, String responseMessage, int statusCode, Exception e)
+    {
+        String message = responseMessage + req;
+
+        if (logger.isDebugEnabled())
+        {
+            logger.warn(message, e);
+        }
+        else
+        {
+            logger.warn(message);
+        }
+
+        responseStatus.setCode(statusCode, message);
+        responseStatus.setException(e);
+    }
+
+    private Map<String, Object> buildModel(WebScriptRequest req) throws JSONException, IOException
+    {
+        Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
+
+        Content content = req.getContent();
+        if(content == null)
+        {
+            throw new WebScriptException("Failed to convert request to String");
+        }
+        JSONObject o = new JSONObject(content.getContent());
+        JSONArray jsonModels = o.getJSONArray("models");
+        Map<QName, Long> models = new HashMap<QName, Long>(jsonModels.length());
+        for(int i = 0; i < jsonModels.length(); i++)
+        {
+            JSONObject jsonModel = jsonModels.getJSONObject(i);
+            models.put(QName.createQName(jsonModel.getString("name")), jsonModel.getLong("checksum"));
+        }
+
+        List<AlfrescoModelDiff> diffs = solrTrackingComponent.getModelDiffs(models);
+        model.put("diffs", diffs);
+
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+        }
+        
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/GetNodesParameters.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/GetNodesParameters.java
new file mode 100644
index 00000000000..dc998460831
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/GetNodesParameters.java
@@ -0,0 +1,148 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.util.List;
+import java.util.Set;
+
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Input parameters for retrieving node details for SOLR.
+ * 
+ * @since 4.0
+ */
+public class GetNodesParameters
+{
+    private List<Long> transactionIds;
+    private Long fromNodeId;
+    private Long toNodeId;
+    
+    private String storeProtocol;
+    private String storeIdentifier;
+    
+    private Set<QName> includeNodeTypes;
+    private Set<QName> excludeNodeTypes;
+    
+    private Set<QName> includeAspects;
+    private Set<QName> excludeAspects;
+    
+    public boolean getStoreFilter()
+    {
+        return (storeProtocol != null || storeIdentifier != null);
+    }
+    
+    public void setStoreProtocol(String storeProtocol)
+    {
+        this.storeProtocol = storeProtocol;
+    }
+
+    public String getStoreProtocol()
+    {
+        return storeProtocol;
+    }
+
+    public void setStoreIdentifier(String storeIdentifier)
+    {
+        this.storeIdentifier = storeIdentifier;
+    }
+
+    public String getStoreIdentifier()
+    {
+        return storeIdentifier;
+    }
+    
+    public void setTransactionIds(List<Long> txnIds)
+    {
+        this.transactionIds = txnIds;
+    }
+
+    public List<Long> getTransactionIds()
+    {
+        return transactionIds;
+    }
+
+    public Long getFromNodeId()
+    {
+        return fromNodeId;
+    }
+
+    public void setFromNodeId(Long fromNodeId)
+    {
+        this.fromNodeId = fromNodeId;
+    }
+
+    public Long getToNodeId()
+    {
+        return toNodeId;
+    }
+
+    public void setToNodeId(Long toNodeId)
+    {
+        this.toNodeId = toNodeId;
+    }
+
+    public Set<QName> getIncludeNodeTypes()
+    {
+        return includeNodeTypes;
+    }
+
+    public Set<QName> getExcludeNodeTypes()
+    {
+        return excludeNodeTypes;
+    }
+
+    public Set<QName> getIncludeAspects()
+    {
+        return includeAspects;
+    }
+
+    public Set<QName> getExcludeAspects()
+    {
+        return excludeAspects;
+    }
+
+    public void setIncludeNodeTypes(Set<QName> includeNodeTypes)
+    {
+        this.includeNodeTypes = includeNodeTypes;
+    }
+
+    public void setExcludeNodeTypes(Set<QName> excludeNodeTypes)
+    {
+        this.excludeNodeTypes = excludeNodeTypes;
+    }
+
+    public void setIncludeAspects(Set<QName> includeAspects)
+    {
+        this.includeAspects = includeAspects;
+    }
+
+    public void setExcludeAspects(Set<QName> excludeAspects)
+    {
+        this.excludeAspects = excludeAspects;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NextTransactionGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NextTransactionGet.java
new file mode 100644
index 00000000000..c72cd71f72e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NextTransactionGet.java
@@ -0,0 +1,66 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.repo.domain.node.ibatis.NodeDAOImpl;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Returns the next transaction commit time from a given commit time.
+ * This webscript is used to skip long periods where the repository is not ingesting new content. 
+ *  
+ * @author aborroy
+ *
+ */
+public class NextTransactionGet  extends DeclarativeWebScript
+{
+    
+    private NodeDAOImpl nodeDAO;
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        Long fromCommitTime = Long.parseLong(req.getParameter("fromCommitTime"));
+        
+        Map<String, Object> model = new HashMap<>();
+        model.put("nextTransactionCommitTimeMs", nodeDAO.getNextTxCommitTime(fromCommitTime));
+        return model;
+    }
+    
+    public void setNodeDAO(NodeDAOImpl nodeDAO)
+    {
+        this.nodeDAO = nodeDAO;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodeContentGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodeContentGet.java
new file mode 100644
index 00000000000..baf64349afe
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodeContentGet.java
@@ -0,0 +1,231 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.content.transform.UnsupportedTransformationException;
+import org.alfresco.repo.domain.node.NodeDAO;
+import org.alfresco.repo.rendition2.SynchronousTransformClient;
+import org.alfresco.repo.web.scripts.content.StreamContent;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.ContentIOException;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * A web service to return the text content (transformed if required) of a node's
+ * content property.
+ * 
+ * @since 4.0
+ */
+public class NodeContentGet extends StreamContent
+{
+    private static final String TRANSFORM_STATUS_HEADER = "X-Alfresco-transformStatus";
+    private static final String TRANSFORM_EXCEPTION_HEADER = "X-Alfresco-transformException";
+    private static final String TRANSFORM_DURATION_HEADER = "X-Alfresco-transformDuration";
+    
+    private static final Log logger = LogFactory.getLog(NodeContentGet.class);
+
+    /**
+     * format definied by RFC 822, see http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3
+     */
+    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("EEE', 'dd' 'MMM' 'yyyy' 'HH:mm:ss' 'Z", Locale.US);
+
+    private NodeDAO nodeDAO;
+    private NodeService nodeService;
+    private ContentService contentService;
+    private SynchronousTransformClient synchronousTransformClient;
+
+    public void setNodeDAO(NodeDAO nodeDAO)
+    {
+        this.nodeDAO = nodeDAO;
+    }
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public void setContentService(ContentService contentService)
+    {
+        this.contentService = contentService;
+    }
+
+    public void setSynchronousTransformClient(SynchronousTransformClient synchronousTransformClient)
+    {
+        this.synchronousTransformClient = synchronousTransformClient;
+    }
+
+    /**
+     *
+     * @param req WebScriptRequest
+     * @param res WebScriptResponse
+     * @throws IOException
+     */
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        ContentReader textReader = null;
+        Exception transformException = null;
+
+        String nodeIDString = req.getParameter("nodeId");
+        if(nodeIDString == null)
+        {
+            throw new WebScriptException("nodeID parameter is required for GetNodeContent");
+        }
+        long nodeId = Long.valueOf(nodeIDString).longValue();
+
+        String propertyQName = req.getParameter("propertyQName");
+        QName propertyName = null;
+        if(propertyQName == null)
+        {
+            propertyName = ContentModel.PROP_CONTENT;
+        }
+        else
+        {
+            propertyName = QName.createQName(propertyQName);
+        }
+        Pair<Long, NodeRef> pair = nodeDAO.getNodePair(nodeId);
+        if(pair == null)
+        {
+            // If the node does not exists we treat it as if it has no content
+            // We could be trying to update the content of a node in the index that has been deleted.
+            res.setStatus(HttpStatus.SC_NO_CONTENT);
+            return;
+        }
+        NodeRef nodeRef = pair.getSecond();
+
+        // check If-Modified-Since header and set Last-Modified header as appropriate
+        Date modified = (Date)nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIED);
+        // May be null - if so treat as just changed
+        if(modified == null)
+        {
+            modified = new Date();
+        }
+        long modifiedSince = -1;
+        String modifiedSinceStr = req.getHeader("If-Modified-Since");
+        if(modifiedSinceStr != null)
+        {
+            try
+            {
+                modifiedSince = dateFormat.parse(modifiedSinceStr).getTime();
+            }
+            catch (Throwable e)
+            {
+                if (logger.isWarnEnabled())
+                {
+                    logger.warn("Browser sent badly-formatted If-Modified-Since header: " + modifiedSinceStr);
+                }
+            }
+
+            if (modifiedSince > 0L)
+            {
+                // round the date to the ignore millisecond value which is not supplied by header
+                long modDate = (modified.getTime() / 1000L) * 1000L;
+                if (modDate <= modifiedSince)
+                {
+                    res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+                    return;
+                }
+            }
+        }
+
+        ContentReader reader = contentService.getReader(nodeRef, propertyName);
+        if(reader == null)
+        {
+            res.setStatus(HttpStatus.SC_NO_CONTENT);
+            return;
+        }
+
+        // Perform transformation catering for mimetype AND encoding
+        ContentWriter writer = contentService.getTempWriter();
+        writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+        writer.setEncoding("UTF-8"); // Expect transformers to produce UTF-8
+
+        try
+        {
+            long start = System.currentTimeMillis();
+            Map<String, String> options = Collections.emptyMap();
+            synchronousTransformClient.transform(reader, writer, options, "SolrIndexer", nodeRef);
+            long transformDuration = System.currentTimeMillis() - start;
+            res.setHeader(TRANSFORM_DURATION_HEADER, String.valueOf(transformDuration));
+        }
+        catch (UnsupportedTransformationException e)
+        {
+            res.setHeader(TRANSFORM_STATUS_HEADER, "noTransform");
+            res.setStatus(HttpStatus.SC_NO_CONTENT);
+            return;
+        }
+        catch (Exception e)
+        {
+            transformException = e;
+        }
+
+        if(transformException == null)
+        {
+            // point the reader to the new-written content
+            textReader = writer.getReader();
+            // Check that the reader is a view onto something concrete
+            if (textReader == null || !textReader.exists())
+            {
+                transformException = new ContentIOException(
+                        "The transformation did not write any content, yet: \n"
+                        + "   temp writer:     " + writer);
+            }
+        }
+
+        if(transformException != null)
+        {
+            res.setHeader(TRANSFORM_STATUS_HEADER, "transformFailed");
+            res.setHeader(TRANSFORM_EXCEPTION_HEADER, transformException.getMessage());
+            res.setStatus(HttpStatus.SC_NO_CONTENT);
+        }
+        else
+        {
+            res.setStatus(HttpStatus.SC_OK);
+            streamContentImpl(req, res, textReader, null, null, false, modified, String.valueOf(modified.getTime()), null, null);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodeMetaData.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodeMetaData.java
new file mode 100644
index 00000000000..8491c2bc54a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodeMetaData.java
@@ -0,0 +1,115 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.io.Serializable;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Bean to carry node metadata
+ * 
+ * @since 4.0
+ */
+public class NodeMetaData
+{
+    private long id;
+    private NodeRef nodeRef;
+    private QName type;
+    private long aclId;
+    private Map<QName, Serializable> properties;
+    private Set<QName> aspects;
+    private Path paths;
+    public long getId()
+    {
+        return id;
+    }
+    public void setId(long id)
+    {
+        this.id = id;
+    }
+    public NodeRef getNodeRef()
+    {
+        return nodeRef;
+    }
+    public void setNodeRef(NodeRef nodeRef)
+    {
+        this.nodeRef = nodeRef;
+    }
+    public QName getType()
+    {
+        return type;
+    }
+    public void setType(QName type)
+    {
+        this.type = type;
+    }
+    public long getAclId()
+    {
+        return aclId;
+    }
+    public void setAclId(long aclId)
+    {
+        this.aclId = aclId;
+    }
+    public Map<QName, Serializable> getProperties()
+    {
+        return properties;
+    }
+    public void setProperties(Map<QName, Serializable> properties)
+    {
+        this.properties = properties;
+    }
+    public Set<QName> getAspects()
+    {
+        return aspects;
+    }
+    public void setAspects(Set<QName> aspects)
+    {
+        this.aspects = aspects;
+    }
+    public Path getPaths()
+    {
+        return paths;
+    }
+    public void setPaths(Path paths)
+    {
+        this.paths = paths;
+    }
+    
+    @Override
+    public String toString()
+    {
+        return "NodeMetaData [id=" + id + ", nodeRef=" + nodeRef + ", type=" + type + ", aclId=" + aclId
+                + ", properties=" + properties + ", aspects=" + aspects + ", paths=" + paths + "]";
+    }
+    
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodesGet.java
new file mode 100644
index 00000000000..fdaf1baf9d9
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodesGet.java
@@ -0,0 +1,343 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.repo.domain.node.Node;
+import org.alfresco.repo.domain.qname.QNameDAO;
+import org.alfresco.repo.search.impl.QueryParserUtils;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.solr.NodeParameters;
+import org.alfresco.repo.solr.SOLRTrackingComponent;
+import org.alfresco.repo.solr.SOLRTrackingComponent.NodeQueryCallback;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.surf.util.Content;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Support for SOLR: Get a list of nodes in the given transactions.
+ * <p/>
+ * Supports fromNodeId, toNodeId, count (all optional) to control the number of nodes returned<br/>
+ * e.g. (null, null, 1000) will return at most 1000 nodes starting from the first node in the first transaction.<br/>
+ * e.g. (1234, null, 1000) will return at most 1000 nodes starting from the node id 1234.<br/>
+ * 
+ * @since 4.0
+ */
+public class NodesGet extends DeclarativeWebScript
+{
+    protected static final Log logger = LogFactory.getLog(NodesGet.class);
+    
+    private SOLRTrackingComponent solrTrackingComponent;
+    
+    private TenantService tenantService;
+    
+    private QNameDAO qnameDAO;
+    
+    public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent)
+    {
+        this.solrTrackingComponent = solrTrackingComponent;
+    }
+    
+    public void setTenantService(TenantService tenantService)
+    {
+        this.tenantService = tenantService;
+    }       
+    
+    public void setQnameDAO(QNameDAO qnameDAO)
+    {
+        this.qnameDAO = qnameDAO;
+    }
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        try
+        {
+            Content content = req.getContent();
+            if(content == null)
+            {
+                throw new WebScriptException("Failed to convert request to String");
+            }
+            JSONObject o = new JSONObject(content.getContent());
+
+            JSONArray aTxnIds = o.has("txnIds") ? o.getJSONArray("txnIds") : null;
+            Long fromTxnId = o.has("fromTxnId") ? o.getLong("fromTxnId") : null;
+            Long toTxnId = o.has("toTxnId") ? o.getLong("toTxnId") : null;
+
+            Long fromNodeId = o.has("fromNodeId") ? o.getLong("fromNodeId") : null;
+            Long toNodeId = o.has("toNodeId") ? o.getLong("toNodeId") : null;
+            
+            Set<QName> excludeAspects = null;
+            if(o.has("excludeAspects"))
+            {
+                JSONArray aExcludeAspects = o.getJSONArray("excludeAspects");
+                excludeAspects = new HashSet<QName>(aExcludeAspects.length());
+                for(int i = 0; i < aExcludeAspects.length(); i++)
+                {
+                    excludeAspects.add(QName.createQName(aExcludeAspects.getString(i).trim()));
+                }
+            }
+
+            Set<QName> includeAspects = null;
+            if(o.has("includeAspects"))
+            {
+                JSONArray aIncludeAspects = o.getJSONArray("includeAspects");
+                includeAspects = new HashSet<QName>(aIncludeAspects.length());
+                for(int i = 0; i < aIncludeAspects.length(); i++)
+                {
+                    includeAspects.add(QName.createQName(aIncludeAspects.getString(i).trim()));
+                }
+            }
+            
+            Set<QName> excludeNodeTypes = null;
+            if(o.has("excludeNodeTypes"))
+            {
+                JSONArray aExcludeNodeTypes = o.getJSONArray("excludeNodeTypes");
+                excludeNodeTypes = new HashSet<QName>(aExcludeNodeTypes.length());
+                for(int i = 0; i < aExcludeNodeTypes.length(); i++)
+                {
+                    excludeNodeTypes.add(QName.createQName(aExcludeNodeTypes.getString(i).trim()));
+                }
+            }
+
+            Set<QName> includeNodeTypes = null;
+            if(o.has("includeNodeTypes"))
+            {
+                JSONArray aIncludeNodeTypes = o.getJSONArray("includeNodeTypes");
+                includeNodeTypes = new HashSet<QName>(aIncludeNodeTypes.length());
+                for(int i = 0; i < aIncludeNodeTypes.length(); i++)
+                {
+                    includeNodeTypes.add(QName.createQName(aIncludeNodeTypes.getString(i).trim()));
+                }
+            }
+            
+            // 0 or Integer.MAX_VALUE => ignore
+            int maxResults = o.has("maxResults") ? o.getInt("maxResults") : 0;
+            
+            String storeProtocol = o.has("storeProtocol") ? o.getString("storeProtocol") : null;
+            String storeIdentifier = o.has("storeIdentifier") ? o.getString("storeIdentifier") : null;
+            String coreName = o.has("coreName") ? o.getString("coreName") : null;
+            
+            List<Long> txnIds = null;
+            if(aTxnIds != null)
+            {
+                txnIds = new ArrayList<Long>(aTxnIds.length());
+                for(int i = 0; i < aTxnIds.length(); i++)
+                {
+                    txnIds.add(aTxnIds.getLong(i));
+                }
+            }
+            
+            String shardProperty = o.has("shardProperty") ? o.getString("shardProperty") : null;
+            
+            NodeParameters nodeParameters = new NodeParameters();
+            nodeParameters.setTransactionIds(txnIds);
+            nodeParameters.setFromTxnId(fromTxnId);
+            nodeParameters.setToTxnId(toTxnId);
+            nodeParameters.setFromNodeId(fromNodeId);
+            nodeParameters.setToNodeId(toNodeId);
+            nodeParameters.setExcludeAspects(excludeAspects);
+            nodeParameters.setIncludeAspects(includeAspects);
+            nodeParameters.setExcludeNodeTypes(excludeNodeTypes);
+            nodeParameters.setIncludeNodeTypes(includeNodeTypes);
+            nodeParameters.setShardProperty(shardProperty);
+            nodeParameters.setCoreName(coreName);
+
+            
+            StoreRef storeRef = null;
+            
+            if (AuthenticationUtil.isMtEnabled())
+            {
+                // MT - use Java filter (post query) and then add tenant context for each node
+                storeRef = new StoreRef(storeProtocol, storeIdentifier);
+            }
+            else
+            {
+                // non-MT - use DB filter (in query)
+                nodeParameters.setStoreProtocol(storeProtocol);
+                nodeParameters.setStoreIdentifier(storeIdentifier);
+            }
+            
+            nodeParameters.setMaxResults(maxResults);
+            
+            WebNodeQueryCallback nodeQueryCallback = new WebNodeQueryCallback(maxResults, storeRef, tenantService, qnameDAO);
+
+            solrTrackingComponent.getNodes(nodeParameters, nodeQueryCallback);
+            
+            Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
+            List<NodeRecord> nodes = nodeQueryCallback.getNodes();
+            model.put("nodes", nodes);
+            
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+            }
+            
+            return model;
+        }
+        catch(IOException e)
+        {
+            throw new WebScriptException("IO exception parsing request", e);
+        }
+        catch(JSONException e)
+        {
+            throw new WebScriptException("Invalid JSON", e);
+        }
+    }
+
+    public static class NodeRecord
+    {
+        private final Long id;
+        private final Long txnId;
+        private final boolean isDeleted;
+        private final String nodeRef;
+        private final String tenant;
+        private final Long aclId; 
+        private final String shardPropertyValue;
+        private final Integer explicitShardId;
+
+        public NodeRecord(Node node, QNameDAO qnameDAO, TenantService tenantService)
+        {
+            this.id = node.getId();
+            this.txnId = node.getTransaction().getId();
+            this.isDeleted = node.getNodeStatus(qnameDAO).isDeleted();
+            this.nodeRef = node.getNodeRef().toString();
+            this.tenant = tenantService.getDomain(node.getNodeRef().getStoreRef().getIdentifier());
+            this.aclId = node.getAclId();
+            this.shardPropertyValue = node.getShardKey();
+            this.explicitShardId = node.getExplicitShardId();
+        }
+
+        public Long getId()
+        {
+            return id;
+        }
+
+        public Long getTxnId()
+        {
+            return txnId;
+        }
+
+        public boolean isDeleted()
+        {
+            return isDeleted;
+        }
+
+        public String getNodeRef()
+        {
+            return nodeRef;
+        }
+
+        public String getTenant()
+        {
+            return tenant;
+        }
+
+        public Long getAclId()
+        {
+            return aclId;
+        }
+
+        public String getShardPropertyValue()
+        {
+            return this.shardPropertyValue;
+        }
+
+        public Integer getExplicitShardId()
+        {
+            return this.explicitShardId;
+        }
+    }
+
+    /**
+     * Callback for DAO get nodes query
+     */
+    private class WebNodeQueryCallback implements NodeQueryCallback
+    {
+        private ArrayList<NodeRecord> nodes;
+        
+        private StoreRef storeRef;
+        
+        private TenantService tenantService;
+        
+        private QNameDAO qnameDAO;
+        
+        public WebNodeQueryCallback(int count, StoreRef storeRef, TenantService tenantService, QNameDAO qnameDAO)
+        {
+            super();
+            
+            this.storeRef = storeRef;
+            this.tenantService = tenantService;
+            this.qnameDAO = qnameDAO;
+           
+            nodes = new ArrayList<NodeRecord>(count == 0 || count == Integer.MAX_VALUE ? 100 : count);
+        }
+        
+        @Override
+        public boolean handleNode(Node node)
+        {
+            if (storeRef != null)
+            {
+                // MT - since storeRef is not null, filter by store here
+                StoreRef tenantStoreRef = node.getStore().getStoreRef();
+                StoreRef baseStoreRef = new StoreRef(tenantStoreRef.getProtocol(), tenantService.getBaseName(tenantStoreRef.getIdentifier(), true));
+                if (storeRef.equals(baseStoreRef))
+                {
+                    nodes.add(new NodeRecord(node, qnameDAO, tenantService));
+                }
+            }
+            else
+            {
+                nodes.add(new NodeRecord(node, qnameDAO, tenantService));
+            }
+            
+            // continue - get next node
+            return true;
+        }
+        
+        public List<NodeRecord> getNodes()
+        {
+            return nodes;
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodesMetaDataGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodesMetaDataGet.java
new file mode 100644
index 00000000000..a6187950dc5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/NodesMetaDataGet.java
@@ -0,0 +1,460 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.search.IndexerException;
+import org.alfresco.repo.solr.MetaDataResultsFilter;
+import org.alfresco.repo.solr.NodeMetaData;
+import org.alfresco.repo.solr.NodeMetaDataParameters;
+import org.alfresco.repo.solr.SOLRTrackingComponent;
+import org.alfresco.repo.solr.SOLRTrackingComponent.NodeMetaDataQueryCallback;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.surf.util.Content;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+// todo url parameter to remove whitespace in results - make it the default?
+/**
+ * Support for SOLR: Get metadata for nodes given IDs, ranges of IDs, etc.
+ * <p/>
+ * 
+ * @since 4.0
+ */
+public class NodesMetaDataGet extends DeclarativeWebScript
+{
+    protected static final Log logger = LogFactory.getLog(NodesMetaDataGet.class);
+    private static final int INITIAL_DEFAULT_SIZE = 100;
+    private static final int BATCH_SIZE = 50;
+    
+    private SOLRTrackingComponent solrTrackingComponent;
+    private SOLRSerializer solrSerializer;
+    
+    public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent)
+    {
+        this.solrTrackingComponent = solrTrackingComponent;
+    }
+
+    public void setSolrSerializer(SOLRSerializer solrSerializer)
+    {
+        this.solrSerializer = solrSerializer;
+    }
+
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        try
+        {
+            Content content = req.getContent();
+            if(content == null)
+            {
+                throw new WebScriptException("Failed to convert request to String");
+            }
+            JSONObject o = new JSONObject(content.getContent());
+            
+            List<Long> nodeIds = null;
+            if(o.has("nodeIds"))
+            {
+                JSONArray jsonNodeIds =  o.getJSONArray("nodeIds");
+                nodeIds = new ArrayList<Long>(jsonNodeIds.length());
+                for(int i = 0; i < jsonNodeIds.length(); i++)
+                {
+                    Long nodeId = jsonNodeIds.getLong(i);
+                    nodeIds.add(nodeId);
+                }
+            }
+            
+            Long fromNodeId = o.has("fromNodeId") ? o.getLong("fromNodeId") : null;
+            Long toNodeId = o.has("toNodeId") ? o.getLong("toNodeId") : null;
+            
+            // 0 or Integer.MAX_VALUE => ignore
+            int maxResults = o.has("maxResults") ? o.getInt("maxResults") : 0;
+
+            int size = 0;
+            if(maxResults != 0 && maxResults != Integer.MAX_VALUE)
+            {
+                size = maxResults;
+            }
+            else if(nodeIds != null)
+            {
+                size = nodeIds.size();
+            }
+            else if(fromNodeId != null && toNodeId != null)
+            {
+                if((toNodeId.longValue() - fromNodeId.longValue()) > Integer.MAX_VALUE)
+                {
+                    throw new WebScriptException("Too many nodes expected, try changing the criteria");
+                }
+                size = (int)(toNodeId - fromNodeId);
+            }
+
+            final boolean noSizeCalculated = (size == 0);
+
+            // filters, defaults are 'true'
+            MetaDataResultsFilter filter = new MetaDataResultsFilter();
+            if(o.has("includeAclId"))
+            {
+                filter.setIncludeAclId(o.getBoolean("includeAclId"));
+            }
+            if(o.has("includeAspects"))
+            {
+                filter.setIncludeAspects(o.getBoolean("includeAspects"));
+            }
+            if(o.has("includeNodeRef"))
+            {
+                filter.setIncludeNodeRef(o.getBoolean("includeNodeRef"));
+            }
+            if(o.has("includeOwner"))
+            {
+                filter.setIncludeOwner(o.getBoolean("includeOwner"));
+            }
+            if(o.has("includeProperties"))
+            {
+                filter.setIncludeProperties(o.getBoolean("includeProperties"));
+            }
+            if(o.has("includePaths"))
+            {
+                filter.setIncludePaths(o.getBoolean("includePaths"));
+            }
+            if(o.has("includeType"))
+            {
+                filter.setIncludeType(o.getBoolean("includeType"));
+            }
+            if(o.has("includeParentAssociations"))
+            {
+                filter.setIncludeParentAssociations(o.getBoolean("includeParentAssociations"));
+            }
+            if(o.has("includeChildIds"))
+            {
+                filter.setIncludeChildIds(o.getBoolean("includeChildIds"));
+            }
+            if(o.has("includeTxnId"))
+            {
+                filter.setIncludeTxnId(o.getBoolean("includeTxnId"));
+            }
+            
+            final ArrayList<FreemarkerNodeMetaData> nodesMetaData = 
+                new ArrayList<FreemarkerNodeMetaData>(size > 0 ? size : INITIAL_DEFAULT_SIZE);
+            NodeMetaDataParameters params = new NodeMetaDataParameters();
+            params.setNodeIds(nodeIds);
+            params.setFromNodeId(fromNodeId);
+            params.setToNodeId(toNodeId);
+            params.setMaxResults(maxResults);
+
+            solrTrackingComponent.getNodesMetadata(params, filter, new NodeMetaDataQueryCallback()
+            {
+                private int counter = BATCH_SIZE;
+                private int numBatches = 0;
+
+                @Override
+                public boolean handleNodeMetaData(NodeMetaData nodeMetaData)
+                {
+                    // need to perform data structure conversions that are compatible with Freemarker
+                    // e.g. Serializable -> String, QName -> String (because map keys must be string, number)
+                    try
+                    {
+                        FreemarkerNodeMetaData fNodeMetaData = new FreemarkerNodeMetaData(solrSerializer, nodeMetaData);
+                        nodesMetaData.add(fNodeMetaData);
+                    }
+                    catch(Exception e)
+                    {
+                        throw new AlfrescoRuntimeException("Problem converting to Freemarker using node " + nodeMetaData.getNodeRef().toString(), e); 
+                    }
+
+                    if(noSizeCalculated && --counter == 0)
+                    {
+                        counter = BATCH_SIZE;
+                        nodesMetaData.ensureCapacity(++numBatches*BATCH_SIZE);
+                    }
+
+                    return true;
+                }
+            });
+
+            Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
+            model.put("nodes", nodesMetaData);
+            model.put("filter", filter);
+
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+            }
+            
+            return model;
+        }
+        catch(IOException e)
+        {
+            throw new WebScriptException("IO exception parsing request", e);
+        }
+        catch(JSONException e)
+        {
+            throw new WebScriptException("Invalid JSON", e);
+        }
+    }
+
+    /**
+     * Bean to store node meta data for use by FreeMarker templates
+     * 
+     * @since 4.0
+     */
+    public static class FreemarkerNodeMetaData
+    {
+        private final Long nodeId;
+        private final NodeRef nodeRef;
+        private final QName nodeType;
+        private final Long aclId;
+        private final Map<String, PropertyValue> properties;
+        private final Set<QName> aspects;
+        private final List<String> paths;
+        private final List<String> namePaths;
+        private final List<String> childAssocs;
+        private final List<String> parentAssocs;
+        private final Long parentAssocsCrc;
+        private final List<Long> childIds;
+        private final String owner;
+        private final Long txnId;
+        private final Set<String> ancestors;
+        private final String tenantDomain;
+        
+        public FreemarkerNodeMetaData(final SOLRSerializer solrSerializer, final NodeMetaData nodeMetaData)
+        		throws IOException, JSONException
+        {
+            this.nodeId = nodeMetaData.getNodeId();
+            this.tenantDomain = nodeMetaData.getTenantDomain();
+            this.aclId = nodeMetaData.getAclId();
+            this.nodeRef = nodeMetaData.getNodeRef();
+            this.nodeType = nodeMetaData.getNodeType();
+            this.txnId = nodeMetaData.getTxnId();
+            this.parentAssocs = new ArrayList<>();
+            this.childAssocs = new ArrayList<>();
+
+            // convert Paths to Strings
+            List<String> paths = new ArrayList<String>();
+            List<String> ancestorPaths = new ArrayList<String>();
+            HashSet<String> ancestors = new HashSet<String>();
+            if(nodeMetaData.getPaths() != null)
+            {
+                for(Pair<Path, QName> pair : nodeMetaData.getPaths())
+                {
+                	StringBuilder ancestorPath = new StringBuilder();
+                    JSONObject o = new JSONObject();
+                    o.put("path", solrSerializer.serializeValue(String.class, pair.getFirst()));
+                    o.put("qname", solrSerializer.serializeValue(String.class, pair.getSecond()));
+                   
+                    
+                    for (NodeRef ancestor : getAncestors(pair.getFirst()))
+                    {
+                        ancestors.add(ancestor.toString());
+                        ancestorPath.insert(0, ancestor.getId()).insert(0, "/");
+                    }
+                   
+                    o.put("apath",  ancestorPath);
+                    paths.add(o.toString(3));
+                }
+            }
+            this.ancestors = ancestors;
+            this.paths = paths;
+
+            
+            // convert name Paths to Strings
+            List<String> namePaths = new ArrayList<String>();
+            if(nodeMetaData.getNamePaths() != null)
+            {
+                for(Collection<String> namePath : nodeMetaData.getNamePaths())
+                {
+                    JSONObject o = new JSONObject();
+                    JSONArray array = new JSONArray();
+                    for(String element : namePath)
+                    {
+                        array.put(solrSerializer.serializeValue(String.class, element));
+                    }
+                    o.put("namePath", array);
+                    namePaths.add(o.toString(3));
+                }
+            }
+            this.namePaths = namePaths;
+
+            this.owner = nodeMetaData.getOwner();
+            this.childIds = nodeMetaData.getChildIds();
+            this.parentAssocsCrc = nodeMetaData.getParentAssocsCrc();
+            this.aspects = nodeMetaData.getAspects();
+
+
+            if (nodeMetaData.getParentAssocs() != null)
+            {
+                for( ChildAssociationRef assRef : nodeMetaData.getParentAssocs())
+                {
+                    parentAssocs.add("\"" + solrSerializer.serializeToJSONString(assRef) + "\"");
+                }
+            }
+
+            if (nodeMetaData.getChildAssocs() != null)
+            {
+                for( ChildAssociationRef assRef : nodeMetaData.getChildAssocs() )
+                {
+                    childAssocs.add("\"" + solrSerializer.serializeToJSONString(assRef) + "\"");
+                }
+            }
+
+            final Map<QName, Serializable> props = nodeMetaData.getProperties();
+            if (props != null)
+            {
+                final Map<String, PropertyValue> properties = new HashMap<String, PropertyValue>(props.size());
+                for (final QName propName : props.keySet())
+                {
+                	// need to run this in tenant context because types may be in a tenant-specific
+                	// dictionary registry
+                    TenantUtil.runAsTenant(new TenantRunAsWork<Void>()
+                    {
+                    	@Override
+                    	public Void doWork() throws Exception 
+                    	{
+                    		Serializable value = props.get(propName);
+                    		properties.put(solrSerializer.serializeValue(String.class, propName),
+                    				solrSerializer.serialize(propName, value));
+                    		return null;
+                    	}
+                    }, tenantDomain);
+                }
+                this.properties = properties;
+            }
+            else
+            {
+                this.properties = null;
+            }
+        }
+        
+        public NodeRef getNodeRef()
+        {
+            return nodeRef;
+        }
+        public List<String> getPaths()
+        {
+            return paths;
+        }
+        public List<String> getNamePaths()
+        {
+            return namePaths;
+        }
+        public QName getNodeType()
+        {
+            return nodeType;
+        }
+        public Long getNodeId()
+        {
+            return nodeId;
+        }
+        public Long getAclId()
+        {
+            return aclId;
+        }
+        public Map<String, PropertyValue> getProperties()
+        {
+            return properties;
+        }
+        public Set<QName> getAspects()
+        {
+            return aspects;
+        }
+        public List<String> getChildAssocs()
+        {
+            return childAssocs;
+        }
+        public List<String> getParentAssocs()
+        {
+            return parentAssocs;
+        }
+        public Long getParentAssocsCrc()
+        {
+            return parentAssocsCrc;
+        }
+        public Set<String> getAncestors()
+        {
+            return ancestors;
+        }
+        public List<Long> getChildIds()
+        {
+            return childIds;
+        }
+        public String getOwner()
+        {
+            return owner;
+        }
+        public Long getTxnId()
+        {
+            return txnId;
+        }
+        public String getTenantDomain()
+        {
+            return tenantDomain;
+        }
+        private ArrayList<NodeRef> getAncestors(Path path)
+        {
+            ArrayList<NodeRef> ancestors = new ArrayList<NodeRef>(8);
+            for (Iterator<Path.Element> elit = path.iterator(); elit.hasNext(); /**/)
+            {
+                Path.Element element = elit.next();
+                if (!(element instanceof Path.ChildAssocElement))
+                {
+                    throw new IndexerException("Confused path: " + path);
+                }
+                Path.ChildAssocElement cae = (Path.ChildAssocElement) element;
+                NodeRef parentRef = cae.getRef().getParentRef();
+                if(parentRef != null)
+                {
+                    ancestors.add(0, parentRef);
+                }
+
+            }
+            return ancestors;
+        }
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/PropertyValue.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/PropertyValue.java
new file mode 100644
index 00000000000..a44abfd5386
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/PropertyValue.java
@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+/**
+ * Represents a property value to be used by Freemarker
+ * 
+ * @since 4.0
+ */
+class PropertyValue
+{
+    // is value actually a string or a JSON object or array
+    // if true, enclose the value in double quotes (to represent a JSON string)
+    // when converting to a string.
+    private boolean isString = true;
+    
+    private String value;
+    
+    public PropertyValue(boolean isString, String value)
+    {
+        super();
+        this.isString = isString;
+        this.value = value;
+    }
+    public boolean isString()
+    {
+        return isString;
+    }
+    public String getValue()
+    {
+        return value;
+    }
+    
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+        if(isString)
+        {
+            sb.append("\""); // for json strings
+        }
+        sb.append(value);
+        if(isString)
+        {
+            sb.append("\""); // for json strings
+        }
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilter.java
new file mode 100644
index 00000000000..990e7054a2c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilter.java
@@ -0,0 +1,285 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.web.filter.beans.DependencyInjectedFilter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * This filter protects the solr callback urls by verifying MACs on requests and encrypting responses
+ * and generating MACs on responses, if the secureComms property is set to "md5". If it is set to "https"
+ * or "none", the filter does nothing to the request and response.
+ * 
+ * @since 4.0
+ *
+ */
+public class SOLRAuthenticationFilter implements DependencyInjectedFilter
+{
+	public static enum SecureCommsType
+	{
+		HTTPS, NONE;
+		
+		public static SecureCommsType getType(String type)
+		{
+			if(type.equalsIgnoreCase("https"))
+			{
+				return HTTPS;
+			}
+			else if(type.equalsIgnoreCase("none"))
+			{
+				return NONE;
+			}
+			else
+			{
+				throw new IllegalArgumentException("Invalid communications type");
+			}
+		}
+	};
+
+    // Logger
+    private static Log logger = LogFactory.getLog(SOLRAuthenticationFilter.class);
+
+    private SecureCommsType secureComms = SecureCommsType.HTTPS;
+	
+	public void setSecureComms(String type)
+	{
+		try
+		{
+			this.secureComms = SecureCommsType.getType(type);
+		}
+		catch(IllegalArgumentException e)
+		{
+			throw new AlfrescoRuntimeException("", e);
+		}
+	}
+
+	public void doFilter(ServletContext context, ServletRequest request,
+			ServletResponse response, FilterChain chain) throws IOException,
+			ServletException
+	{
+		HttpServletRequest httpRequest = (HttpServletRequest)request;
+		HttpServletResponse httpResponse = (HttpServletResponse)response;
+
+/*		if(secureComms == SecureCommsType.ALFRESCO)
+		{
+			// Need to get as a byte array because we need to read the request twice, once for authentication
+			// and again by the web service.
+			SOLRHttpServletRequestWrapper requestWrapper = new SOLRHttpServletRequestWrapper(httpRequest, encryptionUtils);
+	
+			if(logger.isDebugEnabled())
+			{
+				logger.debug("Authenticating " + httpRequest.getRequestURI());
+			}
+	
+			if(encryptionUtils.authenticate(httpRequest, requestWrapper.getDecryptedBody()))
+			{
+				try
+				{
+					OutputStream out = response.getOutputStream();
+	
+					GenericResponseWrapper responseWrapper = new GenericResponseWrapper(httpResponse);
+	
+					// TODO - do I need to chain to other authenticating filters - probably not?
+					// Could also remove sending of credentials with http request
+					chain.doFilter(requestWrapper, responseWrapper);
+	
+					Pair<byte[], AlgorithmParameters> pair = encryptor.encrypt(KeyProvider.ALIAS_SOLR, null, responseWrapper.getData());
+	
+					encryptionUtils.setResponseAuthentication(httpRequest, httpResponse, responseWrapper.getData(), pair.getSecond());
+
+					httpResponse.setHeader("Content-Length", Long.toString(pair.getFirst().length));
+					out.write(pair.getFirst());
+					out.close();
+				}
+				catch(Exception e)
+				{
+					throw new AlfrescoRuntimeException("", e);
+				}
+			}
+			else
+			{
+				httpResponse.setStatus(401);
+			}
+		}
+		else */if(secureComms == SecureCommsType.HTTPS)
+		{
+			if(httpRequest.isSecure())
+			{
+				// https authentication
+				chain.doFilter(request, response);
+			}
+			else
+			{
+				throw new AlfrescoRuntimeException("Expected a https request");
+			}
+		}
+		else
+		{
+			chain.doFilter(request, response);
+		}
+	}
+
+    protected boolean validateTimestamp(String timestampStr)
+    {
+    	if(timestampStr == null || timestampStr.equals(""))
+    	{
+    		throw new AlfrescoRuntimeException("Missing timestamp on request");
+    	}
+    	long timestamp = -1;
+    	try
+    	{
+    		timestamp = Long.valueOf(timestampStr);
+    	}
+    	catch(NumberFormatException e)
+    	{
+    		throw new AlfrescoRuntimeException("Invalid timestamp on request");
+    	}
+    	if(timestamp == -1)
+    	{
+    		throw new AlfrescoRuntimeException("Invalid timestamp on request");
+    	}
+    	long currentTime = System.currentTimeMillis();
+    	return((currentTime - timestamp) < 30 * 1000); // 5s
+    }
+    
+/*    private static class SOLRHttpServletRequestWrapper extends HttpServletRequestWrapper
+    {
+    	private byte[] body;
+
+    	SOLRHttpServletRequestWrapper(HttpServletRequest req, EncryptionUtils encryptionUtils) throws IOException
+    	{
+    		super(req);
+    		this.body = encryptionUtils.decryptBody(req);
+    	}
+
+    	byte[] getDecryptedBody()
+    	{
+    		return body;
+    	}
+
+    	public ServletInputStream getInputStream()
+    	{
+    		final InputStream in = (body != null ? new ByteArrayInputStream(body) : null);
+    		return new ServletInputStream()
+    		{
+				public int read() throws IOException
+				{
+					if(in == null)
+					{
+						return -1;
+					}
+					else
+					{
+						int i = in.read();
+						if(i == -1)
+						{
+							in.close();
+						}
+						return i;
+					}
+				}
+    		};
+    	}
+    }*/
+    
+    private static class ByteArrayServletOutputStream extends ServletOutputStream
+    {
+    	private ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+    	ByteArrayServletOutputStream()
+    	{
+    	}
+
+    	public byte[] getData()
+    	{
+    		return out.toByteArray();
+    	}
+    	
+		@Override
+		public void write(int b) throws IOException
+		{
+			out.write(b);
+		}
+    }
+    
+    public static class GenericResponseWrapper extends HttpServletResponseWrapper { 
+    	private ByteArrayServletOutputStream output;
+    	private int contentLength;
+    	private String contentType;
+
+    	public GenericResponseWrapper(HttpServletResponse response) { 
+    		super(response);
+    		output = new ByteArrayServletOutputStream();
+    	} 
+
+    	public byte[] getData() { 
+    		return output.getData(); 
+    	} 
+
+    	public ServletOutputStream getOutputStream() { 
+    		return output; 
+    	} 
+
+    	public PrintWriter getWriter() { 
+    		return new PrintWriter(getOutputStream(),true); 
+    	} 
+
+    	public void setContentLength(int length) { 
+    		this.contentLength = length;
+    		super.setContentLength(length); 
+    	} 
+
+    	public int getContentLength() { 
+    		return contentLength; 
+    	} 
+
+    	public void setContentType(String type) { 
+    		this.contentType = type;
+    		super.setContentType(type); 
+    	} 
+
+
+    	public String getContentType() { 
+    		return contentType; 
+    	} 
+    } 
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/SOLRSerializer.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/SOLRSerializer.java
new file mode 100644
index 00000000000..b483948b128
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/SOLRSerializer.java
@@ -0,0 +1,502 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.domain.node.ContentDataWithId;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.MLText;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.repository.Path.AttributeElement;
+import org.alfresco.service.cmr.repository.Path.ChildAssocElement;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.repository.datatype.TypeConversionException;
+import org.alfresco.service.cmr.repository.datatype.TypeConverter;
+import org.alfresco.service.cmr.repository.datatype.TypeConverter.Converter;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.PropertyCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.surf.exception.PlatformRuntimeException;
+import org.springframework.extensions.webscripts.json.JSONUtils;
+
+/**
+ * SOLR conversions of values to JSON-compatible <tt>String</tt>.
+ * 
+ * @since 4.0
+ */
+/* package */ class SOLRSerializer
+{
+    protected static final Log logger = LogFactory.getLog(SOLRSerializer.class);
+ 
+    private JSONUtils jsonUtils = new JSONUtils();
+    
+    private Set<QName> NUMBER_TYPES;
+
+    private DictionaryService dictionaryService;
+    private NamespaceService namespaceService;
+    
+    private SOLRTypeConverter typeConverter;
+
+    public void init()
+    {
+        PropertyCheck.mandatory(this, "dictionaryService", dictionaryService);
+        PropertyCheck.mandatory(this, "namespaceService", namespaceService);
+
+        NUMBER_TYPES = new HashSet<QName>(4);
+        NUMBER_TYPES.add(DataTypeDefinition.DOUBLE);
+        NUMBER_TYPES.add(DataTypeDefinition.FLOAT);
+        NUMBER_TYPES.add(DataTypeDefinition.INT);
+        NUMBER_TYPES.add(DataTypeDefinition.LONG);
+
+        typeConverter = new SOLRTypeConverter(namespaceService);
+    }
+    
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService;
+    }
+
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+
+    public String serializeToJSONString(Serializable value)
+    {
+        if (value != null && typeConverter.INSTANCE.getConverter(value.getClass(), String.class) == null)
+        {
+            // There is no converter
+            return value.toString();
+        }
+        else
+        {
+            return typeConverter.INSTANCE.convert(String.class, value);
+        }
+    }
+    
+    public <T> T serializeValue(Class<T> targetClass, Object value) throws JSONException
+    {
+        return typeConverter.INSTANCE.convert(targetClass, value);
+    }
+    
+    @SuppressWarnings("unchecked")
+    public PropertyValue serialize(QName propName, Serializable value) throws IOException, JSONException
+    {
+        if(value == null)
+        {
+            return new PropertyValue(false, "null");
+        }
+
+        PropertyDefinition propertyDef = dictionaryService.getProperty(propName);
+        if (propertyDef == null)
+        {
+            // Treat it as text
+            return new PropertyValue(true, serializeToJSONString(value));
+        }
+        DataTypeDefinition dataType = propertyDef.getDataType();
+        QName dataTypeName = dataType.getName();
+        if (propertyDef.isMultiValued())
+        {
+            if(!(value instanceof Collection))
+            {
+                throw new IllegalArgumentException("Multi value: expected a collection, got " + value.getClass().getName());
+            }
+
+            Collection<Serializable> c = (Collection<Serializable>)value;
+
+            JSONArray body = new JSONArray();
+            for(Serializable o : c)
+            {
+                if(dataTypeName.equals(DataTypeDefinition.MLTEXT))
+                {
+                    MLText source = (MLText)o;
+                    JSONArray array = new JSONArray();
+                    for(Locale locale : source.getLocales())
+                    {
+                        JSONObject json = new JSONObject();
+                        json.put("locale", DefaultTypeConverter.INSTANCE.convert(String.class, locale));
+                        json.put("value", source.getValue(locale));
+                        array.put(json);
+                    }
+                    body.put(array);
+                }
+                else if(dataTypeName.equals(DataTypeDefinition.CONTENT))
+                {
+                    throw new RuntimeException("Multi-valued content properties are not supported");
+                }
+                else
+                {
+                    body.put(serializeToJSONString(o));
+                }
+                
+            }
+            
+            return new PropertyValue(false, body.toString());
+        }
+        else
+        {
+            boolean encodeString = true;
+            if(dataTypeName.equals(DataTypeDefinition.MLTEXT))
+            {
+                encodeString = false;
+            }
+            else if(dataTypeName.equals(DataTypeDefinition.CONTENT))
+            {
+                encodeString = false;
+            }
+            else
+            {
+                encodeString = true;
+            }
+
+            String sValue = null;
+            if (value instanceof String && encodeString) {
+            	sValue = (String)jsonUtils.encodeJSONString(value);
+            } else {
+            	sValue = serializeToJSONString(value);
+            }
+
+            return new PropertyValue(encodeString, sValue);
+        }
+    }
+    
+    @SuppressWarnings("rawtypes")
+    static class SOLRTypeConverter
+    {
+        private NamespaceService namespaceService;
+        TypeConverter INSTANCE = new TypeConverter();
+        
+        @SuppressWarnings("unchecked")
+        SOLRTypeConverter(NamespaceService namespaceService)
+        {
+            this.namespaceService = namespaceService;
+
+            // add all default converters to this converter
+            // TODO find a better way of doing this
+            Map<Class<?>, Map<Class<?>, Converter<?, ?>>> converters = DefaultTypeConverter.INSTANCE.getConverters();
+            for(Class<?> source : converters.keySet())
+            {
+                Map<Class<?>, Converter<?, ?>> converters1 = converters.get(source);
+                for(Class dest : converters1.keySet())
+                {
+                    Converter converter = converters1.get(dest);
+                    INSTANCE.addConverter(source, dest, converter);
+                }
+            }
+
+            // MLText
+            INSTANCE.addConverter(MLText.class, String.class, new TypeConverter.Converter<MLText, String>()
+            {
+                public String convert(MLText source)
+                {
+                    try
+                    {
+                        JSONArray array = new JSONArray();
+                        for(Locale locale : source.getLocales())
+                        {
+                            JSONObject json = new JSONObject();
+                            json.put("locale", DefaultTypeConverter.INSTANCE.convert(String.class, locale));
+                            json.put("value", source.getValue(locale));
+                            array.put(json);
+                        }
+
+                        return array.toString(3);
+                    }
+                    catch(JSONException e)
+                    {
+                        throw new AlfrescoRuntimeException("Unable to serialize content data to JSON", e);
+                    }
+                }
+            });
+            
+            // QName
+            INSTANCE.addConverter(QName.class, String.class, new TypeConverter.Converter<QName, String>()
+            {
+                public String convert(QName source)
+                {
+                    return source.toString();
+                }
+            });
+            
+            // content
+            INSTANCE.addConverter(ContentDataWithId.class, String.class, new TypeConverter.Converter<ContentDataWithId, String>()
+            {
+                public String convert(ContentDataWithId source)
+                {
+                    JSONObject json = new JSONObject();
+                    try
+                    {
+                        json.put("contentId", String.valueOf(source.getId()));
+                        String locale = INSTANCE.convert(String.class, source.getLocale());
+                        json.put("locale", locale == null ? JSONObject.NULL : locale);
+                        String encoding = source.getEncoding();
+                        json.put("encoding", encoding == null ? JSONObject.NULL : encoding);
+                        String mimetype = source.getMimetype();
+                        json.put("mimetype", mimetype == null ? JSONObject.NULL : mimetype);
+                        json.put("size", String.valueOf(source.getSize()));
+                        return json.toString(3);
+                    }
+                    catch(JSONException e)
+                    {
+                        throw new AlfrescoRuntimeException("Unable to serialize content data to JSON", e);
+                    }
+                }
+            });
+
+            INSTANCE.addConverter(ContentData.class, String.class, new TypeConverter.Converter<ContentData, String>()
+                    {
+                        public String convert(ContentData source)
+                        {
+                            JSONObject json = new JSONObject();
+                            try
+                            {
+                                String locale = INSTANCE.convert(String.class, source.getLocale());
+                                json.put("locale", locale == null ? JSONObject.NULL : locale);
+                                String encoding = source.getEncoding();
+                                json.put("encoding", encoding == null ? JSONObject.NULL : encoding);
+                                String mimetype = source.getMimetype();
+                                json.put("mimetype", mimetype == null ? JSONObject.NULL : mimetype);
+                                json.put("size", String.valueOf(source.getSize()));
+                                return json.toString(3);
+                            }
+                            catch(JSONException e)
+                            {
+                                throw new AlfrescoRuntimeException("Unable to serialize content data to JSON", e);
+                            }
+                        }
+                    });
+            
+            // node refs
+            INSTANCE.addConverter(NodeRef.class, String.class, new TypeConverter.Converter<NodeRef, String>()
+            {
+                public String convert(NodeRef source)
+                {
+                    return source.toString();
+                }
+            });
+            
+            INSTANCE.addConverter(String.class, NodeRef.class, new TypeConverter.Converter<String, NodeRef>()
+            {
+                public NodeRef convert(String source)
+                {
+                    return new NodeRef(source);
+                }
+            });
+            
+            // paths
+            INSTANCE.addConverter(AttributeElement.class, String.class, new TypeConverter.Converter<AttributeElement, String>()
+            {
+                public String convert(AttributeElement source)
+                {
+                    return source.toString();
+                }
+            });
+            
+            INSTANCE.addConverter(ChildAssocElement.class, String.class, new TypeConverter.Converter<ChildAssocElement, String>()
+            {
+                public String convert(ChildAssocElement source)
+                {
+                    return source.getRef().toString();
+                }
+            });
+            
+            INSTANCE.addConverter(Path.DescendentOrSelfElement.class, String.class, new TypeConverter.Converter<Path.DescendentOrSelfElement, String>()
+            {
+                public String convert(Path.DescendentOrSelfElement source)
+                {
+                    return source.toString();
+                }
+            });
+            
+            INSTANCE.addConverter(Path.ParentElement.class, String.class, new TypeConverter.Converter<Path.ParentElement, String>()
+            {
+                public String convert(Path.ParentElement source)
+                {
+                    return source.toString();
+                }
+            });
+            
+            INSTANCE.addConverter(Path.SelfElement.class, String.class, new TypeConverter.Converter<Path.SelfElement, String>()
+            {
+                public String convert(Path.SelfElement source)
+                {
+                    return source.toString();
+                }
+            });
+            
+            INSTANCE.addConverter(String.class, AttributeElement.class, new TypeConverter.Converter<String, AttributeElement>()
+            {
+                public AttributeElement convert(String source)
+                {
+                    return new Path.AttributeElement(source);
+                }
+            });
+            
+            INSTANCE.addConverter(String.class, ChildAssocElement.class, new TypeConverter.Converter<String, ChildAssocElement>()
+            {
+                public ChildAssocElement convert(String source)
+                {
+                    return new Path.ChildAssocElement(INSTANCE.convert(ChildAssociationRef.class, source));
+                }
+            });
+            
+            INSTANCE.addConverter(String.class, Path.DescendentOrSelfElement.class, new TypeConverter.Converter<String, Path.DescendentOrSelfElement>()
+            {
+                public Path.DescendentOrSelfElement convert(String source)
+                {
+                    return new Path.DescendentOrSelfElement();
+                }
+            });
+            
+            INSTANCE.addConverter(String.class, Path.ParentElement.class, new TypeConverter.Converter<String, Path.ParentElement>()
+            {
+                public Path.ParentElement convert(String source)
+                {
+                    return new Path.ParentElement();
+                }
+            });
+            
+            INSTANCE.addConverter(String.class, Path.SelfElement.class, new TypeConverter.Converter<String, Path.SelfElement>()
+            {
+                public Path.SelfElement convert(String source)
+                {
+                    return new Path.SelfElement();
+                }
+            });
+            
+
+            INSTANCE.addConverter(Path.class, List.class, new TypeConverter.Converter<Path, List>()
+            {
+                public List convert(Path source)
+                {
+                    List<String> pathArray = new ArrayList<String>(source.size());
+                    for(Path.Element element : source)
+                    {
+                        pathArray.add(INSTANCE.convert(String.class, element));
+                    }
+                    return pathArray;
+                }
+            });
+            
+            INSTANCE.addConverter(Path.class, String.class, new TypeConverter.Converter<Path, String>()
+            {
+                public String convert(Path source)
+                {
+                    return source.toString();
+                }
+            });
+            
+            // associations
+            INSTANCE.addConverter(ChildAssociationRef.class, String.class, new TypeConverter.Converter<ChildAssociationRef, String>()
+            {
+                public String convert(ChildAssociationRef source)
+                {
+                    return source.toString();
+                }
+            });
+
+            INSTANCE.addConverter(String.class, ChildAssociationRef.class, new TypeConverter.Converter<String, ChildAssociationRef>()
+            {
+                public ChildAssociationRef convert(String source)
+                {
+                    return new ChildAssociationRef(source);
+                }
+            });
+
+            INSTANCE.addConverter(AssociationRef.class, String.class, new TypeConverter.Converter<AssociationRef, String>()
+            {
+                public String convert(AssociationRef source)
+                {
+                    return source.toString();
+                }
+            });
+
+            INSTANCE.addConverter(String.class, AssociationRef.class, new TypeConverter.Converter<String, AssociationRef>()
+            {
+                public AssociationRef convert(String source)
+                {
+                    return new AssociationRef(source);
+                }
+            });
+            
+            INSTANCE.addConverter(Number.class, String.class, new TypeConverter.Converter<Number, String>()
+            {
+                public String convert(Number source)
+                {
+                    return source.toString();
+                }
+            });
+
+            INSTANCE.addConverter(Boolean.class, String.class, new TypeConverter.Converter<Boolean, String>()
+            {
+                public String convert(Boolean source)
+                {
+                    return source.toString();
+                }
+            });
+            
+            INSTANCE.addConverter(Date.class, String.class, new TypeConverter.Converter<Date, String>()
+            {
+                public String convert(Date source)
+                {
+                	try
+                	{
+                		DateTime dt = new DateTime(source, DateTimeZone.UTC);
+                		return dt.toString();
+                	}
+                    catch (PlatformRuntimeException e)
+                    {
+                        throw new TypeConversionException("Failed to convert date " + source + " to string", e);
+                    }
+                }
+            });
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/StatsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/StatsGet.java
new file mode 100644
index 00000000000..9dbce443585
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/StatsGet.java
@@ -0,0 +1,196 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.search.StatsParameters;
+import org.alfresco.service.cmr.search.StatsProcessor;
+import org.alfresco.service.cmr.search.StatsResultSet;
+import org.alfresco.service.cmr.search.StatsService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.joda.time.LocalDate;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Retrieves statistics using solr.  For a list of potential facets call it with /api/solr/stats?listFacets=true
+ * You can pass one of these facets in eg. facet=content.creator .  The facet name can be used as a I18n resource bundle key,
+ * it also has a predefined structure: group.property[.type] eg. content.created.datetime. The [.type] is optional, the default is String.</description>
+ *
+ * @author Gethin James
+ */
+public class StatsGet extends DeclarativeWebScript
+{
+    public static final String DATE_TIME_SUFFIX = "datetime";
+    private StatsService stats;
+    private SiteService siteService;
+    private Map<String,String> facets;
+    private Map<String,? extends StatsProcessor> postProcessors;
+    private String statsField;
+
+    public void setFacets(Map<String, String> facets)
+    {
+        this.facets = facets;
+    }
+
+    public void setStatsField(String statsField)
+    {
+        this.statsField = statsField;
+    }
+
+    public void setStats(StatsService stats)
+    {
+        this.stats = stats;
+    }
+
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+    
+    public void setPostProcessors(Map<String, ? extends StatsProcessor> postProcessors)
+    {
+        this.postProcessors = postProcessors;
+    }
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache) 
+    {
+       Map<String, Object> model = new HashMap<String, Object>(2, 1.0f);
+       Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+       SiteInfo siteInfo = null;
+       
+       String listFacets = req.getParameter("listFacets");
+       if (listFacets != null)
+       {
+           model.put("facets", facets.keySet());
+           model.put("resultSize", 0);
+           return model;
+       }
+       
+       if (templateVars != null && templateVars.containsKey("siteId") )
+       {
+         siteInfo = siteService.getSite(templateVars.get("siteId"));
+         if (siteInfo == null)
+         {
+             throw new AccessDeniedException("No such site: " + templateVars.get("siteId"));
+         }
+       }
+
+       String facetKey = req.getParameter("facet");
+       if (facetKey == null) facetKey = facets.entrySet().iterator().next().getKey();  //default
+       String query;
+       
+       QName propFacet = findFacet(facetKey);
+       Pair<LocalDate, LocalDate> startAndEnd = getStartAndEndDates(req.getParameter("startDate"),req.getParameter("endDate"));
+       query = buildQuery(siteInfo, facetKey, startAndEnd);
+
+       StatsParameters params = new StatsParameters(SearchService.LANGUAGE_SOLR_FTS_ALFRESCO, query, false);
+       //params.addSort(new SortDefinition(SortDefinition.SortType.FIELD, this.statsField, false));
+       params.addStatsParameter(StatsParameters.PARAM_FIELD, this.statsField);
+       params.addStatsParameter(StatsParameters.PARAM_FACET, StatsParameters.FACET_PREFIX+propFacet.toString());
+  
+       StatsResultSet result = stats.query(params);
+       
+       if (postProcessors.containsKey(facetKey))
+       {
+           StatsProcessor processor = postProcessors.get(facetKey);
+           result = processor.process(result);
+       }
+       model.put("result", result);
+       model.put("resultSize", result.getStats().size());
+       return model;
+    }
+
+    /**
+     * Finds a facet based on its key
+     * @param facetKey String
+     * @return QName facet
+     */
+    private QName findFacet(String facetKey)
+    {         
+       if (!facets.containsKey(facetKey))
+       {
+           throw new AccessDeniedException("Invalid facet key:"+facetKey);
+       }
+       QName propFacet = QName.createQName(facets.get(facetKey));
+       return propFacet;
+
+    }
+
+    protected String buildQuery(SiteInfo siteInfo, String facetKey, Pair<LocalDate, LocalDate> startEndDate)
+    {
+        StringBuilder luceneQuery = new StringBuilder();
+        luceneQuery.append("TYPE:\"" + ContentModel.TYPE_CONTENT + "\"");
+        
+        if (startEndDate != null)
+        {
+            //QName propFacet = QName.createQName(facets.get(facetKey));
+            String dateFacet = ContentModel.PROP_CREATED.toString();//hard coded for now.
+            luceneQuery.append(" AND "+dateFacet.toString()+":(\""+startEndDate.getFirst()+"\"..\""+startEndDate.getSecond()+"\")");
+        }
+        
+        if (siteInfo != null)
+        {
+            luceneQuery.append(" AND ANCESTOR:\""+siteInfo.getNodeRef().toString()+"\"");
+        }  
+        return luceneQuery.toString();
+    }
+    
+    /**
+     * Parses ISO8601 formatted Date Strings.
+     * @param start If start is null then defaults to 1 month
+     * @param end If end is null then it defaults to now();
+     */
+    public static Pair<LocalDate, LocalDate> getStartAndEndDates(String start, String end)
+    {
+        if (start == null) return null;
+        LocalDate startDate = LocalDate.parse(start);
+        LocalDate endDate = end!=null?LocalDate.parse(end):LocalDate.now();
+        return new Pair<LocalDate, LocalDate>(startDate, endDate);
+    }
+
+    /**
+     * Allows you to add a facet to the list of available facets for Solr Statistics
+     * @param facetKey e.g. content.mimetype
+     * @param facetType e.g. {http://www.alfresco.org/model/content/1.0}content.mimetype
+     */
+    public void addFacet(String facetKey, String facetType)
+    {
+        facets.put(facetKey, facetType);
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/TransactionIntervalGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/TransactionIntervalGet.java
new file mode 100644
index 00000000000..fc551a5c204
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/TransactionIntervalGet.java
@@ -0,0 +1,69 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.repo.domain.node.ibatis.NodeDAOImpl;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Returns the minimum and the maximum commit time for transactions in a node id range.
+ * This webscript is used by Shards using DB_ID_RANGE in order to 
+ * identify the transaction time window that needs to be indexed. 
+ *  
+ * @author aborroy
+ *
+ */
+public class TransactionIntervalGet  extends DeclarativeWebScript
+{
+    
+    private NodeDAOImpl nodeDAO;
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        Long fromNodeId = Long.parseLong(req.getParameter("fromNodeId"));
+        Long toNodeId = Long.parseLong(req.getParameter("toNodeId"));
+        
+        Map<String, Object> model = new HashMap<>();
+        model.put("minTransactionCommitTimeMs", nodeDAO.getMinTxInNodeIdRange(fromNodeId, toNodeId));
+        model.put("maxTransactionCommitTimeMs", nodeDAO.getMaxTxInNodeIdRange(fromNodeId, toNodeId));
+        return model;
+    }
+
+    public void setNodeDAO(NodeDAOImpl nodeDAO)
+    {
+        this.nodeDAO = nodeDAO;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/TransactionsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/TransactionsGet.java
new file mode 100644
index 00000000000..5ec743ed882
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/solr/TransactionsGet.java
@@ -0,0 +1,166 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.index.shard.ShardMethodEnum;
+import org.alfresco.repo.index.shard.ShardState;
+import org.alfresco.repo.index.shard.ShardStateBuilder;
+import org.alfresco.repo.solr.SOLRTrackingComponent;
+import org.alfresco.repo.solr.Transaction;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Support for SOLR: Get a list of transactions with a commit time greater than or equal to the given parameter.
+ *
+ * @since 4.0
+ */
+public class TransactionsGet extends DeclarativeWebScript
+{
+    protected static final Log logger = LogFactory.getLog(TransactionsGet.class);
+
+    private SOLRTrackingComponent solrTrackingComponent;
+    
+    public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent)
+    {
+        this.solrTrackingComponent = solrTrackingComponent;
+    }
+
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
+    {
+        String minTxnIdParam = req.getParameter("minTxnId");
+        String fromCommitTimeParam = req.getParameter("fromCommitTime");
+        String maxTxnIdParam = req.getParameter("maxTxnId");
+        String toCommitTimeParam = req.getParameter("toCommitTime");
+        String maxResultsParam = req.getParameter("maxResults");
+        
+        String baseUrl = req.getParameter("baseUrl");
+        String hostName = req.getParameter("hostName");
+        String template = req.getParameter("template");
+        String instance = req.getParameter("instance");
+        String numberOfShards = req.getParameter("numberOfShards");
+        String port = req.getParameter("port");
+        String stores = req.getParameter("stores");
+        String isMaster = req.getParameter("isMaster");
+        String hasContent = req.getParameter("hasContent");
+        String shardMethod = req.getParameter("shardMethod");
+        
+        String lastUpdated =  req.getParameter("lastUpdated");
+        String lastIndexedChangeSetCommitTime =  req.getParameter("lastIndexedChangeSetCommitTime");
+        String lastIndexedChangeSetId =  req.getParameter("lastIndexedChangeSetId");
+        String lastIndexedTxCommitTime =  req.getParameter("lastIndexedTxCommitTime");
+        String lastIndexedTxId =  req.getParameter("lastIndexedTxId");
+        
+        if(baseUrl != null)
+        {
+            ShardState shardState =  ShardStateBuilder.shardState()
+                    .withMaster(Boolean.valueOf(isMaster))
+                    .withLastUpdated(Long.valueOf(lastUpdated))
+                    .withLastIndexedChangeSetCommitTime(Long.valueOf(lastIndexedChangeSetCommitTime))
+                    .withLastIndexedChangeSetId(Long.valueOf(lastIndexedChangeSetId))
+                    .withLastIndexedTxCommitTime(Long.valueOf(lastIndexedTxCommitTime))
+                    .withLastIndexedTxId(Long.valueOf(lastIndexedTxId))
+                    .withShardInstance()
+                        .withBaseUrl(baseUrl)
+                        .withPort(Integer.valueOf(port))
+                        .withHostName(hostName)
+                        .withShard()
+                            .withInstance(Integer.valueOf(instance))
+                            .withFloc()
+                                .withNumberOfShards(Integer.valueOf(numberOfShards))
+                                .withTemplate(template)
+                                .withHasContent(Boolean.valueOf(hasContent))
+                                .withShardMethod(ShardMethodEnum.getShardMethod(shardMethod))
+                                .endFloc()
+                            .endShard()
+                         .endShardInstance()
+                    .build();
+            
+            for(String store : stores.split(","))
+            {
+                shardState.getShardInstance().getShard().getFloc().getStoreRefs().add(new StoreRef(store));
+            }
+            
+            for(String pName : req.getParameterNames())
+            {
+                if(pName.startsWith("floc.property."))
+                {
+                    String key = pName.substring("floc.property.".length());
+                    String value = req.getParameter(pName);
+                    shardState.getShardInstance().getShard().getFloc().getPropertyBag().put(key, value);
+                }
+                else  if(pName.startsWith("state.property."))
+                {
+                    String key = pName.substring("state.property.".length());
+                    String value = req.getParameter(pName);
+                    shardState.getPropertyBag().put(key, value);
+                }
+            }
+            
+            solrTrackingComponent.registerShardState(shardState);
+   
+        }
+        
+
+        Long minTxnId = (minTxnIdParam == null ? null : Long.valueOf(minTxnIdParam));
+        Long fromCommitTime = (fromCommitTimeParam == null ? null : Long.valueOf(fromCommitTimeParam));
+        Long maxTxnId = (maxTxnIdParam == null ? null : Long.valueOf(maxTxnIdParam));
+        Long toCommitTime = (toCommitTimeParam == null ? null : Long.valueOf(toCommitTimeParam));
+        int maxResults = (maxResultsParam == null ? 1024 : Integer.valueOf(maxResultsParam));
+        
+        List<Transaction> transactions = solrTrackingComponent.getTransactions(minTxnId, fromCommitTime, maxTxnId, toCommitTime, maxResults);
+        
+        Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
+        model.put("transactions", transactions);
+        
+        Long maxTxnCommitTime = solrTrackingComponent.getMaxTxnCommitTime();
+        if(maxTxnCommitTime != null)
+        {
+            model.put("maxTxnCommitTime", maxTxnCommitTime);
+        }
+        
+        Long maxTxnIdOnServer = solrTrackingComponent.getMaxTxnId();
+        if(maxTxnIdOnServer != null)
+        {
+            model.put("maxTxnId", maxTxnIdOnServer);
+        }
+
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+        }
+        
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java
new file mode 100644
index 00000000000..b3f3790f6e9
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java
@@ -0,0 +1,215 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.subscriptions;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.nio.charset.Charset;
+import java.util.Date;
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.NoSuchPersonException;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.subscriptions.PrivateSubscriptionListException;
+import org.alfresco.service.cmr.subscriptions.SubscriptionService;
+import org.alfresco.service.cmr.subscriptions.SubscriptionsDisabledException;
+import org.alfresco.util.ISO8601DateFormat;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.ParseException;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.Format;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+public abstract class AbstractSubscriptionServiceWebScript extends AbstractWebScript
+{
+    protected SubscriptionService subscriptionService;
+    protected NodeService nodeService;
+    protected PersonService personService;
+
+    public void setSubscriptionService(SubscriptionService subscriptionService)
+    {
+        this.subscriptionService = subscriptionService;
+    }
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public void setPersonService(PersonService personService)
+    {
+        this.personService = personService;
+    }
+
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        if (!subscriptionService.isActive())
+        {
+            res.setStatus(404);
+            return;
+        }
+
+        try
+        {
+            String userId = req.getServiceMatch().getTemplateVars().get("userid");
+            Object obj = executeImpl(userId, req, res);
+
+            if (obj instanceof JSONObject || obj instanceof JSONArray)
+            {
+                res.setContentEncoding(Charset.defaultCharset().displayName());
+                res.setContentType(Format.JSON.mimetype() + ";charset=UTF-8");
+
+                Writer writer = res.getWriter();
+                if (obj instanceof JSONObject)
+                {
+                    ((JSONObject) obj).writeJSONString(writer);
+                } else
+                {
+                    ((JSONArray) obj).writeJSONString(writer);
+                }
+                writer.flush();
+            } else
+            {
+                res.setStatus(204);
+            }
+        } catch (SubscriptionsDisabledException sde)
+        {
+            throw new WebScriptException(404, "Subscription service is disabled!", sde);
+        } catch (NoSuchPersonException nspe)
+        {
+            throw new WebScriptException(404, "Unknown user '" + nspe.getUserName() + "'!", nspe);
+        } catch (PrivateSubscriptionListException psle)
+        {
+            throw new WebScriptException(403, "Subscription list is private!", psle);
+        } catch (ParseException pe)
+        {
+            throw new WebScriptException(400, "Unable to parse JSON!", pe);
+        } catch (ClassCastException cce)
+        {
+            throw new WebScriptException(400, "Unable to parse JSON!", cce);
+        } catch (IOException ioe)
+        {
+            throw new WebScriptException(500, "Unable to serialize JSON!", ioe);
+        }
+    }
+
+    public abstract Object executeImpl(String userId, WebScriptRequest req, WebScriptResponse res) throws IOException,
+            ParseException;
+
+    protected int parseNumber(String name, String number, int def)
+    {
+        if (number != null && number.length() > 0)
+        {
+            try
+            {
+                return Integer.parseInt(number);
+
+            } catch (NumberFormatException e)
+            {
+                throw new WebScriptException(400, name + " is not a number!", e);
+            }
+        } else
+        {
+            return def;
+        }
+    }
+
+    protected PagingRequest createPagingRequest(WebScriptRequest req)
+    {
+        int skipCount = parseNumber("skipCount", req.getParameter("skipCount"), 0);
+        int maxItems = parseNumber("maxItems", req.getParameter("maxItems"), -1);
+
+        PagingRequest result = new PagingRequest(skipCount, maxItems, null);
+        result.setRequestTotalCountMax(Integer.MAX_VALUE);
+
+        return result;
+    }
+
+    @SuppressWarnings("unchecked")
+    protected JSONObject getUserDetails(String username)
+    {
+        NodeRef node = personService.getPerson(username);
+
+        JSONObject result = new JSONObject();
+        result.put("userName", username);
+        result.put("firstName", nodeService.getProperty(node, ContentModel.PROP_FIRSTNAME));
+        result.put("lastName", nodeService.getProperty(node, ContentModel.PROP_LASTNAME));
+        result.put("jobtitle", nodeService.getProperty(node, ContentModel.PROP_JOBTITLE));
+        result.put("organization", nodeService.getProperty(node, ContentModel.PROP_ORGANIZATION));
+
+        String status = (String) nodeService.getProperty(node, ContentModel.PROP_USER_STATUS);
+        if (status != null)
+        {
+            result.put("userStatus", status);
+        }
+
+        Date statusTime = (Date) nodeService.getProperty(node, ContentModel.PROP_USER_STATUS_TIME);
+        if (statusTime != null)
+        {
+            JSONObject statusTimeJson = new JSONObject();
+            statusTimeJson.put("iso8601", ISO8601DateFormat.format(statusTime));
+            result.put("userStatusTime", statusTimeJson);
+        }
+        
+        // Get the avatar for the user id if one is available
+        List<AssociationRef> assocRefs = this.nodeService.getTargetAssocs(node, ContentModel.ASSOC_AVATAR);
+        if (!assocRefs.isEmpty())
+        {
+            NodeRef avatarNodeRef = assocRefs.get(0).getTargetRef();
+            result.put("avatar", avatarNodeRef.toString());
+        }
+        else
+        {
+            result.put("avatar", "avatar"); // This indicates to just use a placeholder
+        }
+
+        return result;
+    }
+
+    @SuppressWarnings("unchecked")
+    protected JSONArray getUserArray(List<String> usernames)
+    {
+        JSONArray result = new JSONArray();
+
+        if (usernames != null)
+        {
+            for (String username : usernames)
+            {
+                result.add(getUserDetails(username));
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowPost.java
new file mode 100644
index 00000000000..7ae762bded5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowPost.java
@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.subscriptions;
+
+import java.io.IOException;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.json.simple.parser.ParseException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+public class SubscriptionServiceFollowPost extends AbstractSubscriptionServiceWebScript
+{
+    public JSONObject executeImpl(String userId, WebScriptRequest req, WebScriptResponse res) throws IOException,
+            ParseException
+    {
+        JSONArray jsonUsers = (JSONArray) JSONValue.parseWithException(req.getContent().getContent());
+
+        for (Object o : jsonUsers)
+        {
+            String user = (o == null ? null : o.toString());
+            if (user != null)
+            {
+                subscriptionService.follow(userId, user);
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowersCountGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowersCountGet.java
new file mode 100644
index 00000000000..f2e1da4cfa4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowersCountGet.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.subscriptions;
+
+import java.io.IOException;
+
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+public class SubscriptionServiceFollowersCountGet extends AbstractSubscriptionServiceWebScript
+{
+    @SuppressWarnings("unchecked")
+    public JSONObject executeImpl(String userId, WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        int count = subscriptionService.getFollowersCount(userId);
+
+        JSONObject obj = new JSONObject();
+        obj.put("count", count);
+
+        return obj;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowersGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowersGet.java
new file mode 100644
index 00000000000..142751d3231
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowersGet.java
@@ -0,0 +1,52 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.subscriptions;
+
+import java.io.IOException;
+
+import org.alfresco.service.cmr.subscriptions.PagingFollowingResults;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+public class SubscriptionServiceFollowersGet extends AbstractSubscriptionServiceWebScript
+{
+    @SuppressWarnings("unchecked")
+    public JSONObject executeImpl(String userId, WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        PagingFollowingResults result = subscriptionService.getFollowers(userId, createPagingRequest(req));
+
+        JSONObject obj = new JSONObject();
+        obj.put("people", getUserArray(result.getPage()));
+        obj.put("hasMoreItems", result.hasMoreItems());
+        if (result.getTotalResultCount() != null)
+        {
+            obj.put("totalCount", result.getTotalResultCount().getFirst());
+        }
+
+        return obj;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowingCountGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowingCountGet.java
new file mode 100644
index 00000000000..b6cb66c3cde
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowingCountGet.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.subscriptions;
+
+import java.io.IOException;
+
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+public class SubscriptionServiceFollowingCountGet extends AbstractSubscriptionServiceWebScript
+{
+    @SuppressWarnings("unchecked")
+    public JSONObject executeImpl(String userId, WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        int count = subscriptionService.getFollowingCount(userId);
+
+        JSONObject obj = new JSONObject();
+        obj.put("count", count);
+
+        return obj;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowingGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowingGet.java
new file mode 100644
index 00000000000..9c00bea2406
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowingGet.java
@@ -0,0 +1,52 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.subscriptions;
+
+import java.io.IOException;
+
+import org.alfresco.service.cmr.subscriptions.PagingFollowingResults;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+public class SubscriptionServiceFollowingGet extends AbstractSubscriptionServiceWebScript
+{
+    @SuppressWarnings("unchecked")
+    public JSONObject executeImpl(String userId, WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        PagingFollowingResults result = subscriptionService.getFollowing(userId, createPagingRequest(req));
+
+        JSONObject obj = new JSONObject();
+        obj.put("people", getUserArray(result.getPage()));
+        obj.put("hasMoreItems", result.hasMoreItems());
+        if (result.getTotalResultCount() != null)
+        {
+            obj.put("totalCount", result.getTotalResultCount().getFirst());
+        }
+
+        return obj;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowsPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowsPost.java
new file mode 100644
index 00000000000..7d24f8bd390
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceFollowsPost.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.subscriptions;
+
+import java.io.IOException;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.json.simple.parser.ParseException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+public class SubscriptionServiceFollowsPost extends AbstractSubscriptionServiceWebScript
+{
+    @SuppressWarnings("unchecked")
+    public JSONArray executeImpl(String userId, WebScriptRequest req, WebScriptResponse res) throws IOException,
+            ParseException
+    {
+        JSONArray jsonUsers = (JSONArray) JSONValue.parseWithException(req.getContent().getContent());
+
+        JSONArray result = new JSONArray();
+
+        for (Object o : jsonUsers)
+        {
+            String user = (o == null ? null : o.toString());
+            if (user != null)
+            {
+                JSONObject item = new JSONObject();
+                item.put(user, subscriptionService.follows(userId, user));
+                result.add(item);
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServicePrivateListGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServicePrivateListGet.java
new file mode 100644
index 00000000000..62dd4c7d7fd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServicePrivateListGet.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.subscriptions;
+
+import java.io.IOException;
+
+import org.json.simple.JSONObject;
+import org.json.simple.parser.ParseException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+public class SubscriptionServicePrivateListGet extends AbstractSubscriptionServiceWebScript
+{
+    @SuppressWarnings("unchecked")
+    public JSONObject executeImpl(String userId, WebScriptRequest req, WebScriptResponse res) throws IOException,
+            ParseException
+    {
+        JSONObject obj = new JSONObject();
+        obj.put("private", subscriptionService.isSubscriptionListPrivate(userId));
+
+        return obj;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServicePrivateListPut.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServicePrivateListPut.java
new file mode 100644
index 00000000000..2a2f99db55c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServicePrivateListPut.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.subscriptions;
+
+import java.io.IOException;
+
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.json.simple.parser.ParseException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+public class SubscriptionServicePrivateListPut extends SubscriptionServicePrivateListGet
+{
+    public JSONObject executeImpl(String userId, WebScriptRequest req, WebScriptResponse res) throws IOException,
+            ParseException
+    {
+        JSONObject obj = (JSONObject) JSONValue.parseWithException(req.getContent().getContent());
+
+        Object setPrivate = obj.get("private");
+
+        if (setPrivate != null)
+        {
+            if (setPrivate.toString().equalsIgnoreCase("true"))
+            {
+                subscriptionService.setSubscriptionListPrivate(userId, true);
+            } else if (setPrivate.toString().equalsIgnoreCase("false"))
+            {
+                subscriptionService.setSubscriptionListPrivate(userId, false);
+            }
+        }
+
+        return super.executeImpl(userId, req, res);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceUnfollowPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceUnfollowPost.java
new file mode 100644
index 00000000000..2527e317fd0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceUnfollowPost.java
@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.subscriptions;
+
+import java.io.IOException;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.json.simple.parser.ParseException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+public class SubscriptionServiceUnfollowPost extends AbstractSubscriptionServiceWebScript
+{
+    public JSONObject executeImpl(String userId, WebScriptRequest req, WebScriptResponse res) throws IOException,
+            ParseException
+    {
+        JSONArray jsonUsers = (JSONArray) JSONValue.parseWithException(req.getContent().getContent());
+
+        for (Object o : jsonUsers)
+        {
+            String user = (o == null ? null : o.toString());
+            if (user != null)
+            {
+                subscriptionService.unfollow(userId, user);
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/AbstractTenantAdminWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/AbstractTenantAdminWebScript.java
new file mode 100644
index 00000000000..b24139263f3
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/AbstractTenantAdminWebScript.java
@@ -0,0 +1,47 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.tenant;
+
+import org.alfresco.repo.tenant.TenantAdminService;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+
+/**
+ * @author janv
+ * @since 4.2
+ */
+public abstract class AbstractTenantAdminWebScript extends DeclarativeWebScript
+{
+    protected static final String TENANT_DOMAIN             = "tenantDomain";
+    protected static final String TENANT_ADMIN_PASSWORD     = "tenantAdminPassword";
+    protected static final String TENANT_CONTENT_STORE_ROOT = "tenantContentStoreRoot";
+    
+    protected TenantAdminService tenantAdminService;
+    
+    public void setTenantAdminService(TenantAdminService tenantAdminService)
+    {
+        this.tenantAdminService = tenantAdminService;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/TenantDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/TenantDelete.java
new file mode 100644
index 00000000000..c4b8f03a828
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/TenantDelete.java
@@ -0,0 +1,59 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.tenant;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * REST API - delete tenant
+ * 
+ * @author janv
+ * @since 4.2
+ */
+public class TenantDelete extends AbstractTenantAdminWebScript
+{
+    protected static final Log logger = LogFactory.getLog(TenantPost.class);
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        // get request parameters
+        Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        String tenantDomain = templateVars.get("tenantDomain");
+        
+        tenantAdminService.deleteTenant(tenantDomain);
+        
+        Map<String, Object> model = new HashMap<String, Object>(0);
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/TenantPost.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/TenantPost.java
new file mode 100644
index 00000000000..693243f2d87
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/TenantPost.java
@@ -0,0 +1,94 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.tenant;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * REST API - create tenant
+ * 
+ * @author janv
+ * @since 4.2
+ */
+public class TenantPost extends AbstractTenantAdminWebScript
+{
+    protected static final Log logger = LogFactory.getLog(TenantPost.class);
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        String tenantDomain = null;
+        String tenantAdminPassword = null;
+        String contentStoreRoot = null;
+        
+        try
+        {
+            JSONObject json = new JSONObject(new JSONTokener(req.getContent().getContent()));
+            
+            if (! json.has(TENANT_DOMAIN))
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not find required 'tenantDomain' parameter");
+            }
+            tenantDomain = json.getString(TENANT_DOMAIN);
+            
+            if (! json.has(TENANT_ADMIN_PASSWORD))
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not find required 'tenantAdminPassword' parameter");
+            }
+            tenantAdminPassword = json.getString(TENANT_ADMIN_PASSWORD);
+            
+            if (json.has(TENANT_CONTENT_STORE_ROOT))
+            {
+                contentStoreRoot = json.getString(TENANT_CONTENT_STORE_ROOT);
+            }
+        }
+        catch (IOException iox)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not read content from req.", iox);
+        }
+        catch (JSONException je)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from req.", je);
+        }
+        
+        tenantAdminService.createTenant(tenantDomain, tenantAdminPassword.toCharArray(), contentStoreRoot);
+        
+        Map<String, Object> model = new HashMap<String, Object>(0);
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/TenantsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/TenantsGet.java
new file mode 100644
index 00000000000..84e20b33e0f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/TenantsGet.java
@@ -0,0 +1,66 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.tenant;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.tenant.Tenant;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * REST API - get tenants
+ * 
+ * TODO filter params - eg. enabled/ disabled and name startsWith
+ * 
+ * @author janv
+ * @since 4.2
+ */
+public class TenantsGet extends AbstractTenantAdminWebScript
+{
+    protected static final Log logger = LogFactory.getLog(TenantsGet.class);
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        List<Tenant> tenants = tenantAdminService.getAllTenants();
+        
+        Map<String, Object> model = new HashMap<String, Object>(1);
+        model.put("tenants", tenants);
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
+        }
+        
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/AbortTransferCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/AbortTransferCommandProcessor.java
new file mode 100644
index 00000000000..9f3a0eaa7b6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/AbortTransferCommandProcessor.java
@@ -0,0 +1,146 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.transfer;
+
+import java.io.StringWriter;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.service.cmr.transfer.TransferException;
+import org.alfresco.service.cmr.transfer.TransferReceiver;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
+import org.springframework.extensions.webscripts.json.JSONWriter;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+
+/**
+ * This command processor is used to record the start a transfer. No other transfer can be started after this command
+ * has executed until the started transfer terminates.
+ * 
+ * @author brian
+ * 
+ */
+public class AbortTransferCommandProcessor implements CommandProcessor
+{
+    private static final String MSG_CAUGHT_UNEXPECTED_EXCEPTION = "transfer_service.receiver.caught_unexpected_exception";
+
+    private TransferReceiver receiver;
+    
+    private static Log logger = LogFactory.getLog(AbortTransferCommandProcessor.class);
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.repo.web.scripts.transfer.CommandProcessor#process(org.alfresco .web.scripts.WebScriptRequest,
+     * org.alfresco.web.scripts.WebScriptResponse)
+     */
+    public int process(WebScriptRequest req, WebScriptResponse resp)
+    {
+        String transferRecordId = null;
+
+        //Read the transfer id from the request
+
+        // Unwrap to a WebScriptServletRequest if we have one
+        // TODO: Why is this necessary?
+        WebScriptServletRequest webScriptServletRequest = null;
+        WebScriptRequest current = req;
+        do
+        {
+            if (current instanceof WebScriptServletRequest)
+            {
+                webScriptServletRequest = (WebScriptServletRequest) current;
+                current = null;
+            }
+            else if (current instanceof WrappingWebScriptRequest)
+            {
+                current = ((WrappingWebScriptRequest) req).getNext();
+            }
+            else
+            {
+                current = null;
+            }
+        }
+        while (current != null);
+        
+        HttpServletRequest servletRequest = webScriptServletRequest.getHttpServletRequest();
+        String transferId = servletRequest.getParameter("transferId");
+
+        if ((transferId == null))
+        {
+            resp.setStatus(Status.STATUS_BAD_REQUEST);
+            return Status.STATUS_BAD_REQUEST;
+        }
+        
+        try
+        {   
+            logger.debug("abort transfer:" + transferId);
+            
+            receiver.cancel(transferId);
+
+            // return the unique transfer id (the lock id)
+            StringWriter stringWriter = new StringWriter(300);
+            JSONWriter jsonWriter = new JSONWriter(stringWriter);
+            jsonWriter.startObject();
+            jsonWriter.writeValue("transferId", transferRecordId);
+            jsonWriter.endObject();
+            String response = stringWriter.toString();
+
+            resp.setContentType("application/json");
+            resp.setContentEncoding("UTF-8");
+            int length = response.getBytes("UTF-8").length;
+            resp.addHeader("Content-Length", "" + length);
+            resp.setStatus(Status.STATUS_OK);
+            resp.getWriter().write(response);
+
+            return Status.STATUS_OK;
+
+        } 
+        catch (Exception ex)
+        {
+            logger.debug("caught exception", ex);
+            if (ex instanceof TransferException)
+            {
+                throw (TransferException) ex;
+            }
+            throw new TransferException(MSG_CAUGHT_UNEXPECTED_EXCEPTION, ex);
+        }
+    }
+
+    /**
+     * @param receiver the receiver to set
+     */
+    public void setReceiver(TransferReceiver receiver)
+    {
+        this.receiver = receiver;
+    }
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/BeginTransferCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/BeginTransferCommandProcessor.java
new file mode 100644
index 00000000000..fd6773641fb
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/BeginTransferCommandProcessor.java
@@ -0,0 +1,186 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.transfer;
+
+import java.io.StringWriter;
+
+import org.alfresco.repo.transfer.RepoTransferReceiverImpl;
+import org.alfresco.repo.transfer.TransferCommons;
+import org.alfresco.repo.transfer.TransferVersionImpl;
+import org.alfresco.service.cmr.transfer.TransferException;
+import org.alfresco.service.cmr.transfer.TransferReceiver;
+import org.alfresco.service.cmr.transfer.TransferVersion;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.json.JSONWriter;
+
+/**
+ * This command processor is used to record the start a transfer. No other transfer can be started after this command
+ * has executed until the started transfer terminates.
+ *
+ * @author brian
+ *
+ */
+public class BeginTransferCommandProcessor implements CommandProcessor
+{
+    private static final String MSG_CAUGHT_UNEXPECTED_EXCEPTION = "transfer_service.receiver.caught_unexpected_exception";
+
+    private TransferReceiver receiver;
+
+    private final static Log logger = LogFactory.getLog(BeginTransferCommandProcessor.class);
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.alfresco.repo.web.scripts.transfer.CommandProcessor#process(org.alfresco .web.scripts.WebScriptRequest,
+     * org.alfresco.web.scripts.WebScriptResponse)
+     */
+    public int process(WebScriptRequest req, WebScriptResponse resp)
+    {
+        String transferId = null;
+        try
+        {
+            String [] fromRepositoryIdValues = req.getParameterValues(TransferCommons.PARAM_FROM_REPOSITORYID);
+            String [] transferToSelfValues = req.getParameterValues(TransferCommons.PARAM_ALLOW_TRANSFER_TO_SELF);
+            String [] editionValues = req.getParameterValues(TransferCommons.PARAM_VERSION_EDITION);
+            String [] majorValues = req.getParameterValues(TransferCommons.PARAM_VERSION_MAJOR);
+            String [] minorValues = req.getParameterValues(TransferCommons.PARAM_VERSION_MINOR);
+            String [] revisionValues = req.getParameterValues(TransferCommons.PARAM_VERSION_REVISION);
+            String [] rootFileTransfer = req.getParameterValues(TransferCommons.PARAM_ROOT_FILE_TRANSFER);
+
+            String fromRepositoryId = null;
+            if(fromRepositoryIdValues != null && fromRepositoryIdValues.length > 0)
+            {
+                fromRepositoryId = fromRepositoryIdValues[0];
+            }
+
+            boolean transferToSelf = false;
+            if(transferToSelfValues != null && transferToSelfValues.length > 0)
+            {
+                if(transferToSelfValues[0].equalsIgnoreCase("true"))
+                {
+                    transferToSelf = true;
+                }
+            }
+
+            String edition = "Unknown";
+            if(editionValues != null && editionValues.length > 0)
+            {
+                edition = editionValues[0];
+            }
+            String major = "0";
+            if(majorValues != null && majorValues.length > 0)
+            {
+                major = majorValues[0];
+            }
+            String minor = "0";
+            if(minorValues != null && minorValues.length > 0)
+            {
+                minor = minorValues[0];
+            }
+            String revision = "0";
+            if(revisionValues != null && revisionValues.length > 0)
+            {
+                revision = revisionValues[0];
+            }
+
+            TransferVersion fromVersion = new TransferVersionImpl(major, minor, revision, edition);
+
+            //set the root for the root node for the file transfer receiver
+            //It replaces the root node if transfers on file system
+            if(rootFileTransfer != null && rootFileTransfer.length > 0 )
+            {
+                receiver.setTransferRootNode(rootFileTransfer[0]);
+            }
+
+            // attempt to start the transfer
+            transferId = receiver.start(fromRepositoryId, transferToSelf, fromVersion);
+
+            // Create a temporary folder into which we can place transferred files
+            receiver.getStagingFolder(transferId);
+
+            TransferVersion version = receiver.getVersion();
+
+            // return the unique transfer id (the lock id)
+            StringWriter stringWriter = new StringWriter(1000);
+            JSONWriter jsonWriter = new JSONWriter(stringWriter);
+            jsonWriter.startObject();
+
+            jsonWriter.writeValue(TransferCommons.PARAM_TRANSFER_ID, transferId);
+
+            if(version != null)
+            {
+                jsonWriter.writeValue(TransferCommons.PARAM_VERSION_EDITION, version.getEdition());
+                jsonWriter.writeValue(TransferCommons.PARAM_VERSION_MAJOR, version.getVersionMajor());
+                jsonWriter.writeValue(TransferCommons.PARAM_VERSION_MINOR, version.getVersionMinor());
+                jsonWriter.writeValue(TransferCommons.PARAM_VERSION_REVISION, version.getVersionRevision());
+            }
+            jsonWriter.endObject();
+
+            String response = stringWriter.toString();
+
+            resp.setContentType("application/json");
+            resp.setContentEncoding("UTF-8");
+            int length = response.getBytes("UTF-8").length;
+            resp.addHeader("Content-Length", "" + length);
+            resp.setStatus(Status.STATUS_OK);
+            resp.getWriter().write(response);
+
+            logger.debug("transfer started" + transferId);
+
+            return Status.STATUS_OK;
+
+        }
+        catch (Exception ex)
+        {
+            logger.debug("exception caught", ex);
+            if(transferId != null)
+            {
+                logger.debug("ending transfer", ex);
+                receiver.end(transferId);
+            }
+            if (ex instanceof TransferException)
+            {
+                throw (TransferException) ex;
+            }
+            throw new TransferException(MSG_CAUGHT_UNEXPECTED_EXCEPTION, ex);
+        }
+    }
+
+    /**
+     * @param receiver the receiver to set
+     */
+    public void setReceiver(TransferReceiver receiver)
+    {
+        this.receiver = receiver;
+    }
+
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/CommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/CommandProcessor.java
new file mode 100644
index 00000000000..3a0e4f0e64c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/CommandProcessor.java
@@ -0,0 +1,40 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.transfer;
+
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+
+/**
+ * @author brian
+ *
+ */
+public interface CommandProcessor
+{
+    int process(WebScriptRequest req, WebScriptResponse resp);
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/CommitTransferCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/CommitTransferCommandProcessor.java
new file mode 100644
index 00000000000..ea2077f6ef9
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/CommitTransferCommandProcessor.java
@@ -0,0 +1,144 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.transfer;
+
+import java.io.StringWriter;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.service.cmr.transfer.TransferException;
+import org.alfresco.service.cmr.transfer.TransferReceiver;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
+import org.springframework.extensions.webscripts.json.JSONWriter;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+
+/**
+ * This command processor is used to record the start a transfer. No other transfer can be started after this command
+ * has executed until the started transfer terminates.
+ * 
+ * @author brian
+ * 
+ */
+public class CommitTransferCommandProcessor implements CommandProcessor
+{
+    private static final String MSG_CAUGHT_UNEXPECTED_EXCEPTION = "transfer_service.receiver.caught_unexpected_exception";
+    
+    private static Log logger = LogFactory.getLog(CommitTransferCommandProcessor.class);
+
+    private TransferReceiver receiver;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.repo.web.scripts.transfer.CommandProcessor#process(org.alfresco .web.scripts.WebScriptRequest,
+     * org.alfresco.web.scripts.WebScriptResponse)
+     */
+    public int process(WebScriptRequest req, WebScriptResponse resp)
+    {   
+
+        //Read the transfer id from the request
+        // Unwrap to a WebScriptServletRequest if we have one
+        WebScriptServletRequest webScriptServletRequest = null;
+        WebScriptRequest current = req;
+        do
+        {
+            if (current instanceof WebScriptServletRequest)
+            {
+                webScriptServletRequest = (WebScriptServletRequest) current;
+                current = null;
+            }
+            else if (current instanceof WrappingWebScriptRequest)
+            {
+                current = ((WrappingWebScriptRequest) req).getNext();
+            }
+            else
+            {
+                current = null;
+            }
+        }
+        while (current != null);
+        
+        HttpServletRequest servletRequest = webScriptServletRequest.getHttpServletRequest();
+        String transferId = servletRequest.getParameter("transferId");
+
+        if ((transferId == null))
+        {
+            logger.debug("transferId is missing");
+            resp.setStatus(Status.STATUS_BAD_REQUEST);
+            return Status.STATUS_BAD_REQUEST;
+        }
+        
+        try
+        {   
+            receiver.commitAsync(transferId);
+
+            // return the unique transfer id (the lock id)
+            StringWriter stringWriter = new StringWriter(300);
+            JSONWriter jsonWriter = new JSONWriter(stringWriter);
+            jsonWriter.startObject();
+            jsonWriter.writeValue("transferId", transferId);
+            jsonWriter.endObject();
+            String response = stringWriter.toString();
+            
+            resp.setContentType("application/json");
+            resp.setContentEncoding("UTF-8");
+            int length = response.getBytes("UTF-8").length;
+            resp.addHeader("Content-Length", "" + length);
+            resp.setStatus(Status.STATUS_OK);
+            resp.getWriter().write(response);
+            
+            return Status.STATUS_OK;
+        } 
+        catch (Exception ex)
+        {
+            if (logger.isDebugEnabled()) 
+            {
+                logger.debug("caught exception :" + ex.toString(), ex);
+            }
+            if (ex instanceof TransferException)
+            {
+                throw (TransferException) ex;
+            }
+            throw new TransferException(MSG_CAUGHT_UNEXPECTED_EXCEPTION, ex);
+        }
+    }
+
+    /**
+     * @param receiver the receiver to set
+     */
+    public void setReceiver(TransferReceiver receiver)
+    {
+        this.receiver = receiver;
+    }
+
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/MessagesTransferCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/MessagesTransferCommandProcessor.java
new file mode 100644
index 00000000000..3dd56a26f86
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/MessagesTransferCommandProcessor.java
@@ -0,0 +1,110 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.transfer;
+
+import java.io.StringWriter;
+
+import org.alfresco.service.cmr.transfer.TransferException;
+import org.alfresco.service.cmr.transfer.TransferReceiver;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.json.JSONWriter;
+
+/**
+ * This command processor is used to record the start a transfer. No other transfer can be started after this command
+ * has executed until the started transfer terminates.
+ * 
+ * @author brian
+ * 
+ */
+public class MessagesTransferCommandProcessor implements CommandProcessor
+{
+    private static final String MSG_CAUGHT_UNEXPECTED_EXCEPTION = "transfer_service.receiver.caught_unexpected_exception";
+
+    private TransferReceiver receiver;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.repo.web.scripts.transfer.CommandProcessor#process(org.alfresco .web.scripts.WebScriptRequest,
+     * org.alfresco.web.scripts.WebScriptResponse)
+     */
+    public int process(WebScriptRequest req, WebScriptResponse resp)
+    {
+        String transferRecordId = null;
+        try
+        {
+            // return the unique transfer id (the lock id)
+            StringWriter stringWriter = new StringWriter(300);
+            JSONWriter jsonWriter = new JSONWriter(stringWriter);
+            
+            jsonWriter.startValue("data");
+
+            jsonWriter.startArray();
+            jsonWriter.startObject();
+            //TODO - clearly a dummy message for now.
+            jsonWriter.writeValue("message", "hello world");
+            jsonWriter.endObject();
+            jsonWriter.startObject();
+            //TODO - clearly a dummy message for now.
+            jsonWriter.writeValue("message", "message2");
+            jsonWriter.endObject();
+            jsonWriter.endArray();
+            jsonWriter.endValue();
+            String response = stringWriter.toString();
+            
+            resp.setContentType("application/json");
+            resp.setContentEncoding("UTF-8");
+            int length = response.getBytes("UTF-8").length;
+            resp.addHeader("Content-Length", "" + length);
+            resp.setStatus(Status.STATUS_OK);
+            resp.getWriter().write(response);
+            
+            return Status.STATUS_OK;
+
+        } catch (Exception ex)
+        {
+            receiver.end(transferRecordId);
+            if (ex instanceof TransferException)
+            {
+                throw (TransferException) ex;
+            }
+            throw new TransferException(MSG_CAUGHT_UNEXPECTED_EXCEPTION, ex);
+        }
+    }
+
+    /**
+     * @param receiver the receiver to set
+     */
+    public void setReceiver(TransferReceiver receiver)
+    {
+        this.receiver = receiver;
+    }
+
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PostContentCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PostContentCommandProcessor.java
new file mode 100644
index 00000000000..f2605545815
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PostContentCommandProcessor.java
@@ -0,0 +1,172 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.transfer;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.service.cmr.transfer.TransferException;
+import org.alfresco.service.cmr.transfer.TransferReceiver;
+import org.apache.commons.fileupload.FileItemIterator;
+import org.apache.commons.fileupload.FileItemStream;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+import org.springframework.extensions.webscripts.servlet.FormData.FormField;
+
+/**
+ * This command processor is used to receive one or more content files for a given transfer.
+ * 
+ * @author brian
+ * 
+ */
+public class PostContentCommandProcessor implements CommandProcessor
+{
+    private TransferReceiver receiver;
+    
+    private static final String MSG_CAUGHT_UNEXPECTED_EXCEPTION = "transfer_service.receiver.caught_unexpected_exception";
+    
+    private static Log logger = LogFactory.getLog(PostContentCommandProcessor.class);
+
+    /**
+     * @param receiver
+     *            the receiver to set
+     */
+    public void setReceiver(TransferReceiver receiver)
+    {
+        this.receiver = receiver;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.repo.web.scripts.transfer.CommandProcessor#process(org.alfresco.web.scripts.WebScriptRequest,
+     * org.alfresco.web.scripts.WebScriptResponse)
+     */
+    public int process(WebScriptRequest req, WebScriptResponse resp)
+    {
+        logger.debug("post content start");
+        // Unwrap to a WebScriptServletRequest if we have one
+        WebScriptServletRequest webScriptServletRequest = null;
+        WebScriptRequest current = req;
+        do
+        {
+            if (current instanceof WebScriptServletRequest)
+            {
+                webScriptServletRequest = (WebScriptServletRequest) current;
+                current = null;
+            }
+            else if (current instanceof WrappingWebScriptRequest)
+            {
+                current = ((WrappingWebScriptRequest) req).getNext();
+            }
+            else
+            {
+                current = null;
+            }
+        }
+        while (current != null);
+        if (webScriptServletRequest == null)
+        {
+            resp.setStatus(Status.STATUS_BAD_REQUEST);
+            return Status.STATUS_BAD_REQUEST;
+        }
+
+        HttpServletRequest servletRequest = webScriptServletRequest.getHttpServletRequest();
+
+        //Read the transfer id from the request
+        String transferId = servletRequest.getParameter("transferId");
+
+        if ((transferId == null) || !ServletFileUpload.isMultipartContent(servletRequest))
+        {
+            resp.setStatus(Status.STATUS_BAD_REQUEST);
+            return Status.STATUS_BAD_REQUEST;
+        }
+
+        try
+        {
+           
+            ServletFileUpload upload = new ServletFileUpload();
+            FileItemIterator iter = upload.getItemIterator(servletRequest);
+            while (iter.hasNext())
+            {
+                FileItemStream item = iter.next();
+                String name = item.getFieldName();
+                if (!item.isFormField())
+                {
+                    logger.debug("got content Mime Part : " + name);
+                    receiver.saveContent(transferId, item.getName(), item.openStream());
+                }
+            }            
+            
+//            WebScriptServletRequest alfRequest = (WebScriptServletRequest)req;
+//            String[] names = alfRequest.getParameterNames();
+//            for(String name : names)
+//            {
+//                FormField item = alfRequest.getFileField(name);
+//                
+//                if(item != null)
+//                {
+//                    logger.debug("got content Mime Part : " + name);
+//                    receiver.saveContent(transferId, item.getName(), item.getInputStream());
+//                }
+//                else
+//                {
+//                    //TODO - should this be an exception?
+//                    logger.debug("Unable to get content for Mime Part : " + name);
+//                }
+//            }
+            
+            logger.debug("success");
+            
+            resp.setStatus(Status.STATUS_OK);
+        } 
+        catch (Exception ex)
+        {
+            logger.debug("exception caught", ex);
+            if(transferId != null)
+            {
+                logger.debug("ending transfer", ex);
+                receiver.end(transferId);
+            }
+            if (ex instanceof TransferException)
+            {
+                throw (TransferException) ex;
+            }
+            throw new TransferException(MSG_CAUGHT_UNEXPECTED_EXCEPTION, ex);
+
+        }
+
+        resp.setStatus(Status.STATUS_OK);
+        return Status.STATUS_OK;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PostSnapshotCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PostSnapshotCommandProcessor.java
new file mode 100644
index 00000000000..afe7a29b946
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PostSnapshotCommandProcessor.java
@@ -0,0 +1,163 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.transfer;
+
+import java.io.OutputStream;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.repo.transfer.TransferCommons;
+import org.alfresco.service.cmr.transfer.TransferException;
+import org.alfresco.service.cmr.transfer.TransferReceiver;
+import org.apache.commons.fileupload.FileItemIterator;
+import org.apache.commons.fileupload.FileItemStream;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+import org.springframework.extensions.webscripts.servlet.FormData.FormField;
+
+/**
+ * This command processor is used to receive the snapshot for a given transfer.
+ * 
+ * @author brian
+ *
+ */
+public class PostSnapshotCommandProcessor implements CommandProcessor
+{
+    private TransferReceiver receiver;
+    
+    private static Log logger = LogFactory.getLog(PostSnapshotCommandProcessor.class);
+
+    private static final String MSG_CAUGHT_UNEXPECTED_EXCEPTION = "transfer_service.receiver.caught_unexpected_exception";
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.scripts.transfer.CommandProcessor#process(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    public int process(WebScriptRequest req, WebScriptResponse resp)
+    {
+        
+        int result = Status.STATUS_OK;
+        // Unwrap to a WebScriptServletRequest if we have one
+        WebScriptServletRequest webScriptServletRequest = null;
+        WebScriptRequest current = req;
+        do
+        {
+            if (current instanceof WebScriptServletRequest)
+            {
+                webScriptServletRequest = (WebScriptServletRequest) current;
+                current = null;
+            }
+            else if (current instanceof WrappingWebScriptRequest)
+            {
+                current = ((WrappingWebScriptRequest) req).getNext();
+            }
+            else
+            {
+                current = null;
+            }
+        }
+        while (current != null);
+        if (webScriptServletRequest == null) 
+        {
+            logger.debug("bad request, not assignable from");
+            resp.setStatus(Status.STATUS_BAD_REQUEST);
+            return Status.STATUS_BAD_REQUEST;
+        }
+                
+        //We can't use the WebScriptRequest version of getParameter, since that may cause the content stream 
+        //to be parsed. Get hold of the raw HttpServletRequest and work with that.
+        HttpServletRequest servletRequest = webScriptServletRequest.getHttpServletRequest();
+        
+        //Read the transfer id from the request
+        String transferId = servletRequest.getParameter("transferId");
+        
+        if ((transferId == null) || !ServletFileUpload.isMultipartContent(servletRequest)) 
+        {
+            logger.debug("bad request, not multipart");
+            resp.setStatus(Status.STATUS_BAD_REQUEST);
+            return Status.STATUS_BAD_REQUEST;
+        }
+        
+        try 
+        {
+            logger.debug("about to upload manifest file");
+
+            ServletFileUpload upload = new ServletFileUpload();
+            FileItemIterator iter = upload.getItemIterator(servletRequest);
+            while (iter.hasNext()) 
+            {
+                FileItemStream item = iter.next();
+                if (!item.isFormField() && TransferCommons.PART_NAME_MANIFEST.equals(item.getFieldName())) 
+                {
+                    logger.debug("got manifest file");
+                    receiver.saveSnapshot(transferId, item.openStream());
+                }
+            }
+          
+            logger.debug("success");
+            resp.setStatus(Status.STATUS_OK);
+            
+            OutputStream out = resp.getOutputStream();
+            resp.setContentType("text/xml");
+            resp.setContentEncoding("utf-8");
+   
+            receiver.generateRequsite(transferId, out);
+            
+            out.close();
+                        
+        } 
+        catch (Exception ex) 
+        {
+            logger.debug("exception caught", ex);
+            if(transferId != null)
+            {
+                logger.debug("ending transfer", ex);
+                receiver.end(transferId);
+            }
+            if (ex instanceof TransferException)
+            {
+                throw (TransferException) ex;
+            }
+            throw new TransferException(MSG_CAUGHT_UNEXPECTED_EXCEPTION, ex);
+        }
+        return result;
+    }
+
+    /**
+     * @param receiver the receiver to set
+     */
+    public void setReceiver(TransferReceiver receiver)
+    {
+        this.receiver = receiver;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PrepareTransferCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PrepareTransferCommandProcessor.java
new file mode 100644
index 00000000000..de4bbc04356
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/PrepareTransferCommandProcessor.java
@@ -0,0 +1,145 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.transfer;
+
+import java.io.StringWriter;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.repo.transfer.TransferServiceImpl;
+import org.alfresco.service.cmr.transfer.TransferException;
+import org.alfresco.service.cmr.transfer.TransferReceiver;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
+import org.springframework.extensions.webscripts.json.JSONWriter;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+
+/**
+ * 
+ * @author mrogers
+ * 
+ */
+public class PrepareTransferCommandProcessor implements CommandProcessor
+{
+    private static final String MSG_CAUGHT_UNEXPECTED_EXCEPTION = "transfer_service.receiver.caught_unexpected_exception";
+    
+    private static Log logger = LogFactory.getLog(PrepareTransferCommandProcessor.class);
+
+    private TransferReceiver receiver;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.repo.web.scripts.transfer.CommandProcessor#process(org.alfresco .web.scripts.WebScriptRequest,
+     * org.alfresco.web.scripts.WebScriptResponse)
+     */
+    public int process(WebScriptRequest req, WebScriptResponse resp)
+    {
+        String transferRecordId = null;
+
+        //Read the transfer id from the request
+        // Unwrap to a WebScriptServletRequest if we have one
+        WebScriptServletRequest webScriptServletRequest = null;
+        WebScriptRequest current = req;
+        do
+        {
+            if (current instanceof WebScriptServletRequest)
+            {
+                webScriptServletRequest = (WebScriptServletRequest) current;
+                current = null;
+            }
+            else if (current instanceof WrappingWebScriptRequest)
+            {
+                current = ((WrappingWebScriptRequest) req).getNext();
+            }
+            else
+            {
+                current = null;
+            }
+        }
+        while (current != null);
+        HttpServletRequest servletRequest = webScriptServletRequest.getHttpServletRequest();
+        String transferId = servletRequest.getParameter("transferId");
+
+        if (transferId == null) 
+        {
+            logger.debug("transferId is missing");
+            resp.setStatus(Status.STATUS_BAD_REQUEST);
+            return Status.STATUS_BAD_REQUEST;
+        }
+
+        try
+        {
+            logger.debug("prepare transferId: " + transferId);
+            receiver.prepare(transferId);
+
+            // return the unique transfer id (the lock id)
+            StringWriter stringWriter = new StringWriter(300);
+            JSONWriter jsonWriter = new JSONWriter(stringWriter);
+            jsonWriter.startObject();
+            jsonWriter.writeValue("transferId", transferRecordId);
+            jsonWriter.endObject();
+            String response = stringWriter.toString();
+
+            resp.setContentType("application/json");
+            resp.setContentEncoding("UTF-8");
+            int length = response.getBytes("UTF-8").length;
+            resp.addHeader("Content-Length", "" + length);
+            resp.setStatus(Status.STATUS_OK);
+            resp.getWriter().write(response);
+
+            logger.debug("prepared transferId: " + transferId);
+
+            return Status.STATUS_OK;
+        } 
+        catch (Exception ex)
+        {
+            logger.debug("in exception handler", ex);
+            receiver.end(transferRecordId);
+            if (ex instanceof TransferException)
+            {
+                throw (TransferException) ex;
+            }
+            throw new TransferException(MSG_CAUGHT_UNEXPECTED_EXCEPTION, ex);
+        }
+    }
+
+    /**
+     * @param receiver the receiver to set
+     */
+    public void setReceiver(TransferReceiver receiver)
+    {
+        this.receiver = receiver;
+    }
+
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/ReportCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/ReportCommandProcessor.java
new file mode 100644
index 00000000000..568e54db85b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/ReportCommandProcessor.java
@@ -0,0 +1,151 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.transfer;
+
+import java.io.BufferedInputStream;
+import java.io.OutputStream;
+import java.io.StringWriter;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.service.cmr.transfer.TransferException;
+import org.alfresco.service.cmr.transfer.TransferProgress;
+import org.alfresco.service.cmr.transfer.TransferReceiver;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
+import org.springframework.extensions.webscripts.json.JSONWriter;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+
+/**
+ * This command processor is used to get the server side transfer report.
+ * 
+ * @author brian
+ * 
+ */
+public class ReportCommandProcessor implements CommandProcessor
+{
+    private static final String MSG_CAUGHT_UNEXPECTED_EXCEPTION = "transfer_service.receiver.caught_unexpected_exception";
+
+    private TransferReceiver receiver;
+
+    private final static Log logger = LogFactory.getLog(ReportCommandProcessor.class);
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.repo.web.scripts.transfer.CommandProcessor#process(org.alfresco .web.scripts.WebScriptRequest,
+     * org.alfresco.web.scripts.WebScriptResponse)
+     */
+    public int process(WebScriptRequest req, WebScriptResponse resp)
+    {   
+        //Read the transfer id from the request
+        // Unwrap to a WebScriptServletRequest if we have one
+        WebScriptServletRequest webScriptServletRequest = null;
+        WebScriptRequest current = req;
+        do
+        {
+            if (current instanceof WebScriptServletRequest)
+            {
+                webScriptServletRequest = (WebScriptServletRequest) current;
+                current = null;
+            }
+            else if (current instanceof WrappingWebScriptRequest)
+            {
+                current = ((WrappingWebScriptRequest) req).getNext();
+            }
+            else
+            {
+                current = null;
+            }
+        }
+        while (current != null);
+        HttpServletRequest servletRequest = webScriptServletRequest.getHttpServletRequest();
+        String transferId = servletRequest.getParameter("transferId");
+
+        if (transferId == null) 
+        {
+            logger.debug("transferId is missing");
+            resp.setStatus(Status.STATUS_BAD_REQUEST);
+            return Status.STATUS_BAD_REQUEST;
+        }
+        
+        try
+        {
+            OutputStream out = resp.getOutputStream();
+            try
+            {
+                resp.setContentType("text/xml");
+                resp.setContentEncoding("utf-8");
+            
+                BufferedInputStream br = new BufferedInputStream(receiver.getProgressMonitor().getLogInputStream(transferId));
+                try
+                {
+                    byte[] buffer = new byte[1000];
+                    int i = br.read(buffer);
+                    while(i > 0)
+                    {
+                        out.write(buffer, 0, i);
+                        i = br.read(buffer);
+                    }
+                }
+                finally
+                {
+                    br.close();
+                }
+            }
+            finally
+            {
+                out.flush();
+                out.close();
+            }
+         
+            return Status.STATUS_OK;
+        }
+        catch (TransferException ex)
+        {
+            throw ex;
+        }
+        catch (Exception ex)
+        {
+            throw new TransferException(MSG_CAUGHT_UNEXPECTED_EXCEPTION, ex);
+        }
+    }
+
+    /**
+     * @param receiver
+     *            the receiver to set
+     */
+    public void setReceiver(TransferReceiver receiver)
+    {
+        this.receiver = receiver;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/StatusCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/StatusCommandProcessor.java
new file mode 100644
index 00000000000..01c0b53c244
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/StatusCommandProcessor.java
@@ -0,0 +1,155 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.transfer;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.service.cmr.transfer.TransferException;
+import org.alfresco.service.cmr.transfer.TransferProgress;
+import org.alfresco.service.cmr.transfer.TransferReceiver;
+import org.alfresco.util.json.ExceptionJsonSerializer;
+import org.alfresco.util.json.JsonSerializer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+
+/**
+ * This command processor is used to record the start a transfer. No other transfer can be started after this command
+ * has executed until the started transfer terminates.
+ * 
+ * @author brian
+ * 
+ */
+public class StatusCommandProcessor implements CommandProcessor
+{
+    private static final String MSG_CAUGHT_UNEXPECTED_EXCEPTION = "transfer_service.receiver.caught_unexpected_exception";
+
+    private TransferReceiver receiver;
+    private JsonSerializer<Throwable, JSONObject> errorSerializer = new ExceptionJsonSerializer();
+
+    private final static Log logger = LogFactory.getLog(StatusCommandProcessor.class);
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.alfresco.repo.web.scripts.transfer.CommandProcessor#process(org.alfresco .web.scripts.WebScriptRequest,
+     * org.alfresco.web.scripts.WebScriptResponse)
+     */
+    public int process(WebScriptRequest req, WebScriptResponse resp)
+    {   
+        //Read the transfer id from the request
+        // Unwrap to a WebScriptServletRequest if we have one
+        WebScriptServletRequest webScriptServletRequest = null;
+        WebScriptRequest current = req;
+        do
+        {
+            if (current instanceof WebScriptServletRequest)
+            {
+                webScriptServletRequest = (WebScriptServletRequest) current;
+                current = null;
+            }
+            else if (current instanceof WrappingWebScriptRequest)
+            {
+                current = ((WrappingWebScriptRequest) req).getNext();
+            }
+            else
+            {
+                current = null;
+            }
+        }
+        while (current != null);
+        HttpServletRequest servletRequest = webScriptServletRequest.getHttpServletRequest();
+        String transferId = servletRequest.getParameter("transferId");
+
+        if (transferId == null) 
+        {
+            logger.debug("transferId is missing");
+            resp.setStatus(Status.STATUS_BAD_REQUEST);
+            return Status.STATUS_BAD_REQUEST;
+        }
+        
+        try
+        {
+            TransferProgress progress = receiver.getProgressMonitor().getProgress(transferId);
+
+            if (logger.isDebugEnabled())
+            {
+                logger.debug(progress);
+            }
+            
+            JSONObject progressObject = new JSONObject();
+            progressObject.put("transferId", transferId);
+            progressObject.put("status", progress.getStatus().toString());
+            progressObject.put("currentPosition", progress.getCurrentPosition());
+            progressObject.put("endPosition", progress.getEndPosition());
+            if (progress.getError() != null)
+            {
+                JSONObject errorObject = errorSerializer.serialize(progress.getError());
+                progressObject.put("error", errorObject);
+            }
+            String response = progressObject.toString();
+
+            resp.setContentType("application/json");
+            resp.setContentEncoding("UTF-8");
+            int length = response.getBytes("UTF-8").length;
+            resp.addHeader("Content-Length", "" + length);
+            resp.setStatus(Status.STATUS_OK);
+            resp.getWriter().write(response);
+
+            return Status.STATUS_OK;
+
+        }
+        catch (TransferException ex)
+        {
+            throw ex;
+        }
+        catch (Exception ex)
+        {
+            throw new TransferException(MSG_CAUGHT_UNEXPECTED_EXCEPTION, ex);
+        }
+    }
+
+    /**
+     * @param receiver
+     *            the receiver to set
+     */
+    public void setReceiver(TransferReceiver receiver)
+    {
+        this.receiver = receiver;
+    }
+
+    public void setErrorSerializer(JsonSerializer<Throwable, JSONObject> errorSerializer)
+    {
+        this.errorSerializer = errorSerializer;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/TestCredentialsCommandProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/TestCredentialsCommandProcessor.java
new file mode 100644
index 00000000000..fe243017f9a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/TestCredentialsCommandProcessor.java
@@ -0,0 +1,56 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.transfer;
+
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+
+/**
+ * This command processor is used simply to check that the transfer receiver is enabled and that the supplied
+ * credentials are correct and identify an admin user.
+ * 
+ * @author brian
+ *
+ */
+public class TestCredentialsCommandProcessor implements CommandProcessor
+{
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.scripts.transfer.CommandProcessor#process(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    public int process(WebScriptRequest req, WebScriptResponse resp)
+    {
+        //Since all the checks that are needed are actually carried out by the transfer web script, this processor
+        //effectively becomes a no-op.
+        int result = Status.STATUS_OK;
+        resp.setStatus(result);
+        return result;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/TransferWebScript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/TransferWebScript.java
new file mode 100644
index 00000000000..d36309db678
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/TransferWebScript.java
@@ -0,0 +1,138 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.transfer;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.transfer.TransferException;
+import org.alfresco.util.json.ExceptionJsonSerializer;
+import org.alfresco.util.json.JsonSerializer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * @author brian
+ *
+ */
+public class TransferWebScript extends AbstractWebScript
+{
+    private static final Log log = LogFactory.getLog(TransferWebScript.class);
+    
+    private boolean enabled = true;
+    private Map<String, CommandProcessor> processors = new TreeMap<String, CommandProcessor>();
+    private JsonSerializer<Throwable, JSONObject> errorSerializer = new ExceptionJsonSerializer();
+    
+    public void setEnabled(boolean enabled)
+    {
+        this.enabled = enabled;
+    }
+    
+    public void setCommandProcessors(Map<String, CommandProcessor> processors) 
+    {
+        this.processors = new TreeMap<String,CommandProcessor>(processors);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScript#execute(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
+     */
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        if (enabled) 
+        {
+            log.debug("Transfer webscript invoked by user: " + AuthenticationUtil.getFullyAuthenticatedUser() + 
+                    " running as " + AuthenticationUtil.getRunAsAuthentication().getName());
+            processCommand(req.getServiceMatch().getTemplateVars().get("command"), req, res);
+        }
+        else
+        {
+            res.setStatus(Status.STATUS_NOT_FOUND);
+        }
+    }
+
+    /**
+     * @param command String
+     * @param req WebScriptRequest
+     * @param res WebScriptResponse
+     */
+    private void processCommand(String command, WebScriptRequest req, WebScriptResponse res)
+    {
+        log.debug("Received request to process transfer command: " + command);
+        if (command == null || (command = command.trim()).length() == 0)
+        {
+            log.warn("Empty or null command received by the transfer script. Returning \"Not Found\"");
+            res.setStatus(Status.STATUS_NOT_FOUND);
+        }
+        else
+        {
+            CommandProcessor processor = processors.get(command);
+            if (processor != null) 
+            {
+                log.debug("Found appropriate command processor: " + processor);
+                try 
+                {
+                    processor.process(req, res);
+                    log.debug("command processed");
+                } 
+                catch (TransferException ex) 
+                {
+                    try 
+                    {
+                        log.debug("transfer exception caught", ex);
+                        res.setStatus(Status.STATUS_INTERNAL_SERVER_ERROR);
+                        JSONObject errorObject = errorSerializer.serialize(ex);
+                        String error = errorObject.toString();
+                        
+                        res.setContentType("application/json");
+                        res.setContentEncoding("UTF-8");
+                        int length = error.getBytes("UTF-8").length;
+                        res.addHeader("Content-Length", "" + length);
+
+                        res.getWriter().write(error);
+                    } 
+                    catch (Exception e) 
+                    {
+                        //nothing to do at this point really.
+                    }
+                }
+            }
+            else
+            {
+                log.warn("No processor found for requested command: " + command + ". Returning \"Not Found\"");
+                res.setStatus(Status.STATUS_NOT_FOUND);
+            }
+        }
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/package-info.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/package-info.java
new file mode 100644
index 00000000000..987c523ef4f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/transfer/package-info.java
@@ -0,0 +1,38 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+/**
+ * Provides the implementation of the transfer service web scripts.   Which are used to receive transfers from other 
+ * instances of Alfresco.
+ * <p>
+ * The code in this package should be considered private to Alfresco and is liable to 
+ * change with each version of Alfresco. 
+ * <p>
+ * @since 3.3
+ */
+@PackageMarker
+package org.alfresco.repo.web.scripts.transfer;
+import org.alfresco.util.PackageMarker;
+
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java
new file mode 100644
index 00000000000..b7cbb712a6a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowWebscript.java
@@ -0,0 +1,418 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.workflow.WorkflowService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.util.ModelUtil;
+import org.springframework.extensions.surf.util.ISO8601DateFormat;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.util.StringUtils;
+
+/**
+ * Base class for all workflow REST API implementations.
+ * 
+ * @author Nick Smith
+ * @author Gavin Cornwell
+ * @since 3.4
+ */
+public abstract class AbstractWorkflowWebscript extends DeclarativeWebScript
+{
+    public static final String NULL = "null";
+    public static final String EMPTY = "";
+    
+    public static final String PARAM_MAX_ITEMS = "maxItems";
+    public static final String PARAM_SKIP_COUNT = "skipCount";
+    public static final String PARAM_EXCLUDE = "exclude";
+    
+    // used for results pagination: indicates that all items from list should be returned
+    public static final int DEFAULT_MAX_ITEMS = -1;  
+    
+    // used for results pagination: indicates that no items should be skipped
+    public static final int DEFAULT_SKIP_COUNT = 0;
+
+    protected NamespaceService namespaceService;
+    protected NodeService nodeService;
+    protected PersonService personService;
+    protected DictionaryService dictionaryService;
+    protected AuthenticationService authenticationService;
+    protected AuthorityService authorityService;
+    protected WorkflowService workflowService;
+    
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        WorkflowModelBuilder modelBuilder = new WorkflowModelBuilder(namespaceService, nodeService, authenticationService, 
+                    personService, workflowService, dictionaryService);
+        return buildModel(modelBuilder, req, status, cache);
+    }
+
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+    
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+    
+    public void setPersonService(PersonService personService)
+    {
+        this.personService = personService;
+    }
+    
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService;
+    }
+    
+    public void setAuthenticationService(AuthenticationService authenticationService)
+    {
+        this.authenticationService = authenticationService;
+    }
+    
+    public void setAuthorityService(AuthorityService authorityService)
+    {
+        this.authorityService = authorityService;
+    }
+    
+    public void setWorkflowService(WorkflowService workflowService)
+    {
+        this.workflowService = workflowService;
+    }
+    
+    /**
+     * This method uses a {@link WorkflowModelBuilder} to build up the model to return.
+     * @param modelBuilder A {@link WorkflowModelBuilder}.
+     * @param req the {@link WebScriptRequest}
+     * @param status the {@link Status}
+     * @param cache the {@link Cache}
+     * @return the data model.
+     */
+    protected abstract Map<String, Object> buildModel(
+            WorkflowModelBuilder modelBuilder,
+            WebScriptRequest req,
+            Status status, Cache cache);
+    
+    
+    /**
+     * Processes the given date filter parameter from the provided webscript request.
+     * 
+     * If the parameter is present but set to an empty string or to "null" the
+     * date is added to the given filters Map as "", if the parameter
+     * contains an ISO8601 date it's added as a Date object to the filters.
+     * 
+     * @param req The WebScript request
+     * @param paramName The name of the parameter to look for
+     * @param filters Map of filters to add the date to
+     */
+    protected void processDateFilter(WebScriptRequest req, String paramName, Map<String, Object> filters)
+    {
+        // TODO: support other keywords i.e. today, tomorrow
+        
+        String dateParam = req.getParameter(paramName);
+        if (dateParam != null)
+        {
+            Object date = EMPTY;
+            
+            if (!EMPTY.equals(dateParam) && !NULL.equals(dateParam))
+            {
+                date = getDateParameter(req, paramName);
+            }
+            
+            filters.put(paramName, date);
+        }
+    }
+    
+    /**
+     * Retrieves the named paramter as a date.
+     * 
+     * @param req The WebScript request
+     * @param paramName The name of parameter to look for
+     * @return The request parameter value or null if the parameter is not present
+     */
+    protected Date getDateParameter(WebScriptRequest req, String paramName)
+    {
+        String dateString = req.getParameter(paramName);
+
+        if (dateString != null)
+        {
+            try
+            {
+                return ISO8601DateFormat.parse(dateString.replaceAll(" ", "+"));
+            }
+            catch (Exception e)
+            {
+                String msg = "Invalid date value: " + dateString;
+                throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, msg);
+            }
+        }
+        return null;
+    }
+    
+    /**
+     * Retrieves the named parameter as an integer, if the parameter is not present the default value is returned
+     * 
+     * @param req The WebScript request
+     * @param paramName The name of parameter to look for
+     * @param defaultValue The default value that should be returned if parameter is not present in request or if it is not positive
+     * @return The request parameter or default value
+     */
+    protected int getIntParameter(WebScriptRequest req, String paramName, int defaultValue)
+    {
+        String paramString = req.getParameter(paramName);
+        
+        if (paramString != null)
+        {
+            try
+            {
+                int param = Integer.valueOf(paramString);
+                
+                if (param > 0)
+                {
+                    return param;
+                }
+            }
+            catch (NumberFormatException e) 
+            {
+                throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
+            }
+        }
+        
+        return defaultValue;
+    }
+    
+    /**
+     * Builds the results model, applying pagination to the results if necessary.
+     * @param req The WebScript request
+     * @param dataPropertyName The name of the property to use in the model
+     * @param results The full set of results
+     * 
+     * @return List of results to return to the callee
+     */
+    protected Map<String, Object> createResultModel(WebScriptRequest req, String dataPropertyName, 
+                List<Map<String, Object>> results)
+    {
+        // MNT-9074 My Tasks fails to render if tasks quantity is excessive
+        int totalItems = 0;
+        try
+        {
+            totalItems = getCapacity(results);
+        }
+        catch (Exception e)
+        {
+            totalItems = results.size();
+        }
+        
+        int maxItems = getIntParameter(req, PARAM_MAX_ITEMS, DEFAULT_MAX_ITEMS);
+        int skipCount = getIntParameter(req, PARAM_SKIP_COUNT, DEFAULT_SKIP_COUNT);
+        
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put(dataPropertyName, applyPagination(results, maxItems, skipCount));
+        
+        if (maxItems != DEFAULT_MAX_ITEMS || skipCount != DEFAULT_SKIP_COUNT)
+        {
+            // maxItems or skipCount parameter was provided so we need to include paging into response
+            model.put("paging", ModelUtil.buildPaging(totalItems, maxItems == DEFAULT_MAX_ITEMS ? totalItems : maxItems, skipCount));
+        }
+        
+        return model;
+    }
+    
+    /**
+     * Get capacity instaead of size of list
+     * MNT-9074 My Tasks fails to render if tasks quantity is excessive
+     * @param list List<?>
+     * @return capacity of list
+     * @throws Exception
+     */
+    private int getCapacity(List<?> list) throws Exception {
+        Field dataField = ArrayList.class.getDeclaredField("elementData");
+        dataField.setAccessible(true);
+        return ((Object[]) dataField.get(list)).length;
+    }
+    
+    /**
+     * Make the pagination for given list of objects
+     * 
+     * @param results the initial list of objects for pagination
+     * @param maxItems maximum count of elements that should be included in paging result 
+     * @param skipCount the count of elements that should be skipped
+     * @return List of paginated results
+     */
+    protected List<Map<String, Object>> applyPagination(List<Map<String, Object>> results, int maxItems, int skipCount)
+    {
+        if (maxItems == DEFAULT_MAX_ITEMS && skipCount == DEFAULT_SKIP_COUNT)
+        {
+            // no need to make pagination
+            return results;
+        }
+        
+        // Do the paging
+        return ModelUtil.page(results, maxItems, skipCount);
+    }
+    
+    /**
+     * Determines whether the given date is a match for the given filter value.
+     * 
+     * @param date The date to check against
+     * @param filterValue The value of the filter, either an empty String or a Date object
+     * @param dateBeforeFilter true to test the date is before the filterValue, 
+     *        false to test the date is after the filterValue
+     * @return true if the date is a match for the filterValue
+     */
+    protected boolean isDateMatchForFilter(Date date, Object filterValue, boolean dateBeforeFilter)
+    {
+        boolean match = true;
+        
+        if (filterValue.equals(EMPTY))
+        {
+            if (date != null)
+            {
+                match = false;
+            }
+        }
+        else
+        {
+            if (date == null)
+            {
+                match = false;
+            }
+            else
+            {
+                if (dateBeforeFilter)
+                {
+                    if (date.getTime() >= ((Date)filterValue).getTime())
+                    {
+                        match = false;
+                    }
+                }
+                else
+                {
+                    if (date.getTime() <= ((Date)filterValue).getTime())
+                    {
+                        match = false;
+                    }
+                }
+            }
+        }
+        
+        return match;
+    }
+    
+    /**
+     * Helper class to check for excluded items.
+     */
+    public class ExcludeFilter
+    {
+        private static final String WILDCARD = "*";
+        
+        private List<String> exactFilters;
+        private List<String> wilcardFilters;
+        private boolean containsWildcards = false;
+        
+        /**
+         * Creates a new ExcludeFilter
+         * 
+         * @param filters Comma separated list of filters which can optionally
+         *        contain wildcards
+         */
+        public ExcludeFilter(String filters)
+        {
+            // tokenize the filters
+            String[] filterArray = StringUtils.tokenizeToStringArray(filters, ",");
+            
+            // create a list of exact filters and wildcard filters
+            this.exactFilters = new ArrayList<String>(filterArray.length);
+            this.wilcardFilters = new ArrayList<String>(filterArray.length);
+            
+            for (String filter : filterArray)
+            {
+                if (filter.endsWith(WILDCARD))
+                {
+                    // at least one wildcard is present
+                    this.containsWildcards = true;
+                    
+                    // add the filter without the wildcard
+                    this.wilcardFilters.add(filter.substring(0, 
+                                (filter.length()-WILDCARD.length())));
+                }
+                else
+                {
+                    // add the exact filter
+                    this.exactFilters.add(filter);
+                }
+            }
+        }
+        
+        /**
+         * Determines whether the given item matches one of
+         * the filters.
+         * 
+         * @param item The item to check
+         * @return true if the item matches one of the filters
+         */
+        public boolean isMatch(String item)
+        {
+            // see whether there is an exact match
+            boolean match = this.exactFilters.contains(item);
+            
+            // if there wasn't an exact match and wildcards are present
+            if (item != null && !match && this.containsWildcards)
+            {
+                for (String wildcardFilter : this.wilcardFilters)
+                {
+                    if (item.startsWith(wildcardFilter))
+                    {
+                        match = true;
+                        break;
+                    }
+                }
+            }
+            
+            return match;
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstanceGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstanceGet.java
new file mode 100644
index 00000000000..1c0e4bb4a8b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstanceGet.java
@@ -0,0 +1,70 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.cmr.workflow.WorkflowTask;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ * @since 3.4
+ */
+public class TaskInstanceGet extends AbstractWorkflowWebscript
+{
+
+    @Override
+    protected Map<String, Object> buildModel(WorkflowModelBuilder modelBuilder, WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+
+        // getting task id from request parameters
+        String taskId = params.get("task_instance_id");
+
+        // searching for task in repository
+        WorkflowTask workflowTask = workflowService.getTaskById(taskId);
+
+        // task was not found -> return 404
+        if (workflowTask == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find workflow task with id: " + taskId);
+        }
+
+        Map<String, Object> model = new HashMap<String, Object>();
+        // build the model for ftl
+        model.put("workflowTask", modelBuilder.buildDetailed(workflowTask));
+
+        return model;
+    }
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstancePut.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstancePut.java
new file mode 100644
index 00000000000..0d6aa9c0b83
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstancePut.java
@@ -0,0 +1,209 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.repository.datatype.TypeConversionException;
+import org.alfresco.service.cmr.workflow.WorkflowException;
+import org.alfresco.service.cmr.workflow.WorkflowTask;
+import org.alfresco.service.namespace.QName;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ * @since 3.4
+ */
+public class TaskInstancePut extends AbstractWorkflowWebscript
+{
+
+    @Override
+    protected Map<String, Object> buildModel(WorkflowModelBuilder modelBuilder, WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+        
+        // getting task id from request parameters
+        String taskId = params.get("task_instance_id");
+        
+        JSONObject json = null;
+        
+        try
+        {
+            WorkflowTask workflowTask = workflowService.getTaskById(taskId);
+            String currentUser = authenticationService.getCurrentUserName();
+
+            // read request json            
+            json = new JSONObject(new JSONTokener(req.getContent().getContent()));
+                
+            // update task properties
+            workflowTask = workflowService.updateTask(taskId, parseTaskProperties(json, workflowTask), null, null);
+                
+            // task was not found -> return 404
+            if (workflowTask == null)
+            {
+                throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Failed to find workflow task with id: " + taskId);
+            }
+                
+            // build the model for ftl
+            Map<String, Object> model = new HashMap<String, Object>();
+            model.put("workflowTask", modelBuilder.buildDetailed(workflowTask));
+                
+            return model;
+        }
+        catch (IOException iox)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not read content from request.", iox);
+        }
+        catch (JSONException je)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from request.", je);
+        }
+        catch (AccessDeniedException ade)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_UNAUTHORIZED, "Failed to update workflow task with id: " + taskId, ade);
+        }
+        catch (WorkflowException we)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_UNAUTHORIZED, "Failed to update workflow task with id: " + taskId, we);
+        }
+    }
+    
+    @SuppressWarnings("unchecked")
+    private Map<QName, Serializable> parseTaskProperties(JSONObject json, WorkflowTask workflowTask) throws JSONException
+    {
+        Map<QName, Serializable> props = new HashMap<QName, Serializable>();
+        
+        // gets the array of properties names
+        String[] names = JSONObject.getNames(json);
+        
+        if (names != null)
+        {
+            // array is not empty
+            for (String name : names)
+            {
+                // build the qname of property
+                QName key = QName.createQName(name.replaceFirst("_", ":"), namespaceService);
+                Object jsonValue = json.get(name);
+                
+                Serializable value = null;
+                
+                // process null values 
+                if (jsonValue.equals(JSONObject.NULL))
+                {
+                    props.put(key, null);
+                }
+                else
+                {
+                    // gets the property definition from dictionary
+                    PropertyDefinition prop = dictionaryService.getProperty(key);
+                    
+                    if (prop != null)
+                    {
+                        if (prop.isMultiValued() && jsonValue instanceof JSONArray)
+                        {
+                            value = new ArrayList<Serializable>();
+                            
+                            for (int i = 0; i < ((JSONArray)jsonValue).length(); i++)
+                            {
+                                ((List<Serializable>)value).add((Serializable) DefaultTypeConverter.INSTANCE.convert(prop.getDataType(),((JSONArray)jsonValue).get(i)));
+                            }
+                        }
+                        else
+                        {
+                            // convert property using its data type specified in model
+                            value = (Serializable) DefaultTypeConverter.INSTANCE.convert(prop.getDataType(), jsonValue);
+                        }
+                    }
+                    else
+                    {
+                        // property definition was not found in dictionary
+                        if (jsonValue instanceof JSONArray)
+                        {
+                            value = new ArrayList<String>();
+                            
+                            for (int i = 0; i < ((JSONArray)jsonValue).length(); i++)
+                            {
+                                ((List<String>)value).add(((JSONArray)jsonValue).getString(i));
+                            }
+                        }
+                        else
+                        {
+                            // If the JSON returns an Object which is not a String, we use that type.
+                            // Otherwise, we try to convert the string
+                            if (jsonValue instanceof String)
+                            {
+                                // Check if the task already has the property, use that type.
+                                Serializable existingValue = workflowTask.getProperties().get(key);
+                                if (existingValue != null)
+                                {
+                                    try
+                                    {
+                                        value = DefaultTypeConverter.INSTANCE.convert(existingValue.getClass(), jsonValue);
+                                    }
+                                    catch(TypeConversionException tce)
+                                    {
+                                        // TODO: is this the right approach, ignoring exception?
+                                        // Ignore the exception, revert to using String-value
+                                    }
+                                }
+                                else
+                                {
+                                    // Revert to using string-value
+                                    value = (String) jsonValue;
+                                }
+                            }
+                            else
+                            {
+                                // Use the value provided by JSON
+                                value = (Serializable) jsonValue;
+                            }
+                        }
+                    }
+                }
+                
+                props.put(key, value);
+            }
+        }
+        return props;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java
new file mode 100644
index 00000000000..7f0a825ec5a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/TaskInstancesGet.java
@@ -0,0 +1,421 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.workflow.WorkflowModel;
+import org.alfresco.service.cmr.workflow.WorkflowTask;
+import org.alfresco.service.cmr.workflow.WorkflowTaskQuery;
+import org.alfresco.service.cmr.workflow.WorkflowTaskQuery.OrderBy;
+import org.alfresco.service.cmr.workflow.WorkflowTaskState;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ModelUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript impelementation to return workflow task instances.
+ * 
+ * @author Nick Smith
+ * @author Gavin Cornwell
+ * @since 3.4
+ */
+public class TaskInstancesGet extends AbstractWorkflowWebscript
+{
+    private static final Log LOGGER = LogFactory.getLog(TaskInstancesGet.class);
+
+    public static final String PARAM_AUTHORITY = "authority";
+    public static final String PARAM_STATE = "state";
+    public static final String PARAM_PRIORITY = "priority";
+    public static final String PARAM_DUE_BEFORE = "dueBefore";
+    public static final String PARAM_DUE_AFTER = "dueAfter";
+    public static final String PARAM_PROPERTIES = "properties";
+    public static final String PARAM_POOLED_TASKS = "pooledTasks";
+    public static final String PARAM_PROPERTY = "property";
+    public static final String VAR_WORKFLOW_INSTANCE_ID = "workflow_instance_id";
+
+    private WorkflowTaskDueAscComparator taskComparator = new WorkflowTaskDueAscComparator();
+
+    @Override
+    protected Map<String, Object> buildModel(WorkflowModelBuilder modelBuilder, WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+        Map<String, Object> filters = new HashMap<String, Object>(4);
+
+        // authority is not included into filters list as it will be taken into account before filtering
+        String authority = getAuthority(req);
+        
+        if (authority == null)
+        {
+            // ALF-11036 fix, if authority argument is omitted the tasks for the current user should be returned.
+            authority = authenticationService.getCurrentUserName();
+        }
+        
+        // state is also not included into filters list, for the same reason
+        WorkflowTaskState state = getState(req);
+        
+        // look for a workflow instance id
+        String workflowInstanceId = params.get(VAR_WORKFLOW_INSTANCE_ID);
+        
+        // determine if pooledTasks should be included, when appropriate i.e. when an authority is supplied
+        Boolean pooledTasksOnly = getPooledTasks(req);
+        
+        // get list of properties to include in the response
+        List<String> properties = getProperties(req);
+        
+        // get filter param values
+        filters.put(PARAM_PRIORITY, req.getParameter(PARAM_PRIORITY));
+        filters.put(PARAM_PROPERTY, req.getParameter(PARAM_PROPERTY));
+        processDateFilter(req, PARAM_DUE_BEFORE, filters);
+        processDateFilter(req, PARAM_DUE_AFTER, filters);
+        
+        String excludeParam = req.getParameter(PARAM_EXCLUDE);
+        if (excludeParam != null && excludeParam.length() > 0)
+        {
+            filters.put(PARAM_EXCLUDE, new ExcludeFilter(excludeParam));
+        }
+
+        List<WorkflowTask> allTasks;
+
+        if (workflowInstanceId != null)
+        {
+            // a workflow instance id was provided so query for tasks
+            WorkflowTaskQuery taskQuery = new WorkflowTaskQuery();
+            taskQuery.setActive(null);
+            taskQuery.setProcessId(workflowInstanceId);
+            taskQuery.setTaskState(state);
+            taskQuery.setOrderBy(new OrderBy[]{OrderBy.TaskDue_Asc});
+            
+            if (authority != null)
+            {
+                taskQuery.setActorId(authority);
+            }
+            
+            allTasks = workflowService.queryTasks(taskQuery);
+        }
+        else
+        {
+            // default task state to IN_PROGRESS if not supplied
+            if (state == null)
+            {
+                state = WorkflowTaskState.IN_PROGRESS;
+            }
+            
+            // no workflow instance id is present so get all tasks
+            if (authority != null)
+            {
+                List<WorkflowTask> tasks = workflowService.getAssignedTasks(authority, state, true);
+                List<WorkflowTask> pooledTasks = workflowService.getPooledTasks(authority, true);
+                if (pooledTasksOnly != null)
+                {
+                    if (pooledTasksOnly.booleanValue())
+                    {
+                        // only return pooled tasks the user can claim
+                        allTasks = new ArrayList<WorkflowTask>(pooledTasks.size());
+                        allTasks.addAll(pooledTasks);
+                    }
+                    else
+                    {
+                        // only return tasks assigned to the user
+                        allTasks = new ArrayList<WorkflowTask>(tasks.size());
+                        allTasks.addAll(tasks);
+                    }
+                }
+                else
+                {
+                    // include both assigned and unassigned tasks
+                    allTasks = new ArrayList<WorkflowTask>(tasks.size() + pooledTasks.size());
+                    allTasks.addAll(tasks);
+                    allTasks.addAll(pooledTasks);
+                }
+                
+                // sort tasks by due date
+                Collections.sort(allTasks, taskComparator);
+            }
+            else
+            {
+                // authority was not provided -> return all active tasks in the system
+                WorkflowTaskQuery taskQuery = new WorkflowTaskQuery();
+                taskQuery.setTaskState(state);
+                taskQuery.setActive(null);
+                taskQuery.setOrderBy(new OrderBy[] { OrderBy.TaskDue_Asc });
+                allTasks = workflowService.queryTasks(taskQuery);
+            }
+        }
+        
+        int maxItems = getIntParameter(req, PARAM_MAX_ITEMS, DEFAULT_MAX_ITEMS);
+        int skipCount = getIntParameter(req, PARAM_SKIP_COUNT, DEFAULT_SKIP_COUNT);
+        int totalCount = 0;
+        ArrayList<Map<String, Object>> results = new ArrayList<Map<String, Object>>();
+        
+        // Filter results
+        for (WorkflowTask task : allTasks)
+        {
+            if (matches(task, filters))
+            {
+                // Total-count needs to be based on matching tasks only, so we can't just use allTasks.size() for this
+                totalCount++;
+                if(totalCount > skipCount && (maxItems < 0 || maxItems > results.size()))
+                {
+                    // Only build the actual detail if it's in the range of items we need. This will
+                    // drastically improve performance over paging after building the model
+                    results.add(modelBuilder.buildSimple(task, properties));
+                }
+            }
+        }
+        
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("taskInstances", results);
+        
+        if (maxItems != DEFAULT_MAX_ITEMS || skipCount != DEFAULT_SKIP_COUNT)
+        {
+            // maxItems or skipCount parameter was provided so we need to include paging into response
+            model.put("paging", ModelUtil.buildPaging(totalCount, maxItems == DEFAULT_MAX_ITEMS ? totalCount : maxItems, skipCount));
+        }
+        
+        // create and return results, paginated if necessary
+        return model;
+    }
+
+    /**
+     * Retrieves the list of property names to include in the response.
+     * 
+     * @param req The WebScript request
+     * @return List of property names
+     */
+    private List<String> getProperties(WebScriptRequest req)
+    {
+        String propertiesStr = req.getParameter(PARAM_PROPERTIES);
+        if (propertiesStr != null)
+        {
+            return Arrays.asList(propertiesStr.split(","));
+        }
+        return null;
+    }
+    
+    /**
+     * Retrieves the pooledTasks parameter.
+     * 
+     * @param req The WebScript request
+     * @return null if not present, Boolean object otherwise
+     */
+    private Boolean getPooledTasks(WebScriptRequest req)
+    {
+        Boolean result = null;
+        String includePooledTasks = req.getParameter(PARAM_POOLED_TASKS);
+        
+        if (includePooledTasks != null)
+        {
+            result = Boolean.valueOf(includePooledTasks);
+        }
+        
+        return result;
+    }
+    
+    /**
+     * Gets the specified {@link WorkflowTaskState}, null if not requested
+     * 
+     * @param req WebScriptRequest
+     * @return WorkflowTaskState
+     */
+    private WorkflowTaskState getState(WebScriptRequest req)
+    {
+        String stateName = req.getParameter(PARAM_STATE);
+        if (stateName != null)
+        {
+            try
+            {
+                return WorkflowTaskState.valueOf(stateName.toUpperCase());
+            }
+            catch (IllegalArgumentException e)
+            {
+                String msg = "Unrecognised State parameter: " + stateName;
+                throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, msg);
+            }
+        }
+        
+        return null;
+    }
+
+    /**
+     * Returns the specified authority. If no authority is specified then returns the current Fully Authenticated user.
+     * @param req WebScriptRequest
+     * @return String
+     */
+    private String getAuthority(WebScriptRequest req)
+    {
+        String authority = req.getParameter(PARAM_AUTHORITY);
+        if (authority == null || authority.length() == 0)
+        {
+            authority = null;
+        }
+        return authority;
+    }
+
+    /**
+     * Determine if the given task should be included in the response.
+     * 
+     * @param task The task to check
+     * @param filters The list of filters the task must match to be included
+     * @return true if the task matches and should therefore be returned
+     */
+    private boolean matches(WorkflowTask task, Map<String, Object> filters)
+    {
+        // by default we assume that workflow task should be included
+        boolean result = true;
+
+        for (String key : filters.keySet())
+        {
+            Object filterValue = filters.get(key);
+
+            // skip null filters (null value means that filter was not specified)
+            if (filterValue != null)
+            {
+                if (key.equals(PARAM_EXCLUDE))
+                {
+                    ExcludeFilter excludeFilter = (ExcludeFilter)filterValue;
+                    String type = task.getDefinition().getMetadata().getName().toPrefixString(this.namespaceService);
+                    if (excludeFilter.isMatch(type))
+                    {
+                        result = false;
+                        break;
+                    }
+                }
+                else if (key.equals(PARAM_DUE_BEFORE))
+                {
+                    Date dueDate = (Date)task.getProperties().get(WorkflowModel.PROP_DUE_DATE);
+
+                    if (!isDateMatchForFilter(dueDate, filterValue, true))
+                    {
+                        result = false;
+                        break;
+                    }
+                }
+                else if (key.equals(PARAM_DUE_AFTER))
+                {
+                    Date dueDate = (Date)task.getProperties().get(WorkflowModel.PROP_DUE_DATE);
+
+                    if (!isDateMatchForFilter(dueDate, filterValue, false))
+                    {
+                        result = false;
+                        break;
+                    }
+                }
+                else if (key.equals(PARAM_PRIORITY))
+                {
+                    if (!filterValue.equals(task.getProperties().get(WorkflowModel.PROP_PRIORITY).toString()))
+                    {
+                        result = false;
+                        break;
+                    }
+                }
+                else if(key.equals(PARAM_PROPERTY))
+                {
+                    int propQNameEnd = filterValue.toString().indexOf('/');
+                    if (propQNameEnd < 1)
+                    {
+                        if (LOGGER.isDebugEnabled())
+                        {
+                            LOGGER.debug("Ignoring invalid property filter:" + filterValue.toString());
+                        }
+                        break;
+                    }
+                    String propValue = filterValue.toString().substring(propQNameEnd + 1);
+                    if (propValue.isEmpty())
+                    {
+                        if (LOGGER.isDebugEnabled())
+                        {
+                            LOGGER.debug("Ignoring empty property value filter [" + propValue + "]");
+                        }
+                        break;
+                    }
+                    String propQNameStr = filterValue.toString().substring(0, propQNameEnd);
+                    QName propertyQName;
+                    try
+                    {
+                        propertyQName = QName.createQName(propQNameStr, namespaceService);
+                    }
+                    catch (Exception ex)
+                    {
+                        if (LOGGER.isDebugEnabled())
+                        {
+                            LOGGER.debug("Ignoring invalid QName property filter [" + propQNameStr + "]");
+                        }
+                        break;
+                    }
+                    if (LOGGER.isDebugEnabled())
+                    {
+                        LOGGER.debug("Filtering with property [" + propertyQName.toPrefixString(namespaceService) + "=" + propValue + "]");
+                    }
+                    Serializable value = task.getProperties().get(propertyQName);
+                    if (value != null && !value.equals(propValue))
+                    {
+                        result = false;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Comparator to sort workflow tasks by due date in ascending order.
+     */
+    class WorkflowTaskDueAscComparator implements Comparator<WorkflowTask>
+    {
+        @Override
+        public int compare(WorkflowTask o1, WorkflowTask o2)
+        {
+            Date date1 = (Date)o1.getProperties().get(WorkflowModel.PROP_DUE_DATE);
+            Date date2 = (Date)o2.getProperties().get(WorkflowModel.PROP_DUE_DATE);
+            
+            long time1 = date1 == null ? Long.MAX_VALUE : date1.getTime();
+            long time2 = date2 == null ? Long.MAX_VALUE : date2.getTime();
+            
+            long result = time1 - time2;
+            
+            return (result > 0) ? 1 : (result < 0 ? -1 : 0);
+        }
+        
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowDefinitionGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowDefinitionGet.java
new file mode 100644
index 00000000000..330724eda44
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowDefinitionGet.java
@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.cmr.workflow.WorkflowDefinition;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript impelementation to return the latest version of a workflow
+ * definition.
+ * 
+ * @author Frederik Heremans
+ * @since 3.4.e
+ */
+public class WorkflowDefinitionGet extends AbstractWorkflowWebscript
+{
+    private static final String PARAM_WORKFLOW_DEFINITION_ID = "workflowDefinitionId";
+
+    @Override
+    protected Map<String, Object> buildModel(WorkflowModelBuilder modelBuilder, WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+
+        // Get the definition id from the params
+        String workflowDefinitionId = params.get(PARAM_WORKFLOW_DEFINITION_ID);
+        
+        WorkflowDefinition workflowDefinition = workflowService.getDefinitionById(workflowDefinitionId);
+
+        // Workflow definition is not found, 404
+        if (workflowDefinition == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, 
+                        "Unable to find workflow definition with id: " + workflowDefinitionId);
+        }
+        
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("workflowDefinition", modelBuilder.buildDetailed(workflowDefinition));
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowDefinitionsGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowDefinitionsGet.java
new file mode 100644
index 00000000000..6d68efe6a56
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowDefinitionsGet.java
@@ -0,0 +1,76 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.workflow.WorkflowDefinition;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Webscript impelementation to return the latest version of all deployed
+ * workflow definitions.
+ * 
+ * @author Gavin Cornwell
+ * @author Nick Smith
+ * @since 3.4
+ */
+public class WorkflowDefinitionsGet extends AbstractWorkflowWebscript
+{
+    @Override
+    protected Map<String, Object> buildModel(WorkflowModelBuilder modelBuilder, WebScriptRequest req, Status status, Cache cache)
+    {
+        ExcludeFilter excludeFilter = null;
+        String excludeParam = req.getParameter(PARAM_EXCLUDE);
+        if (excludeParam != null && excludeParam.length() > 0)
+        {
+            excludeFilter = new ExcludeFilter(excludeParam);
+        }
+        
+        // list all workflow's definitions simple representation
+        List<WorkflowDefinition> workflowDefinitions = workflowService.getDefinitions();            
+            
+        ArrayList<Map<String, Object>> results = new ArrayList<Map<String, Object>>();
+        
+        for (WorkflowDefinition workflowDefinition : workflowDefinitions)            
+        {
+            // if present, filter out excluded definitions
+            if (excludeFilter == null || !excludeFilter.isMatch(workflowDefinition.getName()))
+            {
+                results.add(modelBuilder.buildSimple(workflowDefinition));
+            }
+        }
+        
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("workflowDefinitions", results);
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDelete.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDelete.java
new file mode 100644
index 00000000000..dded581f7a5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDelete.java
@@ -0,0 +1,171 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.workflow.WorkflowConstants;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.workflow.WorkflowInstance;
+import org.alfresco.service.cmr.workflow.WorkflowTask;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Web Script implementation of delete or cancel workflow instance.
+ * 
+ * @author Gavin Cornwell
+ * @since 3.4
+ */
+public class WorkflowInstanceDelete extends AbstractWorkflowWebscript
+{
+    public static final String PARAM_FORCED = "forced";
+    
+    @Override
+    protected Map<String, Object> buildModel(WorkflowModelBuilder modelBuilder, WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+
+        // getting workflow instance id from request parameters
+        String workflowInstanceId = params.get("workflow_instance_id");
+        
+        // determine if instance should be cancelled or deleted
+        boolean forced = getForced(req);
+
+        if (canUserEndWorkflow(workflowInstanceId))
+        {
+            if (forced)
+            {
+                workflowService.deleteWorkflow(workflowInstanceId);
+            }
+            else
+            {
+                workflowService.cancelWorkflow(workflowInstanceId);
+            }
+            
+            return null;
+        }
+        else
+        {
+            throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "Failed to " + 
+                        (forced ? "delete" : "cancel") + " workflow instance with id: " + workflowInstanceId);
+        }
+    }
+    
+    private boolean getForced(WebScriptRequest req)
+    {
+        String forced = req.getParameter(PARAM_FORCED);
+        if (forced != null)
+        {
+            try
+            {
+                return Boolean.valueOf(forced);
+            }
+            catch (Exception e)
+            {
+                // do nothing, false will be returned
+            }
+        }
+
+        // Defaults to false.
+        return false;
+    }
+    
+    /**
+     * Determines if the current user can cancel or delete the
+     * workflow instance with the given id. Throws a WebscriptException
+     * with status-code 404 if workflow-instance to delete wasn't found.
+     * 
+     * @param instanceId The id of the workflow instance to check
+     * @return true if the user can end the workflow, false otherwise
+     */
+    private boolean canUserEndWorkflow(String instanceId)
+    {
+        boolean canEnd = false;
+        
+        // get the initiator
+        WorkflowInstance wi = workflowService.getWorkflowById(instanceId);  
+        
+        if (wi == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, 
+                        "The workflow instance to delete/cancel with id " + instanceId + " doesn't exist: ");
+        }
+        
+        String currentUserName = authenticationService.getCurrentUserName();
+        
+        // ALF-17405: Admin can always delete/cancel workflows, regardless of the initiator
+        if(authorityService.isAdminAuthority(currentUserName))
+        {
+            canEnd = true;
+        }
+        else
+        {
+            String ownerName = null;
+            // Determine if the current user is the initiator of the workflow.
+            // Get the username of the initiator.
+            NodeRef initiator = wi.getInitiator();
+            if (initiator != null && nodeService.exists(initiator))
+            {
+                ownerName = (String) nodeService.getProperty(initiator, ContentModel.PROP_USERNAME);
+            }
+            else
+            {
+                /*
+                 * Fix for MNT-14411 : Re-created user can't cancel created task.
+                 * If owner value can't be found on workflow properties
+                 * because initiator nodeRef no longer exists get owner from
+                 * initiatorhome nodeRef owner property.
+                 */
+                WorkflowTask startTask = workflowService.getStartTask(wi.getId());
+                Map<QName, Serializable> props = startTask.getProperties();
+                ownerName = (String) props.get(ContentModel.PROP_OWNER);
+                if (ownerName == null)
+                {
+                    NodeRef initiatorHomeNodeRef = (NodeRef) props.get(QName.createQName("", WorkflowConstants.PROP_INITIATOR_HOME));
+                    if (initiatorHomeNodeRef != null)
+                    {
+                        ownerName = (String) nodeService.getProperty(initiatorHomeNodeRef, ContentModel.PROP_OWNER);
+                    }
+                }
+            }
+
+            // if the current user started the workflow allow the cancel action
+            if (currentUserName.equals(ownerName))
+            {
+                canEnd = true;
+            }
+        }
+        return canEnd;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDiagramGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDiagramGet.java
new file mode 100644
index 00000000000..74d979e548b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDiagramGet.java
@@ -0,0 +1,92 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.web.scripts.content.StreamContent;
+import org.alfresco.service.cmr.workflow.WorkflowInstance;
+import org.alfresco.service.cmr.workflow.WorkflowService;
+import org.alfresco.util.TempFileProvider;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.util.FileCopyUtils;
+
+/**
+ * Java backed implementation for REST API to retrieve a diagram of a workflow instance.
+ * 
+ * @author Gavin Cornwell
+ * @since 4.0
+ */
+public class WorkflowInstanceDiagramGet extends StreamContent
+{
+    protected WorkflowService workflowService;
+    
+    public void setWorkflowService(WorkflowService workflowService)
+    {
+        this.workflowService = workflowService;
+    }
+    
+    @Override
+    public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+
+        // getting workflow instance id from request parameters
+        String workflowInstanceId = params.get("workflow_instance_id");
+        
+        WorkflowInstance workflowInstance = workflowService.getWorkflowById(workflowInstanceId);
+
+        // workflow instance was not found -> return 404
+        if (workflowInstance == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find workflow instance with id: " + workflowInstanceId);
+        }
+        
+        // check whether there is a diagram available
+        if (!workflowService.hasWorkflowImage(workflowInstanceId))
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find diagram for workflow instance with id: " + workflowInstanceId);
+        }
+        
+        // copy image data into temporary file
+        File file = TempFileProvider.createTempFile("workflow-diagram-", ".png");
+        InputStream imageData = workflowService.getWorkflowImage(workflowInstanceId);
+        OutputStream os = new FileOutputStream(file);
+        FileCopyUtils.copy(imageData, os);
+        
+        // stream temporary file back to client
+        streamContent(req, res, file);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceGet.java
new file mode 100644
index 00000000000..ca38929f626
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceGet.java
@@ -0,0 +1,91 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.cmr.workflow.WorkflowInstance;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ * @since 3.4
+ */
+public class WorkflowInstanceGet extends AbstractWorkflowWebscript
+{
+    public static final String PARAM_INCLUDE_TASKS = "includeTasks";
+
+    @Override
+    protected Map<String, Object> buildModel(WorkflowModelBuilder modelBuilder, WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+
+        // getting workflow instance id from request parameters
+        String workflowInstanceId = params.get("workflow_instance_id");
+
+        boolean includeTasks = getIncludeTasks(req);
+
+        WorkflowInstance workflowInstance = workflowService.getWorkflowById(workflowInstanceId);
+
+        // task was not found -> return 404
+        if (workflowInstance == null)
+        {
+            throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find workflow instance with id: " + workflowInstanceId);
+        }
+
+        Map<String, Object> model = new HashMap<String, Object>();
+        // build the model for ftl
+        model.put("workflowInstance", modelBuilder.buildDetailed(workflowInstance, includeTasks));
+
+        return model;
+    }
+
+    private boolean getIncludeTasks(WebScriptRequest req)
+    {
+        String includeTasks = req.getParameter(PARAM_INCLUDE_TASKS);
+        if (includeTasks != null)
+        {
+            try
+            {
+                return Boolean.valueOf(includeTasks);
+            }
+            catch (Exception e)
+            {
+                // do nothing, false will be returned
+            }
+        }
+
+        // Defaults to false.
+        return false;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesForNodeGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesForNodeGet.java
new file mode 100644
index 00000000000..736dcdfb666
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesForNodeGet.java
@@ -0,0 +1,74 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.workflow.WorkflowInstance;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * @author unknown
+ * @since 3.4
+ */
+public class WorkflowInstancesForNodeGet extends AbstractWorkflowWebscript
+{
+
+    public static final String PARAM_STORE_TYPE = "store_type";
+    public static final String PARAM_STORE_ID = "store_id";
+    public static final String PARAM_NODE_ID = "id";
+
+    @Override
+    protected Map<String, Object> buildModel(WorkflowModelBuilder modelBuilder, WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+
+        // get nodeRef from request
+        NodeRef nodeRef = new NodeRef(params.get(PARAM_STORE_TYPE), params.get(PARAM_STORE_ID), params.get(PARAM_NODE_ID));
+
+        // list all active workflows for nodeRef
+        List<WorkflowInstance> workflows = workflowService.getWorkflowsForContent(nodeRef, true);
+        
+        List<Map<String, Object>> results = new ArrayList<Map<String, Object>>(workflows.size());
+
+        for (WorkflowInstance workflow : workflows)
+        {
+            results.add(modelBuilder.buildSimple(workflow));
+        }
+
+        Map<String, Object> model = new HashMap<String, Object>();
+        // build the model for ftl
+        model.put("workflowInstances", results);
+
+        return model;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java
new file mode 100644
index 00000000000..6fda9458250
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstancesGet.java
@@ -0,0 +1,292 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.workflow.WorkflowModel;
+import org.alfresco.service.cmr.workflow.WorkflowDefinition;
+import org.alfresco.service.cmr.workflow.WorkflowInstance;
+import org.alfresco.service.cmr.workflow.WorkflowInstanceQuery;
+import org.alfresco.service.cmr.workflow.WorkflowInstanceQuery.DatePosition;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.util.StringUtils;
+
+/**
+ * Java backed implementation for REST API to retrieve workflow instances.
+ * 
+ * @author Gavin Cornwell
+ * @since 3.4
+ */
+public class WorkflowInstancesGet extends AbstractWorkflowWebscript
+{
+    public static final String PARAM_STATE = "state";
+    public static final String PARAM_INITIATOR = "initiator";
+    public static final String PARAM_PRIORITY = "priority";
+    public static final String PARAM_DUE_BEFORE = "dueBefore";
+    public static final String PARAM_DUE_AFTER = "dueAfter";
+    public static final String PARAM_STARTED_BEFORE = "startedBefore";
+    public static final String PARAM_STARTED_AFTER = "startedAfter";
+    public static final String PARAM_COMPLETED_BEFORE = "completedBefore";
+    public static final String PARAM_COMPLETED_AFTER = "completedAfter";
+    public static final String PARAM_DEFINITION_NAME = "definitionName";
+    public static final String PARAM_DEFINITION_ID = "definitionId";
+    public static final String VAR_DEFINITION_ID = "workflow_definition_id";
+    
+    public static final QName QNAME_INITIATOR = QName.createQName(NamespaceService.DEFAULT_URI, "initiator");
+
+    private WorkflowInstanceDueAscComparator workflowComparator = new WorkflowInstanceDueAscComparator();
+
+    @Override
+    protected Map<String, Object> buildModel(WorkflowModelBuilder modelBuilder, WebScriptRequest req, Status status, Cache cache)
+    {
+        WorkflowInstanceQuery workflowInstanceQuery = new WorkflowInstanceQuery();
+
+        Map<String, String> params = req.getServiceMatch().getTemplateVars();
+
+        // state is not included into filters list as it will be taken into account before filtering
+        WorkflowState state = getState(req);
+        
+        // get filter param values
+        Map<QName, Object> filters = new HashMap<QName, Object>(9);
+
+        if (req.getParameter(PARAM_INITIATOR) != null)
+            filters.put(QNAME_INITIATOR, personService.getPerson(req.getParameter(PARAM_INITIATOR)));
+
+        if (req.getParameter(PARAM_PRIORITY) != null)
+            filters.put(WorkflowModel.PROP_WORKFLOW_PRIORITY, req.getParameter(PARAM_PRIORITY));
+        
+        String excludeParam = req.getParameter(PARAM_EXCLUDE);
+        if (excludeParam != null && excludeParam.length() > 0)
+        {
+            workflowInstanceQuery.setExcludedDefinitions(Arrays.asList(StringUtils.tokenizeToStringArray(excludeParam, ",")));
+        }
+        
+        // process all the date related parameters
+        Map<DatePosition, Date> dateParams = new HashMap<DatePosition, Date>();
+        Date dueBefore = getDateFromRequest(req, PARAM_DUE_BEFORE);
+        if (dueBefore != null)
+        {
+            dateParams.put(DatePosition.BEFORE, dueBefore);
+        }
+        Date dueAfter = getDateFromRequest(req, PARAM_DUE_AFTER);
+        if (dueAfter != null)
+        {
+            dateParams.put(DatePosition.AFTER, dueAfter);
+        }
+        if (dateParams.isEmpty())
+        {
+            if (req.getParameter(PARAM_DUE_BEFORE) != null || req.getParameter(PARAM_DUE_AFTER) != null)
+            {
+                filters.put(WorkflowModel.PROP_WORKFLOW_DUE_DATE, null);
+            }
+        }
+        else
+        {
+            filters.put(WorkflowModel.PROP_WORKFLOW_DUE_DATE, dateParams);
+        }
+                    
+        workflowInstanceQuery.setStartBefore(getDateFromRequest(req, PARAM_STARTED_BEFORE));
+        workflowInstanceQuery.setStartAfter(getDateFromRequest(req, PARAM_STARTED_AFTER));
+        workflowInstanceQuery.setEndBefore(getDateFromRequest(req, PARAM_COMPLETED_BEFORE));
+        workflowInstanceQuery.setEndAfter(getDateFromRequest(req, PARAM_COMPLETED_AFTER));
+
+        // determine if there is a definition id to filter by
+        String workflowDefinitionId = params.get(VAR_DEFINITION_ID);
+        if (workflowDefinitionId == null)
+        {
+            workflowDefinitionId = req.getParameter(PARAM_DEFINITION_ID);
+        }
+                    
+        // default workflow state to ACTIVE if not supplied
+        if (state == null)
+        {
+            state = WorkflowState.ACTIVE;
+        }
+
+        workflowInstanceQuery.setActive(state == WorkflowState.ACTIVE);
+        workflowInstanceQuery.setCustomProps(filters);
+
+        List<WorkflowInstance> workflows = new ArrayList<WorkflowInstance>();
+        
+        int total = 0;
+        // MNT-9074 My Tasks fails to render if tasks quantity is excessive
+        int maxItems = getIntParameter(req, PARAM_MAX_ITEMS, DEFAULT_MAX_ITEMS);
+        int skipCount = getIntParameter(req, PARAM_SKIP_COUNT, DEFAULT_SKIP_COUNT);
+
+        if (workflowDefinitionId == null && req.getParameter(PARAM_DEFINITION_NAME) != null)
+        {
+            /**
+             * If we are searching by workflow definition name then there may be many workflow definition instances.
+             */
+            int workingSkipCount = skipCount;
+            
+            /**
+             * Yes there could be multiple process definitions with that definition name
+             */
+            String definitionName = req.getParameter(PARAM_DEFINITION_NAME);
+  
+            List<WorkflowDefinition> defs = workflowService.getAllDefinitionsByName(definitionName);
+            
+            int itemsToQuery = maxItems;
+            
+            for(WorkflowDefinition def : defs)
+            {
+                workflowDefinitionId = def.getId();
+                workflowInstanceQuery.setWorkflowDefinitionId(workflowDefinitionId);
+                if(maxItems < 0 || itemsToQuery > 0)
+                {               
+                    workflows.addAll(workflowService.getWorkflows(workflowInstanceQuery, itemsToQuery, workingSkipCount));
+                }
+                if(maxItems > 0)
+                {
+                    itemsToQuery = maxItems - workflows.size();
+                }
+                
+                total += (int) workflowService.countWorkflows(workflowInstanceQuery);
+                
+                if(workingSkipCount > 0)
+                {
+                    workingSkipCount = skipCount - total;
+                    
+                    if(workingSkipCount < 0)
+                    {
+                        workingSkipCount = 0;
+                    }
+                }
+            }
+        }
+        else
+        {
+            /**
+             * This is the old single task implementation
+             */
+            if (workflowDefinitionId != null)
+            {
+                workflowInstanceQuery.setWorkflowDefinitionId(workflowDefinitionId);
+            }
+            workflows.addAll(workflowService.getWorkflows(workflowInstanceQuery, maxItems, skipCount));
+        
+            total = (int) workflowService.countWorkflows(workflowInstanceQuery);
+        }
+        
+        List<Map<String, Object>> results = new ArrayList<Map<String, Object>>(total);
+        
+        // init empty list 
+        results.addAll(Arrays.asList((Map<String, Object>[]) new Map[total]));
+
+        for (WorkflowInstance workflow : workflows)
+        {
+            // set to special index
+            results.set(skipCount, modelBuilder.buildSimple(workflow));
+            
+            skipCount++;
+        }
+        
+        // create and return results, paginated if necessary
+        return createResultModel(req, "workflowInstances", results);
+    }
+    
+    /**
+     * Gets the specified {@link WorkflowState}, null if not requested.
+     * 
+     * @param req The WebScript request
+     * @return The workflow state or null if not requested
+     */
+    private WorkflowState getState(WebScriptRequest req)
+    {
+        String stateName = req.getParameter(PARAM_STATE);
+        if (stateName != null)
+        {
+            try
+            {
+                return WorkflowState.valueOf(stateName.toUpperCase());
+            }
+            catch (IllegalArgumentException e)
+            {
+                String msg = "Unrecognised State parameter: " + stateName;
+                throw new WebScriptException(HttpServletResponse.SC_BAD_REQUEST, msg);
+            }
+        }
+        
+        return null;
+    }
+
+    // enum to represent workflow states
+    private enum WorkflowState
+    {
+        ACTIVE, COMPLETED;
+    }
+
+    private Date getDateFromRequest(WebScriptRequest req, String paramName)
+    {
+        String dateParam = req.getParameter(paramName);
+        if (dateParam != null)
+        {
+            if (!EMPTY.equals(dateParam) && !NULL.equals(dateParam))
+            {
+                return getDateParameter(req, paramName);
+            }
+        }
+
+        return null;
+    }
+    
+    /**
+     * Comparator to sort workflow instances by due date in ascending order.
+     */
+    class WorkflowInstanceDueAscComparator implements Comparator<WorkflowInstance>
+    {
+        @Override
+        public int compare(WorkflowInstance o1, WorkflowInstance o2)
+        {
+            Date date1 = o1.getDueDate();
+            Date date2 = o2.getDueDate();
+            
+            long time1 = date1 == null ? Long.MAX_VALUE : date1.getTime();
+            long time2 = date2 == null ? Long.MAX_VALUE : date2.getTime();
+            
+            long result = time1 - time2;
+            
+            return (result > 0) ? 1 : (result < 0 ? -1 : 0);
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java
new file mode 100644
index 00000000000..e2b3e3d2d21
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java
@@ -0,0 +1,732 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.dictionary.constraint.ListOfValuesConstraint;
+import org.alfresco.repo.workflow.WorkflowModel;
+import org.alfresco.repo.workflow.WorkflowQNameConverter;
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.cmr.dictionary.Constraint;
+import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.workflow.WorkflowDefinition;
+import org.alfresco.service.cmr.workflow.WorkflowInstance;
+import org.alfresco.service.cmr.workflow.WorkflowNode;
+import org.alfresco.service.cmr.workflow.WorkflowPath;
+import org.alfresco.service.cmr.workflow.WorkflowService;
+import org.alfresco.service.cmr.workflow.WorkflowTask;
+import org.alfresco.service.cmr.workflow.WorkflowTaskDefinition;
+import org.alfresco.service.cmr.workflow.WorkflowTaskQuery;
+import org.alfresco.service.cmr.workflow.WorkflowTaskState;
+import org.alfresco.service.cmr.workflow.WorkflowTransition;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.alfresco.util.collections.CollectionUtils;
+import org.alfresco.util.collections.Function;
+import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.extensions.surf.util.ISO8601DateFormat;
+
+/**
+ * @author Nick Smith
+ * @since 3.4
+ */
+public class WorkflowModelBuilder
+{
+    public static final String PERSON_LAST_NAME = "lastName";
+    public static final String PERSON_FIRST_NAME = "firstName";
+    public static final String PERSON_USER_NAME = "userName";
+    public static final String PERSON_AVATAR = "avatarUrl";
+
+    public static final String TASK_PROPERTIES = "properties";
+    public static final String TASK_PROPERTIY_LABELS = "propertyLabels";
+    public static final String TASK_OWNER = "owner";
+    public static final String TASK_CREATOR = "creator";
+    public static final String TASK_STATE = "state";
+    public static final String TASK_DESCRIPTION = "description";
+    public static final String TASK_TITLE = "title";
+    public static final String TASK_NAME = "name";
+    public static final String TASK_URL = "url";
+    public static final String TASK_IS_POOLED = "isPooled";
+    public static final String TASK_IS_EDITABLE = "isEditable";
+    public static final String TASK_IS_REASSIGNABLE = "isReassignable";
+    public static final String TASK_IS_CLAIMABLE = "isClaimable";
+    public static final String TASK_IS_RELEASABLE = "isReleasable";
+    public static final String TASK_ID = "id";
+    public static final String TASK_PATH = "path";
+    public static final String TASK_DEFINITION = "definition";
+    public static final String TASK_OUTCOME = "outcome";
+
+    public static final String TASK_DEFINITION_ID = "id";
+    public static final String TASK_DEFINITION_URL = "url";
+    public static final String TASK_DEFINITION_TYPE = "type";
+    public static final String TASK_DEFINITION_NODE = "node";
+
+    public static final String TASK_WORKFLOW_INSTANCE = "workflowInstance";
+    
+    public static final String TASK_WORKFLOW_INSTANCE_ID = "id";
+    public static final String TASK_WORKFLOW_INSTANCE_URL = "url";
+    public static final String TASK_WORKFLOW_INSTANCE_NAME = "name";
+    public static final String TASK_WORKFLOW_INSTANCE_TITLE = "title";
+    public static final String TASK_WORKFLOW_INSTANCE_DESCRIPTION = "description";
+    public static final String TASK_WORKFLOW_INSTANCE_MESSAGE = "message";
+    public static final String TASK_WORKFLOW_INSTANCE_IS_ACTIVE = "isActive";
+    public static final String TASK_WORKFLOW_INSTANCE_START_DATE = "startDate";
+    public static final String TASK_WORKFLOW_INSTANCE_DUE_DATE = "dueDate";
+    public static final String TASK_WORKFLOW_INSTANCE_END_DATE = "endDate";
+    public static final String TASK_WORKFLOW_INSTANCE_PRIORITY = "priority";
+    public static final String TASK_WORKFLOW_INSTANCE_INITIATOR = "initiator";
+    public static final String TASK_WORKFLOW_INSTANCE_CONTEXT = "context";
+    public static final String TASK_WORKFLOW_INSTANCE_PACKAGE = "package";
+    public static final String TASK_WORKFLOW_INSTANCE_START_TASK_INSTANCE_ID = "startTaskInstanceId";
+    public static final String TASK_WORKFLOW_INSTANCE_DEFINITION = "definition";
+    public static final String TASK_WORKFLOW_INSTANCE_TASKS = "tasks";
+    public static final String TASK_WORKFLOW_INSTANCE_DEFINITION_URL = "definitionUrl";
+    public static final String TASK_WORKFLOW_INSTANCE_DIAGRAM_URL = "diagramUrl";
+
+    public static final String TASK_WORKFLOW_INSTANCE_INITIATOR_USERNAME = "userName";
+    public static final String TASK_WORKFLOW_INSTANCE_INITIATOR_FIRSTNAME = "firstName";
+    public static final String TASK_WORKFLOW_INSTANCE_INITIATOR_LASTNAME = "lastName";
+    
+    public static final String TYPE_DEFINITION_NAME = "name";
+    public static final String TYPE_DEFINITION_TITLE = "title";
+    public static final String TYPE_DEFINITION_DESCRIPTION = "description";
+    public static final String TYPE_DEFINITION_URL = "url";
+
+    public static final String WORKFLOW_NODE_NAME = "name";
+    public static final String WORKFLOW_NODE_TITLE = "title";
+    public static final String WORKFLOW_NODE_DESCRIPTION = "description";
+    public static final String WORKFLOW_NODE_IS_TASK_NODE = "isTaskNode";
+    public static final String WORKFLOW_NODE_TRANSITIONS = "transitions";
+
+    public static final String WORKFLOW_NODE_TRANSITION_ID = "id";
+    public static final String WORKFLOW_NODE_TRANSITION_TITLE = "title";
+    public static final String WORKFLOW_NODE_TRANSITION_DESCRIPTION = "description";
+    public static final String WORKFLOW_NODE_TRANSITION_IS_DEFAULT = "isDefault";
+    public static final String WORKFLOW_NODE_TRANSITION_IS_HIDDEN = "isHidden";
+
+    public static final String WORKFLOW_DEFINITION_ID = "id";
+    public static final String WORKFLOW_DEFINITION_URL = "url";
+    public static final String WORKFLOW_DEFINITION_NAME = "name";
+    public static final String WORKFLOW_DEFINITION_TITLE = "title";
+    public static final String WORKFLOW_DEFINITION_DESCRIPTION = "description";
+    public static final String WORKFLOW_DEFINITION_VERSION = "version";
+    public static final String WORKFLOW_DEFINITION_START_TASK_DEFINITION_URL = "startTaskDefinitionUrl";
+    public static final String WORKFLOW_DEFINITION_START_TASK_DEFINITION_TYPE = "startTaskDefinitionType";
+    public static final String WORKFLOW_DEFINITION_TASK_DEFINITIONS = "taskDefinitions";
+    
+    public static final String TASK_OUTCOME_MESSAGE_PREFIX = "workflowtask.outcome.";
+
+    private final NodeService nodeService;
+    private final PersonService personService;
+    private final WorkflowService workflowService;
+    private final DictionaryService dictionaryService;
+    private final AuthenticationService authenticationService;
+    private final WorkflowQNameConverter qNameConverter;
+    
+    public WorkflowModelBuilder(NamespaceService namespaceService, NodeService nodeService, 
+                AuthenticationService authenticationService, PersonService personService, 
+                WorkflowService workflowService, DictionaryService dictionaryService)
+    {
+        this.nodeService = nodeService;
+        this.personService = personService;
+        this.workflowService = workflowService;
+        this.authenticationService = authenticationService;
+        this.qNameConverter = new WorkflowQNameConverter(namespaceService);
+        this.dictionaryService = dictionaryService;
+    }
+
+    /**
+     * Returns a simple representation of a {@link WorkflowTask}.
+     * @param task The task to be represented.
+     * @param propertyFilters Specify which properties to include.
+     * @return Map
+     */
+    public Map<String, Object> buildSimple(WorkflowTask task, Collection<String> propertyFilters)
+    {
+        // get current username
+        String currentUser = this.authenticationService.getCurrentUserName();
+        
+        HashMap<String, Object> model = new HashMap<String, Object>();
+        model.put(TASK_ID, task.getId());
+        model.put(TASK_URL, getUrl(task));
+        model.put(TASK_NAME, task.getName());
+        model.put(TASK_TITLE, task.getTitle());
+        model.put(TASK_DESCRIPTION, task.getDescription());
+        model.put(TASK_STATE, task.getState().name());
+        model.put(TASK_PATH, getUrl(task.getPath()));
+        model.put(TASK_OUTCOME, getOutcome(task));
+        model.put(TASK_IS_POOLED, isPooled(task.getProperties()));
+        model.put(TASK_IS_EDITABLE, this.workflowService.isTaskEditable(task, currentUser, false));
+        model.put(TASK_IS_REASSIGNABLE, this.workflowService.isTaskReassignable(task, currentUser, false));
+        model.put(TASK_IS_CLAIMABLE, this.workflowService.isTaskClaimable(task, currentUser, false));
+        model.put(TASK_IS_RELEASABLE, this.workflowService.isTaskReleasable(task, currentUser, false));
+        
+        Serializable owner = task.getProperties().get(ContentModel.PROP_OWNER);
+        model.put(TASK_OWNER, getPersonModel(owner));
+
+        Serializable creator = task.getProperties().get(ContentModel.PROP_CREATOR);
+        model.put(TASK_CREATOR, getPersonModel(creator));
+
+        // task properties
+        Map<String, Object> propertyModel = buildProperties(task, propertyFilters);
+        model.put(TASK_PROPERTIES, propertyModel);
+        model.put(TASK_PROPERTIY_LABELS, buildPropertyLabels(task, propertyModel));
+        
+        // workflow instance part
+        model.put(TASK_WORKFLOW_INSTANCE, buildSimple(task.getPath().getInstance()));
+        
+        return model;
+    }
+
+    /**
+     * Returns a detailed representation of a {@link WorkflowTask}.
+     * @param workflowTask The task to be represented.     
+     * @return Map
+     */
+    public Map<String, Object> buildDetailed(WorkflowTask workflowTask)
+    {
+        Map<String, Object> model = buildSimple(workflowTask, null);
+
+        // definition part
+        model.put(TASK_DEFINITION, buildTaskDefinition(workflowTask.getDefinition(), workflowTask));
+
+        return model;
+    }
+
+    /**
+     * Returns a simple representation of a {@link WorkflowInstance}.
+     * @param workflowInstance The workflow instance to be represented.          
+     * @return Map
+     */
+    public Map<String, Object> buildSimple(WorkflowInstance workflowInstance)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        model.put(TASK_WORKFLOW_INSTANCE_ID, workflowInstance.getId());
+        model.put(TASK_WORKFLOW_INSTANCE_URL, getUrl(workflowInstance));
+        model.put(TASK_WORKFLOW_INSTANCE_NAME, workflowInstance.getDefinition().getName());
+        model.put(TASK_WORKFLOW_INSTANCE_TITLE, workflowInstance.getDefinition().getTitle());
+        model.put(TASK_WORKFLOW_INSTANCE_DESCRIPTION, workflowInstance.getDefinition().getDescription());
+        model.put(TASK_WORKFLOW_INSTANCE_MESSAGE, workflowInstance.getDescription());
+        model.put(TASK_WORKFLOW_INSTANCE_IS_ACTIVE, workflowInstance.isActive());
+        model.put(TASK_WORKFLOW_INSTANCE_PRIORITY, workflowInstance.getPriority());
+        model.put(TASK_WORKFLOW_INSTANCE_DEFINITION_URL, getUrl(workflowInstance.getDefinition()));
+
+        if (workflowInstance.getWorkflowPackage() != null)
+        {
+            model.put(TASK_WORKFLOW_INSTANCE_PACKAGE, workflowInstance.getWorkflowPackage().toString());
+        }
+        
+        if (workflowInstance.getContext() != null)
+        {
+            model.put(TASK_WORKFLOW_INSTANCE_CONTEXT, workflowInstance.getContext().toString());
+        }
+        
+        if (workflowInstance.getStartDate() == null)
+        {
+            model.put(TASK_WORKFLOW_INSTANCE_START_DATE, workflowInstance.getStartDate());
+        }
+        else
+        {
+            model.put(TASK_WORKFLOW_INSTANCE_START_DATE, ISO8601DateFormat.format(workflowInstance.getStartDate()));
+        }
+        
+        if (workflowInstance.getDueDate() == null)
+        {
+            model.put(TASK_WORKFLOW_INSTANCE_DUE_DATE, workflowInstance.getDueDate());
+        }
+        else
+        {
+            model.put(TASK_WORKFLOW_INSTANCE_DUE_DATE, ISO8601DateFormat.format(workflowInstance.getDueDate()));
+        }
+
+        if (workflowInstance.getEndDate() == null)
+        {
+            model.put(TASK_WORKFLOW_INSTANCE_END_DATE, workflowInstance.getEndDate());
+        }
+        else
+        {
+            model.put(TASK_WORKFLOW_INSTANCE_END_DATE, ISO8601DateFormat.format(workflowInstance.getEndDate()));
+        }
+
+        if (workflowInstance.getInitiator() == null || !nodeService.exists(workflowInstance.getInitiator()))
+        {
+            model.put(TASK_WORKFLOW_INSTANCE_INITIATOR, null);
+        }
+        else
+        {
+            model.put(TASK_WORKFLOW_INSTANCE_INITIATOR, getPersonModel(nodeService.getProperty(workflowInstance.getInitiator(), ContentModel.PROP_USERNAME)));
+        }
+
+        return model;
+    }
+    
+    /**
+     * Returns a detailed representation of a {@link WorkflowInstance}.
+     * @param workflowInstance The workflow instance to be represented.
+     * @param includeTasks should we include task in model?     
+     * @return Map
+     */
+    public Map<String, Object> buildDetailed(WorkflowInstance workflowInstance, boolean includeTasks)
+    {
+        Map<String, Object> model = buildSimple(workflowInstance);
+
+        Serializable startTaskId = null;
+        WorkflowTask startTask = workflowService.getStartTask(workflowInstance.getId());
+        if (startTask != null)
+        {
+            startTaskId = startTask.getId();
+        }
+        
+        if (workflowService.hasWorkflowImage(workflowInstance.getId()))
+        {
+            model.put(TASK_WORKFLOW_INSTANCE_DIAGRAM_URL, getDiagramUrl(workflowInstance));
+        }
+        
+        model.put(TASK_WORKFLOW_INSTANCE_START_TASK_INSTANCE_ID, startTaskId);
+        model.put(TASK_WORKFLOW_INSTANCE_DEFINITION, buildDetailed(workflowInstance.getDefinition()));
+
+        if (includeTasks)
+        {
+            // get all tasks for workflow
+            WorkflowTaskQuery tasksQuery = new WorkflowTaskQuery();
+            tasksQuery.setTaskState(null);
+            tasksQuery.setActive(null);
+            tasksQuery.setProcessId(workflowInstance.getId());
+            List<WorkflowTask> tasks = workflowService.queryTasks(tasksQuery);
+
+            ArrayList<Map<String, Object>> results = new ArrayList<Map<String, Object>>(tasks.size());
+
+            for (WorkflowTask task : tasks)
+            {
+                results.add(buildSimple(task, null));
+            }
+
+            model.put(TASK_WORKFLOW_INSTANCE_TASKS, results);
+        }
+
+        return model;
+    }
+
+    /**
+     * Returns a simple representation of a {@link WorkflowDefinition}.
+     * 
+     * @param workflowDefinition the WorkflowDefinition object to be represented.
+     * @return Map
+     */
+    public Map<String, Object> buildSimple(WorkflowDefinition workflowDefinition)
+    {
+        HashMap<String, Object> model = new HashMap<String, Object>();
+
+        model.put(WORKFLOW_DEFINITION_ID, workflowDefinition.getId());
+        model.put(WORKFLOW_DEFINITION_URL, getUrl(workflowDefinition));
+        model.put(WORKFLOW_DEFINITION_NAME, workflowDefinition.getName());
+        model.put(WORKFLOW_DEFINITION_TITLE, workflowDefinition.getTitle());
+        model.put(WORKFLOW_DEFINITION_DESCRIPTION, workflowDefinition.getDescription());
+        model.put(WORKFLOW_DEFINITION_VERSION, workflowDefinition.getVersion());
+
+        return model;
+    }
+
+    /**
+     * Returns a detailed representation of a {@link WorkflowDefinition}.
+     * 
+     * @param workflowDefinition the WorkflowDefinition object to be represented.
+     * @return Map
+     */
+    public Map<String, Object> buildDetailed(WorkflowDefinition workflowDefinition)
+    {
+        Map<String, Object> model = buildSimple(workflowDefinition);
+
+        model.put(WORKFLOW_DEFINITION_START_TASK_DEFINITION_URL, getUrl(workflowDefinition.getStartTaskDefinition().getMetadata()));
+        model.put(WORKFLOW_DEFINITION_START_TASK_DEFINITION_TYPE, workflowDefinition.getStartTaskDefinition().getMetadata().getName());
+
+        ArrayList<Map<String, Object>> results = new ArrayList<Map<String, Object>>();
+        for (WorkflowTaskDefinition taskDefinition : workflowService.getTaskDefinitions(workflowDefinition.getId()))
+        {
+            if (taskDefinition.getId().equals(workflowDefinition.getStartTaskDefinition().getId()))
+            {
+                continue;
+            }
+
+            Map<String, Object> result = new HashMap<String, Object>();
+
+            result.put(TASK_DEFINITION_URL, getUrl(taskDefinition.getMetadata()));
+            result.put(TASK_DEFINITION_TYPE, taskDefinition.getMetadata().getName());
+
+            results.add(result);
+        }
+        model.put(WORKFLOW_DEFINITION_TASK_DEFINITIONS, results);
+
+        return model;
+    }
+    
+    private Object isPooled(Map<QName, Serializable> properties)
+    {
+        Collection<?> actors = (Collection<?>) properties.get(WorkflowModel.ASSOC_POOLED_ACTORS);
+        return actors != null && !actors.isEmpty();
+    }
+
+    private Map<String, Object> buildProperties(WorkflowTask task, Collection<String> propertyFilters)
+    {
+        Map<QName, Serializable> properties = task.getProperties();
+        Collection<QName> keys;
+        if (propertyFilters == null || propertyFilters.size() == 0)
+        {
+            TypeDefinition taskType = task.getDefinition().getMetadata();
+            Map<QName, PropertyDefinition> propDefs = taskType.getProperties();
+            Map<QName, AssociationDefinition> assocDefs = taskType.getAssociations();
+            Set<QName> propKeys = properties.keySet();
+            keys = new HashSet<QName>(propDefs.size() + assocDefs.size() + propKeys.size());
+            keys.addAll(propDefs.keySet());
+            keys.addAll(assocDefs.keySet());
+            keys.addAll(propKeys);
+            keys.add(WorkflowModel.PROP_HIDDEN_TRANSITIONS);
+        }
+        else
+        {
+            keys = buildQNameKeys(propertyFilters);
+        }
+        
+        Map<String, Object> result = buildQNameProperties(properties, keys, task);
+        
+        // ALF-18092: Special handling for the "hiddenTransitions" property, as it can be an empty string
+        if (keys.contains(WorkflowModel.PROP_HIDDEN_TRANSITIONS))
+        {
+            List<?> hiddenTransitions = getHiddenTransitions(properties);
+            if (hiddenTransitions != null)
+            {
+                result.put(qNameConverter.mapQNameToName(WorkflowModel.PROP_HIDDEN_TRANSITIONS), hiddenTransitions);
+            }
+        }
+        return result;
+    }
+
+    private Map<String, String> buildPropertyLabels(WorkflowTask task, Map<String, Object> properties)
+    {
+        TypeDefinition taskType = task.getDefinition().getMetadata();
+        final Map<QName, PropertyDefinition> propDefs = taskType.getProperties();
+        return CollectionUtils.transform(properties, new Function<Entry<String, Object>, Pair<String, String>>()
+        {
+            @Override
+            public Pair<String, String> apply(Entry<String, Object> entry)
+            {
+                String propName = entry.getKey();
+                PropertyDefinition propDef = propDefs.get(qNameConverter.mapNameToQName(propName));
+                if(propDef != null )
+                {
+                    List<ConstraintDefinition> constraints = propDef.getConstraints();
+                    for (ConstraintDefinition constraintDef : constraints)
+                    {
+                        Constraint constraint = constraintDef.getConstraint();
+                        if (constraint instanceof ListOfValuesConstraint)
+                        {
+                            ListOfValuesConstraint listConstraint = (ListOfValuesConstraint) constraint;
+                            String label = listConstraint.getDisplayLabel(String.valueOf(entry.getValue()), dictionaryService);
+                            return new Pair<String, String>(propName, label);
+                        }
+                    }
+                }
+                return null;
+            }
+        });
+    }
+
+    private Map<String, Object> buildQNameProperties(Map<QName, Serializable> properties, Collection<QName> keys,
+            WorkflowTask task)
+    {
+        Map<QName, PropertyDefinition> propDefs = task.getDefinition().getMetadata().getProperties();
+        Map<String, Object> model = new HashMap<String, Object>();
+        for (QName key : keys)
+        {
+            Object value = convertValue(properties.get(key));
+            String strKey = qNameConverter.mapQNameToName(key);
+            PropertyDefinition propDef = propDefs.get(key);
+            if ((value == null) && (propDef != null))
+            {
+                value = propDef.getDefaultValue();
+            }
+            model.put(strKey, value);
+        }
+        return model;
+    }
+
+    private Object convertValue(Object value)
+    {
+        if (value == null || value instanceof Boolean || value instanceof Number || value instanceof String)
+        {
+            return value;
+        }
+        
+        if (value instanceof Collection<?>)
+        {
+            Collection<?> collection = (Collection<?>) value;
+            ArrayList<Object> results = new ArrayList<Object>(collection.size());
+            for (Object obj : collection)
+            {
+                results.add(convertValue(obj));
+            }
+            return results;
+        }
+        
+        return DefaultTypeConverter.INSTANCE.convert(String.class, value);
+    }
+
+    private Collection<QName> buildQNameKeys(Collection<String> keys)
+    {
+        return CollectionUtils.transform(keys, new Function<String, QName>()
+        {
+            @Override
+            public QName apply(String name)
+            {
+                return qNameConverter.mapNameToQName(name);
+            }
+        });
+    }
+
+    private Map<String, Object> getPersonModel(Serializable nameSer)
+    {
+        if (!(nameSer instanceof String))
+            return null;
+
+        String name = (String) nameSer;
+
+        // TODO Person URL?
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put(PERSON_USER_NAME, name);
+        
+        if (personService.personExists(name))
+        {
+            NodeRef person = personService.getPerson(name);
+            Map<QName, Serializable> properties = nodeService.getProperties(person);
+            model.put(PERSON_FIRST_NAME, properties.get(ContentModel.PROP_FIRSTNAME));
+            model.put(PERSON_LAST_NAME, properties.get(ContentModel.PROP_LASTNAME));
+            
+            // add the avatar, id present
+            List<AssociationRef> avatar = nodeService.getTargetAssocs(person, ContentModel.ASSOC_AVATAR);
+            if (avatar != null && !avatar.isEmpty())
+            {
+                model.put(PERSON_AVATAR, getAvatarUrl(avatar.get(0).getTargetRef()));
+            }
+        }
+        
+        return model;
+    }
+
+    private Map<String, Object> buildTaskDefinition(WorkflowTaskDefinition workflowTaskDefinition, WorkflowTask workflowTask)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        model.put(TASK_DEFINITION_ID, workflowTaskDefinition.getId());
+        model.put(TASK_DEFINITION_URL, getUrl(workflowTaskDefinition));
+        model.put(TASK_DEFINITION_TYPE, buildTypeDefinition(workflowTaskDefinition.getMetadata()));
+        model.put(TASK_DEFINITION_NODE, buildWorkflowNode(workflowTaskDefinition.getNode(), workflowTask));
+
+        return model;
+    }
+
+    private Map<String, Object> buildTypeDefinition(TypeDefinition typeDefinition)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        model.put(TYPE_DEFINITION_NAME, typeDefinition.getName());
+        model.put(TYPE_DEFINITION_TITLE, typeDefinition.getTitle(dictionaryService));
+        model.put(TYPE_DEFINITION_DESCRIPTION, typeDefinition.getDescription(dictionaryService));
+        model.put(TYPE_DEFINITION_URL, getUrl(typeDefinition));
+
+        return model;
+    }
+
+    private Map<String, Object> buildWorkflowNode(WorkflowNode workflowNode, WorkflowTask workflowTask)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        model.put(WORKFLOW_NODE_NAME, workflowNode.getName());
+        model.put(WORKFLOW_NODE_TITLE, workflowNode.getTitle());
+        model.put(WORKFLOW_NODE_DESCRIPTION, workflowNode.getDescription());
+        model.put(WORKFLOW_NODE_IS_TASK_NODE, workflowNode.isTaskNode());
+
+        List<Map<String, Object>> transitions = new ArrayList<Map<String, Object>>();
+        List<?> hiddenTransitions = getHiddenTransitions(workflowTask.getProperties());
+        for (WorkflowTransition workflowTransition : workflowNode.getTransitions())
+        {
+            Map<String, Object> transitionModel = buildTransition(workflowTransition, hiddenTransitions);
+            transitions.add(transitionModel);
+        }
+        model.put(WORKFLOW_NODE_TRANSITIONS, transitions);
+        return model;
+    }
+
+    private Map<String, Object> buildTransition(WorkflowTransition workflowTransition, List<?> hiddenTransitions)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+        String id = workflowTransition.getId();
+        model.put(WORKFLOW_NODE_TRANSITION_ID, id == null ? "" : id);
+        model.put(WORKFLOW_NODE_TRANSITION_TITLE, workflowTransition.getTitle());
+        model.put(WORKFLOW_NODE_TRANSITION_DESCRIPTION, workflowTransition.getDescription());
+        model.put(WORKFLOW_NODE_TRANSITION_IS_DEFAULT, workflowTransition.isDefault());
+        model.put(WORKFLOW_NODE_TRANSITION_IS_HIDDEN, isHiddenTransition(id, hiddenTransitions));
+        return model;
+    }
+
+    /**
+     * @param properties Map<QName, Serializable>
+     * @return List
+     */
+    private List<?> getHiddenTransitions(Map<QName, Serializable> properties)
+    {
+        Serializable hiddenSer = properties.get(WorkflowModel.PROP_HIDDEN_TRANSITIONS);
+        if (hiddenSer instanceof List<?>)
+        {
+            return (List<?>) hiddenSer;
+        }
+        else if (hiddenSer instanceof String)
+        {
+        	if(((String) hiddenSer).isEmpty())
+        	{
+        		return Collections.emptyList();
+        	}
+        	else
+        	{
+        		String hiddenStr = (String) hiddenSer;
+        		return Arrays.asList(hiddenStr.split(","));
+        	}
+        }
+        else if (hiddenSer == null)
+        {
+            return Collections.emptyList();
+        }
+        return null;
+    }
+    
+    private boolean isHiddenTransition(String transitionId, List<?> hiddenTransitions)
+    {
+        if (hiddenTransitions == null)
+            return false;
+        
+        return hiddenTransitions.contains(transitionId);
+    }
+
+    private String getOutcome(WorkflowTask task)
+    {
+        String outcomeLabel = null;
+        
+        // there will only be an outcome if the task is completed
+        if (task.getState().equals(WorkflowTaskState.COMPLETED))
+        {
+            String outcomeId = (String)task.getProperties().get(WorkflowModel.PROP_OUTCOME);
+            if (outcomeId != null)
+            {
+                // find the transition with the matching id and get the label
+                WorkflowTransition[] transitions = task.getDefinition().getNode().getTransitions();
+                for (WorkflowTransition transition : transitions)
+                {
+                    if (transition.getId() != null && transition.getId().equals(outcomeId))
+                    {
+                        outcomeLabel = transition.getTitle();
+                        break;
+                    }
+                }
+                if (outcomeLabel == null)
+                {
+                    String translatedOutcome = I18NUtil.getMessage(TASK_OUTCOME_MESSAGE_PREFIX+outcomeId);
+                    if (translatedOutcome != null)
+                    {
+                        outcomeLabel = translatedOutcome;
+                    } 
+                    else 
+                    {
+                        outcomeLabel = outcomeId;
+                    }
+                }
+            }
+        }
+        
+        return outcomeLabel;
+    }
+
+    private String getUrl(WorkflowTask task)
+    {
+        return "api/task-instances/" + task.getId();
+    }
+
+    private String getUrl(WorkflowDefinition workflowDefinition)
+    {
+        return "api/workflow-definitions/" + workflowDefinition.getId();
+    }
+
+    private String getUrl(WorkflowTaskDefinition workflowTaskDefinition)
+    {
+        return "api/task-definitions/" + workflowTaskDefinition.getId();
+    }
+
+    private String getUrl(TypeDefinition typeDefinition)
+    {
+        return "api/classes/" + qNameConverter.mapQNameToName(typeDefinition.getName());
+    }
+
+    private String getUrl(WorkflowPath path)
+    {
+        return "api/workflow-paths/" + path.getId();
+    }
+
+    private String getUrl(WorkflowInstance workflowInstance)
+    {
+        return "api/workflow-instances/" + workflowInstance.getId();
+    }
+    
+    private String getDiagramUrl(WorkflowInstance workflowInstance)
+    {
+        return "api/workflow-instances/" + workflowInstance.getId() + "/diagram";
+    }
+
+    private String getAvatarUrl(NodeRef avatarRef)
+    {
+        return "api/node/" + avatarRef.toString().replace("://", "/") + "/content/thumbnails/avatar";
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/util/HttpRangeProcessor.java b/remote-api/src/main/java/org/alfresco/repo/web/util/HttpRangeProcessor.java
new file mode 100644
index 00000000000..49007d3d51b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/util/HttpRangeProcessor.java
@@ -0,0 +1,660 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * Generates HTTP response for "Range" scoped HTTP requests for content.
+ */
+public class HttpRangeProcessor
+{
+    private static final Log logger = LogFactory.getLog(HttpRangeProcessor.class);
+    private static final String HEADER_CONTENT_TYPE   = "Content-Type";
+    private static final String HEADER_CONTENT_RANGE  = "Content-Range";
+    private static final String HEADER_CONTENT_LENGTH = "Content-Length";
+    private static final String MULTIPART_BYTERANGES_BOUNDRY = "<ALF4558907921887235966L>";
+    private static final String MULTIPART_BYTERANGES_HEADER  = "multipart/byteranges; boundary=" + MULTIPART_BYTERANGES_BOUNDRY;
+    private static final String MULTIPART_BYTERANGES_BOUNDRY_SEP = "--" + MULTIPART_BYTERANGES_BOUNDRY;
+    private static final String MULTIPART_BYTERANGES_BOUNDRY_END = MULTIPART_BYTERANGES_BOUNDRY_SEP + "--";
+    /** size of a multi-part byte range output buffer */
+    private static final int CHUNKSIZE = 64*1024;
+    private ContentService contentService;
+    
+    
+    /**
+     * Constructor.
+     * 
+     * @param contentService ContentService
+     */
+    public HttpRangeProcessor(ContentService contentService)
+    {
+        this.contentService = contentService;
+    }
+
+    /**
+     * Process a range header for a HttpServletResponse - handles single and multiple range requests.
+     * 
+     * @param res the HTTP servlet response
+     * @param reader the content reader
+     * @param range the byte range
+     * @param ref the content NodeRef
+     * @param property the content property
+     * @param mimetype the content mimetype
+     * @param userAgent the user agent string
+     * @return whether or not the range could be processed
+     * @throws IOException
+     */
+    public boolean processRange(HttpServletResponse res, ContentReader reader, String range,
+          NodeRef ref, QName property, String mimetype, String userAgent)
+       throws IOException
+    {
+       // test for multiple byte ranges present in header
+       if (range.indexOf(',') == -1)
+       {
+          return processSingleRange(res, reader, range, mimetype);
+       }
+       else
+       {
+          return processMultiRange(res, range, ref, property, mimetype, userAgent);
+       }
+    }
+    
+    /**
+     * Process a range header for a WebScriptResponse - handles single and multiple range requests.
+     * 
+     * @param res the webscript response
+     * @param reader the content reader
+     * @param range the byte range
+     * @param ref the content NodeRef
+     * @param property the content property
+     * @param mimetype the content mimetype
+     * @param userAgent the user agent string
+     * @return whether or not the range could be processed
+     * @throws IOException
+     */
+    public boolean processRange(WebScriptResponse res, ContentReader reader, String range,
+          NodeRef ref, QName property, String mimetype, String userAgent)
+       throws IOException
+    {
+       // test for multiple byte ranges present in header
+       if (range.indexOf(',') == -1)
+       {
+          return processSingleRange(res, reader, range, mimetype);
+       }
+       else
+       {
+          return processMultiRange(res, range, ref, property, mimetype, userAgent);
+       }
+    }
+
+    /**
+     * Process a single range request.
+     * 
+     * @param res        HttpServletResponse
+     * @param reader     ContentReader to retrieve content
+     * @param range      Range header value
+     * @param mimetype   Content mimetype
+     * 
+     * @return true if processed range, false otherwise
+     */
+    private boolean processSingleRange(Object res, ContentReader reader, String range, String mimetype)
+       throws IOException
+    {
+        // Handle either HttpServletResponse or WebScriptResponse
+        HttpServletResponse httpServletResponse = null;
+        WebScriptResponse webScriptResponse = null;
+        if (res instanceof HttpServletResponse)
+        {
+           httpServletResponse = (HttpServletResponse) res;
+        }
+        else if (res instanceof WebScriptResponse)
+        {
+           webScriptResponse = (WebScriptResponse) res;
+        }
+        if (httpServletResponse == null && webScriptResponse == null)
+        {
+            // Unknown response object type
+            return false;
+        }
+        
+       // return the specific set of bytes as requested in the content-range header
+       
+       /* Examples of byte-content-range-spec values, assuming that the entity contains total of 1234 bytes:
+             The first 500 bytes:
+              bytes 0-499/1234
+             The second 500 bytes:
+              bytes 500-999/1234
+             All except for the first 500 bytes:
+              bytes 500-1233/1234 */
+       /* 'Range' header example:
+              bytes=10485760-20971519 */
+       
+       boolean processedRange = false;
+       Range r = null;
+       try
+       {
+          r = Range.constructRange(range, mimetype, reader.getSize());
+       }
+       catch (IllegalArgumentException err)
+       {
+          if (getLogger().isDebugEnabled())
+             getLogger().debug("Failed to parse range header - returning 416 status code: " + err.getMessage());
+          
+          if (httpServletResponse != null)
+          {
+             httpServletResponse.setStatus(HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE);
+             httpServletResponse.setHeader(HEADER_CONTENT_RANGE, "\"*\"");
+             httpServletResponse.getOutputStream().close();
+          }
+          else if (webScriptResponse != null)
+          {
+             webScriptResponse.setStatus(HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE);
+             webScriptResponse.setHeader(HEADER_CONTENT_RANGE, "\"*\"");
+             webScriptResponse.getOutputStream().close();
+          }
+          return true;
+       }
+       
+       // set Partial Content status and range headers
+       String contentRange = "bytes " + Long.toString(r.start) + 
+               "-" + Long.toString(r.end) + "/" + Long.toString(reader.getSize());
+       if (httpServletResponse != null)
+       {
+          httpServletResponse.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT);
+          httpServletResponse.setContentType(mimetype);
+          httpServletResponse.setHeader(HEADER_CONTENT_RANGE, contentRange);
+          httpServletResponse.setHeader(HEADER_CONTENT_LENGTH, Long.toString((r.end - r.start) + 1L));
+       }
+       else if (webScriptResponse != null)
+       {
+          webScriptResponse.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT);
+          webScriptResponse.setContentType(mimetype);
+          webScriptResponse.setHeader(HEADER_CONTENT_RANGE, contentRange);
+          webScriptResponse.setHeader(HEADER_CONTENT_LENGTH, Long.toString((r.end - r.start) + 1L));
+       }
+       
+       if (getLogger().isDebugEnabled())
+          getLogger().debug("Processing: Content-Range: " + contentRange);
+       
+       InputStream is = null;
+       try
+       {
+          // output the binary data for the range
+          OutputStream os = null;
+          if (httpServletResponse != null)
+          {
+             os = httpServletResponse.getOutputStream();
+          }
+          else if (webScriptResponse != null)
+          {
+             os = webScriptResponse.getOutputStream();
+          }
+          is = reader.getContentInputStream();
+          
+          streamRangeBytes(r, is, os, 0L);
+          
+          os.close();
+          processedRange = true;
+       }
+       catch (IOException err)
+       {
+          if (getLogger().isDebugEnabled())
+             getLogger().debug("Unable to process single range due to IO Exception: " + err.getMessage());
+          throw err;
+       }
+       finally
+       {
+          if (is != null) is.close();
+       }
+       
+       return processedRange;
+    }
+
+    /**
+     * Process multiple ranges.
+     * 
+     * @param res        HttpServletResponse
+     * @param range      Range header value
+     * @param ref        NodeRef to the content for streaming
+     * @param property   Content Property for the content
+     * @param mimetype   Mimetype of the content
+     * @param userAgent  User Agent of the caller
+     * 
+     * @return true if processed range, false otherwise
+     */
+    private boolean processMultiRange(
+          Object res, String range, NodeRef ref, QName property, String mimetype, String userAgent)
+       throws IOException
+    {
+       final Log logger = getLogger();
+       
+       // Handle either HttpServletResponse or WebScriptResponse
+       HttpServletResponse httpServletResponse = null;
+       WebScriptResponse webScriptResponse = null;
+       if (res instanceof HttpServletResponse)
+       {
+          httpServletResponse = (HttpServletResponse) res;
+       }
+       else if (res instanceof WebScriptResponse)
+       {
+          webScriptResponse = (WebScriptResponse) res;
+       }
+       if (httpServletResponse == null && webScriptResponse == null)
+       {
+           // Unknown response object type
+           return false;
+       }
+       
+       // return the sets of bytes as requested in the content-range header
+       // the response will be formatted as multipart/byteranges media type message
+       
+       /* Examples of byte-ranges-specifier values (assuming an entity-body of length 10000):
+
+       - The first 500 bytes (byte offsets 0-499, inclusive):  bytes=0-499
+       - The second 500 bytes (byte offsets 500-999, inclusive):
+         bytes=500-999
+       - The final 500 bytes (byte offsets 9500-9999, inclusive):
+         bytes=-500
+       - Or bytes=9500-
+       - The first and last bytes only (bytes 0 and 9999):  bytes=0-0,-1
+       - Several legal but not canonical specifications of byte offsets 500-999, inclusive:
+          bytes=500-600,601-999
+          bytes=500-700,601-999 */
+       
+       boolean processedRange = false;
+       
+       // get the content reader
+       ContentReader reader = contentService.getReader(ref, property);
+       
+       final List<Range> ranges = new ArrayList<Range>(8);
+       long entityLength = reader.getSize();
+       for (StringTokenizer t=new StringTokenizer(range, ", "); t.hasMoreTokens(); /**/)
+       {
+          try
+          {
+             ranges.add(Range.constructRange(t.nextToken(), mimetype, entityLength));
+          }
+          catch (IllegalArgumentException err)
+          {
+             if (getLogger().isDebugEnabled())
+                getLogger().debug("Failed to parse range header - returning 416 status code: " + err.getMessage());
+             
+             if (httpServletResponse != null)
+             {
+                httpServletResponse.setStatus(HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE);
+                httpServletResponse.setHeader(HEADER_CONTENT_RANGE, "\"*\"");
+                httpServletResponse.getOutputStream().close();
+             }
+             else if (webScriptResponse != null)
+             {
+                webScriptResponse.setStatus(HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE);
+                webScriptResponse.setHeader(HEADER_CONTENT_RANGE, "\"*\"");
+                webScriptResponse.getOutputStream().close();
+             }
+             return true;
+          }
+       }
+       
+       if (ranges.size() != 0)
+       {
+          // merge byte ranges if possible - IE handles this well, FireFox not so much
+          if (userAgent == null || userAgent.indexOf("MSIE ") != -1)
+          {
+             Collections.sort(ranges);
+             
+             for (int i=0; i<ranges.size() - 1; i++)
+             {
+                Range first = ranges.get(i);
+                Range second = ranges.get(i + 1);
+                if (first.end + 1 >= second.start)
+                {
+                   if (logger.isDebugEnabled())
+                      logger.debug("Merging byte range: " + first + " with " + second);
+                   
+                   if (first.end < second.end)
+                   {
+                      // merge second range into first
+                      first.end = second.end;
+                   }
+                   // else we simply discard the second range - it is contained within the first
+                   
+                   // delete second range
+                   ranges.remove(i + 1);
+                   // reset loop index
+                   i--;
+                }
+             }
+          }
+          
+          // calculate response content length
+          long length = MULTIPART_BYTERANGES_BOUNDRY_END.length() + 2;
+          for (Range r : ranges)
+          {
+             length += r.getLength();
+          }
+          
+          // output headers as we have at least one range to process
+          OutputStream os = null;
+          if (httpServletResponse != null)
+          {
+             httpServletResponse.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT);
+             httpServletResponse.setHeader(HEADER_CONTENT_TYPE, MULTIPART_BYTERANGES_HEADER);
+             httpServletResponse.setHeader(HEADER_CONTENT_LENGTH, Long.toString(length));
+             os = httpServletResponse.getOutputStream();
+          }
+          else if (webScriptResponse != null)
+          {
+             webScriptResponse.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT);
+             webScriptResponse.setHeader(HEADER_CONTENT_TYPE, MULTIPART_BYTERANGES_HEADER);
+             webScriptResponse.setHeader(HEADER_CONTENT_LENGTH, Long.toString(length));
+             os =webScriptResponse.getOutputStream();
+          }
+          
+          InputStream is = null;
+          try
+          {
+             for (Range r : ranges)
+             {
+                if (logger.isDebugEnabled())
+                   logger.debug("Processing: " + r.getContentRange());
+                
+                try
+                {
+                   // output the header bytes for the range
+                   if (os instanceof ServletOutputStream)
+                       r.outputHeader((ServletOutputStream) os);
+                   
+                   // output the binary data for the range
+                   // need a new reader for each new InputStream
+                   is = contentService.getReader(ref, property).getContentInputStream();
+                   streamRangeBytes(r, is, os, 0L);
+                   is.close();
+                   is = null;
+                   
+                   // section marker and flush stream
+                   if (os instanceof ServletOutputStream)
+                       ((ServletOutputStream) os).println();
+                   os.flush();
+                }
+                catch (IOException err)
+                {
+                   if (getLogger().isDebugEnabled())
+                      getLogger().debug("Unable to process multiple range due to IO Exception: " + err.getMessage());
+                   throw err;
+                }
+             }
+          }
+          finally
+          {
+             if (is != null)
+             {
+                is.close();
+             }
+          }
+          
+          // end marker
+          if (os instanceof ServletOutputStream)
+              ((ServletOutputStream) os).println(MULTIPART_BYTERANGES_BOUNDRY_END);
+          os.close();
+          processedRange = true;
+       }
+       
+       return processedRange;
+    }
+    
+    /**
+     * Stream a range of bytes from the given InputStream to the ServletOutputStream
+     * 
+     * @param r       Byte Range to process
+     * @param is      InputStream
+     * @param os      ServletOutputStream
+     * @param offset  Assumed InputStream position - to calculate skip bytes from
+     * 
+     */
+    private void streamRangeBytes(final Range r, final InputStream is, final OutputStream os, long offset)
+       throws IOException
+    {
+       final Log logger = getLogger();
+       final boolean trace = logger.isTraceEnabled();
+       
+       // TODO: investigate using getFileChannel() on ContentReader
+       
+       if (r.start != 0L && r.start > offset)
+       {
+          long skipped = offset + is.skip(r.start - offset);
+          if (skipped < r.start)
+          {
+              // Nothing left to download!
+              return;
+          }
+       }
+       long span = (r.end - r.start) + 1L;
+       long bytesLeft = span;
+       int read = 0;
+       
+       // Check that bytesLeft isn't greater than int can hold
+       int bufSize;
+       if (bytesLeft >= Integer.MAX_VALUE - 8)
+       {
+          bufSize = CHUNKSIZE;
+       }
+       else
+       {
+          bufSize = ((int)bytesLeft) < CHUNKSIZE ? (int)bytesLeft : CHUNKSIZE;
+       }
+       byte[] buf = new byte[bufSize];
+       
+       while ((read = is.read(buf)) > 0 && bytesLeft != 0L)
+       {
+          os.write(buf, 0, read);
+          
+          bytesLeft -= (long)read;
+          
+          if (bytesLeft != 0L)
+          {
+             int resize;
+             if (bytesLeft >= Integer.MAX_VALUE - 8)
+             {
+                resize = CHUNKSIZE;
+             }
+             else
+             {
+                resize = ((int)bytesLeft) < CHUNKSIZE ? (int)bytesLeft : CHUNKSIZE;
+             }
+             if (resize != buf.length)
+             {
+                buf = new byte[resize];
+             }
+          }
+          if (trace) logger.trace("...wrote " + read + " bytes, with " + bytesLeft + " to go...");
+       }
+    }
+    
+    
+    /**
+     * Representation of a single byte range.
+     */
+    private static class Range implements Comparable<Range>
+    {
+       private long start;
+       private long end;
+       private long entityLength;
+       private String contentType;
+       private String contentRange;
+       
+       /**
+        * Constructor
+        * 
+        * @param contentType      Mimetype of the range content
+        * @param start            Start position in the parent entity
+        * @param end              End position in the parent entity
+        * @param entityLength     Length of the parent entity
+        */
+       Range(String contentType, long start, long end, long entityLength)
+       {
+          this.contentType = HEADER_CONTENT_TYPE + ": " + contentType;
+          this.start = start;
+          this.end = end;
+          this.entityLength = entityLength;
+       }
+       
+       /**
+        * Factory method to construct a byte range from a range header value.
+        * 
+        * @param range         Range header value
+        * @param contentType   Mimetype of the range
+        * @param entityLength  Length of the parent entity
+        * 
+        * @return Range
+        * 
+        * @throws IllegalArgumentException for an invalid range
+        */
+       static Range constructRange(String range, String contentType, long entityLength)
+       {
+          if (range == null)
+          {
+             throw new IllegalArgumentException("Range argument is mandatory");
+          }
+          
+          // strip total if present - it does not give us anything useful
+          if (range.indexOf('/') != -1)
+          {
+             range = range.substring(0, range.indexOf('/'));
+          }
+          
+          // find the separator
+          int separator = range.indexOf('-');
+          if (separator == -1)
+          {
+             throw new IllegalArgumentException("Invalid range: " + range);
+          }
+          
+          try
+          {
+             // split range and parse values
+             long start = 0L;
+             if (separator != 0)
+             {
+                start = Long.parseLong(range.substring(0, separator));
+             }
+             long end = entityLength - 1L;
+             if (separator != range.length() - 1)
+             {
+                end = Long.parseLong(range.substring(separator + 1));
+             }
+             
+             if (start > end)
+             {
+                 throw new IllegalArgumentException("Range start can not be less than range end: " + range);
+             }
+             // return object to represent the byte-range
+             return new Range(contentType, start, end, entityLength);
+          }
+          catch (NumberFormatException err)
+          {
+             throw new IllegalArgumentException("Unable to parse range value: " + range);
+          }
+       }
+       
+       
+       /**
+        * Output the header bytes for a multi-part byte range header
+        */
+       void outputHeader(ServletOutputStream os) throws IOException
+       {
+          // output multi-part boundry separator
+          os.println(MULTIPART_BYTERANGES_BOUNDRY_SEP);
+          // output content type and range size sub-header for this part
+          os.println(this.contentType);
+          os.println(getContentRange());
+          os.println();
+       }
+       
+       /**
+        * @return the length in bytes of the byte range content including the header bytes
+        */
+       int getLength()
+       {
+          // length in bytes of range plus it's header plus section marker and line feed bytes
+          return MULTIPART_BYTERANGES_BOUNDRY_SEP.length() + 2 +
+                 this.contentType.length() + 2 +
+                 getContentRange().length() + 4 + (int)(this.end - this.start + 1L) + 2;
+       }
+       
+       /**
+        * @return the Content-Range header string value for this byte range
+        */
+       private String getContentRange()
+       {
+          if (this.contentRange == null)
+          {
+             this.contentRange = "Content-Range: bytes " + Long.toString(this.start) + "-" +
+                Long.toString(this.end) + "/" + Long.toString(this.entityLength);
+          }
+          return this.contentRange;
+       }
+
+       @Override
+       public String toString()
+       {
+          return this.start + "-" + this.end;
+       }
+
+       /**
+        * @see java.lang.Comparable#compareTo(java.lang.Object)
+        */
+       public int compareTo(Range o)
+       {
+          return this.start > o.start ? 1 : -1;
+       }
+    }
+
+    /**
+     * @return the logger
+     */
+    private static Log getLogger()
+    {
+        return logger;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/util/PagingCursor.java b/remote-api/src/main/java/org/alfresco/repo/web/util/PagingCursor.java
new file mode 100644
index 00000000000..66aba132131
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/util/PagingCursor.java
@@ -0,0 +1,455 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.util;
+
+/**
+ * Paging cursor.  A utility for maintaining paged indexes for a collection of N items.
+ * 
+ * There are two types of cursor:
+ * 
+ * a) Paged
+ * 
+ * This type of cursor is driven from a page number and page size.  Random access within
+ * the collection is possible by jumping straight to a page.  A simple scroll through
+ * the collection is supported by iterating through each next page.  
+ * 
+ * b) Rows
+ * 
+ * This type of cursor is driven from a skip row count and maximum number of rows.  Random
+ * access is not supported.  The collection of items is simply scrolled through from
+ * start to end by iterating through each next set of rows.
+ * 
+ * In either case, a paging cursor provides a start row and end row which may be used
+ * to extract the items for the page from the collection of N items.
+ * 
+ * A zero (or less) page size or row maximum means "unlimited". 
+ * 
+ * Zero or one based Page and Rows indexes are supported.  By default, Pages are 1 based and
+ * Rows are 0 based.
+ *
+ * At any time, -1 is returned to represent "out of range" i.e. for next, previous, last page
+ * and next skip count.
+ * 
+ * Pseudo-code for traversing through a collection of N items (10 at a time):
+ * 
+ * PagingCursor cursor = new PagingCursor();
+ * Page page = cursor.createPageCursor(N, 10, 1);
+ * while (page.isInRange())
+ * {
+ *    for (long i = page.getStartRow(); i <= page.getEndRow(); i++)
+ *    {
+ *       ...collection[i]...
+ *    }
+ *    page = cursor.createPageCursor(N, 10, page.getNextPage());
+ * }
+ * 
+ * Rows rows = cursor.createRowsCursor(N, 10, 0);
+ * while (rows.isInRange())
+ * {
+ *    for (long i = page.getStartRow(); i <= page.getEndRow(); i++)
+ *    {
+ *       ...collection[i]...
+ *    }
+ *    rows = cursor.createRowsCursor(N, 10, rows.getNextSkipRows());   
+ * }
+ * 
+ * @author davidc
+ */
+public class PagingCursor
+{
+    boolean zeroBasedPage = false;
+    boolean zeroBasedRow = true;
+
+    /**
+     * Sets zero based page index
+     * 
+     * Note: scoped to this paging cursor instance
+     * 
+     * @param zeroBasedPage  true => 0 based, false => 1 based
+     */
+    public void setZeroBasedPage(boolean zeroBasedPage)
+    {
+        this.zeroBasedPage = zeroBasedPage;
+    }
+
+    /**
+     * Is zero based page index?
+     * 
+     * Note: scoped to this paging cursor instance
+     *
+     * @return true => 0 based, false => 1 based
+     */
+    public boolean isZeroBasedPage()
+    {
+        return zeroBasedPage;
+    }
+    
+    /**
+     * Sets zero based row index
+     * 
+     * Note: scoped to this paging cursor instance
+     * 
+     * @param zeroBasedRow  true => 0 based, false => 1 based
+     */
+    public void setZeroBasedRow(boolean zeroBasedRow)
+    {
+        this.zeroBasedRow = zeroBasedRow;
+    }
+
+    /**
+     * Is zero based row index?
+     * 
+     * Note: scoped to this paging cursor instance
+     *
+     * @return true => 0 based, false => 1 based
+     */
+    public boolean isZeroBasedRow()
+    {
+        return zeroBasedRow;
+    }
+
+    /**
+     * Create a Page based Cursor
+     * 
+     * @param totalRows  total rows in collection
+     * @param rowsPerPage  page size
+     * @param page  page number (0 or 1 based)
+     * @return  Page Cursor
+     */
+    public Page createPageCursor(long totalRows, int rowsPerPage, int page)
+    {
+        return new Page(totalRows, rowsPerPage, page, zeroBasedPage, zeroBasedRow);
+    }
+    
+    /**
+     * Create a Page based Cursor
+     * 
+     * @param totalRows  total rows in collection
+     * @param rowsPerPage  page size
+     * @param page  page number (0 or 1 based)
+     * @param zeroBasedPage  true => 0 based, false => 1 based
+     * @param zeroBasedRow  true => 0 based, false => 1 based
+     * @return  Page Cursor
+     */
+    public Page createPageCursor(long totalRows, int rowsPerPage, int page, boolean zeroBasedPage, boolean zeroBasedRow)
+    {
+        return new Page(totalRows, rowsPerPage, page, zeroBasedPage, zeroBasedRow);
+    }
+
+    /**
+     * Create a Rows based Cursor
+     * 
+     * @param totalRows  total rows in collection
+     * @param maxRows  maximum number of rows in page
+     * @param skipRows  number of rows to skip (0 - none)
+     * @return  Rows Cursor
+     */
+    public Rows createRowsCursor(long totalRows, long maxRows, long skipRows)
+    {
+        return new Rows(totalRows, maxRows, skipRows, zeroBasedRow);
+    }
+    
+    /**
+     * Create a Rows based Cursor
+     * 
+     * @param totalRows  total rows in collection
+     * @param maxRows  maximum number of rows in page
+     * @param skipRows  number of rows to skip (0 - none)
+     * @param zeroBasedRow  true => 0 based, false => 1 based
+     * @return  Rows Cursor
+     */
+    public Rows createRowsCursor(long totalRows, long maxRows, long skipRows, boolean zeroBasedRow)
+    {
+        return new Rows(totalRows, maxRows, skipRows, zeroBasedRow);
+    }
+    
+
+    /**
+     * Page based Cursor
+     */
+    public static class Page
+    {
+        boolean zeroBasedPage;
+        boolean zeroBasedRow;
+        long totalRows;
+        int rowsPerPage;
+        long pageSize;
+        int currentPage;
+        int currentRow;
+        
+        /**
+         * Create a Page based Cursor
+         * 
+         * @param totalRows  total rows in collection
+         * @param rowsPerPage  page size
+         * @param page  page number (0 or 1 based)
+         * @param zeroBasedPage  true => 0 based, false => 1 based
+         * @param zeroBasedRow  true => 0 based, false => 1 based
+         */
+        public Page(long totalRows, int rowsPerPage, int page, boolean zeroBasedPage, boolean zeroBasedRow)
+        {
+            this.zeroBasedPage = zeroBasedPage;
+            this.zeroBasedRow = zeroBasedRow;
+            this.totalRows = totalRows;
+            this.rowsPerPage = rowsPerPage;
+            this.pageSize = (rowsPerPage <=0) ? totalRows : rowsPerPage;
+            this.currentPage = (zeroBasedPage) ? page : page - 1;
+        }
+
+        /**
+         * Gets total rows
+         * 
+         * @return  total rows
+         */
+        public long getTotalRows()
+        {
+            return totalRows;
+        }
+        
+        /**
+         * Gets total number of pages
+         * 
+         * @return  total number of pages
+         */
+        public int getTotalPages()
+        {
+            if (totalRows == 0)
+                return 0;
+            
+            int totalPages = (int)(totalRows / pageSize);
+            totalPages += (totalRows % pageSize != 0) ? 1 : 0;
+            return totalPages;
+        }
+        
+        /**
+         * Gets page size
+         * 
+         * @return  page size
+         */
+        public int getRowsPerPage()
+        {
+            return rowsPerPage;
+        }
+        
+        /**
+         * Is the cursor within range of the total number of rows
+         * 
+         * @return  true => within range of total rows
+         */
+        public boolean isInRange()
+        {
+            return currentPage >= 0 && getCurrentPage() <= getLastPage();
+        }
+        
+        /**
+         * Gets the current page number
+         * 
+         * @return  current page number
+         */
+        public int getCurrentPage()
+        {
+            return currentPage + (zeroBasedPage ? 0 : 1);
+        }
+
+        /**
+         * Gets the next page number
+         * 
+         * @return  next page number (-1 if no more pages)
+         */
+        public int getNextPage()
+        {
+            return getCurrentPage() < getLastPage() ? getCurrentPage() + 1 : - 1;
+        }
+        
+        /**
+         * Gets the previous page number
+         * 
+         * @return  previous page number (-1 if no previous pages)
+         */
+        public int getPreviousPage()
+        {
+            return currentPage > 0 ? getCurrentPage() - 1 : - 1;
+        }
+
+        /**
+         * Gets the first page number
+         * 
+         * @return  first page number
+         */
+        public int getFirstPage()
+        {
+            if (totalRows == 0)
+                return -1;
+            
+            return zeroBasedPage ? 0 : 1;
+        }
+
+        /**
+         * Gets the last page number
+         * 
+         * @return  last page number
+         */
+        public int getLastPage()
+        {
+            if (totalRows == 0)
+                return -1;
+            
+            return getTotalPages() - (zeroBasedPage ? 1 : 0);
+        }
+
+        /**
+         * Gets the start row within collection for this page
+         * 
+         * @return  start row index
+         */
+        public long getStartRow()
+        {
+            if (totalRows == 0)
+                return -1;
+            
+            return (currentPage * pageSize) + (zeroBasedRow ? 0 : 1);
+        }
+        
+        /**
+         * Gets the end row within collection for this page
+         * 
+         * @return  end row index
+         */
+        public long getEndRow()
+        {
+            if (totalRows == 0)
+                return -1;
+            
+            return getStartRow() + Math.min(pageSize, totalRows - (currentPage * pageSize)) - 1;
+        }
+    }
+
+    /**
+     * Rows based Cursor
+     */
+    public static class Rows
+    {
+        boolean zeroBasedRow;
+        long totalRows;
+        long skipRows;
+        long maxRows;
+        long pageSize;
+        
+        /**
+         * Create a Rows based Cursor
+         * 
+         * @param totalRows  total rows in collection
+         * @param maxRows  maximum number of rows in page
+         * @param skipRows  number of rows to skip (0 - none)
+         * @param zeroBasedRow  true => 0 based, false => 1 based
+         */
+        public Rows(long totalRows, long maxRows, long skipRows, boolean zeroBasedRow)
+        {
+            this.zeroBasedRow = zeroBasedRow;
+            this.totalRows = totalRows;
+            this.maxRows = maxRows;
+            this.skipRows = skipRows;
+            this.pageSize = (maxRows <= 0) ? totalRows - skipRows : maxRows;
+        }
+
+        /**
+         * Gets the total number of rows
+         * 
+         * @return  total rows
+         */
+        public long getTotalRows()
+        {
+            return totalRows;
+        }
+        
+        /**
+         * Gets the number rows skipped
+         * 
+         * @return  skipped row count
+         */
+        public long getSkipRows()
+        {
+            return skipRows;
+        }
+
+        /**
+         * Gets the maximum number of rows to include in this page
+         *
+         * @return  maximum of numbers
+         */
+        public long getMaxRows()
+        {
+            return maxRows;
+        }
+
+        /**
+         * Is the cursor within range of the total number of rows
+         * 
+         * @return  true => within range of total rows
+         */
+        public boolean isInRange()
+        {
+            return skipRows >= 0 && skipRows < totalRows;
+        }
+        
+        /**
+         * Gets the start row within collection for this page
+         * 
+         * @return  start row index
+         */
+        public long getStartRow()
+        {
+            if (totalRows == 0)
+                return -1;
+
+            return skipRows + (zeroBasedRow ? 0 : 1);
+        }
+        
+        /**
+         * Gets the end row within collection for this page
+         * 
+         * @return  end row index
+         */
+        public long getEndRow()
+        {
+            if (totalRows == 0)
+                return -1;
+            
+            return getStartRow() + Math.min(pageSize, totalRows - skipRows) - 1;
+        }
+
+        /**
+         * Gets the next skip count
+         * 
+         * @return  next skip row
+         */
+        public long getNextSkipRows()
+        {
+            return (skipRows + pageSize < totalRows) ? skipRows + pageSize : -1;
+        }
+    }
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/util/paging/Cursor.java b/remote-api/src/main/java/org/alfresco/repo/web/util/paging/Cursor.java
new file mode 100644
index 00000000000..c36365fcd1e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/util/paging/Cursor.java
@@ -0,0 +1,155 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.util.paging;
+
+
+/**
+ * Cursor - Allows for scrolling through a row set.
+ * 
+ * @author davidc
+ */
+public interface Cursor
+{
+    /**
+     * Gets the page type
+     * 
+     * @return  page type
+     */
+    public String getPageType();
+    
+    /**
+     * Gets the page size
+     * 
+     * @return  page size
+     */
+    int getPageSize();
+    
+    /**
+     * Gets total number of pages
+     * 
+     * @return  total number of pages
+     */
+    int getTotalPages();
+    
+    /**
+     * Gets total rows
+     * 
+     * @return  total rows
+     */
+    int getTotalRows();
+
+    /**
+     * Gets the current page number
+     * 
+     * @return  current page number
+     */
+    int getCurrentPage();
+
+    /**
+     * Gets the first page number
+     * 
+     * @return  first page number
+     */
+    int getFirstPage();
+
+    /**
+     * Gets the last page number
+     * 
+     * @return  last page number
+     */
+    int getLastPage();
+
+    /**
+     * Gets the next page number
+     * 
+     * @return  next page number (-1 if no more pages)
+     */
+    int getNextPage();
+
+    /**
+     * Gets the previous page number
+     * 
+     * @return  previous page number (-1 if no previous pages)
+     */
+    int getPrevPage();
+
+    /**
+     * Is the page within range of the result set
+     * 
+     * @return  true => page is within range
+     */
+    boolean isInRange();
+
+    /**
+     * Is there a known first page?
+     * 
+     * @return  true => getFirstPage() will succeed
+     */
+    boolean getHasFirstPage();
+    
+    /**
+     * Is there a known last page?
+     * 
+     * @return  true => getLastPage() will succeed
+     */
+    boolean getHasLastPage();
+
+    /**
+     * Is there a known next page?
+     * 
+     * @return  true => getNextPage() will succeed
+     */
+    boolean getHasNextPage();
+    
+    /**
+     * Is there a known prev page?
+     * 
+     * @return  true => getPrevPage() will succeed
+     */
+    boolean getHasPrevPage();
+    
+    /**
+     * Gets the start row within result set for this page
+     * 
+     * @return  start row index
+     */
+    int getStartRow();
+    
+    /**
+     * Gets the end row within result set for this page
+     * 
+     * @return  end row index
+     */
+    int getEndRow();
+
+    /**
+     * Gets the count of rows within result set for this page
+     * 
+     * @return  row count
+     */
+    int getRowCount();
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/util/paging/Page.java b/remote-api/src/main/java/org/alfresco/repo/web/util/paging/Page.java
new file mode 100644
index 00000000000..5c538eaa8bd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/util/paging/Page.java
@@ -0,0 +1,97 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.util.paging;
+
+
+/**
+ * A Page within a Cursor.
+ * 
+ * @author davidc
+ */
+public class Page
+{
+    Paging.PageType pageType;
+    boolean zeroBasedIdx;
+    int startIdx;
+    int pageSize;
+    
+    /**
+     * Construct
+     * 
+     * @param pageType  Page or Window
+     * @param zeroBasedIdx  true => start index from 0
+     * @param startIdx  start index
+     * @param pageSize  page size
+     */
+    /*package*/ Page(Paging.PageType pageType, boolean zeroBasedIdx, int startIdx, int pageSize)
+    {
+        this.pageType = pageType;
+        this.zeroBasedIdx = zeroBasedIdx;
+        this.startIdx = startIdx;
+        this.pageSize = pageSize;
+    }
+
+    /**
+     * Gets the Page Type
+     * 
+     * @return  page type
+     */
+    /*package*/ Paging.PageType getType()
+    {
+        return pageType;
+    }
+    
+    /**
+     * Gets the page number
+     * 
+     * @return  page number
+     */
+    public int getNumber()
+    {
+        return startIdx;
+    }
+    
+    /**
+     * Gets the page size
+     * 
+     * @return  page size
+     */
+    public int getSize()
+    {
+        return pageSize;
+    }
+
+    /**
+     * Is zero based page index
+     * 
+     * @return  true => page number starts from zero
+     */
+    public boolean isZeroBasedIdx()
+    {
+        return zeroBasedIdx;
+    }
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/util/paging/PagedCursor.java b/remote-api/src/main/java/org/alfresco/repo/web/util/paging/PagedCursor.java
new file mode 100644
index 00000000000..547d1358d3e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/util/paging/PagedCursor.java
@@ -0,0 +1,225 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.util.paging;
+
+import java.io.Serializable;
+
+import org.alfresco.repo.web.util.paging.Paging.PageType;
+
+
+/**
+ * Implementation of cursor based on notion of a Page.
+ *  
+ * @author davidc
+ */
+public class PagedCursor implements Cursor, Serializable
+{
+    private static final long serialVersionUID = -1041155610387669590L;
+    
+    private boolean zeroBasedPage;
+    private boolean zeroBasedRow;
+    private int totalRows;
+    private int pageSize;
+    private int rowsPerPage;
+    private int page;
+    
+    
+    /**
+     * Construct
+     * 
+     * @param zeroBasedRow   true => row index starts at zero
+     * @param totalRows  total number of rows (-1 for don't know)
+     * @param zeroBasedPage  true => page number starts at zero
+     * @param page  page number
+     * @param pageSize  page size
+     */
+    /*package*/ PagedCursor(boolean zeroBasedRow, int totalRows, boolean zeroBasedPage, int page, int pageSize)
+    {
+        this.zeroBasedRow = zeroBasedRow;
+        this.totalRows = totalRows;
+        this.zeroBasedPage = zeroBasedPage;
+        this.page = (zeroBasedPage) ? page : page - 1;
+        this.pageSize = pageSize;
+        this.rowsPerPage = (pageSize <=0) ? totalRows : pageSize;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getPageType()
+     */
+    public String getPageType()
+    {
+        return PageType.PAGE.toString();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getPageSize()
+     */
+    public int getPageSize()
+    {
+        return pageSize;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getTotalPages()
+     */
+    public int getTotalPages()
+    {
+        if (totalRows <= 0)
+            return 0;
+        
+        int totalPages = (int)(totalRows / rowsPerPage);
+        totalPages += (totalRows % rowsPerPage != 0) ? 1 : 0;
+        return totalPages;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getTotalRows()
+     */
+    public int getTotalRows()
+    {
+        return totalRows;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getCurrentPage()
+     */
+    public int getCurrentPage()
+    {
+        return page + (zeroBasedPage ? 0 : 1);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getFirstPage()
+     */
+    public int getFirstPage()
+    {
+        if (totalRows <= 0)
+            return -1;
+        
+        return zeroBasedPage ? 0 : 1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getLastPage()
+     */
+    public int getLastPage()
+    {
+        if (totalRows <= 0)
+            return -1;
+        
+        return getTotalPages() - (zeroBasedPage ? 1 : 0);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getNextPage()
+     */
+    public int getNextPage()
+    {
+        return getCurrentPage() < getLastPage() ? getCurrentPage() + 1 : - 1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getPrevPage()
+     */
+    public int getPrevPage()
+    {
+        return page > 0 ? getCurrentPage() - 1 : - 1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#isInRange()
+     */
+    public boolean isInRange()
+    {
+        return page >= 0 && getCurrentPage() <= getLastPage();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#hasFirstPage()
+     */
+    public boolean getHasFirstPage()
+    {
+        return getFirstPage() != -1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#hasLastPage()
+     */
+    public boolean getHasLastPage()
+    {
+        return getLastPage() != -1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#hasNextPage()
+     */
+    public boolean getHasNextPage()
+    {
+        return getNextPage() != -1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#hasPrevPage()
+     */
+    public boolean getHasPrevPage()
+    {
+        return getPrevPage() != -1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getStartRow()
+     */
+    public int getStartRow()
+    {
+        if (totalRows <= 0)
+            return 0;
+        
+        return (page * rowsPerPage) + (zeroBasedRow ? 0 : 1);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getEndRow()
+     */
+    public int getEndRow()
+    {
+        if (totalRows <= 0)
+            return -1;
+        
+        return getStartRow() + Math.min(rowsPerPage, totalRows - (page * rowsPerPage)) - 1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getRowCount()
+     */
+    public int getRowCount()
+    {
+        if (totalRows <= 0)
+            return 0;
+        
+        return getEndRow() - getStartRow() + 1;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/util/paging/PagedResults.java b/remote-api/src/main/java/org/alfresco/repo/web/util/paging/PagedResults.java
new file mode 100644
index 00000000000..df8de8273a7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/util/paging/PagedResults.java
@@ -0,0 +1,108 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.util.paging;
+
+import java.io.Serializable;
+
+
+/**
+ * A Paged Result Set
+ * 
+ * @author davidc
+ */
+public class PagedResults implements Serializable
+{
+    private static final long serialVersionUID = 5905699888354619269L;
+    
+    private Object result;
+    private Object[] results;
+    private Cursor cursor;
+    
+
+    /**
+     * Construct
+     *  
+     * @param results  results for the page within cursor
+     * @param cursor  the cursor
+     */
+    /*Package*/ PagedResults(Object[] results, Cursor cursor)
+    {
+        this.result = results;
+        this.results = results;
+        this.cursor = cursor;
+    }
+
+    /**
+     * Construct
+     *  
+     * @param result  results for the page within cursor
+     * @param cursor  the cursor
+     */
+    /*Package*/ PagedResults(Object result, Cursor cursor)
+    {
+        this.result = result;
+        this.results = null;
+        this.cursor = cursor;
+    }
+
+    /**
+     * Get Results
+     * 
+     * @return  results
+     */
+    public Object[] getResults()
+    {
+        if (results == null)
+        {
+            if (result != null)
+            {
+                results = new Object[] {result};
+            }
+        }
+        return results;
+    }
+
+    /**
+     * Get Result
+     * 
+     * @return  result
+     */
+    public Object getResult()
+    {
+        return result;
+    }
+
+    /**
+     * Get Cursor
+     * 
+     * @return  cursor
+     */
+    public Cursor getCursor()
+    {
+        return cursor;
+    }
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/util/paging/Paging.java b/remote-api/src/main/java/org/alfresco/repo/web/util/paging/Paging.java
new file mode 100644
index 00000000000..790a84c4a55
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/util/paging/Paging.java
@@ -0,0 +1,311 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.util.paging;
+
+import java.util.Map;
+
+/**
+ * Paging.  A utility for maintaining paged indexes for a collection of N items.
+ * 
+ * There are two types of cursor:
+ * 
+ * a) Paged
+ * 
+ * This type of cursor is driven from a page number and page size.  Random access within
+ * the collection is possible by jumping straight to a page.  A simple scroll through
+ * the collection is supported by iterating through each next page.  
+ * 
+ * b) Windowed
+ * 
+ * This type of cursor is driven from a skip row count and maximum number of rows.  Random
+ * access is not supported.  The collection of items is simply scrolled through from
+ * start to end by iterating through each next set of rows.
+ * 
+ * In either case, a paging cursor provides a start row and end row which may be used
+ * to extract the items for the page from the collection of N items.
+ * 
+ * A zero (or less) page size or row maximum means "unlimited". 
+ * 
+ * Zero or one based Page and Rows indexes are supported.  By default, Pages are 1 based and
+ * Rows are 0 based.
+ *
+ * At any time, -1 is returned to represent "out of range" i.e. for next, previous, last page.
+ * 
+ * Pseudo-code for traversing through a collection of N items (10 at a time):
+ * 
+ * Paging paging = new Paging();
+ * Cursor page = paging.createCursor(N, paging.createPage(1, 10));
+ * while (page.isInRange())
+ * {
+ *    for (long i = page.getStartRow(); i <= page.getEndRow(); i++)
+ *    {
+ *       ...collection[i]...
+ *    }
+ *    page = paging.createCursor(N, paging.createPage(page.getNextPage(), page.getPageSize());
+ * }
+ * 
+ * Cursor window = paging.createCursor(N, paging.createWindow(0, 10));
+ * while (window.isInRange())
+ * {
+ *    for (long i = window.getStartRow(); i <= window.getEndRow(); i++)
+ *    {
+ *       ...collection[i]...
+ *    }
+ *    window = paging.createCursor(N, paging.createWindow(window.getNextPage(), window.getPageSize());   
+ * }
+ * 
+ * @author davidc
+ */
+public class Paging
+{
+    public enum PageType
+    {
+        PAGE,
+        WINDOW
+    };
+    
+    boolean zeroBasedPage = false;
+    boolean zeroBasedRow = true;
+
+    /**
+     * Sets zero based page index
+     * 
+     * Note: scoped to this paging cursor instance
+     * 
+     * @param zeroBasedPage  true => 0 based, false => 1 based
+     */
+    public void setZeroBasedPage(boolean zeroBasedPage)
+    {
+        this.zeroBasedPage = zeroBasedPage;
+    }
+
+    /**
+     * Is zero based page index?
+     * 
+     * Note: scoped to this paging cursor instance
+     *
+     * @return true => 0 based, false => 1 based
+     */
+    public boolean isZeroBasedPage()
+    {
+        return zeroBasedPage;
+    }
+    
+    /**
+     * Sets zero based row index
+     * 
+     * Note: scoped to this paging cursor instance
+     * 
+     * @param zeroBasedRow  true => 0 based, false => 1 based
+     */
+    public void setZeroBasedRow(boolean zeroBasedRow)
+    {
+        this.zeroBasedRow = zeroBasedRow;
+    }
+
+    /**
+     * Is zero based row index?
+     * 
+     * Note: scoped to this paging cursor instance
+     *
+     * @return true => 0 based, false => 1 based
+     */
+    public boolean isZeroBasedRow()
+    {
+        return zeroBasedRow;
+    }
+
+    /**
+     * Create a Page or Window from standardised request arguments
+     *
+     * For Paged based index (take precedence over window based index, if both are specified):
+     * 
+     * - request args
+     *     pageNo  => page number index 
+     *     pageSize  => size of page
+     * 
+     * For Window based index (as defined by CMIS):
+     * 
+     * - request args  (take precedence over header values if both are specified)
+     *     skipCount  => row number start index
+     *     maxItems  => size of page
+     * 
+     * @param args  request args
+     * @return  page (if pageNumber driven) or window (if skipCount driven)
+     */
+    public Page createPageOrWindow(Map<String, String> args)
+    {
+        // page number
+        Integer pageNo = null;
+        String strPageNo = args.get("pageNo");
+        if (strPageNo != null)
+        {
+            try
+            {
+                pageNo = new Integer(strPageNo);
+            }
+            catch(NumberFormatException e) {};
+        }
+        
+        // page size
+        Integer pageSize = null;
+        String strPageSize = args.get("pageSize");
+        if (strPageSize != null)
+        {
+            try
+            {
+                pageSize = new Integer(strPageSize);
+            }
+            catch(NumberFormatException e) {};
+        }
+        
+        // skip count
+        Integer skipCount = null;
+        String strSkipCount = args.get("skipCount");
+        if (strSkipCount != null)
+        {
+            try
+            {
+                skipCount = new Integer(strSkipCount);
+            }
+            catch(NumberFormatException e) {};
+        }
+
+        // max items
+        Integer maxItems = null;
+        String strMaxItems = args.get("maxItems");
+        if (strMaxItems != null)
+        {
+            try
+            {
+                maxItems = new Integer(strMaxItems);
+            }
+            catch(NumberFormatException e) {};
+        }
+
+        return createPageOrWindow(pageNo, pageSize, skipCount, maxItems);
+    }
+    
+    /**
+     * Create a Page or Window
+     * 
+     * @param pageNumber  page number (optional and paired with pageSize)
+     * @param pageSize   page size (optional and paired with pageNumber)
+     * @param skipCount  skipCount (optional and paired with maxItems)
+     * @param maxItems  maxItems (optional and paired with skipCount)
+     * @return  page (if pageNumber driven) or window (if skipCount driven)
+     */
+    public Page createPageOrWindow(Integer pageNumber, Integer pageSize, Integer skipCount, Integer maxItems)
+    {
+        if (pageNumber != null || pageSize != null)
+        {
+            return createPage(pageNumber == null ? isZeroBasedPage() ? 0 : 1 : pageNumber, pageSize == null ? -1 : pageSize);
+        }
+        else if (skipCount != null || maxItems != null)
+        {
+            return createWindow(skipCount == null ? isZeroBasedRow() ? 0 : 1 : skipCount, maxItems == null ? -1 : maxItems);
+        }
+        return createUnlimitedPage();
+    }
+    
+    /**
+     * Create a Page
+     * 
+     * @param pageNumber  page number
+     * @param pageSize  page size
+     * @return  the page
+     */
+    public Page createPage(int pageNumber, int pageSize)
+    {
+        return new Page(PageType.PAGE, zeroBasedPage, pageNumber, pageSize);
+    }
+    
+    /**
+     * Create an unlimited Page
+     * 
+     * @return  page (single Page starting at first page of unlimited page size)
+     */
+    public Page createUnlimitedPage()
+    {
+        return new Page(PageType.PAGE, zeroBasedPage, zeroBasedPage ? 0 : 1, -1);
+    }
+    
+    /**
+     * Create a Window
+     * @param skipRows  number of rows to skip
+     * @param maxRows  maximum number of rows in window
+     * @return  the window
+     */
+    public Page createWindow(int skipRows, int maxRows)
+    {
+        return new Page(PageType.WINDOW, zeroBasedRow, skipRows, maxRows);
+    }
+    
+    /**
+     * Create a Cursor
+     * 
+     * @param totalRows  total number of rows in cursor (< 0 for don't know)
+     * @param page  the page / window within cursor
+     * @return  the cursor
+     */
+    public Cursor createCursor(int totalRows, Page page)
+    {
+        if (page.getType() == PageType.PAGE)
+        {
+            return new PagedCursor(zeroBasedRow, totalRows, page.zeroBasedIdx, page.startIdx, page.pageSize);
+        }
+        else if (page.getType() == PageType.WINDOW)
+        {
+            return new WindowedCursor(zeroBasedRow, totalRows, page.startIdx, page.pageSize);
+        }
+        return null;
+    }
+    
+    /**
+     * Create a Paged Result Set
+     * 
+     * @param results  the results for the page within the cursor
+     * @param cursor  the cursor
+     * @return  the paged result set
+     */
+    public PagedResults createPagedResults(Object[] results, Cursor cursor)
+    {
+        return new PagedResults(results, cursor);
+    }
+
+    /**
+     * Create a Paged Result Set
+     * 
+     * @param result  the results for the page within the cursor
+     * @param cursor  the cursor
+     * @return  the paged result set
+     */
+    public PagedResults createPagedResult(Object result, Cursor cursor)
+    {
+        return new PagedResults(result, cursor);
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/web/util/paging/WindowedCursor.java b/remote-api/src/main/java/org/alfresco/repo/web/util/paging/WindowedCursor.java
new file mode 100644
index 00000000000..563c9efba35
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/web/util/paging/WindowedCursor.java
@@ -0,0 +1,213 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.util.paging;
+
+import java.io.Serializable;
+
+import org.alfresco.repo.web.util.paging.Paging.PageType;
+
+
+/**
+ * Cursor implementation based on notion of a Window.
+ * 
+ * @author davidc
+ */
+public class WindowedCursor implements Cursor, Serializable
+{
+    private static final long serialVersionUID = 521131539938276413L;
+
+    private boolean zeroBasedRow;
+    private int totalRows;
+    private int skipRows;
+    private int maxRows;
+    private int rowsPerPage;
+    
+    /**
+     * Construct
+     * 
+     * @param zeroBasedRow  true => 0 based, false => 1 based
+     * @param totalRows  total rows in collection
+     * @param skipRows  number of rows to skip (0 - none)
+     * @param maxRows  maximum number of rows in window
+     */
+    WindowedCursor(boolean zeroBasedRow, int totalRows, int skipRows, int maxRows)
+    {
+        this.zeroBasedRow = zeroBasedRow;
+        this.totalRows = totalRows;
+        this.skipRows = skipRows;
+        this.maxRows = maxRows;
+        this.rowsPerPage = (maxRows <= 0) ? totalRows - skipRows : maxRows;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getPageType()
+     */
+    public String getPageType()
+    {
+        return PageType.WINDOW.toString();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getPageSize()
+     */
+    public int getPageSize()
+    {
+        return maxRows;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getTotalPages()
+     */
+    public int getTotalPages()
+    {
+        return -1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getTotalRows()
+     */
+    public int getTotalRows()
+    {
+        return totalRows;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getCurrentPage()
+     */
+    public int getCurrentPage()
+    {
+        return skipRows;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getFirstPage()
+     */
+    public int getFirstPage()
+    {
+        if (totalRows <=0)
+            return -1;
+        
+        return zeroBasedRow ? 0 : 1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getLastPage()
+     */
+    public int getLastPage()
+    {
+        return -1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getNextPage()
+     */
+    public int getNextPage()
+    {
+        return (skipRows + rowsPerPage < totalRows) ? skipRows + maxRows : -1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getPrevPage()
+     */
+    public int getPrevPage()
+    {
+        return (skipRows > 0) ? Math.max(0, skipRows - maxRows) : -1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#isInRange()
+     */
+    public boolean isInRange()
+    {
+        return skipRows >= 0 && skipRows < totalRows;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#hasFirstPage()
+     */
+    public boolean getHasFirstPage()
+    {
+        return getFirstPage() != -1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#hasLastPage()
+     */
+    public boolean getHasLastPage()
+    {
+        return getLastPage() != -1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#hasNextPage()
+     */
+    public boolean getHasNextPage()
+    {
+        return getNextPage() != -1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#hasPrevPage()
+     */
+    public boolean getHasPrevPage()
+    {
+        return getPrevPage() != -1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getStartRow()
+     */
+    public int getStartRow()
+    {
+        if (totalRows <= 0)
+            return 0;
+
+        return skipRows + (zeroBasedRow ? 0 : 1);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getEndRow()
+     */
+    public int getEndRow()
+    {
+        if (totalRows <= 0)
+            return -1;
+        
+        return getStartRow() + Math.min(rowsPerPage, totalRows - skipRows) - 1;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.web.util.paging.Cursor#getRowCount()
+     */
+    public int getRowCount()
+    {
+        if (totalRows <= 0)
+            return 0;
+        
+        return getEndRow() - getStartRow() + 1;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/ActivityPostProducer.java b/remote-api/src/main/java/org/alfresco/repo/webdav/ActivityPostProducer.java
new file mode 100644
index 00000000000..1509897b0c7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/ActivityPostProducer.java
@@ -0,0 +1,39 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+
+/**
+ * WebDAVMethods that are able to post activity data must implement this interface
+ * in order that the CloudWebDAVServlet will supply the object with an
+ * ActivityPoster collaborator.
+ * 
+ * @author Matt Ward
+ */
+public interface ActivityPostProducer
+{
+    void setActivityPoster(WebDAVActivityPoster activityPoster);
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/ActivityPosterImpl.java b/remote-api/src/main/java/org/alfresco/repo/webdav/ActivityPosterImpl.java
new file mode 100644
index 00000000000..3a1e6486bf4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/ActivityPosterImpl.java
@@ -0,0 +1,151 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.sync.repo.Client;
+import org.alfresco.sync.repo.Client.ClientType;
+import org.alfresco.repo.activities.ActivityType;
+import org.alfresco.service.cmr.activities.ActivityPoster;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * WebDAV methods may use an instance of this class to post activity data.
+ * 
+ * @see WebDAVActivityPoster
+ * @author Matt Ward
+ */
+public class ActivityPosterImpl implements WebDAVActivityPoster
+{
+    private String appTool;
+    private ActivityPoster poster;
+    
+    protected static Log logger = LogFactory.getLog("org.alfresco.webdav.protocol.activity");
+    
+    /**
+     * Default constructor. 
+     */
+    public ActivityPosterImpl()
+    {
+    }
+
+    /**
+     * Constructor
+     *
+     * @param appTool String
+     * @param poster ActivityPoster
+     */
+    public ActivityPosterImpl(String appTool, ActivityPoster poster)
+    {
+        this.appTool = appTool;
+        this.poster = poster;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void postFileFolderAdded(
+                String siteId,
+                String tenantDomain,
+                String path,
+                FileInfo nodeInfo) throws WebDAVServerException
+    {
+        postFileFolderActivity(nodeInfo.isFolder() ? ActivityType.FOLDER_ADDED : ActivityType.FILE_ADDED, 
+                               siteId, tenantDomain, nodeInfo.isFolder() ? path : null, null, nodeInfo);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void postFileFolderUpdated(
+                String siteId,
+                String tenantDomain,
+                FileInfo nodeInfo) throws WebDAVServerException
+    {
+        if (! nodeInfo.isFolder())
+        {
+            postFileFolderActivity(ActivityType.FILE_UPDATED, siteId, tenantDomain, null, null, nodeInfo);
+        }
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void postFileFolderDeleted(
+                String siteId,
+                String tenantDomain,
+                String parentPath,
+                FileInfo parentNodeInfo,
+                FileInfo nodeInfo) throws WebDAVServerException
+    {
+        postFileFolderActivity(nodeInfo.isFolder() ? ActivityType.FOLDER_DELETED : ActivityType.FILE_DELETED, siteId, tenantDomain, parentPath, parentNodeInfo.getNodeRef(), nodeInfo);
+    }
+    
+    
+    private void postFileFolderActivity(
+                String activityType,
+                String siteId,
+                String tenantDomain,
+                String path,
+                NodeRef parentNodeRef,
+                FileInfo contentNodeInfo) throws WebDAVServerException
+    {
+        String fileName = contentNodeInfo.getName();
+        NodeRef nodeRef = contentNodeInfo.getNodeRef();
+        
+        try
+        {
+            poster.postFileFolderActivity(activityType, path, tenantDomain, siteId,
+                                   parentNodeRef, nodeRef, fileName,
+                                   appTool, Client.asType(ClientType.webdav),contentNodeInfo);
+        }
+        catch (AlfrescoRuntimeException are)
+        {
+            logger.error("Failed to post activity.", are);
+            throw new WebDAVServerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        }
+    }
+    
+
+    public void setAppTool(String appTool)
+    {
+        this.appTool = appTool;
+    }
+
+    public void setPoster(ActivityPoster poster)
+    {
+        this.poster = poster;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/CopyMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/CopyMethod.java
new file mode 100644
index 00000000000..fed4bfddcfe
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/CopyMethod.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * Implements the WebDAV COPY method
+ * 
+ * @author Derek Hulley
+ */
+public class CopyMethod extends MoveMethod
+{
+    /**
+     * Default constructor
+     */
+    public CopyMethod()
+    {
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.repo.webdav.MoveMethod#isMove()
+     */
+    @Override
+    protected boolean isMove()
+    {
+        return false;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/DeleteMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/DeleteMethod.java
new file mode 100644
index 00000000000..88793f82ca7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/DeleteMethod.java
@@ -0,0 +1,265 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.webdav.WebDavService;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.util.FileFilterMode;
+
+/**
+ * Implements the WebDAV DELETE method
+ * 
+ * @author gavinc
+ */
+public class DeleteMethod extends WebDAVMethod implements ActivityPostProducer
+{
+    private WebDAVActivityPoster activityPoster;
+    
+    /**
+     * Default constructor
+     */
+    public DeleteMethod()
+    {
+    }
+
+    /**
+     * Parse the request headers
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestHeaders() throws WebDAVServerException
+    {
+        parseIfHeader();
+    }
+
+    /**
+     * Parse the request body
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestBody() throws WebDAVServerException
+    {
+        // Nothing to do in this method
+    }
+
+    /**
+     * @deprecated MNT-8704: WebDAV:Content does not disappear after being deleted
+     */
+    @Deprecated
+    private static final Timer deleteDelayTimer = new Timer();
+    
+    /**
+     * Execute the request
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void executeImpl() throws WebDAVServerException, Exception
+    {
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("WebDAV DELETE: " + getPath());
+        }
+        
+        final FileFolderService fileFolderService = getFileFolderService();
+        final PermissionService permissionService = getPermissionService();
+
+        NodeRef rootNodeRef = getRootNodeRef();
+
+        String path = getPath();
+        FileInfo fileInfo = null;
+        try
+        {
+            // get the node to delete
+            fileInfo = getNodeForPath(rootNodeRef, path);
+        }
+        catch (FileNotFoundException e)
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Node not found: " + getPath());
+            }
+            throw new WebDAVServerException(HttpServletResponse.SC_NOT_FOUND);
+        }
+
+        checkNode(fileInfo);
+
+        final NodeService nodeService = getNodeService();
+        final NodeRef nodeRef = fileInfo.getNodeRef();
+        
+        if (permissionService.hasPermission(nodeRef, PermissionService.DELETE) == AccessStatus.ALLOWED)
+        {
+        	// As this content will be deleted, we need to extract some info before it's no longer available.
+        	String siteId = getSiteId();
+        	NodeRef deletedNodeRef = fileInfo.getNodeRef();
+        	FileInfo parentFile = getDAVHelper().getParentNodeForPath(getRootNodeRef(), path);
+
+        	// Don't post activity data for hidden files, resource forks etc.
+        	if (!getDAVHelper().isRenameShuffle(path))
+        	{
+        		postActivity(parentFile, fileInfo, siteId);
+        	}
+            
+            // MNT-181: working copies and versioned nodes are hidden rather than deleted
+            if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY) || nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE))
+            {
+                // Mark content as hidden.  This breaks many contracts and will be fixed for "ALF-18619 WebDAV/SPP file shuffles" 
+                fileFolderService.setHidden(nodeRef, true);
+                {
+                    // Workaround for MNT-8704: WebDAV:Content does not disappear after being deleted
+                    // Get the current user
+                    final String deleteDelayUser = AuthenticationUtil.getFullyAuthenticatedUser();
+                    // Add a timed task to really delete the file
+                    TimerTask deleteDelayTask = new TimerTask()
+                    {
+                        @Override
+                        public void run()
+                        {
+                            RunAsWork<Void> deleteDelayRunAs = new RunAsWork<Void>()
+                            {
+                                @Override
+                                public Void doWork() throws Exception
+                                {
+                                     // Ignore if it is NOT hidden: the shuffle may have finished; the operation may have failed
+                                    if (!nodeService.exists(nodeRef) || !fileFolderService.isHidden(nodeRef))
+                                    {
+                                        return null;
+                                    }
+                                    
+                                    // Since this will run in a different thread, the client thread-local must be set
+                                    // or else unhiding the node will not unhide it for WebDAV.
+                                    FileFilterMode.setClient(FileFilterMode.Client.webdav);
+                                    
+                                    // Unhide the node, e.g. for archiving
+                                    fileFolderService.setHidden(nodeRef, false);
+                                    
+                                    // This is the transaction-aware service
+                                    fileFolderService.delete(nodeRef);
+                                    return null;
+                                }
+                            };
+                            try
+                            {
+                                AuthenticationUtil.runAs(deleteDelayRunAs, deleteDelayUser);
+                            }
+                            catch (Throwable e)
+                            {
+                                // consume exception to avoid it leaking from the TimerTask and causing the Timer to
+                                // no longer accept tasks to be scheduled.
+                                logger.info("Exception thrown during WebDAV delete timer task.", e);
+                            }
+                        }
+                    };
+                    // Schedule a real delete 5 seconds after the current time
+                    deleteDelayTimer.schedule(deleteDelayTask, 5000L);
+                }
+                //MNT-16454: It should be possible to delete files with versionable aspects using webdav; check that 
+                //node is is actually locked before unlocking to avoid access denied
+                if(getDAVLockService().getLockInfo(nodeRef).isLocked())
+                {
+                    getDAVLockService().unlock(nodeRef);
+                }
+            }
+            // We just ensure already-hidden nodes are left unlocked
+            else if (fileFolderService.isHidden(nodeRef))
+            {
+            	getDAVLockService().unlock(nodeRef);            
+            }
+            // A 'real' delete
+            else
+            {
+                // Delete it
+                fileFolderService.delete(deletedNodeRef);
+            }
+        }
+        else
+        {
+            // access denied
+            throw new WebDAVServerException(HttpServletResponse.SC_FORBIDDEN);
+        }
+    }
+
+    
+    /**
+     * Create a deletion activity post.
+     * 
+     * @param parent The FileInfo for the deleted file's parent.
+     * @param deletedFile The FileInfo for the deleted file.
+     * @throws WebDAVServerException 
+     */
+    protected void postActivity(FileInfo parent, FileInfo deletedFile, String siteId) throws WebDAVServerException
+    {
+        WebDavService davService = getDAVHelper().getServiceRegistry().getWebDavService();
+        if (!davService.activitiesEnabled())
+        {
+            // Don't post activities if this behaviour is disabled.
+            return;
+        }
+        
+        String tenantDomain = getTenantDomain();
+        
+        // Check there is enough information to publish site activity.
+        if (!siteId.equals(WebDAVHelper.EMPTY_SITE_ID))
+        {
+            SiteService siteService = getServiceRegistry().getSiteService();
+            NodeRef documentLibrary = siteService.getContainer(siteId, SiteService.DOCUMENT_LIBRARY);
+            String parentPath = "/";
+            try
+            {
+                parentPath = getDAVHelper().getPathFromNode(documentLibrary, parent.getNodeRef());
+            }
+            catch (FileNotFoundException error)
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("No " + SiteService.DOCUMENT_LIBRARY + " container found.");
+                }
+            }
+            
+            activityPoster.postFileFolderDeleted(siteId, tenantDomain, parentPath, parent, deletedFile);
+        }  
+    }
+    
+    @Override
+    public void setActivityPoster(WebDAVActivityPoster activityPoster)
+    {
+        this.activityPoster = activityPoster;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/ExceptionHandler.java b/remote-api/src/main/java/org/alfresco/repo/webdav/ExceptionHandler.java
new file mode 100644
index 00000000000..11d154e04bb
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/ExceptionHandler.java
@@ -0,0 +1,113 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Create a suitable HttpServletResponse when face with an exception.
+ * 
+ * @author Matt Ward
+ */
+public class ExceptionHandler
+{
+    private static final Log logger = LogFactory.getLog(ExceptionHandler.class); 
+    private Throwable e;
+    private final HttpServletRequest request;
+    private final HttpServletResponse response;
+    
+    /**
+     * Create an ExceptionHandler.
+     * 
+     * @param e Throwable
+     * @param request HttpServletRequest
+     * @param response HttpServletResponse
+     */
+    public ExceptionHandler(Throwable e, HttpServletRequest request, HttpServletResponse response)
+    {
+        this.e = e;
+        this.request = request;
+        this.response = response;
+    }
+    
+
+    public void handle() throws IOException
+    {
+        if (!(e instanceof WebDAVServerException) && e.getCause() != null)
+        {
+            if (e.getCause() instanceof WebDAVServerException)
+            {
+                e = e.getCause();
+            }
+        }
+        // Work out how to handle the error
+        if (e instanceof WebDAVServerException)
+        {
+            WebDAVServerException error = (WebDAVServerException) e;
+            if (error.getCause() != null)
+            {
+                logger.error("Exception thrown.", e);
+            }
+
+            if (logger.isDebugEnabled())
+            {
+                // Show what status code the method sent back
+                
+                logger.debug(request.getMethod() + " is returning status code: " + error.getHttpStatusCode());
+            }
+
+            if (response.isCommitted())
+            {
+                logger.warn("Could not return the status code to the client as the response has already been committed!");
+            }
+            else
+            {
+                response.sendError(error.getHttpStatusCode());
+            }
+        }
+        else
+        {
+            logger.error("Exception thrown.", e);
+
+            if (response.isCommitted())
+            {
+                logger.warn("Could not return the internal server error code to the client as the response has already been committed!");
+            }
+            else
+            {
+                response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+            }
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/GetMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/GetMethod.java
new file mode 100644
index 00000000000..c9647f6b640
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/GetMethod.java
@@ -0,0 +1,786 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.Writer;
+import java.net.SocketException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.filestore.FileContentReader;
+import org.alfresco.repo.web.util.HttpRangeProcessor;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.repository.datatype.TypeConverter;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.extensions.surf.util.URLEncoder;
+
+/**
+ * Implements the WebDAV GET method
+ * 
+ * @author gavinc
+ */
+public class GetMethod extends WebDAVMethod
+{
+    // Request parameters
+
+    private static final String RANGE_HEADER_UNIT_SPECIFIER = "bytes=";
+    private static final int MAX_RECURSE_ERROR_STACK = 20;
+    private ArrayList<String> ifMatchTags = null;
+    private ArrayList<String> ifNoneMatchTags = null;
+    private Date m_ifModifiedSince = null;
+    private Date m_ifUnModifiedSince = null;
+
+    protected boolean m_returnContent = true;
+    private String byteRanges;
+
+    /**
+     * Default constructor
+     */
+    public GetMethod()
+    {
+    }
+
+    /**
+     * Parse the request headers
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestHeaders() throws WebDAVServerException
+    {
+        // If the range header is present output a warning, add support later
+
+        String strRange = m_request.getHeader(WebDAV.HEADER_RANGE);
+
+        if (strRange != null && strRange.length() > 0)
+        {
+            byteRanges = strRange;
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Range header supplied: " + byteRanges);
+            }
+        }
+
+        // Capture all the If headers, process later
+
+        String strIfMatch = m_request.getHeader(WebDAV.HEADER_IF_MATCH);
+
+        if (strIfMatch != null && strIfMatch.length() > 0)
+        {
+            ifMatchTags = parseETags(strIfMatch);
+        }
+
+        String strIfNoneMatch = m_request.getHeader(WebDAV.HEADER_IF_NONE_MATCH);
+        if (strIfNoneMatch != null && strIfNoneMatch.length() > 0)
+        {
+            ifNoneMatchTags = parseETags(strIfNoneMatch);
+        }
+
+        // Parse the dates
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat(WebDAV.HEADER_IF_DATE_FORMAT);
+        String strIfModifiedSince = m_request.getHeader(WebDAV.HEADER_IF_MODIFIED_SINCE);
+
+        if (strIfModifiedSince != null && strIfModifiedSince.length() > 0)
+        {
+            try
+            {
+                m_ifModifiedSince = dateFormat.parse(strIfModifiedSince);
+            }
+            catch (ParseException e)
+            {
+                logger.warn("Failed to parse If-Modified-Since date of " + strIfModifiedSince);
+            }
+        }
+
+        String strIfUnModifiedSince = m_request.getHeader(WebDAV.HEADER_IF_UNMODIFIED_SINCE);
+        if (strIfUnModifiedSince != null && strIfUnModifiedSince.length() > 0)
+        {
+            try
+            {
+                m_ifUnModifiedSince = dateFormat.parse(strIfUnModifiedSince);
+            }
+            catch (ParseException e)
+            {
+                logger.warn("Failed to parse If-Unmodified-Since date of " + strIfUnModifiedSince);
+            }
+        }
+    }
+
+    /**
+     * Parse the request body
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestBody() throws WebDAVServerException
+    {
+        // Nothing to do in this method
+    }
+
+    /**
+     * @return          Returns <tt>true</tt> always
+     */
+    @Override
+    protected boolean isReadOnly()
+    {
+        return true;
+    }
+
+    /**
+     * Exceute the WebDAV request
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void executeImpl() throws WebDAVServerException, Exception
+    {
+        FileFolderService fileFolderService = getFileFolderService();
+        NodeRef rootNodeRef = getRootNodeRef();
+        String path = getPath();
+
+        if (!m_returnContent)
+        {
+            // There are multiple cases where no content is sent (due to a HEAD request).
+            // All of them require that the content length is set appropriately.
+            m_response.setContentLength(0);
+        }
+        
+        FileInfo nodeInfo = null;
+        try
+        {
+            nodeInfo = getDAVHelper().getNodeForPath(rootNodeRef, path);
+        }
+        catch (FileNotFoundException e)
+        {
+            throw new WebDAVServerException(HttpServletResponse.SC_NOT_FOUND);
+        }
+        
+        FileInfo realNodeInfo = nodeInfo;
+
+        // ALF-12008: Due to Windows Explorer's URL concatenation behaviour, we must present links as shortcuts to the real URL, rather than direct hrefs
+        // This is at least consistent with the way the CIFS server handles links. See org.alfresco.filesys.repo.ContentDiskDriver.openFile().
+        if (realNodeInfo.isLink())
+        {
+            Path pathToNode = getNodeService().getPath(nodeInfo.getLinkNodeRef());
+            if (pathToNode.size() > 2)
+            {
+                pathToNode = pathToNode.subPath(2, pathToNode.size() -1);
+            }
+
+            String rootURL = getDAVHelper().getURLForPath(m_request, pathToNode.toDisplayPath(getNodeService(), getPermissionService()), true);
+            if (rootURL.endsWith(WebDAVHelper.PathSeperator) == false)
+            {
+                rootURL = rootURL + WebDAVHelper.PathSeperator;
+            }
+           
+            String fname = (String) getNodeService().getProperty(nodeInfo.getLinkNodeRef(), ContentModel.PROP_NAME);
+            StringBuilder urlStr = new StringBuilder(200);
+            urlStr.append("[InternetShortcut]\r\n");
+            urlStr.append("URL=file://");
+            urlStr.append(m_request.getServerName());
+            // Only append the port if it is non-default for compatibility with XP
+            int port = m_request.getServerPort();
+            if (port != 80)
+            {
+                urlStr.append(":").append(port);
+            }
+            urlStr.append(rootURL).append(WebDAVHelper.encodeURL(fname, m_userAgent));
+            urlStr.append("\r\n");
+           
+            m_response.setHeader(WebDAV.HEADER_CONTENT_TYPE, "text/plain; charset=ISO-8859-1");
+            m_response.setHeader(WebDAV.HEADER_CONTENT_LENGTH, String.valueOf(urlStr.length()));
+            m_response.getWriter().write(urlStr.toString());
+        }
+        // Check if the node is a folder
+        else if (realNodeInfo.isFolder())
+        {
+            // is content required
+            if (!m_returnContent)
+            {
+                // ALF-7883 fix, HEAD for collection (see http://www.webdav.org/specs/rfc2518.html#rfc.section.8.4)
+                return;
+            }
+            
+            // Generate a folder listing
+            m_response.setContentType("text/html;charset=UTF-8");
+            generateDirectoryListing(nodeInfo);
+        }
+        else
+        {
+            // Return the node details, and content if requested, check that the node passes the pre-conditions
+
+            checkPreConditions(realNodeInfo);
+
+            // Build the response header
+            m_response.setHeader(WebDAV.HEADER_ETAG, getDAVHelper().makeQuotedETag(nodeInfo));
+
+            Date modifiedDate = realNodeInfo.getModifiedDate();
+            if (modifiedDate != null)
+            {
+                long modDate = DefaultTypeConverter.INSTANCE.longValue(modifiedDate);
+                m_response.setHeader(WebDAV.HEADER_LAST_MODIFIED, WebDAV.formatHeaderDate(modDate));
+            }
+            
+            m_response.setHeader("Content-Disposition", getContentDispositionHeader(nodeInfo));
+
+            ContentReader reader = fileFolderService.getReader(realNodeInfo.getNodeRef());
+            // ensure that we generate something, even if the content is missing
+            reader = FileContentReader.getSafeContentReader(
+                    (ContentReader) reader,
+                    I18NUtil.getMessage(FileContentReader.MSG_MISSING_CONTENT),
+                    realNodeInfo.getNodeRef(), reader);
+            
+            readContent(realNodeInfo, reader);
+        }
+    }
+
+
+    protected void readContent(FileInfo realNodeInfo, ContentReader reader) throws IOException,
+                WebDAVServerException
+    {
+        try
+        {
+            attemptReadContent(realNodeInfo, reader);                
+        }
+        catch (final Throwable e)
+        {
+            boolean logAsError = true;
+            Throwable t = e;
+            // MNT-8989: Traverse the exception cause hierarchy, if we find a SocketException at fault,
+            // assume this is a dropped connection and do not log a stack trace.
+            int levels = 0;
+            while (t.getCause() != null)
+            {
+                if (t == t.getCause() || ++levels == MAX_RECURSE_ERROR_STACK)
+                {
+                    // Avoid infinite loops.
+                    break;
+                }
+                t = t.getCause();
+                if (t instanceof SocketException || t.getClass().getSimpleName().equals("ClientAbortException"))
+                {
+                    logAsError = false;
+                }
+            }
+            
+            if (logAsError && logger.isErrorEnabled())
+            {
+                // Only log at ERROR level when not a SocketException as underlying cause.
+                logger.error("Error while reading content", e);
+            }
+            else if (logger.isDebugEnabled())
+            {
+                // Log other errors at DEBUG level.
+                logger.debug("Error while reading content", e);                
+            }
+            
+            // Note no cause parameter supplied - avoid logging stack trace elsewhere.
+            throw new WebDAVServerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    protected void attemptReadContent(FileInfo realNodeInfo, ContentReader reader) throws IOException
+    {
+        if (byteRanges != null && byteRanges.startsWith(RANGE_HEADER_UNIT_SPECIFIER))
+        {
+            HttpRangeProcessor rangeProcessor = new HttpRangeProcessor(getContentService());
+            String userAgent = m_request.getHeader(WebDAV.HEADER_USER_AGENT);
+            
+            if (m_returnContent)
+            {
+                m_davHelper.publishReadEvent(realNodeInfo, reader.getMimetype(), reader.getSize(), byteRanges.substring(6), reader.getEncoding());
+                rangeProcessor.processRange(
+                        m_response,
+                        reader,
+                        byteRanges.substring(6),
+                        realNodeInfo.getNodeRef(),
+                        ContentModel.PROP_CONTENT,
+                        reader.getMimetype(),
+                        userAgent);
+            }
+        }
+        else
+        {
+                if (m_returnContent)
+                {
+                // there is content associated with the node
+                m_response.setHeader(WebDAV.HEADER_CONTENT_LENGTH, Long.toString(reader.getSize()));
+                m_response.setHeader(WebDAV.HEADER_CONTENT_TYPE, reader.getMimetype());
+                m_davHelper.publishReadEvent(realNodeInfo, reader.getMimetype(), reader.getSize(), null, reader.getEncoding());
+                // copy the content to the response output stream
+                reader.getContent(m_response.getOutputStream());
+            }
+        }
+    }
+
+    protected String getContentDispositionHeader(FileInfo nodeInfo)
+    {
+        String filename = nodeInfo.getName();
+        StringBuilder sb = new StringBuilder();
+        sb.append("attachment; filename=\"");
+        for(int i = 0; i < filename.length(); i++)
+        {
+            char c = filename.charAt(i);
+            if(isValidQuotedStringHeaderParamChar(c))
+            {
+                sb.append(c);
+            }
+            else
+            {
+                sb.append(" ");
+            }
+        }
+        sb.append("\"; filename*=UTF-8''");
+        sb.append(URLEncoder.encode(filename));
+        return sb.toString();
+    }
+    
+    protected boolean isValidQuotedStringHeaderParamChar(char c)
+    {
+        // see RFC2616 section 2.2: 
+        // qdtext         = <any TEXT except <">>
+        // TEXT           = <any OCTET except CTLs, but including LWS>
+        // CTL            = <any US-ASCII control character (octets 0 - 31) and DEL (127)>
+        // A CRLF is allowed in the definition of TEXT only as part of a header field continuation.
+        // Note: we dis-allow header field continuation
+        return     (c < 256)  // message header param fields must be ISO-8859-1. Lower 256 codepoints of Unicode represent ISO-8859-1
+                && (c != 127) // CTL - see RFC2616 section 2.2
+                && (c != '"') // <">
+                && (c > 31);  // CTL - see RFC2616 section 2.2
+    }
+
+    /**
+     * Checks the If header conditions
+     * 
+     * @param nodeInfo the node to check
+     * @throws WebDAVServerException if a pre-condition is not met
+     */
+    private void checkPreConditions(FileInfo nodeInfo) throws WebDAVServerException
+    {
+        // Make an etag for the node
+
+        String strETag = getDAVHelper().makeQuotedETag(nodeInfo);
+        TypeConverter typeConv = DefaultTypeConverter.INSTANCE;
+
+        // Check the If-Match header, don't send any content back if none of the tags in
+        // the list match the etag, and the wildcard is not present
+
+        if (ifMatchTags != null)
+        {
+            if (ifMatchTags.contains(WebDAV.ASTERISK) == false && ifMatchTags.contains(strETag) == false)
+            {
+                throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
+            }
+        }
+
+        // Check the If-None-Match header, don't send any content back if any of the tags
+        // in the list match the etag, or the wildcard is present
+
+        if (ifNoneMatchTags != null)
+        {
+            if (ifNoneMatchTags.contains(WebDAV.ASTERISK) || ifNoneMatchTags.contains(strETag))
+            {
+                throw new WebDAVServerException(HttpServletResponse.SC_NOT_MODIFIED);
+            }
+        }
+
+        // Check the modified since list, if the If-None-Match header was not specified
+
+        if (m_ifModifiedSince != null && ifNoneMatchTags == null)
+        {
+            Date lastModifiedDate = nodeInfo.getModifiedDate();
+
+            long fileLastModified = lastModifiedDate != null ? typeConv.longValue(lastModifiedDate) : 0L;
+            long modifiedSince = m_ifModifiedSince.getTime();
+
+            if (fileLastModified != 0L && fileLastModified <= modifiedSince)
+            {
+                throw new WebDAVServerException(HttpServletResponse.SC_NOT_MODIFIED);
+            }
+        }
+
+        // Check the un-modified since list
+
+        if (m_ifUnModifiedSince != null)
+        {
+            Date lastModifiedDate = nodeInfo.getModifiedDate();
+
+            long fileLastModified = lastModifiedDate != null ? typeConv.longValue(lastModifiedDate) : 0L;
+            long unModifiedSince = m_ifUnModifiedSince.getTime();
+
+            if (fileLastModified >= unModifiedSince)
+            {
+                throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
+            }
+        }
+    }
+
+    /**
+     * Parses the given ETag header into a list of separate ETags
+     * 
+     * @param strETagHeader The header to parse
+     * @return A list of ETags
+     */
+    private ArrayList<String> parseETags(String strETagHeader)
+    {
+        ArrayList<String> list = new ArrayList<String>();
+
+        StringTokenizer tokenizer = new StringTokenizer(strETagHeader, WebDAV.HEADER_VALUE_SEPARATOR);
+        while (tokenizer.hasMoreTokens())
+        {
+            list.add(tokenizer.nextToken().trim());
+        }
+
+        return list;
+    }
+
+    /**
+     * Generates a HTML representation of the contents of the path represented by the given node
+     * 
+     * @param fileInfo the file to use
+     */
+    private void generateDirectoryListing(FileInfo fileInfo)
+    {
+        MimetypeService mimeTypeService = getMimetypeService();
+        NodeService nodeService = getNodeService();
+
+        Writer writer = null;
+
+        try
+        {
+            writer = m_response.getWriter();
+
+            boolean wasLink = false;
+            if (fileInfo.isLink())
+            {
+                fileInfo = getFileFolderService().getFileInfo(fileInfo.getLinkNodeRef());
+                wasLink = true;
+            }
+            
+            // Get the list of child nodes for the parent node
+            List<FileInfo> childNodeInfos = getDAVHelper().getChildren(fileInfo);
+
+            // Send back the start of the HTML
+            writer.write("<html><head><title>");
+            writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.repository_title")));
+            writer.write("</title>");
+            writer.write("<style>");
+            writer.write("body { font-family: Arial, Helvetica; font-size: 12pt; background-color: white; }\n");
+            writer.write("table { font-family: Arial, Helvetica; font-size: 12pt; background-color: white; }\n");
+            writer.write(".listingTable { border: solid black 1px; }\n");
+            writer.write(".textCommand { font-family: verdana; font-size: 10pt; }\n");
+            writer.write(".textLocation { font-family: verdana; font-size: 11pt; font-weight: bold; color: #2a568f; }\n");
+            writer.write(".textData { font-family: verdana; font-size: 10pt; }\n");
+            writer.write(".tableHeading { font-family: verdana; font-size: 10pt; font-weight: bold; color: white; background-color: #2a568f; }\n");
+            writer.write(".rowOdd { background-color: #eeeeee; }\n");
+            writer.write(".rowEven { background-color: #dddddd; }\n");
+            writer.write("</style></head>\n");
+            writer.flush();
+
+            // Send back the table heading
+            writer.write("<body>\n");
+            writer.write("<table cellspacing='2' cellpadding='3' border='0' width='100%'>\n");
+            writer.write("<tr><td colspan='4' class='textLocation'>");
+            writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.directory_listing")));
+            writer.write(' ');
+            writer.write(WebDAVHelper.encodeHTML(getPath()));
+            writer.write("</td></tr>\n");
+            writer.write("<tr><td height='10' colspan='4'></td></tr></table>");
+
+            writer.write("<table cellspacing='2' cellpadding='3' border='0' width='100%' class='listingTable'>\n");
+            writer.write("<tr><td class='tableHeading' width='*'>");
+            writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.column.name")));
+            writer.write("</td>");
+            writer.write("<td class='tableHeading' width='10%'>");
+            writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.column.size")));
+            writer.write("</td>");
+            writer.write("<td class='tableHeading' width='20%'>");
+            writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.column.type")));
+            writer.write("</td>");
+            writer.write("<td class='tableHeading' width='25%'>");
+            writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.column.modifieddate")));
+            writer.write("</td>");
+            writer.write("</tr>\n");
+
+            // Get the URL for the root path
+            String rootURL = getURLForPath(m_request, getPath(), true);
+            if (rootURL.endsWith(WebDAVHelper.PathSeperator) == false)
+            {
+                rootURL = rootURL + WebDAVHelper.PathSeperator;
+            }
+
+            if (wasLink)
+            {
+                Path pathToNode = nodeService.getPath(fileInfo.getNodeRef());
+                if (pathToNode.size() > 2)
+                {
+                    pathToNode = pathToNode.subPath(2, pathToNode.size() - 1);
+                }
+
+                rootURL = getURLForPath(m_request, pathToNode.toDisplayPath(nodeService, getPermissionService()), true);
+                if (rootURL.endsWith(WebDAVHelper.PathSeperator) == false)
+                {
+                    rootURL = rootURL + WebDAVHelper.PathSeperator;
+                }
+
+                rootURL = rootURL + WebDAVHelper.encodeURL(fileInfo.getName(), m_userAgent) + WebDAVHelper.PathSeperator;
+            }
+            // Start with a link to the parent folder so we can navigate back up, unless we are at the root level
+            if (! getDAVHelper().isRootPath(getPath(), getServletPath()))
+            {
+                writer.write("<tr class='rowOdd'>");
+                writer.write("<td colspan='4' class='textData'><a href=\"");
+
+                // Strip the last folder from the path
+                String parentFolderUrl = parentFolder(rootURL);
+                writer.write(parentFolderUrl);
+
+                writer.write("\">");
+                writer.write("[");
+                writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.column.navigate_up")));
+                writer.write("]</a>");
+                writer.write("</tr>\n");
+            }
+
+            // Send back what we have generated so far
+            writer.flush();
+            int rowId = 0;
+            
+            for (FileInfo childNodeInfo : childNodeInfos)
+            {
+                // Output the details for the current node
+                writer.write("<tr class='");
+                if ((rowId++ & 1) == 1)
+                {
+                    writer.write("rowOdd");
+                }
+                else
+                {
+                    writer.write("rowEven");
+                }
+                writer.write("'><td class='textData'><a href=\"");
+                writer.write(rootURL);
+
+                // name field
+                String fname = childNodeInfo.getName();
+
+                writer.write(WebDAVHelper.encodeURL(fname, m_userAgent));
+                writer.write("\">");
+                writer.write(WebDAVHelper.encodeHTML(fname));
+                writer.write("</a>");
+
+                // size field
+                writer.write("</td><td class='textData'>");
+
+                ContentData contentData = null;
+                if (!childNodeInfo.isFolder())
+                {
+                    Serializable contentPropertyName = nodeService.getProperty(childNodeInfo.getNodeRef(), ContentModel.PROP_CONTENT_PROPERTY_NAME);
+                    QName contentPropertyQName = DefaultTypeConverter.INSTANCE.convert(QName.class, contentPropertyName);
+
+                    if (null == contentPropertyQName)
+                    {
+                        contentPropertyQName = ContentModel.PROP_CONTENT;
+                    }
+
+                    Serializable contentProperty = nodeService.getProperty(childNodeInfo.getNodeRef(), contentPropertyQName);
+
+                    if (contentProperty instanceof ContentData)
+                    {
+                        contentData = (ContentData) contentProperty;
+                    }
+                }
+
+                if (childNodeInfo.isFolder())
+                {
+                    writer.write("&nbsp;");
+                }
+                else
+                {
+                    if (null != contentData)
+                    {
+                        writer.write(formatSize(Long.toString(contentData.getSize())));
+                    }
+                    else
+                    {
+                        writer.write("&nbsp;");
+                    }
+
+                }
+                writer.write("</td><td class='textData'>");
+
+                // mimetype field
+                if (childNodeInfo.isFolder())
+                {
+                    writer.write("&nbsp;");
+                }
+                else
+                {
+                    String mimetype = "&nbsp;";
+                    if (null != contentData)
+                    {
+                        mimetype = contentData.getMimetype();
+                        String displayType = mimeTypeService.getDisplaysByMimetype().get(mimetype);
+
+                        if (displayType != null)
+                        {
+                            mimetype = displayType;
+                        }
+                    }
+                    writer.write(mimetype);
+                }
+                writer.write("</td><td class='textData'>");
+                
+                // modified date field
+                Date modifiedDate = childNodeInfo.getModifiedDate();
+                if (modifiedDate != null)
+                {
+                    writer.write(WebDAV.formatHeaderDate(DefaultTypeConverter.INSTANCE.longValue(modifiedDate)));
+                }
+                else
+                {
+                    writer.write("&nbsp;");
+                }
+                writer.write("</td></tr>\n");
+                
+                // flush every few rows
+                if ((rowId & 15) == 0)
+                {
+                    writer.flush();
+                }
+            }
+            
+            writer.write("</table></body></html>");
+        }
+        catch (Throwable e)
+        {
+            logger.error(e);
+
+            if (writer != null)
+            {
+                try
+                {
+                    writer.write("</table><table><tr><td style='color:red'>");
+                    writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.err.dir")));
+                    writer.write("</td></tr></table></body></html>");
+                    writer.flush();
+                }
+                catch (IOException ioe)
+                {
+                }
+            }
+        }
+    }
+
+    /**
+     * Given a path, will return the parent path. For example: /a/b/c
+     * will return /a/b and /a/b will return /a.
+     * 
+     * @param path The path to return the parent of - must be non-null.
+     * @return String - parent path.
+     */
+    private String parentFolder(String path)
+    {
+        if (path.endsWith(WebDAVHelper.PathSeperator))
+        {
+            // Strip trailing slash.
+            path = path.substring(0, path.length() - 1);
+        }
+        String[] paths = getDAVHelper().splitPath(path);
+        String parent = paths[0];
+        if (parent.equals(""))
+        {
+            parent = WebDAVHelper.PathSeperator;
+        }
+        return parent;
+    }
+
+    /**
+     * Formats the given size for display in a directory listing
+     * 
+     * @param strSize The content size
+     * @return The formatted size
+     */
+    private String formatSize(String strSize)
+    {
+        String strFormattedSize = strSize;
+
+        int length = strSize.length();
+        if (length < 4)
+        {
+            strFormattedSize = strSize + ' ' + WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.size.bytes"));
+        }
+        else if (length >= 4 && length < 7)
+        {
+            String strLeft = strSize.substring(0, length - 3);
+            String strRight = strSize.substring(length - 3, length - 2);
+
+            StringBuilder buffer = new StringBuilder(strLeft);
+            if (!strRight.equals("0"))
+            {
+                buffer.append('.');
+                buffer.append(strRight);
+            }
+            buffer.append(' ').append(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.size.kilobytes")));
+
+            strFormattedSize = buffer.toString();
+        }
+        else
+        {
+            String strLeft = strSize.substring(0, length - 6);
+            String strRight = strSize.substring(length - 6, length - 5);
+
+            StringBuilder buffer = new StringBuilder(strLeft);
+            if (!strRight.equals("0"))
+            {
+                buffer.append('.');
+                buffer.append(strRight);
+            }
+            buffer.append(' ').append(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.size.megabytes")));
+
+            strFormattedSize = buffer.toString();
+        }
+
+        return strFormattedSize;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/HeadMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/HeadMethod.java
new file mode 100644
index 00000000000..8d38790b774
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/HeadMethod.java
@@ -0,0 +1,44 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+/**
+ * Implements the WebDAV HEAD method
+ * 
+ * @author gavinc
+ */
+public class HeadMethod extends GetMethod
+{
+    /**
+     * Default constructor
+     */
+    public HeadMethod()
+    {
+        // Do everything the GET request does apart from returning the content
+
+        m_returnContent = false;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/HierarchicalMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/HierarchicalMethod.java
new file mode 100644
index 00000000000..9e5e04ff258
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/HierarchicalMethod.java
@@ -0,0 +1,119 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Abstract base class for the hierarchical methods COPY and MOVE
+ * 
+ * @author gavinc
+ */
+public abstract class HierarchicalMethod extends WebDAVMethod
+{
+    // Request parameters
+
+    protected String m_strDestinationPath;
+    protected boolean m_overwrite = true;
+
+    /**
+     * Default constructor
+     */
+    public HierarchicalMethod()
+    {
+    }
+
+    /**
+     * Return the destination path
+     * 
+     * @return String
+     */
+    public final String getDestinationPath()
+    {
+        return m_strDestinationPath;
+    }
+
+    /**
+     * Return the overwrite setting
+     * 
+     * @return boolean
+     */
+    public final boolean hasOverWrite()
+    {
+        return m_overwrite;
+    }
+
+    /**
+     * Parse the request headers
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestHeaders() throws WebDAVServerException
+    {
+        // Get the destination path for the copy
+
+        String destURL = m_request.getHeader(WebDAV.HEADER_DESTINATION);
+
+        if (logger.isDebugEnabled())
+            logger.debug("Parsing Destination header: " + destURL);
+
+        // Check that the URL is on this server and refers to the WebDAV
+        // path, if not then return an error
+        getDAVHelper().checkDestinationURL(m_request, destURL);
+
+        
+        m_strDestinationPath = getDAVHelper().getDestinationPath(getContextPath(), getServletPath(), destURL);
+        
+        // Failed to fix the destination path, return an error
+
+        if (m_strDestinationPath == null)
+        {
+            logger.warn("Failed to parse the Destination header: " + destURL);
+            throw new WebDAVServerException(HttpServletResponse.SC_BAD_REQUEST);
+        }
+
+        // Check if the copy should overwrite an existing file
+
+        String strOverwrite = m_request.getHeader(WebDAV.HEADER_OVERWRITE);
+        if (strOverwrite != null && strOverwrite.equals(WebDAV.F))
+        {
+            m_overwrite = false;
+        }
+    }
+
+    /**
+     * Parse the request body
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestBody() throws WebDAVServerException
+    {
+        // NOTE: Hierarchical methods do have a body to define what should
+        // happen
+        // to the properties when they are moved or copied, however, this
+        // feature is not implemented by many servers, including ours!!
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/LockInfoImpl.java b/remote-api/src/main/java/org/alfresco/repo/webdav/LockInfoImpl.java
new file mode 100644
index 00000000000..2f883c29740
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/LockInfoImpl.java
@@ -0,0 +1,450 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.alfresco.repo.lock.mem.LockStore;
+
+/**
+ * Class to represent a WebDAV lock info. Instances of this class are accessible
+ * my multiple threads as they are kept in the {@link LockStore}. Clients of this
+ * class are expected to synchronise externally using the provided
+ * ReentrantReadWriteLock.
+ * 
+ * @author Ivan Rybnikov
+ *
+ */
+public class LockInfoImpl implements Serializable, LockInfo
+{
+    private static final long serialVersionUID = 1L;
+    
+    public static final String ADDINFO_WEBDAV_MARKER = "WebDAV_LockInfo";
+    
+    // Exclusive lock token
+    private String exclusiveLockToken = null;
+
+    // Lock scope
+    private String scope = null;
+
+    // Lock depth
+    private String depth = null;
+
+    // Shared lock tokens
+    private final Set<String> sharedLockTokens = new HashSet<String>(3);
+
+    // User name of the lock's owner
+    private String owner;
+    
+    // When does the lock expire?
+    private Date expires;
+    
+    /**
+     * Default constructor
+     * 
+     */
+    public LockInfoImpl()
+    {
+    }
+
+    /**
+     * Constructor
+     * 
+     * @param token Exclusive lock token
+     * @param scope Lock scope (shared/exclusive)
+     * @param depth Lock depth (0/infinity)
+     */
+    public LockInfoImpl(String token, String scope, String depth)
+    {
+        this.exclusiveLockToken = token;
+        this.scope = scope;
+        this.depth = depth;
+    }
+    
+    /**
+     * Returns true if node has shared or exclusive locks
+     * 
+     * @return boolean
+     */
+    @Override
+    @JsonIgnore
+    public boolean isLocked()
+    {
+        // TODO: return (owner != null || isExclusive() || isShared());
+        return (isExclusive() || isShared());
+    }
+    
+    /**
+     * Setter for exclusive lock token
+     * 
+     * @param token Lock token
+     */
+    @Override
+    public void setExclusiveLockToken(String token)
+    {
+        if (isShared())
+        {
+            throw new IllegalStateException("Cannot add exclusive lock token [" + token +
+                        "] to shared lock [" + toString() + "]");
+        }
+        this.exclusiveLockToken = token;
+    }
+
+    /**
+     * Getter for exclusive lock token.
+     * 
+     * @return String
+     */
+    @Override
+    public String getExclusiveLockToken()
+    {
+        return exclusiveLockToken;
+    }
+
+    /**
+     * Setter for lock scope.
+     * 
+     * @param scope String
+     */
+    @Override
+    public void setScope(String scope)
+    {
+        this.scope = scope;
+    }
+
+    /**
+     * Returns lock scope
+     * 
+     * @return lock scope
+     */
+    @Override
+    public String getScope()
+    {
+        return scope == null ? WebDAV.XML_EXCLUSIVE : scope;
+    }
+
+    /**
+     * Setter for lock depth
+     * 
+     * @param depth lock depth
+     */
+    @Override
+    public void setDepth(String depth)
+    {
+        this.depth = depth;
+    }
+
+    /**
+     * Returns lock depth
+     * 
+     * @return lock depth
+     */
+    @Override
+    public String getDepth()
+    {
+        return depth;
+    }
+
+    /**
+     * Getter for sharedLockTokens list.
+     * 
+     */
+    @Override
+    public Set<String> getSharedLockTokens()
+    {
+        return sharedLockTokens;
+    }
+
+    /**
+     * Setter for sharedLockTokens list.
+     * 
+     */
+    @Override
+    public void setSharedLockTokens(Set<String> sharedLockTokens)
+    {
+        if (!sharedLockTokens.isEmpty() && isExclusive())
+        {
+            throw new IllegalStateException("Cannot add shared lock tokens [" + sharedLockTokens +
+                        "] to exclusive lock [" + toString() + "]");
+        }
+        this.sharedLockTokens.clear();
+        this.sharedLockTokens.addAll(sharedLockTokens);
+    }
+
+    /**
+     * Adds new shared lock token to sharedLockTokens list.
+     * 
+     * @param token The token to add.
+     */
+    @Override
+    public void addSharedLockToken(String token)
+    {
+        if (isExclusive())
+        {
+            throw new IllegalStateException("Cannot add shared lock token [" + token +
+                        "] to exclusive lock [" + toString() + "]");
+        }
+        sharedLockTokens.add(token);
+    }
+
+    /**
+     * Is it a shared lock?
+     * 
+     * @return true if shared.
+     */
+    @Override
+    @JsonIgnore
+    public boolean isShared()
+    {
+        return (!sharedLockTokens.isEmpty());
+    }
+    
+    
+    /**
+     * Return the lock info as a string
+     * 
+     * @return String
+     */
+    public String toString()
+    {
+        StringBuilder str = new StringBuilder();
+        
+        str.append("LockInfo[");
+        
+        str.append("exclusiveLockToken=");
+        str.append(getExclusiveLockToken());
+        str.append(", scope=");
+        str.append(getScope());
+        str.append(", depth=");
+        str.append(getDepth());
+        str.append(", sharedLockTokens=");
+        str.append(getSharedLockTokens());
+        str.append(", owner=");
+        str.append(owner);
+        str.append(", expires=");
+        str.append(expires);
+        
+        str.append("]");
+        
+        return str.toString();
+    }
+
+    
+    @Override
+    public String toJSON()
+    {
+        ObjectMapper objectMapper = new ObjectMapper();
+        String json;
+        try
+        {
+            json = objectMapper.writeValueAsString(this);
+        }
+        catch (Throwable e)
+        {
+            throw new RuntimeException("Unable to generate JSON for " + toString(), e);
+        }
+        return ADDINFO_WEBDAV_MARKER + ":" + json;
+    }
+
+    public static LockInfo fromJSON(String json)
+    {
+        ObjectMapper objectMapper = new ObjectMapper();
+        
+        if (json != null && json.startsWith(ADDINFO_WEBDAV_MARKER))
+        {
+            try
+            {
+                json = json.substring(ADDINFO_WEBDAV_MARKER.length() + 1);
+                LockInfo lockInfo = objectMapper.readValue(json, LockInfoImpl.class);
+                return lockInfo;
+            }
+            catch (Throwable e)
+            {
+                throw new IllegalArgumentException("Unable to parse JSON from [" + json + "]", e);
+            }
+        }
+        else
+        {
+            throw new IllegalArgumentException("Was not detected WEBDAV_LOCK marker.");
+        }
+    }
+    
+    /**
+     * Whether this lock has expired. If no expiry is set (i.e. expires is null)
+     * then false is always returned.
+     * 
+     * @return true if expired.
+     */
+    @Override
+    @JsonIgnore
+    public boolean isExpired()
+    {
+        if (expires == null)
+        {
+            return false;
+        }
+        Date now = dateNow();
+        return now.after(expires);
+    }
+
+    /**
+     * Is it an exclusive lock?
+     * 
+     * @return true if exclusive.
+     */
+    @Override
+    @JsonIgnore
+    public boolean isExclusive()
+    {
+        return (exclusiveLockToken != null && exclusiveLockToken.length() > 0);
+    }
+
+    /**
+     * Who owns the lock?
+     * 
+     * @return the owner
+     */
+    @Override
+    @JsonIgnore
+    public String getOwner()
+    {
+        return owner;
+    }
+
+    /**
+     * Set the username of who owns the lock.
+     * 
+     * @param owner Owner's username
+     */
+    @Override
+    @JsonIgnore
+    public void setOwner(String owner)
+    {
+        this.owner = owner;
+    }
+
+    /**
+     * Set the expiry date/time for this lock. Set to null for never expires.
+     * 
+     * @param expires the expires to set
+     */
+    @Override
+    @JsonIgnore
+    public void setExpires(Date expires)
+    {
+        this.expires = expires;
+    }
+
+    /**
+     * Retrieve the expiry date/time for this lock, or null if it never expires.
+     * 
+     * @return the expires
+     */
+    @Override
+    @JsonIgnore
+    public Date getExpires()
+    {
+        return expires;
+    }
+    
+    /**
+     * Remaining time before lock expires, in seconds.
+     */
+    @Override
+    @JsonIgnore
+    public long getRemainingTimeoutSeconds()
+    {
+        Date expires = getExpires();
+        if (expires == null)
+        {
+            return WebDAV.TIMEOUT_INFINITY;
+        }
+        else
+        {
+            Date now = dateNow();
+            long timeout = ((expires.getTime() - now.getTime()) / 1000);
+            return timeout;
+        }
+    }
+
+    /**
+     * Sets the expiry date/time to lockTimeout seconds into the future. Provide
+     * a lockTimeout of WebDAV.TIMEOUT_INFINITY for never expires.
+     * 
+     * @param lockTimeoutSecs int
+     */
+    @Override
+    @JsonIgnore
+    public void setTimeoutSeconds(int lockTimeoutSecs)
+    {
+        if (lockTimeoutSecs == WebDAV.TIMEOUT_INFINITY)
+        {
+            setExpires(null);
+        }
+        else
+        {
+            int timeoutMillis = (lockTimeoutSecs * 1000);
+            Date now = dateNow();
+            Date nextExpiry = new Date(now.getTime() + timeoutMillis);
+            setExpires(nextExpiry);
+        }
+    }
+    
+    /**
+     * Sets the expiry date/time to lockTimeout minutes into the future. Provide
+     * a lockTimeout of WebDAV.TIMEOUT_INFINITY for never expires.
+     * 
+     * @param lockTimeoutMins int
+     */
+    @Override
+    @JsonIgnore
+    public void setTimeoutMinutes(int lockTimeoutMins)
+    {
+        if (lockTimeoutMins != WebDAV.TIMEOUT_INFINITY)
+        {
+            setTimeoutSeconds(lockTimeoutMins * 60); 
+        }
+        else
+        {
+            setTimeoutSeconds(WebDAV.TIMEOUT_INFINITY);
+        }
+    }
+    
+    /**
+     * Hook to allow unit testing - gets the current date/time.
+     * 
+     * @return Date
+     */
+    protected Date dateNow()
+    {
+        return new Date();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/LockMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/LockMethod.java
new file mode 100644
index 00000000000..da9c6ed686c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/LockMethod.java
@@ -0,0 +1,578 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileFolderUtil;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.rule.RuleService;
+import org.alfresco.service.cmr.rule.RuleType;
+import org.alfresco.service.namespace.QName;
+import org.dom4j.io.XMLWriter;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * Implements the WebDAV LOCK method
+ * 
+ * @author gavinc
+ */
+public class LockMethod extends WebDAVMethod
+{
+    public static final String EMPTY_NS = "";
+    
+    private static Timer timer = new Timer(true);
+
+    protected int m_timeoutDuration = WebDAV.TIMEOUT_24_HOURS;
+    
+    protected LockInfo lockInfo = new LockInfoImpl();
+
+    protected boolean createExclusive;
+
+    protected String lockToken= null;
+
+    /**
+     * Default constructor
+     */
+    public LockMethod()
+    {
+    }
+
+    /**
+     * Returns true if request has lock token in the If header
+     * 
+     * @return boolean
+     */
+    protected final boolean hasLockToken()
+    {
+        if (m_conditions != null)
+        {
+            for (Condition condition : m_conditions)
+            {
+                if (!condition.getLockTokensMatch().isEmpty())
+                {
+                    return true;
+                }
+    }
+        }
+        return false;
+    }
+
+    /**
+     * Return the lock timeout, in seconds.
+     * 
+     * @return int
+     */
+    protected final int getLockTimeout()
+    {
+        return m_timeoutDuration;
+    }
+
+    /**
+     * Parse the request headers
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestHeaders() throws WebDAVServerException
+    {
+        // Get user Agent
+        
+        m_userAgent = m_request.getHeader(WebDAV.HEADER_USER_AGENT);
+
+        // Get the depth
+
+        parseDepthHeader();
+        
+        // According to the specification: "Values other than 0 or infinity MUST NOT be used with the Depth header on a LOCK method.".
+        // The specification does not specify the error code for this case - so we use HttpServletResponse.SC_INTERNAL_SERVER_ERROR.
+        if (m_depth != WebDAV.DEPTH_0 && m_depth != WebDAV.DEPTH_INFINITY)
+        {
+            throw new WebDAVServerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        }
+        
+        // Parse Lock tokens and ETags, if any
+
+        parseIfHeader();
+
+        // Get the lock timeout value
+
+        String strTimeout = m_request.getHeader(WebDAV.HEADER_TIMEOUT);
+
+        // If the timeout header starts with anything other than Second
+        // leave the timeout as the default
+
+        if (strTimeout != null && strTimeout.startsWith(WebDAV.SECOND))
+        {
+            try
+            {
+                // Some clients send header as Second-180 Seconds so we need to
+                // look for the space
+
+                int idx = strTimeout.indexOf(" ");
+
+                if (idx != -1)
+                {
+                    // Get the bit after Second- and before the space
+
+                    strTimeout = strTimeout.substring(WebDAV.SECOND.length(), idx);
+                }
+                else
+                {
+                    // The string must be in the correct format
+
+                    strTimeout = strTimeout.substring(WebDAV.SECOND.length());
+                }
+                m_timeoutDuration = Integer.parseInt(strTimeout);
+            }
+            catch (Exception e)
+            {
+                // Warn about the parse failure and leave the timeout as the
+                // default
+
+                logger.warn("Failed to parse Timeout header: " + strTimeout);
+            }
+        }
+
+        // DEBUG
+
+        if (logger.isDebugEnabled())
+            logger.debug("Timeout=" + getLockTimeout() + ", depth=" + getDepth());
+    }
+
+    /**
+     * Parse the request body
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestBody() throws WebDAVServerException
+    {
+        if (m_request.getContentLength() == -1)
+        {
+            return;
+        }
+
+        Document body = getRequestBodyAsDocument();
+        if (body != null)
+        {
+            OUTER: for (Node currentNode = body.getDocumentElement().getFirstChild(); currentNode != null; currentNode = currentNode.getNextSibling())
+            {
+                if (currentNode instanceof Element && WebDAV.DEFAULT_NAMESPACE_URI.equals(((Element) currentNode).getNamespaceURI())
+                        && WebDAV.XML_LOCK_SCOPE.equals(((Element) currentNode).getLocalName()))
+                {
+                    for (Node propertiesNode = currentNode.getFirstChild(); propertiesNode != null; propertiesNode = propertiesNode.getNextSibling())
+                    {
+                        if (propertiesNode instanceof Element && WebDAV.DEFAULT_NAMESPACE_URI.equals(((Element) propertiesNode).getNamespaceURI()))
+                        {
+                            this.createExclusive = WebDAV.XML_EXCLUSIVE.equals(propertiesNode.getLocalName());
+                            break OUTER;
+                        }
+                    }
+                    break OUTER;
+                }
+            }
+            if (!createExclusive)
+            {
+                // We do not support shared locks - return 412 (section 8.10.7 of RFC 2518)
+                throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
+            }
+        }
+    }
+    
+    /**
+     * Execute the request
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void executeImpl() throws WebDAVServerException, Exception
+    {
+        RuleService ruleService = getServiceRegistry().getRuleService();
+        try
+        {
+            // Temporarily disable update rules.
+            ruleService.disableRuleType(RuleType.UPDATE);
+            attemptLock();
+        }
+        finally
+        {
+            // Re-instate update rules.
+            ruleService.enableRuleType(RuleType.UPDATE);
+        }
+    }
+
+    /**
+     * The main lock implementation method.
+     * 
+     * @throws WebDAVServerException
+     * @throws Exception
+     */
+    protected void attemptLock() throws WebDAVServerException, Exception
+    {
+        FileFolderService fileFolderService = getFileFolderService();
+        final String path = getPath();
+        NodeRef rootNodeRef = getRootNodeRef();
+        // Get the active user
+        final String userName = getDAVHelper().getAuthenticationService().getCurrentUserName();
+
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Locking node: \n" +
+                    "   user: " + userName + "\n" +
+                    "   path: " + path);
+        }
+
+        FileInfo lockNodeInfo = null;
+        try
+        {
+            // Check if the path exists
+            lockNodeInfo = getNodeForPath(getRootNodeRef(), getPath());
+        }
+        catch (FileNotFoundException e)
+        {
+            if (m_conditions != null)
+            {
+                // MNT-12303 fix, check whether this is a refresh lock request
+                for (Condition condition : m_conditions)
+                {
+                    List<String> lockTolensMatch = condition.getLockTokensMatch();
+                    List<String> etagsMatch = condition.getETagsMatch();
+                    
+                    if (m_request.getContentLength() == -1 && 
+                        (lockTolensMatch != null && !lockTolensMatch.isEmpty()) ||
+                            (etagsMatch != null && !etagsMatch.isEmpty()))
+                    {
+                        // LOCK method with If header and without body was sent, according to RFC 2518 section 7.8
+                        // this form of LOCK MUST only be used to "refresh" a lock. However resource doesn't exist ->
+                        // so there is nothing to refresh. Return 403 Forbidden as original SharePoint Server.
+                        throw new WebDAVServerException(HttpServletResponse.SC_FORBIDDEN);
+                    }
+                }
+            }
+            
+            // need to create it
+            String[] splitPath = getDAVHelper().splitPath(path);
+            // check
+            if (splitPath[1].length() == 0)
+            {
+                throw new WebDAVServerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+            }
+            
+            FileInfo dirInfo = null;
+            List<String> dirPathElements = getDAVHelper().splitAllPaths(splitPath[0]);
+            if (dirPathElements.size() == 0)
+            {
+               // if there are no path elements we are at the root so get the root node
+               dirInfo = fileFolderService.getFileInfo(getRootNodeRef());
+            }
+            else
+            {
+               // make sure folder structure is present
+               dirInfo = FileFolderUtil.makeFolders(fileFolderService, rootNodeRef, dirPathElements, ContentModel.TYPE_FOLDER);
+            }
+            
+            if (dirInfo == null)
+            {
+                throw new WebDAVServerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+            }
+            
+            // create the file
+            lockNodeInfo = createNode(dirInfo.getNodeRef(), splitPath[1], ContentModel.TYPE_CONTENT);
+            
+            // ALF-10309 fix, mark created node with webdavNoContent aspect, we assume that save operation
+            // is performed by client, webdavNoContent aspect normally removed in put method unless there
+            // is a cancel before the PUT request takes place
+            int lockTimeout = getLockTimeout();
+            if (lockTimeout > 0 &&
+                !getNodeService().hasAspect(lockNodeInfo.getNodeRef(), ContentModel.ASPECT_WEBDAV_NO_CONTENT))
+            {
+                final NodeRef nodeRef = lockNodeInfo.getNodeRef();
+                getNodeService().addAspect(nodeRef, ContentModel.ASPECT_WEBDAV_NO_CONTENT, null);
+                
+                // Remove node after the timeout (MS Office 2003 requests 3 minutes) if the PUT or UNLOCK has not taken place
+                timer.schedule(new TimerTask()
+                {
+                    @Override
+                    public void run()
+                    {
+                        // run as current user
+                        AuthenticationUtil.runAs(new RunAsWork<Void>()
+                        {
+                            @Override
+                            public Void doWork() throws Exception
+                            {
+                                try
+                                {
+                                    if (getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_WEBDAV_NO_CONTENT))
+                                    {
+                                        getTransactionService().getRetryingTransactionHelper().doInTransaction(
+                                            new RetryingTransactionCallback<String>()
+                                            {
+                                                public String execute() throws Throwable
+                                                {
+                                                    getNodeService().deleteNode(nodeRef);
+                                                    if (logger.isDebugEnabled())
+                                                    {
+                                                        logger.debug("Timer DELETE " + path);
+                                                    }
+                                                    return null;
+                                                }
+                                            }, false, true);
+                                    }
+                                    else if (logger.isDebugEnabled())
+                                    {
+                                        logger.debug("Timer IGNORE " + path);
+                                    }
+                                }
+                                catch (InvalidNodeRefException e)
+                                {
+                                    // Might get this if the node is deleted. If so just ignore.
+                                    if (logger.isDebugEnabled())
+                                    {
+                                        logger.debug("Timer DOES NOT EXIST " + path);
+                                    }
+                                }
+                                return null;
+                            }
+                        }, userName);
+                    }
+                }, lockTimeout*1000);
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Timer START in " + lockTimeout + " seconds "+ path);
+                }
+            }
+            
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Created new node for lock: \n" +
+                        "   path: " + path + "\n" +
+                        "   node: " + lockNodeInfo);
+            }
+            
+            m_response.setStatus(HttpServletResponse.SC_CREATED);
+        }
+
+        // Check if this is a new lock or a lock refresh
+        if (hasLockToken())
+        {
+            lockInfo = checkNode(lockNodeInfo);
+
+            if (!lockInfo.isLocked() && m_request.getContentLength() == -1)
+            {
+                // MNT-11990 fix, LOCK method with If header and without body was sent, according to RFC 2518 section 7.8
+                // this form of LOCK MUST only be used to "refresh" a lock. But node is not actually locked. Fail this request.
+                // see http://www.ics.uci.edu/~ejw/authoring/protocol/rfc2518.html#rfc.section.7.8
+                throw new WebDAVServerException(HttpServletResponse.SC_BAD_REQUEST);
+            }
+            
+            // If a request body is not defined and "If" header is sent we have createExclusive as false,
+            // but we need to check a previous LOCK was an exclusive. I.e. get the property for node. It
+            // is already has got in a checkNode method, so we need just get a scope from lockInfo.
+            // This particular case was raised as ALF-4008.
+            this.createExclusive = WebDAV.XML_EXCLUSIVE.equals(this.lockInfo.getScope());
+            // Refresh an existing lock
+            refreshLock(lockNodeInfo, userName);
+        }
+        else
+        {
+            lockInfo = checkNode(lockNodeInfo, true, createExclusive);
+            // Create a new lock
+            createLock(lockNodeInfo, userName);
+        }
+
+        m_response.setHeader(WebDAV.HEADER_LOCK_TOKEN, "<" + WebDAV.makeLockToken(lockNodeInfo.getNodeRef(), userName) + ">");
+        m_response.setHeader(WebDAV.HEADER_CONTENT_TYPE, WebDAV.XML_CONTENT_TYPE);
+
+        // We either created a new lock or refreshed an existing lock, send back the lock details
+        generateResponse(lockNodeInfo, userName);
+    }
+    
+    /**
+     * Create a new node
+     * 
+     * @param parentNodeRef the parent node.  
+     * @param name the name of the node
+     * @param typeQName the type to create
+     * @return Returns the new node's file information
+     *  
+     */
+    protected FileInfo createNode(NodeRef parentNodeRef, String name, QName typeQName)
+    {
+        return getFileFolderService().create(parentNodeRef, name, ContentModel.TYPE_CONTENT);
+    }
+
+    /**
+     * Create a new lock
+     * 
+     * @param lockNode NodeRef
+     * @param userName String
+     * @exception WebDAVServerException
+     */
+    protected final void createLock(FileInfo lockNode, String userName) throws WebDAVServerException
+    {
+        // Create Lock token
+        lockToken = WebDAV.makeLockToken(lockNode.getNodeRef(), userName);
+
+        if (createExclusive)
+        {
+            // Lock the node
+            lockInfo.setTimeoutSeconds(getLockTimeout());
+            lockInfo.setExclusiveLockToken(lockToken);
+        }
+        else
+        {
+            // Shared lock creation should already have been prohibited when parsing the request body
+            throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
+        }
+
+        // Store lock depth
+        lockInfo.setDepth(WebDAV.getDepthName(m_depth));
+        // Store lock scope (shared/exclusive)
+        String scope = createExclusive ? WebDAV.XML_EXCLUSIVE : WebDAV.XML_SHARED;
+        lockInfo.setScope(scope);
+        // Store the owner of this lock
+        lockInfo.setOwner(userName);
+        // Lock the node
+        getDAVLockService().lock(lockNode.getNodeRef(), lockInfo);
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Locked node " + lockNode + ": " + lockInfo);
+        }
+    }
+
+    /**
+     * Refresh an existing lock
+     * 
+     * @param lockNode NodeRef
+     * @param userName String
+     * @exception WebDAVServerException
+     */
+    protected final void refreshLock(FileInfo lockNode, String userName) throws WebDAVServerException
+    {
+        if (this.createExclusive)
+        {
+            // Update the expiry for the lock
+            lockInfo.setTimeoutSeconds(getLockTimeout());
+            getDAVLockService().lock(lockNode.getNodeRef(), lockInfo);
+        }
+    }
+
+    /**
+     * Generates the XML lock discovery response body
+     */
+    protected void generateResponse(FileInfo lockNodeInfo, String userName) throws Exception
+    {
+        String scope;
+        String lt;
+        String owner;
+        Date expiry;
+        
+        if (lockToken != null)
+        {
+            // In case of lock creation take the scope from request header
+            scope = this.createExclusive ? WebDAV.XML_EXCLUSIVE : WebDAV.XML_SHARED;
+            // Output created lock
+            lt = lockToken;
+        }
+        else
+        {
+            // In case of lock refreshing take the scope from previously stored lock
+            scope = this.lockInfo.getScope();
+            // Output refreshed lock
+            lt = this.lockInfo.getExclusiveLockToken();
+        }
+        owner = lockInfo.getOwner();
+        expiry = lockInfo.getExpires();
+        
+        XMLWriter xml = createXMLWriter();
+
+        xml.startDocument();
+
+        String nsdec = generateNamespaceDeclarations(null);
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROP + nsdec, WebDAV.XML_NS_PROP + nsdec, getDAVHelper().getNullAttributes());
+
+        // Output the lock details
+        generateLockDiscoveryXML(xml, lockNodeInfo, false, scope, WebDAV.getDepthName(m_depth), lt, owner, expiry);
+
+        // Close off the XML
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP);
+
+        // Send remaining data
+        flushXML(xml);
+       
+    }
+        
+    /**
+     * Generates a list of namespace declarations for the response
+     */
+    protected String generateNamespaceDeclarations(HashMap<String,String> nameSpaces)
+    {
+        StringBuilder ns = new StringBuilder();
+
+        ns.append(" ");
+        ns.append(WebDAV.XML_NS);
+        ns.append(":");
+        ns.append(WebDAV.DAV_NS);
+        ns.append("=\"");
+        ns.append(WebDAV.DEFAULT_NAMESPACE_URI);
+        ns.append("\"");
+
+        // Add additional namespaces
+        
+        if ( nameSpaces != null)
+        {
+            Iterator<String> namespaceList = nameSpaces.keySet().iterator();
+    
+            while (namespaceList.hasNext())
+            {
+                String strNamespaceUri = namespaceList.next();
+                String strNamespaceName = nameSpaces.get(strNamespaceUri);
+                
+                ns.append(" ").append(WebDAV.XML_NS).append(":").append(strNamespaceName).append("=\"");
+                ns.append(strNamespaceUri).append("\" ");
+            }
+        }
+        
+        return ns.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/MkcolMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/MkcolMethod.java
new file mode 100644
index 00000000000..5efdb0e1f83
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/MkcolMethod.java
@@ -0,0 +1,194 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.webdav.WebDavService;
+
+/**
+ * Implements the WebDAV MKCOL method
+ * 
+ * @author gavinc
+ */
+public class MkcolMethod extends WebDAVMethod implements ActivityPostProducer
+{
+    private WebDAVActivityPoster activityPoster;
+    
+    /**
+     * Default constructor
+     */
+    public MkcolMethod()
+    {
+    }
+
+    /**
+     * Parse the request headers
+     * 
+     * @throws WebDAVServerException
+     */
+    protected void parseRequestHeaders() throws WebDAVServerException
+    {
+        // Nothing to do in this method
+    }
+
+    /**
+     * Parse the request body
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestBody() throws WebDAVServerException
+    {
+        // There should not be a body with the MKCOL request
+
+        if (m_request.getContentLength() > 0)
+        {
+            throw new WebDAVServerException(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
+        }
+    }
+
+    /**
+     * Execute the request
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void executeImpl() throws WebDAVServerException, Exception
+    {
+        FileFolderService fileFolderService = getFileFolderService();
+
+        // see if it exists
+        try
+        {
+            getDAVHelper().getNodeForPath(getRootNodeRef(), getPath());
+            // already exists
+            throw new WebDAVServerException(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+        }
+        catch (FileNotFoundException e)
+        {
+            // it doesn't exist
+        }
+        
+        // Trim the last path component and check if the parent path exists
+        String parentPath = getPath();
+        int lastPos = parentPath.lastIndexOf(WebDAVHelper.PathSeperator);
+        
+        NodeRef parentNodeRef = null;
+
+        if ( lastPos == 0)
+        {
+            // Create new folder at root
+
+            parentPath = WebDAVHelper.PathSeperator;
+            parentNodeRef = getRootNodeRef();
+        }
+        else if (lastPos != -1)
+        {
+            // Trim the last path component
+            parentPath = parentPath.substring(0, lastPos + 1);
+            try
+            {
+                FileInfo parentFileInfo = getDAVHelper().getNodeForPath(getRootNodeRef(), parentPath);
+                parentNodeRef = parentFileInfo.getNodeRef();
+            }
+            catch (FileNotFoundException e)
+            {
+                // parent path is missing
+                throw new WebDAVServerException(HttpServletResponse.SC_CONFLICT);
+            }
+        }
+        else
+        {
+            // Looks like a bad path
+            throw new WebDAVServerException(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+        }
+
+        // Get the new folder name
+        String folderName = getPath().substring(lastPos + 1);
+
+        // Create the new folder node
+        FileInfo fileInfo = fileFolderService.create(parentNodeRef, folderName, ContentModel.TYPE_FOLDER);
+        
+        // Don't post activity data for hidden folder
+        if (!fileInfo.isHidden())
+        {
+             postActivity(fileInfo);
+        }
+        
+        // Return a success status
+        m_response.setStatus(HttpServletResponse.SC_CREATED);
+    }
+    
+    /**
+     * Create a folder added activity post.
+     * 
+     * @throws WebDAVServerException 
+     */
+    private void postActivity(FileInfo fileInfo) throws WebDAVServerException
+    {
+        WebDavService davService = getDAVHelper().getServiceRegistry().getWebDavService();
+        if (!davService.activitiesEnabled())
+        {
+            // Don't post activities if this behaviour is disabled.
+            return;
+        }
+        
+        String siteId = getSiteId();
+        String tenantDomain = getTenantDomain();
+        
+        // Check there is enough information to publish site activity.
+        if (!siteId.equals(WebDAVHelper.EMPTY_SITE_ID))
+        {
+            SiteService siteService = getServiceRegistry().getSiteService();
+            NodeRef documentLibrary = siteService.getContainer(siteId, SiteService.DOCUMENT_LIBRARY);
+            String path = "/";
+            try
+            {
+                path = getDAVHelper().getPathFromNode(documentLibrary, fileInfo.getNodeRef());
+            }
+            catch (FileNotFoundException error)
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("No " + SiteService.DOCUMENT_LIBRARY + " container found.");
+                }
+            }
+            
+            activityPoster.postFileFolderAdded(siteId, tenantDomain, path, fileInfo);
+        }
+    }
+    
+    @Override
+    public void setActivityPoster(WebDAVActivityPoster activityPoster)
+    {
+        this.activityPoster = activityPoster;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/MoveMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/MoveMethod.java
new file mode 100644
index 00000000000..89045de23db
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/MoveMethod.java
@@ -0,0 +1,347 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * Implements the WebDAV MOVE method
+ * 
+ * @author Derek Hulley
+ * @author David Ward
+ */
+public class MoveMethod extends HierarchicalMethod
+{
+    /**
+     * Default constructor
+     */
+    public MoveMethod()
+    {
+    }
+    
+    protected boolean isMove()
+    {
+        return true;
+    }
+
+    /**
+     * Exceute the request
+     * 
+     * @exception WebDAVServerException
+     */
+    protected final void executeImpl() throws WebDAVServerException, Exception
+    {
+        NodeRef rootNodeRef = getRootNodeRef();
+        // Debug
+        if (logger.isDebugEnabled())
+        {
+            logger.debug((isMove() ? "Move" : "Copy") + " from " + getPath() + " to " + getDestinationPath());
+        }
+
+        // the source must exist
+        String sourcePath = getPath();
+        FileInfo sourceInfo = null;
+        try
+        {
+            sourceInfo = getNodeForPath(rootNodeRef, sourcePath);
+        }
+        catch (FileNotFoundException e)
+        {
+            throw new WebDAVServerException(HttpServletResponse.SC_NOT_FOUND);
+        }
+
+        FileInfo sourceParentInfo = getDAVHelper().getParentNodeForPath(rootNodeRef, sourcePath);
+
+        // the destination parent must exist
+        String destPath = getDestinationPath();
+        FileInfo destParentInfo = null;
+        try
+        {
+            if (destPath.endsWith(WebDAVHelper.PathSeperator))
+            {
+                destPath = destPath.substring(0, destPath.length() - 1);
+            }
+            destParentInfo = getDAVHelper().getParentNodeForPath(rootNodeRef, destPath);
+        }
+        catch (FileNotFoundException e)
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Destination parent folder doesn't exist: " + destPath);
+            }
+            throw new WebDAVServerException(HttpServletResponse.SC_CONFLICT);
+        }
+
+        // check for the existence of the destination node
+        FileInfo destInfo = null;
+        boolean destNotHidden = false;
+        try
+        {
+            destInfo = getDAVHelper().getNodeForPath(rootNodeRef, destPath);
+            if (!destInfo.getNodeRef().equals(sourceInfo.getNodeRef()))
+            {
+                // ALF-7079 (MNT-1601) fix, if destInfo is a hidden shuffle target then pretend it's not there
+                destNotHidden = !getFileFolderService().isHidden(destInfo.getNodeRef());
+                if (!hasOverWrite() && destNotHidden)
+                {
+                    if (logger.isDebugEnabled())
+                    {
+                        logger.debug("Destination exists but overwrite is not allowed");
+                    }
+                    // it exists and we may not overwrite
+                    throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
+                }
+                checkNode(destInfo);
+            }
+        }
+        catch (FileNotFoundException e)
+        {
+            // destination doesn't exist
+        }
+
+        NodeRef sourceNodeRef = sourceInfo.getNodeRef();
+        NodeRef sourceParentNodeRef = sourceParentInfo.getNodeRef();
+        NodeRef destParentNodeRef = destParentInfo.getNodeRef();
+        
+        String name = getDAVHelper().splitPath(destPath)[1];
+
+        moveOrCopy(sourceNodeRef, sourceParentNodeRef, destParentNodeRef, name);
+
+        // Set the response status
+        if (!destNotHidden)
+        {
+            m_response.setStatus(HttpServletResponse.SC_CREATED);
+        }
+        else
+        {
+            m_response.setStatus(HttpServletResponse.SC_NO_CONTENT);
+        }
+    }       
+       
+    protected void parseRequestHeaders() throws WebDAVServerException
+    {
+        super.parseRequestHeaders();
+        parseIfHeader();
+    } 
+
+    protected void moveOrCopy(
+            NodeRef sourceNodeRef,
+            NodeRef sourceParentNodeRef,
+            NodeRef destParentNodeRef,
+            String name) throws Exception
+    {
+        FileFolderService fileFolderService = getFileFolderService();
+        NodeRef rootNodeRef = getRootNodeRef();
+
+        String sourcePath = getPath();
+        List<String> sourcePathElements = getDAVHelper().splitAllPaths(sourcePath);
+        FileInfo sourceFileInfo = null;
+        
+        String destPath = getDestinationPath();
+        List<String> destPathElements = getDAVHelper().splitAllPaths(destPath);
+        FileInfo destFileInfo = null;
+        
+        boolean isMove = isMove();
+
+        try
+        {
+            // get the node to move
+            sourceFileInfo = fileFolderService.resolveNamePath(rootNodeRef, sourcePathElements);
+            destFileInfo = fileFolderService.resolveNamePath(rootNodeRef, destPathElements);
+        }
+        catch (FileNotFoundException e)
+        {
+            if (sourceFileInfo == null)
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Source node not found: " + sourcePath);
+                }
+                // nothing to move
+                throw new WebDAVServerException(HttpServletResponse.SC_NOT_FOUND);
+            }
+        }
+        LockInfo lockInfo = null;
+        if (isMove)
+        {
+            lockInfo = checkNode(sourceFileInfo);
+        }
+        // ALF-7079 fix, if destination exists then its content is updated with source content and source is deleted if
+        // this is a move
+        if (!sourceFileInfo.isFolder() && destFileInfo != null && !sourceFileInfo.equals(destFileInfo))
+        {
+            copyContentOnly(sourceFileInfo, destFileInfo, fileFolderService);
+            fileFolderService.setHidden(destFileInfo.getNodeRef(), false);
+            if (isMove)
+            {
+                if (getDAVHelper().isRenameShuffle(destPath) && !getDAVHelper().isRenameShuffle(sourcePath))
+                {
+                    // if temporary or backup file already exists
+                    // don't delete source that is node with version history
+                    fileFolderService.setHidden(sourceNodeRef, true);
+                    // As per the WebDAV spec, we make sure the node is unlocked once moved
+                    unlock(sourceNodeRef, lockInfo);
+                }
+                else
+                {
+                    fileFolderService.delete(sourceNodeRef);
+                }
+            }
+        }
+        // If this is a copy then the source is just copied to destination.
+        else if (!isMove)
+        {
+            // MNT-9939 - check overwrite
+            if (hasOverWrite() && destFileInfo != null)
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Destination exists and overwrite is allowed");
+                }
+                
+                fileFolderService.delete(destFileInfo.getNodeRef());
+            }
+            
+            fileFolderService.copy(sourceNodeRef, destParentNodeRef, name);
+        }
+        // If this is a move and the destination looks like the start of a shuffle operation, then the source is just
+        // copied to destination and the source is hidden.
+        else if (!sourceFileInfo.isFolder() && getDAVHelper().isRenameShuffle(destPath) && !getDAVHelper().isRenameShuffle(sourcePath))
+        {
+            destFileInfo = fileFolderService.create(destParentNodeRef, name, ContentModel.TYPE_CONTENT);
+            copyContentOnly(sourceFileInfo, destFileInfo, fileFolderService);
+            fileFolderService.setHidden(sourceNodeRef, true);
+
+            // As per the WebDAV spec, we make sure the node is unlocked once moved
+            unlock(sourceNodeRef, lockInfo);
+        }
+        else if (sourceParentNodeRef.equals(destParentNodeRef)) 
+        { 
+           // It is a simple rename operation
+           // MNT-9939 - check overwrite
+           if (hasOverWrite() && destFileInfo != null && !sourceFileInfo.equals(destFileInfo))
+           {
+               if (logger.isDebugEnabled())
+               {
+                   logger.debug("Destination exists and overwrite is allowed");
+               }
+               
+               fileFolderService.delete(destFileInfo.getNodeRef());
+           }
+           
+            fileFolderService.rename(sourceNodeRef, name);
+
+            // MNT-13144 WebDav does not correctly version CAD drawings correctly when saved using Windows mapped drive
+            if (!sourceFileInfo.isFolder() && getDAVHelper().isRenameShuffle(name))
+            {
+                fileFolderService.setHidden(sourceFileInfo.getNodeRef(), true);
+            }
+
+           // As per the WebDAV spec, we make sure the node is unlocked once moved
+           unlock(sourceNodeRef, lockInfo);
+        }
+        else
+        {
+            // It is a simple move operation 
+            // MNT-9939 - check overwrite
+            if (hasOverWrite() && destFileInfo != null)
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Destination exists and overwrite is allowed");
+                }
+                
+                fileFolderService.delete(destFileInfo.getNodeRef());
+            }
+            
+            fileFolderService.moveFrom(sourceNodeRef, sourceParentNodeRef, destParentNodeRef, name);  
+
+            // As per the WebDAV spec, we make sure the node is unlocked once moved
+            unlock(sourceNodeRef, lockInfo);
+        }
+    }
+    
+    private void copyContentOnly(FileInfo sourceFileInfo, FileInfo destFileInfo, FileFolderService fileFolderService) throws WebDAVServerException
+    {
+    	ContentService contentService = getContentService();
+        ContentReader reader = contentService.getReader(sourceFileInfo.getNodeRef(), ContentModel.PROP_CONTENT);
+        if (reader == null)
+        {
+            // There is no content for the node if it is a folder
+            if (!sourceFileInfo.isFolder())
+            {
+                // Non-folders should have content available.
+                logger.error("Unable to get ContentReader for source node " + sourceFileInfo.getNodeRef());
+                throw new WebDAVServerException(HttpServletResponse.SC_NOT_FOUND);
+            }
+        }
+        else
+        {
+            ContentWriter contentWriter = contentService.getWriter(destFileInfo.getNodeRef(), ContentModel.PROP_CONTENT, true);
+            contentWriter.putContent(reader);
+        }
+    }
+    
+    /**
+     * Unlock only if the node was locked in the first place.
+     */
+    private void unlock(final NodeRef nodeRef, LockInfo lockInfo)
+    {
+        if (lockInfo != null && lockInfo.isLocked())
+        {
+            if (lockInfo.isExpired())
+            {
+                // If the lock expired unlock as system user
+                AuthenticationUtil.runAs(new RunAsWork<Void>()
+                {
+                    public Void doWork() throws Exception
+                    {
+                        getDAVHelper().getLockService().unlock(nodeRef);
+                        return null;
+                    }
+                }, AuthenticationUtil.getSystemUserName());
+            }
+            // else unlock as current user
+            else
+            {
+                getDAVHelper().getLockService().unlock(nodeRef);
+            }
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/OptionsMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/OptionsMethod.java
new file mode 100644
index 00000000000..ee925fb6074
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/OptionsMethod.java
@@ -0,0 +1,116 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+
+/**
+ * Implements the WebDAV OPTIONS method
+ * 
+ * @author Gavin Cornwell
+ */
+public class OptionsMethod extends WebDAVMethod
+{
+    private static final String DAV_HEADER = "DAV";
+    private static final String DAV_HEADER_CONTENT = "1,2";
+    private static final String ALLOW_HEADER = "Allow";
+    private static final String MS_HEADER = "MS-Author-Via";
+
+    private static final String FILE_METHODS = "OPTIONS, GET, HEAD, POST, DELETE, PROPFIND, PROPPATCH, COPY, MOVE, LOCK, UNLOCK";
+    private static final String COLLECTION_METHODS = FILE_METHODS + ", PUT";
+
+    /**
+     * Default constructor
+     */
+    public OptionsMethod()
+    {
+    }
+
+    /**
+     * Parse the request header fields
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestHeaders() throws WebDAVServerException
+    {
+        // Nothing to do in this method
+    }
+
+    /**
+     * Parse the request main body
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestBody() throws WebDAVServerException
+    {
+        // Nothing to do in this method
+    }
+
+    /**
+     * @return          Returns <tt>true</tt> always
+     */
+    @Override
+    protected boolean isReadOnly()
+    {
+        return true;
+    }
+
+    /**
+     * Perform the main request processing
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void executeImpl() throws WebDAVServerException
+    {
+        Boolean isFolder = AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Boolean>()
+        {
+            @Override
+            public Boolean doWork() throws FileNotFoundException
+            {
+                try
+                {
+                    FileInfo fileInfo = getDAVHelper().getNodeForPath(getRootNodeRef(), getPath());
+                    return fileInfo.isFolder();
+                }
+                catch (FileNotFoundException e)
+                {
+                    // Do nothing; just default to a folder
+                    return true;
+                }
+            }
+        }, AuthenticationUtil.getSystemUserName());
+        // Add the header to advertise the level of support the server has
+        m_response.addHeader(DAV_HEADER, DAV_HEADER_CONTENT);
+
+        // Add the proprietary Microsoft header to make Microsoft clients behave
+        m_response.addHeader(MS_HEADER, DAV_HEADER);
+
+        // Add the header to show what methods are allowed
+        m_response.addHeader(ALLOW_HEADER, isFolder ? COLLECTION_METHODS : FILE_METHODS);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/PostMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/PostMethod.java
new file mode 100644
index 00000000000..0a9c9597917
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/PostMethod.java
@@ -0,0 +1,41 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+/**
+ * Implements the WebDAV POST method
+ * 
+ * @author Gavin Cornwell
+ */
+public class PostMethod extends PutMethod
+{
+    /**
+     * Default constructor
+     */
+    public PostMethod()
+    {
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/PropFindMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/PropFindMethod.java
new file mode 100644
index 00000000000..437abe78ec0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/PropFindMethod.java
@@ -0,0 +1,1050 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.SessionUser;
+import org.alfresco.repo.webdav.auth.AuthenticationFilter;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.repository.datatype.TypeConverter;
+import org.alfresco.service.namespace.InvalidQNameException;
+import org.alfresco.service.namespace.QName;
+import org.dom4j.DocumentHelper;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.XMLWriter;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+/**
+ * Implements the WebDAV PROPFIND method
+ * 
+ * @author Gavin Cornwell
+ */
+public class PropFindMethod extends WebDAVMethod
+{
+    // Request types
+	protected static final int GET_ALL_PROPS = 0;
+	protected static final int GET_NAMED_PROPS = 1;
+	protected static final int FIND_PROPS = 2;
+
+    // Find request type
+    protected int m_mode = GET_ALL_PROPS;
+
+    // Requested properties
+    protected ArrayList<WebDAVProperty> m_properties = null;
+
+    // Available namespaces list
+    protected HashMap<String, String> m_namespaces = null;
+
+    /**
+     * Default constructor
+     */
+    public PropFindMethod()
+    {
+        m_namespaces = new HashMap<String, String>();
+    }
+
+    /**
+     * Return the find mode
+     * 
+     * @return int
+     */
+    public final int getMode()
+    {
+        return m_mode;
+    }
+
+    /**
+     * Parse the request headers
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestHeaders() throws WebDAVServerException
+    {
+        // Store the Depth header as this is used by several WebDAV methods
+
+        parseDepthHeader();
+        
+    }
+
+    /**
+     * Parse the request body
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestBody() throws WebDAVServerException
+    {
+        Document body = getRequestBodyAsDocument();
+        if (body != null)
+        {
+            Element rootElement = body.getDocumentElement();
+            NodeList childList = rootElement.getChildNodes();
+            Node node = null;
+
+            for (int i = 0; i < childList.getLength(); i++)
+            {
+                Node currentNode = childList.item(i);
+                switch (currentNode.getNodeType())
+                {
+                case Node.TEXT_NODE:
+                    break;
+                case Node.ELEMENT_NODE:
+                    if (currentNode.getNodeName().endsWith(WebDAV.XML_ALLPROP))
+                    {
+                        m_mode = GET_ALL_PROPS;
+                    }
+                    else if (currentNode.getNodeName().endsWith(WebDAV.XML_PROP))
+                    {
+                        m_mode = GET_NAMED_PROPS;
+                        node = currentNode;
+                    }
+                    else if (currentNode.getNodeName().endsWith(WebDAV.XML_PROPNAME))
+                    {
+                        m_mode = FIND_PROPS;
+                    }
+
+                    break;
+                }
+            }
+
+            if (m_mode == GET_NAMED_PROPS)
+            {
+                m_properties = new ArrayList<WebDAVProperty>();
+                childList = node.getChildNodes();
+
+                for (int i = 0; i < childList.getLength(); i++)
+                {
+                    Node currentNode = childList.item(i);
+                    switch (currentNode.getNodeType())
+                    {
+                    case Node.TEXT_NODE:
+                        break;
+                    case Node.ELEMENT_NODE:
+                        m_properties.add(createProperty(currentNode));
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * @return          Returns <tt>true</tt> always
+     */
+    @Override
+    protected boolean isReadOnly()
+    {
+        return true;
+    }
+    
+    /**
+     * Execute the main WebDAV request processing
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void executeImpl() throws WebDAVServerException, Exception
+    {
+        m_response.setStatus(WebDAV.WEBDAV_SC_MULTI_STATUS);
+        
+        FileInfo pathNodeInfo = null;
+        try
+        {
+            // Check that the path exists
+            pathNodeInfo = getDAVHelper().getNodeForPath(getRootNodeRef(), m_strPath);
+        }
+        catch (FileNotFoundException e)
+        {
+            // The path is not valid - send a 404 error back to the client
+            throw new WebDAVServerException(HttpServletResponse.SC_NOT_FOUND);
+        }
+        
+        // A node hidden during a 'shuffle' operation - send a 404 error back to the client, as some Mac clients need this
+        // Note the null check, as root node may be null in cloud.
+        if (pathNodeInfo.getNodeRef() != null && getFileFolderService().isHidden(pathNodeInfo.getNodeRef()))
+        {
+            throw new WebDAVServerException(HttpServletResponse.SC_NOT_FOUND);            
+        }
+
+        // Set the response content type
+
+        m_response.setContentType(WebDAV.XML_CONTENT_TYPE);
+
+        // Create multistatus response
+
+        XMLWriter xml = createXMLWriter();
+
+        xml.startDocument();
+
+        String nsdec = generateNamespaceDeclarations(m_namespaces);
+        xml.startElement(
+                WebDAV.DAV_NS,
+                WebDAV.XML_MULTI_STATUS + nsdec,
+                WebDAV.XML_NS_MULTI_STATUS + nsdec,
+                getDAVHelper().getNullAttributes());
+
+        // Create the path for the current location in the tree
+        StringBuilder baseBuild = new StringBuilder(256);
+        baseBuild.append(getPath());
+        if (baseBuild.length() == 0 || baseBuild.charAt(baseBuild.length() - 1) != WebDAVHelper.PathSeperatorChar)
+        {
+            baseBuild.append(WebDAVHelper.PathSeperatorChar);
+        }
+        String basePath = baseBuild.toString();
+
+        // Output the response for the root node, depth zero
+        generateResponseForNode(xml, pathNodeInfo, basePath);
+
+        // If additional levels are required and the root node is a folder then recurse to the required
+        // level and output node details a level at a time
+        if (getDepth() != WebDAV.DEPTH_0 && pathNodeInfo.isFolder())
+        {
+            // Create the initial list of nodes to report
+            List<FileInfo> nodeInfos = new ArrayList<FileInfo>(10);
+            nodeInfos.add(pathNodeInfo);
+
+            int curDepth = WebDAV.DEPTH_1;
+
+            // Save the base path length
+            int baseLen = baseBuild.length();
+
+            // List of next level of nodes to report
+            List<FileInfo> nextNodeInfos = null;
+            if (getDepth() > WebDAV.DEPTH_1)
+            {
+                nextNodeInfos = new ArrayList<FileInfo>(10);
+            }
+
+            // Loop reporting each level of nodes to the requested depth
+            while (curDepth <= getDepth() && nodeInfos != null)
+            {
+                // Clear out the next level of nodes, if required
+                if (nextNodeInfos != null)
+                {
+                    nextNodeInfos.clear();
+                }
+
+                // Output the current level of node(s), the node list should
+                // only contain folder nodes
+
+                for (FileInfo curNodeInfo : nodeInfos)
+                {
+                    // Get the list of child nodes for the current node
+                    List<FileInfo> childNodeInfos = getDAVHelper().getChildren(curNodeInfo);
+                    
+                    // can skip the current node if it doesn't have children
+                    if (childNodeInfos.size() == 0)
+                    {
+                        continue;
+                    }
+                    
+                    // Output the child node details
+                    // Generate the base path for the current parent node
+
+                    baseBuild.setLength(baseLen);
+                    try
+                    {
+                        String pathSnippet = null;
+                        if ((pathNodeInfo.getNodeRef() == null) && (curNodeInfo.getNodeRef() == null))
+                        {
+                            // TODO review - note: can be null in case of Thor
+                            pathSnippet = "/";
+                        }
+                        else
+                        {
+                            pathSnippet = getDAVHelper().getPathFromNode(pathNodeInfo.getNodeRef(), curNodeInfo.getNodeRef());
+                        }
+                        
+                        baseBuild.append(pathSnippet);
+                    }
+                    catch (FileNotFoundException e)
+                    {
+                        // move to the next node
+                        continue;
+                    }
+
+                    int curBaseLen = baseBuild.length();
+
+                    // Output the child node details
+                    for (FileInfo curChildInfo : childNodeInfos)
+                    {
+	                // Build the path for the current child node
+	                baseBuild.setLength(curBaseLen);
+	
+	                baseBuild.append(curChildInfo.getName());
+	
+	                // Output the current child node details
+	                generateResponseForNode(xml, curChildInfo, baseBuild.toString());
+	
+	                // If the child is a folder add it to the list of next level nodes
+	                if (nextNodeInfos != null && curChildInfo.isFolder())
+	                {
+	                    nextNodeInfos.add(curChildInfo);
+	                }
+                    }
+                }
+
+                // Update the current tree depth
+                curDepth++;
+
+                // Move the next level of nodes to the current node list
+                nodeInfos = nextNodeInfos;
+            }
+        }
+
+        // Close the outer XML element
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_MULTI_STATUS, WebDAV.XML_NS_MULTI_STATUS);
+
+        // Send remaining data
+        flushXML(xml);
+    }
+
+    @Override
+    protected OutputFormat getXMLOutputFormat()
+    {
+        String userAgent = m_request.getHeader("User-Agent");
+        return ((null != userAgent) && userAgent.toLowerCase().startsWith("microsoft-webdav-miniredir/5.1.")) ? OutputFormat.createCompactFormat() : super.getXMLOutputFormat();
+
+    }
+
+    /**
+     * Creates a WebDAVProperty from the given XML node
+     */
+    protected WebDAVProperty createProperty(Node node)
+    {
+        WebDAVProperty property = null;
+
+        String strName = node.getLocalName();
+        String strNamespaceUri = node.getNamespaceURI();
+
+        if (WebDAV.DEFAULT_NAMESPACE_URI.equals(strNamespaceUri))
+        {
+            property = new WebDAVProperty(strName);
+        }
+        else
+        {
+            property = new WebDAVProperty(strName, strNamespaceUri, getNamespaceName(strNamespaceUri));
+        }
+
+        return property;
+    }
+
+    /**
+     * Retrieves the namespace name for the given namespace URI, one is
+     * generated if it doesn't exist
+     */
+    private String getNamespaceName(String strNamespaceUri)
+    {
+        if (strNamespaceUri == null)
+        {
+            return null;
+        }
+        String strNamespaceName = m_namespaces.get(strNamespaceUri);
+        if (strNamespaceName == null)
+        {
+            strNamespaceName = "ns" + m_namespaces.size();
+            m_namespaces.put(strNamespaceUri, strNamespaceName);
+        }
+
+        return strNamespaceName;
+    }
+
+    /**
+     * Generates the required response XML for the current node
+     * 
+     * @param xml XMLWriter
+     * @param nodeInfo FileInfo
+     * @param path String
+     */
+    protected void generateResponseForNode(XMLWriter xml, FileInfo nodeInfo, String path) throws Exception
+    {
+        boolean isFolder = nodeInfo.isFolder();
+        
+        // Output the response block for the current node
+        xml.startElement(
+                WebDAV.DAV_NS,
+                WebDAV.XML_RESPONSE,
+                WebDAV.XML_NS_RESPONSE,
+                getDAVHelper().getNullAttributes());
+
+        // Build the href string for the current node
+        String strHRef = getURLForPath(m_request, path, isFolder);
+
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_HREF, WebDAV.XML_NS_HREF, getDAVHelper().getNullAttributes());
+        xml.write(strHRef);
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_HREF, WebDAV.XML_NS_HREF);
+
+        switch (m_mode)
+        {
+        case GET_NAMED_PROPS:
+            generateNamedPropertiesResponse(xml, nodeInfo, isFolder);
+            break;
+        case GET_ALL_PROPS:
+            generateAllPropertiesResponse(xml, nodeInfo, isFolder);
+            break;
+        case FIND_PROPS:
+            generateFindPropertiesResponse(xml, nodeInfo, isFolder);
+            break;
+        }
+
+        // Close off the response element
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_RESPONSE, WebDAV.XML_NS_RESPONSE);
+    }
+
+    /**
+     * Generates the XML response for a PROPFIND request that asks for a
+     * specific set of properties
+     * 
+     * @param xml XMLWriter
+     * @param nodeInfo FileInfo
+     * @param isDir boolean
+     */
+    private void generateNamedPropertiesResponse(XMLWriter xml, FileInfo nodeInfo, boolean isDir) throws Exception
+    {
+        // Get the properties for the node
+        Map<QName, Serializable> props = nodeInfo.getProperties();
+        Map<QName, String> deadProperties = null;
+
+        // Output the start of the properties element
+        Attributes nullAttr = getDAVHelper().getNullAttributes();
+
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROPSTAT, WebDAV.XML_NS_PROPSTAT, nullAttr);
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP, nullAttr);
+
+        ArrayList<WebDAVProperty> propertiesNotFound = new ArrayList<WebDAVProperty>();
+
+        TypeConverter typeConv = DefaultTypeConverter.INSTANCE;
+
+        // Loop through the requested property list
+        for (WebDAVProperty property : m_properties)
+        {
+            // Get the requested property details
+
+            String propName = property.getName();
+            String propNamespaceUri = property.getNamespaceUri();
+
+            // Check if the property is a standard WebDAV property
+
+            Object davValue = null;
+
+            if (WebDAV.DEFAULT_NAMESPACE_URI.equals(propNamespaceUri))
+            {
+                // Check if the client is requesting lock information
+                if (propName.equals(WebDAV.XML_LOCK_DISCOVERY)) // && metaData.isLocked())
+                {
+                    generateLockDiscoveryResponse(xml, nodeInfo, isDir);
+                }
+                else if (propName.equals(WebDAV.XML_SUPPORTED_LOCK))
+                {
+                    // Output the supported lock types
+                    writeLockTypes(xml);
+                }
+
+                // Check if the client is requesting the resource type
+
+                else if (propName.equals(WebDAV.XML_RESOURCE_TYPE))
+                {
+                    // If the node is a folder then return as a collection type
+
+                    xml.startElement(WebDAV.DAV_NS, WebDAV.XML_RESOURCE_TYPE, WebDAV.XML_NS_RESOURCE_TYPE, nullAttr);
+                    if (isDir)
+                    {
+                        xml.write(DocumentHelper.createElement(WebDAV.XML_NS_COLLECTION));
+                    }
+                    xml.endElement(WebDAV.DAV_NS, WebDAV.XML_RESOURCE_TYPE, WebDAV.XML_NS_RESOURCE_TYPE);
+                }
+                else if (propName.equals(WebDAV.XML_DISPLAYNAME))
+                {
+                    // Get the node name
+                    if (getRootNodeRef().equals(nodeInfo.getNodeRef()))
+                    {
+                        // Output an empty name for the root node
+                        xml.write(DocumentHelper.createElement(WebDAV.XML_NS_SOURCE));
+                    }
+                    else
+                    {
+                        // Get the node name
+                        davValue = WebDAV.getDAVPropertyValue(props, WebDAV.XML_DISPLAYNAME);
+
+                        // Output the node name
+                        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_DISPLAYNAME, WebDAV.XML_NS_DISPLAYNAME, nullAttr);
+                        if (davValue != null)
+                        {
+                            String name = typeConv.convert(String.class, davValue);
+                            if (name == null || name.length() == 0)
+                            {
+                                logger.error("WebDAV name is null, value=" + davValue.getClass().getName() + ", node=" + nodeInfo.getNodeRef());
+                            }
+                            xml.write(name);
+                        }
+                        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_DISPLAYNAME, WebDAV.XML_NS_DISPLAYNAME);
+                    }
+                }
+                else if (propName.equals(WebDAV.XML_SOURCE))
+                {
+                    // NOTE: source is always a no content element in our
+                    // implementation
+
+                    xml.write(DocumentHelper.createElement(WebDAV.XML_NS_SOURCE));
+                }
+                else if (propName.equals(WebDAV.XML_GET_LAST_MODIFIED))
+                {
+                    // Get the modifed date/time
+
+                    davValue = WebDAV.getDAVPropertyValue(props, WebDAV.XML_GET_LAST_MODIFIED);
+
+                    // Output the last modified date of the node
+
+                    xml.startElement(WebDAV.DAV_NS, WebDAV.XML_GET_LAST_MODIFIED, WebDAV.XML_NS_GET_LAST_MODIFIED,
+                            nullAttr);
+                    if (davValue != null)
+                        xml.write(WebDAV.formatModifiedDate(typeConv.convert(Date.class, davValue)));
+                    xml.endElement(WebDAV.DAV_NS, WebDAV.XML_GET_LAST_MODIFIED, WebDAV.XML_NS_GET_LAST_MODIFIED);
+                }
+                else if (propName.equals(WebDAV.XML_GET_CONTENT_LANGUAGE) && !isDir)
+                {
+                    // Get the content language
+                    // TODO:
+                    // Output the content language
+                    xml.startElement(
+                            WebDAV.DAV_NS, WebDAV.XML_GET_CONTENT_LANGUAGE,
+                            WebDAV.XML_NS_GET_CONTENT_LANGUAGE, nullAttr);
+                    // TODO:
+                    xml.endElement(WebDAV.DAV_NS, WebDAV.XML_GET_CONTENT_LANGUAGE, WebDAV.XML_NS_GET_CONTENT_LANGUAGE);
+                }
+                else if (propName.equals(WebDAV.XML_GET_CONTENT_TYPE) && !isDir)
+                {
+                    // Get the content type
+                    davValue = WebDAV.getDAVPropertyValue(props, WebDAV.XML_GET_CONTENT_TYPE);
+
+                    // Output the content type
+                    xml.startElement(
+                            WebDAV.DAV_NS, WebDAV.XML_GET_CONTENT_TYPE,
+                            WebDAV.XML_NS_GET_CONTENT_TYPE, nullAttr);
+                    if (davValue != null)
+                        xml.write(typeConv.convert(String.class, davValue));
+                    xml.endElement(WebDAV.DAV_NS, WebDAV.XML_GET_CONTENT_TYPE, WebDAV.XML_NS_GET_CONTENT_TYPE);
+                }
+                else if (propName.equals(WebDAV.XML_GET_ETAG) && !isDir)
+                {
+                    // Output the etag
+
+                    xml.startElement(WebDAV.DAV_NS, WebDAV.XML_GET_ETAG, WebDAV.XML_NS_GET_ETAG, nullAttr);
+                    xml.write(getDAVHelper().makeETag(nodeInfo));
+                    xml.endElement(WebDAV.DAV_NS, WebDAV.XML_GET_ETAG, WebDAV.XML_NS_GET_ETAG);
+                }
+                else if (propName.equals(WebDAV.XML_GET_CONTENT_LENGTH))
+                {
+                    // Get the content length, if it's not a folder
+                    long len = 0;
+
+                    if (!isDir)
+                    {
+                        ContentData contentData = (ContentData) props.get(ContentModel.PROP_CONTENT);
+                        if (contentData != null)
+                            len = contentData.getSize();
+                    }
+
+                    // Output the content length
+                    xml.startElement(WebDAV.DAV_NS, WebDAV.XML_GET_CONTENT_LENGTH, WebDAV.XML_NS_GET_CONTENT_LENGTH,
+                            nullAttr);
+                    xml.write("" + len);
+                    xml.endElement(WebDAV.DAV_NS, WebDAV.XML_GET_CONTENT_LENGTH, WebDAV.XML_NS_GET_CONTENT_LENGTH);
+                }
+                else if (propName.equals(WebDAV.XML_CREATION_DATE))
+                {
+                    // Get the creation date
+                    davValue = WebDAV.getDAVPropertyValue(props, WebDAV.XML_CREATION_DATE);
+
+                    // Output the creation date
+                    xml.startElement(WebDAV.DAV_NS, WebDAV.XML_CREATION_DATE, WebDAV.XML_NS_CREATION_DATE, nullAttr);
+                    if (davValue != null)
+                        xml.write(WebDAV.formatCreationDate(typeConv.convert(Date.class, davValue)));
+                    xml.endElement(WebDAV.DAV_NS, WebDAV.XML_CREATION_DATE, WebDAV.XML_NS_CREATION_DATE);
+                }
+                else if ( propName.equals( WebDAV.XML_ALF_AUTHTICKET))
+                {
+                	// Get the users authentication ticket
+                	
+                    SessionUser davUser = (SessionUser) m_request.getSession().getAttribute( AuthenticationFilter.AUTHENTICATION_USER);
+                    
+                    xml.startElement(WebDAV.DAV_NS, WebDAV.XML_ALF_AUTHTICKET, WebDAV.XML_NS_ALF_AUTHTICKET, nullAttr);
+                    if ( davUser != null)
+                    	xml.write( davUser.getTicket());
+                    xml.endElement(WebDAV.DAV_NS, WebDAV.XML_ALF_AUTHTICKET, WebDAV.XML_NS_ALF_AUTHTICKET);
+                }
+                else
+                {
+                    // Could not map the requested property to an Alfresco property
+                    if (property.getName().equals(WebDAV.XML_HREF) == false)
+                        propertiesNotFound.add(property);
+                }
+            }
+            else
+            {
+                // Look in the custom properties
+
+//                String qualifiedName = propNamespaceUri + WebDAV.NAMESPACE_SEPARATOR + propName;
+
+                String value = (String) nodeInfo.getProperties().get(property.createQName());
+                if (value == null)
+                {
+                    if (deadProperties == null)
+                    {
+                        deadProperties = loadDeadProperties(nodeInfo.getNodeRef());
+                    }
+                    value = deadProperties.get(property.createQName());
+                }
+
+                if (value == null)
+                {
+                    propertiesNotFound.add(property);
+                }
+                else
+                {
+                    if (property.hasNamespaceName())
+                    {
+                        xml.startElement(property.getNamespaceName(), property.getName(), property.getNamespaceName() + WebDAV.NAMESPACE_SEPARATOR + property.getName(), nullAttr);
+                        xml.write(value);
+                        xml.endElement(property.getNamespaceName(), property.getName(), property.getNamespaceName() + WebDAV.NAMESPACE_SEPARATOR + property.getName());
+                    }
+                    else
+                    {
+                        xml.startElement("", property.getName(), property.getName(), nullAttr);
+                        xml.write(value);
+                        xml.endElement("", property.getName(), property.getName());
+                    }
+                }
+
+            }
+        }
+
+        // Close off the successful part of the response
+
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP);
+
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_STATUS, WebDAV.XML_NS_STATUS, nullAttr);
+        xml.write(WebDAV.HTTP1_1 + " " + HttpServletResponse.SC_OK + " " + WebDAV.SC_OK_DESC);
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_STATUS, WebDAV.XML_NS_STATUS);
+
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROPSTAT, WebDAV.XML_NS_PROPSTAT);
+
+        // If some of the requested properties were not found return another
+        // status section
+
+        if (propertiesNotFound.size() > 0)
+        {
+            // Start the second status section
+
+            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROPSTAT, WebDAV.XML_NS_PROPSTAT, nullAttr);
+            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP, nullAttr);
+
+            // Loop through the list of properties that were not found
+
+            for (WebDAVProperty property : propertiesNotFound)
+            {
+                // Output the property not found status block
+
+                String propName = property.getName();
+                String propNamespaceName = property.getNamespaceName();
+                String propQName = propName;
+                if (propNamespaceName != null && propNamespaceName.length() > 0)
+                    propQName = propNamespaceName + ":" + propName;
+
+                xml.write(DocumentHelper.createElement(propQName));
+            }
+
+            // Close the unsuccessful part of the response
+
+            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP);
+
+            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_STATUS, WebDAV.XML_NS_STATUS, nullAttr);
+            xml.write(WebDAV.HTTP1_1 + " " + HttpServletResponse.SC_NOT_FOUND + " " + WebDAV.SC_NOT_FOUND_DESC);
+            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_STATUS, WebDAV.XML_NS_STATUS);
+
+            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROPSTAT, WebDAV.XML_NS_PROPSTAT);
+        }
+    }
+
+    /**
+     * Generates the XML response for a PROPFIND request that asks for all known
+     * properties
+     * 
+     * @param xml XMLWriter
+     * @param nodeInfo FileInfo
+     * @param isDir boolean
+     */
+    protected void generateAllPropertiesResponse(XMLWriter xml, FileInfo nodeInfo, boolean isDir) throws Exception
+    {
+        // Get the properties for the node
+
+        Map<QName, Serializable> props = nodeInfo.getProperties();
+
+        // Output the start of the properties element
+
+        Attributes nullAttr = getDAVHelper().getNullAttributes();
+
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROPSTAT, WebDAV.XML_NS_PROPSTAT, nullAttr);
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP, nullAttr);
+
+        // Generate a lock status report, if locked
+
+        generateLockDiscoveryResponse(xml, nodeInfo, isDir);
+
+        // Output the supported lock types
+
+        writeLockTypes(xml);
+
+        // If the node is a folder then return as a collection type
+
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_RESOURCE_TYPE, WebDAV.XML_NS_RESOURCE_TYPE, nullAttr);
+        if (isDir)
+            xml.write(DocumentHelper.createElement(WebDAV.XML_NS_COLLECTION));
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_RESOURCE_TYPE, WebDAV.XML_NS_RESOURCE_TYPE);
+
+        // Get the node name
+
+        Object davValue = WebDAV.getDAVPropertyValue(props, WebDAV.XML_DISPLAYNAME);
+
+        TypeConverter typeConv = DefaultTypeConverter.INSTANCE;
+
+        // Output the node name
+
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_DISPLAYNAME, WebDAV.XML_NS_DISPLAYNAME, nullAttr);
+        if (davValue != null)
+        {
+            String name = typeConv.convert(String.class, davValue);
+            if (name == null || name.length() == 0)
+            {
+                logger.error("WebDAV name is null, value=" + davValue.getClass().getName() + ", node=" + nodeInfo.getNodeRef());
+            }
+            xml.write(name);
+        }
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_DISPLAYNAME, WebDAV.XML_NS_DISPLAYNAME);
+
+        // Output the source
+        //
+        // NOTE: source is always a no content element in our implementation
+
+        xml.write(DocumentHelper.createElement(WebDAV.XML_NS_SOURCE));
+
+        // Get the creation date
+
+        davValue = WebDAV.getDAVPropertyValue(props, WebDAV.XML_CREATION_DATE);
+
+        // Output the creation date
+
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_CREATION_DATE, WebDAV.XML_NS_CREATION_DATE, nullAttr);
+        if (davValue != null)
+            xml.write(WebDAV.formatCreationDate(typeConv.convert(Date.class, davValue)));
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_CREATION_DATE, WebDAV.XML_NS_CREATION_DATE);
+
+        // Get the modifed date/time
+
+        davValue = WebDAV.getDAVPropertyValue(props, WebDAV.XML_GET_LAST_MODIFIED);
+
+        // Output the last modified date of the node
+
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_GET_LAST_MODIFIED, WebDAV.XML_NS_GET_LAST_MODIFIED, nullAttr);
+        if (davValue != null)
+            xml.write(WebDAV.formatModifiedDate(typeConv.convert(Date.class, davValue)));
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_GET_LAST_MODIFIED, WebDAV.XML_NS_GET_LAST_MODIFIED);
+
+        // For a file node output the content language and content type
+
+        if (isDir == false)
+        {
+            // Get the content language
+
+            // TODO:
+            // Output the content language
+
+            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_GET_CONTENT_LANGUAGE, WebDAV.XML_NS_GET_CONTENT_LANGUAGE,
+                    nullAttr);
+            // TODO:
+            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_GET_CONTENT_LANGUAGE, WebDAV.XML_NS_GET_CONTENT_LANGUAGE);
+
+            // Get the content type
+            davValue = WebDAV.getDAVPropertyValue(props, WebDAV.XML_GET_CONTENT_TYPE);
+
+            // Output the content type
+            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_GET_CONTENT_TYPE, WebDAV.XML_NS_GET_CONTENT_TYPE, nullAttr);
+            if (davValue != null)
+                xml.write(typeConv.convert(String.class, davValue));
+            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_GET_CONTENT_TYPE, WebDAV.XML_NS_GET_CONTENT_TYPE);
+
+            // Output the etag
+
+            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_GET_ETAG, WebDAV.XML_NS_GET_ETAG, nullAttr);
+            xml.write(getDAVHelper().makeETag(nodeInfo));
+            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_GET_ETAG, WebDAV.XML_NS_GET_ETAG);
+        }
+
+        // Get the content length, if it's not a folder
+
+        long len = 0;
+
+        if (isDir == false)
+        {
+            ContentData contentData = (ContentData) props.get(ContentModel.PROP_CONTENT);
+            if (contentData != null)
+                len = contentData.getSize();
+        }
+
+        // Output the content length
+
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_GET_CONTENT_LENGTH, WebDAV.XML_NS_GET_CONTENT_LENGTH, nullAttr);
+        xml.write("" + len);
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_GET_CONTENT_LENGTH, WebDAV.XML_NS_GET_CONTENT_LENGTH);
+
+        // Print out all the custom properties
+
+        SessionUser davUser = (SessionUser) m_request.getSession().getAttribute( AuthenticationFilter.AUTHENTICATION_USER);
+        
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_ALF_AUTHTICKET, WebDAV.XML_NS_ALF_AUTHTICKET, nullAttr);
+        if ( davUser != null)
+        	xml.write( davUser.getTicket());
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_ALF_AUTHTICKET, WebDAV.XML_NS_ALF_AUTHTICKET);
+
+        // Close off the response
+
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP);
+
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_STATUS, WebDAV.XML_NS_STATUS, nullAttr);
+        xml.write(WebDAV.HTTP1_1 + " " + HttpServletResponse.SC_OK + " " + WebDAV.SC_OK_DESC);
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_STATUS, WebDAV.XML_NS_STATUS);
+
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROPSTAT, WebDAV.XML_NS_PROPSTAT);
+    }
+
+    /**
+     * Generates the XML response for a PROPFIND request that asks for a list of
+     * all known properties
+     * 
+     * @param xml XMLWriter
+     * @param nodeInfo FileInfo
+     * @param isDir boolean
+     */
+    protected void generateFindPropertiesResponse(XMLWriter xml, FileInfo nodeInfo, boolean isDir)
+    {
+        try
+        {
+            // Output the start of the properties element
+
+            Attributes nullAttr = getDAVHelper().getNullAttributes();
+
+            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROPSTAT, WebDAV.XML_NS_PROPSTAT, nullAttr);
+            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP, nullAttr);
+
+            // Output the well-known properties
+
+            xml.write(DocumentHelper.createElement(WebDAV.XML_NS_LOCK_DISCOVERY));
+            xml.write(DocumentHelper.createElement(WebDAV.XML_NS_SUPPORTED_LOCK));
+            xml.write(DocumentHelper.createElement(WebDAV.XML_NS_RESOURCE_TYPE));
+            xml.write(DocumentHelper.createElement(WebDAV.XML_NS_DISPLAYNAME));
+            xml.write(DocumentHelper.createElement(WebDAV.XML_NS_GET_LAST_MODIFIED));
+            xml.write(DocumentHelper.createElement(WebDAV.XML_NS_GET_CONTENT_LENGTH));
+            xml.write(DocumentHelper.createElement(WebDAV.XML_NS_CREATION_DATE));
+            xml.write(DocumentHelper.createElement(WebDAV.XML_NS_GET_ETAG));
+
+            if (isDir)
+            {
+                xml.write(DocumentHelper.createElement(WebDAV.XML_NS_GET_CONTENT_LANGUAGE));
+                xml.write(DocumentHelper.createElement(WebDAV.XML_NS_GET_CONTENT_TYPE));
+            }
+
+            // Output the custom properties
+
+            xml.write(DocumentHelper.createElement(WebDAV.XML_NS_ALF_AUTHTICKET));
+
+            // Close off the response
+
+            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP);
+
+            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_STATUS, WebDAV.XML_NS_STATUS, nullAttr);
+            xml.write(WebDAV.HTTP1_1 + " " + HttpServletResponse.SC_OK + " " + WebDAV.SC_OK_DESC);
+            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_STATUS, WebDAV.XML_NS_STATUS);
+
+            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROPSTAT, WebDAV.XML_NS_PROPSTAT);
+        }
+        catch (Exception ex)
+        {
+            // Convert to a runtime exception
+
+            throw new AlfrescoRuntimeException("XML processing error", ex);
+        }
+    }
+
+    /**
+     * Generates the XML response snippet showing the lock information for the
+     * given path
+     * 
+     * @param xml XMLWriter
+     * @param nodeInfo FileInfo
+     * @param isDir boolean
+     */
+    protected void generateLockDiscoveryResponse(XMLWriter xml, FileInfo nodeInfo, boolean isDir) throws Exception
+    {
+        // Output the lock status response
+        LockInfo lockInfo = getNodeLockInfo(nodeInfo);
+        if (lockInfo.isLocked() && !lockInfo.isExpired())
+        {
+            generateLockDiscoveryXML(xml, nodeInfo, lockInfo);
+        }
+    }
+
+    /**
+     * Output the supported lock types XML element
+     * 
+     * @param xml XMLWriter
+     */
+    protected void writeLockTypes(XMLWriter xml)
+    {
+        try
+        {
+            AttributesImpl nullAttr = getDAVHelper().getNullAttributes();
+
+            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_SUPPORTED_LOCK, WebDAV.XML_NS_SUPPORTED_LOCK, nullAttr);
+
+            // Output exclusive lock
+            // Shared locks are not supported, as they cannot be supported by the LockService (relevant to ALF-16449).
+            writeLock(xml, WebDAV.XML_NS_EXCLUSIVE);
+
+            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_SUPPORTED_LOCK, WebDAV.XML_NS_SUPPORTED_LOCK);
+        }
+        catch (Exception ex)
+        {
+            throw new AlfrescoRuntimeException("XML write error", ex);
+        }
+    }
+    
+    /**
+     * Loads all dead properties persisted on the node
+     * 
+     * @param nodeRef NodeRef
+     * @return the map of all dead properties
+     */
+    @SuppressWarnings("unchecked")
+    protected Map<QName, String> loadDeadProperties(NodeRef nodeRef)
+    {
+        Map<QName, String> result;
+        
+        List<String> deadProperties = (List<String>)getNodeService().getProperty(nodeRef, ContentModel.PROP_DEAD_PROPERTIES);
+        
+        if (deadProperties != null)
+        {
+            result = new HashMap<QName, String>(deadProperties.size() * 2);
+
+            for (String deadProperty : deadProperties)
+            {
+                int last = deadProperty.length() - 1;
+                int pos = deadProperty.indexOf(QName.NAMESPACE_END);
+                if (pos == -1 || pos == last)
+                {
+                    continue;
+                }
+                pos = deadProperty.indexOf(':', pos + 1);
+                if (pos == -1 || pos == last)
+                {
+                    continue;
+                }
+                try
+                {
+                    result.put(QName.createQName(deadProperty.substring(0, pos)), deadProperty.substring(pos + 1));
+                }
+                catch (InvalidQNameException e)
+                {
+                    // Skip and continue
+                }
+            }
+        }
+        else
+        {
+            result = new HashMap<QName, String>(7);
+        }
+        
+        return result;
+    }
+    
+    /**
+     * Persists dead properties for specified resource
+     * 
+     * @param nodeRef specified resource
+     * @param deadProperties the properties to persist
+     */
+    protected void persistDeadProperties(NodeRef nodeRef, Map<QName, String> deadProperties)
+    {
+        List<String> listToPersist = new ArrayList<String>(deadProperties.size());
+
+        for (Map.Entry<QName, String> entry: deadProperties.entrySet())
+        {
+            listToPersist.add(entry.getKey().toString() + ':' + entry.getValue());
+        }
+
+        getNodeService().setProperty(nodeRef, ContentModel.PROP_DEAD_PROPERTIES, (Serializable)listToPersist);
+    }
+    
+    /**
+     * Output the lockentry element of the specified type
+     * @param xml XMLWriter
+     * @param lockType lock type containing namespace. Can be WebDAV.XML_NS_EXCLUSIVE or WebDAV.XML_NS_SHARED
+     * @throws SAXException
+     * @throws IOException
+     */
+    private void writeLock(XMLWriter xml, String lockType) throws SAXException, IOException
+    {
+        AttributesImpl nullAttr = getDAVHelper().getNullAttributes();
+
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_LOCK_ENTRY, WebDAV.XML_NS_LOCK_ENTRY, nullAttr); 
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_LOCK_SCOPE, WebDAV.XML_NS_LOCK_SCOPE, nullAttr);
+        xml.write(DocumentHelper.createElement(lockType));
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_LOCK_SCOPE, WebDAV.XML_NS_LOCK_SCOPE);
+
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_LOCK_TYPE, WebDAV.XML_NS_LOCK_TYPE, nullAttr);
+        xml.write(DocumentHelper.createElement(WebDAV.XML_NS_WRITE));
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_LOCK_TYPE, WebDAV.XML_NS_LOCK_TYPE);
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_LOCK_ENTRY, WebDAV.XML_NS_LOCK_ENTRY); 
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/PropPatchMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/PropPatchMethod.java
new file mode 100644
index 00000000000..cf66c05437c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/PropPatchMethod.java
@@ -0,0 +1,484 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.namespace.QName;
+import org.dom4j.DocumentHelper;
+import org.dom4j.io.XMLWriter;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.Attributes;
+
+/**
+ * Implements the WebDAV PROPPATCH method
+ * 
+ * @author Ivan Rybnikov
+ */
+public class PropPatchMethod extends PropFindMethod
+{
+    // Properties to patch
+    protected ArrayList<PropertyAction> m_propertyActions = null;
+    private String strHRef;
+    private WebDAVProperty failedProperty;
+    private String basePath;
+    
+    /**
+     * @return          Returns <tt>false</tt> always
+     */
+    @Override
+    protected boolean isReadOnly()
+    {
+        return false;
+    }
+    
+    @Override
+    protected void executeImpl() throws WebDAVServerException, Exception
+    {
+        FileInfo pathNodeInfo = null;
+        try
+        {
+            // Check that the path exists
+            pathNodeInfo = getNodeForPath(getRootNodeRef(), m_strPath);
+        }
+        catch (FileNotFoundException e)
+        {
+            // The path is not valid - send a 404 error back to the client
+            throw new WebDAVServerException(HttpServletResponse.SC_NOT_FOUND);
+        }
+
+        checkNode(pathNodeInfo);
+        
+        // Create the path for the current location in the tree
+        StringBuilder baseBuild = new StringBuilder(256);
+        baseBuild.append(getPath());
+        if (baseBuild.length() == 0 || baseBuild.charAt(baseBuild.length() - 1) != WebDAVHelper.PathSeperatorChar)
+        {
+            baseBuild.append(WebDAVHelper.PathSeperatorChar);
+        }
+        basePath = baseBuild.toString();
+        
+        // Build the href string for the current node
+        boolean isFolder = pathNodeInfo.isFolder();
+        strHRef = getURLForPath(m_request, basePath, isFolder);
+        
+        // Do the real work: patch the properties
+        patchProperties(pathNodeInfo, basePath);
+    }
+
+    
+    @Override
+    protected void generateResponseImpl() throws Exception
+    {
+        m_response.setStatus(WebDAV.WEBDAV_SC_MULTI_STATUS);
+        
+        // Set the response content type
+        m_response.setContentType(WebDAV.XML_CONTENT_TYPE);
+        
+        // Create multistatus response
+        XMLWriter xml = createXMLWriter();
+
+        xml.startDocument();
+
+        String nsdec = generateNamespaceDeclarations(m_namespaces);
+        xml.startElement(
+                WebDAV.DAV_NS,
+                WebDAV.XML_MULTI_STATUS + nsdec,
+                WebDAV.XML_NS_MULTI_STATUS + nsdec,
+                getDAVHelper().getNullAttributes());
+        
+        // Output the response block for the current node
+        xml.startElement(
+                WebDAV.DAV_NS,
+                WebDAV.XML_RESPONSE,
+                WebDAV.XML_NS_RESPONSE,
+                getDAVHelper().getNullAttributes());
+
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_HREF, WebDAV.XML_NS_HREF, getDAVHelper().getNullAttributes());
+        xml.write(strHRef);
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_HREF, WebDAV.XML_NS_HREF);
+
+        if (failedProperty != null)
+        {
+            generateError(xml);
+        }
+
+        for (PropertyAction propertyAction : m_propertyActions)
+        {
+            WebDAVProperty property = propertyAction.getProperty();
+            int statusCode = propertyAction.getStatusCode();
+            String statusCodeDescription = propertyAction.getStatusCodeDescription();
+            generatePropertyResponse(xml, property, statusCode, statusCodeDescription);
+        }
+        
+        // Close off the response element
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_RESPONSE, WebDAV.XML_NS_RESPONSE);
+        
+        // Close the outer XML element
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_MULTI_STATUS, WebDAV.XML_NS_MULTI_STATUS);
+
+        // Send remaining data
+        flushXML(xml);
+    }
+
+    
+    /**
+     * Parse the request body
+     * 
+     * @exception WebDAVServerException
+     */
+    @Override
+    protected void parseRequestBody() throws WebDAVServerException
+    {
+        Document body = getRequestBodyAsDocument();
+        if (body != null)
+        {
+            Element rootElement = body.getDocumentElement();
+            NodeList childList = rootElement.getChildNodes();
+
+            m_propertyActions = new ArrayList<PropertyAction>();
+
+            for (int i = 0; i < childList.getLength(); i++)
+            {
+                Node currentNode = childList.item(i);
+                switch (currentNode.getNodeType())
+                {
+                case Node.TEXT_NODE:
+                    break;
+                case Node.ELEMENT_NODE:
+                    if (currentNode.getNodeName().endsWith(WebDAV.XML_SET) || currentNode.getNodeName().endsWith(WebDAV.XML_REMOVE))
+                    {
+                        NodeList propertiesList = currentNode.getChildNodes();
+
+                        for (int j = 0; j < propertiesList.getLength(); j++)
+                        {
+                            Node propertiesNode = propertiesList.item(j);
+                            switch (propertiesNode.getNodeType())
+                            {
+                            case Node.TEXT_NODE:
+                                break;
+                            case Node.ELEMENT_NODE:
+                                if (propertiesNode.getNodeName().endsWith(WebDAV.XML_PROP))
+                                {
+                                    NodeList propList = propertiesNode.getChildNodes();
+
+                                    for (int k = 0; k < propList.getLength(); k++)
+                                    {
+                                        Node propNode = propList.item(k);
+                                        switch (propNode.getNodeType())
+                                        {
+                                        case Node.TEXT_NODE:
+                                            break;
+                                        case Node.ELEMENT_NODE:
+                                            int action = currentNode.getNodeName().endsWith(WebDAV.XML_SET) ? PropertyAction.SET : PropertyAction.REMOVE;
+                                            m_propertyActions.add(new PropertyAction(action, createProperty(propNode)));
+                                            break;
+                                    }
+                                }
+                            }
+                            break;
+                            }
+                        }
+                    }
+                    break;
+                }
+            }
+
+        }
+        
+    }
+
+    /**
+     * Parse the request headers
+     * 
+     * @exception WebDAVServerException
+     */
+    @Override
+    protected void parseRequestHeaders() throws WebDAVServerException
+    {
+        // Parse Lock tokens and ETags, if any
+        parseIfHeader();
+    }
+
+    /**
+     * Creates a WebDAVProperty from the given XML node
+     */
+    protected WebDAVProperty createProperty(Node node)
+    {
+        WebDAVProperty property = super.createProperty(node);
+        
+        String strValue = null;
+        Node value = node.getFirstChild();
+        if (value != null)
+        {
+            strValue = value.getNodeValue();
+        }
+        property.setValue(strValue);
+
+        return property;
+    }
+    
+    
+    protected void patchProperties(FileInfo nodeInfo, String path) throws WebDAVServerException
+    {
+        failedProperty = null;
+        for (PropertyAction action : m_propertyActions)
+        {
+            if (action.getProperty().isProtected())
+            {
+                failedProperty = action.getProperty();
+                break;
+            }
+        }
+
+        Map<QName, String> deadProperties = null;
+        for (PropertyAction propertyAction : m_propertyActions)
+        {
+            int statusCode;
+            String statusCodeDescription;
+            WebDAVProperty property = propertyAction.getProperty();
+
+            if (failedProperty == null)
+            {
+                PropertyDefinition propDef = getDAVHelper().getDictionaryService().getProperty(property.createQName());
+                
+                boolean deadProperty = propDef == null || (!propDef.getContainerClass().isAspect() && !getDAVHelper().getDictionaryService().isSubClass(getNodeService().getType(nodeInfo.getNodeRef()), 
+                        propDef.getContainerClass().getName()));
+                
+                if (deadProperty && deadProperties == null)
+                {
+                    deadProperties = loadDeadProperties(nodeInfo.getNodeRef());
+                }
+
+                if (PropertyAction.SET == propertyAction.getAction())
+                {
+                    if (deadProperty)
+                    {
+                        deadProperties.put(property.createQName(), property.getValue());
+                    }
+                    else
+                    {
+                        getNodeService().setProperty(nodeInfo.getNodeRef(), property.createQName(), property.getValue());
+                    }
+                }
+                else if (PropertyAction.REMOVE == propertyAction.getAction())
+                {
+                    if (deadProperty)
+                    {
+                        deadProperties.remove(property.createQName());
+                    }
+                    else
+                    {
+                        getNodeService().removeProperty(nodeInfo.getNodeRef(), property.createQName());
+                    }
+                }
+                else
+                {
+                    throw new WebDAVServerException(HttpServletResponse.SC_BAD_REQUEST);
+                }
+                statusCode = HttpServletResponse.SC_OK;
+                statusCodeDescription = WebDAV.SC_OK_DESC;
+            }
+            else if (failedProperty == property)
+            {
+                statusCode = HttpServletResponse.SC_FORBIDDEN;
+                statusCodeDescription = WebDAV.SC_FORBIDDEN_DESC;
+            }
+            else
+            {
+                statusCode = WebDAV.WEBDAV_SC_FAILED_DEPENDENCY;
+                statusCodeDescription = WebDAV.WEBDAV_SC_FAILED_DEPENDENCY_DESC;
+            }
+
+            propertyAction.setResult(statusCode, statusCodeDescription);
+        }
+        if (deadProperties != null)
+        {
+            persistDeadProperties(nodeInfo.getNodeRef(), deadProperties);
+        }
+    }
+    
+    
+    /**
+     * Generates the XML response for a PROPFIND request that asks for a list of
+     * all known properties
+     * 
+     * @param xml XMLWriter
+     * @param property WebDAVProperty
+     * @param status int
+     * @param description String
+     */
+    protected void generatePropertyResponse(XMLWriter xml, WebDAVProperty property, int status, String description)
+    {
+        try
+        {
+            // Output the start of the properties element
+            Attributes nullAttr = getDAVHelper().getNullAttributes();
+
+            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROPSTAT, WebDAV.XML_NS_PROPSTAT, nullAttr);
+
+            // Output property name
+            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP, nullAttr);
+            if (property.hasNamespaceName())
+            {
+                xml.write(DocumentHelper.createElement(property.getNamespaceName() + WebDAV.NAMESPACE_SEPARATOR + property.getName()));
+            }
+            else
+            {
+                xml.write(DocumentHelper.createElement(property.getName()));
+            }
+            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP);
+
+            // Output action result status
+            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_STATUS, WebDAV.XML_NS_STATUS, nullAttr);
+            xml.write(WebDAV.HTTP1_1 + " " + status + " " + description);
+            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_STATUS, WebDAV.XML_NS_STATUS);
+
+            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROPSTAT, WebDAV.XML_NS_PROPSTAT);
+        }
+        catch (Exception ex)
+        {
+            // Convert to a runtime exception
+            throw new AlfrescoRuntimeException("XML processing error", ex);
+        }
+    }
+
+
+    /**
+     * Generates the error tag
+     * 
+     * @param xml XMLWriter
+     */
+    protected void generateError(XMLWriter xml)
+    {
+        try
+        {
+            // Output the start of the error element
+            Attributes nullAttr = getDAVHelper().getNullAttributes();
+
+            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_ERROR, WebDAV.XML_NS_ERROR, nullAttr);
+            // Output error
+            xml.write(DocumentHelper.createElement(WebDAV.XML_NS_CANNOT_MODIFY_PROTECTED_PROPERTY));
+
+            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_ERROR, WebDAV.XML_NS_ERROR);
+        }
+        catch (Exception ex)
+        {
+            // Convert to a runtime exception
+            throw new AlfrescoRuntimeException("XML processing error", ex);
+        }
+    }
+
+    
+    /**
+     * Stores information about PROPPATCH action(set or remove) an according property.
+     * 
+     * @author Ivan Rybnikov
+     */
+    protected class PropertyAction
+    {
+        public static final int SET = 0;
+        public static final int REMOVE = 1;
+        
+        // Property on which action should be performed
+        private WebDAVProperty property;
+        
+        // Action
+        private int action;
+        
+        private int statusCode;
+        
+        private String statusCodeDescription;
+        
+        /**
+         * Constructor
+         * 
+         * @param action int
+         * @param property WebDAVProperty
+         */
+        public PropertyAction(int action, WebDAVProperty property)
+        {
+            this.action = action;
+            this.property = property;
+        }
+        
+        public void setResult(int statusCode, String statusCodeDescription)
+        {
+            this.statusCode = statusCode;
+            this.statusCodeDescription = statusCodeDescription;
+        }
+
+        public int getStatusCode()
+        {
+            return this.statusCode;
+        }
+
+        public String getStatusCodeDescription()
+        {
+            return this.statusCodeDescription;
+        }
+
+        public int getAction()
+        {
+            return action;
+        }
+
+        public WebDAVProperty getProperty()
+        {
+            return property;
+        }
+
+        public String toString()
+        {
+            StringBuilder str = new StringBuilder();
+            
+            str.append("[");
+            str.append("action=");
+            str.append(getAction() == 0 ? "SET" : "REMOVE");
+            str.append(",property=");
+            str.append(getProperty());
+            str.append(",statusCode=");
+            str.append(getStatusCode());
+            str.append(",statusCodeDescription=");
+            str.append(getStatusCodeDescription());
+            str.append("]");
+            
+            return str.toString();
+        }
+    }
+    
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/PutMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/PutMethod.java
new file mode 100644
index 00000000000..c1a75c37906
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/PutMethod.java
@@ -0,0 +1,430 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.io.InputStream;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.executer.ContentMetadataExtracter;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.model.FileExistsException;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.webdav.WebDavService;
+import org.springframework.dao.ConcurrencyFailureException;
+
+/**
+ * Implements the WebDAV PUT method
+ * 
+ * @author Gavin Cornwell
+ */
+public class PutMethod extends WebDAVMethod implements ActivityPostProducer
+{
+    // Request parameters
+    private String m_strContentType = null;
+    private boolean m_expectHeaderPresent = false;
+    // Indicates if a zero byte node was created by a LOCK call.
+    // Try to delete the node if the PUT fails
+    private boolean noContent = false;
+    private boolean created = false;
+    private WebDAVActivityPoster activityPoster;
+    private FileInfo contentNodeInfo;
+    private long fileSize;
+    
+    /**
+     * Default constructor
+     */
+    public PutMethod()
+    {
+    }
+
+    /**
+     * Parse the request headers
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestHeaders() throws WebDAVServerException
+    {
+        m_strContentType = m_request.getHeader(WebDAV.HEADER_CONTENT_TYPE);
+        String strExpect = m_request.getHeader(WebDAV.HEADER_EXPECT);
+
+        if (strExpect != null && strExpect.equals(WebDAV.HEADER_EXPECT_CONTENT))
+        {
+            m_expectHeaderPresent = true;
+        }
+
+        // Parse Lock tokens and ETags, if any
+
+        parseIfHeader();
+    }
+
+    /**
+     * Clears the aspect added by a LOCK request for a new file, so
+     * that the Timer started by the LOCK request will not remove the
+     * node now that the PUT request has been received. This is needed
+     * for large content.
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestBody() throws WebDAVServerException
+    {
+        // Nothing is done with the body by this method. The body contains
+        // the content it will be dealt with later.
+        
+        // This method is called ONCE just before the FIRST call to executeImpl,
+        // which is in a retrying transaction so may be called many times.
+        
+        // Although this method is called just before the first executeImpl,
+        // it is possible that the Thread could be interrupted before the first call
+        // or between calls. However the chances are low and the consequence
+        // (leaving a zero byte file) is minor.
+  
+        noContent = getTransactionService().getRetryingTransactionHelper().doInTransaction(
+                new RetryingTransactionCallback<Boolean>()
+                {
+                    public Boolean execute() throws Throwable
+                    {
+                        FileInfo contentNodeInfo = null;
+                        try
+                        {
+                            contentNodeInfo = getNodeForPath(getRootNodeRef(), getPath());
+                            checkNode(contentNodeInfo);
+                            final NodeRef nodeRef = contentNodeInfo.getNodeRef();
+                            if (getNodeService().hasAspect(contentNodeInfo.getNodeRef(), ContentModel.ASPECT_WEBDAV_NO_CONTENT))
+                            {
+                                getNodeService().removeAspect(nodeRef, ContentModel.ASPECT_WEBDAV_NO_CONTENT);
+                                if (logger.isDebugEnabled())
+                                {
+                                    String path = getPath();
+                                    logger.debug("Put Timer DISABLE " + path);
+                                }
+                                return Boolean.TRUE;
+                            }
+                        }
+                        catch (FileNotFoundException e)
+                        {
+                            // Does not exist, so there will be no aspect.
+                        }
+                        return Boolean.FALSE;
+                    }
+                }, false, true);
+    }
+
+    /**
+     * Execute the WebDAV request
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void executeImpl() throws WebDAVServerException, Exception
+    {
+        if (logger.isDebugEnabled())
+        {
+            String path = getPath();
+            String userName = getDAVHelper().getAuthenticationService().getCurrentUserName();
+            logger.debug("Put node: \n" +
+                    "     user: " + userName + "\n" +
+                    "     path: " + path + "\n" +
+                    "noContent: " + noContent);
+        }
+
+        FileFolderService fileFolderService = getFileFolderService();
+
+        // Get the status for the request path
+        LockInfo nodeLockInfo = null;
+        try
+        {
+            contentNodeInfo = getNodeForPath(getRootNodeRef(), getPath());
+            // make sure that we are not trying to use a folder
+            if (contentNodeInfo.isFolder())
+            {
+                throw new WebDAVServerException(HttpServletResponse.SC_BAD_REQUEST);
+            }
+
+            nodeLockInfo = checkNode(contentNodeInfo);
+            
+            // 'Unhide' nodes hidden by us and behave as though we created them
+            NodeRef contentNodeRef = contentNodeInfo.getNodeRef();
+            if (fileFolderService.isHidden(contentNodeRef) && !getDAVHelper().isRenameShuffle(getPath()))
+            {
+                fileFolderService.setHidden(contentNodeRef, false);
+                created = true;
+            }
+        }
+        catch (FileNotFoundException e)
+        {
+            // the file doesn't exist - create it
+            String[] paths = getDAVHelper().splitPath(getPath());
+            try
+            {
+                FileInfo parentNodeInfo = getNodeForPath(getRootNodeRef(), paths[0]);
+                // create file
+                contentNodeInfo = getDAVHelper().createFile(parentNodeInfo, paths[1]);  
+                created = true;
+                
+            }
+            catch (FileNotFoundException ee)
+            {
+                // bad path
+                throw new WebDAVServerException(HttpServletResponse.SC_CONFLICT);
+            }
+            catch (FileExistsException ee)
+            {
+                // ALF-7079 fix, retry: it looks like concurrent access (file not found but file exists) 
+                throw new ConcurrencyFailureException("Concurrent access was detected.",  ee);
+            }
+        }
+        
+        String userName = getDAVHelper().getAuthenticationService().getCurrentUserName();
+        LockInfo lockInfo = getDAVLockService().getLockInfo(contentNodeInfo.getNodeRef());
+        
+        if (lockInfo != null)
+        {
+            if (lockInfo.isLocked() && !lockInfo.getOwner().equals(userName))
+            {
+                if (logger.isDebugEnabled())
+                {
+                    String path = getPath();
+                    String owner = lockInfo.getOwner();
+                    logger.debug("Node locked: path=["+path+"], owner=["+owner+"], current user=["+userName+"]");
+                }
+                // Indicate that the resource is locked
+                throw new WebDAVServerException(WebDAV.WEBDAV_SC_LOCKED);
+            }
+        }
+        // ALF-16808: We disable the versionable aspect if we are overwriting
+        // empty content because it's probably part of a compound operation to
+        // create a new single version
+        boolean disabledVersioning = false;
+        
+        try
+        {
+            // Disable versioning if we are overwriting an empty file with content
+            NodeRef nodeRef = contentNodeInfo.getNodeRef();
+            ContentData contentData = (ContentData)getNodeService().getProperty(nodeRef, ContentModel.PROP_CONTENT);
+            if ((contentData == null || contentData.getSize() == 0) && getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE))
+            {
+                getDAVHelper().getPolicyBehaviourFilter().disableBehaviour(nodeRef, ContentModel.ASPECT_VERSIONABLE);
+                disabledVersioning = true;
+            }
+            // Access the content
+            ContentWriter writer = fileFolderService.getWriter(contentNodeInfo.getNodeRef());
+        
+            // set content properties
+            writer.guessMimetype(contentNodeInfo.getName());
+            writer.guessEncoding();
+    
+            // Get the input stream from the request data
+            InputStream is = m_request.getInputStream();
+            
+    
+            // Write the new data to the content node
+            writer.putContent(is);
+          
+            // ALF-16756: To avoid firing inbound rules too early (while a node is still locked) apply the no content aspect
+            //                     Note, for MNT-15801, that the aspect is only applied if:
+            //                         - the node is locked AND
+            //                         - the node does not have any content (zero length binaries included)
+            if (nodeLockInfo != null && nodeLockInfo.isExclusive() && !(ContentData.hasContent(contentData) && contentData.getSize() > 0))
+            {
+                getNodeService().addAspect(contentNodeInfo.getNodeRef(), ContentModel.ASPECT_NO_CONTENT, null);
+            }
+            
+            // Ask for the document metadata to be extracted
+            Action extract = getActionService().createAction(ContentMetadataExtracter.EXECUTOR_NAME);
+            if(extract != null)
+            {
+               extract.setExecuteAsynchronously(false);
+               getActionService().executeAction(extract, contentNodeInfo.getNodeRef());
+            }
+
+            // If the mime-type determined by the repository is different
+            // from the original specified in the request, update it.
+            if (m_strContentType == null || !m_strContentType.equals(writer.getMimetype()))
+            {
+                String oldMimeType = m_strContentType;
+                m_strContentType = writer.getMimetype();
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Mimetype originally specified as " + oldMimeType +
+                                ", now guessed to be " + m_strContentType);
+                }
+            }
+
+            // Record the uploaded file's size
+            fileSize = writer.getSize();
+            
+            // Set the response status, depending if the node existed or not
+            m_response.setStatus(created ? HttpServletResponse.SC_CREATED : HttpServletResponse.SC_NO_CONTENT);
+        }
+        catch (AccessDeniedException e)
+        {
+            throw new WebDAVServerException(HttpServletResponse.SC_FORBIDDEN, e);
+        }
+        catch (Throwable e) 
+        {
+            // check if the node was marked with noContent aspect previously by lock method AND
+            // we are about to give up
+            if (noContent && RetryingTransactionHelper.extractRetryCause(e) == null)
+            {
+                // remove the 0 bytes content if save operation failed or was cancelled
+                final NodeRef nodeRef = contentNodeInfo.getNodeRef();
+                getTransactionService().getRetryingTransactionHelper().doInTransaction(
+                        new RetryingTransactionCallback<String>()
+                        {
+                            public String execute() throws Throwable
+                            {
+                                getNodeService().deleteNode(nodeRef);
+                                if (logger.isDebugEnabled())
+                                {
+                                    logger.debug("Put failed. DELETE  " + getPath());
+                                }
+                                return null;
+                            }
+                        }, false, false);
+            }
+            throw new WebDAVServerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
+        }
+        finally
+        {
+            if (disabledVersioning)
+            {
+                getDAVHelper().getPolicyBehaviourFilter().enableBehaviour(contentNodeInfo.getNodeRef(), ContentModel.ASPECT_VERSIONABLE);
+            }
+        }
+
+        postActivity();
+
+    }
+    
+    /**
+     * Can be used after a successful {@link #execute()} invocation to
+     * check whether the resource was new (created) or over-writing existing
+     * content.
+     * 
+     * @return true if the content was newly created, false if existing.
+     */
+    protected boolean isCreated()
+    {
+        return created;
+    }
+    
+    /**
+     * Retrieve the mimetype of the content sent for the PUT request. The initial
+     * value specified in the request may be updated after the file contents have
+     * been uploaded if the repository has determined a different mimetype for the content.
+     * 
+     * @return content-type
+     */
+    public String getContentType()
+    {
+        return m_strContentType;
+    }
+
+    /**
+     * The FileInfo for the uploaded file, or null if not yet uploaded.
+     * 
+     * @return FileInfo
+     */
+    public FileInfo getContentNodeInfo()
+    {
+        return contentNodeInfo;
+    }
+
+    /**
+     * Returns the size of the uploaded file, zero if not yet uploaded.
+     * 
+     * @return the fileSize
+     */
+    public long getFileSize()
+    {
+        return fileSize;
+    }
+
+    /**
+     * Create an activity post.
+     * 
+     * @throws WebDAVServerException 
+     */
+    protected void postActivity() throws WebDAVServerException
+    {
+        WebDavService davService = getDAVHelper().getServiceRegistry().getWebDavService();
+        if (!davService.activitiesEnabled())
+        {
+            // Don't post activities if this behaviour is disabled.
+            return;
+        }
+        
+        String path = getPath();
+        String siteId = getSiteId();
+        String tenantDomain = getTenantDomain();
+        
+        if (siteId.equals(WebDAVHelper.EMPTY_SITE_ID))
+        {
+            // There is not enough information to publish site activity.
+            return;
+        }
+        
+        FileInfo contentNodeInfo = null;
+        try
+        {
+            contentNodeInfo = getNodeForPath(getRootNodeRef(), path);
+            NodeRef nodeRef = contentNodeInfo.getNodeRef();
+            // Don't post activity data for hidden files, resource forks etc.
+            if (!getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_HIDDEN))
+            {
+                if (isCreated())
+                {
+                    // file added
+                    activityPoster.postFileFolderAdded(siteId, tenantDomain, null, contentNodeInfo);
+                }
+                else
+                {
+                    // file updated
+                    activityPoster.postFileFolderUpdated(siteId, tenantDomain, contentNodeInfo);
+                }
+            }
+        }
+        catch (FileNotFoundException error)
+        {
+            throw new WebDAVServerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        }        
+    }
+
+    @Override
+    public void setActivityPoster(WebDAVActivityPoster activityPoster)
+    {
+        this.activityPoster = activityPoster;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/UnlockMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/UnlockMethod.java
new file mode 100644
index 00000000000..837afdfeac2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/UnlockMethod.java
@@ -0,0 +1,284 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.util.Set;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.lock.UnableToReleaseLockException;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.rule.RuleService;
+import org.alfresco.service.cmr.rule.RuleType;
+
+/**
+ * Implements the WebDAV UNLOCK method
+ * 
+ * @author gavinc
+ */
+public class UnlockMethod extends WebDAVMethod
+{
+    private String m_strLockToken = null;
+
+    /**
+     * Default constructor
+     */
+    public UnlockMethod()
+    {
+    }
+
+    /**
+     * Return the lock token of an existing lock
+     * 
+     * @return String
+     */
+    protected final String getLockToken()
+    {
+        return m_strLockToken;
+    }
+
+    /**
+     * Parse the request headers
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestHeaders() throws WebDAVServerException
+    {
+        // Get the lock token, if any
+        String strLockTokenHeader = m_request.getHeader(WebDAV.HEADER_LOCK_TOKEN);
+
+        // DEBUG
+        if (logger.isDebugEnabled())
+            logger.debug("Parsing Lock-Token header: " + strLockTokenHeader);
+
+        // Validate the lock token
+        if (strLockTokenHeader != null)
+        {
+            if (!(strLockTokenHeader.startsWith("<") && strLockTokenHeader.endsWith(">")))
+            {
+                // ALF-13904: Header isn't correctly enclosed in < and > characters. Try correcting this
+                // to allow for Windows 7 + OpenOffice.org bug.
+                strLockTokenHeader = "<" + strLockTokenHeader + ">";
+            }
+            if (strLockTokenHeader.startsWith("<" + WebDAV.OPAQUE_LOCK_TOKEN) && strLockTokenHeader.endsWith(">"))
+            {
+                try
+                {
+                    m_strLockToken = strLockTokenHeader.substring(
+                            WebDAV.OPAQUE_LOCK_TOKEN.length() + 1,
+                            strLockTokenHeader.length() - 1);
+                }
+                catch (IndexOutOfBoundsException e)
+                {
+                    logger.warn("Failed to parse If header: " + strLockTokenHeader);
+	            }
+	        }
+        }
+        // If there is no token this is a bad request so send an error back
+        if (m_strLockToken == null)
+        {
+            throw new WebDAVServerException(HttpServletResponse.SC_BAD_REQUEST);
+        }
+    }
+
+    /**
+     * Parse the request body
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void parseRequestBody() throws WebDAVServerException
+    {
+        // Nothing to do in this method
+    }
+
+    /**
+     * Execute the request
+     * 
+     * @exception WebDAVServerException
+     */
+    protected void executeImpl() throws WebDAVServerException
+    {
+        RuleService ruleService = getServiceRegistry().getRuleService();
+        try
+        {
+            // Temporarily disable update rules.
+            ruleService.disableRuleType(RuleType.UPDATE);
+            attemptUnlock();
+        }
+        finally
+        {
+            // Re-instate update rules.
+            ruleService.enableRuleType(RuleType.UPDATE);
+        }
+    }
+
+    /**
+     * The main unlock implementation.
+     * 
+     * @throws WebDAVServerException
+     */
+    protected void attemptUnlock() throws WebDAVServerException
+    {
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Unlock node; path=" + getPath() + ", token=" + getLockToken());
+        }
+
+        FileInfo lockNodeInfo = null;
+        try
+        {
+            lockNodeInfo = getNodeForPath(getRootNodeRef(), getPath());
+        }
+        catch (FileNotFoundException e)
+        {
+            throw new WebDAVServerException(HttpServletResponse.SC_NOT_FOUND);
+        }
+
+        // Parse the lock token
+        String[] lockInfoFromRequest = WebDAV.parseLockToken(getLockToken());
+        if (lockInfoFromRequest == null)
+        {
+            // Bad lock token
+            throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
+        }
+
+        NodeRef nodeRef = lockNodeInfo.getNodeRef();        
+        LockInfo lockInfo = getDAVLockService().getLockInfo(nodeRef);
+        
+        if (lockInfo == null)
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Unlock token=" + getLockToken() + " Not locked - no info in lock store.");
+            }
+            // Node is not locked
+            throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
+        }
+        
+        
+        if (!lockInfo.isLocked())
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Unlock token=" + getLockToken() + " Not locked");
+            }
+            // Node is not locked
+            throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
+        }
+        else if (lockInfo.isExpired())
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Unlock token=" + getLockToken() + " Lock expired");
+            }
+            // Return a success status
+            m_response.setStatus(HttpServletResponse.SC_NO_CONTENT);
+            removeNoContentAspect(nodeRef);
+        }
+        else if (lockInfo.isExclusive())
+        {
+            String currentUser = getAuthenticationService().getCurrentUserName();
+            if (currentUser.equals(lockInfo.getOwner()))
+            {
+            	try
+                {
+                    getDAVLockService().unlock(nodeRef);
+                }
+                catch (UnableToReleaseLockException e)
+                {
+                    throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED, e);
+                }
+    
+                // Indicate that the unlock was successful
+                m_response.setStatus(HttpServletResponse.SC_NO_CONTENT);            
+                removeNoContentAspect(nodeRef);
+    
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Unlock token=" + getLockToken() + " Successful");
+                }
+            }
+            else
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Unlock token=" + getLockToken() + " Not lock owner");
+                }
+                // Node is not locked
+                throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
+            }
+        }
+        else if (lockInfo.isShared())
+        {
+            Set<String> sharedLocks = lockInfo.getSharedLockTokens();
+            if (sharedLocks.contains(m_strLockToken))
+            {
+                sharedLocks.remove(m_strLockToken);
+
+                // Indicate that the unlock was successful
+                m_response.setStatus(HttpServletResponse.SC_NO_CONTENT);
+                removeNoContentAspect(nodeRef);
+
+                // DEBUG
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Unlock token=" + getLockToken() + " Successful");
+                }
+            }
+        }
+        else
+        {
+            throw new IllegalStateException("Invalid LockInfo state: " + lockInfo);
+        }
+    }
+
+    // This method removes a new zero byte node that has been locked, where the
+    // PUT has not taken place but the client has issued an UNLOCK. The Timer
+    // started in the LOCK will delete the node, but this is faster.
+    // I have seen it with MS Office 2003 Excel. Almost impossible to reproduce.
+    // Think Excel responds to a 'kill' request between the LOCK and PUT requests
+    // and tries to tidy down as it exits.
+    private void removeNoContentAspect(NodeRef nodeRef)
+    {
+        if (getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_NO_CONTENT))
+        {
+            getNodeService().removeAspect(nodeRef, ContentModel.ASPECT_NO_CONTENT);
+        }
+        if (getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_WEBDAV_NO_CONTENT))
+        {
+            getNodeService().removeAspect(nodeRef, ContentModel.ASPECT_WEBDAV_NO_CONTENT);
+            getNodeService().deleteNode(nodeRef);
+
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Unlock Timer DISABLE and DELETE " + getPath());
+            }
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAV.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAV.java
new file mode 100644
index 00000000000..878400f8d0c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAV.java
@@ -0,0 +1,527 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.Locale;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.TimeZone;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ISO9075;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Helper class used by the WebDAV protocol handling classes
+ * 
+ * @author gavinc
+ */
+public class WebDAV
+{
+    // Logging
+
+    private static Log logger = LogFactory.getLog("org.alfresco.webdav.protocol");
+    
+    // WebDAV XML namespace
+    
+    public static final String DAV_NS   = "D";
+    public static final String DAV_NS_PREFIX = DAV_NS + ":";
+    
+    // PROPFIND, LOCK depth
+    
+    public static final int DEPTH_0 = 0;
+    public static final int DEPTH_1 = 1;
+    public static final int DEPTH_INFINITY = -1;
+    public static final short TIMEOUT_INFINITY = -1;
+    public static final int TIMEOUT_24_HOURS = 86400;
+
+    // WebDAV HTTP response codes
+    
+    public static final int WEBDAV_SC_MULTI_STATUS = 207;
+    public static final int WEBDAV_SC_LOCKED = 423;
+    public static final int WEBDAV_SC_FAILED_DEPENDENCY = 424;
+
+    // WebDAV HTTP response code descriptions
+
+    public static final String WEBDAV_SC_FAILED_DEPENDENCY_DESC = "Failed Dependency";
+
+    // HTTP response code descriptions
+    
+    public static final String SC_OK_DESC = "OK";
+    public static final String SC_NOT_FOUND_DESC = "Not Found";
+    public static final String SC_FORBIDDEN_DESC = "Forbidden";
+
+
+    // HTTP methods
+    
+    public static final String METHOD_PUT = "PUT";
+    public static final String METHOD_POST = "POST";
+    public static final String METHOD_GET = "GET";
+    public static final String METHOD_DELETE = "DELETE";
+    public static final String METHOD_HEAD = "HEAD";
+    public static final String METHOD_OPTIONS = "OPTIONS";
+    public static final String METHOD_PROPFIND = "PROPFIND";
+    public static final String METHOD_PROPPATCH = "PROPPATCH";
+    public static final String METHOD_MKCOL = "MKCOL";
+    public static final String METHOD_MOVE = "MOVE";
+    public static final String METHOD_COPY = "COPY";
+    public static final String METHOD_LOCK = "LOCK";
+    public static final String METHOD_UNLOCK = "UNLOCK";
+
+    // HTTP headers
+    
+    public static final String HEADER_CONTENT_LENGTH = "Content-Length";
+    public static final String HEADER_CONTENT_TYPE = "Content-Type";
+    public static final String HEADER_DEPTH = "Depth";
+    public static final String HEADER_DESTINATION = "Destination";
+    public static final String HEADER_ETAG = "ETag";
+    public static final String HEADER_EXPECT = "Expect";
+    public static final String HEADER_EXPECT_CONTENT = "100-continue";
+    public static final String HEADER_IF = "If";
+    public static final String HEADER_IF_MATCH = "If-Match";
+    public static final String HEADER_IF_MODIFIED_SINCE = "If-Modified-Since";
+    public static final String HEADER_IF_NONE_MATCH = "If-None-Match";
+    public static final String HEADER_IF_RANGE = "If-Range";
+    public static final String HEADER_IF_UNMODIFIED_SINCE = "If-Unmodified-Since";
+    public static final String HEADER_LAST_MODIFIED = "Last-Modified";
+    public static final String HEADER_LOCK_TOKEN = "Lock-Token";
+    public static final String HEADER_OVERWRITE = "Overwrite";
+    public static final String HEADER_RANGE = "Range";
+    public static final String HEADER_TIMEOUT = "Timeout";
+    public static final String HEADER_USER_AGENT = "User-Agent";
+
+    // If-Modified/If-Unmodified date format
+    
+    public static final String HEADER_IF_DATE_FORMAT = "EEE, dd MMM yyyy HH:mm:ss zzz";
+    
+    // If header keyword
+    
+    public static final String HEADER_KEY_NOT = "Not";
+
+    public static final String AGENT_MICROSOFT_DATA_ACCESS_INTERNET_PUBLISHING_PROVIDER_DAV = "Microsoft Data Access Internet Publishing Provider DAV";
+    public static final String AGENT_INTERNET_EXPLORER = "MSIE";
+    // General string constants
+    
+    public static final String ASTERISK = "*";
+    public static final String DEFAULT_NAMESPACE_URI = "DAV:";
+    public static final String FAKE_TOKEN = "faketoken";
+    public static final String HTTP1_1 = "HTTP/1.1";
+    public static final String INFINITE = "Infinite";
+    public static final String INFINITY = "infinity";
+    public static final String OPAQUE_LOCK_TOKEN = "opaquelocktoken:";
+    public static final String NAMESPACE_SEPARATOR = ":";
+    public static final String SECOND = "Second-";
+    public static final String HEADER_VALUE_SEPARATOR = ",";
+    public static final String ZERO = "0";
+    public static final String ONE = "1";
+    public static final String F = "F";
+
+    // Strings used in WebDAV XML payload
+    
+    public static final String XML_NS = "xmlns";
+    
+    public static final String XML_ACTIVE_LOCK = "activelock";
+    public static final String XML_ALLPROP = "allprop";
+    public static final String XML_COLLECTION = "collection";
+    public static final String XML_CREATION_DATE = "creationdate";
+    public static final String XML_DEPTH = "depth";
+    public static final String XML_DISPLAYNAME = "displayname";
+    public static final String XML_EXCLUSIVE = "exclusive";
+    public static final String XML_GET_CONTENT_LANGUAGE = "getcontentlanguage";
+    public static final String XML_GET_CONTENT_LENGTH = "getcontentlength";
+    public static final String XML_GET_CONTENT_TYPE = "getcontenttype";
+    public static final String XML_GET_ETAG = "getetag";
+    public static final String XML_GET_LAST_MODIFIED = "getlastmodified";
+    public static final String XML_HREF = "href";
+    public static final String XML_LOCK_DISCOVERY = "lockdiscovery";
+    public static final String XML_LOCK_ENTRY = "lockentry";
+    public static final String XML_LOCK_SCOPE = "lockscope";
+    public static final String XML_LOCK_TOKEN = "locktoken";
+    public static final String XML_LOCK_TYPE = "locktype";
+    public static final String XML_MULTI_STATUS = "multistatus";
+    public static final String XML_OWNER = "owner";
+    public static final String XML_PROP = "prop";
+    public static final String XML_PROPNAME = "propname";
+    public static final String XML_PROPSTAT = "propstat";
+    public static final String XML_RESOURCE_TYPE = "resourcetype";
+    public static final String XML_RESPONSE = "response";
+    public static final String XML_SHARED = "shared";
+    public static final String XML_SOURCE = "source";
+    public static final String XML_STATUS = "status";
+    public static final String XML_SUPPORTED_LOCK = "supportedlock";
+    public static final String XML_TIMEOUT = "timeout";
+    public static final String XML_WRITE = "write";
+    public static final String XML_SET = "set";
+    public static final String XML_REMOVE = "remove";
+    public static final String XML_ERROR = "error";
+
+    // Namespaced versions of payload elements
+    
+    public static final String XML_NS_ACTIVE_LOCK = DAV_NS_PREFIX + "activelock";
+    public static final String XML_NS_ALLPROP = DAV_NS_PREFIX + "allprop";
+    public static final String XML_NS_COLLECTION = DAV_NS_PREFIX + "collection";
+    public static final String XML_NS_CREATION_DATE = DAV_NS_PREFIX + "creationdate";
+    public static final String XML_NS_DEPTH = DAV_NS_PREFIX + "depth";
+    public static final String XML_NS_DISPLAYNAME = DAV_NS_PREFIX + "displayname";
+    public static final String XML_NS_EXCLUSIVE = DAV_NS_PREFIX + "exclusive";
+    public static final String XML_NS_GET_CONTENT_LANGUAGE = DAV_NS_PREFIX + "getcontentlanguage";
+    public static final String XML_NS_GET_CONTENT_LENGTH = DAV_NS_PREFIX + "getcontentlength";
+    public static final String XML_NS_GET_CONTENT_TYPE = DAV_NS_PREFIX + "getcontenttype";
+    public static final String XML_NS_GET_ETAG = DAV_NS_PREFIX + "getetag";
+    public static final String XML_NS_GET_LAST_MODIFIED = DAV_NS_PREFIX + "getlastmodified";
+    public static final String XML_NS_HREF = DAV_NS_PREFIX + "href";
+    public static final String XML_NS_LOCK_DISCOVERY = DAV_NS_PREFIX + "lockdiscovery";
+    public static final String XML_NS_LOCK_ENTRY = DAV_NS_PREFIX + "lockentry";
+    public static final String XML_NS_LOCK_SCOPE = DAV_NS_PREFIX + "lockscope";
+    public static final String XML_NS_LOCK_TOKEN = DAV_NS_PREFIX + "locktoken";
+    public static final String XML_NS_LOCK_TYPE = DAV_NS_PREFIX + "locktype";
+    public static final String XML_NS_MULTI_STATUS = DAV_NS_PREFIX + "multistatus";
+    public static final String XML_NS_OWNER = DAV_NS_PREFIX + "owner";
+    public static final String XML_NS_PROP = DAV_NS_PREFIX + "prop";
+    public static final String XML_NS_PROPNAME = DAV_NS_PREFIX + "propname";
+    public static final String XML_NS_PROPSTAT = DAV_NS_PREFIX + "propstat";
+    public static final String XML_NS_RESOURCE_TYPE = DAV_NS_PREFIX + "resourcetype";
+    public static final String XML_NS_RESPONSE = DAV_NS_PREFIX + "response";
+    public static final String XML_NS_SHARED = DAV_NS_PREFIX + "shared";
+    public static final String XML_NS_SOURCE = DAV_NS_PREFIX + "source";
+    public static final String XML_NS_STATUS = DAV_NS_PREFIX + "status";
+    public static final String XML_NS_SUPPORTED_LOCK = DAV_NS_PREFIX + "supportedlock";
+    public static final String XML_NS_TIMEOUT = DAV_NS_PREFIX + "timeout";
+    public static final String XML_NS_WRITE = DAV_NS_PREFIX + "write";
+    public static final String XML_NS_ERROR = DAV_NS_PREFIX + "error";
+    public static final String XML_NS_CANNOT_MODIFY_PROTECTED_PROPERTY = DAV_NS_PREFIX + "cannot-modify-protected-property";
+    
+    
+    public static final String XML_CONTENT_TYPE = "text/xml; charset=UTF-8";
+    
+    // Alfresco specific properties
+    
+    public static final String XML_ALF_AUTHTICKET    = "authticket";
+    public static final String XML_NS_ALF_AUTHTICKET = DAV_NS_PREFIX + "authticket";
+    
+    // Path seperator
+    
+    public static final String PathSeperator   = "/";
+    public static final char PathSeperatorChar = '/';
+    
+    // Lock token seperator
+    
+    public static final String LOCK_TOKEN_SEPERATOR = ":";
+    
+    // Root path
+    
+    public static final String RootPath = PathSeperator;
+    
+    // Map WebDAV property names to Alfresco property names
+    
+    private static Hashtable<String, QName> _propertyNameMap;
+    
+    // WebDAV creation date/time formatter
+    
+    private static String CREATION_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
+    
+    /**
+     * Formats the given date so that it conforms with the Last-Modified HTTP header
+     * 
+     * @param date The date to format
+     * @return The formatted date string
+     */
+    public static String formatModifiedDate(Date date)
+    {
+        return formatHeaderDate(date);
+    }
+
+    /**
+     * Formats the given date so that it conforms with the Last-Modified HTTP header
+     * 
+     * @param ldate long
+     * @return The formatted date string
+     */
+    public static String formatModifiedDate(long ldate)
+    {
+        return formatHeaderDate(ldate);
+    }
+
+    /**
+     * Formats the given date so that it conforms with the WebDAV creation date/time format
+     * 
+     * @param date The date to format
+     * @return The formatted date string
+     */
+    public static String formatCreationDate(Date date)
+    {
+        return DateFormatUtils.formatUTC(date, CREATION_DATE_FORMAT);
+    }
+
+    /**
+     * Formats the given date so that it conforms with the WebDAV creation date/time format
+     * 
+     * @param ldate long
+     * @return The formatted date string
+     */
+    public static String formatCreationDate(long ldate)
+    {
+        return DateFormatUtils.formatUTC(ldate, CREATION_DATE_FORMAT);
+    }
+
+    /**
+     * Formats the given date for use in the HTTP header
+     * 
+     * @param date Date
+     * @return String
+     */
+    public static String formatHeaderDate(Date date)
+    {
+        // HTTP header date/time format
+        // NOTE: According to RFC2616 dates should always be in English and in
+        //        the GMT timezone see http://rfc.net/rfc2616.html#p20 for details
+        return DateFormatUtils.format(date, HEADER_IF_DATE_FORMAT, TimeZone.getTimeZone("GMT"), Locale.ENGLISH);
+    }
+    
+    /**
+     * Formats the given date for use in the HTTP header
+     * 
+     * @param ldate long
+     * @return String
+     */
+    public static String formatHeaderDate(long ldate)
+    {
+        // HTTP header date/time format
+        // NOTE: According to RFC2616 dates should always be in English and in
+        //        the GMT timezone see http://rfc.net/rfc2616.html#p20 for details
+        return DateFormatUtils.format(ldate, HEADER_IF_DATE_FORMAT, TimeZone.getTimeZone("GMT"), Locale.ENGLISH);
+    }
+    
+    /**
+     * Return the Alfresco property value for the specified WebDAV property
+     * 
+     * @param davPropName String
+     * @return Object
+     */
+    public static Object getDAVPropertyValue( Map<QName, Serializable> props, String davPropName)
+    {
+        // Convert the WebDAV property name to the corresponding Alfresco property
+        
+        QName propName = _propertyNameMap.get( davPropName);
+        if ( propName == null)
+            throw new AlfrescoRuntimeException("No mapping for WebDAV property " + davPropName);
+        
+        //  Return the property value
+        Object value = props.get(propName);
+        if (value instanceof ContentData)
+        {
+            ContentData contentData = (ContentData) value;
+            if (davPropName.equals(WebDAV.XML_GET_CONTENT_TYPE))
+            {
+                value = contentData.getMimetype();
+            }
+            else if (davPropName.equals(WebDAV.XML_GET_CONTENT_LENGTH))
+            {
+                value = new Long(contentData.getSize());
+            }
+        }
+        return value;
+    }
+    /**
+    /**
+     * Returns a context-relative path, beginning with a "/", that represents the canonical version
+     * of the specified path after ".." and "." elements are resolved out. If the specified path
+     * attempts to go outside the boundaries of the current context (i.e. too many ".." path
+     * elements are present), return <code>null</code> instead.
+     * 
+     * @param strPath The path to be decoded
+     */
+    public static String decodeURL(String strPath)
+    {
+        if (strPath == null)
+            return null;
+
+        // Resolve encoded characters in the normalized path, which also handles encoded
+        // spaces so we can skip that later. Placed at the beginning of the chain so that
+        // encoded bad stuff(tm) can be caught by the later checks
+        
+        String strNormalized = null;
+
+        try
+        {
+            strNormalized = WebDAVHelper.decodeURL(strPath);
+        }
+        catch (Exception ex)
+        {
+            logger.error("Error in decodeURL, URL = " + strPath, ex);
+        }
+
+        if (strNormalized == null)
+            return (null);
+
+        // Normalize the slashes and add leading slash if necessary
+        
+        if (strNormalized.indexOf('\\') >= 0)
+            strNormalized = strNormalized.replace('\\', '/');
+
+        if (!strNormalized.startsWith("/"))
+            strNormalized = "/" + strNormalized;
+
+        // Resolve occurrences of "//" in the normalized path
+        
+        while (true)
+        {
+            int index = strNormalized.indexOf("//");
+            if (index < 0)
+                break;
+            strNormalized = strNormalized.substring(0, index) + strNormalized.substring(index + 1);
+        }
+
+        // Resolve occurrences of "/./" in the normalized path
+        
+        while (true)
+        {
+            int index = strNormalized.indexOf("/./");
+            if (index < 0)
+                break;
+            strNormalized = strNormalized.substring(0, index) + strNormalized.substring(index + 2);
+        }
+
+        // Resolve occurrences of "/../" in the normalized path
+        
+        while (true)
+        {
+            int index = strNormalized.indexOf("/../");
+            if (index < 0)
+                break;
+            if (index == 0)
+                return (null); // Trying to go outside our context
+
+            int index2 = strNormalized.lastIndexOf('/', index - 1);
+            strNormalized = strNormalized.substring(0, index2) + strNormalized.substring(index + 3);
+        }
+
+        // Return the normalized path that we have completed
+        
+        return strNormalized;
+    }
+    
+    /**
+     * Make a unique lock token
+     * 
+     * @param lockNode NodeRef
+     * @param owner String
+     * @return String
+     */
+    public static final String makeLockToken(NodeRef lockNode, String owner)
+    {
+        StringBuilder str = new StringBuilder();
+        
+        str.append(WebDAV.OPAQUE_LOCK_TOKEN);
+        str.append(lockNode.getId());
+        str.append(LOCK_TOKEN_SEPERATOR);
+        str.append(ISO9075.encode(owner));
+        
+        return str.toString();
+    }
+    
+    /**
+     * Parse a lock token returning the node if and username
+     * 
+     * @param lockToken String
+     * @return String[]
+     */
+    public static final String[] parseLockToken(String lockToken)
+    {
+        // Check if the lock token is valid
+        
+        if ( lockToken == null)
+            return null;
+        
+        // Check if the token contains the lock token header
+        
+        if ( lockToken.startsWith(WebDAV.OPAQUE_LOCK_TOKEN))
+            lockToken = lockToken.substring(WebDAV.OPAQUE_LOCK_TOKEN.length());
+        
+        // Split the node id and username tokens
+        
+        int pos = lockToken.indexOf(LOCK_TOKEN_SEPERATOR);
+        if ( pos == -1)
+            return null;
+        
+        String[] tokens = new String[2];
+        
+        tokens[0] = lockToken.substring(0,pos);
+        tokens[1] = lockToken.substring(pos + 1);
+        
+        return tokens;
+    }
+    
+    /**
+     * Returns string representation of the depth
+     * 
+     * @param depth int
+     * @return String
+     */
+    public static final String getDepthName(int depth)
+    {
+        switch (depth)
+        {
+        case DEPTH_0:
+            return ZERO;
+
+        case DEPTH_1:
+            return ONE;
+
+        case DEPTH_INFINITY:
+            return INFINITY;
+            
+        default:
+            throw new IllegalArgumentException("Unknown depth:" + depth);
+        }
+    }
+
+    /**
+     * Static initializer
+     */
+    static
+    {
+        // Create the WebDAV to Alfresco property mapping table
+        
+        _propertyNameMap = new Hashtable<String, QName>();
+        
+        _propertyNameMap.put(XML_DISPLAYNAME, ContentModel.PROP_NAME);
+        _propertyNameMap.put(XML_CREATION_DATE, ContentModel.PROP_CREATED);
+        _propertyNameMap.put(XML_GET_LAST_MODIFIED, ContentModel.PROP_MODIFIED);
+        _propertyNameMap.put(XML_GET_CONTENT_TYPE, ContentModel.PROP_CONTENT);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVActivityPoster.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVActivityPoster.java
new file mode 100644
index 00000000000..aaa35369e95
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVActivityPoster.java
@@ -0,0 +1,75 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import org.alfresco.service.cmr.model.FileInfo;
+
+/**
+ * WebDAV methods can ActivityPoster to create entries in the activity feed.
+ * 
+ * @author Matt Ward
+ */
+public interface WebDAVActivityPoster
+{
+    /**
+     * @param siteId
+     * @param tenantDomain
+     * @param path the path to the folder or <code>null</code> for files
+     * @param nodeInfo
+     * @throws WebDAVServerException
+     */
+    void postFileFolderAdded(
+                String siteId,
+                String tenantDomain,
+                String path,
+                FileInfo nodeInfo) throws WebDAVServerException;
+    
+    /**
+     * @param siteId
+     * @param tenantDomain
+     * @param nodeInfo
+     * @throws WebDAVServerException
+     */
+    void postFileFolderUpdated(
+                String siteId,
+                String tenantDomain,
+                FileInfo nodeInfo) throws WebDAVServerException;
+    
+    /**
+     * @param siteId
+     * @param tenantDomain
+     * @param parentPath
+     * @param parentNodeInfo
+     * @param contentNodeInfo
+     * @throws WebDAVServerException
+     */
+    void postFileFolderDeleted(
+                String siteId,
+                String tenantDomain,
+                String parentPath,
+                FileInfo parentNodeInfo,
+                FileInfo contentNodeInfo) throws WebDAVServerException;
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVHelper.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVHelper.java
new file mode 100644
index 00000000000..34e7fc0cce8
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVHelper.java
@@ -0,0 +1,1200 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.io.UnsupportedEncodingException;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.NetworkInterface;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.sync.events.types.ContentEvent;
+import org.alfresco.sync.events.types.ContentEventImpl;
+import org.alfresco.sync.events.types.Event;
+import org.alfresco.jlan.util.IPAddress;
+import org.alfresco.model.ContentModel;
+import org.alfresco.sync.repo.Client;
+import org.alfresco.sync.repo.Client.ClientType;
+import org.alfresco.sync.repo.events.EventPreparator;
+import org.alfresco.sync.repo.events.EventPublisher;
+import org.alfresco.repo.lock.LockUtils;
+import org.alfresco.repo.model.filefolder.HiddenAspect;
+import org.alfresco.repo.policy.BehaviourFilter;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.activities.ActivityPoster;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.CopyService;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.util.EqualsHelper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.URLDecoder;
+import org.springframework.extensions.surf.util.URLEncoder;
+import org.springframework.util.StringUtils;
+import org.xml.sax.helpers.AttributesImpl;
+
+/**
+ * WebDAV Protocol Helper Class
+ * 
+ * <p>Provides helper methods for repository access using the WebDAV protocol.
+ * 
+ * @author GKSpencer
+ */
+public class WebDAVHelper
+{
+    // Constants
+    public static final String BEAN_NAME = "webDAVHelper";
+
+    private static final String HTTPS_SCHEME = "https://";
+    private static final String HTTP_SCHEME = "http://";
+    
+
+    // Path seperator
+    public static final String PathSeperator   = "/";
+    public static final char PathSeperatorChar = '/';
+    public static final String EMPTY_SITE_ID = "";
+    
+    // Logging
+    protected static Log logger = LogFactory.getLog("org.alfresco.webdav.protocol");
+
+    // Service registry TODO: eliminate this - not dependency injection!
+    private ServiceRegistry m_serviceRegistry;
+
+    // Services
+    private NodeService m_nodeService;
+    private FileFolderService m_fileFolderService;
+    private SearchService m_searchService;
+    private NamespaceService m_namespaceService;
+    private DictionaryService m_dictionaryService;
+    private MimetypeService m_mimetypeService;
+    private WebDAVLockService m_lockService;
+    private ActionService m_actionService;
+    private AuthenticationService m_authService;
+    private PermissionService m_permissionService;
+    private TenantService m_tenantService;
+    private HiddenAspect m_hiddenAspect;
+    private EventPublisher eventPublisher;
+    private ActivityPoster poster;
+    
+    // pattern is tested against full path after it has been lower cased.
+    private Pattern m_renameShufflePattern = Pattern.compile("(.*/\\..*)|(.*[a-f0-9]{8}+$)|(.*\\.tmp$)|(.*atmp[0-9]+$)|(.*\\.wbk$)|(.*\\.bak$)|(.*\\~$)|(.*backup.*\\.do[ct]{1}[x]?[m]?$)|(.*\\.sb\\-\\w{8}\\-\\w{6}$)");
+    
+    //  Empty XML attribute list
+    
+    private final AttributesImpl m_nullAttribs = new AttributesImpl();
+        
+    private BehaviourFilter m_policyBehaviourFilter;
+
+    private String m_urlPathPrefix;
+        
+    private long sizeLimit = -1L;
+    
+    /**
+     * This method sets a value for the limit. If the string does not {@link Long#parseLong(String) parse} to a
+     * java long.
+     * 
+     * @param limit a String representing a valid Java long.
+     */
+    public void setSizeLimitString(String limit)
+    {
+        // A string parameter is used here in order to not to require end users to provide a value for the limit in a property
+        // file. This results in the empty string being injected to this method.
+        long longLimit = -1L;
+        try
+        {
+            longLimit = Long.parseLong(limit);
+        } catch (NumberFormatException ignored)
+        {
+            // Intentionally empty
+        }
+        this.sizeLimit = longLimit;
+    }
+    
+    /**
+     * Set the regular expression that will be applied to filenames during renames
+     * to detect whether clients are performing a renaming shuffle - common during
+     * file saving on various clients.
+     * <p/>
+     * <b>ALF-3856, ALF-7079, MNT-181</b>
+     * 
+     * @param renameShufflePattern      a regular expression filename match
+     */
+    public void setRenameShufflePattern(Pattern renameShufflePattern)
+    {
+        this.m_renameShufflePattern = renameShufflePattern;
+    }
+
+    /**
+     * @return          Return the limit size
+     */
+    public long getSizeLimit()
+    {
+        return sizeLimit;
+    }
+    
+    /**
+     * @return          Return the authentication service
+     */
+    public final AuthenticationService getAuthenticationService()
+    {
+        return m_authService;
+    }
+    
+    /**
+     * @return          Return the service registry
+     */
+    public ServiceRegistry getServiceRegistry()
+    {
+        // TODO: eliminate this - not dependency injection!
+        return m_serviceRegistry;
+    }
+    
+    /**
+     * @return          Return the node service
+     */
+    public final NodeService getNodeService()
+    {
+        return m_nodeService;
+    }
+    
+    public FileFolderService getFileFolderService()
+    {
+        return m_fileFolderService;
+    }
+
+    /**
+     * @return          Return the search service
+     */
+    public final SearchService getSearchService()
+    {
+        return m_searchService;
+    }
+    
+    /**
+     * @return          Return the namespace service
+     */
+    public final NamespaceService getNamespaceService()
+    {
+        return m_namespaceService;
+    }
+    
+    /**
+     * @return          Return the dictionary service
+     */
+    public final DictionaryService getDictionaryService()
+    {
+        return m_dictionaryService;
+    }
+
+    /**
+     * @return          Return the mimetype service
+     */
+    public final MimetypeService getMimetypeService()
+    {
+        return m_mimetypeService;
+    }
+    
+    /**
+     * @return          Return the lock service
+     */
+    public WebDAVLockService getLockService()
+    {
+        return m_lockService;
+    }
+    
+    /**
+     * @return          Return the action service
+     */
+    public final ActionService getActionService()
+    {
+        return m_actionService;
+    }
+    
+    /**
+     * 
+     * @return          Return the permission service
+     */
+    public final PermissionService getPermissionService()
+    {
+        return m_permissionService;
+    }
+        
+    /**
+     * @return the hidden aspect bean
+     */
+    public final HiddenAspect getHiddenAspect()
+    {
+        return m_hiddenAspect;
+    }
+
+    /**
+     * Retrieve the {@link TenantService} held by the helper.
+     * 
+     * @return TenantService
+     */
+    public TenantService getTenantService()
+    {
+        return m_tenantService;
+    }
+    
+    /**
+     * @return          Return the copy service
+     */
+    public final CopyService getCopyService()
+    {
+        return getServiceRegistry().getCopyService();
+    }
+    
+    public void setTenantService(TenantService tenantService)
+    {
+        this.m_tenantService = tenantService;
+    }
+    
+    /**
+     * @param serviceRegistry the service registry
+     */
+    public void setServiceRegistry(ServiceRegistry serviceRegistry)
+    {
+        this.m_serviceRegistry = serviceRegistry;
+    }
+
+    /**
+     * @param nodeService the node service
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.m_nodeService = nodeService;
+    }
+
+    /**
+     * @param fileFolderService the fileFolder service
+     */
+    public void setFileFolderService(FileFolderService fileFolderService)
+    {
+        this.m_fileFolderService = fileFolderService;
+    }
+
+    /**
+     * @param searchService the search service
+     */
+    public void setSearchService(SearchService searchService)
+    {
+        this.m_searchService = searchService;
+    }
+
+    /**
+     * @param namespaceService the namespace service
+     */
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.m_namespaceService = namespaceService;
+    }
+
+    /**
+     * @param eventPublisher the eventPublisher service
+     */
+    public void setEventPublisher(EventPublisher eventPublisher)
+    {
+        this.eventPublisher = eventPublisher;
+    }
+    
+
+    /**
+     * @param poster ActivityPoster
+     */
+    public void setPoster(ActivityPoster poster)
+    {
+        this.poster = poster;
+    }
+    
+    /**
+     * @param dictionaryService the dictionary service
+     */
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.m_dictionaryService = dictionaryService;
+    }
+
+    /**
+     * @param mimetypeService the mimetype service
+     */
+    public void setMimetypeService(MimetypeService mimetypeService)
+    {
+        this.m_mimetypeService = mimetypeService;
+    }
+
+    /**
+     * @param lockService the lock service
+     */
+    public void setLockService(WebDAVLockService lockService)
+    {
+        this.m_lockService = lockService;
+    }
+
+    /**
+     * @param actionService the action service
+     */
+    public void setActionService(ActionService actionService)
+    {
+        this.m_actionService = actionService;
+    }
+
+    /**
+     * @param authService the authentication service
+     */
+    public void setAuthenticationService(AuthenticationService authService)
+    {
+        this.m_authService = authService;
+    }
+
+    /**
+     * @param permissionService the permission service
+     */
+    public void setPermissionService(PermissionService permissionService)
+    {
+        this.m_permissionService = permissionService;
+    }
+
+    /**
+     * @param hiddenAspect the hiddenAspect to set
+     */
+    public void setHiddenAspect(HiddenAspect hiddenAspect)
+    {
+        this.m_hiddenAspect = hiddenAspect;
+    }
+
+    
+    public BehaviourFilter getPolicyBehaviourFilter()
+    {
+        return m_policyBehaviourFilter;
+    }
+
+    public void setPolicyBehaviourFilter(BehaviourFilter behaviourFilter)
+    {
+        m_policyBehaviourFilter = behaviourFilter;
+    }
+
+    /**
+     * Checks a new path in a move operation to detect whether clients are starting a renaming shuffle - common during
+     * file saving on various clients.
+     * <p/>
+     * <b>ALF-3856, ALF-7079, MNT-181</b>
+     */
+    public boolean isRenameShuffle(String newPath)
+    {
+        return m_renameShufflePattern.matcher(newPath.toLowerCase()).matches();
+    }
+
+    /**
+     * Split the path into seperate directory path and file name strings.
+     * If the path is not empty, then there will always be an entry for the filename
+     * 
+     * @param path Full path string.
+     * @return Returns a String[2] with the folder path and file path.
+     */
+    public final String[] splitPath(String path)
+    {
+        if (path == null)
+            throw new IllegalArgumentException("path may not be null");
+        
+        // Create an array of strings to hold the path and file name strings
+        String[] pathStr = new String[] {"", ""};
+
+        // Check if the path has a trailing seperator, if so then there is no file name.
+
+        int pos = path.lastIndexOf(PathSeperatorChar);
+        if (pos == -1 || pos == (path.length() - 1))
+        {
+            // Set the path string in the returned string array
+            pathStr[1] = path;
+        }
+        else
+        {
+            pathStr[0] = path.substring(0, pos);
+            pathStr[1] = path.substring(pos + 1);
+        }
+        // Return the path strings
+        return pathStr;
+    }
+    
+    /**
+     * Split the path into all the component directories and filename
+     * 
+     * @param path          the string to split
+     * @return              an array of all the path components
+     */
+    public List<String> splitAllPaths(String path)
+    {
+        if (path == null || path.length() == 0)
+        {
+            return Collections.emptyList();
+        }
+
+        // split the path
+        StringTokenizer token = new StringTokenizer(path, PathSeperator);
+        List<String> results = new ArrayList<String>(10);
+        while (token.hasMoreTokens())
+        {
+            results.add(token.nextToken());
+        }
+        return results;
+    }
+
+    public String getURLForPath(HttpServletRequest request, String path, boolean isCollection)
+    {
+        return getURLForPath(request, path, isCollection, null);
+    }
+    
+    public String getURLForPath(HttpServletRequest request, String path, boolean isCollection, String userAgent)
+    {
+        String urlPathPrefix = getUrlPathPrefix(request);
+        StringBuilder urlStr = new StringBuilder(urlPathPrefix);
+        
+        if (path.equals(WebDAV.RootPath) == false)
+        {
+            // split the path and URL encode each path element
+            for (StringTokenizer t = new StringTokenizer(path, PathSeperator); t.hasMoreTokens(); /**/)
+            {
+                urlStr.append( WebDAVHelper.encodeURL(t.nextToken(), userAgent) );
+                if (t.hasMoreTokens())
+                {
+                    urlStr.append(PathSeperator);
+                }
+            }
+        }
+        
+        // If the URL is to a collection add a trailing slash
+        if (isCollection && urlStr.charAt( urlStr.length() - 1) != PathSeperatorChar)
+        {
+            urlStr.append( PathSeperator);
+        }
+        
+        logger.debug("getURLForPath() path:" + path + " => url:" + urlStr);
+        
+        // Return the URL string
+        return urlStr.toString();
+    }    
+
+    /**
+     * Get the file info for the given paths
+     * 
+     * @param rootNodeRef       the acting webdav root
+     * @param path              the path to search for
+     * @return                  Return the file info for the path
+     * @throws FileNotFoundException
+     *                          if the path doesn't refer to a valid node
+     */
+    public FileInfo getNodeForPath(NodeRef rootNodeRef, String path) throws FileNotFoundException
+    {
+        if (rootNodeRef == null)
+        {
+            throw new IllegalArgumentException("Root node may not be null");
+        }
+        else if (path == null)
+        {
+            throw new IllegalArgumentException("Path may not be null");
+        }
+        
+        FileFolderService fileFolderService = getFileFolderService();
+        // Check for the root path
+        if ( path.length() == 0 || path.equals(PathSeperator))
+        {
+            return fileFolderService.getFileInfo(rootNodeRef);
+        }
+        
+        // split the paths up
+        List<String> splitPath = splitAllPaths(path);
+        
+        // find it
+        FileInfo fileInfo = m_fileFolderService.resolveNamePath(rootNodeRef, splitPath);
+        
+        String fileName = splitPath.get(splitPath.size() - 1);
+        if (!fileInfo.getName().equals(fileName))
+        {
+            throw new FileNotFoundException("Requested filename " + fileName +
+                        " does not match case of " + fileInfo.getName());
+        }
+        
+        // done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Fetched node for path: \n" +
+                    "   root: " + rootNodeRef + "\n" +
+                    "   path: " + path + "\n" +
+                    "   result: " + fileInfo);
+        }
+        return fileInfo;
+    }
+    
+    public boolean isRootPath(String path, String servletPath)
+    {
+        // Check for the root path
+        return( path.length() == 0 || path.equals(PathSeperator) || EqualsHelper.nullSafeEquals(path, servletPath));
+    }
+    
+    public final FileInfo getParentNodeForPath(NodeRef rootNodeRef, String path) throws FileNotFoundException
+    {
+        if (rootNodeRef == null)
+        {
+            throw new IllegalArgumentException("Root node may not be null");
+        }
+        else if (path == null)
+        {
+            throw new IllegalArgumentException("Path may not be null");
+        }
+        // shorten the path
+        String[] paths = splitPath(path);
+        return getNodeForPath(rootNodeRef, paths[0]);
+    }
+    
+    /**
+     * Return the relative path for the node walking back to the specified root node
+     * 
+     * @param rootNodeRef the root below which the path will be valid
+     * @param nodeRef the node's path to get
+     * @return Returns string of form <b>/A/B/C</b> where C represents the from node and 
+     */
+    public final String getPathFromNode(NodeRef rootNodeRef, NodeRef nodeRef) throws FileNotFoundException
+    {
+        // Check if the nodes are valid, or equal
+        if (rootNodeRef == null || nodeRef == null)
+            throw new IllegalArgumentException("Invalid node(s) in getPathFromNode call");
+        
+        // short cut if the path node is the root node
+        if (rootNodeRef.equals(nodeRef))
+            return "";
+        
+        FileFolderService fileFolderService = getFileFolderService();
+        
+        // get the path elements
+        List<String> pathInfos = fileFolderService.getNameOnlyPath(rootNodeRef, nodeRef);
+        
+        // build the path string
+        StringBuilder sb = new StringBuilder(pathInfos.size() * 20);
+        for (String fileInfo : pathInfos)
+        {
+            sb.append(WebDAVHelper.PathSeperatorChar);
+            sb.append(fileInfo);
+        }
+        // done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Build name path for node: \n" +
+                    "   root: " + rootNodeRef + "\n" +
+                    "   target: " + nodeRef + "\n" +
+                    "   path: " + sb);
+        }
+        return sb.toString();
+    }
+        
+    public FileInfo createFile(FileInfo parentNodeInfo, String path) throws WebDAVServerException
+    {
+        return m_fileFolderService.create(parentNodeInfo.getNodeRef(), path, ContentModel.TYPE_CONTENT);
+    }
+
+    public List<FileInfo> getChildren(FileInfo fileInfo) throws WebDAVServerException
+    {
+        return m_fileFolderService.list(fileInfo.getNodeRef());
+    }
+
+    /**
+     * Make an ETag value for a node using the GUID and modify date/time
+     */
+    public final String makeETag(FileInfo nodeInfo)
+    {
+        // Get the modify date/time property for the node
+        
+        StringBuilder etag = new StringBuilder();
+        makeETagString(nodeInfo, etag);
+        return etag.toString();
+    }
+    
+    /**
+     * Make an ETag value for a node using the GUID and modify date/time
+     */
+    public final String makeQuotedETag(FileInfo nodeInfo)
+    {
+        StringBuilder etag = new StringBuilder();
+        
+        etag.append("\"");
+        makeETagString(nodeInfo, etag);
+        etag.append("\"");
+        return etag.toString();
+    }
+    
+    /**
+     * Make an ETag value for a node using the GUID and modify date/time
+     */
+    protected final void makeETagString(FileInfo nodeInfo, StringBuilder etag)
+    {
+        // Get the modify date/time property for the node
+        
+        Object modVal = nodeInfo.getProperties().get(ContentModel.PROP_MODIFIED);
+        
+        etag.append(nodeInfo.getNodeRef().getId());
+        
+        if ( modVal != null)
+        {
+            etag.append("_");
+            etag.append(DefaultTypeConverter.INSTANCE.longValue(modVal));
+        }
+    }
+    
+    /**
+     * @return              Return the null XML attribute list
+     */
+    public final AttributesImpl getNullAttributes()
+    {
+        return m_nullAttribs;
+    }
+    
+    /**
+     * Encodes the given string to valid URL format
+     * 
+     * @param s             the String to convert
+     */
+    public final static String encodeURL(String s)
+    {
+        return encodeURL(s, null);
+    }
+    
+    public final static String encodeURL(String s, String userAgent)
+    {
+          return URLEncoder.encode(s);
+    }
+    
+    public final static String decodeURL(String s)
+    {
+        return URLDecoder.decode(s);
+    }
+    
+    /**
+     * Encodes the given string to valid HTML format
+     * 
+     * @param string        the String to convert
+     */
+    public final static String encodeHTML(String string)
+    {
+        if (string == null)
+        {
+            return "";
+        }
+        
+        StringBuilder sb = null;      //create on demand
+        String enc;
+        char c;
+        for (int i = 0; i < string.length(); i++)
+        {
+            enc = null;
+            c = string.charAt(i);
+            switch (c)
+            {
+                case '"': enc = "&quot;"; break;    //"
+                case '&': enc = "&amp;"; break;     //&
+                case '<': enc = "&lt;"; break;      //<
+                case '>': enc = "&gt;"; break;      //>
+                
+                //misc
+                case '\u20AC': enc = "&euro;";  break;
+                case '\u00AB': enc = "&laquo;"; break;
+                case '\u00BB': enc = "&raquo;"; break;
+                case '\u00A0': enc = "&nbsp;"; break;
+                
+                default:
+                    if (((int)c) >= 0x80)
+                    {
+                        //encode all non basic latin characters
+                        enc = "&#" + ((int)c) + ";";
+                    }
+                break;
+            }
+            
+            if (enc != null)
+            {
+                if (sb == null)
+                {
+                    String soFar = string.substring(0, i);
+                    sb = new StringBuilder(i + 8);
+                    sb.append(soFar);
+                }
+                sb.append(enc);
+            }
+            else
+            {
+                if (sb != null)
+                {
+                    sb.append(c);
+                }
+            }
+        }
+        
+        if (sb == null)
+        {
+            return string;
+        }
+        else
+        {
+            return sb.toString();
+        }
+    }
+    
+    /**
+     * ALF-5333: Microsoft clients use ISO-8859-1 to decode WebDAV responses
+     * so this method should only be used for Microsoft user agents.
+     * 
+     * @param string String
+     * @return The encoded string for Microsoft clients
+     * @throws UnsupportedEncodingException
+     */
+    public final static String encodeUrlReservedSymbols(String string) throws UnsupportedEncodingException
+    {
+        if (string == null)
+        {
+            return "";
+        }
+        
+        StringBuilder sb = null;      // create on demand
+        String enc;
+        char c;
+        for (int i = 0; i < string.length(); i++)
+        {
+            enc = null;
+            c = string.charAt(i);
+            switch (c)
+            {
+                // reserved
+                case ';': enc = URLEncoder.encode(String.valueOf(c)); break;
+                case '/': enc = URLEncoder.encode(String.valueOf(c)); break;
+                case '?': enc = URLEncoder.encode(String.valueOf(c)); break;
+                case ':': enc = URLEncoder.encode(String.valueOf(c)); break;
+                case '@': enc = URLEncoder.encode(String.valueOf(c)); break;
+                case '&': enc = URLEncoder.encode(String.valueOf(c)); break;
+                case '=': enc = URLEncoder.encode(String.valueOf(c)); break;
+                case '+': enc = URLEncoder.encode(String.valueOf(c)); break;
+                
+                // unsafe
+                case '\"': enc = URLEncoder.encode(String.valueOf(c)); break;
+                case '#': enc = URLEncoder.encode(String.valueOf(c)); break;
+                case '%': enc = URLEncoder.encode(String.valueOf(c)); break;
+                case '>': enc = URLEncoder.encode(String.valueOf(c)); break;
+                case '<': enc = URLEncoder.encode(String.valueOf(c)); break;
+                default: break;
+            }
+            
+            if (enc != null)
+            {
+                if (sb == null)
+                {
+                    String soFar = string.substring(0, i);
+                    sb = new StringBuilder(i + 8);
+                    sb.append(soFar);
+                }
+                sb.append(enc);
+            }
+            else
+            {
+                if (sb != null)
+                {
+                    sb.append(c);
+                }
+            }
+        }
+        
+        if (sb == null)
+        {
+            return string;
+        }
+        else
+        {
+            return sb.toString();
+        }
+    }
+    
+    public String determineSiteId(WebDAVMethod method)
+    {
+        return determineSiteId(method.getRootNodeRef(), method.getPath());
+    }
+    
+    public String determineSiteId(NodeRef rootNodeRef, String path)
+    {
+        SiteService siteService = getServiceRegistry().getSiteService();
+        String siteId;
+        try
+        {
+            FileInfo fileInfo = getNodeForPath(rootNodeRef, path);
+            siteId = siteService.getSiteShortName(fileInfo.getNodeRef());
+            if (siteId == null)
+            {
+                throw new RuntimeException("Node is not contained by a site: " + path);
+            }
+        }
+        catch (Exception error)
+        {
+            siteId = EMPTY_SITE_ID;
+        }
+        return siteId;
+    }
+    
+    @Deprecated
+    public String determineTenantDomain(WebDAVMethod method)
+    {
+        return determineTenantDomain();
+    }
+    
+    public String determineTenantDomain()
+    {
+        TenantService tenantService = getTenantService();
+        String tenantDomain = tenantService.getCurrentUserDomain();
+        if (tenantDomain == null)
+        {
+            return TenantService.DEFAULT_DOMAIN;
+        }
+        return tenantDomain;
+    }
+    
+    /**
+     * Extract the destination path for MOVE or COPY commands from the
+     * supplied destination URL header.
+     * 
+     * @param servletPath Path prefix of the WebDAV servlet.
+     * @param destURL The Destination header.
+     * @return The path to move/copy the file to.
+     */
+    public String getDestinationPath(String contextPath, String servletPath, String destURL)
+    {
+        if (destURL != null && destURL.length() > 0)
+        {
+            int offset = -1;
+
+            if (destURL.startsWith(HTTP_SCHEME))
+            {
+                // Set the offset to the start of the host name
+                offset = HTTP_SCHEME.length();
+            }
+            else if (destURL.startsWith(HTTPS_SCHEME))
+            {
+                // Set the offset to the start of the host name
+                offset = HTTPS_SCHEME.length();
+            }
+
+            // Strip the start of the path if not a relative path
+
+            if (offset != -1)
+            {
+                offset = destURL.indexOf(WebDAV.PathSeperator, offset);
+                if (offset != -1)
+                {
+                    // Strip the host from the beginning
+                    String strPath = destURL.substring(offset);
+                    
+                    // If it starts with /contextPath/servletPath/ (e.g. /alfresco/webdav/path/to/file) - then
+                    // strip the servlet path from the start of the path.
+                    String pathPrefix = contextPath + servletPath + WebDAV.PathSeperator;
+                    if (strPath.startsWith(pathPrefix))
+                    {
+                        strPath = strPath.substring(pathPrefix.length());
+                    }
+
+                    return WebDAV.decodeURL(strPath);
+                }
+            }            
+        }
+        
+        // Unable to get the path.
+        return null;
+    }
+    
+    /**
+     * Check that the destination path is on this server and is a valid WebDAV
+     * path for this server
+     * 
+     * @param request The request made against the WebDAV server.
+     * @param urlStr String
+     * @exception WebDAVServerException
+     */
+    public void checkDestinationURL(HttpServletRequest request, String urlStr) throws WebDAVServerException
+    {
+        try
+        {
+            // Parse the URL
+
+            URL url = new URL(urlStr);
+
+            // Check if the path is on this WebDAV server
+
+            boolean localPath = true;
+
+            if (url.getPort() != -1 && url.getPort() != request.getServerPort())
+            {
+                // Debug
+
+                if (logger.isDebugEnabled())
+                    logger.debug("Destination path, different server port");
+
+                localPath = false;
+            }
+            else if (url.getHost().equalsIgnoreCase(request.getServerName()) == false
+                    && url.getHost().equals(request.getLocalAddr()) == false)
+            {
+                // The target host may contain a domain or be specified as a numeric IP address
+                
+                String targetHost = url.getHost();
+                
+                if ( IPAddress.isNumericAddress( targetHost) == false)
+                {
+                    String localHost  = request.getServerName();
+                    
+                    int pos = targetHost.indexOf( ".");
+                    if ( pos != -1)
+                        targetHost = targetHost.substring( 0, pos);
+                    
+                    pos = localHost.indexOf( ".");
+                    if ( pos != -1)
+                        localHost = localHost.substring( 0, pos);
+                    
+                    // compare the host names
+                    
+                    if ( targetHost.equalsIgnoreCase( localHost) == false)
+                        localPath = false;
+                }
+                else
+                {
+                    try
+                    {
+                        // Check if the target IP address is a local address
+                        
+                        InetAddress targetAddr = InetAddress.getByName( targetHost);
+                        if ( NetworkInterface.getByInetAddress( targetAddr) == null)
+                            localPath = false;
+                    }
+                    catch (Exception ex)
+                    {
+                        // DEBUG
+                        
+                        if ( logger.isDebugEnabled())
+                            logger.debug("Failed to check target IP address, " + targetHost);
+                        
+                        localPath = false;
+                    }
+                }
+                
+                // Debug
+
+                if (localPath == false && logger.isDebugEnabled())
+                {
+                    logger.debug("Destination path, different server name/address");
+                    logger.debug("  URL host=" + url.getHost() + ", ServerName=" + request.getServerName() + ", localAddr=" + request.getLocalAddr());
+                }
+            }
+            else if (!url.getPath().startsWith(getUrlPathPrefix(request)))
+            {
+                // Debug
+
+                if (logger.isDebugEnabled())
+                    logger.debug("Destination path, different serlet path");
+
+                localPath = false;
+            }
+
+            // If the URL does not refer to this WebDAV server throw an
+            // exception
+
+            if (localPath != true)
+                throw new WebDAVServerException(HttpServletResponse.SC_BAD_GATEWAY);
+        }
+        catch (MalformedURLException ex)
+        {
+            // Debug
+
+            if (logger.isDebugEnabled())
+                logger.debug("Bad destination path, " + urlStr);
+
+            throw new WebDAVServerException(HttpServletResponse.SC_BAD_GATEWAY);
+        }
+    }
+    
+
+    public void setUrlPathPrefix(String urlPathPrefix)
+    {
+        m_urlPathPrefix = urlPathPrefix;
+    }
+    
+    public String getUrlPathPrefix(HttpServletRequest request)
+    {
+        StringBuilder urlStr = null;
+        if (StringUtils.hasText(m_urlPathPrefix))
+        {
+            // A specific prefix has been configured in, so use it.
+            urlStr = new StringBuilder(m_urlPathPrefix);
+        }
+        else
+        {
+            // Extract the path prefix from the request, using the servlet path as a guide.
+            // e.g. "/preamble/servlet-mapping/folder/file.txt"
+            // with a servlet path of "/servlet-mapping"
+            // would result in a path prefix of "/preamble/servlet-mapping" being discovered.
+            urlStr = new StringBuilder(request.getRequestURI());
+            String servletPath = request.getServletPath();
+            
+            int rootPos = urlStr.indexOf(servletPath);
+            if (rootPos != -1)
+            {
+                urlStr.setLength(rootPos + servletPath.length());
+            }
+        }
+        
+        // Ensure the prefix ends in the path separator.
+        if (urlStr.length() == 0 || urlStr.charAt(urlStr.length() - 1) != PathSeperatorChar)
+        {
+            urlStr.append(PathSeperator);
+        }
+        
+        return urlStr.toString();
+    }
+    
+    /**
+     * Notifies listeners that a read has taken place
+     * @param realNodeInfo FileInfo
+     * @param mimetype String
+     * @param size Long
+     * @param contentEncoding String
+     * @param range String
+     */
+    protected void publishReadEvent(final FileInfo realNodeInfo, final String mimetype, final Long size, final String contentEncoding, final String range)
+    {
+     
+        if (!StringUtils.hasText(range))
+        {
+            // Its not a range request
+            eventPublisher.publishEvent(new EventPreparator()
+            {
+                @Override
+                public Event prepareEvent(String user, String networkId, String transactionId)
+                {
+                    return new ContentEventImpl(ContentEvent.DOWNLOAD, user, networkId, transactionId, realNodeInfo.getNodeRef().getId(), null,
+                                realNodeInfo.getType().toString(), Client.asType(ClientType.webdav), realNodeInfo.getName(), mimetype,
+                                size, contentEncoding);
+                }
+            });
+
+        }
+    }
+    
+    public String getRepositoryPath(HttpServletRequest request)
+    {
+        // Try and get the path
+
+        String strPath = null;
+        
+        try 
+        {
+            strPath = WebDAVHelper.decodeURL(request.getRequestURI());
+        }
+        catch (Exception ex) {}
+
+        // Find the servlet path and trim from the request path
+        
+        String servletPath = request.getServletPath();
+        
+        int rootPos = strPath.indexOf(servletPath);
+        if ( rootPos != -1)
+        {
+            strPath = strPath.substring( rootPos);
+        }
+        
+        // If we failed to get the path from the request try and get the path from the servlet path
+
+        if (strPath == null)
+        {
+            strPath = request.getServletPath();
+        }
+
+        if (strPath == null || strPath.length() == 0)
+        {
+            // If we still have not got a path then default to the root directory
+            strPath = WebDAV.RootPath;
+        }
+        else if (strPath.startsWith(request.getServletPath()))
+        {
+            // Check if the path starts with the base servlet path
+            int len = request.getServletPath().length();
+            
+            if (strPath.length() > len)
+            {
+                strPath = strPath.substring(len);
+            }
+            else
+            {
+                strPath = WebDAV.RootPath;
+            }
+        }
+
+        // Make sure there are no trailing slashes
+        
+        if (strPath.length() > 1 && strPath.endsWith(WebDAV.PathSeperator))
+        {
+            strPath = strPath.substring(0, strPath.length() - 1);
+        }
+
+        // Return the path
+        
+        return strPath;
+    }
+
+    /**
+     * Indicates if the node is unlocked or the current user has a WRITE_LOCK<p>
+     * 
+     * @see LockService#isLockedAndReadOnly(org.alfresco.service.cmr.repository.NodeRef)
+     * 
+     * @param nodeRef    the node reference
+     */
+    public boolean isLockedAndReadOnly(final NodeRef nodeRef)
+    {
+        return m_serviceRegistry.getLockService().isLockedAndReadOnly(nodeRef);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockService.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockService.java
new file mode 100644
index 00000000000..a826adc6b5c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockService.java
@@ -0,0 +1,91 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.webdav;
+
+import javax.servlet.http.HttpSession;
+
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * WebDAVLockService is used to manage file locks for WebDAV and Sharepoint protocol. It ensures a lock never persists
+ * for more than 24 hours, and also ensures locks are timed out on session timeout.
+ * 
+ * @author Pavel.Yurkevich
+ * @author Matt Ward
+ */
+public interface WebDAVLockService
+{
+    static final String BEAN_NAME = "webDAVLockService";
+
+    @SuppressWarnings("unchecked")
+    void sessionDestroyed();
+
+    /**
+     * Shared method for webdav/vti protocols to lock node. If node is locked for more than 24 hours it is automatically added
+     * to the current session locked resources list.
+     * 
+     * @param nodeRef the node to lock
+     * @param userName the current user's user name
+     * @param timeout the number of seconds before the locks expires
+     */
+    void lock(NodeRef nodeRef, String userName, int timeout);
+
+    void lock(NodeRef nodeRef, LockInfo lockInfo);
+    
+    /**
+     * Shared method for webdav/vti to unlock node. Unlocked node is automatically removed from
+     * current sessions's locked resources list.
+     * 
+     * @param nodeRef the node to lock
+     */
+    void unlock(NodeRef nodeRef);
+
+    /**
+     * Gets the lock info for the node reference relative to the current user.
+     * 
+     * @see LockService#getLockStatus(org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
+     * 
+     * @param nodeRef    the node reference
+     * @return           the lock status
+     */
+    LockInfo getLockInfo(NodeRef nodeRef);
+    
+    /**
+     * Determines if the node is locked AND it's not a WRITE_LOCK for the current user.<p>
+     *
+     * @return true if the node is locked AND it's not a WRITE_LOCK for the current user
+     */
+    public boolean isLockedAndReadOnly(NodeRef nodeRef);
+    
+    /**
+     * Caches current session in a thread local variable.
+     * 
+     * @param session HttpSession
+     */
+    void setCurrentSession(HttpSession session);
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockServiceImpl.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockServiceImpl.java
new file mode 100644
index 00000000000..ec3ea6b6153
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockServiceImpl.java
@@ -0,0 +1,486 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.webdav;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.lock.LockUtils;
+import org.alfresco.repo.lock.mem.Lifetime;
+import org.alfresco.repo.lock.mem.LockState;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.coci.CheckOutCheckInService;
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.lock.LockStatus;
+import org.alfresco.service.cmr.lock.LockType;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.Pair;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * <p>
+ * WebDAVLockService is used to manage file locks for WebDAV and Sharepoint protocol. It ensures a lock never persists
+ * for more than 24 hours, and also ensures locks are timed out on session timeout.
+ * 
+ * @author Pavel.Yurkevich
+ */
+public class WebDAVLockServiceImpl implements WebDAVLockService
+{
+    /** The session attribute under which webdav/vti stores its locked documents. */
+    private static final String LOCKED_RESOURCES = "_webdavLockedResources";
+
+    private static Log logger = LogFactory.getLog(WebDAVLockServiceImpl.class);
+    
+    private static ThreadLocal<HttpSession> currentSession = new ThreadLocal<HttpSession>();
+    
+    private LockService lockService;
+    private NodeService nodeService;
+    private TransactionService transactionService;
+    private CheckOutCheckInService checkOutCheckInService;
+
+    /**
+     * Set the LockService
+     * 
+     * @param lockService LockService
+     */
+    public void setLockService(LockService lockService)
+    {
+        this.lockService = lockService;
+    }
+
+    /**
+     * Set the NodeService
+     * 
+     * @param nodeService NodeService
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    /**
+     * Set the TransactionService
+     * 
+     * @param transactionService TransactionService
+     */
+    public void setTransactionService(TransactionService transactionService)
+    {
+        this.transactionService = transactionService;
+    }
+
+    /**
+     * Set the CheckOutCheckInService
+     * 
+     * @param checkOutCheckInService CheckOutCheckInService
+     */
+    public void setCheckOutCheckInService(CheckOutCheckInService checkOutCheckInService)
+    {
+        this.checkOutCheckInService = checkOutCheckInService;
+    }
+    
+    /**
+     * Caches current session to the thread local variable
+     * 
+     * @param session HttpSession
+     */
+    @Override
+    public void setCurrentSession(HttpSession session)
+    {
+        currentSession.set(session);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void sessionDestroyed()
+    {
+        HttpSession session = currentSession.get();
+
+        if (session == null)
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Couldn't find current session.");
+            }
+            return;
+        }
+
+        // look for locked documents list in http session
+        final List<Pair<String, NodeRef>> lockedResources = (List<Pair<String, NodeRef>>) session.getAttribute(LOCKED_RESOURCES);
+
+        if (lockedResources != null && lockedResources.size() > 0)
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Found " + lockedResources.size() + " locked resources for session: " + session.getId());
+            }
+
+            for (Pair<String, NodeRef> lockedResource : lockedResources)
+            {
+                String runAsUser = lockedResource.getFirst();
+                final NodeRef nodeRef = lockedResource.getSecond();
+
+                // there are some document that should be forcibly unlocked
+                AuthenticationUtil.runAs(new RunAsWork<Void>()
+                {
+                    @Override
+                    public Void doWork() throws Exception
+                    {
+                        return transactionService.getRetryingTransactionHelper().doInTransaction(
+                                new RetryingTransactionCallback<Void>()
+                                {
+                                    @Override
+                                    public Void execute() throws Throwable
+                                    {
+                                        // check whether this document still exists in repo
+                                        if (nodeService.exists(nodeRef))
+                                        {
+                                            if (logger.isDebugEnabled())
+                                            {
+                                                logger.debug("Trying to release lock for: " + nodeRef);
+                                            }
+
+                                            // check the lock status of document
+                                            LockStatus lockStatus = lockService.getLockStatus(nodeRef);
+                                            
+                                            // check if document was checked out
+                                            boolean hasWorkingCopy = checkOutCheckInService.getWorkingCopy(nodeRef) != null;
+                                            boolean isWorkingCopy = nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY);
+
+                                            // forcibly unlock document if it is still locked and not checked out
+                                            if ((lockStatus.equals(LockStatus.LOCKED) ||
+                                                    lockStatus.equals(LockStatus.LOCK_OWNER)) && !hasWorkingCopy && !isWorkingCopy)
+                                            {
+                                                try
+                                                {
+                                                    // try to unlock it
+                                                    lockService.unlock(nodeRef);
+
+                                                    if (logger.isDebugEnabled())
+                                                    {
+                                                        logger.debug("Lock was successfully released for: "
+                                                                + nodeRef);
+                                                    }
+                                                }
+                                                catch (Exception e)
+                                                {
+                                                    if (logger.isDebugEnabled())
+                                                    {
+                                                        logger.debug("Unable to unlock " + nodeRef
+                                                                + " cause: " + e.getMessage());
+                                                    }
+                                                }
+                                            }
+                                            else
+                                            {
+                                                // document is not locked or is checked out
+                                                if (logger.isDebugEnabled())
+                                                {
+                                                    logger.debug("Skip lock releasing for: " + nodeRef
+                                                            + " as it is not locked or is checked out");
+                                                }
+                                            }
+                                        }
+                                        else
+                                        {
+                                            // document no longer exists in repo 
+                                            if (logger.isDebugEnabled())
+                                            {
+                                                logger.debug("Skip lock releasing for an unexisting node: " + nodeRef);
+                                            }
+                                        }
+                                        return null;
+                                    }
+                                }, transactionService.isReadOnly());
+                    }
+                }, runAsUser == null ? AuthenticationUtil.getSystemUserName() : runAsUser);
+            }
+        }
+        else
+        {
+            // there are no documents with unexpected lock left on it
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("No locked resources were found for session: " + session.getId());
+            }
+        }
+    }
+
+    public void lock(NodeRef nodeRef, LockInfo lockInfo)
+    {
+        boolean performSessionBehavior = false;
+        long timeout;
+        
+        timeout = lockInfo.getRemainingTimeoutSeconds();    
+        
+        // ALF-11777 fix, do not lock node for more than 24 hours (webdav and vti)
+        if (timeout >= WebDAV.TIMEOUT_24_HOURS || timeout == WebDAV.TIMEOUT_INFINITY)
+        {   
+            timeout = WebDAV.TIMEOUT_24_HOURS;
+            lockInfo.setTimeoutSeconds((int) timeout);
+            performSessionBehavior = true;
+        }
+        
+        // TODO: lock children according to depth? lock type?
+        final String additionalInfo = lockInfo.toJSON();
+        lockService.lock(nodeRef, LockType.WRITE_LOCK, (int) timeout, Lifetime.EPHEMERAL, additionalInfo);
+        
+
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(nodeRef + " was locked for " + timeout + " seconds.");
+        }
+
+        if (performSessionBehavior)
+        {
+            HttpSession session = currentSession.get();
+
+            if (session == null)
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Couldn't find current session.");
+                }
+                return;
+            }
+
+            storeObjectInSessionList(session, LOCKED_RESOURCES, new Pair<String, NodeRef>(AuthenticationUtil.getRunAsUser(), nodeRef));
+
+            if (logger.isDebugEnabled())
+            {
+                logger.debug(nodeRef + " was added to the session " + session.getId() + " for post expiration processing.");
+            }
+        }
+    }
+    
+    /**
+     * Shared method for webdav/vti protocols to lock node. If node is locked for more than 24 hours it is automatically added
+     * to the current session locked resources list.
+     * 
+     * @param nodeRef the node to lock
+     * @param userName userName
+     * @param timeout the number of seconds before the locks expires
+     */
+    @Override
+    public void lock(NodeRef nodeRef, String userName, int timeout)
+    {
+        LockInfo lockInfo = createLock(nodeRef, userName, true, timeout);
+        lock(nodeRef, lockInfo);
+    }
+    
+    /**
+     * Shared method for webdav/vti to unlock node. Unlocked node is automatically removed from
+     * current sessions's locked resources list.
+     * 
+     * @param nodeRef the node to lock
+     */
+    @Override
+    public void unlock(NodeRef nodeRef)
+    {
+        lockService.unlock(nodeRef);
+
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(nodeRef + " was unlocked.");
+        }
+
+        HttpSession session = currentSession.get();
+
+        if (session == null)
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Couldn't find current session.");
+            }
+            return;
+        }
+
+        boolean removed = removeObjectFromSessionList(session, LOCKED_RESOURCES, new Pair<String, NodeRef>(AuthenticationUtil.getRunAsUser(), nodeRef));
+
+        if (removed && logger.isDebugEnabled())
+        {
+            logger.debug(nodeRef + " was removed from the session " + session.getId());
+        }
+    }
+    
+    /**
+     * Gets the lock status for the node reference relative to the current user.
+     * 
+     * @see LockService#getLockStatus(org.alfresco.service.cmr.repository.NodeRef, String)
+     * 
+     * @param nodeRef    the node reference
+     * @return           the lock status
+     */
+    @Override
+    public LockInfo getLockInfo(NodeRef nodeRef)
+    {
+        LockInfo lockInfo = null;
+        LockState lockState = lockService.getLockState(nodeRef);
+        if (lockState != null)
+        {
+            String additionalInfo = lockState.getAdditionalInfo();
+            
+            try
+            {
+                lockInfo = LockInfoImpl.fromJSON(additionalInfo);
+            }
+            catch (IllegalArgumentException e)
+            {
+                lockInfo = new LockInfoImpl();
+            }
+
+            lockInfo.setExpires(lockState.getExpires());
+            lockInfo.setOwner(lockState.getOwner());
+        }
+        return lockInfo;
+    }
+
+    /**
+     * Determines if the node is locked AND it's not a WRITE_LOCK for the current user.<p>
+     *
+     * @return true if the node is locked AND it's not a WRITE_LOCK for the current user
+     */
+    public boolean isLockedAndReadOnly(NodeRef nodeRef)
+    {
+        return this.lockService.isLockedAndReadOnly(nodeRef);
+    }
+
+    /**
+     * Add the given <code>object</code> to the session list that is stored in session under <code>listName</code> attribute
+     * 
+     * @param session the session 
+     * @param listName the list name (session attribute name)
+     * @param object the object to store in session list
+     */
+    @SuppressWarnings("unchecked")
+    private static final void storeObjectInSessionList(HttpSession session, String listName, Object object)
+    {
+        List<Object> list = null;
+
+        synchronized (session)
+        {
+            list = (List<Object>) session.getAttribute(listName);
+
+            if (list == null)
+            {
+                list = new ArrayList<Object>();
+                session.setAttribute(listName, list);
+            }
+        }
+
+        synchronized (list)
+        {
+            if (!list.contains(object))
+            {
+                list.add(object);
+            }
+        }
+    }
+
+    /**
+     * Removes the given <code>object</code> from the session list that is stored in session under <code>listName</code> attribute
+     * 
+     * @param session the session 
+     * @param listName the list name (session attribute name)
+     * @param object the object to store in session list
+     * 
+     * @return <tt>true</tt> if session list contained the specified element, otherwise <tt>false</tt>
+     */
+    @SuppressWarnings("unchecked")
+    private static final boolean removeObjectFromSessionList(HttpSession session, String listName, Object object)
+    {
+        List<Object> list = null;
+
+        synchronized (session)
+        {
+            list = (List<Object>) session.getAttribute(listName);
+        }
+
+        if (list == null)
+        {
+            return false;
+        }
+
+        synchronized (list)
+        {
+            return list.remove(object);
+        }
+    }
+    
+    /**
+     * Create a new lock
+     * 
+     * @param nodeRef NodeRef
+     * @param userName String
+     * @param createExclusive boolean
+     * @param timeoutSecs int
+     */
+    private LockInfo createLock(NodeRef nodeRef, String userName, boolean createExclusive, int timeoutSecs)
+    {
+        // Create Lock token
+        String lockToken = WebDAV.makeLockToken(nodeRef, userName);
+
+        LockInfo lockInfo = new LockInfoImpl();
+        
+        if (createExclusive)
+        {
+            // Lock the node
+            lockInfo.setTimeoutSeconds(timeoutSecs);
+            lockInfo.setExclusiveLockToken(lockToken);
+        }
+        else
+        {
+            lockInfo.addSharedLockToken(lockToken);
+        }
+
+        // Store lock depth
+        lockInfo.setDepth(WebDAV.getDepthName(WebDAV.DEPTH_INFINITY));
+        // Store lock scope (shared/exclusive)
+        String scope = createExclusive ? WebDAV.XML_EXCLUSIVE : WebDAV.XML_SHARED;
+        lockInfo.setScope(scope);
+        // Store the owner of this lock
+        lockInfo.setOwner(userName);
+        
+        // TODO: to help with debugging/refactoring (remove later)
+        String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
+        if (!currentUser.equals(userName))
+        {
+            throw new IllegalStateException("Node is being locked for user " + userName +
+                        " by (different/current) user " + currentUser);
+        }
+        
+        return lockInfo;
+    }
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVMethod.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVMethod.java
new file mode 100644
index 00000000000..3b3fead5c4a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVMethod.java
@@ -0,0 +1,1643 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.io.BufferedReader;
+import java.io.CharArrayWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.SocketException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.LimitedStreamCopier;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.TempFileProvider;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.dom4j.DocumentHelper;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.XMLWriter;
+import org.w3c.dom.Document;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+
+/**
+ * Abstract base class for all the WebDAV method handling classes
+ * 
+ * @author gavinc
+ */
+public abstract class WebDAVMethod
+{
+    // Log output
+
+    private static final String VERSION_NUM_PATTERN = "\\d+\\.\\d+(\\.\\d+)?";
+
+    protected static Log logger = LogFactory.getLog("org.alfresco.webdav.protocol");
+
+    // Output formatted XML in the response
+
+    private static final boolean XMLPrettyPrint = true;
+    
+    // Mapping of User-Agent pattern to response status code
+    // used to determine which status code should be returned for AccessDeniedException
+
+    private static final Map<String, Integer> accessDeniedStatusCodes = new LinkedHashMap<String, Integer>();
+    static
+    {
+        accessDeniedStatusCodes.put("^WebDAVLib/" + VERSION_NUM_PATTERN + "$",
+                                    HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        accessDeniedStatusCodes.put("^WebDAVFS/" + VERSION_NUM_PATTERN + " \\(\\d+\\)\\s+Darwin/" +
+                                    VERSION_NUM_PATTERN + "\\s+\\(.*\\)$",
+                                    HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        accessDeniedStatusCodes.put(".*", HttpServletResponse.SC_FORBIDDEN);
+    }
+
+    // Servlet request/response
+
+    protected HttpServletRequest m_request;
+    protected HttpServletResponse m_response;
+    private File m_requestBody;
+    private ServletInputStream m_inputStream;
+    private CharArrayWriter m_xmlWriter;
+    private BufferedReader m_reader;
+
+    // WebDAV helper
+
+    protected WebDAVHelper m_davHelper;
+
+    // Root node
+
+    protected NodeRef m_rootNodeRef;
+
+    // Repository path
+
+    protected String m_strPath = null;
+
+    // User Agent
+    
+    protected String m_userAgent = null;
+
+    // If header conditions 
+    
+    protected LinkedList<Condition> m_conditions = null;
+
+    // If header resource-tag
+    
+    protected String m_resourceTag = null;
+
+    // Depth header
+    
+    protected int m_depth = WebDAV.DEPTH_INFINITY;
+    
+    // request scope
+    protected Map<NodeRef, NodeRef> m_childToParent = new HashMap<NodeRef, NodeRef>();
+    protected Map<NodeRef, LockInfo> m_parentLockInfo = new HashMap<NodeRef, LockInfo>();
+
+    private String siteId;
+
+    private String tenantDomain;
+    
+    /**
+     * Default constructor
+     */
+    public WebDAVMethod()
+    {
+    }
+
+    /**
+     * Set the request/response details
+     * 
+     * @param req
+     *            HttpServletRequest
+     * @param resp
+     *            HttpServletResponse
+     * @param davHelper
+     *            WebDAVHelper
+     * @param rootNode
+     *            NodeRef
+     */
+    public void setDetails(final HttpServletRequest req, HttpServletResponse resp, WebDAVHelper davHelper,
+            NodeRef rootNode)
+    {
+        // Wrap the request so that it is 'retryable'. Calls to getInputStream() and getReader() will result in the
+        // request body being read into an intermediate file.
+        this.m_request = new HttpServletRequestWrapper(req)
+        {
+
+            @Override
+            public ServletInputStream getInputStream() throws IOException
+            {
+                if (WebDAVMethod.this.m_reader != null)
+                {
+                    throw new IllegalStateException("Reader in use");
+                }
+                if (WebDAVMethod.this.m_inputStream == null)
+                {
+                    final FileInputStream in = new FileInputStream(getRequestBodyAsFile(req));
+                    WebDAVMethod.this.m_inputStream = new ServletInputStream()
+                    {
+
+                        @Override
+                        public int read() throws IOException
+                        {
+                            return in.read();
+                        }
+
+                        @Override
+                        public int read(byte b[]) throws IOException
+                        {
+                            return in.read(b);
+                        }
+
+                        @Override
+                        public int read(byte b[], int off, int len) throws IOException
+                        {
+                            return in.read(b, off, len);
+                        }
+
+                        @Override
+                        public long skip(long n) throws IOException
+                        {
+                            return in.skip(n);
+                        }
+
+                        @Override
+                        public int available() throws IOException
+                        {
+                            return in.available();
+                        }
+
+                        @Override
+                        public void close() throws IOException
+                        {
+                            in.close();
+                        }
+
+                        @Override
+                        public void mark(int readlimit)
+                        {
+                            in.mark(readlimit);
+                        }
+
+                        @Override
+                        public void reset() throws IOException
+                        {
+                            in.reset();
+                        }
+
+                        @Override
+                        public boolean markSupported()
+                        {
+                            return in.markSupported();
+                        }
+                    };
+                }
+
+                return WebDAVMethod.this.m_inputStream;
+            }
+
+            @Override
+            public BufferedReader getReader() throws IOException
+            {
+                if (WebDAVMethod.this.m_inputStream != null)
+                {
+                    throw new IllegalStateException("Input Stream in use");
+                }
+                if (WebDAVMethod.this.m_reader == null)
+                {
+                    String encoding = req.getCharacterEncoding();
+                    WebDAVMethod.this.m_reader = new BufferedReader(new InputStreamReader(new FileInputStream(
+                            getRequestBodyAsFile(req)), encoding == null ? "ISO-8859-1" : encoding));
+                }
+
+                return WebDAVMethod.this.m_reader;
+            }
+
+        };
+        this.m_response = resp;
+        this.m_davHelper = davHelper;
+        this.m_rootNodeRef = rootNode;
+
+        this.m_strPath = m_davHelper.getRepositoryPath(m_request);
+    }
+
+    private File getRequestBodyAsFile(HttpServletRequest req) throws IOException
+    {
+        if (this.m_requestBody == null)
+        {
+            this.m_requestBody = TempFileProvider.createTempFile("webdav_" + req.getMethod() + "_", ".bin");
+            // copy the streams
+            LimitedStreamCopier streamCopier = new LimitedStreamCopier();
+            long bytes = streamCopier.copyStreamsLong(req.getInputStream(), new FileOutputStream(this.m_requestBody), m_davHelper.getSizeLimit());
+            
+            // get content length
+            long contentLength = -1;
+            try
+            {
+                    contentLength = Long.valueOf(req.getHeader(WebDAV.HEADER_CONTENT_LENGTH));
+            }
+            catch (NumberFormatException e)
+            {
+                    ; // may be null etc.
+            }
+            
+            // ALF-7377: check for corrupt request
+            if (contentLength >= 0 && contentLength != bytes)
+            {
+                throw new IOException("Request body does not have specified Content Length");
+            }
+        }
+        return this.m_requestBody;
+    }
+
+    /**
+     * Override and return <tt>true</tt> if the method is a query method only.  The default implementation
+     * returns <tt>false</tt>.
+     * 
+     * @return          Returns <tt>true</tt> if the method transaction may be read-only
+     */
+    protected boolean isReadOnly()
+    {
+        return false;
+    }
+
+    /**
+     * Return the property find depth
+     * 
+     * @return int
+     */
+    public final int getDepth()
+    {
+        return m_depth;
+    }
+
+    /**
+     * Executes the method, wrapping the call to {@link #executeImpl()} in an appropriate transaction
+     * and handling the error conditions.
+     * @throws WebDAVServerException
+     */
+    public void execute() throws WebDAVServerException
+    {
+        // Parse the HTTP headers
+        parseRequestHeaders();
+
+        // Parse the HTTP body
+        try
+        {
+            parseRequestBody();
+        }
+        catch (WebDAVServerException e)
+        {
+            if (e.getCause() != null && e.getCause() instanceof SAXParseException)
+            {
+                SAXParseException saxParseEx = (SAXParseException) e.getCause();
+                if (logger.isTraceEnabled())
+                {
+                    // Include stack trace.
+                    logger.trace("Malformed request body", saxParseEx);
+                }
+                else if (logger.isDebugEnabled())
+                {
+                    // Log message only.
+                    logger.debug("Malformed request body: " + saxParseEx.getMessage());
+                }
+                
+                try
+                {
+                    m_response.sendError(e.getHttpStatusCode());
+                }
+                catch (IOException ioe)
+                {
+                    if (logger.isDebugEnabled())
+                    {
+                        logger.debug("Unable to send status code", ioe);
+                    }
+                }
+                // Halt processing.
+                return;
+            }
+            else
+            {
+                // Rethrow the exception, as we haven't dealt with it here.
+                throw e;
+            }
+        }
+        
+        m_userAgent = m_request.getHeader(WebDAV.HEADER_USER_AGENT);
+
+        RetryingTransactionCallback<Object> executeImplCallback = new RetryingTransactionCallback<Object>()
+        {
+            public Object execute() throws Exception
+            {
+                // Reset the request input stream / reader state
+                WebDAVMethod.this.m_inputStream = null;
+                WebDAVMethod.this.m_reader = null;
+
+                // cache current session
+                getDAVHelper().getLockService().setCurrentSession(m_request.getSession());
+
+                executeImpl();
+                return null;
+            }
+        };
+        try
+        {
+            boolean isReadOnly = isReadOnly();
+            // Execute the method
+            getTransactionService().getRetryingTransactionHelper().doInTransaction(executeImplCallback, isReadOnly);
+            generateResponseImpl();
+        }
+        catch (AccessDeniedException e)
+        {
+            // Return a forbidden status
+            throw new WebDAVServerException(getStatusForAccessDeniedException());
+        }
+        catch (Throwable e)
+        {
+            if (e instanceof WebDAVServerException)
+            {
+               throw (WebDAVServerException) e;
+            }
+            else if (e.getCause() instanceof WebDAVServerException)
+            {
+                throw (WebDAVServerException) e.getCause();
+            }
+            else
+            {
+                boolean logOnly = false;
+                
+                Throwable t = e;
+                while ((t = t.getCause()) != null)
+                {
+                    if (t instanceof SocketException)
+                    {
+                        logOnly = true;
+                        
+                        // The client aborted the connection - we can't do much about this, except log it.
+                        if (logger.isTraceEnabled() || logger.isDebugEnabled())
+                        {
+                            String message = "Client dropped connection [uri=" + m_request.getRequestURI() + "]";
+
+                            if (logger.isTraceEnabled())
+                            {
+                                // Include a stack trace when trace is enabled.
+                                logger.trace(message, e);
+                            }
+                            else if (logger.isDebugEnabled())
+                            {
+                                // Just a message for debug-level output.
+                                logger.debug(message);
+                            }
+                        }
+                        break;
+                    }
+                }
+                
+                // Convert error to a server error
+                if (!logOnly)
+                {
+                    throw new WebDAVServerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
+                }
+            }
+        }
+        finally
+        {
+			cleanUp();
+        }
+    }
+
+    /**
+     * Clean up resources if about to finish processing the request.
+     */
+    private void cleanUp()
+    {
+        // Remove temporary file if created
+        if (this.m_requestBody != null)
+        {
+            try
+            {
+                this.m_requestBody.delete();
+        		this.m_requestBody = null;
+            }
+            catch (Throwable t)
+            {
+                WebDAVMethod.logger.error("Failed to delete temp file", t);
+            }
+        }
+    }
+        
+    /**
+     * Access the content repository to satisfy the request and generates the appropriate WebDAV 
+     * response.
+     * 
+     * @throws WebDAVServerException a general server exception
+     * @throws Exception any unhandled exception
+     */
+    protected abstract void executeImpl() throws WebDAVServerException, Exception;
+
+    /**
+     * Does nothing unless overridden - for reasons of backwards compatibility. Subclasses
+     * implementing this method should separate the WebDAV method execution logic from
+     * response generation logic. Execution logic should be contained in the {@link #executeImpl} method
+     * and should NOT contain any code that writes to the response. Conversely response generation logic
+     * should NOT contain any code relating to the desired effect of the WebDAV method (e.g. setting properties
+     * on a node) and should be contained purely within this method.
+     * <p>
+     * Older methods, until refactored will not override this method, relying only on {@link #executeImpl()}.
+     */
+    protected void generateResponseImpl() throws Exception
+    {
+    }
+    
+    /**
+     * Parses the given request body represented as an XML document and sets any necessary context
+     * ready for execution.
+     */
+    protected abstract void parseRequestBody() throws WebDAVServerException;
+
+    /**
+     * Parses the HTTP headers of the request and sets any necessary context ready for execution.
+     */
+    protected abstract void parseRequestHeaders() throws WebDAVServerException;
+
+    /**
+     * Retrieves the request body as an XML document
+     * 
+     * @return The body of the request as an XML document or null if there isn't a body
+     */
+    protected Document getRequestBodyAsDocument() throws WebDAVServerException
+    {
+        Document body = null;
+
+        if (m_request.getContentLength() > 0)
+        {
+            // TODO: Do we need to do anything for chunking support?
+
+            try
+            {
+                DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+                factory.setNamespaceAware(true);
+
+                DocumentBuilder builder = factory.newDocumentBuilder();
+                if (m_request.getCharacterEncoding() == null)
+                {
+                    // Let the XML parser work out the encoding if it is not explicitly declared in the HTTP header
+                    body = builder.parse(new InputSource(m_request.getInputStream()));
+                }
+                else
+                {
+                    body = builder.parse(new InputSource(m_request.getReader()));
+                }
+            }
+            catch (ParserConfigurationException e)
+            {
+                throw new WebDAVServerException(HttpServletResponse.SC_BAD_REQUEST, e);
+            }
+            catch (SAXException e)
+            {
+                throw new WebDAVServerException(HttpServletResponse.SC_BAD_REQUEST, e);
+            }
+            catch (IOException e)
+            {
+                throw new WebDAVServerException(HttpServletResponse.SC_BAD_REQUEST, e);
+            }
+        }
+
+        return body;
+    }
+
+    /**
+     * Parses "Depth" request header
+     * 
+     * @throws WebDAVServerException
+     */
+    protected void parseDepthHeader() throws WebDAVServerException
+    {
+        // Store the Depth header as this is used by several WebDAV methods
+
+        String strDepth = m_request.getHeader(WebDAV.HEADER_DEPTH);
+        if (strDepth != null && strDepth.length() > 0)
+        {
+            if (strDepth.equals(WebDAV.ZERO))
+            {
+                m_depth = WebDAV.DEPTH_0;
+            }
+            else if (strDepth.equals(WebDAV.ONE))
+            {
+                m_depth = WebDAV.DEPTH_1;
+            }
+            else
+            {
+                m_depth = WebDAV.DEPTH_INFINITY;
+            }
+        }
+    }
+
+    /**
+     * Parses "If" header of the request.
+     * Stores conditions that should be checked.
+     * Parses both No-tag-list and Tagged-list formats
+     * See "10.4.2 Syntax" paragraph of the WebDAV specification for "If" header format.
+     * 
+     */
+    protected void parseIfHeader() throws WebDAVServerException
+    {
+        //String strLockToken = null;
+
+        String strIf = m_request.getHeader(WebDAV.HEADER_IF);
+
+        if (logger.isDebugEnabled())
+            logger.debug("Parsing If header: " + strIf);
+
+        if (strIf != null && strIf.length() > 0)
+        {
+            if (strIf.startsWith("<"))
+            {
+                m_resourceTag = strIf.substring(1, strIf.indexOf(">"));
+                strIf = strIf.substring(m_resourceTag.length() + 3);
+            }
+
+            m_conditions = new LinkedList<Condition>();
+            String[] parts = strIf.split("\\) \\(");
+            for (int i = 0; i < parts.length; i++)
+            {
+
+                String partString = parts[i].replaceAll("\\(", "").replaceAll("\\)", "");
+                
+                Condition c = new Condition();
+                String[] conditions = partString.split(" ");
+
+                for (int j = 0; j < conditions.length; j++)
+                {
+                    boolean fNot = false;
+                    String eTag = null;
+                    String lockToken = null;
+
+                    if (WebDAV.HEADER_KEY_NOT.equals(conditions[j]))
+                    {
+                        // Check if Not keyword followed by State-token or entity-tag
+                        if (j == (conditions.length - 1))
+                        {
+                            throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
+                        }
+                        fNot = true;
+                        j++;
+                    }
+                
+                    // read State-token
+                    int index = conditions[j].indexOf('<');
+                    if (index != -1)
+                {
+                    try
+                    {
+                            String s = conditions[j].substring(index + 1, conditions[j].indexOf(">"));
+                            if (!s.startsWith(WebDAV.OPAQUE_LOCK_TOKEN))
+                            {
+                               if(!fNot)
+                    {
+                                   throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
+                    }
+                }
+                else
+                {
+                                lockToken = s;
+                                c.addLockTocken(lockToken, fNot);
+                }
+                        }
+                        catch (IndexOutOfBoundsException e)
+                {
+                            throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
+                }
+            }
+
+                    // read entity-tag
+                    index = conditions[j].indexOf("[\"");
+                    if (index != -1)
+            {
+                        // TODO: implement parsing of weak ETags: W/"123..".
+                        int index2 = conditions[j].indexOf("]");
+                        if (index2 == -1)
+                        {
+                            logger.warn("No closing ']': "+conditions[j]);
+                            index2 = conditions[j].length();
+                        }
+                        eTag = conditions[j].substring(index + 1, index2);
+                        c.addETag(eTag, fNot);
+            }
+
+                }
+                m_conditions.add(c);
+            }
+        }
+    }
+
+    /**
+     * Return the WebDAV protocol helper
+     * 
+     * @return WebDAVHelper
+     */
+    protected final WebDAVHelper getDAVHelper()
+    {
+        return m_davHelper;
+    }
+
+    /**
+     * Return the service registry
+     * 
+     * @return ServiceRegistry
+     */
+    protected final ServiceRegistry getServiceRegistry()
+    {
+        return m_davHelper.getServiceRegistry();
+    }
+
+    /**
+     * Convenience method to return the transaction service
+     * 
+     * @return TransactionService
+     */
+    protected final TransactionService getTransactionService()
+    {
+        return m_davHelper.getServiceRegistry().getTransactionService();
+    }
+
+    /**
+     * Convenience method to return the node service
+     * 
+     * @return NodeService
+     */
+    protected final NodeService getNodeService()
+    {
+        return m_davHelper.getNodeService();
+    }
+    
+    /**
+     * Convenience method to return the search service
+     * 
+     * @return SearchService
+     */
+    protected final SearchService getSearchService()
+    {
+        return m_davHelper.getSearchService();
+    }
+
+    /**
+     * Convenience method to return the namespace service
+     * 
+     * @return NamespaceService
+     */
+    protected final NamespaceService getNamespaceService()
+    {
+        return m_davHelper.getNamespaceService();
+    }
+
+    /**
+     * @return Returns the general file/folder manipulation service
+     */
+    protected final FileFolderService getFileFolderService()
+    {
+        return m_davHelper.getFileFolderService();
+    }
+
+    /**
+     * Convenience method to return the content service
+     * 
+     * @return ContentService
+     */
+    protected final ContentService getContentService()
+    {
+        return m_davHelper.getServiceRegistry().getContentService();
+    }
+
+    /**
+     * Convenience method to return the mimetype service
+     * 
+     * @return MimetypeService
+     */
+    protected final MimetypeService getMimetypeService()
+    {
+        return m_davHelper.getMimetypeService();
+    }
+    
+    /**
+     * Retrieve the (WebDAV protocol-level) locking service.
+     * 
+     * @return WebDAVLockService
+     */
+    protected final WebDAVLockService getDAVLockService()
+    {
+        return m_davHelper.getLockService();
+    }
+    
+    /**
+     * Convenience method to return the action service
+     * 
+     * @return ActionService
+     */
+    protected final ActionService getActionService()
+    {
+        return m_davHelper.getActionService();
+    }
+    
+    /**
+     * Convenience method to return the permission service
+     * 
+     * @return PermissionService
+     */
+    protected final PermissionService getPermissionService()
+    {
+        return m_davHelper.getPermissionService();
+    }
+    
+    /**
+     * Convenience method to return the authentication service
+     * 
+     * @return AuthenticationService
+     */
+    protected final AuthenticationService getAuthenticationService()
+    {
+        return m_davHelper.getAuthenticationService();
+    }
+    
+    /**
+     * @return Returns the path of the servlet, e.g. /webdav
+     */
+    protected final String getServletPath()
+    {
+        return m_request.getServletPath();
+    }
+    
+    /**
+     * @return Returns the context path of the servlet, e.g. /alfresco
+     */
+    protected final String getContextPath()
+    {
+        return m_request.getContextPath();
+    }
+    
+    /**
+     * Return the root node
+     * 
+     * @return NodeRef
+     */
+    protected final NodeRef getRootNodeRef()
+    {
+        return m_rootNodeRef;
+    }
+
+    /**
+     * Return the relative path
+     * 
+     * @return String
+     */
+    public String getPath()
+    {
+        return m_strPath;
+    }
+
+    /**
+     * Returns the format required for an XML response. This may vary per method.
+     */
+    protected OutputFormat getXMLOutputFormat()
+    {
+        // Check if debug output or XML pretty printing is enabled
+        return (XMLPrettyPrint || logger.isDebugEnabled()) ? OutputFormat.createPrettyPrint() : OutputFormat.createCompactFormat();
+    }    
+
+    /**
+     * Create an XML writer for the response
+     * 
+     * @return XMLWriter
+     * @exception IOException
+     */
+    protected final XMLWriter createXMLWriter() throws IOException
+    {
+        // Buffer the XML response, in case we have to reset mid-transaction
+        m_xmlWriter = new CharArrayWriter(1024);
+        return new XMLWriter(m_xmlWriter, getXMLOutputFormat());
+    }
+
+    /**
+     * Generates the lock discovery XML response
+     * 
+     * @param xml XMLWriter
+     * @param lockNodeInfo FileInfo
+     * @param lockInfo LockInfo
+     */
+    protected void generateLockDiscoveryXML(XMLWriter xml, FileInfo lockNodeInfo, LockInfo lockInfo) throws Exception
+    {
+        String owner, scope, depth;
+        Date expiry;
+        
+        owner = lockInfo.getOwner();
+        expiry = lockInfo.getExpires();
+	    scope = lockInfo.getScope();
+        depth = lockInfo.getDepth();
+        
+        generateLockDiscoveryXML(xml, lockNodeInfo, false, scope, depth,
+	                WebDAV.makeLockToken(lockNodeInfo.getNodeRef(), owner), owner, expiry);
+	}
+  
+    /**
+     * Generates the lock discovery XML response
+     * 
+     * @param xml XMLWriter
+     * @param lockNodeInfo FileInfo
+     * @param emptyNamespace boolean True if namespace should be empty. Used to avoid bugs in WebDAV clients.
+     * @param scope String lock scope
+     * @param depth String lock depth
+     * @param lToken String locktoken
+     * @param owner String lock owner
+     * @param expiryDate the date/time the lock should expire
+     */
+    protected void generateLockDiscoveryXML(XMLWriter xml, FileInfo lockNodeInfo, boolean emptyNamespace,
+                String scope, String depth, String lToken, String owner, Date expiryDate) throws Exception
+    {
+        Attributes nullAttr= getDAVHelper().getNullAttributes();
+        String ns = emptyNamespace ? "" : WebDAV.DAV_NS;
+        if (lockNodeInfo != null)
+        {
+            // Output the XML response
+            
+            xml.startElement(ns, WebDAV.XML_LOCK_DISCOVERY, emptyNamespace ? WebDAV.XML_LOCK_DISCOVERY : WebDAV.XML_NS_LOCK_DISCOVERY, nullAttr);  
+            xml.startElement(ns, WebDAV.XML_ACTIVE_LOCK, emptyNamespace ? WebDAV.XML_ACTIVE_LOCK : WebDAV.XML_NS_ACTIVE_LOCK, nullAttr);
+             
+            xml.startElement(ns, WebDAV.XML_LOCK_TYPE, emptyNamespace ? WebDAV.XML_LOCK_TYPE : WebDAV.XML_NS_LOCK_TYPE, nullAttr);
+            xml.write(DocumentHelper.createElement(emptyNamespace ? WebDAV.XML_WRITE : WebDAV.XML_NS_WRITE));
+            xml.endElement(ns, WebDAV.XML_LOCK_TYPE, emptyNamespace ? WebDAV.XML_LOCK_TYPE : WebDAV.XML_NS_LOCK_TYPE);
+             
+            xml.startElement(ns, WebDAV.XML_LOCK_SCOPE, emptyNamespace ? WebDAV.XML_LOCK_SCOPE : WebDAV.XML_NS_LOCK_SCOPE, nullAttr);
+            xml.write(DocumentHelper.createElement(emptyNamespace ? scope : WebDAV.DAV_NS_PREFIX + scope));
+            xml.endElement(ns, WebDAV.XML_LOCK_SCOPE, emptyNamespace ? WebDAV.XML_LOCK_SCOPE : WebDAV.XML_NS_LOCK_SCOPE);
+             
+            // NOTE: We only support one level of lock at the moment
+           
+            xml.startElement(ns, WebDAV.XML_DEPTH, emptyNamespace ? WebDAV.XML_DEPTH : WebDAV.XML_NS_DEPTH, nullAttr);
+            xml.write(depth);
+            xml.endElement(ns, WebDAV.XML_DEPTH, emptyNamespace ? WebDAV.XML_DEPTH : WebDAV.XML_NS_DEPTH);
+             
+            xml.startElement(ns, WebDAV.XML_OWNER, emptyNamespace ? WebDAV.XML_OWNER : WebDAV.XML_NS_OWNER, nullAttr);
+            xml.write(owner);
+            xml.endElement(ns, WebDAV.XML_OWNER, emptyNamespace ? WebDAV.XML_OWNER : WebDAV.XML_NS_OWNER);
+             
+            xml.startElement(ns, WebDAV.XML_TIMEOUT, emptyNamespace ? WebDAV.XML_TIMEOUT : WebDAV.XML_NS_TIMEOUT, nullAttr);
+
+            // Output the expiry time
+            
+            String strTimeout = WebDAV.INFINITE;
+            if (expiryDate != null)
+            {
+                  long timeoutRemaining = (expiryDate.getTime() - System.currentTimeMillis())/1000L;
+              
+                  strTimeout = WebDAV.SECOND + timeoutRemaining;
+            }
+            xml.write(strTimeout);
+           
+            xml.endElement(ns, WebDAV.XML_TIMEOUT, emptyNamespace ? WebDAV.XML_TIMEOUT : WebDAV.XML_NS_TIMEOUT);
+             
+            xml.startElement(ns, WebDAV.XML_LOCK_TOKEN, emptyNamespace ? WebDAV.XML_LOCK_TOKEN : WebDAV.XML_NS_LOCK_TOKEN, nullAttr);
+            xml.startElement(ns, WebDAV.XML_HREF, emptyNamespace ? WebDAV.XML_HREF : WebDAV.XML_NS_HREF, nullAttr);
+           
+            xml.write(lToken);
+            
+            xml.endElement(ns, WebDAV.XML_HREF, emptyNamespace ? WebDAV.XML_HREF : WebDAV.XML_NS_HREF);
+            xml.endElement(ns, WebDAV.XML_LOCK_TOKEN, emptyNamespace ? WebDAV.XML_LOCK_TOKEN : WebDAV.XML_NS_LOCK_TOKEN);
+           
+            xml.endElement(ns, WebDAV.XML_ACTIVE_LOCK, emptyNamespace ? WebDAV.XML_ACTIVE_LOCK : WebDAV.XML_NS_ACTIVE_LOCK);
+            xml.endElement(ns, WebDAV.XML_LOCK_DISCOVERY, emptyNamespace ? WebDAV.XML_LOCK_DISCOVERY : WebDAV.XML_NS_LOCK_DISCOVERY);
+        }
+    }
+    
+    /**
+     * Generates a list of namespace declarations for the response
+     */
+    protected String generateNamespaceDeclarations(HashMap<String,String> nameSpaces)
+    {
+        StringBuilder ns = new StringBuilder();
+
+        ns.append(" ");
+        ns.append(WebDAV.XML_NS);
+        ns.append(":");
+        ns.append(WebDAV.DAV_NS);
+        ns.append("=\"");
+        ns.append(WebDAV.DEFAULT_NAMESPACE_URI);
+        ns.append("\"");
+
+        // Add additional namespaces
+        
+        if ( nameSpaces != null)
+        {
+            Iterator<String> namespaceList = nameSpaces.keySet().iterator();
+    
+            while (namespaceList.hasNext())
+            {
+                String strNamespaceUri = namespaceList.next();
+                String strNamespaceName = nameSpaces.get(strNamespaceUri);
+                
+                ns.append(" ").append(WebDAV.XML_NS).append(":").append(strNamespaceName).append("=\"");
+                ns.append(strNamespaceUri == null ? "" : strNamespaceUri).append("\" ");
+            }
+        }
+        
+        return ns.toString();
+    }
+
+    /**
+     * Checks if write operation can be performed on node.
+     * 
+     * @param fileInfo          - node's file info
+     * @param ignoreShared      - if true ignores shared locks
+     * @param lockMethod        - must be true if used from lock method
+     * @return node's lock info
+     * @throws WebDAVServerException if node has shared or exclusive lock
+     *                               or If header preconditions failed
+     */
+    protected LockInfo checkNode(FileInfo fileInfo, boolean ignoreShared, boolean lockMethod) throws WebDAVServerException
+    {
+        LockInfo nodeLockInfo = getNodeLockInfo(fileInfo);
+        NodeRef nodeRef = fileInfo.getNodeRef();
+
+        // Regardless of WebDAV locks, if we can't write to this node, then it's locked!
+        if (getDAVHelper().isLockedAndReadOnly(nodeRef))
+        {
+            throw new WebDAVServerException(WebDAV.WEBDAV_SC_LOCKED);
+        }
+        
+        String nodeETag = getDAVHelper().makeQuotedETag(fileInfo);
+    
+        // Handle the case where there are no conditions and no lock token stored on the node. Node just needs to be writable with no shared locks
+        if (m_conditions == null)
+        {            
+            // ALF-3681 fix. WebDrive 10 client doesn't send If header when locked resource is updated so check the node by lockOwner.
+            if (!nodeLockInfo.isExclusive() || (m_userAgent != null && m_userAgent.equals(WebDAV.AGENT_MICROSOFT_DATA_ACCESS_INTERNET_PUBLISHING_PROVIDER_DAV)))
+            {    
+                if (!ignoreShared && nodeLockInfo.isShared() && !nodeLockInfo.getSharedLockTokens().isEmpty())
+                {
+                    throw new WebDAVServerException(WebDAV.WEBDAV_SC_LOCKED);
+                }
+                return nodeLockInfo;
+            }
+        }
+
+        // Checking of the If tag consists of two checks:
+        // 1. Check the appropriate lock token for the node has been supplied (if the node is locked)
+        // 2. If there are conditions, check at least one condition (corresponding to this node) is satisfied.
+        checkLockToken(nodeLockInfo, ignoreShared, lockMethod);
+        checkConditions(nodeLockInfo.getExclusiveLockToken(), nodeETag);
+        
+        return nodeLockInfo;
+    }
+
+    /**
+     * Checks if write operation can be performed on node.
+     * 
+     * @param fileInfo FileInfo
+     * @return LockInfo
+     * @throws WebDAVServerException if node has shared or exclusive lock
+     *                               or If header preconditions failed
+     */
+    protected LockInfo checkNode(FileInfo fileInfo) throws WebDAVServerException
+    {
+        return checkNode(fileInfo, false, true);
+    }
+
+    /**
+     * Checks if node can be accessed with WebDAV operation
+     * 
+     * @param lockInfo           - node's lock info
+     * @param ignoreShared       - if true - ignores shared lock tokens 
+     * @param lockMethod         - must be true if used from lock method
+     * @throws WebDAVServerException if node has no appropriate lock token
+     */
+    private void checkLockToken(LockInfo lockInfo, boolean ignoreShared, boolean lockMethod) throws WebDAVServerException
+    {
+        String nodeLockToken = lockInfo.getExclusiveLockToken();
+        Set<String> sharedLockTokens = lockInfo.getSharedLockTokens();
+        
+        if (m_conditions != null)
+        {
+            // Request has conditions to check
+            if (lockInfo.isShared())
+            {
+                // Node has shared lock. Check if conditions contains lock token of the node.
+                // If not throw exception
+                if (!sharedLockTokens.isEmpty())
+                {
+                    if (!ignoreShared)
+                    {
+                        for (Condition condition : m_conditions)
+                        {
+                            for (String sharedLockToken : sharedLockTokens)
+                            {
+                                if (condition.getLockTokensMatch().contains(sharedLockToken))
+                                {
+                                    return;
+                                }
+                            }
+                        }
+                        throw new WebDAVServerException(WebDAV.WEBDAV_SC_LOCKED);
+                    }
+                    return;
+                }
+            }
+            else
+            {
+                // This particular node is not locked so it will not be part of the conditions
+                if (nodeLockToken == null)
+                {
+                    return;
+                }
+                // Node has exclusive lock. Check if conditions contains lock token of the node
+                // If not throw exception
+                for (Condition condition : m_conditions)
+                {
+                    if (condition.getLockTokensMatch().contains(nodeLockToken))
+                    {
+                        return;
+                    }
+                }
+                throw new WebDAVServerException(WebDAV.WEBDAV_SC_LOCKED);
+            }
+        }
+        else
+        {
+            // Request has no conditions
+            if (lockInfo.isShared())
+            {
+                // If lock is shared and check was called not from LOCK method return
+                if (!lockMethod)
+                {
+                    return;
+                }
+                // Throw exception - we can't set lock on node with shared lock
+                throw new WebDAVServerException(WebDAV.WEBDAV_SC_LOCKED);
+            }
+        }
+        
+        // MNT-10555
+        if (lockInfo.isExpired())
+        {
+            return;
+        }
+                
+        throw new WebDAVServerException(WebDAV.WEBDAV_SC_LOCKED);
+    }
+
+
+    /**
+     * Checks If header conditions. Throws WebDAVServerException with 412(Precondition failed)
+     * if none of the conditions success.
+     * 
+     * @param nodeLockToken          - node's lock token
+     * @param nodeETag               - node's ETag
+     * @throws WebDAVServerException if conditions fail
+     */
+    private void checkConditions(String nodeLockToken, String nodeETag) throws WebDAVServerException
+    {
+        // Checks If header conditions.
+        // Each condition can contain check of ETag and check of Lock token.
+
+        if (m_conditions == null)
+        {
+            // No conditions were provided with "If" request header, so check successful
+            return;
+        }
+        
+        // Check the list of "If" header's conditions.
+        // If any condition conforms then check is successful
+        for (Condition condition : m_conditions)
+        {
+            // Flag for ETag conditions
+            boolean fMatchETag = true;
+            // Flag for Lock token conditions
+            boolean fMatchLockToken = true;
+
+            // Check ETags that should match
+            if (condition.getETagsMatch() != null)
+            {
+                fMatchETag = condition.getETagsMatch().contains(nodeETag) ? true : false;
+            }
+            // Check ETags that shouldn't match
+            if (condition.getETagsNotMatch() != null)
+            {
+                fMatchETag = condition.getETagsNotMatch().contains(nodeETag) ? false : true;
+            }
+            // Check lock tokens that should match
+            if (condition.getLockTokensMatch() != null)
+            {
+                fMatchLockToken = nodeLockToken == null || condition.getLockTokensMatch().contains(nodeLockToken);
+            }
+            // Check lock tokens that shouldn't match
+            if (condition.getLockTokensNotMatch() != null)
+            {
+                fMatchLockToken = nodeLockToken == null || !condition.getLockTokensNotMatch().contains(nodeLockToken);
+            }
+
+            if (fMatchETag && fMatchLockToken)
+            {
+                // Condition conforms
+                return;
+            }
+        }
+
+        // None of the conditions successful
+        throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
+    }
+    
+    
+    /**
+     * Returns node Lock token in consideration of WebDav lock depth. 
+     * 
+     * @param nodeInfo FileInfo
+     * @return String Lock token
+     */
+    protected LockInfo getNodeLockInfo(final FileInfo nodeInfo)
+    {
+        if (nodeInfo.getNodeRef() == null)
+        {
+            // TODO review - note: can be null in case of Thor root
+            return new LockInfoImpl();
+        }
+        
+        // perf optimisation - effectively run against unprotected nodeService (to bypass repeated permission checks)
+        return AuthenticationUtil.runAs(new RunAsWork<LockInfo>()
+        {
+            public LockInfo doWork() throws Exception
+            {
+                return getNodeLockInfoImpl(nodeInfo);
+            }
+        }, AuthenticationUtil.getSystemUserName());
+    }
+    
+    private LockInfo getNodeLockInfoImpl(final FileInfo nodeInfo)
+    {
+        // Check if node is locked directly.
+        LockInfo lockInfo = getNodeLockInfoDirect(nodeInfo);
+        if (lockInfo != null)
+        {
+            return lockInfo;
+        }
+        
+        // Node isn't locked directly, try to search for an indirect lock.
+
+        // ALF-13472: In accordance with http://www.webdav.org/specs/rfc2518.html#rfc.section.8.10.4 lock of collection causes locking each resource within it.
+        // It should be possible to receive information about direct or indirect lock because it is one of the states of requested resource.
+        return AuthenticationUtil.runAsSystem(new RunAsWork<LockInfo>()
+        {
+            @Override
+            public LockInfo doWork() throws Exception
+            {
+                NodeService nodeService = getNodeService();
+        
+                NodeRef node = nodeInfo.getNodeRef();
+                
+                while (true)
+                {
+                    NodeRef parent = m_childToParent.get(node);
+                    
+                    if ((parent == null) && (! m_childToParent.containsKey(node)))
+                    {
+                        ChildAssociationRef childAssocRef = nodeService.getPrimaryParent(node);
+                        parent = childAssocRef.getParentRef();
+                        
+                        if (! childAssocRef.getTypeQName().equals(ContentModel.ASSOC_CONTAINS))
+                        {
+                            parent = null;
+                        }
+                        
+                        // temporarily cache - for this request
+                        m_childToParent.put(node, parent);
+                    }
+                    
+                    if (parent == null)
+                    {
+                        // Node has no lock and Lock token
+                        return new LockInfoImpl();
+                    }
+                    
+                    LockInfo lockInfo = m_parentLockInfo.get(parent);
+            
+                    if (lockInfo != null)
+                    {
+                        if (lockInfo.isLocked())
+                        {
+                            return lockInfo;
+                        }
+                    }
+                    
+                    if (lockInfo == null)
+                    {
+                        try
+                        {
+                            lockInfo = getNodeLockInfoIndirect(parent);
+                            if (lockInfo != null)
+                            {
+                                return lockInfo;
+                            }
+                        }
+                        finally
+                        {
+                            if (lockInfo == null)
+                            {
+                                lockInfo = new LockInfoImpl();
+                            }
+                            // temporarily cache - for this request
+                            m_parentLockInfo.put(parent, lockInfo);
+                        }
+                    }
+                    
+                    node = parent;
+                } // end while
+            }
+        });
+        
+    }
+    
+    /**
+     * Checks if a node is directly locked. A direct lock is one associated with the node itself
+     * rather than associated with some ancestor.
+     * 
+     * @param nodeInfo FileInfo
+     * @return The LockInfo if the node is <strong>locked</strong>, or null otherwise.
+     */
+    private LockInfo getNodeLockInfoDirect(FileInfo nodeInfo)
+    {
+        LockInfo lock = getDAVLockService().getLockInfo(nodeInfo.getNodeRef());
+        
+        if (lock == null)
+        {
+            return null;
+        }
+        
+        if (lock.isLocked())
+        {
+            return lock;
+        }
+        return null;        
+    }
+    
+    /**
+     * Checks whether a parent node has a lock that is valid for all its descendants.
+     * 
+     * @param parent NodeRef
+     * @return The LockInfo if the node is <strong>locked</strong>, or null otherwise.
+     */
+    private LockInfo getNodeLockInfoIndirect(NodeRef parent)
+    {
+        LockInfo parentLock = getDAVLockService().getLockInfo(parent);
+        
+        if (parentLock == null)
+        {
+            return null;
+        }
+        
+        // In this case node is locked indirectly.
+        if (parentLock.isLocked() && WebDAV.INFINITY.equals(parentLock.getDepth()))
+        {
+            // In this case node is locked indirectly.
+            // Get lock scope
+            // Get shared lock tokens
+
+            // Store lock information to the lockInfo object
+
+            // Get lock token of the locked node - this is indirect lock token.
+
+            return parentLock;
+        }
+        return null;
+
+        // No has no exclusive lock but can be locked with shared lock
+        // Check node lock depth.
+        // If depth is WebDAV.INFINITY then return this node's Lock token.
+        // In this case node is locked indirectly.
+
+        // Get lock scope
+
+        // Node has it's own Lock token.
+    }
+    
+    /**
+     * Get the file info for the given paths
+     * 
+     * @param rootNodeRef the acting webdav root
+     * @param path the path to search for
+     * @return Return the file info for the path
+     * @throws FileNotFoundException if the path doesn't refer to a valid node
+     */
+    protected FileInfo getNodeForPath(NodeRef rootNodeRef, String path) throws FileNotFoundException
+    {
+        return getDAVHelper().getNodeForPath(rootNodeRef, path);
+    }
+
+    /**     * Returns a URL that could be used to access the given path.
+     * 
+     * @param request HttpServletRequest
+     * @param path the path to search for
+     * @param isFolder indicates file or folder is requested
+     * @return URL that could be used to access the given path
+     */
+    protected String getURLForPath(HttpServletRequest request, String path, boolean isFolder)
+    {
+        return getDAVHelper().getURLForPath(request, path, isFolder, m_userAgent);
+    }
+
+    /**
+     * Determines whether the XMLWriter should be flushed when XML is flushed. For some reason this is method specific.
+     * @return <code>true</code> if the XMLWriter should be flushed when XML is flushed
+     */
+    protected boolean shouldFlushXMLWriter()
+    {
+        return true;
+    }
+    
+    /**
+     * Flushes all XML written so far to the response
+     * 
+     * @param writer XMLWriter that should be flushed
+     */
+    protected final void flushXML(XMLWriter writer) throws IOException
+    {
+        if (shouldFlushXMLWriter())
+        {
+            writer.flush();
+        }
+        
+        m_response.getWriter().write(m_xmlWriter.toCharArray());
+        
+        m_xmlWriter.reset();
+    }
+
+    /**
+     * Returns a working copy of node for current user.
+     * 
+     * @param nodeRef node reference
+     * @return Returns the working copy's file information
+     */
+    protected FileInfo getWorkingCopy(NodeRef nodeRef)
+    {
+        FileInfo result = null;
+        NodeRef workingCopy = getServiceRegistry().getCheckOutCheckInService().getWorkingCopy(nodeRef);
+        if (workingCopy != null)
+        {
+            String workingCopyOwner = getNodeService().getProperty(workingCopy, ContentModel.PROP_WORKING_COPY_OWNER).toString();
+            if (workingCopyOwner.equals(getAuthenticationService().getCurrentUserName()))
+            {
+                result = getFileFolderService().getFileInfo(workingCopy);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Determines status code for AccessDeniedException based on client's HTTP headers.
+     * 
+     * @return Returns status code
+     */
+    protected int getStatusForAccessDeniedException()
+    {
+        if (m_request != null && m_request.getHeader(WebDAV.HEADER_USER_AGENT) != null)
+        {
+            String userAgent = m_request.getHeader(WebDAV.HEADER_USER_AGENT);
+
+            for (Entry<String, Integer> entry : accessDeniedStatusCodes.entrySet())
+            {
+                if (Pattern.compile(entry.getKey()).matcher(userAgent).find())
+                {
+                    return entry.getValue();
+                }
+            }
+        }
+        return HttpServletResponse.SC_UNAUTHORIZED;
+    }
+
+    /**
+     * Class used for storing conditions which comes with "If" header of the request
+     * 
+     * @author ivanry
+     */
+    protected class Condition
+    {
+        // These tokens will be checked on equivalence against node's lock token
+        private LinkedList<String> lockTokensMatch = new LinkedList<String>();
+
+        // These tokens will be checked on non-equivalence against node's lock token
+        private LinkedList<String> lockTokensNotMatch = new LinkedList<String>();
+
+        // These ETags will be checked on equivalence against node's ETags
+        private LinkedList<String> eTagsMatch;
+
+        // These ETags will be checked on non-equivalence against node's ETags
+        private LinkedList<String> eTagsNotMatch;
+        
+        /**
+         * Default constructor
+         * 
+         */
+        public Condition()
+        {
+        }
+        
+        /**
+         * Returns the list of lock tokens that should be checked against node's lock token on equivalence.
+         * 
+         * @return lock tokens
+         */
+        public LinkedList<String> getLockTokensMatch()
+        {
+            return this.lockTokensMatch;
+        }
+
+        /**
+         * Returns the list of lock tokens that should be checked against node's lock token on non-equivalence.
+         * 
+         * @return lock tokens
+         */
+        public LinkedList<String> getLockTokensNotMatch()
+        {
+            return this.lockTokensNotMatch;
+        }
+
+        /**
+         * Returns the list of ETags that should be checked against node's ETag on equivalence.
+         * 
+         * @return ETags list
+         */
+        public LinkedList<String> getETagsMatch()
+        {
+            return this.eTagsMatch;
+        }
+
+        /**
+         * Returns the list of ETags that should be checked against node's ETag on non-equivalence.
+         * 
+         * @return ETags list
+         */
+        public LinkedList<String> getETagsNotMatch()
+        {
+            return this.eTagsNotMatch;
+        }
+
+        /**
+         * Adds lock token to check
+         * 
+         * @param lockToken String
+         * @param notMatch true is lock token should be added to the list matched tokens. 
+         *                 false if should be added to the list of non-matches. 
+         */
+        public void addLockTocken(String lockToken, boolean notMatch)
+        {
+            if (notMatch)
+            {
+                this.lockTokensNotMatch.add(lockToken);
+            }
+            else
+            {
+                this.lockTokensMatch.add(lockToken);
+            }
+        }
+
+        /**
+         * Add ETag to check
+         * 
+         * @param eTag String
+         * @param notMatch true is ETag should be added to the list matched ETags. 
+         *                 false if should be added to the list of non-matches.
+         */
+        public void addETag(String eTag, boolean notMatch)
+        {
+            if (notMatch)
+            {
+                if (eTagsNotMatch == null)
+                {
+                    eTagsNotMatch = new LinkedList<String>();
+                }
+                this.eTagsNotMatch.add(eTag);
+            }
+            else
+            {
+                if (eTagsMatch == null)
+                {
+                    eTagsMatch = new LinkedList<String>();
+                }
+                this.eTagsMatch.add(eTag);
+            }
+        }
+    }
+
+    public String toString()
+    {
+       StringBuffer sb = new StringBuffer();
+       
+       if(m_request != null)
+       {
+          sb.append("WebDAV ");
+          sb.append(m_request.getMethod());
+          sb.append(" request for ");
+          sb.append(m_strPath);
+       }
+       else
+       {
+          sb.append("Inactive WebDAV request via ");
+          String clz = getClass().getName();
+          sb.append(clz.substring(clz.lastIndexOf('.')+1));
+       }
+       
+       return sb.toString();
+    }    
+    
+
+    /**
+     * Get the site ID (short-name) that the current request relates to. The site ID
+     * will be {@code DEFAULT_SITE_ID} if not specifically set.
+     * 
+     * @return The site ID
+     */
+    protected String getSiteId()
+    {
+        if (siteId == null)
+        {
+            siteId = getDAVHelper().determineSiteId(this);
+        }
+        return siteId;
+    }
+
+    /**
+     * Get the tenant domain for the current user and request. The tenant domain
+     * will be {@link TenantService#DEFAULT_DOMAIN} if not specifically set.
+     * 
+     * @return The tenant domain.
+     */
+    protected String getTenantDomain()
+    {
+        if (tenantDomain == null)
+        {
+            tenantDomain = getDAVHelper().determineTenantDomain(this);
+        }
+        return tenantDomain;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVProperty.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVProperty.java
new file mode 100644
index 00000000000..e53ec15aae6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVProperty.java
@@ -0,0 +1,193 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Class to represent a WebDAV property
+ * 
+ * @author gavinc
+ */
+public class WebDAVProperty
+{
+   private String m_strName = null;
+   private String m_strNamespaceUri = WebDAV.DEFAULT_NAMESPACE_URI;
+   private String m_strNamespaceName = null;
+   private String m_strValue = null;
+   
+   /**
+    * Constructs a WebDAVProperty
+    * 
+    * @param strName String
+    * @param strNamespaceUri String
+    * @param strNamespaceName String
+    * @param strValue String
+    */
+   public WebDAVProperty(String strName, String strNamespaceUri, String strNamespaceName, String strValue)
+   {
+      this(strName, strNamespaceUri, strNamespaceName);
+      m_strValue = strValue;
+   }
+   
+   /**
+    * Constructs a WebDAVProperty
+    * 
+    * @param strName String
+    * @param strNamespaceUri String
+    * @param strNamespaceName String
+    */
+   public WebDAVProperty(String strName, String strNamespaceUri, String strNamespaceName)
+   {
+      this(strName);
+      
+      m_strNamespaceUri = strNamespaceUri;
+      m_strNamespaceName = strNamespaceName;
+   }
+   
+   /**
+    * Constructs a WebDAVProperty with the default namespace details
+    * 
+    * @param strName String
+    */
+   public WebDAVProperty(String strName)
+   {
+      m_strName = strName;
+   }
+   
+   /**
+    * Returns the name of the property
+    * 
+    * @return The name of the property
+    */
+   public String getName()
+   {
+      return m_strName;
+   }
+   
+   /**
+    * Returns the namespace URI for this property
+    * 
+    * @return The namespace URI for this property
+    */
+   public String getNamespaceUri()
+   {
+      return m_strNamespaceUri;
+   }
+   
+   /**
+    * Determine if the property has a namespace
+    * 
+    * @return boolean
+    */
+   public final boolean hasNamespaceName()
+   {
+       return m_strNamespaceName != null ? true : false;
+   }
+   
+   /**
+    * Returns the namespace name for this property
+    * 
+    * @return The namespace name for this property
+    */
+   public String getNamespaceName()
+   {
+      return m_strNamespaceName;
+   }
+   
+   /**
+    * Returns the value of this property
+    * 
+    * @return The value of this property
+    */
+   public String getValue()
+   {
+      return m_strValue;
+   }
+   
+   /**
+    * Sets the property's value
+    * 
+    * @param strValue The new value
+    */
+   public void setValue(String strValue)
+   {
+      m_strValue = strValue;
+   }
+   
+   
+   /**
+    * Creates QName of the property
+    * 
+    * @return QName
+    */
+   public QName createQName()
+   {
+       return QName.createQName(m_strNamespaceUri, m_strName);
+   }
+   
+   /**
+    * Returns true if property is protected according to the WebDav specification
+    * 
+    * @return boolean
+    */
+   public boolean isProtected()
+   {
+       return WebDAV.XML_GET_CONTENT_LENGTH.equals(m_strName) ||
+               WebDAV.XML_GET_ETAG.equals(m_strName) ||
+               WebDAV.XML_GET_LAST_MODIFIED.equals(m_strName) ||
+               WebDAV.XML_LOCK_DISCOVERY.equals(m_strName) ||
+               WebDAV.XML_RESOURCE_TYPE.equals(m_strName) ||
+               WebDAV.XML_SUPPORTED_LOCK.equals(m_strName);
+   }
+   
+   
+   /**
+    * Return the property as a string
+    * 
+    * @return String
+    */
+   public String toString()
+   {
+       StringBuilder str = new StringBuilder();
+       
+       str.append("[");
+       
+       str.append(getName());
+       str.append("=");
+       str.append(getValue());
+       str.append(",URI=");
+       str.append(getNamespaceUri());
+       
+       if ( hasNamespaceName())
+       {
+           str.append(",");
+           str.append(getNamespaceName());
+       }
+       
+       return str.toString();
+   }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVServerException.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVServerException.java
new file mode 100644
index 00000000000..b822d7551ba
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVServerException.java
@@ -0,0 +1,100 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Exception class that represents an error in the WebDAV protocol layer
+ * 
+ * @author gavinc
+ */
+public class WebDAVServerException extends Exception
+{
+    private static final long serialVersionUID = -2949418282738082368L;
+
+    private int m_httpStatusCode = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+    private Throwable m_cause = null;
+
+    /**
+     * Constructs a WebDAVException
+     * 
+     * @param httpStatusCode The HTTP status code
+     */
+    public WebDAVServerException(int httpStatusCode)
+    {
+        this(httpStatusCode, null);
+    }
+
+    /**
+     * Constructs a WebDAVException
+     * 
+     * @param httpStatusCode The HTTP status code
+     * @param cause The cause of this exception
+     */
+    public WebDAVServerException(int httpStatusCode, Throwable cause)
+    {
+        super(Integer.toString(httpStatusCode));
+
+        m_httpStatusCode = httpStatusCode;
+        m_cause = cause;
+    }
+
+    /**
+     * Returns the HTTP status code
+     * 
+     * @return The HTTP status code
+     */
+    public int getHttpStatusCode()
+    {
+        return m_httpStatusCode;
+    }
+
+    /**
+     * Returns the cause of this exception
+     * 
+     * @return The cause of this exception
+     */
+    public Throwable getCause()
+    {
+        return m_cause;
+    }
+
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString()
+    {
+        String strErrorMsg = "HTTP Status Code: " + m_httpStatusCode;
+
+        if (m_cause != null)
+        {
+            strErrorMsg = strErrorMsg + " caused by: " + m_cause.toString();
+        }
+
+        return strErrorMsg;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVServlet.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVServlet.java
new file mode 100644
index 00000000000..f586edf5e32
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVServlet.java
@@ -0,0 +1,487 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.List;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.UnavailableException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.repo.cache.SimpleCache;
+import org.alfresco.repo.security.authentication.AuthenticationContext;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.activities.ActivityPoster;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.FileFilterMode;
+import org.alfresco.util.FileFilterMode.Client;
+import org.alfresco.util.PropertyCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * Servlet that accepts WebDAV requests for the hub. The request is served by the hub's content
+ * repository framework and the response sent back using the WebDAV protocol.
+ * 
+ * @author gavinc
+ */
+public class WebDAVServlet extends HttpServlet
+{
+    private static final long serialVersionUID = 6900069445027527165L;
+
+    // Logging
+    private static Log logger = LogFactory.getLog("org.alfresco.webdav.protocol");
+    
+    // Constants
+    public static final String WEBDAV_PREFIX = "webdav"; 
+    //private static final String INTERNAL_SERVER_ERROR = "Internal Server Error: ";
+    
+    // Init parameter names
+    private static final String BEAN_INIT_PARAMS = "webdav.initParams";
+    
+    // Service registry, used by methods to find services to process requests
+    private ServiceRegistry serviceRegistry;
+    
+    private TransactionService transactionService;
+    private static TenantService tenantService;
+    private static NodeService nodeService;
+    private static SearchService searchService;
+    private static NamespaceService namespaceService;
+    
+    // WebDAV method handlers
+    protected Hashtable<String,Class<? extends WebDAVMethod>> m_davMethods;
+    
+    // note: cache is tenant-aware (if using TransctionalCache impl)
+    
+    private static SimpleCache<String, NodeRef> singletonCache; // eg. for webdavRootNodeRef
+    private static final String KEY_WEBDAV_ROOT_NODEREF = "key.webdavRoot.noderef";
+    
+    private static String rootPath;
+    
+    private static NodeRef defaultRootNode; // for default domain
+    
+    // WebDAV helper class
+    private WebDAVHelper m_davHelper;
+    private WebDAVActivityPoster activityPoster;
+
+    private WebDAVInitParameters initParams;
+
+    /**
+     * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest,
+     *      javax.servlet.http.HttpServletResponse)
+     */
+    protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException,
+            IOException
+    {
+        if (!initParams.getEnabled())
+        {
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+            return;
+        }
+
+        long startTime = 0;
+        if (logger.isTraceEnabled())
+        {
+            startTime = System.currentTimeMillis();
+        }
+
+        FileFilterMode.setClient(Client.webdav);
+
+        try
+        {
+            // Create the appropriate WebDAV method for the request and execute it
+            final WebDAVMethod method = createMethod(request, response);
+
+            if (method == null)
+            {
+                if ( logger.isErrorEnabled())
+                    logger.error("WebDAV method not implemented - " + request.getMethod());
+                
+                // Return an error status
+                
+                response.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED);
+                return;
+            }
+            else if (method.getRootNodeRef() == null)
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("No root node for request [" +
+                                 request.getMethod() + " " + request.getRequestURI() + "]");
+                }
+                
+                // Return an error status
+                response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+                return;
+            }
+
+            // Execute the WebDAV request, which must take care of its own transaction
+            method.execute();
+        }
+        catch (Throwable e)
+        {
+            ExceptionHandler exHandler = new ExceptionHandler(e, request, response);
+            exHandler.handle();
+        }
+        finally
+        {
+            if (logger.isTraceEnabled())
+            {
+                logger.trace(request.getMethod() + " took " + (System.currentTimeMillis()-startTime) + "ms to execute ["+request.getRequestURI()+"]");
+            }
+
+            FileFilterMode.clearClient();
+        }
+    }
+
+    /**
+     * Create a WebDAV method handler
+     * 
+     * @param request HttpServletRequest
+     * @param response HttpServletResponse
+     * @return WebDAVMethod
+     */
+    protected WebDAVMethod createMethod(HttpServletRequest request, HttpServletResponse response)
+    {
+        // Get the type of the current request
+        
+        String strHttpMethod = request.getMethod();
+
+        if (logger.isDebugEnabled())
+            logger.debug("WebDAV request " + strHttpMethod + " on path "
+                    + request.getRequestURI());
+
+        Class<? extends WebDAVMethod> methodClass = m_davMethods.get(strHttpMethod);
+        WebDAVMethod method = null;
+
+        if (methodClass != null)
+        {
+            try
+            {
+                // Create the handler method    
+                method = methodClass.newInstance();
+                method.setDetails(request, response, m_davHelper, getRootNodeRef());
+                
+                // A very few WebDAV methods produce activity posts.
+                if (method instanceof ActivityPostProducer)
+                {
+                    ActivityPostProducer activityPostProducer = (ActivityPostProducer) method;
+                    activityPostProducer.setActivityPoster(activityPoster);
+                }
+            }
+            catch (Exception ex)
+            {
+                // Debug
+                
+                if ( logger.isDebugEnabled())
+                    logger.debug(ex);
+            }
+        }
+
+        // Return the WebDAV method handler, or null if not supported
+        
+        return method;
+    }
+    
+    private static NodeRef getRootNodeRef()
+    {
+        NodeRef rootNodeRef = singletonCache.get(KEY_WEBDAV_ROOT_NODEREF);
+        
+        if (rootNodeRef == null)
+        {
+            rootNodeRef = tenantService.getRootNode(nodeService, searchService, namespaceService, rootPath, defaultRootNode);
+            singletonCache.put(KEY_WEBDAV_ROOT_NODEREF, rootNodeRef);
+        }
+        
+        return rootNodeRef;
+    }
+
+    /**
+     * Initialize the servlet
+     * 
+     * @param config ServletConfig
+     * @exception ServletException
+     */
+    @SuppressWarnings("unchecked")
+    public void init(ServletConfig config) throws ServletException
+    {
+        super.init(config);
+
+        // Get service registry        
+        WebApplicationContext context = WebApplicationContextUtils.getWebApplicationContext(getServletContext());
+        
+        // If no context has been initialised, exit silently so config changes can be made
+        if (context == null)
+        {
+            return;
+        }
+        
+        // Get global configuration properties
+        WebApplicationContext wc = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext());
+        initParams = (WebDAVInitParameters) wc.getBean(BEAN_INIT_PARAMS);
+        
+        // Render this servlet permanently unavailable if its enablement property is not set
+        if (!initParams.getEnabled())
+        {
+            logger.info("Marking servlet WebDAV as unavailable!");
+            return;
+        }
+        
+        // Get root paths
+        
+        String storeValue = initParams.getStoreName();
+        
+        rootPath = initParams.getRootPath();
+        
+        // Get beans
+        
+        serviceRegistry = (ServiceRegistry)context.getBean(ServiceRegistry.SERVICE_REGISTRY);
+        
+        transactionService = serviceRegistry.getTransactionService();
+        tenantService = (TenantService) context.getBean("tenantService");
+        
+        nodeService = (NodeService) context.getBean("NodeService");
+        searchService = (SearchService) context.getBean("SearchService");
+        namespaceService = (NamespaceService) context.getBean("NamespaceService");
+        ActivityPoster poster = (ActivityPoster) context.getBean("activitiesPoster");
+        singletonCache = (SimpleCache<String, NodeRef>)context.getBean("immutableSingletonCache");
+        
+        
+        
+        // Collaborator used by WebDAV methods to create activity posts.
+        activityPoster = new ActivityPosterImpl("WebDAV", poster);
+        
+        // Create the WebDAV helper
+        m_davHelper = (WebDAVHelper) context.getBean("webDAVHelper");
+        
+        // Initialize the root node
+        initializeRootNode(storeValue, rootPath, context, nodeService, searchService, namespaceService, tenantService, transactionService);
+        
+        // Create the WebDAV methods table
+        
+        m_davMethods = new Hashtable<String, Class<? extends WebDAVMethod>>();
+        
+        m_davMethods.put(WebDAV.METHOD_PROPFIND, PropFindMethod.class);
+        m_davMethods.put(WebDAV.METHOD_PROPPATCH, PropPatchMethod.class);
+        m_davMethods.put(WebDAV.METHOD_COPY, CopyMethod.class);
+        m_davMethods.put(WebDAV.METHOD_DELETE, DeleteMethod.class);
+        m_davMethods.put(WebDAV.METHOD_GET, GetMethod.class);
+        m_davMethods.put(WebDAV.METHOD_HEAD, HeadMethod.class);
+        m_davMethods.put(WebDAV.METHOD_LOCK, LockMethod.class);
+        m_davMethods.put(WebDAV.METHOD_MKCOL, MkcolMethod.class);
+        m_davMethods.put(WebDAV.METHOD_MOVE, MoveMethod.class);
+        m_davMethods.put(WebDAV.METHOD_OPTIONS, OptionsMethod.class);
+        m_davMethods.put(WebDAV.METHOD_POST, PostMethod.class);
+        m_davMethods.put(WebDAV.METHOD_PUT, PutMethod.class);
+        m_davMethods.put(WebDAV.METHOD_UNLOCK, UnlockMethod.class);
+    }
+
+    protected WebDAVHelper getDAVHelper()
+    {
+        return m_davHelper;
+    }
+    
+    
+    /**
+     * @param storeValue String
+     * @param rootPath String
+     * @param context WebApplicationContext
+     * @param nodeService NodeService
+     * @param searchService SearchService
+     * @param namespaceService NamespaceService
+     * @param tenantService TenantService
+     * @param m_transactionService TransactionService
+     */
+    private void initializeRootNode(String storeValue, String rootPath, WebApplicationContext context, NodeService nodeService, SearchService searchService,
+            NamespaceService namespaceService, TenantService tenantService, TransactionService m_transactionService)
+    {
+
+        // Use the system user as the authenticated context for the filesystem initialization
+
+        AuthenticationContext authComponent = (AuthenticationContext) context.getBean("authenticationContext");
+        authComponent.setSystemUserAsCurrentUser();
+
+        // Wrap the initialization in a transaction
+
+        UserTransaction tx = m_transactionService.getUserTransaction(true);
+
+        try
+        {
+            // Start the transaction
+
+            if (tx != null)
+                tx.begin();
+            
+            StoreRef storeRef = new StoreRef(storeValue);
+            
+            if (nodeService.exists(storeRef) == false)
+            {
+                throw new RuntimeException("No store for path: " + storeRef);
+            }
+            
+            NodeRef storeRootNodeRef = nodeService.getRootNode(storeRef);
+            
+            List<NodeRef> nodeRefs = searchService.selectNodes(storeRootNodeRef, rootPath, null, namespaceService, false);
+            
+            if (nodeRefs.size() > 1)
+            {
+                throw new RuntimeException("Multiple possible children for : \n" + "   path: " + rootPath + "\n" + "   results: " + nodeRefs);
+            }
+            else if (nodeRefs.size() == 0)
+            {
+                throw new RuntimeException("Node is not found for : \n" + "   root path: " + rootPath);
+            }
+            
+            defaultRootNode = nodeRefs.get(0);
+            
+            // Commit the transaction
+            if (tx != null)
+            	tx.commit();
+        }
+        catch (Exception ex)
+        {
+            logger.error(ex);
+        }
+        finally
+        {
+            // Clear the current system user
+
+            authComponent.clearCurrentSecurityContext();
+        }
+    }
+    
+    /**
+     * 
+     * @return root node for WebDAV
+     */
+    public static NodeRef getWebdavRootNode()
+    {
+        return getRootNodeRef();
+    }
+    
+    /**
+     * Bean to hold injected initialization parameters.
+     * 
+     * @author Derek Hulley
+     * @since V3.5 Team
+     */
+    public static class WebDAVInitParameters
+    {
+        private boolean enabled = false;
+        private String storeName;
+        private String rootPath;
+        private String urlPathPrefix;
+        
+        public boolean getEnabled()
+        {
+            return enabled;
+        }
+        public void setEnabled(boolean enabled)
+        {
+            this.enabled = enabled;
+        }
+        /**
+         * @return              Returns the name of the store
+         * @throws ServletException if the store name was not set
+         */
+        public String getStoreName() throws ServletException
+        {
+            if (!PropertyCheck.isValidPropertyString(storeName))
+            {
+                throw new ServletException("WebDAV missing 'storeName' value.");
+            }
+            return storeName;
+        }
+        public void setStoreName(String storeName)
+        {
+            this.storeName = storeName;
+        }
+        /**
+         * @return              Returns the WebDAV root path within the store
+         * @throws ServletException if the root path was not set
+         */
+        public String getRootPath() throws ServletException
+        {
+            if (!PropertyCheck.isValidPropertyString(rootPath))
+            {
+                throw new ServletException("WebDAV missing 'rootPath' value.");
+            }
+            return rootPath;
+        }
+        public void setRootPath(String rootPath)
+        {
+            this.rootPath = rootPath;
+        }
+        
+        /**
+         * Get the path prefix that generated URLs should exhibit, e.g.
+         * <pre>
+         *   http://server.name&lt;prefix&gt;/path/to/file.txt
+         * </pre>
+         * In the default set up this would be of the form /context-path/servlet-name e.g. /alfresco/webdav:
+         * <pre>
+         *   http://server.name/alfresco/webdav/path/to/file.txt
+         * </pre>
+         * however if using URL rewriting rules or a reverse proxy in front of the webdav server
+         * you may choose to use, for example / for shorter URLs.
+         * <pre>
+         *   http://server.name/path/to/file.txt
+         * </pre>
+         * <p>
+         * Leaving this property blank will cause the prefix used to be /context-path/servlet-name
+         * 
+         * @return the urlPathPrefix
+         */
+        public String getUrlPathPrefix()
+        {
+            return urlPathPrefix;
+        }
+        
+        /**
+         * See {@link #getUrlPathPrefix()}
+         * 
+         * @param urlPathPrefix String
+         */
+        public void setUrlPathPrefix(String urlPathPrefix)
+        {
+            this.urlPathPrefix = urlPathPrefix;
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVSessionListener.java b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVSessionListener.java
new file mode 100644
index 00000000000..5c9c77c2088
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVSessionListener.java
@@ -0,0 +1,95 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.webdav;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * <p>WebDAVSessionListener is used to forcibly unlock documents that were 
+ * persistently locked during user's session and were not unlocked because of some extraordinary
+ * situations such as network connection lost. Was introduced in ALF-11777 jira issue.
+ * </p>
+ * 
+ * @author Pavel.Yurkevich
+ * 
+ */
+public class WebDAVSessionListener implements HttpSessionListener, ServletContextListener
+{
+    private static Log logger = LogFactory.getLog(WebDAVSessionListener.class);
+    private WebDAVLockService webDAVLockService;
+
+    /**
+     * @param webDAVLockService
+     *            the webDAVLockService to set
+     */
+    public void setWebDAVLockService(WebDAVLockService webDAVLockService)
+    {
+        this.webDAVLockService = webDAVLockService;
+    }
+
+    @Override
+    public void sessionCreated(HttpSessionEvent hse)
+    {
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Session created " + hse.getSession().getId());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void sessionDestroyed(HttpSessionEvent hse)
+    {
+        webDAVLockService.setCurrentSession(hse.getSession());
+        webDAVLockService.sessionDestroyed();
+
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Session destroyed " + hse.getSession().getId());
+        }
+    }
+
+    @Override
+    public void contextDestroyed(ServletContextEvent sce)
+    {
+    }
+
+    @Override
+    public void contextInitialized(ServletContextEvent sce)
+    {
+        ApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(sce.getServletContext());
+        this.webDAVLockService = (WebDAVLockService)context.getBean(WebDAVLockService.BEAN_NAME);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/AuthenticationDriver.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/AuthenticationDriver.java
new file mode 100644
index 00000000000..829f4914fdd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/AuthenticationDriver.java
@@ -0,0 +1,75 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav.auth;
+
+import java.io.IOException;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * A general interface for servlet-based authentication. Allows code to be shared by Web Client, WebDAV and Sharepoint
+ * authentication classes.
+ * 
+ * @author dward
+ */
+public interface AuthenticationDriver
+{
+    public static final String AUTHENTICATION_USER = "_alfAuthTicket";
+    
+    /**
+     * Authenticate user based on information in http request such as Authorization header or cached session
+     * information.
+     * 
+     * @param context
+     *            the context
+     * @param request
+     *            http request
+     * @param response
+     *            http response
+     * @return <code>true</code> if authentication was successful
+     * @throws IOException
+     * @throws ServletException
+     */
+    public boolean authenticateRequest(ServletContext context, HttpServletRequest request, HttpServletResponse response)
+            throws IOException, ServletException;
+
+    /**
+     * Send a status 401 response that will restart the log in handshake.
+     * 
+     * @param context
+     *            the context
+     * @param request
+     *            http request
+     * @param response
+     *            http response
+     * @throws IOException
+     */
+    public void restartLoginChallenge(ServletContext context, HttpServletRequest request, HttpServletResponse response)
+            throws IOException;
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java
new file mode 100644
index 00000000000..f1785b95048
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java
@@ -0,0 +1,331 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.webdav.auth;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.SessionUser;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.Authorization;
+import org.alfresco.repo.web.auth.BasicAuthCredentials;
+import org.alfresco.repo.web.auth.TicketCredentials;
+import org.alfresco.repo.web.filter.beans.DependencyInjectedFilter;
+import org.alfresco.repo.webdav.WebDAV;
+import org.alfresco.service.cmr.security.NoSuchPersonException;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * WebDAV Authentication Filter Class
+ * 
+ * @author GKSpencer
+ */
+public class AuthenticationFilter extends BaseAuthenticationFilter implements DependencyInjectedFilter
+{
+    // Debug logging
+    
+    private static Log logger = LogFactory.getLog(AuthenticationFilter.class);
+    
+    // Authenticated user session object name
+
+    private static final String PPT_EXTN = ".ppt";
+    
+    /** The password encodings to try in priority order **/
+    private static final String[] ENCODINGS;
+    
+    static
+    {
+        String[] encodings = new String[] {
+                "UTF-8", 
+                System.getProperty("file.encoding"),
+                "ISO-8859-1"
+            };
+        
+        Set<String> encodingsSet = new LinkedHashSet<String>();
+        for (String encoding : encodings)
+        {
+            encodingsSet.add(encoding);
+        }
+        ENCODINGS = new String[encodingsSet.size()];
+        encodingsSet.toArray(ENCODINGS);
+    }
+    
+    // Various services required by NTLM authenticator
+    
+    /**
+     * Run the authentication filter
+     * 
+     * @param context ServletContext
+     * @param req ServletRequest
+     * @param resp ServletResponse
+     * @param chain FilterChain
+     * @exception ServletException
+     * @exception IOException
+     */
+    @Override
+    public void doFilter(ServletContext context, ServletRequest req, ServletResponse resp, FilterChain chain)
+            throws IOException, ServletException
+    {
+        try
+        {
+            doFilterInternal(context, req, resp, chain);
+        }
+        finally
+        {
+            if (logger.isTraceEnabled())
+            {
+                logger.debug("About to clear the security context");
+            }
+            AuthenticationUtil.clearCurrentSecurityContext();
+        }
+    }
+    protected void doFilterInternal(ServletContext context, ServletRequest req, ServletResponse resp, FilterChain chain)
+        throws IOException, ServletException
+    {
+        if (logger.isTraceEnabled())
+        {
+            logger.trace("Entering AuthenticationFilter.");
+        }
+        
+        // Assume it's an HTTP request
+
+        HttpServletRequest httpReq = (HttpServletRequest) req;
+        HttpServletResponse httpResp = (HttpServletResponse) resp;
+
+        // Get the user details object from the session
+        SessionUser user = getSessionUser(context, httpReq, httpResp, false);
+
+        if (user == null)
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("There is no user in the session.");
+            }
+            // Get the authorization header
+            
+            String authHdr = httpReq.getHeader("Authorization");
+            
+            if ( authHdr != null && authHdr.length() > 5 && authHdr.substring(0,5).equalsIgnoreCase("BASIC"))
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Basic authentication details present in the header.");
+                }
+                byte[] encodedString = Base64.decodeBase64(authHdr.substring(5).getBytes());
+                
+                // ALF-13621: Due to browser inconsistencies we have to try a fallback path of encodings
+                Set<String> attemptedAuths = new HashSet<String>(ENCODINGS.length * 2);
+                for (String encoding : ENCODINGS)
+                {
+                    CharsetDecoder decoder = Charset.forName(encoding).newDecoder()
+                            .onMalformedInput(CodingErrorAction.REPORT);
+                    try
+                    {
+                        // Attempt to decode using this charset 
+                        String basicAuth = decoder.decode(ByteBuffer.wrap(encodedString)).toString();
+                        
+                        // It decoded OK but we may already have tried this string.
+                        if (!attemptedAuths.add(basicAuth))
+                        {
+                            // Already tried - no need to try again
+                            continue;
+                        }
+                        
+                        String username = null;
+                        String password = null;
+    
+                        // Split the username and password
+                        int pos = basicAuth.indexOf(":");
+                        if (pos != -1)
+                        {
+                            username = basicAuth.substring(0, pos);
+                            password = basicAuth.substring(pos + 1);
+                        }
+                        else
+                        {
+                            username = basicAuth;
+                            password = "";
+                        }
+    
+                        // Go to the repo and authenticate
+                        Authorization auth = new Authorization(username, password);
+                        if (auth.isTicket())
+                        {
+                            authenticationService.validate(auth.getTicket());
+                        }
+                        else
+                        {
+                            authenticationService.authenticate(username, password.toCharArray());
+                            if(authenticationListener != null)
+                            {
+                                authenticationListener.userAuthenticated(new BasicAuthCredentials(username, password));
+                            }
+                        }
+                        
+                        user = createUserEnvironment(httpReq.getSession(), authenticationService.getCurrentUserName(), authenticationService.getCurrentTicket(), false);
+                        if (logger.isTraceEnabled())
+                        {
+                            logger.trace("Successfully created user environment, login using basic auth or ROLE_TICKET for user: " +
+                                AuthenticationUtil.maskUsername(user.getUserName()));
+                        }
+                        // Success so break out
+                        break;
+                    }
+                    catch (CharacterCodingException e)
+                    {
+                        if (logger.isDebugEnabled())
+                        {
+                            logger.debug("Didn't decode using " + decoder.getClass().getName(), e);
+                        }
+                    }
+                    catch (AuthenticationException ex)
+                    {
+                        if (logger.isDebugEnabled())
+                        {
+                            logger.debug("Authentication error ", ex);
+                        }
+                    }
+                    catch (NoSuchPersonException e)
+                    {
+                        if (logger.isDebugEnabled())
+                        {
+                            logger.debug("There is no such person error ", e);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // Check if the request includes an authentication ticket
+
+                String ticket = req.getParameter(ARG_TICKET);
+
+                if (ticket != null && ticket.length() > 0)
+                {
+                    // PowerPoint bug fix
+                    if (ticket.endsWith(PPT_EXTN))
+                    {
+                        ticket = ticket.substring(0, ticket.length() - PPT_EXTN.length());
+                    }
+
+                    if (logger.isTraceEnabled())
+                    {
+                        logger.trace("Logon via ticket from " + req.getRemoteHost() +
+                            " (" + req.getRemoteAddr() + ":" + req.getRemotePort() + ")" +
+                            " ticket=" + ticket);
+                    }
+
+                    // Validate the ticket
+                    authenticationService.validate(ticket);
+                    if(authenticationListener != null)
+                    {
+                        authenticationListener.userAuthenticated(new TicketCredentials(ticket));
+                    }
+
+                    // Need to create the User instance if not already available
+
+                    String currentUsername = authenticationService.getCurrentUserName();
+
+                    user = createUserEnvironment(httpReq.getSession(), currentUsername, ticket, false);
+                    if (logger.isTraceEnabled())
+                    {
+                        logger.trace("Successfully created user environment, login using TICKET for user: " +
+                            AuthenticationUtil.maskUsername(user.getUserName()));
+                    }
+                }
+            }
+
+            // Check if the user is authenticated, if not then prompt again
+            
+            if (user == null)
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("No user/ticket, force the client to prompt for logon details.");
+                }
+    
+                httpResp.setHeader("WWW-Authenticate", "BASIC realm=\"Alfresco DAV Server\"");
+                httpResp.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+    
+                httpResp.flushBuffer();
+                return;
+            }
+        }
+        else
+        {
+            if(authenticationListener != null)
+            {
+                authenticationListener.userAuthenticated(new TicketCredentials(user.getTicket()));
+            }
+            if (logger.isTraceEnabled())
+            {
+                logger.trace("User already set to: " + AuthenticationUtil.maskUsername(user.getUserName()));
+            }
+        }
+
+        // Chain other filters
+
+        chain.doFilter(req, resp);
+    }
+
+    /**
+     * Cleanup filter resources
+     */
+    public void destroy()
+    {
+        // Nothing to do
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.webdav.auth.BaseAuthenticationFilter#getLogger()
+     */
+    @Override
+    protected Log getLogger()
+    {
+        return logger;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseAuthenticationFilter.java
new file mode 100644
index 00000000000..c6eaa1da15d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseAuthenticationFilter.java
@@ -0,0 +1,522 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav.auth;
+
+import java.io.IOException;
+import java.io.Reader;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.SessionUser;
+import org.alfresco.repo.management.subsystems.ActivateableBean;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.external.RemoteUserMapper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.web.auth.AuthenticationListener;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.transaction.TransactionService;
+import org.apache.commons.logging.Log;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * A base class for authentication filters. Handles management of the session user.
+ * 
+ * @author dward
+ */
+public abstract class BaseAuthenticationFilter
+{
+    /** Indication by an up-stream filter that no authentication checks are required. */
+    protected static final String NO_AUTH_REQUIRED = "alfNoAuthRequired"; 
+
+    /** The default session attribute used to cache the user. Subclasses may override this with {@link #setUserAttributeName(String)}. */
+    public static final String AUTHENTICATION_USER = "_alfDAVAuthTicket";
+    
+    /** The session attribute that indicates external authentication. */
+    private static final String LOGIN_EXTERNAL_AUTH = "_alfExternalAuth";
+    
+    /** The name of the ticket argument. */
+    protected static final String ARG_TICKET = "ticket";
+    
+    /** The authentication service. */
+    protected AuthenticationService authenticationService;
+    
+    /** The person service. */
+    protected PersonService personService;
+    
+    /** The node service. */
+    protected NodeService nodeService;
+    
+    /** The transaction service. */
+    protected TransactionService transactionService;
+    
+    /** The authentication component. */
+    protected AuthenticationComponent authenticationComponent;
+    
+    /** The remote user mapper. */
+    protected RemoteUserMapper remoteUserMapper;
+    
+    /** The authentication listener. */
+    protected AuthenticationListener authenticationListener;
+
+    /** The configured user attribute name. */
+    private String userAttributeName = AUTHENTICATION_USER;
+
+    
+
+    /**
+     * Sets the authentication service.
+     * 
+     * @param authenticationService
+     *            the authService to set
+     */
+    public void setAuthenticationService(AuthenticationService authenticationService)
+    {
+        this.authenticationService = authenticationService;
+    }
+
+    /**
+     * Sets the person service.
+     * 
+     * @param personService
+     *            the personService to set
+     */
+    public void setPersonService(PersonService personService)
+    {
+        this.personService = personService;
+    }
+
+    /**
+     * Sets the node service.
+     * 
+     * @param nodeService
+     *            the nodeService to set
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    /**
+     * Sets the transaction service.
+     * 
+     * @param transactionService
+     *            the transactionService to set
+     */
+    public void setTransactionService(TransactionService transactionService)
+    {
+        this.transactionService = transactionService;
+    }
+
+    /**
+     * Sets the authentication component.
+     * 
+     * @param authenticationComponent
+     *            the authentication component
+     */
+    public void setAuthenticationComponent(AuthenticationComponent authenticationComponent)
+    {
+        this.authenticationComponent = authenticationComponent;
+    }
+    
+    /**
+     * Sets the authentication listener.
+     * 
+     * @param authenticationListener AuthenticationListener
+     */
+    public void setAuthenticationListener(AuthenticationListener authenticationListener)
+    {
+        this.authenticationListener = authenticationListener;
+    }
+
+    /**
+     * Sets the remote user mapper.
+     * 
+     * @param remoteUserMapper
+     *            the remote user mapper
+     */
+    public void setRemoteUserMapper(RemoteUserMapper remoteUserMapper)
+    {
+        this.remoteUserMapper = remoteUserMapper;
+    }
+
+    /**
+     * Create the user object that will be stored in the session.
+     * 
+     * @param userName
+     *            String
+     * @param ticket
+     *            String
+     * @param personNode
+     *            NodeRef
+     * @param homeSpaceRef
+     *            NodeRef
+     * @return SessionUser
+     */
+    protected SessionUser createUserObject(String userName, String ticket, NodeRef personNode, NodeRef homeSpaceRef)
+    {
+        return new WebDAVUser(userName, ticket, homeSpaceRef);
+    }
+
+    /**
+     * Callback to get the specific impl of the Session User for a filter.
+     * 
+     * @param servletContext
+     *            the servlet context
+     * @param httpServletRequest
+     *            the http servlet request
+     * @param httpServletResponse
+     *            the http servlet response
+     * @param externalAuth
+     *            has the user been authenticated by SSO?
+     * @return User from the session
+     */
+    protected SessionUser getSessionUser(ServletContext servletContext, final HttpServletRequest httpServletRequest,
+            HttpServletResponse httpServletResponse, final boolean externalAuth)
+    {
+        String userId = null;
+
+        // If the remote user mapper is configured, we may be able to map in an externally authenticated user
+        if (remoteUserMapper != null
+                && (!(remoteUserMapper instanceof ActivateableBean) || ((ActivateableBean) remoteUserMapper).isActive()))
+        {
+            userId = remoteUserMapper.getRemoteUser(httpServletRequest);
+            if (getLogger().isTraceEnabled())
+            {
+                getLogger().trace("Found a remote user: " + AuthenticationUtil.maskUsername(userId));
+            }
+        }
+        
+        String sessionAttrib = getUserAttributeName(); 
+        HttpSession session = httpServletRequest.getSession();
+        SessionUser sessionUser = (SessionUser) session.getAttribute(sessionAttrib);
+        if (sessionUser != null)
+        {
+            try
+            {
+                if (getLogger().isTraceEnabled())
+                {
+                    getLogger().trace("Found a session user: " + AuthenticationUtil.maskUsername(sessionUser.getUserName()));
+                }
+                authenticationService.validate(sessionUser.getTicket());
+                setExternalAuth(session, externalAuth);
+            }
+            catch (AuthenticationException e)
+            {
+                if (getLogger().isDebugEnabled())
+                {
+                    getLogger().debug("The ticket may have expired or the person could have been removed, invalidating session.", e);
+                }
+                invalidateSession(httpServletRequest);
+                sessionUser = null;
+            }
+        }
+        
+        if (userId != null)
+        {
+            if (getLogger().isDebugEnabled())
+            {
+                getLogger().debug("We have a previously-cached user with the wrong identity - replace them.");
+            }
+            if (sessionUser != null && !sessionUser.getUserName().equals(userId))
+            {
+                if (getLogger().isDebugEnabled())
+                {
+                    getLogger().debug("Removing the session user, invalidating session.");
+                }
+                session.removeAttribute(sessionAttrib);
+                session.invalidate();
+                sessionUser = null;
+            }
+
+            if (sessionUser == null)
+            {
+               // If we have been authenticated by other means, just propagate through the user identity
+               if (getLogger().isDebugEnabled())
+               {
+                   getLogger().debug("Propagating through the user identity: " + AuthenticationUtil.maskUsername(userId));
+               }
+               authenticationComponent.setCurrentUser(userId);
+               session = httpServletRequest.getSession();
+
+               try
+               {
+                   sessionUser = createUserEnvironment(session, authenticationService.getCurrentUserName(), authenticationService.getCurrentTicket(), true);
+               }
+               catch (Throwable e)
+               {
+                   if (getLogger().isDebugEnabled())
+                   {
+                       getLogger().debug("Error during ticket validation and user creation: " + e.getMessage(), e);
+                   }
+               }
+            }
+        }
+        
+        return sessionUser;
+    }
+
+    /**
+     * Remove the user from the session and expire the session - after failed ticket auth.
+     * 
+     * @param req HttpServletRequest
+     */
+    protected void invalidateSession(HttpServletRequest req)
+    {
+        HttpSession session = req.getSession(false);
+        if (session != null)
+        {
+            setExternalAuth(session, false);
+            session.removeAttribute(getUserAttributeName());
+            session.invalidate();
+        }
+    }
+    
+    /**
+     * Executes a callback in a transaction as the system user
+     * 
+     * @param callback
+     *            the callback
+     * @return the return value from the callback
+     */
+    protected <T> T doInSystemTransaction(final RetryingTransactionHelper.RetryingTransactionCallback<T> callback)
+    {
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<T>()
+        {
+            public T doWork() throws Exception
+            {
+                return transactionService.getRetryingTransactionHelper().doInTransaction(callback, transactionService.isReadOnly());
+            }
+        }, AuthenticationUtil.SYSTEM_USER_NAME);
+    }
+
+    /**
+     * Return the user object session attribute name.
+     * 
+     * @return the user object session attribute name
+     */
+    protected final String getUserAttributeName()
+    {
+    	return userAttributeName;
+    }
+
+    /**
+     * Set the user object attribute name.
+     * 
+     * @param userAttr
+     *            the user object session attribute name
+     */
+    protected final void setUserAttributeName(String userAttr)
+    {
+    	userAttributeName = userAttr;
+    }
+
+    /**
+     * Callback to create the User environment as appropriate for a filter impl.
+     * 
+     * @param session
+     *            HttpSession
+     * @param userName
+     *            String
+     * @param ticket
+     *            the ticket
+     * @param externalAuth
+     *            has the user been authenticated by SSO?
+     * @return SessionUser
+     * @throws IOException
+     *             Signals that an I/O exception has occurred.
+     * @throws ServletException
+     *             the servlet exception
+     */
+    protected SessionUser createUserEnvironment(HttpSession session, final String userName, final String ticket, boolean externalAuth)
+            throws IOException, ServletException
+    {
+        if (getLogger().isTraceEnabled())
+        {
+            getLogger().trace("Create the User environment for: " + AuthenticationUtil.maskUsername(userName));
+        }
+        SessionUser user = doInSystemTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<SessionUser>()
+        {
+            public SessionUser execute() throws Throwable
+            {
+                // Setup User object and Home space ID etc.
+                final NodeRef personNodeRef = personService.getPerson(userName);
+
+                String name = (String) nodeService.getProperty(personNodeRef, ContentModel.PROP_USERNAME);
+
+                NodeRef homeSpaceRef = (NodeRef) nodeService.getProperty(personNodeRef, ContentModel.PROP_HOMEFOLDER);
+
+                return createUserObject(name, ticket, personNodeRef, homeSpaceRef);
+            }
+        });
+
+        // Store the user on the session
+        session.setAttribute(getUserAttributeName(), user);
+        setExternalAuth(session, externalAuth);
+        return user;
+    }
+
+    private void setExternalAuth(HttpSession session, boolean externalAuth)
+    {
+        if (externalAuth)
+        {
+            session.setAttribute(LOGIN_EXTERNAL_AUTH, Boolean.TRUE);
+        }
+        else
+        {
+           session.removeAttribute(LOGIN_EXTERNAL_AUTH);
+        }
+    }
+
+    /**
+     * Callback to create the User environment as appropriate for a filter impl
+     * 
+     * @param session
+     *            HttpSession
+     * @param userName
+     *            String
+     * @return SessionUser
+     * @throws IOException
+     * @throws ServletException
+     */
+    protected SessionUser createUserEnvironment(final HttpSession session, final String userName) throws IOException,
+            ServletException
+    {
+        return this.transactionService.getRetryingTransactionHelper().doInTransaction(
+                new RetryingTransactionHelper.RetryingTransactionCallback<SessionUser>()
+                {
+
+                    public SessionUser execute() throws Throwable
+                    {
+                        authenticationComponent.setCurrentUser(userName);
+                        return createUserEnvironment(session, userName, authenticationService.getCurrentTicket(), true);
+                    }
+                }, transactionService.isReadOnly());
+    }
+
+    /**
+     * Return the logger.
+     * 
+     * @return Log
+     */
+    protected abstract Log getLogger();
+    
+    /**
+     * Handles the login form directly, allowing management of the session user.
+     * 
+     * @param req
+     *            the request
+     * @param res
+     *            the response
+     * @throws IOException
+     *             Signals that an I/O exception has occurred.
+     * @throws ServletException
+     *             on error
+     */
+    protected boolean handleLoginForm(HttpServletRequest req, HttpServletResponse res) throws IOException,
+            ServletException
+    {
+        if (getLogger().isDebugEnabled())
+        {
+            getLogger().debug("Handling the login form.");
+        }
+        // Invalidate current session
+        HttpSession session = req.getSession(false);
+        if (session != null)
+        {
+            session.invalidate();
+        }
+        StringBuilder out = new StringBuilder(1024);
+        Reader in = req.getReader();
+        char[] buff = new char[1024];
+        int charsRead;
+        while ((charsRead = in.read(buff)) != -1)
+        {
+            out.append(buff, 0, charsRead);
+        }
+        in.close();
+
+        try
+        {
+            JSONObject json = new JSONObject(out.toString());
+            String username = json.getString("username");
+            String password = json.getString("password");
+
+            if (username == null || username.length() == 0)
+            {
+                if (getLogger().isDebugEnabled())
+                {
+                    getLogger().debug("Username not specified in the login form.");
+                }
+                res.sendError(HttpServletResponse.SC_BAD_REQUEST, "Username not specified");
+                return false;
+            }
+
+            if (password == null)
+            {
+                if (getLogger().isDebugEnabled())
+                {
+                    getLogger().debug("Password not specified in the login form.");
+                }
+                res.sendError(HttpServletResponse.SC_BAD_REQUEST, "Password not specified");
+                return false;
+            }
+
+            authenticationService.authenticate(username, password.toCharArray());
+            session = req.getSession();            
+            createUserEnvironment(session, username, authenticationService.getCurrentTicket(), false);
+            res.setStatus(HttpServletResponse.SC_NO_CONTENT);
+            return true;
+        }
+        catch (AuthenticationException e)
+        {
+            if (getLogger().isDebugEnabled())
+            {
+                getLogger().debug("Login failed", e);
+            }
+            res.sendError(HttpServletResponse.SC_FORBIDDEN, "Login failed");
+        }
+        catch (JSONException jErr)
+        {
+            if (getLogger().isDebugEnabled())
+            {
+                getLogger().debug("Unable to parse JSON POST body", jErr);
+            }
+            res.sendError(HttpServletResponse.SC_BAD_REQUEST, "Unable to parse JSON POST body: " + jErr.getMessage());
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java
new file mode 100644
index 00000000000..2b0bfd70962
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseKerberosAuthenticationFilter.java
@@ -0,0 +1,715 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.webdav.auth;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.security.Principal;
+import java.util.Vector;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+import javax.security.sasl.RealmCallback;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.alfresco.jlan.server.auth.kerberos.KerberosDetails;
+import org.alfresco.jlan.server.auth.kerberos.SessionSetupPrivilegedAction;
+import org.alfresco.jlan.server.auth.spnego.NegTokenInit;
+import org.alfresco.jlan.server.auth.spnego.NegTokenTarg;
+import org.alfresco.jlan.server.auth.spnego.OID;
+import org.alfresco.jlan.server.auth.spnego.SPNEGO;
+import org.alfresco.repo.SessionUser;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.auth.KerberosCredentials;
+import org.alfresco.repo.web.auth.TicketCredentials;
+import org.alfresco.repo.web.auth.WebCredentials;
+import org.apache.commons.codec.binary.Base64;
+import org.ietf.jgss.Oid;
+
+/**
+ * Base class with common code and initialisation for Kerberos authentication filters.
+ * 
+ * @author gkspencer
+ */
+public abstract class BaseKerberosAuthenticationFilter extends BaseSSOAuthenticationFilter implements CallbackHandler {
+
+	// Constants
+    //
+    // Default login configuration entry name
+    
+    private static final String LoginConfigEntry = "AlfrescoHTTP";
+    
+    // Kerberos settings
+    //
+    // Account name and password for server ticket
+    //
+    // The account name must be built from the HTTP server name, in the format :-
+    //
+    //      HTTP/<server_name>@<realm>
+    
+    private String m_accountName;
+    private String m_password;
+    
+    // Kerberos realm
+    
+    private String m_krbRealm;
+    
+    // Login configuration entry name
+    
+    private String m_loginEntryName = LoginConfigEntry; 
+
+    // Server login context
+    
+    private LoginContext m_loginContext;
+        
+    // Should we strip the @domain suffix from the Kerberos username?
+
+    private boolean m_stripKerberosUsernameSuffix = true;
+
+    /**
+     * Sets the HTTP service account password. (the Principal should be configured in java.login.config)
+     * 
+     * @param password
+     *            the password to set
+     */
+    public void setPassword(String password)
+    {
+        this.m_password = password;
+    }
+
+    /**
+     * Sets the HTTP service account realm.
+     * 
+     * @param realm the realm to set
+     */
+    public void setRealm(String realm)
+    {
+        m_krbRealm = realm;
+    }
+
+    /**
+     * Sets the HTTP service login configuration entry name. The default is <code>"AlfrescoHTTP"</code>.
+     * 
+     * @param jaasConfigEntryName
+     *            the jaasConfigEntryName to set
+     */
+    public void setJaasConfigEntryName(String jaasConfigEntryName)
+    {
+        m_loginEntryName = jaasConfigEntryName;
+    }
+    
+    /**
+     * Indicates whether the @domain suffix should be removed from Kerberos user IDs
+     * 
+     * @param stripKerberosUsernameSuffix
+     *            <code>true</code> if the @domain suffix should be removed from Kerberos user IDs
+     */
+    public void setStripKerberosUsernameSuffix(boolean stripKerberosUsernameSuffix)
+    {
+        m_stripKerberosUsernameSuffix = stripKerberosUsernameSuffix;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#init()
+     */
+    @Override
+    protected void init() throws ServletException
+    {
+        super.init();
+
+        if ( m_krbRealm == null)
+        {
+            throw new ServletException("Kerberos realm not specified");
+        }
+        
+        if ( m_password == null)
+        {
+            throw new ServletException("HTTP service account password not specified");
+        }
+        
+        if (m_loginEntryName == null)
+        {
+            throw new ServletException("Invalid login entry specified");
+        }
+        
+        // Get the local host name        
+        String localName = null;
+        
+        try
+        {
+        	localName = InetAddress.getLocalHost().getCanonicalHostName();
+        }
+        catch ( UnknownHostException ex)
+        {
+        	throw new ServletException( "Failed to get local host name");
+        }
+        
+        // Create a login context for the HTTP server service
+        
+        try
+        {
+            // Login the HTTP server service
+            
+            m_loginContext = new LoginContext( m_loginEntryName, this);
+            m_loginContext.login();
+            
+            // DEBUG
+            
+            if ( getLogger().isTraceEnabled())
+            {
+                getLogger().trace("HTTP Kerberos login successful");
+            }
+        }
+        catch ( LoginException ex)
+        {
+            getLogger().error("HTTP Kerberos web filter error", ex);
+            
+            throw new ServletException("Failed to login HTTP server service");
+        }
+        
+        // Get the HTTP service account name from the subject
+        
+        Subject subj = m_loginContext.getSubject();
+        Principal princ = subj.getPrincipals().iterator().next();
+        
+        m_accountName = princ.getName();
+
+        if (getLogger().isTraceEnabled())
+        {
+            getLogger().trace("Logged on using principal " + AuthenticationUtil.maskUsername(m_accountName));
+        }
+        
+        // Create the Oid list for the SPNEGO NegTokenInit, include NTLMSSP for fallback
+        
+        Vector<Oid> mechTypes = new Vector<Oid>();
+
+        mechTypes.add(OID.KERBEROS5);
+        mechTypes.add(OID.MSKERBEROS5);
+    
+        // Build the SPNEGO NegTokenInit blob
+
+        try
+        {
+            // Build the mechListMIC principle
+            //
+            // Note: This field is not as specified
+            
+            String mecListMIC = null;
+            
+            StringBuilder mic = new StringBuilder();
+            mic.append( localName);
+            mic.append("$@");
+            mic.append( m_krbRealm);
+            
+            mecListMIC = mic.toString();
+            
+            // Build the SPNEGO NegTokenInit that contains the authentication types that the HTTP server accepts
+            
+            NegTokenInit negTokenInit = new NegTokenInit(mechTypes, mecListMIC);
+            
+            // Encode the NegTokenInit blob
+            negTokenInit.encode();
+        }
+        catch (IOException ex)
+        {
+            getLogger().error("Error creating SPNEGO NegTokenInit blob", ex);
+            
+            throw new ServletException("Failed to create SPNEGO NegTokenInit blob");
+        }
+    }
+
+    
+    public boolean authenticateRequest(ServletContext context, HttpServletRequest req, HttpServletResponse resp)
+            throws IOException, ServletException
+    {
+        // Check if there is an authorization header with an SPNEGO security blob
+        
+        String authHdr = req.getHeader("Authorization");
+        boolean reqAuth = false;
+        
+        if ( authHdr != null)
+        {
+        	// Check for a Kerberos/SPNEGO authorization header
+        	
+        	if ( authHdr.startsWith( "Negotiate"))
+        		reqAuth = true;
+        	else if ( authHdr.startsWith( "NTLM"))
+        	{
+                if (getLogger().isTraceEnabled())
+                {
+                    getLogger().trace("Received NTLM logon from client");
+                }
+        		
+        		// Restart the authentication
+        		
+            	restartLoginChallenge(context, req, resp);
+        		return false;
+        	}
+            else if (isFallbackEnabled())
+            {
+                return performFallbackAuthentication(context, req, resp);
+            }
+        }
+        
+        // Check if the user is already authenticated        
+        SessionUser user = getSessionUser(context, req, resp, true);
+        HttpSession httpSess = req.getSession(true);
+        if (user == null)
+        {
+            user = (SessionUser) httpSess.getAttribute("_alfAuthTicket");
+            // MNT-13191 Opening /alfresco/webdav from a Kerberos-authenticated IE11 browser causes HTTP error 500
+            if (user != null)
+            {
+                String userName = user.getUserName();
+                AuthenticationUtil.setFullyAuthenticatedUser(userName);
+            }
+        }
+        
+        // If the user has been validated and we do not require re-authentication then continue to
+        // the next filter
+        if ( user != null && reqAuth == false)
+        {
+            // Filter validate hook
+            onValidate( context, req, resp, new TicketCredentials(user.getTicket()));
+
+            if ( getLogger().isTraceEnabled())
+            {
+                getLogger().trace("Authentication not required (user), chaining ...");
+            }
+            // Chain to the next filter
+            return true;
+        }
+
+        // Check if the login page is being accessed, do not intercept the login page
+        if (checkLoginPage(req, resp))
+        {
+            if (getLogger().isDebugEnabled())
+            {
+                getLogger().debug("Login page requested, chaining ...");
+            }
+            
+            // Chain to the next filter
+
+            return true;
+        }
+
+        // Check the authorization header
+        
+        if ( authHdr == null) {
+
+        	// If ticket based logons are allowed, check for a ticket parameter
+        	
+        	if ( allowsTicketLogons())
+        	{
+        		// Check if a ticket parameter has been specified in the reuqest
+        		
+        		if (checkForTicketParameter(context, req, resp))
+        		{
+                    // Filter validate hook
+                    if (getLogger().isTraceEnabled())
+                    {
+                        getLogger().trace("Authenticated with a ticket parameter.");
+                    }
+
+                    if (user == null)
+                    {
+                        user = (SessionUser) httpSess.getAttribute(getUserAttributeName());
+                    }
+                    onValidate( context, req, resp, new TicketCredentials(user.getTicket()));
+
+                    // Chain to the next filter
+                    
+        	        return true;
+        		}
+        	}
+
+            if (getLogger().isTraceEnabled())
+            {
+                getLogger()
+                    .trace("New Kerberos auth request from " + req.getRemoteHost() + " (" + req.getRemoteAddr() + ":" + req.getRemotePort() + ")");
+            }
+            
+            // Send back a request for SPNEGO authentication
+            logonStartAgain(context, req, resp, true);
+
+            return false;
+        }
+        else
+        {
+            // Decode the received SPNEGO blob and validate
+            
+            final byte[] spnegoByts = Base64.decodeBase64( authHdr.substring(10).getBytes());
+         
+            // Check if the client sent an NTLMSSP blob
+            
+            if ( isNTLMSSPBlob( spnegoByts, 0))
+            {
+            	if ( getLogger().isTraceEnabled())
+                {
+                    getLogger().trace("Client sent an NTLMSSP security blob");
+                }
+            	
+        		// Restart the authentication
+        		
+            	restartLoginChallenge(context, req, resp);
+        		return false;
+            }
+            	
+            //  Check the received SPNEGO token type
+
+            int tokType = -1;
+            
+            try
+            {
+                tokType = SPNEGO.checkTokenType( spnegoByts, 0, spnegoByts.length);
+            }
+            catch ( IOException ex)
+            {
+            }
+
+            // Check for a NegTokenInit blob
+            
+            if ( tokType == SPNEGO.NegTokenInit)
+            {
+                //  Parse the SPNEGO security blob to get the Kerberos ticket
+                
+                NegTokenInit negToken = new NegTokenInit();
+                
+                try
+                {
+                    // Decode the security blob
+                    
+                    negToken.decode( spnegoByts, 0, spnegoByts.length);
+
+                    //  Determine the authentication mechanism the client is using and logon
+                    
+                    String oidStr = null;
+                    if ( negToken.numberOfOids() > 0)
+                        oidStr = negToken.getOidAt( 0).toString();
+                    
+                    if (  oidStr != null && (oidStr.equals( OID.ID_MSKERBEROS5) || oidStr.equals(OID.ID_KERBEROS5)))
+                    {
+                        //  Kerberos logon
+                        
+                        try
+                        {
+                            NegTokenTarg negTokenTarg = doKerberosLogon( negToken, req, resp, httpSess);
+                            if ( negTokenTarg != null)
+                            {
+                                // Allow the user to access the requested page
+                                onValidate(context, req, resp, new KerberosCredentials(negToken, negTokenTarg));
+                                if (getLogger().isTraceEnabled())
+                                {
+                                    getLogger().trace("Authenticated through Kerberos.");
+                                }
+                                return true;
+                            }
+                            else
+                            {
+                                // Send back a request for SPNEGO authentication
+                                if (getLogger().isDebugEnabled())
+                                {
+                                    getLogger().debug("Failed SPNEGO authentication.");
+                                }
+                            	restartLoginChallenge(context, req, resp);
+                            	return false;
+                            }
+                        }
+                        catch (AuthenticationException ex)
+                        {
+                            // Even though the user successfully authenticated, the ticket may not be granted, e.g. to
+                            // max user limit
+                            if (getLogger().isDebugEnabled())
+                            {
+                                getLogger().debug("Validate failed.", ex);
+                            }
+                            WebCredentials webCredentials = user == null ? null : new TicketCredentials(user.getTicket());
+                            onValidateFailed(context, req, resp, httpSess, webCredentials);
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        //  Unsupported mechanism, e.g. NegoEx
+                        
+                        if ( getLogger().isDebugEnabled())
+                        {
+                            getLogger().debug("Unsupported SPNEGO mechanism " + oidStr);
+                        }
+                        // Try again!
+                        
+                        restartLoginChallenge(context, req,  resp);
+                    }
+                }
+                catch ( IOException ex)
+                {
+                    // Log the error
+                	if ( getLogger().isDebugEnabled())
+                    {
+                        getLogger().debug(ex);
+                    }
+                }
+            }
+            else
+            {
+                //  Unknown SPNEGO token type
+                
+            	if ( getLogger().isDebugEnabled())
+                {
+                    getLogger().debug("Unknown SPNEGO token type");
+                }
+                // Send back a request for SPNEGO authentication
+                
+            	restartLoginChallenge(context, req,  resp);
+            }
+        }
+        return false;
+    }
+
+    protected boolean checkLoginPage(HttpServletRequest req, HttpServletResponse resp)
+    {
+        return (hasLoginPage() && req.getRequestURI().endsWith(getLoginPage()));
+    }
+
+    /**
+     * JAAS callback handler
+     * 
+     * @param callbacks Callback[]
+     * @exception IOException
+     * @exception UnsupportedCallbackException
+     */
+    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
+    {
+        // Process the callback list
+        if (getLogger().isTraceEnabled())
+        {
+            getLogger().trace("Processing the JAAS callback list of " + callbacks.length + " items.");
+        }
+        for (int i = 0; i < callbacks.length; i++)
+        {
+            // Request for user name
+            
+            if (callbacks[i] instanceof NameCallback)
+            {
+                if (getLogger().isTraceEnabled())
+                {
+                    getLogger().trace("Request for user name.");
+                }
+                NameCallback cb = (NameCallback) callbacks[i];
+                cb.setName(m_accountName);
+            }
+            
+            // Request for password
+            else if (callbacks[i] instanceof PasswordCallback)
+            {
+                if (getLogger().isTraceEnabled())
+                {
+                    getLogger().trace("Request for password.");
+                }
+                PasswordCallback cb = (PasswordCallback) callbacks[i];
+                cb.setPassword(m_password.toCharArray());
+            }
+            
+            // Request for realm
+            
+            else if (callbacks[i] instanceof RealmCallback)
+            {
+                if (getLogger().isTraceEnabled())
+                {
+                    getLogger().trace("Request for realm.");
+                }
+                RealmCallback cb = (RealmCallback) callbacks[i];
+                cb.setText(m_krbRealm);
+            }
+            else
+            {
+                throw new UnsupportedCallbackException(callbacks[i]);
+            }
+        }
+    }
+    
+    /**
+     * Perform a Kerberos login and return an SPNEGO response
+     * 
+     * @param negToken NegTokenInit
+     * @param req HttpServletRequest
+     * @param resp HttpServletResponse
+     * @param httpSess HttpSession
+     * @return NegTokenTarg
+     */
+    private final NegTokenTarg doKerberosLogon( NegTokenInit negToken, HttpServletRequest req, HttpServletResponse resp, HttpSession httpSess)
+    {
+        //  Authenticate the user
+        
+        KerberosDetails krbDetails = null;
+        String userName = null;
+        NegTokenTarg negTokenTarg = null;
+        
+        try
+        {
+            //  Run the session setup as a privileged action
+            
+            SessionSetupPrivilegedAction sessSetupAction = new SessionSetupPrivilegedAction( m_accountName, negToken.getMechtoken());
+            Object result = Subject.doAs( m_loginContext.getSubject(), sessSetupAction);
+    
+            if ( result != null)
+            {
+                // Access the Kerberos response
+                
+                krbDetails = (KerberosDetails) result;
+                userName = m_stripKerberosUsernameSuffix ? krbDetails.getUserName() : krbDetails.getSourceName();
+                
+                // Create the NegTokenTarg response blob
+                
+                negTokenTarg = new NegTokenTarg( SPNEGO.AcceptCompleted, OID.KERBEROS5, krbDetails.getResponseToken());
+                
+                // Check if the user has been authenticated, if so then setup the user environment
+                
+                if ( negTokenTarg != null)
+                {
+                    // Create and store the user authentication context
+
+                    SessionUser user = createUserEnvironment(httpSess, userName);
+
+                    // Debug
+
+                    if (getLogger().isTraceEnabled())
+                    {
+                        getLogger().trace("User " + AuthenticationUtil.maskUsername(user.getUserName()) + " logged on via Kerberos");
+                    }
+                }
+            }
+            else
+            {
+            	// Debug
+            	
+            	if ( getLogger().isDebugEnabled())
+                {
+                    getLogger().debug("No SPNEGO response, Kerberos logon failed");
+                }
+            }
+        }
+        catch (AuthenticationException ex)
+        {
+            // Pass on validation failures
+            if (getLogger().isDebugEnabled())
+            {
+                getLogger().debug("Failed to validate user " + AuthenticationUtil.maskUsername(userName), ex);
+            }
+
+            throw ex;
+        }
+        catch (Exception ex)
+        {
+            // Log the error
+        	if ( getLogger().isDebugEnabled())
+            {
+                getLogger().debug("Kerberos logon error", ex);
+            }
+        }
+    
+        // Return the response SPNEGO blob
+        
+        return negTokenTarg;
+    }
+    
+    
+    /**
+     * Restart the Kerberos logon process
+     * 
+     * @param context ServletContext
+     * @param req HttpServletRequest
+     * @param resp HttpServletResponse
+     * @throws IOException
+     */
+    public void restartLoginChallenge(ServletContext context, HttpServletRequest req, HttpServletResponse resp) throws IOException
+    {
+        HttpSession session = req.getSession(false);
+        if (session != null)
+        {
+            if (getLogger().isTraceEnabled())
+            {
+                getLogger().trace("Clearing session.");
+            }
+            session.invalidate();
+        }
+        logonStartAgain(context, req, resp);
+    }
+    
+    /**
+     * The logon to start again
+     *
+     * @param context ServletContext
+     * @param req HttpServletRequest
+     * @param resp HttpServletResponse
+     * @throws IOException
+     */
+    public void logonStartAgain(ServletContext context, HttpServletRequest req, HttpServletResponse resp) throws IOException
+    {
+        logonStartAgain(context, req, resp, false);
+    }
+    
+    /**
+     * The logon to start again
+     *
+     * @param context ServletContext
+     * @param req HttpServletRequest
+     * @param resp HttpServletResponse
+     * @param ignoreFallback ignore fallback
+     * @throws IOException
+     */
+    private void logonStartAgain(ServletContext context, HttpServletRequest req, HttpServletResponse resp, boolean ignoreFallback) throws IOException
+        {
+        if (getLogger().isTraceEnabled())
+        {
+            getLogger().trace("Issuing login challenge to browser.");
+        }
+        // Force the logon to start again
+        resp.setHeader("WWW-Authenticate", "Negotiate");
+        
+        if (!ignoreFallback && isFallbackEnabled())
+        {
+            includeFallbackAuth(context, req, resp);
+        }
+        
+        resp.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+        writeLoginPageLink(context, req, resp);
+        resp.flushBuffer();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java
new file mode 100644
index 00000000000..3c4bcdb90f5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/BaseSSOAuthenticationFilter.java
@@ -0,0 +1,734 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav.auth;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.regex.Pattern;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.filesys.ExtendedServerConfigurationAccessor;
+import org.alfresco.jlan.server.auth.ntlm.NTLM;
+import org.alfresco.jlan.server.config.SecurityConfigSection;
+import org.alfresco.jlan.util.IPAddress;
+import org.alfresco.repo.SessionUser;
+import org.alfresco.repo.management.subsystems.ActivateableBean;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.web.auth.WebCredentials;
+import org.alfresco.repo.web.filter.beans.DependencyInjectedFilter;
+import org.alfresco.rest.api.PublicApiTenantWebScriptServletRequest;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.RuntimeContainer;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+import org.springframework.extensions.webscripts.Description.RequiredAuthentication;
+import org.springframework.extensions.surf.util.URLDecoder;
+import org.springframework.extensions.webscripts.Match;
+
+/**
+ * Base class with common code and initialisation for single signon authentication filters.
+ * 
+ * @author gkspencer
+ * @author kroast
+ */
+public abstract class BaseSSOAuthenticationFilter extends BaseAuthenticationFilter implements DependencyInjectedFilter, AuthenticationDriver, ActivateableBean, InitializingBean
+{   
+	private static final Pattern CMIS_URI_PATTERN = Pattern.compile(".*/cmis/versions/[0-9]+\\.[0-9]+/.*");
+	
+	// Allow an authentication ticket to be passed as part of a request to bypass authentication
+
+    private ExtendedServerConfigurationAccessor serverConfiguration;
+    
+    // Various services required by NTLM authenticator
+
+    private String m_loginPage;
+    
+    // Indicate whether ticket based logons are supported
+    
+    private boolean m_ticketLogons;
+    
+    // User object attribute name
+    
+    private String m_lastConfiguredServerName;
+    private String m_lastResolvedServerName;
+    
+    private boolean m_isActive = true;
+            
+    private AuthenticationDriver fallbackDelegate;
+    private boolean m_isFallbackEnabled = true;
+            
+    protected static final String MIME_HTML_TEXT = "text/html";
+
+    protected String loginPageLink;
+
+    /**
+     * @return login page link, which is send back to the client if the login fails in the filter.
+     *         Override to change the default behaviour.
+     */
+    public String getLoginPageLink()
+    {
+        if (loginPageLink == null || loginPageLink.isEmpty())
+        {
+            return "/faces" + getLoginPage();
+        }
+        else
+        {
+            return loginPageLink;
+        }
+    }
+
+    public void setLoginPageLink(String loginPageLink)
+    {
+        this.loginPageLink = loginPageLink;
+    }
+
+    /**
+     * @param serverConfiguration the serverConfiguration to set
+     */
+    public void setServerConfiguration(ExtendedServerConfigurationAccessor serverConfiguration)
+    {
+        this.serverConfiguration = serverConfiguration;
+    }
+    
+    /**
+     * Activates or deactivates the bean
+     * 
+     * @param active
+     *            <code>true</code> if the bean is active and initialization should complete
+     */
+    public final void setActive(boolean active)
+    {
+        this.m_isActive = active;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.repo.management.subsystems.ActivateableBean#isActive()
+     */
+    public final boolean isActive()
+    {
+        return m_isActive;
+    }
+
+    /**
+     * Sets the fallback authentication support for this filter
+     * 
+     * @param delegate AuthenticationDriver
+     */
+    public final void setFallback(AuthenticationDriver delegate)
+    {
+        this.fallbackDelegate = delegate;
+    }
+
+    /**
+     * Activates or deactivates the fallback authentication support for this filter
+     * 
+     * @param fallbackEnabled
+     */
+    public final void setFallbackEnabled(boolean fallbackEnabled)
+    {
+        this.m_isFallbackEnabled = fallbackEnabled;
+    }
+
+    /** 
+     * @return <code>true</code> if fallback authentication enabled
+     */
+    public final boolean isFallbackEnabled()
+    {
+        return m_isFallbackEnabled && fallbackDelegate != null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+     */
+    public final void afterPropertiesSet() throws ServletException
+    {
+        // Don't trigger initialization if this component has been disabled
+        if (isActive())
+        {
+            init();
+        }
+    }
+    
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.repo.web.filter.beans.DependencyInjectedFilter#doFilter(javax.servlet.ServletContext,
+     * javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
+     */
+    public void doFilter(ServletContext context, ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException
+    {
+    	// Get the publicapi.container bean.
+        ApplicationContext appContext = WebApplicationContextUtils.getRequiredWebApplicationContext(context);
+        RuntimeContainer container = (RuntimeContainer) appContext.getBean("publicapi.container");
+
+        // Get the HTTP request/response
+        HttpServletRequest req = (HttpServletRequest) request;
+
+        Match match = null;
+
+        try
+        {
+            match = container.getRegistry().findWebScript(req.getMethod(), getScriptUrl(req));
+        }
+        catch (NotFoundException notFoundEx)
+        {
+            getLogger().debug(req.getMethod() + " " + getScriptUrl(req) + "not found in Public API Container.");
+        }
+        
+        // If a filter up the chain has marked the request as not requiring auth then respect it        
+        if (request.getAttribute(NO_AUTH_REQUIRED) != null)
+        {
+            if ( getLogger().isTraceEnabled())
+            {
+                getLogger().trace("Authentication not required (filter), chaining ...");
+            }
+            chain.doFilter(request, response);
+        }
+       // check the authentication required - if none then we don't want any of the filters down the chain to require any authentication checks
+       else if ((match != null) && (match.getWebScript() != null) && (RequiredAuthentication.none == match.getWebScript().getDescription().getRequiredAuthentication()))
+        {
+        	if (getLogger().isDebugEnabled())    
+        	{
+                    getLogger().debug("Found webscript with no authentication - set NO_AUTH_REQUIRED flag.");
+            }
+
+            req.setAttribute(NO_AUTH_REQUIRED, Boolean.TRUE);
+          
+            chain.doFilter(request, response);
+        }
+        else if (authenticateRequest(context, (HttpServletRequest) request, (HttpServletResponse) response))
+        {
+            chain.doFilter(request, response);
+        }
+    }
+
+    /**
+     * Initializes the filter. Only called if the filter is active, as indicated by {@link #isActive()}. Subclasses
+     * should override.
+     */
+    protected void init() throws ServletException
+    {
+    }
+    
+    /**
+     * Callback executed on successful ticket validation during Type3 Message processing.
+     * 
+     * @param sc
+     *           the servlet context
+     * @param req
+     *           the request
+     * @param res
+     *           the response
+     */
+    protected void onValidate(ServletContext sc, HttpServletRequest req, HttpServletResponse res, WebCredentials credentials)
+    {
+        authenticationListener.userAuthenticated(credentials);
+    }
+    
+    /**
+     * Callback executed on failed authentication of a user ticket during Type3 Message processing
+     * 
+     *  @param sc the servlet context
+     *  @param req HttpServletRequest
+     *  @param res HttpServletResponse
+     *  @param session HttpSession
+     */
+    protected void onValidateFailed(ServletContext sc, HttpServletRequest req, HttpServletResponse res, HttpSession session, WebCredentials credentials)
+        throws IOException
+    {
+        authenticationListener.authenticationFailed(credentials);
+        
+        // Restart the login challenge process if validation fails
+        
+        restartLoginChallenge(sc, req, res);
+    }
+    
+    /**
+     * Callback executed on completion of NTLM login
+     * 
+     * @param req HttpServletRequest
+     * @param res HttpServletResponse
+     * @return true to continue filter chaining, false otherwise
+     */
+    protected boolean onLoginComplete(ServletContext sc, HttpServletRequest req, HttpServletResponse res, boolean userInit)
+        throws IOException
+    {
+        return true;
+    }
+    
+    /**
+     * Check if the request has specified a ticket parameter to bypass the standard authentication.
+     * 
+     * @param servletContext
+     *            the servlet context
+     * @param req
+     *            the request
+     * @param resp
+     *            the response
+     * @return boolean
+     */
+    protected boolean checkForTicketParameter(ServletContext servletContext, HttpServletRequest req, HttpServletResponse resp)
+    {
+        // Check if the request includes an authentication ticket
+
+        boolean ticketValid = false;
+        String ticket = req.getParameter(ARG_TICKET);
+        
+        if (ticket != null && ticket.length() != 0)
+        {
+            if (getLogger().isTraceEnabled())
+            {
+                getLogger().trace(
+                    "Logon via ticket from " + req.getRemoteHost() + " (" + req.getRemoteAddr() + ":" + req.getRemotePort() + ")" +
+                        " ticket=" + ticket);
+            }
+            
+            UserTransaction tx = null;
+            try
+            {
+                // Get a cached user with a valid ticket
+                SessionUser user = getSessionUser(servletContext, req, resp, true);
+                
+                // If this isn't the same ticket, invalidate the session
+                if (user != null && !ticket.equals(user.getTicket()))
+                {
+                   if (getLogger().isDebugEnabled())
+                   {
+                       getLogger().debug("The ticket doesn't match, invalidate the session.");
+                   }
+                   invalidateSession(req);
+                   user = null;
+                }
+                
+                // If we don't yet have a valid cached user, validate the ticket and create one
+                if (user == null)
+                {
+                   if (getLogger().isDebugEnabled())
+                   {
+                       getLogger().debug("There is no valid cached user, validate the ticket and create one.");
+                   }
+                   authenticationService.validate(ticket);
+                   user = createUserEnvironment(req.getSession(), authenticationService.getCurrentUserName(),
+                         authenticationService.getCurrentTicket(), true);
+                }
+                
+                // Indicate the ticket parameter was specified, and valid
+                
+                ticketValid = true;
+            }
+            catch (AuthenticationException authErr)
+            {
+                if (getLogger().isDebugEnabled())
+                {
+                    getLogger().debug("Failed to authenticate user ticket: " + authErr.getMessage(), authErr);
+                }
+            }
+            catch (Throwable e)
+            {
+                if (getLogger().isDebugEnabled())
+                {
+                    getLogger().debug("Error during ticket validation and user creation: " + e.getMessage(), e);
+                }
+            }
+            finally
+            {
+                try
+                {
+                    if (tx != null)
+                    {
+                        tx.rollback();
+                    }
+                }
+                catch (Exception tex)
+                {
+                }
+            }
+        }
+        
+        // Return the ticket parameter status
+        
+        return ticketValid;
+    }
+    
+    /**
+     * Redirect to the login page
+     * 
+     * @param req HttpServletRequest
+     * @param res HttpServletResponse
+     * @exception IOException
+     */
+    protected void redirectToLoginPage(HttpServletRequest req, HttpServletResponse res)
+        throws IOException
+    {
+        if (getLogger().isTraceEnabled())
+        {
+            getLogger().trace("redirectToLoginPage...");
+        }
+        if (hasLoginPage())
+            res.sendRedirect(req.getContextPath() + "/faces" + getLoginPage());
+    }
+    
+    /**
+     * Determine if the login page is available
+     * 
+     * @return boolean
+     */
+    protected final boolean hasLoginPage()
+    {
+        return m_loginPage != null ? true : false;
+    }
+    
+    /**
+     * Return the login page address
+     * 
+     * @return String
+     */
+    protected final String getLoginPage()
+    {
+        return m_loginPage;
+    }
+    
+    /**
+     * Set the login page address
+     * 
+     * @param loginPage String
+     */
+    protected final void setLoginPage( String loginPage)
+    {
+        m_loginPage = loginPage;
+    }
+    
+    /**
+     * Check if ticket based logons are allowed
+     * 
+     * @return boolean
+     */
+    protected final boolean allowsTicketLogons()
+    {
+        return m_ticketLogons;
+    }
+    
+    /**
+     * Set the ticket based logons allowed flag
+     * 
+     * @param ticketsAllowed boolean
+     */
+    public final void setTicketLogons( boolean ticketsAllowed)
+    {
+        m_ticketLogons = ticketsAllowed;
+    }
+
+    /**
+     * Check if a security blob starts with the NTLMSSP signature
+     * 
+     * @param byts byte[]
+     * @param offset int
+     * @return boolean
+     */
+    protected final boolean isNTLMSSPBlob( byte[] byts, int offset)
+    {
+        // Check if the blob has the NTLMSSP signature
+
+        boolean isNTLMSSP = false;
+        
+        if (( byts.length - offset) >= NTLM.Signature.length) {
+          
+          // Check for the NTLMSSP signature
+          
+          int idx = 0;
+          while ( idx < NTLM.Signature.length && byts[offset + idx] == NTLM.Signature[ idx])
+            idx++;
+          
+          if ( idx == NTLM.Signature.length)
+            isNTLMSSP = true;
+        }
+        
+        return isNTLMSSP;
+    }
+
+    /**
+     * Because the file server configuration may change during the lifetime of this filter, this method checks against
+     * the last configured server name before returning a cached result
+     * 
+     * @return resolved local server name
+     */
+    protected synchronized String getServerName()
+    {
+        // Get the local server name, try the file server config first
+        if (getLogger().isTraceEnabled())
+        {
+            getLogger().trace("Searching for local server name.");
+        }
+        String srvName = null;
+        if (serverConfiguration != null)
+        {
+            srvName = serverConfiguration.getServerName();
+            if (srvName != null && srvName.length() == 0)
+            {
+                srvName = null;
+            }
+
+        }
+
+        if (m_lastResolvedServerName != null
+                && (m_lastConfiguredServerName == null && srvName == null || m_lastConfiguredServerName.equals(srvName)))
+        {
+            return m_lastResolvedServerName;
+        }
+
+        m_lastResolvedServerName = null;
+        if (getLogger().isTraceEnabled())
+        {
+            getLogger().trace("Found server name in the file server configuration: " + srvName);
+        }
+        m_lastConfiguredServerName = srvName;
+        if (serverConfiguration != null)
+        {
+            if (m_lastConfiguredServerName != null)
+            {
+                try
+                {
+                    InetAddress resolved = InetAddress.getByName(m_lastConfiguredServerName);
+                    if (resolved == null)
+                    {
+                        if (getLogger().isDebugEnabled())
+                        {
+                            getLogger().debug("Failed to resolve the configured name.");
+                        }
+
+                        m_lastResolvedServerName = serverConfiguration.getLocalServerName(true);
+                    }
+                    else
+                    {
+                        m_lastResolvedServerName = m_lastConfiguredServerName;
+                    }
+                }
+                catch (UnknownHostException ex)
+                {
+                    if (getLogger().isWarnEnabled())
+                    {
+                        getLogger().warn("NTLM filter, error resolving CIFS host name" + m_lastConfiguredServerName);
+                    }
+                }
+            }
+
+            // If we still do not have a name use the DNS name of the server, with the domain part removed
+
+            if (m_lastResolvedServerName == null)
+            {
+                m_lastResolvedServerName = serverConfiguration.getLocalServerName(true);
+
+                // DEBUG
+
+                if (getLogger().isInfoEnabled())
+                {
+                    getLogger().info("NTLM filter using server name " + m_lastResolvedServerName);
+                }
+            }
+        }
+        else
+        {
+            // Get the host name
+            try
+            {
+                // Get the local host name
+
+                m_lastResolvedServerName = InetAddress.getLocalHost().getHostName();
+
+                if (getLogger().isInfoEnabled())
+                {
+                    getLogger().info("Found FQDN " + m_lastResolvedServerName);
+                }
+                // Strip any domain name
+
+                int pos = m_lastResolvedServerName.indexOf(".");
+                if (pos != -1)
+                {
+                    m_lastResolvedServerName = m_lastResolvedServerName.substring(0, pos);
+                }
+            }
+            catch (UnknownHostException ex)
+            {
+                getLogger().error("NTLM filter, error getting local host name", ex);
+            }
+        }
+
+        // Check if the server name is valid
+
+        if (m_lastResolvedServerName == null || m_lastResolvedServerName.length() == 0)
+        {
+            throw new AlfrescoRuntimeException("Failed to get local server name");
+        }
+
+        return m_lastResolvedServerName;
+    }
+    
+    protected SecurityConfigSection getSecurityConfigSection()
+    {
+        return serverConfiguration == null ? null : (SecurityConfigSection) serverConfiguration.getConfigSection(SecurityConfigSection.SectionName);
+    }
+    
+    /**
+     * Writes link to login page and refresh tag which cause user
+     * to be redirected to the login page.
+     *
+     * @param context ServletContext
+     * @param req HttpServletRequest
+     * @param resp HttpServletResponse
+     * @throws IOException
+     */
+    protected void writeLoginPageLink(ServletContext context, HttpServletRequest req, HttpServletResponse resp) throws IOException
+    {
+        if ( hasLoginPage())
+        {
+            resp.setContentType(MIME_HTML_TEXT);
+
+            try (PrintWriter out = resp.getWriter())
+            {
+                out.println("<html><head>");
+                // Removed the auto refresh to avoid refresh loop, MNT-16931
+                // Removed the link to the login page, MNT-20200
+                out.println("</head><body><p>Login failed. Please try again.</p>");
+                out.println("</body></html>");
+            }
+        }
+    }
+
+    /**
+     * Include into response authentication method that is supported by fallback mechanism
+     * 
+     * @param context ServletContext
+     * @param req HttpServletRequest
+     * @param resp HttpServletResponse
+     * @throws IOException
+     */
+    protected void includeFallbackAuth(ServletContext context, HttpServletRequest req, HttpServletResponse resp) throws IOException
+    {
+        fallbackDelegate.restartLoginChallenge(context, req, resp);
+    }
+    
+    /**
+     * Delegate authentication to the fallback mechanism
+     * 
+     * @param context ServletContext
+     * @param req HttpServletRequest
+     * @param resp HttpServletResponse
+     * @return boolean
+     * @throws IOException
+     * @throws ServletException
+     */
+    protected boolean performFallbackAuthentication(ServletContext context, HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException
+    {
+        if (getLogger().isTraceEnabled())
+        {
+            getLogger().trace("Performing fallback authentication...");
+        }
+        
+        boolean fallbackSuccess = fallbackDelegate.authenticateRequest(context, req, resp);
+        
+        if (!fallbackSuccess)
+        {
+            restartLoginChallenge(context, req, resp);
+    
+            if (getLogger().isDebugEnabled())
+            {
+                getLogger().debug("Fallback authentication failed. Restarting login...");
+            }
+        }
+    
+        if (fallbackSuccess && getLogger().isDebugEnabled())
+        {
+            getLogger().debug("Fallback authentication succeeded.");
+        }
+        
+        return fallbackSuccess;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptRuntime#getScriptUrl()
+     */
+    private String getScriptUrl(HttpServletRequest req)
+    {
+        // NOTE: Don't use req.getPathInfo() - it truncates the path at first semi-colon in Tomcat
+        final String requestURI = req.getRequestURI();
+        final String serviceContextPath = req.getContextPath() + req.getServletPath();
+        String pathInfo;
+        
+        if (serviceContextPath.length() > requestURI.length())
+        {
+            // NOTE: assume a redirect has taken place e.g. tomcat welcome-page
+            // NOTE: this is unlikely, and we'll take the hit if the path contains a semi-colon
+            pathInfo = req.getPathInfo();
+        }
+        // MNT-13057 fix, do not decode CMIS uris.
+        else if (CMIS_URI_PATTERN.matcher(requestURI).matches())
+        {
+    	   pathInfo = requestURI.substring(serviceContextPath.length());
+        }
+        else
+        {
+            pathInfo = URLDecoder.decode(requestURI.substring(serviceContextPath.length()));
+        }
+        
+        // NOTE: must contain at least root / and single character for tenant name
+        if (pathInfo.length() < 2 || pathInfo.equals("/"))
+        {
+            // url path has no tenant id -> get networks request
+            pathInfo = PublicApiTenantWebScriptServletRequest.NETWORKS_PATH;
+        }
+        else
+        {
+            if(!pathInfo.substring(0, 6).toLowerCase().equals("/cmis/") && !pathInfo.equals("/discovery"))
+            {
+                // remove tenant
+                int idx = pathInfo.indexOf('/', 1);
+                pathInfo = pathInfo.substring(idx == -1 ? pathInfo.length() : idx);
+                if(pathInfo.equals("") || pathInfo.equals("/"))
+                {
+                    // url path is just a tenant id -> get network request
+                    pathInfo = PublicApiTenantWebScriptServletRequest.NETWORK_PATH;
+                }
+            }
+        }
+
+        return pathInfo;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/HTTPRequestAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/HTTPRequestAuthenticationFilter.java
new file mode 100644
index 00000000000..76432d5486c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/HTTPRequestAuthenticationFilter.java
@@ -0,0 +1,316 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.webdav.auth;
+
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.SessionUser;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.security.PersonService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * WebDAV Authentication Filter Class for SSO linke SiteMinder and IChains
+ */
+public class HTTPRequestAuthenticationFilter extends BaseAuthenticationFilter implements Filter
+{
+    // Debug logging
+
+    private static Log logger = LogFactory.getLog(HTTPRequestAuthenticationFilter.class);
+
+    // Servlet context
+
+    private ServletContext m_context;
+
+    private String httpServletRequestAuthHeaderName;
+    
+    private AuthenticationComponent m_authComponent;
+
+    // By default match everything if this is not set
+    private String m_authPatternString = null;
+
+    private Pattern m_authPattern = null;
+
+    /**
+     * Initialize the filter
+     * 
+     * @param config
+     *            FitlerConfig
+     * @exception ServletException
+     */
+    public void init(FilterConfig config) throws ServletException
+    {
+        // Save the context
+
+        m_context = config.getServletContext();
+
+        // Setup the authentication context
+
+        WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(m_context);
+
+        ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
+        setNodeService(serviceRegistry.getNodeService());
+        setAuthenticationService(serviceRegistry.getAuthenticationService());
+        setTransactionService(serviceRegistry.getTransactionService());
+        setPersonService((PersonService) ctx.getBean("PersonService")); // transactional and permission-checked
+        m_authComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
+        
+        httpServletRequestAuthHeaderName = config.getInitParameter("httpServletRequestAuthHeaderName");
+        if(httpServletRequestAuthHeaderName == null)
+        {
+            httpServletRequestAuthHeaderName = "x-user";
+        }
+        this.m_authPatternString = config.getInitParameter("authPatternString");
+        if (this.m_authPatternString != null)
+        {
+            try
+            {
+                m_authPattern = Pattern.compile(this.m_authPatternString);
+            }
+            catch (PatternSyntaxException e)
+            {
+                logger.warn("Invalid pattern: " + this.m_authPatternString, e);
+                m_authPattern = null;
+            }
+        }
+        
+    }
+
+    /**
+     * Run the authentication filter
+     * 
+     * @param req
+     *            ServletRequest
+     * @param resp
+     *            ServletResponse
+     * @param chain
+     *            FilterChain
+     * @exception ServletException
+     * @exception IOException
+     */
+    public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException,
+            ServletException
+    {
+        // Assume it's an HTTP request
+
+        final HttpServletRequest httpReq = (HttpServletRequest) req;
+        HttpServletResponse httpResp = (HttpServletResponse) resp;
+
+        // Get the user details object from the session
+
+        SessionUser user = (SessionUser) httpReq.getSession().getAttribute(AUTHENTICATION_USER);
+
+        if (user == null)
+        {
+            // Check for the auth header
+
+            String authHdr = httpReq.getHeader(httpServletRequestAuthHeaderName);
+            if (logger.isTraceEnabled())
+            {
+                if (authHdr == null)
+                {
+                    logger.trace("Header not found: " + httpServletRequestAuthHeaderName);
+                }
+                else
+                {
+                    logger.trace("Header is <" + authHdr + ">");
+                }
+            }
+
+            // Throw an error if we have an unknown authentication
+
+            if ((authHdr != null) && (authHdr.length() > 0))
+            {
+
+                // Get the user
+
+                final String userName;
+                if (m_authPattern != null)
+                {
+                    Matcher matcher = m_authPattern.matcher(authHdr);
+                    if (matcher.matches())
+                    {
+                        userName = matcher.group();
+                        if ((userName == null) || (userName.length() < 1))
+                        {
+                            if (logger.isDebugEnabled())
+                            {
+                                logger.debug("Extracted null or empty user name from pattern " + m_authPatternString
+                                        + " against " + authHdr);
+                            }
+                            reject(httpReq, httpResp);
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        if (logger.isDebugEnabled())
+                        {
+                            logger.debug("no pattern match for " + m_authPatternString + " against " + authHdr);
+                        }
+                        reject(httpReq, httpResp);
+                        return;
+                    }
+                }
+                else
+                {
+                    userName = authHdr;
+                }
+
+                if (logger.isTraceEnabled())
+                {
+                    logger.trace("User = " + AuthenticationUtil.maskUsername(userName));
+                }
+
+                // Get the authorization header
+
+                user = transactionService.getRetryingTransactionHelper().doInTransaction(
+                        new RetryingTransactionHelper.RetryingTransactionCallback<SessionUser>()
+                        {
+
+                            public SessionUser execute() throws Throwable
+                            {
+                                try
+                                {
+                                    // Authenticate the user
+
+                                    m_authComponent.clearCurrentSecurityContext();
+                                    m_authComponent.setCurrentUser(userName);
+
+                                    return createUserEnvironment(httpReq.getSession(), userName, authenticationService
+                                            .getCurrentTicket(), true);
+                                }
+                                catch (AuthenticationException ex)
+                                {
+                                    if (logger.isDebugEnabled())
+                                    {
+                                        logger.debug("Failed", ex);
+                                    }
+                                    return null;
+                                    // Perhaps auto-creation/import is disabled
+                                }
+                            }
+                        });
+
+            }
+            else
+            {
+                // Check if the request includes an authentication ticket
+
+                String ticket = req.getParameter(ARG_TICKET);
+
+                if (ticket != null && ticket.length() > 0)
+                {
+                    // Debug
+
+                    if (logger.isTraceEnabled())
+                    {
+                        logger.trace("Logon via ticket from " + req.getRemoteHost() + " (" + req.getRemoteAddr() + ":" + req.getRemotePort() + ")" +
+                            " ticket=" + ticket);
+                    }
+
+                    try
+                    {
+                        // Validate the ticket
+                        authenticationService.validate(ticket);
+
+                        // Need to create the User instance if not already available
+                        user = createUserEnvironment(httpReq.getSession(), authenticationService.getCurrentUserName(),
+                                ticket, true);
+                    }
+                    catch (AuthenticationException authErr)
+                    {
+                        // Clear the user object to signal authentication failure
+                        if (logger.isDebugEnabled())
+                        {
+                            logger.debug("Failed", authErr);
+                        }
+                        user = null;
+                    }
+                }
+            }
+
+            // Check if the user is authenticated, if not then prompt again
+
+            if (user == null)
+            {
+                // No user/ticket, force the client to prompt for logon details
+                reject(httpReq, httpResp);
+                return;
+            }
+        }
+
+        // Chain other filters
+
+        chain.doFilter(req, resp);
+    }
+
+    private void reject( HttpServletRequest httpReq, HttpServletResponse httpResp) throws IOException
+    {
+        httpResp.setHeader("WWW-Authenticate", "BASIC realm=\"Alfresco DAV Server\"");
+        httpResp.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+        httpResp.flushBuffer();
+        return;
+    }
+    
+    /**
+     * Cleanup filter resources
+     */
+    public void destroy()
+    {
+        // Nothing to do
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.webdav.auth.BaseAuthenticationFilter#getLogger()
+     */
+    @Override
+    protected Log getLogger()
+    {
+        return logger;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/HTTPRequestAuthenticationFilterTestFilter.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/HTTPRequestAuthenticationFilterTestFilter.java
new file mode 100644
index 00000000000..7d942519ed0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/HTTPRequestAuthenticationFilterTestFilter.java
@@ -0,0 +1,139 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.webdav.auth;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * This filter simply sets a request header to test the SSO filters
+ */
+public class HTTPRequestAuthenticationFilterTestFilter implements Filter
+{
+
+    private String httpServletRequestAuthHeaderName;
+
+    private String userName;
+
+    /**
+     * Initialize the filter
+     * 
+     * @param config
+     *            FitlerConfig
+     * @exception ServletException
+     */
+    public void init(FilterConfig config) throws ServletException
+    {
+        httpServletRequestAuthHeaderName = config.getInitParameter("httpServletRequestAuthHeaderName");
+        if (httpServletRequestAuthHeaderName == null)
+        {
+            httpServletRequestAuthHeaderName = "x-user";
+        }
+
+        userName = config.getInitParameter("userName");
+        if (userName == null)
+        {
+            userName = "guest";
+        }
+    }
+
+    /**
+     * Run the authentication filter
+     * 
+     * @param req
+     *            ServletRequest
+     * @param resp
+     *            ServletResponse
+     * @param chain
+     *            FilterChain
+     * @exception ServletException
+     * @exception IOException
+     */
+    public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException
+    {
+        // Assume it's an HTTP request
+
+        HttpServletRequest httpReq = (HttpServletRequest) req;
+        chain.doFilter(getProxy(httpReq), resp);
+    }
+
+    /**
+     * Cleanup filter resources
+     */
+    public void destroy()
+    {
+        // Nothing to do
+    }
+
+    private HttpServletRequest getProxy(HttpServletRequest req)
+    {
+        HttpServletRequest proxy = (HttpServletRequest) Proxy.newProxyInstance(HttpServletRequest.class.getClassLoader(), new Class[] { HttpServletRequest.class },
+                new Handler(req));
+        return proxy;
+    }
+
+    class Handler implements InvocationHandler
+    {
+        HttpServletRequest httpReq;
+
+        Handler(HttpServletRequest httpReq)
+        {
+            this.httpReq = httpReq;
+        }
+
+        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+        {
+            if (method.getName().equals("getHeader"))
+            {
+                Object arg0 = args[0];
+                if (arg0 != null)
+                {
+                    if (arg0 instanceof String)
+                    {
+                        String headerName = (String) arg0;
+                        if (headerName.equals(httpServletRequestAuthHeaderName))
+                        {
+                            return userName;
+                        }
+                    }
+                }
+            }
+            return method.invoke(httpReq, args);
+        }
+
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/KerberosAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/KerberosAuthenticationFilter.java
new file mode 100644
index 00000000000..6a019a950bc
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/KerberosAuthenticationFilter.java
@@ -0,0 +1,107 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav.auth;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.alfresco.repo.web.auth.WebCredentials;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * WebDAV Kerberos Authentication Filter Class
+ * 
+ * @author GKSpencer
+ */
+public class KerberosAuthenticationFilter extends BaseKerberosAuthenticationFilter
+{
+    // Debug logging
+    private static Log logger = LogFactory.getLog(KerberosAuthenticationFilter.class);
+
+    @Override
+    public String getLoginPageLink()
+    {
+        return loginPageLink;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#onValidateFailed(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.http.HttpSession)
+     */
+    @Override
+    protected void onValidateFailed(ServletContext sc, HttpServletRequest req, HttpServletResponse res, HttpSession session, WebCredentials credentials)
+        throws IOException
+    {
+        super.onValidateFailed(sc, req, res, session, credentials);
+        // Restart the login challenge process if validation fails
+        restartLoginChallenge(sc, req, res);
+    }
+    
+    /* (non-Javadoc)
+     * 
+     * @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#getLogger()
+     */
+    @Override
+    protected Log getLogger()
+    {
+        return logger;
+    }
+
+    @Override
+    protected boolean checkLoginPage(HttpServletRequest req, HttpServletResponse resp)
+    {
+        return (req.getRequestURI().endsWith("/jsp/login.jsp"));
+    }
+    
+    /**
+     * Writes link to login page and refresh tag which cause user
+     * to be redirected to the login page.
+     *
+     * @param context ServletContext
+     * @param req HttpServletRequest
+     * @param resp HttpServletResponse
+     * @throws IOException
+     */
+    @Override
+    protected void writeLoginPageLink(ServletContext context, HttpServletRequest req, HttpServletResponse resp) throws IOException
+    {
+        resp.setContentType(MIME_HTML_TEXT);
+
+        try (PrintWriter out = resp.getWriter())
+        {
+            out.println("<html><head>");
+            // Removed the auto refresh to avoid refresh loop, MNT-16931
+            // Removed the link to the login page, MNT-20200
+            out.println("</head><body><p>Login failed. Please try again.</p>");
+            out.println("</body></html>");
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/SSOFallbackBasicAuthenticationDriver.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/SSOFallbackBasicAuthenticationDriver.java
new file mode 100644
index 00000000000..016b1a64633
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/SSOFallbackBasicAuthenticationDriver.java
@@ -0,0 +1,210 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav.auth;
+
+import java.io.IOException;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.SessionUser;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.Authorization;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.transaction.TransactionService;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * <p>
+ * Basic HTTP web authentication implementation. Main purpose to use as fallback authentication with SSO filters.
+ * </p>
+ * 
+ * @author pavel.yurkevich
+ */
+public class SSOFallbackBasicAuthenticationDriver implements AuthenticationDriver
+{
+    private Log logger = LogFactory.getLog(SSOFallbackBasicAuthenticationDriver.class);
+    
+    private AuthenticationService authenticationService;
+    private PersonService personService;
+    private NodeService nodeService;
+    private TransactionService transactionService;
+    
+    private String userAttributeName = AuthenticationDriver.AUTHENTICATION_USER;
+
+    public void setAuthenticationService(AuthenticationService authenticationService)
+    {
+        this.authenticationService = authenticationService;
+    }
+
+    public void setPersonService(PersonService personService)
+    {
+        this.personService = personService;
+    }
+    
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+    
+    public void setTransactionService(TransactionService transactionService)
+    {
+        this.transactionService = transactionService;
+    }
+
+    public void setUserAttributeName(String userAttributeName)
+    {
+        this.userAttributeName = userAttributeName;
+    }
+    
+    @Override
+    public boolean authenticateRequest(ServletContext context, HttpServletRequest request, HttpServletResponse response)
+            throws IOException, ServletException
+    {
+        String authHdr = request.getHeader("Authorization");
+        HttpSession session = request.getSession(false);
+        SessionUser user = session == null ? null : (SessionUser) session.getAttribute(userAttributeName);
+        if (user == null)
+        {
+            if (authHdr != null && authHdr.length() > 5 && authHdr.substring(0, 5).equalsIgnoreCase("Basic"))
+            {
+                String basicAuth = new String(Base64.decodeBase64(authHdr.substring(5).getBytes()));
+                String username = null;
+                String password = null;
+    
+                int pos = basicAuth.indexOf(":");
+                if (pos != -1)
+                {
+                    username = basicAuth.substring(0, pos);
+                    password = basicAuth.substring(pos + 1);
+                }
+                else
+                {
+                    username = basicAuth;
+                    password = "";
+                }
+    
+                try
+                {
+                    if (logger.isTraceEnabled())
+                    {
+                        logger.trace("Authenticating user '" + AuthenticationUtil.maskUsername(username) + "'");
+                    }
+    
+                    Authorization auth = new Authorization(username, password);
+                    if (auth.isTicket())
+                    {
+                        authenticationService.validate(auth.getTicket());
+                    }
+                    else
+                    {
+                        authenticationService.authenticate(username, password.toCharArray());
+                    }
+
+                    final RetryingTransactionCallback<SessionUser> callback = new RetryingTransactionCallback<SessionUser>()
+                    {
+                        @Override
+                        public SessionUser execute() throws Throwable
+                        {
+                            NodeRef personNodeRef = personService.getPerson(authenticationService.getCurrentUserName());
+                            String username = (String) nodeService.getProperty(personNodeRef, ContentModel.PROP_USERNAME);
+                            NodeRef homeSpaceRef = (NodeRef) nodeService.getProperty(personNodeRef, ContentModel.PROP_HOMEFOLDER);
+                            
+                            return new WebDAVUser(username, authenticationService.getCurrentTicket(), homeSpaceRef);
+                        }
+                    };
+                    
+                    user = AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<SessionUser>()
+                    {
+                        public SessionUser doWork() throws Exception
+                        {
+                            return transactionService.getRetryingTransactionHelper().doInTransaction(callback, true);
+                        }
+                    }, AuthenticationUtil.SYSTEM_USER_NAME);
+                    
+                    if (logger.isTraceEnabled())
+                    {
+                        logger.trace("Authenticated user '" + AuthenticationUtil.maskUsername(username) + "'");
+                    }
+                    
+                    request.getSession().setAttribute(userAttributeName, user);
+                    return true;
+                }
+                catch (AuthenticationException ex)
+                {
+                    // Do nothing, user object will be null
+                    if (logger.isDebugEnabled())
+                    {
+                        logger.debug(ex.getMessage(), ex);
+                    }
+                }
+            }
+        }
+        else
+        {
+            try
+            {
+                authenticationService.validate(user.getTicket());
+                return true;
+            }
+            catch (AuthenticationException ex)
+            {
+                session.invalidate();
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug(ex.getMessage(), ex);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public void restartLoginChallenge(ServletContext context, HttpServletRequest request, HttpServletResponse response)
+            throws IOException
+    {
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Including Basic HTTP authentication into response headers...");
+        }
+
+        response.addHeader("WWW-Authenticate", "Basic realm=\"Alfresco Server\"");
+        response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/SharepointConstants.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/SharepointConstants.java
new file mode 100644
index 00000000000..5ac00c44233
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/SharepointConstants.java
@@ -0,0 +1,39 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav.auth;
+
+/**
+ * A place to put Sharepoint specific authentication constants.
+ * 
+ * @author dward
+ */
+public interface SharepointConstants
+{
+
+    /** The session attribute under which sharepoint {@link AuthenticationDriver}s store their user objects. */
+    public final static String USER_SESSION_ATTRIBUTE = "_vtiAuthTicket";
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/repo/webdav/auth/WebDAVUser.java b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/WebDAVUser.java
new file mode 100644
index 00000000000..2c722e6e784
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/repo/webdav/auth/WebDAVUser.java
@@ -0,0 +1,142 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.webdav.auth;
+
+import org.alfresco.repo.SessionUser;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * WebDAV User Class
+ * 
+ * <p>Contains the details of an authenticated WebDAV user
+ * 
+ * @author GKSpencer
+ */
+public class WebDAVUser implements SessionUser
+{
+    private static final long serialVersionUID = -6948146071131901345L;
+
+    // User name
+    
+    private String m_userName;
+    
+    //  Authentication ticket
+    
+    private String m_ticket;
+    
+    // User home node
+    
+    private NodeRef m_homeNode;
+    
+    /**
+     * Class constructor
+     * 
+     * @param user String
+     * @param ticket String
+     * @param homeNode NodeRef
+     */
+    public WebDAVUser(String user, String ticket, NodeRef homeNode)
+    {
+        m_userName = user;
+        m_ticket   = ticket;
+        m_homeNode = homeNode;
+    }
+    
+    /**
+     * Return the user name
+     * 
+     * @return String
+     */
+    public final String getUserName()
+    {
+        return m_userName;
+    }
+    
+    /**
+     * Return the ticket
+     * 
+     * @return String
+     */
+    public final String getTicket()
+    {
+        return m_ticket;
+    }
+    
+    /**
+     * Check if the user has a home node
+     * 
+     * @return boolean
+     */
+    public final boolean hasHomeNode()
+    {
+        return m_homeNode != null ? true : false;
+    }
+
+    /**
+     * Return the user home node
+     * 
+     * @return NodeRef
+     */
+    public final NodeRef getHomeNode()
+    {
+        return m_homeNode;
+    }
+    
+    /**
+     * Set the home folder node for this user
+     * 
+     * @param homeNode NodeRef
+     */
+    protected final void setHomeNode(NodeRef homeNode)
+    {
+        m_homeNode = homeNode;
+    }
+    
+    /**
+     * Return the user details as a string
+     * 
+     * @return String
+     */
+    public String toString()
+    {
+        StringBuilder str = new StringBuilder();
+        
+        str.append("[");
+        str.append(getUserName());
+        str.append(":");
+        str.append(getTicket());
+        
+        if ( hasHomeNode())
+        {
+            str.append(",Home=");
+            str.append(getHomeNode());
+        }
+        str.append("]");
+        
+        return str.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Actions.java b/remote-api/src/main/java/org/alfresco/rest/api/Actions.java
new file mode 100644
index 00000000000..e45fa3ce605
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Actions.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api;
+
+
+import org.alfresco.rest.api.model.Action;
+import org.alfresco.rest.api.model.ActionDefinition;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+public interface Actions
+{
+    CollectionWithPagingInfo<ActionDefinition> getActionDefinitions(NodeRef nodeRef, Parameters params);
+
+    CollectionWithPagingInfo<ActionDefinition> getActionDefinitions(Parameters params);
+
+    ActionDefinition getActionDefinitionById(String actionDefinitionId);
+    
+    enum SortKey
+    {
+        NAME,
+        TITLE
+    };
+    
+    Action executeAction(Action action, Parameters parameters);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Activities.java b/remote-api/src/main/java/org/alfresco/rest/api/Activities.java
new file mode 100644
index 00000000000..590f5c236e3
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Activities.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import java.util.Map;
+
+import org.alfresco.sync.repo.Client;
+import org.alfresco.repo.domain.activities.ActivityFeedEntity;
+import org.alfresco.rest.api.model.Activity;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.json.JSONException;
+
+public interface Activities
+{
+	static final String APP_TOOL = "restapi";
+	static final Client RESTAPI_CLIENT = Client.asType(Client.ClientType.restapi);
+
+	public static enum ActivityWho
+	{
+		me, others;
+	};
+
+	public Map<String, Object> getActivitySummary(ActivityFeedEntity entity) throws JSONException;
+    public CollectionWithPagingInfo<Activity> getUserActivities(String personId, final Parameters parameters);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Audit.java b/remote-api/src/main/java/org/alfresco/rest/api/Audit.java
new file mode 100644
index 00000000000..fc3c3e4dc1e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Audit.java
@@ -0,0 +1,121 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import org.alfresco.rest.api.model.AuditApp;
+import org.alfresco.rest.api.model.AuditEntry;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+/**
+ * Handles audit (applications & entries)
+ *
+ * @author janv, anechifor, eknizat
+ */
+public interface Audit
+{
+    String VALUES_VALUE = "valuesValue";
+    String VALUES_KEY = "valuesKey";
+    String CREATED_BY_USER = "createdByUser";
+    String CREATED_AT = "createdAt";
+    String ID = "id";
+    String PARAM_INCLUDE_VALUES = "values";
+    String PARAM_INCLUDE_MAX = "max";
+    String PARAM_INCLUDE_MIN = "min";
+
+    /**
+     * Gets a single audit application by id
+     * 
+     * @param auditAppId
+     * @param parameters
+     * @return an audit app
+     */
+    AuditApp getAuditApp(String auditAppId, Parameters parameters);
+
+    /**
+     * Lists audit applications
+     * 
+     * @param paging
+     * @return Collection of audit apps
+     */
+    CollectionWithPagingInfo<AuditApp> getAuditApps(Paging paging);
+
+    /**
+     * Updates a single audit application by id
+     * 
+     * @param auditAppId
+     * @param auditApp
+     * @param parameters
+     * @return an audit entry
+     */
+    AuditApp update(String auditAppId, AuditApp auditApp, Parameters parameters);
+
+    /**
+     * Get a single audit entry by id
+     *
+     * @param auditAppId
+     * @param auditEntryId
+     * @param parameters
+     * @return an audit entry
+     */
+    AuditEntry getAuditEntry(String auditAppId, long auditEntryId, Parameters parameters);
+
+    /**
+     * Lists audit entries
+     * 
+     * @param auditAppId
+     *            if null then across all audit apps
+     * @param parameters
+     * @return Collection of audit entries
+     */
+     CollectionWithPagingInfo<AuditEntry> listAuditEntries(String auditAppId, Parameters parameters);
+
+    /**
+     * Delete a single audit entry by id
+     *
+     * @param auditAppId
+     * @param auditEntryId
+     * @param parameters
+     */
+    void deleteAuditEntry(String auditAppId, long auditEntryId, Parameters parameters);
+
+    /**
+     * Delete set of audit entities
+     *
+     * @param auditAppId
+     * @param parameters - required - delete is based on "where" query
+     */
+    void deleteAuditEntries(String auditAppId, Parameters parameters);
+
+    /**
+     * 
+     * @param nodeId
+     * @param parameters
+     * @return
+     */
+    CollectionWithPagingInfo<AuditEntry> listAuditEntriesByNodeId(String nodeId, Parameters parameters);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Authentications.java b/remote-api/src/main/java/org/alfresco/rest/api/Authentications.java
new file mode 100644
index 00000000000..b21dae68733
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Authentications.java
@@ -0,0 +1,45 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api;
+
+import org.alfresco.rest.api.model.LoginTicket;
+import org.alfresco.rest.api.model.LoginTicketResponse;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public interface Authentications
+{
+
+    LoginTicketResponse createTicket(LoginTicket loginRequest, Parameters parameters);
+
+    LoginTicketResponse validateTicket(String me, Parameters parameters, WithResponse withResponse);
+
+    void deleteTicket(String me, Parameters parameters, WithResponse withResponse);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Comments.java b/remote-api/src/main/java/org/alfresco/rest/api/Comments.java
new file mode 100644
index 00000000000..fce22fcc7a6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Comments.java
@@ -0,0 +1,45 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import org.alfresco.rest.api.model.Comment;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+
+import java.util.List;
+
+/**
+ * 
+ * @author steveglover
+ * @since publicapi1.0
+ */
+public interface Comments
+{
+    public Comment createComment(String nodeId, Comment comment);
+    public Comment updateComment(String nodeId, Comment comment);
+    public void deleteComment(String nodeId, String commentNodeId);
+    public CollectionWithPagingInfo<Comment> getComments(String nodeId, Paging paging, List<String> include);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/CustomModels.java b/remote-api/src/main/java/org/alfresco/rest/api/CustomModels.java
new file mode 100644
index 00000000000..c9ef74f8701
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/CustomModels.java
@@ -0,0 +1,227 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api;
+
+import org.alfresco.repo.dictionary.M2Model;
+import org.alfresco.rest.api.model.CustomAspect;
+import org.alfresco.rest.api.model.CustomModel;
+import org.alfresco.rest.api.model.CustomModelConstraint;
+import org.alfresco.rest.api.model.CustomModelDownload;
+import org.alfresco.rest.api.model.CustomType;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public interface CustomModels
+{
+    /**
+     * Gets the {@code org.alfresco.rest.api.model.CustomModel} representation for the given model
+     * 
+     * @param modelName the model name
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     * @return {@code org.alfresco.rest.api.model.CustomModel} object
+     */
+    public CustomModel getCustomModel(String modelName, Parameters parameters);
+
+    /**
+     * Gets a paged list of all custom models
+     * 
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     * @return a paged list of {@code org.alfresco.rest.api.model.CustomModel} objects
+     */
+    public CollectionWithPagingInfo<CustomModel> getCustomModels(Parameters parameters);
+
+    /**
+     * Creates custom model
+     * 
+     * @param model the custom model to create
+     * @return {@code org.alfresco.rest.api.model.CustomModel} object
+     */
+    public CustomModel createCustomModel(CustomModel model);
+
+    /**
+     * Creates custom model from the imported {@link M2Model}.
+     * 
+     * @param m2Model the model
+     * @return {@code org.alfresco.rest.api.model.CustomModel} object
+     */
+    public CustomModel createCustomModel(M2Model m2Model);
+
+    /**
+     * Updates or activates/deactivates the custom model
+     * 
+     * @param modelName the model name
+     * @param model the custom model to update (JSON payload)
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     * @return {@code org.alfresco.rest.api.model.CustomModel} object
+     */
+    public CustomModel updateCustomModel(String modelName, CustomModel model, Parameters parameters);
+
+    /**
+     * Deletes the custom model
+     * 
+     * @param modelName the model name
+     */
+    public void deleteCustomModel(String modelName);
+
+    /**
+     * Gets the {@code org.alfresco.rest.api.model.CustomType} representation of
+     * the given model's type
+     *
+     * @param modelName the model name
+     * @param typeName the model's type name
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     * @return {@code org.alfresco.rest.api.model.CustomType} object
+     */
+    public CustomType getCustomType(String modelName, String typeName, Parameters parameters);
+
+    /**
+     * Gets a paged list of all the given custom model's types
+     * 
+     * @param modelName the model name
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     * @return a paged list of {@code org.alfresco.rest.api.model.CustomType} objects
+     */
+    public CollectionWithPagingInfo<CustomType> getCustomTypes(String modelName, Parameters parameters);
+
+    /**
+     * Creates custom model's type
+     * 
+     * @param modelName the model name
+     * @param type the custom type to create within the given model
+     * @return {@code org.alfresco.rest.api.model.CustomType} object
+     */
+    public CustomType createCustomType(String modelName, CustomType type);
+
+    /**
+     * Updates the custom model's type
+     * 
+     * @param modelName the model name
+     * @param type the custom model's type to update (JSON payload)
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     * @return {@code org.alfresco.rest.api.model.CustomType} object
+     */
+    public CustomType updateCustomType(String modelName, CustomType type, Parameters parameters);
+
+    /**
+     * Deletes the custom model's type
+     * 
+     * @param modelName the model name
+     * @param typeName the model's type name
+     */
+    public void deleteCustomType(String modelName, String typeName);
+
+    /**
+     * Gets the {@code org.alfresco.rest.api.model.CustomAspect} representation of
+     * the given model's aspect
+     *
+     * @param modelName the model name
+     * @param aspectName the model's aspect name
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     * @return {@code org.alfresco.rest.api.model.CustomAspect} object
+     */
+    public CustomAspect getCustomAspect(String modelName, String aspectName, Parameters parameters);
+
+    /**
+     * Gets a paged list of all the given custom model's aspects
+     * 
+     * @param modelName the model name
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     * @return a paged list of {@code org.alfresco.rest.api.model.CustomAspect} objects
+     */
+    public CollectionWithPagingInfo<CustomAspect> getCustomAspects(String modelName, Parameters parameters);
+
+    /**
+     * Creates custom model's aspect
+     * 
+     * @param modelName the model name
+     * @param aspect the custom aspect to create within the given model
+     * @return {@code org.alfresco.rest.api.model.CustomAspect} object
+     */
+    public CustomAspect createCustomAspect(String modelName, CustomAspect aspect);
+
+    /**
+     * Updates the custom model's aspect
+     * 
+     * @param modelName the model name
+     * @param aspect the custom model's aspect to update (JSON payload)
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     * @return {@code org.alfresco.rest.api.model.CustomAspect} object
+     */
+    public CustomAspect updateCustomAspect(String modelName, CustomAspect aspect, Parameters parameters);
+
+    /**
+     * Deletes the custom model's aspect
+     * 
+     * @param modelName the model name
+     * @param aspectName the model's aspect name
+     */
+    public void deleteCustomAspect(String modelName, String aspectName);
+
+    /**
+     * Gets the {@code org.alfresco.rest.api.model.CustomModelConstraint}
+     * representation of the given model's constraint
+     * 
+     * @param modelName the model name
+     * @param constraintName the model's constraint name
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     * @return {@code org.alfresco.rest.api.model.CustomModelConstraint} object
+     */
+    public CustomModelConstraint getCustomModelConstraint(String modelName, String constraintName, Parameters parameters);
+
+    /**
+     * Gets a paged list of all of the given custom model's constraints
+     * 
+     * @param modelName the model name
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     * @return a paged list of {@code org.alfresco.rest.api.model.CustomModelConstraint} objects
+     */
+    public CollectionWithPagingInfo<CustomModelConstraint> getCustomModelConstraints(String modelName, Parameters parameters);
+
+    /**
+     * Creates custom model's constraint
+     * 
+     * @param modelName the model name
+     * @param constraint the custom constraint to create within the given model
+     * @return {@code org.alfresco.rest.api.model.CustomModelConstraint} object
+     */
+    public CustomModelConstraint createCustomModelConstraint(String modelName, CustomModelConstraint constraint);
+
+    /**
+     * Starts the creation of a downloadable archive file containing the
+     * custom model file and its associated Share extension module file (if requested).
+     * 
+     * @param modelName the model name
+     * @param parameters the {@link Parameters} object to get the parameters
+     *            passed into the request
+     * @return {@code org.alfresco.rest.api.model.CustomModelDownload} object
+     *         containing the archive node reference
+     */
+    public CustomModelDownload createDownload(String modelName, Parameters parameters);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/DeletedNodes.java b/remote-api/src/main/java/org/alfresco/rest/api/DeletedNodes.java
new file mode 100644
index 00000000000..1b2a568e4da
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/DeletedNodes.java
@@ -0,0 +1,102 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import java.util.Map;
+
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.NodeTargetAssoc;
+import org.alfresco.rest.api.model.Rendition;
+import org.alfresco.rest.api.model.UserInfo;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+/**
+ * Handles trashcan / deleted nodes
+ *
+ * @author Gethin James
+ */
+public interface DeletedNodes
+{
+    /**
+     * Lists deleted nodes using a ArchivedNodesCannedQuery
+     * @param parameters
+     * @return Collection of deleted Nodes
+     */
+    CollectionWithPagingInfo<Node> listDeleted(Parameters parameters);
+
+    /**
+     * Gets a single deleted node by id.
+     * @param originalId
+     * @param parameters
+     * @param fullnode Should we return the full representation of the minimal one?
+     * @param mapUserInfo
+     * @return a deleted node
+     */
+    Node getDeletedNode(String originalId, Parameters parameters, boolean fullnode, Map<String, UserInfo> mapUserInfo);
+
+    /**
+     * Restores a deleted node and returns it.
+     * 
+     * @param archivedId
+     * @param nodeTargetAssoc
+     *            - optional
+     * @return the new undeleted node.
+     */
+    Node restoreArchivedNode(String archivedId, NodeTargetAssoc nodeTargetAssoc);
+
+    /**
+     * Permanently delete the node.
+     * @param archivedId
+     */
+    void purgeArchivedNode(String archivedId);
+
+    /**
+     * Download file content (or rendition content) via archived node.
+     *
+     * @param archivedId
+     * @param renditionId
+     *            - optional
+     * @param parameters
+     *            {@link Parameters}
+     * @return
+     */
+    BinaryResource getContent(String archivedId, String renditionId, Parameters parameters);
+
+    /**
+     * @param archivedId
+     * @param renditionId
+     * @return
+     */
+    Rendition getRendition(String archivedId, String renditionId, Parameters parameters);
+
+    /**
+     * @param archivedId
+     * @return
+     */
+    CollectionWithPagingInfo<Rendition> getRenditions(String archivedId, Parameters parameters);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Downloads.java b/remote-api/src/main/java/org/alfresco/rest/api/Downloads.java
new file mode 100644
index 00000000000..dea9eb45525
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Downloads.java
@@ -0,0 +1,59 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import org.alfresco.rest.api.model.Download;
+
+/**
+ * downloads API
+ * 
+ * @author cpopa
+ *
+ */
+public interface Downloads
+{
+    /**
+     * Creates a download:download node.
+     * 
+     * @param download
+     * @return information about the newly created download:download node
+     */
+    Download createDownloadNode(Download download);
+
+    /**
+     * Get status info about a download node.
+     * 
+     * @param downloadNodeId
+     * @return status info about a download:download node
+     */
+    Download getDownloadStatus(String downloadNodeId);
+    
+    /**
+     * Stop the zip creation if still in progress
+     * @param downloadNodeId
+     */
+    void cancel(String downloadNodeId);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Favourites.java b/remote-api/src/main/java/org/alfresco/rest/api/Favourites.java
new file mode 100644
index 00000000000..7919b929f42
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Favourites.java
@@ -0,0 +1,96 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import org.alfresco.rest.api.model.Favourite;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+/**
+ * Centralises access to favourites functionality and maps between representations repository and api representations.
+ * 
+ * @author steveglover
+ * @since publicapi1.0
+ */
+public interface Favourites
+{
+    String PARAM_INCLUDE_PATH = Nodes.PARAM_INCLUDE_PATH;
+
+    String PARAM_INCLUDE_PROPERTIES = Nodes.PARAM_INCLUDE_PROPERTIES;
+
+    /**
+     * Add a favourite for user personId
+     *
+     * @param personId the personId for which the favourite is to be added
+     * @param favourite the favourite to add
+     */
+    Favourite addFavourite(String personId, Favourite favourite);
+
+    /**
+     * Add a favourite for user personId taking parameters into account
+     *
+     * @param personId   the personId for which the favourite is to be added
+     * @param favourite  the favourite to add
+     * @param parameters the parameters
+     */
+    Favourite addFavourite(String personId, Favourite favourite, Parameters parameters);
+
+    /**
+     * Add a favourite for user personId
+     *
+     * @param personId the personId for which the favourite is to be removed
+     * @param id the id of the favourite to remove (id is a uuid)
+     */
+    void removeFavourite(String personId, String id);
+
+    /**
+     * Get a paged list of favourites for user personId
+     *
+     * @param personId the personId for which the favourite is to be removed
+     * @param parameters Parameters
+     * @return paged favourites
+     */
+    CollectionWithPagingInfo<Favourite> getFavourites(String personId, final Parameters parameters);
+
+    /**
+     * Get a specific favourite for user personId
+     *
+     * @param personId the personId for which the favourite is to be removed
+     * @param favouriteId the favourite id
+     * @return the favourite
+     */
+    Favourite getFavourite(String personId, String favouriteId);
+
+    /**
+     * Get a specific favourite for user personId taking parameters into account
+     *
+     * @param personId    the personId for which the favourite is to be removed
+     * @param favouriteId the favourite id
+     * @param parameters  the parameters
+     * @return the favourite
+     */
+    Favourite getFavourite(String personId, String favouriteId, Parameters parameters);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Groups.java b/remote-api/src/main/java/org/alfresco/rest/api/Groups.java
new file mode 100644
index 00000000000..53eb2203875
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Groups.java
@@ -0,0 +1,150 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import org.alfresco.rest.api.model.Group;
+import org.alfresco.rest.api.model.GroupMember;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+/**
+ * Groups API
+ *
+ * @author cturlica
+ */
+public interface Groups
+{
+    String PARAM_ID = "id";
+    String PARAM_DISPLAY_NAME = "displayName";
+    String PARAM_INCLUDE_PARENT_IDS = "parentIds";
+    String PARAM_INCLUDE_ZONES = "zones";
+    String PARAM_IS_ROOT = "isRoot";
+    String PARAM_CASCADE = "cascade";
+    String PARAM_MEMBER_TYPE = "memberType";
+    String PARAM_MEMBER_TYPE_GROUP = "GROUP";
+    String PARAM_MEMBER_TYPE_PERSON = "PERSON";
+
+    /**
+     * Create a group.
+     *
+     * @param group the group to create.
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     *        including:
+     *        - include param (parentIds, zones)
+     * @return a {@code org.alfresco.rest.api.model.Group} object
+     */
+    Group create(Group group, Parameters parameters);
+
+    /**
+     * Update the given group. Not all fields are used, only those as defined in
+     * the Open API spec.
+     *
+     * @param groupId
+     *            the group ID
+     * @param group
+     *            details to use for the update
+     * @param parameters
+     *            the {@link Parameters} object to get the parameters passed
+     *            into the request including: - include param (parentIds, zones)
+     * @return Updated group
+     */
+    Group update(String groupId, Group group, Parameters parameters);
+
+    /**
+     * Get a group by it's id.
+     *
+     * @param groupId the identifier of a group.
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     *        including:
+     *        - include param (parentIds, zones)
+     * @return a {@code org.alfresco.rest.api.model.Group} object
+     * @throws EntityNotFoundException
+     */
+    Group getGroup(String groupId, Parameters parameters) throws EntityNotFoundException;
+
+    /**
+     * Gets a list of groups.
+     * 
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     *        including:
+     *        - filter, sort & paging params (where, orderBy, skipCount, maxItems)
+     *        - include param (parentIds, zones)
+     * @return a paged list of {@code org.alfresco.rest.api.model.Group} objects
+     */
+    CollectionWithPagingInfo<Group> getGroups(Parameters parameters);
+
+    /**
+     * Gets the list of groups for which the specified person is a member.
+     *
+     * @param personId the person's ID ("-me-" may be used as an alias for the current user.)
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     *        including:
+     *        - sort & paging params (orderBy, skipCount, maxItems)
+     * @return a paged list of {@code org.alfresco.rest.api.model.Group} objects
+     */
+    CollectionWithPagingInfo<Group> getGroupsByPersonId(String personId, Parameters parameters);
+
+    /**
+     * Delete the given group.
+     *
+     * @param groupId
+     *            the group ID
+     * @param parameters
+     *            the {@link Parameters} object to get the parameters passed
+     *            into the request including: - include param (parentIds, zones)
+     */
+    void delete(String groupId, Parameters parameters);
+
+    /**
+     * Gets a list of groups.
+     *
+     * @param groupId the identifier of a group.
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     *        including:
+     *        - filter, sort & paging params (where, orderBy, skipCount, maxItems)
+     *        - include param (parentIds, zones)
+     * @return a paged list of {@code org.alfresco.rest.api.model.GroupMember} objects
+     */
+    CollectionWithPagingInfo<GroupMember> getGroupMembers(String groupId, Parameters parameters);
+
+    /**
+     * Create a group member.
+     *
+     * @param groupId the identifier of a group.
+     * @return a {@code org.alfresco.rest.api.model.GroupMember} object
+     */
+    GroupMember createGroupMember(String groupId, GroupMember groupMember);
+
+    /**
+     *
+     * Delete group membership
+     *
+     * @param groupId
+     * @param groupMemberId
+     */
+    void deleteGroupMembership(String groupId, String groupMemberId);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/NetworkWebScriptGet.java b/remote-api/src/main/java/org/alfresco/rest/api/NetworkWebScriptGet.java
new file mode 100644
index 00000000000..c1a17aa8ab6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/NetworkWebScriptGet.java
@@ -0,0 +1,119 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.rest.api.model.PersonNetwork;
+import org.alfresco.rest.api.networks.NetworksEntityResource;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.exceptions.ApiException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper.Writer;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.tools.ResponseWriter;
+import org.alfresco.rest.framework.webscripts.ApiWebScript;
+import org.alfresco.rest.framework.webscripts.ResourceWebScriptHelper;
+import org.springframework.extensions.webscripts.Format;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+public class NetworkWebScriptGet extends ApiWebScript implements ResponseWriter
+{
+	private Networks networks;
+    private ResourceWebScriptHelper helper;
+    
+	public void setHelper(ResourceWebScriptHelper helper)
+	{
+		this.helper = helper;
+	}
+
+	public void setNetworks(Networks networks)
+	{
+		this.networks = networks;
+	}
+
+    @Override
+    public void execute(final Api api, final WebScriptRequest req, final WebScriptResponse res) throws IOException
+    {
+        try
+        {
+            transactionService.getRetryingTransactionHelper().doInTransaction(
+            new RetryingTransactionCallback<Void>()
+            {
+                @Override
+                public Void execute() throws Throwable
+                {
+                    // apply content type
+                    res.setContentType(Format.JSON.mimetype() + ";charset=UTF-8");
+
+                    assistant.getJsonHelper().withWriter(res.getOutputStream(), new Writer()
+                    {
+                        @Override
+                        public void writeContents(JsonGenerator generator, ObjectMapper objectMapper)
+                                    throws JsonGenerationException, JsonMappingException, IOException
+                        {
+                            String personId = AuthenticationUtil.getFullyAuthenticatedUser();
+                            String networkId = TenantUtil.getCurrentDomain();
+            
+                            PersonNetwork networkMembership = networks.getNetwork(personId, networkId);
+                            if(networkMembership != null)
+                            {
+                                // TODO this is not ideal, but the only way to populate the embedded network entities (this would normally be
+                                // done automatically by the api framework).
+                                Object wrapped = helper.processAdditionsToTheResponse(res, Api.ALFRESCO_PUBLIC, NetworksEntityResource.NAME, Params.valueOf(personId, null, req), networkMembership);
+                
+                                objectMapper.writeValue(generator, wrapped);
+                            }
+                            else
+                            {
+                                throw new EntityNotFoundException(networkId);
+                            }
+                        }
+                    });
+
+                    return null;
+                }
+            }, true, true);
+        }
+        catch (ApiException | WebScriptException apiException)
+        {
+            renderException(apiException, res, assistant);
+        }
+        catch (RuntimeException runtimeException)
+        {
+            renderException(runtimeException, res, assistant);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Networks.java b/remote-api/src/main/java/org/alfresco/rest/api/Networks.java
new file mode 100644
index 00000000000..f6edd4115c4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Networks.java
@@ -0,0 +1,39 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import org.alfresco.rest.api.model.Network;
+import org.alfresco.rest.api.model.PersonNetwork;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+
+public interface Networks
+{
+	public Network validateNetwork(String networkId);
+    public Network getNetwork(String networkId);
+    public PersonNetwork getNetwork(String personId, String networkId);
+    public CollectionWithPagingInfo<PersonNetwork> getNetworks(String personId, Paging paging);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/NetworksWebScriptGet.java b/remote-api/src/main/java/org/alfresco/rest/api/NetworksWebScriptGet.java
new file mode 100644
index 00000000000..e5f4183060d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/NetworksWebScriptGet.java
@@ -0,0 +1,128 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.rest.api.model.PersonNetwork;
+import org.alfresco.rest.api.networks.NetworksEntityResource;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.exceptions.ApiException;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper.Writer;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+import org.alfresco.rest.framework.tools.ResponseWriter;
+import org.alfresco.rest.framework.webscripts.ApiWebScript;
+import org.alfresco.rest.framework.webscripts.ResourceWebScriptHelper;
+import org.springframework.extensions.webscripts.Format;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * A webscript that returns the authenticated user's network memberships.
+ * 
+ * @author steveglover
+ *
+ */
+public class NetworksWebScriptGet extends ApiWebScript implements RecognizedParamsExtractor, ResponseWriter
+{
+	private Networks networks;
+    private ResourceWebScriptHelper helper;
+    
+	public void setHelper(ResourceWebScriptHelper helper)
+	{
+		this.helper = helper;
+	}
+
+	public void setNetworks(Networks networks)
+	{
+		this.networks = networks;
+	}
+
+    @Override
+    public void execute(final Api api, final WebScriptRequest req, final WebScriptResponse res) throws IOException
+    {
+        try
+        {
+            transactionService.getRetryingTransactionHelper().doInTransaction(
+            new RetryingTransactionCallback<Void>()
+            {
+                @Override
+                public Void execute() throws Throwable
+                {
+                    final Paging paging = findPaging(req);
+            
+                    // apply content type
+                    res.setContentType(Format.JSON.mimetype() + ";charset=UTF-8");
+
+                    assistant.getJsonHelper().withWriter(res.getOutputStream(), new Writer()
+                    {
+                        @Override
+                        public void writeContents(JsonGenerator generator, ObjectMapper objectMapper)
+                                    throws JsonGenerationException, JsonMappingException, IOException
+                        {
+                            List<Object> entities = new ArrayList<Object>();
+            
+                            String personId = AuthenticationUtil.getFullyAuthenticatedUser();
+                            
+                            CollectionWithPagingInfo<PersonNetwork> networkMemberships = networks.getNetworks(personId, paging);
+                            for (PersonNetwork networkMember : networkMemberships.getCollection())
+                            {
+                                // TODO this is not ideal, but the only way to populate the embedded network entities (this would normally be
+                                // done automatically by the api framework).
+                                Object wrapped = helper.processAdditionsToTheResponse(res, Api.ALFRESCO_PUBLIC, NetworksEntityResource.NAME, Params.valueOf(personId, null, req), networkMember);
+                                entities.add(wrapped);
+                            }
+            
+                            objectMapper.writeValue(generator, CollectionWithPagingInfo.asPaged(paging, entities));
+                        }
+                    });
+                    
+                    return null;
+                }
+            }, true, true);
+        }
+        catch (ApiException | WebScriptException apiException)
+        {
+            renderException(apiException, res, assistant);
+        }
+        catch (RuntimeException runtimeException)
+        {
+            renderException(runtimeException, res, assistant);
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/NodeDefinitionMapper.java b/remote-api/src/main/java/org/alfresco/rest/api/NodeDefinitionMapper.java
new file mode 100644
index 00000000000..918be2531dd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/NodeDefinitionMapper.java
@@ -0,0 +1,39 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import org.alfresco.rest.api.model.NodeDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.i18n.MessageLookup;
+/**
+ * Maps representations from TypeDefinition to NodeDefinition
+ *
+ * @author gfertuso
+ */
+public interface NodeDefinitionMapper 
+{
+    NodeDefinition fromTypeDefinition(TypeDefinition typeDefinition, MessageLookup messageLookup);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/NodeRatings.java b/remote-api/src/main/java/org/alfresco/rest/api/NodeRatings.java
new file mode 100644
index 00000000000..dba18a3cc7a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/NodeRatings.java
@@ -0,0 +1,40 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import org.alfresco.rest.api.impl.node.ratings.RatingScheme;
+import org.alfresco.rest.api.model.NodeRating;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+
+public interface NodeRatings
+{
+	public RatingScheme validateRatingScheme(String ratingSchemeId);
+	public NodeRating getNodeRating(String nodeId, String ratingSchemeId);
+	public CollectionWithPagingInfo<NodeRating> getNodeRatings(String nodeId, Paging paging);
+	public void addRating(String nodeId, String ratingSchemeId, Object rating);
+	public void removeRating(String nodeId, String ratingSchemeId);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Nodes.java b/remote-api/src/main/java/org/alfresco/rest/api/Nodes.java
new file mode 100644
index 00000000000..5ea28363159
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Nodes.java
@@ -0,0 +1,408 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.rest.api.model.AssocChild;
+import org.alfresco.rest.api.model.AssocTarget;
+import org.alfresco.rest.api.model.Document;
+import org.alfresco.rest.api.model.Folder;
+import org.alfresco.rest.api.model.LockInfo;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.DirectAccessUrlRequest;
+import org.alfresco.rest.api.model.PathInfo;
+import org.alfresco.rest.api.model.UserInfo;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.DirectAccessUrl;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.webscripts.servlet.FormData;
+
+/**
+ * File Folder (Nodes) API
+ *
+ * @author janv
+ * @author Jamal Kaabi-Mofrad
+ * @author Gethin James
+ * @author steveglover
+ */
+public interface Nodes
+{
+    /**
+     * Get the node representation for the given node.
+     *
+     * @param nodeId String
+     * @return Node
+     */
+    Node getNode(String nodeId);
+    
+    /**
+     * Get the document representation for the given node.
+     *
+     * @param nodeRef NodeRef
+     * @return Document
+     */
+    Document getDocument(NodeRef nodeRef);
+    
+    /**
+     * Get the folder representation for the given node.
+     *
+     * @param nodeRef NodeRef
+     * @return Folder
+     */
+    Folder getFolder(NodeRef nodeRef);
+    
+    /**
+     * Get the folder or document representation (as appropriate) for the given node.
+     *
+     * @param nodeId String nodeId or well-known alias, eg. "-root-" or "-my-"
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     *        including:
+     *        - incPrimaryParent
+     * @return
+     */
+    Node getFolderOrDocument(String nodeId, Parameters parameters);
+
+    Node getFolderOrDocumentFullInfo(NodeRef nodeRef, NodeRef parentNodeRef, QName nodeTypeQName, Parameters parameters, Map<String, UserInfo> mapUserInfo);
+
+    /**
+     * Get the folder or document representation (as appropriate) for the given node.
+     *
+     * @param nodeRef A real Node
+     * @param parentNodeRef
+     * @param nodeTypeQName
+     * @param includeParam
+     * @param mapUserInfo
+     * @return
+     */
+    Node getFolderOrDocument(NodeRef nodeRef, NodeRef parentNodeRef, QName nodeTypeQName, List<String> includeParam, Map<String, UserInfo> mapUserInfo);
+
+    /**
+     * Get list of children of a parent folder.
+     *
+     * @param parentFolderNodeId String id of parent folder node or well-known alias, eg. "-root-" or "-my-"
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     *        including:
+     *        - filter, sort & paging params (where, orderBy, skipCount, maxItems)
+     *        - incFiles, incFolders (both true by default)
+     * @return a paged list of {@code org.alfresco.rest.api.model.Node} objects
+     */
+    CollectionWithPagingInfo<Node> listChildren(String parentFolderNodeId, Parameters parameters);
+    
+    /**
+     * Delete the given node. Note: will cascade delete for a folder.
+     *
+     * @param nodeId String id of node (folder or document)
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     *                   - permanent (default false)
+     */
+    void deleteNode(String nodeId, Parameters parameters);
+
+    /**
+     * Create node - folder or (empty) file.
+     *
+     * @param parentFolderNodeId
+     * @param nodeInfo
+     * @param parameters
+     * @return
+     */
+    Node createNode(String parentFolderNodeId, Node nodeInfo, Parameters parameters);
+
+    /**
+     * Move or Copy node
+     *
+     * @param sourceNodeId
+     * @param parentFolderNodeId
+     * @param name
+     * @param parameters
+     * @return
+     */
+    Node moveOrCopyNode(String sourceNodeId, String parentFolderNodeId, String name, Parameters parameters, boolean isCopy);
+
+    /**
+     * Update node meta-data.
+     *
+     * @param nodeId
+     * @param entity
+     * @param parameters
+     * @return
+     */
+    Node updateNode(String nodeId, Node entity, Parameters parameters);
+
+    /**
+     * Download file content.
+     *
+     * @param fileNodeId
+     * @param parameters
+     * @param recordActivity true, if an activity post is required.
+     * @return
+     */
+    BinaryResource getContent(String fileNodeId, Parameters parameters, boolean recordActivity);
+
+    /**
+     * Download file content.
+     *
+     * @param nodeRef        the content nodeRef
+     * @param parameters
+     * @param recordActivity true, if an activity post is required.
+     * @return
+     */
+    BinaryResource getContent(NodeRef nodeRef, Parameters parameters, boolean recordActivity);
+
+    /**
+     * Uploads file content (updates existing node with new content).
+     *
+     * Note: may create a new version, depending on versioning behaviour.
+     *
+     * @param fileNodeId
+     * @param contentInfo
+     * @param stream
+     * @param parameters
+     * @return
+     */
+    Node updateContent(String fileNodeId, BasicContentInfo contentInfo, InputStream stream, Parameters parameters);
+
+    /**
+     * Uploads file content and meta-data into the repository.
+     *
+     * @param parentFolderNodeId String id of parent folder node or well-known alias, eg. "-root-" or "-my-"
+     * @param formData           the {@link FormData}
+     * @param parameters         the {@link Parameters} object to get the parameters passed into the request
+     * @return {@code Node} if successful
+     */
+    Node upload(String parentFolderNodeId, FormData formData, Parameters parameters);
+    
+
+    NodeRef validateNode(StoreRef storeRef, String nodeId);
+    NodeRef validateNode(String nodeId);
+    NodeRef validateNode(NodeRef nodeRef);
+    NodeRef validateOrLookupNode(String nodeId, String path);
+
+    boolean nodeMatches(NodeRef nodeRef, Set<QName> expectedTypes, Set<QName> excludedTypes);
+
+    /**
+     * Determines whether the type of the given nodeRef is a sub-class of another class or not.
+     *
+     * @param nodeRef         source nodeRef
+     * @param ofClassQName    the class to test against
+     * @param validateNodeRef whether to validate the given source node or not
+     * @return true if the type of the given nodeRef is a sub-class of another class, otherwise false
+     */
+    boolean isSubClass(NodeRef nodeRef, QName ofClassQName, boolean validateNodeRef);
+
+    /**
+     * Helper to create a QName from either a fully qualified or short-name QName string
+     *
+     * @param qnameStr Fully qualified or short-name QName string
+     * @return QName
+     */
+    QName createQName(String qnameStr);
+
+    QName getAssocType(String assocTypeQNameStr);
+
+    QName getAssocType(String assocTypeQNameStr, boolean mandatory);
+
+    /**
+     *
+     * @param parentNodeId
+     * @param entities
+     * @return
+     */
+    List<AssocChild> addChildren(String parentNodeId, List<AssocChild> entities);
+
+    /**
+     *
+     * @param sourceNodeId
+     * @param entities
+     * @return
+     */
+    List<AssocTarget> addTargets(String sourceNodeId, List<AssocTarget> entities);
+
+    /**
+     * Lock a node
+     * @param nodeId
+     * @param lockInfo
+     * @param parameters
+     * @return
+     */
+    Node lock(String nodeId, LockInfo lockInfo, Parameters parameters);
+
+    /**
+     * Unlock a node
+     * @param nodeId
+     * @param parameters
+     * @return
+     */
+    Node unlock(String nodeId, Parameters parameters);
+
+    DirectAccessUrl requestContentUrl(String nodeId, DirectAccessUrlRequest directAccessUrlRequest);
+
+    DirectAccessUrl requestContentUrl(NodeRef nodeRef, DirectAccessUrlRequest directAccessUrlRequest);
+
+    /**
+     * Convert from node properties (map of QName to Serializable) retrieved from
+     * the respository to a map of String to Object that can be formatted/expressed
+     * as required by the API JSON response for get nodes, get person etc.
+     * <p>
+     * Returns null if there are no properties to return, rather than an empty map.
+     * 
+     * @param nodeProps
+     * @param selectParam
+     * @param mapUserInfo
+     * @param excludedNS
+     * @param excludedProps
+     * @return The map of properties, or null if none to return.
+     */
+    Map<String, Object> mapFromNodeProperties(Map<QName, Serializable> nodeProps, List<String> selectParam, Map<String,UserInfo> mapUserInfo, List<String> excludedNS, List<QName> excludedProps);
+
+    /**
+     * Map from the JSON API format of properties (String to Object) to
+     * the typical node properties map used by the repository (QName to Serializable).
+     * 
+     * @param props
+     * @return
+     */
+    Map<QName, Serializable> mapToNodeProperties(Map<String, Object> props);
+
+    /**
+     * Returns the path to the given nodeRef {@code nodeRefIn} or the archived nodeRef {@code archivedParentAssoc}.
+     *
+     * @param nodeRefIn           the NodeRef
+     * @param archivedParentAssoc the ChildAssociationRef of the archived NodeRef
+     * @return the path to the given node
+     */
+    PathInfo lookupPathInfo(NodeRef nodeRefIn, ChildAssociationRef archivedParentAssoc);
+
+    /**
+     * Map from a String representation of aspect names to a set
+     * of QName objects, as used by the repository.
+     * 
+     * @param aspectNames
+     * @return
+     */
+    Set<QName> mapToNodeAspects(List<String> aspectNames);
+        
+    /**
+     * Map from aspects (Set of QName) retrieved from the repository to a
+     * map List of String required that can be formatted/expressed as required
+     * by the API JSON response for get nodes, get person etc.
+     * <p>
+     * Returns null if there are no aspect names to return, rather than an empty list.
+     * 
+     * @param nodeAspects
+     * @param excludedNS
+     * @param excludedAspects
+     * @return The list of aspect names, or null if none to return.
+     */
+    List<String> mapFromNodeAspects(Set<QName> nodeAspects, List<String> excludedNS, List<QName> excludedAspects);
+
+    /**
+     * Add aspects to the specified NodeRef. Aspects that appear in the exclusions list
+     * will be ignored.
+     * 
+     * @param nodeRef
+     * @param aspectNames
+     * @param exclusions
+     */
+    void addCustomAspects(NodeRef nodeRef, List<String> aspectNames, List<QName> exclusions);
+
+    /**
+     * Update aspects for the specified NodeRef. An empty list will result in
+     * aspects being <strong>removed</strong>.
+     * 
+     * @param nodeRef
+     * @param aspectNames
+     * @param exclusions
+     */
+    void updateCustomAspects(NodeRef nodeRef, List<String> aspectNames, List<QName> exclusions);
+
+    void validateAspects(List<String> aspectNames, List<String> excludedNS, List<QName> excludedAspects);
+
+    void validateProperties(Map<String, Object> properties, List<String> excludedNS, List<QName> excludedProperties);
+
+    
+    /**
+     * API Constants - query parameters, etc
+     */
+
+    String PATH_ROOT = "-root-";
+    String PATH_MY = "-my-";
+    String PATH_SHARED = "-shared-";
+
+    String OP_CREATE = "create";
+    String OP_DELETE = "delete";
+    String OP_UPDATE = "update";
+    String OP_UPDATE_PERMISSIONS = "updatePermissions";
+
+    String PARAM_RELATIVE_PATH = "relativePath";
+    String PARAM_PERMANENT = "permanent";
+
+    String PARAM_INCLUDE_PROPERTIES = "properties";
+    String PARAM_INCLUDE_PATH = "path";
+    String PARAM_INCLUDE_ASPECTNAMES = "aspectNames";
+    String PARAM_INCLUDE_ISLINK = "isLink";
+    String PARAM_INCLUDE_ISLOCKED = "isLocked";
+    String PARAM_INCLUDE_ALLOWABLEOPERATIONS = "allowableOperations";
+    String PARAM_INCLUDE_PERMISSIONS = "permissions";
+    String PARAM_INCLUDE_ISFAVORITE = "isFavorite";
+
+    String PARAM_INCLUDE_ASSOCIATION = "association";
+    String PARAM_INCLUDE_DEFINITION = "definition";
+
+    String PARAM_ISFOLDER = "isFolder";
+    String PARAM_ISFILE = "isFile";
+
+    String PARAM_INCLUDE_SUBTYPES = "INCLUDESUBTYPES";
+
+    String PARAM_NAME = "name";
+    String PARAM_CREATEDAT = "createdAt";
+    String PARAM_MODIFIEDAT = "modifiedAt";
+    String PARAM_CREATEBYUSER = "createdByUser";
+    String PARAM_MODIFIEDBYUSER = "modifiedByUser";
+    String PARAM_MIMETYPE = "mimeType";
+    String PARAM_SIZEINBYTES = "sizeInBytes";
+    String PARAM_NODETYPE = "nodeType";
+
+    String PARAM_VERSION_MAJOR = "majorVersion"; // true if major, false if minor
+    String PARAM_VERSION_COMMENT = "comment";
+
+    String PARAM_OVERWRITE = "overwrite";
+    String PARAM_AUTO_RENAME = "autoRename";
+
+    String PARAM_ISPRIMARY = "isPrimary";
+    String PARAM_ASSOC_TYPE = "assocType";
+}
+
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/People.java b/remote-api/src/main/java/org/alfresco/rest/api/People.java
new file mode 100644
index 00000000000..ea7af6886cc
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/People.java
@@ -0,0 +1,133 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import java.io.InputStream;
+import java.util.List;
+
+import org.alfresco.rest.api.model.PasswordReset;
+import org.alfresco.rest.api.model.Person;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.NoSuchPersonException;
+
+public interface People
+{
+    String DEFAULT_USER = "-me-";
+    String PARAM_INCLUDE_ASPECTNAMES = "aspectNames";
+    String PARAM_INCLUDE_PROPERTIES = "properties";
+    String PARAM_INCLUDE_CAPABILITIES = "capabilities";
+    String PARAM_FIRST_NAME = "firstName";
+    String PARAM_LAST_NAME = "lastName";
+    String PARAM_ID = "id";
+
+    String validatePerson(String personId);
+    String validatePerson(String personId, boolean validateIsCurrentUser);
+    NodeRef getAvatar(String personId);
+
+    /**
+     * Get a person. This included a full representation of the person.
+     * 
+     * @throws NoSuchPersonException if personId does not exist
+     */
+    Person getPerson(final String personId);
+
+    /**
+     * Get a person, specifying optional includes as required.
+     * 
+     * @param personId
+     * @param include
+     * @return
+     */
+    Person getPerson(String personId, List<String> include);
+    
+    /**
+     * Create a person.
+     *
+     * @param person
+     * @return
+     */
+    Person create(Person person);
+
+    /**
+     * Update the given person's details.
+     * 
+     * @param personId The identifier of a person.
+     * @param person The person details.
+     * @return The updated person details.
+     */
+    Person update(String personId, Person person);
+
+    /**
+     * Get people list
+     * 
+     * @return CollectionWithPagingInfo<Person>
+     */
+    CollectionWithPagingInfo<Person> getPeople(Parameters parameters);
+
+    /**
+     * Request password reset (an email will be sent to the registered email of the given {@code userId}).
+     * The API returns a 202 response for a valid, as well as the invalid (does not exist or disabled) userId
+     *
+     * @param userId     the user id of the person requesting the password reset
+     * @param client the client name which is registered to send emails
+     */
+    void requestPasswordReset(String userId, String client);
+
+    /**
+     * Performs password reset
+     *
+     * @param passwordReset the password reset details
+     */
+    void resetPassword(String personId, PasswordReset passwordReset);
+
+    /**
+     *
+     * @param personId
+     * @param parameters
+     * @return
+     */
+    BinaryResource downloadAvatarContent(String personId, Parameters parameters);
+
+    /**
+     *
+     * @param personId
+     * @param contentInfo
+     * @param stream
+     * @param parameters
+     * @return
+     */
+    Person uploadAvatarContent(String personId, BasicContentInfo contentInfo, InputStream stream, Parameters parameters);
+
+    /**
+     *
+     * @param personId
+     */
+    void deleteAvatarContent(String personId);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Preferences.java b/remote-api/src/main/java/org/alfresco/rest/api/Preferences.java
new file mode 100644
index 00000000000..c8faeb99fce
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Preferences.java
@@ -0,0 +1,36 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import org.alfresco.rest.api.model.Preference;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+
+public interface Preferences
+{
+	public Preference getPreference(String personId, String preferenceName);
+	public CollectionWithPagingInfo<Preference> getPreferences(String personId, Paging paging);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/PublicApiAuthenticatorFactory.java b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiAuthenticatorFactory.java
new file mode 100644
index 00000000000..2eef57809f6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiAuthenticatorFactory.java
@@ -0,0 +1,305 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.web.auth.AuthenticationListener;
+import org.alfresco.repo.web.auth.TenantAuthentication;
+import org.alfresco.repo.web.auth.WebCredentials;
+import org.alfresco.repo.web.scripts.TenantWebScriptServletRequest;
+import org.alfresco.repo.web.scripts.servlet.RemoteUserAuthenticatorFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Authenticator;
+import org.springframework.extensions.webscripts.Description.RequiredAuthentication;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletResponse;
+
+/**
+ * HTTP Basic Authentication for Public Api.
+ * 
+ * Adapted from org.alfresco.module.org_alfresco_module_cloud.webscripts.TenantBasicHTTPAuthenticatorFactory.
+ * 
+ * @author sglover
+ */
+public class PublicApiAuthenticatorFactory extends RemoteUserAuthenticatorFactory
+{
+    private static Log logger = LogFactory.getLog(PublicApiAuthenticatorFactory.class);
+    
+    public static final String DEFAULT_AUTHENTICATOR_KEY_HEADER = "X-Alfresco-Authenticator-Key"; 
+    
+    private String authenticatorKeyHeader = DEFAULT_AUTHENTICATOR_KEY_HEADER;
+    private RetryingTransactionHelper retryingTransactionHelper;
+    private TenantAuthentication tenantAuthentication;
+    private Set<String> validAuthenticatorKeys = Collections.emptySet();
+    private Set<String> outboundHeaderNames;
+    private boolean useBasicAuth = true;
+    
+    public void setAuthenticatorKeyHeader(String authenticatorKeyHeader)
+    {
+        this.authenticatorKeyHeader = authenticatorKeyHeader;
+    }
+    
+    /**
+     * Set the headers passed to the gateway for authentication.
+     * 
+     */
+    public void setOutboundHeaders(Set<String> outboundHeaders)
+    {
+        if (outboundHeaders != null)
+        {
+            Set<String> trimmed = new HashSet<String>();
+            for (String value : outboundHeaders)
+            {
+                trimmed.add(value.toLowerCase(Locale.ENGLISH).trim());
+            }
+            outboundHeaders = trimmed;
+        }
+        
+        this.outboundHeaderNames = outboundHeaders;
+    }
+
+    /**
+     * Whether to suggest that users use Basic auth. If set to true, then a
+     * 401 (unauthorized) response will contain a WWW-Authentication header
+     * specifying the scheme "Basic". If this is set to false, then
+     * the scheme "AlfTicket" will be used.
+     * <p>
+     * Set this to false to avoid getting Basic auth dialogue popups in browsers
+     * when using the public API directly, for example.
+     * 
+     * @see <a href="https://issues.alfresco.com/jira/browse/REPO-2575">REPO-2575</a>
+     * @param useBasicAuth
+     */
+    public void setUseBasicAuth(boolean useBasicAuth)
+    {
+        this.useBasicAuth = useBasicAuth;
+    }
+
+    public void setTenantAuthentication(TenantAuthentication service)
+    {
+        this.tenantAuthentication = service;
+    }
+    
+    public void setTransactionHelper(RetryingTransactionHelper service)
+    {
+        this.retryingTransactionHelper = service;
+    }
+    
+    public void setValidAuthentictorKeys(Set<String> validKeys)
+    {
+        if (validKeys != null)
+        {
+            Set<String> trimmedKeys = new HashSet<String>();
+            for (String key : validKeys)
+            {
+                trimmedKeys.add(key.trim());
+            }
+            validKeys = trimmedKeys;
+        }
+        this.validAuthenticatorKeys = validKeys;
+    }
+    
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.servlet.ServletAuthenticatorFactory#create(org.alfresco.web.scripts.servlet.WebScriptServletRequest, org.alfresco.web.scripts.servlet.WebScriptServletResponse)
+     */
+    public Authenticator create(WebScriptServletRequest req, WebScriptServletResponse res)
+    {
+        return new PublicApiAuthenticator(req, res, new ProxyListener());
+    }
+    
+    private Map<String, String[]> getOutboundHeaders(TenantWebScriptServletRequest req) 
+    {
+        Map<String, String[]> outboundHeaders = new HashMap<String, String[]>();
+        for (String headerName : outboundHeaderNames)
+        {
+            String[] headerValues = req.getHeaderValues(headerName);
+            if (headerValues != null && headerValues.length > 0)
+            {
+                outboundHeaders.put(headerName, headerValues);
+            }
+        }
+        return outboundHeaders;
+    }
+    
+    /**
+     * Public api authentication with additional tenant applicability check
+     */
+    public class PublicApiAuthenticator extends RemoteUserAuthenticator
+    {
+        // dependencies
+        private TenantWebScriptServletRequest servletReq;
+        
+        // Proxy listener used to receive initial authentication events from the base BasicHttpAuthenticator
+        private ProxyListener proxyListener;
+        
+        /**
+         * Construct
+         * 
+         * @param req WebScriptServletRequest
+         * @param res WebScriptServletResponse
+         * @param proxyListener ProxyListener
+         */
+        public PublicApiAuthenticator(WebScriptServletRequest req, WebScriptServletResponse res, ProxyListener proxyListener)
+        {
+            super(req, res, proxyListener);
+            if (!(req instanceof TenantWebScriptServletRequest))
+            {
+                throw new WebScriptException("Request is not a tenant aware request");
+            }
+            servletReq = (TenantWebScriptServletRequest)req;
+            this.proxyListener = proxyListener; 
+        }
+    
+        /* (non-Javadoc)
+         * @see org.alfresco.web.scripts.Authenticator#authenticate(org.alfresco.web.scripts.Description.RequiredAuthentication, boolean)
+         */
+        public boolean authenticate(RequiredAuthentication required, boolean isGuest)
+        {
+            boolean authorized = false;
+            try
+            {
+                String authenticatorKey = servletReq.getHeader(authenticatorKeyHeader);
+                String remoteUser = getRemoteUser();
+                if (authenticatorKey != null && remoteUser != null)
+                {
+                    // Trusted auth. Validate key and setup authentication context.
+                    authorized = authenticateViaGateway(required, isGuest, authenticatorKey, remoteUser);
+                }
+                else
+                {
+                    // Fallback to parent authenticator
+                    try
+                    {
+                        authorized = super.authenticate(required, isGuest);
+                    }
+                    catch (AuthenticationException ae)
+                    {
+                        // e.g. guest
+                        if (logger.isDebugEnabled())
+                            logger.debug("TenantBasicHttpAuthenticator: required="+required+", isGuest="+isGuest+" - "+ae.getMessage());
+                    }
+                }
+                if (authorized)
+                {
+                    // check tenant validity
+                    final String tenant = servletReq.getTenant();
+                    final String email = AuthenticationUtil.getFullyAuthenticatedUser();
+                    try
+                    {
+                        authorized = retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Boolean>()
+                        {
+                            public Boolean execute() throws Exception
+                            {
+                                return tenantAuthentication.authenticateTenant(email, tenant);
+                            }
+                        }, true, false);
+                    }
+                    finally
+                    {
+                        if (!authorized)
+                        {
+                            listener.authenticationFailed(new TenantCredentials(tenant, email, proxyListener.getOrignalCredentials()));
+                            AuthenticationUtil.clearCurrentSecurityContext();
+                        }
+                        else
+                        {
+                            listener.userAuthenticated(new TenantCredentials(tenant, email, proxyListener.getOrignalCredentials()));
+                        }
+                    }
+                }
+                return authorized;
+            }
+            finally
+            {
+                if (!authorized)
+                {
+                    servletRes.setStatus(401);
+                    String scheme = useBasicAuth ? "Basic" : "AlfTicket";
+                    String challenge = scheme + " realm=\"Alfresco " + servletReq.getTenant() + " tenant\"";
+                    servletRes.setHeader("WWW-Authenticate", challenge);
+                }
+            }
+        }
+
+        private boolean authenticateViaGateway(RequiredAuthentication required, boolean isGuest, String authenticatorKey, String remoteUser)
+        {
+            // Validate the authenticator key, and if valid set the fully authenticated user.
+            if (validAuthenticatorKeys.contains(authenticatorKey))
+            {
+                AuthenticationUtil.setFullyAuthenticatedUser(remoteUser);
+                proxyListener.userAuthenticated(new PublicApiCredentials(authenticatorKey, remoteUser, getOutboundHeaders(servletReq)));
+                return true;
+            }
+            else
+            {
+                logger.error("Invalid authenticator key:- " + authenticatorKey);
+                proxyListener.authenticationFailed(new PublicApiCredentials(authenticatorKey, remoteUser, getOutboundHeaders(servletReq)));
+                return false;
+            }
+        }
+    }
+    
+    private class ProxyListener implements AuthenticationListener
+    {
+        private WebCredentials originalCredentials;
+
+        @Override
+        public void userAuthenticated(WebCredentials credentials)
+        {
+            this.originalCredentials = credentials;
+        }
+        
+        @Override
+        public void authenticationFailed(WebCredentials credentials)
+        {
+            listener.authenticationFailed(credentials);
+        }
+
+        @Override
+        public void authenticationFailed(WebCredentials credentials, Exception ex)
+        {
+            listener.authenticationFailed(credentials, ex);
+        }
+        
+        public WebCredentials getOrignalCredentials()
+        {
+            return this.originalCredentials;
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/PublicApiCredentials.java b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiCredentials.java
new file mode 100644
index 00000000000..7f3573236ad
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiCredentials.java
@@ -0,0 +1,95 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import java.util.Map;
+
+import org.alfresco.repo.web.auth.WebCredentials;
+
+/**
+ * {@link WebCredentials} class for holding information related to authentication when using the public API..
+ *
+ * @author Alex Miller
+ */
+public class PublicApiCredentials implements WebCredentials
+{
+    private static final long serialVersionUID = 7828112870415043104L;
+    
+    private String authenticatorKey;
+    private Map<String, String[]> outboundHeaders;
+    private String user;
+
+    /**
+     * @param authenticatorKey The Gateway specific key 
+     * @param user The user name supplied by the gateway
+     * @param outboundHeaders The headers used by the gateway for authentication.
+     */
+    public PublicApiCredentials(String authenticatorKey, String user, Map<String, String[]> outboundHeaders)
+    {
+        this.authenticatorKey = authenticatorKey;
+        this.user = user;
+        this.outboundHeaders = outboundHeaders;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+                    + ((this.authenticatorKey == null) ? 0 : this.authenticatorKey.hashCode());
+        result = prime * result
+                    + ((this.outboundHeaders == null) ? 0 : this.outboundHeaders.hashCode());
+        result = prime * result + ((this.user == null) ? 0 : this.user.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
+        PublicApiCredentials other = (PublicApiCredentials) obj;
+        if (this.authenticatorKey == null)
+        {
+            if (other.authenticatorKey != null) { return false; }
+        }
+        else if (!this.authenticatorKey.equals(other.authenticatorKey)) { return false; }
+        if (this.outboundHeaders == null)
+        {
+            if (other.outboundHeaders != null) { return false; }
+        }
+        else if (!this.outboundHeaders.equals(other.outboundHeaders)) { return false; }
+        if (this.user == null)
+        {
+            if (other.user != null) { return false; }
+        }
+        else if (!this.user.equals(other.user)) { return false; }
+        return true;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/PublicApiDeclarativeRegistry.java b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiDeclarativeRegistry.java
new file mode 100644
index 00000000000..a198acb9aa0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiDeclarativeRegistry.java
@@ -0,0 +1,494 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.Set;
+
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.ResourceLocator;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.ResourceAction;
+import org.alfresco.rest.framework.tools.ApiAssistant;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.extensions.webscripts.*;
+import org.springframework.extensions.webscripts.Description.FormatStyle;
+import org.springframework.extensions.webscripts.Description.RequiredAuthentication;
+import org.springframework.extensions.webscripts.Description.RequiredTransaction;
+import org.springframework.extensions.webscripts.Description.TransactionCapability;
+import org.springframework.http.HttpMethod;
+
+/**
+ *
+ * @author steveglover
+ * @author janv
+ * @author Jamal Kaabi-Mofrad
+ * @since PublicApi1.0
+ */
+public class PublicApiDeclarativeRegistry extends DeclarativeRegistry
+{
+    private WebScript getNetworksWebScript;
+    private WebScript getNetworkWebScript;
+    private Container container;
+
+    private ResourceLocator locator;
+
+    public void setLocator(ResourceLocator locator)
+    {
+        this.locator = locator;
+    }
+
+    public void setGetNetworksWebScript(WebScript getNetworksWebScript)
+    {
+        this.getNetworksWebScript = getNetworksWebScript;
+    }
+
+    public void setGetNetworkWebScript(WebScript getNetworkWebScript)
+    {
+        this.getNetworkWebScript = getNetworkWebScript;
+    }
+
+    public void setContainer(Container container)
+    {
+        super.setContainer(container);
+        this.container = container;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.Registry#findWebScript(java.lang.String, java.lang.String)
+     */
+    public Match findWebScript(String method, String uri)
+    {
+        Match match;
+
+        HttpMethod httpMethod = HttpMethod.valueOf(method);
+        if (HttpMethod.GET.equals(httpMethod))
+        {
+            if (uri.equals(PublicApiTenantWebScriptServletRequest.NETWORKS_PATH))
+            {
+                Map<String, String> templateVars = new HashMap<>();
+                templateVars.put("apiScope", "public");
+                templateVars.put("apiVersion", "1");
+                templateVars.put("apiName", "networks");
+                match = new Match("", templateVars, "", getNetworksWebScript);
+            }
+            else if (uri.equals(PublicApiTenantWebScriptServletRequest.NETWORK_PATH))
+            {
+                Map<String, String> templateVars = new HashMap<>();
+                templateVars.put("apiScope", "public");
+                templateVars.put("apiVersion", "1");
+                templateVars.put("apiName", "network");
+                match = new Match("", templateVars, "", getNetworkWebScript);
+            }
+            else
+            {
+                match = super.findWebScript(method, uri);
+                if (match == null)
+                {
+                    return null;
+                }
+                Map<String, String> templateVars = match.getTemplateVars();
+                ResourceWithMetadata rwm = getResourceWithMetadataOrNull(templateVars, httpMethod);
+                if (rwm != null)
+                {
+                    Class<? extends ResourceAction> resAction = null;
+
+                    final Map<String, String> resourceVars = locator.parseTemplateVars(templateVars);
+                    final String entityId = resourceVars.get(ResourceLocator.ENTITY_ID);
+                    final String relationshipId = resourceVars.get(ResourceLocator.RELATIONSHIP_ID);
+
+                    switch (rwm.getMetaData().getType())
+                    {
+                        case ENTITY:
+                            if (StringUtils.isNotBlank(entityId))
+                            {
+                                if (EntityResourceAction.ReadById.class.isAssignableFrom(rwm.getResource().getClass()))
+                                {
+                                    resAction = EntityResourceAction.ReadById.class;
+                                }
+                            }
+                            else
+                            {
+                                if (EntityResourceAction.Read.class.isAssignableFrom(rwm.getResource().getClass()))
+                                {
+                                    resAction = EntityResourceAction.Read.class;
+                                }
+                            }
+                            break;
+                        case PROPERTY:
+                            if (StringUtils.isNotBlank(entityId))
+                            {
+                                if (BinaryResourceAction.Read.class.isAssignableFrom(rwm.getResource().getClass()))
+                                {
+                                    resAction = BinaryResourceAction.Read.class;
+                                }
+                                else if (RelationshipResourceBinaryAction.Read.class.isAssignableFrom(rwm.getResource().getClass()))
+                                {
+                                    resAction = RelationshipResourceBinaryAction.Read.class;
+                                }
+                            }
+                            break;
+                        case RELATIONSHIP:
+                            if (StringUtils.isNotBlank(relationshipId))
+                            {
+                                if (RelationshipResourceAction.ReadById.class.isAssignableFrom(rwm.getResource().getClass()))
+                                {
+                                    resAction = RelationshipResourceAction.ReadById.class;
+                                }
+                            }
+                            else
+                            {
+                                if (RelationshipResourceAction.Read.class.isAssignableFrom(rwm.getResource().getClass()))
+                                {
+                                    resAction = RelationshipResourceAction.Read.class;
+                                }
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+
+                    final boolean noAuth = (resAction != null && rwm.getMetaData().isNoAuth(resAction));
+                    if (noAuth)
+                    {
+                        // override match with noAuth
+                        match = overrideMatch(match);
+                    }
+                }
+            }
+        }
+        else if (HttpMethod.POST.equals(httpMethod))
+        {
+            match = super.findWebScript(method, uri);
+            if (match != null)
+            {
+                ResourceWithMetadata rwm = getResourceWithMetadataOrNull(match.getTemplateVars(), httpMethod);
+                if (rwm != null)
+                {
+                    Class<? extends ResourceAction> resAction = null;
+                    Boolean noAuth = null;
+                    switch (rwm.getMetaData().getType())
+                    {
+                        case ENTITY:
+                            if (EntityResourceAction.Create.class.isAssignableFrom(rwm.getResource().getClass()))
+                            {
+                                resAction = EntityResourceAction.Create.class;
+                            }
+                            else if (EntityResourceAction.CreateWithResponse.class.isAssignableFrom(rwm.getResource().getClass()))
+                            {
+                                resAction = EntityResourceAction.CreateWithResponse.class;
+                            }
+                            break;
+                        case RELATIONSHIP:
+                            if (RelationshipResourceAction.Create.class.isAssignableFrom(rwm.getResource().getClass()))
+                            {
+                                resAction = RelationshipResourceAction.Create.class;
+                            }
+                            else if (RelationshipResourceAction.CreateWithResponse.class.isAssignableFrom(rwm.getResource().getClass()))
+                            {
+                                resAction = RelationshipResourceAction.CreateWithResponse.class;
+                            }
+                            break;
+                        case OPERATION:
+                            noAuth = rwm.getMetaData().isNoAuth(null);
+                            break;
+                        default:
+                            break;
+                    }
+
+                    if (noAuth == null)
+                    {
+                        noAuth = (resAction != null && rwm.getMetaData().isNoAuth(resAction));
+                    }
+                    if (noAuth)
+                    {
+                        // override match with noAuth
+                        match = overrideMatch(match);
+                    }
+                }
+            }
+        }
+        else
+        {
+            match = super.findWebScript(method, uri);
+        }
+
+        if (match == null)
+        {
+            throw new NotFoundException(NotFoundException.DEFAULT_MESSAGE_ID, new String[] {uri});
+        }
+        return match;
+    }
+
+    private ResourceWithMetadata getResourceWithMetadataOrNull(Map<String, String> templateVars, HttpMethod method)
+    {
+        if (templateVars.get("apiName") != null)
+        {
+            // NOTE: noAuth currently only exposed for GET or POST
+            Api api = ApiAssistant.determineApi(templateVars);
+
+            // TODO can we avoid locating resource more than once (or at least provide a common code to determine the GET resourceAction) ?
+            return locator.locateResource(api, templateVars, method);
+        }
+        return null;
+    }
+
+    private Match overrideMatch(final Match match)
+    {
+        // TODO is there a better way (to dynamically override "requiredAuthentication") or handle noAuth check earlier ?
+        WebScript noAuthWebScriptWrapper = new WebScript()
+        {
+            @Override
+            public void init(Container container, Description description)
+            {
+                match.getWebScript().init(container, description);
+            }
+
+            @Override
+            public Description getDescription()
+            {
+                final Description d = match.getWebScript().getDescription();
+                return new Description()
+                {
+                    @Override
+                    public String getStorePath()
+                    {
+                        return d.getStorePath();
+                    }
+
+                    @Override
+                    public String getScriptPath()
+                    {
+                        return d.getScriptPath();
+                    }
+
+                    @Override
+                    public Path getPackage()
+                    {
+                        return d.getPackage();
+                    }
+
+                    @Override
+                    public String getDescPath()
+                    {
+                        return d.getDescPath();
+                    }
+
+                    @Override
+                    public InputStream getDescDocument() throws IOException
+                    {
+                        return d.getDescDocument();
+                    }
+
+                    @Override
+                    public String getKind()
+                    {
+                        return d.getKind();
+                    }
+
+                    @Override
+                    public Set<String> getFamilys()
+                    {
+                        return d.getFamilys();
+                    }
+
+                    @Override
+                    public RequiredAuthentication getRequiredAuthentication()
+                    {
+                        return RequiredAuthentication.none;
+                    }
+
+                    @Override
+                    public String getRunAs()
+                    {
+                        return d.getRunAs();
+                    }
+
+                    @Override
+                    public RequiredTransaction getRequiredTransaction()
+                    {
+                        return d.getRequiredTransaction();
+                    }
+
+                    @Override
+                    public RequiredTransactionParameters getRequiredTransactionParameters()
+                    {
+                        return d.getRequiredTransactionParameters();
+                    }
+
+                    @Override
+                    public RequiredCache getRequiredCache()
+                    {
+                        return d.getRequiredCache();
+                    }
+
+                    @Override
+                    public String getMethod()
+                    {
+                        return d.getMethod();
+                    }
+
+                    @Override
+                    public String[] getURIs()
+                    {
+                        return d.getURIs();
+                    }
+
+                    @Override
+                    public FormatStyle getFormatStyle()
+                    {
+                        return d.getFormatStyle();
+                    }
+
+                    @Override
+                    public String getDefaultFormat()
+                    {
+                        return d.getDefaultFormat();
+                    }
+
+                    @Override
+                    public NegotiatedFormat[] getNegotiatedFormats()
+                    {
+                        return d.getNegotiatedFormats();
+                    }
+
+                    @Override
+                    public Map<String, Serializable> getExtensions()
+                    {
+                        return d.getExtensions();
+                    }
+
+                    @Override
+                    public Lifecycle getLifecycle()
+                    {
+                        return d.getLifecycle();
+                    }
+
+                    @Override
+                    public boolean getMultipartProcessing()
+                    {
+                        return d.getMultipartProcessing();
+                    }
+
+                    @Override
+                    public void setMultipartProcessing(boolean b)
+                    {
+                        d.setMultipartProcessing(b);
+                    }
+
+                    @Override
+                    public ArgumentTypeDescription[] getArguments()
+                    {
+                        return d.getArguments();
+                    }
+
+                    @Override
+                    public TypeDescription[] getRequestTypes()
+                    {
+                        return d.getRequestTypes();
+                    }
+
+                    @Override
+                    public TypeDescription[] getResponseTypes()
+                    {
+                        return d.getResponseTypes();
+                    }
+
+                    @Override
+                    public String getId()
+                    {
+                        return d.getId();
+                    }
+
+                    @Override
+                    public String getShortName()
+                    {
+                        return d.getShortName();
+                    }
+
+                    @Override
+                    public String getDescription()
+                    {
+                        return d.getDescription();
+                    }
+                };
+            }
+
+            @Override
+            public ResourceBundle getResources()
+            {
+                return match.getWebScript().getResources();
+            }
+
+            @Override
+            public void execute(WebScriptRequest webScriptRequest, WebScriptResponse webScriptResponse) throws IOException
+            {
+                match.getWebScript().execute(webScriptRequest, webScriptResponse);
+            }
+
+            @Override
+            public void setURLModelFactory(URLModelFactory urlModelFactory)
+            {
+                match.getWebScript().setURLModelFactory(urlModelFactory);
+            }
+        };
+
+        // override match with noAuth
+        return new Match(match.getTemplate(), match.getTemplateVars(), match.getPath(), noAuthWebScriptWrapper);
+    }
+
+    private void initWebScript(WebScript webScript, String name)
+    {
+        DescriptionImpl serviceDesc = new DescriptionImpl(name, name, name, name);
+        serviceDesc.setRequiredAuthentication(RequiredAuthentication.user);
+        TransactionParameters transactionParameters = new TransactionParameters();
+        transactionParameters.setRequired(RequiredTransaction.required);
+        transactionParameters.setCapability(TransactionCapability.readonly);
+        serviceDesc.setRequiredTransactionParameters(transactionParameters);
+        serviceDesc.setFormatStyle(FormatStyle.argument);
+        serviceDesc.setDefaultFormat("json");
+        serviceDesc.setUris(new String[] { name });
+        webScript.init(container, serviceDesc);
+    }
+
+    public void reset()
+    {
+        super.reset();
+        initWebScript(getNetworksWebScript, "networks");
+        initWebScript(getNetworkWebScript, "network");
+    }
+}
+
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/PublicApiRepositoryContainer.java b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiRepositoryContainer.java
new file mode 100644
index 00000000000..1bd23ddb4ee
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiRepositoryContainer.java
@@ -0,0 +1,109 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import java.io.IOException;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.repo.web.scripts.TenantRepositoryContainer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Authenticator;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * Repository (server-tier) container for public api
+ * 
+ * @author steveglover
+ * @author davidc
+ */
+public class PublicApiRepositoryContainer extends TenantRepositoryContainer
+{
+    protected static final Log logger = LogFactory.getLog(PublicApiRepositoryContainer.class);
+
+    @Override
+    public void executeScript(final WebScriptRequest scriptReq, final WebScriptResponse scriptRes, final Authenticator auth)
+        throws IOException
+    {
+        String tenant = ((PublicApiTenantWebScriptServletRequest)scriptReq).getTenant();
+        if (tenant != null)
+        {
+            // handle special tenant keys
+            // -super-    => run as system tenant
+            // -default-  => run as user's default tenant
+            String user = null;
+            if (tenant.equalsIgnoreCase(TenantUtil.DEFAULT_TENANT))
+            {
+                // switch from default to super tenant, if not authenticated
+                user = AuthenticationUtil.getFullyAuthenticatedUser();
+                if (user == null)
+                {
+                    tenant = TenantUtil.SYSTEM_TENANT;
+                }
+            }
+            
+            // run as super tenant
+            if (tenant.equalsIgnoreCase(TenantUtil.SYSTEM_TENANT))
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("executeScript (-system-): ["+user+","+tenant+"] "+scriptReq.getServicePath());
+                }
+
+                TenantUtil.runAsTenant(new TenantRunAsWork<Object>()
+                {
+                    public Object doWork() throws Exception
+                    {
+                        PublicApiRepositoryContainer.super.executeScript(scriptReq, scriptRes, auth);
+                        return null;
+                        
+                    }
+                }, TenantService.DEFAULT_DOMAIN);
+            }
+            else
+            {
+                if (tenant.equalsIgnoreCase(TenantUtil.DEFAULT_TENANT))
+                {
+                    tenant = tenantAdminService.getUserDomain(user);
+                }
+
+                // run as explicit tenant
+                TenantUtil.runAsTenant(new TenantRunAsWork<Object>()
+                {
+                    public Object doWork() throws Exception
+                    {
+                        PublicApiRepositoryContainer.super.executeScript(scriptReq, scriptRes, auth);
+                        return null;
+                    }
+                }, tenant);
+            }
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantAuthentication.java b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantAuthentication.java
new file mode 100644
index 00000000000..cf011421253
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantAuthentication.java
@@ -0,0 +1,105 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.tenant.TenantAdminService;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.web.auth.TenantAuthentication;
+
+/**
+ * Authenticate current user against specified tenant (Enterprise)
+ * 
+ * @author steveglover
+ */
+public class PublicApiTenantAuthentication implements TenantAuthentication
+{
+    private TenantAdminService tenantAdminService;
+    
+    public void setTenantAdminService(TenantAdminService service)
+    {
+        this.tenantAdminService = service;
+    }
+    
+    /**
+     * Determine whether tenant exists and enabled
+     * 
+     * @param tenant String
+     * @return  true => it exists, no it doesn't
+     */
+    public boolean tenantExists(final String tenant)
+    {
+        if (tenant == null || TenantService.DEFAULT_DOMAIN.equalsIgnoreCase(tenant))
+        {
+            return true;
+        }
+        
+        return AuthenticationUtil.runAsSystem(new RunAsWork<Boolean>()
+        {
+            public Boolean doWork() throws Exception
+            {
+                return tenantAdminService.existsTenant(tenant) && tenantAdminService.isEnabled();
+            }
+        });
+    }
+
+    /**
+     * Authenticate user against network/tenant.
+     * 
+     * @param username String
+     * @param networkId String
+     * @return  true => authenticated, false => not authenticated
+     */
+    public boolean authenticateTenant(String username, String networkId)
+    {
+    	boolean authenticated = false;
+
+    	String userNetworkId = tenantAdminService.getUserDomain(username);
+    	if(userNetworkId == null || userNetworkId.equals(TenantService.DEFAULT_DOMAIN))
+    	{
+    		if(networkId.equalsIgnoreCase(TenantUtil.DEFAULT_TENANT) || networkId.equalsIgnoreCase(TenantUtil.SYSTEM_TENANT))
+    		{
+    			authenticated = true;
+    		}
+    	}
+    	else
+    	{
+    		if(networkId.equalsIgnoreCase(TenantUtil.DEFAULT_TENANT))
+    		{
+    			networkId = userNetworkId;
+    		}
+    		
+    		if(userNetworkId.equalsIgnoreCase(networkId))
+        	{
+        		authenticated = tenantAdminService.isEnabledTenant(networkId);
+        	}
+    	}
+
+        return authenticated; 
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRequest.java b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRequest.java
new file mode 100644
index 00000000000..c264769ce7e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRequest.java
@@ -0,0 +1,83 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.web.scripts.TenantWebScriptServletRequest;
+import org.springframework.extensions.config.ServerProperties;
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.Runtime;
+
+public class PublicApiTenantWebScriptServletRequest extends TenantWebScriptServletRequest
+{
+    public static final String NETWORKS_PATH = "networks";
+    public static final String NETWORK_PATH = "network";
+
+    public PublicApiTenantWebScriptServletRequest(Runtime container, HttpServletRequest req, Match serviceMatch, ServerProperties serverProperties)
+    {
+        super(container, req, serviceMatch, serverProperties);
+    }
+
+    @Override
+    protected void parse()
+    {
+        String realPathInfo = getRealPathInfo();
+
+        if(realPathInfo.equals("") || realPathInfo.equals("/"))
+        {
+            // no tenant - "index" request
+            tenant = TenantUtil.DEFAULT_TENANT;
+            pathInfo = NETWORKS_PATH;
+        }
+        else if (realPathInfo.equals("/discovery"))
+        {
+            // The '/discovery' API is special and doesn't need network info, however,
+            // we set the tenant to default, to satisfy PublicApiTenantAuthentication logic.
+            tenant = TenantUtil.DEFAULT_TENANT;
+            pathInfo = realPathInfo;
+        }
+        else
+        {
+            // optimisation - don't need to lowercase the whole path
+            if(realPathInfo.substring(0, 5).toLowerCase().equals("/cmis"))
+            {
+                // cmis service document, pass through as is and set tenant to "-default-".
+                tenant = TenantUtil.DEFAULT_TENANT;
+                pathInfo = realPathInfo;
+            }
+            else
+            {
+                int idx = realPathInfo.indexOf('/', 1);
+
+                // remove tenant
+                tenant = realPathInfo.substring(1, idx == -1 ? realPathInfo.length() : idx);
+                pathInfo = realPathInfo.substring(tenant.length() + 1);
+            }
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRuntime.java b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRuntime.java
new file mode 100644
index 00000000000..8df1321ea19
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRuntime.java
@@ -0,0 +1,154 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import java.io.IOException;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.web.scripts.TenantWebScriptServletRuntime;
+import org.alfresco.rest.framework.tools.ApiAssistant;
+import org.alfresco.rest.framework.tools.ResponseWriter;
+import org.springframework.extensions.config.ServerProperties;
+import org.springframework.extensions.surf.util.URLDecoder;
+import org.springframework.extensions.webscripts.*;
+import org.springframework.extensions.webscripts.servlet.ServletAuthenticatorFactory;
+
+public class PublicApiTenantWebScriptServletRuntime extends TenantWebScriptServletRuntime implements ResponseWriter
+{
+    private static final Pattern CMIS_URI_PATTERN = Pattern.compile(".*/cmis/versions/[0-9]+\\.[0-9]+/.*");
+    private ApiAssistant apiAssistant;
+
+    public PublicApiTenantWebScriptServletRuntime(RuntimeContainer container, ServletAuthenticatorFactory authFactory, HttpServletRequest req,
+            HttpServletResponse res, ServerProperties serverProperties, ApiAssistant apiAssistant)
+    {
+        super(container, authFactory, req, res, serverProperties);
+        this.apiAssistant = apiAssistant;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptRuntime#getScriptUrl()
+     */
+    @Override
+    protected String getScriptUrl()
+    {
+        // NOTE: Don't use req.getPathInfo() - it truncates the path at first semi-colon in Tomcat
+        final String requestURI = req.getRequestURI();
+        final String serviceContextPath = req.getContextPath() + req.getServletPath();
+        String pathInfo;
+        
+        if (serviceContextPath.length() > requestURI.length())
+        {
+            // NOTE: assume a redirect has taken place e.g. tomcat welcome-page
+            // NOTE: this is unlikely, and we'll take the hit if the path contains a semi-colon
+            pathInfo = req.getPathInfo();
+        }
+        // MNT-13057 fix, do not decode CMIS uris.
+        else if (CMIS_URI_PATTERN.matcher(requestURI).matches())
+        {
+            pathInfo = requestURI.substring(serviceContextPath.length());
+        }
+        else
+        {
+            pathInfo = URLDecoder.decode(requestURI.substring(serviceContextPath.length()));
+        }
+        
+        // NOTE: must contain at least root / and single character for tenant name
+        if (pathInfo.length() < 2 || pathInfo.equals("/"))
+        {
+            // url path has no tenant id -> get networks request
+            pathInfo = PublicApiTenantWebScriptServletRequest.NETWORKS_PATH;
+        }
+        else
+        {
+            if(!pathInfo.substring(0, 6).toLowerCase().equals("/cmis/") && !pathInfo.equals("/discovery"))
+            {
+                // remove tenant
+                int idx = pathInfo.indexOf('/', 1);
+                pathInfo = pathInfo.substring(idx == -1 ? pathInfo.length() : idx);
+                if(pathInfo.equals("") || pathInfo.equals("/"))
+                {
+                    // url path is just a tenant id -> get network request
+                    pathInfo = PublicApiTenantWebScriptServletRequest.NETWORK_PATH;
+                }
+            }
+        }
+
+        return pathInfo;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptRuntime#createRequest(org.alfresco.web.scripts.WebScriptMatch)
+     */
+    @Override
+    protected WebScriptRequest createRequest(Match match)
+    {
+//    	try
+//    	{
+            // make the request input stream a BufferedInputStream so that the first x bytes can be reused.
+//	    	PublicApiHttpServletRequest wrapped = new PublicApiHttpServletRequest(req);
+
+            // TODO: construct org.springframework.extensions.webscripts.servlet.WebScriptServletResponse when
+            //       org.alfresco.web.scripts.WebScriptServletResponse (deprecated) is removed
+            servletReq = new PublicApiTenantWebScriptServletRequest(this, req, match, serverProperties);
+            return servletReq;
+//    	}
+//    	catch(IOException e)
+//    	{
+//    		throw new AlfrescoRuntimeException("", e);
+//    	}
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.web.scripts.WebScriptContainer#getName()
+     */
+    public String getName()
+    {
+        return "PublicApiTenantServletRuntime";
+    }
+
+    @Override
+    protected void renderErrorResponse(Match match, Throwable exception, WebScriptRequest request, WebScriptResponse response) {
+
+        //If its cmis or not an exception then use the default behaviour
+        if (CMIS_URI_PATTERN.matcher(req.getRequestURI()).matches() || !(exception instanceof Exception))
+        {
+            super.renderErrorResponse(match, exception, request, response);
+        }
+        else
+        {
+            try {
+                renderException((Exception)exception, response, apiAssistant);
+            } catch (IOException e) {
+                logger.error("Internal error", e);
+                throw new WebScriptException("Internal error", e);
+            }
+        }
+
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/PublicApiWebScriptServlet.java b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiWebScriptServlet.java
new file mode 100644
index 00000000000..f977d5a0005
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/PublicApiWebScriptServlet.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.web.scripts.TenantWebScriptServlet;
+import org.alfresco.rest.framework.tools.ApiAssistant;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.RuntimeContainer;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRuntime;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+public class PublicApiWebScriptServlet extends TenantWebScriptServlet
+{
+	private static final long serialVersionUID = 726730674397482039L;
+	private ApiAssistant apiAssistant;
+    @Override
+    public void init() throws ServletException
+    {
+    	super.init();
+    	
+        ApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext());
+        container = (RuntimeContainer)context.getBean("publicapi.container");
+        apiAssistant = (ApiAssistant) context.getBean("apiAssistant");
+    }
+
+    protected WebScriptServletRuntime getRuntime(HttpServletRequest req, HttpServletResponse res)
+    {
+        WebScriptServletRuntime runtime = new PublicApiTenantWebScriptServletRuntime(container, authenticatorFactory, req, res, serverProperties, apiAssistant);
+        return runtime;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Queries.java b/remote-api/src/main/java/org/alfresco/rest/api/Queries.java
new file mode 100644
index 00000000000..93d5b5f3c1a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Queries.java
@@ -0,0 +1,98 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.Person;
+import org.alfresco.rest.api.model.Site;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+import org.alfresco.rest.framework.webscripts.ResourceWebScriptHelper;
+
+/**
+ * Queries API
+ *
+ * @author janv
+ * @author Alan Davis
+ */
+public interface Queries
+{
+    // General
+    static String PARAM_TERM    = "term";
+    static String PARAM_ORDERBY = RecognizedParamsExtractor.PARAM_ORDERBY;
+    static String PARAM_FIELDS = RecognizedParamsExtractor.PARAM_FILTER_FIELDS;
+    static String PARAM_INCLUDE = RecognizedParamsExtractor.PARAM_INCLUDE;
+    
+    // Node query
+    static String PARAM_ROOT_NODE_ID = "rootNodeId";
+    static String PARAM_NODE_TYPE    = "nodeType";
+    static String PARAM_NAME         = "name";
+    static String PARAM_CREATEDAT    = "createdAt";
+    static String PARAM_MODIFIEDAT   = "modifiedAt";
+    static int MIN_TERM_LENGTH_NODES = 3;
+    
+    // People query
+    static String PARAM_PERSON_ID  = "id";
+    static String PARAM_FIRSTNAME = ContentModel.PROP_FIRSTNAME.getLocalName();
+    static String PARAM_LASTNAME  = ContentModel.PROP_LASTNAME.getLocalName();
+    static int MIN_TERM_LENGTH_PEOPLE = 2;
+    
+    // Sites query
+    static String PARAM_SITE_ID          = "id";
+    static String PARAM_SITE_TITLE       = "title";
+    static String PARAM_SITE_DESCRIPTION = "description";
+    static int MIN_TERM_LENGTH_SITES     = 2;
+    
+    /**
+     * Find Nodes
+     *
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     *
+     * @return the search query results
+     */
+    CollectionWithPagingInfo<Node> findNodes(Parameters parameters);
+
+    /**
+     * Find People
+     * 
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     *
+     * @return the search query results
+     */
+    CollectionWithPagingInfo<Person> findPeople(Parameters parameters);
+
+    /**
+     * Find Sites
+     *
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     *
+     * @return the search query results
+     */
+    CollectionWithPagingInfo<Site> findSites(Parameters parameters);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/QuickShareLinks.java b/remote-api/src/main/java/org/alfresco/rest/api/QuickShareLinks.java
new file mode 100644
index 00000000000..1e40851d498
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/QuickShareLinks.java
@@ -0,0 +1,142 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import org.alfresco.rest.api.model.QuickShareLink;
+import org.alfresco.rest.api.model.QuickShareLinkEmailRequest;
+import org.alfresco.rest.api.model.Rendition;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+import java.util.List;
+
+/**
+ * Centralises access to quick share services and maps between representations.
+ *
+ * @author janv
+ * @author Jamal Kaabi-Mofrad
+ * 
+ * @since publicapi1.0
+ */
+public interface QuickShareLinks
+{
+    /**
+     * Returns limited metadata regarding the shared (content) link.
+     *
+     * Note: does *not* require authenticated access for (public) shared link.
+     */
+    QuickShareLink readById(String sharedId, Parameters parameters);
+
+    /**
+     * Download file content (or rendition content) via shared link.
+     *
+     * Note: does *not* require authenticated access for (public) shared link.
+     *
+     * @param sharedId
+     * @param renditionId - optional
+     * @param parameters {@link Parameters}
+     * @return
+     * @throws EntityNotFoundException
+     */
+    BinaryResource readProperty(String sharedId, String renditionId, Parameters parameters) throws EntityNotFoundException;
+
+    /**
+     * Gets information about a rendition of a shared link.
+     *
+     * @param shareId
+     * @param renditionId
+     * @return the {@link Rendition} object
+     */
+    Rendition getRendition(String shareId, String renditionId);
+
+    /**
+     * List renditions info - note: only returns available (=> created) renditions.
+     *
+     * Note: does *not* require authenticated access for (public) shared link.
+     *
+     * @param sharedId
+     * @return
+     */
+    CollectionWithPagingInfo<Rendition> getRenditions(String sharedId);
+
+    /**
+     * Delete the shared link.
+     *
+     * Once deleted, the shared link will no longer exist hence get/download will no longer work (ie. return 404).
+     * If the link is later re-created then a new unique shared id will be generated.
+     *
+     * Requires authenticated access.
+     *
+     * @param sharedId String id of the quick share
+     */
+    void delete(String sharedId, Parameters parameters);
+
+    /**
+     * Create quick share.
+     *
+     * Requires authenticated access.
+     *
+     * @param nodeIds
+     * @param parameters
+     * @return
+     */
+    List<QuickShareLink> create(List<QuickShareLink> nodeIds, Parameters parameters);
+
+    /**
+     * Notifies users by email that a content has been shared with them.
+     *
+     * @param sharedId     The string id of the quick share
+     * @param emailRequest The email details including its template details
+     * @param parameters   The {@link Parameters} object to get the parameters passed into the request
+     */
+    void emailSharedLink(String sharedId, QuickShareLinkEmailRequest emailRequest, Parameters parameters);
+
+    /**
+     * Find (search) for shared links visible to current user.
+     * Optionally filter by "sharedByUser/id" (if -me- then filter by current user).
+     *
+     * @param parameters
+     * @return
+     */
+    CollectionWithPagingInfo<QuickShareLink> findLinks(Parameters parameters);
+
+    /**
+     * API Constants - query parameters, etc
+     */
+    String PARAM_SHAREDBY = "sharedByUser";
+
+    String PARAM_INCLUDE_ALLOWABLEOPERATIONS = Nodes.PARAM_INCLUDE_ALLOWABLEOPERATIONS;
+
+    String PARAM_INCLUDE_PATH = Nodes.PARAM_INCLUDE_PATH;
+
+    String PARAM_INCLUDE_PROPERTIES = Nodes.PARAM_INCLUDE_PROPERTIES;
+
+    String PARAM_INCLUDE_ISFAVORITE = Nodes.PARAM_INCLUDE_ISFAVORITE;
+
+    String PARAM_INCLUDE_ASPECTNAMES = Nodes.PARAM_INCLUDE_ASPECTNAMES;
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Renditions.java b/remote-api/src/main/java/org/alfresco/rest/api/Renditions.java
new file mode 100644
index 00000000000..ca179312fae
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Renditions.java
@@ -0,0 +1,194 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api;
+
+import org.alfresco.rest.api.model.DirectAccessUrlRequest;
+import org.alfresco.rest.api.model.Rendition;
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.repository.DirectAccessUrl;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+import java.util.List;
+
+/**
+ * Renditions API
+ *
+ * @author Jamal Kaabi-Mofrad, janv
+ */
+public interface Renditions
+{
+    String PARAM_STATUS = "status";
+
+    String PARAM_ATTACHMENT = "attachment";
+    String PARAM_PLACEHOLDER = "placeholder";
+
+    /**
+     * Lists all available renditions includes those that have been created and those that are yet to be created.
+     *
+     * @param nodeRef    the source/live nodeRef
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     * @return the rendition results
+     */
+    CollectionWithPagingInfo<Rendition> getRenditions(NodeRef nodeRef, Parameters parameters);
+
+    /**
+     * Lists all available renditions includes those that have been created and those that are yet to be created.
+     *
+     * @param nodeRef     the source/live nodeRef
+     * @param versionId   the version id (aka version label)
+     * @param parameters  the {@link Parameters} object to get the parameters passed into the request
+     * @return the rendition results
+     */
+    CollectionWithPagingInfo<Rendition> getRenditions(NodeRef nodeRef, String versionId, Parameters parameters);
+
+    /**
+     * Gets information about a rendition of a node in the repository.
+     * If there is no rendition, then returns the available/registered rendition.
+     *
+     * @param nodeRef     the source nodeRef, ie. live node
+     * @param renditionId the rendition id
+     * @param parameters  the {@link Parameters} object to get the parameters passed into the request
+     * @return the {@link Rendition} object
+     */
+    Rendition getRendition(NodeRef nodeRef, String renditionId, Parameters parameters);
+
+    /**
+     * Gets information about a rendition of a node in the repository.
+     * If there is no rendition, then returns the available/registered rendition.
+     *
+     * @param nodeRef     the source nodeRef, ie. live node
+     * @param versionId   the version id (aka version label)
+     * @param renditionId the rendition id
+     * @param parameters  the {@link Parameters} object to get the parameters passed into the request
+     * @return the {@link Rendition} object
+     */
+    Rendition getRendition(NodeRef nodeRef, String versionId, String renditionId, Parameters parameters);
+
+    /**
+     * Creates a rendition for the given node asynchronously.
+     *
+     * @param nodeRef    the source nodeRef, ie. live node
+     * @param rendition  the {@link Rendition} request
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     */
+    void createRendition(NodeRef nodeRef, Rendition rendition, Parameters parameters);
+
+    /**
+     * Creates a rendition for the given node - either async r sync
+     *
+     * @param nodeRef   the source nodeRef, ie. live node
+     * @param rendition the {@link Rendition} request
+     * @param executeAsync
+     * @param parameters
+     */
+    void createRendition(NodeRef nodeRef, Rendition rendition, boolean executeAsync, Parameters parameters);
+
+    /**
+     * Creates a rendition for the given node - either async r sync
+     *
+     * @param nodeRef   the source nodeRef, ie. live node
+     * @param versionId the version id (aka version label)
+     * @param rendition the {@link Rendition} request
+     * @param executeAsync
+     * @param parameters
+     */
+    void createRendition(NodeRef nodeRef, String versionId, Rendition rendition, boolean executeAsync, Parameters parameters);
+
+    /**
+     * Creates renditions that don't already exist for the given node asynchronously.
+     *
+     * @param nodeRef    the source nodeRef, ie. live node
+     * @param renditions the list of {@link Rendition} requests
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     * @throws NotFoundException if any of the rendition id do not exist.
+     * @throws ConstraintViolatedException if all of the renditions already exist.
+     */
+    void createRenditions(NodeRef nodeRef, List<Rendition> renditions, Parameters parameters)
+            throws NotFoundException, ConstraintViolatedException;
+
+    /**
+     * Creates renditions that don't already exist for the given node asynchronously.
+     *
+     * @param nodeRef    the source nodeRef, ie. live node
+     * @param versionId the version id (aka version label)
+     * @param renditions the list of {@link Rendition} requests
+     * @param parameters the {@link Parameters} object to get the parameters passed into the request
+     * @throws NotFoundException if any of the rendition id do not exist.
+     * @throws ConstraintViolatedException if all of the renditions already exist.
+     */
+    void createRenditions(NodeRef nodeRef, String versionId, List<Rendition> renditions, Parameters parameters)
+            throws NotFoundException, ConstraintViolatedException;
+
+    /**
+     * Downloads rendition.
+     *
+     * @param nodeRef     the source nodeRef, ie. live node
+     * @param renditionId the rendition id
+     * @param parameters  the {@link Parameters} object to get the parameters passed into the request
+     * @return the rendition stream
+     */
+    BinaryResource getContent(NodeRef nodeRef, String renditionId, Parameters parameters);
+
+    /**
+     * Downloads rendition.
+     *
+     * @param nodeRef     the source nodeRef, ie. live node
+     * @param versionId   the version id (aka version label)
+     * @param renditionId the rendition id
+     * @param parameters  the {@link Parameters} object to get the parameters passed into the request
+     * @return the rendition stream
+     */
+    BinaryResource getContent(NodeRef nodeRef, String versionId, String renditionId, Parameters parameters);
+
+    /**
+     * Downloads rendition.
+     *
+     * @param nodeRef     the source nodeRef, ie. live node
+     * @param renditionId the rendition id
+     * @param parameters  the {@link Parameters} object to get the parameters passed into the request
+     * @return the rendition stream
+     */
+    BinaryResource getContentNoValidation(NodeRef nodeRef, String renditionId, Parameters parameters);
+
+    /**
+     * Downloads rendition.
+     *
+     * @param nodeRef     the source nodeRef, ie. live node
+     * @param versionId   the version id (aka version label)
+     * @param renditionId the rendition id
+     * @param parameters  the {@link Parameters} object to get the parameters passed into the request
+     * @return the rendition stream
+     */
+    BinaryResource getContentNoValidation(NodeRef nodeRef, String versionId, String renditionId, Parameters parameters);
+
+    DirectAccessUrl requestContentUrl(String nodeId, String versionId, String renditionId, DirectAccessUrlRequest directAccessUrlRequest);
+}
+
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/SiteMembershipRequests.java b/remote-api/src/main/java/org/alfresco/rest/api/SiteMembershipRequests.java
new file mode 100644
index 00000000000..fa6892b1dfd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/SiteMembershipRequests.java
@@ -0,0 +1,93 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import org.alfresco.rest.api.model.SiteMembershipApproval;
+import org.alfresco.rest.api.model.SiteMembershipRejection;
+import org.alfresco.rest.api.model.SiteMembershipRequest;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+/**
+ * Public REST API: centralises access to site membership requests and maps between representations.
+ * 
+ * @author steveglover
+ *
+ */
+public interface SiteMembershipRequests
+{
+    String PARAM_SITE_ID = "siteId";
+    String PARAM_PERSON_ID = "personId";
+
+	/**
+	 * Create a site membership request for the user 'inviteeId'
+	 * @param inviteeId the site inviteee id
+	 * @param siteInvite the site invite
+	 * @return SiteMembershipRequest
+	 */
+	SiteMembershipRequest createSiteMembershipRequest(String inviteeId, final SiteMembershipRequest siteInvite);
+	
+	/**
+	 * Update the site membership request for inviteeId and site
+	 * @param inviteeId the site inviteee id
+	 * @param siteInvite the site invite
+	 * @return the updated siteMembershipRequest
+	 */
+	SiteMembershipRequest updateSiteMembershipRequest(String inviteeId, final SiteMembershipRequest siteInvite);
+	
+	/**
+	 * Cancel site membership request for invitee and site.
+	 * 
+	 * @param inviteeId the site inviteee id
+	 * @param siteId the site id
+	 */
+	void cancelSiteMembershipRequest(String inviteeId, String siteId);
+	
+	/**
+	 * Get the site membership request for inviteeId and siteId, if it exists.
+	 * 
+	 * @param inviteeId the site inviteee id
+	 * @param siteId the site id
+	 * @return the site membership request
+	 */
+	SiteMembershipRequest getSiteMembershipRequest(String inviteeId, String siteId);
+	
+	/**
+	 * Get a paged list of site membership requests for inviteeId.
+	 * 
+	 * @param inviteeId the site inviteee id
+	 * @param paging paging information
+	 * @return a paged list of site membership requests
+	 */
+	CollectionWithPagingInfo<SiteMembershipRequest> getPagedSiteMembershipRequests(String inviteeId, Paging paging);
+
+    CollectionWithPagingInfo<SiteMembershipRequest> getPagedSiteMembershipRequests(final Parameters parameters);
+
+    void approveSiteMembershipRequest(String siteId, String inviteeId, SiteMembershipApproval siteMembershipApproval);
+
+    void rejectSiteMembershipRequest(String siteId, String inviteeId, SiteMembershipRejection siteMembershipRejection);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Sites.java b/remote-api/src/main/java/org/alfresco/rest/api/Sites.java
new file mode 100644
index 00000000000..15a4dbd299a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Sites.java
@@ -0,0 +1,87 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import org.alfresco.query.PagingResults;
+import org.alfresco.rest.api.model.*;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+
+public interface Sites
+{
+	SiteInfo validateSite(String siteShortName);
+	SiteInfo validateSite(NodeRef nodeRef);
+    CollectionWithPagingInfo<SiteMember> getSiteMembers(String siteShortName, Parameters parameters);
+    Site getSite(String siteId);
+	void deleteSite(String siteId, Parameters parameters);
+    Site createSite(Site site, Parameters parameters);
+	Site updateSite(String siteId, SiteUpdate site, Parameters parameters);
+
+	/**
+	 * people/<personId>/sites/<siteId>
+	 * 
+	 * @param personId String
+     * @param siteShortName String
+     * @return MemberOfSite
+	 */
+	MemberOfSite getMemberOfSite(String personId, String siteShortName);
+	SiteMember getSiteMember(String personId, String siteShortName);
+	SiteMember addSiteMember(String siteShortName, SiteMember siteMember);
+	void removeSiteMember(String personId, String siteId);
+	SiteMember updateSiteMember(String siteShortName, SiteMember siteMember);
+	CollectionWithPagingInfo<MemberOfSite> getSites(String personId, Parameters parameters);
+	SiteContainer getSiteContainer(String siteShortName, String containerId);
+	PagingResults<SiteContainer> getSiteContainers(String siteShortName, Paging paging);
+	CollectionWithPagingInfo<Site> getSites(Parameters parameters);
+    FavouriteSite getFavouriteSite(String personId, String siteShortName);
+    void addFavouriteSite(String personId, FavouriteSite favouriteSite);
+    void removeFavouriteSite(String personId, String siteId);
+    CollectionWithPagingInfo<FavouriteSite> getFavouriteSites(String personId, Parameters parameters);
+
+    String getSiteRole(String siteId);
+    String getSiteRole(String siteId, String personId);
+
+    CollectionWithPagingInfo<SiteGroup> getSiteGroupMemberships(String siteId, Parameters parameters);
+    SiteGroup addSiteGroupMembership(String siteId, SiteGroup group);
+    SiteGroup getSiteGroupMembership(String siteId, String groupId);
+    SiteGroup updateSiteGroupMembership(String siteId, SiteGroup group);
+    void removeSiteGroupMembership(String groupId, String siteId);
+
+    String PARAM_PERMANENT = "permanent";
+    String PARAM_SKIP_ADDTOFAVORITES = "skipAddToFavorites";
+    String PARAM_SKIP_SURF_CONFIGURATION = "skipConfiguration";
+
+    String PARAM_SITE_ID          = "id";
+    String PARAM_SITE_TITLE       = "title";
+    String PARAM_SITE_DESCRIPTION = "description";
+
+    String PARAM_SITE_ROLE = "role";
+    String PARAM_VISIBILITY = "visibility";
+    String PARAM_PRESET = "preset";
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Tags.java b/remote-api/src/main/java/org/alfresco/rest/api/Tags.java
new file mode 100644
index 00000000000..6c8971a12a8
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/Tags.java
@@ -0,0 +1,44 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import java.util.List;
+
+import org.alfresco.rest.api.model.Tag;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.repository.StoreRef;
+
+public interface Tags
+{
+    public List<Tag> addTags(String nodeId, List<Tag> tags);
+    public Tag getTag(StoreRef storeRef, String tagId);
+    public void deleteTag(String nodeId, String tagId);
+    public CollectionWithPagingInfo<Tag> getTags(StoreRef storeRef, Parameters params);
+    public Tag changeTag(StoreRef storeRef, String tagId, Tag tag);
+    public CollectionWithPagingInfo<Tag> getTags(String nodeId, Parameters params);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/TenantCredentials.java b/remote-api/src/main/java/org/alfresco/rest/api/TenantCredentials.java
new file mode 100644
index 00000000000..8aa575648a3
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/TenantCredentials.java
@@ -0,0 +1,95 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api;
+
+import org.alfresco.repo.web.auth.WebCredentials;
+import org.alfresco.repo.web.scripts.servlet.BasicHttpAuthenticatorFactory.BasicHttpAuthenticator;
+
+/**
+ * {@link WebCredentials} class which wraps the credentials from the {@link BasicHttpAuthenticator} and adds
+ * additional information related to TenantBased logins.
+ *
+ * @author Alex Miller
+ * @since Cloud Sprint 5
+ */
+public class TenantCredentials implements WebCredentials
+{
+    private static final long serialVersionUID = -3877007259822281712L;
+
+    private String tenant;
+    private String email;
+    private WebCredentials originalCredentials;
+
+    public TenantCredentials(String tenant, String email, WebCredentials orignalCredentials)
+    {
+        this.tenant = tenant;
+        this.email = email;
+        this.originalCredentials = orignalCredentials;
+    }
+
+    public WebCredentials getOriginalCredentials()
+    {
+        return originalCredentials;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((this.email == null) ? 0 : this.email.hashCode());
+        result = prime
+                    * result
+                    + ((this.originalCredentials == null) ? 0 : this.originalCredentials.hashCode());
+        result = prime * result + ((this.tenant == null) ? 0 : this.tenant.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
+        TenantCredentials other = (TenantCredentials) obj;
+        if (this.email == null)
+        {
+            if (other.email != null) { return false; }
+        }
+        else if (!this.email.equals(other.email)) { return false; }
+        if (this.originalCredentials == null)
+        {
+            if (other.originalCredentials != null) { return false; }
+        }
+        else if (!this.originalCredentials.equals(other.originalCredentials)) { return false; }
+        if (this.tenant == null)
+        {
+            if (other.tenant != null) { return false; }
+        }
+        else if (!this.tenant.equals(other.tenant)) { return false; }
+        return true;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/actions/ActionDefinitionsEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/actions/ActionDefinitionsEntityResource.java
new file mode 100644
index 00000000000..e8ab760b66e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/actions/ActionDefinitionsEntityResource.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.actions;
+
+import org.alfresco.rest.api.Actions;
+import org.alfresco.rest.api.model.ActionDefinition;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+@EntityResource(name="action-definitions", title = "Actions")
+public class ActionDefinitionsEntityResource implements EntityResourceAction.Read<ActionDefinition>, EntityResourceAction.ReadById<ActionDefinition>
+{
+    private Actions actions;
+
+    public void setActions(Actions actions)
+    {
+        this.actions = actions;
+    }
+
+    @Override
+    public CollectionWithPagingInfo<ActionDefinition> readAll(Parameters params)
+    {
+        return actions.getActionDefinitions(params);
+    }
+
+    @Override
+    public ActionDefinition readById(String id, Parameters parameters) throws EntityNotFoundException 
+    {
+        return actions.getActionDefinitionById(id);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/actions/ActionExecutionsEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/actions/ActionExecutionsEntityResource.java
new file mode 100644
index 00000000000..30f2594fd15
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/actions/ActionExecutionsEntityResource.java
@@ -0,0 +1,63 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.actions;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.Actions;
+import org.alfresco.rest.api.model.Action;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.springframework.extensions.webscripts.Status;
+
+@EntityResource(name = "action-executions", title = "Actions")
+public class ActionExecutionsEntityResource implements EntityResourceAction.Create<Action>
+{
+    private Actions actions;
+
+    public void setActions(Actions actions)
+    {
+        this.actions = actions;
+    }
+
+    @WebApiDescription(title = "Execute action", successStatus = Status.STATUS_ACCEPTED)
+    @Override
+    public List<Action> create(List<Action> entity, Parameters parameters)
+    {
+        if (entity == null || entity.size() != 1)
+        {
+            throw new InvalidArgumentException("Please specify one action request only.");
+        }
+
+        List<Action> result = new ArrayList<>(1);
+        result.add(actions.executeAction(entity.get(0), parameters));
+        return result;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/actions/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/actions/package-info.java
new file mode 100644
index 00000000000..77b88184974
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/actions/package-info.java
@@ -0,0 +1,30 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="alfresco", scope= Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.api.actions;
+
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/audit/AuditApplicationsAuditEntriesRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/audit/AuditApplicationsAuditEntriesRelation.java
new file mode 100644
index 00000000000..79c209cb68c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/audit/AuditApplicationsAuditEntriesRelation.java
@@ -0,0 +1,88 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.audit;
+
+import org.alfresco.rest.api.Audit;
+import org.alfresco.rest.api.model.AuditEntry;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * Audit Entries (within the context of an Audit Application)
+ * 
+ * @author anechifor, janv
+ */
+@RelationshipResource(name = "audit-entries", entityResource = AuditApplicationsEntityResource.class, title = "Audit Application Entries")
+public class AuditApplicationsAuditEntriesRelation implements RelationshipResourceAction.Read<AuditEntry>,
+        RelationshipResourceAction.ReadById<AuditEntry>, RelationshipResourceAction.Delete, RelationshipResourceAction.DeleteSet, InitializingBean
+{
+    private Audit audit;
+
+    public void setAudit(Audit audit)
+    {
+        this.audit = audit;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("audit", this.audit);
+    }
+
+    @WebApiDescription(title = "Returns audit entries for audit app id")
+    @Override
+    public CollectionWithPagingInfo<AuditEntry> readAll(String auditAppId, Parameters parameters)
+    {
+        return audit.listAuditEntries(auditAppId, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Return audit entry id for audit app id")
+    public AuditEntry readById(String auditAppId, String auditEntryId, Parameters parameters) throws RelationshipResourceNotFoundException
+    {
+        return audit.getAuditEntry(auditAppId, Long.valueOf(auditEntryId), parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Delete audit entry id for audit app id")
+    public void delete(String auditAppId, String auditEntryId, Parameters parameters) throws RelationshipResourceNotFoundException
+    {
+        audit.deleteAuditEntry(auditAppId, Long.valueOf(auditEntryId), parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Delete collection/set of audit entries for audit app id - based on params")
+    public void deleteSet(String auditAppId, Parameters parameters) throws RelationshipResourceNotFoundException
+    {
+        audit.deleteAuditEntries(auditAppId, parameters);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/audit/AuditApplicationsEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/audit/AuditApplicationsEntityResource.java
new file mode 100644
index 00000000000..5ce75ebb074
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/audit/AuditApplicationsEntityResource.java
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.audit;
+
+import org.alfresco.rest.api.Audit;
+import org.alfresco.rest.api.model.AuditApp;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * An implementation of an Entity Resource for handling audit applications
+ *
+ * @author janv, anechifor, eknizat
+ */
+@EntityResource(name = "audit-applications", title = "Audit Applications")
+public class AuditApplicationsEntityResource implements EntityResourceAction.ReadById<AuditApp>, EntityResourceAction.Read<AuditApp>,
+        EntityResourceAction.Update<AuditApp>, InitializingBean
+{
+    private Audit audit;
+
+    public void setAudit(Audit audit)
+    {
+        this.audit = audit;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("audit", this.audit);
+    }
+
+    @Override
+    @WebApiDescription(title = "Returns audit application for audit app id")
+    public AuditApp readById(String auditAppId, Parameters parameters) throws EntityNotFoundException
+    {
+        return audit.getAuditApp(auditAppId, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Update audit", description = "Update audit")
+    public AuditApp update(String auditAppId, AuditApp auditApp, Parameters parameters)
+    {
+        return audit.update(auditAppId, auditApp, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Get List of audit applications", description = "Get List of Audit Applications")
+    public CollectionWithPagingInfo<AuditApp> readAll(Parameters parameters)
+    {
+        return audit.getAuditApps(parameters.getPaging());
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/audit/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/audit/package-info.java
new file mode 100644
index 00000000000..3f0c9a02fd2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/audit/package-info.java
@@ -0,0 +1,30 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+@WebApi(name="alfresco", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.api.audit;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/authentications/AuthenticationTicketsEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/authentications/AuthenticationTicketsEntityResource.java
new file mode 100644
index 00000000000..46ffe179e72
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/authentications/AuthenticationTicketsEntityResource.java
@@ -0,0 +1,95 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.authentications;
+
+import org.alfresco.rest.api.Authentications;
+import org.alfresco.rest.api.model.LoginTicket;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiNoAuth;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.util.PropertyCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+@EntityResource(name = "tickets", title = "Authentication tickets")
+public class AuthenticationTicketsEntityResource implements EntityResourceAction.Create<LoginTicket>,
+            EntityResourceAction.ReadByIdWithResponse<LoginTicket>,
+            EntityResourceAction.DeleteWithResponse,
+            InitializingBean
+{
+    // tickets => @EntityResource(name = "tickets" ...
+    public static final String COLLECTION_RESOURCE_NAME = "tickets";
+
+    private Authentications authentications;
+
+    public void setAuthentications(Authentications authentications)
+    {
+        this.authentications = authentications;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        PropertyCheck.mandatory(this, "authentications", authentications);
+    }
+
+    @WebApiDescription(title = "Login", description = "Login.")
+    @WebApiNoAuth
+    @Override
+    public List<LoginTicket> create(List<LoginTicket> entity, Parameters parameters)
+    {
+        if (entity == null || entity.size() != 1)
+        {
+            throw new InvalidArgumentException("Please specify one login request only.");
+        }
+        LoginTicket result = authentications.createTicket(entity.get(0), parameters);
+        return Collections.singletonList(result);
+    }
+
+    @WebApiDescription(title = "Validate login ticket", description = "Validate login ticket.")
+    @Override
+    public LoginTicket readById(String me, Parameters parameters, WithResponse withResponse)
+    {
+        return authentications.validateTicket(me, parameters, withResponse);
+    }
+
+    @WebApiDescription(title = "Logout", description = "Logout.")
+    @Override
+    public void delete(String me, Parameters parameters, WithResponse withResponse)
+    {
+        authentications.deleteTicket(me, parameters, withResponse);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/authentications/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/authentications/package-info.java
new file mode 100644
index 00000000000..a839c435103
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/authentications/package-info.java
@@ -0,0 +1,30 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name = "authentication", scope = Api.SCOPE.PUBLIC, version = 1)
+package org.alfresco.rest.api.authentications;
+
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelAspectsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelAspectsRelation.java
new file mode 100644
index 00000000000..ec9eebbf919
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelAspectsRelation.java
@@ -0,0 +1,106 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.cmm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.CustomModels;
+import org.alfresco.rest.api.model.CustomAspect;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.PropertyCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+@RelationshipResource(name = "aspects", entityResource = CustomModelEntityResource.class, title = "Custom Model Aspects")
+public class CustomModelAspectsRelation implements RelationshipResourceAction.Read<CustomAspect>,
+            RelationshipResourceAction.ReadById<CustomAspect>,
+            RelationshipResourceAction.Create<CustomAspect>,
+            RelationshipResourceAction.Update<CustomAspect>,
+            RelationshipResourceAction.Delete,
+            InitializingBean
+{
+
+    private CustomModels customModels;
+
+    public void setCustomModels(CustomModels customModels)
+    {
+        this.customModels = customModels;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        PropertyCheck.mandatory(this, "customModels", customModels);
+    }
+
+    @Override
+    @WebApiDescription(title = "Returns a paged list of all the custom model's aspects.")
+    public CollectionWithPagingInfo<CustomAspect> readAll(String modelName, Parameters parameters)
+    {
+        return customModels.getCustomAspects(modelName, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Returns custom aspect information for the given 'aspectName' in 'modelName'.")
+    public CustomAspect readById(String modelName, String aspectName, Parameters parameters)
+    {
+        return customModels.getCustomAspect(modelName, aspectName, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Removes the custom aspect for the given 'aspectName' in 'modelName'.")
+    public void delete(String modelName, String aspectName, Parameters parameters)
+    {
+        customModels.deleteCustomAspect(modelName, aspectName);
+    }
+
+    @Override
+    @WebApiDescription(title = "Updates the custom aspect in the given 'modelName'.")
+    public CustomAspect update(String modelName, CustomAspect aspect, Parameters parameters)
+    {
+        return customModels.updateCustomAspect(modelName, aspect, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Creates custom aspects for the model 'modelName'.")
+    public List<CustomAspect> create(String modelName, List<CustomAspect> aspects, Parameters parameters)
+    {
+        List<CustomAspect> result = new ArrayList<>(aspects.size());
+        for (CustomAspect aspect : aspects)
+        {
+            result.add(customModels.createCustomAspect(modelName, aspect));
+        }
+        return result;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelConstraintRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelConstraintRelation.java
new file mode 100644
index 00000000000..4800b5780ca
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelConstraintRelation.java
@@ -0,0 +1,90 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.cmm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.CustomModels;
+import org.alfresco.rest.api.model.CustomModelConstraint;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.PropertyCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+@RelationshipResource(name = "constraints", entityResource = CustomModelEntityResource.class, title = "Custom Model Constraints")
+public class CustomModelConstraintRelation implements RelationshipResourceAction.Read<CustomModelConstraint>,
+            RelationshipResourceAction.ReadById<CustomModelConstraint>,
+            RelationshipResourceAction.Create<CustomModelConstraint>,
+            InitializingBean
+{
+
+    private CustomModels customModels;
+
+    public void setCustomModels(CustomModels customModels)
+    {
+        this.customModels = customModels;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        PropertyCheck.mandatory(this, "customModels", customModels);
+    }
+
+    @Override
+    @WebApiDescription(title = "Returns a paged list of all the custom model's constraints.")
+    public CollectionWithPagingInfo<CustomModelConstraint> readAll(String modelName, Parameters parameters)
+    {
+        return customModels.getCustomModelConstraints(modelName, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Returns custom constraint information for the given 'constraintName' in 'modelName'.")
+    public CustomModelConstraint readById(String modelName, String constraintName, Parameters parameters)
+    {
+        return customModels.getCustomModelConstraint(modelName, constraintName, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Creates custom constraints for the model 'modelName'.")
+    public List<CustomModelConstraint> create(String modelName, List<CustomModelConstraint> constraints, Parameters parameters)
+    {
+        List<CustomModelConstraint> result = new ArrayList<>(constraints.size());
+        for (CustomModelConstraint constraint : constraints)
+        {
+            result.add(customModels.createCustomModelConstraint(modelName, constraint));
+        }
+        return result;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelDownloadRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelDownloadRelation.java
new file mode 100644
index 00000000000..5f7b043d324
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelDownloadRelation.java
@@ -0,0 +1,68 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.cmm;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.alfresco.rest.api.CustomModels;
+import org.alfresco.rest.api.model.CustomModelDownload;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.PropertyCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+@RelationshipResource(name = "download", entityResource = CustomModelEntityResource.class, title = "Custom Model Download")
+public class CustomModelDownloadRelation implements RelationshipResourceAction.Create<CustomModelDownload>, InitializingBean
+{
+
+    private CustomModels customModels;
+
+    public void setCustomModels(CustomModels customModels)
+    {
+        this.customModels = customModels;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        PropertyCheck.mandatory(this, "customModels", customModels);
+    }
+
+    @Override
+    @WebApiDescription(title = "Creates download node containing the custom model file and if specified, its associated Share extension module file.")
+    public List<CustomModelDownload> create(String modelName, List<CustomModelDownload> download, Parameters parameters)
+    {
+        CustomModelDownload result = customModels.createDownload(modelName, parameters);
+        return Collections.singletonList(result);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelEntityResource.java
new file mode 100644
index 00000000000..6eb5eb07378
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelEntityResource.java
@@ -0,0 +1,107 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.cmm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.CustomModels;
+import org.alfresco.rest.api.model.CustomModel;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.PropertyCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+@EntityResource(name = "cmm", title = "Custom Model Management")
+public class CustomModelEntityResource implements EntityResourceAction.Read<CustomModel>,
+            EntityResourceAction.ReadById<CustomModel>,
+            EntityResourceAction.Create<CustomModel>,
+            EntityResourceAction.Update<CustomModel>,
+            EntityResourceAction.Delete,
+            InitializingBean
+{
+
+    private CustomModels customModels;
+
+    public void setCustomModels(CustomModels customModels)
+    {
+        this.customModels = customModels;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        PropertyCheck.mandatory(this, "customModels", customModels);
+    }
+
+    @Override
+    @WebApiDescription(title="Returns custom model information for the given model name.")
+    public CustomModel readById(String modelName, Parameters parameters) throws EntityNotFoundException
+    {
+        return customModels.getCustomModel(modelName, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title="Returns a paged list of all custom models.")
+    public CollectionWithPagingInfo<CustomModel> readAll(Parameters parameters)
+    {
+        return customModels.getCustomModels(parameters);
+    }
+
+    @Override
+    @WebApiDescription(title="Creates custom model(s).")
+    public List<CustomModel> create(List<CustomModel> entity, Parameters parameters)
+    {
+        List<CustomModel> result = new ArrayList<>(entity.size());
+        for (CustomModel cm : entity)
+        {
+            result.add(customModels.createCustomModel(cm));
+        }
+        return result;
+    }
+
+    @Override
+    @WebApiDescription(title = "Updates or activates/deactivates the custom model.")
+    public CustomModel update(String modelName, CustomModel entity, Parameters parameters)
+    {
+        return customModels.updateCustomModel(modelName, entity, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Deletes the custom model.")
+    public void delete(String modelName, Parameters parameters)
+    {
+        customModels.deleteCustomModel(modelName);
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelTypesRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelTypesRelation.java
new file mode 100644
index 00000000000..28d1dd77203
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/cmm/CustomModelTypesRelation.java
@@ -0,0 +1,106 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.cmm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.CustomModels;
+import org.alfresco.rest.api.model.CustomType;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.PropertyCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+@RelationshipResource(name = "types", entityResource = CustomModelEntityResource.class, title = "Custom Model Types")
+public class CustomModelTypesRelation implements RelationshipResourceAction.Read<CustomType>,
+            RelationshipResourceAction.ReadById<CustomType>,
+            RelationshipResourceAction.Create<CustomType>,
+            RelationshipResourceAction.Update<CustomType>,
+            RelationshipResourceAction.Delete,
+            InitializingBean
+{
+
+    private CustomModels customModels;
+
+    public void setCustomModels(CustomModels customModels)
+    {
+        this.customModels = customModels;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        PropertyCheck.mandatory(this, "customModels", customModels);
+    }
+
+    @Override
+    @WebApiDescription(title = "Returns a paged list of all the custom model's types.")
+    public CollectionWithPagingInfo<CustomType> readAll(String modelName, Parameters parameters)
+    {
+        return customModels.getCustomTypes(modelName, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Returns custom type information for the given 'typeName' in 'modelName'.")
+    public CustomType readById(String modelName, String typeName, Parameters parameters)
+    {
+        return customModels.getCustomType(modelName, typeName, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Removes the custom type for the given 'typeName' in 'modelName'.")
+    public void delete(String modelName, String typeName, Parameters parameters)
+    {
+        customModels.deleteCustomType(modelName, typeName);
+    }
+
+    @Override
+    @WebApiDescription(title = "Updates the custom type in the given 'modelName'.")
+    public CustomType update(String modelName, CustomType type, Parameters parameters)
+    {
+        return customModels.updateCustomType(modelName, type, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Creates custom types for the model 'modelName'.")
+    public List<CustomType> create(String modelName, List<CustomType> types, Parameters parameters)
+    {
+        List<CustomType> result = new ArrayList<>(types.size());
+        for (CustomType type : types)
+        {
+            result.add(customModels.createCustomType(modelName, type));
+        }
+        return result;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/cmm/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/cmm/package-info.java
new file mode 100644
index 00000000000..efacb45f418
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/cmm/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="alfresco", scope=Api.SCOPE.PRIVATE, version=1)
+package org.alfresco.rest.api.cmm;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java b/remote-api/src/main/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java
new file mode 100644
index 00000000000..c163447fd0b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java
@@ -0,0 +1,197 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.discovery;
+
+import org.alfresco.rest.api.model.DiscoveryDetails;
+import org.alfresco.rest.api.model.ModulePackage;
+import org.alfresco.rest.api.model.RepositoryInfo;
+import org.alfresco.rest.api.model.RepositoryInfo.LicenseInfo;
+import org.alfresco.rest.api.model.RepositoryInfo.StatusInfo;
+import org.alfresco.rest.api.model.RepositoryInfo.VersionInfo;
+import org.alfresco.rest.framework.core.exceptions.DisabledServiceException;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
+import org.alfresco.rest.framework.tools.ApiAssistant;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+import org.alfresco.rest.framework.tools.ResponseWriter;
+import org.alfresco.service.cmr.admin.RepoAdminService;
+import org.alfresco.service.cmr.audit.AuditService;
+import org.alfresco.service.cmr.module.ModuleDetails;
+import org.alfresco.service.cmr.module.ModuleService;
+import org.alfresco.service.cmr.quickshare.QuickShareService;
+import org.alfresco.service.cmr.thumbnail.ThumbnailService;
+import org.alfresco.service.descriptor.Descriptor;
+import org.alfresco.service.descriptor.DescriptorService;
+import org.alfresco.util.PropertyCheck;
+import org.json.simple.JSONObject;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class DiscoveryApiWebscript extends AbstractWebScript implements RecognizedParamsExtractor, ResponseWriter, InitializingBean
+{
+    private DescriptorService descriptorService;
+    private RepoAdminService repoAdminService;
+    private AuditService auditService;
+    private QuickShareService quickShareService;
+    private ModuleService moduleService;
+    private ApiAssistant assistant;
+    private ThumbnailService thumbnailService;
+
+    private boolean enabled = true;
+    private final static String DISABLED = "Not Implemented";
+
+    public void setDescriptorService(DescriptorService descriptorService)
+    {
+        this.descriptorService = descriptorService;
+    }
+
+    public void setRepoAdminService(RepoAdminService repoAdminService)
+    {
+        this.repoAdminService = repoAdminService;
+    }
+
+    public void setAuditService(AuditService auditService)
+    {
+        this.auditService = auditService;
+    }
+
+    public void setQuickShareService(QuickShareService quickShareService)
+    {
+        this.quickShareService = quickShareService;
+    }
+
+    public void setModuleService(ModuleService moduleService)
+    {
+        this.moduleService = moduleService;
+    }
+
+    public void setAssistant(ApiAssistant assistant)
+    {
+        this.assistant = assistant;
+    }
+
+    public void setThumbnailService(ThumbnailService thumbnailService)
+    {
+        this.thumbnailService = thumbnailService;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        PropertyCheck.mandatory(this, "descriptorService", descriptorService);
+        PropertyCheck.mandatory(this, "repoAdminService", repoAdminService);
+        PropertyCheck.mandatory(this, "auditService", auditService);
+        PropertyCheck.mandatory(this, "quickShareService", quickShareService);
+        PropertyCheck.mandatory(this, "moduleService", moduleService);
+        PropertyCheck.mandatory(this, "assistant", assistant);
+        PropertyCheck.mandatory(this, "thumbnailService", thumbnailService);
+    }
+
+    @Override
+    public void execute(WebScriptRequest webScriptRequest, WebScriptResponse webScriptResponse) throws IOException
+    {
+        try
+        {
+            checkEnabled();
+
+            DiscoveryDetails discoveryDetails = new DiscoveryDetails(getRepositoryInfo());
+            // Write response
+            setResponse(webScriptResponse, DEFAULT_SUCCESS);
+            renderJsonResponse(webScriptResponse, discoveryDetails, assistant.getJsonHelper());
+        }
+        catch (Exception exception)
+        {
+            renderException(exception, webScriptResponse, assistant);
+        }
+    }
+
+    public RepositoryInfo getRepositoryInfo()
+    {
+        LicenseInfo licenseInfo = null;
+        if(descriptorService.getLicenseDescriptor() != null)
+        {
+            licenseInfo = new LicenseInfo(descriptorService.getLicenseDescriptor());
+        }
+        Descriptor serverDescriptor = descriptorService.getServerDescriptor();
+        return new RepositoryInfo()
+                    .setId(descriptorService.getCurrentRepositoryDescriptor().getId())
+                    .setEdition(serverDescriptor.getEdition())
+                    .setVersion(new VersionInfo(serverDescriptor))
+                    .setLicense(licenseInfo)
+                    .setModules(getModules())
+                    .setStatus(new StatusInfo()
+                                .setReadOnly(repoAdminService.getUsage().isReadOnly())
+                                .setAuditEnabled(auditService.isAuditEnabled())
+                                .setQuickShareEnabled(quickShareService.isQuickShareEnabled())
+                                .setThumbnailGenerationEnabled(thumbnailService.getThumbnailsEnabled()));
+    }
+
+    private List<ModulePackage> getModules()
+    {
+        List<ModuleDetails> details = moduleService.getAllModules();
+        if (details.isEmpty())
+        {
+            return null;
+        }
+        List<ModulePackage> packages = new ArrayList<>(details.size());
+        for (ModuleDetails detail : details)
+        {
+            packages.add(ModulePackage.fromModuleDetails(detail));
+        }
+        return packages;
+    }
+
+    @Override
+    public void renderJsonResponse(final WebScriptResponse res, final Object toSerialize, final JacksonHelper jsonHelper) throws IOException
+    {
+        jsonHelper.withWriter(res.getOutputStream(), (generator, objectMapper) -> {
+            JSONObject obj = new JSONObject();
+            obj.put("entry", toSerialize);
+            objectMapper.writeValue(generator, obj);
+        });
+    }
+
+    public void setEnabled(boolean enabled)
+    {
+        this.enabled = enabled;
+    }
+
+    private void checkEnabled()
+    {
+        if (!enabled)
+        {
+            throw new DisabledServiceException(DISABLED);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/downloads/DownloadsEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/downloads/DownloadsEntityResource.java
new file mode 100644
index 00000000000..7cb2616671a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/downloads/DownloadsEntityResource.java
@@ -0,0 +1,91 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.downloads;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.rest.api.Downloads;
+import org.alfresco.rest.api.model.Download;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * 
+ * @author cpopa
+ *
+ */
+@EntityResource(name = "downloads", title = "Downloads")
+public class DownloadsEntityResource implements EntityResourceAction.Create<Download>, EntityResourceAction.ReadById<Download>, EntityResourceAction.Delete, InitializingBean
+{
+    private Downloads downloads;
+
+    public void setDownloads(Downloads downloads)
+    {
+        this.downloads = downloads;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("downloads", this.downloads);
+    }
+
+    @Override
+    @WebApiDescription(title = "Create download", description = "Create a download node whose content will be a zip which is being created asynchronously.", successStatus = HttpServletResponse.SC_ACCEPTED)
+    @WebApiParam(name = "entity", title = "Download request", description = "Download request which contains the node ids for the zip elements.", 
+                 kind = ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple = false)
+    public List<Download> create(List<Download> entity, Parameters parameters)
+    {
+        Download downloadNode = downloads.createDownloadNode(entity.get(0));
+        return Collections.singletonList(downloadNode);
+    }
+
+    @Override
+    @WebApiDescription(title = "Get download information", description = "Get information about the progress of the zip creation.")
+    @WebApiParam(name = "nodeId", title = "Download nodeId")
+    public Download readById(String nodeId, Parameters parameters) throws EntityNotFoundException
+    {
+        return downloads.getDownloadStatus(nodeId);
+    }
+    
+    @WebApiDescription(title = "Cancel download", description = "Stop the zip creation if still in progress.", successStatus = HttpServletResponse.SC_ACCEPTED)
+    @Override
+    public void delete(String nodeId, Parameters parameters)
+    {
+        downloads.cancel(nodeId);
+    }
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/downloads/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/downloads/package-info.java
new file mode 100644
index 00000000000..7583142401a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/downloads/package-info.java
@@ -0,0 +1,30 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+@WebApi(name="alfresco", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.api.downloads;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/groups/GroupMembersRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/groups/GroupMembersRelation.java
new file mode 100644
index 00000000000..dfef446cc14
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/groups/GroupMembersRelation.java
@@ -0,0 +1,87 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.groups;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.Groups;
+import org.alfresco.rest.api.model.GroupMember;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+
+ * @author cturlica
+ */
+@RelationshipResource(name = "members", entityResource = GroupsEntityResource.class, title = "Group Members")
+public class GroupMembersRelation
+        implements RelationshipResourceAction.Read<GroupMember>, RelationshipResourceAction.Create<GroupMember>, RelationshipResourceAction.Delete, InitializingBean
+{
+    private Groups groups;
+
+    public void setGroups(Groups groups)
+    {
+        this.groups = groups;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("groups", this.groups);
+    }
+
+    @Override
+    @WebApiDescription(title = "A paged list of all the members of the group 'groupId'.")
+    public CollectionWithPagingInfo<GroupMember> readAll(String groupId, Parameters params)
+    {
+        return groups.getGroupMembers(groupId, params);
+    }
+
+    @Override
+    @WebApiDescription(title = "Create group membership.")
+    @WebApiParam(name = "entity", title = "A single group member", description = "A single group member, multiple groups members are not supported.", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple = false, required = true)
+    public List<GroupMember> create(String groupId, List<GroupMember> entity, Parameters params)
+    {
+        List<GroupMember> result = new ArrayList<>(1);
+        result.add(groups.createGroupMember(groupId, entity.get(0)));
+        return result;
+    }
+
+    @Override
+    @WebApiDescription(title = "Delete group membership")
+    public void delete(String entityResourceId, String id, Parameters parameters)
+    {
+        groups.deleteGroupMembership(entityResourceId, id);
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/groups/GroupsEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/groups/GroupsEntityResource.java
new file mode 100644
index 00000000000..bd6ecc71de4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/groups/GroupsEntityResource.java
@@ -0,0 +1,104 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.groups;
+
+import org.alfresco.rest.api.Groups;
+import org.alfresco.rest.api.model.Group;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * An implementation of an Entity Resource for a Group
+ * 
+ * @author cturlica
+ */
+@EntityResource(name = "groups", title = "Groups")
+public class GroupsEntityResource implements EntityResourceAction.Read<Group>, EntityResourceAction.ReadById<Group>, EntityResourceAction.Create<Group>,
+        EntityResourceAction.Update<Group>, EntityResourceAction.Delete, InitializingBean
+{
+    private Groups groups;
+
+    public void setGroups(Groups groups)
+    {
+        this.groups = groups;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("groups", this.groups);
+    }
+
+    @Override
+    @WebApiDescription(title = "Get List of Groups", description = "Get List of Groups")
+    public CollectionWithPagingInfo<Group> readAll(Parameters params)
+    {
+        return groups.getGroups(params);
+    }
+
+    @Override
+    @WebApiDescription(title="Returns group information for group id")
+    public Group readById(String groupId, Parameters parameters) throws EntityNotFoundException
+    {
+        return groups.getGroup(groupId, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title="Create group", description="Create group")
+    @WebApiParam(name="entity", title="A single group", description="A single group, multiple groups are not supported.",
+            kind= ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple=false, required = true)
+    public List<Group> create(List<Group> entity, Parameters parameters)
+    {
+        List<Group> result = new ArrayList<>(1);
+        result.add(groups.create(entity.get(0), parameters));
+        return result;
+    }
+
+    @Override
+    @WebApiDescription(title = "Update group", description = "Update group")
+    public Group update(String groupId, Group group, Parameters parameters)
+    {
+        return groups.update(groupId, group, parameters);
+    }
+
+    @Override
+    @WebApiDescription(title = "Delete group", description = "Delete group")
+    public void delete(String groupId, Parameters parameters)
+    {
+        groups.delete(groupId, parameters);
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/groups/SiteGroupsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/groups/SiteGroupsRelation.java
new file mode 100644
index 00000000000..00b13af7a67
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/groups/SiteGroupsRelation.java
@@ -0,0 +1,128 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.groups;
+
+import org.alfresco.rest.api.Sites;
+import org.alfresco.rest.api.model.SiteGroup;
+import org.alfresco.rest.api.sites.SiteEntityResource;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RelationshipResource(name = "group-members", entityResource = SiteEntityResource.class, title = "Site Groups")
+public class SiteGroupsRelation implements RelationshipResourceAction.Read<SiteGroup>,
+        RelationshipResourceAction.Delete,
+        RelationshipResourceAction.Create<SiteGroup>,
+        RelationshipResourceAction.Update<SiteGroup>,
+        RelationshipResourceAction.ReadById<SiteGroup>,
+        InitializingBean
+{
+
+    private Sites sites;
+
+    public void setSites(Sites sites)
+    {
+        this.sites = sites;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("sites", this.sites);
+    }
+
+    /**
+     * POST sites/<siteId>/group-members
+     * <p>
+     * Adds groups to site
+     * <p>
+     * If group does not exist throws NotFoundException (status 404).
+     *
+     * @see RelationshipResourceAction.Create#create(String, List, Parameters)
+     */
+    @Override
+    @WebApiDescription(title = "Adds groups as a member of site siteId.")
+    public List<SiteGroup> create(String siteId, List<SiteGroup> siteMembers, Parameters parameters)
+    {
+        return siteMembers.stream().map((group) -> sites.addSiteGroupMembership(siteId, group)).collect(Collectors.toList());
+    }
+
+    /**
+     * Returns a paged list of all the groups of the site 'siteId'.
+     * <p>
+     * If siteId does not exist, throws NotFoundException (status 404).
+     */
+    @Override
+    @WebApiDescription(title = "A paged list of all the groups of the site 'siteId'.")
+    public CollectionWithPagingInfo<SiteGroup> readAll(String siteId, Parameters parameters)
+    {
+        return sites.getSiteGroupMemberships(siteId, parameters);
+    }
+
+    /**
+     * Returns site membership information for groupId in siteId.
+     * <p>
+     * GET sites/<siteId>/group-members/<groupId>
+     */
+    @Override
+    @WebApiDescription(title = "Returns site membership information for groupId in siteId.")
+    public SiteGroup readById(String siteId, String groupId, Parameters parameters)
+    {
+        return sites.getSiteGroupMembership(siteId, groupId);
+    }
+
+    /**
+     * PUT sites/<siteId>/group-members/<groupId>
+     * <p>
+     * Updates the membership of group in the site.
+     */
+    @Override
+    @WebApiDescription(title = "Updates the membership of groupId in the site.")
+    public SiteGroup update(String siteId, SiteGroup groupMember, Parameters parameters)
+    {
+        return sites.updateSiteGroupMembership(siteId, groupMember);
+    }
+
+    /**
+     * DELETE sites/<siteId>/group-members/<groupId>
+     * <p>
+     * Remove a group from site.
+     */
+    @Override
+    @WebApiDescription(title = "Removes groupId as a member of site siteId.")
+    public void delete(String siteId, String groupId, Parameters parameters)
+    {
+        sites.removeSiteGroupMembership(siteId, groupId);
+    }
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/groups/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/groups/package-info.java
new file mode 100644
index 00000000000..884613cec9d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/groups/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="alfresco", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.api.groups;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/ActionsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/ActionsImpl.java
new file mode 100644
index 00000000000..8c89fb7a2e0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/ActionsImpl.java
@@ -0,0 +1,409 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.rest.api.Actions;
+import org.alfresco.rest.api.model.Action;
+import org.alfresco.rest.api.model.ActionDefinition;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.action.ParameterDefinition;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryException;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.namespace.NamespacePrefixResolver;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.naturalOrder;
+import static java.util.Comparator.nullsFirst;
+
+public class ActionsImpl implements Actions
+{
+    private ActionService actionService;
+    private DictionaryService dictionaryService;
+    private NamespaceService namespaceService;
+    private NodeService nodeService;
+    private NamespacePrefixResolver prefixResolver;
+
+    public void setActionService(ActionService actionService)
+    {
+        this.actionService = actionService;
+    }
+
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService;
+    }
+
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public void setPrefixResolver(NamespacePrefixResolver prefixResolver)
+    {
+        this.prefixResolver = prefixResolver;
+    }
+
+    @Override
+    public ActionDefinition getActionDefinitionById(String actionDefinitionId)
+    {
+        if (actionDefinitionId == null)
+        {
+            throw new IllegalArgumentException("Missing actionDefinitionId");
+        }
+
+        // Non-existing actionDefinitionId -> 404
+        ActionDefinition result = null;
+        try
+        {
+            result = getActionDefinition(actionService.getActionDefinition(actionDefinitionId));
+        }
+        catch (NoSuchBeanDefinitionException nsbdx)
+        {
+            // Intentionally empty.
+        }
+
+        if (result == null)
+        {
+            throw new EntityNotFoundException(actionDefinitionId);
+        }
+
+        return result;
+    }
+    
+    private ActionDefinition getActionDefinition( 
+            org.alfresco.service.cmr.action.ActionDefinition actionDefinitionId)
+    {        
+        List<ActionDefinition.ParameterDefinition> paramDefs =
+                actionDefinitionId.
+                        getParameterDefinitions().
+                        stream().
+                        map(this::toModel).
+                        collect(Collectors.toList());
+        return new ActionDefinition(
+                actionDefinitionId.getName(), // ID is a synonym for name.
+                actionDefinitionId.getName(),
+                actionDefinitionId.getTitle(),
+                actionDefinitionId.getDescription(),
+                toShortQNames(actionDefinitionId.getApplicableTypes()),
+                actionDefinitionId.getAdhocPropertiesAllowed(),
+                actionDefinitionId.getTrackStatus(),
+                paramDefs);
+    }
+    
+    @Override
+    public CollectionWithPagingInfo<ActionDefinition> getActionDefinitions(NodeRef nodeRef, Parameters params)
+    {
+        return actionDefinitions(actionService.getActionDefinitions(nodeRef), params);
+    }
+
+    @Override
+    public CollectionWithPagingInfo<ActionDefinition> getActionDefinitions(Parameters params)
+    {
+        return actionDefinitions(actionService.getActionDefinitions(), params);
+    }
+
+    private CollectionWithPagingInfo<ActionDefinition> actionDefinitions(
+            List<org.alfresco.service.cmr.action.ActionDefinition> actionDefinitions,
+            Parameters params)
+    {
+        List<SortColumn> sorting = params.getSorting();
+        Actions.SortKey sortKey = SortKey.NAME; // default
+        Boolean sortAsc = true; // default
+        if (sorting != null && !sorting.isEmpty())
+        {
+            if (sorting.size() > 1)
+            {
+                throw new IllegalArgumentException("Only a single sort field ('name' or 'title') is supported.");
+            }
+            sortKey = Actions.SortKey.valueOf(sorting.get(0).column.toUpperCase());
+            sortAsc = sorting.get(0).asc;
+        }
+        
+        Comparator<? super ActionDefinition> comparator;
+        switch (sortKey)
+        {
+            case TITLE:
+                comparator = comparing(ActionDefinition::getTitle, nullsFirst(naturalOrder()));
+                break;
+            case NAME:
+                comparator = comparing(ActionDefinition::getName, nullsFirst(naturalOrder()));
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid sort key, must be either 'title' or 'name'.");
+        }
+        
+        if (!sortAsc)
+        {
+            comparator = comparator.reversed();
+        }
+
+
+        final int maxItems = params.getPaging().getMaxItems();
+        final int skip = params.getPaging().getSkipCount();
+
+        List<ActionDefinition> sortedPage = actionDefinitions.
+                stream().
+                map(actionDefinition -> {
+                    List<ActionDefinition.ParameterDefinition> paramDefs =
+                            actionDefinition.
+                                    getParameterDefinitions().
+                                    stream().
+                                    map(this::toModel).
+                                    collect(Collectors.toList());
+                    return new ActionDefinition(
+                            actionDefinition.getName(), // ID is a synonym for name.
+                            actionDefinition.getName(),
+                            actionDefinition.getTitle(),
+                            actionDefinition.getDescription(),
+                            toShortQNames(actionDefinition.getApplicableTypes()),
+                            actionDefinition.getAdhocPropertiesAllowed(),
+                            actionDefinition.getTrackStatus(),
+                            paramDefs);
+                }).
+                sorted(comparator).
+                skip(skip).
+                limit(maxItems).
+                collect(Collectors.toList());
+        
+        boolean hasMoreItems = actionDefinitions.size() > (skip + maxItems);
+
+        return CollectionWithPagingInfo.asPaged(
+                params.getPaging(),
+                sortedPage,
+                hasMoreItems,
+                actionDefinitions.size());
+    }
+
+    @Override
+    public Action executeAction(Action action, Parameters parameters)
+    {
+
+        if (action == null)
+        {
+            throw new InvalidArgumentException("action is null");
+        }
+
+        // Check action definition.
+
+        if (action.getActionDefinitionId() == null || action.getActionDefinitionId().isEmpty())
+        {
+            throw new InvalidArgumentException("action.actionDefinitionId is null or empty");
+        }
+
+        org.alfresco.service.cmr.action.ActionDefinition actionDef = null;
+        try
+        {
+            actionDef = actionService.getActionDefinition(action.getActionDefinitionId());
+        }
+        catch (NoSuchBeanDefinitionException nsbdx)
+        {
+            // Intentionally empty.
+        }
+
+        // The null check was intentionally added to catch the case when the bean is
+        // found but it isn't an instance of ActionExecuter. This is the only case when
+        // the result of getActionDefinition can be null and not throw the exception.
+        if (actionDef == null)
+        {
+            throw new EntityNotFoundException(action.getActionDefinitionId());
+        }
+
+        // targetId is optional, however, currently targetId must be a valid node ID.
+        NodeRef actionedUponNodeRef = null;
+        if (action.getTargetId() != null && !action.getTargetId().isEmpty())
+        {
+            // Does it exist in the repo?
+            actionedUponNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, action.getTargetId());
+
+            if (!nodeService.exists(actionedUponNodeRef))
+            {
+                throw new EntityNotFoundException(action.getTargetId());
+            }
+        }
+
+        org.alfresco.service.cmr.action.Action cmrAction;
+        if (action.getParams() != null && !action.getParams().isEmpty())
+        {
+            cmrAction = actionService.createAction(action.getActionDefinitionId(), extractActionParams(actionDef, action.getParams()));
+        }
+        else
+        {
+            cmrAction = actionService.createAction(action.getActionDefinitionId());
+        }
+
+        actionService.executeAction(cmrAction, actionedUponNodeRef, true, true);
+
+        // Create user result.
+        Action result = new Action();
+        result.setId(cmrAction.getId());
+
+        return result;
+    }
+
+    private Map<String, Serializable> extractActionParams(org.alfresco.service.cmr.action.ActionDefinition actionDefinition, Map<String, String> params)
+    {
+        Map<String, Serializable> parameterValues = new HashMap<>();
+
+        try
+        {
+            for (Map.Entry<String, String> entry : params.entrySet())
+            {
+                String propertyName = entry.getKey();
+                Object propertyValue = entry.getValue();
+
+                // Get the parameter definition we care about
+                ParameterDefinition paramDef = actionDefinition.getParameterDefintion(propertyName);
+                if (paramDef == null && !actionDefinition.getAdhocPropertiesAllowed())
+                {
+                    throw new AlfrescoRuntimeException("Invalid parameter " + propertyName + " for action/condition " + actionDefinition.getName());
+                }
+                if (paramDef != null)
+                {
+                    QName typeQName = paramDef.getType();
+
+                    // Convert the property value
+                    Serializable value = convertValue(typeQName, propertyValue);
+                    parameterValues.put(propertyName, value);
+                }
+                else
+                {
+                    // If there is no parameter definition we can only rely on the .toString()
+                    // representation of the ad-hoc property
+                    parameterValues.put(propertyName, propertyValue.toString());
+                }
+            }
+        }
+        catch (JSONException je)
+        {
+            throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from req.", je);
+        }
+
+        return parameterValues;
+    }
+
+    private Serializable convertValue(QName typeQName, Object propertyValue) throws JSONException
+    {
+        Serializable value;
+
+        DataTypeDefinition typeDef = dictionaryService.getDataType(typeQName);
+        if (typeDef == null)
+        {
+            throw new AlfrescoRuntimeException("Action property type definition " + typeQName.toPrefixString() + " is unknown.");
+        }
+
+        if (propertyValue instanceof JSONArray)
+        {
+            // Convert property type to java class
+            String javaClassName = typeDef.getJavaClassName();
+            try
+            {
+                Class.forName(javaClassName);
+            }
+            catch (ClassNotFoundException e)
+            {
+                throw new DictionaryException("Java class " + javaClassName + " of property type " + typeDef.getName() + " is invalid", e);
+            }
+
+            int length = ((JSONArray) propertyValue).length();
+            List<Serializable> list = new ArrayList<>(length);
+            for (int i = 0; i < length; i++)
+            {
+                list.add(convertValue(typeQName, ((JSONArray) propertyValue).get(i)));
+            }
+            value = (Serializable) list;
+        }
+        else
+        {
+            if (typeQName.equals(DataTypeDefinition.QNAME) && typeQName.toString().contains(":"))
+            {
+                value = QName.createQName(propertyValue.toString(), namespaceService);
+            }
+            else
+            {
+                value = (Serializable) DefaultTypeConverter.INSTANCE.convert(dictionaryService.getDataType(typeQName), propertyValue);
+            }
+        }
+
+        return value;
+    }
+
+    private List<String> toShortQNames(Set<QName> types)
+    {
+        return types.
+                stream().
+                map(this::toShortQName).
+                collect(Collectors.toList());
+    }
+    
+    private String toShortQName(QName type)
+    {
+        return type.toPrefixString(prefixResolver);
+    }
+
+    private ActionDefinition.ParameterDefinition toModel(ParameterDefinition p)
+    {
+        return new ActionDefinition.ParameterDefinition(
+                p.getName(),
+                toShortQName(p.getType()),
+                p.isMultiValued(),
+                p.isMandatory(),
+                p.getDisplayLabel(),
+                p.getParameterConstraintName()
+        );
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/ActivitiesImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/ActivitiesImpl.java
new file mode 100644
index 00000000000..8064c1ed300
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/ActivitiesImpl.java
@@ -0,0 +1,182 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.domain.activities.ActivityFeedEntity;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.rest.api.Activities;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.Sites;
+import org.alfresco.rest.api.impl.activities.ActivitySummaryParser;
+import org.alfresco.rest.api.model.Activity;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.JSONException;
+
+/**
+ * Centralises access to activities services and maps between representations.
+ * 
+ * @author steveglover
+ *
+ */
+public class ActivitiesImpl implements Activities
+{
+	private static final String ACTIVITIES_FORMAT = "json";
+
+	private People people;
+	private ActivityService activityService;
+	private ActivitySummaryParser activitySummaryParser;
+    private TenantService tenantService;
+    private Sites sites;
+    
+	public void setSites(Sites sites)
+	{
+		this.sites = sites;
+	}
+
+	public void setPeople(People people)
+	{
+		this.people = people;
+	}
+	
+	public void setTenantService(TenantService tenantService)
+	{
+		this.tenantService = tenantService;
+	}
+
+	public void setActivityService(ActivityService activityService)
+	{
+		this.activityService = activityService;
+	}
+
+	public void setActivitySummaryParser(ActivitySummaryParser activitySummaryParser)
+	{
+		this.activitySummaryParser = activitySummaryParser;
+	}
+
+	public Map<String, Object> getActivitySummary(ActivityFeedEntity entity) throws JSONException
+	{
+		Map<String, Object> activitySummary = activitySummaryParser.parse(entity.getActivityType(), entity.getActivitySummary());
+		return activitySummary;
+	}
+	
+	private String getSiteId(String siteNetwork)
+	{
+		String siteId = siteNetwork;
+
+        int idx = siteNetwork.lastIndexOf(TenantService.SEPARATOR);
+        if(idx != -1)
+        {
+            siteId = siteNetwork.substring(idx + 1);
+        }
+
+        return siteId;
+	}
+
+    public CollectionWithPagingInfo<Activity> getUserActivities(String personId, final Parameters parameters)
+    {
+    	personId = people.validatePerson(personId);
+
+    	Paging paging = parameters.getPaging();
+    	String siteId = parameters.getParameter("siteId");
+    	String who = parameters.getParameter("who");
+    	ActivityWho activityWho = null;
+    	if(who != null)
+    	{
+	    	try
+	    	{
+	    		activityWho = ActivityWho.valueOf(who);
+	    	}
+	    	catch(IllegalArgumentException e)
+	    	{
+                throw new InvalidArgumentException("Parameter who should be one of " + Arrays.toString(ActivityWho.values()));
+	    	}
+    	}
+
+    	if(siteId != null && !siteId.equals(""))
+    	{
+    		SiteInfo siteInfo = sites.validateSite(siteId);
+        	if(siteInfo == null)
+        	{
+        		// site does not exist
+        		throw new EntityNotFoundException(siteId);
+        	}
+        	// set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
+        	siteId = siteInfo.getShortName();
+    	}
+
+    	try
+    	{
+            PagingResults<ActivityFeedEntity> activities = null;
+
+            if(activityWho == null)
+            {
+            	activities = activityService.getPagedUserFeedEntries(personId, siteId, false, false, -1, Util.getPagingRequest(paging));
+            }
+            else if(activityWho.equals(ActivityWho.me))
+            {
+            	activities = activityService.getPagedUserFeedEntries(personId, siteId, false, true, -1, Util.getPagingRequest(paging));
+            }
+            else if(activityWho.equals(ActivityWho.others))
+            {
+            	activities = activityService.getPagedUserFeedEntries(personId, siteId, true, false, -1, Util.getPagingRequest(paging));
+            }
+            else
+            {
+                throw new InvalidArgumentException("Who argument is invalid.");
+            }
+            
+            List<ActivityFeedEntity> feedEntities = activities.getPage();
+            List<Activity> ret = new ArrayList<Activity>(feedEntities.size());
+            for(ActivityFeedEntity entity : feedEntities)
+            {
+            	String feedSiteId = getSiteId(entity.getSiteNetwork());
+            	String networkId = tenantService.getDomain(entity.getSiteNetwork());
+                Activity activity = new Activity(entity.getId(), networkId, feedSiteId, entity.getFeedUserId(), entity.getPostUserId(),
+                		entity.getPostDate(), entity.getActivityType(), getActivitySummary(entity));
+            	ret.add(activity);
+            }
+
+            return CollectionWithPagingInfo.asPaged(paging, ret, activities.hasMoreItems(), activities.getTotalResultCount().getFirst());
+    	}
+    	catch(JSONException e)
+    	{
+    		throw new AlfrescoRuntimeException("", e);
+    	}
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/AuditImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/AuditImpl.java
new file mode 100644
index 00000000000..fdb865fc995
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/AuditImpl.java
@@ -0,0 +1,885 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.api.Audit;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.model.AuditApp;
+import org.alfresco.rest.api.model.AuditEntry;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.UserInfo;
+import org.alfresco.rest.framework.core.exceptions.DisabledServiceException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.rest.framework.resource.parameters.where.Query;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.workflow.api.impl.MapBasedQueryWalker;
+import org.alfresco.service.cmr.audit.AuditQueryParameters;
+import org.alfresco.service.cmr.audit.AuditService;
+import org.alfresco.service.cmr.audit.AuditService.AuditApplication;
+import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.util.ISO8601DateFormat;
+import org.alfresco.util.ISO9075;
+import org.alfresco.util.Pair;
+
+/**
+ * Handles audit (applications & entries)
+ *
+ * @author janv, anechifor, eknizat
+ */
+public class AuditImpl implements Audit
+{
+
+    private final static String DISABLED = "Audit is disabled system-wide";
+    private final static String DEFAULT_USER = "-me-";
+
+    // list of equals filter's auditEntry (via where clause)
+    private final static Set<String> LIST_AUDIT_ENTRY_EQUALS_QUERY_PROPERTIES = new HashSet<>(
+            Arrays.asList(new String[] { CREATED_BY_USER, VALUES_KEY, VALUES_VALUE }));
+
+    // map of sort parameters for the moment one createdAt
+    private final static Map<String, String> SORT_PARAMS_TO_NAMES;
+
+    static
+    {
+        Map<String, String> aMap = new HashMap<>(1);
+        aMap.put(CREATED_AT, CREATED_AT);
+        SORT_PARAMS_TO_NAMES = Collections.unmodifiableMap(aMap);
+    }
+
+    private AuditService auditService;
+
+    private PersonService personService;
+
+    private NodeService nodeService;
+
+    private NamespaceService namespaceService;
+
+    private Nodes nodes;
+
+    private People people;
+
+    public void setPeople(People people)
+    {
+        this.people = people;
+    }
+
+    public void setNodes(Nodes nodes)
+    {
+        this.nodes = nodes;
+    }
+
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public void setAuditService(AuditService auditService)
+    {
+        this.auditService = auditService;
+    }
+
+    public void setPersonService(PersonService personService)
+    {
+        this.personService = personService;
+    }
+
+    private void checkEnabled()
+    {
+        if (!auditService.isAuditEnabled())
+        {
+            throw new DisabledServiceException(DISABLED);
+        }
+    }
+
+    @Override
+    public AuditApp getAuditApp(String auditAppId, Parameters parameters)
+    {
+        checkEnabled();
+
+        AuditService.AuditApplication auditApplication = findAuditAppByIdOr404(auditAppId);
+
+        AuditApp auditApp = new AuditApp(auditApplication.getKey().substring(1), auditApplication.getName(), auditApplication.isEnabled());
+
+        if (!parameters.getInclude().isEmpty())
+        {
+            List<String> filteredParams = parameters.getInclude().stream().filter(p -> (p.contains(PARAM_INCLUDE_MAX) || p.contains(PARAM_INCLUDE_MIN)))
+                    .collect(Collectors.toList());
+
+            if (!filteredParams.isEmpty())
+            {
+                HashMap<String, Long> result = auditService.getAuditMinMaxByApp(auditApp.getName(), filteredParams);
+
+                if (!result.isEmpty())
+                {
+                    // Set the max/min results to audit application
+                    auditApp.setMaxEntryId(result.get("max"));
+                    auditApp.setMinEntryId(result.get("min"));
+                }
+            }
+        }
+        return auditApp;
+    }
+
+    private AuditService.AuditApplication findAuditAppByIdOr404(String auditAppId)
+    {
+        AuditService.AuditApplication auditApplication = findAuditAppById(auditAppId);
+
+        if (auditApplication == null)
+        {
+            throw new EntityNotFoundException(auditAppId);
+        }
+
+        return auditApplication;
+    }
+
+    private AuditService.AuditApplication findAuditAppById(String auditAppId)
+    {
+        AuditService.AuditApplication auditApp = null;
+        Map<String, AuditService.AuditApplication> auditApplicationsByName = auditService.getAuditApplications();
+        if (auditApplicationsByName != null)
+        {
+            for (AuditService.AuditApplication auditApplication : auditApplicationsByName.values())
+            {
+                if (auditApplication.getKey().equals("/" + auditAppId))
+                {
+                    auditApp = auditApplication;
+                }
+            }
+        }
+        return auditApp;
+    }
+
+    @Override
+    public CollectionWithPagingInfo<AuditApp> getAuditApps(Paging paging)
+    {
+        checkEnabled();
+
+        Map<String, AuditService.AuditApplication> auditApplicationsByName = auditService.getAuditApplications();
+
+        Set<String> audAppsName = new TreeSet<String>(auditApplicationsByName.keySet());
+        Iterator<String> audAppsNameIt = audAppsName.iterator();
+
+        int skipCount = paging.getSkipCount();
+        int maxItems = paging.getMaxItems();
+        int totalItems = audAppsName.size();
+        int end = skipCount + maxItems;
+
+        if (skipCount >= totalItems)
+        {
+            List<AuditApp> empty = Collections.emptyList();
+            return CollectionWithPagingInfo.asPaged(paging, empty, false, totalItems);
+        }
+
+        List<AuditApp> auditApps = new ArrayList<AuditApp>(totalItems);
+        int count = 0;
+        for (int i = 0; i < end && audAppsNameIt.hasNext(); i++)
+        {
+            String auditAppName = audAppsNameIt.next();
+            if (i < skipCount)
+            {
+                continue;
+            }
+            count++;
+            AuditApplication auditApplication = auditApplicationsByName.get(auditAppName);
+
+            auditApps.add(new AuditApp(auditApplication.getKey().substring(1), auditApplication.getName(), auditApplication.isEnabled()));
+        }
+
+        boolean hasMoreItems = (skipCount + count < totalItems);
+
+        return CollectionWithPagingInfo.asPaged(paging, auditApps, hasMoreItems, totalItems);
+    }
+
+    @Override
+    public CollectionWithPagingInfo<AuditEntry> listAuditEntries(String auditAppId, Parameters parameters)
+    {
+        checkEnabled();
+
+        AuditService.AuditApplication auditApplication = findAuditAppByIdOr404(auditAppId);
+
+        // adding orderBy property
+        Pair<String, Boolean> sortProp = getAuditEntrySortProp(parameters);
+        Boolean forward = true;
+        if ((sortProp != null) && (sortProp.getFirst().equals(CREATED_AT)))
+        {
+            forward = sortProp.getSecond();
+        }
+
+        // Parse where clause properties.
+        List<AuditEntry> entriesAudit = new ArrayList<>();
+        Query q = parameters.getQuery();
+        // paging
+        Paging paging = parameters.getPaging();
+        int skipCount = paging.getSkipCount();
+        int maxItems = paging.getMaxItems();
+        int limit = skipCount + maxItems + 1; // to detect hasMoreItems
+
+        if (q != null)
+        {
+            // filtering via "where" clause
+            AuditEntryQueryWalker propertyWalker = new AuditEntryQueryWalker();
+            QueryHelper.walk(q, propertyWalker);
+            entriesAudit = getQueryResultAuditEntries(auditApplication, propertyWalker, parameters.getInclude(), limit, forward);
+        }
+
+        // clear null elements
+        entriesAudit.removeAll(Collections.singleton(null));
+        int totalItems = entriesAudit.size();
+
+        if (skipCount >= totalItems)
+        {
+            List<AuditEntry> empty = Collections.emptyList();
+            return CollectionWithPagingInfo.asPaged(paging, empty, false, totalItems);
+        }
+        else
+        {
+            int end = Math.min(limit - 1, totalItems);
+            boolean hasMoreItems = totalItems > end;
+
+            entriesAudit = entriesAudit.subList(skipCount, end);
+            return CollectionWithPagingInfo.asPaged(paging, entriesAudit, hasMoreItems, totalItems);
+        }
+    }
+
+    /**
+     * @param parameters
+     * @return
+     * @throws InvalidArgumentException
+     */
+    private Pair<String, Boolean> getAuditEntrySortProp(Parameters parameters)
+    {
+        Pair<String, Boolean> sortProp = null;
+        List<SortColumn> sortCols = parameters.getSorting();
+
+        if ((sortCols != null) && (sortCols.size() > 0))
+        {
+            if (sortCols.size() > 1)
+            {
+                throw new InvalidArgumentException("Multiple sort fields not allowed.");
+            }
+
+            SortColumn sortCol = sortCols.get(0);
+
+            String sortPropName = SORT_PARAMS_TO_NAMES.get(sortCol.column);
+            if (sortPropName == null)
+            {
+                throw new InvalidArgumentException("Invalid sort field: " + sortCol.column);
+            }
+
+            sortProp = new Pair<>(sortPropName, (sortCol.asc ? Boolean.TRUE : Boolean.FALSE));
+        }
+        return sortProp;
+    }
+
+    /**
+     * @author anechifor
+     */
+    private class AuditEntryQueryWalker extends MapBasedQueryWalker
+    {
+        private Long fromTime;
+        private Long toTime;
+
+        private Long fromId;
+        private Long toId;
+
+        public AuditEntryQueryWalker()
+        {
+            super(LIST_AUDIT_ENTRY_EQUALS_QUERY_PROPERTIES, null);
+        }
+
+        @Override
+        public void and()
+        {
+            // allow AND, e.g. createdByUser='jbloggs' AND createdAt BETWEEN ('...','...)
+        }
+
+        @Override
+        public void between(String propertyName, String firstValue, String secondValue, boolean negated)
+        {
+            if (propertyName.equals(CREATED_AT))
+            {
+                fromTime = getTime(firstValue);
+                toTime = getTime(secondValue) + 1;
+            }
+
+            if (propertyName.equals(ID))
+            {
+                fromId = Long.valueOf(firstValue);
+                toId = Long.valueOf(secondValue) + 1;
+            }
+        }
+
+        public Long getFromTime()
+        {
+            return fromTime;
+        }
+
+        public Long getToTime()
+        {
+            return toTime;
+        }
+
+        public String getCreatedByUser()
+        {
+            String propertyValue = getProperty(CREATED_BY_USER, WhereClauseParser.EQUALS, String.class);
+
+            // Check if '-me-' alias is used and replace it with userId
+            if ((propertyValue != null) && propertyValue.equalsIgnoreCase(DEFAULT_USER))
+            {
+                propertyValue = AuditImpl.this.people.validatePerson(propertyValue);
+            }
+            return propertyValue;
+        }
+
+        public String getValuesKey()
+        {
+            return getProperty(VALUES_KEY, WhereClauseParser.EQUALS, String.class);
+        }
+
+        public String getValuesValue()
+        {
+            return getProperty(VALUES_VALUE, WhereClauseParser.EQUALS, String.class);
+        }
+
+        public Long getFromId()
+        {
+            return fromId;
+        }
+
+        public Long getToId()
+        {
+            return toId;
+        }
+    }
+
+    /**
+     * @param auditAppId
+     * @param propertyWalker
+     * @param includeParams
+     * @param maxItem
+     * @param forward
+     * @return
+     */
+    public List<AuditEntry> getQueryResultAuditEntries(AuditService.AuditApplication auditApplication, AuditEntryQueryWalker propertyWalker,
+            List<String> includeParam, int maxItem, Boolean forward)
+    {
+        final List<AuditEntry> results = new ArrayList<>();
+
+        final String auditAppId = auditApplication.getKey().substring(1);
+        String auditApplicationName = auditApplication.getName();
+
+        // Execute the query
+        AuditQueryParameters params = new AuditQueryParameters();
+
+        // used to orderBY by field createdAt
+        params.setForward(forward);
+
+        params.setApplicationName(auditApplicationName);
+        params.setUser(propertyWalker.getCreatedByUser());
+
+        Long fromId = propertyWalker.getFromId();
+        Long toId = propertyWalker.getToId();
+
+        validateWhereBetween(auditAppId, fromId, toId);
+
+        Long fromTime = propertyWalker.getFromTime();
+        Long toTime = propertyWalker.getToTime();
+
+        validateWhereBetween(auditAppId, fromTime, toTime);
+
+        params.setFromTime(fromTime);
+        params.setToTime(toTime);
+
+        params.setFromId(fromId);
+        params.setToId(toId);
+
+        if (propertyWalker.getValuesKey() != null && propertyWalker.getValuesValue() != null)
+        {
+            params.addSearchKey(propertyWalker.getValuesKey(), propertyWalker.getValuesValue());
+        }
+
+        final Map<String, UserInfo> mapUserInfo = new HashMap<>(10);
+
+        // create the callback for auditQuery method
+        final AuditQueryCallback callback = new AuditQueryCallback()
+        {
+            public boolean valuesRequired()
+            {
+                return ((includeParam != null) && (includeParam.contains(PARAM_INCLUDE_VALUES)));
+            }
+
+            public boolean handleAuditEntryError(Long entryId, String errorMsg, Throwable error)
+            {
+                throw new AlfrescoRuntimeException("Failed to retrieve audit data.", error);
+            }
+
+            public boolean handleAuditEntry(Long entryId, String applicationName, String userName, long time, Map<String, Serializable> values)
+            {
+                UserInfo userInfo = Node.lookupUserInfo(userName, mapUserInfo, personService);
+                AuditEntry auditEntry = new AuditEntry(entryId, auditAppId, userInfo, new Date(time), values);
+                results.add(auditEntry);
+                return true;
+            }
+        };
+
+        auditService.auditQuery(callback, params, maxItem);
+        return results;
+    }
+
+    @Override
+    public AuditApp update(String auditAppId, AuditApp auditApp, Parameters parameters)
+    {
+        checkEnabled();
+
+        AuditService.AuditApplication auditApplication = findAuditAppByIdOr404(auditAppId);
+
+        // Enable/Disable audit application
+        if (auditApp.getIsEnabled() && !auditApplication.isEnabled())
+        {
+            auditService.enableAudit(auditApplication.getName(), null);
+        }
+        else if (!auditApp.getIsEnabled() && auditApplication.isEnabled())
+        {
+            auditService.disableAudit(auditApplication.getName(), null);
+        }
+
+        return new AuditApp(auditApplication.getKey().substring(1), auditApplication.getName(), auditApp.getIsEnabled());
+    }
+
+    @Override
+    public AuditEntry getAuditEntry(String auditAppId, long auditEntryId, Parameters parameters)
+    {
+        checkEnabled();
+
+        AuditService.AuditApplication auditApplication = findAuditAppByIdOr404(auditAppId);
+
+        // Execute the query
+        AuditQueryParameters params = new AuditQueryParameters();
+        params.setApplicationName(auditApplication.getName());
+        params.setFromId(auditEntryId);
+        params.setToId(auditEntryId + 1);
+        
+        List<String> includeParam = new ArrayList<>();
+        if (parameters != null)
+        {
+            includeParam.addAll(parameters.getInclude());
+        }
+
+        // Add values for single get
+        includeParam.add(PARAM_INCLUDE_VALUES);
+
+        final List<AuditEntry> results = new ArrayList<>();
+
+        // create the callback for auditQuery method
+        final AuditQueryCallback callback = new AuditQueryCallback()
+        {
+            public boolean valuesRequired()
+            {
+                return ((includeParam != null) && (includeParam.contains(PARAM_INCLUDE_VALUES)));
+            }
+
+            public boolean handleAuditEntryError(Long entryId, String errorMsg, Throwable error)
+            {
+                throw new AlfrescoRuntimeException("Failed to retrieve audit data.", error);
+            }
+
+            public boolean handleAuditEntry(Long entryId, String applicationName, String userName, long time, Map<String, Serializable> values)
+            {
+                UserInfo userInfo = Node.lookupUserInfo(userName, new HashMap<>(0), personService);
+                AuditEntry auditEntry = new AuditEntry(entryId, auditAppId, userInfo, new Date(time), values);
+                results.add(auditEntry);
+                return true;
+            }
+        };
+
+        auditService.auditQuery(callback, params, 1);
+
+        if (results.size() != 1)
+        {
+            throw new EntityNotFoundException("" + auditEntryId);
+        }
+        return results.get(0);
+    }
+
+    @Override
+    public void deleteAuditEntry(String auditAppId, long auditEntryId, Parameters parameters)
+    {
+        checkEnabled();
+
+        AuditService.AuditApplication auditApplication = findAuditAppByIdOr404(auditAppId);
+
+        int deleted = auditService.clearAuditByIdRange(auditApplication.getName(), auditEntryId, auditEntryId + 1);
+        if (deleted != 1)
+        {
+            throw new EntityNotFoundException("" + auditEntryId);
+        }
+    }
+
+    @Override
+    public void deleteAuditEntries(String auditAppId, Parameters parameters)
+    {
+        checkEnabled();
+
+        AuditService.AuditApplication auditApplication = findAuditAppByIdOr404(auditAppId);
+
+        Query q = parameters.getQuery();
+        if ((q == null) || (q.getTree() == null))
+        {
+            throw new InvalidArgumentException("where clause is required to delete audit entries (" + auditAppId + ")");
+        }
+
+        // delete via "where" clause
+        DeleteAuditEntriesQueryWalker walker = new DeleteAuditEntriesQueryWalker();
+        QueryHelper.walk(q, walker);
+
+        Long fromId = walker.getFromId();
+        Long toId = walker.getToId();
+
+        validateWhereBetween(auditAppId, fromId, toId);
+
+        Long fromTime = walker.getFromTime();
+        Long toTime = walker.getToTime();
+
+        validateWhereBetween(auditAppId, fromTime, toTime);
+
+        if ((fromId != null) && (fromTime != null))
+        {
+            throw new InvalidArgumentException("where clause is invalid - cannot specify both createdAt & id (" + auditAppId + ")");
+        }
+
+        if (fromId != null)
+        {
+            auditService.clearAuditByIdRange(auditApplication.getName(), fromId, toId); // ignore
+                                                                                        // response
+        }
+        else if (fromTime != null)
+        {
+            auditService.clearAudit(auditApplication.getName(), fromTime, toTime); // ignore
+                                                                                   // response
+        }
+
+        // return success (even if nothing is deleted)
+    }
+
+    private static class DeleteAuditEntriesQueryWalker extends MapBasedQueryWalker
+    {
+        private Long fromTime;
+        private Long toTime;
+
+        private Long fromId;
+        private Long toId;
+
+        public DeleteAuditEntriesQueryWalker()
+        {
+            super(null, null);
+        }
+
+        @Override
+        public void between(String propertyName, String firstValue, String secondValue, boolean negated)
+        {
+            if (propertyName.equals(CREATED_AT))
+            {
+                fromTime = getTime(firstValue);
+                toTime = getTime(secondValue) + 1;
+            }
+
+            if (propertyName.equals(ID))
+            {
+                fromId = Long.valueOf(firstValue);
+                toId = Long.valueOf(secondValue) + 1;
+            }
+        }
+
+        public Long getFromTime()
+        {
+            return fromTime;
+        }
+
+        public Long getToTime()
+        {
+            return toTime;
+        }
+
+        public Long getFromId()
+        {
+            return fromId;
+        }
+
+        public Long getToId()
+        {
+            return toId;
+        }
+    }
+
+    private static long getTime(String iso8601String)
+    {
+        return ISO8601DateFormat.parse(iso8601String.replace(" ", "+")).getTime();
+    }
+
+    private void validateWhereBetween(String auditAppId, Long from, Long to)
+    {
+        if ((from != null) || (to != null))
+        {
+            if ((from == null) || (to == null))
+            {
+                // belts-and-braces
+                throw new InvalidArgumentException("where BETWEEN is invalid - must contain range (" + auditAppId + ")");
+            }
+
+            if (from >= to)
+            {
+                throw new InvalidArgumentException("where BETWEEN is invalid - range start greater than end (" + auditAppId + ")");
+            }
+        }
+    }
+
+    @Override
+    public CollectionWithPagingInfo<AuditEntry> listAuditEntriesByNodeId(String nodeId, Parameters parameters)
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            public Void doWork() throws Exception
+            {
+                checkEnabled();
+                return null;
+            }
+        }, AuthenticationUtil.getSystemUserName());
+
+        // note: node read permission is checked later - see nodeService.getPath
+        NodeRef nodeRef = nodes.validateNode(nodeId);
+        List<AuditEntry> entriesAudit = new ArrayList<>();
+
+        // adding orderBy property
+        Pair<String, Boolean> sortProp = getAuditEntrySortProp(parameters);
+        Boolean forward = true;
+        if ((sortProp != null) && (sortProp.getFirst().equals(CREATED_AT)))
+        {
+            forward = sortProp.getSecond();
+        }
+
+        // paging
+        Paging paging = parameters.getPaging();
+        int skipCount = paging.getSkipCount();
+        int maxItems = paging.getMaxItems();
+        int limit = skipCount + maxItems + 1; // to detect hasMoreItems
+
+        Query q = parameters.getQuery();
+
+        if (q != null)
+        {
+            // filtering via "where" clause
+            AuditEntriesByNodeIdQueryWalker propertyWalker = new AuditEntriesByNodeIdQueryWalker();
+            QueryHelper.walk(q, propertyWalker);
+            entriesAudit = getQueryResultAuditEntriesByNodeRef(nodeRef, propertyWalker, parameters.getInclude(), forward, limit);
+        }
+
+        // clear null elements
+        entriesAudit.removeAll(Collections.singleton(null));
+        int totalItems = entriesAudit.size();
+
+        if (skipCount >= totalItems)
+        {
+            List<AuditEntry> empty = Collections.emptyList();
+            return CollectionWithPagingInfo.asPaged(paging, empty, false, totalItems);
+        }
+        else
+        {
+            int end = Math.min(limit - 1, totalItems);
+            boolean hasMoreItems = totalItems > end;
+
+            entriesAudit = entriesAudit.subList(skipCount, end);
+            return CollectionWithPagingInfo.asPaged(paging, entriesAudit, hasMoreItems, totalItems);
+        }
+    }
+
+    private List<AuditEntry> getQueryResultAuditEntriesByNodeRef(NodeRef nodeRef, AuditEntriesByNodeIdQueryWalker propertyWalker,
+            List<String> includeParam, boolean forward, int limit)
+    {
+        final List<AuditEntry> results = new ArrayList<>();
+
+        String auditAppId = "alfresco-access";
+        String auditApplicationName = AuthenticationUtil.runAs(new RunAsWork<String>()
+        {
+            public String doWork() throws Exception
+            {
+                return findAuditAppByIdOr404(auditAppId).getName();
+            }
+        }, AuthenticationUtil.getSystemUserName());
+
+        // create the callback for auditQuery method
+        final AuditQueryCallback callback = new AuditQueryCallback()
+        {
+            public boolean valuesRequired()
+            {
+                return ((includeParam != null) && (includeParam.contains(PARAM_INCLUDE_VALUES)));
+            }
+
+            public boolean handleAuditEntryError(Long entryId, String errorMsg, Throwable error)
+            {
+                throw new AlfrescoRuntimeException("Failed to retrieve audit data.", error);
+            }
+
+            public boolean handleAuditEntry(Long entryId, String applicationName, String userName, long time, Map<String, Serializable> values)
+            {
+                UserInfo userInfo = Node.lookupUserInfo(userName, new HashMap<>(0), personService);
+                AuditEntry auditEntry = new AuditEntry(entryId, auditAppId, userInfo, new Date(time), values);
+                results.add(auditEntry);
+                return true;
+            }
+        };
+
+        // resolve the path of the node - note: this will also check read permission for current user
+        final String nodePath = ISO9075.decode(nodeService.getPath(nodeRef).toPrefixString(namespaceService));
+        Long fromTime = propertyWalker.getFromTime();
+        Long toTime = propertyWalker.getToTime();
+        validateWhereBetween(nodeRef.getId(), fromTime, toTime);
+
+        AuthenticationUtil.runAs(new RunAsWork<Object>()
+        {
+            public Object doWork() throws Exception
+            {
+                // QueryParameters
+                AuditQueryParameters pathParams = new AuditQueryParameters();
+                // used to orderBY by field createdAt
+                pathParams.setForward(forward);
+                pathParams.setUser(propertyWalker.getCreatedByUser());
+                pathParams.setFromTime(fromTime);
+                pathParams.setToTime(toTime);
+                pathParams.setApplicationName(auditApplicationName);
+                pathParams.addSearchKey("/"+auditAppId+"/transaction/path", nodePath);
+                auditService.auditQuery(callback, pathParams, limit);
+
+                AuditQueryParameters copyFromPathParams = new AuditQueryParameters();
+                // used to orderBY by field createdAt
+                copyFromPathParams.setForward(forward);
+                copyFromPathParams.setUser(propertyWalker.getCreatedByUser());
+                copyFromPathParams.setFromTime(fromTime);
+                copyFromPathParams.setToTime(toTime);
+                copyFromPathParams.setApplicationName(auditApplicationName);
+                copyFromPathParams.addSearchKey("/"+auditAppId+"/transaction/copy/from/path", nodePath);
+                auditService.auditQuery(callback, copyFromPathParams, limit);
+
+                AuditQueryParameters moveFromPathParams = new AuditQueryParameters();
+                // used to orderBY by field createdAt
+                moveFromPathParams.setForward(forward);
+                moveFromPathParams.setUser(propertyWalker.getCreatedByUser());
+                moveFromPathParams.setFromTime(fromTime);
+                moveFromPathParams.setToTime(toTime);
+                moveFromPathParams.setApplicationName(auditApplicationName);
+                moveFromPathParams.addSearchKey("/"+auditAppId+"/transaction/move/from/path", nodePath);
+                auditService.auditQuery(callback, moveFromPathParams, limit);
+
+                return null;
+            }
+        }, AuthenticationUtil.getSystemUserName());
+
+        return results;
+    }
+
+    private class AuditEntriesByNodeIdQueryWalker extends MapBasedQueryWalker
+    {
+        private Long fromTime;
+        private Long toTime;
+
+        public AuditEntriesByNodeIdQueryWalker()
+        {
+            super(new HashSet<>(Arrays.asList(new String[] { CREATED_BY_USER })), null);
+        }
+
+        @Override
+        public void and()
+        {
+            // allow AND, e.g. createdByUser='jbloggs' AND createdAt BETWEEN ('...','...)
+        }
+
+        @Override
+        public void between(String propertyName, String firstValue, String secondValue, boolean negated)
+        {
+            if (propertyName.equals(CREATED_AT))
+            {
+                fromTime = getTime(firstValue);
+                toTime = getTime(secondValue) + 1;
+            }
+
+        }
+
+        public String getCreatedByUser()
+        {
+            String propertyValue = getProperty(CREATED_BY_USER, WhereClauseParser.EQUALS, String.class);
+
+            // Check if '-me-' alias is used and replace it with userId
+            if ((propertyValue != null) && propertyValue.equalsIgnoreCase(DEFAULT_USER))
+            {
+                propertyValue = AuditImpl.this.people.validatePerson(propertyValue);
+            }
+            return propertyValue;
+        }
+
+        public Long getFromTime()
+        {
+            return fromTime;
+        }
+
+        public Long getToTime()
+        {
+            return toTime;
+        }
+
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/AuthenticationsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/AuthenticationsImpl.java
new file mode 100644
index 00000000000..ed4f04bc9f6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/AuthenticationsImpl.java
@@ -0,0 +1,266 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.impl;
+
+import org.alfresco.repo.management.subsystems.ActivateableBean;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.Authorization;
+import org.alfresco.repo.security.authentication.TicketComponent;
+import org.alfresco.repo.security.authentication.external.RemoteUserMapper;
+import org.alfresco.repo.web.scripts.BufferedRequest;
+import org.alfresco.rest.api.Authentications;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.PublicApiTenantWebScriptServletRequest;
+import org.alfresco.rest.api.model.LoginTicket;
+import org.alfresco.rest.api.model.LoginTicketResponse;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.util.PropertyCheck;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.extensions.surf.util.Base64;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class AuthenticationsImpl implements Authentications
+{
+    private static final String AUTHORIZATION_HEADER = "Authorization";
+    private static final String PARAM_ALF_TICKET = "alf_ticket";
+
+    private AuthenticationService authenticationService;
+    private TicketComponent ticketComponent;
+    private RemoteUserMapper remoteUserMapper;
+
+    public void setAuthenticationService(AuthenticationService authenticationService)
+    {
+        this.authenticationService = authenticationService;
+    }
+
+    public void setTicketComponent(TicketComponent ticketComponent)
+    {
+        this.ticketComponent = ticketComponent;
+    }
+
+    public void setRemoteUserMapper(RemoteUserMapper remoteUserMapper)
+    {
+        this.remoteUserMapper = remoteUserMapper;
+    }
+
+    public void init()
+    {
+        PropertyCheck.mandatory(this, "authenticationService", authenticationService);
+        PropertyCheck.mandatory(this, "ticketComponent", ticketComponent);
+    }
+
+    @Override
+    public LoginTicketResponse createTicket(LoginTicket loginRequest, Parameters parameters)
+    {
+        validateLoginRequest(loginRequest);
+        try
+        {
+            // get ticket
+            authenticationService.authenticate(loginRequest.getUserId(), loginRequest.getPassword().toCharArray());
+
+            LoginTicketResponse response = new LoginTicketResponse();
+            response.setUserId(loginRequest.getUserId());
+            response.setId(authenticationService.getCurrentTicket());
+
+            return response;
+        }
+        catch (AuthenticationException e)
+        {
+            throw new PermissionDeniedException("Login failed");
+        }
+        finally
+        {
+            AuthenticationUtil.clearCurrentSecurityContext();
+        }
+    }
+
+    @Override
+    public LoginTicketResponse validateTicket(String me, Parameters parameters, WithResponse withResponse)
+    {
+        if (!People.DEFAULT_USER.equals(me))
+        {
+            throw new InvalidArgumentException("Invalid parameter: " + me);
+        }
+
+        final String ticket = getTicket(parameters);
+        try
+        {
+            final String ticketUser = ticketComponent.validateTicket(ticket);
+
+            final String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
+            // do not go any further if tickets are different
+            // or the user is not fully authenticated
+            if (currentUser == null || !currentUser.equals(ticketUser))
+            {
+                throw new NotFoundException(NotFoundException.DEFAULT_MESSAGE_ID, new String[] { ticket });
+            }
+        }
+        catch (AuthenticationException e)
+        {
+            throw new NotFoundException(NotFoundException.DEFAULT_MESSAGE_ID, new String[] { ticket });
+        }
+        LoginTicketResponse response = new LoginTicketResponse();
+        response.setId(ticket);
+        return response;
+    }
+
+    @Override
+    public void deleteTicket(String me, Parameters parameters, WithResponse withResponse)
+    {
+        if (!People.DEFAULT_USER.equals(me))
+        {
+            throw new InvalidArgumentException("Invalid parameter: " + me);
+        }
+
+        final String ticket = getTicket(parameters);
+        try
+        {
+            final String ticketUser = ticketComponent.validateTicket(ticket);
+
+            final String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
+            // do not go any further if tickets are different
+            // or the user is not fully authenticated
+            if (currentUser == null || !currentUser.equals(ticketUser))
+            {
+                throw new NotFoundException(NotFoundException.DEFAULT_MESSAGE_ID, new String[] { ticket });
+            }
+            else
+            {
+                // delete the ticket
+                authenticationService.invalidateTicket(ticket);
+            }
+        }
+        catch (AuthenticationException e)
+        {
+            throw new NotFoundException(NotFoundException.DEFAULT_MESSAGE_ID, new String[] { ticket });
+        }
+    }
+
+    protected void validateLoginRequest(LoginTicket loginTicket)
+    {
+        if (loginTicket == null || loginTicket.getUserId() == null || loginTicket.getPassword() == null)
+        {
+            throw new InvalidArgumentException("Invalid login details.");
+        }
+    }
+
+    protected String getTicket(Parameters parameters)
+    {
+        // First check the alf_ticket in the URL
+        final String alfTicket = parameters.getParameter(PARAM_ALF_TICKET);
+        if (StringUtils.isNotEmpty(alfTicket))
+        {
+            return alfTicket;
+        }
+
+        // Check the Authorization header
+        final String authorization = parameters.getRequest().getHeader(AUTHORIZATION_HEADER);
+        if (StringUtils.isEmpty(authorization))
+        {
+            throw new InvalidArgumentException("Authorization header is required.");
+        }
+
+        final String[] authorizationParts = authorization.split(" ");
+        if (authorizationParts[0].equalsIgnoreCase("basic"))
+        {
+            final String decodedAuthorisation = new String(Base64.decode(authorizationParts[1]));
+            Authorization authObj = new Authorization(decodedAuthorisation);
+            if (!authObj.isTicket())
+            {
+                throw new InvalidArgumentException("Ticket base authentication required.");
+            }
+            return authObj.getTicket();
+        }
+        else if (authorizationParts[0].equalsIgnoreCase("bearer"))
+        {
+            return getTicketFromRemoteUserMapperUserId(parameters);
+        }
+
+        throw new InvalidArgumentException("Authorization '" + authorizationParts[0] + "' not supported.");
+    }
+
+    private String getTicketFromRemoteUserMapperUserId(Parameters parameters)
+    {
+        // If we got to execute any of the code in this class, it means that, somehow, the user is authenticated;
+        // If we got this far, in this method, it means that:
+        // * there is no alf_ticket in the URL;
+        // * there is an "Authorization" header that says it is "bearer";
+        // * the authorization type in the header is not "basic"; therefore the user was not authenticated with basic auth
+
+        // We could end up here authenticated with some other mechanism (kerberos (SSO) or other custom authenticators)
+        // We need to validate the bearer token so as not to open an exploit where we return the alf_ticket even if
+        // the value of the bearer access token is not valid;
+
+        // Validate the bearer access token again and
+        // confirm that the current authenticated user is the same user specified in the bearer token
+        HttpServletRequest httpServletRequest = extractHttpServletRequestFromParameters(parameters);
+        if (httpServletRequest != null && isRemoteUserMapperActive())
+        {
+            String remoteUser = remoteUserMapper.getRemoteUser(httpServletRequest);
+            // We accept that the remoteUserMapper may have not been the IdentityServiceRemoteUserMapper,
+            // and could have been DefaultRemoteUserMapper (using External authentication), but that is ok
+            // because the business logic is similar.
+            if (remoteUser != null)
+            {
+                return ticketComponent.getCurrentTicket(remoteUser, false);
+            }
+        }
+        throw new InvalidArgumentException("Can't use Alfresco Identity Services to validate the user in the bearer access token");
+    }
+
+    private HttpServletRequest extractHttpServletRequestFromParameters(Parameters parameters)
+    {
+        // An alternative solution would be to create some sort of ServletHttpFacade object based on the information present
+        // in the parameters object. But for that we need to write a lot of code and check that we pass all the data required
+        // by the keycloak library;
+
+        // Parameters object is clearly not designed to give us access to the HttpServletRequest object,
+        // but we know that remoteUserMapper.getRemoteUser will use this in a safe way
+        if (parameters.getRequest() instanceof BufferedRequest &&
+            ((BufferedRequest) parameters.getRequest()).getNext() instanceof PublicApiTenantWebScriptServletRequest)
+        {
+            return ((PublicApiTenantWebScriptServletRequest) ((BufferedRequest) parameters.getRequest()).getNext()).getHttpServletRequest();
+        }
+        return null;
+    }
+
+    private boolean isRemoteUserMapperActive()
+    {
+        return remoteUserMapper instanceof ActivateableBean && ((ActivateableBean) remoteUserMapper).isActive();
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/CommentsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/CommentsImpl.java
new file mode 100644
index 00000000000..b569a842825
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/CommentsImpl.java
@@ -0,0 +1,248 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.forum.CommentService;
+import org.alfresco.rest.api.Comments;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.model.Comment;
+import org.alfresco.rest.api.model.Person;
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.TypeConstraint;
+
+import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.alfresco.rest.api.People.PARAM_INCLUDE_ASPECTNAMES;
+import static org.alfresco.rest.api.People.PARAM_INCLUDE_PROPERTIES;
+
+/**
+ * Centralises access to comment services and maps between representations.
+ * 
+ * @author steveglover
+ * @since publicapi1.0
+ */
+public class CommentsImpl implements Comments
+{
+	private static final List<String> INCLUDE_FULL_PERSON = Arrays.asList(
+			PARAM_INCLUDE_ASPECTNAMES,
+			PARAM_INCLUDE_PROPERTIES);
+	private Nodes nodes;
+    private NodeService nodeService;
+    private CommentService commentService;
+    private ContentService contentService;
+    private TypeConstraint typeConstraint;
+	private People people;
+
+	public void setTypeConstraint(TypeConstraint typeConstraint)
+	{
+		this.typeConstraint = typeConstraint;
+	}
+
+	public void setNodes(Nodes nodes)
+	{
+		this.nodes = nodes;
+	}
+    
+	public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+	
+	public void setCommentService(CommentService commentService)
+	{
+		this.commentService = commentService;
+	}
+
+	public void setContentService(ContentService contentService)
+	{
+		this.contentService = contentService;
+	}
+
+	public void setPeople(People people)
+	{
+		this.people = people;
+	}
+
+	private Comment toComment(NodeRef nodeRef, NodeRef commentNodeRef, List<String> include)
+    {
+        Map<QName, Serializable> nodeProps = nodeService.getProperties(commentNodeRef);
+
+        ContentReader reader = contentService.getReader(commentNodeRef, ContentModel.PROP_CONTENT);
+        if(reader != null)
+        {
+	        String content = reader.getContentString();
+	        nodeProps.put(Comment.PROP_COMMENT_CONTENT, content);
+	        nodeProps.remove(ContentModel.PROP_CONTENT);
+        }
+
+
+        Map<String, Boolean> map = commentService.getCommentPermissions(nodeRef, commentNodeRef);
+        boolean canEdit = map.get(CommentService.CAN_EDIT);
+        boolean canDelete =  map.get(CommentService.CAN_DELETE);
+
+		Person createdBy;
+        try {
+			createdBy = people.getPerson((String) nodeProps.get(ContentModel.PROP_CREATOR), include);
+		} catch (EntityNotFoundException enfe){
+        	createdBy = new Person();
+        	createdBy.setUserName((String) nodeProps.get(ContentModel.PROP_CREATOR));
+		}
+		nodeProps.put(Comment.PROP_COMMENT_CREATED_BY, createdBy);
+
+		Person modifiedBy;
+		try {
+			modifiedBy = people.getPerson((String) nodeProps.get(ContentModel.PROP_MODIFIER), include);
+		} catch (EntityNotFoundException enfe)
+		{
+			modifiedBy = new Person();
+			modifiedBy.setUserName((String) nodeProps.get(ContentModel.PROP_MODIFIER));
+		}
+		nodeProps.put(Comment.PROP_COMMENT_MODIFIED_BY, modifiedBy);
+
+		Comment comment = new Comment(commentNodeRef.getId(), nodeProps, canEdit, canDelete);
+        return comment;
+    }
+    
+    public Comment createComment(String nodeId, Comment comment)
+    {
+		NodeRef nodeRef = nodes.validateNode(nodeId);
+
+		if(!typeConstraint.matches(nodeRef))
+		{
+			throw new UnsupportedResourceOperationException("Cannot comment on this node");
+		}
+
+		try
+		{
+	        NodeRef commentNode = commentService.createComment(nodeRef, comment.getTitle(), comment.getContent(), false);
+	        return toComment(nodeRef, commentNode, INCLUDE_FULL_PERSON);
+	    }
+	    catch(IllegalArgumentException e)
+	    {
+	    	throw new InvalidArgumentException(e.getMessage());
+	    }
+    }
+
+    public Comment updateComment(String nodeId, Comment comment)
+    {
+    	try
+    	{
+	    	NodeRef nodeRef = nodes.validateNode(nodeId);
+	    	String commentNodeId = comment.getId();
+			NodeRef commentNodeRef = nodes.validateNode(commentNodeId);
+			
+			String title = comment.getTitle();
+			String content = comment.getContent();
+			
+			if(content == null)
+			{
+				throw new InvalidArgumentException();
+			}
+            
+            commentService.updateComment(commentNodeRef, title, content);
+	        return toComment(nodeRef, commentNodeRef, INCLUDE_FULL_PERSON);
+		}
+		catch(IllegalArgumentException e)
+		{
+			throw new ConstraintViolatedException(e.getMessage());
+		}
+    }
+
+    public CollectionWithPagingInfo<Comment> getComments(String nodeId, Paging paging, List<String> include)
+    {
+		final NodeRef nodeRef = nodes.validateNode(nodeId);
+        
+        /* MNT-10536 : fix */
+        final Set<QName> contentAndFolders = 
+                new HashSet<>(Arrays.asList(ContentModel.TYPE_FOLDER, ContentModel.TYPE_CONTENT));
+        if (!nodes.nodeMatches(nodeRef, contentAndFolders, null))
+        {
+            throw new InvalidArgumentException("NodeId of folder or content is expected");
+        }
+
+    	PagingRequest pagingRequest = Util.getPagingRequest(paging);
+        final PagingResults<NodeRef> pagingResults = commentService.listComments(nodeRef, pagingRequest);
+        
+		final List<NodeRef> page = pagingResults.getPage();
+		List<Comment> comments = new AbstractList<>()
+		{
+			@Override
+			public Comment get(int index)
+			{
+				return toComment(nodeRef, page.get(index), include);
+			}
+
+			@Override
+			public int size()
+			{
+				return page.size();
+			}
+		};
+
+        return CollectionWithPagingInfo.asPaged(paging, comments, pagingResults.hasMoreItems(), pagingResults.getTotalResultCount().getFirst());
+    }
+
+    @Override
+    public void deleteComment(String nodeId, String commentNodeId)
+    {
+    	try
+    	{
+            NodeRef nodeRef = nodes.validateNode(nodeId);
+	        NodeRef commentNodeRef = nodes.validateNode(commentNodeId);
+            
+            if (! nodeRef.equals(commentService.getDiscussableAncestor(commentNodeRef)))
+            {
+                throw new InvalidArgumentException("Unexpected "+nodeId+","+commentNodeId);
+            }
+            
+            commentService.deleteComment(commentNodeRef);
+		}
+		catch(IllegalArgumentException e)
+		{
+			throw new ConstraintViolatedException(e.getMessage());
+		}
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/CustomModelsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/CustomModelsImpl.java
new file mode 100644
index 00000000000..f1fa39df0d0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/CustomModelsImpl.java
@@ -0,0 +1,1733 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.dictionary.CompiledModel;
+import org.alfresco.repo.dictionary.CustomModelDefinitionImpl;
+import org.alfresco.repo.dictionary.Facetable;
+import org.alfresco.repo.dictionary.M2Aspect;
+import org.alfresco.repo.dictionary.M2Class;
+import org.alfresco.repo.dictionary.M2Constraint;
+import org.alfresco.repo.dictionary.M2Model;
+import org.alfresco.repo.dictionary.M2Namespace;
+import org.alfresco.repo.dictionary.M2Property;
+import org.alfresco.repo.dictionary.M2Type;
+import org.alfresco.repo.dictionary.ValueDataTypeValidator;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.rest.api.CustomModels;
+import org.alfresco.rest.api.model.AbstractClassModel;
+import org.alfresco.rest.api.model.AbstractCommonDetails;
+import org.alfresco.rest.api.model.CustomAspect;
+import org.alfresco.rest.api.model.CustomModel;
+import org.alfresco.rest.api.model.CustomModel.ModelStatus;
+import org.alfresco.rest.api.model.CustomModelConstraint;
+import org.alfresco.rest.api.model.CustomModelDownload;
+import org.alfresco.rest.api.model.CustomModelNamedValue;
+import org.alfresco.rest.api.model.CustomModelProperty;
+import org.alfresco.rest.api.model.CustomType;
+import org.alfresco.rest.framework.core.exceptions.ApiException;
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.dictionary.AspectDefinition;
+import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
+import org.alfresco.service.cmr.dictionary.CustomModelDefinition;
+import org.alfresco.service.cmr.dictionary.CustomModelException;
+import org.alfresco.service.cmr.dictionary.CustomModelService;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.ModelDefinition;
+import org.alfresco.service.cmr.dictionary.NamespaceDefinition;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.dictionary.CustomModelException.ActiveModelConstraintException;
+import org.alfresco.service.cmr.dictionary.CustomModelException.CustomModelConstraintException;
+import org.alfresco.service.cmr.dictionary.CustomModelException.InvalidCustomModelException;
+import org.alfresco.service.cmr.dictionary.CustomModelException.ModelDoesNotExistException;
+import org.alfresco.service.cmr.dictionary.CustomModelException.ModelExistsException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.alfresco.util.collections.CollectionUtils;
+import org.alfresco.util.collections.Function;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class CustomModelsImpl implements CustomModels
+{
+    // for consistency the patterns are equivalent to the patterns defined in the cmm-misc.lib.js
+    public static final Pattern NAME_PATTERN = Pattern.compile("^[A-Za-z0-9_\\-]+$");
+    public static final Pattern URI_PATTERN = Pattern.compile("^[A-Za-z0-9:/_\\.\\-]+$");
+
+    public static final String MODEL_NAME_NULL_ERR = "cmm.rest_api.model_name_null";
+    public static final String TYPE_NAME_NULL_ERR = "cmm.rest_api.type_name_null";
+    public static final String ASPECT_NAME_NULL_ERR = "cmm.rest_api.aspect_name_null";
+    public static final String CONSTRAINT_NAME_NULL_ERR = "cmm.rest_api.constraint_name_null";
+
+    // Services
+    protected CustomModelService customModelService;
+    protected DictionaryService dictionaryService;
+    protected PersonService personService;
+    protected NodeService nodeService;
+    protected NamespaceService namespaceService;
+    protected ValueDataTypeValidator valueDataTypeValidator;
+
+    private static final String DEFAULT_DATA_TYPE = "d:text";
+    private static final String BOOLEAN_DATA_TYPE = "d:boolean";
+    private static final String SELECT_ALL = "all";
+    private static final String SELECT_STATUS = "status";
+    private static final String SELECT_PROPS = "props";
+    private static final String SELECT_ALL_PROPS = "allProps";
+    private static final String PARAM_UPDATE_PROP = "update";
+    private static final String PARAM_DELETE_PROP = "delete";
+    private static final String PARAM_WITH_EXT_MODULE = "extModule";
+
+    public void setCustomModelService(CustomModelService customModelService)
+    {
+        this.customModelService = customModelService;
+    }
+
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService;
+    }
+
+    public void setPersonService(PersonService personService)
+    {
+        this.personService = personService;
+    }
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+
+    public void setValueDataTypeValidator(ValueDataTypeValidator valueDataTypeValidator)
+    {
+        this.valueDataTypeValidator = valueDataTypeValidator;
+    }
+
+    @Override
+    public CustomModel getCustomModel(String modelName, Parameters parameters)
+    {
+        CustomModelDefinition modelDef = getCustomModelImpl(modelName);
+
+        if (hasSelectProperty(parameters, SELECT_ALL))
+        {
+            return new CustomModel(modelDef, 
+                        convertToCustomTypes(modelDef.getTypeDefinitions(), false),
+                        convertToCustomAspects(modelDef.getAspectDefinitions(), false),
+                        convertToCustomModelConstraints(modelDef.getModelDefinedConstraints()));
+        }
+
+        return new CustomModel(modelDef);
+    }
+
+    private CustomModelDefinition getCustomModelImpl(String modelName)
+    {
+        if(modelName == null)
+        {
+            throw new InvalidArgumentException(MODEL_NAME_NULL_ERR);
+        }
+
+        CustomModelDefinition model = null;
+        try
+        {
+            model = customModelService.getCustomModel(modelName);
+        }
+        catch (CustomModelException ex)
+        {
+            throw new EntityNotFoundException(modelName);
+        }
+
+        if (model == null)
+        {
+            throw new EntityNotFoundException(modelName);
+        }
+
+        return model;
+    }
+
+    @Override
+    public CollectionWithPagingInfo<CustomModel> getCustomModels(Parameters parameters)
+    {
+        Paging paging = parameters.getPaging();
+        PagingRequest pagingRequest = Util.getPagingRequest(paging);
+        PagingResults<CustomModelDefinition> results = customModelService.getCustomModels(pagingRequest);
+
+        Integer totalItems = results.getTotalResultCount().getFirst();
+        List<CustomModelDefinition> page = results.getPage();
+
+        List<CustomModel> models = new ArrayList<>(page.size());
+        for (CustomModelDefinition modelDefinition : page)
+        {
+            models.add(new CustomModel(modelDefinition));
+        }
+
+        return CollectionWithPagingInfo.asPaged(paging, models, results.hasMoreItems(), (totalItems == null ? null : totalItems.intValue()));
+    }
+
+    @Override
+    public CustomModel createCustomModel(CustomModel model)
+    {
+        // Check the current user is authorised to create a custom model
+        validateCurrentUser();
+        return createCustomModelImpl(model, true);
+    }
+
+    private CustomModel createCustomModelImpl(CustomModel model, boolean basicModelOnly)
+    {
+        M2Model m2Model = null;
+        if (basicModelOnly)
+        {
+            m2Model = convertToM2Model(model, null, null, null);
+        }
+        else
+        {
+            m2Model = convertToM2Model(model, model.getTypes(), model.getAspects(), model.getConstraints());
+        }
+
+        boolean activate = ModelStatus.ACTIVE.equals(model.getStatus());
+        try
+        {
+            CustomModelDefinition modelDefinition = customModelService.createCustomModel(m2Model, activate);
+            return new CustomModel(modelDefinition);
+        }
+        catch (ModelExistsException me)
+        {
+            throw new ConstraintViolatedException(me.getMessage());
+        }
+        catch (CustomModelConstraintException ncx)
+        {
+            throw new ConstraintViolatedException(ncx.getMessage());
+        }
+        catch (InvalidCustomModelException iex)
+        {
+            throw new InvalidArgumentException(iex.getMessage());
+        }
+        catch (Exception e)
+        {
+            throw new ApiException("cmm.rest_api.model_invalid", e);
+        }
+    }
+
+    @Override
+    public CustomModel updateCustomModel(String modelName, CustomModel model, Parameters parameters)
+    {
+        // Check the current user is authorised to update the custom model
+        validateCurrentUser();
+
+        // Check to see if the model exists
+        ModelDetails existingModelDetails = new ModelDetails(getCustomModelImpl(modelName));
+        CustomModel existingModel = existingModelDetails.getModel();
+
+        // The model just needs to be activated/deactivated (in other words,
+        // the other properties should be untouched)
+        if (hasSelectProperty(parameters, SELECT_STATUS))
+        {
+            ModelStatus status = model.getStatus();
+            if (status == null)
+            {
+                throw new InvalidArgumentException("cmm.rest_api.model_status_null");
+            }
+            try
+            {
+                if (ModelStatus.ACTIVE.equals(status))
+                {
+                    customModelService.activateCustomModel(modelName);
+                }
+                else
+                {
+                    customModelService.deactivateCustomModel(modelName);
+                }
+                // update the model's status
+                existingModel.setStatus(status);
+                return existingModel;
+            }
+            catch (CustomModelConstraintException mce)
+            {
+                throw new ConstraintViolatedException(mce.getMessage());
+            }
+            catch (Exception ex)
+            {
+                throw new ApiException(ex.getMessage(), ex);
+            }
+        }
+        else
+        {
+            if (model.getName() != null && !(existingModel.getName().equals(model.getName())))
+            {
+                throw new InvalidArgumentException("cmm.rest_api.model_name_cannot_update");
+            }
+
+            existingModel.setNamespaceUri(model.getNamespaceUri());
+            final boolean isNamespacePrefixChanged = !(existingModel.getNamespacePrefix().equals(model.getNamespacePrefix()));
+            if(isNamespacePrefixChanged)
+            {
+                // Change types' and aspects' parents as well as the property constraint's Ref namespace prefix
+                replacePrefix(existingModelDetails.getTypes(), existingModel.getNamespacePrefix(), model.getNamespacePrefix());
+                replacePrefix(existingModelDetails.getAspects(), existingModel.getNamespacePrefix(), model.getNamespacePrefix());
+            }
+            existingModel.setNamespacePrefix(model.getNamespacePrefix());
+            existingModel.setAuthor(model.getAuthor());
+            existingModel.setDescription(model.getDescription());
+
+            CustomModelDefinition modelDef = updateModel(existingModelDetails, "cmm.rest_api.model_update_failure");
+            return new CustomModel(modelDef);
+        }
+    }
+
+    private void replacePrefix(List<? extends AbstractClassModel> existingTypesOrAspects, String modelOldNamespacePrefix, String modelNewNamespacePrefix)
+    {
+        for(AbstractClassModel classModel : existingTypesOrAspects)
+        {
+            // Type/Aspect's parent name
+            String parentName = classModel.getParentName();
+            if(parentName != null)
+            {
+                Pair<String, String> prefixLocalNamePair = splitPrefixedQName(parentName);
+                // Check to see if the parent name prefix, is the namespace prefix of the model being edited.
+                // As we don't want to modify the parent name of the imported models.
+                if(modelOldNamespacePrefix.equals(prefixLocalNamePair.getFirst()))
+                {
+                    // Change the parent name prefix, to a new model namespace prefix.
+                    String newParentName = constructName(prefixLocalNamePair.getSecond(), modelNewNamespacePrefix);
+                    classModel.setParentName(newParentName);
+                }
+            }
+
+            // Change the property constraint ref
+            List<CustomModelProperty> properties = classModel.getProperties();
+            for(CustomModelProperty prop : properties)
+            {
+                List<String> constraintRefs = prop.getConstraintRefs();
+                if(constraintRefs.size() > 0)
+                {
+                    List<String> modifiedRefs = new ArrayList<>(constraintRefs.size());
+                    for(String ref : constraintRefs)
+                    {
+                        // We don't need to check if the prefix is equal to the model prefix here, as it was
+                        // done upon adding the constraint refs in the setM2Properties method.
+                        Pair<String, String> prefixLocalNamePair = splitPrefixedQName(ref);
+                        // Change the constraint ref prefix, to a new model namespace prefix.
+                        String newRef = constructName(prefixLocalNamePair.getSecond(), modelNewNamespacePrefix);
+                        modifiedRefs.add(newRef);
+                    }
+                    prop.setConstraintRefs(modifiedRefs);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void deleteCustomModel(String modelName)
+    {
+        // Check the current user is authorised to delete the custom model
+        validateCurrentUser();
+
+        if(modelName == null)
+        {
+            throw new InvalidArgumentException(MODEL_NAME_NULL_ERR);
+        }
+
+        try
+        {
+            customModelService.deleteCustomModel(modelName);
+        }
+        catch (ModelDoesNotExistException ee)
+        {
+            throw new EntityNotFoundException(modelName);
+        }
+        catch (ActiveModelConstraintException ae)
+        {
+            throw new ConstraintViolatedException(ae.getMessage());
+        }
+        catch (Exception ex)
+        {
+            throw new ApiException(ex.getMessage(), ex);
+        }
+    }
+
+    @Override
+    public CustomType getCustomType(String modelName, String typeName, Parameters parameters)
+    {
+        if(typeName == null)
+        {
+            throw new InvalidArgumentException(TYPE_NAME_NULL_ERR);
+        }
+
+        final CustomModelDefinition modelDef = getCustomModelImpl(modelName);
+        QName typeQname = QName.createQName(modelDef.getName().getNamespaceURI(), typeName);
+
+        TypeDefinition customTypeDef = customModelService.getCustomType(typeQname);
+        if (customTypeDef == null)
+        {
+            throw new EntityNotFoundException(typeName);
+        }
+        
+        // Check if inherited properties have been requested
+        boolean includeInheritedProps = hasSelectProperty(parameters, SELECT_ALL_PROPS);
+        return convertToCustomType(customTypeDef, includeInheritedProps);
+    }
+
+    @Override
+    public CollectionWithPagingInfo<CustomType> getCustomTypes(String modelName, Parameters parameters)
+    {
+        CustomModelDefinition modelDef = getCustomModelImpl(modelName);
+        Collection<TypeDefinition> typeDefinitions = modelDef.getTypeDefinitions();
+        // TODO Should we support paging?
+        Paging paging = Paging.DEFAULT;
+
+        List<CustomType> customTypes = convertToCustomTypes(typeDefinitions, false);
+
+        return CollectionWithPagingInfo.asPaged(paging, customTypes, false, typeDefinitions.size());
+
+    }
+
+    @Override
+    public CustomType createCustomType(String modelName, CustomType type)
+    {
+        // Check the current user is authorised to update the custom model
+        validateCurrentUser();
+
+        ModelDetails existingModelDetails = new ModelDetails(getCustomModelImpl(modelName));
+
+        // Validate type's parent
+        validateTypeAspectParent(type, existingModelDetails.getModel());
+        existingModelDetails.getTypes().add(type);
+
+        updateModel(existingModelDetails, "cmm.rest_api.type_create_failure");
+        return type;
+    }
+
+    @Override
+    public CustomType updateCustomType(String modelName, CustomType type, Parameters parameters)
+    {
+        return updateTypeAspect(modelName, type, parameters);
+    }
+
+    private <T extends AbstractClassModel> T updateTypeAspect(String modelName, T classDef, Parameters parameters)
+    {
+        // Check the current user is authorised to update the custom model
+        validateCurrentUser();
+
+        final boolean isAspect = classDef instanceof CustomAspect;
+
+        String name = classDef.getName();
+        if(name == null)
+        {
+            String msgId = isAspect ? ASPECT_NAME_NULL_ERR : TYPE_NAME_NULL_ERR;
+            throw new InvalidArgumentException(msgId);
+        }
+
+        ModelDetails existingModelDetails = new ModelDetails(getCustomModelImpl(modelName));
+
+        List<? extends AbstractClassModel> allClassDefs = isAspect ? existingModelDetails.getAspects() : existingModelDetails.getTypes();
+
+        @SuppressWarnings("unchecked")
+        T existingClassDef = (T) getObjectByName(allClassDefs, name);
+        if (existingClassDef == null)
+        {
+            throw new EntityNotFoundException(name);
+        }
+
+        if (hasSelectProperty(parameters, SELECT_PROPS))
+        {
+            String errorMsg = null;
+            String propName = parameters.getParameter(PARAM_DELETE_PROP);
+            if (propName == null)
+            {
+                errorMsg = "cmm.rest_api.property_create_update_failure";
+                // Add/Update properties
+                mergeProperties(existingClassDef, classDef, parameters, existingModelDetails.isActive());
+            }
+            else //Delete property request
+            {
+                errorMsg = "cmm.rest_api.property_delete_failure";
+                deleteProperty(existingClassDef, propName);
+            }
+
+            updateModel(existingModelDetails, errorMsg);
+        }
+        else
+        {
+            existingClassDef.setTitle(classDef.getTitle());
+            existingClassDef.setDescription(classDef.getDescription());
+            final boolean isParentChanged = !(StringUtils.equals(existingClassDef.getParentName(), classDef.getParentName()));
+            if (isParentChanged && existingModelDetails.isActive())
+            {
+                String errMsgId = isAspect ? "cmm.rest_api.aspect_parent_cannot_update" : "cmm.rest_api.type_parent_cannot_update";
+                throw new ConstraintViolatedException(errMsgId);
+            }
+            // Validate type/aspect parent
+            validateTypeAspectParent(classDef, existingModelDetails.getModel());
+            existingClassDef.setParentName(classDef.getParentName());
+
+            String errMsgId = isAspect ? "cmm.rest_api.aspect_update_failure" : "cmm.rest_api.type_update_failure";
+            updateModel(existingModelDetails, errMsgId);
+        }
+        return existingClassDef;
+    }
+
+    @Override
+    public void deleteCustomType(String modelName, String typeName)
+    {
+        // Check the current user is authorised to delete the custom model's type
+        validateCurrentUser();
+
+        if(typeName == null)
+        {
+            throw new InvalidArgumentException(TYPE_NAME_NULL_ERR);
+        }
+
+        ModelDetails existingModelDetails = new ModelDetails(getCustomModelImpl(modelName));
+        if(existingModelDetails.isActive())
+        {
+            throw new ConstraintViolatedException("cmm.rest_api.type_cannot_delete");
+        }
+
+        Map<String, CustomType> allTypes = transformToMap(existingModelDetails.getTypes(), toNameFunction());
+        CustomType typeToBeDeleted = allTypes.get(typeName);
+
+        if(typeToBeDeleted == null)
+        {
+            throw new EntityNotFoundException(typeName);
+        }
+
+        // Validate type's dependency
+        validateTypeAspectDelete(allTypes.values(), typeToBeDeleted.getPrefixedName());
+
+        // Remove the validated type
+        allTypes.remove(typeName);
+        existingModelDetails.setTypes(new ArrayList<>(allTypes.values()));
+
+        updateModel(existingModelDetails, "cmm.rest_api.type_delete_failure");
+    }
+
+    @Override
+    public CustomAspect getCustomAspect(String modelName, String aspectName, Parameters parameters)
+    {
+        if(aspectName == null)
+        {
+            throw new InvalidArgumentException(ASPECT_NAME_NULL_ERR);
+        }
+
+        final CustomModelDefinition modelDef = getCustomModelImpl(modelName);
+        QName aspectQname = QName.createQName(modelDef.getName().getNamespaceURI(), aspectName);
+
+        AspectDefinition customAspectDef = customModelService.getCustomAspect(aspectQname);
+        if (customAspectDef == null)
+        {
+            throw new EntityNotFoundException(aspectName);
+        }
+        
+        // Check if inherited properties have been requested
+        boolean includeInheritedProps = hasSelectProperty(parameters, SELECT_ALL_PROPS);
+        return convertToCustomAspect(customAspectDef, includeInheritedProps);
+    }
+
+    @Override
+    public CollectionWithPagingInfo<CustomAspect> getCustomAspects(String modelName, Parameters parameters)
+    {
+        CustomModelDefinition modelDef = getCustomModelImpl(modelName);
+        Collection<AspectDefinition> aspectDefinitions = modelDef.getAspectDefinitions();
+        // TODO Should we support paging?
+        Paging paging = Paging.DEFAULT;
+
+        List<CustomAspect> customAspects = convertToCustomAspects(aspectDefinitions, false);
+
+        return CollectionWithPagingInfo.asPaged(paging, customAspects, false, aspectDefinitions.size());
+    }
+
+    @Override
+    public CustomAspect createCustomAspect(String modelName, CustomAspect aspect)
+    {
+        // Check the current user is authorised to update the custom model
+        validateCurrentUser();
+
+        ModelDetails existingModelDetails = new ModelDetails(getCustomModelImpl(modelName));
+
+        // Validate aspect's parent
+        validateTypeAspectParent(aspect, existingModelDetails.getModel());
+        existingModelDetails.getAspects().add(aspect);
+
+        updateModel(existingModelDetails, "cmm.rest_api.aspect_create_failure");
+        return aspect;
+    }
+
+    @Override
+    public CustomAspect updateCustomAspect(String modelName, CustomAspect aspect, Parameters parameters)
+    {
+        return updateTypeAspect(modelName, aspect, parameters);
+    }
+
+    @Override
+    public void deleteCustomAspect(String modelName, String aspectName)
+    {
+        // Check the current user is authorised to delete the custom model's aspect
+        validateCurrentUser();
+
+        if(aspectName == null)
+        {
+            throw new InvalidArgumentException(ASPECT_NAME_NULL_ERR);
+        }
+
+        ModelDetails existingModelDetails = new ModelDetails(getCustomModelImpl(modelName));
+        if(existingModelDetails.isActive())
+        {
+            throw new ConstraintViolatedException("cmm.rest_api.aspect_cannot_delete");
+        }
+
+        Map<String, CustomAspect> allAspects = transformToMap(existingModelDetails.getAspects(), toNameFunction());
+        CustomAspect aspectToBeDeleted = allAspects.get(aspectName);
+
+        if(aspectToBeDeleted == null)
+        {
+            throw new EntityNotFoundException(aspectName);
+        }
+
+        // Validate aspect's dependency
+        validateTypeAspectDelete(allAspects.values(), aspectToBeDeleted.getPrefixedName());
+
+        // Remove the validated aspect
+        allAspects.remove(aspectName);
+        existingModelDetails.setAspects(new ArrayList<>(allAspects.values()));
+
+        updateModel(existingModelDetails, "cmm.rest_api.aspect_delete_failure");
+    }
+
+    @Override
+    public CollectionWithPagingInfo<CustomModelConstraint> getCustomModelConstraints(String modelName, Parameters parameters)
+    {
+        CustomModelDefinition modelDef = getCustomModelImpl(modelName);
+        Collection<ConstraintDefinition> constraintDefinitions = modelDef.getModelDefinedConstraints();
+        // TODO Should we support paging?
+        Paging paging = Paging.DEFAULT;
+
+        List<CustomModelConstraint> customModelConstraints = convertToCustomModelConstraints(constraintDefinitions);
+
+        return CollectionWithPagingInfo.asPaged(paging, customModelConstraints, false, constraintDefinitions.size());
+    }
+
+    @Override
+    public CustomModelConstraint getCustomModelConstraint(String modelName, String constraintName, Parameters parameters)
+    {
+        if (constraintName == null)
+        {
+            throw new InvalidArgumentException(CONSTRAINT_NAME_NULL_ERR);
+        }
+
+        final CustomModelDefinition modelDef = getCustomModelImpl(modelName);
+        QName constraintQname = QName.createQName(modelDef.getName().getNamespaceURI(), constraintName);
+
+        ConstraintDefinition constraintDef = customModelService.getCustomConstraint(constraintQname);
+        if (constraintDef == null)
+        {
+            throw new EntityNotFoundException(constraintName);
+        }
+
+        return new CustomModelConstraint(constraintDef, dictionaryService);
+    }
+
+    @Override
+    public CustomModelConstraint createCustomModelConstraint(String modelName, CustomModelConstraint constraint)
+    {
+        // Check the current user is authorised to create constraints
+        validateCurrentUser();
+
+        ModelDetails existingModelDetails = new ModelDetails(getCustomModelImpl(modelName));
+
+        existingModelDetails.getModelDefinedConstraints().add(constraint);
+
+        updateModel(existingModelDetails, "cmm.rest_api.constraint_create_failure");
+        return constraint;
+    }
+
+    @Override
+    public CustomModelDownload createDownload(String modelName, Parameters parameters)
+    {
+        // Check the current user is authorised to export the model
+        validateCurrentUser();
+
+        if (modelName == null)
+        {
+            throw new InvalidArgumentException(MODEL_NAME_NULL_ERR);
+        }
+
+        String propName = parameters.getParameter(PARAM_WITH_EXT_MODULE);
+        boolean withForm = Boolean.valueOf(propName);
+        try
+        {
+            NodeRef nodeRef = customModelService.createDownloadNode(modelName, withForm);
+            return new CustomModelDownload(nodeRef);
+        }
+        catch (Exception ex)
+        {
+            String errorMsg = "cmm.rest_api.model_download_failure";
+            if (ex.getMessage() != null)
+            {
+                errorMsg = ex.getMessage();
+            }
+            throw new ApiException(errorMsg, ex);
+        }
+    }
+
+    private CustomType convertToCustomType(TypeDefinition typeDefinition, boolean includeInheritedProps)
+    {
+        List<CustomModelProperty> properties = convertToCustomModelProperty(typeDefinition, includeInheritedProps);
+        return new CustomType(typeDefinition, dictionaryService, properties);
+    }
+
+    private List<CustomType> convertToCustomTypes(Collection<TypeDefinition> typeDefinitions, boolean includeInheritedProps)
+    {
+        // Convert a collection of TypeDefinitions into a list of CustomTypes
+        List<CustomType> customTypes = new ArrayList<>(typeDefinitions.size());
+        for (TypeDefinition td : typeDefinitions)
+        {
+            customTypes.add(convertToCustomType(td, includeInheritedProps));
+        }
+
+        return customTypes;
+    }
+
+    private CustomAspect convertToCustomAspect(AspectDefinition aspectDefinition, boolean includeInheritedProps)
+    {
+        List<CustomModelProperty> properties = convertToCustomModelProperty(aspectDefinition, includeInheritedProps);
+        return new CustomAspect(aspectDefinition, dictionaryService, properties);
+    }
+
+    private List<CustomAspect> convertToCustomAspects(Collection<AspectDefinition> aspectDefinitions, boolean includeInheritedProps)
+    {
+        // Convert a collection of AspectDefinitions into a list of CustomAspect
+        List<CustomAspect> customAspects = new ArrayList<>(aspectDefinitions.size());
+        for (AspectDefinition ad : aspectDefinitions)
+        {
+            customAspects.add(convertToCustomAspect(ad, includeInheritedProps));
+        }
+
+        return customAspects;
+    }
+
+    private List<CustomModelProperty> convertToCustomModelProperty(ClassDefinition classDefinition, boolean includeInherited)
+    {
+        Collection<PropertyDefinition> ownProperties = null;
+        ClassDefinition parentDef = classDefinition.getParentClassDefinition();
+        if (!includeInherited && parentDef != null)
+        {
+            // Remove inherited properties
+            ownProperties = removeRightEntries(classDefinition.getProperties(), parentDef.getProperties()).values();
+        }
+        else
+        {
+            ownProperties = classDefinition.getProperties().values();
+        }
+
+        List<CustomModelProperty> customProperties = new ArrayList<>(ownProperties.size());
+        for (PropertyDefinition propDef : ownProperties)
+        {
+            customProperties.add(new CustomModelProperty(propDef, dictionaryService));
+        }
+
+        return customProperties;
+    }
+
+    private List<CustomModelConstraint> convertToCustomModelConstraints(Collection<ConstraintDefinition> constraintDefinitions)
+    {
+        List<CustomModelConstraint> constraints = new ArrayList<>(constraintDefinitions.size());
+        for (ConstraintDefinition definition : constraintDefinitions)
+        {
+            constraints.add(new CustomModelConstraint(definition, dictionaryService));
+        }
+        return constraints;
+    }
+
+    /**
+     * Converts the given {@code ModelDetails} object into a {@link M2Model} object
+     * 
+     * @param modelDetails the custom model details
+     * @return {@link M2Model} object
+     */
+    private M2Model convertToM2Model(ModelDetails modelDetails)
+    {
+        return convertToM2Model(modelDetails.getModel(), modelDetails.getTypes(), modelDetails.getAspects(), modelDetails.getModelDefinedConstraints());
+    }
+
+    /**
+     * Converts the given {@code org.alfresco.rest.api.model.CustomModel}
+     * object, a collection of {@code org.alfresco.rest.api.model.CustomType}
+     * objects, a collection of
+     * {@code org.alfresco.rest.api.model.CustomAspect} objects, and a collection of
+     * {@code org.alfresco.rest.api.model.CustomModelConstraint} objects into a {@link M2Model} object
+     * 
+     * @param customModel the custom model
+     * @param types the custom types
+     * @param aspects the custom aspects
+     * @param constraints the custom constraints
+     * @return {@link M2Model} object
+     */
+    private M2Model convertToM2Model(CustomModel customModel, Collection<CustomType> types, Collection<CustomAspect> aspects, Collection<CustomModelConstraint> constraints)
+    {
+        validateBasicModelInput(customModel);
+
+        Set<Pair<String, String>> namespacesToImport = new LinkedHashSet<>();
+
+        final String namespacePrefix = customModel.getNamespacePrefix();
+        final String namespaceURI = customModel.getNamespaceUri();
+        // Construct the model name
+        final String name = constructName(customModel.getName(), namespacePrefix);
+
+        M2Model model = M2Model.createModel(name);
+        model.createNamespace(namespaceURI, namespacePrefix);
+        model.setDescription(customModel.getDescription());
+        String author = customModel.getAuthor();
+        if (author == null)
+        {
+            author = getCurrentUserFullName();
+        }
+        model.setAuthor(author);
+
+        // Types
+        if(types != null)
+        {
+            for(CustomType type : types)
+            {
+               validateName(type.getName(), TYPE_NAME_NULL_ERR);
+               M2Type m2Type = model.createType(constructName(type.getName(), namespacePrefix));
+               m2Type.setDescription(type.getDescription());
+               m2Type.setTitle(type.getTitle());
+               setParentName(m2Type, type.getParentName(), namespacesToImport, namespacePrefix);
+               setM2Properties(m2Type, type.getProperties(), namespacePrefix, namespacesToImport);
+            }
+        }
+
+        // Aspects
+        if(aspects != null)
+        {
+            for(CustomAspect aspect : aspects)
+            {
+                validateName(aspect.getName(), ASPECT_NAME_NULL_ERR);
+                M2Aspect m2Aspect = model.createAspect(constructName(aspect.getName(), namespacePrefix));
+                m2Aspect.setDescription(aspect.getDescription());
+                m2Aspect.setTitle(aspect.getTitle());
+                setParentName(m2Aspect, aspect.getParentName(), namespacesToImport, namespacePrefix);
+                setM2Properties(m2Aspect, aspect.getProperties(), namespacePrefix, namespacesToImport);
+            }
+        }
+
+        // Constraints
+        if(constraints != null)
+        {
+            for (CustomModelConstraint constraint : constraints)
+            {
+                validateName(constraint.getName(), CONSTRAINT_NAME_NULL_ERR);
+                final String constraintName = constructName(constraint.getName(), namespacePrefix);
+                M2Constraint m2Constraint = model.createConstraint(constraintName, constraint.getType());
+                // Set title, desc and parameters
+                setConstraintOtherData(constraint, m2Constraint, null);
+            }
+        }
+
+        // Add imports
+        for (Pair<String, String> uriPrefix : namespacesToImport)
+        {
+            // Don't import the already defined namespace
+            if (!namespaceURI.equals(uriPrefix.getFirst()))
+            {
+                model.createImport(uriPrefix.getFirst(), uriPrefix.getSecond());
+            }
+        }
+
+        return model;
+    }
+
+    private void setConstraintOtherData(CustomModelConstraint constraint, M2Constraint m2Constraint, String propDataType)
+    {
+        if (m2Constraint.getType() == null)
+        {
+            throw new InvalidArgumentException("cmm.rest_api.constraint_type_null");
+        }
+
+        ConstraintValidator constraintValidator = ConstraintValidator.findByType(m2Constraint.getType());
+        if (propDataType != null)
+        {
+            // Check if the constraint can be used with given data type
+            constraintValidator.validateUsage(prefixedStringToQname(propDataType));
+        }
+
+        m2Constraint.setTitle(constraint.getTitle());
+        m2Constraint.setDescription(constraint.getDescription());
+        for (CustomModelNamedValue parameter : constraint.getParameters())
+        {
+            validateName(parameter.getName(), "cmm.rest_api.constraint_parameter_name_null");
+            if (parameter.getListValue() != null)
+            {
+                if (propDataType != null && "allowedValues".equals(parameter.getName()))
+                {
+                    validateListConstraint(parameter.getListValue(), propDataType);
+                }
+                m2Constraint.createParameter(parameter.getName(), parameter.getListValue());
+            }
+            else
+            {
+                constraintValidator.validate(parameter.getName(), parameter.getSimpleValue());
+                m2Constraint.createParameter(parameter.getName(), parameter.getSimpleValue());
+            }
+        }
+    }
+
+    /*
+     * List constraint is a special case, so can't use the ConstraintValidator.
+     */
+    private void validateListConstraint(List<String> listValue, String propDataType)
+    {
+        for (String value : listValue)
+        {
+            try
+            {
+                // validate list values
+                this.valueDataTypeValidator.validateValue(propDataType, value);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidArgumentException(ex.getMessage());
+            }
+        }
+    }
+
+    private void setM2Properties(M2Class m2Class, List<CustomModelProperty> properties, String namespacePrefix,
+                Set<Pair<String, String>> namespacesToImport)
+    {
+        if (properties != null)
+        {
+            for (CustomModelProperty prop : properties)
+            {
+                validateName(prop.getName(), "cmm.rest_api.property_name_null");
+                M2Property m2Property = m2Class.createProperty(constructName(prop.getName(), namespacePrefix));
+                m2Property.setTitle(prop.getTitle());
+                m2Property.setDescription(prop.getDescription());
+                m2Property.setMandatory(prop.isMandatory());
+                m2Property.setMandatoryEnforced(prop.isMandatoryEnforced());
+                m2Property.setMultiValued(prop.isMultiValued());
+
+                String dataType = prop.getDataType();
+                // Default type is d:text
+                if (StringUtils.isBlank(dataType))
+                {
+                    dataType = DEFAULT_DATA_TYPE;
+                }
+                else
+                {
+                    if (!dataType.contains(":"))
+                    {
+                        throw new InvalidArgumentException("cmm.rest_api.property_datatype_invalid", new Object[] { dataType });
+                    }
+                }
+                namespacesToImport.add(resolveToUriAndPrefix(dataType));
+                try
+                {
+                    // validate default values
+                    this.valueDataTypeValidator.validateValue(dataType, prop.getDefaultValue());
+                }
+                catch (Exception ex)
+                {
+                    throw new InvalidArgumentException(ex.getMessage());
+                }
+                m2Property.setType(dataType);
+                m2Property.setDefaultValue(prop.getDefaultValue());
+ 
+                // Set indexing options
+                m2Property.setIndexed(prop.isIndexed());
+                // SHA-1234
+                // This 'if' statement can be removed when we fix the Solr schema
+                // so it can support boolean data type.
+                if (!BOOLEAN_DATA_TYPE.equals(dataType))
+                {
+                    if (Facetable.TRUE == prop.getFacetable())
+                    {
+                        m2Property.setFacetable(true);
+                    }
+                    else if (Facetable.FALSE == prop.getFacetable())
+                    {
+                        m2Property.setFacetable(false);
+                    }
+                }
+                m2Property.setIndexTokenisationMode(prop.getIndexTokenisationMode());
+
+                // Check for constraints
+                List<String> constraintRefs = prop.getConstraintRefs();
+                List<CustomModelConstraint> constraints = prop.getConstraints();
+                if (constraintRefs.size() > 0)
+                {
+                    for (String ref : constraintRefs)
+                    {
+                        Pair<String, String> prefixLocalName = splitPrefixedQName(ref);
+                        if (!namespacePrefix.equals(prefixLocalName.getFirst()))
+                        {
+                            throw new ConstraintViolatedException(I18NUtil.getMessage("cmm.rest_api.constraint_ref_not_defined", ref));
+                        }
+                        m2Property.addConstraintRef(ref);
+                    }
+                }
+                if(constraints.size() > 0)
+                {
+                    for (CustomModelConstraint modelConstraint : constraints)
+                    {
+                        String constraintName = null;
+                        if (modelConstraint.getName() != null)
+                        {
+                            validateName(modelConstraint.getName(), CONSTRAINT_NAME_NULL_ERR);
+                            constraintName = constructName(modelConstraint.getName(), namespacePrefix);
+                        }
+                        M2Constraint m2Constraint = m2Property.addConstraint(constraintName, modelConstraint.getType());
+                        // Set title, desc and parameters
+                        setConstraintOtherData(modelConstraint, m2Constraint, dataType);
+                    }
+                }
+            }
+        }
+    }
+
+    private void validateBasicModelInput(CustomModel customModel)
+    {
+        // validate model name
+        validateName(customModel.getName(), MODEL_NAME_NULL_ERR);
+
+        // validate model namespace prefix
+        validateName(customModel.getNamespacePrefix(), "cmm.rest_api.model_namespace_prefix_null");
+
+        // validate model namespace URI
+        if (customModel.getNamespaceUri() == null)
+        {
+            throw new InvalidArgumentException("cmm.rest_api.model_namespace_uri_null");
+        }
+        else
+        {
+            Matcher matcher = URI_PATTERN.matcher(customModel.getNamespaceUri());
+            if (!matcher.find())
+            {
+                throw new InvalidArgumentException("cmm.rest_api.model_namespace_uri_invalid");
+            }
+        }
+    }
+
+    private void validateName(String name, String errMsgId)
+    {
+        if (name == null)
+        {
+            if (errMsgId == null)
+            {
+                errMsgId = InvalidArgumentException.DEFAULT_MESSAGE_ID;
+            }
+            throw new InvalidArgumentException(errMsgId);
+        }
+        else
+        {
+            Matcher matcher = NAME_PATTERN.matcher(name);
+            if (!matcher.find())
+            {
+                throw new InvalidArgumentException("cmm.rest_api.input_validation_err", new Object [] {name});
+            }
+        }
+    }
+
+    /**
+     * Checks the current user access rights and throws
+     * {@link PermissionDeniedException} if the user is not a member of the
+     * ALFRESCO_MODEL_ADMINISTRATORS group
+     */
+    private void validateCurrentUser()
+    {
+        String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
+        if (!customModelService.isModelAdmin(currentUser))
+        {
+            throw new PermissionDeniedException();
+        }
+    }
+
+    /**
+     * Gets the fully authenticated user's full name
+     * 
+     * @return user's full name or the user's id if the full name dose not exit
+     */
+    protected String getCurrentUserFullName()
+    {
+        String userName = AuthenticationUtil.getFullyAuthenticatedUser();
+        NodeRef personRef = personService.getPerson(userName, false);
+ 
+        String firstName = (String) nodeService.getProperty(personRef, ContentModel.PROP_FIRSTNAME);
+        String lastName = (String) nodeService.getProperty(personRef, ContentModel.PROP_LASTNAME);
+
+        String fullName = (firstName != null ? firstName + " " : "") + (lastName != null ? lastName : "");
+
+        return ((StringUtils.isBlank(fullName) ? userName : fullName)).trim();
+    }
+
+    private String constructName(String name, String prefix)
+    {
+        return new StringBuilder(100).append(prefix).append(QName.NAMESPACE_PREFIX).append(name).toString();
+    }
+
+    /**
+     * Gets the namespace URI and prefix from the parent's name, provided that the
+     * given name is of a valid format. The valid format consist of a
+     * <i>namespace prefix</i>, a <i>colon</i> and a <i>name</i>. <b>E.g. sys:localized</b>
+     * 
+     * @param parentName the parent name
+     * @return a pair of namespace URI and prefix object
+     */
+    protected Pair<String, String> resolveToUriAndPrefix(String parentName)
+    {
+        QName qName = prefixedStringToQname(parentName);
+        Collection<String> prefixes = namespaceService.getPrefixes(qName.getNamespaceURI());
+        if (prefixes.size() == 0)
+        {
+            throw new InvalidArgumentException("cmm.rest_api.prefix_not_registered", new Object[] { qName.getNamespaceURI() });
+        }
+        String prefix = prefixes.iterator().next();
+        return new Pair<String, String>(qName.getNamespaceURI(), prefix);
+    }
+
+    /**
+     * Creates {@link QName} from a valid prefixed string.
+     */
+    private QName prefixedStringToQname(String prefixedQName)
+    {
+        try
+        {
+            return QName.createQName(prefixedQName, namespaceService);
+        }
+        catch (Exception ex)
+        {
+            String msg = ex.getMessage();
+            if (msg == null)
+            {
+                msg = "";
+            }
+            throw new InvalidArgumentException("cmm.rest_api.prefixed_qname_invalid", new Object[] { prefixedQName, msg });
+        }
+    }
+
+    /**
+     * Validates and sets the type's or aspect's parent name
+     * 
+     * @param m2Class the {@link M2Type} or {@link M2Aspect} object
+     * @param parentPrefixedName the parent prefixed name. E.g. <code>prefix:localName</code>
+     * @param namespacesToImport the {@link Set} of namespace pairs to import
+     * @param modelNamespacePrefix the model namespace prefix
+     */
+    private void setParentName(M2Class m2Class, String parentPrefixedName, Set<Pair<String, String>> namespacesToImport, String modelNamespacePrefix)
+    {
+        if (StringUtils.isBlank(parentPrefixedName))
+        {
+            return;
+        }
+
+        Pair<String, String> prefixLocaNamePair = splitPrefixedQName(parentPrefixedName);
+        if (!modelNamespacePrefix.equals(prefixLocaNamePair.getFirst()))
+        {
+            // Add to the list of imports
+            Pair<String, String> uriPrefixPair = resolveToUriAndPrefix(parentPrefixedName);
+            namespacesToImport.add(uriPrefixPair);
+        }
+        m2Class.setParentName(parentPrefixedName);
+    }
+
+    private void validateTypeAspectParent(AbstractClassModel typeAspect, CustomModel existingModel)
+    {
+        String parentPrefixedName = typeAspect.getParentName();
+        if (StringUtils.isBlank(parentPrefixedName))
+        {
+            return;
+        }
+
+        Pair<String, String> prefixLocaNamePair = splitPrefixedQName(parentPrefixedName);
+        String parentPrefix = prefixLocaNamePair.getFirst();
+        String parentLocalName = prefixLocaNamePair.getSecond();
+
+        // Validate parent prefix and localName
+        // We know that the values are not null, we just check against the defined RegEx
+        validateName(parentPrefix, null);
+        validateName(parentLocalName, null);
+
+        final boolean isAspect = (typeAspect instanceof CustomAspect);
+        ClassDefinition classDefinition = null;
+        QName qname = null;
+        if (existingModel.getNamespacePrefix().equals(parentPrefix))
+        {
+            // Check for types/aspects within the model
+            qname = QName.createQName(existingModel.getNamespaceUri(), parentLocalName);
+            classDefinition = (isAspect) ? customModelService.getCustomAspect(qname) : customModelService.getCustomType(qname);
+        }
+        else
+        {
+            // Make sure the namespace URI and Prefix are registered
+            Pair<String, String> uriPrefixPair = resolveToUriAndPrefix(parentPrefixedName);
+
+            qname = QName.createQName(uriPrefixPair.getFirst(), parentLocalName);
+            classDefinition = (isAspect) ? dictionaryService.getAspect(qname) : dictionaryService.getType(qname);
+        }
+
+        if (classDefinition == null)
+        {
+            String msgId = (isAspect) ? "cmm.rest_api.aspect_parent_not_exist" : "cmm.rest_api.type_parent_not_exist";
+            throw new ConstraintViolatedException(I18NUtil.getMessage(msgId, parentPrefixedName));
+        }
+        else
+        {
+            checkCircularDependency(classDefinition.getModel(), existingModel, parentPrefixedName);
+        }
+    }
+
+    /**
+     * Validates models circular dependencies
+     * <p>E.g. if {@literal B -> A} denotes  model B depends on model A, then {@link ConstraintViolatedException} must be thrown for following:
+     * <li> if {@literal B -> A}, then {@literal A -> B} must throw exception </li>
+     * <li> if {@literal B -> A} and {@literal C -> B}, then {@literal A -> C} must throw exception </li>
+     * <li> if {@literal B -> A} and {@literal C -> B} and {@literal D -> C}, then {@literal A -> D} must throw exception </li>
+     * @param modelDefinition the model which has a reference to the model containing the {@code parentPrefixedName}
+     * @param existingModel the model being updated
+     * @param parentPrefixedName the type/aspect parent name
+     */
+    private void checkCircularDependency(ModelDefinition modelDefinition, CustomModel existingModel, String parentPrefixedName)
+    {
+        for (NamespaceDefinition importedNamespace : modelDefinition.getImportedNamespaces())
+        {
+            ModelDefinition md = null;
+            if ((md = customModelService.getCustomModelByUri(importedNamespace.getUri())) != null)
+            {
+                if (existingModel.getNamespaceUri().equals(importedNamespace.getUri()))
+                {
+                    String msg = I18NUtil.getMessage("cmm.rest_api.circular_dependency_err", parentPrefixedName, existingModel.getName());
+                    throw new ConstraintViolatedException(msg);
+                }
+                checkCircularDependency(md, existingModel, parentPrefixedName);
+            }
+        }
+    }
+
+    /**
+     * Returns the qualified name of the following format
+     * <code>prefix:localName</code>, as a pair of (prefix, localName)
+     * 
+     * @param prefixedQName the prefixed name. E.g. <code>prefix:localName</code>
+     * @return {@link Pair} of (prefix, localName)
+     */
+    private Pair<String, String> splitPrefixedQName(String prefixedQName)
+    {
+        // index 0 => prefix and index 1 => local name
+        String[] prefixLocalName = QName.splitPrefixedQName(prefixedQName);
+
+        if (NamespaceService.DEFAULT_PREFIX.equals(prefixLocalName[0]))
+        {
+            throw new InvalidArgumentException("cmm.rest_api.prefixed_qname_invalid_format", new Object[] { prefixedQName });
+        }
+
+        return new Pair<String, String>(prefixLocalName[0], prefixLocalName[1]);
+    }
+
+    private CustomModelDefinition updateModel(ModelDetails modelDetails, String errorMsg)
+    {
+        M2Model m2Model = convertToM2Model(modelDetails);
+        try
+        {
+            CustomModelDefinition modelDef = customModelService.updateCustomModel(modelDetails.getModel().getName(), m2Model, modelDetails.isActive());
+            return modelDef;
+        }
+        catch (CustomModelConstraintException mce)
+        {
+            throw new ConstraintViolatedException(mce.getMessage());
+        }
+        catch (InvalidCustomModelException iex)
+        {
+            throw new InvalidArgumentException(iex.getMessage());
+        }
+        catch (Exception ex)
+        {
+            if (ex.getMessage() != null)
+            {
+                errorMsg = ex.getMessage();
+            }
+            throw new ApiException(errorMsg, ex);
+        }
+    }
+
+    private void mergeProperties(AbstractClassModel existingDetails, AbstractClassModel newDetails, Parameters parameters, boolean isModelActive)
+    {
+        validateList(newDetails.getProperties(), "cmm.rest_api.properties_empty_null");
+
+        // Transform existing properties into a map
+        Map<String, CustomModelProperty> existingProperties = transformToMap(existingDetails.getProperties(), toNameFunction());
+
+        // Transform new properties into a map
+        Map<String, CustomModelProperty> newProperties = transformToMap(newDetails.getProperties(), toNameFunction());
+
+        String propName = parameters.getParameter(PARAM_UPDATE_PROP);
+        // (propName == null) => property create request
+        if (propName == null)
+        {
+            // As this is a create request, check for duplicate properties
+            for (String name : newProperties.keySet())
+            {
+                if (existingProperties.containsKey(name))
+                {
+                    throw new ConstraintViolatedException(I18NUtil.getMessage("cmm.rest_api.property_create_name_already_in_use", name));
+                }
+            }
+        }
+        else
+        {// Update request
+            CustomModelProperty existingProp = existingProperties.get(propName);
+            if (existingProp == null)
+            {
+                throw new EntityNotFoundException(propName);
+            }
+
+            CustomModelProperty modifiedProp = newProperties.get(propName);
+            if (modifiedProp == null)
+            {
+                throw new InvalidArgumentException("cmm.rest_api.property_update_prop_not_found", new Object[] { propName });
+            }
+
+            existingProp.setTitle(modifiedProp.getTitle());
+            existingProp.setDescription(modifiedProp.getDescription());
+            existingProp.setDefaultValue(modifiedProp.getDefaultValue());
+            existingProp.setConstraintRefs(modifiedProp.getConstraintRefs());
+            existingProp.setConstraints(modifiedProp.getConstraints());
+            if (isModelActive)
+            {
+                validateActivePropertyUpdate(existingProp, modifiedProp);
+            }
+            existingProp.setDataType(modifiedProp.getDataType());
+            existingProp.setMandatory(modifiedProp.isMandatory());
+            existingProp.setMandatoryEnforced(modifiedProp.isMandatoryEnforced());
+            existingProp.setMultiValued(modifiedProp.isMultiValued());
+        }
+        // Override properties
+        existingProperties.putAll(newProperties);
+        existingDetails.setProperties(new ArrayList<>(existingProperties.values()));
+    }
+
+    /**
+     * A helper method to throw a more informative exception (for an active model) rather than depending on the
+     * {@link org.alfresco.repo.dictionary.ModelValidatorImpl#validateModel}
+     * generic exception.
+     */
+    private void validateActivePropertyUpdate(CustomModelProperty existingProp, CustomModelProperty newProp)
+    {
+        if (!StringUtils.equals(existingProp.getDataType(), newProp.getDataType()))
+        {
+            throw new ConstraintViolatedException("cmm.rest_api.property_change_datatype_err");
+        }
+        if (existingProp.isMandatory() != newProp.isMandatory())
+        {
+            throw new ConstraintViolatedException("cmm.rest_api.property_change_mandatory_opt_err");
+        }
+        if (existingProp.isMandatoryEnforced() != newProp.isMandatoryEnforced())
+        {
+            throw new ConstraintViolatedException("cmm.rest_api.property_change_mandatory_enforced_opt_err");
+        }
+        if (existingProp.isMultiValued() != newProp.isMultiValued())
+        {
+            throw new ConstraintViolatedException("cmm.rest_api.property_change_multi_valued_opt_err");
+        }
+    }
+
+    private void deleteProperty(AbstractClassModel existingClassModel, String propertyName)
+    {
+        // Transform existing properties into a map
+        Map<String, CustomModelProperty> existingProperties = transformToMap(existingClassModel.getProperties(), toNameFunction());
+        if (!existingProperties.containsKey(propertyName))
+        {
+            throw new EntityNotFoundException(propertyName);
+        }
+        existingProperties.remove(propertyName);
+        existingClassModel.setProperties(new ArrayList<>(existingProperties.values()));
+    }
+
+    private void validateList(List<?> list, String errorMsg)
+    {
+        if (CollectionUtils.isEmpty(list))
+        {
+            throw new InvalidArgumentException(errorMsg);
+        }
+    }
+
+    private static <K, V> Map<K, V> transformToMap(Collection<V> collection, Function<? super V, K> function)
+    {
+        Map<K, V> map = new HashMap<>(collection.size());
+
+        for (V item : collection)
+        {
+            map.put(function.apply(item), item);
+        }
+        return map;
+    }
+
+    private static <K, V> Map<K, V> removeRightEntries(Map<K, V> leftMap, Map<K, V> rightMap)
+    {
+        Map<K, V> result = new HashMap<>(leftMap);
+        for (K key : rightMap.keySet())
+        {
+            result.remove(key);
+        }
+        return result;
+    }
+
+    private void validateTypeAspectDelete(Collection<? extends AbstractClassModel> list, String classPrefixedName)
+    {
+        for(AbstractClassModel acm : list)
+        {
+            if(classPrefixedName.equals(acm.getParentName()))
+            {
+                throw new ConstraintViolatedException(I18NUtil.getMessage("cmm.rest_api.aspect_type_cannot_delete", classPrefixedName, acm.getPrefixedName()));
+            }
+        }
+    }
+
+    private boolean hasSelectProperty(Parameters parameters, String param)
+    {
+        return parameters.getSelectedProperties().contains(param);
+    }
+
+    private static Function<AbstractCommonDetails, String> toNameFunction()
+    {
+        return new Function<AbstractCommonDetails, String>()
+        {
+            @Override
+            public String apply(AbstractCommonDetails details)
+            {
+                return details.getName();
+            }
+        };
+    }
+
+    private <T extends AbstractCommonDetails> T getObjectByName(Collection<T> collection, String name)
+    {
+        for (T details : collection)
+        {
+            if (details.getName().equals(name))
+            {
+                return details;
+            }
+        }
+        return null;
+    }
+
+    public class ModelDetails
+    {
+        private CustomModel model;
+        private boolean active;
+        private List<CustomType> types;
+        private List<CustomAspect> aspects;
+        private List<CustomModelConstraint> modelDefinedConstraints;
+
+        public ModelDetails(CustomModelDefinition modelDefinition)
+        {
+            this.model = new CustomModel(modelDefinition);
+            this.active = modelDefinition.isActive();
+            this.types = convertToCustomTypes(modelDefinition.getTypeDefinitions(), false);
+            this.aspects = convertToCustomAspects(modelDefinition.getAspectDefinitions(), false);
+            this.modelDefinedConstraints = convertToCustomModelConstraints(modelDefinition.getModelDefinedConstraints());
+        }
+
+        public CustomModel getModel()
+        {
+            return this.model;
+        }
+
+        public void setModel(CustomModel model)
+        {
+            this.model = model;
+        }
+
+        public List<CustomType> getTypes()
+        {
+            return this.types;
+        }
+
+        public void setTypes(List<CustomType> types)
+        {
+            this.types = types;
+        }
+
+        public List<CustomAspect> getAspects()
+        {
+            return this.aspects;
+        }
+
+        public void setAspects(List<CustomAspect> aspects)
+        {
+            this.aspects = aspects;
+        }
+
+        public List<CustomModelConstraint> getModelDefinedConstraints()
+        {
+            return this.modelDefinedConstraints;
+        }
+
+        public void setModelDefinedConstraints(List<CustomModelConstraint> modelDefinedConstraints)
+        {
+            this.modelDefinedConstraints = modelDefinedConstraints;
+        }
+
+        public boolean isActive()
+        {
+            return this.active;
+        }
+    }
+
+    /**
+     * Constraint validator
+     *
+     * @author Jamal Kaabi-Mofrad
+     */
+    public enum ConstraintValidator
+    {
+        REGEX
+        {
+            @Override
+            public void validate(String parameterName, String value)
+            {
+                if ("expression".equals(parameterName))
+                {
+                    try
+                    {
+                        Pattern.compile(value);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new InvalidArgumentException("cmm.rest_api.regex_constraint_invalid_expression", new Object[] { value });
+                    }
+                }
+            }
+        },
+        MINMAX
+        {
+            @Override
+            public void validate(String parameterName, String value)
+            {
+                double parsedValue;
+                try
+                {
+                    parsedValue = Double.parseDouble(value);
+                }
+                catch (Exception ex)
+                {
+                    throw new InvalidArgumentException("cmm.rest_api.minmax_constraint_invalid_parameter", new Object[] { value, parameterName });
+                }
+                // SHA-1126. We check for the Double.MIN_VALUE to be consistent with NumericRangeConstraint.minValue
+                if("maxValue".equalsIgnoreCase(parameterName) && parsedValue < Double.MIN_VALUE)
+                {
+                    throw new InvalidArgumentException("cmm.rest_api.minmax_constraint_invalid_max_value");
+                }
+            }
+
+            @Override
+            public void validateUsage(QName propDataType)
+            {
+                if (propDataType != null && !(DataTypeDefinition.INT.equals(propDataType)
+                            || DataTypeDefinition.LONG.equals(propDataType)
+                            || DataTypeDefinition.FLOAT.equals(propDataType)
+                            || DataTypeDefinition.DOUBLE.equals(propDataType)))
+                {
+                    throw new InvalidArgumentException("cmm.rest_api.minmax_constraint_invalid_use");
+                }
+            }
+        },
+        LENGTH
+        {
+            @Override
+            public void validate(String parameterName, String value)
+            {
+                try
+                {
+                    Integer.parseInt(value);
+                }
+                catch (Exception ex)
+                {
+                    throw new InvalidArgumentException("cmm.rest_api.length_constraint_invalid_parameter", new Object[] { value, parameterName });
+                }
+            }
+
+            @Override
+            public void validateUsage(QName propDataType)
+            {
+                if (propDataType != null && !(DataTypeDefinition.TEXT.equals(propDataType)
+                            || DataTypeDefinition.MLTEXT.equals(propDataType)
+                            || DataTypeDefinition.CONTENT.equals(propDataType)))
+                {
+                    throw new InvalidArgumentException("cmm.rest_api.length_constraint_invalid_use");
+                }
+            }
+        },
+        DUMMY_CONSTRAINT
+        {
+            @Override
+            public void validate(String parameterName, String value)
+            {
+                // nothing to do
+            }
+        };
+
+        public abstract void validate(String parameterName, String value);
+
+        public void validateUsage(QName propDataType)
+        {
+            return; // nothing to do
+        }
+
+        public static ConstraintValidator findByType(String constraintType)
+        {
+            for (ConstraintValidator c : values())
+            {
+                if (c.name().equals(constraintType))
+                {
+                    return c;
+                }
+            }
+            return DUMMY_CONSTRAINT;
+        }
+    }
+
+    @Override
+    public CustomModel createCustomModel(M2Model m2Model)
+    {
+        // Check the current user is authorised to import the custom model
+        validateCurrentUser();
+
+        validateImportedM2Model(m2Model);
+
+        CompiledModel compiledModel = null;
+        try
+        {
+            compiledModel = customModelService.compileModel(m2Model);
+        }
+        catch (CustomModelConstraintException mce)
+        {
+            throw new ConstraintViolatedException(mce.getMessage());
+        }
+        catch (InvalidCustomModelException iex)
+        {
+            throw new InvalidArgumentException(iex.getMessage());
+        }
+
+        ModelDefinition modelDefinition = compiledModel.getModelDefinition();
+        CustomModel customModel = new CustomModel();
+        customModel.setName(modelDefinition.getName().getLocalName());
+        customModel.setAuthor(modelDefinition.getAuthor());
+        customModel.setDescription(modelDefinition.getDescription(dictionaryService));
+        customModel.setStatus(ModelStatus.DRAFT);
+        NamespaceDefinition nsd = modelDefinition.getNamespaces().iterator().next();
+        customModel.setNamespaceUri(nsd.getUri());
+        customModel.setNamespacePrefix(nsd.getPrefix());
+
+        List<CustomType> customTypes = convertToCustomTypes(compiledModel.getTypes(), false);
+        List<CustomAspect> customAspects = convertToCustomAspects(compiledModel.getAspects(), false);
+
+        List<ConstraintDefinition> constraintDefinitions = CustomModelDefinitionImpl.removeInlineConstraints(compiledModel);
+        List<CustomModelConstraint> customModelConstraints = convertToCustomModelConstraints(constraintDefinitions);
+
+        customModel.setTypes(customTypes);
+        customModel.setAspects(customAspects);
+        customModel.setConstraints(customModelConstraints);
+
+        return createCustomModelImpl(customModel, false);
+    }
+
+    private void validateImportedM2Model(M2Model m2Model)
+    {
+        List<M2Namespace> namespaces = m2Model.getNamespaces();
+        if (namespaces.size() > 1)
+        {
+            throw new ConstraintViolatedException(I18NUtil.getMessage("cmm.rest_api.model.import_namespace_multiple_found", namespaces.size()));
+        }
+        else if (namespaces.isEmpty())
+        {
+            throw new ConstraintViolatedException("cmm.rest_api.model.import_namespace_undefined");
+        }
+
+        checkUnsupportedModelElements(m2Model.getTypes());
+        checkUnsupportedModelElements(m2Model.getAspects());
+    }
+
+    private void checkUnsupportedModelElements(Collection<? extends M2Class> m2Classes)
+    {
+        for (M2Class cls : m2Classes)
+        {
+            if (cls.getAssociations().size() > 0)
+            {
+                throw new ConstraintViolatedException("cmm.rest_api.model.import_associations_unsupported");
+            }
+            if (cls.getPropertyOverrides().size() > 0)
+            {
+                throw new ConstraintViolatedException("cmm.rest_api.model.import_overrides_unsupported");
+            }
+            if (cls.getMandatoryAspects().size() > 0)
+            {
+                throw new ConstraintViolatedException("cmm.rest_api.model.import_mandatory_aspects_unsupported");
+            }
+            if(cls.getArchive() != null)
+            {
+                throw new ConstraintViolatedException("cmm.rest_api.model.import_archive_unsupported");
+            }
+            if(cls.getIncludedInSuperTypeQuery() != null)
+            {
+                throw new ConstraintViolatedException("cmm.rest_api.model.import_includedInSuperTQ_unsupported");
+            }
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/DefaultExceptionHandler.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/DefaultExceptionHandler.java
new file mode 100644
index 00000000000..fa30cdf9135
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/DefaultExceptionHandler.java
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+
+/**
+ * Translates access denied exceptions from the service layer to API not found exception.
+ * 
+ * @author steveglover
+ *
+ */
+public class DefaultExceptionHandler implements ExceptionHandler
+{
+	@Override
+	public boolean handle(Throwable t)
+	{
+		if(t instanceof AccessDeniedException || t instanceof PermissionDeniedException)
+		{
+			// Note: security, no message to indicate why
+			throw new NotFoundException();
+		}
+		return false;
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/DeletedNodesImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/DeletedNodesImpl.java
new file mode 100644
index 00000000000..2398a370670
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/DeletedNodesImpl.java
@@ -0,0 +1,247 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.node.archive.ArchivedNodesCannedQueryBuilder;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.node.archive.RestoreNodeReport;
+import org.alfresco.repo.node.integrity.IntegrityException;
+import org.alfresco.rest.api.DeletedNodes;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.Renditions;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.NodeTargetAssoc;
+import org.alfresco.rest.api.model.Rendition;
+import org.alfresco.rest.api.model.UserInfo;
+import org.alfresco.rest.framework.core.exceptions.ApiException;
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Handles trashcan / deleted nodes
+ *
+ * @author Gethin James
+ */
+public class DeletedNodesImpl implements DeletedNodes, RecognizedParamsExtractor
+{
+    private NodeArchiveService nodeArchiveService;
+    private PersonService personService;
+    private NodeService nodeService;
+    private Nodes nodes;
+    private Renditions renditions;
+
+    public void setNodeArchiveService(NodeArchiveService nodeArchiveService)
+    {
+        this.nodeArchiveService = nodeArchiveService;
+    }
+
+    public void setPersonService(PersonService personService)
+    {
+        this.personService = personService;
+    }
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public void setNodes(Nodes nodes)
+    {
+        this.nodes = nodes;
+    }
+
+    public void setRenditions(Renditions renditions)
+    {
+        this.renditions = renditions;
+    }
+
+    /**
+     * Sets archived information on the Node
+     * @param aNode
+     * @param mapUserInfo
+     */
+    private void mapArchiveInfo(Node aNode, Map<String, UserInfo> mapUserInfo)
+    {
+        if (mapUserInfo == null) {
+            mapUserInfo = new HashMap<>();
+        }
+        Map<QName, Serializable> nodeProps = nodeService.getProperties(aNode.getNodeRef());
+        aNode.setArchivedAt((Date)nodeProps.get(ContentModel.PROP_ARCHIVED_DATE));
+        aNode.setArchivedByUser(aNode.lookupUserInfo((String)nodeProps.get(ContentModel.PROP_ARCHIVED_BY), mapUserInfo, personService));
+
+        //Don't show parent id
+        aNode.setParentId(null);
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Node> listDeleted(Parameters parameters)
+    {
+        PagingRequest pagingRequest = Util.getPagingRequest(parameters.getPaging());
+        NodeRef archiveStoreRootNodeRef = nodeService.getStoreArchiveNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+
+        // Create canned query
+        ArchivedNodesCannedQueryBuilder queryBuilder = new ArchivedNodesCannedQueryBuilder.Builder(
+                archiveStoreRootNodeRef, pagingRequest).sortOrderAscending(false).build();
+
+        // Query the DB
+        PagingResults<NodeRef> result = nodeArchiveService.listArchivedNodes(queryBuilder);
+
+        Integer totalItems = result.getTotalResultCount().getFirst();
+
+        List<Node> nodesFound = new ArrayList<Node>(result.getPage().size());
+        Map mapUserInfo = new HashMap<>();
+        for (NodeRef nRef:result.getPage())
+        {
+            Node foundNode = nodes.getFolderOrDocument(nRef, null, null, parameters.getInclude(), mapUserInfo);
+            mapArchiveInfo(foundNode,mapUserInfo);
+            nodesFound.add(foundNode);
+        }
+
+        return CollectionWithPagingInfo.asPaged(parameters.getPaging(), nodesFound, result.hasMoreItems(), (totalItems == null ? null : totalItems.intValue()));
+    }
+
+    @Override
+    public Node getDeletedNode(String originalId, Parameters parameters, boolean fullnode, Map<String, UserInfo> mapUserInfo)
+    {
+        //First check the node is valid and has been archived.
+        NodeRef validatedNodeRef = nodes.validateNode(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, originalId);
+
+        //Now get the Node
+        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, validatedNodeRef.getId());
+        NodeRef archivedNodeRef = nodeArchiveService.getArchivedNode(nodeRef);
+
+        Node foundNode = null;
+        if (fullnode)
+        {
+            foundNode = nodes.getFolderOrDocumentFullInfo(archivedNodeRef, null, null, parameters, mapUserInfo);
+        }
+        else
+        {
+            foundNode = nodes.getFolderOrDocument(archivedNodeRef, null, null, parameters.getInclude(), mapUserInfo);
+        }
+
+        if (foundNode != null) mapArchiveInfo(foundNode,null);
+        return foundNode;
+    }
+
+    @Override
+    public Node restoreArchivedNode(String archivedId, NodeTargetAssoc nodeTargetAssoc)
+    {
+        //First check the node is valid and has been archived.
+        NodeRef validatedNodeRef = nodes.validateNode(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, archivedId);
+
+        RestoreNodeReport restored = null;
+
+        if (nodeTargetAssoc != null)
+        {
+            NodeRef targetNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeTargetAssoc.getTargetParentId());
+            QName assocType = nodes.getAssocType(nodeTargetAssoc.getAssocType());
+            restored = nodeArchiveService.restoreArchivedNode(validatedNodeRef, targetNodeRef, assocType, null);
+        }
+        else
+        {
+            restored = nodeArchiveService.restoreArchivedNode(validatedNodeRef);
+        }
+
+        switch (restored.getStatus())
+        {
+        case SUCCESS:
+            return nodes.getFolderOrDocumentFullInfo(restored.getRestoredNodeRef(), null, null, null, null);
+        case FAILURE_PERMISSION:
+            throw new PermissionDeniedException();
+        case FAILURE_INTEGRITY:
+            throw new IntegrityException("Restore failed due to an integrity error", null);
+        case FAILURE_DUPLICATE_CHILD_NODE_NAME:
+            throw new ConstraintViolatedException("Name already exists in target");
+        case FAILURE_INVALID_ARCHIVE_NODE:
+            throw new EntityNotFoundException(archivedId);
+        case FAILURE_INVALID_PARENT:
+            throw new NotFoundException("Invalid parent id "+restored.getTargetParentNodeRef());
+        default:
+            throw new ApiException("Unable to restore node "+archivedId);
+        }
+    }
+
+    @Override
+    public void purgeArchivedNode(String archivedId)
+    {
+        //First check the node is valid and has been archived.
+        NodeRef validatedNodeRef = nodes.validateNode(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, archivedId);
+        nodeArchiveService.purgeArchivedNode(validatedNodeRef);
+    }
+
+    @Override
+    public BinaryResource getContent(String archivedId, String renditionId, Parameters parameters)
+    {
+        // First check if the archived node is valid
+        NodeRef validatedNodeRef = nodes.validateNode(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, archivedId);
+
+        if (renditionId != null)
+        {
+            return renditions.getContent(validatedNodeRef, renditionId, parameters);
+        }
+        else
+        {
+            return nodes.getContent(validatedNodeRef, parameters, false);
+        }
+    }
+
+    @Override
+    public Rendition getRendition(String archivedId, String renditionId, Parameters parameters)
+    {
+        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, archivedId);
+        Rendition rendition = renditions.getRendition(nodeRef, renditionId, parameters);
+        return rendition;
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Rendition> getRenditions(String archivedId, Parameters parameters)
+    {
+        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, archivedId);
+        return renditions.getRenditions(nodeRef, parameters);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/DownloadsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/DownloadsImpl.java
new file mode 100644
index 00000000000..87b428927b6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/DownloadsImpl.java
@@ -0,0 +1,175 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.util.HashSet;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.download.DownloadModel;
+import org.alfresco.rest.api.Downloads;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.Download;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.service.cmr.download.DownloadService;
+import org.alfresco.service.cmr.download.DownloadStatus;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * 
+ * @author cpopa
+ *
+ */
+public class DownloadsImpl implements Downloads
+{
+    private DownloadService downloadService;
+    private NodeService nodeService;
+    private Nodes nodes;
+    private PermissionService permissionService;
+    public static final String DEFAULT_ARCHIVE_NAME = "archive.zip";
+    public static final String DEFAULT_ARCHIVE_EXTENSION = ".zip";
+
+    public void setDownloadService(DownloadService downloadService)
+    {
+        this.downloadService = downloadService;
+    }
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public void setNodes(Nodes nodes)
+    {
+        this.nodes = nodes;
+    }    
+
+    public void setPermissionService(PermissionService permissionService)
+    {
+        this.permissionService = permissionService;
+    }
+
+    @Override
+    public Download createDownloadNode(Download download)
+    {
+        checkEmptyNodeIds(download);
+        
+        checkDuplicateNodeId(download);
+        
+        NodeRef[] zipContentNodeRefs = validateAndGetNodeRefs(download);
+        
+        checkNodeIdsReadPermission(zipContentNodeRefs);
+        
+        NodeRef zipNodeRef = downloadService.createDownload(zipContentNodeRefs, true);
+        
+        String archiveName = zipContentNodeRefs.length > 1 ?
+                                 DEFAULT_ARCHIVE_NAME : 
+                                 nodeService.getProperty(zipContentNodeRefs[0], ContentModel.PROP_NAME) + DEFAULT_ARCHIVE_EXTENSION;
+        
+        nodeService.setProperty(zipNodeRef, ContentModel.PROP_NAME, archiveName);
+        Download downloadInfo = getStatus(zipNodeRef);
+        return downloadInfo;
+    }
+
+    @Override
+    public Download getDownloadStatus(String downloadNodeId)
+    {
+        NodeRef downloadNodeRef = nodes.validateNode(downloadNodeId);
+        
+        checkIsDownloadNodeType(downloadNodeRef);
+        
+        Download downloadInfo = getStatus(downloadNodeRef);
+        return downloadInfo;
+    }
+
+    @Override
+    public void cancel(String downloadNodeId)
+    {
+        NodeRef downloadNodeRef = nodes.validateNode(downloadNodeId);
+        checkIsDownloadNodeType(downloadNodeRef);
+        
+        downloadService.cancelDownload(downloadNodeRef);
+    }    
+
+    protected NodeRef[] validateAndGetNodeRefs(Download download)
+    {
+        return download.getNodeIds().stream()
+                                    .map(nodeRef -> nodes.validateNode(nodeRef))
+                                    .toArray(NodeRef[]::new);
+    }
+
+    protected void checkNodeIdsReadPermission(NodeRef[] zipContentNodeRefs)
+    {
+        for (NodeRef nodeRef : zipContentNodeRefs)
+        {
+            if (permissionService.hasReadPermission(nodeRef).equals(AccessStatus.DENIED)){
+                throw new PermissionDeniedException();
+            }
+        }
+    }
+
+    protected void checkDuplicateNodeId(Download download)
+    {
+        if(download.getNodeIds().size() != new HashSet<String>(download.getNodeIds()).size()){
+            throw new InvalidArgumentException("Cannot specify the same nodeId twice");
+        }
+    }
+
+    protected void checkEmptyNodeIds(Download download)
+    {
+        if (download.getNodeIds().size() == 0)
+        {
+            throw new InvalidArgumentException("Cannot create an archive with 0 entries.");
+        }
+    }
+    
+    protected void checkIsDownloadNodeType(NodeRef downloadNodeRef)
+    {
+        QName nodeIdType = this.nodeService.getType(downloadNodeRef);
+        
+        if(!nodeIdType.equals(DownloadModel.TYPE_DOWNLOAD)){ 
+            throw new InvalidArgumentException("Please specify the nodeId of a download node."); 
+        }
+    }    
+
+    private Download getStatus(NodeRef downloadNodeRef)
+    {
+        DownloadStatus status = downloadService.getDownloadStatus(downloadNodeRef);
+        Download downloadInfo = new Download();
+        downloadInfo.setId(downloadNodeRef.getId());
+        downloadInfo.setBytesAdded(status.getDone());
+        downloadInfo.setFilesAdded(status.getFilesAdded());
+        downloadInfo.setStatus(status.getStatus());
+        downloadInfo.setTotalFiles(status.getTotalFiles());
+        downloadInfo.setTotalBytes(status.getTotal());
+        return downloadInfo;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/ExceptionHandler.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/ExceptionHandler.java
new file mode 100644
index 00000000000..7ae201bf1d4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/ExceptionHandler.java
@@ -0,0 +1,31 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+public interface ExceptionHandler
+{
+	boolean handle(Throwable t);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/ExceptionInterceptor.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/ExceptionInterceptor.java
new file mode 100644
index 00000000000..5b2046ce246
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/ExceptionInterceptor.java
@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.util.List;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
+/**
+ * An interceptor that catches exceptions and handlers them in some way, possibly by re-throwing as a different exception.
+ * 
+ * @author steveglover
+ *
+ */
+public class ExceptionInterceptor implements MethodInterceptor
+{
+	private List<ExceptionHandler> exceptionHandlers;
+
+    public void setExceptionHandlers(List<ExceptionHandler> exceptionHandlers)
+	{
+		this.exceptionHandlers = exceptionHandlers;
+	}
+
+	public ExceptionInterceptor()
+    {
+        super();
+    }
+
+    public Object invoke(MethodInvocation mi) throws Throwable
+    {
+        try
+        {
+            return mi.proceed();
+        }
+        catch(Throwable t)
+        {
+        	for(ExceptionHandler handler : exceptionHandlers)
+        	{
+        		if(handler.handle(t))
+        		{
+        			break;
+        		}
+        	}
+        	throw t;
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/ExcludedTypes.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/ExcludedTypes.java
new file mode 100644
index 00000000000..27712a75d83
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/ExcludedTypes.java
@@ -0,0 +1,116 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.alfresco.opencmis.dictionary.QNameFilter;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Stores a set of excluded types, by full type name. The localName can be a wildcard (*) to indicate that the
+ * whole namespace should be excluded.
+ * 
+ * @author steveglover
+ *
+ */
+public class ExcludedTypes
+{
+	private List<QName> expectedTypes;
+    private QNameFilter excludedTypes;
+    private NodeService nodeService;
+
+    public void setExpectedTypes(List<String> expectedTypes)
+    {
+        if(expectedTypes != null && expectedTypes.size() > 0)
+        {
+        	this.expectedTypes = new ArrayList<QName>(expectedTypes.size());
+
+	    	for(String type : expectedTypes)
+	    	{
+	            final QName typeDef = QName.createQName(type);
+	    		this.expectedTypes.add(typeDef);
+	    	}
+        }
+	}
+
+	public void setNodeService(NodeService nodeService)
+    {
+		this.nodeService = nodeService;
+	}
+
+	public void setExcludedTypes(QNameFilter excludedTypes)
+    {
+		this.excludedTypes = excludedTypes;
+	}
+
+	public boolean isExcluded(final NodeRef nodeRef)
+	{
+		boolean excluded = false;
+
+		QName nodeType = nodeService.getType(nodeRef);
+		if(expectedTypes != null && !expectedTypes.contains(nodeType))
+		{
+			excluded = true;
+		}
+
+		if(!excluded)
+		{
+			// need to run as system - caller may not be able to read the node's aspects
+			// but we need to know what they are in order to determine exclusion.
+			excluded = TenantUtil.runAsSystemTenant(new TenantRunAsWork<Boolean>()
+			{
+				@Override
+				public Boolean doWork() throws Exception
+				{
+					boolean excluded = false;
+
+					// the node is a content node. Make sure it doesn't have an aspect in the excluded list.
+					Set<QName> aspects = new HashSet<QName>(nodeService.getAspects(nodeRef));
+					for(QName aspect : aspects)
+					{
+						if(excludedTypes.isExcluded(aspect))
+						{
+							excluded = true;
+							break;
+						}
+					}
+
+					return excluded;
+				}
+			}, TenantUtil.getCurrentDomain());
+		}
+
+		return excluded;
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java
new file mode 100644
index 00000000000..00924291183
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/FavouritesImpl.java
@@ -0,0 +1,451 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.favourites.PersonFavourite;
+import org.alfresco.repo.site.SiteDoesNotExistException;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.rest.api.Favourites;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.Sites;
+import org.alfresco.rest.api.model.Document;
+import org.alfresco.rest.api.model.DocumentTarget;
+import org.alfresco.rest.api.model.Favourite;
+import org.alfresco.rest.api.model.Folder;
+import org.alfresco.rest.api.model.FolderTarget;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.PathInfo;
+import org.alfresco.rest.api.model.Site;
+import org.alfresco.rest.api.model.SiteTarget;
+import org.alfresco.rest.api.model.Target;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper.WalkerCallbackAdapter;
+import org.alfresco.service.cmr.favourites.FavouritesService;
+import org.alfresco.service.cmr.favourites.FavouritesService.SortFields;
+import org.alfresco.service.cmr.favourites.FavouritesService.Type;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Public REST API: Centralises access to favourites functionality and maps between representations repository and api representations.
+ * 
+ * @author steveglover
+ * @since publicapi1.0
+ */
+public class FavouritesImpl implements Favourites
+{
+    private static final Log logger = LogFactory.getLog(FavouritesImpl.class);
+
+	private People people;
+	private Sites sites;
+	private Nodes nodes;
+	private FavouritesService favouritesService;
+	private SiteService siteService;
+    private NamespaceService namespaceService;
+
+    // additional exclude properties for favourites as these can be already top-level properties
+    private static final List<QName> EXCLUDED_PROPS = Arrays.asList(
+            ContentModel.PROP_TITLE,
+            ContentModel.PROP_DESCRIPTION,
+            SiteModel.PROP_SITE_VISIBILITY,
+            SiteModel.PROP_SITE_PRESET
+            );
+
+	public void setPeople(People people)
+	{
+		this.people = people;
+	}
+
+	public void setSites(Sites sites)
+	{
+		this.sites = sites;
+	}
+
+	public void setNodes(Nodes nodes)
+	{
+		this.nodes = nodes;
+	}
+
+	public void setFavouritesService(FavouritesService favouritesService)
+	{
+		this.favouritesService = favouritesService;
+	}
+	
+	public void setSiteService(SiteService siteService)
+	{
+		this.siteService = siteService;
+	}
+
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+
+	private Target getTarget(PersonFavourite personFavourite, Parameters parameters)
+	{
+		Target target = null;
+		NodeRef nodeRef = personFavourite.getNodeRef();
+		Type type = personFavourite.getType();
+		if(type.equals(Type.FILE))
+		{
+			Document document = nodes.getDocument(nodeRef);
+            setPathInfo(document, parameters.getInclude());
+            target = new DocumentTarget(document);
+		}
+		else if(type.equals(Type.FOLDER))
+		{
+			Folder folder = nodes.getFolder(nodeRef);
+            setPathInfo(folder, parameters.getInclude());
+			target = new FolderTarget(folder);
+		}
+		else if(type.equals(Type.SITE))
+		{
+			SiteInfo siteInfo = siteService.getSite(nodeRef);
+			String role = sites.getSiteRole(siteInfo.getShortName());
+			Site site = new Site(siteInfo, role);
+			target = new SiteTarget(site);
+		}
+		else
+		{
+			throw new AlfrescoRuntimeException("Unexpected favourite target type: " + type);
+		}
+		
+		return target;
+	}
+
+	private Favourite getFavourite(PersonFavourite personFavourite, Parameters parameters)
+	{
+		Favourite fav = new Favourite();
+		fav.setTargetGuid(personFavourite.getNodeRef().getId());
+		fav.setCreatedAt(personFavourite.getCreatedAt());
+		Target target = getTarget(personFavourite, parameters);
+		fav.setTarget(target);
+
+		// REPO-1147 allow retrieving additional properties
+        if (parameters.getInclude().contains(PARAM_INCLUDE_PROPERTIES))
+        {
+            List<String> includeProperties = new LinkedList<>();
+            includeProperties.add(PARAM_INCLUDE_PROPERTIES);
+            // get node representation with only properties included
+            Node node = nodes.getFolderOrDocument(personFavourite.getNodeRef(), null, null, includeProperties, null);
+            // Create a map from node properties excluding properties already in this Favorite
+            Map<String, Object> filteredNodeProperties = filterProps(node.getProperties(), EXCLUDED_PROPS);
+            if(filteredNodeProperties.size() > 0)
+            {
+                fav.setProperties(filteredNodeProperties);
+            }
+        }
+
+		return fav;
+	}
+
+    private Map<String, Object> filterProps(Map<String, Object> properties, List<QName> toRemove)
+    {
+        Map<String, Object> filteredProps = properties == null ? new HashMap<>() : new HashMap<>(properties);
+        List<String> propsToRemove = toRemove.stream().map(e -> e.toPrefixString(namespaceService)).collect(Collectors.toList());
+        filteredProps.keySet().removeAll(propsToRemove);
+        return filteredProps;
+    }
+
+    private CollectionWithPagingInfo<Favourite> wrap(Paging paging, PagingResults<PersonFavourite> personFavourites, Parameters parameters)
+    {
+    	final List<PersonFavourite> page = personFavourites.getPage();
+    	final List<Favourite> list = new AbstractList<Favourite>()
+		{
+			@Override
+			public Favourite get(int index)
+			{
+				PersonFavourite personFavourite = page.get(index);
+				Favourite fav = getFavourite(personFavourite, parameters);
+				return fav;
+			}
+
+			@Override
+			public int size()
+			{
+				return page.size();
+			}
+		};
+		Pair<Integer, Integer> pair = personFavourites.getTotalResultCount();
+		Integer total = null;
+		if(pair.getFirst().equals(pair.getSecond()))
+		{
+			total = pair.getFirst();
+		}
+    	return CollectionWithPagingInfo.asPaged(paging, list, personFavourites.hasMoreItems(), total);
+    }
+
+    @Override
+	public Favourite addFavourite(String personId, Favourite favourite)
+    {
+        Parameters parameters = getDefaultParameters(personId, null);
+        return addFavourite(personId, favourite, parameters);
+    }
+
+    @Override
+    public Favourite addFavourite(String personId, Favourite favourite, Parameters parameters)
+    {
+        Favourite ret = null;
+
+        personId = people.validatePerson(personId, true);
+        Target target = favourite.getTarget();
+        if(target == null)
+        {
+            throw new InvalidArgumentException("target is missing");
+        }
+        else if(target instanceof SiteTarget)
+        {
+            SiteTarget siteTarget = (SiteTarget)target;
+            String guid = siteTarget.getSite().getGuid();
+            SiteInfo siteInfo = sites.validateSite(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, guid));
+            NodeRef siteNodeRef = siteInfo.getNodeRef();
+            String siteId = siteInfo.getShortName();
+
+            try
+            {
+                PersonFavourite personFavourite = favouritesService.addFavourite(personId, siteNodeRef);
+                ret = getFavourite(personFavourite, parameters);
+            }
+            catch(SiteDoesNotExistException e)
+            {
+                throw new RelationshipResourceNotFoundException(personId, siteId);
+            }
+        }
+        else if(target instanceof DocumentTarget)
+        {
+            DocumentTarget documentTarget = (DocumentTarget)target;
+            NodeRef nodeRef = documentTarget.getFile().getGuid();
+            if(!nodes.nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_CONTENT), null))
+            {
+                throw new RelationshipResourceNotFoundException(personId, nodeRef.getId());
+            }
+
+            PersonFavourite personFavourite = favouritesService.addFavourite(personId, nodeRef);
+            ret = getFavourite(personFavourite, parameters);
+        }
+        else if(target instanceof FolderTarget)
+        {
+            FolderTarget folderTarget = (FolderTarget)target;
+            NodeRef nodeRef = folderTarget.getFolder().getGuid();
+            if(!nodes.nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_FOLDER), Collections.singleton(SiteModel.TYPE_SITE)))
+            {
+                throw new RelationshipResourceNotFoundException(personId, nodeRef.getId());
+            }
+
+            PersonFavourite personFavourite = favouritesService.addFavourite(personId, nodeRef);
+            ret = getFavourite(personFavourite, parameters);
+        }
+
+        return ret;
+    }
+
+    @Override
+    public void removeFavourite(String personId, String id)
+    {
+    	personId = people.validatePerson(personId, true);
+    	NodeRef nodeRef = nodes.validateNode(id);
+    	boolean exists = false;
+
+    	Type type = favouritesService.getType(nodeRef);
+    	if(type.equals(Type.SITE))
+    	{
+    		SiteInfo siteInfo = siteService.getSite(nodeRef);
+    		if(siteInfo == null)
+    		{
+    			// shouldn't happen because the type implies it's a site
+    			throw new AlfrescoRuntimeException("Unable to find site with nodeRef " + nodeRef);
+    		}
+    		exists = favouritesService.removeFavourite(personId, siteInfo.getNodeRef());
+    	}
+    	else if(type.equals(Type.FILE))
+    	{
+    		exists = favouritesService.removeFavourite(personId, nodeRef);
+    	}
+    	else if(type.equals(Type.FOLDER))
+    	{
+    		exists = favouritesService.removeFavourite(personId, nodeRef);
+    	}
+    	if(!exists)
+    	{
+    		throw new RelationshipResourceNotFoundException(personId, id);
+    	}
+    }
+
+    @Override
+    public Favourite getFavourite(String personId, String favouriteId)
+    {
+        Parameters parameters = getDefaultParameters(personId, favouriteId);
+        return getFavourite(personId, favouriteId, parameters);
+    }
+
+    @Override
+    public Favourite getFavourite(String personId, String favouriteId, Parameters parameters)
+    {
+        NodeRef nodeRef = nodes.validateNode(favouriteId);
+        personId = people.validatePerson(personId, true);
+
+        PersonFavourite personFavourite = favouritesService.getFavourite(personId, nodeRef);
+        if(personFavourite != null)
+        {
+            Favourite favourite = getFavourite(personFavourite, parameters);
+            return favourite;
+        }
+        else
+        {
+            throw new RelationshipResourceNotFoundException(personId, favouriteId);
+        }
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Favourite> getFavourites(String personId, final Parameters parameters)
+    {
+    	personId = people.validatePerson(personId, true);
+
+    	Paging paging = parameters.getPaging();
+
+    	List<Pair<FavouritesService.SortFields, Boolean>> sortProps = getSortProps(parameters);
+
+    	final Set<Type> filteredByClientQuery = new HashSet<Type>();
+    	Set<Type> filterTypes = FavouritesService.Type.ALL_FILTER_TYPES;  //Default all
+    	
+    	// filterType is of the form 'target.<site|file|folder>'
+    	QueryHelper.walk(parameters.getQuery(), new WalkerCallbackAdapter()
+        {
+			@Override
+			public void or() {
+				//OR is supported but exists() will be called for each EXISTS so we don't
+				//need to do anything here.  If we don't override it then it will be assumed
+				//that OR in the grammar is not supported.
+			}
+
+			@Override
+			public void exists(String filteredByClient, boolean negated) {
+                if(filteredByClient != null)
+                {
+                    int idx = filteredByClient.lastIndexOf("/");
+                    if(idx == -1 || idx == filteredByClient.length())
+                    {
+                        throw new InvalidArgumentException();
+                    }
+                    else
+                    {
+                    	String filtertype = filteredByClient.substring(idx + 1).toUpperCase();
+                        filteredByClientQuery.add(Type.valueOf(filtertype));
+                    }
+                }
+				
+			}
+        });
+    	
+    	if (filteredByClientQuery.size() > 0)
+    	{
+    	    filterTypes = filteredByClientQuery;
+    	}
+
+        final PagingResults<PersonFavourite> favourites = favouritesService.getPagedFavourites(personId, filterTypes, sortProps, Util.getPagingRequest(paging));
+
+    	return wrap(paging, favourites, parameters);
+    }
+
+    private void setPathInfo(Node node, List<String> includeParam)
+    {
+        if (includeParam.contains(PARAM_INCLUDE_PATH))
+        {
+            PathInfo pathInfo = nodes.lookupPathInfo(node.getNodeRef(), null);
+            node.setPath(pathInfo);
+        }
+    }
+
+    /**
+     * Returns a {@code {@link Parameters} object where almost all of its values are null.
+     * the non-null value is the {@literal include} and whatever value is passed for {@code personId} and {@code favouriteId}
+     */
+    private Parameters getDefaultParameters(String personId, String favouriteId)
+    {
+        Params.RecognizedParams recognizedParams = new Params.RecognizedParams(null, null, null, null, Collections.emptyList(), null, null, null,
+                    false);
+        Parameters parameters = Params.valueOf(recognizedParams, personId, favouriteId, null);
+        return parameters;
+    }
+
+    private List<Pair<FavouritesService.SortFields, Boolean>> getSortProps(Parameters parameters)
+    {
+        List<Pair<FavouritesService.SortFields, Boolean>> sortProps = new ArrayList<>();
+        List<SortColumn> sortCols = parameters.getSorting();
+        if ((sortCols != null) && (sortCols.size() > 0))
+        {
+            for (SortColumn sortCol : sortCols)
+            {
+                SortFields sortField;
+                try
+                {
+                    sortField = SortFields.valueOf(sortCol.column);
+                }
+                catch (Exception e)
+                {
+                    throw new InvalidArgumentException("Invalid sort field: " + sortCol.column);
+                }
+                sortProps.add(new Pair<>(sortField, (sortCol.asc ? Boolean.TRUE : Boolean.FALSE)));
+            }
+        }
+        else
+        {
+            // default sort order
+            sortProps = FavouritesService.DEFAULT_SORT_PROPS;
+        }
+        return sortProps;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java
new file mode 100644
index 00000000000..de7dcd7f155
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java
@@ -0,0 +1,1070 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import static org.alfresco.repo.security.authentication.AuthenticationUtil.runAsSystem;
+
+import java.text.Collator;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.alfresco.query.CannedQueryPageDetails;
+import org.alfresco.query.EmptyPagingResults;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authority.AuthorityDAO;
+import org.alfresco.repo.security.authority.AuthorityException;
+import org.alfresco.repo.security.authority.AuthorityInfo;
+import org.alfresco.repo.security.authority.UnknownAuthorityException;
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.api.Groups;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.model.Group;
+import org.alfresco.rest.api.model.GroupMember;
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.rest.framework.resource.parameters.where.Query;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.workflow.api.impl.MapBasedQueryWalker;
+import org.alfresco.rest.workflow.api.impl.MapBasedQueryWalkerOrSupported;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.util.AlfrescoCollator;
+import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * Centralises access to groups services and maps between representations.
+ * 
+ * @author cturlica
+ */
+public class GroupsImpl implements Groups
+{
+    private static final int MAX_ZONES = 1;
+    private static final String DISPLAY_NAME = "displayName";
+    private static final String AUTHORITY_NAME = "authorityName";
+    private static final String ERR_MSG_MODIFY_FIXED_AUTHORITY = "Trying to modify a fixed authority";
+
+    private final static Map<String, String> SORT_PARAMS_TO_NAMES;
+    static
+    {
+        Map<String, String> aMap = new HashMap<>(2);
+        aMap.put(PARAM_ID, AUTHORITY_NAME);
+        aMap.put(PARAM_DISPLAY_NAME, DISPLAY_NAME);
+
+        SORT_PARAMS_TO_NAMES = Collections.unmodifiableMap(aMap);
+    }
+
+    // List groups filtering (via where clause)
+    private final static Set<String> LIST_GROUPS_EQUALS_QUERY_PROPERTIES = new HashSet<>(Arrays.asList(new String[] { PARAM_IS_ROOT }));
+
+    private final static Set<String> LIST_GROUP_MEMBERS_QUERY_PROPERTIES = new HashSet<>(Arrays.asList(new String[] { PARAM_MEMBER_TYPE }));
+
+    protected AuthorityService authorityService;
+    private AuthorityDAO authorityDAO;
+
+    protected People people;
+
+    public AuthorityService getAuthorityService()
+    {
+        return authorityService;
+    }
+
+    public void setAuthorityService(AuthorityService authorityService)
+    {
+        this.authorityService = authorityService;
+    }
+
+    public void setAuthorityDAO(AuthorityDAO authorityDAO)
+    {
+        this.authorityDAO = authorityDAO;
+    }
+
+    public void setPeople(People people)
+    {
+        this.people = people;
+    }
+
+    public Group create(Group group, Parameters parameters)
+    {
+        validateGroup(group, false);
+
+        // Create authority with default zones.
+        final Set<String> authorityZones = authorityService.getDefaultZones();
+        String authorityDisplayName = null;
+        if(group.getDisplayName() != null && !group.getDisplayName().isEmpty())
+        {
+            authorityDisplayName = group.getDisplayName();
+        }
+
+        String authority = authorityService.createAuthority(AuthorityType.GROUP, group.getId(), authorityDisplayName, authorityZones);
+
+        // Set a given child authority to be included by the given parent
+        // authorities.
+        if (group.getParentIds() != null && !group.getParentIds().isEmpty())
+        {
+            authorityService.addAuthority(group.getParentIds(), authority);
+        }
+
+        return getGroup(authority, parameters);
+    }
+
+    public Group update(String groupId, Group group, Parameters parameters)
+    {
+        validateGroupId(groupId, false);
+        validateGroup(group, true);
+
+        try
+        {
+            authorityService.setAuthorityDisplayName(groupId, group.getDisplayName());
+        }
+        catch (AuthorityException ae)
+        {
+            handleAuthorityException(ae);
+        }
+
+        return getGroup(groupId, parameters);
+    }
+
+    public Group getGroup(String groupId, Parameters parameters) throws EntityNotFoundException
+    {
+        AuthorityInfo authorityInfo = getAuthorityInfo(groupId);
+
+        final Set<String> rootAuthorities = getAllRootAuthorities(AuthorityType.GROUP);
+        final List<String> includeParam = parameters.getInclude();
+
+        return getGroup(authorityInfo, includeParam, rootAuthorities);
+    }
+
+    public CollectionWithPagingInfo<Group> getGroups(final Parameters parameters)
+    {
+        final List<String> includeParam = parameters.getInclude();
+
+        Paging paging = parameters.getPaging();
+
+        // Retrieve sort column. This is limited for now to sort column due to
+        // v0 api implementation. Should be improved in the future.
+        Pair<String, Boolean> sortProp = getGroupsSortProp(parameters);
+
+        // Parse where clause properties.
+        Query q = parameters.getQuery();
+        Boolean isRootParam = null;
+        String zoneFilter = null;
+        if (q != null)
+        {
+            GroupsQueryWalker propertyWalker = new GroupsQueryWalker();
+            QueryHelper.walk(q, propertyWalker);
+
+            isRootParam = propertyWalker.getIsRoot();
+            List<String> zonesParam = propertyWalker.getZones();
+            if (zonesParam != null)
+            {
+                validateZonesParam(zonesParam);
+                zoneFilter = zonesParam.get(0);
+            }
+        }
+
+        final AuthorityType authorityType = AuthorityType.GROUP;
+        final Set<String> rootAuthorities = getAllRootAuthorities(authorityType);
+
+        PagingResults<AuthorityInfo> pagingResult;
+        try
+        {
+            pagingResult = getAuthoritiesInfo(authorityType, isRootParam, zoneFilter, rootAuthorities, sortProp, paging);
+        }
+        catch (UnknownAuthorityException e)
+        {
+            // Non-existent zone
+            pagingResult = new EmptyPagingResults<>();
+        }
+
+        // Create response.
+        final List<AuthorityInfo> page = pagingResult.getPage();
+        int totalItems = pagingResult.getTotalResultCount().getFirst();
+        List<Group> groups = new AbstractList<Group>()
+        {
+            @Override
+            public Group get(int index)
+            {
+                AuthorityInfo authorityInfo = page.get(index);
+                return getGroup(authorityInfo, includeParam, rootAuthorities);
+            }
+
+            @Override
+            public int size()
+            {
+                return page.size();
+            }
+        };
+
+        return CollectionWithPagingInfo.asPaged(paging, groups, pagingResult.hasMoreItems(), totalItems);
+    }
+
+    private void validateZonesParam(List<String> zonesParam)
+    {
+        if (zonesParam.size() > MAX_ZONES)
+        {
+            throw new IllegalArgumentException("A maximum of " + MAX_ZONES + " zones may be specified.");
+        }
+        else if (zonesParam.isEmpty())
+        {
+            throw new IllegalArgumentException("Zones filter list cannot be empty.");
+        }
+        // Validate each zone name
+        zonesParam.forEach(zone -> {
+            if (zone.isEmpty())
+            {
+                throw new IllegalArgumentException("Zone name cannot be empty (i.e. '')");
+            }
+        });
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Group> getGroupsByPersonId(String requestedPersonId, Parameters parameters)
+    {
+        // Canonicalize the person ID, performing -me- alias substitution.
+        final String personId = people.validatePerson(requestedPersonId);
+
+        // Non-admins can only access their own data
+        // TODO: this is also in PeopleImpl.update(personId,personInfo) - refactor?
+        boolean isAdmin = authorityService.hasAdminAuthority();
+        String currentUserId = AuthenticationUtil.getFullyAuthenticatedUser();
+        if (!isAdmin && !currentUserId.equalsIgnoreCase(personId))
+        {
+            // The user is not an admin user and is not attempting to retrieve *their own* details.
+            throw new PermissionDeniedException();
+        }
+
+        Query q = parameters.getQuery();
+        Boolean isRootParam = null;
+        String zoneFilter = null;
+        if (q != null)
+        {
+            GroupsQueryWalker propertyWalker = new GroupsQueryWalker();
+            QueryHelper.walk(q, propertyWalker);
+
+            isRootParam = propertyWalker.getIsRoot();
+            List<String> zonesParam = propertyWalker.getZones();
+            if (zonesParam != null)
+            {
+                validateZonesParam(zonesParam);
+                zoneFilter = zonesParam.get(0);
+            }
+        }
+
+        final List<String> includeParam = parameters.getInclude();
+        Paging paging = parameters.getPaging();
+
+        // Retrieve sort column. This is limited for now to sort column due to
+        // v0 api implementation. Should be improved in the future.
+        Pair<String, Boolean> sortProp = getGroupsSortProp(parameters);
+
+        // Get all the authorities for a user, including but not limited to, groups.
+        Set<String> userAuthorities = runAsSystem(
+                () -> authorityService.getAuthoritiesForUser(personId));
+
+        final Set<String> rootAuthorities = getAllRootAuthorities(AuthorityType.GROUP);
+
+        // Filter, transform and sort the list of user authorities into
+        // a suitable list of AuthorityInfo objects.
+        final String finalZoneFilter = zoneFilter;
+        final Boolean finalIsRootParam = isRootParam;
+        List<AuthorityInfo> groupAuthorities = userAuthorities.stream().
+                filter(a -> a.startsWith(AuthorityType.GROUP.getPrefixString())).
+                filter(a -> isRootPredicate(finalIsRootParam, rootAuthorities, a)).
+                filter(a -> zonePredicate(a, finalZoneFilter)).
+                map(this::getAuthorityInfo).
+                sorted(new AuthorityInfoComparator(sortProp.getFirst(), sortProp.getSecond())).
+                collect(Collectors.toList());
+
+        PagingResults<AuthorityInfo> pagingResult = Util.wrapPagingResults(paging, groupAuthorities);
+
+        // Create response.
+        final List<AuthorityInfo> page = pagingResult.getPage();
+        int totalItems = pagingResult.getTotalResultCount().getFirst();
+
+        // Transform the page of results into Group objects
+        List<Group> groups = page.stream().
+                map(authority -> getGroup(authority, includeParam, rootAuthorities)).
+                collect(Collectors.toList());
+
+        return CollectionWithPagingInfo.asPaged(paging, groups, pagingResult.hasMoreItems(), totalItems);
+    }
+
+    private PagingResults<AuthorityInfo> getAuthoritiesInfo(AuthorityType authorityType, Boolean isRootParam, String zoneFilter, Set<String> rootAuthorities, Pair<String, Boolean> sortProp,
+            Paging paging)
+    {
+        PagingResults<AuthorityInfo> pagingResult;
+
+        if (isRootParam != null)
+        {
+            List<AuthorityInfo> groupList;
+
+            if (isRootParam)
+            {
+                // Limit the post processing work by using the already loaded
+                // list of root authorities.
+                List<AuthorityInfo> authorities = rootAuthorities.stream().
+                        map(this::getAuthorityInfo).
+                        filter(auth -> zonePredicate(auth.getAuthorityName(), zoneFilter)).
+                        collect(Collectors.toList());
+                groupList = new ArrayList<>(rootAuthorities.size());
+                groupList.addAll(authorities);
+
+                // Post process sorting - this should be moved to service
+                // layer. It is done here because sorting is not supported at
+                // service layer.
+                AuthorityInfoComparator authorityComparator = new AuthorityInfoComparator(sortProp.getFirst(), sortProp.getSecond());
+                Collections.sort(groupList, authorityComparator);
+            }
+            else
+            {
+                PagingRequest pagingNoMaxItems = new PagingRequest(CannedQueryPageDetails.DEFAULT_PAGE_SIZE);
+
+                // Get authorities using canned query but without using
+                // the requested paginating now because we need to filter out
+                // the root authorities.
+                PagingResults<AuthorityInfo> nonPagingResult = authorityService.getAuthoritiesInfo(authorityType, zoneFilter, null, sortProp.getFirst(), sortProp.getSecond(),
+                        pagingNoMaxItems);
+
+                // Post process filtering - this should be moved to service
+                // layer. It is done here because filtering by "isRoot" is not
+                // supported at service layer.
+                groupList = nonPagingResult.getPage();
+                if (groupList != null)
+                {
+                    for (Iterator<AuthorityInfo> i = groupList.iterator(); i.hasNext();)
+                    {
+                        AuthorityInfo authorityInfo = i.next();
+                        if (!isRootParam.equals(isRootAuthority(rootAuthorities, authorityInfo.getAuthorityName())))
+                        {
+                            i.remove();
+                        }
+                    }
+                }
+            }
+
+            // Post process paging - this should be moved to service layer.
+            pagingResult = Util.wrapPagingResults(paging, groupList);
+        }
+        else
+        {
+            PagingRequest pagingRequest = Util.getPagingRequest(paging);
+
+            // Get authorities using canned query.
+            pagingResult = authorityService.getAuthoritiesInfo(authorityType, zoneFilter, null, sortProp.getFirst(), sortProp.getSecond(), pagingRequest);
+        }
+        return pagingResult;
+    }
+
+    /**
+     * Checks to see if the named group authority should be included in results
+     * when filtered by zone.
+     *
+     * @see #zonePredicate(Set, String)
+     * @param groupName
+     * @param zone
+     * @return true if result should be included.
+     */
+    private boolean zonePredicate(String groupName, String zone)
+    {
+        Set<String> zones = null;
+        if (zone != null)
+        {
+            // Don't bother doing this lookup unless the zone filter is non-null.
+            zones = authorityService.getAuthorityZones(groupName);
+        }
+        return zonePredicate(zones, zone);
+    }
+
+    /**
+     * Test to see if a result should be included, using the isRoot parameter.
+     * <p>
+     * If isRootParam is null, then no results will be filtered. Otherwise
+     * results will be filtered to return only those that are root or non-root,
+     * depending on the value of isRootParam.
+     *
+     * @param isRootParam
+     * @param rootAuthorities
+     * @param authority
+     * @return
+     */
+    private boolean isRootPredicate(Boolean isRootParam, Set<String> rootAuthorities, String authority)
+    {
+        if (isRootParam != null)
+        {
+            return isRootParam == isRootAuthority(rootAuthorities, authority);
+        }
+        return true;
+    }
+
+    /**
+     * Checks a list of zones to see if it matches the supplied zone filter
+     * ({@code requiredZone} parameter).
+     * <p>
+     * If the requiredZone parameter is null, then the filter will not be applied (returns true.)
+     * <p>
+     * If the requiredZone parameter is not null (i.e. a filter must be applied) and the
+     * {@code zones}) list is {@code null} then the predicate will return false.
+     *
+     * @param zones
+     * @param requiredZone
+     * @return true if result should be included.
+     */
+    private boolean zonePredicate(Set<String> zones, String requiredZone)
+    {
+        if (requiredZone != null)
+        {
+            return zones != null && zones.contains(requiredZone);
+        }
+        return true;
+    }
+
+    private Set<String> getAllRootAuthorities(AuthorityType authorityType)
+    {
+        Set<String> authorities;
+        try
+        {
+            authorities = authorityService.getAllRootAuthorities(authorityType);
+        }
+        catch (UnknownAuthorityException e)
+        {
+            authorities = Collections.emptySet();
+        }
+
+        return authorities;
+    }
+
+    /**
+     * Retrieve authority info by name. <b>Node id field isn't used at this time
+     * and it is set to null.</b>
+     * 
+     * @param id
+     *            The authority name.
+     * @return The authority info.
+     */
+    private AuthorityInfo getAuthorityInfo(String id)
+    {
+        return getAuthorityInfo(id, false);
+    }
+
+    /**
+     * Retrieve authority info by name. <b>Node id field isn't used at this time
+     * and it is set to null.</b>
+     *
+     * @param id
+     *            The authority name.
+     * @param defaultDisplayNameIfNull
+     *            True if we would like to get a default value (e.g. shortName of the authority) if the authority display name is null.
+     * @return The authority info.
+     */
+    private AuthorityInfo getAuthorityInfo(String id, boolean defaultDisplayNameIfNull)
+    {
+        if (id == null || id.isEmpty())
+        {
+            throw new InvalidArgumentException("id is null or empty");
+        }
+
+        // authorityService.authorityExists(ALL_AUTHORITIES) returns false!
+        if (!id.equals(PermissionService.ALL_AUTHORITIES) && !authorityService.authorityExists(id))
+        {
+            throw new EntityNotFoundException(id);
+        }
+
+        String authorityDisplayName = getAuthorityDisplayName(id, defaultDisplayNameIfNull);
+
+        return new AuthorityInfo(null, authorityDisplayName, id);
+    }
+
+    private String getAuthorityDisplayName(String id, boolean defaultDisplayNameIfNull)
+    {
+        return defaultDisplayNameIfNull ? authorityService.getAuthorityDisplayName(id) : authorityDAO.getAuthorityDisplayName(id);
+    }
+
+    private Group getGroup(AuthorityInfo authorityInfo, List<String> includeParam, Set<String> rootAuthorities)
+    {
+        if (authorityInfo == null)
+        {
+            return null;
+        }
+
+        Group group = new Group();
+        group.setId(authorityInfo.getAuthorityName());
+
+        // REPO-1743
+        String authorityDisplayName = authorityInfo.getAuthorityDisplayName();
+        if (authorityDisplayName == null || authorityDisplayName.isEmpty())
+        {
+            authorityDisplayName = authorityService.getAuthorityDisplayName(authorityInfo.getAuthorityName());
+        }
+
+        group.setDisplayName(authorityDisplayName);
+
+        group.setIsRoot(isRootAuthority(rootAuthorities, authorityInfo.getAuthorityName()));
+
+        // Optionally include
+        if (includeParam != null)
+        {
+            if (includeParam.contains(PARAM_INCLUDE_PARENT_IDS))
+            {
+                String authority = authorityInfo.getAuthorityName();
+                Set<String> containingAuthorities = Collections.emptySet();
+                // Workaround for AuthorityDAO.listAuthorities, where although AuthorityType.GUEST
+                // is a special case, AuthorityType.EVERYONE is not, and an exception is thrown.
+                if (!authority.equalsIgnoreCase(PermissionService.ALL_AUTHORITIES))
+                {
+                    containingAuthorities = authorityService.getContainingAuthorities(AuthorityType.GROUP, authority, true);
+                }
+                group.setParentIds(containingAuthorities);
+            }
+
+            if (includeParam.contains(PARAM_INCLUDE_ZONES))
+            {
+                Set<String> authorityZones = authorityService.getAuthorityZones(authorityInfo.getAuthorityName());
+                group.setZones(authorityZones);
+            }
+        }
+
+        return group;
+    }
+
+    private boolean isRootAuthority(Set<String> rootAuthorities, String authorityName)
+    {
+        return rootAuthorities.contains(authorityName);
+    }
+
+    private Pair<String, Boolean> getGroupsSortProp(Parameters parameters)
+    {
+        Pair<String, Boolean> sortProp;
+        List<SortColumn> sortCols = parameters.getSorting();
+
+        if ((sortCols != null) && (sortCols.size() > 0))
+        {
+            if (sortCols.size() > 1)
+            {
+                throw new InvalidArgumentException("Multiple sort fields not allowed.");
+            }
+
+            SortColumn sortCol = sortCols.get(0);
+
+            String sortPropName = SORT_PARAMS_TO_NAMES.get(sortCol.column);
+            if (sortPropName == null)
+            {
+                throw new InvalidArgumentException("Invalid sort field: " + sortCol.column);
+            }
+
+            sortProp = new Pair<>(sortPropName, (sortCol.asc ? Boolean.TRUE : Boolean.FALSE));
+        }
+        else
+        {
+            sortProp = getGroupsSortPropDefault();
+        }
+        return sortProp;
+    }
+
+    /**
+     * <p>
+     * Returns the default sort order.
+     * </p>
+     *
+     * @return The default <code>Pair&lt;QName, Boolean&gt;</code> sort
+     *         property.
+     */
+    private Pair<String, Boolean> getGroupsSortPropDefault()
+    {
+        return new Pair<>(DISPLAY_NAME, Boolean.TRUE);
+    }
+
+    private static class AuthorityInfoComparator implements Comparator<AuthorityInfo>
+    {
+        private Map<AuthorityInfo, String> nameCache;
+        private String sortBy;
+        private Collator col;
+        private int orderMultiplier = 1;
+
+        private AuthorityInfoComparator(String sortBy, boolean sortAsc)
+        {
+            col = AlfrescoCollator.getInstance(I18NUtil.getLocale());
+            this.sortBy = sortBy;
+            this.nameCache = new HashMap<>();
+
+            if (!sortAsc)
+            {
+                orderMultiplier = -1;
+            }
+        }
+
+        @Override
+        public int compare(AuthorityInfo g1, AuthorityInfo g2)
+        {
+            return col.compare(get(g1), get(g2)) * orderMultiplier;
+        }
+
+        private String get(AuthorityInfo g)
+        {
+            String v = nameCache.get(g);
+            if (v == null)
+            {
+
+                // Please see GetAuthoritiesCannedQuery.AuthComparator for details.
+
+                // Get the value from the group
+                if (DISPLAY_NAME.equals(sortBy))
+                {
+                    v = g.getAuthorityDisplayName();
+                }
+                else if (AUTHORITY_NAME.equals(sortBy))
+                {
+                    v = g.getAuthorityName();
+                }
+                else
+                {
+                    throw new InvalidArgumentException("Invalid sort field: " + sortBy);
+                }
+
+                if (v == null)
+                {
+                    v = g.getAuthorityName();
+                }
+
+                // // Lower case it for case insensitive search
+                // v = v.toLowerCase();
+
+                // Cache it
+                nameCache.put(g, v);
+            }
+            return v;
+        }
+    }
+
+    public void delete(String groupId, Parameters parameters)
+    {
+        if (!isGroupAuthority(groupId))
+        {
+            throw new InvalidArgumentException("Invalid group id: " + groupId);
+        }
+
+        // Get cascade param - default false (if not provided).
+        boolean cascade = Boolean.valueOf(parameters.getParameter(PARAM_CASCADE));
+
+        try
+        {
+            authorityService.deleteAuthority(groupId, cascade);
+        }
+        catch (AuthorityException ae)
+        {
+            handleAuthorityException(ae);
+        }
+    }
+
+    private void handleAuthorityException(AuthorityException ae)
+    {
+        if (ae.getMsgId().equals("Trying to modify a fixed authority"))
+        {
+            throw new ConstraintViolatedException(ERR_MSG_MODIFY_FIXED_AUTHORITY);
+        }
+        else
+        {
+            throw ae;
+        }
+    }
+
+    public CollectionWithPagingInfo<GroupMember> getGroupMembers(String groupId, final Parameters parameters)
+    {
+        validateGroupId(groupId, false);
+
+        // Not allowed to list all members.
+        if (PermissionService.ALL_AUTHORITIES.equals(groupId))
+        {
+            throw new UnsupportedResourceOperationException();
+        }
+
+        Paging paging = parameters.getPaging();
+
+        // Retrieve sort column. This is limited for now to sort column due to
+        // v0 api implementation. Should be improved in the future.
+        Pair<String, Boolean> sortProp = getGroupsSortProp(parameters);
+
+        AuthorityType authorityType = null;
+
+        // Parse where clause properties.
+        Query q = parameters.getQuery();
+        if (q != null)
+        {
+            MapBasedQueryWalkerOrSupported propertyWalker = new MapBasedQueryWalkerOrSupported(LIST_GROUP_MEMBERS_QUERY_PROPERTIES, null);
+            QueryHelper.walk(q, propertyWalker);
+
+            String memberTypeStr = propertyWalker.getProperty(PARAM_MEMBER_TYPE, WhereClauseParser.EQUALS, String.class);
+            authorityType = getAuthorityType(memberTypeStr);
+        }
+
+        PagingResults<AuthorityInfo> pagingResult = getAuthoritiesInfo(authorityType, groupId, sortProp, paging);
+
+        // Create response.
+        final List<AuthorityInfo> page = pagingResult.getPage();
+        int totalItems = pagingResult.getTotalResultCount().getFirst();
+        List<GroupMember> groupMembers = new AbstractList<GroupMember>()
+        {
+            @Override
+            public GroupMember get(int index)
+            {
+                AuthorityInfo authorityInfo = page.get(index);
+                return getGroupMember(authorityInfo);
+            }
+
+            @Override
+            public int size()
+            {
+                return page.size();
+            }
+        };
+
+        return CollectionWithPagingInfo.asPaged(paging, groupMembers, pagingResult.hasMoreItems(), totalItems);
+    }
+
+    @Override
+    public GroupMember createGroupMember(String groupId, GroupMember groupMember)
+    {
+        validateGroupId(groupId, false);
+
+        // Not allowed to modify a GROUP_EVERYONE member.
+        if (PermissionService.ALL_AUTHORITIES.equals(groupId))
+        {
+            throw new ConstraintViolatedException(ERR_MSG_MODIFY_FIXED_AUTHORITY);
+        }
+
+        validateGroupMember(groupMember);
+
+        AuthorityType authorityType = getAuthorityType(groupMember.getMemberType());
+
+        if (!authorityService.authorityExists(groupMember.getId()))
+        {
+            throw new EntityNotFoundException(groupMember.getId());
+        }
+
+        AuthorityType existingAuthorityType = AuthorityType.getAuthorityType(groupMember.getId());
+        if (existingAuthorityType != authorityType)
+        {
+            throw new IllegalArgumentException("Incorrect group member type, "
+                    + (AuthorityType.USER.equals(existingAuthorityType) ? Groups.PARAM_MEMBER_TYPE_PERSON : existingAuthorityType) + " exists with the given id");
+        }
+
+        authorityService.addAuthority(groupId, groupMember.getId());
+        String authority = authorityService.getName(authorityType, groupMember.getId());
+
+        return getGroupMember(authority);
+    }
+
+    public void deleteGroupMembership(String groupId, String groupMemberId)
+    {
+        validateGroupId(groupId, false);
+
+        // Not allowed to modify a GROUP_EVERYONE member.
+        if (PermissionService.ALL_AUTHORITIES.equals(groupId))
+        {
+            throw new ConstraintViolatedException(ERR_MSG_MODIFY_FIXED_AUTHORITY);
+        }
+
+        validateGroupMemberId(groupMemberId);
+
+        // Verify if groupMemberId is member of groupId
+        AuthorityType authorityType = AuthorityType.getAuthorityType(groupMemberId);
+        Set<String> parents = authorityService.getContainingAuthorities(AuthorityType.GROUP, groupMemberId, true);
+        if (!parents.contains(groupId))
+        {
+            throw new NotFoundException(groupMemberId + " is not member of " + groupId);
+        }
+
+        authorityService.removeAuthority(groupId, groupMemberId);
+    }
+
+    private AuthorityType getAuthorityType(String memberType)
+    {
+        AuthorityType authorityType = null;
+        if (memberType != null && !memberType.isEmpty())
+        {
+            switch (memberType)
+            {
+            case PARAM_MEMBER_TYPE_GROUP:
+                authorityType = AuthorityType.GROUP;
+                break;
+            case PARAM_MEMBER_TYPE_PERSON:
+                authorityType = AuthorityType.USER;
+                break;
+            default:
+                throw new InvalidArgumentException("MemberType is invalid (expected eg. GROUP, PERSON)");
+            }
+        }
+        return authorityType;
+    }
+
+    private PagingResults<AuthorityInfo> getAuthoritiesInfo(AuthorityType authorityType, String groupId, Pair<String, Boolean> sortProp, Paging paging)
+    {
+        Set<String> authorities;
+        try
+        {
+            authorities = authorityService.findAuthorities(authorityType, groupId, true, null, null);
+        }
+        catch (UnknownAuthorityException e)
+        {
+            authorities = Collections.emptySet();
+        }
+
+        List<AuthorityInfo> authorityInfoList = new ArrayList<>(authorities.size());
+        authorityInfoList.addAll(authorities.stream().map(this::getAuthorityInfo).collect(Collectors.toList()));
+
+        // Post process sorting - this should be moved to service
+        // layer. It is done here because sorting is not supported at
+        // service layer.
+        AuthorityInfoComparator authorityComparator = new AuthorityInfoComparator(sortProp.getFirst(), sortProp.getSecond());
+        Collections.sort(authorityInfoList, authorityComparator);
+
+        // Post process paging - this should be moved to service layer.
+        return Util.wrapPagingResults(paging, authorityInfoList);
+    }
+
+    private GroupMember getGroupMember(AuthorityInfo authorityInfo)
+    {
+        if (authorityInfo == null)
+        {
+            return null;
+        }
+
+        GroupMember groupMember = new GroupMember();
+        groupMember.setId(authorityInfo.getAuthorityName());
+
+        String authorityDisplayName = authorityInfo.getAuthorityDisplayName();
+        if (authorityDisplayName == null || authorityDisplayName.isEmpty())
+        {
+            authorityDisplayName = authorityService.getAuthorityDisplayName(authorityInfo.getAuthorityName());
+        }
+
+        groupMember.setDisplayName(authorityDisplayName);
+
+        String memberType = null;
+        AuthorityType authorityType = AuthorityType.getAuthorityType(authorityInfo.getAuthorityName());
+        switch (authorityType)
+        {
+        case GROUP:
+            memberType = PARAM_MEMBER_TYPE_GROUP;
+            break;
+        case USER:
+            memberType = PARAM_MEMBER_TYPE_PERSON;
+            break;
+        default:
+        }
+        groupMember.setMemberType(memberType);
+
+        return groupMember;
+    }
+
+    private GroupMember getGroupMember(String authorityId)
+    {
+        AuthorityInfo authorityInfo = getAuthorityInfo(authorityId);
+
+        return getGroupMember(authorityInfo);
+    }
+
+    private void validateGroupId(String groupId, boolean inferPrefix)
+    {
+        if (groupId == null || groupId.isEmpty())
+        {
+            throw new InvalidArgumentException("groupId is null or empty");
+        }
+
+        if (!PermissionService.ALL_AUTHORITIES.equals(groupId) && !groupAuthorityExists(groupId, inferPrefix))
+        {
+            throw new EntityNotFoundException(groupId);
+        }
+    }
+
+    private void validateGroupMemberId(String groupMemberId)
+    {
+        if (groupMemberId == null || groupMemberId.isEmpty())
+        {
+            throw new InvalidArgumentException("group member id is null or empty");
+        }
+        if (!(personAuthorityExists(groupMemberId) || groupAuthorityExists(groupMemberId, false)))
+        {
+            throw new EntityNotFoundException(groupMemberId);
+        }
+    }
+
+    private void validateGroup(Group group, boolean isUpdate)
+    {
+        if (group == null)
+        {
+            throw new InvalidArgumentException("group is null");
+        }
+
+        if (!isUpdate)
+        {
+            String groupId = group.getId();
+            if (groupId == null || groupId.isEmpty())
+            {
+                throw new InvalidArgumentException("groupId is null or empty");
+            }
+
+            if (groupAuthorityExists(groupId))
+            {
+                throw new ConstraintViolatedException("Group '" + group.getId() + "' already exists.");
+            }
+        }
+        else
+        {
+            if (group.wasSet(Group.ID))
+            {
+                throw new InvalidArgumentException("Group update does not support field: id");
+            }
+
+            if (group.wasSet(Group.IS_ROOT))
+            {
+                throw new InvalidArgumentException("Group update does not support field: isRoot");
+            }
+
+            if (group.wasSet(Group.PARENT_IDS))
+            {
+                throw new InvalidArgumentException("Group update does not support field: parentIds");
+            }
+
+            if (group.wasSet(Group.ZONES))
+            {
+                throw new InvalidArgumentException("Group update does not support field: zones");
+            }
+        }
+    }
+
+    private void validateGroupMember(GroupMember groupMember)
+    {
+        if (groupMember == null)
+        {
+            throw new InvalidArgumentException("group member is null");
+        }
+
+        if (groupMember.getId() == null || groupMember.getId().isEmpty())
+        {
+            throw new InvalidArgumentException("group member Id is null or empty");
+        }
+
+        if (groupMember.getMemberType() == null || groupMember.getMemberType().isEmpty())
+        {
+            throw new InvalidArgumentException("group member type is null or empty");
+        }
+    }
+
+    private boolean groupAuthorityExists(String authorityName)
+    {
+        return groupAuthorityExists(authorityName, true);
+    }
+
+    private boolean groupAuthorityExists(String authorityName, boolean inferPrefix)
+    {
+        return authorityExists(AuthorityType.GROUP, authorityName, inferPrefix);
+    }
+
+    private boolean personAuthorityExists(String authorityName)
+    {
+        return authorityExists(AuthorityType.USER, authorityName, false);
+    }
+
+    private boolean authorityExists(AuthorityType authorityType, String authorityName, boolean inferPrefix)
+    {
+        String name = inferPrefix ? authorityService.getName(authorityType, authorityName) : authorityName;
+
+        return (name != null && authorityService.authorityExists(name));
+    }
+
+    private boolean isGroupAuthority(String authorityName)
+    {
+        AuthorityType authorityType = AuthorityType.getAuthorityType(authorityName);
+        return AuthorityType.GROUP.equals(authorityType) || AuthorityType.EVERYONE.equals(authorityType);
+    }
+
+    private static class GroupsQueryWalker extends MapBasedQueryWalker
+    {
+        private List<String> zones;
+
+        public GroupsQueryWalker()
+        {
+            super(LIST_GROUPS_EQUALS_QUERY_PROPERTIES, null);
+        }
+
+        @Override
+        public void and()
+        {
+            // allow AND, e.g. isRoot=true AND zones in ('BLAH')
+        }
+
+        @Override
+        public void in(String propertyName, boolean negated, String... propertyValues)
+        {
+            if (propertyName.equalsIgnoreCase("zones"))
+            {
+                zones = Arrays.asList(propertyValues);
+            }
+        }
+
+        /**
+         * The list of zones specified in the where clause.
+         *
+         * @return The zones list if specified, or null if not.
+         */
+        public List<String> getZones()
+        {
+            return zones;
+        }
+
+        /**
+         * Get the value of the isRoot clause, if specified.
+         *
+         * @return The isRoot param if specified, null if not.
+         */
+        public Boolean getIsRoot()
+        {
+            return getProperty(PARAM_IS_ROOT, WhereClauseParser.EQUALS, Boolean.class);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/LegacyExceptionHandler.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/LegacyExceptionHandler.java
new file mode 100644
index 00000000000..32a1b675227
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/LegacyExceptionHandler.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+
+/**
+ * Translates access denied exceptions from the service layer to API permission denied exception.
+ * 
+ * @author steveglover
+ *
+ */
+public class LegacyExceptionHandler implements ExceptionHandler
+{
+	@Override
+	public boolean handle(Throwable t)
+	{
+		if(t instanceof AccessDeniedException)
+		{
+			// Note: security, no message to indicate why
+			throw new PermissionDeniedException();
+		}
+		return false;
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/NetworksImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/NetworksImpl.java
new file mode 100644
index 00000000000..1e48a299a59
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/NetworksImpl.java
@@ -0,0 +1,112 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.tenant.NetworksService;
+import org.alfresco.rest.api.Networks;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.model.Network;
+import org.alfresco.rest.api.model.NetworkImpl;
+import org.alfresco.rest.api.model.PersonNetwork;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+
+/**
+ * Centralises access to network services and maps between representations.
+ * 
+ * @author steveglover
+ * @since publicapi1.0
+ */
+public class NetworksImpl implements Networks
+{
+	private People people;
+	private NetworksService networksService;
+	
+	public void setPeople(People people)
+	{
+		this.people = people;
+	}
+
+	public void setNetworksService(NetworksService networksService)
+	{
+		this.networksService = networksService;
+	}
+
+	public Network validateNetwork(String networkId)
+    {
+		org.alfresco.repo.tenant.Network network = networksService.getNetwork(networkId);
+		if(network == null)
+		{
+			throw new EntityNotFoundException(networkId);
+		}
+		Network restNetwork = new NetworkImpl(network);
+		return restNetwork;
+    }
+	
+    private PersonNetwork getPersonNetwork(org.alfresco.repo.tenant.Network network)
+    {
+		Network restNetwork = new NetworkImpl(network);
+		PersonNetwork personNetwork = new PersonNetwork(network.getIsHomeNetwork(), restNetwork);
+		return personNetwork;
+    }
+    
+    public Network getNetwork(String networkId)
+    {
+    	Network network = validateNetwork(networkId);
+    	return network;
+    }
+    
+    public PersonNetwork getNetwork(String personId, String networkId)
+    {
+    	// check that personId is the current user
+    	personId = people.validatePerson(personId, true);
+    	Network network = validateNetwork(networkId);
+
+    	org.alfresco.repo.tenant.Network tenantNetwork = networksService.getNetwork(network.getId());
+		PersonNetwork personNetwork = getPersonNetwork(tenantNetwork);
+		return personNetwork;
+    }
+
+	public CollectionWithPagingInfo<PersonNetwork> getNetworks(String personId, Paging paging)
+    {
+    	// check that personId is the current user
+    	personId = people.validatePerson(personId, true);
+
+    	PagingResults<org.alfresco.repo.tenant.Network> networks = networksService.getNetworks(Util.getPagingRequest(paging));
+    	List<PersonNetwork> ret = new ArrayList<PersonNetwork>(networks.getPage().size());
+    	for(org.alfresco.repo.tenant.Network network : networks.getPage())
+		{
+    		PersonNetwork personNetwork = getPersonNetwork(network);
+    		ret.add(personNetwork);
+		}
+    	return CollectionWithPagingInfo.asPaged(paging, ret, networks.hasMoreItems(), networks.getTotalResultCount().getFirst());
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/NodeDefinitionMapperImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/NodeDefinitionMapperImpl.java
new file mode 100644
index 00000000000..edc477e1268
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/NodeDefinitionMapperImpl.java
@@ -0,0 +1,124 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.rest.api.NodeDefinitionMapper;
+import org.alfresco.rest.api.model.NodeDefinitionConstraint;
+import org.alfresco.rest.api.model.NodeDefinition;
+import org.alfresco.rest.api.model.NodeDefinitionProperty;
+import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.i18n.MessageLookup;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+/**
+ * Maps representations from TypeDefinition to NodeDefinition
+ *
+ * @author gfertuso
+ */
+public class NodeDefinitionMapperImpl implements NodeDefinitionMapper 
+{
+
+    private final List<String> EXCLUDED_NS = Arrays.asList(NamespaceService.SYSTEM_MODEL_1_0_URI);
+    private static final List<QName> EXCLUDED_PROPS = Arrays.asList(ContentModel.PROP_CONTENT);
+
+    @Override
+    public NodeDefinition fromTypeDefinition(TypeDefinition typeDefinition,
+            MessageLookup messageLookup) 
+    {
+        
+        if (typeDefinition == null)
+        {
+            throw new AlfrescoRuntimeException("Undefined definition for the node");
+        }
+        NodeDefinition nodeDefinition = new NodeDefinition();
+        nodeDefinition.setProperties(getProperties(typeDefinition.getProperties(), messageLookup));
+        
+        return nodeDefinition;
+    }
+
+    private boolean isPropertyExcluded(QName propertyName) 
+    {
+        return EXCLUDED_NS.contains(propertyName.getNamespaceURI()) || EXCLUDED_PROPS.contains(propertyName);
+    }
+
+    private List <NodeDefinitionProperty> getProperties(Map<QName, PropertyDefinition> propertiesMap, MessageLookup messageLookup)
+    {
+        return propertiesMap.values().stream()
+                .filter(p -> !isPropertyExcluded(p.getName()))
+                .map(p -> fromPropertyDefinitionToProperty(p , messageLookup))
+                .collect(Collectors.toList());
+    }
+    
+    private NodeDefinitionProperty fromPropertyDefinitionToProperty(PropertyDefinition propertyDefinition,
+            MessageLookup messageLookup)
+    {
+        NodeDefinitionProperty property = new NodeDefinitionProperty();
+        property.setId(propertyDefinition.getName().toPrefixString());
+        property.setTitle(propertyDefinition.getTitle(messageLookup));
+        property.setDescription(propertyDefinition.getDescription(messageLookup));
+        property.setDefaultValue(propertyDefinition.getDefaultValue());
+        property.setDataType(propertyDefinition.getDataType().getName().toPrefixString());
+        property.setIsMultiValued(propertyDefinition.isMultiValued());
+        property.setIsMandatory(propertyDefinition.isMandatory());
+        property.setIsMandatoryEnforced(propertyDefinition.isMandatoryEnforced());
+        property.setIsProtected(propertyDefinition.isProtected());
+        property.setConstraints(getConstraints(propertyDefinition.getConstraints(), messageLookup));
+       
+        return property;
+    }
+    
+    private List<NodeDefinitionConstraint> getConstraints( Collection<ConstraintDefinition> constraintDefinitions,
+            MessageLookup messageLookup)
+    {
+
+        return constraintDefinitions.stream()
+                .filter(constraint -> constraint.getConstraint() != null)
+                .map(constraint -> fromConstraintDefinitionToConstraint(constraint, messageLookup))
+                .collect(Collectors.toList());
+    }
+
+    private NodeDefinitionConstraint fromConstraintDefinitionToConstraint(ConstraintDefinition constraintDefinition, 
+            MessageLookup messageLookup) 
+    {
+        NodeDefinitionConstraint constraint = new NodeDefinitionConstraint();
+        constraint.setId(constraintDefinition.getConstraint().getShortName());
+        constraint.setType(constraintDefinition.getConstraint().getType());
+        constraint.setTitle(constraintDefinition.getTitle(messageLookup));
+        constraint.setDescription(constraintDefinition.getDescription(messageLookup));
+        constraint.setParameters(constraintDefinition.getConstraint().getParameters());
+        return constraint;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/NodeRatingsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/NodeRatingsImpl.java
new file mode 100644
index 00000000000..27256ae15ea
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/NodeRatingsImpl.java
@@ -0,0 +1,160 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.alfresco.rest.api.NodeRatings;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.impl.node.ratings.RatingScheme;
+import org.alfresco.rest.api.model.NodeRating;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.service.cmr.rating.RatingService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.util.TypeConstraint;
+import org.alfresco.util.registry.NamedObjectRegistry;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Centralises access to node ratings services and maps between representations.
+ * 
+ * @author steveglover
+ * @since publicapi1.0
+ */
+public class NodeRatingsImpl implements NodeRatings
+{
+    private static Log logger = LogFactory.getLog(NodeRatingsImpl.class);  
+
+	private Nodes nodes;
+	private RatingService ratingService;
+	private NamedObjectRegistry<RatingScheme> nodeRatingSchemeRegistry;
+    private TypeConstraint typeConstraint;
+
+	public void setTypeConstraint(TypeConstraint typeConstraint)
+	{
+		this.typeConstraint = typeConstraint;
+	}
+
+	public void setRatingService(RatingService ratingService)
+    {
+		this.ratingService = ratingService;
+	}
+
+	public void setNodes(Nodes nodes) 
+    {
+		this.nodes = nodes;
+	}
+
+	public void setNodeRatingSchemeRegistry(NamedObjectRegistry<RatingScheme> nodeRatingSchemeRegistry)
+    {
+		this.nodeRatingSchemeRegistry = nodeRatingSchemeRegistry;
+	}
+
+	public RatingScheme validateRatingScheme(String ratingSchemeId)
+	{
+		RatingScheme ratingScheme = nodeRatingSchemeRegistry.getNamedObject(ratingSchemeId);
+		if(ratingScheme == null)
+		{
+			throw new InvalidArgumentException("Invalid ratingSchemeId " + ratingSchemeId);
+		}
+
+		return ratingScheme;
+	}
+	
+	// TODO deal with fractional ratings - InvalidArgumentException
+	public NodeRating getNodeRating(String nodeId, String ratingSchemeId)
+	{
+		NodeRef nodeRef = nodes.validateNode(nodeId);
+		RatingScheme ratingScheme = validateRatingScheme(ratingSchemeId);
+		return ratingScheme.getNodeRating(nodeRef);
+	}
+
+	public CollectionWithPagingInfo<NodeRating> getNodeRatings(String nodeId, Paging paging)
+	{
+		NodeRef nodeRef = nodes.validateNode(nodeId);
+		Set<String> schemes = new TreeSet<String>(ratingService.getRatingSchemes().keySet());
+		Iterator<String> it = schemes.iterator();
+
+		int skipCount = paging.getSkipCount();
+		int maxItems = paging.getMaxItems();
+		int totalSize = schemes.size();
+		int count = 0;
+		
+		int end = skipCount + maxItems;
+		if(end < 0)
+		{
+			// overflow
+			end = Integer.MAX_VALUE;
+		}
+		List<NodeRating> ratings = new ArrayList<NodeRating>(totalSize);
+
+		for(int i = 0; i < end && it.hasNext(); i++)
+		{
+			String schemeName = it.next();
+			if(i < skipCount)
+			{
+				continue;
+			}
+			count++;
+        	RatingScheme ratingScheme = validateRatingScheme(schemeName);
+    		NodeRating nodeRating = ratingScheme.getNodeRating(nodeRef);
+            ratings.add(nodeRating);
+		}
+
+		boolean hasMoreItems = (skipCount + count < totalSize);
+
+        return CollectionWithPagingInfo.asPaged(paging, ratings, hasMoreItems, totalSize);
+	}
+
+	public void addRating(String nodeId, String ratingSchemeId, Object rating)
+	{
+		NodeRef nodeRef = nodes.validateNode(nodeId);
+		
+		RatingScheme ratingScheme = validateRatingScheme(ratingSchemeId);
+
+		if(!typeConstraint.matches(nodeRef))
+		{
+			throw new UnsupportedResourceOperationException("Cannot rate this node");
+		}
+
+		ratingScheme.applyRating(nodeRef, rating);
+	}
+
+	public void removeRating(String nodeId, String ratingSchemeId)
+	{
+		RatingScheme ratingScheme = validateRatingScheme(ratingSchemeId);
+		NodeRef nodeRef = nodes.validateNode(nodeId);
+		ratingScheme.removeRating(nodeRef);
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/NodesImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/NodesImpl.java
new file mode 100644
index 00000000000..600c2763371
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/NodesImpl.java
@@ -0,0 +1,3693 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.nio.charset.Charset;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.alfresco.model.ApplicationModel;
+import org.alfresco.model.ContentModel;
+import org.alfresco.model.QuickShareModel;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.action.executer.ContentMetadataExtracter;
+import org.alfresco.repo.activities.ActivityType;
+import org.alfresco.repo.content.ContentLimitViolationException;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.domain.node.AuditablePropertiesEntity;
+import org.alfresco.repo.lock.mem.Lifetime;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.model.filefolder.FileFolderServiceImpl;
+import org.alfresco.repo.node.getchildren.FilterProp;
+import org.alfresco.repo.node.getchildren.FilterPropBoolean;
+import org.alfresco.repo.node.getchildren.GetChildrenCannedQuery;
+import org.alfresco.repo.node.integrity.IntegrityException;
+import org.alfresco.repo.policy.BehaviourFilter;
+import org.alfresco.repo.rendition2.RenditionDefinition2;
+import org.alfresco.repo.rendition2.RenditionDefinitionRegistry2;
+import org.alfresco.repo.rendition2.RenditionService2;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.version.VersionModel;
+import org.alfresco.repo.virtual.store.VirtualStore;
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.api.Activities;
+import org.alfresco.rest.api.NodeDefinitionMapper;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.QuickShareLinks;
+import org.alfresco.rest.api.model.AssocChild;
+import org.alfresco.rest.api.model.AssocTarget;
+import org.alfresco.rest.api.model.NodeDefinition;
+import org.alfresco.rest.api.model.Document;
+import org.alfresco.rest.api.model.Folder;
+import org.alfresco.rest.api.model.LockInfo;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.DirectAccessUrlRequest;
+import org.alfresco.rest.api.model.NodePermissions;
+import org.alfresco.rest.api.model.PathInfo;
+import org.alfresco.rest.api.model.PathInfo.ElementInfo;
+import org.alfresco.rest.api.model.QuickShareLink;
+import org.alfresco.rest.api.model.UserInfo;
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.DisabledServiceException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InsufficientStorageException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.core.exceptions.RequestEntityTooLargeException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedMediaTypeException;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.content.ContentInfoImpl;
+import org.alfresco.rest.framework.resource.content.NodeBinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.rest.framework.resource.parameters.where.Query;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.workflow.api.impl.MapBasedQueryWalker;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ActionDefinition;
+import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.activities.ActivitiesTransactionListener;
+import org.alfresco.service.cmr.activities.ActivityInfo;
+import org.alfresco.service.cmr.activities.ActivityPoster;
+import org.alfresco.service.cmr.dictionary.AspectDefinition;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.lock.NodeLockedException;
+import org.alfresco.service.cmr.model.FileExistsException;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.preference.PreferenceService;
+import org.alfresco.service.cmr.repository.AssociationExistsException;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.ContentIOException;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.DirectAccessUrl;
+import org.alfresco.service.cmr.repository.DuplicateChildNodeNameException;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.repository.Path.Element;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.AccessPermission;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.OwnableService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.thumbnail.ThumbnailService;
+import org.alfresco.service.cmr.usage.ContentQuotaException;
+import org.alfresco.service.cmr.version.VersionService;
+import org.alfresco.service.cmr.version.VersionType;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.alfresco.util.PropertyCheck;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.joda.time.DateTime;
+import org.springframework.dao.ConcurrencyFailureException;
+import org.springframework.extensions.surf.util.Content;
+import org.springframework.extensions.webscripts.servlet.FormData;
+
+/**
+ * Centralises access to file/folder/node services and maps between representations.
+ *
+ * Note:
+ * This class was originally used for returning some basic node info when listing Favourites.
+ *
+ * It has now been re-purposed and extended to implement the new Nodes (RESTful) API for
+ * managing files & folders, as well as custom node types.
+ * 
+ * @author steveglover
+ * @author janv
+ * @author Jamal Kaabi-Mofrad
+ * 
+ * @since publicapi1.0
+ */
+public class NodesImpl implements Nodes
+{
+    private static final Log logger = LogFactory.getLog(NodesImpl.class);
+
+    private enum Type
+    {
+        // Note: ordered
+        DOCUMENT, FOLDER
+    }
+
+    private NodeService nodeService;
+    private DictionaryService dictionaryService;
+    private FileFolderService fileFolderService;
+    private NamespaceService namespaceService;
+    private PermissionService permissionService;
+    private MimetypeService mimetypeService;
+    private ContentService contentService;
+    private ActionService actionService;
+    private VersionService versionService;
+    private PersonService personService;
+    private OwnableService ownableService;
+    private AuthorityService authorityService;
+    private ThumbnailService thumbnailService;
+    private RenditionService2 renditionService2;
+    private SiteService siteService;
+    private ActivityPoster poster;
+    private RetryingTransactionHelper retryingTransactionHelper;
+    private LockService lockService;
+    private VirtualStore smartStore; // note: remove as part of REPO-1173
+    private NodeDefinitionMapper nodeDefinitionMapper;
+
+    private enum Activity_Type
+    {
+        ADDED, UPDATED, DELETED, DOWNLOADED
+    }
+
+    private BehaviourFilter behaviourFilter;
+
+    // note: circular - Nodes/QuickShareLinks currently use each other (albeit for different methods)
+    private QuickShareLinks quickShareLinks;
+
+    private Repository repositoryHelper;
+    private ServiceRegistry sr;
+    private Set<String> defaultIgnoreTypesAndAspects;
+
+    // ignore types/aspects
+    private Set<QName> ignoreQNames;
+
+    private ConcurrentHashMap<String,NodeRef> ddCache = new ConcurrentHashMap<>();
+
+    private Set<String> nonAttachContentTypes = Collections.emptySet(); // pre-configured whitelist, eg. images & pdf
+
+    public void setNonAttachContentTypes(Set<String> nonAttachWhiteList)
+    {
+        this.nonAttachContentTypes = nonAttachWhiteList;
+    }
+
+    public void init()
+    {
+        PropertyCheck.mandatory(this, "serviceRegistry", sr);
+        PropertyCheck.mandatory(this, "behaviourFilter", behaviourFilter);
+        PropertyCheck.mandatory(this, "repositoryHelper", repositoryHelper);
+        PropertyCheck.mandatory(this, "quickShareLinks", quickShareLinks);
+        PropertyCheck.mandatory(this, "poster", poster);
+
+        this.namespaceService = sr.getNamespaceService();
+        this.fileFolderService = sr.getFileFolderService();
+        this.nodeService = sr.getNodeService();
+        this.permissionService = sr.getPermissionService();
+        this.dictionaryService = sr.getDictionaryService();
+        this.mimetypeService = sr.getMimetypeService();
+        this.contentService = sr.getContentService();
+        this.actionService = sr.getActionService();
+        this.versionService = sr.getVersionService();
+        this.personService = sr.getPersonService();
+        this.ownableService = sr.getOwnableService();
+        this.authorityService = sr.getAuthorityService();
+        this.thumbnailService = sr.getThumbnailService();
+        this.renditionService2 = sr.getRenditionService2();
+        this.siteService =  sr.getSiteService();
+        this.retryingTransactionHelper = sr.getRetryingTransactionHelper();
+        this.lockService = sr.getLockService();
+
+        if (defaultIgnoreTypesAndAspects != null)
+        {
+            ignoreQNames = new HashSet<>(defaultIgnoreTypesAndAspects.size());
+            for (String type : defaultIgnoreTypesAndAspects)
+            {
+                ignoreQNames.add(createQName(type));
+            }
+        }
+    }
+
+    public void setServiceRegistry(ServiceRegistry sr)
+    {
+        this.sr = sr;
+    }
+
+    public void setBehaviourFilter(BehaviourFilter behaviourFilter)
+    {
+        this.behaviourFilter = behaviourFilter;
+    }
+
+    public void setRepositoryHelper(Repository repositoryHelper)
+    {
+        this.repositoryHelper = repositoryHelper;
+    }
+
+    public void setQuickShareLinks(QuickShareLinks quickShareLinks)
+    {
+        this.quickShareLinks = quickShareLinks;
+    }
+
+    public void setIgnoreTypes(Set<String> ignoreTypesAndAspects)
+    {
+        this.defaultIgnoreTypesAndAspects = ignoreTypesAndAspects;
+    }
+
+    public void setPoster(ActivityPoster poster)
+    {
+        this.poster = poster;
+    }
+
+    public void setSmartStore(VirtualStore smartStore)
+    {
+        this.smartStore = smartStore;
+    }
+    
+    public void setNodeDefinitionMapper(NodeDefinitionMapper nodeDefinitionMapper)
+    {
+        this.nodeDefinitionMapper = nodeDefinitionMapper;
+    }
+
+    // excluded namespaces (aspects, properties, assoc types)
+    private static final List<String> EXCLUDED_NS = Arrays.asList(NamespaceService.SYSTEM_MODEL_1_0_URI);
+
+    // excluded aspects
+    private static final List<QName> EXCLUDED_ASPECTS = Arrays.asList();
+
+    // excluded properties
+    private static final List<QName> EXCLUDED_PROPS = Arrays.asList(
+            // top-level minimal info
+            ContentModel.PROP_NAME,
+            ContentModel.PROP_MODIFIER,
+            ContentModel.PROP_MODIFIED,
+            ContentModel.PROP_CREATOR,
+            ContentModel.PROP_CREATED,
+            ContentModel.PROP_CONTENT,
+            // other - TBC
+            ContentModel.PROP_INITIAL_VERSION,
+            ContentModel.PROP_AUTO_VERSION_PROPS,
+            ContentModel.PROP_AUTO_VERSION);
+
+    public static final List<QName> PROPS_USERLOOKUP = Arrays.asList(
+            ContentModel.PROP_CREATOR,
+            ContentModel.PROP_MODIFIER,
+            ContentModel.PROP_OWNER,
+            ContentModel.PROP_LOCK_OWNER,
+            ContentModel.PROP_WORKING_COPY_OWNER);
+
+    public final static Map<String,QName> PARAM_SYNONYMS_QNAME;
+    static
+    {
+        Map<String,QName> aMap = new HashMap<>(9);
+
+        aMap.put(PARAM_ISFOLDER, GetChildrenCannedQuery.SORT_QNAME_NODE_IS_FOLDER);
+        aMap.put(PARAM_NAME, ContentModel.PROP_NAME);
+        aMap.put(PARAM_CREATEDAT, ContentModel.PROP_CREATED);
+        aMap.put(PARAM_MODIFIEDAT, ContentModel.PROP_MODIFIED);
+        aMap.put(PARAM_CREATEBYUSER, ContentModel.PROP_CREATOR);
+        aMap.put(PARAM_MODIFIEDBYUSER, ContentModel.PROP_MODIFIER);
+        aMap.put(PARAM_MIMETYPE, GetChildrenCannedQuery.SORT_QNAME_CONTENT_MIMETYPE);
+        aMap.put(PARAM_SIZEINBYTES, GetChildrenCannedQuery.SORT_QNAME_CONTENT_SIZE);
+        aMap.put(PARAM_NODETYPE, GetChildrenCannedQuery.SORT_QNAME_NODE_TYPE);
+
+        PARAM_SYNONYMS_QNAME = Collections.unmodifiableMap(aMap);
+    }
+
+    // list children filtering (via where clause)
+    private final static Set<String> LIST_FOLDER_CHILDREN_EQUALS_QUERY_PROPERTIES =
+            new HashSet<>(Arrays.asList(new String[] {PARAM_ISFOLDER, PARAM_ISFILE, PARAM_NODETYPE, PARAM_ISPRIMARY, PARAM_ASSOC_TYPE}));
+
+    /*
+     * Validates that node exists.
+     *
+     * Note: assumes workspace://SpacesStore
+     */
+    @Override
+    public NodeRef validateNode(String nodeId)
+    {
+        //belts-and-braces
+        if (nodeId == null)
+        {
+            throw new InvalidArgumentException("Missing nodeId");
+        }
+
+        return validateNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+    }
+
+    @Override
+    public NodeRef validateNode(StoreRef storeRef, String nodeId)
+    {
+        String versionLabel = null;
+
+        int idx = nodeId.indexOf(";");
+        if (idx != -1)
+        {
+            versionLabel = nodeId.substring(idx + 1);
+            nodeId = nodeId.substring(0, idx);
+            if (versionLabel.equals("pwc"))
+            {
+                // TODO correct exception?
+                throw new EntityNotFoundException(nodeId);
+            }
+        }
+
+        NodeRef nodeRef = new NodeRef(storeRef, nodeId);
+        return validateNode(nodeRef);
+    }
+
+    @Override
+    public NodeRef validateNode(NodeRef nodeRef)
+    {
+        if (!nodeService.exists(nodeRef))
+        {
+            throw new EntityNotFoundException(nodeRef.getId());
+        }
+
+        return nodeRef;
+    }
+
+    /*
+     * Check that nodes exists and matches given expected/excluded type(s).
+     */
+    @Override
+    public boolean nodeMatches(NodeRef nodeRef, Set<QName> expectedTypes, Set<QName> excludedTypes)
+    {
+        return nodeMatches(nodeRef, expectedTypes, excludedTypes, true);
+    }
+
+    @Override
+    public boolean isSubClass(NodeRef nodeRef, QName ofClassQName, boolean validateNodeRef)
+    {
+        if (validateNodeRef)
+        {
+            nodeRef = validateNode(nodeRef);
+        }
+        return isSubClass(getNodeType(nodeRef), ofClassQName);
+    }
+
+    private boolean nodeMatches(NodeRef nodeRef, Set<QName> expectedTypes, Set<QName> excludedTypes, boolean existsCheck)
+    {
+        if (existsCheck && (! nodeService.exists(nodeRef)))
+        {
+            throw new EntityNotFoundException(nodeRef.getId());
+        }
+
+        return typeMatches(getNodeType(nodeRef), expectedTypes, excludedTypes);
+    }
+
+    private QName getNodeType(NodeRef nodeRef)
+    {
+        return nodeService.getType(nodeRef);
+    }
+
+    private boolean isSubClass(QName className, QName ofClassQName)
+    {
+        return dictionaryService.isSubClass(className, ofClassQName);
+    }
+
+    protected boolean typeMatches(QName type, Set<QName> expectedTypes, Set<QName> excludedTypes)
+    {
+        if (((expectedTypes != null) && (expectedTypes.size() == 1)) &&
+            ((excludedTypes == null) || (excludedTypes.size() == 0)))
+        {
+            // use isSubClass if checking against single expected type (and no excluded types)
+            return isSubClass(type, expectedTypes.iterator().next());
+        }
+
+        Set<QName> allExpectedTypes = new HashSet<>();
+        if (expectedTypes != null)
+        {
+            for (QName expectedType : expectedTypes)
+            {
+                allExpectedTypes.addAll(dictionaryService.getSubTypes(expectedType, true));
+            }
+        }
+
+        Set<QName> allExcludedTypes = new HashSet<>();
+        if (excludedTypes != null)
+        {
+            for (QName excludedType : excludedTypes)
+            {
+                allExcludedTypes.addAll(dictionaryService.getSubTypes(excludedType, true));
+            }
+        }
+
+        boolean inExpected = allExpectedTypes.contains(type);
+        boolean excluded = allExcludedTypes.contains(type);
+        return (inExpected && !excluded);
+    }
+
+    /**
+     * @deprecated review usage (backward compat')
+     */
+    @Override
+    public Node getNode(String nodeId)
+    {
+        NodeRef nodeRef = validateNode(nodeId);
+
+        return new Node(nodeRef, null, nodeService.getProperties(nodeRef), null, sr);
+    }
+
+    /**
+     * @deprecated review usage (backward compat')
+     */
+    public Node getNode(NodeRef nodeRef)
+    {
+        return new Node(nodeRef, null, nodeService.getProperties(nodeRef), null, sr);
+    }
+
+    private Type getType(NodeRef nodeRef)
+    {
+        return getType(getNodeType(nodeRef), nodeRef);
+    }
+
+    private Type getType(QName typeQName, NodeRef nodeRef)
+    {
+        // quick check for common types
+        if (typeQName.equals(ContentModel.TYPE_FOLDER) || typeQName.equals(ApplicationModel.TYPE_FOLDERLINK))
+        {
+            return Type.FOLDER;
+        }
+        else if (typeQName.equals(ContentModel.TYPE_CONTENT) || typeQName.equals(ApplicationModel.TYPE_FILELINK))
+        {
+            return Type.DOCUMENT;
+        }
+
+        // further checks
+
+        if (isSubClass(typeQName, ContentModel.TYPE_LINK))
+        {
+            if (isSubClass(typeQName, ApplicationModel.TYPE_FOLDERLINK))
+            {
+                return Type.FOLDER;
+            }
+            else if (isSubClass(typeQName, ApplicationModel.TYPE_FILELINK))
+            {
+                return Type.DOCUMENT;
+            }
+
+            NodeRef linkNodeRef = (NodeRef)nodeService.getProperty(nodeRef, ContentModel.PROP_LINK_DESTINATION);
+            if (linkNodeRef != null)
+            {
+                try
+                {
+                    typeQName = getNodeType(linkNodeRef);
+                    // drop-through to check type of destination
+                    // note: edge-case - if link points to another link then we will return null
+                }
+                catch (InvalidNodeRefException inre)
+                {
+                    // ignore
+                }
+            }
+        }
+
+        if (isSubClass(typeQName, ContentModel.TYPE_FOLDER))
+        {
+            if (! isSubClass(typeQName, ContentModel.TYPE_SYSTEM_FOLDER))
+            {
+                return Type.FOLDER;
+            }
+            return null; // unknown
+        }
+        else if (isSubClass(typeQName, ContentModel.TYPE_CONTENT))
+        {
+            return Type.DOCUMENT;
+        }
+
+        return null; // unknown
+    }
+
+    /**
+     * @deprecated note: currently required for backwards compat' (Favourites API)
+     */
+    @Override
+    public Document getDocument(NodeRef nodeRef)
+    {
+        Type type = getType(nodeRef);
+        if ((type != null) && type.equals(Type.DOCUMENT))
+        {
+            Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
+
+            Document doc = new Document(nodeRef, getParentNodeRef(nodeRef), properties, null, sr);
+
+            doc.setVersionLabel((String) properties.get(ContentModel.PROP_VERSION_LABEL));
+            ContentData cd = (ContentData) properties.get(ContentModel.PROP_CONTENT);
+            if (cd != null)
+            {
+                doc.setSizeInBytes(BigInteger.valueOf(cd.getSize()));
+                doc.setMimeType((cd.getMimetype()));
+            }
+
+            setCommonProps(doc, nodeRef, properties);
+            return doc;
+        }
+        else
+        {
+            throw new InvalidArgumentException("Node is not a file: "+nodeRef.getId());
+        }
+    }
+
+    private void setCommonProps(Node node, NodeRef nodeRef, Map<QName,Serializable> properties)
+    {
+        node.setGuid(nodeRef);
+        node.setTitle((String)properties.get(ContentModel.PROP_TITLE));
+        node.setDescription((String)properties.get(ContentModel.PROP_DESCRIPTION));
+        node.setModifiedBy((String)properties.get(ContentModel.PROP_MODIFIER));
+        node.setCreatedBy((String)properties.get(ContentModel.PROP_CREATOR));
+    }
+
+    /**
+     * @deprecated note: currently required for backwards compat' (Favourites API)
+     */
+    @Override
+    public Folder getFolder(NodeRef nodeRef)
+    {
+        Type type = getType(nodeRef);
+        if ((type != null) && type.equals(Type.FOLDER))
+        {
+            Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
+
+            Folder folder = new Folder(nodeRef, getParentNodeRef(nodeRef), properties, null, sr);
+            setCommonProps(folder, nodeRef, properties);
+            return folder;
+        }
+        else
+        {
+            throw new InvalidArgumentException("Node is not a folder: "+nodeRef.getId());
+        }
+    }
+
+    private NodeRef getParentNodeRef(NodeRef nodeRef)
+    {
+        if (repositoryHelper.getCompanyHome().equals(nodeRef))
+        {
+            return null; // note: does not make sense to return parent above C/H
+        }
+
+        return nodeService.getPrimaryParent(nodeRef).getParentRef();
+    }
+
+    public NodeRef validateOrLookupNode(String nodeId, String path)
+    {
+        NodeRef parentNodeRef;
+
+        if ((nodeId == null) || (nodeId.isEmpty()))
+        {
+            throw new InvalidArgumentException("Missing nodeId");
+        }
+
+        if (nodeId.equals(PATH_ROOT))
+        {
+            parentNodeRef = repositoryHelper.getCompanyHome();
+        }
+        else if (nodeId.equals(PATH_SHARED))
+        {
+            parentNodeRef = repositoryHelper.getSharedHome();
+        }
+        else if (nodeId.equals(PATH_MY))
+        {
+            NodeRef person = repositoryHelper.getPerson();
+            if (person == null)
+            {
+                throw new InvalidArgumentException("Unexpected - cannot use: " + PATH_MY);
+            }
+            parentNodeRef = repositoryHelper.getUserHome(person);
+            if (parentNodeRef == null)
+            {
+                throw new EntityNotFoundException(nodeId);
+            }
+        }
+        else
+        {
+            parentNodeRef = validateNode(nodeId);
+        }
+
+        if (path != null)
+        {
+            // check that parent is a folder before resolving relative path
+            if (! nodeMatches(parentNodeRef, Collections.singleton(ContentModel.TYPE_FOLDER), null, false))
+            {
+                throw new InvalidArgumentException("NodeId of folder is expected: "+parentNodeRef.getId());
+            }
+
+            // resolve path relative to current nodeId
+            parentNodeRef = resolveNodeByPath(parentNodeRef, path, true);
+        }
+
+        return parentNodeRef;
+    }
+
+    protected NodeRef resolveNodeByPath(final NodeRef parentNodeRef, String path, boolean checkForCompanyHome)
+    {
+        final List<String> pathElements = getPathElements(path);
+
+        if (!pathElements.isEmpty() && checkForCompanyHome)
+        {
+            /*
+            if (nodeService.getRootNode(parentNodeRef.getStoreRef()).equals(parentNodeRef))
+            {
+                // special case
+                NodeRef chNodeRef = repositoryHelper.getCompanyHome();
+                String chName = (String) nodeService.getProperty(chNodeRef, ContentModel.PROP_NAME);
+                if (chName.equals(pathElements.get(0)))
+                {
+                    pathElements = pathElements.subList(1, pathElements.size());
+                    parentNodeRef = chNodeRef;
+                }
+            }
+            */
+        }
+
+        FileInfo fileInfo = null;
+        try
+        {
+            if (!pathElements.isEmpty())
+            {
+                fileInfo = fileFolderService.resolveNamePath(parentNodeRef, pathElements);
+            }
+            else
+            {
+                fileInfo = fileFolderService.getFileInfo(parentNodeRef);
+                if (fileInfo == null)
+                {
+                    throw new EntityNotFoundException(parentNodeRef.getId());
+                }
+            }
+        }
+        catch (FileNotFoundException fnfe)
+        {
+            // convert checked exception
+            throw new NotFoundException("The entity with relativePath: " + path + " was not found.");
+        }
+        catch (AccessDeniedException ade)
+        {
+            // return 404 instead of 403 (as per security review - uuid vs path)
+            throw new NotFoundException("The entity with relativePath: " + path + " was not found.");
+        }
+
+        return fileInfo.getNodeRef();
+    }
+
+    private List<String> getPathElements(String path)
+    {
+        final List<String> pathElements = new ArrayList<>();
+        if (path != null && path.trim().length() > 0)
+        {
+            // There is no need to check for leading and trailing "/"
+            final StringTokenizer tokenizer = new StringTokenizer(path, "/");
+            while (tokenizer.hasMoreTokens())
+            {
+                pathElements.add(tokenizer.nextToken().trim());
+            }
+        }
+        return pathElements;
+    }
+
+    private NodeRef makeFolders(NodeRef parentNodeRef, List<String> pathElements)
+    {
+        NodeRef currentParentRef = parentNodeRef;
+        // just loop and create if necessary
+        for (final String element : pathElements)
+        {
+            final NodeRef contextNodeRef = currentParentRef;
+            // does it exist?
+            // Navigation should not check permissions
+            NodeRef nodeRef = AuthenticationUtil.runAs(new RunAsWork<NodeRef>()
+            {
+                @Override
+                public NodeRef doWork() throws Exception
+                {
+                    return nodeService.getChildByName(contextNodeRef, ContentModel.ASSOC_CONTAINS, element);
+                }
+            }, AuthenticationUtil.getSystemUserName());
+
+            if (nodeRef == null)
+            {
+                try
+                {
+                    // Checks for create permissions as the fileFolderService is a public service.
+                    FileInfo createdFileInfo = fileFolderService.create(currentParentRef, element, ContentModel.TYPE_FOLDER);
+                    currentParentRef = createdFileInfo.getNodeRef();
+                }
+                catch (AccessDeniedException ade)
+                {
+                    throw new PermissionDeniedException(ade.getMessage());
+                }
+                catch (FileExistsException fex)
+                {
+                    // Assume concurrency failure, so retry
+                    throw new ConcurrencyFailureException(fex.getMessage());
+                }
+            }
+            else if (!isSubClass(nodeRef, ContentModel.TYPE_FOLDER, false))
+            {
+                String parentName = (String) nodeService.getProperty(contextNodeRef, ContentModel.PROP_NAME);
+                throw new ConstraintViolatedException("Name [" + element + "] already exists in the target parent: " + parentName);
+            }
+            else
+            {
+                // it exists
+                currentParentRef = nodeRef;
+            }
+        }
+        return currentParentRef;
+    }
+
+    @Override
+    public Node getFolderOrDocument(String nodeId, Parameters parameters)
+    {
+        String path = parameters.getParameter(PARAM_RELATIVE_PATH);
+        NodeRef nodeRef = validateOrLookupNode(nodeId, path);
+        Node node = getFolderOrDocumentFullInfo(nodeRef, null, null, parameters);
+        return node;
+
+    }
+
+    private Node getFolderOrDocumentFullInfo(NodeRef nodeRef, NodeRef parentNodeRef, QName nodeTypeQName, Parameters parameters)
+    {
+        return getFolderOrDocumentFullInfo(nodeRef, parentNodeRef, nodeTypeQName, parameters, null);
+    }
+
+    @Override
+    public Node getFolderOrDocumentFullInfo(NodeRef nodeRef, NodeRef parentNodeRef, QName nodeTypeQName, Parameters parameters, Map<String,UserInfo> mapUserInfo)
+    {
+        List<String> includeParam = new ArrayList<>();
+        if (parameters != null)
+        {
+            includeParam.addAll(parameters.getInclude());
+        }
+
+        // Add basic info for single get (above & beyond minimal that is used for listing collections)
+        includeParam.add(PARAM_INCLUDE_ASPECTNAMES);
+        includeParam.add(PARAM_INCLUDE_PROPERTIES);
+
+        return getFolderOrDocument(nodeRef, parentNodeRef, nodeTypeQName, includeParam, mapUserInfo);
+    }
+
+    @Override
+    public Node getFolderOrDocument(final NodeRef nodeRef, NodeRef parentNodeRef, QName nodeTypeQName, List<String> includeParam, Map<String, UserInfo> mapUserInfo)
+    {
+        if (mapUserInfo == null)
+        {
+            mapUserInfo = new HashMap<>(2);
+        }
+
+        if (includeParam == null)
+        {
+            includeParam = Collections.emptyList();
+        }
+
+        Node node;
+        Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
+
+        PathInfo pathInfo = null;
+        if (includeParam.contains(PARAM_INCLUDE_PATH))
+        {
+            ChildAssociationRef archivedParentAssoc = (ChildAssociationRef) properties.get(ContentModel.PROP_ARCHIVED_ORIGINAL_PARENT_ASSOC);
+            pathInfo = lookupPathInfo(nodeRef, archivedParentAssoc);
+        }
+
+        if (nodeTypeQName == null)
+        {
+            nodeTypeQName = getNodeType(nodeRef);
+        }
+
+        if (parentNodeRef == null)
+        {
+            parentNodeRef = getParentNodeRef(nodeRef);
+        }
+
+        Type type = getType(nodeTypeQName, nodeRef);
+
+        if (type == null)
+        {
+            // not direct folder (or file) ...
+            // might be sub-type of cm:cmobject (or a cm:link pointing to cm:cmobject or possibly even another cm:link)
+            node = new Node(nodeRef, parentNodeRef, properties, mapUserInfo, sr);
+            node.setIsFolder(false);
+            node.setIsFile(false);
+        }
+        else if (type.equals(Type.DOCUMENT))
+        {
+            node = new Document(nodeRef, parentNodeRef, properties, mapUserInfo, sr);
+        }
+        else if (type.equals(Type.FOLDER))
+        {
+            node = new Folder(nodeRef, parentNodeRef, properties, mapUserInfo, sr);
+        }
+        else
+        {
+            throw new RuntimeException("Unexpected - should not reach here: "+type);
+        }
+
+        if (includeParam.size() > 0)
+        {
+            node.setProperties(mapFromNodeProperties(properties, includeParam, mapUserInfo, EXCLUDED_NS, EXCLUDED_PROPS));
+        }
+
+        Set<QName> aspects = null;
+        if (includeParam.contains(PARAM_INCLUDE_ASPECTNAMES))
+        {
+            aspects = nodeService.getAspects(nodeRef);
+            node.setAspectNames(mapFromNodeAspects(aspects, EXCLUDED_NS, EXCLUDED_ASPECTS));
+        }
+
+        if (includeParam.contains(PARAM_INCLUDE_ISLINK))
+        {
+            boolean isLink = isSubClass(nodeTypeQName, ContentModel.TYPE_LINK);
+            node.setIsLink(isLink);
+        }
+
+        if (includeParam.contains(PARAM_INCLUDE_ISLOCKED))
+        {
+            boolean isLocked = isLocked(nodeRef, aspects);
+            node.setIsLocked(isLocked);
+        }
+
+        if (includeParam.contains(PARAM_INCLUDE_ISFAVORITE))
+        {
+            boolean isFavorite = isFavorite(nodeRef);
+            node.setIsFavorite(isFavorite);
+        }
+
+        if (includeParam.contains(PARAM_INCLUDE_ALLOWABLEOPERATIONS))
+        {
+            // note: refactor when requirements change
+            Map<String, String> mapPermsToOps = new HashMap<>(3);
+            mapPermsToOps.put(PermissionService.DELETE, OP_DELETE);
+            mapPermsToOps.put(PermissionService.ADD_CHILDREN, OP_CREATE);
+            mapPermsToOps.put(PermissionService.WRITE, OP_UPDATE);
+            mapPermsToOps.put(PermissionService.CHANGE_PERMISSIONS, OP_UPDATE_PERMISSIONS);
+            
+
+            List<String> allowableOperations = new ArrayList<>(3);
+            for (Entry<String, String> kv : mapPermsToOps.entrySet())
+            {
+                String perm = kv.getKey();
+                String op = kv.getValue();
+
+                if (perm.equals(PermissionService.ADD_CHILDREN) && Type.DOCUMENT.equals(type))
+                {
+                    // special case: do not return "create" (as an allowable op) for file/content types - note: 'type' can be null
+                    continue;
+                }
+                else if (perm.equals(PermissionService.DELETE) && (isSpecialNode(nodeRef, nodeTypeQName)))
+                {
+                    // special case: do not return "delete" (as an allowable op) for specific system nodes
+                    continue;
+                }
+                else if (permissionService.hasPermission(nodeRef, perm) == AccessStatus.ALLOWED)
+                {
+                    allowableOperations.add(op);
+                }
+            }
+
+            node.setAllowableOperations((allowableOperations.size() > 0 )? allowableOperations : null);
+        }
+
+        if (includeParam.contains(PARAM_INCLUDE_PERMISSIONS))
+        {
+            Boolean inherit = permissionService.getInheritParentPermissions(nodeRef);
+
+            List<NodePermissions.NodePermission> inheritedPerms = new ArrayList<>(5);
+            List<NodePermissions.NodePermission> setDirectlyPerms = new ArrayList<>(5);
+            Set<String> settablePerms = null;
+            boolean allowRetrievePermission = true;
+
+            try
+            {
+                for (AccessPermission accessPerm : permissionService.getAllSetPermissions(nodeRef))
+                {
+                    NodePermissions.NodePermission nodePerm = new NodePermissions.NodePermission(accessPerm.getAuthority(), accessPerm.getPermission(), accessPerm.getAccessStatus().toString());
+                    if (accessPerm.isSetDirectly())
+                    {
+                        setDirectlyPerms.add(nodePerm);
+                    } else
+                    {
+                        inheritedPerms.add(nodePerm);
+                    }
+                }
+
+                settablePerms = permissionService.getSettablePermissions(nodeRef);
+            }
+            catch (AccessDeniedException ade)
+            {
+                // ignore - ie. denied access to retrieve permissions, eg. non-admin on root (Company Home)
+                allowRetrievePermission = false;
+            }
+
+            // If the user does not have read permissions at
+            // least on a special node then do not include permissions and
+            // returned only node info that he's allowed to see
+            if (allowRetrievePermission)
+            {
+                NodePermissions nodePerms = new NodePermissions(inherit, inheritedPerms, setDirectlyPerms, settablePerms);
+                node.setPermissions(nodePerms);
+            }
+        }
+
+        if (includeParam.contains(PARAM_INCLUDE_ASSOCIATION))
+        {
+            // Ugh ... can we optimise this and return the actual assoc directly (via FileFolderService/GetChildrenCQ) ?
+            ChildAssociationRef parentAssocRef = nodeService.getPrimaryParent(nodeRef);
+
+            // note: parentAssocRef.parentRef can be null for -root- node !
+            if ((parentAssocRef == null) || (parentAssocRef.getParentRef() == null) || (! parentAssocRef.getParentRef().equals(parentNodeRef)))
+            {
+                List<ChildAssociationRef> parentAssocRefs = nodeService.getParentAssocs(nodeRef);
+                for (ChildAssociationRef pAssocRef : parentAssocRefs)
+                {
+                    if (pAssocRef.getParentRef().equals(parentNodeRef))
+                    {
+                        // for now, assume same parent/child cannot appear more than once (due to unique name)
+                        parentAssocRef = pAssocRef;
+                        break;
+                    }
+                }
+            }
+
+            if (parentAssocRef != null)
+            {
+                QName assocTypeQName = parentAssocRef.getTypeQName();
+                if ((assocTypeQName != null) && (! EXCLUDED_NS.contains(assocTypeQName.getNamespaceURI())))
+                {
+                    AssocChild childAssoc = new AssocChild(
+                            assocTypeQName.toPrefixString(namespaceService),
+                            parentAssocRef.isPrimary());
+
+                    node.setAssociation(childAssoc);
+                }
+            }
+        }
+
+        if (includeParam.contains(PARAM_INCLUDE_DEFINITION)) 
+        {
+            NodeDefinition nodeDefinition = nodeDefinitionMapper.fromTypeDefinition(getTypeDefinition(nodeRef), dictionaryService);
+            node.setDefinition(nodeDefinition);
+        }
+
+        node.setNodeType(nodeTypeQName.toPrefixString(namespaceService));
+        node.setPath(pathInfo);
+
+        return node;
+    }
+
+    private TypeDefinition getTypeDefinition(NodeRef nodeRef)
+    {
+        QName type = nodeService.getType(nodeRef);
+        Set<QName> aspectNames = nodeService.getAspects(nodeRef);
+        TypeDefinition typeDefinition = dictionaryService.getAnonymousType(type, aspectNames);
+        return typeDefinition;
+    }
+
+    @Override
+    public PathInfo lookupPathInfo(NodeRef nodeRefIn, ChildAssociationRef archivedParentAssoc)
+    {
+
+        List<ElementInfo> pathElements = new ArrayList<>();
+        Boolean isComplete = Boolean.TRUE;
+        final Path nodePath;
+        final int pathIndex;
+
+        if (archivedParentAssoc != null)
+        {
+            if (permissionService.hasPermission(archivedParentAssoc.getParentRef(), PermissionService.READ).equals(AccessStatus.ALLOWED)
+                    && nodeService.exists(archivedParentAssoc.getParentRef()))
+            {
+                nodePath = nodeService.getPath(archivedParentAssoc.getParentRef());
+                pathIndex = 1;// 1 => we want to include the given node in the path as well.
+            }
+            else
+            {
+                //We can't return a valid path
+                return null;
+            }
+        }
+        else
+        {
+            nodePath = nodeService.getPath(nodeRefIn);
+            pathIndex = 2; // 2 => as we don't want to include the given node in the path as well.
+        }
+
+        for (int i = nodePath.size() - pathIndex; i >= 0; i--)
+        {
+            Element element = nodePath.get(i);
+            if (element instanceof Path.ChildAssocElement)
+            {
+                ChildAssociationRef elementRef = ((Path.ChildAssocElement) element).getRef();
+                if (elementRef.getParentRef() != null)
+                {
+                    NodeRef childNodeRef = elementRef.getChildRef();
+                    if (permissionService.hasPermission(childNodeRef, PermissionService.READ) == AccessStatus.ALLOWED)
+                    {
+                        Serializable nameProp = nodeService.getProperty(childNodeRef, ContentModel.PROP_NAME);
+                        String type = getNodeType(childNodeRef).toPrefixString(namespaceService);
+                        Set<QName> aspects = nodeService.getAspects(childNodeRef);
+                        List<String> aspectNames = mapFromNodeAspects(aspects, EXCLUDED_NS, EXCLUDED_ASPECTS);
+                        pathElements.add(0, new ElementInfo(childNodeRef.getId(), nameProp.toString(), type, aspectNames));
+                    }
+                    else
+                    {
+                        // Just return the pathInfo up to the location where the user has access
+                        isComplete = Boolean.FALSE;
+                        break;
+                    }
+                }
+            }
+        }
+
+        String pathStr = null;
+        if (pathElements.size() > 0)
+        {
+            StringBuilder sb = new StringBuilder(120);
+            for (PathInfo.ElementInfo e : pathElements)
+            {
+                sb.append("/").append(e.getName());
+            }
+            pathStr = sb.toString();
+        }
+        else
+        {
+            // There is no path element, so set it to null in order to be
+            // ignored by Jackson during serialisation
+            isComplete = null;
+        }
+        return new PathInfo(pathStr, isComplete, pathElements);
+    }
+
+    public Set<QName> mapToNodeAspects(List<String> aspectNames)
+    {
+        Set<QName> nodeAspects = new HashSet<>(aspectNames.size());
+
+        for (String aspectName : aspectNames)
+        {
+            QName aspectQName = createQName(aspectName);
+
+            AspectDefinition ad = dictionaryService.getAspect(aspectQName);
+            if (ad != null)
+            {
+                nodeAspects.add(aspectQName);
+            }
+            else 
+            {
+                throw new InvalidArgumentException("Unknown aspect: " + aspectName);
+            }
+        }
+
+        return nodeAspects;
+    }
+
+    public Map<QName, Serializable> mapToNodeProperties(Map<String, Object> props)
+    {
+        Map<QName, Serializable> nodeProps = new HashMap<>(props.size());
+
+        for (Entry<String, Object> entry : props.entrySet())
+        {
+            String propName = entry.getKey();
+            QName propQName = createQName(propName);
+
+            PropertyDefinition pd = dictionaryService.getProperty(propQName);
+            if (pd != null)
+            {
+                Serializable value = null;
+                if (entry.getValue() != null)
+                {
+                    if (pd.getDataType().getName().equals(DataTypeDefinition.NODE_REF))
+                    {
+                        String nodeRefString = (String) entry.getValue();
+                        if (! NodeRef.isNodeRef(nodeRefString))
+                        {
+                            value = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeRefString);
+                        }
+                        else
+                        {
+                            value = new NodeRef(nodeRefString);
+                        }
+                    }
+                    else
+                    {
+                        value = (Serializable)entry.getValue();
+                    }
+                }
+                nodeProps.put(propQName, value);
+            }
+            else 
+            {
+                throw new InvalidArgumentException("Unknown property: " + propName);
+            }
+        }
+        return nodeProps;
+    }
+    
+    public Map<String, Object> mapFromNodeProperties(Map<QName, Serializable> nodeProps, List<String> selectParam, Map<String,UserInfo> mapUserInfo, List<String> excludedNS, List<QName> excludedProps)
+    {
+        List<QName> selectedProperties;
+
+        if ((selectParam.size() == 0) || selectParam.contains(PARAM_INCLUDE_PROPERTIES))
+        {
+            // return all properties
+            selectedProperties = new ArrayList<>(nodeProps.size());
+            for (QName propQName : nodeProps.keySet())
+            {
+                if ((! excludedNS.contains(propQName.getNamespaceURI())) && (! excludedProps.contains(propQName)))
+                {
+                    selectedProperties.add(propQName);
+                }
+            }
+        }
+        else
+        {
+            // return selected properties
+            selectedProperties = createQNames(selectParam, excludedProps);
+        }
+
+        Map<String, Object> props = null;
+        if (!selectedProperties.isEmpty())
+        {
+            props = new HashMap<>(selectedProperties.size());
+
+            for (QName qName : selectedProperties)
+            {
+                Serializable value = nodeProps.get(qName);
+                if (value != null)
+                {
+                    if (PROPS_USERLOOKUP.contains(qName))
+                    {
+                        value = Node.lookupUserInfo((String)value, mapUserInfo, sr.getPersonService());
+                    }
+
+                    // Empty (zero length) string values are considered to be
+                    // null values, and will be represented the same as null
+                    // values (i.e. by non-existence of the property).
+                    if (value != null && value instanceof String && ((String) value).isEmpty())
+                    {
+                        continue;
+                    }
+
+                    props.put(qName.toPrefixString(namespaceService), value);
+                }
+            }
+            if (props.isEmpty())
+            {
+                props = null; // set to null so it doesn't show up as an empty object in the JSON response.
+            }
+        }
+
+        return props;
+    }
+
+    public List<String> mapFromNodeAspects(Set<QName> nodeAspects, List<String> excludedNS, List<QName> excludedAspects)
+    {
+        List<String> aspectNames = new ArrayList<>(nodeAspects.size());
+
+        for (QName aspectQName : nodeAspects)
+        {
+            if ((! excludedNS.contains(aspectQName.getNamespaceURI())) && (! excludedAspects.contains(aspectQName)))
+            {
+                aspectNames.add(aspectQName.toPrefixString(namespaceService));
+            }
+        }
+
+        if (aspectNames.size() == 0)
+        {
+            aspectNames = null; // no aspects to return
+        }
+
+        return aspectNames;
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Node> listChildren(String parentFolderNodeId, Parameters parameters)
+    {
+        String path = parameters.getParameter(PARAM_RELATIVE_PATH);
+
+        final NodeRef parentNodeRef = validateOrLookupNode(parentFolderNodeId, path);
+
+        final List<String> includeParam = parameters.getInclude();
+
+        QName assocTypeQNameParam = null;
+
+        Query q = parameters.getQuery();
+
+        if (q != null)
+        {
+            // filtering via "where" clause
+            MapBasedQueryWalker propertyWalker = createListChildrenQueryWalker();
+            QueryHelper.walk(q, propertyWalker);
+
+            String assocTypeQNameStr = propertyWalker.getProperty(PARAM_ASSOC_TYPE, WhereClauseParser.EQUALS, String.class);
+            if (assocTypeQNameStr != null)
+            {
+                assocTypeQNameParam = getAssocType(assocTypeQNameStr);
+            }
+        }
+
+        List<Pair<QName, Boolean>> sortProps = getListChildrenSortProps(parameters);
+        List<FilterProp> filterProps = getListChildrenFilterProps(parameters);
+
+        Paging paging = parameters.getPaging();
+
+        PagingRequest pagingRequest = Util.getPagingRequest(paging);
+
+        final PagingResults<FileInfo> pagingResults;
+
+        Pair<Set<QName>, Set<QName>> pair = buildSearchTypesAndIgnoreAspects(parameters);
+
+        Set<QName> searchTypeQNames = pair.getFirst();
+        Set<QName> ignoreAspectQNames = pair.getSecond();
+
+        Set<QName> assocTypeQNames = buildAssocTypes(assocTypeQNameParam);
+
+        // call GetChildrenCannedQuery (via FileFolderService)
+        if (((filterProps == null) || (filterProps.size() == 0)) &&
+            ((assocTypeQNames == null) || (assocTypeQNames.size() == 0)) &&
+            (smartStore.isVirtual(parentNodeRef)|| (smartStore.canVirtualize(parentNodeRef))))
+        {
+            pagingResults = fileFolderService.list(parentNodeRef, searchTypeQNames, ignoreAspectQNames, sortProps, pagingRequest);
+        }
+        else
+        {
+            // TODO smart folders (see REPO-1173)
+            pagingResults = fileFolderService.list(parentNodeRef, assocTypeQNames, searchTypeQNames, ignoreAspectQNames, sortProps, filterProps, pagingRequest);
+        }
+
+        final Map<String, UserInfo> mapUserInfo = new HashMap<>(10);
+
+        final List<FileInfo> page = pagingResults.getPage();
+        List<Node> nodes = new AbstractList<Node>()
+        {
+            @Override
+            public Node get(int index)
+            {
+                FileInfo fInfo = page.get(index);
+
+                // minimal info by default (unless "include"d otherwise)
+                // (pass in null as parentNodeRef to force loading of primary
+                // parent node as parentId)
+                Node node = getFolderOrDocument(fInfo.getNodeRef(), null, fInfo.getType(), includeParam, mapUserInfo);
+                if (node.getPath() != null)
+                {
+                    calculateRelativePath(parentFolderNodeId, node);
+                }
+                return node;
+            }
+
+            private void calculateRelativePath(String parentFolderNodeId, Node node)
+            {
+                NodeRef rootNodeRef = validateOrLookupNode(parentFolderNodeId, null);
+                try
+                {
+                    // get the path elements
+                    List<String> pathInfos = fileFolderService.getNameOnlyPath(rootNodeRef, node.getNodeRef());
+
+                    int sizePathInfos = pathInfos.size();
+
+                    if (sizePathInfos > 1)
+                    {
+                        // remove the current child
+                        pathInfos.remove(sizePathInfos - 1);
+
+                        // build the path string
+                        StringBuilder sb = new StringBuilder(pathInfos.size() * 20);
+                        for (String fileInfo : pathInfos)
+                        {
+                            sb.append("/");
+                            sb.append(fileInfo);
+                        }
+
+                        node.getPath().setRelativePath(sb.toString());
+                    }
+
+                }
+
+                catch (FileNotFoundException e)
+                {   
+                 // NOTE: return null as relativePath
+                }
+            }
+
+            @Override
+            public int size()
+            {
+                return page.size();
+            }
+        };
+
+        Node sourceEntity = null;
+        if (parameters.includeSource())
+        {
+            sourceEntity = getFolderOrDocumentFullInfo(parentNodeRef, null, null, null, mapUserInfo);
+        }
+ 
+        return CollectionWithPagingInfo.asPaged(paging, nodes, pagingResults.hasMoreItems(), pagingResults.getTotalResultCount().getFirst(), sourceEntity);
+    }
+
+    /**
+     * Create query walker for <code>listChildren</code>.
+     *
+     * @return The  created {@link MapBasedQueryWalker}.
+     */
+    private MapBasedQueryWalker createListChildrenQueryWalker()
+    {
+        return new MapBasedQueryWalker(LIST_FOLDER_CHILDREN_EQUALS_QUERY_PROPERTIES, null);
+    }
+
+    /**
+     * <p>Returns a List of filter properties specified by request parameters.</p>
+     *
+     * @param parameters The {@link Parameters} object to get the parameters passed into the request
+     *        including:
+     *        - filter, sort & paging params (where, orderBy, skipCount, maxItems)
+     *        - incFiles, incFolders (both true by default)
+     * @return The list of {@link FilterProp}. Can be null.
+     */
+    protected List<FilterProp> getListChildrenFilterProps(final Parameters parameters)
+    {
+        List<FilterProp> filterProps = null;
+        Query q = parameters.getQuery();
+        if (q != null)
+        {
+            MapBasedQueryWalker propertyWalker = createListChildrenQueryWalker();
+            QueryHelper.walk(q, propertyWalker);
+
+            Boolean isPrimary = propertyWalker.getProperty(PARAM_ISPRIMARY, WhereClauseParser.EQUALS, Boolean.class);
+
+            if (isPrimary != null)
+            {
+                filterProps = new ArrayList<>(1);
+                filterProps.add(new FilterPropBoolean(GetChildrenCannedQuery.FILTER_QNAME_NODE_IS_PRIMARY, isPrimary));
+            }
+        }
+        return filterProps;
+    }
+
+    /**
+     * <p>Returns a List of sort properties specified by the "sorting" request parameter.</p>
+     *
+     * @param parameters The {@link Parameters} object to get the parameters passed into the request
+     *        including:
+     *        - filter, sort & paging params (where, orderBy, skipCount, maxItems)
+     *        - incFiles, incFolders (both true by default)
+     * @return The list of <code>Pair&lt;QName, Boolean&gt;</code> sort properties. If no sort parameters are
+     *        found defaults to {@link #getListChildrenSortPropsDefault() getListChildrenSortPropsDefault}.
+     */
+    protected List<Pair<QName, Boolean>> getListChildrenSortProps(final Parameters parameters)
+    {
+        List<SortColumn> sortCols = parameters.getSorting();
+        List<Pair<QName, Boolean>> sortProps;
+        if ((sortCols != null) && (sortCols.size() > 0))
+        {
+            // TODO should we allow isFile in sort (and map to reverse of isFolder) ?
+            sortProps = new ArrayList<>(sortCols.size());
+            for (SortColumn sortCol : sortCols)
+            {
+                QName propQname = PARAM_SYNONYMS_QNAME.get(sortCol.column);
+                if (propQname == null)
+                {
+                    propQname = createQName(sortCol.column);
+                }
+
+                if (propQname != null)
+                {
+                    sortProps.add(new Pair<>(propQname, sortCol.asc));
+                }
+            }
+        }
+        else
+        {
+            sortProps = getListChildrenSortPropsDefault();
+        }
+
+        return sortProps;
+    }
+
+    /**
+     * <p>
+     * Returns the default sort order.
+     * </p>
+     *
+     * @return The list of <code>Pair&lt;QName, Boolean&gt;</code> sort
+     *         properties.
+     */
+    protected List<Pair<QName, Boolean>> getListChildrenSortPropsDefault()
+    {
+        List<Pair<QName, Boolean>> sortProps = new ArrayList<>(
+                Arrays.asList(new Pair<>(GetChildrenCannedQuery.SORT_QNAME_NODE_IS_FOLDER, Boolean.FALSE), new Pair<>(ContentModel.PROP_NAME, true)));
+        return sortProps;
+    }
+
+    private Pair<QName,Boolean> parseNodeTypeFilter(String nodeTypeStr)
+    {
+        boolean filterIncludeSubTypes = false; // default nodeType filtering is without subTypes (unless nodeType value is suffixed with ' INCLUDESUBTYPES')
+
+        int idx = nodeTypeStr.lastIndexOf(' ');
+        if (idx > 0)
+        {
+            String suffix = nodeTypeStr.substring(idx);
+            if (suffix.equalsIgnoreCase(" "+PARAM_INCLUDE_SUBTYPES))
+            {
+                filterIncludeSubTypes = true;
+                nodeTypeStr = nodeTypeStr.substring(0, idx);
+            }
+        }
+
+        QName filterNodeTypeQName = createQName(nodeTypeStr);
+        if (dictionaryService.getType(filterNodeTypeQName) == null)
+        {
+            throw new InvalidArgumentException("Unknown filter nodeType: "+nodeTypeStr);
+        }
+
+        return new Pair<>(filterNodeTypeQName, filterIncludeSubTypes);
+    }
+
+    protected Set<QName> buildAssocTypes(QName assocTypeQName)
+    {
+        Set<QName> assocTypeQNames = null;
+        if (assocTypeQName != null)
+        {
+            assocTypeQNames = Collections.singleton(assocTypeQName);
+        }
+        /*
+        // TODO review - this works, but reduces from ~100 to ~96 (OOTB)
+        // maybe we could post filter (rather than join) - examples: sys:children, sys:lost_found, sys:archivedLink, sys:archiveUserLink
+        else
+        {
+            Collection<QName> qnames = dictionaryService.getAllAssociations();
+            assocTypeQNames = new HashSet<>(qnames.size());
+
+            // remove system assoc types
+            for (QName qname : qnames)
+            {
+                if ((!EXCLUDED_NS.contains(qname.getNamespaceURI())))
+                {
+                    assocTypeQNames.add(qname);
+                }
+            }
+        }
+        */
+        return assocTypeQNames;
+    }
+
+    protected Pair<Set<QName>, Set<QName>> buildSearchTypesAndIgnoreAspects(QName nodeTypeQName, boolean includeSubTypes, Set<QName> ignoreQNameTypes, Boolean includeFiles, Boolean includeFolders)
+    {
+        Set<QName> searchTypeQNames = new HashSet<>(100);
+        Set<QName> ignoreAspectQNames = null;
+
+        if (nodeTypeQName != null)
+        {
+            // Build a list of (sub-)types
+            if (includeSubTypes)
+            {
+                Collection<QName> qnames = dictionaryService.getSubTypes(nodeTypeQName, true);
+                searchTypeQNames.addAll(qnames);
+            }
+            searchTypeQNames.add(nodeTypeQName);
+
+            // Remove 'system' folders
+            if (includeSubTypes)
+            {
+                Collection<QName> qnames = dictionaryService.getSubTypes(ContentModel.TYPE_SYSTEM_FOLDER, true);
+                searchTypeQNames.removeAll(qnames);
+            }
+            searchTypeQNames.remove(ContentModel.TYPE_SYSTEM_FOLDER);
+        }
+
+        if (includeFiles != null)
+        {
+            if (includeFiles)
+            {
+                if (includeSubTypes)
+                {
+                    Collection<QName> qnames = dictionaryService.getSubTypes(ContentModel.TYPE_CONTENT, true);
+                    searchTypeQNames.addAll(qnames);
+                }
+                searchTypeQNames.add(ContentModel.TYPE_CONTENT);
+            }
+            else
+            {
+                Collection<QName> qnames = dictionaryService.getSubTypes(ContentModel.TYPE_CONTENT, true);
+                searchTypeQNames.removeAll(qnames);
+                searchTypeQNames.remove(ContentModel.TYPE_CONTENT);
+            }
+        }
+
+        if (includeFolders != null)
+        {
+            if (includeFolders)
+            {
+                if (includeSubTypes)
+                {
+                    Collection<QName> qnames = dictionaryService.getSubTypes(ContentModel.TYPE_FOLDER, true);
+                    searchTypeQNames.addAll(qnames);
+                }
+                searchTypeQNames.add(ContentModel.TYPE_FOLDER);
+
+                // Remove 'system' folders
+                if (includeSubTypes)
+                {
+                    Collection<QName> qnames = dictionaryService.getSubTypes(ContentModel.TYPE_SYSTEM_FOLDER, true);
+                    searchTypeQNames.removeAll(qnames);
+                }
+                searchTypeQNames.remove(ContentModel.TYPE_SYSTEM_FOLDER);
+            }
+            else
+            {
+                Collection<QName> qnames = dictionaryService.getSubTypes(ContentModel.TYPE_FOLDER, true);
+                searchTypeQNames.removeAll(qnames);
+                searchTypeQNames.remove(ContentModel.TYPE_FOLDER);
+            }
+        }
+
+        if (ignoreQNameTypes != null)
+        {
+            Set<QName> ignoreQNamesNotSearchTypes = new HashSet<>(ignoreQNameTypes);
+            ignoreQNamesNotSearchTypes.removeAll(searchTypeQNames);
+            ignoreQNamesNotSearchTypes.remove(ContentModel.TYPE_SYSTEM_FOLDER);
+
+            if (ignoreQNamesNotSearchTypes.size() > 0)
+            {
+                ignoreAspectQNames = getAspectsToIgnore(ignoreQNamesNotSearchTypes);
+            }
+
+            searchTypeQNames.removeAll(ignoreQNameTypes);
+        }
+
+        return new Pair<>(searchTypeQNames, ignoreAspectQNames);
+    }
+
+    protected Pair<Set<QName>, Set<QName>> buildSearchTypesAndIgnoreAspects(final Parameters parameters)
+    {
+        // filters
+        Boolean includeFolders = null;
+        Boolean includeFiles = null;
+        QName filterNodeTypeQName = null;
+
+        // note: for files/folders, include subtypes by default (unless filtering by a specific nodeType - see below)
+        boolean filterIncludeSubTypes = true;
+
+        Query q = parameters.getQuery();
+
+        if (q != null)
+        {
+            // filtering via "where" clause
+            MapBasedQueryWalker propertyWalker = createListChildrenQueryWalker();
+            QueryHelper.walk(q, propertyWalker);
+
+            Boolean isFolder = propertyWalker.getProperty(PARAM_ISFOLDER, WhereClauseParser.EQUALS, Boolean.class);
+            Boolean isFile = propertyWalker.getProperty(PARAM_ISFILE, WhereClauseParser.EQUALS, Boolean.class);
+
+            if (isFolder != null)
+            {
+                includeFolders = isFolder;
+            }
+
+            if (isFile != null)
+            {
+                includeFiles = isFile;
+            }
+
+            if (Boolean.TRUE.equals(includeFiles) && Boolean.TRUE.equals(includeFolders))
+            {
+                throw new InvalidArgumentException("Invalid filter (isFile=true and isFolder=true) - a node cannot be both a file and a folder");
+            }
+
+            String nodeTypeStr = propertyWalker.getProperty(PARAM_NODETYPE, WhereClauseParser.EQUALS, String.class);
+            if ((nodeTypeStr != null) && (! nodeTypeStr.isEmpty()))
+            {
+                if ((isFile != null) || (isFolder != null))
+                {
+                    throw new InvalidArgumentException("Invalid filter - nodeType and isFile/isFolder are mutually exclusive");
+                }
+
+                Pair<QName, Boolean> pair = parseNodeTypeFilter(nodeTypeStr);
+                filterNodeTypeQName = pair.getFirst();
+                filterIncludeSubTypes = pair.getSecond();
+            }
+        }
+
+        // notes (see also earlier validation checks):
+        // - no filtering means any types/sub-types (well, apart from hidden &/or default ignored types - eg. systemfolder, fm types)
+        // - node type filtering is mutually exclusive from isFile/isFolder, can optionally also include sub-types
+        // - isFile & isFolder cannot both be true
+        // - (isFile=false) means any other types/sub-types (other than files)
+        // - (isFolder=false) means any other types/sub-types (other than folders)
+        // - (isFile=false and isFolder=false) means any other types/sub-types (other than files or folders)
+
+        if (filterNodeTypeQName == null)
+        {
+            if ((includeFiles == null) && (includeFolders == null))
+            {
+                // no additional filtering
+                filterNodeTypeQName = ContentModel.TYPE_CMOBJECT;
+            }
+            else if ((includeFiles != null) && (includeFolders != null))
+            {
+                if ((! includeFiles) && (! includeFolders))
+                {
+                    // no files or folders
+                    filterNodeTypeQName = ContentModel.TYPE_CMOBJECT;
+                }
+            }
+            else if ((includeFiles != null) && (! includeFiles))
+            {
+                // no files
+                filterNodeTypeQName = ContentModel.TYPE_CMOBJECT;
+            }
+            else if ((includeFolders != null) && (! includeFolders))
+            {
+                // no folders
+                filterNodeTypeQName = ContentModel.TYPE_CMOBJECT;
+            }
+        }
+
+        return buildSearchTypesAndIgnoreAspects(filterNodeTypeQName, filterIncludeSubTypes, ignoreQNames, includeFiles, includeFolders);
+    }
+
+    private Set<QName> getAspectsToIgnore(Set<QName> ignoreQNames)
+    {
+        Set<QName> ignoreQNameAspects = new HashSet<>(ignoreQNames.size());
+        for (QName qname : ignoreQNames)
+        {
+            if (dictionaryService.getAspect(qname) != null)
+            {
+                ignoreQNameAspects.add(qname);
+            }
+        }
+        return ignoreQNameAspects;
+    }
+
+    @Override
+    public void deleteNode(String nodeId, Parameters parameters)
+    {
+        NodeRef nodeRef = validateOrLookupNode(nodeId, null);
+
+        if (isSpecialNode(nodeRef, getNodeType(nodeRef)))
+        {
+            throw new PermissionDeniedException("Cannot delete: " + nodeId);
+        }
+
+        // default false (if not provided)
+        boolean permanentDelete = Boolean.valueOf(parameters.getParameter(PARAM_PERMANENT));
+
+        if (permanentDelete == true)
+        {
+            boolean isAdmin = authorityService.hasAdminAuthority();
+            if (! isAdmin)
+            {
+                String owner = ownableService.getOwner(nodeRef);
+                if (! AuthenticationUtil.getRunAsUser().equals(owner))
+                {
+                    // non-owner/non-admin cannot permanently delete (even if they have delete permission)
+                    throw new PermissionDeniedException("Non-owner/non-admin cannot permanently delete: " + nodeId);
+                }
+            }
+
+            // Set as temporary to delete node instead of archiving.
+            nodeService.addAspect(nodeRef, ContentModel.ASPECT_TEMPORARY, null);
+        }
+
+        final ActivityInfo activityInfo =  getActivityInfo(getParentNodeRef(nodeRef), nodeRef);
+        postActivity(Activity_Type.DELETED, activityInfo, true);
+
+        fileFolderService.delete(nodeRef);
+    }
+
+    @Override
+    public Node createNode(String parentFolderNodeId, Node nodeInfo, Parameters parameters)
+    {
+        if (nodeInfo.getNodeRef() != null)
+        {
+            throw new InvalidArgumentException("Unexpected id when trying to create a new node: "+nodeInfo.getNodeRef().getId());
+        }
+        validateAspects(nodeInfo.getAspectNames(), EXCLUDED_NS, EXCLUDED_ASPECTS);
+        validateProperties(nodeInfo.getProperties(), EXCLUDED_NS,  Arrays.asList());
+
+        // check that requested parent node exists and it's type is a (sub-)type of folder
+        NodeRef parentNodeRef = validateOrLookupNode(parentFolderNodeId, null);
+
+        // node name - mandatory
+        String nodeName = nodeInfo.getName();
+        if ((nodeName == null) || nodeName.isEmpty())
+        {
+            throw new InvalidArgumentException("Node name is expected: "+parentNodeRef.getId());
+        }
+
+        // node type - check that requested type is a (sub-) type of cm:object
+        String nodeType = nodeInfo.getNodeType();
+        if ((nodeType == null) || nodeType.isEmpty())
+        {
+            throw new InvalidArgumentException("Node type is expected: "+parentNodeRef.getId()+","+nodeName);
+        }
+
+        QName nodeTypeQName = createQName(nodeType);
+
+        boolean isContent = isSubClass(nodeTypeQName, ContentModel.TYPE_CONTENT);
+        if (! isContent)
+        {
+            validateCmObject(nodeTypeQName);
+        }
+
+        /* RA-834: commented-out since not currently applicable for empty file
+        List<ThumbnailDefinition> thumbnailDefs = null;
+        String renditionsParam = parameters.getParameter(PARAM_RENDITIONS);
+        if (renditionsParam != null)
+        {
+            if (!isContent)
+            {
+                throw new InvalidArgumentException("Renditions ['"+renditionsParam+"'] only apply to content types: "+parentNodeRef.getId()+","+nodeName);
+            }
+
+            thumbnailDefs = getThumbnailDefs(renditionsParam);
+        }
+        */
+
+        Map<QName, Serializable> props = new HashMap<>(1);
+
+        if (nodeInfo.getProperties() != null)
+        {
+            // node properties - set any additional properties
+            props = mapToNodeProperties(nodeInfo.getProperties());
+        }
+
+        // Optionally, lookup by relative path
+        String relativePath = nodeInfo.getRelativePath();
+        parentNodeRef = getOrCreatePath(parentNodeRef, relativePath);
+
+        // Existing file/folder name handling
+        boolean autoRename = Boolean.valueOf(parameters.getParameter(PARAM_AUTO_RENAME));
+        if (autoRename && (isContent || isSubClass(nodeTypeQName, ContentModel.TYPE_FOLDER)))
+        {
+            NodeRef existingNode = nodeService.getChildByName(parentNodeRef, ContentModel.ASSOC_CONTAINS, nodeName);
+            if (existingNode != null)
+            {
+                // File already exists, find a unique name
+                nodeName = findUniqueName(parentNodeRef, nodeName);
+            }
+        }
+
+        QName assocTypeQName = ContentModel.ASSOC_CONTAINS;
+        if ((nodeInfo.getAssociation() != null) && (nodeInfo.getAssociation().getAssocType() != null))
+        {
+            assocTypeQName = getAssocType(nodeInfo.getAssociation().getAssocType());
+        }
+        
+        Boolean versionMajor = null;
+        String str = parameters.getParameter(PARAM_VERSION_MAJOR);
+        if (str != null)
+        {
+            versionMajor = Boolean.valueOf(str);
+        }
+        String versionComment = parameters.getParameter(PARAM_VERSION_COMMENT);
+
+        // Create the node
+        NodeRef nodeRef;
+
+        if (isContent)
+        {
+            // create empty file node - note: currently will be set to default encoding only (UTF-8)
+            nodeRef = createNewFile(parentNodeRef, nodeName, nodeTypeQName, null, props, assocTypeQName, parameters, versionMajor, versionComment);
+        }
+        else
+        {
+            // create non-content node
+            nodeRef = createNodeImpl(parentNodeRef, nodeName, nodeTypeQName, props, assocTypeQName);
+        }
+
+        addCustomAspects(nodeRef, nodeInfo.getAspectNames(), EXCLUDED_ASPECTS);
+
+        processNodePermissions(nodeRef, nodeInfo);
+
+        // eg. to create mandatory assoc(s)
+
+        if (nodeInfo.getTargets() != null)
+        {
+            addTargets(nodeRef.getId(), nodeInfo.getTargets());
+        }
+
+        if (nodeInfo.getSecondaryChildren() != null)
+        {
+            addChildren(nodeRef.getId(), nodeInfo.getSecondaryChildren());
+        }
+
+        Node newNode = getFolderOrDocument(nodeRef.getId(), parameters);
+
+        /* RA-834: commented-out since not currently applicable for empty file
+        requestRenditions(thumbnailDefs, newNode); // note: noop for folder
+        */
+
+        return newNode;
+    }
+
+    public void addCustomAspects(NodeRef nodeRef, List<String> aspectNames, List<QName> excludedAspects)
+    {
+        if (aspectNames == null)
+        {
+            return;
+        }
+        // node aspects - set any additional aspects
+        Set<QName> aspectQNames = mapToNodeAspects(aspectNames);
+        for (QName aspectQName : aspectQNames)
+        {
+            if (excludedAspects.contains(aspectQName) || aspectQName.equals(ContentModel.ASPECT_AUDITABLE))
+            {
+                continue; // ignore
+            }
+
+            nodeService.addAspect(nodeRef, aspectQName, null);
+        }
+    }
+
+    private NodeRef getOrCreatePath(NodeRef parentNodeRef, String relativePath)
+    {
+        if (relativePath != null)
+        {
+            List<String> pathElements = getPathElements(relativePath);
+
+            // Checks for the presence of, and creates as necessary,
+            // the folder structure in the provided path elements list.
+            if (!pathElements.isEmpty())
+            {
+                parentNodeRef = makeFolders(parentNodeRef, pathElements);
+            }
+        }
+
+        return parentNodeRef;
+    }
+
+    public List<AssocChild> addChildren(String parentNodeId, List<AssocChild> entities)
+    {
+        NodeRef parentNodeRef = validateNode(parentNodeId);
+
+        List<AssocChild> result = new ArrayList<>(entities.size());
+
+        for (AssocChild assoc : entities)
+        {
+            String childId = assoc.getChildId();
+            if (childId == null)
+            {
+                throw new InvalidArgumentException("Missing childId");
+            }
+
+            QName assocTypeQName = getAssocType(assoc.getAssocType());
+
+            try
+            {
+                NodeRef childNodeRef = validateNode(childId);
+
+                String nodeName = (String)nodeService.getProperty(childNodeRef, ContentModel.PROP_NAME);
+                QName assocChildQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName.createValidLocalName(nodeName));
+
+                nodeService.addChild(parentNodeRef, childNodeRef, assocTypeQName, assocChildQName);
+            }
+            catch (AssociationExistsException aee)
+            {
+                throw new ConstraintViolatedException(aee.getMessage());
+            }
+            catch (DuplicateChildNodeNameException dcne)
+            {
+                throw new ConstraintViolatedException(dcne.getMessage());
+            }
+
+            result.add(assoc);
+        }
+
+        return result;
+    }
+
+    public List<AssocTarget> addTargets(String sourceNodeId, List<AssocTarget> entities)
+    {
+        List<AssocTarget> result = new ArrayList<>(entities.size());
+
+        NodeRef srcNodeRef = validateNode(sourceNodeId);
+
+        for (AssocTarget assoc : entities)
+        {
+            String targetNodeId = assoc.getTargetId();
+            if (targetNodeId == null)
+            {
+                throw new InvalidArgumentException("Missing targetId");
+            }
+
+            String assocTypeStr = assoc.getAssocType();
+            QName assocTypeQName = getAssocType(assocTypeStr);
+            try
+            {
+                NodeRef tgtNodeRef = validateNode(targetNodeId);
+                nodeService.createAssociation(srcNodeRef, tgtNodeRef, assocTypeQName);
+            }
+            catch (AssociationExistsException aee)
+            {
+                throw new ConstraintViolatedException("Node association '"+assocTypeStr+"' already exists from "+sourceNodeId+" to "+targetNodeId);
+            }
+            catch (IllegalArgumentException iae)
+            {
+                // note: for now, we assume it is invalid assocType - alternatively, we could attempt to pre-validate via dictionary.getAssociation
+                throw new InvalidArgumentException(sourceNodeId+","+assocTypeStr+","+targetNodeId);
+            }
+
+            result.add(assoc);
+        }
+        return result;
+    }
+
+    public QName getAssocType(String assocTypeQNameStr)
+    {
+        return getAssocType(assocTypeQNameStr, true);
+    }
+
+    public QName getAssocType(String assocTypeQNameStr, boolean mandatory)
+    {
+        QName assocType = null;
+
+        if ((assocTypeQNameStr != null) && (! assocTypeQNameStr.isEmpty()))
+        {
+            assocType = createQName(assocTypeQNameStr);
+            if (dictionaryService.getAssociation(assocType) == null)
+            {
+                throw new InvalidArgumentException("Unknown assocType: " + assocTypeQNameStr);
+            }
+
+            if (EXCLUDED_NS.contains(assocType.getNamespaceURI()))
+            {
+                throw new InvalidArgumentException("Invalid assocType: " + assocTypeQNameStr);
+            }
+        }
+
+        if (mandatory && (assocType == null))
+        {
+            throw new InvalidArgumentException("Missing assocType");
+        }
+
+        return assocType;
+    }
+
+
+    private NodeRef createNodeImpl(NodeRef parentNodeRef, String nodeName, QName nodeTypeQName, Map<QName, Serializable> props, QName assocTypeQName)
+    {
+        NodeRef newNode = null;
+        if (props == null)
+        {
+            props = new HashMap<>(1);
+        }
+        props.put(ContentModel.PROP_NAME, nodeName);
+
+        validatePropValues(props);
+
+        QName assocQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName.createValidLocalName(nodeName));
+        try
+        {
+            newNode = nodeService.createNode(parentNodeRef, assocTypeQName, assocQName, nodeTypeQName, props).getChildRef();
+        }
+        catch (DuplicateChildNodeNameException dcne)
+        {
+            // duplicate - name clash
+            throw new ConstraintViolatedException(dcne.getMessage());
+        }
+
+        ActivityInfo activityInfo =  getActivityInfo(parentNodeRef, newNode);
+        postActivity(Activity_Type.ADDED, activityInfo, false);
+        return newNode;
+    }
+
+    /**
+     * Posts activities based on the activity_type.
+     * If the method is called with aSync=true then a TransactionListener is used post the activity
+     * afterCommit.  Otherwise the activity posting is done synchronously.
+     * @param activity_type
+     * @param activityInfo
+     * @param aSync
+     */
+    protected void postActivity(Activity_Type activity_type, ActivityInfo activityInfo, boolean aSync)
+    {
+        if (activityInfo == null) return; //Nothing to do.
+
+        String activityType = determineActivityType(activity_type, activityInfo.getFileInfo().isFolder());
+        if (activityType != null)
+        {
+            if (aSync)
+            {
+                ActivitiesTransactionListener txListener = new ActivitiesTransactionListener(activityType, activityInfo,
+                        TenantUtil.getCurrentDomain(), Activities.APP_TOOL, Activities.RESTAPI_CLIENT,
+                        poster, retryingTransactionHelper);
+                AlfrescoTransactionSupport.bindListener(txListener);
+            }
+            else
+            {
+                    poster.postFileFolderActivity(activityType, null, TenantUtil.getCurrentDomain(),
+                        activityInfo.getSiteId(), activityInfo.getParentNodeRef(), activityInfo.getNodeRef(),
+                        activityInfo.getFileName(), Activities.APP_TOOL, Activities.RESTAPI_CLIENT,
+                        activityInfo.getFileInfo());
+            }
+        }
+    }
+
+    // note: see also org.alfresco.opencmis.ActivityPosterImpl
+    protected ActivityInfo getActivityInfo(NodeRef parentNodeRef, NodeRef nodeRef)
+    {
+        // runAs system, eg. user may not have permission see one or more parents (irrespective of whether in a site context of not)
+        SiteInfo siteInfo = AuthenticationUtil.runAs(new RunAsWork<SiteInfo>()
+        {
+            @Override
+            public SiteInfo doWork() throws Exception
+            {
+                return siteService.getSite(nodeRef);
+            }
+        }, AuthenticationUtil.getSystemUserName());
+
+        String siteId = (siteInfo != null ? siteInfo.getShortName() : null);
+        if(siteId != null && !siteId.equals(""))
+        {
+            FileInfo fileInfo = fileFolderService.getFileInfo(nodeRef);
+            if (fileInfo != null)
+            {
+                boolean isContent = isSubClass(fileInfo.getType(), ContentModel.TYPE_CONTENT);
+
+                if (fileInfo.isFolder() || isContent)
+                {
+                    return new ActivityInfo(null, parentNodeRef, siteId, fileInfo);
+                }
+            }
+        }
+        else
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Non-site activity, so ignored " + nodeRef);
+            }
+        }
+        return null;
+    }
+
+    protected static String determineActivityType(Activity_Type activity_type, boolean isFolder)
+    {
+        switch (activity_type)
+        {
+            case DELETED:
+                return isFolder ? ActivityType.FOLDER_DELETED:ActivityType.FILE_DELETED;
+            case ADDED:
+                return isFolder ? ActivityType.FOLDER_ADDED:ActivityType.FILE_ADDED;
+            case UPDATED:
+                if (!isFolder) return ActivityType.FILE_UPDATED;
+                break;
+            case DOWNLOADED:
+                if (!isFolder) return ActivityPoster.DOWNLOADED;
+                break;
+        }
+        return null;
+    }
+
+    // check cm:cmobject (but *not* cm:systemfolder)
+    private void validateCmObject(QName nodeTypeQName)
+    {
+        if (! isSubClass(nodeTypeQName, ContentModel.TYPE_CMOBJECT))
+        {
+            throw new InvalidArgumentException("Invalid type: " + nodeTypeQName + " - expected (sub-)type of cm:cmobject");
+        }
+
+        if (isSubClass(nodeTypeQName, ContentModel.TYPE_SYSTEM_FOLDER))
+        {
+            throw new InvalidArgumentException("Invalid type: " + nodeTypeQName + " - cannot be (sub-)type of cm:systemfolder");
+        }
+    }
+
+    // special cases: additional validation of property values (if not done by underlying foundation services)
+    private void validatePropValues(Map<QName, Serializable> props)
+    {
+        String newOwner = (String)props.get(ContentModel.PROP_OWNER);
+        if (newOwner != null)
+        {
+            // validate that user exists
+            if (! personService.personExists(newOwner))
+            {
+                throw new InvalidArgumentException("Unknown owner: "+newOwner);
+            }
+        }
+    }
+
+
+    /**
+     * Check for special case: additional node validation (pending common lower-level service support)
+     * for blacklist of system nodes that should not be deleted or locked, eg. Company Home, Sites, Data Dictionary
+     *
+     * @param nodeRef
+     * @param type
+     * @return
+     */
+    protected boolean isSpecialNode(NodeRef nodeRef, QName type)
+    {
+        // Check for Company Home, Sites and Data Dictionary (note: must be tenant-aware)
+
+        if (nodeRef.equals(repositoryHelper.getCompanyHome()))
+        {
+            return true;
+        }
+        else if (type.equals(SiteModel.TYPE_SITES) || type.equals(SiteModel.TYPE_SITE))
+        {
+            // note: alternatively, we could inject SiteServiceInternal and use getSitesRoot (or indirectly via node locator)
+            return true;
+        }
+        else
+        {
+            String tenantDomain = TenantUtil.getCurrentDomain();
+            NodeRef ddNodeRef = ddCache.get(tenantDomain);
+            if (ddNodeRef == null)
+            {
+                List<ChildAssociationRef> ddAssocs = nodeService.getChildAssocs(
+                        repositoryHelper.getCompanyHome(),
+                        ContentModel.ASSOC_CONTAINS,
+                        QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "dictionary"));
+                if (ddAssocs.size() == 1)
+                {
+                    ddNodeRef = ddAssocs.get(0).getChildRef();
+                    ddCache.put(tenantDomain, ddNodeRef);
+                }
+            }
+
+            if (nodeRef.equals(ddNodeRef))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private boolean isLocked(NodeRef nodeRef, Set<QName> aspects)
+    {
+        boolean locked = false;
+        if (((aspects != null) && aspects.contains(ContentModel.ASPECT_LOCKABLE))
+           || nodeService.hasAspect(nodeRef, ContentModel.ASPECT_LOCKABLE))
+        {
+            locked = lockService.isLocked(nodeRef);
+        }
+
+        return locked;
+    }
+
+    @Override
+    public Node updateNode(String nodeId, Node nodeInfo, Parameters parameters)
+    {
+        retryingTransactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                NodeRef nodeRef = updateNodeImpl(nodeId, nodeInfo, parameters);
+                ActivityInfo activityInfo =  getActivityInfo(getParentNodeRef(nodeRef), nodeRef);
+                postActivity(Activity_Type.UPDATED, activityInfo, false);
+                
+                return null;
+            }
+        }, false, true);
+
+        return retryingTransactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Node>()
+        {
+            @Override
+            public Node execute() throws Throwable
+            {
+                return getFolderOrDocument(nodeId, parameters);
+            }
+        }, false, false);
+    }
+    
+    protected NodeRef updateNodeImpl(String nodeId, Node nodeInfo, Parameters parameters)
+    {
+        validateAspects(nodeInfo.getAspectNames(), EXCLUDED_NS, EXCLUDED_ASPECTS);
+        validateProperties(nodeInfo.getProperties(), EXCLUDED_NS,  Arrays.asList());
+
+        final NodeRef nodeRef = validateOrLookupNode(nodeId, null);
+
+        QName nodeTypeQName = getNodeType(nodeRef);
+
+        validateCmObject(nodeTypeQName);
+
+        Map<QName, Serializable> props = new HashMap<>(0);
+
+        if (nodeInfo.getProperties() != null)
+        {
+            props = mapToNodeProperties(nodeInfo.getProperties());
+        }
+
+        String name = nodeInfo.getName();
+        if ((name != null) && (! name.isEmpty()))
+        {
+            // update node name if needed - note: if the name is different than existing then this is equivalent of a rename (within parent folder)
+            props.put(ContentModel.PROP_NAME, name);
+        }
+
+        String nodeType = nodeInfo.getNodeType();
+        if ((nodeType != null) && (! nodeType.isEmpty()))
+        {
+            // update node type - ensure that we are performing a specialise (we do not support generalise)
+            QName destNodeTypeQName = createQName(nodeType);
+
+            if ((! destNodeTypeQName.equals(nodeTypeQName)) &&
+                 isSubClass(destNodeTypeQName, nodeTypeQName) &&
+                 (! isSubClass(destNodeTypeQName, ContentModel.TYPE_SYSTEM_FOLDER)))
+            {
+                nodeService.setType(nodeRef, destNodeTypeQName);
+            }
+            else if (! destNodeTypeQName.equals(nodeTypeQName))
+            {
+                throw new InvalidArgumentException("Failed to change (specialise) node type - from "+nodeTypeQName+" to "+destNodeTypeQName);
+            }
+        }
+
+        NodeRef parentNodeRef = nodeInfo.getParentId();
+        if (parentNodeRef != null)
+        {
+            NodeRef currentParentNodeRef = getParentNodeRef(nodeRef);
+            if (currentParentNodeRef == null)
+            {
+                // implies root (Company Home) hence return 403 here
+                throw new PermissionDeniedException();
+            }
+
+            if (! currentParentNodeRef.equals(parentNodeRef))
+            {
+                //moveOrCopy(nodeRef, parentNodeRef, name, false); // not currently supported - client should use explicit POST /move operation instead
+                throw new InvalidArgumentException("Cannot update parentId of "+nodeId+" via PUT /nodes/{nodeId}. Please use explicit POST /nodes/{nodeId}/move operation instead");
+            }
+        }
+
+        List<String> aspectNames = nodeInfo.getAspectNames();
+        updateCustomAspects(nodeRef, aspectNames, EXCLUDED_ASPECTS);
+
+        if (props.size() > 0)
+        {
+            validatePropValues(props);
+
+            try
+            {
+                handleNodeRename(props, nodeRef);
+                // update node properties - note: null will unset the specified property
+                nodeService.addProperties(nodeRef, props);
+            }
+            catch (DuplicateChildNodeNameException dcne)
+            {
+                throw new ConstraintViolatedException(dcne.getMessage());
+            }
+        }
+
+        processNodePermissions(nodeRef, nodeInfo);
+        
+        return nodeRef;
+    }
+
+    private void handleNodeRename(Map<QName, Serializable> props, NodeRef nodeRef)
+    {
+        Serializable nameProp = props.get(ContentModel.PROP_NAME);
+        if ((nameProp != null))
+        {
+            String currentName = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
+            String newName = (String) nameProp;
+            if (!currentName.equals(newName))
+            {
+                rename(nodeRef, newName);
+            }
+        }
+    }
+
+    protected void processNodePermissions(NodeRef nodeRef, Node nodeInfo)
+    {
+        NodePermissions nodePerms = nodeInfo.getPermissions();
+        if (nodePerms != null)
+        {
+            // Cannot set inherited permissions, only direct (locally set) permissions can be set
+            if ((nodePerms.getInherited() != null) && (nodePerms.getInherited().size() > 0))
+            {
+                throw new InvalidArgumentException("Cannot set *inherited* permissions on this node");
+            }
+
+            // Check inherit from parent value and if it's changed set the new value
+            if (nodePerms.getIsInheritanceEnabled() != null)
+            {
+                if (nodePerms.getIsInheritanceEnabled() != permissionService.getInheritParentPermissions(nodeRef))
+                {
+                    permissionService.setInheritParentPermissions(nodeRef, nodePerms.getIsInheritanceEnabled());
+                }
+            }
+
+            // set direct permissions
+            if ((nodePerms.getLocallySet() != null))
+            {
+                // list of all directly set permissions
+                Set<AccessPermission> directPerms = new HashSet<>(5);
+                for (AccessPermission accessPerm : permissionService.getAllSetPermissions(nodeRef))
+                {
+                    if (accessPerm.isSetDirectly()) 
+                    {
+                        directPerms.add(accessPerm);
+                    }
+                }
+
+                //
+                // replace (or clear) set of direct permissions
+                //
+
+                // TODO cleanup the way we replace permissions (ie. add, update and delete)
+
+                // check if same permission is sent more than once
+                if (hasDuplicatePermissions(nodePerms.getLocallySet()))
+                {
+                    throw new InvalidArgumentException("Duplicate node permissions, there is more than one permission with the same authority and name!");
+                }
+                
+                for (NodePermissions.NodePermission nodePerm : nodePerms.getLocallySet())
+                {
+                    String permName = nodePerm.getName();
+                    String authorityId = nodePerm.getAuthorityId();
+
+                    AccessStatus accessStatus = AccessStatus.ALLOWED;
+                    if (nodePerm.getAccessStatus() != null)
+                    {
+                        accessStatus = AccessStatus.valueOf(nodePerm.getAccessStatus());
+                    }
+
+                    if (authorityId == null || authorityId.isEmpty())
+                    {
+                        throw new InvalidArgumentException("Authority Id is expected.");
+                    }
+
+                    if (permName == null || permName.isEmpty())
+                    {
+                        throw new InvalidArgumentException("Permission name is expected.");
+                    }
+
+                    if (((!authorityId.equals(PermissionService.ALL_AUTHORITIES) && (!authorityService.authorityExists(authorityId)))))
+                    {
+                        throw new InvalidArgumentException("Cannot set permissions on this node - unknown authority: " + authorityId);
+                    }
+
+                    AccessPermission existing = null;
+                    boolean addPerm = true;
+                    boolean updatePerm = false;
+
+                    // If the permission already exists but with different access status it will be updated
+                    for (AccessPermission accessPerm : directPerms)
+                    {
+                        if (accessPerm.getAuthority().equals(authorityId) && accessPerm.getPermission().equals(permName))
+                        {
+                            existing = accessPerm;
+                            addPerm = false;
+
+                            if (accessPerm.getAccessStatus() != accessStatus)
+                            {
+                                updatePerm = true;
+                            }
+                            break;
+                        }
+                    }
+
+                    if (existing != null)
+                    {
+                        // ignore existing permissions
+                        directPerms.remove(existing);
+                    }
+
+                    if (addPerm || updatePerm)
+                    {
+                        try
+                        {
+                            permissionService.setPermission(nodeRef, authorityId, permName, (accessStatus == AccessStatus.ALLOWED));
+                        }
+                        catch (UnsupportedOperationException e)
+                        {
+                            throw new InvalidArgumentException("Cannot set permissions on this node - unknown access level: " + permName);
+                        }
+                    }
+                }
+
+                // remove any remaining direct perms
+                for (AccessPermission accessPerm : directPerms)
+                {
+                    permissionService.deletePermission(nodeRef, accessPerm.getAuthority(), accessPerm.getPermission());
+                }
+            }
+        }
+    }
+
+    @Override
+    public Node moveOrCopyNode(String sourceNodeId, String targetParentId, String name, Parameters parameters, boolean isCopy)
+    {
+        if ((sourceNodeId == null) || (sourceNodeId.isEmpty()))
+        {
+            throw new InvalidArgumentException("Missing sourceNodeId");
+        }
+
+        if ((targetParentId == null) || (targetParentId.isEmpty()))
+        {
+            throw new InvalidArgumentException("Missing targetParentId");
+        }
+
+        final NodeRef parentNodeRef = validateOrLookupNode(targetParentId, null);
+        final NodeRef sourceNodeRef = validateOrLookupNode(sourceNodeId, null);
+
+        FileInfo fi = moveOrCopyImpl(sourceNodeRef, parentNodeRef, name, isCopy);
+        return getFolderOrDocument(fi.getNodeRef().getId(), parameters);
+    }
+    
+    public void updateCustomAspects(NodeRef nodeRef, List<String> aspectNames, List<QName> excludedAspects)
+    {
+        if (aspectNames != null)
+        {
+            // update aspects - note: can be empty (eg. to remove existing aspects+properties) but not cm:auditable, sys:referencable, sys:localized
+
+            Set<QName> aspectQNames = mapToNodeAspects(aspectNames);
+
+            Set<QName> existingAspects = nodeService.getAspects(nodeRef);
+
+            Set<QName> aspectsToAdd = new HashSet<>(3);
+            Set<QName> aspectsToRemove = new HashSet<>(3);
+
+            for (QName aspectQName : aspectQNames)
+            {
+                if (EXCLUDED_NS.contains(aspectQName.getNamespaceURI()) || excludedAspects.contains(aspectQName) || aspectQName.equals(ContentModel.ASPECT_AUDITABLE))
+                {
+                    continue; // ignore
+                }
+
+                if (! existingAspects.contains(aspectQName))
+                {
+                    aspectsToAdd.add(aspectQName);
+                }
+            }
+
+            for (QName existingAspect : existingAspects)
+            {
+                if (EXCLUDED_NS.contains(existingAspect.getNamespaceURI()) || excludedAspects.contains(existingAspect) || existingAspect.equals(ContentModel.ASPECT_AUDITABLE))
+                {
+                    continue; // ignore
+                }
+
+                if (! aspectQNames.contains(existingAspect))
+                {
+                    aspectsToRemove.add(existingAspect);
+                }
+            }
+
+            // Note: for now, if aspectNames are sent then all that are required should be sent (to avoid properties from other existing aspects being removed)
+            // TODO: optional PATCH mechanism to add one new new aspect (with some related aspect properties) without affecting existing aspects/properties
+            for (QName aQName : aspectsToRemove)
+            {
+                if (aQName.equals(QuickShareModel.ASPECT_QSHARE))
+                {
+                    String qSharedId = (String)nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDID);
+                    if (qSharedId != null)
+                    {
+                        // note: for now, go via QuickShareLinks (rather than QuickShareService) to ensure consistent permission checks
+                        // alternatively we could disallow (or ignore) "qshare:shared" aspect removal
+                        quickShareLinks.delete(qSharedId, null);
+                    }
+                }
+
+                nodeService.removeAspect(nodeRef, aQName);
+            }
+
+            for (QName aQName : aspectsToAdd)
+            {
+                if (aQName.equals(QuickShareModel.ASPECT_QSHARE))
+                {
+                    // note: for now, go via QuickShareLinks (rather than QuickShareService) to ensure consistent permission checks
+                    // alternatively we could disallow (or ignore) "qshare:shared" aspect addition
+                    QuickShareLink qs = new QuickShareLink();
+                    qs.setNodeId(nodeRef.getId());
+                    quickShareLinks.create(Collections.singletonList(qs), null);
+                }
+
+                nodeService.addAspect(nodeRef, aQName, null);
+            }
+        }
+    }
+
+    private void rename(NodeRef nodeRef, String name)
+    {
+        try
+        {
+            fileFolderService.rename(nodeRef, name);
+        }
+        catch (FileNotFoundException fnfe)
+        {
+            // convert checked exception
+            throw new EntityNotFoundException(nodeRef.getId());
+        }
+        catch (FileExistsException fee)
+        {
+            // duplicate - name clash
+            throw new ConstraintViolatedException("Name already exists in target parent: " + name);
+        }
+    }
+
+    protected FileInfo moveOrCopyImpl(NodeRef nodeRef, NodeRef parentNodeRef, String name, boolean isCopy)
+    {
+        String targetParentId = parentNodeRef.getId();
+
+        try
+        {
+            if (isCopy)
+            {
+                // copy
+                FileInfo newFileInfo = fileFolderService.copy(nodeRef, parentNodeRef, name);
+                if (newFileInfo.getNodeRef().equals(nodeRef))
+                {
+                    // copy did not happen - eg. same parent folder and name (name can be null or same)
+                    throw new FileExistsException(nodeRef, "");
+                }
+                return newFileInfo;
+            }
+            else
+            {
+                // move
+                if ((! nodeRef.equals(parentNodeRef)) && isSpecialNode(nodeRef, getNodeType(nodeRef)))
+                {
+                    throw new PermissionDeniedException("Cannot move: "+nodeRef.getId());
+                }
+
+                // updating "parentId" means moving primary parent !
+                // note: in the future (as and when we support secondary parent/child assocs) we may also
+                // wish to select which parent to "move from" (in case where the node resides in multiple locations)
+                return fileFolderService.move(nodeRef, parentNodeRef, name);
+            }
+        }
+        catch (InvalidNodeRefException inre)
+        {
+            throw new EntityNotFoundException(targetParentId);
+        }
+        catch (FileNotFoundException fnfe)
+        {
+            // convert checked exception
+            throw new EntityNotFoundException(targetParentId);
+        }
+        catch (FileExistsException fee)
+        {
+            // duplicate - name clash
+            throw new ConstraintViolatedException("Name already exists in target parent: "+name);
+        }
+        catch (FileFolderServiceImpl.InvalidTypeException ite)
+        {
+            throw new InvalidArgumentException("Invalid type of target parent: "+targetParentId);
+        }
+    }
+
+    @Override
+    public BinaryResource getContent(String fileNodeId, Parameters parameters, boolean recordActivity)
+    {
+        final NodeRef nodeRef = validateNode(fileNodeId);
+        return getContent(nodeRef, parameters, recordActivity);
+    }
+
+    @Override
+    public BinaryResource getContent(NodeRef nodeRef, Parameters parameters, boolean recordActivity)
+    {
+        if (!nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_CONTENT), null, false))
+        {
+            throw new InvalidArgumentException("NodeId of content is expected: " + nodeRef.getId());
+        }
+
+        Map<QName, Serializable> nodeProps = nodeService.getProperties(nodeRef);
+        ContentData cd = (ContentData) nodeProps.get(ContentModel.PROP_CONTENT);
+        String name = (String) nodeProps.get(ContentModel.PROP_NAME);
+
+        org.alfresco.rest.framework.resource.content.ContentInfo ci = null;
+        String mimeType = null;
+        if (cd != null)
+        {
+            mimeType = cd.getMimetype();
+            ci = new org.alfresco.rest.framework.resource.content.ContentInfoImpl(mimeType, cd.getEncoding(), cd.getSize(), cd.getLocale());
+        }
+
+        // By default set attachment header (with filename) unless attachment=false *and* content type is pre-configured as non-attach
+        boolean attach = true;
+        String attachment = parameters.getParameter("attachment");
+        if (attachment != null)
+        {
+            Boolean a = Boolean.valueOf(attachment);
+            if (!a)
+            {
+                if (nonAttachContentTypes.contains(mimeType))
+                {
+                    attach = false;
+                }
+                else
+                {
+                    logger.warn("Ignored attachment=false for "+nodeRef.getId()+" since "+mimeType+" is not in the whitelist for non-attach content types");
+                }
+            }
+        }
+        String attachFileName = (attach ? name : null);
+
+        if (recordActivity)
+        {
+            final ActivityInfo activityInfo = getActivityInfo(getParentNodeRef(nodeRef), nodeRef);
+            postActivity(Activity_Type.DOWNLOADED, activityInfo, true);
+        }
+
+        return new NodeBinaryResource(nodeRef, ContentModel.PROP_CONTENT, ci, attachFileName);
+    }
+
+    @Override
+    public Node updateContent(String fileNodeId, BasicContentInfo contentInfo, InputStream stream, Parameters parameters)
+    {
+        if (contentInfo.getMimeType().toLowerCase().startsWith("multipart"))
+        {
+            throw new UnsupportedMediaTypeException("Cannot update using "+contentInfo.getMimeType());
+        }
+
+        final NodeRef nodeRef = validateNode(fileNodeId);
+
+        if (! nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_CONTENT), null, false))
+        {
+            throw new InvalidArgumentException("NodeId of content is expected: " + nodeRef.getId());
+        }
+
+        Boolean versionMajor = null;
+        String str = parameters.getParameter(PARAM_VERSION_MAJOR);
+        if (str != null)
+        {
+            versionMajor = Boolean.valueOf(str);
+        }
+        String versionComment = parameters.getParameter(PARAM_VERSION_COMMENT);
+
+        String fileName = parameters.getParameter(PARAM_NAME);
+        if (fileName != null)
+        {
+            // optionally rename, before updating the content
+            nodeService.setProperty(nodeRef, ContentModel.PROP_NAME, fileName);
+        }
+        else
+        {
+            fileName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
+        }
+        
+        return updateExistingFile(null, nodeRef, fileName, contentInfo, stream, parameters, versionMajor, versionComment);
+    }
+
+    private Node updateExistingFile(NodeRef parentNodeRef, NodeRef nodeRef, String fileName, BasicContentInfo contentInfo, InputStream stream, Parameters parameters, Boolean versionMajor, String versionComment)
+    {
+        boolean isVersioned = versionService.isVersioned(nodeRef);
+
+        behaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_VERSIONABLE);
+        try
+        {
+            writeContent(nodeRef, fileName, stream, true);
+
+            if ((isVersioned) || (versionMajor != null) || (versionComment != null) )
+            {
+                VersionType versionType = null;
+                if (versionMajor != null)
+                {
+                    versionType = (versionMajor ? VersionType.MAJOR : VersionType.MINOR);
+                }
+                else
+                {
+                    // note: it is possible to have versionable aspect but no versions (=> no version label)
+                    if ((! isVersioned) || (nodeService.getProperty(nodeRef, ContentModel.PROP_VERSION_LABEL) == null))
+                    {
+                        versionType = VersionType.MAJOR;
+                    }
+                    else
+                    {
+                        versionType = VersionType.MINOR;
+                    }
+                }
+
+                createVersion(nodeRef, isVersioned, versionType, versionComment);
+            }
+
+            ActivityInfo activityInfo =  getActivityInfo(parentNodeRef, nodeRef);
+            postActivity(Activity_Type.UPDATED, activityInfo, false);
+
+            extractMetadata(nodeRef);
+        }
+        finally
+        {
+            behaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_VERSIONABLE);
+        }
+
+        return getFolderOrDocumentFullInfo(nodeRef, null, null, parameters);
+    }
+
+    private void writeContent(NodeRef nodeRef, String fileName, InputStream stream, boolean guessEncoding)
+    {
+        try
+        {
+            ContentWriter writer = contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
+
+            String mimeType = mimetypeService.guessMimetype(fileName);
+            if ((mimeType != null) && (!mimeType.equals(MimetypeMap.MIMETYPE_BINARY)))
+            {
+                // quick/weak guess based on file extension
+                writer.setMimetype(mimeType);
+            } else
+            {
+                // stronger guess based on file stream
+                writer.guessMimetype(fileName);
+            }
+
+            InputStream is = null;
+
+            if (guessEncoding)
+            {
+                is = new BufferedInputStream(stream);
+                is.mark(1024);
+                writer.setEncoding(guessEncoding(is, mimeType, false));
+                try
+                {
+                    is.reset();
+                } catch (IOException ioe)
+                {
+                    if (logger.isWarnEnabled())
+                    {
+                        logger.warn("Failed to reset stream after trying to guess encoding: " + ioe.getMessage());
+                    }
+                }
+            } else
+            {
+                is = stream;
+            }
+
+            writer.putContent(is);
+        }
+        catch (ContentQuotaException cqe)
+        {
+            throw new InsufficientStorageException();
+        }
+        catch (ContentLimitViolationException clv)
+        {
+            throw new RequestEntityTooLargeException(clv.getMessage());
+        }
+        catch (ContentIOException cioe)
+        {
+            if (cioe.getCause() instanceof NodeLockedException)
+            {
+                throw (NodeLockedException)cioe.getCause();
+            }
+            throw cioe;
+        }
+    }
+
+    private String guessEncoding(InputStream in, String mimeType, boolean close)
+    {
+        String encoding = "UTF-8";
+        try
+        {
+            if (in != null)
+            {
+                Charset charset = mimetypeService.getContentCharsetFinder().getCharset(in, mimeType);
+                encoding = charset.name();
+            }
+        }
+        finally
+        {
+            try
+            {
+                if (close && (in != null))
+                {
+                    in.close();
+                }
+            }
+            catch (IOException ioe)
+            {
+                if (logger.isWarnEnabled())
+                {
+                    logger.warn("Failed to close stream after trying to guess encoding: " + ioe.getMessage());
+                }
+            }
+        }
+        return encoding;
+    }
+
+    protected void createVersion(NodeRef nodeRef, boolean isVersioned, VersionType versionType, String reason)
+    {
+        if (!isVersioned)
+        {
+            nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, null);
+        }
+
+        Map<String, Serializable> versionProperties = new HashMap<>(2);
+        versionProperties.put(VersionModel.PROP_VERSION_TYPE, versionType);
+        if (reason != null)
+        {
+            versionProperties.put(VersionModel.PROP_DESCRIPTION, reason);
+        }
+
+        versionService.createVersion(nodeRef, versionProperties);
+    }
+
+    @Override
+    public Node upload(String parentFolderNodeId, FormData formData, Parameters parameters)
+    {
+        if (formData == null || !formData.getIsMultiPart())
+        {
+            throw new InvalidArgumentException("The request content-type is not multipart: "+parentFolderNodeId);
+        }
+
+        NodeRef parentNodeRef = validateOrLookupNode(parentFolderNodeId, null);
+        if (!nodeMatches(parentNodeRef, Collections.singleton(ContentModel.TYPE_FOLDER), null, false))
+        {
+            throw new InvalidArgumentException("NodeId of folder is expected: " + parentNodeRef.getId());
+        }
+
+        String fileName = null;
+        Content content = null;
+        boolean autoRename = false;
+        QName nodeTypeQName = ContentModel.TYPE_CONTENT;
+        boolean overwrite = false; // If a fileName clashes for a versionable file
+        Boolean versionMajor = null;
+        String versionComment = null;
+        String relativePath = null;
+        String renditionNames = null;
+
+        Map<String, Object> qnameStrProps = new HashMap<>();
+        Map<QName, Serializable> properties = null;
+        Map<String, String[]> formDataParameters = formData.getParameters();
+
+        for (FormData.FormField field : formData.getFields())
+        {
+            switch (field.getName().toLowerCase())
+            {
+                case "name":
+                    String str = getStringOrNull(field.getValue());
+                    if ((str != null) && (! str.isEmpty()))
+                    {
+                        fileName = str;
+                    }
+                    break;
+
+                case "filedata":
+                    if (field.getIsFile())
+                    {
+                        fileName = (fileName != null ? fileName : field.getFilename());
+                        content = field.getContent();
+                    }
+                    break;
+
+                case "autorename":
+                    autoRename = Boolean.valueOf(field.getValue());
+                    break;
+
+                case "nodetype":
+                    nodeTypeQName = createQName(getStringOrNull(field.getValue()));
+                    if (! isSubClass(nodeTypeQName, ContentModel.TYPE_CONTENT))
+                    {
+                        throw new InvalidArgumentException("Can only upload type of cm:content: " + nodeTypeQName);
+                    }
+                    break;
+
+                case "overwrite":
+                    overwrite = Boolean.valueOf(field.getValue());
+                    break;
+
+                case "majorversion":
+                    versionMajor = Boolean.valueOf(field.getValue());
+                    break;
+
+                case "comment":
+                    versionComment = getStringOrNull(field.getValue());
+                    break;
+
+                case "relativepath":
+                    relativePath = getStringOrNull(field.getValue());
+                    break;
+
+                case "renditions":
+                    renditionNames = getStringOrNull(field.getValue());
+                    break;
+
+                default:
+                {
+                    final String propName = field.getName();
+                    if (propName.indexOf(QName.NAMESPACE_PREFIX) > -1 && !qnameStrProps.containsKey(propName))
+                    {
+                        String[] fieldValue = formDataParameters.get(propName);
+                        if (fieldValue.length > 1)
+                        {
+                            qnameStrProps.put(propName, Arrays.asList(fieldValue));
+                        }
+                        else
+                        {
+                            qnameStrProps.put(propName, fieldValue[0]);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Ensure mandatory file attributes have been located. Need either
+        // destination, or site + container or updateNodeRef
+        if ((fileName == null) || fileName.isEmpty() || (content == null))
+        {
+            throw new InvalidArgumentException("Required parameters are missing");
+        }
+
+        if (autoRename && overwrite)
+        {
+            throw new InvalidArgumentException("Both 'overwrite' and 'autoRename' should not be true when uploading a file");
+        }
+
+        // if requested, make (get or create) path
+        parentNodeRef = getOrCreatePath(parentNodeRef, relativePath);
+        final QName assocTypeQName = ContentModel.ASSOC_CONTAINS;
+        final Set<String> renditions = getRequestedRenditions(renditionNames);
+
+        validateProperties(qnameStrProps, EXCLUDED_NS,  Arrays.asList());
+        try
+        {
+            // Map the given properties, if any.
+            if (qnameStrProps.size() > 0)
+            {
+                properties = mapToNodeProperties(qnameStrProps);
+            }
+
+            /*
+             * Existing file handling
+             */
+            NodeRef existingFile = nodeService.getChildByName(parentNodeRef, assocTypeQName, fileName);
+            if (existingFile != null)
+            {
+                // File already exists, decide what to do
+                if (autoRename)
+                {
+                    // attempt to find a unique name
+                    fileName = findUniqueName(parentNodeRef, fileName);
+
+                    // drop-through !
+                }
+                else if (overwrite && nodeService.hasAspect(existingFile, ContentModel.ASPECT_VERSIONABLE))
+                {
+                    // overwrite existing (versionable) file
+                    BasicContentInfo contentInfo = new ContentInfoImpl(content.getMimetype(), content.getEncoding(), -1, null);
+                    return updateExistingFile(parentNodeRef, existingFile, fileName, contentInfo, content.getInputStream(), parameters, versionMajor, versionComment);
+                }
+                else
+                {
+                    // name clash (and no autoRename or overwrite)
+                    throw new ConstraintViolatedException(fileName + " already exists.");
+                }
+            }
+            
+            // Note: pending REPO-159, we currently auto-enable versioning on new upload (but not when creating empty file)
+            if (versionMajor == null)
+            {
+                versionMajor = true;
+            }
+
+            // Create a new file.
+            NodeRef nodeRef = createNewFile(parentNodeRef, fileName, nodeTypeQName, content, properties, assocTypeQName, parameters, versionMajor, versionComment);
+            
+            // Create the response
+            final Node fileNode = getFolderOrDocumentFullInfo(nodeRef, parentNodeRef, nodeTypeQName, parameters);
+
+            checkRenditionNames(renditions);
+            requestRenditions(renditions, fileNode);
+
+            return fileNode;
+
+            // Do not clean formData temp files to allow for retries.
+            // Temp files will be deleted later when GC call DiskFileItem#finalize() method or by temp file cleaner.
+        }
+        catch (AccessDeniedException ade)
+        {
+            throw new PermissionDeniedException(ade.getMessage());
+        }
+
+        /*
+         * NOTE: Do not clean formData temp files to allow for retries. It's
+         * possible for a temp file to remain if max retry attempts are
+         * made, but this is rare, so leave to usual temp file cleanup.
+         */
+    }
+
+    private NodeRef createNewFile(NodeRef parentNodeRef, String fileName, QName nodeType, Content content, Map<QName, Serializable> props, QName assocTypeQName, Parameters params,
+                                  Boolean versionMajor, String versionComment)
+    {
+        NodeRef nodeRef = createNodeImpl(parentNodeRef, fileName, nodeType, props, assocTypeQName);
+        
+        if (content == null)
+        {
+            // Write "empty" content
+            writeContent(nodeRef, fileName, new ByteArrayInputStream("".getBytes()), false);
+        }
+        else
+        {
+            // Write content
+            writeContent(nodeRef, fileName, content.getInputStream(), true);
+        }
+        
+        if ((versionMajor != null) || (versionComment != null))
+        {
+            behaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_VERSIONABLE);
+            try
+            {
+                // by default, first version is major, unless specified otherwise
+                VersionType versionType = VersionType.MAJOR;
+                if ((versionMajor != null) && (!versionMajor))
+                {
+                    versionType = VersionType.MINOR;
+                }
+
+                createVersion(nodeRef, false, versionType, versionComment);
+
+                extractMetadata(nodeRef);
+            } finally
+            {
+                behaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_VERSIONABLE);
+            }
+        }
+
+        return nodeRef;
+    }
+
+    private String getStringOrNull(String value)
+    {
+        if (StringUtils.isNotEmpty(value))
+        {
+            return value.equalsIgnoreCase("null") ? null : value;
+        }
+        return null;
+    }
+
+    private void checkRenditionNames(Set<String> renditionNames)
+    {
+        if (renditionNames != null)
+        {
+            if (!renditionService2.isEnabled())
+            {
+                throw new DisabledServiceException("Thumbnail generation has been disabled.");
+            }
+
+            RenditionDefinitionRegistry2 renditionDefinitionRegistry2 = renditionService2.getRenditionDefinitionRegistry2();
+            for (String renditionName : renditionNames)
+            {
+                RenditionDefinition2 renditionDefinition = renditionDefinitionRegistry2.getRenditionDefinition(renditionName);
+                if (renditionDefinition == null)
+                {
+                    throw new NotFoundException(renditionName + " is not registered.");
+                }
+            }
+        }
+    }
+
+    static Set<String> getRequestedRenditions(String renditionsParam)
+    {
+        if (renditionsParam == null)
+        {
+            return null;
+        }
+
+        String[] renditionNames = renditionsParam.split(",");
+
+        Set<String> renditions = new LinkedHashSet<>(renditionNames.length);
+        for (String name : renditionNames)
+        {
+            name = name.trim();
+            if (!name.isEmpty())
+            {
+                renditions.add(name.trim());
+            }
+        }
+        return renditions;
+    }
+
+    private void requestRenditions(Set<String> renditionNames, Node fileNode)
+    {
+        if (renditionNames != null)
+        {
+            NodeRef sourceNodeRef = fileNode.getNodeRef();
+            String mimeType = fileNode.getContent().getMimeType();
+            long size = fileNode.getContent().getSizeInBytes();
+            RenditionDefinitionRegistry2 renditionDefinitionRegistry2 = renditionService2.getRenditionDefinitionRegistry2();
+            Set<String> availableRenditions = renditionDefinitionRegistry2.getRenditionNamesFrom(mimeType, size);
+
+            for (String renditionName : renditionNames)
+            {
+                // RA-1052 (REPO-47)
+                try
+                {
+                    // File may be to big
+                    if (!availableRenditions.contains(renditionName))
+                    {
+                        throw new InvalidArgumentException("Unable to create thumbnail '" + renditionName + "' for " +
+                                mimeType + " as no transformer is currently available.");
+                    }
+
+                    renditionService2.render(sourceNodeRef, renditionName);
+                }
+                catch (Exception ex)
+                {
+                    // Note: The log level is not 'error' as it could easily fill out the log file.
+                    if (logger.isDebugEnabled())
+                    {
+                        // Don't throw the exception as we don't want the the upload to fail, just log it.
+                        logger.debug("Asynchronous request to create a rendition upon upload failed: " + ex.getMessage());
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Extracts the given node metadata asynchronously.
+     *
+     *  The overwrite policy controls which if any parts of the document's properties are updated from this.
+     */
+    private void extractMetadata(NodeRef nodeRef)
+    {
+        final String actionName = ContentMetadataExtracter.EXECUTOR_NAME;
+        ActionDefinition actionDef = actionService.getActionDefinition(actionName);
+        if (actionDef != null)
+        {
+            Action action = actionService.createAction(actionName);
+            actionService.executeAction(action, nodeRef);
+        }
+    }
+
+    /**
+     * Creates a unique file name, if the upload component was configured to
+     * find a new unique name for clashing filenames.
+     *
+     * @param parentNodeRef the parent node
+     * @param fileName      the original fileName
+     * @return a new file name
+     */
+    private String findUniqueName(NodeRef parentNodeRef, String fileName)
+    {
+        int counter = 1;
+        String tmpFilename;
+        NodeRef existingFile;
+        do
+        {
+            int dotIndex = fileName.lastIndexOf('.');
+            if (dotIndex == 0)
+            {
+                // File didn't have a proper 'name' instead it
+                // had just a suffix and started with a ".", create "1.txt"
+                tmpFilename = counter + fileName;
+            }
+            else if (dotIndex > 0)
+            {
+                // Filename contained ".", create "fileName-1.txt"
+                tmpFilename = fileName.substring(0, dotIndex) + "-" + counter + fileName.substring(dotIndex);
+            }
+            else
+            {
+                // Filename didn't contain a dot at all, create "fileName-1"
+                tmpFilename = fileName + "-" + counter;
+            }
+            existingFile = nodeService.getChildByName(parentNodeRef, ContentModel.ASSOC_CONTAINS, tmpFilename);
+            counter++;
+
+        } while (existingFile != null);
+
+        return tmpFilename;
+    }
+
+    /**
+     * Helper to create a QName from either a fully qualified or short-name QName string
+     *
+     * @param qnameStr Fully qualified or short-name QName string
+     * @return QName
+     */
+    public QName createQName(String qnameStr)
+    {
+        try
+        {
+            QName qname;
+            if (qnameStr.indexOf(QName.NAMESPACE_BEGIN) != -1)
+            {
+                qname = QName.createQName(qnameStr);
+            }
+            else
+            {
+                qname = QName.createQName(qnameStr, namespaceService);
+            }
+            return qname;
+        }
+        catch (Exception ex)
+        {
+            String msg = ex.getMessage();
+            if (msg == null)
+            {
+                msg = "";
+            }
+            throw new InvalidArgumentException(qnameStr + " isn't a valid QName. " + msg);
+        }
+    }
+
+    /**
+     * Helper to create a QName from either a fully qualified or short-name QName string
+     *
+     * @param qnameStrList list of fully qualified or short-name QName string
+     * @param excludedProps
+     * @return a list of {@code QName} objects
+     */
+    protected List<QName> createQNames(List<String> qnameStrList, List<QName> excludedProps)
+    {
+        String PREFIX = PARAM_INCLUDE_PROPERTIES +"/";
+
+        List<QName> result = new ArrayList<>(qnameStrList.size());
+        for (String str : qnameStrList)
+        {
+            if (str.startsWith(PREFIX))
+            {
+                str = str.substring(PREFIX.length());
+            }
+
+            QName name = createQName(str);
+            if (!excludedProps.contains(name))
+            {
+                result.add(name);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public Node lock(String nodeId, LockInfo lockInfo, Parameters parameters)
+    {
+        NodeRef nodeRef = validateOrLookupNode(nodeId, null);
+
+        if (isSpecialNode(nodeRef, getNodeType(nodeRef)))
+        {
+            throw new PermissionDeniedException("Current user doesn't have permission to lock node " + nodeId);
+        }
+
+        if (!nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_CONTENT), null, false))
+        {
+            throw new InvalidArgumentException("Node of type cm:content or a subtype is expected: " + nodeId);
+        }
+
+        LockInfo validatedLockInfo = validateLockInformation(lockInfo);
+        lockService.lock(nodeRef, validatedLockInfo.getMappedType(), validatedLockInfo.getTimeToExpire(), validatedLockInfo.getLifetime());
+
+        return getFolderOrDocument(nodeId, parameters);
+    }
+
+    private LockInfo validateLockInformation(LockInfo lockInfo)
+    {
+        // Set default values for the lock details.
+        if (lockInfo.getType() == null)
+        {
+            lockInfo.setType(LockInfo.LockType2.ALLOW_OWNER_CHANGES.name());
+        }
+        if (lockInfo.getLifetime() == null)
+        {
+            lockInfo.setLifetime(Lifetime.PERSISTENT.name());
+        }
+        if (lockInfo.getTimeToExpire() == null)
+        {
+            lockInfo.setTimeToExpire(0);
+        }
+        return lockInfo;
+    }
+
+    @Override
+    public Node unlock(String nodeId, Parameters parameters)
+    {
+        NodeRef nodeRef = validateOrLookupNode(nodeId, null);
+
+        if (isSpecialNode(nodeRef, getNodeType(nodeRef)))
+        {
+            throw new PermissionDeniedException("Current user doesn't have permission to unlock node " + nodeId);
+        }
+        if (!lockService.isLocked(nodeRef))
+        {
+            throw new IntegrityException("Can't unlock node " + nodeId + " because it isn't locked", null);
+        }
+
+        lockService.unlock(nodeRef);
+        return getFolderOrDocument(nodeId, parameters);
+    }
+
+    @Override
+    public DirectAccessUrl requestContentUrl(String nodeId, DirectAccessUrlRequest nodeDirectAccess)
+    {
+        NodeRef nodeRef = validateOrLookupNode(nodeId, null);
+        return requestContentUrl(nodeRef, nodeDirectAccess);
+    }
+
+    private void checkExpiryDate(Date expiryDate)
+    {
+        DateTime now = DateTime.now();
+        if (now.isAfter(expiryDate.getTime()))
+        {
+            throw new InvalidArgumentException("Invalid expiry date. Expiry date can't be in the past.");
+        }
+    }
+
+    @Override
+    public DirectAccessUrl requestContentUrl(NodeRef nodeRef, DirectAccessUrlRequest directAccessUrlRequest)
+    {
+        if (nodeRef == null)
+        {
+            throw new InvalidArgumentException("Missing nodeRef");
+        }
+
+        Date expiresAt = null;
+        if (directAccessUrlRequest != null)
+        {
+            if (directAccessUrlRequest.getExpiresAt() != null && directAccessUrlRequest.getValidFor() != null)
+            {
+                throw new InvalidArgumentException("Direct access url can not have both expiresAt and validFor set.");
+            }
+
+            if (directAccessUrlRequest.getExpiresAt() != null)
+            {
+                checkExpiryDate(directAccessUrlRequest.getExpiresAt());
+
+                expiresAt = directAccessUrlRequest.getExpiresAt();
+            }
+            else if (directAccessUrlRequest.getValidFor() != null)
+            {
+                Date expiration = new Date();
+                long expTimeMillis = expiration.getTime();
+
+                expTimeMillis += (directAccessUrlRequest.getValidFor() * 1000);
+                expiration.setTime(expTimeMillis);
+
+                checkExpiryDate(expiration);
+
+                expiresAt = expiration;
+            }
+        }
+
+        DirectAccessUrl directAccessUrl = contentService.getDirectAccessUrl(nodeRef, expiresAt);
+
+        if (directAccessUrl == null)
+        {
+            throw new DisabledServiceException("Direct access url isn't available.");
+        }
+
+        return directAccessUrl;
+    }
+
+    /**
+     * Checks if same permission is sent more than once
+     * @param locallySetPermissions
+     * @return
+     */
+    private boolean hasDuplicatePermissions(List<NodePermissions.NodePermission> locallySetPermissions)
+    {
+        boolean duplicate = false;
+        if (locallySetPermissions != null)
+        {
+            HashSet<NodePermissions.NodePermission> temp = new HashSet<>(locallySetPermissions.size());
+            for (NodePermissions.NodePermission permission : locallySetPermissions)
+            {
+                temp.add(permission);
+            }
+            duplicate = (locallySetPermissions.size() != temp.size());
+        }
+        return duplicate;
+    }
+    
+    /**
+     * 
+     * @param node
+     */
+    private boolean isFavorite(NodeRef node)
+    {
+        PreferenceService preferenceService = (PreferenceService) sr.getService(ServiceRegistry.PREFERENCE_SERVICE);
+        String currentUserName = AuthenticationUtil.getFullyAuthenticatedUser();
+        Map<String, Serializable> preferences = preferenceService.getPreferences(currentUserName);
+
+        for (Serializable nodesFavorites : preferences.values())
+        {
+            if (nodesFavorites instanceof String)
+            {
+                StringTokenizer st = new StringTokenizer((String) nodesFavorites, ",");
+                while (st.hasMoreTokens())
+                {
+                    String nodeRefStr = st.nextToken();
+                    nodeRefStr = nodeRefStr.trim();
+
+                    if (!NodeRef.isNodeRef((String) nodeRefStr))
+                    {
+                        continue;
+                    }
+
+                    NodeRef nodeRef = new NodeRef((String) nodeRefStr);
+
+                    if (nodeRef.equals(node))
+                    {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    public void validateAspects(List<String> aspectNames, List<String> excludedNS, List<QName> excludedAspects)
+    {
+        if (aspectNames != null && excludedNS != null && excludedAspects != null)
+        {
+            Set<QName> aspects = mapToNodeAspects(aspectNames);
+            aspects.forEach(aspect -> {
+                if (excludedNS != null && excludedNS.contains(aspect.getNamespaceURI()))
+                {
+                    throw new IllegalArgumentException("NameSpace cannot be used by API: " + aspect.toPrefixString());
+                }
+                if (excludedAspects != null && excludedAspects.contains(aspect))
+                {
+                    throw new IllegalArgumentException("Cannot be used by API: " + aspect.toPrefixString());
+                }
+            });
+        }
+    }
+
+    public void validateProperties(Map<String, Object> properties, List<String> excludedNS, List<QName> excludedProperties)
+    {
+        if (properties != null)
+        {
+            Map<QName, Serializable> nodeProps = mapToNodeProperties(properties);
+            nodeProps.keySet().forEach(property -> {
+                if ((excludedNS != null && excludedNS.contains(property.getNamespaceURI())))
+                {
+                    throw new IllegalArgumentException("NameSpace cannot be used by API: " + property.toPrefixString());
+                }
+                if ((excludedProperties != null && excludedProperties.contains(property)) || AuditablePropertiesEntity.getAuditablePropertyQNames().contains(property))
+                {
+                    throw new IllegalArgumentException("Cannot be used by API: " + property.toPrefixString());
+                }
+            });
+        }
+    }
+
+    /**
+     * @author Jamal Kaabi-Mofrad
+     */
+    /*
+    private static class ContentInfoWrapper implements BasicContentInfo
+    {
+        private String mimeType;
+        private String encoding;
+
+        public String getEncoding()
+        {
+            return encoding;
+        }
+
+        public String getMimeType()
+        {
+            return mimeType;
+        }
+
+        ContentInfoWrapper(BasicContentInfo basicContentInfo)
+        {
+            if (basicContentInfo != null)
+            {
+                this.mimeType = basicContentInfo.getMimeType();
+                this.encoding = basicContentInfo.getEncoding();
+            }
+        }
+
+        ContentInfoWrapper(ContentInfo contentInfo)
+        {
+            if (contentInfo != null)
+            {
+                this.mimeType = contentInfo.getMimeType();
+                this.encoding = contentInfo.getEncoding();
+            }
+        }
+
+        ContentInfoWrapper(Content content)
+        {
+            if (content != null && StringUtils.isNotEmpty(content.getMimetype()))
+            {
+                try
+                {
+                    // TODO I think it makes sense to push contentType parsing into org.springframework.extensions.webscripts.servlet.FormData
+                    MediaType media = MediaType.parseMediaType(content.getMimetype());
+                    this.mimeType = media.getType() + '/' + media.getSubtype();
+
+                    if (media.getCharSet() != null)
+                    {
+                        this.encoding = media.getCharSet().name();
+                    }
+                }
+                catch (InvalidMediaTypeException ime)
+                {
+                    throw new InvalidArgumentException(ime.getMessage());
+                }
+            }
+        }
+    }
+    */
+
+    protected NodeService getNodeService()
+    {
+        return nodeService;
+    }
+
+    protected DictionaryService getDictionaryService()
+    {
+        return dictionaryService;
+    }
+
+    protected FileFolderService getFileFolderService()
+    {
+        return fileFolderService;
+    }
+
+    protected NamespaceService getNamespaceService()
+    {
+        return namespaceService;
+    }
+
+    protected PermissionService getPermissionService()
+    {
+        return permissionService;
+    }
+
+    protected MimetypeService getMimetypeService()
+    {
+        return mimetypeService;
+    }
+
+    protected ContentService getContentService()
+    {
+        return contentService;
+    }
+
+    protected ActionService getActionService()
+    {
+        return actionService;
+    }
+
+    protected VersionService getVersionService()
+    {
+        return versionService;
+    }
+
+    protected PersonService getPersonService()
+    {
+        return personService;
+    }
+
+    protected OwnableService getOwnableService()
+    {
+        return ownableService;
+    }
+
+    protected AuthorityService getAuthorityService()
+    {
+        return authorityService;
+    }
+
+    @Deprecated
+    protected ThumbnailService getThumbnailService()
+    {
+        return thumbnailService;
+    }
+
+    protected SiteService getSiteService()
+    {
+        return siteService;
+    }
+
+    protected ActivityPoster getPoster()
+    {
+        return poster;
+    }
+
+    protected RetryingTransactionHelper getRetryingTransactionHelper()
+    {
+        return retryingTransactionHelper;
+    }
+
+    protected LockService getLockService()
+    {
+        return lockService;
+    }
+
+    protected VirtualStore getSmartStore()
+    {
+        return smartStore;
+    }
+
+    protected QuickShareLinks getQuickShareLinks()
+    {
+        return quickShareLinks;
+    }
+
+    protected Repository getRepositoryHelper()
+    {
+        return repositoryHelper;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java
new file mode 100644
index 00000000000..9d8ea818cc1
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java
@@ -0,0 +1,959 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.security.authentication.ResetPasswordService;
+import org.alfresco.repo.security.authentication.ResetPasswordServiceImpl.ResetPasswordDetails;
+import org.alfresco.repo.security.authentication.ResetPasswordServiceImpl.ResetPasswordWorkflowException;
+import org.alfresco.repo.security.authentication.ResetPasswordServiceImpl.ResetPasswordWorkflowInvalidUserException;
+import org.alfresco.repo.security.sync.UserRegistrySynchronizer;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.Renditions;
+import org.alfresco.rest.api.Sites;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.PasswordReset;
+import org.alfresco.rest.api.model.Person;
+import org.alfresco.rest.api.model.Rendition;
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.DisabledServiceException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.NoSuchPersonException;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.thumbnail.ThumbnailService;
+import org.alfresco.service.cmr.usage.ContentUsageService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Centralises access to people services and maps between representations.
+ * 
+ * @author steveglover
+ * @since publicapi1.0
+ */
+public class PeopleImpl implements People
+{
+    private static final Log LOGGER = LogFactory.getLog(PeopleImpl.class);
+
+    private static final List<String> EXCLUDED_NS = Arrays.asList(
+            NamespaceService.SYSTEM_MODEL_1_0_URI,
+            "http://www.alfresco.org/model/user/1.0",
+            NamespaceService.CONTENT_MODEL_1_0_URI);
+    private static final List<QName> EXCLUDED_ASPECTS = Arrays.asList();
+    private static final List<QName> EXCLUDED_PROPS = Arrays.asList();
+    private static final int USERNAME_MAXLENGTH = 100;
+    private static final String[] RESERVED_AUTHORITY_PREFIXES =
+    {
+            PermissionService.GROUP_PREFIX,
+            PermissionService.ROLE_PREFIX
+    };
+
+    protected Nodes nodes;
+	protected Sites sites;
+	protected SiteService siteService;
+	protected NodeService nodeService;
+    protected PersonService personService;
+    protected AuthenticationService authenticationService;
+    protected AuthorityService authorityService;
+    protected ContentUsageService contentUsageService;
+    protected ContentService contentService;
+    protected ThumbnailService thumbnailService;
+    protected ResetPasswordService resetPasswordService;
+    protected UserRegistrySynchronizer userRegistrySynchronizer;
+    protected Renditions renditions;
+
+
+    private final static Map<String, QName> sort_params_to_qnames;
+    static
+    {
+        Map<String, QName> aMap = new HashMap<>(3);
+        aMap.put(PARAM_FIRST_NAME, ContentModel.PROP_FIRSTNAME);
+        aMap.put(PARAM_LAST_NAME, ContentModel.PROP_LASTNAME);
+        aMap.put(PARAM_ID, ContentModel.PROP_USERNAME);
+        sort_params_to_qnames = Collections.unmodifiableMap(aMap);
+    }
+
+	public void setSites(Sites sites)
+	{
+		this.sites = sites;
+	}
+
+	public void setSiteService(SiteService siteService)
+	{
+		this.siteService = siteService;
+	}
+
+	public void setNodes(Nodes nodes)
+	{
+		this.nodes = nodes;
+	}
+
+	public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+	
+	public void setPersonService(PersonService personService)
+    {
+		this.personService = personService;
+	}
+
+    public void setAuthenticationService(AuthenticationService authenticationService)
+    {
+		this.authenticationService = authenticationService;
+	}
+
+    public void setAuthorityService(AuthorityService authorityService)
+    {
+        this.authorityService = authorityService;
+    }
+
+    public void setContentUsageService(ContentUsageService contentUsageService)
+    {
+		this.contentUsageService = contentUsageService;
+	}
+
+	public void setContentService(ContentService contentService)
+	{
+		this.contentService = contentService;
+	}
+	
+	public void setThumbnailService(ThumbnailService thumbnailService)
+    {
+		this.thumbnailService = thumbnailService;
+	}
+
+    public void setResetPasswordService(ResetPasswordService resetPasswordService)
+    {
+        this.resetPasswordService = resetPasswordService;
+    }
+
+    public void setRenditions(Renditions renditions)
+    {
+        this.renditions = renditions;
+    }
+
+    public void setUserRegistrySynchronizer(UserRegistrySynchronizer userRegistrySynchronizer)
+    {
+        this.userRegistrySynchronizer = userRegistrySynchronizer;
+    }
+
+    /**
+     * Validate, perform -me- substitution and canonicalize the person ID.
+     * 
+     * @param personId
+     * @return The validated and processed ID.
+     */
+    @Override
+	public String validatePerson(String personId)
+	{
+		return validatePerson(personId, false);
+	}
+
+    @Override
+	public String validatePerson(final String requestedPersonId, boolean validateIsCurrentUser)
+	{
+        String personId = requestedPersonId;
+		if(personId == null)
+		{
+			throw new InvalidArgumentException("personId is null.");
+		}
+        
+    	if(personId.equalsIgnoreCase(DEFAULT_USER))
+    	{
+    		personId = AuthenticationUtil.getFullyAuthenticatedUser();
+    	}
+
+    	personId = personService.getUserIdentifier(personId);
+		if(personId == null)
+		{
+            // Could not find canonical user ID by case-sensitive ID.
+            throw new EntityNotFoundException(requestedPersonId);
+		}
+
+		if(validateIsCurrentUser)
+		{
+			String currentUserId = AuthenticationUtil.getFullyAuthenticatedUser();
+			if(!currentUserId.equalsIgnoreCase(personId))
+			{
+				throw new EntityNotFoundException(personId);
+			}
+		}
+
+    	return personId;
+	}
+
+    protected void processPersonProperties(String userName, final Map<QName, Serializable> nodeProps)
+    {
+		if(!contentUsageService.getEnabled())
+		{
+			// quota used will always be 0 in this case so remove from the person properties
+			nodeProps.remove(ContentModel.PROP_SIZE_QUOTA);
+			nodeProps.remove(ContentModel.PROP_SIZE_CURRENT);
+		}
+
+		// The person description is located in a separate content file located at cm:persondescription
+		// "Inline" this data, by removing the cm:persondescription property and adding a temporary property
+		// (Person.PROP_PERSON_DESCRIPTION) containing the actual content as a string.
+		final ContentData personDescription = (ContentData)nodeProps.get(ContentModel.PROP_PERSONDESC);
+		if(personDescription != null)
+		{
+			nodeProps.remove(ContentModel.PROP_PERSONDESC);
+
+			AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
+			{
+				@Override
+				public Void doWork() throws Exception
+				{
+					ContentReader reader = contentService.getRawReader(personDescription.getContentUrl());
+					if(reader != null && reader.exists())
+					{
+						String description = reader.getContentString();
+						nodeProps.put(Person.PROP_PERSON_DESCRIPTION, description);
+					}
+
+					return null;
+				}
+			});
+		}
+    }
+
+    public boolean hasAvatar(NodeRef personNodeRef)
+    {
+    	return (getAvatarOriginal(personNodeRef) != null);
+    }
+
+    @Override
+    public NodeRef getAvatar(String personId)
+    {
+    	NodeRef avatar = null;
+    	personId = validatePerson(personId);
+    	NodeRef personNode = personService.getPerson(personId);
+    	if(personNode != null)
+    	{
+            NodeRef avatarOrig = getAvatarOriginal(personNode);
+            avatar = thumbnailService.getThumbnailByName(avatarOrig, ContentModel.PROP_CONTENT, "avatar");
+    	}
+
+    	if (avatar == null)
+    	{
+    		throw new EntityNotFoundException(personId);
+    	}
+
+    	return avatar;
+    }
+
+    private NodeRef getAvatarOriginal(NodeRef personNode)
+    {
+        NodeRef avatarOrigNodeRef = null;
+        List<ChildAssociationRef> avatarChildAssocs = nodeService.getChildAssocs(personNode, Collections.singleton(ContentModel.ASSOC_PREFERENCE_IMAGE));
+        if (avatarChildAssocs.size() > 0)
+        {
+            ChildAssociationRef ref = avatarChildAssocs.get(0);
+            avatarOrigNodeRef = ref.getChildRef();
+        }
+        else
+        {
+            // TODO do we still need this ? - backward compatible with JSF web-client avatar
+            List<AssociationRef> avatorAssocs = nodeService.getTargetAssocs(personNode, ContentModel.ASSOC_AVATAR);
+            if (avatorAssocs.size() > 0)
+            {
+                AssociationRef ref = avatorAssocs.get(0);
+                avatarOrigNodeRef = ref.getTargetRef();
+            }
+        }
+        return avatarOrigNodeRef;
+    }
+
+    @Override
+    public BinaryResource downloadAvatarContent(String personId, Parameters parameters)
+    {
+        personId = validatePerson(personId);
+        NodeRef personNode = personService.getPerson(personId);
+        NodeRef avatarNodeRef = getAvatarOriginal(personNode);
+
+        return renditions.getContentNoValidation(avatarNodeRef, "avatar", parameters);
+    }
+
+    @Override
+    public Person uploadAvatarContent(String personId, BasicContentInfo contentInfo, InputStream stream, Parameters parameters)
+    {
+        if (!thumbnailService.getThumbnailsEnabled())
+        {
+            throw new DisabledServiceException("Thumbnail generation has been disabled.");
+        }
+
+        personId = validatePerson(personId);
+        checkCurrentUserOrAdmin(personId);
+
+        NodeRef personNode = personService.getPerson(personId);
+        NodeRef avatarOrigNodeRef = getAvatarOriginal(personNode);
+
+        if (avatarOrigNodeRef != null)
+        {
+            deleteAvatar(avatarOrigNodeRef);
+        }
+
+        QName origAvatarQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "origAvatar");
+        nodeService.addAspect(personNode, ContentModel.ASPECT_PREFERENCES, null);
+        ChildAssociationRef assoc = nodeService.createNode(personNode, ContentModel.ASSOC_PREFERENCE_IMAGE, origAvatarQName,
+                ContentModel.TYPE_CONTENT);
+        NodeRef avatar = assoc.getChildRef();
+        String avatarOriginalNodeId = avatar.getId();
+
+        // TODO do we still need this ? - backward compatible with JSF web-client avatar
+        nodeService.createAssociation(personNode, avatar, ContentModel.ASSOC_AVATAR);
+
+        Node n = nodes.updateContent(avatarOriginalNodeId, contentInfo, stream, parameters);
+        String mimeType = n.getContent().getMimeType();
+
+        if (mimeType.indexOf("image/") != 0)
+        {
+            throw new InvalidArgumentException(
+                    "Uploaded content must be an image (content type determined to be '"+mimeType+"')");
+        }
+
+        // create thumbnail synchronously
+        Rendition avatarR = new Rendition();
+        avatarR.setId("avatar");
+        renditions.createRendition(avatar, avatarR, false, parameters);
+
+        List<String> include = Arrays.asList(
+                PARAM_INCLUDE_ASPECTNAMES,
+                PARAM_INCLUDE_PROPERTIES);
+
+        return getPersonWithProperties(personId, include);
+    }
+
+    @Override
+    public void deleteAvatarContent(String personId)
+    {
+        personId = validatePerson(personId);
+        checkCurrentUserOrAdmin(personId);
+
+        NodeRef personNode = personService.getPerson(personId);
+        NodeRef avatarOrigNodeRef = getAvatarOriginal(personNode);
+        if (avatarOrigNodeRef != null)
+        {
+            deleteAvatar(avatarOrigNodeRef);
+        }
+    }
+
+    private void deleteAvatar(NodeRef avatarOrigNodeRef)
+    {
+        // Set as temporary to permanently delete node (instead of archiving)
+        nodeService.addAspect(avatarOrigNodeRef, ContentModel.ASPECT_TEMPORARY, null);
+
+        nodeService.deleteNode(avatarOrigNodeRef);
+    }
+
+
+    /**
+     * Get a full representation of a person.
+     * 
+     * @throws NoSuchPersonException
+     *             if personId does not exist
+     */
+    @Override
+    public Person getPerson(String personId)
+    {
+        personId = validatePerson(personId);
+        List<String> include = Arrays.asList(
+                PARAM_INCLUDE_ASPECTNAMES,
+                PARAM_INCLUDE_PROPERTIES,
+                PARAM_INCLUDE_CAPABILITIES);
+        Person person = getPersonWithProperties(personId, include);
+
+        return person;
+    }
+    
+    public Person getPerson(String personId, List<String> include)
+    {
+        personId = validatePerson(personId);
+        Person person = getPersonWithProperties(personId, include);
+
+        return person;
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Person> getPeople(final Parameters parameters)
+    {
+        Paging paging = parameters.getPaging();
+        PagingRequest pagingRequest = Util.getPagingRequest(paging);
+
+        List<Pair<QName, Boolean>> sortProps = getSortProps(parameters);
+
+        // For now the results are not filtered
+        // please see REPO-555
+        final PagingResults<PersonService.PersonInfo> pagingResult = personService.getPeople(null, null, sortProps, pagingRequest);
+
+        final List<PersonService.PersonInfo> page = pagingResult.getPage();
+        int totalItems = pagingResult.getTotalResultCount().getFirst();
+        final String personId = AuthenticationUtil.getFullyAuthenticatedUser();
+        List<Person> people = new AbstractList<Person>()
+        {
+            @Override
+            public Person get(int index)
+            {
+                PersonService.PersonInfo personInfo = page.get(index);
+                Person person = getPersonWithProperties(personInfo.getUserName(), parameters.getInclude());
+                return person;
+            }
+
+            @Override
+            public int size()
+            {
+                return page.size();
+            }
+        };
+
+        return CollectionWithPagingInfo.asPaged(paging, people, pagingResult.hasMoreItems(), totalItems);
+    }
+
+    private List<Pair<QName, Boolean>> getSortProps(Parameters parameters)
+    {
+        List<Pair<QName, Boolean>> sortProps = new ArrayList<>();
+        List<SortColumn> sortCols = parameters.getSorting();
+        if ((sortCols != null) && (sortCols.size() > 0))
+        {
+            for (SortColumn sortCol : sortCols)
+            {
+                QName sortPropQName = sort_params_to_qnames.get(sortCol.column);
+                if (sortPropQName == null)
+                {
+                    throw new InvalidArgumentException("Invalid sort field: " + sortCol.column);
+                }
+                sortProps.add(new Pair<>(sortPropQName, (sortCol.asc ? Boolean.TRUE : Boolean.FALSE)));
+            }
+        }
+        else
+        {
+            // default sort order
+            sortProps.add(new Pair<>(ContentModel.PROP_USERNAME, Boolean.TRUE));
+        }
+        return sortProps;
+    }
+
+    private Person getPersonWithProperties(String personId, List<String> include)
+    {
+        Person person = null;
+        NodeRef personNode = personService.getPerson(personId, false);
+        if (personNode != null)
+        {
+            Map<QName, Serializable> nodeProps = nodeService.getProperties(personNode);
+            processPersonProperties(personId, nodeProps);
+            // TODO this needs to be run as admin but should we do this here?
+            final String pId = personId;
+            Boolean enabled = AuthenticationUtil.runAsSystem(new RunAsWork<Boolean>()
+            {
+                public Boolean doWork() throws Exception
+                {
+                    return authenticationService.getAuthenticationEnabled(pId);
+                }
+            });
+            person = new Person(personNode, nodeProps, enabled);
+
+            // Remove the temporary property used to help inline the person description content property.
+            // It may be accessed from the person object (person.getDescription()).
+            nodeProps.remove(Person.PROP_PERSON_DESCRIPTION);
+
+            // Expose properties
+            if (include.contains(PARAM_INCLUDE_PROPERTIES))
+            {
+                // Note that custProps may be null.
+                Map<String, Object> custProps = nodes.mapFromNodeProperties(nodeProps, new ArrayList<>(), new HashMap<>(), EXCLUDED_NS, EXCLUDED_PROPS);
+                person.setProperties(custProps);
+            }
+            if (include.contains(PARAM_INCLUDE_ASPECTNAMES))
+            {
+                // Expose aspect names
+                Set<QName> aspects = nodeService.getAspects(personNode);
+                person.setAspectNames(nodes.mapFromNodeAspects(aspects, EXCLUDED_NS, EXCLUDED_ASPECTS));
+            }
+            if (include.contains(PARAM_INCLUDE_CAPABILITIES))
+            {
+                // Expose capabilities
+                Map<String, Boolean> capabilities = new HashMap<>(3);
+                capabilities.put("isAdmin", isAdminAuthority(personId));
+                capabilities.put("isGuest", isGuestAuthority(personId));
+                capabilities.put("isMutable", isMutableAuthority(personId));
+                person.setCapabilities(capabilities);               
+            }
+            
+            // get avatar information
+            if (hasAvatar(personNode))
+            {
+                try
+                {
+                    NodeRef avatar = getAvatar(personId);
+                    person.setAvatarId(avatar);
+                }
+                catch (EntityNotFoundException e)
+                {
+                    // shouldn't happen, but ok
+                }
+            }
+        }
+        else
+        {
+            throw new EntityNotFoundException(personId);
+        }
+
+        return person;
+    }
+
+    @Override
+    public Person create(Person person)
+    {
+        validateCreatePersonData(person);
+
+        if (! isAdminAuthority())
+        {
+            // note: do an explict check for admin here (since personExists does not throw 403 unlike createPerson,
+            // hence next block would cause 409 to be returned)
+            throw new PermissionDeniedException();
+        }
+
+        // Unfortunately PersonService.createPerson(...) only throws an AlfrescoRuntimeException
+        // rather than a more specific exception and does not use a message ID either, so there's
+        // no sensible way to know that it was thrown due to the user already existing - hence this check here.
+        if (personService.personExists(person.getUserName()))
+        {
+            throw new ConstraintViolatedException("Person '" + person.getUserName() + "' already exists.");
+        }
+
+        // set enabled default value true
+        if (person.isEnabled() == null)
+        {
+            person.setEnabled(true);
+        }
+
+        Map<QName, Serializable> props = person.toProperties();
+
+		MutableAuthenticationService mas = (MutableAuthenticationService) authenticationService;
+		mas.createAuthentication(person.getUserName(), person.getPassword().toCharArray());
+		mas.setAuthenticationEnabled(person.getUserName(), person.isEnabled());
+
+		// Add custom properties
+		if (person.getProperties() != null)
+		{
+			Map<String, Object> customProps = person.getProperties();
+			props.putAll(nodes.mapToNodeProperties(customProps));
+		}
+		
+		NodeRef nodeRef = personService.createPerson(props);
+		
+		// Add custom aspects
+		nodes.addCustomAspects(nodeRef, person.getAspectNames(), EXCLUDED_ASPECTS);
+		
+        // Write the contents of PersonUpdate.getDescription() text to a content file
+        // and store the content URL in ContentModel.PROP_PERSONDESC
+        if (person.getDescription() != null)
+        {
+            savePersonDescription(person.getDescription(), nodeRef);
+        }
+
+        // Return a fresh retrieval
+        return getPerson(person.getUserName());
+    }
+	
+    /**
+     * Write the description to a content file and store the content URL in
+     * ContentModel.PROP_PERSONDESC
+     * 
+     * @param description
+     * @param nodeRef
+     */
+    private void savePersonDescription(final String description, final NodeRef nodeRef)
+    {
+        AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                if (description != null)
+                {
+                    ContentWriter writer = contentService.getWriter(nodeRef, ContentModel.PROP_PERSONDESC, true);
+                    writer.putContent(description);
+                }
+                else
+                {
+                    nodeService.setProperty(nodeRef, ContentModel.PROP_PERSONDESC, null);
+                }
+                return null;
+            }
+        });
+    }
+
+    private void validateCreatePersonData(Person person)
+    {
+        // Mandatory field checks first
+        checkRequiredField("id", person.getUserName());
+        checkRequiredField("firstName", person.getFirstName());
+        checkRequiredField("email", person.getEmail());
+        checkRequiredField("password", person.getPassword());
+
+        validateUsername(person.getUserName());
+        nodes.validateAspects(person.getAspectNames(), EXCLUDED_NS, EXCLUDED_ASPECTS);
+        nodes.validateProperties(person.getProperties(), EXCLUDED_NS, EXCLUDED_PROPS);
+    }
+
+    private void validateUsername(String username)
+    {
+        if (username.length() > 100)
+        {
+            throw new InvalidArgumentException("Username exceeds max length of " + USERNAME_MAXLENGTH + " characters.");
+        }
+
+        for (String prefix : RESERVED_AUTHORITY_PREFIXES)
+        {
+            if (username.toUpperCase().startsWith(prefix))
+            {
+                throw new IllegalArgumentException("Username cannot start with the reserved prefix '"+prefix+"'.");
+            }
+        }
+    }
+
+    private void checkRequiredField(String fieldName, Object fieldValue)
+	{
+		if (fieldValue == null)
+		{
+			throw new InvalidArgumentException("Field '"+fieldName+"' is null, but is required.");
+		}
+
+        // belts-and-braces - note: should not see empty string (since converted to null via custom json deserializer)
+        if ((fieldValue instanceof String) && ((String)fieldValue).isEmpty())
+        {
+            throw new InvalidArgumentException("Field '"+fieldName+"' is empty, but is required.");
+        }
+	}
+
+    @Override
+    public Person update(String personId, final Person person)
+    {
+        // Validate, perform -me- substitution and canonicalize the person ID.
+        personId = validatePerson(personId);
+        validateUpdatePersonData(person);
+
+        // Check if user updating *their own* details or is an admin
+        boolean isAdmin = checkCurrentUserOrAdmin(personId);
+
+        final String personIdToUpdate = validatePerson(personId);
+        final Map<QName, Serializable> properties = person.toProperties();
+
+        // if requested, update password
+        updatePassword(isAdmin, personIdToUpdate, person);
+
+        if (person.isEnabled() != null)
+        {
+            if (isAdminAuthority(personIdToUpdate))
+            {
+                throw new PermissionDeniedException("Admin authority cannot be disabled.");
+            }
+
+            // note: if current user is not an admin then permission denied exception is thrown
+            MutableAuthenticationService mutableAuthenticationService = (MutableAuthenticationService) authenticationService;
+            mutableAuthenticationService.setAuthenticationEnabled(personIdToUpdate, person.isEnabled());
+        }
+
+		NodeRef personNodeRef = personService.getPerson(personIdToUpdate, false);
+		if (person.wasSet(Person.PROP_PERSON_DESCRIPTION))
+        {
+			// Remove person description from saved properties
+			properties.remove(ContentModel.PROP_PERSONDESC);
+
+			// Custom save for person description.
+            savePersonDescription(person.getDescription(), personNodeRef);
+        }
+
+        // Update custom aspects - do this *before* adding custom properties. The
+        // addition of custom properties may result in the auto-addition of aspects
+        // and we don't want to remove them during the update of explicitly specified aspects.
+        nodes.updateCustomAspects(personNodeRef, person.getAspectNames(), EXCLUDED_ASPECTS);
+        
+		// Add custom properties
+		if (person.getProperties() != null)
+		{
+			Map<String, Object> customProps = person.getProperties();
+			properties.putAll(nodes.mapToNodeProperties(customProps));
+		}
+
+        // MNT-21150 LDAP synced attributes can be changed using REST API
+        Set<QName> immutableProperties = userRegistrySynchronizer.getPersonMappedProperties(personIdToUpdate);
+
+        immutableProperties.forEach(immutableProperty -> {
+            if (properties.containsKey(immutableProperty))
+            {
+                properties.remove(immutableProperty);
+            }
+        });
+
+        // The person service only allows admin users to set the properties by default.
+        if(!properties.isEmpty())
+        {
+            AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
+            {
+                @Override public Void doWork() throws Exception
+                {
+                    personService.setPersonProperties(personIdToUpdate, properties, false);
+                    return null;
+                }
+            });
+        }
+		
+        return getPerson(personId);
+    }
+
+    private boolean checkCurrentUserOrAdmin(String personId)
+    {
+        boolean isAdmin = isAdminAuthority();
+
+        String currentUserId = AuthenticationUtil.getFullyAuthenticatedUser();
+        if (!isAdmin && !currentUserId.equalsIgnoreCase(personId))
+        {
+            throw new PermissionDeniedException();
+        }
+
+        return isAdmin;
+    }
+
+    private void validateUpdatePersonData(Person person)
+    {
+        nodes.validateAspects(person.getAspectNames(), EXCLUDED_NS, EXCLUDED_ASPECTS);
+        nodes.validateProperties(person.getProperties(), EXCLUDED_NS, EXCLUDED_PROPS);
+        
+        if (person.wasSet(ContentModel.PROP_FIRSTNAME))
+        {
+            checkRequiredField("firstName", person.getFirstName());
+        }
+
+        if (person.wasSet(ContentModel.PROP_EMAIL))
+        {
+            checkRequiredField("email", person.getEmail());
+        }
+
+        if (person.wasSet(ContentModel.PROP_ENABLED) && (person.isEnabled() == null))
+        {
+            throw new IllegalArgumentException("'enabled' field cannot be empty.");
+        }
+
+        if (person.wasSet(ContentModel.PROP_EMAIL_FEED_DISABLED) && (person.isEmailNotificationsEnabled() == null))
+        {
+            throw new IllegalArgumentException("'emailNotificationsEnabled' field cannot be empty.");
+        }
+    }
+
+    private void updatePassword(boolean isAdmin, String personIdToUpdate, Person person)
+    {
+        MutableAuthenticationService mutableAuthenticationService = (MutableAuthenticationService) authenticationService;
+
+        boolean isOldPassword = person.wasSet(Person.PROP_PERSON_OLDPASSWORD);
+        boolean isPassword = person.wasSet(Person.PROP_PERSON_PASSWORD);
+
+        if (isPassword || isOldPassword)
+        {
+            if (isOldPassword && ((person.getOldPassword() == null) || (person.getOldPassword().isEmpty())))
+            {
+                throw new IllegalArgumentException("'oldPassword' field cannot be empty.");
+            }
+
+            if (!isPassword || (person.getPassword() == null) || (person.getPassword().isEmpty()))
+            {
+                throw new IllegalArgumentException("password' field cannot be empty.");
+            }
+
+            char[] newPassword = person.getPassword().toCharArray();
+
+            if (!isAdmin)
+            {
+                // Non-admin users can update their own password, but must provide their current password.
+                if (!isOldPassword)
+                {
+                    throw new IllegalArgumentException("To change password, both 'oldPassword' and 'password' fields are required.");
+                }
+
+                char[] oldPassword = person.getOldPassword().toCharArray();
+                try
+                {
+                    mutableAuthenticationService.updateAuthentication(personIdToUpdate, oldPassword, newPassword);
+                }
+                catch (AuthenticationException e)
+                {
+                    throw new PermissionDeniedException("Incorrect password.");
+                }
+            }
+            else
+            {
+                // An admin user can update without knowing the original pass - but must know their own!
+                // note: is it reasonable to silently ignore oldPassword if supplied ?
+
+                mutableAuthenticationService.setAuthentication(personIdToUpdate, newPassword);
+            }
+        }
+    }
+
+    private boolean isAdminAuthority()
+    {
+        return authorityService.hasAdminAuthority();
+    }
+
+    private boolean isAdminAuthority(String authorityName)
+    {
+        return authorityService.isAdminAuthority(authorityName);
+    }
+
+    @Override
+    public void requestPasswordReset(String userId, String client)
+    {
+        // Validate the userId and the client
+        checkRequiredField("userId", userId);
+        checkRequiredField("client", client);
+
+        // This is an un-authenticated API call so we wrap it to run as System
+        AuthenticationUtil.runAsSystem(() -> {
+            try
+            {
+                resetPasswordService.requestReset(userId, client);
+            }
+            catch (ResetPasswordWorkflowInvalidUserException ex)
+            {
+                // we don't throw an exception.
+                // For security reason (prevent the attackers to determine that userId exists in the system or not),
+                // the endpoint returns a 202 response if the userId does not exist or
+                // if the user is disabled by an Administrator.
+                if (LOGGER.isDebugEnabled())
+                {
+                    LOGGER.debug("Invalid user. " + ex.getMessage());
+                }
+            }
+
+            return null;
+        });
+    }
+
+    @Override
+    public void resetPassword(String personId, final PasswordReset passwordReset)
+    {
+        checkResetPasswordData(passwordReset);
+        checkRequiredField("personId", personId);
+
+        ResetPasswordDetails resetDetails = new ResetPasswordDetails()
+                    .setUserId(personId)
+                    .setPassword(passwordReset.getPassword())
+                    .setWorkflowId(passwordReset.getId())
+                    .setWorkflowKey(passwordReset.getKey());
+        try
+        {
+            // This is an un-authenticated API call so we wrap it to run as System
+            AuthenticationUtil.runAsSystem(() -> {
+                resetPasswordService.initiateResetPassword(resetDetails);
+
+                return null;
+            });
+
+        }
+        catch (ResetPasswordWorkflowException ex)
+        {
+            // we don't throw an exception.
+            // For security reason, the endpoint returns a 202 response
+            // See APPSREPO-35 acceptance criteria
+            if (LOGGER.isWarnEnabled())
+            {
+                LOGGER.warn(ex.getMessage());
+            }
+        }
+    }
+
+    private void checkResetPasswordData(PasswordReset data)
+    {
+        checkRequiredField("password", data.getPassword());
+        checkRequiredField("id", data.getId());
+        checkRequiredField("key", data.getKey());
+    }
+
+    private boolean isGuestAuthority(String authorityName)
+    {
+        return authorityService.isGuestAuthority(authorityName);
+    }
+
+    private boolean isMutableAuthority(String authorityName)
+    {
+        MutableAuthenticationService mutableAuthenticationService = (MutableAuthenticationService) authenticationService;
+        // Check whether the account is mutable according to the authentication service
+        if (!mutableAuthenticationService.isAuthenticationMutable(authorityName))
+        {
+            return false;
+        }
+        // Only allow non-admin users to mutate their own accounts
+        String currentUser = mutableAuthenticationService.getCurrentUserName();
+        if (currentUser.equals(authorityName) || authorityService.isAdminAuthority(currentUser))
+        {
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/PreferencesImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/PreferencesImpl.java
new file mode 100644
index 00000000000..abdf9ee8c68
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/PreferencesImpl.java
@@ -0,0 +1,91 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.query.PagingResults;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.Preferences;
+import org.alfresco.rest.api.model.Preference;
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.service.cmr.preference.PreferenceService;
+import org.alfresco.util.Pair;
+
+/**
+ * Centralises access to preference services and maps between representations.
+ * 
+ * @author steveglover
+ * @since publicapi1.0
+ */
+public class PreferencesImpl implements Preferences
+{
+	private People people;
+    private PreferenceService preferenceService;
+    
+	public void setPeople(People people)
+	{
+		this.people = people;
+	}
+
+	public void setPreferenceService(PreferenceService preferenceService)
+	{
+		this.preferenceService = preferenceService;
+	}
+
+	public Preference getPreference(String personId, String preferenceName)
+	{
+		personId = people.validatePerson(personId);
+		Serializable preferenceValue = preferenceService.getPreference(personId, preferenceName);
+		if(preferenceValue != null)
+		{
+			return new Preference(preferenceName, preferenceValue);
+		}
+		else
+		{
+			throw new RelationshipResourceNotFoundException(personId, preferenceName);
+		}
+	}
+	
+	public CollectionWithPagingInfo<Preference> getPreferences(String personId, Paging paging)
+	{
+		personId = people.validatePerson(personId);
+
+		PagingResults<Pair<String, Serializable>> preferences = preferenceService.getPagedPreferences(personId, null, Util.getPagingRequest(paging));
+		List<Preference> ret = new ArrayList<Preference>(preferences.getPage().size());
+		for(Pair<String, Serializable> prefEntity : preferences.getPage())
+		{
+			Preference pref = new Preference(prefEntity.getFirst(), prefEntity.getSecond());
+			ret.add(pref);
+		}
+
+        return CollectionWithPagingInfo.asPaged(paging, ret, preferences.hasMoreItems(), preferences.getTotalResultCount().getFirst());
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/QueriesImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/QueriesImpl.java
new file mode 100644
index 00000000000..c86c064e8d9
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/QueriesImpl.java
@@ -0,0 +1,651 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.impl;
+
+import static org.alfresco.rest.api.impl.QueriesImpl.AbstractQuery.Sort.IN_QUERY_SORT;
+import static org.alfresco.rest.api.impl.QueriesImpl.AbstractQuery.Sort.POST_QUERY_SORT;
+
+import java.io.Serializable;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.Queries;
+import org.alfresco.rest.api.Sites;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.Person;
+import org.alfresco.rest.api.model.Site;
+import org.alfresco.rest.api.model.UserInfo;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.PermissionEvaluationMode;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.AlfrescoCollator;
+import org.alfresco.util.ISO9075;
+import org.alfresco.util.ParameterCheck;
+import org.alfresco.util.SearchLanguageConversion;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * Queries implementation
+ * 
+ * @author janv
+ * @author Alan Davis
+ */
+public class QueriesImpl implements Queries, InitializingBean
+{
+    private final static Map<String,QName> NODE_SORT_PARAMS_TO_QNAMES = sortParamsToQNames(
+        PARAM_NAME,       ContentModel.PROP_NAME,
+        PARAM_CREATEDAT,  ContentModel.PROP_CREATED,
+        PARAM_MODIFIEDAT, ContentModel.PROP_MODIFIED);
+
+    private final static Map<String, QName> PEOPLE_SORT_PARAMS_TO_QNAMES = sortParamsToQNames(
+        PARAM_PERSON_ID, ContentModel.PROP_USERNAME,
+        ContentModel.PROP_FIRSTNAME,
+        ContentModel.PROP_LASTNAME);
+
+    private final static Map<String, QName> SITE_SORT_PARAMS_TO_QNAMES = sortParamsToQNames(
+            PARAM_SITE_ID,  ContentModel.PROP_NAME,
+            PARAM_SITE_TITLE,  ContentModel.PROP_TITLE,
+            PARAM_SITE_DESCRIPTION, ContentModel.PROP_DESCRIPTION);
+
+    /**
+     * Helper method to build a map of sort parameter names to QNames. This method iterates through
+     * the parameters. If a parameter is a String it is assumed to be a sort parameter name and will
+     * be followed by a QName to which it maps. If however it is a QName the local name of the OName
+     * is used as the sort parameter name.
+     * @param parameters to build up the map.
+     * @return the map
+     */
+    private static Map<String, QName> sortParamsToQNames(Object... parameters)
+    {
+        Map<String, QName> map = new HashMap<>();
+        for (int i=0; i<parameters.length; i++)
+        {
+            map.put(
+                parameters[i] instanceof String
+                ? (String)parameters[i++]
+                : ((QName)parameters[i]).getLocalName(),
+                (QName)parameters[i]);
+        }
+        return Collections.unmodifiableMap(map);
+    }
+    
+    private ServiceRegistry sr;
+    private NodeService nodeService;
+    private NamespaceService namespaceService;
+    private DictionaryService dictionaryService;
+    private SiteService siteService;
+
+    private Nodes nodes;
+    private People people;
+    private Sites sites;
+
+    public void setServiceRegistry(ServiceRegistry sr)
+    {
+        this.sr = sr;
+    }
+
+    public void setNodes(Nodes nodes)
+    {
+        this.nodes = nodes;
+    }
+
+    public void setPeople(People people)
+    {
+        this.people = people;
+    }
+
+    public void setSites(Sites sites)
+    {
+        this.sites = sites;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("sr", this.sr);
+        ParameterCheck.mandatory("nodes", this.nodes);
+        ParameterCheck.mandatory("people", this.people);
+        ParameterCheck.mandatory("sites", this.sites);
+        
+        this.nodeService = sr.getNodeService();
+        this.namespaceService = sr.getNamespaceService();
+        this.dictionaryService = sr.getDictionaryService();
+        this.siteService = sr.getSiteService();
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Node> findNodes(Parameters parameters)
+    {
+        SearchService searchService = sr.getSearchService();
+        return new AbstractQuery<Node>(nodeService, searchService)
+        {
+            private final Map<String, UserInfo> mapUserInfo = new HashMap<>(10);
+            
+            @Override
+            protected void buildQuery(StringBuilder query, String term, SearchParameters sp, String queryTemplateName)
+            {
+                sp.addQueryTemplate(queryTemplateName, "%(cm:name cm:title cm:description TEXT TAG)");
+
+                String rootNodeId = parameters.getParameter(PARAM_ROOT_NODE_ID);
+                if (rootNodeId != null)
+                {
+                    NodeRef nodeRef = nodes.validateOrLookupNode(rootNodeId, null);
+                    query.append("PATH:\"").append(getQNamePath(nodeRef.getId())).append("//*\" AND (");
+                }
+                if (term != null)
+                {
+                    query.append("\"");
+                    query.append(term);
+                    query.append("\"");
+                }
+                if (rootNodeId != null)
+                {
+                    query.append(")");
+                }
+                
+                String nodeTypeStr = parameters.getParameter(PARAM_NODE_TYPE);
+                if (nodeTypeStr != null)
+                {
+                    QName filterNodeTypeQName = nodes.createQName(nodeTypeStr);
+                    if (dictionaryService.getType(filterNodeTypeQName) == null)
+                    {
+                        throw new InvalidArgumentException("Unknown filter nodeType: "+nodeTypeStr);
+                    }
+
+                    query.append(" AND (+TYPE:\"").append(nodeTypeStr).append(("\")"));
+                    query.append(" AND -ASPECT:\"sys:hidden\" AND -cm:creator:system AND -QNAME:comment\\-* ");
+                }
+                else
+                {
+                    query.append(" AND (+TYPE:\"cm:content\" OR +TYPE:\"cm:folder\")");
+                    query.append(" AND -TYPE:\"cm:thumbnail\" AND -TYPE:\"cm:failedThumbnail\" AND -TYPE:\"cm:rating\" AND -TYPE:\"fm:post\"");
+                    query.append(" AND -TYPE:\"st:site\" AND -ASPECT:\"st:siteContainer\"");
+                    query.append(" AND -ASPECT:\"sys:hidden\" AND -cm:creator:system AND -QNAME:comment\\-* ");
+                }
+            }
+
+            private String getQNamePath(String nodeId)
+            {
+                NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+
+                Map<String, String> cache = new HashMap<>();
+                StringBuilder buf = new StringBuilder(128);
+                Path path = null;
+                try
+                {
+                   path = nodeService.getPath(nodeRef);
+                }
+                catch (InvalidNodeRefException inre)
+                {
+                    throw new EntityNotFoundException(nodeId);
+                }
+
+                for (Path.Element e : path)
+                {
+                    if (e instanceof Path.ChildAssocElement)
+                    {
+                        QName qname = ((Path.ChildAssocElement) e).getRef().getQName();
+                        if (qname != null)
+                        {
+                            String prefix = cache.get(qname.getNamespaceURI());
+                            if (prefix == null)
+                            {
+                                // first request for this namespace prefix, get and cache result
+                                Collection<String> prefixes = namespaceService.getPrefixes(qname.getNamespaceURI());
+                                prefix = prefixes.size() != 0 ? prefixes.iterator().next() : "";
+                                cache.put(qname.getNamespaceURI(), prefix);
+                            }
+                            buf.append('/').append(prefix).append(':').append(ISO9075.encode(qname.getLocalName()));
+                        }
+                    }
+                    else
+                    {
+                        buf.append('/').append(e.toString());
+                    }
+                }
+                return buf.toString();
+            }
+
+            @Override
+            protected List<Node> newList(int capacity)
+            {
+                return new ArrayList<Node>(capacity);
+            }
+
+            @Override
+            protected Node convert(NodeRef nodeRef, List<String> includeParam)
+            {
+                return nodes.getFolderOrDocument(nodeRef, null, null, includeParam, mapUserInfo);
+            }
+
+            @Override
+            protected String escapeTerm(String term)
+            {
+                term = term.trim();
+                term = SearchLanguageConversion.escapeLuceneQuery(term);
+                return term;
+            }
+            
+        }.find(parameters, PARAM_TERM, MIN_TERM_LENGTH_NODES, "keywords",
+            IN_QUERY_SORT, NODE_SORT_PARAMS_TO_QNAMES,
+            new SortColumn(PARAM_MODIFIEDAT, false));
+    }
+    
+    @Override
+    public CollectionWithPagingInfo<Person> findPeople(Parameters parameters)
+    {
+        SearchService searchService = sr.getSearchService();
+        return new AbstractQuery<Person>(nodeService, searchService)
+        {
+            @Override
+            protected void buildQuery(StringBuilder query, String term, SearchParameters sp, String queryTemplateName)
+            {
+                sp.addQueryTemplate(queryTemplateName, "|%firstName OR |%lastName OR |%userName");
+                sp.setExcludeTenantFilter(false);
+                sp.setPermissionEvaluation(PermissionEvaluationMode.EAGER);
+
+                query.append("TYPE:\"").append(ContentModel.TYPE_PERSON).append("\" AND (\"*");
+                query.append(term);
+                query.append("*\")");
+            }
+
+            @Override
+            protected List<Person> newList(int capacity)
+            {
+                return new ArrayList<Person>(capacity);
+            }
+
+            @Override
+            protected Person convert(NodeRef nodeRef, List<String> includeParam)
+            {
+                String personId = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_USERNAME);
+                Person person = people.getPerson(personId);
+                return person;
+            }
+            
+            // TODO Do the sort in the query on day. A comment in the code for the V0 API used for live people
+            //      search says adding sort values for this query don't work - tried it and they really don't.
+        }.find(parameters, PARAM_TERM, MIN_TERM_LENGTH_PEOPLE, "_PERSON",
+            POST_QUERY_SORT, PEOPLE_SORT_PARAMS_TO_QNAMES,
+            new SortColumn(PARAM_FIRSTNAME, true), new SortColumn(PARAM_LASTNAME, true));
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Site> findSites(Parameters parameters)
+    {
+        SearchService searchService = sr.getSearchService();
+        return new AbstractQuery<Site>(nodeService, searchService)
+        {
+            @Override
+            protected void buildQuery(StringBuilder query, String term, SearchParameters sp, String queryTemplateName)
+            {
+                sp.addQueryTemplate(queryTemplateName, "%(cm:name cm:title cm:description)");
+                sp.setExcludeTenantFilter(false);
+                sp.setPermissionEvaluation(PermissionEvaluationMode.EAGER);
+
+                query.append("TYPE:\"").append(SiteModel.TYPE_SITE).append("\" AND (\"*");
+                query.append(term);
+                query.append("*\")");
+            }
+            
+            @Override
+            protected List<Site> newList(int capacity)
+            {
+                return new ArrayList<>(capacity);
+            }
+
+            @Override
+            protected Site convert(NodeRef nodeRef, List<String> includeParam)
+            {
+                return getSite(siteService.getSite(nodeRef), true);
+            }
+
+            // note: see also Sites.getSite
+            private Site getSite(SiteInfo siteInfo, boolean includeRole)
+            {
+                // set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
+                String siteId = siteInfo.getShortName();
+                String role = null;
+                if(includeRole)
+                {
+                    role = sites.getSiteRole(siteId);
+                }
+                return new Site(siteInfo, role);
+            }
+        }.find(parameters, PARAM_TERM, MIN_TERM_LENGTH_SITES, "_SITE", POST_QUERY_SORT, SITE_SORT_PARAMS_TO_QNAMES, new SortColumn(PARAM_SITE_TITLE, true));
+    }
+    
+    public abstract static class AbstractQuery<T>
+    {
+        public enum Sort
+        {
+            IN_QUERY_SORT, POST_QUERY_SORT
+        }
+        
+        private final NodeService nodeService;
+        private final SearchService searchService;
+        
+        public AbstractQuery(NodeService nodeService, SearchService searchService)
+        {
+            this.nodeService = nodeService;
+            this.searchService = searchService;
+        }
+
+        public CollectionWithPagingInfo<T> find(Parameters parameters,
+            String termName, int minTermLength, String queryTemplateName,
+            Sort sort, Map<String, QName> sortParamsToQNames, SortColumn... defaultSort)
+        {
+            SearchParameters sp = new SearchParameters();
+            sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+            sp.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+            sp.setDefaultFieldName(queryTemplateName);
+            
+            String term = getTerm(parameters, termName, minTermLength);
+
+            StringBuilder query = new StringBuilder();
+            buildQuery(query, term, sp, queryTemplateName);
+            sp.setQuery(query.toString());
+
+            Paging paging = parameters.getPaging();
+            PagingRequest pagingRequest = Util.getPagingRequest(paging);
+            
+            List<SortColumn> defaultSortCols = (defaultSort != null ? Arrays.asList(defaultSort) : Collections.emptyList());
+            if (sort == IN_QUERY_SORT)
+            {
+                addSortOrder(parameters, sortParamsToQNames, defaultSortCols, sp);
+
+                sp.setSkipCount(pagingRequest.getSkipCount());
+                sp.setMaxItems(pagingRequest.getMaxItems());
+            }
+            
+            ResultSet queryResults = null;
+            List<T> collection = null;
+            try
+            {
+                queryResults = searchService.query(sp);
+                
+                List<NodeRef> nodeRefs = queryResults.getNodeRefs();
+                
+                if (sort == POST_QUERY_SORT)
+                {
+                    nodeRefs = postQuerySort(parameters, sortParamsToQNames, defaultSortCols, nodeRefs);
+                }
+                
+                collection = newList(nodeRefs.size());
+                List<String> includeParam = parameters.getInclude();
+
+                for (NodeRef nodeRef : nodeRefs)
+                {
+                    T t = convert(nodeRef, includeParam);
+                    collection.add(t);
+                }
+
+                if (sort == POST_QUERY_SORT)
+                {
+                    return listPage(collection, paging);
+                }
+                else
+                {
+                    return CollectionWithPagingInfo.asPaged(paging, collection, queryResults.hasMore(), Long.valueOf(queryResults.getNumberFound()).intValue());
+                }
+            }
+            finally
+            {
+                if (queryResults != null)
+                {
+                    queryResults.close();
+                }
+            }
+        }
+
+        /**
+         * Builds up the query and is expected to call {@link SearchParameters#setDefaultFieldName(String)}
+         * and {@link SearchParameters#addQueryTemplate(String, String)}
+         * @param query StringBuilder into which the query should be built.
+         * @param term to be searched for
+         * @param sp SearchParameters
+         * @param queryTemplateName
+         */
+        protected abstract void buildQuery(StringBuilder query, String term, SearchParameters sp, String queryTemplateName);
+        
+        /**
+         * Returns a list of the correct type.
+         * @param capacity of the list
+         * @return a new list.
+         */
+        protected abstract List<T> newList(int capacity);
+
+        /**
+         * Converts a nodeRef into the an object of the required type.
+         * @param nodeRef to be converted
+         * @param includeParam additional fields to be included
+         * @return the object
+         */
+        protected abstract T convert(NodeRef nodeRef, List<String> includeParam);
+        
+        protected String getTerm(Parameters parameters, String termName, int minTermLength)
+        {
+            String term = parameters.getParameter(termName);
+            if (term == null)
+            {
+                throw new InvalidArgumentException("Query '"+termName+"' not specified");
+            }
+            
+            term = escapeTerm(term);
+            
+            int cnt = 0;
+            for (int i = 0; i < term.length(); i++)
+            {
+                char c = term.charAt(i);
+                if (Character.isLetterOrDigit(c))
+                {
+                    cnt++;
+                    if (cnt == minTermLength)
+                    {
+                        break;
+                    }
+                }
+            }
+
+            if (cnt < minTermLength)
+            {
+                throw new InvalidArgumentException("Query '"+termName+"' is too short. Must have at least "+minTermLength+" alphanumeric chars");
+            }
+
+            return term;
+        }
+
+        /**
+         * Trim and escape the term - override if needed
+         * 
+         * @param term
+         * @return
+         */
+        protected String escapeTerm(String term)
+        {
+            term = term.trim();
+            term = term.replace("\"", "");
+            term = SearchLanguageConversion.escapeLuceneQuery(term);
+            return term;
+        }
+        
+        /**
+         * Adds sort order to the SearchParameters.
+         */
+        protected void addSortOrder(Parameters parameters, Map<String, QName> sortParamsToQNames,
+            List<SortColumn> defaultSortCols, SearchParameters sp)
+        {
+            List<SortColumn> sortCols = getSorting(parameters, defaultSortCols);
+            for (SortColumn sortCol : sortCols)
+            {
+                QName sortPropQName = sortParamsToQNames.get(sortCol.column);
+                if (sortPropQName == null)
+                {
+                    throw new InvalidArgumentException("Invalid sort field: "+sortCol.column);
+                }
+                sp.addSort("@" + sortPropQName,  sortCol.asc);
+            }
+        }
+
+        private List<SortColumn> getSorting(Parameters parameters, List<SortColumn> defaultSortCols)
+        {
+            List<SortColumn> sortCols = parameters.getSorting();
+            if (sortCols == null || sortCols.size() == 0)
+            {
+                sortCols = defaultSortCols == null ? Collections.emptyList() : defaultSortCols;
+            }
+            return sortCols;
+        }
+
+        protected List<NodeRef> postQuerySort(Parameters parameters, Map<String, QName> sortParamsToQNames,
+            List<SortColumn> defaultSortCols, List<NodeRef> nodeRefs)
+        {
+            final List<SortColumn> sortCols = getSorting(parameters, defaultSortCols);
+            int sortColCount = sortCols.size();
+            if (sortColCount > 0)
+            {
+                // make copy of nodeRefs because it can be unmodifiable list.
+                nodeRefs = new ArrayList<NodeRef>(nodeRefs);
+                
+                List<QName> sortPropQNames = new ArrayList<>(sortColCount);
+                for (SortColumn sortCol : sortCols)
+                {
+                    QName sortPropQName = sortParamsToQNames.get(sortCol.column);
+                    if (sortPropQName == null)
+                    {
+                        throw new InvalidArgumentException("Invalid sort field: "+sortCol.column);
+                    }
+                    sortPropQNames.add(sortPropQName);
+                }
+                
+                final Collator col = AlfrescoCollator.getInstance(I18NUtil.getLocale());
+                Collections.sort(nodeRefs, new Comparator<NodeRef>()
+                {
+                    @Override
+                    public int compare(NodeRef n1, NodeRef n2)
+                    {
+                        int result = 0;
+                        for (int i=0; i<sortCols.size(); i++)
+                        {
+                            SortColumn sortCol = sortCols.get(i);
+                            QName sortPropQName = sortPropQNames.get(i);
+                            
+                            Serializable  p1 = getProperty(n1, sortPropQName);
+                            Serializable  p2 = getProperty(n2, sortPropQName);
+
+                            result = ((p1 instanceof Long) && (p2 instanceof Long)
+                                ? Long.compare((Long)p1, (Long)p2)
+                                : col.compare(p1.toString(), p2.toString()))
+                                * (sortCol.asc ? 1 : -1);
+                            
+                            if (result != 0)
+                            {
+                                break;
+                            }
+                        }
+                        return result;
+                    }
+
+                    private Serializable getProperty(NodeRef nodeRef, QName sortPropQName)
+                    {
+                        Serializable result = nodeService.getProperty(nodeRef, sortPropQName);
+                        return result == null ? "" : result;
+                    }
+
+                });
+            }
+            return nodeRefs;
+        }
+
+        // note: see also AbstractNodeRelation
+        protected static <T> CollectionWithPagingInfo<T> listPage(List<T> result, Paging paging)
+        {
+            // return 'page' of results (based on full result set)
+            int skipCount = paging.getSkipCount();
+            int pageSize = paging.getMaxItems();
+            int pageEnd = skipCount + pageSize;
+
+            final List<T> page = new ArrayList<>(pageSize);
+            if (result == null)
+            {
+                result = Collections.emptyList();
+            }
+
+            Iterator<T> it = result.iterator();
+            for (int counter = 0; counter < pageEnd && it.hasNext(); counter++)
+            {
+                T element = it.next();
+                if (counter < skipCount)
+                {
+                    continue;
+                }
+                if (counter > pageEnd - 1)
+                {
+                    break;
+                }
+                page.add(element);
+            }
+
+            int totalCount = result.size();
+            boolean hasMoreItems = ((skipCount + page.size()) < totalCount);
+
+            return CollectionWithPagingInfo.asPaged(paging, page, hasMoreItems, totalCount);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
new file mode 100644
index 00000000000..94ebee970dc
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
@@ -0,0 +1,701 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.model.QuickShareModel;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.repo.quickshare.QuickShareLinkExpiryActionException;
+import org.alfresco.repo.quickshare.QuickShareServiceImpl.QuickShareEmailRequest;
+import org.alfresco.repo.search.QueryParameterDefImpl;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.QuickShareLinks;
+import org.alfresco.rest.api.Renditions;
+import org.alfresco.rest.api.model.ContentInfo;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.QuickShareLink;
+import org.alfresco.rest.api.model.QuickShareLinkEmailRequest;
+import org.alfresco.rest.api.model.Rendition;
+import org.alfresco.rest.api.model.UserInfo;
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.DisabledServiceException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.resource.parameters.where.Query;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+import org.alfresco.rest.workflow.api.impl.MapBasedQueryWalker;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.quickshare.InvalidSharedIdException;
+import org.alfresco.service.cmr.quickshare.QuickShareDTO;
+import org.alfresco.service.cmr.quickshare.QuickShareService;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.QueryParameterDefinition;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.ResultSetRow;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.alfresco.util.ParameterCheck;
+import org.alfresco.util.SearchLanguageConversion;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Centralises access to shared link (public "quick share") services and maps between representations.
+ *
+ * @author janv
+ * @author Jamal Kaabi-Mofrad
+ *
+ * @since publicapi1.0
+ */
+public class QuickShareLinksImpl implements QuickShareLinks, RecognizedParamsExtractor, InitializingBean
+{
+    private static final Log logger = LogFactory.getLog(QuickShareLinksImpl.class);
+
+    private final static String DISABLED = "QuickShare is disabled system-wide";
+    private boolean enabled = true;
+
+    private ServiceRegistry sr;
+    private QuickShareService quickShareService;
+    private Nodes nodes;
+    private Renditions renditions;
+
+    private NodeService nodeService;
+    private PersonService personService;
+    private MimetypeService mimeTypeService;
+    private SearchService searchService;
+    private DictionaryService dictionaryService;
+    private NamespaceService namespaceService;
+
+    // additional exclude properties for share links as these are already top-level properties
+    private static final List<QName> EXCLUDED_PROPS = Arrays.asList(
+            QuickShareModel.PROP_QSHARE_SHAREDBY,
+            QuickShareModel.PROP_QSHARE_SHAREDID);
+
+
+    public void setServiceRegistry(ServiceRegistry sr)
+    {
+        this.sr = sr;
+    }
+
+
+    public void setQuickShareService(QuickShareService quickShareService)
+    {
+        this.quickShareService = quickShareService;
+    }
+
+    public void setNodes(Nodes nodes)
+    {
+        this.nodes = nodes;
+    }
+
+    public void setRenditions(Renditions renditions)
+    {
+        this.renditions = renditions;
+    }
+
+    public void setEnabled(boolean enabled)
+    {
+        this.enabled = enabled;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("sr", this.sr);
+        ParameterCheck.mandatory("quickShareService", this.quickShareService);
+        ParameterCheck.mandatory("nodes", this.nodes);
+
+        this.nodeService = sr.getNodeService();
+        this.personService = sr.getPersonService();
+        this.mimeTypeService = sr.getMimetypeService();
+        this.searchService = sr.getSearchService();
+        this.dictionaryService = sr.getDictionaryService();
+        this.namespaceService = sr.getNamespaceService();
+    }
+
+    /**
+     * Returns limited metadata regarding the shared (content) link.
+     * <p>
+     * Note: does *not* require authenticated access for (public) shared link.
+     */
+    public QuickShareLink readById(final String sharedId, final Parameters parameters)
+    {
+        checkEnabled();
+
+        try
+        {
+            Pair<String, NodeRef> pair = quickShareService.getTenantNodeRefFromSharedId(sharedId);
+            String networkTenantDomain = pair.getFirst();
+
+            return TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork<QuickShareLink>()
+            {
+                public QuickShareLink doWork() throws Exception
+                {
+                    // note: assume noAuth here (rather than rely on getRunAsUser which will be null in non-MT)
+                    return getQuickShareInfo(sharedId, true, parameters.getInclude());
+                }
+            }, networkTenantDomain);
+        }
+        catch (InvalidSharedIdException ex)
+        {
+            logger.warn("Unable to find: " + sharedId);
+            throw new EntityNotFoundException(sharedId);
+        }
+    }
+
+    /**
+     * Download content via shared link.
+     * <p>
+     * Note: does *not* require authenticated access for (public) shared link.
+     *
+     * @param sharedId
+     * @param renditionId - optional
+     * @param parameters {@link Parameters}
+     * @return
+     * @throws EntityNotFoundException
+     */
+    public BinaryResource readProperty(String sharedId, final String renditionId, final Parameters parameters) throws EntityNotFoundException
+    {
+        checkEnabled();
+        checkValidShareId(sharedId);
+
+        try
+        {
+            Pair<String, NodeRef> pair = quickShareService.getTenantNodeRefFromSharedId(sharedId);
+
+            String networkTenantDomain = pair.getFirst();
+            final NodeRef nodeRef = pair.getSecond();
+
+            return TenantUtil.runAsSystemTenant(() -> {
+                // belt-and-braces (similar to QuickShareContentGet)
+                if (!nodeService.hasAspect(nodeRef, QuickShareModel.ASPECT_QSHARE))
+                {
+                    throw new InvalidNodeRefException(nodeRef);
+                }
+
+                if (renditionId != null)
+                {
+                    return renditions.getContent(nodeRef, renditionId, parameters);
+                }
+                else
+                {
+                    return nodes.getContent(nodeRef, parameters, false);
+                }
+            }, networkTenantDomain);
+        }
+        catch (InvalidSharedIdException ex)
+        {
+            logger.warn("Unable to find: " + sharedId);
+            throw new EntityNotFoundException(sharedId);
+        }
+        catch (InvalidNodeRefException inre)
+        {
+            logger.warn("Unable to find: " + sharedId + " [" + inre.getNodeRef() + "]");
+            throw new EntityNotFoundException(sharedId);
+        }
+    }
+
+    /**
+     * Delete the shared link.
+     * <p>
+     * Once deleted, the shared link will no longer exist hence get/download will no longer work (ie. return 404).
+     * If the link is later re-created then a new unique shared id will be generated.
+     * <p>
+     * Requires authenticated access.
+     *
+     * @param sharedId String id of the quick share
+     */
+    public void delete(String sharedId, Parameters parameters)
+    {
+        checkEnabled();
+        checkValidShareId(sharedId);
+
+        try
+        {
+            NodeRef nodeRef = quickShareService.getTenantNodeRefFromSharedId(sharedId).getSecond();
+
+            String sharedByUserId = (String)nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDBY);
+            if (!quickShareService.canDeleteSharedLink(nodeRef, sharedByUserId))
+            {
+                throw new PermissionDeniedException("Can't perform unshare action: " + sharedId);
+            }
+
+            quickShareService.unshareContent(sharedId);
+        }
+        catch (InvalidSharedIdException ex)
+        {
+            logger.warn("Unable to find: " + sharedId);
+            throw new EntityNotFoundException(sharedId);
+        }
+        catch (InvalidNodeRefException inre)
+        {
+            logger.warn("Unable to find: " + sharedId + " [" + inre.getNodeRef() + "]");
+            throw new EntityNotFoundException(sharedId);
+        }
+    }
+
+    /**
+     * Create quick share.
+     * <p>
+     * Requires authenticated access.
+     *
+     * @param nodeIds
+     * @param parameters
+     * @return
+     */
+    public List<QuickShareLink> create(List<QuickShareLink> nodeIds, Parameters parameters)
+    {
+        checkEnabled();
+
+        List<QuickShareLink> result = new ArrayList<>(nodeIds.size());
+
+        List<String> includeParam = parameters != null ? parameters.getInclude() : Collections.<String> emptyList();
+
+        for (QuickShareLink qs : nodeIds)
+        {
+            String nodeId = qs.getNodeId();
+
+            if (nodeId == null)
+            {
+                throw new InvalidArgumentException("A valid nodeId must be specified !");
+            }
+
+            NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+
+            try
+            {
+                // Note: will throw InvalidNodeRefException (=> 404) if node does not exist
+                String sharedId = (String) nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDID);
+                if (sharedId != null)
+                {
+                    throw new ConstraintViolatedException("sharedId already exists: "+nodeId+" ["+sharedId+"]");
+                }
+
+                // Note: will throw AccessDeniedException (=> 403) via QuickShareService (when NodeService tries to getAspects)
+                // Note: since we already check node exists above, we can assume that InvalidNodeRefException (=> 404) here means not content (see type check)
+                try
+                {
+                    QuickShareDTO qsDto = quickShareService.shareContent(nodeRef, qs.getExpiresAt());
+                    result.add(getQuickShareInfo(qsDto.getId(), false, includeParam));
+                }
+                catch (InvalidNodeRefException inre)
+                {
+                    throw new InvalidArgumentException("Unable to create shared link to non-file content: " + nodeId);
+                }
+                catch (QuickShareLinkExpiryActionException ex)
+                {
+                    throw new InvalidArgumentException(ex.getMessage());
+                }
+            }
+            catch (AccessDeniedException ade)
+            {
+                throw new PermissionDeniedException("Unable to create shared link to node that does not exist: " + nodeId);
+            }
+            catch (InvalidNodeRefException inre)
+            {
+                logger.warn("Unable to create shared link: [" + nodeRef + "]");
+                throw new EntityNotFoundException(nodeId);
+            }
+        }
+
+        return result;
+    }
+
+    @Override
+    public void emailSharedLink(String sharedId, QuickShareLinkEmailRequest emailRequest, Parameters parameters)
+    {
+        checkEnabled();
+        checkValidShareId(sharedId);
+        validateEmailRequest(emailRequest);
+
+        try
+        {
+            NodeRef nodeRef = quickShareService.getTenantNodeRefFromSharedId(sharedId).getSecond();
+            String sharedNodeName = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
+            QuickShareEmailRequest request = new QuickShareEmailRequest();
+            request.setSharedNodeName(sharedNodeName);
+            request.setClient(emailRequest.getClient());
+            request.setSharedId(sharedId);
+            request.setSenderMessage(emailRequest.getMessage());
+            request.setLocale(I18NUtil.parseLocale(emailRequest.getLocale()));
+            request.setToEmails(emailRequest.getRecipientEmails());
+            quickShareService.sendEmailNotification(request);
+        }
+        catch (InvalidSharedIdException ex)
+        {
+            throw new EntityNotFoundException(sharedId);
+        }
+        catch (InvalidNodeRefException inre)
+        {
+            logger.warn("Unable to find: " + sharedId + " [" + inre.getNodeRef() + "]");
+            throw new EntityNotFoundException(sharedId);
+        }
+    }
+
+    private Parameters getParamsWithCreatedStatus()
+    {
+        String filterStatusCreated = "(" + Renditions.PARAM_STATUS + "='" + Rendition.RenditionStatus.CREATED + "')";
+        Query whereQuery = getWhereClause(filterStatusCreated);
+        Params.RecognizedParams recParams = new Params.RecognizedParams(null, null, null, null, null, null, whereQuery, null, false);
+        Parameters params = Params.valueOf(recParams, null, null, null);
+        return params;
+    }
+
+    @Override
+    public Rendition getRendition(String sharedId, String renditionId)
+    {
+        checkEnabled();
+        checkValidShareId(sharedId);
+
+        try
+        {
+            Pair<String, NodeRef> pair = quickShareService.getTenantNodeRefFromSharedId(sharedId);
+
+            String networkTenantDomain = pair.getFirst();
+            final NodeRef nodeRef = pair.getSecond();
+
+            return TenantUtil.runAsSystemTenant(() ->
+            {
+                Parameters params = getParamsWithCreatedStatus();
+                return renditions.getRendition(nodeRef, renditionId, params);
+
+            }, networkTenantDomain);
+        }
+        catch (InvalidSharedIdException ex)
+        {
+            logger.warn("Unable to find: " + sharedId);
+            throw new EntityNotFoundException(sharedId);
+        }
+        catch (InvalidNodeRefException inre)
+        {
+            logger.warn("Unable to find: " + sharedId + " [" + inre.getNodeRef() + "]");
+            throw new EntityNotFoundException(sharedId);
+        }
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Rendition> getRenditions(String sharedId)
+    {
+        checkEnabled();
+        checkValidShareId(sharedId);
+
+        try
+        {
+            Pair<String, NodeRef> pair = quickShareService.getTenantNodeRefFromSharedId(sharedId);
+
+            String networkTenantDomain = pair.getFirst();
+            final NodeRef nodeRef = pair.getSecond();
+
+            return TenantUtil.runAsSystemTenant(() ->
+            {
+                Parameters params = getParamsWithCreatedStatus();
+                return renditions.getRenditions(nodeRef, params);
+
+            }, networkTenantDomain);
+        }
+        catch (InvalidSharedIdException ex)
+        {
+            logger.warn("Unable to find: " + sharedId);
+            throw new EntityNotFoundException(sharedId);
+        }
+        catch (InvalidNodeRefException inre)
+        {
+            logger.warn("Unable to find: " + sharedId + " [" + inre.getNodeRef() + "]");
+            throw new EntityNotFoundException(sharedId);
+        }
+    }
+
+    // Helper find (search) method
+
+    private final static Set<String> FIND_SHARED_LINKS_QUERY_PROPERTIES =
+            new HashSet<>(Arrays.asList(new String[] {PARAM_SHAREDBY}));
+
+    public CollectionWithPagingInfo<QuickShareLink> findLinks(Parameters parameters)
+    {
+        checkEnabled();
+
+        String queryString =
+                "ASPECT:\"" + QuickShareModel.ASPECT_QSHARE.toString() + "\"";
+
+        SearchParameters sp = new SearchParameters();
+
+        // note: REST API query parameter (ie. where clause filter) - not to be confused with search query ;-)
+        Query q = parameters.getQuery();
+        if (q != null)
+        {
+            // filtering via "where" clause
+            MapBasedQueryWalker propertyWalker = new MapBasedQueryWalker(FIND_SHARED_LINKS_QUERY_PROPERTIES, null);
+            QueryHelper.walk(q, propertyWalker);
+
+            String sharedByUserId = propertyWalker.getProperty(PARAM_SHAREDBY, WhereClauseParser.EQUALS, String.class);
+
+            if (sharedByUserId != null)
+            {
+                if (People.DEFAULT_USER.equalsIgnoreCase(sharedByUserId))
+                {
+                    sharedByUserId =  AuthenticationUtil.getFullyAuthenticatedUser();
+                }
+
+                QueryParameterDefinition qpd = new QueryParameterDefImpl(QuickShareModel.PROP_QSHARE_SHAREDBY, dictionaryService.getDataType(DataTypeDefinition.TEXT),
+                        true, sharedByUserId);
+                sp.addQueryParameterDefinition(qpd);
+
+                String qsharedBy = QuickShareModel.PROP_QSHARE_SHAREDBY.toPrefixString(namespaceService);
+                queryString += " +@"+SearchLanguageConversion.escapeLuceneQuery(qsharedBy)+":\"${"+qsharedBy+"}\"";
+            }
+        }
+
+        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+        sp.setQuery(queryString);
+        sp.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+
+        Paging paging = parameters.getPaging();
+        PagingRequest pagingRequest = Util.getPagingRequest(paging);
+
+        sp.setSkipCount(pagingRequest.getSkipCount());
+        sp.setMaxItems(pagingRequest.getMaxItems());
+
+        sp.addSort("@" + ContentModel.PROP_MODIFIED, false);
+
+        ResultSet results = searchService.query(sp);
+
+        List<QuickShareLink> qsLinks = new ArrayList<>(results.length());
+
+        List<String> includeParam = parameters.getInclude();
+
+        for (ResultSetRow row : results)
+        {
+            NodeRef nodeRef = row.getNodeRef();
+            qsLinks.add(getQuickShareInfo(nodeRef, false, includeParam));
+        }
+
+        results.close();
+
+        return CollectionWithPagingInfo.asPaged(paging, qsLinks, results.hasMore(), Long.valueOf(results.getNumberFound()).intValue());
+    }
+
+    private QuickShareLink getQuickShareInfo(String sharedId, boolean noAuth, List<String> includeParam)
+    {
+        checkValidShareId(sharedId);
+        
+        Map<String, Object> map = (Map<String, Object>) quickShareService.getMetaData(sharedId).get("item");
+        NodeRef nodeRef = new NodeRef((String) map.get("nodeRef"));
+
+        return getQuickShareInfo(nodeRef, map, noAuth, includeParam);
+    }
+
+    private QuickShareLink getQuickShareInfo(NodeRef nodeRef, boolean noAuth, List<String> includeParam)
+    {
+        Map<String, Object> map = (Map<String, Object>) quickShareService.getMetaData(nodeRef).get("item");
+        return getQuickShareInfo(nodeRef, map , noAuth, includeParam);
+    }
+
+    private QuickShareLink getQuickShareInfo(NodeRef nodeRef, Map<String, Object> map, boolean noAuth, List<String> includeParam)
+    {
+        String sharedId = (String)map.get("sharedId");
+
+        try
+        {
+            Map<QName, Serializable> nodeProps = nodeService.getProperties(nodeRef);
+            ContentData cd = (ContentData)nodeProps.get(ContentModel.PROP_CONTENT);
+
+            String mimeType = cd.getMimetype();
+            String mimeTypeName = mimeTypeService.getDisplaysByMimetype().get(mimeType);
+            ContentInfo contentInfo = new ContentInfo(mimeType, mimeTypeName, cd.getSize(), cd.getEncoding());
+
+            Map<String, UserInfo> mapUserInfo = new HashMap<>(2);
+
+            // note: if noAuth mode then don't return userids (to limit disclosure and be consistent with v0 internal)
+            boolean displayNameOnly = noAuth;
+
+            UserInfo modifiedByUser = Node.lookupUserInfo((String)nodeProps.get(ContentModel.PROP_MODIFIER), mapUserInfo, personService, displayNameOnly);
+
+            // TODO review - should we return sharedByUser for authenticated users only ?? (not exposed by V0 but needed for "find")
+            String sharedByUserId = (String)nodeProps.get(QuickShareModel.PROP_QSHARE_SHAREDBY);
+            UserInfo sharedByUser = Node.lookupUserInfo(sharedByUserId, mapUserInfo, personService, displayNameOnly);
+
+            QuickShareLink qs = new QuickShareLink(sharedId, nodeRef.getId());
+            qs.setName((String) map.get("name"));
+            qs.setTitle((String) map.get("title"));
+            qs.setDescription((String) map.get("description"));
+            qs.setContent(contentInfo);
+            qs.setModifiedAt((Date) map.get("modified"));
+            qs.setModifiedByUser(modifiedByUser);
+            qs.setSharedByUser(sharedByUser);
+            qs.setExpiresAt((Date) map.get("expiryDate"));
+
+            // note: if noAuth mode then do not return allowable operations (eg. but can be optionally returned when finding shared links)
+            if (!noAuth)
+            {
+                // Cached document
+                Node doc = null;
+
+                if (includeParam.contains(PARAM_INCLUDE_ALLOWABLEOPERATIONS))
+                {
+                    if (quickShareService.canDeleteSharedLink(nodeRef, sharedByUserId))
+                    {
+                        // the allowable operations for the shared link
+                        qs.setAllowableOperations(Collections.singletonList(Nodes.OP_DELETE));
+                    }
+                    doc = getNode(nodeRef, includeParam, mapUserInfo);
+                    List<String> allowableOps = doc.getAllowableOperations();
+                    // the allowable operations for the actual file being shared
+                    qs.setAllowableOperationsOnTarget(allowableOps);
+                }
+
+                // in noAuth mode we don't return the path info
+                if (includeParam.contains(PARAM_INCLUDE_PATH))
+                {
+                    qs.setPath(nodes.lookupPathInfo(nodeRef, null));
+                }
+
+                if (includeParam.contains(PARAM_INCLUDE_PROPERTIES))
+                {
+                    if (doc == null)
+                    {
+                        doc = getNode(nodeRef, includeParam, mapUserInfo);
+                    }
+                    // Create a map from node properties excluding properties already in this QuickShareLink
+                    Map<String, Object> filteredNodeProperties = filterProps(doc.getProperties(), EXCLUDED_PROPS);
+                    qs.setProperties(filteredNodeProperties);
+                }
+
+                if (includeParam.contains(PARAM_INCLUDE_ISFAVORITE))
+                {
+                    if (doc == null)
+                    {
+                        doc = getNode(nodeRef, includeParam, mapUserInfo);
+                    }
+                    qs.setIsFavorite(doc.getIsFavorite());
+                }
+
+                if (includeParam.contains(PARAM_INCLUDE_ASPECTNAMES))
+                {
+                    if (doc == null)
+                    {
+                        doc = getNode(nodeRef, includeParam, mapUserInfo);
+                    }
+                    qs.setAspectNames(doc.getAspectNames());
+                }
+            }
+
+            return qs;
+        }
+        catch (InvalidSharedIdException ex)
+        {
+            logger.warn("Unable to find: " + sharedId);
+            throw new EntityNotFoundException(sharedId);
+        }
+        catch (InvalidNodeRefException inre)
+        {
+            logger.warn("Unable to find: " + sharedId + " [" + inre.getNodeRef() + "]");
+            throw new EntityNotFoundException(sharedId);
+        }
+    }
+
+    private Map<String, Object> filterProps(Map<String, Object> properties, List<QName> toRemove)
+    {
+        Map<String, Object> filteredProps = properties == null ? new HashMap<>() : new HashMap<>(properties);
+        List<String> propsToRemove = toRemove.stream().map(e -> e.toPrefixString(namespaceService)).collect(Collectors.toList());
+        filteredProps.keySet().removeAll(propsToRemove);
+        return filteredProps;
+    }
+
+    private Node getNode(NodeRef nodeRef, List<String> includeParam, Map<String, UserInfo> mapUserInfo)
+    {
+        List<String> modifiedIncludeParams = new LinkedList<>(includeParam);
+        // Remove path as this information is already retrieved elsewhere
+        modifiedIncludeParams.remove(PARAM_INCLUDE_PATH);
+        return nodes.getFolderOrDocument(nodeRef, null, null, modifiedIncludeParams, mapUserInfo);
+    }
+
+    private void checkEnabled()
+    {
+        if (!enabled)
+        {
+            throw new DisabledServiceException(DISABLED);
+        }
+    }
+
+    private void checkValidShareId(String sharedId)
+    {
+        if (sharedId==null)
+        {
+            throw new InvalidArgumentException("A valid sharedId must be specified !");
+        }
+    }
+
+    private void validateEmailRequest(QuickShareLinkEmailRequest emailRequest)
+    {
+        if (StringUtils.isEmpty(emailRequest.getClient()))
+        {
+            throw new InvalidArgumentException("A valid client must be specified.");
+        }
+        if (emailRequest.getRecipientEmails() == null || emailRequest.getRecipientEmails().isEmpty())
+        {
+            throw new InvalidArgumentException("A valid recipientEmail must be specified.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/RenditionsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/RenditionsImpl.java
new file mode 100644
index 00000000000..8e65103edc7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/RenditionsImpl.java
@@ -0,0 +1,735 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software LimitedP
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.impl;
+
+import org.alfresco.heartbeat.RenditionsDataCollector;
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.rendition2.RenditionDefinition2;
+import org.alfresco.repo.rendition2.RenditionDefinitionRegistry2;
+import org.alfresco.repo.rendition2.RenditionService2;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.thumbnail.script.ScriptThumbnailService;
+import org.alfresco.repo.version.common.VersionUtil;
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.Renditions;
+import org.alfresco.rest.api.model.ContentInfo;
+import org.alfresco.rest.api.model.DirectAccessUrlRequest;
+import org.alfresco.rest.api.model.Rendition;
+import org.alfresco.rest.api.model.Rendition.RenditionStatus;
+import org.alfresco.rest.framework.core.exceptions.ApiException;
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.DisabledServiceException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.core.exceptions.StaleEntityException;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.content.CacheDirective;
+import org.alfresco.rest.framework.resource.content.ContentInfoImpl;
+import org.alfresco.rest.framework.resource.content.FileBinaryResource;
+import org.alfresco.rest.framework.resource.content.NodeBinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.where.Query;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.workflow.api.impl.MapBasedQueryWalker;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.DirectAccessUrl;
+import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.version.Version;
+import org.alfresco.service.cmr.version.VersionDoesNotExistException;
+import org.alfresco.service.cmr.version.VersionHistory;
+import org.alfresco.service.cmr.version.VersionService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.PropertyCheck;
+import org.alfresco.util.TempFileProvider;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.ResourceLoaderAware;
+import org.springframework.core.io.ResourceLoader;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringJoiner;
+import java.util.TreeMap;
+
+/**
+ * @author Jamal Kaabi-Mofrad, janv
+ */
+public class RenditionsImpl implements Renditions, ResourceLoaderAware
+{
+    private static final Log logger = LogFactory.getLog(RenditionsImpl.class);
+
+    private static final Set<String> RENDITION_STATUS_COLLECTION_EQUALS_QUERY_PROPERTIES = Collections.singleton(PARAM_STATUS);
+
+    private Nodes nodes;
+    private NodeService nodeService;
+    private ScriptThumbnailService scriptThumbnailService;
+    private MimetypeService mimetypeService;
+    private ServiceRegistry serviceRegistry;
+    private ResourceLoader resourceLoader;
+    private TenantService tenantService;
+    private RenditionService2 renditionService2;
+    private RenditionsDataCollector renditionsDataCollector;
+    private VersionService versionService;
+
+    public void setNodes(Nodes nodes)
+    {
+        this.nodes = nodes;
+    }
+
+    public void setScriptThumbnailService(ScriptThumbnailService scriptThumbnailService)
+    {
+        this.scriptThumbnailService = scriptThumbnailService;
+    }
+
+    public void setServiceRegistry(ServiceRegistry serviceRegistry)
+    {
+        this.serviceRegistry = serviceRegistry;
+    }
+
+    @Override
+    public void setResourceLoader(ResourceLoader resourceLoader)
+    {
+        this.resourceLoader = resourceLoader;
+    }
+
+    public void setTenantService(TenantService tenantService)
+    {
+        this.tenantService = tenantService;
+    }
+
+    public void setRenditionService2(RenditionService2 renditionService2)
+    {
+        this.renditionService2 = renditionService2;
+    }
+
+    public void setRenditionsDataCollector(RenditionsDataCollector renditionsDataCollector)
+    {
+        this.renditionsDataCollector = renditionsDataCollector;
+    }
+
+    public void init()
+    {
+        PropertyCheck.mandatory(this, "nodes", nodes);
+        PropertyCheck.mandatory(this, "scriptThumbnailService", scriptThumbnailService);
+        PropertyCheck.mandatory(this, "serviceRegistry", serviceRegistry);
+        PropertyCheck.mandatory(this, "tenantService", tenantService);
+        PropertyCheck.mandatory(this, "renditionService2", renditionService2);
+        PropertyCheck.mandatory(this, "renditionsDataCollector", renditionsDataCollector);
+
+        this.nodeService = serviceRegistry.getNodeService();
+        this.versionService = serviceRegistry.getVersionService();
+        this.mimetypeService = serviceRegistry.getMimetypeService();
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Rendition> getRenditions(NodeRef nodeRef, Parameters parameters)
+    {
+        return getRenditions(nodeRef, null, parameters);
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Rendition> getRenditions(NodeRef nodeRef, String versionLabelId, Parameters parameters)
+    {
+        final NodeRef validatedNodeRef = validateNode(nodeRef.getStoreRef(), nodeRef.getId(), versionLabelId, parameters);
+        ContentData contentData = getContentData(validatedNodeRef, true);
+        String sourceMimetype = contentData.getMimetype();
+
+        boolean includeCreated = true;
+        boolean includeNotCreated = true;
+        String status = getStatus(parameters);
+        if (status != null)
+        {
+            includeCreated = RenditionStatus.CREATED.equals(RenditionStatus.valueOf(status));
+            includeNotCreated = !includeCreated;
+        }
+
+        // List all available rendition definitions
+        long size = contentData.getSize();
+        RenditionDefinitionRegistry2 renditionDefinitionRegistry2 = renditionService2.getRenditionDefinitionRegistry2();
+        Set<String> renditionNames = renditionDefinitionRegistry2.getRenditionNamesFrom(sourceMimetype, size);
+
+        Map<String, Rendition> apiRenditions = new TreeMap<>();
+        if (includeNotCreated)
+        {
+            for (String renditionName : renditionNames)
+            {
+                apiRenditions.put(renditionName, toApiRendition(renditionName));
+            }
+        }
+
+        List<ChildAssociationRef> nodeRefRenditions = renditionService2.getRenditions(validatedNodeRef);
+        if (!nodeRefRenditions.isEmpty())
+        {
+            for (ChildAssociationRef childAssociationRef : nodeRefRenditions)
+            {
+                NodeRef renditionNodeRef = childAssociationRef.getChildRef();
+                Rendition apiRendition = toApiRendition(renditionNodeRef);
+                String renditionName = apiRendition.getId();
+                if (renditionNames.contains(renditionName))
+                {
+                    if (includeCreated)
+                    {
+                        // Replace/append any thumbnail definitions with created rendition info
+                        apiRenditions.put(renditionName, apiRendition);
+                    }
+                    else
+                    {
+                        // Remove any thumbnail definitions that has been created from the list,
+                        // as the filter requires only the Not_Created renditions
+                        apiRenditions.remove(renditionName);
+                    }
+                }
+                else
+                {
+                    if (logger.isTraceEnabled())
+                    {
+                        logger.trace("Skip unknown rendition [" + renditionName + ", " + renditionNodeRef + "]");
+                    }
+                }
+            }
+        }
+
+        // Wrap paging info, as the core service doesn't support paging
+        Paging paging = parameters.getPaging();
+        PagingResults<Rendition> results = Util.wrapPagingResults(paging, apiRenditions.values());
+
+        return CollectionWithPagingInfo.asPaged(paging, results.getPage(), results.hasMoreItems(), results.getTotalResultCount().getFirst());
+    }
+
+    @Override
+    public Rendition getRendition(NodeRef nodeRef, String renditionId, Parameters parameters)
+    {
+        return getRendition(nodeRef, null, renditionId, parameters);
+    }
+
+    @Override
+    public Rendition getRendition(NodeRef nodeRef, String versionLabelId, String renditionId, Parameters parameters)
+    {
+        final NodeRef validatedNodeRef = validateNode(nodeRef.getStoreRef(), nodeRef.getId(), versionLabelId, parameters);
+        NodeRef renditionNodeRef = getRenditionByName(validatedNodeRef, renditionId, parameters);
+        boolean includeNotCreated = true;
+        String status = getStatus(parameters);
+        if (status != null)
+        {
+            includeNotCreated = !RenditionStatus.CREATED.equals(RenditionStatus.valueOf(status));
+        }
+
+        // if there is no rendition, then try to find the available/registered rendition (yet to be created).
+        if (renditionNodeRef == null && includeNotCreated)
+        {
+            ContentData contentData = getContentData(validatedNodeRef, true);
+            String sourceMimetype = contentData.getMimetype();
+            long size = contentData.getSize();
+            RenditionDefinitionRegistry2 renditionDefinitionRegistry2 = renditionService2.getRenditionDefinitionRegistry2();
+            RenditionDefinition2 renditionDefinition = renditionDefinitionRegistry2.getRenditionDefinition(renditionId);
+            if (renditionDefinition == null)
+            {
+                throw new NotFoundException(renditionId + " is not registered.");
+            }
+            else
+            {
+                Set<String> renditionNames = renditionDefinitionRegistry2.getRenditionNamesFrom(sourceMimetype, size);
+                boolean found = false;
+                for (String renditionName : renditionNames)
+                {
+                    // Check the registered renditionId is applicable for the node's mimeType
+                    if (renditionId.equals(renditionName))
+                    {
+                        found = true;
+                        break;
+                    }
+                }
+                if (!found)
+                {
+                    throw new NotFoundException(renditionId + " is not applicable for the node's mimeType " + sourceMimetype);
+                }
+            }
+            return toApiRendition(renditionId);
+        }
+
+        if (renditionNodeRef == null)
+        {
+            throw new NotFoundException("The rendition with id: " + renditionId + " was not found.");
+        }
+
+        return toApiRendition(renditionNodeRef);
+    }
+
+    @Override
+    public void createRendition(NodeRef nodeRef, Rendition rendition, Parameters parameters)
+    {
+        createRendition(nodeRef, rendition, true, parameters);
+    }
+
+    @Override
+    public void createRendition(NodeRef nodeRef, Rendition rendition, boolean executeAsync, Parameters parameters)
+    {
+        createRendition(nodeRef, null, rendition, executeAsync, parameters);
+    }
+
+    @Override
+    public void createRendition(NodeRef nodeRef, String versionLabelId, Rendition rendition, boolean executeAsync, Parameters parameters)
+    {
+        // If thumbnail generation has been configured off, then don't bother.
+        if (!renditionService2.isEnabled())
+        {
+            throw new DisabledServiceException("Rendition generation has been disabled.");
+        }
+
+        final NodeRef sourceNodeRef = validateNode(nodeRef.getStoreRef(), nodeRef.getId(), versionLabelId, parameters);
+        final NodeRef renditionNodeRef = getRenditionByName(sourceNodeRef, rendition.getId(), parameters);
+        if (renditionNodeRef != null)
+        {
+            throw new ConstraintViolatedException(rendition.getId() + " rendition already exists."); // 409
+        }
+
+        try
+        {
+            renditionService2.render(sourceNodeRef, rendition.getId());
+        }
+        catch (IllegalArgumentException e)
+        {
+            throw new NotFoundException(rendition.getId() + " is not registered."); // 404
+        }
+        catch (UnsupportedOperationException e)
+        {
+            throw new IllegalArgumentException((e.getMessage())); // 400
+        }
+        catch (IllegalStateException e)
+        {
+            throw new StaleEntityException(e.getMessage()); // 409
+        }
+    }
+
+    @Override
+    public void createRenditions(NodeRef nodeRef, List<Rendition> renditions, Parameters parameters)
+            throws NotFoundException, ConstraintViolatedException
+    {
+        createRenditions(nodeRef, null, renditions, parameters);
+    }
+
+    @Override
+    public void createRenditions(NodeRef nodeRef, String versionLabelId, List<Rendition> renditions, Parameters parameters)
+            throws NotFoundException, ConstraintViolatedException
+    {
+        if (renditions.isEmpty())
+        {
+            return;
+        }
+
+        if (!renditionService2.isEnabled())
+        {
+            throw new DisabledServiceException("Rendition generation has been disabled.");
+        }
+
+        final NodeRef sourceNodeRef = validateNode(nodeRef.getStoreRef(), nodeRef.getId(), versionLabelId, parameters);
+        RenditionDefinitionRegistry2 renditionDefinitionRegistry2 = renditionService2.getRenditionDefinitionRegistry2();
+
+        // So that POST /nodes/{nodeId}/renditions can specify rendition names as a comma separated list just like
+        // POST /nodes/{nodId}/children can specify a comma separated list, the following code checks to see if the
+        // supplied Rendition names are actually comma separated lists. The following example shows it is possible to
+        // use both approaches.
+        // [
+        //  { "id": "doclib" },
+        //  { "id": "avatar,avatar32" }
+        // ]
+        Set<String> renditionNames = new HashSet<>();
+        for (Rendition rendition : renditions)
+        {
+            String name = getName(rendition);
+            Set<String> requestedRenditions = NodesImpl.getRequestedRenditions(name);
+            if (requestedRenditions == null)
+            {
+                renditionNames.add(null);
+            }
+            else
+            {
+                renditionNames.addAll(requestedRenditions);
+            }
+        }
+
+        StringJoiner renditionNamesAlreadyExist = new StringJoiner(",");
+        StringJoiner renditionNamesNotRegistered = new StringJoiner(",");
+        List<String> renditionNamesToCreate = new ArrayList<>();
+        for (String renditionName : renditionNames)
+        {
+            if (renditionName == null)
+            {
+                throw new IllegalArgumentException(("Null rendition name supplied")); // 400
+            }
+
+            RenditionDefinition2 renditionDefinition = renditionDefinitionRegistry2.getRenditionDefinition(renditionName);
+            if (renditionDefinition == null)
+            {
+                renditionNamesNotRegistered.add(renditionName);
+            }
+
+            final NodeRef renditionNodeRef = getRenditionByName(sourceNodeRef, renditionName, parameters);
+            if (renditionNodeRef == null)
+            {
+                renditionNamesToCreate.add(renditionName);
+            }
+            else
+            {
+                renditionNamesAlreadyExist.add(renditionName);
+            }
+        }
+
+        if (renditionNamesNotRegistered.length() != 0)
+        {
+            throw new NotFoundException("Renditions not registered: " + renditionNamesNotRegistered); // 404
+        }
+
+        if (renditionNamesToCreate.size() == 0)
+        {
+            throw new ConstraintViolatedException("All renditions requested already exist: " + renditionNamesAlreadyExist); // 409
+        }
+
+        for (String renditionName : renditionNamesToCreate)
+        {
+            try
+            {
+                renditionService2.render(sourceNodeRef, renditionName);
+            }
+            catch (UnsupportedOperationException e)
+            {
+                throw new IllegalArgumentException((e.getMessage())); // 400
+            }
+            catch (IllegalStateException e)
+            {
+                throw new StaleEntityException(e.getMessage()); // 409
+            }
+        }
+
+    }
+
+    private String getName(Rendition rendition)
+    {
+        String renditionName = rendition.getId();
+        if (renditionName != null)
+        {
+            renditionName = renditionName.trim();
+            if (renditionName.isEmpty())
+            {
+                renditionName = null;
+            }
+        }
+        return renditionName;
+    }
+
+    @Override
+    public BinaryResource getContent(NodeRef nodeRef, String renditionId, Parameters parameters)
+    {
+        return getContent(nodeRef, null, renditionId, parameters);
+    }
+
+    @Override
+    public BinaryResource getContent(NodeRef nodeRef, String versionLabelId, String renditionId, Parameters parameters)
+    {
+        final NodeRef validatedNodeRef = validateNode(nodeRef.getStoreRef(), nodeRef.getId(), versionLabelId, parameters);
+        return getContentImpl(validatedNodeRef, renditionId, parameters);
+    }
+
+    @Override
+    public BinaryResource getContentNoValidation(NodeRef nodeRef, String renditionId, Parameters parameters)
+    {
+        return getContentNoValidation(nodeRef, null, renditionId, parameters);
+    }
+
+    @Override
+    public BinaryResource getContentNoValidation(NodeRef nodeRef, String versionLabelId, String renditionId, Parameters parameters)
+    {
+        nodeRef = findVersionIfApplicable(nodeRef, versionLabelId);
+        return getContentImpl(nodeRef, renditionId, parameters);
+    }
+
+    private BinaryResource getContentImpl(NodeRef nodeRef, String renditionId, Parameters parameters)
+    {
+        NodeRef renditionNodeRef = getRenditionByName(nodeRef, renditionId, parameters);
+
+        // By default set attachment header (with rendition Id) unless attachment=false
+        boolean attach = true;
+        String attachment = parameters.getParameter(PARAM_ATTACHMENT);
+        if (attachment != null)
+        {
+            attach = Boolean.valueOf(attachment);
+        }
+        final String attachFileName = (attach ? renditionId : null);
+
+        if (renditionNodeRef == null)
+        {
+            boolean isPlaceholder = Boolean.valueOf(parameters.getParameter(PARAM_PLACEHOLDER));
+            if (!isPlaceholder)
+            {
+                throw new NotFoundException("Thumbnail was not found for [" + renditionId + ']');
+            }
+            String sourceNodeMimeType = null;
+            try
+            {
+                sourceNodeMimeType = (nodeRef != null ? getMimeType(nodeRef) : null);
+            }
+            catch (InvalidArgumentException e)
+            {
+                // No content for node, e.g. ASSOC_AVATAR rather than ASSOC_PREFERENCE_IMAGE
+            }
+            // resource based on the content's mimeType and rendition id
+            String phPath = scriptThumbnailService.getMimeAwarePlaceHolderResourcePath(renditionId, sourceNodeMimeType);
+            if (phPath == null)
+            {
+                // 404 since no thumbnail was found
+                throw new NotFoundException("Thumbnail was not found and no placeholder resource available for [" + renditionId + ']');
+            }
+            else
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Retrieving content from resource path [" + phPath + ']');
+                }
+                // get extension of resource
+                String ext = "";
+                int extIndex = phPath.lastIndexOf('.');
+                if (extIndex != -1)
+                {
+                    ext = phPath.substring(extIndex);
+                }
+
+                try
+                {
+                    final String resourcePath = "classpath:" + phPath;
+                    InputStream inputStream = resourceLoader.getResource(resourcePath).getInputStream();
+                    // create temporary file
+                    File file = TempFileProvider.createTempFile(inputStream, "RenditionsApi-", ext);
+                    return new FileBinaryResource(file, attachFileName);
+                }
+                catch (Exception ex)
+                {
+                    if (logger.isErrorEnabled())
+                    {
+                        logger.error("Couldn't load the placeholder." + ex.getMessage());
+                    }
+                    throw new ApiException("Couldn't load the placeholder.");
+                }
+            }
+        }
+
+        Map<QName, Serializable> nodeProps = nodeService.getProperties(renditionNodeRef);
+        ContentData contentData = (ContentData) nodeProps.get(ContentModel.PROP_CONTENT);
+        Date modified = (Date) nodeProps.get(ContentModel.PROP_MODIFIED);
+
+        org.alfresco.rest.framework.resource.content.ContentInfo contentInfo = null;
+        if (contentData != null)
+        {
+            contentInfo = new ContentInfoImpl(contentData.getMimetype(), contentData.getEncoding(), contentData.getSize(), contentData.getLocale());
+        }
+        // add cache settings
+        CacheDirective cacheDirective = new CacheDirective.Builder()
+                .setNeverCache(false)
+                .setMustRevalidate(false)
+                .setLastModified(modified)
+                .setETag(modified != null ? Long.toString(modified.getTime()) : null)
+                .setMaxAge(Long.valueOf(31536000))// one year (in seconds)
+                .build();
+
+        return new NodeBinaryResource(renditionNodeRef, ContentModel.PROP_CONTENT, contentInfo, attachFileName, cacheDirective);
+    }
+
+    protected NodeRef getRenditionByName(NodeRef nodeRef, String renditionId, Parameters parameters)
+    {
+        if (nodeRef != null)
+        {
+            if (StringUtils.isEmpty(renditionId))
+            {
+                throw new InvalidArgumentException("renditionId can't be null or empty.");
+            }
+
+            ChildAssociationRef nodeRefRendition = renditionService2.getRenditionByName(nodeRef, renditionId);
+            if (nodeRefRendition != null)
+            {
+                ContentData contentData = getContentData(nodeRefRendition.getChildRef(), false);
+                if (contentData != null)
+                {
+                    return tenantService.getName(nodeRef, nodeRefRendition.getChildRef());
+                }
+            }
+        }
+
+        return null;
+    }
+
+    protected Rendition toApiRendition(NodeRef renditionNodeRef)
+    {
+        Rendition apiRendition = new Rendition();
+
+        String renditionName = (String) nodeService.getProperty(renditionNodeRef, ContentModel.PROP_NAME);
+        apiRendition.setId(renditionName);
+
+        ContentData contentData = getContentData(renditionNodeRef, false);
+        ContentInfo contentInfo = null;
+        if (contentData != null)
+        {
+            contentInfo = new ContentInfo(contentData.getMimetype(),
+                    getMimeTypeDisplayName(contentData.getMimetype()),
+                    contentData.getSize(),
+                    contentData.getEncoding());
+        }
+        apiRendition.setContent(contentInfo);
+        apiRendition.setStatus(RenditionStatus.CREATED);
+
+        return apiRendition;
+    }
+
+    protected Rendition toApiRendition(String renditionName)
+    {
+        RenditionDefinitionRegistry2 renditionDefinitionRegistry2 = renditionService2.getRenditionDefinitionRegistry2();
+        RenditionDefinition2 renditionDefinition = renditionDefinitionRegistry2.getRenditionDefinition(renditionName);
+        ContentInfo contentInfo = new ContentInfo(renditionDefinition.getTargetMimetype(),
+                getMimeTypeDisplayName(renditionDefinition.getTargetMimetype()), null, null);
+
+        Rendition apiRendition = new Rendition();
+        apiRendition.setId(renditionName);
+        apiRendition.setContent(contentInfo);
+        apiRendition.setStatus(RenditionStatus.NOT_CREATED);
+
+        return apiRendition;
+    }
+
+    private NodeRef validateNode(StoreRef storeRef, final String nodeId, String versionLabelId, Parameters parameters)
+    {
+        if (nodeId == null)
+        {
+            throw new InvalidArgumentException("Missing nodeId");
+        }
+
+        NodeRef nodeRef = nodes.validateNode(storeRef, nodeId);
+        // check if the node represents a file
+        isContentFile(nodeRef);
+
+        nodeRef = findVersionIfApplicable(nodeRef, versionLabelId);
+
+        return nodeRef;
+    }
+
+    private NodeRef findVersionIfApplicable(NodeRef nodeRef, String versionLabelId)
+    {
+        if (versionLabelId != null)
+        {
+            nodeRef = nodes.validateOrLookupNode(nodeRef.getId(), null);
+            VersionHistory vh = versionService.getVersionHistory(nodeRef);
+            if (vh != null)
+            {
+                try
+                {
+                    Version v = vh.getVersion(versionLabelId);
+                    nodeRef = VersionUtil.convertNodeRef(v.getFrozenStateNodeRef());
+                }
+                catch (VersionDoesNotExistException vdne)
+                {
+                    throw new NotFoundException("Couldn't find version: [" + nodeRef.getId() + ", " + versionLabelId + "]");
+                }
+            }
+        }
+
+        return nodeRef;
+    }
+
+    private void isContentFile(NodeRef nodeRef)
+    {
+        if (!nodes.isSubClass(nodeRef, ContentModel.PROP_CONTENT, false))
+        {
+            throw new InvalidArgumentException("Node id '" + nodeRef.getId() + "' does not represent a file.");
+        }
+    }
+
+    private String getMimeTypeDisplayName(String mimeType)
+    {
+        return mimetypeService.getDisplaysByMimetype().get(mimeType);
+    }
+
+    private ContentData getContentData(NodeRef nodeRef, boolean validate)
+    {
+        ContentData contentData = (ContentData) nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT);
+        if (validate && !ContentData.hasContent(contentData))
+        {
+            throw new InvalidArgumentException("Node id '" + nodeRef.getId() + "' has no content.");
+        }
+        return contentData;
+    }
+
+    private String getMimeType(NodeRef nodeRef)
+    {
+        ContentData contentData = getContentData(nodeRef, true);
+        return contentData.getMimetype();
+    }
+
+    private String getStatus(Parameters parameters)
+    {
+        Query query = parameters.getQuery();
+        String status = null;
+        if (query != null)
+        {
+            // Filtering via "where" clause
+            MapBasedQueryWalker propertyWalker = new MapBasedQueryWalker(RENDITION_STATUS_COLLECTION_EQUALS_QUERY_PROPERTIES, null);
+            QueryHelper.walk(query, propertyWalker);
+
+            status = propertyWalker.getProperty(PARAM_STATUS, WhereClauseParser.EQUALS);
+        }
+        return status;
+    }
+
+    @Override
+    public DirectAccessUrl requestContentUrl(String nodeId, String versionId, String renditionId, DirectAccessUrlRequest directAccessUrlRequest)
+    {
+        final NodeRef validatedNodeRef = validateNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId, versionId, null);
+        NodeRef renditionNodeRef = getRenditionByName(validatedNodeRef, renditionId, null);
+
+        if (renditionNodeRef == null)
+        {
+            throw new NotFoundException("The rendition with id: " + renditionId + " was not found.");
+        }
+
+        return nodes.requestContentUrl(renditionNodeRef, directAccessUrlRequest);
+    }
+}
+
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteImportPackageHandler.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteImportPackageHandler.java
new file mode 100644
index 00000000000..97a0d69d7e7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteImportPackageHandler.java
@@ -0,0 +1,86 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import org.alfresco.service.cmr.view.ImportPackageHandler;
+import org.alfresco.service.cmr.view.ImporterException;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
+
+// note: based on HomeSiteImportPackageHandler in Cloud/Thor module
+public class SiteImportPackageHandler implements ImportPackageHandler
+{
+    private final static String SITEID_PLACEHOLDER = "${siteId}";
+
+    private SiteSurfConfig config;
+    private String siteId;
+
+    public SiteImportPackageHandler(SiteSurfConfig config, String siteId)
+    {
+        this.config = config;
+        this.siteId = siteId;
+    }
+
+    @Override
+    public void startImport()
+    {
+    }
+
+    @Override
+    public Reader getDataStream()
+    {
+        return new StringReader(config.getImportView());
+    }
+
+    @Override
+    public InputStream importStream(String contentPath)
+    {
+        String content = config.getImportContent(contentPath);
+        if (content == null)
+        {
+            return null;
+        }
+
+        String siteContent = content.replace(SITEID_PLACEHOLDER, siteId);
+        try
+        {
+            return new ByteArrayInputStream(siteContent.getBytes("UTF-8"));
+        }
+        catch(UnsupportedEncodingException e)
+        {
+            throw new ImporterException("Failed to read content " + contentPath, e);
+        }
+    }
+
+    @Override
+    public void endImport()
+    {
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsExceptionHandler.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsExceptionHandler.java
new file mode 100644
index 00000000000..43b212b929c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsExceptionHandler.java
@@ -0,0 +1,44 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.service.cmr.invitation.InvitationExceptionForbidden;
+
+public class SiteMembershipRequestsExceptionHandler extends DefaultExceptionHandler
+{
+    @Override
+    public boolean handle(Throwable t)
+    {
+        if (t instanceof AccessDeniedException || t instanceof InvitationExceptionForbidden)
+        {
+            // Note: security, no message to indicate why
+            throw new NotFoundException();
+        }
+        return false;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsImpl.java
new file mode 100644
index 00000000000..6cc008c7316
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsImpl.java
@@ -0,0 +1,692 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.invitation.InvitationSearchCriteriaImpl;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.security.authority.UnknownAuthorityException;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.tenant.NetworksService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.SiteMembershipRequests;
+import org.alfresco.rest.api.Sites;
+import org.alfresco.rest.api.model.Person;
+import org.alfresco.rest.api.model.SiteMembershipApproval;
+import org.alfresco.rest.api.model.SiteMembershipRejection;
+import org.alfresco.rest.api.model.SiteMembershipRequest;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.where.Query;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.workflow.api.impl.MapBasedQueryWalker;
+import org.alfresco.service.cmr.invitation.Invitation;
+import org.alfresco.service.cmr.invitation.Invitation.ResourceType;
+import org.alfresco.service.cmr.invitation.InvitationExceptionForbidden;
+import org.alfresco.service.cmr.invitation.InvitationExceptionNotFound;
+import org.alfresco.service.cmr.invitation.InvitationSearchCriteria.InvitationType;
+import org.alfresco.service.cmr.invitation.InvitationService;
+import org.alfresco.service.cmr.invitation.ModeratedInvitation;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Public REST API: centralises access to site membership requests and maps between representations.
+ * 
+ * @author steveglover
+ * @since publicapi1.0
+ */
+public class SiteMembershipRequestsImpl implements SiteMembershipRequests
+{
+    private static final Log logger = LogFactory.getLog(SiteMembershipRequestsImpl.class);
+	
+	// Default role to assign to the site membership request
+    public final static String DEFAULT_ROLE = SiteModel.SITE_CONSUMER;
+
+    // List site memberships filtering (via where clause)
+    private final static Set<String> LIST_SITE_MEMBERSHIPS_EQUALS_QUERY_PROPERTIES = new HashSet<>(Arrays.asList(new String[] { PARAM_SITE_ID, PARAM_PERSON_ID }));
+
+	private People people;
+	private Sites sites;
+	private SiteService siteService;
+	private NodeService nodeService;
+	private InvitationService invitationService;
+	private NetworksService networksService;
+
+	public void setNetworksService(NetworksService networksService)
+	{
+		this.networksService = networksService;
+	}
+
+	public void setNodeService(NodeService nodeService)
+	{
+		this.nodeService = nodeService;
+	}
+
+	public void setPeople(People people)
+	{
+		this.people = people;
+	}
+
+	public void setSites(Sites sites)
+	{
+		this.sites = sites;
+	}
+
+	public void setSiteService(SiteService siteService)
+	{
+		this.siteService = siteService;
+	}
+
+	public void setInvitationService(InvitationService invitationService)
+	{
+		this.invitationService = invitationService;
+	}
+
+	private Invitation getSiteInvitation(String inviteeId, String siteId)
+    {
+		// Is there an outstanding site invite request for the invitee?
+		InvitationSearchCriteriaImpl criteria = new InvitationSearchCriteriaImpl();
+		criteria.setInvitationType(InvitationType.MODERATED);
+		criteria.setInvitee(inviteeId);
+		criteria.setResourceName(siteId);
+		criteria.setResourceType(ResourceType.WEB_SITE);
+		List<Invitation> invitations = invitationService.searchInvitation(criteria);
+		if(invitations.size() > 1)
+		{
+			// TODO exception
+			throw new AlfrescoRuntimeException("There should be only one outstanding site invitation");
+		}
+		return (invitations.size() == 0 ? null : invitations.get(0));
+    }
+	
+	private List<Invitation> getSiteInvitations(String inviteeId)
+    {
+		InvitationSearchCriteriaImpl criteria = new InvitationSearchCriteriaImpl();
+		criteria.setInvitationType(InvitationType.MODERATED);
+		criteria.setInvitee(inviteeId);
+		criteria.setResourceType(ResourceType.WEB_SITE);
+		List<Invitation> invitations = invitationService.searchInvitation(criteria);
+		return invitations;
+    }
+	
+	private SiteMembershipRequest inviteToModeratedSite(final String message, final String inviteeId, final String siteId,
+			final String inviteeRole)
+	{
+		ModeratedInvitation invitation = invitationService.inviteModerated(message, inviteeId, ResourceType.WEB_SITE, siteId, inviteeRole);
+
+		SiteMembershipRequest ret = new SiteMembershipRequest();
+		ret.setId(siteId);
+		ret.setMessage(message);
+		ret.setCreatedAt(invitation.getCreatedAt());
+		return ret;
+	}
+	
+	private SiteMembershipRequest inviteToSite(String siteId, String inviteeId, String inviteeRole, String message)
+	{
+		siteService.setMembership(siteId, inviteeId, inviteeRole);
+		SiteMembershipRequest ret = new SiteMembershipRequest();
+		ret.setId(siteId);
+		ret.setMessage(message);
+		Date createdAt = new Date();
+		ret.setCreatedAt(createdAt);
+		return ret;
+	}
+	
+	private SiteMembershipRequest inviteToPublicSite(final SiteInfo siteInfo, final String message, final String inviteeId,
+			final String inviteeRole)
+	{
+		SiteMembershipRequest siteMembershipRequest = null;
+
+		final String siteId = siteInfo.getShortName();
+		NodeRef siteNodeRef = siteInfo.getNodeRef();
+		String siteCreator = (String)nodeService.getProperty(siteNodeRef, ContentModel.PROP_CREATOR);
+
+		final String siteNetwork = networksService.getUserDefaultNetwork(siteCreator);
+		if(StringUtils.isNotEmpty(siteNetwork))
+		{
+			// MT
+			siteMembershipRequest = TenantUtil.runAsUserTenant(new TenantRunAsWork<SiteMembershipRequest>()
+			{
+				@Override
+				public SiteMembershipRequest doWork() throws Exception
+				{
+					return inviteToSite(siteId, inviteeId, inviteeRole, message);
+				}
+			}, siteCreator, siteNetwork);
+		}
+		else
+		{
+			siteMembershipRequest = AuthenticationUtil.runAs(new RunAsWork<SiteMembershipRequest>()
+			{
+				@Override
+				public SiteMembershipRequest doWork() throws Exception
+				{
+					return inviteToSite(siteId, inviteeId, inviteeRole, message);
+				}
+			}, siteCreator);
+		}
+
+		return siteMembershipRequest;
+	}
+
+    @Override
+	public SiteMembershipRequest createSiteMembershipRequest(String inviteeId, final SiteMembershipRequest siteInvite)
+	{
+    	SiteMembershipRequest request = null;
+
+    	inviteeId = people.validatePerson(inviteeId, true);
+
+    	// Note that the order of error checking is important. The server first needs to check for the status 404 
+    	// conditions before checking for status 400 conditions. Otherwise the server is open to a probing attack. 
+		String siteId = siteInvite.getId();
+		final SiteInfo siteInfo = sites.validateSite(siteId);
+    	if(siteInfo == null)
+    	{
+    		// site does not exist
+    		throw new RelationshipResourceNotFoundException(inviteeId, siteId);
+    	}
+		// set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
+		siteId = siteInfo.getShortName();
+
+		final SiteVisibility siteVisibility = siteInfo.getVisibility();
+
+		if(siteVisibility.equals(SiteVisibility.PRIVATE))
+		{
+			// note: security, no indication that this is a private site
+			throw new RelationshipResourceNotFoundException(inviteeId, siteId);
+		}
+
+		// Is the invitee already a member of the site?
+		boolean isMember = siteService.isMember(siteId, inviteeId);
+		if(isMember)
+		{
+			// yes
+			throw new InvalidArgumentException(inviteeId + " is already a member of site " + siteId);
+		}
+
+		// Is there an outstanding site invite request for the (invitee, site)?
+		Invitation invitation = getSiteInvitation(inviteeId, siteId);
+		if(invitation != null)
+		{
+			// yes
+			throw new InvalidArgumentException(inviteeId + " is already invited to site " + siteId);
+		}
+
+		final String inviteeRole = DEFAULT_ROLE;
+		String message = siteInvite.getMessage();
+		if(message == null)
+		{
+			// the invitation service ignores null messages so convert to an empty message.
+			message = "";
+		}
+
+		if(siteVisibility.equals(SiteVisibility.MODERATED))
+		{
+			request = inviteToModeratedSite(message, inviteeId, siteId, inviteeRole);
+		}
+		else if(siteVisibility.equals(SiteVisibility.PUBLIC))
+		{
+			request = inviteToPublicSite(siteInfo, message, inviteeId, inviteeRole);
+		}
+		else
+		{
+			// note: security, no indication that this is a private site
+			throw new RelationshipResourceNotFoundException(inviteeId, siteId);
+		}
+
+		return request;
+	}
+
+    @Override
+	public SiteMembershipRequest updateSiteMembershipRequest(String inviteeId, final SiteMembershipRequest siteInvite)
+	{
+    	SiteMembershipRequest updatedSiteInvite = null;
+
+		inviteeId = people.validatePerson(inviteeId, true);
+
+		String siteId = siteInvite.getId();
+		SiteInfo siteInfo = sites.validateSite(siteId);
+    	if(siteInfo == null)
+    	{
+    		// site does not exist
+    		throw new RelationshipResourceNotFoundException(inviteeId, siteId);
+    	}
+		// set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
+		siteId = siteInfo.getShortName();
+
+		String message = siteInvite.getMessage();
+		if(message == null)
+		{
+			// the invitation service ignores null messages so convert to an empty message.
+			message = "";
+		}
+
+		try
+		{
+			ModeratedInvitation updatedInvitation = invitationService.updateModeratedInvitation(inviteeId, siteId, message);
+			if(updatedInvitation == null)
+			{
+	    		throw new RelationshipResourceNotFoundException(inviteeId, siteId);
+			}
+			updatedSiteInvite = getSiteMembershipRequest(updatedInvitation);
+		}
+		catch(InvitationExceptionNotFound e)
+		{
+			throw new RelationshipResourceNotFoundException(inviteeId, siteId);
+		}
+
+		if(updatedSiteInvite == null)
+		{
+			throw new RelationshipResourceNotFoundException(inviteeId, siteId);
+		}
+		
+		return updatedSiteInvite;
+	}
+
+    @Override
+	public void cancelSiteMembershipRequest(String inviteeId, String siteId)
+	{
+		inviteeId = people.validatePerson(inviteeId);
+		SiteInfo siteInfo = sites.validateSite(siteId);
+    	if(siteInfo == null)
+    	{
+    		// site does not exist
+    		throw new RelationshipResourceNotFoundException(inviteeId, siteId);
+    	}
+		// set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
+		siteId = siteInfo.getShortName();
+
+		Invitation invitation = getSiteInvitation(inviteeId, siteId);
+		if(invitation == null)
+		{
+			// no such invitation
+    		throw new RelationshipResourceNotFoundException(inviteeId, siteId);
+		}
+		invitationService.cancel(invitation.getInviteId());
+	}
+	
+	public SiteMembershipRequest getSiteMembershipRequest(String inviteeId, final String siteId)
+	{
+		inviteeId = people.validatePerson(inviteeId);
+
+		SiteInfo siteInfo = AuthenticationUtil.runAsSystem(new RunAsWork<SiteInfo>()
+		{
+			@Override
+			public SiteInfo doWork() throws Exception
+			{
+				SiteInfo siteInfo = sites.validateSite(siteId);
+				return siteInfo;
+			}
+		});
+		
+		if(siteInfo == null)
+		{
+			// site does not exist
+			throw new RelationshipResourceNotFoundException(inviteeId, siteId);
+		}
+		
+		if(siteInfo.getVisibility().equals(SiteVisibility.MODERATED))
+		{
+			// set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
+			String normalizedSiteId = siteInfo.getShortName();
+	
+			Invitation invitation = getSiteInvitation(inviteeId, normalizedSiteId);
+			if(invitation == null)
+			{
+				// no such invitation
+	    		throw new RelationshipResourceNotFoundException(inviteeId, normalizedSiteId);
+			}
+			if(invitation instanceof ModeratedInvitation)
+			{
+				ModeratedInvitation moderatedInvitation = (ModeratedInvitation)invitation;
+				SiteMembershipRequest siteInvite = getSiteMembershipRequest(moderatedInvitation);
+				return siteInvite;
+			}
+			else
+			{
+				throw new InvalidArgumentException("Expected moderated invitation");
+			}
+		}
+		else
+		{
+			// non-moderated sites cannot appear in a site membership request, so throw an exception
+			throw new RelationshipResourceNotFoundException(inviteeId, siteId);
+		}
+	}
+
+    private SiteMembershipRequest getSiteMembershipRequest(ModeratedInvitation moderatedInvitation)
+    {
+		return getSiteMembershipRequest(moderatedInvitation, false);
+    }
+
+	private SiteMembershipRequest getSiteMembershipRequest(ModeratedInvitation moderatedInvitation, boolean includePersonDetails)
+	{
+		SiteMembershipRequest siteMembershipRequest = null;
+
+		ResourceType resourceType = moderatedInvitation.getResourceType();
+		if(resourceType.equals(ResourceType.WEB_SITE))
+		{
+			final String siteId = moderatedInvitation.getResourceName();
+			
+			SiteInfo siteInfo = AuthenticationUtil.runAsSystem(new RunAsWork<SiteInfo>()
+			{
+				@Override
+				public SiteInfo doWork() throws Exception
+				{
+					SiteInfo siteInfo = sites.validateSite(siteId);
+					return siteInfo;
+				}
+			});
+
+			if(siteInfo == null)
+			{
+				// site does not exist
+				throw new EntityNotFoundException(siteId);
+			}
+
+			if(siteInfo.getVisibility().equals(SiteVisibility.MODERATED))
+			{
+				// return a site membership request only if this is a moderated site
+				siteMembershipRequest = new SiteMembershipRequest();
+				String title = siteInfo.getTitle();
+				siteMembershipRequest.setTitle(title);
+				siteMembershipRequest.setId(siteId);
+				siteMembershipRequest.setMessage(moderatedInvitation.getInviteeComments());
+				siteMembershipRequest.setCreatedAt(moderatedInvitation.getCreatedAt());
+				siteMembershipRequest.setModifiedAt(moderatedInvitation.getModifiedAt());
+
+                if (includePersonDetails)
+                {
+                    Person person = people.getPerson(moderatedInvitation.getInviteeUserName());
+                    siteMembershipRequest.setPerson(person);
+                }
+			}
+		}
+		else
+		{
+			logger.warn("Unexpected resource type " + resourceType + " for site membership request");
+		}
+
+		return siteMembershipRequest;
+    }
+
+    private List<SiteMembershipRequest> toSiteMembershipRequests(List<Invitation> invitations)
+    {
+        return toSiteMembershipRequests(invitations, false);
+    }
+
+    private List<SiteMembershipRequest> toSiteMembershipRequests(List<Invitation> invitations, boolean includePersonDetails)
+    {
+		List<SiteMembershipRequest> siteMembershipRequests = new ArrayList<SiteMembershipRequest>(invitations.size());
+		for(Invitation invitation : invitations)
+		{
+			if(invitation instanceof ModeratedInvitation)
+			{
+				ModeratedInvitation moderatedInvitation = (ModeratedInvitation)invitation;
+				SiteMembershipRequest siteMembershipRequest = getSiteMembershipRequest(moderatedInvitation, includePersonDetails);
+				if(siteMembershipRequest != null)
+				{
+					// note: siteMembershipRequest may be null if the site is now no longer a moderated site
+					// or if the invitation is malformed and does not refer to a site.
+					siteMembershipRequests.add(siteMembershipRequest);
+				}
+			}
+			else
+			{
+				// just ignore, shouldn't happen because getSiteInvitations filters by ModeratedInvitation
+			}
+		}
+		
+		return siteMembershipRequests;
+    }
+
+    private CollectionWithPagingInfo<SiteMembershipRequest> createPagedSiteMembershipRequests(List<SiteMembershipRequest> siteMembershipRequests, Paging paging)
+    {
+        int skipCount = paging.getSkipCount();
+        int maxItems = paging.getMaxItems();
+        int max = skipCount + maxItems + 1; // to detect hasMoreItems
+
+        // unfortunately, need to sort in memory because there's no way to get site
+        // membership requests sorted by title from
+        // the workflow apis
+        Collections.sort(siteMembershipRequests);
+
+        int totalItems = siteMembershipRequests.size();
+
+        if (skipCount >= totalItems)
+        {
+            List<SiteMembershipRequest> empty = Collections.emptyList();
+            return CollectionWithPagingInfo.asPaged(paging, empty, false, totalItems);
+        }
+        else
+        {
+            int end = Math.min(max - 1, totalItems);
+            boolean hasMoreItems = totalItems > end;
+
+            siteMembershipRequests = siteMembershipRequests.subList(skipCount, end);
+            return CollectionWithPagingInfo.asPaged(paging, siteMembershipRequests, hasMoreItems, totalItems);
+        }
+    }
+
+    @Override
+    public CollectionWithPagingInfo<SiteMembershipRequest> getPagedSiteMembershipRequests(String personId, Paging paging)
+    {
+        personId = people.validatePerson(personId, true);
+
+        List<Invitation> invitations = getSiteInvitations(personId);
+        return createPagedSiteMembershipRequests(toSiteMembershipRequests(invitations), paging);
+    }
+
+    @Override
+    public CollectionWithPagingInfo<SiteMembershipRequest> getPagedSiteMembershipRequests(final Parameters parameters)
+    {
+        InvitationSearchCriteriaImpl criteria = new InvitationSearchCriteriaImpl();
+        criteria.setInvitationType(InvitationType.MODERATED);
+        criteria.setResourceType(ResourceType.WEB_SITE);
+
+        // Parse where clause properties.
+        Query q = parameters.getQuery();
+        if (q != null)
+        {
+            // Filtering via "where" clause.
+            MapBasedQueryWalker propertyWalker = createSiteMembershipRequestQueryWalker();
+            QueryHelper.walk(q, propertyWalker);
+
+            String siteId = propertyWalker.getProperty(PARAM_SITE_ID, WhereClauseParser.EQUALS, String.class);
+
+            if (siteId != null && !siteId.isEmpty())
+            {
+                criteria.setResourceName(siteId);
+            }
+
+            String personId = propertyWalker.getProperty(PARAM_PERSON_ID, WhereClauseParser.EQUALS, String.class);
+
+            if (personId != null && !personId.isEmpty())
+            {
+                criteria.setInvitee(personId);
+            }
+        }
+
+        List<Invitation> invitations = invitationService.searchInvitation(criteria);
+        return createPagedSiteMembershipRequests(toSiteMembershipRequests(invitations, true), parameters.getPaging());
+    }
+
+    @Override
+    public void approveSiteMembershipRequest(String siteId, String inviteeId, SiteMembershipApproval siteMembershipApproval)
+    {
+        SiteInfo siteInfo = sites.validateSite(siteId);
+        if (siteInfo == null)
+        {
+            throw new EntityNotFoundException(siteId);
+        }
+
+        // Set the site id to the short name (to deal with case sensitivity issues with
+        // using the siteId from the url)
+        siteId = siteInfo.getShortName();
+
+        // Validate invitation.
+        Invitation invitation = getSiteInvitation(inviteeId, siteId);
+        if (invitation == null || !(invitation instanceof ModeratedInvitation))
+        {
+            throw new RelationshipResourceNotFoundException(siteId, inviteeId);
+        }
+
+        ModeratedInvitation moderatedInvitation = (ModeratedInvitation) invitation;
+        ResourceType resourceType = moderatedInvitation.getResourceType();
+
+        if (!resourceType.equals(ResourceType.WEB_SITE) || !SiteVisibility.MODERATED.equals(siteInfo.getVisibility()))
+        {
+            // note: security, no indication that this has a different visibility
+            throw new RelationshipResourceNotFoundException(siteId, inviteeId);
+        }
+
+        try
+        {
+            invitationService.approve(invitation.getInviteId(), "");
+        }
+        catch (InvitationExceptionForbidden ex)
+        {
+            throw new PermissionDeniedException();
+        }
+
+        // Workflow doesn't allow changing the role, so a new update may be required if
+        // approval role differs from default one.
+        if (siteMembershipApproval != null && !(siteMembershipApproval.getRole() == null || siteMembershipApproval.getRole().isEmpty()))
+        {
+            String role = siteMembershipApproval.getRole();
+
+            // Check if role chosen by moderator differs from the invite role.
+            if (!moderatedInvitation.getRoleName().equals(role))
+            {
+                String currentUserId = AuthenticationUtil.getFullyAuthenticatedUser();
+
+                // Update invitation with new role.
+                try
+                {
+                    addSiteMembership(invitation.getInviteeUserName(), siteId, role, currentUserId);
+                }
+                catch (UnknownAuthorityException e)
+                {
+                    logger.debug("addSiteMember:  UnknownAuthorityException " + siteId + " person " + invitation.getInviteId() + " role " + role);
+                    throw new InvalidArgumentException("Unknown role '" + role + "'");
+                }
+            }
+        }
+    }
+
+    @Override
+    public void rejectSiteMembershipRequest(String siteId, String inviteeId, SiteMembershipRejection siteMembershipRejection)
+    {
+        SiteInfo siteInfo = sites.validateSite(siteId);
+        if (siteInfo == null)
+        {
+            throw new EntityNotFoundException(siteId);
+        }
+
+        // set the site id to the short name (to deal with case sensitivity issues with
+        // using the siteId from the url)
+        siteId = siteInfo.getShortName();
+
+        // Validate invitation.
+        Invitation invitation = getSiteInvitation(inviteeId, siteId);
+        if (invitation == null || !(invitation instanceof ModeratedInvitation))
+        {
+            throw new RelationshipResourceNotFoundException(siteId, inviteeId);
+        }
+
+        ModeratedInvitation moderatedInvitation = (ModeratedInvitation) invitation;
+        ResourceType resourceType = moderatedInvitation.getResourceType();
+
+        if (!resourceType.equals(ResourceType.WEB_SITE) || !SiteVisibility.MODERATED.equals(siteInfo.getVisibility()))
+        {
+            // note: security, no indication that this has a different visibility
+            throw new RelationshipResourceNotFoundException(siteId, inviteeId);
+        }
+
+        String reason = null;
+        if (siteMembershipRejection != null && !(siteMembershipRejection.getComment() == null || siteMembershipRejection.getComment().isEmpty()))
+        {
+            reason = siteMembershipRejection.getComment();
+        }
+
+        try
+        {
+            invitationService.reject(invitation.getInviteId(), reason);
+        }
+        catch (InvitationExceptionForbidden ex)
+        {
+            throw new PermissionDeniedException();
+        }
+    }
+
+    /**
+     * Create query walker for <code>listChildren</code>.
+     *
+     * @return The created {@link MapBasedQueryWalker}.
+     */
+    private MapBasedQueryWalker createSiteMembershipRequestQueryWalker()
+    {
+        return new MapBasedQueryWalker(LIST_SITE_MEMBERSHIPS_EQUALS_QUERY_PROPERTIES, null);
+    }
+
+    private void addSiteMembership(final String invitee, final String siteName, final String role, final String runAsUser)
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            public Void doWork() throws Exception
+            {
+                siteService.setMembership(siteName, invitee, role);
+                return null;
+            }
+
+        }, runAsUser);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteSurfConfig.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteSurfConfig.java
new file mode 100644
index 00000000000..e7e957030fb
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteSurfConfig.java
@@ -0,0 +1,132 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.extensions.webscripts.ClassPathStoreResourceResolver;
+import org.springframework.util.FileCopyUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+// note: based on HomeSiteSurfConfig in Cloud/Thor module
+public class SiteSurfConfig implements ApplicationContextAware, InitializingBean
+{
+    private ApplicationContext applicationContext;
+    private String configPath;
+    private String packageName = "surf-config";
+    private String importView;
+    private Map<String, String> importContent;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
+    {
+        this.applicationContext = applicationContext;
+    }
+
+    public void setConfigPath(String configPath)
+    {
+        if (!configPath.endsWith("/"))
+        {
+            configPath = configPath + "/";
+        }
+        this.configPath = configPath;
+    }
+
+    public void setPackageName(String packageName)
+    {
+        this.packageName = packageName;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        if (this.configPath == null)
+        {
+            setConfigPath("alfresco/bootstrap/site");
+        }
+        importView = loadImportView();
+        importContent = loadContent();
+    }
+
+    public String getImportView()
+    {
+        return importView;
+    }
+
+    public String getImportContent(String contentPath)
+    {
+        return importContent.get(contentPath);
+    }
+
+    private String loadImportView() throws IOException
+    {
+        ClassPathResource importViewResource = new ClassPathResource(configPath + packageName + ".xml");
+        if (!importViewResource.exists())
+        {
+            throw new AlfrescoRuntimeException("Cannot find site config " + importViewResource.getPath());
+        }
+        return convert(importViewResource.getInputStream());
+    }
+
+    private Map<String, String> loadContent() throws IOException
+    {
+        ClassPathStoreResourceResolver resourceResolver = new ClassPathStoreResourceResolver(applicationContext);
+        Resource[] contentResources = resourceResolver.getResources("classpath*:" + configPath + packageName + "/*.*");
+        Map<String, String> content = new HashMap<String, String>();
+        for (Resource contentResource : contentResources)
+        {
+            String fileName = contentResource.getFilename();
+            // ignore hidden directories / files
+            if (fileName.startsWith("."))
+            {
+                continue;
+            }
+            String key = packageName + "/" + fileName;
+            String value = convert(contentResource.getInputStream());
+            content.put(key, value);
+        }
+        return content;
+    }
+
+    private String convert(InputStream contentInputStream) throws IOException
+    {
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        FileCopyUtils.copy(contentInputStream, os);
+        byte[] bytes = os.toByteArray();
+        String content = new String(bytes, "UTF-8");
+        return content;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/SitesImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/SitesImpl.java
new file mode 100644
index 00000000000..26c038914d0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/SitesImpl.java
@@ -0,0 +1,1445 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.io.Serializable;
+import java.text.Collator;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.CannedQuerySortDetails.SortOrder;
+import org.alfresco.query.PageDetails;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.node.getchildren.FilterProp;
+import org.alfresco.repo.node.getchildren.FilterPropBoolean;
+import org.alfresco.repo.node.getchildren.FilterPropString;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authority.UnknownAuthorityException;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.repo.site.*;
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.Sites;
+import org.alfresco.rest.api.model.*;
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.jacksonextensions.BeanPropertiesFilter;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.rest.framework.resource.parameters.where.Query;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.workflow.api.impl.MapBasedQueryWalker;
+import org.alfresco.rest.workflow.api.impl.MapBasedQueryWalkerOrSupported;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.favourites.FavouritesService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.preference.PreferenceService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteMemberInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.cmr.view.ImportPackageHandler;
+import org.alfresco.service.cmr.view.ImporterBinding;
+import org.alfresco.service.cmr.view.ImporterContentCache;
+import org.alfresco.service.cmr.view.ImporterService;
+import org.alfresco.service.cmr.view.Location;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Centralises access to site services and maps between representations.
+ * 
+ * @author steveglover
+ * @author janv
+ * @since publicapi1.0
+ */
+public class SitesImpl implements Sites
+{
+    private static final Log logger = LogFactory.getLog(SitesImpl.class);
+
+    private static final String FAVOURITE_SITES_PREFIX = "org.alfresco.share.sites.favourites.";
+    private static final int FAVOURITE_SITES_PREFIX_LENGTH = FAVOURITE_SITES_PREFIX.length();
+
+    // based on Share create site
+    private static final int SITE_MAXLEN_ID = 72;
+    private static final int SITE_MAXLEN_TITLE = 256;
+    private static final int SITE_MAXLEN_DESCRIPTION = 512;
+
+    private static final String SITE_ID_VALID_CHARS_PARTIAL_REGEX = "A-Za-z0-9\\-";
+
+    private static final String DEFAULT_SITE_PRESET = "site-dashboard";
+    private static final String PARAM_IS_MEMBER_OF_GROUP = "isMemberOfGroup";
+
+    private final static Map<String,QName> SORT_PARAMS_TO_QNAMES;
+    static
+    {
+        Map<String,QName> aMap = new HashMap<>(3);
+        aMap.put(PARAM_SITE_TITLE, ContentModel.PROP_TITLE);
+        aMap.put(PARAM_SITE_ID, ContentModel.PROP_NAME);
+        aMap.put(PARAM_SITE_DESCRIPTION, ContentModel.PROP_DESCRIPTION);
+        SORT_PARAMS_TO_QNAMES = Collections.unmodifiableMap(aMap);
+    }
+
+    private final static Map<String,SiteService.SortFields> SORT_SITE_MEMBERSHIP;
+    static
+    {
+        Map<String,SiteService.SortFields> aMap = new HashMap<>(3);
+        aMap.put(PARAM_SITE_TITLE, SiteService.SortFields.SiteTitle);
+        aMap.put(SiteService.SortFields.SiteTitle.toString(), SiteService.SortFields.SiteTitle); // for backwards compat'
+        aMap.put(PARAM_SITE_ID, SiteService.SortFields.SiteShortName);
+        aMap.put(SiteService.SortFields.SiteShortName.toString(), SiteService.SortFields.SiteShortName); // for backwards compat'
+        aMap.put(PARAM_SITE_ROLE, SiteService.SortFields.Role);
+        aMap.put(SiteService.SortFields.Role.toString(), SiteService.SortFields.Role);  // for backwards compat'
+        SORT_SITE_MEMBERSHIP = Collections.unmodifiableMap(aMap);
+    }
+
+    // list children filtering (via where clause)
+    private final static Set<String> LIST_SITES_EQUALS_QUERY_PROPERTIES = new HashSet<>(Arrays.asList(PARAM_VISIBILITY, PARAM_PRESET));
+
+    protected Nodes nodes;
+    protected People people;
+    protected NodeService nodeService;
+    protected DictionaryService dictionaryService;
+    protected SiteService siteService;
+    protected FavouritesService favouritesService;
+    protected PreferenceService preferenceService;
+    protected ImporterService importerService;
+    protected SiteSurfConfig siteSurfConfig;
+    protected PermissionService permissionService;
+    protected SiteServiceImpl siteServiceImpl;
+    protected AuthorityService authorityService;
+
+    public void setPreferenceService(PreferenceService preferenceService)
+    {
+        this.preferenceService = preferenceService;
+    }
+
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService;
+    }
+
+    public void setNodes(Nodes nodes)
+    {
+        this.nodes = nodes;
+    }
+
+    public void setFavouritesService(FavouritesService favouritesService)
+    {
+        this.favouritesService = favouritesService;
+    }
+
+    public void setPeople(People people)
+    {
+        this.people = people;
+    }
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+
+    public void setImporterService(ImporterService importerService)
+    {
+        this.importerService = importerService;
+    }
+
+    public void setSiteSurfConfig(SiteSurfConfig siteSurfConfig)
+    {
+        this.siteSurfConfig = siteSurfConfig;
+    }
+
+    public void setPermissionService(PermissionService permissionService)
+    {
+        this.permissionService = permissionService;
+    }
+
+    public void setSiteServiceImpl(SiteServiceImpl siteServiceImpl)
+    {
+        this.siteServiceImpl = siteServiceImpl;
+    }
+
+    public AuthorityService getAuthorityService()
+    {
+        return authorityService;
+    }
+
+    public void setAuthorityService(AuthorityService authorityService)
+    {
+        this.authorityService = authorityService;
+    }
+
+    public SiteInfo validateSite(NodeRef guid)
+    {
+        SiteInfo siteInfo = null;
+
+        if(guid == null)
+        {
+            throw new InvalidArgumentException("guid is null");
+        }
+        nodes.validateNode(guid);
+        QName type = nodeService.getType(guid);
+        boolean isSiteNodeRef = dictionaryService.isSubClass(type, SiteModel.TYPE_SITE);
+        if(isSiteNodeRef)
+        {
+            siteInfo = siteService.getSite(guid);
+            if(siteInfo == null)
+            {
+                // not a site
+                throw new InvalidArgumentException(guid.getId() + " is not a site");
+            }
+        }
+        else
+        {
+            // site does not exist
+            throw new EntityNotFoundException(guid.getId());
+        }
+
+        return siteInfo;
+    }
+
+    public SiteInfo validateSite(String siteId)
+    {
+        if(siteId == null)
+        {
+            throw new InvalidArgumentException("siteId is null");
+        }
+        SiteInfo siteInfo = siteService.getSite(siteId);
+        return siteInfo;
+    }
+
+    public CollectionWithPagingInfo<SiteMember> getSiteMembers(String siteId, Parameters parameters)
+    {
+        SiteInfo siteInfo = validateSite(siteId);
+        if(siteInfo == null)
+        {
+            // site does not exist
+            throw new EntityNotFoundException(siteId);
+        }
+        // set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
+        siteId = siteInfo.getShortName();
+
+        Paging paging = parameters.getPaging();
+        PagingRequest pagingRequest = Util.getPagingRequest(paging);
+        pagingRequest.setRequestTotalCountMax(100);
+
+        MapBasedQueryWalker propertyWalker = new MapBasedQueryWalker(new HashSet<>(Collections.singletonList(PARAM_IS_MEMBER_OF_GROUP)), null);;
+        QueryHelper.walk(parameters.getQuery(), propertyWalker);
+
+        Boolean expandGroups = propertyWalker.getProperty(PARAM_IS_MEMBER_OF_GROUP, WhereClauseParser.EQUALS, Boolean.class);
+
+        if (expandGroups == null) {
+            expandGroups = true;
+        }
+
+        final List<Pair<SiteService.SortFields, Boolean>> sort = new ArrayList<Pair<SiteService.SortFields, Boolean>>();
+        sort.add(new Pair<SiteService.SortFields, Boolean>(SiteService.SortFields.LastName, Boolean.TRUE));
+        sort.add(new Pair<SiteService.SortFields, Boolean>(SiteService.SortFields.FirstName, Boolean.TRUE));
+        sort.add(new Pair<SiteService.SortFields, Boolean>(SiteService.SortFields.Role, Boolean.TRUE));
+        sort.add(new Pair<SiteService.SortFields, Boolean>(SiteService.SortFields.Username, Boolean.TRUE));
+        PagingResults<SiteMembership> pagedResults = siteService.listMembersPaged(siteId, expandGroups, sort, pagingRequest);
+
+        List<SiteMember> ret = pagedResults.getPage()
+                .stream()
+                .map((siteMembership) -> new SiteMember(siteMembership.getPersonId(), siteMembership.getRole(), siteMembership.isMemberOfGroup()))
+                .collect(Collectors.toList());
+
+        return CollectionWithPagingInfo.asPaged(paging, ret, pagedResults.hasMoreItems(), pagedResults.getTotalResultCount().getFirst());
+    }
+    
+    public String getSiteRole(String siteId)
+    {
+        String personId = AuthenticationUtil.getFullyAuthenticatedUser();
+        return getSiteRole(siteId, personId);
+    }
+    
+    public String getSiteRole(String siteId, String personId)
+    {
+        return siteService.getMembersRole(siteId, personId);
+    }
+    
+    public Site getSite(String siteId)
+    {
+        return getSite(siteId, true);
+    }
+
+    public Site getSite(String siteId, boolean includeRole)
+    {
+        SiteInfo siteInfo = validateSite(siteId);
+        if(siteInfo == null)
+        {
+            // site does not exist
+            throw new EntityNotFoundException(siteId);
+        }
+        return getSite(siteInfo, includeRole);
+    }
+
+    private Site getSite(SiteInfo siteInfo, boolean includeRole)
+    {
+        // set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
+        String siteId = siteInfo.getShortName();
+        String role = null;
+        if(includeRole)
+        {
+            role = getSiteRole(siteId);
+        }
+        return new Site(siteInfo, role);
+    }
+    
+    /**
+     * people/<personId>/sites/<siteId>
+     *
+     * @param siteId String
+     * @param personId String
+     * @return MemberOfSite
+     */
+    public MemberOfSite getMemberOfSite(String personId, String siteId)
+    {
+        MemberOfSite siteMember = null;
+
+        personId = people.validatePerson(personId);
+        SiteInfo siteInfo = validateSite(siteId);
+        if(siteInfo == null)
+        {
+            // site does not exist
+            throw new RelationshipResourceNotFoundException(personId, siteId);
+        }
+        // set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
+        siteId = siteInfo.getShortName();
+
+        String roleStr = siteService.getMembersRole(siteInfo.getShortName(), personId);
+        if(roleStr != null)
+        {
+            Site site = new Site(siteInfo, roleStr);
+            siteMember = new MemberOfSite(site.getId(), siteInfo.getNodeRef(), roleStr);
+        }
+        else
+        {
+            throw new RelationshipResourceNotFoundException(personId, siteId);
+        }
+
+        return siteMember;
+    }
+
+    public SiteMember getSiteMember(String personId, String siteId)
+    {
+        SiteMember siteMember = null;
+
+		personId = people.validatePerson(personId);
+    	SiteInfo siteInfo = validateSite(siteId);
+    	if(siteInfo == null)
+    	{
+    		// site does not exist
+            logger.debug("Site does not exist: "+siteId);            
+    		throw new RelationshipResourceNotFoundException(personId, siteId);
+    	}
+    	siteId = siteInfo.getShortName();
+
+        logger.debug("Getting member role for "+siteId+ " person "+personId);
+    	String role = siteService.getMembersRole(siteId, personId);
+    	if(role != null)
+    	{
+	    	siteMember = new SiteMember(personId, role);
+    	}
+    	else
+    	{
+            logger.debug("Getting member role but role is null");
+    		throw new RelationshipResourceNotFoundException(personId, siteId);
+    	}
+        
+        return siteMember;
+    }
+
+	public SiteMember addSiteMember(String siteId, SiteMember siteMember)
+	{
+		String personId = people.validatePerson(siteMember.getPersonId());
+    	SiteInfo siteInfo = validateSite(siteId);
+    	if(siteInfo == null)
+    	{
+    		// site does not exist
+			logger.debug("addSiteMember:  site does not exist "+siteId+ " person "+personId);
+    		throw new EntityNotFoundException(siteId);
+    	}
+    	// set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
+    	siteId = siteInfo.getShortName();
+    	
+    	String role = siteMember.getRole();
+    	if(role == null)
+    	{
+			logger.debug("addSiteMember:  Must provide a role "+siteMember);
+    		throw new InvalidArgumentException("Must provide a role");
+    	}
+    	
+    	if(siteService.isMember(siteId, personId))
+    	{
+			logger.debug("addSiteMember:  "+ personId + " is already a member of site " + siteId);
+    		throw new ConstraintViolatedException(personId + " is already a member of site " + siteId);
+    	}
+
+    	if(!siteService.canAddMember(siteId, personId, role))
+    	{
+			logger.debug("addSiteMember:  PermissionDeniedException "+siteId+ " person "+personId+ " role "+role);
+    		throw new PermissionDeniedException();
+    	}
+
+        try
+        {
+            siteService.setMembership(siteId, personId, role);
+        }
+        catch (UnknownAuthorityException e)
+        {
+			logger.debug("addSiteMember:  UnknownAuthorityException "+siteId+ " person "+personId+ " role "+role);
+            throw new InvalidArgumentException("Unknown role '" + role + "'");
+        }
+        return siteMember;
+    }
+
+    public void removeSiteMember(String personId, String siteId)
+    {
+        personId = people.validatePerson(personId);
+        SiteInfo siteInfo = validateSite(siteId);
+        if(siteInfo == null)
+        {
+            // site does not exist
+            throw new RelationshipResourceNotFoundException(personId, siteId);
+        }
+        // set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
+        siteId = siteInfo.getShortName();
+
+        boolean isMember = siteService.isMember(siteId, personId);
+        if(!isMember)
+        {
+            throw new InvalidArgumentException();
+        }
+        String role = siteService.getMembersRole(siteId, personId);
+        if(role != null)
+        {
+            if(role.equals(SiteModel.SITE_MANAGER))
+            {
+                int numAuthorities = siteService.countAuthoritiesWithRole(siteId, SiteModel.SITE_MANAGER);
+                if(numAuthorities <= 1)
+                {
+                    throw new InvalidArgumentException("Can't remove last manager of site " + siteId);
+                }
+                siteService.removeMembership(siteId, personId);
+            }
+            else
+            {
+                siteService.removeMembership(siteId, personId);
+            }
+        }
+        else
+        {
+            throw new AlfrescoRuntimeException("Unable to determine role of site member");
+        }
+    }
+
+    public SiteMember updateSiteMember(String siteId, SiteMember siteMember)
+    {
+        String siteMemberId = siteMember.getPersonId();
+        if(siteMemberId == null)
+        {
+            throw new InvalidArgumentException("Member id is null");
+        }
+        siteMemberId = people.validatePerson(siteMemberId);
+        SiteInfo siteInfo = validateSite(siteId);
+        if(siteInfo == null)
+        {
+            // site does not exist
+            throw new EntityNotFoundException(siteId);
+        }
+        siteId = siteInfo.getShortName();
+        String siteRole = siteMember.getRole();
+        if(siteRole == null)
+        {
+            throw new InvalidArgumentException("Must provide a role");
+        }
+
+        /* MNT-10551 : fix */
+        if (!siteService.isMember(siteId, siteMember.getPersonId()))
+        {
+            throw new InvalidArgumentException("User is not a member of the site");
+        }
+
+        try
+        {
+            siteService.setMembership(siteId, siteMember.getPersonId(), siteRole);
+        }
+        catch (UnknownAuthorityException e)
+        {
+            throw new InvalidArgumentException("Unknown role '" + siteRole + "'");
+        }
+        return siteMember;
+    }
+
+    public CollectionWithPagingInfo<MemberOfSite> getSites(String personId, Parameters parameters)
+    {
+        Paging paging = parameters.getPaging();
+
+        personId = people.validatePerson(personId);
+
+        PagingRequest pagingRequest = Util.getPagingRequest(paging);
+
+        // get the sorting options
+        List<Pair<? extends Object, SortOrder>> sortPairs = new ArrayList<>(parameters.getSorting().size());
+
+        List<SortColumn> sortCols = parameters.getSorting();
+        if ((sortCols != null) && (sortCols.size() > 0))
+        {
+            for (SortColumn sortCol : sortCols)
+            {
+                SiteService.SortFields sortProp = SORT_SITE_MEMBERSHIP.get(sortCol.column);
+                if (sortProp == null)
+                {
+                    throw new InvalidArgumentException("Invalid sort field: "+sortCol.column);
+                }
+                sortPairs.add(new Pair<>(sortProp, (sortCol.asc ? SortOrder.ASCENDING : SortOrder.DESCENDING)));
+            }
+        }
+        else
+        {
+            // default sort order
+            sortPairs.add(new Pair<SiteService.SortFields, SortOrder>(
+                    SiteService.SortFields.SiteTitle,
+                    SortOrder.ASCENDING ));
+        }
+
+        // get the unsorted list of site memberships
+        List<SiteMembership> siteMembers = siteService.listSiteMemberships(personId, 0);
+
+        // sort the list of site memberships
+        int totalSize = siteMembers.size();
+        final List<SiteMembership> sortedSiteMembers = new ArrayList<>(siteMembers);
+        Collections.sort(sortedSiteMembers, new SiteMembershipComparator(
+                    sortPairs,
+                    SiteMembershipComparator.Type.SITES));
+
+        PageDetails pageDetails = PageDetails.getPageDetails(pagingRequest, totalSize);
+        List<MemberOfSite> ret = new ArrayList<>(totalSize);
+
+        List<FilterProp> filterProps = getFilterPropListOfSites(parameters);
+
+        int counter;
+        int totalItems = 0;
+        Iterator<SiteMembership> it = sortedSiteMembers.iterator();
+        for(counter = 0; it.hasNext();)
+        {
+            SiteMembership siteMember = it.next();
+
+            if (filterProps != null && !includeFilter(siteMember, filterProps))
+            {
+                continue;
+            }
+
+            if(counter < pageDetails.getSkipCount())
+            {
+                totalItems++;
+                counter++;
+                continue;
+            }
+            
+            if (counter <= pageDetails.getEnd() - 1)
+            {
+                SiteInfo siteInfo = siteMember.getSiteInfo();
+                MemberOfSite memberOfSite = new MemberOfSite(siteInfo.getShortName(), siteInfo.getNodeRef(), siteMember.getRole());
+                ret.add(memberOfSite);
+
+                counter++;
+            }
+
+            totalItems++;
+        }
+        return CollectionWithPagingInfo.asPaged(paging, ret, counter < totalItems, totalItems);
+
+    }
+
+    public SiteContainer getSiteContainer(String siteId, String containerId)
+    {
+        // check site and container node validity
+        SiteInfo siteInfo = validateSite(siteId);
+        if(siteInfo == null)
+        {
+            // site does not exist
+            throw new RelationshipResourceNotFoundException(siteId, containerId);
+        }
+        // set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
+        siteId = siteInfo.getShortName();
+
+        NodeRef containerNodeRef = siteService.getContainer(siteId, containerId);
+        if(containerNodeRef == null)
+        {
+            throw new RelationshipResourceNotFoundException(siteId, containerId);
+        }
+
+        // check that the containerId is actually a container for the specified site
+        SiteInfo testSiteInfo = siteService.getSite(containerNodeRef);
+        if(testSiteInfo == null)
+        {
+            throw new RelationshipResourceNotFoundException(siteId, containerId);
+        }
+        else
+        {
+            if(!testSiteInfo.getShortName().equals(siteId))
+            {
+                throw new RelationshipResourceNotFoundException(siteId, containerId);
+            }
+        }
+
+        String folderId = (String)nodeService.getProperty(containerNodeRef, SiteModel.PROP_COMPONENT_ID);
+
+        SiteContainer siteContainer = new SiteContainer(folderId, containerNodeRef);
+        return siteContainer;
+    }
+
+    public PagingResults<SiteContainer> getSiteContainers(String siteId, Paging paging)
+    {
+        SiteInfo siteInfo = validateSite(siteId);
+        if(siteInfo == null)
+        {
+            // site does not exist
+            throw new EntityNotFoundException(siteId);
+        }
+
+        final PagingResults<FileInfo> pagingResults = siteService.listContainers(siteInfo.getShortName(), Util.getPagingRequest(paging));
+        List<FileInfo> containerFileInfos = pagingResults.getPage();
+        final List<SiteContainer> siteContainers = new ArrayList<SiteContainer>(containerFileInfos.size());
+        for(FileInfo containerFileInfo : containerFileInfos)
+        {
+            NodeRef nodeRef = containerFileInfo.getNodeRef();
+            String containerId = (String)nodeService.getProperty(nodeRef, SiteModel.PROP_COMPONENT_ID);
+            SiteContainer siteContainer = new SiteContainer(containerId, nodeRef);
+            siteContainers.add(siteContainer);
+        }
+
+        return new PagingResults<SiteContainer>()
+        {
+            @Override
+            public List<SiteContainer> getPage()
+            {
+                return siteContainers;
+            }
+
+            @Override
+            public boolean hasMoreItems()
+            {
+                return pagingResults.hasMoreItems();
+            }
+
+            @Override
+            public Pair<Integer, Integer> getTotalResultCount()
+            {
+                return pagingResults.getTotalResultCount();
+            }
+
+            @Override
+            public String getQueryExecutionId()
+            {
+                return null;
+            }
+        };
+    }
+    
+    public CollectionWithPagingInfo<Site> getSites(final Parameters parameters)
+    {
+        final BeanPropertiesFilter filter = parameters.getFilter();
+
+        Paging paging = parameters.getPaging();
+        PagingRequest pagingRequest = Util.getPagingRequest(paging);
+//    	pagingRequest.setRequestTotalCountMax(requestTotalCountMax)
+        
+        List<Pair<QName, Boolean>> sortProps = new ArrayList<Pair<QName, Boolean>>();
+        List<SortColumn> sortCols = parameters.getSorting();
+        if ((sortCols != null) && (sortCols.size() > 0))
+        {
+            for (SortColumn sortCol : sortCols)
+            {
+                QName sortPropQName = SORT_PARAMS_TO_QNAMES.get(sortCol.column);
+                if (sortPropQName == null)
+                {
+                    throw new InvalidArgumentException("Invalid sort field: "+sortCol.column);
+                }
+                sortProps.add(new Pair<>(sortPropQName, (sortCol.asc ? Boolean.TRUE : Boolean.FALSE)));
+            }
+        }
+        else
+        {
+            // default sort order
+            sortProps.add(new Pair<>(ContentModel.PROP_TITLE, Boolean.TRUE));
+        }
+
+        List<FilterProp> filterProps = getFilterPropListOfSites(parameters);
+
+        final PagingResults<SiteInfo> pagingResult = siteService.listSites(filterProps, sortProps, pagingRequest);
+        final List<SiteInfo> sites = pagingResult.getPage();
+        int totalItems = pagingResult.getTotalResultCount().getFirst();
+        final String personId = AuthenticationUtil.getFullyAuthenticatedUser();
+        List<Site> page = new AbstractList<Site>()
+        {
+            @Override
+            public Site get(int index)
+            {
+                SiteInfo siteInfo = sites.get(index);
+
+                String role = null;
+                if(filter.isAllowed(Site.ROLE))
+                {
+                    role = siteService.getMembersRole(siteInfo.getShortName(), personId);
+                }
+                return new Site(siteInfo, role);
+            }
+
+            @Override
+            public int size()
+            {
+                return sites.size();
+            }
+        };
+
+        return CollectionWithPagingInfo.asPaged(paging, page, pagingResult.hasMoreItems(), totalItems);
+    }
+
+    private SiteVisibility getSiteVisibilityFromParam(String siteVisibilityStr)
+    {
+        SiteVisibility visibility;
+        try
+        {
+            // Create the enum value from the string
+            visibility = SiteVisibility.valueOf(siteVisibilityStr);
+        }
+        catch (IllegalArgumentException e)
+        {
+            throw new InvalidArgumentException("Site visibility is invalid (expected eg. PUBLIC, PRIVATE, MODERATED)");
+        }
+
+        return visibility;
+    }
+
+    private List<FilterProp> getFilterPropListOfSites(final Parameters parameters)
+    {
+        List<FilterProp> filterProps = new ArrayList<FilterProp>();
+        Query q = parameters.getQuery();
+        if (q != null)
+        {
+            MapBasedQueryWalkerOrSupported propertyWalker = new MapBasedQueryWalkerOrSupported(LIST_SITES_EQUALS_QUERY_PROPERTIES, null);
+            QueryHelper.walk(q, propertyWalker);
+
+            String siteVisibilityStr = propertyWalker.getProperty(PARAM_VISIBILITY, WhereClauseParser.EQUALS, String.class);
+            if (siteVisibilityStr != null && !siteVisibilityStr.isEmpty())
+            {
+                SiteVisibility siteVisibility = getSiteVisibilityFromParam(siteVisibilityStr);
+                filterProps.add(new FilterPropString(SiteModel.PROP_SITE_VISIBILITY, siteVisibility.name(), FilterPropString.FilterTypeString.EQUALS));
+            }
+
+            String sitePreset = propertyWalker.getProperty(PARAM_PRESET, WhereClauseParser.EQUALS, String.class);
+            if (sitePreset != null && !sitePreset.isEmpty())
+            {
+                filterProps.add(new FilterPropString(SiteModel.PROP_SITE_PRESET, sitePreset, FilterPropString.FilterTypeString.EQUALS));
+            }
+        }
+
+        // expected null or non-empty list
+        return filterProps.isEmpty() ? null : filterProps;
+    }
+
+    private boolean includeFilter(SiteMembership siteMembership, List<FilterProp> filterProps)
+    {
+        Map<QName, Serializable> propVals = new HashMap<>();
+        propVals.put(SiteModel.PROP_SITE_VISIBILITY, siteMembership.getSiteInfo().getVisibility().name());
+        propVals.put(SiteModel.PROP_SITE_PRESET, siteMembership.getSiteInfo().getSitePreset());
+        return includeFilter(propVals, filterProps);
+    }
+
+    // note: currently inclusive and OR-based
+    private boolean includeFilter(Map<QName, Serializable> propVals, List<FilterProp> filterProps)
+    {
+        for (FilterProp filterProp : filterProps)
+        {
+            Serializable propVal = propVals.get(filterProp.getPropName());
+            if (propVal != null)
+            {
+                if ((filterProp instanceof FilterPropString) && (propVal instanceof String))
+                {
+                    String val = (String)propVal;
+                    String filter = (String)filterProp.getPropVal();
+
+                    switch ((FilterPropString.FilterTypeString)filterProp.getFilterType())
+                    {
+                    case STARTSWITH:
+                        if (val.startsWith(filter))
+                        {
+                            return true;
+                        }
+                        break;
+                    case STARTSWITH_IGNORECASE:
+                        if (val.toLowerCase().startsWith(filter.toLowerCase()))
+                        {
+                            return true;
+                        }
+                        break;
+                    case EQUALS:
+                        if (val.equals(filter))
+                        {
+                            return true;
+                        }
+                        break;
+                    case EQUALS_IGNORECASE:
+                        if (val.equalsIgnoreCase(filter))
+                        {
+                            return true;
+                        }
+                        break;
+                    case ENDSWITH:
+                        if (val.endsWith(filter))
+                        {
+                            return true;
+                        }
+                        break;
+                    case ENDSWITH_IGNORECASE:
+                        if (val.toLowerCase().endsWith(filter.toLowerCase()))
+                        {
+                            return true;
+                        }
+                        break;
+                    case MATCHES:
+                        if (val.matches(filter))
+                        {
+                            return true;
+                        }
+                        break;
+                    case MATCHES_IGNORECASE:
+                        if (val.toLowerCase().matches(filter.toLowerCase()))
+                        {
+                            return true;
+                        }
+                        break;
+                    default:
+                    }
+                }
+            }
+
+            if ((filterProp instanceof FilterPropBoolean) && (propVal instanceof Boolean))
+            {
+                Boolean val = (Boolean)propVal;
+                Boolean filter = (Boolean)filterProp.getPropVal();
+
+                return (val == filter);
+            }
+        }
+
+        return false;
+    }
+
+    public FavouriteSite getFavouriteSite(String personId, String siteId)
+    {
+        personId = people.validatePerson(personId);
+        SiteInfo siteInfo = validateSite(siteId);
+        if(siteInfo == null)
+        {
+            // site does not exist
+            throw new RelationshipResourceNotFoundException(personId, siteId);
+        }
+        // set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
+        siteId = siteInfo.getShortName();
+        NodeRef nodeRef = siteInfo.getNodeRef();
+
+        if(favouritesService.isFavourite(personId, nodeRef))
+        {
+            String role = getSiteRole(siteId, personId);
+            return new FavouriteSite(siteInfo, role);
+        }
+        else
+        {
+            throw new RelationshipResourceNotFoundException(personId, siteId);
+        }
+    }
+    
+    public void addFavouriteSite(String personId, FavouriteSite favouriteSite)
+    {
+        personId = people.validatePerson(personId);
+        String siteId = favouriteSite.getId();
+        SiteInfo siteInfo = validateSite(siteId);
+        if(siteInfo == null)
+        {
+            // site does not exist
+            throw new EntityNotFoundException(siteId);
+        }
+        // set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
+        siteId = siteInfo.getShortName();
+
+        StringBuilder prefKey = new StringBuilder(FAVOURITE_SITES_PREFIX);
+        prefKey.append(siteId);
+        String value = (String)preferenceService.getPreference(personId, prefKey.toString());
+        boolean isFavouriteSite = (value != null && value.equalsIgnoreCase("true"));
+
+        if(isFavouriteSite)
+        {
+            throw new ConstraintViolatedException("Site " + siteId + " is already a favourite site");
+        }
+
+        prefKey = new StringBuilder(FAVOURITE_SITES_PREFIX);
+        prefKey.append(siteId);
+
+        Map<String, Serializable> preferences = new HashMap<String, Serializable>(1);
+        preferences.put(prefKey.toString(), Boolean.TRUE);
+        preferenceService.setPreferences(personId, preferences);
+    }
+    
+    public void removeFavouriteSite(String personId, String siteId)
+    {
+        personId = people.validatePerson(personId);
+        SiteInfo siteInfo = validateSite(siteId);
+        if(siteInfo == null)
+        {
+            // site does not exist
+            throw new RelationshipResourceNotFoundException(personId, siteId);
+        }
+        siteId = siteInfo.getShortName();
+
+        StringBuilder prefKey = new StringBuilder(FAVOURITE_SITES_PREFIX);
+        prefKey.append(siteId);
+        String value = (String)preferenceService.getPreference(personId, prefKey.toString());
+        boolean isFavouriteSite = (value != null && value.equalsIgnoreCase("true"));
+
+        if(!isFavouriteSite)
+        {
+            throw new NotFoundException("Site " + siteId + " is not a favourite site");
+        }
+
+        preferenceService.clearPreferences(personId, prefKey.toString());
+    }
+    
+    private PagingResults<SiteInfo> getFavouriteSites(String userName, PagingRequest pagingRequest)
+    {
+        final Collator collator = Collator.getInstance();
+
+        final Set<SiteInfo> sortedFavouriteSites = new TreeSet<SiteInfo>(new Comparator<SiteInfo>()
+        {
+            @Override
+            public int compare(SiteInfo o1, SiteInfo o2)
+            {
+                return collator.compare(o1.getTitle(), o2.getTitle());
+            }
+        });
+
+        Map<String, Serializable> prefs = preferenceService.getPreferences(userName, FAVOURITE_SITES_PREFIX);
+        for(Entry<String, Serializable> entry : prefs.entrySet())
+        {
+            boolean isFavourite = false;
+            Serializable s = entry.getValue();
+            if(s instanceof Boolean)
+            {
+                isFavourite = (Boolean)s;
+            }
+            if(isFavourite)
+            {
+                String siteShortName = entry.getKey().substring(FAVOURITE_SITES_PREFIX_LENGTH).replace(".favourited", "");
+                SiteInfo siteInfo = siteService.getSite(siteShortName);
+                if(siteInfo != null)
+                {
+                    sortedFavouriteSites.add(siteInfo);
+                }
+            }
+        }
+
+        int totalSize = sortedFavouriteSites.size();
+        final PageDetails pageDetails = PageDetails.getPageDetails(pagingRequest, totalSize);
+
+        final List<SiteInfo> page = new ArrayList<SiteInfo>(pageDetails.getPageSize());
+        Iterator<SiteInfo> it = sortedFavouriteSites.iterator();
+        for(int counter = 0; counter < pageDetails.getEnd() && it.hasNext(); counter++)
+        {
+            SiteInfo favouriteSite = it.next();
+
+            if(counter < pageDetails.getSkipCount())
+            {
+                continue;
+            }
+
+            if(counter > pageDetails.getEnd() - 1)
+            {
+                break;
+            }
+
+            page.add(favouriteSite);
+        }
+
+        return new PagingResults<SiteInfo>()
+        {
+            @Override
+            public List<SiteInfo> getPage()
+            {
+                return page;
+            }
+
+            @Override
+            public boolean hasMoreItems()
+            {
+                return pageDetails.hasMoreItems();
+            }
+
+            @Override
+            public Pair<Integer, Integer> getTotalResultCount()
+            {
+                Integer total = Integer.valueOf(sortedFavouriteSites.size());
+                return new Pair<Integer, Integer>(total, total);
+            }
+
+            @Override
+            public String getQueryExecutionId()
+            {
+                return null;
+            }
+        };
+    }
+
+    public CollectionWithPagingInfo<FavouriteSite> getFavouriteSites(String personId, Parameters parameters)
+    {
+        personId = people.validatePerson(personId);
+
+        Paging paging = parameters.getPaging();
+        BeanPropertiesFilter filter = parameters.getFilter();
+
+        PagingResults<SiteInfo> favouriteSites = getFavouriteSites(personId, Util.getPagingRequest(paging));
+        List<FavouriteSite> favourites = new ArrayList<FavouriteSite>(favouriteSites.getPage().size());
+        for(SiteInfo favouriteSite : favouriteSites.getPage())
+        {
+            String role = null;
+            if(filter.isAllowed(Site.ROLE))
+            {
+                role = getSiteRole(favouriteSite.getShortName(), personId);
+            }
+            FavouriteSite favourite = new FavouriteSite(favouriteSite, role);
+            favourites.add(favourite);
+        }
+
+        return CollectionWithPagingInfo.asPaged(paging, favourites, favouriteSites.hasMoreItems(), favouriteSites.getTotalResultCount().getFirst());
+    }
+
+    public void deleteSite(String siteId, Parameters parameters)
+    {
+        boolean isSiteAdmin = siteService.isSiteAdmin(AuthenticationUtil.getFullyAuthenticatedUser());
+        SiteInfo siteInfo = validateSite(siteId);
+        if (siteInfo == null)
+        {
+            // site does not exist
+            throw new EntityNotFoundException(siteId);
+        }
+        siteId = siteInfo.getShortName();
+
+        NodeRef siteNodeRef = siteInfo.getNodeRef();
+
+        // belt-and-braces - double-check before purge/delete (rather than
+        // rollback)
+        if ((isSiteAdmin == false) && (permissionService.hasPermission(siteNodeRef, PermissionService.DELETE) != AccessStatus.ALLOWED))
+        {
+            throw new AccessDeniedException("Cannot delete site: " + siteId);
+        }
+
+        // default false (if not provided)
+        boolean permanentDelete = Boolean.valueOf(parameters.getParameter(PARAM_PERMANENT));
+
+        if (permanentDelete == true)
+        {
+            // Set as temporary to delete node instead of archiving.
+            nodeService.addAspect(siteNodeRef, ContentModel.ASPECT_TEMPORARY, null);
+
+            // bypassing trashcan means that purge behaviour will not fire, so
+            // explicitly force cleanup here
+            siteServiceImpl.beforePurgeNode(siteNodeRef);
+        }
+
+        siteService.deleteSite(siteId);
+    }
+
+    /**
+     * Uses site service for creating site info
+     *
+     * Extracted this call in a separate method because it might be needed to
+     * call different site service method when creating site info (e.g.
+     * siteService.createSite(String, String, String, String, SiteVisibility, QName))
+     * 
+     * @param site
+     * @return
+     */
+    protected SiteInfo createSite(Site site)
+    {
+        if (site.getPreset() != null)
+        {
+            throw new InvalidArgumentException("Site preset should not be set");
+        }
+        return siteService.createSite(DEFAULT_SITE_PRESET, site.getId(), site.getTitle(), site.getDescription(), site.getVisibility());
+    }
+        
+    /**
+     * Create default/fixed preset (Share) site - with DocLib container/component
+     *
+     * @param site
+     * @return
+     */
+    public Site createSite(Site site, Parameters parameters)
+    {
+        // note: if site id is null then will be generated from the site title
+        site = validateSite(site);
+
+        SiteInfo siteInfo = null;
+        try
+        {
+            siteInfo = createSite(site);
+        }
+        catch (SiteServiceException sse)
+        {
+            if (sse.getMsgId().equals("site_service.unable_to_create"))
+            {
+                throw new ConstraintViolatedException(sse.getMessage());
+            }
+            else
+            {
+                throw sse;
+            }
+        }
+
+        String siteId = siteInfo.getShortName();
+        NodeRef siteNodeRef = siteInfo.getNodeRef();
+
+        // default false (if not provided)
+        boolean skipShareSurfConfig = Boolean.valueOf(parameters.getParameter(PARAM_SKIP_SURF_CONFIGURATION));
+        if (skipShareSurfConfig == false)
+        {
+            // import default/fixed preset Share surf config
+            importSite(siteId, siteNodeRef);
+        }
+
+        // pre-create doclib
+        siteService.createContainer(siteId, SiteService.DOCUMENT_LIBRARY, ContentModel.TYPE_FOLDER, null);
+
+        // default false (if not provided)
+        boolean skipAddToFavorites = Boolean.valueOf(parameters.getParameter(PARAM_SKIP_ADDTOFAVORITES));
+        if (skipAddToFavorites == false)
+        {
+            String personId = AuthenticationUtil.getFullyAuthenticatedUser();
+            favouritesService.addFavourite(personId, siteNodeRef); // ignore result
+        }
+
+        return getSite(siteInfo, true);
+    }
+
+    @Override
+    public Site updateSite(String siteId, SiteUpdate update, Parameters parameters)
+    {
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Updating site, ID: "+siteId+", site data: "+update+", parameters: "+parameters);
+        }
+
+        // Get the site by ID (aka short name)
+        SiteInfo siteInfo = validateSite(siteId);
+        if (siteInfo == null)
+        {
+            // site does not exist
+            throw new EntityNotFoundException(siteId);
+        }
+
+        // Bind any provided values to the site info, allowing for "partial" updates.
+        if (update.wasSet(Site.TITLE))
+        {
+            siteInfo.setTitle(update.getTitle());
+        }
+        if (update.wasSet(Site.DESCRIPTION))
+        {
+            siteInfo.setDescription(update.getDescription());
+        }
+        if (update.wasSet(Site.VISIBILITY))
+        {
+            siteInfo.setVisibility(update.getVisibility());
+        }
+
+        // Validate the new details
+        validateSite(new Site(siteInfo, null));
+
+        // Perform the actual update.
+        siteService.updateSite(siteInfo);
+
+        return getSite(siteId);
+    }
+
+    protected Site validateSite(Site site)
+    {
+        // site title - mandatory
+        String siteTitle = site.getTitle();
+        if ((siteTitle == null) || siteTitle.isEmpty())
+        {
+            throw new InvalidArgumentException("Site title is expected: "+siteTitle);
+        }
+        else if (siteTitle.length() > SITE_MAXLEN_TITLE)
+        {
+            throw new InvalidArgumentException("Site title exceeds max length of "+SITE_MAXLEN_TITLE+" characters");
+        }
+
+        SiteVisibility siteVisibility = site.getVisibility();
+        if (siteVisibility == null)
+        {
+            throw new InvalidArgumentException("Site visibility is expected: "+siteTitle+" (eg. PUBLIC, PRIVATE, MODERATED)");
+        }
+
+        String siteId = site.getId();
+        if (siteId == null)
+        {
+            // generate a site id from title (similar to Share create site dialog)
+            siteId = siteTitle.
+                    trim(). // trim leading & trailing whitespace
+                    replaceAll("[^"+SITE_ID_VALID_CHARS_PARTIAL_REGEX+" ]",""). // remove special characters (except spaces)
+                    replaceAll(" +", " "). // collapse multiple spaces to single space
+                    replace(" ","-"). // replaces spaces with dashs
+                    toLowerCase(); // lowercase :-)
+        }
+        else
+        {
+            if (! siteId.matches("^["+SITE_ID_VALID_CHARS_PARTIAL_REGEX+"]+"))
+            {
+                throw new InvalidArgumentException("Invalid site id - should consist of alphanumeric/dash characters");
+            }
+        }
+
+        if (siteId.length() > SITE_MAXLEN_ID)
+        {
+            throw new InvalidArgumentException("Site id exceeds max length of " + SITE_MAXLEN_ID + " characters");
+        }
+
+        site.setId(siteId);
+
+        String siteDescription = site.getDescription();
+
+        if (siteDescription == null)
+        {
+            // workaround: to avoid Share error (eg. in My Sites dashlet / freemarker template)
+            site.setDescription("");
+        }
+
+        if ((siteDescription != null) && (siteDescription.length() > SITE_MAXLEN_DESCRIPTION))
+        {
+            throw new InvalidArgumentException("Site description exceeds max length of "+SITE_MAXLEN_DESCRIPTION+" characters");
+        }
+
+        return site;
+    }
+
+    private void importSite(final String siteId, final NodeRef siteNodeRef)
+    {
+        ImportPackageHandler acpHandler = new SiteImportPackageHandler(siteSurfConfig, siteId);
+        Location location = new Location(siteNodeRef);
+        ImporterBinding binding = new ImporterBinding()
+        {
+            @Override
+            public String getValue(String key)
+            {
+                if (key.equals("siteId"))
+                {
+                    return siteId;
+                }
+                return null;
+            }
+
+            @Override
+            public UUID_BINDING getUUIDBinding()
+            {
+                return UUID_BINDING.CREATE_NEW;
+            }
+
+            @Override
+            public QName[] getExcludedClasses()
+            {
+                return null;
+            }
+
+            @Override
+            public boolean allowReferenceWithinTransaction()
+            {
+                return false;
+            }
+
+            @Override
+            public ImporterContentCache getImportConentCache()
+            {
+                return null;
+            }
+        };
+        importerService.importView(acpHandler, location, binding, null);
+    }
+
+    @Override
+    public CollectionWithPagingInfo<SiteGroup> getSiteGroupMemberships(String siteId, Parameters parameters)
+    {
+        validateSite(siteId);
+
+        PagingRequest pagingRequest = Util.getPagingRequest(parameters.getPaging());
+        pagingRequest.setRequestTotalCountMax(100);
+        PagingResults<SiteGroupMembership> pagedResults = siteService.listGroupMembersPaged(siteId, new ArrayList<>(), pagingRequest);
+        List<SiteGroup> groups = pagedResults.getPage().stream().map(siteMembership -> new SiteGroup(siteMembership.getId(), siteMembership.getRole())).collect(Collectors.toList());
+        return CollectionWithPagingInfo.asPaged(parameters.getPaging(), groups, pagedResults.hasMoreItems(), pagedResults.getTotalResultCount().getFirst());
+    }
+
+    @Override
+    public SiteGroup addSiteGroupMembership(String siteId, SiteGroup group)
+    {
+        SiteInfo siteInfo = validateSite(siteId);
+        if(siteInfo == null)
+        {
+            logger.debug("Site does not exist: " + siteId);
+            throw new EntityNotFoundException(siteId);
+        }
+
+        validateGroup(group.getId());
+
+        SiteMemberInfo groupInfo = siteService.getMembersRoleInfo(siteId, group.getId());
+        if(groupInfo != null)
+        {
+            logger.debug("addSiteGroupMembership:  "+ group.getId() + " is already a member of site " + siteId);
+            throw new ConstraintViolatedException(group.getId() + " is already a member of site " + siteId);
+        }
+        if(group.getRole() == null)
+        {
+            logger.debug("Getting member role but role is null");
+            throw new RelationshipResourceNotFoundException(group.getId(), siteId);
+        }
+
+        siteService.setMembership(siteId, group.getId(), group.getRole());
+        return group;
+    }
+
+    @Override
+    public SiteGroup getSiteGroupMembership(String siteId, String groupId)
+    {
+        SiteMemberInfo groupInfo = isMemberOfSite(siteId, groupId);
+        return new SiteGroup(groupId, groupInfo.getMemberRole());
+    }
+
+    @Override
+    public SiteGroup updateSiteGroupMembership(String siteId, SiteGroup group)
+    {
+        isMemberOfSite(siteId, group.getId());
+        siteService.setMembership(siteId, group.getId(), group.getRole());
+        return group;
+    }
+
+    @Override
+    public void removeSiteGroupMembership(String siteId, String groupId)
+    {
+        isMemberOfSite(siteId, groupId);
+        String role = this.siteService.getMembersRole(siteId, groupId);
+        if(role != null)
+        {
+            if(role.equals(SiteModel.SITE_MANAGER))
+            {
+                int numAuthorities = this.siteService.countAuthoritiesWithRole(siteId, SiteModel.SITE_MANAGER);
+                if(numAuthorities <= 1)
+                {
+                    throw new InvalidArgumentException("Can't remove last manager of site " + siteId);
+                }
+                this.siteService.removeMembership(siteId, groupId);
+            }
+            else
+            {
+                this.siteService.removeMembership(siteId, groupId);
+            }
+        }
+        else
+        {
+            throw new AlfrescoRuntimeException("Unable to determine role of site member");
+        }
+
+    }
+
+    private SiteMemberInfo isMemberOfSite(String siteId, String id)
+    {
+
+        SiteInfo siteInfo = validateSite(siteId);
+        if(siteInfo == null)
+        {
+            logger.debug("Site does not exist: " + siteId);
+            throw new EntityNotFoundException(siteId);
+        }
+
+        validateGroup(id);
+
+        SiteMemberInfo memberInfo = this.siteService.getMembersRoleInfo(siteId, id);
+        if(memberInfo == null)
+        {
+            logger.debug("Given authority is not a member of the site");
+            throw new InvalidArgumentException("Given authority is not a member of the site");
+        }
+        if(memberInfo.getMemberRole() == null)
+        {
+            logger.debug("Getting authority role but role is null");
+            throw new RelationshipResourceNotFoundException(memberInfo.getMemberName(), siteId);
+        }
+        return  memberInfo;
+    }
+
+    private void validateGroup(String groupId) throws EntityNotFoundException
+    {
+        String authorityName = authorityService.getName(AuthorityType.GROUP, groupId);
+        if(authorityName == null)
+        {
+            logger.debug("AuthorityName does not exist: " + groupId);
+            throw new EntityNotFoundException(groupId);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/TagsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/TagsImpl.java
new file mode 100644
index 00000000000..529714e41ac
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/TagsImpl.java
@@ -0,0 +1,234 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.tagging.NonExistentTagException;
+import org.alfresco.repo.tagging.TagExistsException;
+import org.alfresco.repo.tagging.TaggingException;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.Tags;
+import org.alfresco.rest.api.model.Tag;
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.tagging.TaggingService;
+import org.alfresco.util.Pair;
+import org.alfresco.util.TypeConstraint;
+
+/**
+ * Centralises access to tag services and maps between representations.
+ * 
+ * @author steveglover
+ * @since publicapi1.0
+ */
+public class TagsImpl implements Tags
+{
+	private static final Object PARAM_INCLUDE_COUNT = "count";
+    private Nodes nodes;
+	private TaggingService taggingService;
+	private TypeConstraint typeConstraint;
+	
+	public void setTypeConstraint(TypeConstraint typeConstraint)
+	{
+		this.typeConstraint = typeConstraint;
+	}
+
+	public void setNodes(Nodes nodes) 
+    {
+		this.nodes = nodes;
+	}
+	
+    public void setTaggingService(TaggingService taggingService)
+    {
+		this.taggingService = taggingService;
+	}
+
+	public List<Tag> addTags(String nodeId, final List<Tag> tags)
+	{
+	        NodeRef nodeRef = nodes.validateNode(nodeId);
+			if(!typeConstraint.matches(nodeRef))
+			{
+				throw new UnsupportedResourceOperationException("Cannot tag this node");
+			}
+
+	        List<String> tagValues = new AbstractList<String>()
+            {
+                @Override
+                public String get(int arg0)
+                {
+                	String tag = tags.get(arg0).getTag();
+                    return tag;
+                }
+    
+                @Override
+                public int size()
+                {
+                    return tags.size();
+                }
+            };
+            try
+            {
+		        List<Pair<String, NodeRef>> tagNodeRefs = taggingService.addTags(nodeRef, tagValues);
+		        List<Tag> ret = new ArrayList<Tag>(tags.size());
+		        for(Pair<String, NodeRef> pair : tagNodeRefs)
+		        {
+		        	ret.add(new Tag(pair.getSecond(), pair.getFirst()));
+		        }
+		        return ret;
+            }
+            catch(IllegalArgumentException e)
+            {
+            	throw new InvalidArgumentException(e.getMessage());
+            }
+	}
+	
+    public void deleteTag(String nodeId, String tagId)
+    {
+		NodeRef nodeRef = nodes.validateNode(nodeId);
+		getTag(tagId);
+    	NodeRef existingTagNodeRef = validateTag(tagId);
+    	String tagValue = taggingService.getTagName(existingTagNodeRef);
+    	taggingService.removeTag(nodeRef, tagValue);
+    }
+
+    public CollectionWithPagingInfo<Tag> getTags(StoreRef storeRef, Parameters params)
+    {
+        Paging paging = params.getPaging();
+        PagingResults<Pair<NodeRef, String>> results = taggingService.getTags(storeRef, Util.getPagingRequest(paging));
+        taggingService.getPagedTags(storeRef, 0, paging.getMaxItems());
+        Integer totalItems = results.getTotalResultCount().getFirst();
+        List<Pair<NodeRef, String>> page = results.getPage();
+        List<Tag> tags = new ArrayList<Tag>(page.size());
+        List<Pair<String, Integer>> tagsByCount = null;
+        Map<String, Integer> tagsByCountMap = new HashMap<String, Integer>();
+
+        if (params.getInclude().contains(PARAM_INCLUDE_COUNT))
+        {
+            tagsByCount = taggingService.findTaggedNodesAndCountByTagName(storeRef);
+            if (tagsByCount != null)
+            {
+                for (Pair<String, Integer> tagByCountElem : tagsByCount)
+                {
+                    tagsByCountMap.put(tagByCountElem.getFirst(), tagByCountElem.getSecond());
+                }
+            }
+        }
+        for (Pair<NodeRef, String> pair : page)
+        {
+            Tag selectedTag = new Tag(pair.getFirst(), pair.getSecond());
+            selectedTag.setCount(tagsByCountMap.get(selectedTag.getTag()));
+            tags.add(selectedTag);
+        }
+
+        return CollectionWithPagingInfo.asPaged(paging, tags, results.hasMoreItems(), (totalItems == null ? null : totalItems.intValue()));
+    }
+
+    public NodeRef validateTag(String tagId)
+    {
+    	NodeRef tagNodeRef = nodes.validateNode(tagId);
+    	if(tagNodeRef == null)
+    	{
+    		throw new EntityNotFoundException(tagId);
+    	}
+    	return tagNodeRef;
+    }
+    
+    public NodeRef validateTag(StoreRef storeRef, String tagId)
+    {
+    	NodeRef tagNodeRef = nodes.validateNode(storeRef, tagId);
+    	if(tagNodeRef == null)
+    	{
+    		throw new EntityNotFoundException(tagId);
+    	}
+    	return tagNodeRef;
+    }
+
+    public Tag changeTag(StoreRef storeRef, String tagId, Tag tag)
+    {
+    	try
+    	{
+	    	NodeRef existingTagNodeRef = validateTag(storeRef, tagId);
+	    	String existingTagName = taggingService.getTagName(existingTagNodeRef);
+	    	String newTagName = tag.getTag();
+	    	NodeRef newTagNodeRef = taggingService.changeTag(storeRef, existingTagName, newTagName);
+	    	return new Tag(newTagNodeRef, newTagName);
+    	}
+    	catch(NonExistentTagException e)
+    	{
+    		throw new NotFoundException(e.getMessage());
+    	}
+    	catch(TagExistsException e)
+    	{
+    		throw new ConstraintViolatedException(e.getMessage());
+    	}
+    	catch(TaggingException e)
+    	{
+    		throw new InvalidArgumentException(e.getMessage());
+    	}
+    }
+
+    public Tag getTag(String tagId)
+    {
+    	return getTag(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, tagId);
+    }
+
+    public Tag getTag(StoreRef storeRef, String tagId)
+    {
+    	NodeRef tagNodeRef = validateTag(storeRef, tagId);
+    	String tagValue = taggingService.getTagName(tagNodeRef);
+    	return new Tag(tagNodeRef, tagValue);
+    }
+
+    public CollectionWithPagingInfo<Tag> getTags(String nodeId, Parameters params)
+    {
+		NodeRef nodeRef = validateTag(nodeId);
+
+		PagingResults<Pair<NodeRef, String>> results = taggingService.getTags(nodeRef, Util.getPagingRequest(params.getPaging()));
+    	Integer totalItems = results.getTotalResultCount().getFirst();
+    	List<Pair<NodeRef, String>> page = results.getPage();
+    	List<Tag> tags = new ArrayList<Tag>(page.size());
+    	for(Pair<NodeRef, String> pair : page)
+    	{
+    		tags.add(new Tag(pair.getFirst(), pair.getSecond()));
+    	}
+
+    	return CollectionWithPagingInfo.asPaged(params.getPaging(), tags, results.hasMoreItems(), (totalItems == null ? null : totalItems.intValue()));
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/Util.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/Util.java
new file mode 100644
index 00000000000..b6612a37a76
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/Util.java
@@ -0,0 +1,115 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import org.alfresco.query.CannedQueryPageDetails;
+import org.alfresco.query.PageDetails;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.util.Pair;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * @author steveglover
+ * @author Jamal Kaabi-Mofrad
+ */
+public class Util
+{
+    public static PagingRequest getPagingRequest(Paging paging)
+    {
+        PagingRequest pagingRequest = new PagingRequest(paging.getSkipCount(), paging.getMaxItems());
+        pagingRequest.setRequestTotalCountMax(CannedQueryPageDetails.DEFAULT_PAGE_SIZE);
+        return pagingRequest;
+    }
+
+    public static <T> PagingResults<T> wrapPagingResults(Paging paging, Collection<T> result)
+    {
+        if (paging == null)
+        {
+            throw new InvalidArgumentException("paging object can't be null.");
+        }
+        if (result == null)
+        {
+            result = Collections.emptyList();
+        }
+
+        PagingRequest pagingRequest = getPagingRequest(paging);
+
+        final int totalSize = result.size();
+        final PageDetails pageDetails = PageDetails.getPageDetails(pagingRequest, totalSize);
+
+        final List<T> page = new ArrayList<>(pageDetails.getPageSize());
+        Iterator<T> it = result.iterator();
+        for (int counter = 0, end = pageDetails.getEnd(); counter < end && it.hasNext(); counter++)
+        {
+            T element = it.next();
+            if (counter < pageDetails.getSkipCount())
+            {
+                continue;
+            }
+            if (counter > end - 1)
+            {
+                break;
+            }
+            page.add(element);
+        }
+
+        return new PagingResults<T>()
+        {
+            @Override
+            public List<T> getPage()
+            {
+                return page;
+            }
+
+            @Override
+            public boolean hasMoreItems()
+            {
+                return pageDetails.hasMoreItems();
+            }
+
+            @Override
+            public Pair<Integer, Integer> getTotalResultCount()
+            {
+                Integer total = totalSize;
+                return new Pair<>(total, total);
+            }
+
+            @Override
+            public String getQueryExecutionId()
+            {
+                return null;
+            }
+        };
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/AbstractActivitySummaryProcessor.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/AbstractActivitySummaryProcessor.java
new file mode 100644
index 00000000000..f5e1fb117fe
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/AbstractActivitySummaryProcessor.java
@@ -0,0 +1,144 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl.activities;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.extensions.surf.util.AbstractLifecycleBean;
+
+public abstract class AbstractActivitySummaryProcessor extends AbstractLifecycleBean implements ActivitySummaryProcessor
+{
+	protected static Log logger = LogFactory.getLog(ActivitySummaryProcessor.class);  
+
+	protected ActivitySummaryProcessorRegistry registry;
+    private List<String> eventTypes;
+
+	public void setEventTypes(List<String> eventTypes)
+	{
+		this.eventTypes = eventTypes;
+	}
+
+	public void setRegistry(ActivitySummaryProcessorRegistry registry)
+	{
+		this.registry = registry;
+	}
+
+    public void setCustomRenditions(List<String> eventTypes)
+    {
+    	this.eventTypes = eventTypes;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent)
+     */
+    protected void onBootstrap(ApplicationEvent event)
+    {
+    	register();
+    }
+    
+    protected void onShutdown(ApplicationEvent event)
+    {
+    	
+    }
+    
+	@Override
+	public Map<String, Object> process(Map<String, Object> entries)
+	{
+		List<Change> changes = new LinkedList<Change>();
+		Map<String, Object> ret = new HashMap<String, Object>(entries.size());
+		for(Map.Entry<String, Object> entry : entries.entrySet())
+		{
+			String key = entry.getKey();
+			Object value = entry.getValue();
+			Change change = processEntry(key, value);
+			if(change != null)
+			{
+				changes.add(change);
+			}
+		}
+
+		for(Change change : changes)
+		{
+			if(change != null)
+			{
+				change.process(entries);
+			}			
+		}
+
+		return ret;
+	}
+	
+	protected abstract Change processEntry(String key, Object value);
+
+    protected void register()
+    {
+    	for(String eventType : eventTypes)
+    	{
+    		registry.register(eventType, this);
+    	}
+    }
+
+	public static class ChangeKey implements Change
+	{
+		private String oldKey;
+		private String newKey;
+
+		public ChangeKey(String oldKey, String newKey) {
+			super();
+			this.oldKey = oldKey;
+			this.newKey = newKey;
+		}
+
+		public void process(Map<String, Object> entries)
+		{
+			Object value = entries.remove(oldKey);
+			entries.put(newKey, value);
+		}
+	}
+
+	public static class RemoveKey implements Change
+	{
+		private String key;
+
+		public RemoveKey(String key) {
+			super();
+			this.key = key;
+		}
+
+		public void process(Map<String, Object> entries)
+		{
+			entries.remove(key);
+		}
+	}
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/ActivitySummaryParser.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/ActivitySummaryParser.java
new file mode 100644
index 00000000000..2415c0b087e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/ActivitySummaryParser.java
@@ -0,0 +1,193 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl.activities;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.util.registry.NamedObjectRegistry;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONException;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.springframework.extensions.surf.util.ISO8601DateFormat;
+
+/*
+ * Adapted from JSONtoFmModel
+ */
+public class ActivitySummaryParser implements ActivitySummaryProcessorRegistry
+{
+    private final Log logger = LogFactory.getLog(ActivitySummaryParser.class);
+
+    // note: current format is dependent on ISO8601DateFormat.parser, eg. YYYY-MM-DDThh:mm:ss.sssTZD
+    private static String REGEXP_ISO8061 = "^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(.([0-9]){3})?(Z|[\\+\\-]([0-9]{2}):([0-9]{2}))$";
+    private static Pattern matcherISO8601 = Pattern.compile(REGEXP_ISO8061);
+    private static final Pattern nodeRefPattern = Pattern.compile("^[a-zA-Z]+://.+/.+");
+    
+	private NamedObjectRegistry<ActivitySummaryProcessor> processors;
+	
+    private boolean autoConvertISO8601 = true;
+
+	public ActivitySummaryParser()
+	{
+	}
+
+	public void setProcessors(NamedObjectRegistry<ActivitySummaryProcessor> processors)
+	{
+		this.processors = processors;
+	}
+
+	public void register(String activityType, ActivitySummaryProcessor processor)
+	{
+		ActivitySummaryProcessor existingProcessor = processors.getNamedObject(activityType);
+		if(existingProcessor != null)
+		{
+			logger.warn("Activity summary processor " + existingProcessor + " is being overridden by " + processor + " for activity type " + activityType);
+		}
+
+		processors.register(activityType, processor);
+	}
+
+	private void processActivitySummary(String activityType, Map<String, Object> entries)
+	{
+		ActivitySummaryProcessor processor = processors.getNamedObject(activityType);
+		if(processor == null)
+		{
+			processor = new BaseActivitySummaryProcessor();
+		}
+
+		processor.process(entries);
+	}
+
+	public Map<String, Object> parse(String activityType, String activitySummary) throws JSONException
+	{
+		JSONObject json = (JSONObject)JSONValue.parse(activitySummary);
+		Map<String, Object> map = convertJSONObjectToMap(json);
+		processActivitySummary(activityType, map);
+		return map;
+	}
+	
+    /**
+     * Determine if passed string conforms to the pattern of a node reference
+     * 
+     * @param nodeRef  the node reference as a string
+     * @return  true => it matches the pattern of a node reference
+     */
+    private boolean isNodeRef(String nodeRef)
+    {
+    	Matcher matcher = nodeRefPattern.matcher(nodeRef);
+    	return matcher.matches();
+    }
+    
+    Map<String, Object> convertJSONObjectToMap(JSONObject jo) throws JSONException
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+
+        for(Object key : jo.keySet())
+        {
+            Object value = jo.get(key);
+            if (value instanceof JSONObject)
+            {
+                model.put((String)key, convertJSONObjectToMap((JSONObject)value));
+            }
+            else if (value instanceof JSONArray)
+            {
+                model.put((String)key, convertJSONArrayToList((JSONArray)value));
+            }
+            else if (value == null)
+            {
+                model.put((String)key, null);
+            }
+            else
+            {
+                if ((value instanceof String) && autoConvertISO8601 && (matcherISO8601.matcher((String)value).matches()))
+                {
+                	value = ISO8601DateFormat.parse((String)value);
+                }
+                
+                if ((value instanceof String) && isNodeRef((String)value))
+                {
+                	try
+                	{
+                		value = new NodeRef((String)value);
+                	}
+                	catch(AlfrescoRuntimeException e)
+                	{
+                		// cannot convert to a nodeRef, just keep as a string
+                		logger.warn("Cannot convert activity summary NodeRef string " + value + " to a NodeRef");
+                	}
+                }
+                
+                model.put((String)key, value);
+            }
+        }
+       
+        return model;
+    }
+   
+    List<Object> convertJSONArrayToList(JSONArray ja) throws JSONException
+    {
+        List<Object> model = new ArrayList<Object>();
+       
+        for (int i = 0; i < ja.size(); i++)
+        {
+            Object o = ja.get(i);
+            
+            if (o instanceof JSONArray)
+            {
+                model.add(convertJSONArrayToList((JSONArray)o));
+            }
+            else if (o instanceof JSONObject)
+            {
+                model.add(convertJSONObjectToMap((JSONObject)o));
+            }
+            else if (o == null)
+            {
+                model.add(null);
+            }
+            else
+            {
+                if ((o instanceof String) && autoConvertISO8601 && (matcherISO8601.matcher((String)o).matches()))
+                {
+                    o = ISO8601DateFormat.parse((String)o);
+                }
+                
+                model.add(o);
+            }
+        }
+       
+        return model;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/ActivitySummaryProcessor.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/ActivitySummaryProcessor.java
new file mode 100644
index 00000000000..2f45f1d75be
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/ActivitySummaryProcessor.java
@@ -0,0 +1,38 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl.activities;
+
+import java.util.Map;
+
+public interface ActivitySummaryProcessor
+{
+	public interface Change
+	{
+		void process(Map<String, Object> entries);
+	}
+
+	public Map<String, Object> process(Map<String, Object> entries);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/ActivitySummaryProcessorRegistry.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/ActivitySummaryProcessorRegistry.java
new file mode 100644
index 00000000000..4feeeb33c23
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/ActivitySummaryProcessorRegistry.java
@@ -0,0 +1,37 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl.activities;
+
+/**
+ * A registry for activity summary parsers/post processors.
+ * 
+ * @author steveglover
+ *
+ */
+public interface ActivitySummaryProcessorRegistry
+{
+	public void register(String activityType, ActivitySummaryProcessor processor);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/BaseActivitySummaryProcessor.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/BaseActivitySummaryProcessor.java
new file mode 100644
index 00000000000..0ac4fcdbef2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/BaseActivitySummaryProcessor.java
@@ -0,0 +1,121 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl.activities;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.alfresco.rest.api.impl.activities.AbstractActivitySummaryProcessor.RemoveKey;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+public class BaseActivitySummaryProcessor extends AbstractActivitySummaryProcessor
+{
+	@Override
+	protected Change processEntry(String key, Object value)
+	{
+		Change change = null;
+
+		if(key.equals("page"))
+		{
+			change = new ChangePageValue(key);
+		}
+
+		if(key.equals("tenantDomain"))
+		{
+			change = new RemoveKey(key);
+		}
+		
+		if(key.equals("nodeRef"))
+		{
+			change = new ChangeKey(key, "objectId");
+		}
+		
+		if(key.equals("parentNodeRef"))
+		{
+			change = new ChangeKey(key, "parentObjectId");
+		}
+		
+		// remove null or empty properties
+		if(value == null || value.equals(""))
+		{
+			change = new RemoveKey(key);
+		}
+
+		return change;
+	}
+	
+	public static class ChangePageValue implements Change
+	{
+		private String key;
+		private static final String regex = Pattern.quote("document-details?nodeRef=") + "(.*)";
+		private static final Pattern pattern = Pattern.compile(regex);
+
+		public ChangePageValue(String key) {
+			super();
+			this.key = key;
+		}
+
+		/*
+		 * Extract and output the node id from input that looks like this: document-details?nodeRef=workspace%3A%2F%2FSpacesStore%2Fd4c1a75e-a17e-4033-94f4-988cca39a357 (non-Javadoc)
+		 * 
+		 * @see org.alfresco.rest.api.impl.activities.ActivitySummaryProcessor.Change#process(java.util.Map)
+		 */
+		public void process(Map<String, Object> entries)
+		{
+			String value = (String)entries.remove(key);
+			try
+			{
+				value = URLDecoder.decode(value, "UTF-8");
+				Matcher matcher = pattern.matcher(value);
+				if(matcher.matches())
+				{
+					String nodeRefStr = matcher.group(1);
+					boolean isNodeRef = NodeRef.isNodeRef(nodeRefStr);
+					if(isNodeRef)
+					{
+						NodeRef nodeRef = new NodeRef(nodeRefStr);
+						entries.put("objectId", nodeRef.getId());
+					}
+					else
+					{
+						logger.warn("Activity page url contains an invalid NodeRef " + value);
+					}
+				}
+				else
+				{
+					logger.warn("Failed to match activity page url for objectId extraction " + value);
+				}
+			}
+			catch (UnsupportedEncodingException e)
+			{
+				logger.warn("Unable to decode activity page url " + value);
+			}
+		}
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/CommentsActivitySummaryProcessor.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/CommentsActivitySummaryProcessor.java
new file mode 100644
index 00000000000..2ca0571098c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/CommentsActivitySummaryProcessor.java
@@ -0,0 +1,32 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl.activities;
+
+public class CommentsActivitySummaryProcessor extends BaseActivitySummaryProcessor
+{
+
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/DiscussionsActivitySummaryProcessor.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/DiscussionsActivitySummaryProcessor.java
new file mode 100644
index 00000000000..2164d80f525
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/DiscussionsActivitySummaryProcessor.java
@@ -0,0 +1,42 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl.activities;
+
+public class DiscussionsActivitySummaryProcessor extends BaseActivitySummaryProcessor
+{
+	@Override
+	protected Change processEntry(String key, Object value)
+	{
+		Change change = null;
+
+		if(key.equals("params"))
+		{
+			change = new RemoveKey(key);
+		}
+		
+		return change;
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/DocumentLibraryActivitySummaryProcessor.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/DocumentLibraryActivitySummaryProcessor.java
new file mode 100644
index 00000000000..e00e0865ff5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/DocumentLibraryActivitySummaryProcessor.java
@@ -0,0 +1,31 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl.activities;
+
+public class DocumentLibraryActivitySummaryProcessor extends BaseActivitySummaryProcessor
+{
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/SiteActivitySummaryProcessor.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/SiteActivitySummaryProcessor.java
new file mode 100644
index 00000000000..a731290018b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/SiteActivitySummaryProcessor.java
@@ -0,0 +1,43 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl.activities;
+
+public class SiteActivitySummaryProcessor extends BaseActivitySummaryProcessor
+{
+	@Override
+	protected Change processEntry(String key, Object value)
+	{
+		Change change = super.processEntry(key, value);
+
+		if(key.equals("memberUserName"))
+		{
+			change = new ChangeKey(key, "memberPersonId");
+		}
+
+		return change;
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/SubscriptionsActivitySummaryProcessor.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/SubscriptionsActivitySummaryProcessor.java
new file mode 100644
index 00000000000..216696a945b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/activities/SubscriptionsActivitySummaryProcessor.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl.activities;
+
+public class SubscriptionsActivitySummaryProcessor extends BaseActivitySummaryProcessor
+{
+	//{"lastName":"Glover","userFirstName":"David","followerLastName":"Glover","userUserName":"david.bowie@alfresco.com","followerFirstName":"Steve",
+	// "userLastName":"Bowie","followerUserName":"steven.glover@alfresco.com","firstName":"Steve","tenantDomain":"alfresco.com"}
+	
+	@Override
+	protected Change processEntry(String key, Object value)
+	{
+		Change change = super.processEntry(key, value);
+
+		if(key.equals("userUserName"))
+		{
+			change = new ChangeKey(key, "userPersonId");
+		}
+		
+		if(key.equals("followerUserName"))
+		{
+			change = new ChangeKey(key, "followerPersonId");
+		}
+
+		return change;
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/node/ratings/AbstractRatingScheme.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/node/ratings/AbstractRatingScheme.java
new file mode 100644
index 00000000000..47773b6ad0f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/node/ratings/AbstractRatingScheme.java
@@ -0,0 +1,236 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl.node.ratings;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Date;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.sync.repo.Client;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.rest.api.model.DocumentRatingSummary;
+import org.alfresco.rest.api.model.NodeRating;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.rating.Rating;
+import org.alfresco.service.cmr.rating.RatingService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.util.registry.NamedObjectRegistry;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.simple.JSONObject;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * Manages the mapping between the rest api's representation of a node rating and the repository's
+ * representation of a node rating.
+ * 
+ * @author steveglover
+ *
+ */
+public abstract class AbstractRatingScheme implements RatingScheme, InitializingBean
+{
+    private static Log logger = LogFactory.getLog(RatingScheme.class);  
+
+	protected String ratingSchemeName; // for interaction with the RatingService
+	protected String ratingSchemeId; // exposed through the api
+	protected RatingService ratingService;
+	protected NodeService nodeService;
+	protected DictionaryService dictionaryService;
+	protected ActivityService activityService;
+	protected SiteService siteService;
+
+	protected NamedObjectRegistry<RatingScheme> nodeRatingSchemeRegistry;
+
+	public AbstractRatingScheme(String ratingSchemeId, String ratingSchemeName)
+	{
+		super();
+		this.ratingSchemeName = ratingSchemeName;
+		this.ratingSchemeId = ratingSchemeId;
+	}
+	
+	public String getRatingSchemeId()
+	{
+		return ratingSchemeId;
+	}
+
+	public String getRatingServiceName()
+	{
+		return ratingSchemeName;
+	}
+	
+    public void setNodeRatingSchemeRegistry(NamedObjectRegistry<RatingScheme> nodeRatingSchemeRegistry)
+    {
+		this.nodeRatingSchemeRegistry = nodeRatingSchemeRegistry;
+	}
+
+	public void setActivityService(ActivityService activityService)
+	{
+		this.activityService = activityService;
+	}
+
+	public void setSiteService(SiteService siteService)
+	{
+		this.siteService = siteService;
+	}
+
+	public void setNodeService(NodeService nodeService)
+	{
+		this.nodeService = nodeService;
+	}
+
+	public void setDictionaryService(DictionaryService dictionaryService)
+	{
+		this.dictionaryService = dictionaryService;
+	}
+
+	public void setRatingService(RatingService ratingService)
+	{
+		this.ratingService = ratingService;
+	}
+
+	protected org.alfresco.service.cmr.rating.RatingScheme getRepoRatingScheme()
+	{
+		return ratingService.getRatingScheme(ratingSchemeName);
+	}
+
+	protected abstract DocumentRatingSummary getDocumentRatingSummary(NodeRef nodeRef);
+	protected abstract Object getApiRating(Float rating);
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+		nodeRatingSchemeRegistry.register(ratingSchemeId, this);
+		nodeRatingSchemeRegistry.register(ratingSchemeName, this);
+    }
+    
+    public void validateRating(Float rating)
+    {
+		org.alfresco.service.cmr.rating.RatingScheme ratingScheme = getRepoRatingScheme();
+		Float minRating = ratingScheme.getMinRating();
+		Float maxRating = ratingScheme.getMaxRating();
+		if(rating < minRating || rating > maxRating)
+		{
+			throw new InvalidArgumentException("Rating is out of bounds.");
+		}
+    }
+
+	public NodeRating getNodeRating(NodeRef nodeRef)
+	{
+    	Rating ratingByCurrentUser = ratingService.getRatingByCurrentUser(nodeRef, ratingSchemeName);
+    	Float rating = null;
+    	Date appliedAt = null;
+
+    	if(ratingByCurrentUser != null)
+    	{
+	    	rating = ratingByCurrentUser.getScore();
+	    	appliedAt = ratingByCurrentUser.getAppliedAt();
+    	}
+
+    	Object myRating = null;
+    	if(rating != null)
+    	{
+    		validateRating(rating);
+        	myRating = getApiRating(rating);
+    	}
+
+    	DocumentRatingSummary documentRatingSummary = getDocumentRatingSummary(nodeRef);
+
+        NodeRating nodeRating = new NodeRating(ratingSchemeId, myRating, appliedAt, documentRatingSummary);
+        return nodeRating;
+	}
+	
+    private String getSiteId(final NodeRef nodeRef)
+    {
+		// may not be able to read site data so run as system
+		String siteId = AuthenticationUtil.runAsSystem(new RunAsWork<String>()
+        {
+			@Override
+			public String doWork() throws Exception
+			{
+				String siteId = null;
+		        SiteInfo siteInfo = siteService.getSite(nodeRef);
+		        if(siteInfo != null)
+		        {
+		        	siteId = siteInfo.getShortName();
+		        }
+				return siteId;
+			}
+        });
+
+		return siteId;
+    }
+
+    @SuppressWarnings("unchecked")
+	private JSONObject getActivityData(final NodeRef nodeRef, String siteId)
+    {
+    	JSONObject activityData = null;
+
+    	if(siteId != null)
+    	{
+            // may not be able to read these nodes, but we need to for the activity processing so run as system
+    		activityData = AuthenticationUtil.runAsSystem(new RunAsWork<JSONObject>()
+    		{
+    			@Override
+    			public JSONObject doWork() throws Exception
+    			{
+    				JSONObject activityData = new JSONObject();
+    				activityData.put("title", nodeService.getProperty(nodeRef, ContentModel.PROP_NAME));
+    				try
+    				{
+    					StringBuilder sb = new StringBuilder("document-details?nodeRef=");
+    					sb.append(URLEncoder.encode(nodeRef.toString(), "UTF-8"));
+    					activityData.put("page", sb.toString());
+    				}
+    				catch (UnsupportedEncodingException e)
+    				{
+    					logger.warn("Unable to urlencode page for create nodeRating activity");
+    				}
+
+    				return activityData;
+    			}
+    		});
+    	}
+
+		return activityData;
+    }
+
+	protected void postActivity(final NodeRef nodeRef, final String activityType)
+    {
+    	String siteId = getSiteId(nodeRef);
+    	JSONObject activityData = getActivityData(nodeRef, siteId);
+		if(activityData != null)
+		{
+			activityService.postActivity(activityType, siteId, "nodeRatings", activityData.toString(), Client.asType(Client.ClientType.restapi));
+		}
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/node/ratings/FiveStarRatingScheme.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/node/ratings/FiveStarRatingScheme.java
new file mode 100644
index 00000000000..e217451262f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/node/ratings/FiveStarRatingScheme.java
@@ -0,0 +1,104 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl.node.ratings;
+
+import org.alfresco.rest.api.model.DocumentRatingSummary;
+import org.alfresco.rest.api.model.FiveStarRatingSummary;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.service.cmr.rating.RatingServiceException;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * The rest apis representation of the 'fiveStar' rating scheme.
+ * 
+ * @author steveglover
+ *
+ */
+public class FiveStarRatingScheme extends AbstractRatingScheme
+{
+	public FiveStarRatingScheme()
+	{
+		super("fiveStar", "fiveStarRatingScheme");
+	}
+
+	public Float getRatingServiceRating(Object rating)
+	{
+		Float ratingToApply = null;
+
+		if(rating instanceof Integer)
+		{
+			ratingToApply = ((Integer)rating).floatValue();
+		}
+		else
+		{
+			throw new InvalidArgumentException("Rating should be non-null and an integer for 'fiveStar' rating scheme.");
+		}
+
+		validateRating(ratingToApply);
+		
+		return ratingToApply;
+	}
+	
+	public Object getApiRating(Float rating)
+	{
+		Object apiRating = Integer.valueOf(rating.intValue());
+		return apiRating;
+	}
+
+	public DocumentRatingSummary getDocumentRatingSummary(NodeRef nodeRef)
+	{
+		return new FiveStarRatingSummary(ratingService.getRatingsCount(nodeRef, ratingSchemeName),
+    			ratingService.getTotalRating(nodeRef, ratingSchemeName),
+    			ratingService.getAverageRating(nodeRef, ratingSchemeName));
+	}
+
+	@Override
+	public void applyRating(NodeRef nodeRef, Object rating)
+	{
+		try
+		{
+			Float ratingServiceRating = getRatingServiceRating(rating);
+			ratingService.applyRating(nodeRef, ratingServiceRating, getRatingServiceName());
+		}
+		catch(RatingServiceException e)
+		{
+			throw new InvalidArgumentException(e.getMessage());
+		}
+	}
+
+	@Override
+	public void removeRating(NodeRef nodeRef)
+	{
+		try
+		{
+			ratingService.removeRatingByCurrentUser(nodeRef, getRatingServiceName());
+		}
+		catch(RatingServiceException e)
+		{
+			throw new InvalidArgumentException(e.getMessage());
+		}
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/node/ratings/LikesRatingScheme.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/node/ratings/LikesRatingScheme.java
new file mode 100644
index 00000000000..be182fd3314
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/node/ratings/LikesRatingScheme.java
@@ -0,0 +1,125 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl.node.ratings;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.activities.ActivityType;
+import org.alfresco.rest.api.model.DocumentRatingSummary;
+import org.alfresco.rest.api.model.LikesRatingSummary;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.service.cmr.rating.RatingServiceException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * The rest api representation of the 'likes' rating scheme.
+ * 
+ * @author steveglover
+ *
+ */
+public class LikesRatingScheme extends AbstractRatingScheme
+{
+	public LikesRatingScheme()
+	{
+		super("likes", "likesRatingScheme");
+	}
+	
+	public Float getRatingServiceRating(Object rating)
+	{
+		Float ratingToApply = null;
+
+		if(rating instanceof Boolean)
+		{
+    		boolean liked = ((Boolean)rating).booleanValue();
+    		ratingToApply = Float.valueOf((liked ? 1.0f : 0.0f));	    			
+		}
+		else
+		{
+			throw new InvalidArgumentException("Rating should be non-null and a boolean for 'likes' rating scheme.");
+		}
+
+		return ratingToApply;
+	}
+	
+	@Override
+	public void applyRating(NodeRef nodeRef, Object rating)
+	{
+		try
+		{
+			Float ratingServiceRating = getRatingServiceRating(rating);
+			ratingService.applyRating(nodeRef, ratingServiceRating, getRatingServiceName());
+
+			QName nodeType = nodeService.getType(nodeRef);
+            boolean isContainer = dictionaryService.isSubClass(nodeType, ContentModel.TYPE_FOLDER) &&
+                    !dictionaryService.isSubClass(nodeType, ContentModel.TYPE_SYSTEM_FOLDER);
+			postActivity(nodeRef, isContainer ? ActivityType.FOLDER_LIKED : ActivityType.FILE_LIKED);
+		}
+		catch(RatingServiceException e)
+		{
+			throw new InvalidArgumentException(e.getMessage());
+		}
+	}
+	
+	@Override
+	public void removeRating(NodeRef nodeRef)
+	{
+		try
+		{
+			ratingService.removeRatingByCurrentUser(nodeRef, getRatingServiceName());
+		}
+		catch(RatingServiceException e)
+		{
+			throw new InvalidArgumentException(e.getMessage());
+		}
+	}
+
+	@Override
+	protected Object getApiRating(Float rating)
+	{
+		Object apiRating = null;
+		if(rating == 1.0f)
+		{
+			apiRating = true;
+		}
+		else if(rating == 0.0f)
+		{
+			apiRating = false;
+		}
+		else
+		{
+			throw new InvalidArgumentException("Rating is invalid.");
+		}
+
+		return apiRating;
+	}
+	
+	@Override
+	protected DocumentRatingSummary getDocumentRatingSummary(NodeRef nodeRef)
+	{
+		return new LikesRatingSummary(ratingService.getRatingsCount(nodeRef, ratingSchemeName));
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/node/ratings/RatingScheme.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/node/ratings/RatingScheme.java
new file mode 100644
index 00000000000..39613899c4a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/node/ratings/RatingScheme.java
@@ -0,0 +1,36 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl.node.ratings;
+
+import org.alfresco.rest.api.model.NodeRating;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+public interface RatingScheme
+{
+	public void applyRating(NodeRef nodeRef, Object rating);
+	public void removeRating(NodeRef nodeRef);
+	public NodeRating getNodeRating(NodeRef nodeRef);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/lookups/MimeTypePropertyLookup.java b/remote-api/src/main/java/org/alfresco/rest/api/lookups/MimeTypePropertyLookup.java
new file mode 100644
index 00000000000..b289a545c0d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/lookups/MimeTypePropertyLookup.java
@@ -0,0 +1,71 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.lookups;
+
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Looks up mimetype values
+ * Pass in a mimetype value and a display string is returned.
+ * @author Gethin James
+ */
+public class MimeTypePropertyLookup implements PropertyLookup<String>
+{
+    private Set<String> supported = new HashSet<>();
+    private ServiceRegistry serviceRegistry;
+
+    @Override
+    public String lookup(String propertyValue)
+    {
+        Map<String,String> mimetypes = serviceRegistry.getMimetypeService().getDisplaysByMimetype();
+        return mimetypes.get(propertyValue);
+    }
+
+    @Override
+    public Set<String> supports()
+    {
+        return supported;
+    }
+
+    public void setServiceRegistry(ServiceRegistry serviceRegistry)
+    {
+        this.serviceRegistry = serviceRegistry;
+    }
+
+    public void setSupported(List<String> supported)
+    {
+        this.supported.add(QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "content.mimetype").toString());
+        this.supported.addAll(supported);
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/lookups/PersonPropertyLookup.java b/remote-api/src/main/java/org/alfresco/rest/api/lookups/PersonPropertyLookup.java
new file mode 100644
index 00000000000..041d8bb8305
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/lookups/PersonPropertyLookup.java
@@ -0,0 +1,76 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.lookups;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.transaction.TransactionalResourceHelper;
+import org.alfresco.rest.api.impl.NodesImpl;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.UserInfo;
+import org.alfresco.service.ServiceRegistry;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Looks up information about a person.
+ * Pass in a userId and the display name is returned.
+ *
+ * @author Gethin James
+ */
+public class PersonPropertyLookup implements PropertyLookup<String>
+{
+    private Set<String> supported = new HashSet<>();
+    private ServiceRegistry serviceRegistry;
+
+    @Override
+    public String lookup(String propertyValue)
+    {
+        Map<String, UserInfo> mapUserInfo = TransactionalResourceHelper.getMap("PERSON_PROPERTY_LOOKUP_USER_INFO_CACHE");
+        UserInfo user = Node.lookupUserInfo(propertyValue, mapUserInfo, serviceRegistry.getPersonService());
+        if (user != null) return user.getDisplayName();
+        return null;
+    }
+
+    @Override
+    public Set<String> supports()
+    {
+        return supported;
+    }
+
+    public void setSupported(List<String> supported)
+    {
+        NodesImpl.PROPS_USERLOOKUP.forEach(entry -> this.supported.add(entry.toString()));
+        this.supported.addAll(supported);
+    }
+
+    public void setServiceRegistry(ServiceRegistry serviceRegistry)
+    {
+        this.serviceRegistry = serviceRegistry;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/lookups/PropertyLookup.java b/remote-api/src/main/java/org/alfresco/rest/api/lookups/PropertyLookup.java
new file mode 100644
index 00000000000..19313384753
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/lookups/PropertyLookup.java
@@ -0,0 +1,52 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.lookups;
+
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Looks up property values for the api
+ *
+ * @author Gethin James
+ */
+public interface PropertyLookup<T extends Object>
+{
+    /**
+     * The list of property keys that are supported by this class
+     * @return Set<String> property keys
+     */
+    public Set<String> supports();
+
+    /**
+     * Lookup the property value with a new value.
+     * @param propertyValue
+     * @return a new value or null if the property value isn't found.
+     */
+    public T lookup(String propertyValue);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/lookups/PropertyLookupRegistry.java b/remote-api/src/main/java/org/alfresco/rest/api/lookups/PropertyLookupRegistry.java
new file mode 100644
index 00000000000..50dc9565461
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/lookups/PropertyLookupRegistry.java
@@ -0,0 +1,88 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.lookups;
+
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.extensions.surf.util.AbstractLifecycleBean;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Acts as a central point for property lookups
+ *
+ * @author Gethin James
+ */
+public class PropertyLookupRegistry
+{
+    private static Log logger = LogFactory.getLog(PropertyLookupRegistry.class);
+    Map<String, PropertyLookup> propertyLookups = new HashMap<>();
+
+    /**
+     * Set the supported property lookup classes.
+     * @param lookups
+     */
+    public void setLookups(List<PropertyLookup> lookups)
+    {
+        lookups.forEach(entry ->
+        {
+            entry.supports().forEach( propKey -> propertyLookups.put((String) propKey, entry) );
+        });
+    }
+
+    /**
+     * The list of property keys that are supported by this class
+     * @return Set<String> property keys
+     */
+    public Set<String> supports()
+    {
+        return propertyLookups.keySet();
+    }
+
+    /**
+     * Looks up the property value using a PropertyLookup
+     * @param propertyName the property name/type
+     * @param propertyValue the value to lookup
+     * @return Object to be serialized as json
+     */
+    public Object lookup(String propertyName, String propertyValue)
+    {
+        PropertyLookup lookup = propertyLookups.get(propertyName);
+        if (lookup != null)
+        {
+            return lookup.lookup(propertyValue);
+        }
+        return null;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/AbstractClassModel.java b/remote-api/src/main/java/org/alfresco/rest/api/model/AbstractClassModel.java
new file mode 100644
index 00000000000..9146ef9c302
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/AbstractClassModel.java
@@ -0,0 +1,80 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.alfresco.service.namespace.QName;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public abstract class AbstractClassModel extends AbstractCommonDetails
+{
+    /* package */String parentName;
+    /* package */List<CustomModelProperty> properties = Collections.emptyList();
+
+    public String getParentName()
+    {
+        return this.parentName;
+    }
+
+    public void setParentName(String parentName)
+    {
+        this.parentName = parentName;
+    }
+
+    public List<CustomModelProperty> getProperties()
+    {
+        return this.properties;
+    }
+
+    public void setProperties(List<CustomModelProperty> properties)
+    {
+        this.properties = properties;
+    }
+
+    /* package */<T> List<T> setList(List<T> sourceList)
+    {
+        if (sourceList == null)
+        {
+            return Collections.<T> emptyList();
+        }
+        return new ArrayList<>(sourceList);
+    }
+
+    /* package */String getParentNameAsString(QName parentQName)
+    {
+        if (parentQName != null)
+        {
+            return parentQName.toPrefixString();
+        }
+        return null;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/AbstractCommonDetails.java b/remote-api/src/main/java/org/alfresco/rest/api/model/AbstractCommonDetails.java
new file mode 100644
index 00000000000..33f8d6b555c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/AbstractCommonDetails.java
@@ -0,0 +1,118 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public abstract class AbstractCommonDetails implements Comparable<AbstractCommonDetails>
+{
+    /* package */String name;
+    /* package */String prefixedName;
+    /* package */String title;
+    /* package */String description;
+
+    public String getName()
+    {
+        return this.name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getPrefixedName()
+    {
+        return this.prefixedName;
+    }
+
+    public String getTitle()
+    {
+        return this.title;
+    }
+
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public String getDescription()
+    {
+        return this.description;
+    }
+
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((this.name == null) ? 0 : this.name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+        if (obj == null)
+        {
+            return false;
+        }
+        if (!(obj instanceof CustomModelConstraint))
+        {
+            return false;
+        }
+        CustomModelConstraint other = (CustomModelConstraint) obj;
+        if (this.name == null)
+        {
+            if (other.name != null)
+            {
+                return false;
+            }
+        }
+        else if (!this.name.equals(other.name))
+        {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int compareTo(AbstractCommonDetails other)
+    {
+        return this.name.compareTo(other.getName());
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Action.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Action.java
new file mode 100644
index 00000000000..99a5da3625d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Action.java
@@ -0,0 +1,76 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.Map;
+
+public class Action
+{
+    private String id;
+    private String actionDefinitionId;
+    private String targetId;
+    Map<String, String> params;
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getActionDefinitionId()
+    {
+        return actionDefinitionId;
+    }
+
+    public void setActionDefinitionId(String actionDefinitionId)
+    {
+        this.actionDefinitionId = actionDefinitionId;
+    }
+
+    public String getTargetId()
+    {
+        return targetId;
+    }
+
+    public void setTargetId(String targetId)
+    {
+        this.targetId = targetId;
+    }
+
+    public Map<String, String> getParams()
+    {
+        return params;
+    }
+
+    public void setParams(Map<String, String> params)
+    {
+        this.params = params;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/ActionDefinition.java b/remote-api/src/main/java/org/alfresco/rest/api/model/ActionDefinition.java
new file mode 100644
index 00000000000..c9a9cdf137e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/ActionDefinition.java
@@ -0,0 +1,171 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.List;
+
+public class ActionDefinition
+{
+    private String id;
+    private String name;
+    private String title;
+    private String description;
+    private List<String> applicableTypes;
+    private boolean adhocPropertiesAllowed;
+    private boolean trackStatus;
+    private List<ParameterDefinition> parameterDefinitions;
+
+    /**
+     * For Jackson deserialisation.
+     */
+    public ActionDefinition()
+    {
+    }
+
+    public ActionDefinition(String id,
+                            String name,
+                            String title,
+                            String description,
+                            List<String> applicableTypes,
+                            boolean adhocPropertiesAllowed,
+                            boolean trackStatus,
+                            List<ParameterDefinition> parameterDefinitions)
+    {
+        this.id = id;
+        this.name = name;
+        this.title = title;
+        this.description = description;
+        this.applicableTypes = applicableTypes;
+        this.adhocPropertiesAllowed = adhocPropertiesAllowed;
+        this.trackStatus = trackStatus;
+        this.parameterDefinitions = parameterDefinitions;
+    }
+
+    /**
+     * Will be used as a synonym for name.
+     */
+    public String getId()
+    {
+        return id;
+    }
+    
+    public String getName()
+    {
+        return name;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public List<String> getApplicableTypes()
+    {
+        return applicableTypes;
+    }
+
+    public boolean isAdhocPropertiesAllowed()
+    {
+        return adhocPropertiesAllowed;
+    }
+
+    public boolean isTrackStatus()
+    {
+        return trackStatus;
+    }
+
+    public List<ParameterDefinition> getParameterDefinitions()
+    {
+        return parameterDefinitions;
+    }
+
+    public static class ParameterDefinition
+    {
+        private String name;
+        private String type;
+        private boolean multiValued;
+        private boolean mandatory;
+        private String displayLabel;
+        private String parameterConstraintName;
+
+        /**
+         * For Jackson deserialisation.
+         */
+        public ParameterDefinition()
+        {
+        }
+
+        public ParameterDefinition(String name,
+                                   String type,
+                                   boolean multiValued,
+                                   boolean mandatory,
+                                   String displayLabel,
+                                   String parameterConstraintName)
+        {
+            this.name = name;
+            this.type = type;
+            this.multiValued = multiValued;
+            this.mandatory = mandatory;
+            this.displayLabel = displayLabel;
+            this.parameterConstraintName = parameterConstraintName;
+        }
+
+        public String getName()
+        {
+            return name;
+        }
+
+        public String getType()
+        {
+            return type;
+        }
+
+        public boolean isMultiValued()
+        {
+            return multiValued;
+        }
+
+        public boolean isMandatory()
+        {
+            return mandatory;
+        }
+
+        public String getDisplayLabel()
+        {
+            return displayLabel;
+        }
+
+        public String getParameterConstraintName()
+        {
+            return parameterConstraintName;
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Activity.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Activity.java
new file mode 100644
index 00000000000..535128f0d8f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Activity.java
@@ -0,0 +1,165 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.Date;
+import java.util.Map;
+
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Represents an activity feed entry.
+ * 
+ * @author steveglover
+ *
+ */
+public class Activity implements Comparable<Activity>
+{
+	private Long id;
+	private String networkId;
+	private String siteId;
+	private String feedPersonId;
+	private String postPersonId;
+	private Date postedAt;
+	private String activityType;
+	private Map<String, Object> activitySummary;
+
+	public Activity()
+	{
+	}
+
+	public Activity(Long id, String networkId, String siteId, String feedPersonId,
+			String postPersonId, Date postedAt, String activityType, Map<String, Object> activitySummary)
+	{
+		super();
+		this.id = id;
+		this.networkId = networkId;
+		this.siteId = siteId;
+		this.feedPersonId = feedPersonId;
+		this.postPersonId = postPersonId;
+		this.postedAt = postedAt;
+		this.activityType = activityType;
+		this.activitySummary = activitySummary;
+	}
+
+	@UniqueId
+	public Long getId()
+	{
+		return id;
+	}
+
+	public String getNetworkId()
+	{
+		return networkId;
+	}
+
+	public String getSiteId()
+	{
+		return siteId;
+	}
+
+	public String getFeedPersonId()
+	{
+		return feedPersonId;
+	}
+
+	public String getPostPersonId()
+	{
+		return postPersonId;
+	}
+
+	public String getActivityType()
+	{
+		return activityType;
+	}
+
+	public Date getPostedAt()
+	{
+		return postedAt;
+	}
+
+	public Map<String, Object> getActivitySummary()
+	{
+		return activitySummary;
+	}
+	
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+		{
+			return true;
+		}
+		
+		if (obj == null)
+		{
+			return false;
+		}
+		
+		if (getClass() != obj.getClass())
+		{
+			return false;
+		}
+
+		Activity other = (Activity) obj;
+		return(id.equals(other.id));
+	}
+
+	@Override
+	public int compareTo(Activity activity)
+	{
+		long otherId = activity.getId();
+		long diff = id - otherId;
+		if(diff == 0)
+		{
+			return 0;
+		}
+		else
+		{
+			return diff < 0 ? -1 : 1;
+		}
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Activity [id=" + id + ", siteId=" + siteId
+				+ ", feedPersonId=" + feedPersonId + ", postPersonId=" + postPersonId
+				+ ", postedAt=" + postedAt
+				+ ", activityType=" + activityType + ", activitySummary="
+				+ activitySummary + "]";
+	}
+	
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Assoc.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Assoc.java
new file mode 100644
index 00000000000..e60d48214a8
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Assoc.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+
+/**
+ * @author janv
+ */
+public class Assoc
+{
+    private String prefixAssocTypeQName;
+
+    public Assoc()
+    {
+    }
+
+    public Assoc(String prefixAssocTypeQName)
+    {
+        this.prefixAssocTypeQName = prefixAssocTypeQName;
+    }
+
+    public String getAssocType()
+    {
+        return prefixAssocTypeQName;
+    }
+
+    public void setAssocType(String prefixAssocTypeQName)
+    {
+        this.prefixAssocTypeQName = prefixAssocTypeQName;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/AssocChild.java b/remote-api/src/main/java/org/alfresco/rest/api/model/AssocChild.java
new file mode 100644
index 00000000000..84a1500939f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/AssocChild.java
@@ -0,0 +1,73 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+/**
+ * @author janv
+ */
+public class AssocChild extends Assoc
+{
+    private String childId;
+    private Boolean isPrimary;
+
+    public AssocChild()
+    {
+    }
+
+    public AssocChild(String prefixAssocTypeQName, boolean isPrimary)
+    {
+        super(prefixAssocTypeQName);
+
+        this.isPrimary = isPrimary;
+    }
+
+    public AssocChild(String childId, String prefixAssocTypeQName)
+    {
+        super(prefixAssocTypeQName);
+
+        this.childId = childId;
+    }
+
+    public Boolean getIsPrimary()
+    {
+        return isPrimary;
+    }
+
+    public void setIsPrimary(Boolean isPrimary)
+    {
+        this.isPrimary = isPrimary;
+    }
+
+    public String getChildId()
+    {
+        return childId;
+    }
+
+    public void setChildId(String childId)
+    {
+        this.childId = childId;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/AssocTarget.java b/remote-api/src/main/java/org/alfresco/rest/api/model/AssocTarget.java
new file mode 100644
index 00000000000..fa4a232852a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/AssocTarget.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+/**
+ * @author janv
+ */
+public class AssocTarget extends Assoc
+{
+    private String targetId;
+
+    public AssocTarget()
+    {
+    }
+
+    public AssocTarget(String prefixAssocTypeQName)
+    {
+        super(prefixAssocTypeQName);
+    }
+
+    public AssocTarget(String targetId, String prefixAssocTypeQName)
+    {
+        super(prefixAssocTypeQName);
+
+        this.targetId = targetId;
+    }
+
+    public String getTargetId()
+    {
+        return targetId;
+    }
+
+    public void setTargetId(String targetId)
+    {
+        this.targetId = targetId;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/AuditApp.java b/remote-api/src/main/java/org/alfresco/rest/api/model/AuditApp.java
new file mode 100644
index 00000000000..13467bb9b3d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/AuditApp.java
@@ -0,0 +1,112 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A representation of a Audit App
+ *
+ * @author janv
+ * 
+ */
+public class AuditApp
+{
+	private String id;
+    private String name;
+    private Boolean isEnabled;
+    private Long maxEntryId;
+    private Long minEntryId;
+
+    public Long getMaxEntryId()
+    {
+        return maxEntryId;
+    }
+
+    public void setMaxEntryId(Long maxEntryId)
+    {
+        this.maxEntryId = maxEntryId;
+    }
+
+    public Long getMinEntryId()
+    {
+        return minEntryId;
+    }
+
+    public void setMinEntryId(Long minEntryId)
+    {
+        this.minEntryId = minEntryId;
+    }
+
+    public AuditApp()
+    {
+    }
+
+    public AuditApp(String id, String name, boolean isEnabled)
+    {
+    	this.id = id;
+        this.name = name;
+        this.isEnabled = isEnabled;
+    }
+
+    public String getId()
+    {
+		return id;
+	}
+
+    public void setId(String id)
+    {
+    	this.id = id;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    @JsonProperty(value="isEnabled")
+    public Boolean getIsEnabled()
+    {
+        return isEnabled;
+    }
+
+    @JsonProperty(value="isEnabled")
+    public void setIsEnabled(Boolean isEnabled)
+    {
+        this.isEnabled = isEnabled;
+    }
+
+	@Override
+	public String toString()
+    {
+		return "AuditApp [id=" + id + ", name= " + name + ", isEnabled=" + isEnabled + "]";
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/AuditEntry.java b/remote-api/src/main/java/org/alfresco/rest/api/model/AuditEntry.java
new file mode 100644
index 00000000000..b37734c4da4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/AuditEntry.java
@@ -0,0 +1,105 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Map;
+
+public class AuditEntry
+{
+
+    private Long id;
+    private String auditApplicationId;
+    protected UserInfo createdByUser;
+    protected Date createdAt;
+    protected Map<String, Serializable> values;
+
+    public AuditEntry()
+    {
+
+    }
+
+    public AuditEntry(Long id, String auditApplicationId, UserInfo createdByUser, Date createdAt, Map<String, Serializable> values2)
+    {
+        this.id = id;
+        this.auditApplicationId = auditApplicationId;
+        this.createdByUser = createdByUser;
+        this.createdAt = createdAt;
+        this.values = values2;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public String getAuditApplicationId()
+    {
+        return auditApplicationId;
+    }
+
+    public void setAuditApplicationId(String auditApplicationId)
+    {
+        this.auditApplicationId = auditApplicationId;
+    }
+
+    public UserInfo getCreatedByUser()
+    {
+        return createdByUser;
+    }
+
+    public void setCreatedByUser(UserInfo createdByUser)
+    {
+        this.createdByUser = createdByUser;
+    }
+
+    public Date getCreatedAt()
+    {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt)
+    {
+        this.createdAt = createdAt;
+    }
+
+    public Map<String, Serializable> getValues()
+    {
+        return values;
+    }
+
+    public void setValues(Map<String, Serializable> values)
+    {
+        this.values = values;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Client.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Client.java
new file mode 100644
index 00000000000..bf6dec8dda4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Client.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+/**
+ * Representation of a client app.
+ *
+ * @author Jamal Kaabi-Mofrad
+ * @since 5.2.1
+ */
+public class Client
+{
+    /**
+     * client app name. Used to lookup the client
+     * that is registered to send emails so that
+     * client's specific configuration could be used.
+     */
+    protected String client;
+
+    public String getClient()
+    {
+        return client;
+    }
+
+    public Client setClient(String client)
+    {
+        this.client = client;
+        return this;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "Client [ client=" + client + ']';
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Comment.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Comment.java
new file mode 100644
index 00000000000..4b48ced11c4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Comment.java
@@ -0,0 +1,178 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.rest.api.people.PeopleEntityResource;
+import org.alfresco.rest.framework.resource.EmbeddedEntityResource;
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * A representation of a Comment in the system.
+ *
+ * @author Gethin James
+ * @author steveglover
+ * 
+ */
+public class Comment
+{
+    public static final QName PROP_COMMENT_CONTENT = QName.createQName("RestApi", "commentContent");
+    public static final QName PROP_COMMENT_CREATED_BY = QName.createQName("RestApi", "createdBy");
+    public static final QName PROP_COMMENT_MODIFIED_BY = QName.createQName("RestApi", "modifiedBy");
+
+	private String id;
+    private String title;
+    private String content;
+    private Date createdAt;
+    private Person createdBy;
+    private Date modifiedAt;
+    private Person modifiedBy;
+    private Boolean edited;
+
+    // permissions
+    private boolean canEdit;
+    private boolean canDelete;
+    
+    public Comment()
+    {
+        super();
+    }
+
+    public Comment(String id, Map<QName, Serializable> nodeProps, boolean canEdit, boolean canDelete)
+    {
+    	if(id == null)
+    	{
+    		throw new IllegalArgumentException();
+    	}
+
+    	this.id = id;
+        mapProperties(nodeProps);
+        this.canEdit = canEdit;
+        this.canDelete = canDelete;
+    }
+
+    @UniqueId
+    public String getId()
+    {
+		return id;
+	}
+
+    public void setId(String id)
+    {
+    	this.id = id;
+    }
+    
+    public boolean getCanEdit()
+    {
+		return canEdit;
+	}
+
+	public boolean getCanDelete()
+	{
+		return canDelete;
+	}
+
+	public String getTitle()
+    {
+        return this.title;
+    }
+    
+    public String getContent()
+    {
+        return this.content;
+    }
+
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public Date getCreatedAt()
+    {
+		return createdAt;
+	}
+	
+	public Person getCreatedBy()
+	{
+		return createdBy;
+	}
+	
+    public Person getModifiedBy()
+    {
+		return modifiedBy;
+	}
+    
+	public Date getModifiedAt()
+	{
+		return modifiedAt;
+	}
+
+	public Boolean getEdited()
+    {
+		return edited;
+	}
+
+    protected void mapProperties(Map<QName, Serializable> nodeProps)
+    {
+		String propTitle = (String) nodeProps.get(ContentModel.PROP_TITLE);
+		if (propTitle != null)
+		{
+			title = propTitle;
+		}
+
+		this.modifiedAt = (Date)nodeProps.get(ContentModel.PROP_MODIFIED);
+		this.createdAt = (Date)nodeProps.get(ContentModel.PROP_CREATED);
+		if(modifiedAt != null && createdAt != null)
+		{
+			long diff = modifiedAt.getTime() - createdAt.getTime();
+			this.edited = Boolean.valueOf(diff >= 100); // logic is consistent with existing (Javascript) comments implementation
+		}
+		
+		this.content = (String)nodeProps.get(PROP_COMMENT_CONTENT);
+		nodeProps.remove(PROP_COMMENT_CONTENT);
+		
+		this.createdBy = (Person) nodeProps.get(PROP_COMMENT_CREATED_BY);
+		nodeProps.remove(PROP_COMMENT_CREATED_BY);
+
+		this.modifiedBy = (Person) nodeProps.get(PROP_COMMENT_MODIFIED_BY);
+		nodeProps.remove(PROP_COMMENT_MODIFIED_BY);
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Comment [id=" + id + ", title=" + title
+				+ ", content=" + content + ", createdAt=" + createdAt
+				+ ", createdBy=" + createdBy + ", modifiedAt=" + modifiedAt
+				+ ", modifiedBy=" + modifiedBy + ", edited=" + edited + "]";
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Company.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Company.java
new file mode 100644
index 00000000000..f3a8a2dfb01
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Company.java
@@ -0,0 +1,176 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.namespace.QName;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Represents a company
+ * 
+ * @author steveglover
+ *
+ */
+public class Company
+{
+	private String organization;
+	private String address1;
+	private String address2;
+	private String address3;
+	private String postcode;
+	private String telephone;
+	private String fax;
+	private String email;
+
+	private Map<QName, Boolean> setFields = new HashMap<>(7);
+
+	/**
+	 * Default constructor, required for deserialising from JSON.
+	 */
+	public Company()
+	{
+	}
+
+	public Company(String organization, String address1, String address2, String address3,
+			String postcode, String telephone, String fax, String email)
+	{
+		super();
+		setOrganization(organization);
+		setAddress1(address1);
+		setAddress2(address2);
+		setAddress3(address3);
+		setPostcode(postcode);
+		setTelephone(telephone);
+		setFax(fax);
+		setEmail(email);
+	}
+
+	public String getOrganization()
+	{
+		return organization;
+	}
+
+	public String getAddress1()
+	{
+		return address1;
+	}
+
+	public String getAddress2()
+	{
+		return address2;
+	}
+
+	public String getAddress3()
+	{
+		return address3;
+	}
+
+	public String getPostcode()
+	{
+		return postcode;
+	}
+
+	public String getTelephone()
+	{
+		return telephone;
+	}
+
+	public String getFax()
+	{
+		return fax;
+	}
+
+	public String getEmail()
+	{
+		return email;
+	}
+
+	public void setOrganization(String organization)
+	{
+		this.organization = organization;
+		setFields.put(ContentModel.PROP_ORGANIZATION, true);
+	}
+
+	public void setAddress1(String address1)
+	{
+		this.address1 = address1;
+		setFields.put(ContentModel.PROP_COMPANYADDRESS1, true);
+	}
+
+	public void setAddress2(String address2)
+	{
+		this.address2 = address2;
+		setFields.put(ContentModel.PROP_COMPANYADDRESS2, true);
+	}
+
+	public void setAddress3(String address3)
+	{
+		this.address3 = address3;
+		setFields.put(ContentModel.PROP_COMPANYADDRESS3, true);
+	}
+
+	public void setPostcode(String postcode)
+	{
+		this.postcode = postcode;
+		setFields.put(ContentModel.PROP_COMPANYPOSTCODE, true);
+	}
+
+	public void setTelephone(String telephone)
+	{
+		this.telephone = telephone;
+		setFields.put(ContentModel.PROP_COMPANYTELEPHONE, true);
+	}
+
+	public void setFax(String fax)
+	{
+		this.fax = fax;
+		setFields.put(ContentModel.PROP_COMPANYFAX, true);
+	}
+
+	public void setEmail(String email)
+	{
+		this.email = email;
+		setFields.put(ContentModel.PROP_COMPANYEMAIL, true);
+	}
+
+	public boolean wasSet(QName fieldName)
+	{
+		Boolean b = setFields.get(fieldName);
+		return (b != null ? b : false);
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Company [address1=" + address1 + ", address2=" + address2
+				+ ", address3=" + address3 + ", postcode=" + postcode
+				+ ", telephone=" + telephone + ", fax=" + fax + ", email="
+				+ email + "]";
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/ContentInfo.java b/remote-api/src/main/java/org/alfresco/rest/api/model/ContentInfo.java
new file mode 100644
index 00000000000..348b164cb41
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/ContentInfo.java
@@ -0,0 +1,79 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+/**
+ * Representation of content info
+ *
+ * @author janv
+ *
+ */
+public class ContentInfo
+{
+	private String mimeType;
+    private String mimeTypeName;
+	private Long sizeInBytes;
+	private String encoding;
+
+	public ContentInfo()
+	{
+	}
+
+	public ContentInfo(String mimeType, String mimeTypeName, Long sizeInBytes, String encoding)
+	{
+		this.mimeType = mimeType;
+		this.mimeTypeName = mimeTypeName;
+		this.sizeInBytes = sizeInBytes;
+		this.encoding = encoding;
+	}
+
+    public String getMimeType() {
+        return mimeType;
+    }
+
+	public void setMimeType(String mimeType) {
+		this.mimeType = mimeType;
+	}
+
+    public String getMimeTypeName() {
+        return mimeTypeName;
+    }
+
+    public Long getSizeInBytes() {
+        return sizeInBytes;
+    }
+
+    public String getEncoding() {
+        return encoding;
+    }
+
+    @Override
+	public String toString()
+	{
+		return "ContentInfo [mimeType=" + mimeType + ", mimeTypeName=" + mimeTypeName
+				+ ", encoding=" + encoding + ", sizeInBytes=" + sizeInBytes + "]";
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/CustomAspect.java b/remote-api/src/main/java/org/alfresco/rest/api/model/CustomAspect.java
new file mode 100644
index 00000000000..6715f109d1c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/CustomAspect.java
@@ -0,0 +1,67 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+import java.util.List;
+
+import org.alfresco.service.cmr.dictionary.AspectDefinition;
+import org.alfresco.service.cmr.i18n.MessageLookup;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class CustomAspect extends AbstractClassModel
+{
+
+    public CustomAspect()
+    {
+    }
+
+    public CustomAspect(AspectDefinition aspectDefinition, MessageLookup messageLookup, List<CustomModelProperty> properties)
+    {
+        this.name = aspectDefinition.getName().getLocalName();
+        this.prefixedName = aspectDefinition.getName().toPrefixString();
+        this.title = aspectDefinition.getTitle(messageLookup);
+        this.description = aspectDefinition.getDescription(messageLookup);
+        this.parentName = getParentNameAsString(aspectDefinition.getParentName());
+        this.properties = setList(properties);
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder(512);
+        builder.append("CustomAspect [name=").append(this.name)
+                    .append(", prefixedName=").append(this.prefixedName)
+                    .append(", title=").append(this.title)
+                    .append(", description=").append(this.description)
+                    .append(", parentName=").append(parentName)
+                    .append(", properties=").append(properties)
+                    .append(']');
+        return builder.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModel.java b/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModel.java
new file mode 100644
index 00000000000..64c128bc455
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModel.java
@@ -0,0 +1,224 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+import java.util.List;
+
+import org.alfresco.service.cmr.dictionary.CustomModelDefinition;
+import org.alfresco.service.cmr.dictionary.NamespaceDefinition;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class CustomModel implements Comparable<CustomModel>
+{
+    public static enum ModelStatus
+    {
+        ACTIVE, DRAFT
+    }
+
+    private String name;
+    private String author;
+    private String description;
+    private ModelStatus status;
+    private String namespaceUri;
+    private String namespacePrefix;
+    private List<CustomType> types;
+    private List<CustomAspect> aspects;
+    private List<CustomModelConstraint> constraints;
+
+    public CustomModel()
+    {
+    }
+
+    public CustomModel(CustomModelDefinition modelDefinition)
+    {
+        this(modelDefinition, null, null, null);
+    }
+
+    public CustomModel(CustomModelDefinition modelDefinition, List<CustomType> types, List<CustomAspect> aspects, List<CustomModelConstraint> constraints)
+    {
+        this.name = modelDefinition.getName().getLocalName();
+        this.author = modelDefinition.getAuthor();
+        this.description = modelDefinition.getDescription();
+        this.status = modelDefinition.isActive() ? ModelStatus.ACTIVE : ModelStatus.DRAFT;
+        // we don't need to check for NoSuchElementException, as we don't allow
+        // the model to be saved without a valid namespace
+        NamespaceDefinition nsd = modelDefinition.getNamespaces().iterator().next();
+        this.namespaceUri = nsd.getUri();
+        this.namespacePrefix = nsd.getPrefix();
+        this.types = types;
+        this.aspects = aspects;
+        this.constraints = constraints;
+    }
+
+    public String getName()
+    {
+        return this.name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getAuthor()
+    {
+        return this.author;
+    }
+
+    public void setAuthor(String author)
+    {
+        this.author = author;
+    }
+
+    public String getDescription()
+    {
+        return this.description;
+    }
+
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    public ModelStatus getStatus()
+    {
+        return this.status;
+    }
+
+    public void setStatus(ModelStatus status)
+    {
+        this.status = status;
+    }
+
+    public String getNamespaceUri()
+    {
+        return this.namespaceUri;
+    }
+
+    public void setNamespaceUri(String namespaceUri)
+    {
+        this.namespaceUri = namespaceUri;
+    }
+
+    public String getNamespacePrefix()
+    {
+        return this.namespacePrefix;
+    }
+
+    public void setNamespacePrefix(String namespacePrefix)
+    {
+        this.namespacePrefix = namespacePrefix;
+    }
+
+    public List<CustomType> getTypes()
+    {
+        return this.types;
+    }
+
+    public void setTypes(List<CustomType> types)
+    {
+        this.types = types;
+    }
+
+    public List<CustomAspect> getAspects()
+    {
+        return this.aspects;
+    }
+
+    public void setAspects(List<CustomAspect> aspects)
+    {
+        this.aspects = aspects;
+    }
+
+    public List<CustomModelConstraint> getConstraints()
+    {
+        return this.constraints;
+    }
+
+    public void setConstraints(List<CustomModelConstraint> constraints)
+    {
+        this.constraints = constraints;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((this.name == null) ? 0 : this.name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+        if (obj == null)
+        {
+            return false;
+        }
+        if (!(obj instanceof CustomModel))
+        {
+            return false;
+        }
+        CustomModel other = (CustomModel) obj;
+        if (this.name == null)
+        {
+            if (other.name != null)
+            {
+                return false;
+            }
+        }
+        else if (!this.name.equals(other.name))
+        {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int compareTo(CustomModel customModel)
+    {
+        return this.name.compareTo(customModel.getName());
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder(512);
+        builder.append("CustomModel [name=").append(this.name).append(", author=").append(this.author)
+                    .append(", description=").append(this.description).append(", status=").append(this.status)
+                    .append(", namespaceUri=").append(this.namespaceUri).append(", namespacePrefix=")
+                    .append(this.namespacePrefix).append(']');
+        return builder.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModelConstraint.java b/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModelConstraint.java
new file mode 100644
index 00000000000..30beb8f1291
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModelConstraint.java
@@ -0,0 +1,104 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
+import org.alfresco.service.cmr.i18n.MessageLookup;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class CustomModelConstraint extends AbstractCommonDetails
+{
+    private String type;
+    private List<CustomModelNamedValue> parameters = Collections.emptyList();
+
+    public CustomModelConstraint()
+    {
+    }
+
+    public CustomModelConstraint(ConstraintDefinition constraintDefinition, MessageLookup messageLookup)
+    {
+        this.name = constraintDefinition.getName().getLocalName();
+        this.prefixedName = constraintDefinition.getConstraint().getShortName();
+        this.type = constraintDefinition.getConstraint().getType();
+        this.title = constraintDefinition.getTitle(messageLookup);
+        this.description = constraintDefinition.getDescription(messageLookup);
+        this.parameters = convertToNamedValue(constraintDefinition.getConstraint().getParameters());
+    }
+
+    private List<CustomModelNamedValue> convertToNamedValue(Map<String, Object> params)
+    {
+        List<CustomModelNamedValue> list = new ArrayList<>(params.size());
+        for (Entry<String, Object> en : params.entrySet())
+        {
+            list.add(new CustomModelNamedValue(en.getKey(), en.getValue()));
+        }
+
+        return list;
+    }
+
+    public String getType()
+    {
+        return this.type;
+    }
+
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+
+    public List<CustomModelNamedValue> getParameters()
+    {
+        return this.parameters;
+    }
+
+    public void setParameters(List<CustomModelNamedValue> parameters)
+    {
+        this.parameters = parameters;
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder(300);
+        builder.append("CustomModelConstraint [name=").append(this.name)
+                    .append(", prefixedName=").append(this.prefixedName)
+                    .append(", type=").append(this.type)
+                    .append(", title=").append(this.title)
+                    .append(", description=").append(this.description)
+                    .append(", parameters=").append(this.parameters)
+                    .append(']');
+        return builder.toString();
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModelDownload.java b/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModelDownload.java
new file mode 100644
index 00000000000..01b1c623643
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModelDownload.java
@@ -0,0 +1,101 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class CustomModelDownload implements Comparable<CustomModelDownload>
+{
+    private String nodeRef;
+
+    public CustomModelDownload()
+    {
+    }
+
+    public CustomModelDownload(NodeRef nodeRef)
+    {
+        this.nodeRef = nodeRef.toString();
+    }
+
+    public String getNodeRef()
+    {
+        return this.nodeRef;
+    }
+
+    public void setNodeRef(String nodeRef)
+    {
+        this.nodeRef = nodeRef;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((this.nodeRef == null) ? 0 : this.nodeRef.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+        if (obj == null)
+        {
+            return false;
+        }
+        if (!(obj instanceof CustomModelDownload))
+        {
+            return false;
+        }
+        CustomModelDownload other = (CustomModelDownload) obj;
+        if (this.nodeRef == null)
+        {
+            if (other.nodeRef != null)
+            {
+                return false;
+            }
+        }
+        else if (!this.nodeRef.equals(other.nodeRef))
+        {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int compareTo(CustomModelDownload other)
+    {
+        return this.nodeRef.toString().compareTo(other.getNodeRef().toString());
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModelNamedValue.java b/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModelNamedValue.java
new file mode 100644
index 00000000000..97e91573ce6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModelNamedValue.java
@@ -0,0 +1,166 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.repository.datatype.TypeConversionException;
+
+/**
+ *
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class CustomModelNamedValue implements Comparable<CustomModelNamedValue>
+{
+    private String name;
+    private String simpleValue = null;
+    private List<String> listValue = null;
+
+    public CustomModelNamedValue()
+    {
+    }
+
+    public CustomModelNamedValue(String name, Object value)
+    {
+        this.name = name;
+        if (value instanceof List<?>)
+        {
+            List<?> values = (List<?>) value;
+            listValue = new ArrayList<>(values.size());
+            for(Object val : values)
+            {
+                listValue.add(convertToString(val));
+            }
+        }
+        else
+        {
+            simpleValue = convertToString(value);
+        }
+    }
+
+    private String convertToString(Object value)
+    {
+        try
+        {
+            return DefaultTypeConverter.INSTANCE.convert(String.class, value);
+        }
+        catch (TypeConversionException e)
+        {
+            throw new InvalidArgumentException("Cannot convert to string '" + value + "'.");
+        }
+    }
+
+    public String getName()
+    {
+        return this.name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getSimpleValue()
+    {
+        return this.simpleValue;
+    }
+
+    public void setSimpleValue(String simpleValue)
+    {
+        this.simpleValue = simpleValue;
+    }
+
+    public List<String> getListValue()
+    {
+        return this.listValue;
+    }
+
+    public void setListValue(List<String> listValue)
+    {
+        this.listValue = listValue;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((this.name == null) ? 0 : this.name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+        if (obj == null)
+        {
+            return false;
+        }
+        if (!(obj instanceof CustomModelNamedValue))
+        {
+            return false;
+        }
+        CustomModelNamedValue other = (CustomModelNamedValue) obj;
+        if (this.name == null)
+        {
+            if (other.name != null)
+            {
+                return false;
+            }
+        }
+        else if (!this.name.equals(other.name))
+        {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int compareTo(CustomModelNamedValue other)
+    {
+        return name.compareTo(other.getName());
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder(120);
+        builder.append("CustomModelNamedValue [name=").append(this.name)
+                    .append(", simpleValue=").append(this.simpleValue)
+                    .append(", listValue=").append(this.listValue)
+                    .append(']');
+        return builder.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModelProperty.java b/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModelProperty.java
new file mode 100644
index 00000000000..1a4450a7825
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/CustomModelProperty.java
@@ -0,0 +1,213 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.alfresco.repo.dictionary.Facetable;
+import org.alfresco.repo.dictionary.IndexTokenisationMode;
+import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.i18n.MessageLookup;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class CustomModelProperty extends AbstractCommonDetails
+{
+    private String dataType;
+    private boolean isMandatory;
+    private boolean isMandatoryEnforced;
+    private boolean isMultiValued;
+    private String defaultValue;
+    private boolean isIndexed = true;
+    private Facetable facetable = Facetable.UNSET;
+    private IndexTokenisationMode indexTokenisationMode;
+    private List<String> constraintRefs = Collections.emptyList();
+    private List<CustomModelConstraint> constraints = Collections.emptyList();
+
+    public CustomModelProperty()
+    {
+    }
+
+    public CustomModelProperty(PropertyDefinition propertyDefinition, MessageLookup messageLookup)
+    {
+        this.name = propertyDefinition.getName().getLocalName();
+        this.prefixedName = propertyDefinition.getName().toPrefixString();
+        this.title = propertyDefinition.getTitle(messageLookup);
+        this.dataType = propertyDefinition.getDataType().getName().toPrefixString();
+        this.description = propertyDefinition.getDescription(messageLookup);
+        this.isMandatory = propertyDefinition.isMandatory();
+        this.isMandatoryEnforced = propertyDefinition.isMandatoryEnforced();
+        this.isMultiValued = propertyDefinition.isMultiValued();
+        this.defaultValue = propertyDefinition.getDefaultValue();
+        this.isIndexed = propertyDefinition.isIndexed();
+        this.facetable = propertyDefinition.getFacetable();
+        this.indexTokenisationMode = propertyDefinition.getIndexTokenisationMode();
+        List<ConstraintDefinition> constraintDefs = propertyDefinition.getConstraints();
+        if (constraintDefs.size() > 0)
+        {
+            this.constraintRefs = new ArrayList<>();
+            this.constraints = new ArrayList<>();
+            for (ConstraintDefinition cd : constraintDefs)
+            {
+                if (cd.getRef() != null)
+                {
+                    constraintRefs.add(cd.getRef().toPrefixString());
+                }
+                else
+                {
+                    constraints.add(new CustomModelConstraint(cd, messageLookup));
+                }
+            }
+        }
+    }
+
+    public String getDataType()
+    {
+        return this.dataType;
+    }
+
+    public void setDataType(String dataType)
+    {
+        this.dataType = dataType;
+    }
+
+    public boolean isMandatory()
+    {
+        return this.isMandatory;
+    }
+
+    public void setMandatory(boolean isMandatory)
+    {
+        this.isMandatory = isMandatory;
+    }
+
+    public boolean isMandatoryEnforced()
+    {
+        return this.isMandatoryEnforced;
+    }
+
+    public void setMandatoryEnforced(boolean isMandatoryEnforced)
+    {
+        this.isMandatoryEnforced = isMandatoryEnforced;
+    }
+
+    public boolean isMultiValued()
+    {
+        return this.isMultiValued;
+    }
+
+    public void setMultiValued(boolean isMultiValued)
+    {
+        this.isMultiValued = isMultiValued;
+    }
+
+    public String getDefaultValue()
+    {
+        return this.defaultValue;
+    }
+
+    public void setDefaultValue(String defaultValue)
+    {
+        this.defaultValue = defaultValue;
+    }
+
+    public boolean isIndexed()
+    {
+        return this.isIndexed;
+    }
+
+    public void setIndexed(boolean isIndexed)
+    {
+        this.isIndexed = isIndexed;
+    }
+
+    public Facetable getFacetable()
+    {
+        return this.facetable;
+    }
+
+    public void setFacetable(Facetable facetable)
+    {
+        this.facetable = facetable;
+    }
+
+    public IndexTokenisationMode getIndexTokenisationMode()
+    {
+        return this.indexTokenisationMode;
+    }
+
+    public void setIndexTokenisationMode(IndexTokenisationMode indexTokenisationMode)
+    {
+        this.indexTokenisationMode = indexTokenisationMode;
+    }
+
+    public List<String> getConstraintRefs()
+    {
+        return this.constraintRefs;
+    }
+
+    public void setConstraintRefs(List<String> constraintRefs)
+    {
+        this.constraintRefs = constraintRefs;
+    }
+
+    public List<CustomModelConstraint> getConstraints()
+    {
+        return this.constraints;
+    }
+
+    public void setConstraints(List<CustomModelConstraint> constraints)
+    {
+        this.constraints = constraints;
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder(612);
+        builder.append("CustomModelProperty [name=").append(this.name)
+                    .append(", prefixedName=").append(this.prefixedName)
+                    .append(", title=").append(this.title)
+                    .append(", description=").append(this.description)
+                    .append(", dataType=").append(this.dataType)
+                    .append(", isMandatory=").append(this.isMandatory)
+                    .append(", isMandatoryEnforced=").append(this.isMandatoryEnforced)
+                    .append(", isMultiValued=").append(this.isMultiValued)
+                    .append(", defaultValue=").append(this.defaultValue)
+                    .append(", isIndexed=").append(this.isIndexed)
+                    .append(", facetable=").append(this.facetable)
+                    .append(", indexTokenisationMode=").append(this.indexTokenisationMode)
+                    .append(", constraintRefs=").append(this.constraintRefs)
+                    .append(", constraints=").append(this.constraints)
+                    .append(']');
+        return builder.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/CustomType.java b/remote-api/src/main/java/org/alfresco/rest/api/model/CustomType.java
new file mode 100644
index 00000000000..bfaf5dc585d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/CustomType.java
@@ -0,0 +1,67 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+import java.util.List;
+
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.i18n.MessageLookup;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class CustomType extends AbstractClassModel
+{
+
+    public CustomType()
+    {
+    }
+
+    public CustomType(TypeDefinition typeDefinition, MessageLookup messageLookup, List<CustomModelProperty> properties)
+    {
+        this.name = typeDefinition.getName().getLocalName();
+        this.prefixedName = typeDefinition.getName().toPrefixString();
+        this.title = typeDefinition.getTitle(messageLookup);
+        this.description = typeDefinition.getDescription(messageLookup);
+        this.parentName = getParentNameAsString(typeDefinition.getParentName());
+        this.properties = setList(properties);
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder(512);
+        builder.append("CustomType [name=").append(this.name)
+                    .append(", prefixedName=").append(this.prefixedName)
+                    .append(", title=").append(this.title)
+                    .append(", description=").append(this.description)
+                    .append(", parentName=").append(parentName)
+                    .append(", properties=").append(properties)
+                    .append(']');
+        return builder.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/DirectAccessUrlRequest.java b/remote-api/src/main/java/org/alfresco/rest/api/model/DirectAccessUrlRequest.java
new file mode 100644
index 00000000000..ff25083d7a5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/DirectAccessUrlRequest.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.Date;
+
+public class DirectAccessUrlRequest
+{
+    private Date expiresAt;
+    private Long validFor;
+
+    public DirectAccessUrlRequest()
+    {
+    }
+
+    public Date getExpiresAt()
+    {
+        return expiresAt;
+    }
+
+    public void setExpiresAt(Date expiresAt)
+    {
+        this.expiresAt = expiresAt;
+    }
+
+    public Long getValidFor()
+    {
+        return validFor;
+    }
+
+    public void setValidFor(Long validFor)
+    {
+        this.validFor = validFor;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/DiscoveryDetails.java b/remote-api/src/main/java/org/alfresco/rest/api/model/DiscoveryDetails.java
new file mode 100644
index 00000000000..e88b8f872ce
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/DiscoveryDetails.java
@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+/**
+ * Representation of the discovery information
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class DiscoveryDetails
+{
+    private RepositoryInfo repository;
+
+    public DiscoveryDetails()
+    {
+    }
+
+    public DiscoveryDetails(RepositoryInfo repository)
+    {
+        this.repository = repository;
+    }
+
+    public RepositoryInfo getRepository()
+    {
+        return repository;
+    }
+
+    public DiscoveryDetails setRepository(RepositoryInfo repository)
+    {
+        this.repository = repository;
+        return this;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder();
+        sb.append("DiscoveryDetails [repository=").append(repository)
+                    .append(']');
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Document.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Document.java
new file mode 100644
index 00000000000..98eeb52276a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Document.java
@@ -0,0 +1,143 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Representation of a document node.
+ * 
+ * @author steveglover
+ * @author janv
+ *
+ */
+public class Document extends Node
+{
+    public Document() {
+        super();
+    }
+
+    public Document(NodeRef nodeRef, NodeRef parentNodeRef, Map<QName, Serializable> nodeProps, Map<String, UserInfo> mapUserInfo, ServiceRegistry sr)
+    {
+        super(nodeRef, parentNodeRef, nodeProps, mapUserInfo, sr);
+
+        Serializable val = nodeProps.get(ContentModel.PROP_CONTENT);
+
+        if ((val != null) && (val instanceof ContentData)) {
+            ContentData cd = (ContentData)val;
+            String mimeType = cd.getMimetype();
+            String mimeTypeName = sr.getMimetypeService().getDisplaysByMimetype().get(mimeType);
+            contentInfo = new ContentInfo(mimeType, mimeTypeName, cd.getSize(), cd.getEncoding());
+        }
+
+        setIsFolder(false);
+        setIsFile(true);
+    }
+
+    @Override
+    public ContentInfo getContent()
+    {
+        return contentInfo;
+    }
+
+    @Override
+    public void setContent(ContentInfo contentInfoIn)
+    {
+        contentInfo = contentInfoIn;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "Document [contentInfo=" + contentInfo.toString() + ", nodeRef="
+                    + nodeRef + ", name=" + name + ", createdAt=" + createdAt
+                    + ", modifiedAt=" + modifiedAt + ", createdBy=" + createdBy
+                    + ", modifiedBy=" + modifiedBy + "]";
+    }
+
+    // TODO for backwards compat' - set explicitly when needed (ie. favourites)
+    private String mimeType;
+    private BigInteger sizeInBytes;
+    private String versionLabel;
+
+    /**
+     * @deprecated
+     */
+    public String getMimeType()
+    {
+        return mimeType;
+    }
+
+    /**
+     * @deprecated
+     */
+    public BigInteger getSizeInBytes()
+    {
+        return sizeInBytes;
+    }
+
+    /**
+     * @deprecated
+     */
+    public String getVersionLabel()
+    {
+        return versionLabel;
+    }
+
+    /**
+     * @deprecated
+     */
+    public void setMimeType(String mimeType)
+    {
+        this.mimeType = mimeType;
+    }
+
+    /**
+     * @deprecated
+     */
+    public void setSizeInBytes(BigInteger sizeInBytes)
+    {
+        this.sizeInBytes = sizeInBytes;
+    }
+
+    /**
+     * @deprecated
+     */
+    public void setVersionLabel(String versionLabel)
+    {
+        this.versionLabel = versionLabel;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/DocumentRatingSummary.java b/remote-api/src/main/java/org/alfresco/rest/api/model/DocumentRatingSummary.java
new file mode 100644
index 00000000000..09ee217bfce
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/DocumentRatingSummary.java
@@ -0,0 +1,30 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+public interface DocumentRatingSummary
+{
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/DocumentTarget.java b/remote-api/src/main/java/org/alfresco/rest/api/model/DocumentTarget.java
new file mode 100644
index 00000000000..261c5b8e41d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/DocumentTarget.java
@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+/**
+ * A document target favourite.
+ * 
+ * @author steveglover
+ *
+ */
+public class DocumentTarget extends Target
+{
+	private Document file;
+
+	public DocumentTarget()
+	{
+		super();
+	}
+
+	public DocumentTarget(Document file)
+	{
+		super();
+		this.file = file;
+	}
+
+	public void setDocument(Document file)
+	{
+		this.file = file;
+	}
+
+	public Document getFile()
+	{
+		return file;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "DocumentTarget [file=" + file + "]";
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Download.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Download.java
new file mode 100644
index 00000000000..498ccaac61d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Download.java
@@ -0,0 +1,132 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+import java.util.List;
+
+import org.alfresco.service.cmr.download.DownloadStatus;
+
+/**
+ * Represents a download entity
+ *
+ */
+public class Download
+{
+    private String id;
+    private List<String> nodeIds;
+    private DownloadStatus.Status status;
+    private long bytesAdded;
+    private long totalBytes;
+    private long filesAdded;
+    private long totalFiles;
+    
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public List<String> getNodeIds()
+    {
+        return nodeIds;
+    }
+
+    public void setNodeIds(List<String> nodeIds)
+    {
+        this.nodeIds = nodeIds;
+    }
+
+    public DownloadStatus.Status getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(DownloadStatus.Status status)
+    {
+        this.status = status;
+    }
+
+    public long getBytesAdded()
+    {
+        return bytesAdded;
+    }
+
+    public void setBytesAdded(long bytesAdded)
+    {
+        this.bytesAdded = bytesAdded;
+    }
+
+    public long getTotalBytes()
+    {
+        return totalBytes;
+    }
+
+    public void setTotalBytes(long totalBytes)
+    {
+        this.totalBytes = totalBytes;
+    }
+
+    public long getFilesAdded()
+    {
+        return filesAdded;
+    }
+
+    public void setFilesAdded(long filesAdded)
+    {
+        this.filesAdded = filesAdded;
+    }
+
+    public long getTotalFiles()
+    {
+        return totalFiles;
+    }
+
+    public void setTotalFiles(long totalFiles)
+    {
+        this.totalFiles = totalFiles;
+    }
+
+
+    @Override
+    public String toString()
+    {        
+        StringBuilder builder = new StringBuilder(150);
+        builder.append("Download [id=").append(id)
+               .append(", nodeIds=").append(nodeIds)
+               .append(", status=").append(status)
+               .append(", bytesAdded=").append(bytesAdded)
+               .append(", totalBytes=").append(totalBytes)
+               .append(", filesAdded=").append(filesAdded)
+               .append(", totalFiles=").append(totalFiles)
+               .append("]");
+        return builder.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Favourite.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Favourite.java
new file mode 100644
index 00000000000..a148f4fc051
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Favourite.java
@@ -0,0 +1,93 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.Date;
+import java.util.Map;
+
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Representation of a favourite (document, folder, site, ...).
+ * 
+ * @author steveglover
+ *
+ */
+public class Favourite
+{
+	private String targetGuid;
+	private Date createdAt;
+	private Target target;
+	private Map<String, Object> properties;
+
+	public Date getCreatedAt()
+	{
+		return createdAt;
+	}
+
+	public void setCreatedAt(Date createdAt)
+	{
+		this.createdAt = createdAt;
+	}
+
+	@UniqueId(name="targetGuid")
+	public String getTargetGuid()
+	{
+		return targetGuid;
+	}
+	
+	public void setTargetGuid(String targetGuid)
+	{
+	    this.targetGuid = targetGuid;
+	}
+	
+	public Target getTarget()
+	{
+		return target;
+	}
+
+	public void setTarget(Target target)
+	{
+		this.target = target;
+	}
+
+	public Map<String, Object> getProperties()
+	{
+		return properties;
+	}
+
+	public void setProperties(Map<String, Object> properties)
+	{
+		this.properties = properties;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Favourite [targetGuid=" + targetGuid
+				+ ", createdAt=" + createdAt + ", target=" + target + ", properties=" + properties + "]";
+	}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/FavouriteSite.java b/remote-api/src/main/java/org/alfresco/rest/api/model/FavouriteSite.java
new file mode 100644
index 00000000000..2a0d43c6682
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/FavouriteSite.java
@@ -0,0 +1,56 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import org.alfresco.service.cmr.site.SiteInfo;
+
+/**
+ * Represents a user's favourite site.
+ * 
+ * Represented by a separate class in order to allow other attributes to be added.
+ * 
+ * @author steveglover
+ *
+ */
+public class FavouriteSite extends Site
+{
+	public FavouriteSite()
+	{
+	}
+	
+	public FavouriteSite(SiteInfo siteInfo, String role)
+	{
+		super(siteInfo, role);
+	}
+
+	@Override
+	public String toString()
+	{
+		return "FavouriteSite [id=" + id + ", guid=" + guid + ", title="
+				+ title + ", description=" + description + ", visibility="
+				+ visibility + ", role=" + role + "]";
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/FiveStarRatingSummary.java b/remote-api/src/main/java/org/alfresco/rest/api/model/FiveStarRatingSummary.java
new file mode 100644
index 00000000000..c1663c3be69
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/FiveStarRatingSummary.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+public class FiveStarRatingSummary implements DocumentRatingSummary
+{
+	private Integer numberOfRatings;
+	private Float average;
+
+	public FiveStarRatingSummary(Integer numberOfRatings, Float ratingTotal, Float average)
+	{
+		super();
+		this.numberOfRatings = numberOfRatings;
+		this.average = (average == -1 ? null : average);
+	}
+
+	public Integer getNumberOfRatings()
+	{
+		return numberOfRatings;
+	}
+
+	public Float getAverage()
+	{
+		return average;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "FiveStarRatingSummary [numberOfRatings=" + numberOfRatings
+				+ ", average=" + average + "]";
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Folder.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Folder.java
new file mode 100644
index 00000000000..82f6b203b3d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Folder.java
@@ -0,0 +1,76 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Representation of a folder node.
+ * 
+ * @author steveglover
+ * @author janv
+ */
+public class Folder extends Node
+{
+    public Folder()
+    {
+        super();
+    }
+
+    public Folder(NodeRef nodeRef, NodeRef parentNodeRef, Map<QName, Serializable> nodeProps, Map<String, UserInfo> mapUserInfo, ServiceRegistry sr)
+    {
+        super(nodeRef, parentNodeRef, nodeProps, mapUserInfo, sr);
+
+        setIsFolder(true);
+        setIsFile(false);
+    }
+
+    @Override
+    public ContentInfo getContent()
+    {
+        return null;
+    }
+
+    @Override
+    public void setContent(ContentInfo contentInfo)
+    {
+    }
+
+    @Override
+    public String toString()
+    {
+        return "Folder [nodeRef=" + nodeRef + ", name=" + name + ", title="
+                    + title + ", description=" + description + ", createdAt="
+                    + createdAt + ", modifiedAt=" + modifiedAt + ", createdBy="
+                    + createdBy + ", modifiedBy=" + modifiedBy + "]";
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/FolderTarget.java b/remote-api/src/main/java/org/alfresco/rest/api/model/FolderTarget.java
new file mode 100644
index 00000000000..6a61696388f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/FolderTarget.java
@@ -0,0 +1,64 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+/**
+ * A folder target favourite.
+ * 
+ * @author steveglover
+ *
+ */
+public class FolderTarget extends Target
+{
+	private Folder folder;
+
+	public FolderTarget()
+	{
+		super();
+	}
+
+	public FolderTarget(Folder folder)
+	{
+		super();
+		this.folder = folder;
+	}
+
+	public void setFolder(Folder folder)
+	{
+		this.folder = folder;
+	}
+
+	public Folder getFolder()
+	{
+		return folder;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "FolderTarget [folder=" + folder + "]";
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Group.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Group.java
new file mode 100644
index 00000000000..6ef826229cf
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Group.java
@@ -0,0 +1,165 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Represents a group.
+ * 
+ * @author cturlica
+ *
+ */
+public class Group implements Comparable<Group>
+{
+
+    protected String id; // group id (aka authority name)
+    protected String displayName;
+    protected Boolean isRoot;
+    protected Set<String> parentIds;
+    protected Set<String> zones;
+
+    private Map<String, Boolean> setFields = new HashMap<>(7);
+
+    public static final String ID = "id";
+    public static final String DISPLAY_NAME = "displayName";
+    public static final String IS_ROOT = "isRoot";
+    public static final String PARENT_IDS = "parentIds";
+    public static final String ZONES = "zones";
+
+    public Group()
+    {
+    }
+
+    @UniqueId
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+        setFields.put(ID, true);
+    }
+
+    public String getDisplayName()
+    {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName)
+    {
+        this.displayName = displayName;
+        setFields.put(DISPLAY_NAME, true);
+    }
+
+    public Boolean getIsRoot()
+    {
+        return isRoot;
+    }
+
+    public void setIsRoot(Boolean isRoot)
+    {
+        this.isRoot = isRoot;
+        setFields.put(IS_ROOT, true);
+    }
+
+    public Set<String> getParentIds()
+    {
+        return parentIds;
+    }
+
+    public void setParentIds(Set<String> parentIds)
+    {
+        this.parentIds = parentIds;
+        setFields.put(PARENT_IDS, true);
+    }
+
+    public Set<String> getZones()
+    {
+        return zones;
+    }
+
+    public void setZones(Set<String> zones)
+    {
+        this.zones = zones;
+        setFields.put(ZONES, true);
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+
+        if (obj == null)
+        {
+            return false;
+        }
+
+        if (getClass() != obj.getClass())
+        {
+            return false;
+        }
+
+        Group other = (Group) obj;
+        return id.equals(other.id);
+    }
+
+    @Override
+    public int compareTo(Group group)
+    {
+        return id.compareTo(group.getId());
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "Group [id=" + id + ", displayName=" + displayName + ", isRoot=" + isRoot + "]";
+    }
+
+    public boolean wasSet(String fieldName)
+    {
+        Boolean b = setFields.get(fieldName);
+        return (b != null ? b : false);
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/GroupMember.java b/remote-api/src/main/java/org/alfresco/rest/api/model/GroupMember.java
new file mode 100644
index 00000000000..b3931d5591d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/GroupMember.java
@@ -0,0 +1,116 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Represents a group member.
+ * 
+ * @author cturlica
+ *
+ */
+public class GroupMember implements Comparable<GroupMember>
+{
+
+    private String id; // group id (aka authority name)
+    private String displayName;
+    private String memberType;
+
+    @UniqueId
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getDisplayName()
+    {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName)
+    {
+        this.displayName = displayName;
+    }
+
+    public String getMemberType()
+    {
+        return memberType;
+    }
+
+    public void setMemberType(String memberType)
+    {
+        this.memberType = memberType;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+
+        if (obj == null)
+        {
+            return false;
+        }
+
+        if (getClass() != obj.getClass())
+        {
+            return false;
+        }
+
+        GroupMember other = (GroupMember) obj;
+        return id.equals(other.id);
+    }
+
+    @Override
+    public int compareTo(GroupMember group)
+    {
+        return id.compareTo(group.getId());
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "GroupMember [id=" + id + ", displayName=" + displayName + ", memberType=" + memberType + "]";
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/LikesRatingSummary.java b/remote-api/src/main/java/org/alfresco/rest/api/model/LikesRatingSummary.java
new file mode 100644
index 00000000000..efecd1cb4a3
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/LikesRatingSummary.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+public class LikesRatingSummary implements DocumentRatingSummary
+{
+	private Integer numberOfRatings;
+
+	public LikesRatingSummary(Integer numberOfRatings)
+	{
+		super();
+		this.numberOfRatings = numberOfRatings;
+	}
+
+	public Integer getNumberOfRatings()
+	{
+		return numberOfRatings;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "LikesRatingSummary [numberOfRatings=" + numberOfRatings + "]";
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/LockInfo.java b/remote-api/src/main/java/org/alfresco/rest/api/model/LockInfo.java
new file mode 100644
index 00000000000..46c4c0b3be7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/LockInfo.java
@@ -0,0 +1,116 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.alfresco.repo.lock.mem.Lifetime;
+import org.alfresco.service.cmr.lock.LockType;
+
+/**
+ * Representation of a lock info
+ *
+ * @author Ancuta Morarasu
+ */
+@JsonIgnoreProperties({"mappedType"})
+public class LockInfo
+{
+    private Integer timeToExpire;
+    private LockType2 type;
+    private Lifetime lifetime;
+    
+    /**
+     * Lock Type enum that maps to the current values in {@link org.alfresco.service.cmr.lock.LockType}.
+     * These values describe better the meanings of the lock types.
+     */
+    @SuppressWarnings("deprecation")
+    public static enum LockType2
+    {
+        FULL(LockType.READ_ONLY_LOCK),
+        ALLOW_OWNER_CHANGES(LockType.WRITE_LOCK);
+        // ALLOW_ADD_CHILDREN(LockType.NODE_LOCK); // removed for now, as per REPO-1187
+        
+        private LockType type;
+        
+        private LockType2(LockType type)
+        {
+            this.type = type;
+        }
+
+        public LockType getType()
+        {
+            return type;
+        }
+    }
+    
+    public LockInfo() {}
+
+    public void setTimeToExpire(Integer timeToExpire)
+    {
+        this.timeToExpire = timeToExpire;
+    }
+
+    public Integer getTimeToExpire()
+    {
+        return timeToExpire;
+    }
+
+    public LockType getMappedType()
+    {
+        return type != null ? type.getType() : null;
+    }
+
+    public LockType2 getType()
+    {
+        return type;
+    }
+
+    public void setType(String type)
+    {
+        this.type = LockType2.valueOf(type);
+    }
+
+    public Lifetime getLifetime()
+    {
+        return lifetime;
+    }
+
+    public void setLifetime(String lifetimeStr)
+    {
+        this.lifetime = Lifetime.valueOf(lifetimeStr);
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder("LockInfo{");
+        sb.append(", timeToExpire='").append(timeToExpire).append('\'');
+        sb.append(", type='").append(type).append('\'');
+        sb.append(", lifetime='").append(lifetime).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/LoginTicket.java b/remote-api/src/main/java/org/alfresco/rest/api/model/LoginTicket.java
new file mode 100644
index 00000000000..c747c5333d2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/LoginTicket.java
@@ -0,0 +1,77 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class LoginTicket
+{
+    protected String userId;
+    protected String password;
+    protected String id;
+
+    public String getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(String userId)
+    {
+        this.userId = userId;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder(150);
+        sb.append("LoginTicket [userId=").append(userId)
+                    .append(", password=").append(password)
+                    .append(", id=").append(id)
+                    .append(']');
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/LoginTicketResponse.java b/remote-api/src/main/java/org/alfresco/rest/api/model/LoginTicketResponse.java
new file mode 100644
index 00000000000..31eecf1934b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/LoginTicketResponse.java
@@ -0,0 +1,62 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class LoginTicketResponse extends LoginTicket
+{
+
+    public LoginTicketResponse()
+    {
+        this.password = null;
+    }
+
+    @Override
+    public String getPassword()
+    {
+        return null;
+    }
+
+    @Override
+    public void setPassword(String password)
+    {
+        // intentionally empty
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder(150);
+        sb.append("LoginTicketResponse [userId=").append(userId)
+                    .append(", password=").append(password)
+                    .append(", id=").append(id)
+                    .append(']');
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/MemberOfSite.java b/remote-api/src/main/java/org/alfresco/rest/api/model/MemberOfSite.java
new file mode 100644
index 00000000000..0204a435c40
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/MemberOfSite.java
@@ -0,0 +1,173 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.api.sites.SiteEntityResource;
+import org.alfresco.rest.framework.resource.EmbeddedEntityResource;
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+
+/**
+ * Represents membership of a site.
+ * 
+ * @author steveglover
+ *
+ */
+public class MemberOfSite implements Comparable<MemberOfSite>
+{
+	private String role;
+	private String siteShortName;
+	private NodeRef guid;
+
+	public MemberOfSite()
+	{
+	}
+
+    public MemberOfSite(String siteShortName, NodeRef siteGuid, String role)
+    {
+		super();
+		if(siteShortName == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		if(role == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		if(siteGuid == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.role = role;
+		this.siteShortName = siteShortName;
+		this.guid = siteGuid;
+	}
+
+    public static MemberOfSite getMemberOfSite(SiteInfo siteInfo, String siteRole)
+    {
+    	MemberOfSite memberOfSite = new MemberOfSite(siteInfo.getShortName(), siteInfo.getNodeRef(), siteRole);
+    	return memberOfSite;
+    }
+
+	@JsonProperty("id")
+    @UniqueId
+    @EmbeddedEntityResource(propertyName = "site", entityResource = SiteEntityResource.class)
+    public String getSiteShortName()
+	{
+		return siteShortName;
+	}
+	
+	public NodeRef getGuid()
+	{
+		return guid;
+	}
+	
+	public void setGuid(NodeRef guid)
+	{
+		this.guid = guid;
+	}
+
+	public String getRole()
+	{
+		return role;
+	}
+	
+	public void setRole(String role)
+	{
+		if(role == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.role = role;
+	}
+
+	public void setSiteShortName(String siteShortName)
+	{
+		if(siteShortName == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.siteShortName = siteShortName;
+	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((role == null) ? 0 : role.hashCode());
+		result = prime * result
+				+ ((siteShortName == null) ? 0 : siteShortName.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+		{
+			return true;
+		}
+		
+		if (obj == null)
+		{
+			return false;
+		}
+		
+		if (getClass() != obj.getClass())
+		{
+			return false;
+		}
+		
+		MemberOfSite other = (MemberOfSite) obj;
+		if (role != other.role)
+		{
+			return false;
+		}
+
+		return siteShortName.equals(other.siteShortName);
+	}
+
+	@Override
+	public int compareTo(MemberOfSite o)
+	{
+        int i = siteShortName.compareTo(o.getSiteShortName());
+        if(i == 0)
+        {
+        	i = role.compareTo(o.getRole());
+        }
+        return i;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "MemberOfSite [role=" + role + ", siteShortName="
+				+ siteShortName + ", siteGuid=" + guid + "]";
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/ModulePackage.java b/remote-api/src/main/java/org/alfresco/rest/api/model/ModulePackage.java
new file mode 100644
index 00000000000..f7e171842be
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/ModulePackage.java
@@ -0,0 +1,139 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import org.alfresco.repo.module.ModuleVersionNumber;
+import org.alfresco.service.cmr.module.ModuleDetails;
+import org.alfresco.service.cmr.module.ModuleInstallState;
+import org.alfresco.util.VersionNumber;
+import org.apache.maven.artifact.versioning.ArtifactVersion;
+
+import java.util.Date;
+
+/**
+ * POJO representation of Module Details for Serialization as JSON.
+ * @author Gethin James.
+ */
+public class ModulePackage
+{
+    private String id;
+    private String title;
+    private String description;
+    private String version;
+    private Date installDate;
+    private ModuleInstallState installState;
+    private String versionMin;
+    private String versionMax;
+
+    public ModulePackage()
+    {
+    }
+
+    private ModulePackage(ModuleDetails moduleDetails)
+    {
+        this.id = moduleDetails.getId();
+        this.title = moduleDetails.getTitle();
+        this.description = moduleDetails.getDescription();
+        this.version = moduleDetails.getModuleVersionNumber().toString();
+        this.installDate = moduleDetails.getInstallDate();
+        this.installState = moduleDetails.getInstallState();
+        this.versionMin = moduleDetails.getRepoVersionMin().toString();
+        this.versionMax = moduleDetails.getRepoVersionMax().toString();
+    }
+
+    public static ModulePackage fromModuleDetails(ModuleDetails moduleDetails)
+    {
+        try
+        {
+            return new ModulePackage(moduleDetails);
+        }
+        catch (NullPointerException npe)
+        {
+            //Something went wrong with the definition of the Module.
+            //These are just POJO properties, I am unable to represent
+            //the data so will return null
+            return null;
+        }
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public String getVersion()
+    {
+        return version;
+    }
+
+    public Date getInstallDate()
+    {
+        return installDate;
+    }
+
+    public ModuleInstallState getInstallState()
+    {
+        return installState;
+    }
+
+    public String getVersionMin()
+    {
+        return versionMin;
+    }
+
+    public String getVersionMax()
+    {
+        return versionMax;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder("ModulePackage{");
+        sb.append("id='").append(id).append('\'');
+        sb.append(", title='").append(title).append('\'');
+        sb.append(", description='").append(description).append('\'');
+        sb.append(", version=").append(version);
+        sb.append(", installDate=").append(installDate);
+        sb.append(", installState=").append(installState);
+        sb.append(", versionMin='").append(versionMin).append('\'');
+        sb.append(", versionMax='").append(versionMax).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
+}
+
+
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Network.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Network.java
new file mode 100644
index 00000000000..67db80fd668
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Network.java
@@ -0,0 +1,63 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Represents a cloud network (account).
+ * 
+ * @author steveglover
+ *
+ */
+public interface Network
+{
+    public String getId();
+    
+    /**
+     * Gets the date the account was created
+     *
+     * @return  The account creation date
+     */
+    public Date getCreatedAt();
+    public List<Quota> getQuotas();
+
+	/**
+     * Gets whether an account is enabled or not. 
+     *
+     * @return true = account is enabled, false = account is disabled
+     */
+    public Boolean getIsEnabled();
+    
+    /**
+     * Gets the subscription level.
+     * @return String
+     */
+    public String getSubscriptionLevel();
+    
+	public Boolean getPaidNetwork();
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/NetworkImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/model/NetworkImpl.java
new file mode 100644
index 00000000000..6fe06c00628
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/NetworkImpl.java
@@ -0,0 +1,164 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Represents a cloud network (account).
+ * 
+ * @author steveglover
+ *
+ */
+public class NetworkImpl implements Comparable<NetworkImpl>, Network
+{
+	private String id;
+	private Date createdAt;
+	private List<Quota> quotas = new LinkedList<Quota>();
+    private Boolean isEnabled;
+    private String subscriptionLevel;
+    private Boolean paidNetwork;
+    
+    public NetworkImpl(org.alfresco.repo.tenant.Network network)
+    {
+    	this.id = network.getTenantDomain();
+    	this.createdAt = network.getCreatedAt();
+    	this.isEnabled = network.isEnabled();
+    	this.paidNetwork = network.getPaidNetwork();
+    	this.subscriptionLevel = network.getSubscriptionLevel();
+    }
+
+    public NetworkImpl(String id, Date createdAt, Boolean isEnabled, String subscriptionLevel, Boolean paidNetwork)
+    {
+    	this.id = id;
+    	this.createdAt = createdAt;
+    	this.isEnabled = isEnabled;
+    	this.subscriptionLevel = subscriptionLevel;
+    	this.paidNetwork = paidNetwork;
+    }
+
+    /**
+     * Get the account name
+     * 
+     * @return The name of the account
+     */
+    @UniqueId
+    public String getId()
+    {
+    	return id;
+    }
+    
+    /**
+     * Gets the date the account was created
+     *
+     * @return  The account creation date
+     */
+    public Date getCreatedAt()
+    {
+    	return createdAt;
+    }
+    
+    public List<Quota> getQuotas()
+    {
+		return quotas;
+	}
+
+	/**
+     * Gets whether an account is enabled or not. 
+     *
+     * @return true = account is enabled, false = account is disabled
+     */
+    public Boolean getIsEnabled()
+    {
+    	return isEnabled;
+    }
+    
+    /**
+     * Gets the subscription level.
+     * 
+     * @return ths subscription level
+     */
+    public String getSubscriptionLevel()
+    {
+    	return subscriptionLevel;
+    }
+    
+	public Boolean getPaidNetwork()
+	{
+		return paidNetwork;
+	}
+
+	@Override
+	public int compareTo(NetworkImpl network)
+	{
+		return id.compareTo(network.getId());
+	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+		{
+			return true;
+		}
+		
+		if (obj == null)
+		{
+			return false;
+		}
+		
+		if (getClass() != obj.getClass())
+		{
+			return false;
+		}
+		
+		Network other = (Network) obj;
+		return(id.equals(other.getId()));
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Network [id=" + id
+				+ ", createdAt=" + createdAt + ", quotas=" + quotas
+				+ ", isEnabled=" + isEnabled + ", subscriptionLevel="
+				+ subscriptionLevel + "]";
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Node.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Node.java
new file mode 100644
index 00000000000..9f3827d8f47
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Node.java
@@ -0,0 +1,689 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.rest.api.search.model.SearchEntry;
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.NoSuchPersonException;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.EqualsHelper;
+import org.apache.chemistry.opencmis.commons.data.PropertyData;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Concrete class carrying general information for <b>alf_node</b> data
+ *
+ * @author steveglover
+ * @author Gethin James
+ * @author janv
+ */
+public class Node implements Comparable<Node>
+{
+    private static final Log logger = LogFactory.getLog(Node.class);
+
+    protected NodeRef nodeRef;
+    protected String name;
+
+    protected Date createdAt;
+    protected Date modifiedAt;
+    protected UserInfo createdByUser;
+    protected UserInfo modifiedByUser;
+
+    // Archived info - specifically for archive (deleted) node - see Trashcan API
+    protected Date archivedAt;
+    protected UserInfo archivedByUser;
+
+    // Version info - specifically for version node - see Version History API
+    protected String versionLabel;
+    protected String versionComment;
+    protected String nodeId; //This is the frozen node id NOT the current node id
+
+    protected Boolean isFolder;
+    protected Boolean isFile;
+    protected Boolean isLink;
+    protected Boolean isLocked;
+
+    protected NodeRef parentNodeRef;
+    protected PathInfo pathInfo;
+    protected String prefixTypeQName;
+
+    // please note: these are currently only used (optionally) for node create request
+    protected String relativePath;
+    protected List<AssocChild> secondaryChildren;
+    protected List<AssocTarget> targets;
+
+
+    protected List<String> aspectNames;
+    protected Map<String, Object> properties;
+
+    protected List<String> allowableOperations;
+    protected NodePermissions nodePermissions;
+    protected NodeDefinition definition;
+
+    //optional SearchEntry (only ever returned from a search)
+    protected SearchEntry search = null;
+    protected String location;
+    protected Boolean isFavorite;
+
+    public Node(NodeRef nodeRef, NodeRef parentNodeRef, Map<QName, Serializable> nodeProps, Map<String, UserInfo> mapUserInfo, ServiceRegistry sr)
+    {
+        if(nodeRef == null)
+        {
+            throw new IllegalArgumentException();
+        }
+
+        this.nodeRef = nodeRef;
+        this.parentNodeRef = parentNodeRef;
+
+        mapMinimalInfo(nodeProps, mapUserInfo, sr);
+    }
+
+    protected Object getValue(Map<String, PropertyData<?>> props, String name)
+    {
+        PropertyData<?> prop = props.get(name);
+        Object value = (prop != null ? prop.getFirstValue() : null);
+        return value;
+    }
+
+    public Node()
+    {
+    }
+
+    protected void mapMinimalInfo(Map<QName, Serializable> nodeProps,  Map<String, UserInfo> mapUserInfo, ServiceRegistry sr)
+    {
+        PersonService personService = sr.getPersonService();
+
+        this.name = (String)nodeProps.get(ContentModel.PROP_NAME);
+
+        if (mapUserInfo == null) {
+            // minor: save one lookup if creator & modifier are the same
+            mapUserInfo = new HashMap<>(2);
+        }
+
+        this.createdAt = (Date)nodeProps.get(ContentModel.PROP_CREATED);
+        this.createdByUser = lookupUserInfo((String)nodeProps.get(ContentModel.PROP_CREATOR), mapUserInfo, personService);
+
+        this.modifiedAt = (Date)nodeProps.get(ContentModel.PROP_MODIFIED);
+        this.modifiedByUser = lookupUserInfo((String)nodeProps.get(ContentModel.PROP_MODIFIER), mapUserInfo, personService);
+    }
+
+    public static UserInfo lookupUserInfo(String userName, Map<String, UserInfo> mapUserInfo, PersonService personService)
+    {
+        return lookupUserInfo(userName, mapUserInfo, personService, false);
+    }
+
+    public static UserInfo lookupUserInfo(String userName, Map<String, UserInfo> mapUserInfo, PersonService personService, boolean displayNameOnly)
+    {
+        UserInfo userInfo = mapUserInfo.get(userName);
+        if ((userInfo == null) && (userName != null))
+        {
+            String sysUserName = AuthenticationUtil.getSystemUserName();
+            if (userName.equals(sysUserName) || (AuthenticationUtil.isMtEnabled() && userName.startsWith(sysUserName + "@")))
+            {
+                userInfo = new UserInfo((displayNameOnly ? null : userName), userName, "");
+            }
+            else
+            {
+                PersonService.PersonInfo pInfo = null;
+                try
+                {
+                    NodeRef pNodeRef = personService.getPersonOrNull(userName);
+                    if (pNodeRef != null)
+                    {
+                        pInfo = personService.getPerson(pNodeRef);
+                    }
+                }
+                catch (NoSuchPersonException nspe)
+                {
+                    // drop-through
+                }
+                catch (AccessDeniedException ade)
+                {
+                    // SFS-610
+                    // drop-through
+                }
+
+                if (pInfo != null)
+                {
+                    userInfo = new UserInfo((displayNameOnly ? null : userName), pInfo.getFirstName(), pInfo.getLastName());
+                }
+                else
+                {
+                    logger.warn("Unknown person: "+userName);
+                    userInfo = new UserInfo((displayNameOnly ? null : userName), userName, "");
+                }
+            }
+
+            mapUserInfo.put(userName, userInfo);
+        }
+        return userInfo;
+    }
+
+    // note: nodeRef maps to json "id" (when serializing/deserializng)
+
+    @JsonProperty("id")
+    @UniqueId
+    public NodeRef getNodeRef()
+    {
+        return nodeRef;
+    }
+
+    public void setNodeRef(NodeRef nodeRef)
+    {
+        this.nodeRef = nodeRef;
+    }
+
+    public Date getCreatedAt()
+    {
+        return this.createdAt;
+    }
+
+    public void setCreated(Date createdAt)
+    {
+        this.createdAt = createdAt;
+    }
+
+    public Date getModifiedAt()
+    {
+        return modifiedAt;
+    }
+
+    public UserInfo getModifiedByUser() {
+        return modifiedByUser;
+    }
+
+    public UserInfo getCreatedByUser() {
+        return createdByUser;
+    }
+
+    public void setCreatedByUser(UserInfo createdByUser)
+    {
+        this.createdByUser = createdByUser;
+    }
+
+    public String getName()
+    {
+        return this.name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public PathInfo getPath()
+    {
+        return pathInfo;
+    }
+
+    public void setPath(PathInfo pathInfo)
+    {
+        this.pathInfo = pathInfo;
+    }
+
+    public String getNodeType()
+    {
+        return prefixTypeQName;
+    }
+
+    public void setNodeType(String prefixType)
+    {
+        this.prefixTypeQName = prefixType;
+    }
+
+    public Map<String, Object> getProperties() {
+        return this.properties;
+    }
+
+    public void setProperties(Map<String, Object> props) {
+        this.properties = props;
+    }
+
+    public List<String> getAspectNames() {
+        return aspectNames;
+    }
+
+    public void setAspectNames(List<String> aspectNames) {
+        this.aspectNames = aspectNames;
+    }
+
+    public NodeRef getParentId()
+    {
+        return parentNodeRef;
+    }
+
+    public void setParentId(NodeRef parentNodeRef)
+    {
+        this.parentNodeRef = parentNodeRef;
+    }
+
+    public Boolean getIsFolder()
+    {
+        return isFolder;
+    }
+
+    public void setIsFolder(Boolean isFolder)
+    {
+        this.isFolder = isFolder;
+    }
+
+    public Boolean getIsFile()
+    {
+        return isFile;
+    }
+
+    public void setIsFile(Boolean isFile)
+    {
+        this.isFile = isFile;
+    }
+
+    public Boolean getIsLink()
+    {
+        return isLink;
+    }
+
+    public void setIsLink(Boolean isLink)
+    {
+        this.isLink = isLink;
+    }
+
+    public Boolean getIsLocked()
+    {
+        return isLocked;
+    }
+
+    public void setIsLocked(Boolean isLocked)
+    {
+        this.isLocked = isLocked;
+    }
+
+    public Boolean getIsFavorite()
+    {
+        return isFavorite;
+    }
+
+    public void setIsFavorite(Boolean isFavorite)
+    {
+        this.isFavorite = isFavorite;
+    }
+
+    public List<String> getAllowableOperations()
+    {
+        return allowableOperations;
+    }
+
+    public void setAllowableOperations(List<String> allowableOperations)
+    {
+        this.allowableOperations = allowableOperations;
+    }
+
+    public NodePermissions getPermissions()
+    {
+        return nodePermissions;
+    }
+
+    public void setPermissions(NodePermissions nodePermissions)
+    {
+        this.nodePermissions = nodePermissions;
+    }
+
+    public List<AssocTarget> getTargets()
+    {
+        return targets;
+    }
+
+    public void setTargets(List<AssocTarget> targets)
+    {
+        this.targets = targets;
+    }
+
+    public Date getArchivedAt()
+    {
+        return archivedAt;
+    }
+
+    public void setArchivedAt(Date archivedAt)
+    {
+        this.archivedAt = archivedAt;
+    }
+
+    public UserInfo getArchivedByUser()
+    {
+        return archivedByUser;
+    }
+
+    public void setArchivedByUser(UserInfo archivedByUser)
+    {
+        this.archivedByUser = archivedByUser;
+    }
+
+    public String getVersionLabel()
+    {
+        return versionLabel;
+    }
+
+    public void setVersionLabel(String versionLabel)
+    {
+        this.versionLabel = versionLabel;
+    }
+
+    public String getVersionComment()
+    {
+        return versionComment;
+    }
+
+    public void setVersionComment(String versionComment)
+    {
+        this.versionComment = versionComment;
+    }
+
+    public String getLocation()
+    {
+        return location;
+    }
+
+    public void setLocation(String location)
+    {
+        this.location = location;
+    }
+
+    public String getNodeId()
+    {
+        return nodeId;
+    }
+
+    public void setNodeId(String nodeId)
+    {
+        this.nodeId = nodeId;
+    }
+
+    public boolean equals(Object other)
+    {
+        if(this == other)
+        {
+            return true;
+        }
+
+        if(!(other instanceof Node))
+        {
+            return false;
+        }
+
+        Node node = (Node)other;
+        return EqualsHelper.nullSafeEquals(getNodeRef(), node.getNodeRef());
+    }
+
+    public String getRelativePath()
+    {
+        return relativePath;
+    }
+
+    public void setRelativePath(String relativePath)
+    {
+        this.relativePath = relativePath;
+    }
+
+    public List<AssocChild> getSecondaryChildren()
+    {
+        return secondaryChildren;
+    }
+
+    public void setSecondaryChildren(List<AssocChild> secondaryChildren)
+    {
+        this.secondaryChildren = secondaryChildren;
+    }
+
+    public NodeDefinition getDefinition()
+    {
+        return definition;
+    }
+
+    public void setDefinition(NodeDefinition definition)
+    {
+        this.definition = definition;
+    }
+
+    @Override
+    public int compareTo(Node node)
+    {
+        return getNodeRef().toString().compareTo(node.getNodeRef().toString());
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Node [id=").append(getNodeRef().getId());
+        sb.append(", parentId=").append(getParentId());
+        sb.append(", type=").append(getNodeType());
+        sb.append(", name=").append(getName());
+        sb.append(", isFolder=").append(getIsFolder());
+        sb.append(", isFile=").append(getIsFile());
+        sb.append(", modifiedAt=").append(getModifiedAt());
+        sb.append(", modifiedByUser=").append(getModifiedByUser());
+        sb.append(", createdAt=").append(getCreatedAt());
+        sb.append(", createdByUser=").append(getCreatedByUser());
+        if (getArchivedAt() != null)
+        {
+            sb.append(", archivedAt=").append(getArchivedAt());
+        }
+        if (getArchivedByUser() != null)
+        {
+            sb.append(", archivedByUser=").append(getArchivedByUser());
+        }
+        if (getVersionLabel() != null)
+        {
+            sb.append(", versionLabel=").append(getVersionLabel());
+        }
+        if (getVersionComment() != null)
+        {
+            sb.append(", versionComment=").append(getVersionComment());
+        }
+        if (getLocation() != null)
+        {
+            sb.append(", location=").append(getLocation());
+        }
+        if (getNodeId() != null)
+        {
+            sb.append(", nodeId=").append(getNodeId());
+        }
+        if (getIsLink() != null)
+        {
+            sb.append(", isLink=").append(getIsLink()); // note: symbolic link (not shared link)
+        }
+        if (getPath() != null)
+        {
+            sb.append(", path=").append(getPath());
+        }
+        if (getContent() != null)
+        {
+            sb.append(", content=").append(getContent());
+        }
+        if (getAspectNames() != null)
+        {
+            sb.append(", aspectNames=").append(getAspectNames());
+        }
+        if (getProperties() != null)
+        {
+            //sb.append(", properties=").append(getProperties());
+        }
+        if (getRelativePath() != null)
+        {
+            sb.append(", relativePath=").append(getRelativePath());
+        }
+        if (getAllowableOperations() != null)
+        {
+            sb.append(", allowableOperations=").append(getAllowableOperations());
+        }
+        if (getSearch() != null)
+        {
+            sb.append(", search=").append(getSearch());
+        }
+        sb.append("]");
+        return sb.toString();
+    }
+
+    // here to allow POST /nodes/{id}/children when creating empty file with specified content.mimeType
+    // also allows list of results to be returned as "nodes"
+
+    protected ContentInfo contentInfo;
+
+    public void setContent(ContentInfo contentInfo)
+    {
+        this.contentInfo = contentInfo;
+    }
+
+    public ContentInfo getContent()
+    {
+        return this.contentInfo;
+    }
+
+    // when appropriate, can be used to show association (in the context of a listing), for example
+    // GET /nodes/parentId/children, /nodes/parentId/secondary-children, /nodes/childId/parents
+    // GET /nodes/sourceId/targets, /nodes/targetId/sources
+    protected Assoc association;
+
+    public Assoc getAssociation()
+    {
+        return association;
+    }
+
+    public void setAssociation(Assoc association)
+    {
+        this.association = association;
+    }
+
+    public SearchEntry getSearch()
+    {
+        return search;
+    }
+
+    public void setSearch(SearchEntry search)
+    {
+        this.search = search;
+    }
+    // TODO for backwards compat' - set explicitly when needed (ie. favourites) (note: we could choose to have separate old Node/NodeImpl etc)
+
+    protected String title;
+    protected NodeRef guid;
+    protected String description;
+    protected String createdBy;
+    protected String modifiedBy;
+
+    /**
+     * @deprecated
+     */
+    public NodeRef getGuid() {
+        return guid;
+    }
+
+    /**
+     * @deprecated
+     */
+    public void setGuid(NodeRef guid)
+    {
+        this.guid = guid;
+    }
+
+    /**
+     * @deprecated
+     */
+    public String getTitle()
+    {
+        return title;
+    }
+
+    /**
+     * @deprecated
+     */
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    /**
+     * @deprecated
+     */
+    public String getDescription()
+    {
+        return description;
+    }
+
+    /**
+     * @deprecated
+     */
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    /**
+     * @deprecated
+     */
+    public String getCreatedBy()
+    {
+        return this.createdBy;
+    }
+
+    /**
+     * @deprecated
+     */
+    public void setCreatedBy(String createdBy)
+    {
+        this.createdBy = createdBy;
+    }
+
+    /**
+     * @deprecated
+     */
+    public String getModifiedBy()
+    {
+        return modifiedBy;
+    }
+
+    /**
+     * @deprecated
+     */
+    public void setModifiedBy(String modifiedBy)
+    {
+        this.modifiedBy = modifiedBy;
+    }
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/NodeDefinition.java b/remote-api/src/main/java/org/alfresco/rest/api/model/NodeDefinition.java
new file mode 100644
index 00000000000..227a1506235
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/NodeDefinition.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.List;
+/**
+ * Represents the node definition.
+ *
+ * @author gfertuso
+ */
+public class NodeDefinition
+{
+    
+    List <NodeDefinitionProperty> properties;
+    
+    public List<NodeDefinitionProperty> getProperties() 
+    {
+        return properties;
+    }
+
+    public void setProperties(List<NodeDefinitionProperty> properties) 
+    {
+        this.properties = properties;
+    }
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/NodeDefinitionConstraint.java b/remote-api/src/main/java/org/alfresco/rest/api/model/NodeDefinitionConstraint.java
new file mode 100644
index 00000000000..8a7cbcb6fc6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/NodeDefinitionConstraint.java
@@ -0,0 +1,92 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.Map;
+/**
+ * Represents a constraint of a node definition property.
+ *
+ * @author gfertuso
+ */
+public class NodeDefinitionConstraint
+{
+    private String id;
+    private String type;
+    private String title;
+    private String description;
+    private Map<String, Object> parameters;
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getDescription() 
+    {
+        return description;
+    }
+
+    public void setDescription(String description) 
+    {
+        this.description = description;
+    }
+
+    public Map<String, Object> getParameters() 
+    {
+        return parameters;
+    }
+
+    public void setParameters(Map<String, Object> parameters)
+    {
+        this.parameters = parameters;
+    }
+    
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/NodeDefinitionProperty.java b/remote-api/src/main/java/org/alfresco/rest/api/model/NodeDefinitionProperty.java
new file mode 100644
index 00000000000..c07d02c066e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/NodeDefinitionProperty.java
@@ -0,0 +1,147 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.List;
+/**
+ * Represents a property of the node definition.
+ *
+ * @author gfertuso
+ */
+public class NodeDefinitionProperty 
+{
+    private String id;
+    private String title;
+    private String description;
+    private String defaultValue;
+    private String dataType;
+    private Boolean isMultiValued;
+    private Boolean isMandatory;
+    private Boolean isMandatoryEnforced;
+    private Boolean isProtected;
+    private List<NodeDefinitionConstraint> constraints;
+
+    public String getId() 
+    {
+        return id;
+    }
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getDescription() 
+    {
+        return description;
+    }
+
+    public void setDescription(String description) 
+    {
+        this.description = description;
+    }
+
+    public String getDefaultValue() 
+    {
+        return defaultValue;
+    }
+
+    public void setDefaultValue(String defaultValue)
+    {
+        this.defaultValue = defaultValue;
+    }
+
+    public String getDataType()
+    {
+        return dataType;
+    }
+
+    public void setDataType(String dataType)
+    {
+        this.dataType = dataType;
+    }
+
+    public boolean getIsProtected()
+    {
+        return isProtected;
+    }
+
+    public void setIsProtected(boolean isProtected)
+    {
+        this.isProtected = isProtected;
+    }
+
+    public List<NodeDefinitionConstraint> getConstraints() 
+    {
+        return constraints;
+    }
+
+    public void setConstraints(List<NodeDefinitionConstraint> constraints) 
+    {
+        this.constraints = constraints;
+    }
+
+    public boolean getIsMultiValued() 
+    {
+        return isMultiValued;
+    }
+
+    public void setIsMultiValued(boolean isMultiValued) 
+    {
+        this.isMultiValued = isMultiValued;
+    }
+
+    public boolean getIsMandatory() 
+    {
+        return isMandatory;
+    }
+
+    public void setIsMandatory(boolean isMandatory) 
+    {
+        this.isMandatory = isMandatory;
+    }
+
+    public boolean getIsMandatoryEnforced() 
+    {
+        return isMandatoryEnforced;
+    }
+
+    public void setIsMandatoryEnforced(boolean isMandatoryEnforced) 
+    {
+        this.isMandatoryEnforced = isMandatoryEnforced;
+    }
+    
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/NodePermissions.java b/remote-api/src/main/java/org/alfresco/rest/api/model/NodePermissions.java
new file mode 100644
index 00000000000..afbc50f3297
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/NodePermissions.java
@@ -0,0 +1,171 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.List;
+import java.util.Set;
+
+import org.alfresco.service.cmr.security.AccessStatus;
+
+
+/**
+ * Representation of Node Permissions
+ *
+ * @author janv
+ */
+public class NodePermissions
+{
+    private Boolean inherit;
+    private List<NodePermission> inherited;
+    private List<NodePermission> locallySet;
+    private Set<String> settable;
+
+    public NodePermissions()
+    {
+    }
+
+    public NodePermissions(Boolean inherit, 
+                           List<NodePermission> inherited,
+                           List<NodePermission> locallySet,
+                           Set<String> settable)
+    {
+        this.inherit = inherit;
+        this.inherited = inherited;
+        this.locallySet = locallySet;
+        this.settable = settable;
+    }
+
+    public Boolean getIsInheritanceEnabled()
+    {
+        return inherit;
+    }
+
+    public void setIsInheritanceEnabled(boolean inherit)
+    {
+        this.inherit = inherit;
+    }
+
+    public List<NodePermission> getInherited()
+    {
+        return inherited;
+    }
+
+    public List<NodePermission> getLocallySet()
+    {
+        return locallySet;
+    }
+
+    public void setLocallySet(List<NodePermission> directPermissions)
+    {
+        this.locallySet = directPermissions;
+    }
+
+    public Set<String> getSettable()
+    {
+        return settable;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder(120);
+        sb.append("PathInfo [isInheritanceEnabled=").append(inherit)
+                    .append(", inherited=").append(getInherited())
+                    .append(", locallySet=").append(getLocallySet())
+                    .append(", settable=").append(getSettable())
+                    .append(']');
+        return sb.toString();
+    }
+
+    public static class NodePermission
+    {
+
+        private String authorityId;
+        private String name;
+        private String accessStatus;
+
+        public NodePermission()
+        {
+        }
+
+        public NodePermission(String authorityId, String name, String accessStatus)
+        {
+            this.authorityId = authorityId;
+            this.name = name;
+            this.accessStatus = accessStatus != null ? accessStatus : AccessStatus.ALLOWED.toString();
+        }
+
+        public String getName()
+        {
+            return name;
+        }
+
+        public String getAuthorityId()
+        {
+            return authorityId;
+        }
+
+        public String getAccessStatus()
+        {
+            return accessStatus;
+        }
+
+        @Override
+        public String toString()
+        {
+            final StringBuilder sb = new StringBuilder(250);
+            sb.append("NodePermission [authorityId=").append(authorityId)
+                        .append(", name=").append(name)
+                        .append(", accessStatus=").append(accessStatus)
+                        .append(']');
+            return sb.toString();
+        }
+
+        @Override
+        public boolean equals(Object o)
+        {
+            if (this == o)
+                return true;
+            if (o == null || getClass() != o.getClass())
+                return false;
+
+            NodePermission that = (NodePermission) o;
+
+            if (authorityId != null ? !authorityId.equals(that.authorityId) : that.authorityId != null)
+                return false;
+            return name != null ? name.equals(that.name) : that.name == null;
+
+        }
+
+        @Override
+        public int hashCode()
+        {
+            int result = authorityId != null ? authorityId.hashCode() : 0;
+            result = 31 * result + (name != null ? name.hashCode() : 0);
+            return result;
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/NodeRating.java b/remote-api/src/main/java/org/alfresco/rest/api/model/NodeRating.java
new file mode 100644
index 00000000000..bf451a25757
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/NodeRating.java
@@ -0,0 +1,147 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Date;
+
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Represents a node rating.
+ * 
+ * @author steveglover
+ *
+ */
+public class NodeRating implements Comparable<NodeRating>
+{
+	private String ratingSchemeId;
+	private Object myRating;
+    private Date ratedAt;
+	private DocumentRatingSummary documentRatingSummary;
+
+	public NodeRating()
+	{
+	}
+
+	public NodeRating(String ratingSchemeId, Object myRating, Date ratedAt, DocumentRatingSummary documentRatingSummary)
+	{
+		if(ratingSchemeId == null)
+		{
+			throw new IllegalArgumentException();
+		}
+
+		this.ratingSchemeId = ratingSchemeId;
+		this.documentRatingSummary = documentRatingSummary;
+		this.myRating = myRating;
+		this.ratedAt = ratedAt;
+	}
+
+	@JsonProperty("id")
+	@UniqueId
+	public String getScheme()
+	{
+		return ratingSchemeId;
+	}
+
+	public void setScheme(String ratingSchemeId)
+	{
+		if(ratingSchemeId == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.ratingSchemeId = ratingSchemeId;
+	}
+
+	public Date getRatedAt()
+	{
+		return ratedAt;
+	}
+
+	public Object getMyRating()
+	{
+		return myRating;
+	}
+
+	public void setMyRating(Object myRating)
+	{
+		this.myRating = myRating;
+	}
+	
+	public DocumentRatingSummary getAggregate()
+	{
+		return documentRatingSummary;
+	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((ratingSchemeId == null) ? 0 : ratingSchemeId.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		NodeRating other = (NodeRating) obj;
+		if (ratingSchemeId == null) {
+			if (other.getScheme() != null)
+				return false;
+		} else if (!ratingSchemeId.equals(other.getScheme()))
+			return false;
+		return true;
+	}
+
+	@Override
+	public int compareTo(NodeRating other)
+	{
+		if(other != null)
+		{
+			int ret = (ratingSchemeId.compareTo(other.getScheme()));
+			return ret;
+		}
+		else
+		{
+			throw new IllegalArgumentException();
+		}
+	}
+
+	@Override
+	public String toString()
+	{
+		return "NodeRating [scheme=" + ratingSchemeId + ", myRating=" + myRating
+				+ ", ratedAt=" + ratedAt
+				+ ", documentRatingSummary=" + documentRatingSummary + "]";
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/NodeTarget.java b/remote-api/src/main/java/org/alfresco/rest/api/model/NodeTarget.java
new file mode 100644
index 00000000000..bd2b6ea7bc2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/NodeTarget.java
@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+/**
+ * A target object.
+ * 
+ * @author Gethin James
+ */
+public class NodeTarget
+{
+    String targetParentId;
+    String name;
+
+    public NodeTarget()
+    {
+    }
+
+    public String getTargetParentId()
+    {
+        return targetParentId;
+    }
+
+    public void setTargetParentId(String targetParentId)
+    {
+        this.targetParentId = targetParentId;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder("NodeTarget{");
+        sb.append("targetParentId=").append(targetParentId);
+        sb.append(", name='").append(name).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/NodeTargetAssoc.java b/remote-api/src/main/java/org/alfresco/rest/api/model/NodeTargetAssoc.java
new file mode 100644
index 00000000000..017b0b1fc5a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/NodeTargetAssoc.java
@@ -0,0 +1,52 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+public class NodeTargetAssoc extends Assoc
+{
+    private String targetParentId;
+
+    public NodeTargetAssoc()
+    {
+    }
+
+    public NodeTargetAssoc(String targetParentId, String prefixAssocTypeQName)
+    {
+        super(prefixAssocTypeQName);
+
+        this.targetParentId = targetParentId;
+    }
+
+    public String getTargetParentId()
+    {
+        return targetParentId;
+    }
+
+    public void setTargetParentId(String targetParentId)
+    {
+        this.targetParentId = targetParentId;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/PasswordReset.java b/remote-api/src/main/java/org/alfresco/rest/api/model/PasswordReset.java
new file mode 100644
index 00000000000..48c987759fd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/PasswordReset.java
@@ -0,0 +1,91 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+/**
+ * Representation of a password reset.
+ *
+ * @author Jamal Kaabi-Mofrad
+ * @since 5.2.1
+ */
+public class PasswordReset
+{
+    /** new password */
+    private String password;
+    /** workflow Id */
+    private String id;
+    /** workflow Key */
+    private String key;
+
+    public PasswordReset()
+    {
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public PasswordReset setPassword(String password)
+    {
+        this.password = password;
+        return this;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public PasswordReset setId(String id)
+    {
+        this.id = id;
+        return this;
+    }
+
+    public String getKey()
+    {
+        return key;
+    }
+
+    public PasswordReset setKey(String key)
+    {
+        this.key = key;
+        return this;
+    }
+
+    @Override
+    public String toString()
+    {
+        // we don't return the password for the obvious reason
+        final StringBuilder sb = new StringBuilder(100);
+        sb.append("PasswordReset [id=").append(id)
+                    .append(", key=").append(key)
+                    .append(']');
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/PathInfo.java b/remote-api/src/main/java/org/alfresco/rest/api/model/PathInfo.java
new file mode 100644
index 00000000000..ac4ad610842
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/PathInfo.java
@@ -0,0 +1,142 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.List;
+
+
+/**
+ * Representation of a path info
+ *
+ * @author janv
+ */
+public class PathInfo
+{
+    private String name;
+    private Boolean isComplete;
+    private String relativePath;
+    private List<ElementInfo> elements;
+
+    public PathInfo()
+    {
+    }
+
+    public PathInfo(String name, Boolean isComplete, List<ElementInfo> elements)
+    {
+        this.name = name;
+        this.isComplete = isComplete;
+        this.elements = elements;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public Boolean getIsComplete()
+    {
+        return isComplete;
+    }
+
+    public List<ElementInfo> getElements()
+    {
+        return elements;
+    }
+    
+    public String getRelativePath()
+    {
+        return relativePath;
+    }
+
+    public void setRelativePath(String relativePath)
+    {
+        this.relativePath = relativePath;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder(120);
+        sb.append("PathInfo [name=").append(name)
+                    .append(", isComplete=").append(isComplete)
+                    .append(", elements=").append(elements)
+                    .append(']');
+        return sb.toString();
+    }
+
+    public static class ElementInfo
+    {
+
+        private String id;
+        private String name;
+        private String nodeType;
+        private List<String> aspectNames;
+
+        public ElementInfo()
+        {
+        }
+        
+        public ElementInfo(String id, String name, String nodeType, List<String> aspectNames)
+        {
+            this.id = id;
+            this.name = name;
+            this.nodeType = nodeType;
+            this.aspectNames = aspectNames;
+        }
+
+        public String getName()
+        {
+            return name;
+        }
+
+        public String getId()
+        {
+            return id;
+        }
+
+        public String getNodeType()
+        {
+            return nodeType;
+        }
+
+        public List<String> getAspectNames()
+        {
+            return aspectNames;
+        }
+
+        @Override
+        public String toString()
+        {
+            final StringBuilder sb = new StringBuilder(250);
+            sb.append("PathElement [id=").append(id)
+                        .append(", name=").append(name)
+                        .append(", nodeType=").append(nodeType)
+                        .append(", aspectNames=").append(aspectNames)
+                        .append(']');
+            return sb.toString();
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Person.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Person.java
new file mode 100644
index 00000000000..d1bd4dbf0c6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Person.java
@@ -0,0 +1,618 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.model.ContentModel;
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Represents a person (aka user) within the system.
+ * 
+ * @author steveglover
+ *
+ */
+public class Person implements Serializable
+{
+	private static final long serialVersionUID = 1L;
+	protected String userName;
+	protected Boolean enabled;
+	protected NodeRef avatarId;
+	protected String firstName;
+	protected String lastName;
+	protected String displayName;
+	protected String jobTitle;
+	protected String location;
+	protected String telephone;
+	protected String mobile;
+	protected String email;
+	protected String skypeId;
+	protected String instantMessageId;
+	protected String userStatus;
+	protected Date statusUpdatedAt;
+	protected String googleId;
+	protected Long quota;
+	protected Long quotaUsed;
+	protected Boolean emailNotificationsEnabled;
+	protected String description;
+	protected transient Company company;
+	protected String password;
+	protected String oldPassword;
+	protected transient Map<String, Object> properties;
+	protected transient List<String> aspectNames;
+	protected Map<String, Boolean> capabilities;
+
+	private Map<QName, Boolean> setFields = new HashMap<>(7);
+
+	public static final QName PROP_PERSON_DESCRIPTION = QName.createQName("RestApi", "description");
+	public static final QName PROP_PERSON_COMPANY = QName.createQName("RestApi", "company");
+	public static final QName PROP_PERSON_AVATAR_ID = QName.createQName("RestApi", "avatarId");
+	public static final QName PROP_PERSON_OLDPASSWORD = QName.createQName("RestApi", "oldPassword");
+	public static final QName PROP_PERSON_PASSWORD = QName.createQName("RestApi", "password");
+
+	public Person()
+    {
+	}
+
+	public Person(
+			String userName,
+			Boolean enabled,
+			NodeRef avatarId,
+			String firstName,
+			String lastName,
+			String jobTitle,
+			String location,
+			String telephone,
+			String mobile,
+			String email,
+			String skypeId,
+			String instantMessageId,
+			String userStatus,
+			Date statusUpdatedAt,
+			String googleId,
+			Long quota,
+			Long quotaUsed,
+			Boolean emailNotificationsEnabled,
+			String description,
+			Company company)
+	{
+		setUserName(userName);
+		setEnabled(enabled);
+		setAvatarId(avatarId);
+		setFirstName(firstName);
+		setLastName(lastName);
+		setJobTitle(jobTitle);
+		setLocation(location);
+		setTelephone(telephone);
+		setMobile(mobile);
+        if (email != null)
+        {
+            setEmail(email);
+        }
+		setSkypeId(skypeId);
+		setInstantMessageId(instantMessageId);
+		setUserStatus(userStatus);
+		setGoogleId(googleId);
+		setEmailNotificationsEnabled(emailNotificationsEnabled);
+		setDescription(description);
+		setCompany(company);
+
+		// system-maintained / derived
+		setStatusUpdatedAt(statusUpdatedAt);
+		setQuota(quota);
+		updateDisplayName();
+        if (quotaUsed != null)
+        {
+            setQuotaUsed(quotaUsed);
+        }
+	}
+
+	public Person(NodeRef nodeRef, Map<QName, Serializable> nodeProps, boolean enabled)
+    {
+        mapProperties(nodeProps);
+		this.enabled = enabled;
+	    updateDisplayName();
+	}
+
+	protected void mapProperties(Map<QName, Serializable> nodeProps)
+    {
+		nodeProps.remove(ContentModel.PROP_CONTENT);
+
+		setUserName((String) nodeProps.get(ContentModel.PROP_USERNAME));
+		setFirstName((String) nodeProps.get(ContentModel.PROP_FIRSTNAME));
+		setLastName((String) nodeProps.get(ContentModel.PROP_LASTNAME));
+		setJobTitle((String) nodeProps.get(ContentModel.PROP_JOBTITLE));
+
+		setLocation((String) nodeProps.get(ContentModel.PROP_LOCATION));
+		setTelephone((String) nodeProps.get(ContentModel.PROP_TELEPHONE));
+		setMobile((String) nodeProps.get(ContentModel.PROP_MOBILE));
+		setEmail((String) nodeProps.get(ContentModel.PROP_EMAIL));
+
+		String organization = (String) nodeProps.get(ContentModel.PROP_ORGANIZATION);
+		String companyAddress1 = (String) nodeProps.get(ContentModel.PROP_COMPANYADDRESS1);
+		String companyAddress2 = (String) nodeProps.get(ContentModel.PROP_COMPANYADDRESS2);
+		String companyAddress3 = (String) nodeProps.get(ContentModel.PROP_COMPANYADDRESS3);
+		String companyPostcode = (String) nodeProps.get(ContentModel.PROP_COMPANYPOSTCODE);
+		String companyTelephone = (String) nodeProps.get(ContentModel.PROP_COMPANYTELEPHONE);
+		String companyFax = (String) nodeProps.get(ContentModel.PROP_COMPANYFAX);
+		String companyEmail = (String) nodeProps.get(ContentModel.PROP_COMPANYEMAIL);
+		setCompany(new Company(organization, companyAddress1, companyAddress2, companyAddress3, companyPostcode, companyTelephone, companyFax, companyEmail));
+
+		setSkypeId((String) nodeProps.get(ContentModel.PROP_SKYPE));
+		setInstantMessageId((String) nodeProps.get(ContentModel.PROP_INSTANTMSG));
+		setUserStatus((String) nodeProps.get(ContentModel.PROP_USER_STATUS));
+		setGoogleId((String) nodeProps.get(ContentModel.PROP_GOOGLEUSERNAME));
+		Boolean bool = (Boolean)nodeProps.get(ContentModel.PROP_EMAIL_FEED_DISABLED);
+		setEmailNotificationsEnabled(bool == null ? Boolean.TRUE : !bool.booleanValue());
+		setDescription((String)nodeProps.get(PROP_PERSON_DESCRIPTION));
+
+		// system-maintained / derived
+		setStatusUpdatedAt((Date) nodeProps.get(ContentModel.PROP_USER_STATUS_TIME));
+		setQuota((Long) nodeProps.get(ContentModel.PROP_SIZE_QUOTA));
+		setQuotaUsed((Long) nodeProps.get(ContentModel.PROP_SIZE_CURRENT));
+    }
+
+	public Company getCompany()
+	{
+		return company;
+	}
+
+	public void setCompany(Company company)
+	{
+		this.company = company;
+		setFields.put(PROP_PERSON_COMPANY, true);
+	}
+
+	public String getInstantMessageId()
+	{
+		return instantMessageId;
+	}
+
+	public void setInstantMessageId(String instantMessageId)
+	{
+		this.instantMessageId = instantMessageId;
+		setFields.put(ContentModel.PROP_INSTANTMSG, true);
+	}
+
+	public String getGoogleId()
+	{
+		return googleId;
+	}
+
+	public void setGoogleId(String googleId)
+	{
+		this.googleId = googleId;
+		setFields.put(ContentModel.PROP_GOOGLEUSERNAME, true);
+	}
+
+	public Long getQuota()
+	{
+		return quota;
+	}
+
+	// TEMP: for tracking (pending REPO-110)
+	protected void setQuota(Long quota)
+	{
+		this.quota = quota;
+		setFields.put(ContentModel.PROP_SIZE_QUOTA, true);
+	}
+
+	public Long getQuotaUsed()
+	{
+		return quotaUsed;
+	}
+
+	// TEMP: for tracking (pending REPO-110)
+	protected void setQuotaUsed(Long quotaUsed)
+	{
+		this.quotaUsed = quotaUsed;
+		setFields.put(ContentModel.PROP_SIZE_CURRENT, true);
+	}
+
+	public String getDescription()
+	{
+		return description;
+	}
+
+	public void setDescription(String description)
+	{
+		this.description = description;
+		setFields.put(PROP_PERSON_DESCRIPTION, true);
+	}
+
+	@JsonProperty("id")
+	@UniqueId
+	public String getUserName() 
+	{
+		return userName;
+	}
+
+	public void setUserName(String userName)
+	{
+		this.userName = userName;
+		setFields.put(ContentModel.PROP_USERNAME, true);
+	}
+
+	public Boolean isEnabled()
+	{
+		return enabled;
+	}
+
+	public void setEnabled(Boolean enabled)
+	{
+		this.enabled = enabled;
+		setFields.put(ContentModel.PROP_ENABLED, true);
+	}
+
+	public void setAvatarId(NodeRef avatarId)
+	{
+		this.avatarId = avatarId;
+		setFields.put(PROP_PERSON_AVATAR_ID, true);
+	}
+
+	public void setPassword(String password)
+	{
+		this.password = password;
+		setFields.put(PROP_PERSON_PASSWORD, true);
+	}
+
+	public void setOldPassword(String oldPassword)
+	{
+		this.oldPassword = oldPassword;
+		setFields.put(PROP_PERSON_OLDPASSWORD, true);
+	}
+
+	public NodeRef getAvatarId()
+	{
+		return avatarId;
+	}
+
+	public String getFirstName()
+	{
+		return firstName;
+	}
+
+	public void setFirstName(String firstName)
+	{
+		this.firstName = firstName;
+		setFields.put(ContentModel.PROP_FIRSTNAME, true);
+		updateDisplayName();
+	}
+
+	public void setLastName(String lastName)
+	{
+		this.lastName = lastName;
+		setFields.put(ContentModel.PROP_LASTNAME, true);
+		updateDisplayName();
+	}
+
+	public String getLastName()
+	{
+		return lastName;
+	}
+
+	public String getJobTitle()
+	{
+		return jobTitle;
+	}
+
+	public void setJobTitle(String jobTitle)
+	{
+		this.jobTitle = jobTitle;
+		setFields.put(ContentModel.PROP_JOBTITLE, true);
+	}
+
+	public String getLocation()
+	{
+		return location;
+	}
+
+	public void setLocation(String location)
+	{
+		this.location = location;
+		setFields.put(ContentModel.PROP_LOCATION, true);
+	}
+
+	public String getTelephone()
+	{
+		return telephone;
+	}
+
+	public void setTelephone(String telephone)
+	{
+		this.telephone = telephone;
+		setFields.put(ContentModel.PROP_TELEPHONE, true);
+	}
+
+	public String getMobile()
+	{
+		return mobile;
+	}
+
+	public void setMobile(String mobile)
+	{
+		this.mobile = mobile;
+		setFields.put(ContentModel.PROP_MOBILE, true);
+	}
+
+	public String getEmail()
+	{
+		return email;
+	}
+
+	public void setEmail(String email)
+	{
+		this.email = email;
+		setFields.put(ContentModel.PROP_EMAIL, true);
+	}
+
+	public String getSkypeId()
+	{
+		return skypeId;
+	}
+
+	public void setSkypeId(String skypeId)
+	{
+		this.skypeId = skypeId;
+		setFields.put(ContentModel.PROP_SKYPE, true);
+	}
+
+	public String getUserStatus()
+	{
+		return userStatus;
+	}
+
+	public void setUserStatus(String userStatus)
+	{
+		this.userStatus = userStatus;
+		setFields.put(ContentModel.PROP_USER_STATUS, true);
+	}
+
+	public Date getStatusUpdatedAt()
+	{
+		return statusUpdatedAt;
+	}
+
+	// TEMP: for tracking (pending REPO-110)
+	protected void setStatusUpdatedAt(Date statusUpdatedAt)
+	{
+		this.statusUpdatedAt = statusUpdatedAt;
+		setFields.put(ContentModel.PROP_USER_STATUS_TIME, true);
+	}
+
+	public Boolean isEmailNotificationsEnabled()
+	{
+		return emailNotificationsEnabled;
+	}
+
+	public void setEmailNotificationsEnabled(Boolean emailNotificationsEnabled)
+	{
+		this.emailNotificationsEnabled = emailNotificationsEnabled;
+		setFields.put(ContentModel.PROP_EMAIL_FEED_DISABLED, true);
+	}
+
+	public String getPassword()
+	{
+		return this.password;
+	}
+
+	public String getOldPassword()
+	{
+		return oldPassword;
+	}
+
+	public Map<String, Object> getProperties()
+	{
+		return properties;
+	}
+
+	public void setProperties(Map<String, Object> properties)
+	{
+		this.properties = properties;
+	}
+
+	public List<String> getAspectNames()
+	{
+		return aspectNames;
+	}
+
+	public void setAspectNames(List<String> aspectNames)
+	{
+		this.aspectNames = aspectNames;
+	}
+	
+    public Map<String, Boolean> getCapabilities()
+    {
+        return capabilities;
+    }
+
+    public void setCapabilities(Map<String, Boolean> capabilities)
+    {
+        this.capabilities = capabilities;
+    }
+
+	public boolean wasSet(QName fieldName)
+	{
+		Boolean b = setFields.get(fieldName);
+		return (b != null ? b : false);
+	}
+
+	public String getDisplayName()
+	{
+		return displayName;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Person [userName=" + userName + ", enabled=" + enabled
+				+ ", avatarId=" + avatarId + ", firstName=" + firstName
+				+ ", lastName=" + lastName + ", jobTitle=" + jobTitle
+				+ ", location=" + location
+				+ ", telephone=" + telephone + ", mobile=" + mobile
+				+ ", email=" + email + ", skypeId=" + skypeId
+				+ ", instantMessageId=" + instantMessageId + ", userStatus="
+				+ userStatus + ", statusUpdatedAt=" + statusUpdatedAt
+				+ ", googleId=" + googleId + ", quota=" + quota
+				+ ", quotaUsed=" + quotaUsed + ", emailNotificationsEnabled="
+				+ emailNotificationsEnabled + ", description=" + description
+				+ ", company=" + company + "]";
+	}
+
+	public Map<QName, Serializable> toProperties()
+	{
+		Map<QName, Serializable> props = new HashMap<>();
+		populateProps(props);
+		return props;
+	}
+
+	private void addToMap(Map<QName, Serializable> properties, QName name, Serializable value)
+	{
+		if (name != null)
+		{
+			Boolean b = setFields.get(name);
+			if (Boolean.TRUE.equals(b))
+			{
+				properties.put(name, value);
+			}
+		}
+	}
+	
+	private void populateProps(Map<QName, Serializable> properties)
+	{
+		addToMap(properties, ContentModel.PROP_USERNAME, getUserName());
+		addToMap(properties, ContentModel.PROP_FIRSTNAME, getFirstName());
+		addToMap(properties, ContentModel.PROP_LASTNAME, getLastName());
+		addToMap(properties, ContentModel.PROP_JOBTITLE, getJobTitle());
+		addToMap(properties, ContentModel.PROP_LOCATION, getLocation());
+		addToMap(properties, ContentModel.PROP_TELEPHONE, getTelephone());
+		addToMap(properties, ContentModel.PROP_MOBILE, getMobile());
+        if (wasSet(ContentModel.PROP_EMAIL))
+        {
+            addToMap(properties, ContentModel.PROP_EMAIL, getEmail());
+        }
+		
+		if (wasSet(PROP_PERSON_COMPANY))
+		{
+			Company company = getCompany();
+
+			int setCount = 0;
+			if (company != null)
+			{
+				if (company.wasSet(ContentModel.PROP_ORGANIZATION))
+				{
+					setCount++;
+					properties.put(ContentModel.PROP_ORGANIZATION, company.getOrganization());
+				}
+
+				if (company.wasSet(ContentModel.PROP_COMPANYADDRESS1))
+				{
+					setCount++;
+					properties.put(ContentModel.PROP_COMPANYADDRESS1, company.getAddress1());
+				}
+
+				if (company.wasSet(ContentModel.PROP_COMPANYADDRESS2))
+				{
+					setCount++;
+					properties.put(ContentModel.PROP_COMPANYADDRESS2, company.getAddress2());
+				}
+
+				if (company.wasSet(ContentModel.PROP_COMPANYADDRESS3))
+				{
+					setCount++;
+					properties.put(ContentModel.PROP_COMPANYADDRESS3, company.getAddress3());
+				}
+
+				if (company.wasSet(ContentModel.PROP_COMPANYPOSTCODE))
+				{
+					setCount++;
+					properties.put(ContentModel.PROP_COMPANYPOSTCODE, company.getPostcode());
+				}
+
+				if (company.wasSet(ContentModel.PROP_COMPANYTELEPHONE))
+				{
+					setCount++;
+					properties.put(ContentModel.PROP_COMPANYTELEPHONE, company.getTelephone());
+				}
+
+				if (company.wasSet(ContentModel.PROP_COMPANYFAX))
+				{
+					setCount++;
+					properties.put(ContentModel.PROP_COMPANYFAX, company.getFax());
+				}
+
+				if (company.wasSet(ContentModel.PROP_COMPANYEMAIL))
+				{
+					setCount++;
+					properties.put(ContentModel.PROP_COMPANYEMAIL, company.getEmail());
+				}
+			}
+
+			if (setCount == 0)
+			{
+				// company was null or {} (no individual properties set)
+				properties.put(ContentModel.PROP_ORGANIZATION, null);
+				properties.put(ContentModel.PROP_COMPANYADDRESS1, null);
+				properties.put(ContentModel.PROP_COMPANYADDRESS2, null);
+				properties.put(ContentModel.PROP_COMPANYADDRESS3, null);
+				properties.put(ContentModel.PROP_COMPANYPOSTCODE, null);
+				properties.put(ContentModel.PROP_COMPANYTELEPHONE, null);
+				properties.put(ContentModel.PROP_COMPANYFAX, null);
+				properties.put(ContentModel.PROP_COMPANYEMAIL, null);
+			}
+		}
+
+//		addToMap(properties, ContentModel.ASSOC_AVATAR, getAvatarId());
+		addToMap(properties, ContentModel.PROP_SKYPE, getSkypeId());
+		addToMap(properties, ContentModel.PROP_INSTANTMSG, getInstantMessageId());
+		addToMap(properties, ContentModel.PROP_USER_STATUS, getUserStatus());
+		addToMap(properties, ContentModel.PROP_USER_STATUS_TIME, getStatusUpdatedAt());
+		addToMap(properties, ContentModel.PROP_GOOGLEUSERNAME, getGoogleId());
+		addToMap(properties, ContentModel.PROP_SIZE_QUOTA, getQuota());
+        if (wasSet(ContentModel.PROP_SIZE_CURRENT))
+        {
+            addToMap(properties, ContentModel.PROP_SIZE_CURRENT, getQuotaUsed());
+        }
+		addToMap(properties, ContentModel.PROP_PERSONDESC, getDescription());
+        addToMap(properties, ContentModel.PROP_ENABLED, isEnabled());
+
+        Boolean isEmailNotificationsEnabled = isEmailNotificationsEnabled();
+        addToMap(properties, ContentModel.PROP_EMAIL_FEED_DISABLED, (isEmailNotificationsEnabled == null ? null : !isEmailNotificationsEnabled.booleanValue()));
+	}
+
+	private void updateDisplayName()
+	{
+		displayName = ((firstName != null ? firstName + " " : "") + (lastName != null ? lastName : "")).trim();
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/PersonNetwork.java b/remote-api/src/main/java/org/alfresco/rest/api/model/PersonNetwork.java
new file mode 100644
index 00000000000..79e8bfe1eae
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/PersonNetwork.java
@@ -0,0 +1,132 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.Date;
+import java.util.List;
+
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Represents network membership.
+ * 
+ * @author steveglover
+ *
+ */
+public class PersonNetwork implements Network, Comparable<PersonNetwork>
+{
+	private Boolean homeNetwork;
+	private Network network;
+
+	public PersonNetwork()
+	{
+	}
+
+	public PersonNetwork(Boolean homeNetwork, Network network)
+	{
+		super();
+		this.homeNetwork = homeNetwork;
+		this.network = network;
+	}
+
+	@UniqueId
+    public String getId()
+    {
+    	return network.getId();
+    }
+    
+    public Date getCreatedAt()
+    {
+    	return network.getCreatedAt();
+    }
+
+	public List<Quota> getQuotas()
+    {
+    	return network.getQuotas();
+    }
+
+    public Boolean getIsEnabled()
+    {
+    	return network.getIsEnabled();
+    }
+    
+    public String getSubscriptionLevel()
+    {
+    	return network.getSubscriptionLevel();
+    }
+    
+	public Boolean getPaidNetwork()
+	{
+    	return network.getPaidNetwork();		
+	}
+
+	@Override
+	public int compareTo(PersonNetwork member)
+	{
+		int ret = getId().compareTo(member.getId());
+		return ret;
+	}
+	
+	public Boolean getHomeNetwork()
+	{
+		return homeNetwork;
+	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((network == null) ? 0 : network.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		PersonNetwork other = (PersonNetwork) obj;
+		if (network == null)
+		{
+			if (other.network != null)
+				return false;
+		}
+		else if (!network.equals(other.network))
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "PersonNetwork [homeNetwork=" + homeNetwork + ", network="
+				+ network + "]";
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Preference.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Preference.java
new file mode 100644
index 00000000000..c2817791a65
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Preference.java
@@ -0,0 +1,126 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Represents a user preference.
+ * 
+ * @author steveglover
+ *
+ */
+public class Preference implements Comparable<Preference>
+{
+	private String name;
+	private Serializable value;
+	
+	public Preference()
+	{
+	}
+	
+	public Preference(String name, Serializable value)
+	{
+		if(name == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.name = name;
+		this.value = value;
+	}
+
+	@JsonProperty("id")
+	@UniqueId
+	public String getName()
+	{
+		return name;
+	}
+
+	public void setName(String name)
+	{
+		if(name == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.name = name;
+	}
+
+	public Serializable getValue()
+	{
+		return value;
+	}
+
+	public void setValue(Serializable value)
+	{
+		this.value = value;
+	}
+
+	@Override
+	public int hashCode() 
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((name == null) ? 0 : name.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+		{
+			return true;
+		}
+		
+		if (obj == null)
+		{
+			return false;
+		}
+		
+		if (getClass() != obj.getClass())
+		{
+			return false;
+		}
+		
+		Preference other = (Preference) obj;
+		return name.equals(other.name);
+	}
+
+	@Override
+	public int compareTo(Preference preference)
+	{
+		return name.compareTo(preference.getName());
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Preference [name=" + name + ", value=" + value + "]";
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Probe.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Probe.java
new file mode 100644
index 00000000000..d9ab9e3f890
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Probe.java
@@ -0,0 +1,47 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+/**
+ * Representation of a probe result.
+ *
+ * Probes simply return a status code of 200 for okay and some other code if not. They should provide very limited
+ * information to the caller for security reasons as they generally provide unauthenticated access.
+ */
+public class Probe
+{
+    final String message;
+
+    public Probe(String message)
+    {
+        this.message = message;
+    }
+
+    public String getMessage()
+    {
+        return message;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/QuickShareLink.java b/remote-api/src/main/java/org/alfresco/rest/api/model/QuickShareLink.java
new file mode 100644
index 00000000000..c9b281fe683
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/QuickShareLink.java
@@ -0,0 +1,271 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Representation of quick share link
+ *
+ * The shared link id provides a short id that can be part of a short app url that is easy to
+ * copy/paste/send (via email or other).
+ *
+ * As of now, these shared links are public in that they provide unauthenticated access to the
+ * node's content and limited metadata info, such as file name and last modifier/modification.
+ *
+ * In the future, the QuickShareService *could* be enhanced to provide additional features,
+ * such as link expiry &/or "password" protection, etc.
+ *
+ * @author janv
+ *
+ */
+public class QuickShareLink
+{
+    // unique short id (ie. shorter than a guid, 22 vs 36 chars)
+    private String sharedId;
+
+    private Date expiresAt;
+
+    private String nodeId;
+    private String name;
+    private String title;
+    private String description;
+    private PathInfo path;
+
+    private ContentInfo content;
+
+    private Date modifiedAt;
+    private UserInfo modifiedByUser;
+    private UserInfo sharedByUser;
+
+    private List<String> allowableOperations;
+
+    private List<String> allowableOperationsOnTarget;
+    private Map<String, Object> properties;
+    private List<String> aspectNames;
+    private Boolean isFavorite;
+
+    public QuickShareLink()
+    {
+    }
+
+    public QuickShareLink(String sharedId, String nodeId)
+    {
+        this.sharedId = sharedId;
+        this.nodeId = nodeId;
+    }
+
+    public List<String> getAspectNames()
+    {
+        return aspectNames;
+    }
+
+    public void setAspectNames(List<String> aspectNames)
+    {
+        this.aspectNames = aspectNames;
+    }
+
+    public Map<String, Object> getProperties()
+    {
+        return properties;
+    }
+
+    public void setProperties(Map<String, Object> properties)
+    {
+        this.properties = properties;
+    }
+
+    public Boolean getIsFavorite()
+    {
+        return isFavorite;
+    }
+
+    public void setIsFavorite(Boolean isFavorite)
+    {
+        this.isFavorite = isFavorite;
+    }
+
+    public String getId() {
+        return sharedId;
+    }
+
+    public void setId(String sharedId) {
+        this.sharedId = sharedId;
+    }
+
+    public Date getExpiresAt()
+    {
+        return expiresAt;
+    }
+
+    public void setExpiresAt(Date expiresAt)
+    {
+        this.expiresAt = expiresAt;
+    }
+
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(String nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public ContentInfo getContent()
+    {
+        return content;
+    }
+
+    public void setContent(ContentInfo content)
+    {
+        this.content = content;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    public PathInfo getPath()
+    {
+        return path;
+    }
+
+    public void setPath(PathInfo pathInfo)
+    {
+        this.path = pathInfo;
+    }
+
+    public Date getModifiedAt()
+    {
+        return modifiedAt;
+    }
+
+    public void setModifiedAt(Date modifiedAt)
+    {
+        this.modifiedAt = modifiedAt;
+    }
+
+    public UserInfo getModifiedByUser()
+    {
+        return modifiedByUser;
+    }
+
+    public void setModifiedByUser(UserInfo modifiedByUser)
+    {
+        this.modifiedByUser = modifiedByUser;
+    }
+
+    public UserInfo getSharedByUser()
+    {
+        return sharedByUser;
+    }
+
+    public void setSharedByUser(UserInfo sharedByUser)
+    {
+        this.sharedByUser = sharedByUser;
+    }
+
+    /**
+     * Retrieve the allowable operations for the shared link.
+     *
+     * @return List of operation labels, e.g. "delete"
+     */
+    public List<String> getAllowableOperations()
+    {
+        return allowableOperations;
+    }
+
+    public void setAllowableOperations(List<String> allowableOperations)
+    {
+        this.allowableOperations = allowableOperations;
+    }
+
+    /**
+     * Retrieve the allowable operations for the actual file being shared.
+     *
+     * @return List of operation labels, e.g. "delete"
+     */
+    public List<String> getAllowableOperationsOnTarget()
+    {
+        return allowableOperationsOnTarget;
+    }
+
+    public void setAllowableOperationsOnTarget(List<String> allowableOperationsOnTarget)
+    {
+        this.allowableOperationsOnTarget = allowableOperationsOnTarget;
+    }
+
+    // eg. for debug logging etc
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("QuickShareLink [id=").append(getId());
+        sb.append(", nodeId=").append(getNodeId());
+        sb.append(", name=").append(getName());
+        sb.append(", title=").append(getTitle());
+        sb.append(", description=").append(getDescription());
+        sb.append(", path=").append(getPath());
+        sb.append(", modifiedAt=").append(getModifiedAt());
+        sb.append(", modifiedByUser=").append(getModifiedByUser());
+        sb.append(", sharedByUser=").append(getSharedByUser());
+        sb.append(", content=").append(getContent());
+        sb.append(", allowableOperations=").append(getAllowableOperations());
+        sb.append(", allowableOperationsOnTarget=").append(getAllowableOperationsOnTarget());
+        sb.append(", expiresAt=").append(getExpiresAt());
+        sb.append(", properties=").append(getProperties());
+        sb.append("]");
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/QuickShareLinkEmailRequest.java b/remote-api/src/main/java/org/alfresco/rest/api/model/QuickShareLinkEmailRequest.java
new file mode 100644
index 00000000000..1c3f6422bfd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/QuickShareLinkEmailRequest.java
@@ -0,0 +1,95 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+import java.util.List;
+
+/**
+ * Representation of an email request for the quick share link
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class QuickShareLinkEmailRequest
+{
+    private String client;
+    private String message;
+    private String locale;
+    private List<String> recipientEmails;
+
+    public String getClient()
+    {
+        return client;
+    }
+
+    public QuickShareLinkEmailRequest setClient(String client)
+    {
+        this.client = client;
+        return this;
+    }
+
+    public String getMessage()
+    {
+        return message;
+    }
+
+    public void setMessage(String message)
+    {
+        this.message = message;
+    }
+
+    public String getLocale()
+    {
+        return locale;
+    }
+
+    public void setLocale(String locale)
+    {
+        this.locale = locale;
+    }
+
+    public List<String> getRecipientEmails()
+    {
+        return recipientEmails;
+    }
+
+    public void setRecipientEmails(List<String> recipientEmails)
+    {
+        this.recipientEmails = recipientEmails;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder(250);
+        sb.append("QuickShareLinkEmailRequest [client=").append(client)
+                    .append(", message=").append(message)
+                    .append(", locale=").append(locale)
+                    .append(", recipientEmails=").append(recipientEmails)
+                    .append(']');
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Quota.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Quota.java
new file mode 100644
index 00000000000..30d9d87cedf
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Quota.java
@@ -0,0 +1,93 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Represents a network quota.
+ * 
+ * @author steveglover
+ *
+ */
+public class Quota
+{
+	private String name;
+	private Long limit;
+	private Long usage;
+	
+	public Quota()
+	{
+	}
+
+	public Quota(String name, Long limit, Long usage)
+	{
+		this.name = name;
+		this.limit = limit;
+		this.usage = usage;
+	}
+
+	@JsonProperty("id")
+	@UniqueId
+	public String getName()
+	{
+		return name;
+	}
+	
+	public void setName(String name)
+	{
+		this.name = name;
+	}
+
+	public Long getLimit()
+	{
+		return limit;
+	}
+
+	public void setLimit(Long limit)
+	{
+		this.limit = limit;
+	}
+
+	public Long getUsage()
+	{
+		return usage;
+	}
+
+	public void setUsage(Long usage)
+	{
+		this.usage = usage;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Quota [name=" + name + ", limit=" + limit + ", usage=" + usage
+				+ "]";
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Rendition.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Rendition.java
new file mode 100644
index 00000000000..47e24d03afe
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Rendition.java
@@ -0,0 +1,86 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.model;
+
+/**
+ * Representation of a rendition.
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class Rendition
+{
+    public enum RenditionStatus
+    {
+        CREATED,
+        NOT_CREATED
+    }
+
+    private String id;
+    private RenditionStatus status;
+    private ContentInfo contentInfo;
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public RenditionStatus getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(RenditionStatus status)
+    {
+        this.status = status;
+    }
+
+    public ContentInfo getContent()
+    {
+        return contentInfo;
+    }
+
+    public void setContent(ContentInfo contentInfo)
+    {
+        this.contentInfo = contentInfo;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder(150);
+        sb.append("Rendition [id=").append(id)
+                    .append(", status=").append(status)
+                    .append(", contentInfo=").append(contentInfo)
+                    .append(']');
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/RepositoryInfo.java b/remote-api/src/main/java/org/alfresco/rest/api/model/RepositoryInfo.java
new file mode 100644
index 00000000000..f65aa8c5c7a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/RepositoryInfo.java
@@ -0,0 +1,480 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import org.alfresco.service.descriptor.Descriptor;
+import org.alfresco.service.license.LicenseDescriptor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * Representation of the repository information.
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class RepositoryInfo
+{
+    private String id;
+    private String edition;
+    private VersionInfo version;
+    private LicenseInfo license;
+    private StatusInfo status;
+    private List<ModulePackage> modules;
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public RepositoryInfo setId(String id)
+    {
+        this.id = id;
+        return this;
+    }
+
+    public String getEdition()
+    {
+        return edition;
+    }
+
+    public RepositoryInfo setEdition(String edition)
+    {
+        this.edition = edition;
+        return this;
+    }
+
+    public VersionInfo getVersion()
+    {
+        return version;
+    }
+
+    public RepositoryInfo setVersion(VersionInfo version)
+    {
+        this.version = version;
+        return this;
+    }
+
+    public LicenseInfo getLicense()
+    {
+        return license;
+    }
+
+    public RepositoryInfo setLicense(LicenseInfo license)
+    {
+        this.license = license;
+        return this;
+    }
+
+    public StatusInfo getStatus()
+    {
+        return status;
+    }
+
+    public RepositoryInfo setStatus(StatusInfo status)
+    {
+        this.status = status;
+        return this;
+    }
+
+    public List<ModulePackage> getModules()
+    {
+        return modules;
+    }
+
+    public RepositoryInfo setModules(List<ModulePackage> modules)
+    {
+        this.modules = modules;
+        return this;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder(450);
+        sb.append("RepositoryInfo [edition=").append(edition)
+                    .append(", version=").append(version)
+                    .append(", license=").append(license)
+                    .append(", status=").append(status)
+                    .append(", modules=").append(modules)
+                    .append(']');
+        return sb.toString();
+    }
+
+    /**
+     * Representation of the repository version information.
+     *
+     * @author Jamal Kaabi-Mofrad
+     */
+    public static class VersionInfo
+    {
+        private static final Pattern HOTFIX_PATTERN = Pattern.compile("^[0-9]+$");
+        private String major;
+        private String minor;
+        private String patch;
+        private String hotfix;
+        private int schema;
+        private String label;
+        private String display;
+
+        // Default constructor required for test purposes
+        public VersionInfo()
+        {
+        }
+
+        public VersionInfo(Descriptor descriptor)
+        {
+            this.major = descriptor.getVersionMajor();
+            this.minor = descriptor.getVersionMinor();
+            this.patch = descriptor.getVersionRevision();
+            this.hotfix = getHotfix(descriptor.getVersionLabel());
+            this.schema = descriptor.getSchema();
+            this.label = descriptor.getVersionBuild();
+            this.display = getVersionDisplay();
+        }
+
+        public String getMajor()
+        {
+            return major;
+        }
+
+        public String getMinor()
+        {
+            return minor;
+        }
+
+        public String getPatch()
+        {
+            return patch;
+        }
+
+        public String getHotfix()
+        {
+            return hotfix;
+        }
+
+        public int getSchema()
+        {
+            return schema;
+        }
+
+        public String getLabel()
+        {
+            return label;
+        }
+
+        public String getDisplay()
+        {
+            return display;
+        }
+
+        private String getHotfix(String versionLabel)
+        {
+            /*
+             * if the label starts with a dot, then digit(s), or just digit(s), we return the number only.
+             * for anything else zero will be returned.
+             */
+            if (StringUtils.isNotEmpty(versionLabel))
+            {
+                if (versionLabel.startsWith("."))
+                {
+                    versionLabel = versionLabel.substring(1);
+                }
+                Matcher matcher = HOTFIX_PATTERN.matcher(versionLabel);
+                if (matcher.find())
+                {
+                    return versionLabel;
+                }
+            }
+            return Integer.toString(0);
+        }
+
+        private String getVersionDisplay()
+        {
+            StringBuilder version = new StringBuilder(major);
+            version.append('.')
+                        .append(minor)
+                        .append('.')
+                        .append(patch)
+                        .append('.')
+                        .append(getHotfix());
+
+            if (StringUtils.isNotEmpty(label))
+            {
+                version.append(" (").append(label).append(") ");
+            }
+            version.append("schema ").append(schema);
+
+            // Display example: "5.2.0.1 (r123456-b0) schema 10001"
+            return version.toString();
+        }
+
+        @Override
+        public String toString()
+        {
+            final StringBuilder sb = new StringBuilder(250);
+            sb.append("VersionInfo [major=").append(major)
+                        .append(", minor=").append(minor)
+                        .append(", patch=").append(patch)
+                        .append(", hotfix=").append(hotfix)
+                        .append(", schema=").append(schema)
+                        .append(", label=").append(label)
+                        .append(", display=").append(display)
+                        .append(']');
+            return sb.toString();
+        }
+    }
+
+    /**
+     * Representation of the license information.
+     *
+     * @author Jamal Kaabi-Mofrad
+     */
+    public static class LicenseInfo
+    {
+        private Date issuedAt;
+        private Date expiresAt;
+        private Integer remainingDays;
+        private String holder;
+        private String mode;
+        private LicenseEntitlement entitlements;
+
+        // Default constructor required for test purposes
+        public LicenseInfo()
+        {
+        }
+
+        public LicenseInfo(LicenseDescriptor licenseDescriptor)
+        {
+            this.issuedAt = licenseDescriptor.getIssued();
+            this.expiresAt = licenseDescriptor.getValidUntil();
+            this.remainingDays = licenseDescriptor.getRemainingDays();
+            this.holder = licenseDescriptor.getHolderOrganisation();
+            this.mode = licenseDescriptor.getLicenseMode().name();
+            this.entitlements = new LicenseEntitlement()
+                        .setMaxDocs(licenseDescriptor.getMaxDocs())
+                        .setMaxUsers(licenseDescriptor.getMaxUsers())
+                        .setClusterEnabled(licenseDescriptor.isClusterEnabled())
+                        .setCryptodocEnabled(licenseDescriptor.isCryptodocEnabled());
+        }
+
+        public Date getIssuedAt()
+        {
+            return issuedAt;
+        }
+
+        public Date getExpiresAt()
+        {
+            return expiresAt;
+        }
+
+        public Integer getRemainingDays()
+        {
+            return remainingDays;
+        }
+
+        public String getHolder()
+        {
+            return holder;
+        }
+
+        public String getMode()
+        {
+            return mode;
+        }
+
+        public LicenseEntitlement getEntitlements()
+        {
+            return entitlements;
+        }
+
+        @Override
+        public String toString()
+        {
+            final StringBuilder sb = new StringBuilder(250);
+            sb.append("LicenseInfo [issuedAt=").append(issuedAt)
+                        .append(", expiresAt=").append(expiresAt)
+                        .append(", remainingDays=").append(remainingDays)
+                        .append(", holder=").append(holder)
+                        .append(", mode=").append(mode)
+                        .append(", entitlements=").append(entitlements)
+                        .append(']');
+            return sb.toString();
+        }
+    }
+
+    /**
+     * Representation of the license's entitlement.
+     *
+     * @author Jamal Kaabi-Mofrad
+     */
+    public static class LicenseEntitlement
+    {
+        private Long maxUsers;
+        private Long maxDocs;
+        private boolean isClusterEnabled;
+        private boolean isCryptodocEnabled;
+
+        public LicenseEntitlement()
+        {
+        }
+
+        public Long getMaxUsers()
+        {
+            return maxUsers;
+        }
+
+        public LicenseEntitlement setMaxUsers(Long maxUsers)
+        {
+            this.maxUsers = maxUsers;
+            return this;
+        }
+
+        public Long getMaxDocs()
+        {
+            return maxDocs;
+        }
+
+        public LicenseEntitlement setMaxDocs(Long maxDocs)
+        {
+            this.maxDocs = maxDocs;
+            return this;
+        }
+
+        public boolean getIsClusterEnabled()
+        {
+            return isClusterEnabled;
+        }
+
+        public LicenseEntitlement setClusterEnabled(boolean clusterEnabled)
+        {
+            isClusterEnabled = clusterEnabled;
+            return this;
+        }
+
+        public boolean getIsCryptodocEnabled()
+        {
+            return isCryptodocEnabled;
+        }
+
+        public LicenseEntitlement setCryptodocEnabled(boolean cryptodocEnabled)
+        {
+            isCryptodocEnabled = cryptodocEnabled;
+            return this;
+        }
+
+        @Override
+        public String toString()
+        {
+            final StringBuilder sb = new StringBuilder(100);
+            sb.append("LicenseEntitlement [maxUsers=").append(maxUsers)
+                        .append(", maxDocs=").append(maxDocs)
+                        .append(", isClusterEnabled=").append(isClusterEnabled)
+                        .append(", isCryptodocEnabled=").append(isCryptodocEnabled)
+                        .append(']');
+            return sb.toString();
+        }
+    }
+
+    /**
+     * Representation of the repository status information.
+     *
+     * @author Jamal Kaabi-Mofrad
+     */
+    public static class StatusInfo
+    {
+        private boolean isReadOnly;
+        private boolean isAuditEnabled;
+        private boolean isQuickShareEnabled;
+        private boolean isThumbnailGenerationEnabled;
+
+        public StatusInfo()
+        {
+        }
+
+        public boolean getIsReadOnly()
+        {
+            return isReadOnly;
+        }
+
+        public StatusInfo setReadOnly(boolean readOnly)
+        {
+            isReadOnly = readOnly;
+            return this;
+        }
+
+        public boolean getIsAuditEnabled()
+        {
+            return isAuditEnabled;
+        }
+
+        public StatusInfo setAuditEnabled(boolean auditEnabled)
+        {
+            isAuditEnabled = auditEnabled;
+            return this;
+        }
+
+        public boolean getIsQuickShareEnabled()
+        {
+            return isQuickShareEnabled;
+        }
+
+        public StatusInfo setQuickShareEnabled(boolean quickShareEnabled)
+        {
+            isQuickShareEnabled = quickShareEnabled;
+            return this;
+        }
+
+        public boolean getIsThumbnailGenerationEnabled()
+        {
+            return isThumbnailGenerationEnabled;
+        }
+
+        public StatusInfo setThumbnailGenerationEnabled(boolean isThumbnailGenerationEnabled)
+        {
+            this.isThumbnailGenerationEnabled = isThumbnailGenerationEnabled;
+            return this;
+        }
+
+        @Override
+        public String toString()
+        {
+            final StringBuilder sb = new StringBuilder(250);
+            sb.append("StatusInfo [isReadOnly=").append(isReadOnly)
+                        .append(", isAuditEnabled=").append(isAuditEnabled)
+                        .append(", isQuickShareEnabled=").append(isQuickShareEnabled)
+                        .append(", isThumbnailGenerationEnabled=").append(isThumbnailGenerationEnabled)
+                        .append(']');
+            return sb.toString();
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Site.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Site.java
new file mode 100644
index 00000000000..4860e26df7f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Site.java
@@ -0,0 +1,209 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteVisibility;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Represents a site.
+ * 
+ * @author steveglover
+ *
+ */
+public class Site implements Comparable<Site>
+{
+    protected String id; // site id (aka short name)
+    protected String guid; // site nodeId
+    protected String title;
+    protected String description;
+    protected SiteVisibility visibility;
+    protected String preset;
+    protected String role;
+
+    private Map<String, Boolean> setFields = new HashMap<>(7);
+
+    public static final String ID = "id";
+    public static final String GUID = "guid";
+    public static final String TITLE = "title";
+    public static final String DESCRIPTION = "description";
+    public static final String VISIBILITY = "visibility";
+    public static final String PRESET = "preset";
+    public static final String ROLE = "role";
+
+    public Site()
+    {
+    }
+
+    public Site(SiteInfo siteInfo, String role)
+    {
+        if (siteInfo == null)
+        {
+            throw new IllegalArgumentException("Must provide siteInfo");
+        }
+        setId(siteInfo.getShortName());
+        setGuid(siteInfo.getNodeRef().getId());
+        setTitle(siteInfo.getTitle());
+        setDescription(siteInfo.getDescription());
+        setVisibility(siteInfo.getVisibility());
+        setPreset(siteInfo.getSitePreset());
+        setRole(role);
+    }
+
+    @UniqueId
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+        setFields.put(ID, true);
+    }
+
+    public String getGuid()
+    {
+        return guid;
+    }
+
+    public void setGuid(String guid)
+    {
+        this.guid = guid;
+        setFields.put(GUID, true);
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public void setTitle(String title)
+    {
+        this.title = title;
+        setFields.put(TITLE, true);
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public void setDescription(String description)
+    {
+        this.description = description;
+        setFields.put(DESCRIPTION, true);
+    }
+
+    public SiteVisibility getVisibility()
+    {
+        return visibility;
+    }
+
+    public void setVisibility(SiteVisibility visibility)
+    {
+        this.visibility = visibility;
+        setFields.put(VISIBILITY, true);
+    }
+
+    public String getPreset()
+    {
+        return preset;
+    }
+
+    public void setPreset(String preset)
+    {
+        this.preset = preset;
+        setFields.put(PRESET, true);
+    }
+
+    public String getRole()
+    {
+        return role;
+    }
+
+    public void setRole(String role)
+    {
+        this.role = role;
+        setFields.put(ROLE, true);
+    }
+
+    public boolean wasSet(String fieldName)
+    {
+        Boolean b = setFields.get(fieldName);
+        return (b != null ? b : false);
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+
+        if (obj == null)
+        {
+            return false;
+        }
+
+        if (getClass() != obj.getClass())
+        {
+            return false;
+        }
+
+        Site other = (Site) obj;
+        return id.equals(other.id);
+    }
+
+    @Override
+    public int compareTo(Site site)
+    {
+        return id.compareTo(site.getId());
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+                + ((id == null) ? 0 : id.hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "Site [id=" + id + ", guid=" + guid + ", title=" + title
+                + ", description=" + description + ", visibility=" + visibility
+                + "]";
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/SiteContainer.java b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteContainer.java
new file mode 100644
index 00000000000..c3d8874aac9
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteContainer.java
@@ -0,0 +1,119 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * Represents a site container.
+ * 
+ * @author steveglover
+ *
+ */
+public class SiteContainer implements Comparable<SiteContainer>
+{
+	private String folderId;
+	private NodeRef nodeRef;
+
+	public SiteContainer()
+	{
+	}
+
+	public SiteContainer(String folderId, NodeRef nodeRef)
+	{
+		super();
+		if(folderId == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		if(nodeRef == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.folderId = folderId;
+		this.nodeRef = nodeRef;
+	}
+
+	public String getFolderId()
+	{
+		return folderId;
+	}
+
+	@JsonProperty("id")
+	@UniqueId
+	public NodeRef getNodeRef()
+	{
+		return nodeRef;
+	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result
+				+ ((folderId == null) ? 0 : folderId.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) 
+	{
+		if (this == obj)
+		{
+			return true;
+		}
+		
+		if (obj == null)
+		{
+			return false;
+		}
+		
+		if (getClass() != obj.getClass())
+		{
+			return false;
+		}
+		
+		SiteContainer other = (SiteContainer) obj;
+		return nodeRef.equals(other.getNodeRef());
+	}
+
+	@Override
+	public int compareTo(SiteContainer other)
+	{
+		return folderId.compareTo(other.getFolderId());
+	}
+
+	@Override
+	public String toString()
+	{
+		return "SiteContainer [folderId=" + folderId + ", nodeRef="
+				+ nodeRef + "]";
+	}
+	
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/SiteGroup.java b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteGroup.java
new file mode 100644
index 00000000000..45b33381aa9
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteGroup.java
@@ -0,0 +1,143 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.api.groups.GroupsEntityResource;
+import org.alfresco.rest.framework.resource.EmbeddedEntityResource;
+import org.alfresco.rest.framework.resource.UniqueId;
+
+public class SiteGroup implements Comparable<SiteGroup>
+{
+    private String role;
+    private String id; // group id (aka authority name)
+
+    public SiteGroup() {}
+
+    public SiteGroup(String id, String role)
+    {
+        if (id == null)
+        {
+            throw new IllegalArgumentException();
+        }
+        if (role == null)
+        {
+            throw new IllegalArgumentException();
+        }
+        this.role = role;
+        this.id = id;
+    }
+
+    public static SiteGroup getMemberOfSite(String id, String role)
+    {
+        return new SiteGroup(id, role);
+    }
+
+    @JsonProperty("id")
+    @UniqueId
+    @EmbeddedEntityResource(propertyName = "group", entityResource = GroupsEntityResource.class)
+    public String getId()
+    {
+        return id;
+    }
+
+    public String getRole()
+    {
+        return role;
+    }
+
+    public void setRole(String role)
+    {
+        if (role == null)
+        {
+            throw new IllegalArgumentException();
+        }
+        this.role = role;
+    }
+
+    public void setId(String id)
+    {
+        if (id == null)
+        {
+            throw new IllegalArgumentException();
+        }
+        this.id = id;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((role == null) ? 0 : role.hashCode());
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+
+        if (obj == null)
+        {
+            return false;
+        }
+
+        if (getClass() != obj.getClass())
+        {
+            return false;
+        }
+
+        SiteGroup other = (SiteGroup) obj;
+        if (role != other.role)
+        {
+            return false;
+        }
+
+        return id.equals(other.id);
+    }
+
+    @Override
+    public int compareTo(SiteGroup o)
+    {
+        int i = id.compareTo(o.getId());
+        if (i == 0)
+        {
+            i = role.compareTo(o.getRole());
+        }
+        return i;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "SiteGroup [role='" + role + '\'' + ", id='" + id + '\'' + ", role='" + role + '\'' + "]";
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/SiteMember.java b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteMember.java
new file mode 100644
index 00000000000..f51757cba2b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteMember.java
@@ -0,0 +1,170 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.api.people.PeopleEntityResource;
+import org.alfresco.rest.framework.resource.EmbeddedEntityResource;
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Represents site membership.
+ * 
+ * @author steveglover
+ *
+ */
+public class SiteMember
+{
+	private String personId;
+	private String role;
+	private boolean isMemberOfGroup;
+
+	public SiteMember()
+	{
+	}
+
+	public SiteMember(String personId, String role)
+	{
+		super();
+		if(personId == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		if(role == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.personId = personId;
+		this.role = role;
+	}
+
+	public SiteMember(String personId, String role, boolean isMemberOfGroup)
+	{
+		super();
+		if(personId == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		if(role == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.personId = personId;
+		this.role = role;
+		this.isMemberOfGroup = isMemberOfGroup;
+	}
+
+	@JsonProperty("id")
+	@UniqueId
+	@EmbeddedEntityResource(propertyName = "person", entityResource = PeopleEntityResource.class)
+	public String getPersonId()
+	{
+		return personId;
+	}
+
+	public String getRole()
+	{
+		return role;
+	}
+
+	public void setRole(String role)
+	{
+		if(role == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.role = role;
+	}
+
+	public void setPersonId(String personId)
+	{
+		if(personId == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.personId = personId;
+	}
+
+	public void setIsMemberOfGroup(boolean isMemberOfGroup)
+	{
+		this.isMemberOfGroup = isMemberOfGroup;
+	}
+
+	public boolean getIsMemberOfGroup()
+	{
+		return isMemberOfGroup;
+	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result
+				+ ((personId == null) ? 0 : personId.hashCode());
+		result = prime * result + ((role == null) ? 0 : role.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+		{
+			return true;
+		}
+		
+		if (obj == null)
+		{
+			return false;
+		}
+		
+		if (getClass() != obj.getClass())
+		{
+			return false;
+		}
+		
+		SiteMember other = (SiteMember) obj;
+		if (!personId.equals(other.personId))
+		{
+			return false;
+		}
+		
+		if (isMemberOfGroup != other.isMemberOfGroup)
+		{
+			return false;
+		}
+
+		return(role == other.role);
+	}
+
+	@Override
+	public String toString()
+	{
+		return "SiteMember [personId=" + personId + ", isMemberOfGroup=" + isMemberOfGroup + ", role=" + role + "]";
+	}
+	
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/SiteMembershipApproval.java b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteMembershipApproval.java
new file mode 100644
index 00000000000..02d21c22643
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteMembershipApproval.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+public class SiteMembershipApproval
+{
+
+    private String role;
+
+    public String getRole()
+    {
+        return role;
+    }
+
+    public void setRole(String role)
+    {
+        this.role = role;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "SiteMembershipApproval [role=" + role + "]";
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/SiteMembershipRejection.java b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteMembershipRejection.java
new file mode 100644
index 00000000000..447fb6afcd5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteMembershipRejection.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+public class SiteMembershipRejection
+{
+
+    private String comment;
+
+    public String getComment()
+    {
+        return comment;
+    }
+
+    public void setComment(String comment)
+    {
+        this.comment = comment;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "SiteMembershipRejection [comment=" + comment + "]";
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/SiteMembershipRequest.java b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteMembershipRequest.java
new file mode 100644
index 00000000000..e946016e0d2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteMembershipRequest.java
@@ -0,0 +1,195 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.text.Collator;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.alfresco.rest.api.sites.SiteEntityResource;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.EmbeddedEntityResource;
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.util.Pair;
+
+/**
+ * Representation of a site membership request for a specific user.
+ * 
+ * Ordering is by id (site id).
+ * 
+ * @author steveglover
+ *
+ */
+public class SiteMembershipRequest implements Comparable<SiteMembershipRequest>
+{
+	private static Collator collator = Collator.getInstance();
+
+    private String id; // site id
+    private String message;
+    private Date createdAt;
+    private Date modifiedAt;
+    private String title; // for sorting only
+	private Person person;
+
+	public static Pair<String, String> splitId(String id)
+	{
+		int idx = id.indexOf(":");
+		if(idx != -1)
+		{
+			String workflowId = id.substring(0, idx);
+			String key = id.substring(idx + 1);
+			Pair<String, String> ret = new Pair<String, String>(workflowId, key);
+			return ret;
+		}
+		else
+		{
+			throw new InvalidArgumentException("Site invite id is invalid: " + id);
+		}
+	}
+
+    public SiteMembershipRequest()
+    {
+    }
+
+    @EmbeddedEntityResource(propertyName = "site", entityResource = SiteEntityResource.class)
+	@UniqueId
+    public String getId()
+    {
+		return id;
+    }
+
+    public void setId(String id)
+    {
+		this.id = id;
+    }
+    
+	public void setTitle(String title)
+	{
+		this.title = title;
+	}
+
+	@JsonIgnore
+	public String getTitle()
+	{
+		return title;
+	}
+
+	public Date getCreatedAt()
+	{
+		return createdAt;
+	}
+
+	public void setCreatedAt(Date createdAt)
+	{
+		this.createdAt = createdAt;
+	}
+
+	public Date getModifiedAt()
+	{
+		return modifiedAt;
+	}
+
+	public void setModifiedAt(Date modifiedAt)
+	{
+		this.modifiedAt = modifiedAt;
+	}
+
+	public String getMessage()
+	{
+		return message;
+	}
+
+	public void setMessage(String message)
+	{
+		this.message = message;
+	}
+
+    public Person getPerson()
+    {
+        return person;
+    }
+
+    public void setPerson(Person person)
+    {
+        this.person = person;
+    }
+
+	@Override
+	public String toString()
+	{
+		return "SiteMembershipRequest [id=" + id + ", message=" + message + ", createdAt=" + createdAt
+				+ ", modifiedAt=" + modifiedAt + "]";
+	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		SiteMembershipRequest other = (SiteMembershipRequest) obj;
+		if (id == null)
+		{
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		return true;
+	}
+
+	@Override
+	public int compareTo(SiteMembershipRequest o)
+	{
+		int ret = 0;
+
+		if(title == null && o.getTitle() != null)
+		{
+			ret = -1;
+		}
+		else if(title != null && o.getTitle() == null)
+		{
+			ret = 1;
+		}
+		else
+		{
+			ret = collator.compare(title, o.getTitle());
+		}
+
+		return ret;
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/SiteTarget.java b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteTarget.java
new file mode 100644
index 00000000000..74a234ef9a4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteTarget.java
@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+
+/**
+ * A site target favourite.
+ * 
+ * @author steveglover
+ *
+ */
+public class SiteTarget extends Target
+{
+	private Site site;
+
+	public SiteTarget()
+	{
+		super();
+	}
+
+	public SiteTarget(Site site)
+	{
+		super();
+		this.site = site;
+	}
+
+	public void setSite(Site site)
+	{
+		this.site = site;
+	}
+
+	public Site getSite()
+	{
+		return site;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "SiteTarget [site=" + site + "]";
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/SiteUpdate.java b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteUpdate.java
new file mode 100644
index 00000000000..1d5a48e6d67
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/SiteUpdate.java
@@ -0,0 +1,135 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import org.alfresco.service.cmr.site.SiteVisibility;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Class representing a site update API operation.
+ *
+ * @author Matt Ward
+ * @since 5.2
+ */
+public class SiteUpdate implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+    private String title;
+    private String description;
+    private SiteVisibility visibility;
+
+    private Map<String, Boolean> setFields = new HashMap<>(3);
+
+    public static final String TITLE = "title";
+    public static final String DESCRIPTION = "description";
+    public static final String VISIBILITY = "visibility";
+
+    public SiteUpdate()
+    {
+    }
+
+    public SiteUpdate(String title, String description, SiteVisibility visibility)
+    {
+        setTitle(title);
+        setDescription(description);
+        setVisibility(visibility);
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public void setTitle(String title)
+    {
+        this.title = title;
+        setFields.put(TITLE, true);
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public void setDescription(String description)
+    {
+        this.description = description;
+        setFields.put(DESCRIPTION, true);
+    }
+
+    public SiteVisibility getVisibility()
+    {
+        return visibility;
+    }
+
+    public void setVisibility(SiteVisibility visibility)
+    {
+        this.visibility = visibility;
+        setFields.put(VISIBILITY, true);
+    }
+
+    public boolean wasSet(String fieldName)
+    {
+        Boolean b = setFields.get(fieldName);
+        return (b != null ? b : false);
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        SiteUpdate that = (SiteUpdate) o;
+
+        if (title != null ? !title.equals(that.title) : that.title != null) return false;
+        if (description != null ? !description.equals(that.description) : that.description != null) return false;
+        return visibility == that.visibility;
+
+    }
+
+    @Override
+    public int hashCode()
+    {
+        int result = title != null ? title.hashCode() : 0;
+        result = 31 * result + (description != null ? description.hashCode() : 0);
+        result = 31 * result + (visibility != null ? visibility.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "SiteUpdate{" +
+                "title='" + title + '\'' +
+                ", description='" + description + '\'' +
+                ", visibility=" + visibility +
+                '}';
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Tag.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Tag.java
new file mode 100644
index 00000000000..1fb4c16088b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Tag.java
@@ -0,0 +1,140 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * Represents a node tag.
+ * 
+ * @author steveglover
+ *
+ */
+public class Tag implements Comparable<Tag>
+{
+	private NodeRef nodeRef;
+	private String tag;
+	private Integer count;
+
+    public Tag()
+	{
+	}
+	
+	public Tag(NodeRef nodeRef, String tag)
+	{
+		this.nodeRef = nodeRef;
+		this.tag = tag;
+	}
+
+	@JsonProperty("id")
+	@UniqueId
+	public NodeRef getNodeRef()
+	{
+		return nodeRef;
+	}
+
+	public void setNodeRef(NodeRef nodeRef)
+	{
+		this.nodeRef = nodeRef;
+	}
+
+	public String getTag()
+	{
+		return tag;
+	}
+
+	public void setTag(String tag)
+	{
+		this.tag = tag;
+	}
+	
+	public Integer getCount()
+	{
+	
+	    return count;
+	}
+
+	public void setCount(Integer count)
+	{
+	    this.count = count;
+	}
+
+	/*
+	 * Note that comparison of tags is based on their string value. This should still
+	 * be consistent with equals since tags that are equal implies NodeRefs that are equal.
+	 * 
+	 * (non-Javadoc)
+	 * @see java.lang.Comparable#compareTo(java.lang.Object)
+	 */
+	@Override
+	public int compareTo(Tag o)
+	{
+		int ret = getTag().compareTo(o.getTag());
+		return ret;
+	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((nodeRef == null) ? 0 : nodeRef.hashCode());
+		return result;
+	}
+
+	/*
+	 * Tags are equal if they have the same NodeRef
+	 * 
+	 * (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Tag other = (Tag) obj;
+		if (nodeRef == null) {
+			if (other.nodeRef != null)
+				return false;
+		} else if (!nodeRef.equals(other.nodeRef))
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Tag [nodeRef=" + nodeRef + ", tag=" + tag + "]";
+	}
+	
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Target.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Target.java
new file mode 100644
index 00000000000..d01bd6dc9da
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Target.java
@@ -0,0 +1,36 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+/**
+ * A favourite target entity.
+ * 
+ * @author steveglover
+ *
+ */
+public abstract class Target
+{
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/UserInfo.java b/remote-api/src/main/java/org/alfresco/rest/api/model/UserInfo.java
new file mode 100644
index 00000000000..b17c529f664
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/UserInfo.java
@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import java.io.Serializable;
+
+/**
+ * Representation of a user info
+ *
+ * @author janv
+ */
+public class UserInfo implements Serializable
+{
+    private String id;
+    private String displayName;
+
+    public UserInfo()
+    {
+    }
+
+    public UserInfo(String id, String firstName, String lastName)
+    {
+        this.id = id;
+        this.displayName = ((firstName != null ? firstName + " " : "") + (lastName != null ? lastName : "")).trim();
+    }
+
+    public String getDisplayName()
+    {
+        return displayName;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "User [id=" + id + ", displayName=" + displayName + "]";
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/UserRating.java b/remote-api/src/main/java/org/alfresco/rest/api/model/UserRating.java
new file mode 100644
index 00000000000..c569bd596c2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/UserRating.java
@@ -0,0 +1,69 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Represents a user rating for a node.
+ * 
+ * @author steveglover
+ *
+ */
+public class UserRating
+{
+	private Float userRating;
+	private String personId;
+
+	public UserRating(String personId, Float userRating)
+	{
+		super();
+		this.userRating = userRating;
+		this.personId = personId;
+	}
+
+	public Float getUserRating()
+	{
+		return userRating;
+	}
+
+	@JsonProperty("id")
+	@UniqueId
+	public String getPersonId()
+	{
+		return personId;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "UserRating [userRating=" + userRating + ", personId="
+				+ personId + "]";
+	}
+	
+	
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/VersionOptions.java b/remote-api/src/main/java/org/alfresco/rest/api/model/VersionOptions.java
new file mode 100644
index 00000000000..c81846d2d17
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/VersionOptions.java
@@ -0,0 +1,63 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.model;
+
+/**
+ * Version Options
+ *
+ * Initially, used by version revert. Should also be consistent with version options used with Node Create & Update.
+ *
+ * @author janv
+ */
+public class VersionOptions
+{
+    private Boolean majorVersion;
+    private String comment;
+
+    public VersionOptions()
+    {
+    }
+
+    public String getComment()
+    {
+        return comment;
+    }
+
+    public void setComment(String comment)
+    {
+        this.comment = comment;
+    }
+
+    public Boolean getMajorVersion()
+    {
+        return majorVersion;
+    }
+
+    public void setMajorVersion(Boolean majorVersion)
+    {
+        this.majorVersion = majorVersion;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/modules/ModulePackagesEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/modules/ModulePackagesEntityResource.java
new file mode 100644
index 00000000000..9bfdd99d439
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/modules/ModulePackagesEntityResource.java
@@ -0,0 +1,86 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.modules;
+
+import org.alfresco.rest.api.model.CustomModel;
+import org.alfresco.rest.api.model.ModulePackage;
+import org.alfresco.rest.api.model.Site;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.module.ModuleDetails;
+import org.alfresco.service.cmr.module.ModuleService;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Returns Alfresco Module Information.
+ */
+@EntityResource(name="modulepackages", title = "Installed Modules Packages")
+public class ModulePackagesEntityResource implements   EntityResourceAction.Read<ModulePackage>,
+                                                EntityResourceAction.ReadById<ModulePackage>
+{
+    @Autowired
+    ModuleService moduleService;
+
+    @Override
+    @WebApiDescription(title="Returns ModulePackage information for the given module.")
+    public ModulePackage readById(String modelName, Parameters parameters) throws EntityNotFoundException
+    {
+        ModuleDetails moduleDetails = moduleService.getModule(modelName);
+        if(moduleDetails == null)
+        {
+            // module does not exist
+            throw new EntityNotFoundException(modelName);
+        }
+        return ModulePackage.fromModuleDetails(moduleDetails);
+    }
+
+    @Override
+    @WebApiDescription(title="Returns a paged list of all Modules.")
+    public CollectionWithPagingInfo<ModulePackage> readAll(Parameters parameters)
+    {
+        List<ModuleDetails> details = moduleService.getAllModules();
+        if (details!= null && details.size()>0)
+        {
+            List<ModulePackage> packages = new ArrayList<>(details.size());
+            for (ModuleDetails detail : details)
+            {
+                packages.add(ModulePackage.fromModuleDetails(detail));
+            }
+            return CollectionWithPagingInfo.asPaged(parameters.getPaging(), packages);
+        }
+
+        return CollectionWithPagingInfo.asPaged(parameters.getPaging(), Collections.EMPTY_LIST);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/modules/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/modules/package-info.java
new file mode 100644
index 00000000000..7973a5f90eb
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/modules/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="alfresco", scope=Api.SCOPE.PRIVATE, version=1)
+package org.alfresco.rest.api.modules;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/networks/NetworksEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/networks/NetworksEntityResource.java
new file mode 100644
index 00000000000..6110b17eaf4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/networks/NetworksEntityResource.java
@@ -0,0 +1,63 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.networks;
+
+import org.alfresco.rest.api.Networks;
+import org.alfresco.rest.api.model.Network;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+@EntityResource(name="networks", title = "Networks entity")
+public class NetworksEntityResource implements EntityResourceAction.ReadById<Network>, InitializingBean
+{
+	public static final String NAME = "networks";
+
+	private Networks networks;
+
+	public void setNetworks(Networks networks)
+	{
+		this.networks = networks;
+	}
+
+	@Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("networks", this.networks);
+    }
+
+    @Override
+    @WebApiDescription(title = "Get Network Information", description = "Get information for the network with id 'networkId'")
+    @WebApiParam(name = "networkId", title = "The network name")
+    public Network readById(final String networkId, Parameters parameters)
+    {
+    	return networks.getNetwork(networkId);
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/networks/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/networks/package-info.java
new file mode 100644
index 00000000000..927d87bcbaf
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/networks/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="alfresco", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.api.networks;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/AbstractNodeRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/AbstractNodeRelation.java
new file mode 100644
index 00000000000..e8d08b7ead5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/AbstractNodeRelation.java
@@ -0,0 +1,230 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.nodes;
+
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.Assoc;
+import org.alfresco.rest.api.model.AssocChild;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.UserInfo;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.where.Query;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.workflow.api.impl.MapBasedQueryWalker;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.QNamePattern;
+import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.util.ParameterCheck;
+import org.alfresco.util.PropertyCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author janv
+ */
+public class AbstractNodeRelation implements InitializingBean
+{
+    // excluded namespaces (assoc types)
+    protected static final List<String> EXCLUDED_NS = Arrays.asList(NamespaceService.SYSTEM_MODEL_1_0_URI);
+
+    private final static Set<String> WHERE_PARAMS_ASSOC_TYPE =
+            new HashSet<>(Arrays.asList(new String[] {Nodes.PARAM_ASSOC_TYPE}));
+
+    protected ServiceRegistry sr;
+    protected NodeService nodeService;
+    protected NamespaceService namespaceService;
+    protected DictionaryService dictionaryService;
+    protected Nodes nodes;
+
+    public void setNodes(Nodes nodes)
+    {
+        this.nodes = nodes;
+    }
+
+    public void setServiceRegistry(ServiceRegistry sr)
+    {
+        this.sr = sr;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        PropertyCheck.mandatory(this, "serviceRegistry", sr);
+        ParameterCheck.mandatory("nodes", this.nodes);
+
+        this.nodeService = sr.getNodeService();
+        this.namespaceService = sr.getNamespaceService();
+        this.dictionaryService = sr.getDictionaryService();
+    }
+
+    protected QNamePattern getAssocTypeFromWhereElseAll(Parameters parameters)
+    {
+        QNamePattern assocTypeQNamePattern = RegexQNamePattern.MATCH_ALL;
+
+        Query q = parameters.getQuery();
+        if (q != null)
+        {
+            MapBasedQueryWalker propertyWalker = new MapBasedQueryWalker(WHERE_PARAMS_ASSOC_TYPE, null);
+            QueryHelper.walk(q, propertyWalker);
+
+            String assocTypeQNameStr = propertyWalker.getProperty(Nodes.PARAM_ASSOC_TYPE, WhereClauseParser.EQUALS, String.class);
+            if (assocTypeQNameStr != null)
+            {
+                assocTypeQNamePattern = nodes.getAssocType(assocTypeQNameStr);
+            }
+        }
+
+        return assocTypeQNamePattern;
+    }
+
+    protected CollectionWithPagingInfo<Node> listNodePeerAssocs(List<AssociationRef> assocRefs, Parameters parameters, boolean returnTarget)
+    {
+        Map<QName, String> qnameMap = new HashMap<>(3);
+
+        Map<String, UserInfo> mapUserInfo = new HashMap<>(10);
+
+        List<String> includeParam = parameters.getInclude();
+
+        List<Node> collection = new ArrayList<Node>(assocRefs.size());
+        for (AssociationRef assocRef : assocRefs)
+        {
+            // minimal info by default (unless "include"d otherwise)
+            NodeRef nodeRef = (returnTarget ? assocRef.getTargetRef() : assocRef.getSourceRef());
+
+            Node node = nodes.getFolderOrDocument(nodeRef, null, null, includeParam, mapUserInfo);
+
+            QName assocTypeQName = assocRef.getTypeQName();
+
+            if (! EXCLUDED_NS.contains(assocTypeQName.getNamespaceURI()))
+            {
+                String assocType = qnameMap.get(assocTypeQName);
+                if (assocType == null)
+                {
+                    assocType = assocTypeQName.toPrefixString(namespaceService);
+                    qnameMap.put(assocTypeQName, assocType);
+                }
+
+                node.setAssociation(new Assoc(assocType));
+
+                collection.add(node);
+            }
+        }
+        
+        return listPage(collection, parameters.getPaging());
+    }
+
+    protected CollectionWithPagingInfo<Node> listNodeChildAssocs(List<ChildAssociationRef> childAssocRefs, Parameters parameters, Boolean isPrimary, boolean returnChild)
+    {
+        Map<QName, String> qnameMap = new HashMap<>(3);
+
+        Map<String, UserInfo> mapUserInfo = new HashMap<>(10);
+
+        List<String> includeParam = parameters.getInclude();
+
+        List<Node> collection = new ArrayList<Node>(childAssocRefs.size());
+        for (ChildAssociationRef childAssocRef : childAssocRefs)
+        {
+            if (isPrimary == null || (isPrimary == childAssocRef.isPrimary()))
+            {
+                // minimal info by default (unless "include"d otherwise)
+                NodeRef nodeRef = (returnChild ? childAssocRef.getChildRef() : childAssocRef.getParentRef());
+
+                Node node = nodes.getFolderOrDocument(nodeRef, null, null, includeParam, mapUserInfo);
+
+                QName assocTypeQName = childAssocRef.getTypeQName();
+
+                if (!EXCLUDED_NS.contains(assocTypeQName.getNamespaceURI()))
+                {
+                    String assocType = qnameMap.get(assocTypeQName);
+                    if (assocType == null)
+                    {
+                        assocType = assocTypeQName.toPrefixString(namespaceService);
+                        qnameMap.put(assocTypeQName, assocType);
+                    }
+
+                    node.setAssociation(new AssocChild(assocType, childAssocRef.isPrimary()));
+                    
+                    collection.add(node);
+                }
+            }
+        }
+        
+        return listPage(collection, parameters.getPaging());
+    }
+    
+    protected CollectionWithPagingInfo listPage(List result, Paging paging)
+    {
+        // return 'page' of results (note: depends on in-built/natural sort order of results)
+        int skipCount = paging.getSkipCount();
+        int pageSize = paging.getMaxItems();
+        int pageEnd = skipCount + pageSize;
+
+        final List page = new ArrayList<>(pageSize);
+        if (result == null) 
+        {
+            result = Collections.emptyList();
+        }
+        
+        Iterator it = result.iterator();
+        for (int counter = 0; counter < pageEnd && it.hasNext(); counter++)
+        {
+            Object element = it.next();
+            if (counter < skipCount)
+            {
+                continue;
+            }
+            if (counter > pageEnd - 1)
+            {
+                break;
+            }
+            page.add(element);
+        }
+
+        int totalCount = result.size();
+        boolean hasMoreItems = ((skipCount + page.size()) < totalCount);
+
+        return CollectionWithPagingInfo.asPaged(paging, page, hasMoreItems, totalCount);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeActionDefinitionsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeActionDefinitionsRelation.java
new file mode 100644
index 00000000000..1c0d6db6809
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeActionDefinitionsRelation.java
@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.nodes;
+
+import org.alfresco.rest.api.Actions;
+import org.alfresco.rest.api.model.ActionDefinition;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.util.ParameterCheck;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RelationshipResource(name = "action-definitions",  entityResource = NodesEntityResource.class, title = "Node action definitions")
+public class NodeActionDefinitionsRelation extends AbstractNodeRelation
+        implements RelationshipResourceAction.Read<ActionDefinition>
+{
+    private Actions actions;
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        super.afterPropertiesSet();
+        ParameterCheck.mandatory("actions", actions);
+    }
+
+    public void setActions(Actions actions)
+    {
+        this.actions = actions;
+    }
+
+    @Override
+    public CollectionWithPagingInfo<ActionDefinition> readAll(String entityResourceId, Parameters params)
+    {
+        NodeRef parentNodeRef = nodes.validateOrLookupNode(entityResourceId, null);
+        return actions.getActionDefinitions(parentNodeRef, params);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeAuditEntriesRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeAuditEntriesRelation.java
new file mode 100644
index 00000000000..13a0a078943
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeAuditEntriesRelation.java
@@ -0,0 +1,73 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.nodes;
+
+import org.alfresco.rest.api.Audit;
+import org.alfresco.rest.api.model.AuditEntry;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartRelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * Node AuditEntries
+ * 
+ * -list audit-entries
+ * 
+ * @author anechifor
+ *
+ */
+@RelationshipResource(name = "audit-entries", entityResource = NodesEntityResource.class, title = "Audit Entries")
+public class NodeAuditEntriesRelation implements RelationshipResourceAction.Read<AuditEntry>, InitializingBean
+{
+
+    private Audit audit;
+
+    public void setAudit(Audit audit)
+    {
+        this.audit = audit;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        ParameterCheck.mandatory("audit", this.audit);
+
+    }
+
+    @WebApiDescription(title = "Returns audit entries for node id")
+    @Override
+    public CollectionWithPagingInfo<AuditEntry> readAll(String nodeId, Parameters parameters)
+    {
+        return audit.listAuditEntriesByNodeId(nodeId, parameters);
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeChildrenRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeChildrenRelation.java
new file mode 100644
index 00000000000..25f5128298d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeChildrenRelation.java
@@ -0,0 +1,131 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.nodes;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartRelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.extensions.webscripts.servlet.FormData;
+
+/**
+ * Node Children
+ *
+ * - list folder children
+ * - create folder &/or empty file
+ * - create (ie. upload) file with content
+ * 
+ * @author janv
+ * @author Jamal Kaabi-Mofrad
+ */
+@RelationshipResource(name = "children",  entityResource = NodesEntityResource.class, title = "Folder children")
+public class NodeChildrenRelation implements
+        RelationshipResourceAction.Read<Node>,
+        RelationshipResourceAction.Create<Node>,
+        MultiPartRelationshipResourceAction.Create<Node>, InitializingBean
+{
+    private Nodes nodes;
+
+    public void setNodes(Nodes nodes)
+    {
+        this.nodes = nodes;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("nodes", this.nodes);
+    }
+
+    /**
+     * List folder children - returns a filtered/sorted/paged list of nodes that are immediate children of the parent folder
+     *
+     * @param parentFolderNodeId String id of parent folder - will also accept well-known alias, eg. -root- or -my- or -shared-
+     * 
+     * Optional query parameters:
+     *
+     * - include
+     * - fields
+     * - where
+     * - orderBy
+     * - skipCount
+     * - maxItems
+     * - ... etc
+     *                        
+     * Please refer to OpenAPI spec for more details !    
+     * 
+     * If parentFolderNodeId does not exist, EntityNotFoundException (status 404).
+     * If parentFolderNodeId does not represent a folder, InvalidArgumentException (status 400).
+     */
+    @Override
+    @WebApiDescription(title = "Return a paged list of nodes for the document/folder identified by parentFolderNodeId")
+    public CollectionWithPagingInfo<Node> readAll(String parentFolderNodeId, Parameters parameters)
+    {
+        return nodes.listChildren(parentFolderNodeId, parameters);
+    }
+
+    /**
+     * Create one or more nodes (folder or empty file) below parent folder.
+     *
+     * Note: for parent folder nodeId, can also use well-known alias, eg. -root- or -my- or -shared-
+     *
+     * If parentFolderNodeId does not exist, EntityNotFoundException (status 404).
+     * If parentFolderNodeId does not represent a folder, InvalidArgumentException (status 400).
+     */
+    @Override
+    @WebApiDescription(title="Create one (or more) nodes as children of folder identified by parentFolderNodeId")
+    public List<Node> create(String parentFolderNodeId, List<Node> nodeInfos, Parameters parameters)
+    {
+        List<Node> result = new ArrayList<>(nodeInfos.size());
+
+        for (Node nodeInfo : nodeInfos)
+        {
+            result.add(nodes.createNode(parentFolderNodeId, nodeInfo, parameters));
+        }
+
+        return result;
+    }
+
+    @Override
+    @WebApiDescription(title = "Upload file content and meta-data into the repository.")
+    @WebApiParam(name = "formData", title = "A single form data", description = "A single form data which holds FormFields.")
+    public Node create(String parentFolderNodeId, FormData formData, Parameters parameters, WithResponse withResponse)
+    {
+        return nodes.upload(parentFolderNodeId, formData, parameters);
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeCommentsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeCommentsRelation.java
new file mode 100644
index 00000000000..923032fb2a1
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeCommentsRelation.java
@@ -0,0 +1,116 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.nodes;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.Comments;
+import org.alfresco.rest.api.model.Comment;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.WebApiParameters;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ *
+ * @author Gethin James
+ * @author Steve Glover
+ */
+@RelationshipResource(name = "comments",  entityResource = NodesEntityResource.class, title = "Document or folder comments")
+public class NodeCommentsRelation implements RelationshipResourceAction.Read<Comment>, RelationshipResourceAction.Create<Comment>, RelationshipResourceAction.Update<Comment>,  
+    RelationshipResourceAction.Delete, InitializingBean
+{
+	private Comments comments;
+
+	public void setComments(Comments comments)
+	{
+		this.comments = comments;
+	}
+
+	@Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("comments", this.comments);
+    }
+
+	/**
+	 * Create a comment for the node given by nodeId.
+	 * 
+	 * THOR-1153: "F314: Add a comment to a folder or document"
+     * 
+	 */
+    @Override
+    @WebApiDescription(title="Creates comments for the node 'nodeId'.")
+    public List<Comment> create(String nodeId, List<Comment> entity, Parameters parameters)
+    {
+        List<Comment> result = new ArrayList<Comment>(entity.size());
+        for (Comment comment : entity)
+        {
+           result.add(comments.createComment(nodeId, comment));
+        }
+        return result;
+    }
+
+    /**
+     * 
+     * Returns a paged list of comments for the document/folder identified by nodeId, sorted chronologically with the newest first.
+     *  
+     * THOR-1152: “F313: For a folder or document, get the list of associated comments”
+     * 
+     * If nodeId does not exist, EntityNotFoundException (status 404).
+     * If nodeId does not represent a document or folder, InvalidArgumentException (status 400).
+     */
+    @Override
+    @WebApiDescription(title = "Returns a paged list of comments for the document/folder identified by nodeId, sorted chronologically with the newest first.")
+    public CollectionWithPagingInfo<Comment> readAll(String nodeId, Parameters parameters)
+    {
+        return comments.getComments(nodeId, parameters.getPaging(), parameters.getInclude());
+    }
+
+	@Override
+    @WebApiDescription(title = "Updates the comment with the given id.")
+	public Comment update(String nodeId, Comment entity, Parameters parameters)
+	{
+		return comments.updateComment(nodeId, entity);
+	}
+
+    @Override
+    @WebApiDescription(title = "Delete the comment with the given commentNodeId.")
+    @WebApiParameters({
+                @WebApiParam(name="nodeId", title="The unique id of the parent Node being addressed", description="A single node id"),
+                @WebApiParam(name="commentNodeId", title="The unique id of the comment Node being addressed", description="A single node id")})
+    public void delete(String nodeId, String commentNodeId, Parameters parameters)
+    {
+        comments.deleteComment(nodeId, commentNodeId);
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeParentsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeParentsRelation.java
new file mode 100644
index 00000000000..d2440a2266d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeParentsRelation.java
@@ -0,0 +1,103 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.nodes;
+
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.where.Query;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.workflow.api.impl.MapBasedQueryWalker;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QNamePattern;
+import org.alfresco.service.namespace.RegexQNamePattern;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Node Parents
+ *
+ * @author janv
+ */
+@RelationshipResource(name = "parents",  entityResource = NodesEntityResource.class, title = "Node Parents")
+public class NodeParentsRelation extends AbstractNodeRelation implements RelationshipResourceAction.Read<Node>
+{
+    private final static Set<String> WHERE_PARAMS_PARENTS =
+            new HashSet<>(Arrays.asList(new String[] {Nodes.PARAM_ASSOC_TYPE, Nodes.PARAM_ISPRIMARY}));
+
+    /**
+     * List child node's parent(s) based on (parent ->) child associations.
+     * Returns primary parent & also secondary parents, if any.
+     *
+     * @param childNodeId String id of child node
+     */
+    @Override
+    @WebApiDescription(title = "Return a list of parent nodes based on child assocs")
+    public CollectionWithPagingInfo<Node> readAll(String childNodeId, Parameters parameters)
+    {
+        NodeRef childNodeRef = nodes.validateOrLookupNode(childNodeId, null);
+
+        QNamePattern assocTypeQNameParam = RegexQNamePattern.MATCH_ALL;
+
+        Boolean isPrimary = null;
+
+        Query q = parameters.getQuery();
+        if (q != null)
+        {
+            MapBasedQueryWalker propertyWalker = new MapBasedQueryWalker(WHERE_PARAMS_PARENTS, null);
+            QueryHelper.walk(q, propertyWalker);
+
+            isPrimary = propertyWalker.getProperty(Nodes.PARAM_ISPRIMARY, WhereClauseParser.EQUALS, Boolean.class);
+
+            String assocTypeQNameStr = propertyWalker.getProperty(Nodes.PARAM_ASSOC_TYPE, WhereClauseParser.EQUALS, String.class);
+            if (assocTypeQNameStr != null)
+            {
+                assocTypeQNameParam = nodes.getAssocType(assocTypeQNameStr);
+            }
+        }
+
+        List<ChildAssociationRef> childAssocRefs = null;
+        if (assocTypeQNameParam.equals(RegexQNamePattern.MATCH_ALL))
+        {
+            childAssocRefs = nodeService.getParentAssocs(childNodeRef);
+        }
+        else
+        {
+            childAssocRefs = nodeService.getParentAssocs(childNodeRef, assocTypeQNameParam, RegexQNamePattern.MATCH_ALL);
+        }
+
+        return listNodeChildAssocs(childAssocRefs, parameters, isPrimary, false);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRatingsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRatingsRelation.java
new file mode 100644
index 00000000000..3381d6d7d29
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRatingsRelation.java
@@ -0,0 +1,107 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.nodes;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.alfresco.rest.api.NodeRatings;
+import org.alfresco.rest.api.model.NodeRating;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.WebApiParameters;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+@RelationshipResource(name = "ratings", entityResource = NodesEntityResource.class, title = "Document or folder ratings")
+public class NodeRatingsRelation implements RelationshipResourceAction.Read<NodeRating>, RelationshipResourceAction.ReadById<NodeRating>, RelationshipResourceAction.Delete,
+RelationshipResourceAction.Create<NodeRating>, InitializingBean
+{
+	private NodeRatings nodeRatings;
+
+	public void setNodeRatings(NodeRatings nodeRatings)
+	{
+		this.nodeRatings = nodeRatings;
+	}
+
+	@Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("nodeRatings", this.nodeRatings);
+    }
+
+	@Override
+    @WebApiDescription(title="A paged list of ratings for node 'nodeId'.")
+	@WebApiParam(name="nodeId", title="The unique id of the Node being addressed", description="A single node id")
+	public CollectionWithPagingInfo<NodeRating> readAll(String nodeId, Parameters parameters)
+	{
+		return nodeRatings.getNodeRatings(nodeId, parameters.getPaging());
+	}
+
+	/**
+	 * Create a rating for the node with id 'nodeId'.
+	 * 
+	 */
+	@Override
+    @WebApiDescription(title="Rate a node for 'nodeId'.")
+	@WebApiParam(name="ratingEntity", title="A single rating", description="A single node rating, multiple ratings are not supported.", 
+	             kind=ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple=false, required = true)
+	public List<NodeRating> create(String nodeId, List<NodeRating> ratingEntity, Parameters parameters)
+	{
+	    //There will always be 1 value because allowMultiple=false
+        NodeRating rating = ratingEntity.get(0);
+        String ratingSchemeId = rating.getScheme();
+        nodeRatings.addRating(nodeId, ratingSchemeId, rating.getMyRating());
+        return Collections.singletonList(nodeRatings.getNodeRating(nodeId, ratingSchemeId));
+	}
+
+	/**
+	 * Returns the rating with id 'schemeName' for node with id 'nodeId'.
+	 * 
+	 */
+	@Override
+    @WebApiDescription(title="Get the rating with id 'ratingSchemeId' for node 'nodeId'.")
+	   @WebApiParameters({
+	                @WebApiParam(name="nodeId", title="The unique id of the Node being addressed", description="A single node id"),
+	                @WebApiParam(name="ratingSchemeId", title="The rating scheme type", description="Possible values are likesRatingScheme.")})
+	public NodeRating readById(String nodeId, String ratingSchemeId, Parameters parameters)
+	{
+		return nodeRatings.getNodeRating(nodeId, ratingSchemeId);
+	}
+
+	@Override
+    @WebApiDescription(title="Deletes a node rating")
+	public void delete(String nodeId, String ratingSchemeId, Parameters parameters)
+	{
+		nodeRatings.removeRating(nodeId, ratingSchemeId);		
+	}
+	
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRenditionsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRenditionsRelation.java
new file mode 100644
index 00000000000..d406fdfff84
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeRenditionsRelation.java
@@ -0,0 +1,121 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.nodes;
+
+import org.alfresco.rest.api.Renditions;
+import org.alfresco.rest.api.model.DirectAccessUrlRequest;
+import org.alfresco.rest.api.model.Rendition;
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.Operation;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.service.cmr.repository.DirectAccessUrl;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.util.PropertyCheck;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.extensions.webscripts.Status;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * Node renditions.
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+@RelationshipResource(name = "renditions", entityResource = NodesEntityResource.class, title = "Node renditions")
+public class NodeRenditionsRelation implements RelationshipResourceAction.Read<Rendition>,
+        RelationshipResourceAction.ReadById<Rendition>,
+        RelationshipResourceAction.Create<Rendition>,
+        RelationshipResourceBinaryAction.Read,
+        InitializingBean
+{
+
+    private Renditions renditions;
+
+    public void setRenditions(Renditions renditions)
+    {
+        this.renditions = renditions;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        PropertyCheck.mandatory(this, "renditions", renditions);
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Rendition> readAll(String nodeId, Parameters parameters)
+    {
+        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+        return renditions.getRenditions(nodeRef, parameters);
+    }
+
+    @Override
+    public Rendition readById(String nodeId, String renditionId, Parameters parameters)
+    {
+        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+        return renditions.getRendition(nodeRef, renditionId, parameters);
+    }
+
+    @WebApiDescription(title = "Create rendition", successStatus = Status.STATUS_ACCEPTED)
+    @Override
+    public List<Rendition> create(String nodeId, List<Rendition> entity, Parameters parameters)
+    {
+        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+        renditions.createRenditions(nodeRef, entity, parameters);
+        return null;
+    }
+
+    @WebApiDescription(title = "Download rendition", description = "Download rendition")
+    @BinaryProperties({ "content" })
+    @Override
+    public BinaryResource readProperty(String nodeId, String renditionId, Parameters parameters)
+    {
+        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+        return renditions.getContent(nodeRef, renditionId, parameters);
+    }
+
+    @Operation("request-content-url")
+    @WebApiParam(name = "directAccessUrlRequest", title = "Direct access url request", description = "Direct access url request", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
+    @WebApiDescription(title = "Request content url",
+            description="Generates a direct access url.",
+            successStatus = HttpServletResponse.SC_OK)
+    public DirectAccessUrl requestContentUrl(String nodeId, String renditionId, DirectAccessUrlRequest directAccessUrlRequest, Parameters parameters, WithResponse withResponse)
+    {
+        return renditions.requestContentUrl(nodeId, null, renditionId, directAccessUrlRequest);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeSecondaryChildrenRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeSecondaryChildrenRelation.java
new file mode 100644
index 00000000000..aa17a20561c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeSecondaryChildrenRelation.java
@@ -0,0 +1,154 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.nodes;
+
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.AssocChild;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.QNamePattern;
+import org.alfresco.service.namespace.RegexQNamePattern;
+
+import java.util.List;
+
+/**
+ * Node Secondary Children
+ *
+ * Manage secondary child associations (sometimes also known as multi-filing)
+ *
+ * Please note, if you wish to manage primary child associations then please refer to other endpoints, for example:
+ *
+ * - to create primary child, use POST /nodes/{parentId}/children
+ * - to delete node (ie. primary child), use DELETE /nodes/{nodeId}
+ * - to move a node from one primary parent to another, use POST /nodes/{nodeId}/copy
+ *
+ * @author janv
+ */
+@RelationshipResource(name = "secondary-children",  entityResource = NodesEntityResource.class, title = "Node Secondary Children")
+public class NodeSecondaryChildrenRelation extends AbstractNodeRelation implements
+        RelationshipResourceAction.Read<Node>,
+        RelationshipResourceAction.Create<AssocChild>,
+        RelationshipResourceAction.Delete
+{
+    /**
+     * List secondary children only
+     *
+     * @param parentNodeId String id of parent node
+     */
+    @Override
+    @WebApiDescription(title = "Return a paged list of secondary child nodes based on child assocs")
+    public CollectionWithPagingInfo<Node> readAll(String parentNodeId, Parameters parameters)
+    {
+        NodeRef parentNodeRef = nodes.validateOrLookupNode(parentNodeId, null);
+
+        QNamePattern assocTypeQNameParam = getAssocTypeFromWhereElseAll(parameters);
+
+        List<ChildAssociationRef> childAssocRefs = null;
+        if (assocTypeQNameParam.equals(RegexQNamePattern.MATCH_ALL))
+        {
+            childAssocRefs = nodeService.getChildAssocs(parentNodeRef);
+        }
+        else
+        {
+            childAssocRefs = nodeService.getChildAssocs(parentNodeRef, assocTypeQNameParam, RegexQNamePattern.MATCH_ALL);
+        }
+
+        return listNodeChildAssocs(childAssocRefs, parameters, false, true);
+    }
+
+    @Override
+    @WebApiDescription(title="Add secondary child assoc")
+    public List<AssocChild> create(String parentNodeId, List<AssocChild> entities, Parameters parameters)
+    {
+        return nodes.addChildren(parentNodeId, entities);
+    }
+
+    @Override
+    @WebApiDescription(title = "Remove secondary child assoc(s)")
+    public void delete(String parentNodeId, String childNodeId, Parameters parameters)
+    {
+        NodeRef parentNodeRef = nodes.validateNode(parentNodeId);
+        NodeRef childNodeRef = nodes.validateNode(childNodeId);
+
+        String assocTypeStr = parameters.getParameter(Nodes.PARAM_ASSOC_TYPE);
+        QName assocTypeQName = nodes.getAssocType(assocTypeStr, false);
+
+        List<ChildAssociationRef> assocRefs = nodeService.getChildAssocs(parentNodeRef);
+
+        boolean found = false;
+
+        for (ChildAssociationRef assocRef : assocRefs)
+        {
+            if (! assocRef.getChildRef().equals(childNodeRef))
+            {
+                continue;
+            }
+
+            if (assocTypeQName != null)
+            {
+                if (assocTypeQName.equals(assocRef.getTypeQName()))
+                {
+                    if (assocRef.isPrimary())
+                    {
+                        throw new InvalidArgumentException("Cannot use secondary-children to delete primary assoc: "
+                            +parentNodeId+","+assocTypeStr+","+childNodeId);
+                    }
+
+                    boolean existed = nodeService.removeSecondaryChildAssociation(assocRef);
+                    if (existed)
+                    {
+                        found = true;
+                    }
+                }
+            }
+            else
+            {
+                if (! assocRef.isPrimary())
+                {
+                    boolean existed = nodeService.removeSecondaryChildAssociation(assocRef);
+                    if (existed)
+                    {
+                        found = true;
+                    }
+                }
+            }
+        }
+
+        if (! found)
+        {
+            throw new EntityNotFoundException(parentNodeId+","+assocTypeStr+","+childNodeId);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeSourcesRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeSourcesRelation.java
new file mode 100644
index 00000000000..743716fef3d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeSourcesRelation.java
@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.nodes;
+
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QNamePattern;
+
+import java.util.List;
+
+/**
+ * Node Sources - list node (peer) associations from target to sources
+ * 
+ * @author janv
+ */
+@RelationshipResource(name = "sources",  entityResource = NodesEntityResource.class, title = "Node Sources")
+public class NodeSourcesRelation extends AbstractNodeRelation implements RelationshipResourceAction.Read<Node>
+{
+    /**
+     * List sources
+     *
+     * @param targetNodeId String id of target node
+     */
+    @Override
+    @WebApiDescription(title = "Return a paged list of sources nodes based on (peer) assocs")
+    public CollectionWithPagingInfo<Node> readAll(String targetNodeId, Parameters parameters)
+    {
+        NodeRef targetNodeRef = nodes.validateOrLookupNode(targetNodeId, null);
+
+        QNamePattern assocTypeQNameParam = getAssocTypeFromWhereElseAll(parameters);
+
+        List<AssociationRef> assocRefs = nodeService.getSourceAssocs(targetNodeRef, assocTypeQNameParam);
+
+        return listNodePeerAssocs(assocRefs, parameters, false);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeTagsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeTagsRelation.java
new file mode 100644
index 00000000000..9e9d9ea3c6e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeTagsRelation.java
@@ -0,0 +1,81 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.nodes;
+
+import java.util.List;
+
+import org.alfresco.rest.api.Tags;
+import org.alfresco.rest.api.model.Tag;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+@RelationshipResource(name = "tags", entityResource = NodesEntityResource.class, title = "Document or folder tags")
+public class NodeTagsRelation implements RelationshipResourceAction.Create<Tag>, RelationshipResourceAction.Delete, RelationshipResourceAction.Read<Tag>, InitializingBean
+{
+	private Tags tags;
+
+	public void setTags(Tags tags)
+	{
+		this.tags = tags;
+	}
+
+	@Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("tags", this.tags);
+    }
+
+	/**
+	 * Add the tag to the node with id 'nodeId'.
+	 * 
+	 */
+	@Override
+	@WebApiDescription(title="Adds one or more tags to the node with id 'nodeId'.")
+    public List<Tag> create(String nodeId, List<Tag> tagsToCreate, Parameters parameters)
+	{
+	    return tags.addTags(nodeId, tagsToCreate);
+	}
+
+	@Override
+	@WebApiDescription(title="Remove the tag from the node with id 'nodeId'.")
+	public void delete(String nodeId, String tagId, Parameters parameters)
+	{
+		tags.deleteTag(nodeId, tagId);
+	}
+
+	@Override
+	@WebApiDescription(title="A paged list of tags on the node 'nodeId'.")
+	public CollectionWithPagingInfo<Tag> readAll(String nodeId, Parameters params)
+	{
+		return tags.getTags(nodeId, params);
+	}
+	
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeTargetsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeTargetsRelation.java
new file mode 100644
index 00000000000..f4ac2c04fee
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeTargetsRelation.java
@@ -0,0 +1,115 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.nodes;
+
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.AssocTarget;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.namespace.QNamePattern;
+import org.alfresco.service.namespace.RegexQNamePattern;
+
+import java.util.List;
+
+/**
+ * Node Targets
+ *
+ * - list node (peer) associations - from source to target
+ * 
+ * @author janv
+ */
+@RelationshipResource(name = "targets",  entityResource = NodesEntityResource.class, title = "Node Targets")
+public class NodeTargetsRelation extends AbstractNodeRelation implements
+        RelationshipResourceAction.Read<Node>,
+        RelationshipResourceAction.Create<AssocTarget>,
+        RelationshipResourceAction.Delete
+{
+    /**
+     * List targets
+     *
+     * @param sourceNodeId String id of source node
+     */
+    @Override
+    @WebApiDescription(title = "Return a paged list of target nodes based on (peer) assocs")
+    public CollectionWithPagingInfo<Node> readAll(String sourceNodeId, Parameters parameters)
+    {
+        NodeRef sourceNodeRef = nodes.validateOrLookupNode(sourceNodeId, null);
+
+        QNamePattern assocTypeQNameParam = getAssocTypeFromWhereElseAll(parameters);
+
+        List<AssociationRef> assocRefs = nodeService.getTargetAssocs(sourceNodeRef, assocTypeQNameParam);
+
+        return listNodePeerAssocs(assocRefs, parameters, true);
+    }
+
+    @Override
+    @WebApiDescription(title="Add node assoc")
+    public List<AssocTarget> create(String sourceNodeId, List<AssocTarget> entities, Parameters parameters)
+    {
+        return nodes.addTargets(sourceNodeId, entities);
+    }
+
+    @Override
+    @WebApiDescription(title = "Remove node assoc(s)")
+    public void delete(String sourceNodeId, String targetNodeId, Parameters parameters)
+    {
+        NodeRef srcNodeRef = nodes.validateNode(sourceNodeId);
+        NodeRef tgtNodeRef = nodes.validateNode(targetNodeId);
+
+        String assocTypeStr = parameters.getParameter(Nodes.PARAM_ASSOC_TYPE);
+        QNamePattern assocTypeQName = nodes.getAssocType(assocTypeStr, false);
+
+        if (assocTypeQName == null)
+        {
+            assocTypeQName = RegexQNamePattern.MATCH_ALL;
+        }
+
+        boolean found = false;
+
+        List<AssociationRef> assocRefs = nodeService.getTargetAssocs(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, sourceNodeId), assocTypeQName);
+        for (AssociationRef assocRef : assocRefs)
+        {
+            if (assocRef.getTargetRef().equals(tgtNodeRef))
+            {
+                nodeService.removeAssociation(srcNodeRef, tgtNodeRef, assocRef.getTypeQName());
+                found = true;
+            }
+        }
+
+        if (! found)
+        {
+            throw new EntityNotFoundException(sourceNodeId+","+assocTypeStr+","+targetNodeId);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionRenditionsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionRenditionsRelation.java
new file mode 100644
index 00000000000..24ed699e3c6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionRenditionsRelation.java
@@ -0,0 +1,136 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.nodes;
+
+import org.alfresco.rest.api.Renditions;
+import org.alfresco.rest.api.model.DirectAccessUrlRequest;
+import org.alfresco.rest.api.model.Rendition;
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.Operation;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.service.cmr.repository.DirectAccessUrl;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.util.PropertyCheck;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.extensions.webscripts.Status;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ *
+ * Node version renditions
+ *
+ * - GET  /nodes/{nodeId}/versions/{versionId}/renditions
+ * - POST /nodes/{nodeId}/versions/{versionId}/renditions
+ * - GET  /nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}
+ * - GET  /nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}/content
+ *
+ * @author janv
+ */
+@RelationshipResource(name = "renditions", entityResource = NodeVersionsRelation.class, title = "Node version renditions")
+public class NodeVersionRenditionsRelation implements RelationshipResourceAction.Read<Rendition>,
+        RelationshipResourceAction.ReadById<Rendition>,
+        RelationshipResourceAction.Create<Rendition>,
+        RelationshipResourceBinaryAction.Read,
+        InitializingBean
+{
+    private Renditions renditions;
+
+    public void setRenditions(Renditions renditions)
+    {
+        this.renditions = renditions;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        PropertyCheck.mandatory(this, "renditions", renditions);
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Rendition> readAll(String nodeId, Parameters parameters)
+    {
+        String versionId = parameters.getRelationshipId();
+
+        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+        return renditions.getRenditions(nodeRef, versionId, parameters);
+    }
+
+    @Override
+    public Rendition readById(String nodeId, String versionId, Parameters parameters)
+    {
+        String renditionId = parameters.getRelationship2Id();
+
+        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+        return renditions.getRendition(nodeRef, versionId, renditionId, parameters);
+    }
+
+    @WebApiDescription(title = "Create rendition", successStatus = Status.STATUS_ACCEPTED)
+    @Override
+    public List<Rendition> create(String nodeId, List<Rendition> entity, Parameters parameters)
+    {
+        String versionId = parameters.getRelationshipId();
+
+        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+        renditions.createRenditions(nodeRef, versionId, entity, parameters);
+        return null;
+    }
+
+    @WebApiDescription(title = "Download rendition", description = "Download rendition")
+    @BinaryProperties({ "content" })
+    @Override
+    public BinaryResource readProperty(String nodeId, String versionId, Parameters parameters)
+    {
+        String renditionId = parameters.getRelationship2Id();
+
+        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+        return renditions.getContent(nodeRef, versionId, renditionId, parameters);
+    }
+
+    @Operation("request-content-url")
+    @WebApiParam(name = "directAccessUrlRequest", title = "Direct access url request", description = "Direct access url request", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
+    @WebApiDescription(title = "Request content url",
+            description="Generates a direct access url.",
+            successStatus = HttpServletResponse.SC_OK)
+    public DirectAccessUrl requestContentUrl(String nodeId, String versionId, DirectAccessUrlRequest directAccessUrlRequest, Parameters parameters, WithResponse withResponse)
+    {
+        String renditionId = parameters.getRelationship2Id();
+
+        return renditions.requestContentUrl(nodeId, versionId, renditionId, directAccessUrlRequest);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsRelation.java
new file mode 100644
index 00000000000..73f5c62ff5f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsRelation.java
@@ -0,0 +1,312 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.nodes;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.node.integrity.IntegrityException;
+import org.alfresco.repo.policy.BehaviourFilter;
+import org.alfresco.repo.version.Version2Model;
+import org.alfresco.repo.version.VersionModel;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.DirectAccessUrlRequest;
+import org.alfresco.rest.api.model.UserInfo;
+import org.alfresco.rest.api.model.VersionOptions;
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.Operation;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.service.cmr.coci.CheckOutCheckInService;
+import org.alfresco.service.cmr.repository.DirectAccessUrl;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.version.Version;
+import org.alfresco.service.cmr.version.VersionHistory;
+import org.alfresco.service.cmr.version.VersionService;
+import org.alfresco.service.cmr.version.VersionType;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ParameterCheck;
+import org.alfresco.util.PropertyCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Node Versions - version history
+ * 
+ * @author janv
+ */
+@RelationshipResource(name = "versions", entityResource = NodesEntityResource.class, title = "Node Versions")
+public class NodeVersionsRelation extends AbstractNodeRelation implements
+        RelationshipResourceAction.Read<Node>,
+        RelationshipResourceAction.ReadById<Node>,
+        RelationshipResourceBinaryAction.Read,
+        RelationshipResourceAction.Delete,
+        InitializingBean
+{
+    protected VersionService versionService;
+    protected BehaviourFilter behaviourFilter;
+    
+    @Override
+    public void afterPropertiesSet()
+    {
+        PropertyCheck.mandatory(this, "serviceRegistry", sr);
+        ParameterCheck.mandatory("nodes", this.nodes);
+
+        this.versionService = sr.getVersionService();
+    }
+
+    public void setBehaviourFilter(BehaviourFilter behaviourFilter)
+    {
+        this.behaviourFilter = behaviourFilter;
+    }
+    
+    /**
+     * List version history
+     *
+     * @param nodeId String id of (live) node
+     */
+    @Override
+    @WebApiDescription(title = "Return version history as a paged list of version node infos")
+    public CollectionWithPagingInfo<Node> readAll(String nodeId, Parameters parameters)
+    {
+        NodeRef nodeRef = nodes.validateOrLookupNode(nodeId, null);
+
+        VersionHistory vh = versionService.getVersionHistory(nodeRef);
+
+        Map<String, UserInfo> mapUserInfo = new HashMap<>(10);
+        List<String> includeParam = parameters.getInclude();
+        
+        List<Node> collection = null;
+        if (vh != null)
+        {
+            collection = new ArrayList<>(vh.getAllVersions().size());
+            for (Version v : vh.getAllVersions())
+            {
+                Node node = nodes.getFolderOrDocument(v.getFrozenStateNodeRef(), null, null, includeParam, mapUserInfo);
+                mapVersionInfo(v, node);
+                collection.add(node);
+            }
+        }
+        
+        return listPage(collection, parameters.getPaging());
+    }
+
+    private void mapVersionInfo(Version v, Node aNode)
+    {
+        mapVersionInfo(v, aNode, new NodeRef("", "", v.getVersionLabel()));
+    }
+
+    public void mapVersionInfo(Version v, Node aNode, NodeRef nodeRef)
+    {
+        aNode.setNodeRef(nodeRef);
+        aNode.setVersionComment(v.getDescription());
+
+        Map<String, Object> props = aNode.getProperties();
+        if (props != null)
+        {
+            // special case (as per Version2Service)
+            props.put("cm:"+Version2Model.PROP_VERSION_TYPE, v.getVersionProperty(Version2Model.PROP_VERSION_TYPE));
+        }
+
+        //Don't show parentId, createdAt, createdByUser
+        aNode.setParentId(null);
+        aNode.setCreated(null);
+        aNode.setCreatedByUser(null);
+    }
+
+    @Override
+    @WebApiDescription(title="Get version node info", description = "Return metadata for a specific version node")
+    public Node readById(String nodeId, String versionId, Parameters parameters)
+    {
+        Version v = findVersion(nodeId, versionId);
+
+        if (v != null)
+        {
+            Node node = nodes.getFolderOrDocumentFullInfo(v.getFrozenStateNodeRef(), null, null, parameters, null);
+            mapVersionInfo(v, node);
+            return node;
+        }
+
+        throw new EntityNotFoundException(nodeId+"-"+versionId);
+    }
+
+    @WebApiDescription(title = "Download version content", description = "Download version content")
+    @BinaryProperties({ "content" })
+    @Override
+    public BinaryResource readProperty(String nodeId, String versionId, Parameters parameters)
+    {
+        Version v = findVersion(nodeId, versionId);
+
+        if (v != null)
+        {
+            NodeRef versionNodeRef = v.getFrozenStateNodeRef();
+            return nodes.getContent(versionNodeRef, parameters, true); // TODO should we record version downloads ?
+        }
+
+        throw new EntityNotFoundException(nodeId+"-"+versionId);
+    }
+
+    @Operation("revert")
+    @WebApiDescription(title = "Revert Version",
+            description="Reverts (ie. promotes) specified version to become a new, most recent, version",
+            successStatus = HttpServletResponse.SC_OK)
+    public Node revertById(String nodeId, String versionId, VersionOptions versionOptions, Parameters parameters, WithResponse withResponse)
+    {
+        Version v = findVersion(nodeId, versionId);
+
+        if (v != null)
+        {
+            CheckOutCheckInService cociService = sr.getCheckOutCheckInService();
+
+            NodeRef nodeRef = v.getVersionedNodeRef();
+
+            String versionComment = versionOptions.getComment();
+
+            VersionType versionType = VersionType.MINOR;
+            Boolean versionMajor = versionOptions.getMajorVersion();
+            if ((versionMajor != null) && (versionMajor))
+            {
+                versionType = VersionType.MAJOR;
+            }
+
+            Map<String, Serializable> versionProperties = new HashMap<>(2);
+            versionProperties.put(VersionModel.PROP_VERSION_TYPE, versionType);
+            if (versionComment != null)
+            {
+                versionProperties.put(VersionModel.PROP_DESCRIPTION, versionComment);
+            }
+
+            //cancel editing if we want to revert
+            if (sr.getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY))
+            {
+                nodeRef = cociService.cancelCheckout(nodeRef);
+            }
+
+            // TODO review default for deep and/or whether we should make it an option
+            versionService.revert(nodeRef, v, false);
+
+            // Checkout/Checkin the node - to store the new version in version history
+            NodeRef wcNodeRef = cociService.checkout(nodeRef);
+            cociService.checkin(wcNodeRef, versionProperties);
+
+            // get latest version
+            v = versionService.getVersionHistory(nodeRef).getHeadVersion();
+
+            Node node = nodes.getFolderOrDocumentFullInfo(v.getFrozenStateNodeRef(), null, null, parameters, null);
+            mapVersionInfo(v, node);
+            return node;
+        }
+
+        throw new EntityNotFoundException(nodeId+"-"+versionId);
+    }
+
+    @Override
+    @WebApiDescription(title = "Delete version")
+    public void delete(String nodeId, String versionId, Parameters parameters)
+    {
+        Version v = findVersion(nodeId, versionId);
+
+        // live (aka versioned) nodeRef
+        NodeRef nodeRef = v.getVersionedNodeRef();
+
+        if (sr.getPermissionService().hasPermission(nodeRef, PermissionService.DELETE) != AccessStatus.ALLOWED)
+        {
+            throw new PermissionDeniedException("Cannot delete version");
+        }
+
+        versionService.deleteVersion(nodeRef, v);
+
+        Map<QName, Serializable> props = sr.getNodeService().getProperties(nodeRef);
+        if (props.get(ContentModel.PROP_VERSION_LABEL) == null)
+        {
+            // attempt to delete last version - we do not yet support this (see REPO-835 & REPO-834)
+            // note: alternatively, the client can remove the "cm:versionable" aspect (if permissions allow) to clear the version history and disable versioning
+            throw new IntegrityException("Cannot delete last version (did you mean to disable versioning instead ?) ["+nodeId+","+versionId+"]", null);
+            
+            /*
+            if (props.get(ContentModel.PROP_VERSION_TYPE) != null)
+            {
+                // minor fix up to versionable aspect - ie. remove versionType
+                behaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_VERSIONABLE);
+                behaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
+                try
+                {
+                    sr.getNodeService().removeProperty(nodeRef, ContentModel.PROP_VERSION_TYPE);
+                }
+                finally
+                {
+                    behaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
+                    behaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_VERSIONABLE);
+                }
+            }
+            */
+        }
+    }
+
+    @Operation("request-content-url")
+    @WebApiParam(name = "directAccessUrlRequest", title = "Direct access url request", description = "Direct access url request", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
+    @WebApiDescription(title = "Request content url",
+            description="Generates a direct access url.",
+            successStatus = HttpServletResponse.SC_OK)
+    public DirectAccessUrl requestContentUrl(String nodeId, String versionId, DirectAccessUrlRequest directAccessUrlRequest, Parameters parameters, WithResponse withResponse)
+    {
+        Version version = findVersion(nodeId, versionId);
+
+        if (version == null)
+        {
+            throw new EntityNotFoundException(nodeId + "-" + versionId);
+        }
+
+        return nodes.requestContentUrl(version.getFrozenStateNodeRef(), directAccessUrlRequest);
+    }
+
+    public Version findVersion(String nodeId, String versionLabelId)
+    {
+        NodeRef nodeRef = nodes.validateOrLookupNode(nodeId, null);
+        VersionHistory vh = versionService.getVersionHistory(nodeRef);
+        if (vh != null) 
+        {
+            return vh.getVersion(versionLabelId);
+        }
+        return null;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java
new file mode 100644
index 00000000000..48a5a7c75db
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodesEntityResource.java
@@ -0,0 +1,206 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.nodes;
+
+import java.io.InputStream;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.LockInfo;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.DirectAccessUrlRequest;
+import org.alfresco.rest.api.model.NodeTarget;
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.Operation;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.service.cmr.repository.DirectAccessUrl;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * An implementation of an Entity Resource for a Node (file or folder)
+ *
+ * @author sglover
+ * @author Gethin James
+ * @author janv
+ */
+@EntityResource(name="nodes", title = "Nodes")
+public class NodesEntityResource implements
+        EntityResourceAction.ReadById<Node>, EntityResourceAction.Delete, EntityResourceAction.Update<Node>,
+        BinaryResourceAction.Read, BinaryResourceAction.Update<Node>, InitializingBean
+{
+    private Nodes nodes;
+
+    public void setNodes(Nodes nodes)
+    {
+        this.nodes = nodes;
+    }
+
+	@Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("nodes", this.nodes);
+    }
+	
+    /**
+     * Returns information regarding the node 'nodeId' - folder or document
+     * 
+     * @param nodeId String id of node (folder or document) - will also accept well-known aliases, eg. "-root-", "-my-", "-shared-"
+     * 
+     * Optional parameters:
+     * - path
+     */
+    @WebApiDescription(title = "Get Node Information", description = "Get information for the node with id 'nodeId'")
+    @WebApiParam(name = "nodeId", title = "The node id")
+    public Node readById(String nodeId, Parameters parameters)
+    {
+    	return nodes.getFolderOrDocument(nodeId, parameters);
+    }
+
+    /**
+     * Download content
+     * 
+     * @param fileNodeId
+     * @param parameters {@link Parameters}
+     * @return
+     * @throws EntityNotFoundException
+     */
+    @Override
+    @WebApiDescription(title = "Download content", description = "Download content")
+    @BinaryProperties({"content"})
+    public BinaryResource readProperty(String fileNodeId, Parameters parameters) throws EntityNotFoundException
+    {
+        return nodes.getContent(fileNodeId, parameters, true);
+    }
+
+    /**
+     * Upload new version of content
+     * 
+     * This allow binary content update of an existing file/content node.
+     * 
+     * Note: alternatively, can upload via POST (multipart/form-data) with existing file name and form "overwrite=true".
+     * 
+     * @param fileNodeId
+     * @param contentInfo Basic information about the content stream
+     * @param stream An inputstream
+     * @param parameters
+     * @return
+     */
+    @Override
+    @WebApiDescription(title = "Upload content", description = "Upload content")
+    @BinaryProperties({"content"})
+    public Node updateProperty(String fileNodeId, BasicContentInfo contentInfo, InputStream stream, Parameters parameters)
+    {
+        return nodes.updateContent(fileNodeId, contentInfo, stream, parameters);
+    }
+
+    /**
+     * Update info on the node 'nodeId' - folder or document
+     *
+     * Can update name (which is a "rename" and hence must be unique within the current parent folder)
+     * or update other properties.
+     *
+     * @param nodeId  String nodeId of node (folder or document)
+     * @param nodeInfo node entity with info to update (eg. name, properties ...)
+     * @param parameters
+     * @return
+     */
+    @Override
+    @WebApiDescription(title="Updates a node (file or folder) with id 'nodeId'")
+    public Node update(String nodeId, Node nodeInfo, Parameters parameters)
+    {
+        return nodes.updateNode(nodeId, nodeInfo, parameters);
+    }
+    
+    /**
+     * Delete the given node. Note: will cascade delete for a folder.
+     * 
+     * @param nodeId String id of node (folder or document)
+     */
+    @Override
+    @WebApiDescription(title = "Delete Node", description="Delete the file or folder with id 'nodeId'. Folder will cascade delete")
+    public void delete(String nodeId, Parameters parameters)
+    {
+        nodes.deleteNode(nodeId, parameters);
+    }
+
+    @Operation("copy")
+    @WebApiDescription(title = "Copy Node", description="Copy one or more nodes (files or folders) to a new target folder, with option to rename.")
+    public Node copyById(String nodeId, NodeTarget target, Parameters parameters, WithResponse withResponse)
+    {
+       return nodes.moveOrCopyNode(nodeId, target.getTargetParentId(), target.getName(), parameters, true);
+    }
+
+    @Operation("move")
+    @WebApiDescription(title = "Move Node",
+            description="Moves one or more nodes (files or folders) to a new target folder, with option to rename.",
+            successStatus = HttpServletResponse.SC_OK)
+    public Node moveById(String nodeId, NodeTarget target, Parameters parameters, WithResponse withResponse)
+    {
+        return nodes.moveOrCopyNode(nodeId, target.getTargetParentId(), target.getName(), parameters, false);
+    }
+
+    @Operation("lock")
+    @WebApiDescription(title = "Lock Node",
+            description="Places a lock on a node.",
+            successStatus = HttpServletResponse.SC_OK)
+    public Node lock(String nodeId, LockInfo lockInfo, Parameters parameters, WithResponse withResponse)
+    {
+        return nodes.lock(nodeId, lockInfo, parameters);
+    }
+    
+    @Operation("unlock")
+    @WebApiDescription(title = "Unlock Node",
+            description="Removes a lock on a node.",
+            successStatus = HttpServletResponse.SC_OK)
+    public Node unlock(String nodeId, Void ignore, Parameters parameters, WithResponse withResponse)
+    {
+        return nodes.unlock(nodeId, parameters);
+    }
+
+    @Operation("request-content-url")
+    @WebApiParam(name = "directAccessUrlRequest", title = "Direct access url request", description = "Direct access url request", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
+    @WebApiDescription(title = "Request content url",
+            description="Generates a direct access url.",
+            successStatus = HttpServletResponse.SC_OK)
+    public DirectAccessUrl requestContentUrl(String nodeId, DirectAccessUrlRequest directAccessUrlRequest, Parameters parameters, WithResponse withResponse)
+    {
+        return nodes.requestContentUrl(nodeId, directAccessUrlRequest);
+    }
+
+}
+
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/package-info.java
new file mode 100644
index 00000000000..722feda5748
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="alfresco", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.api.nodes;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java
new file mode 100644
index 00000000000..114098121fa
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java
@@ -0,0 +1,232 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.people;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.model.Client;
+import org.alfresco.rest.api.model.PasswordReset;
+import org.alfresco.rest.api.model.Person;
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.Operation;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiNoAuth;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.util.PropertyCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * An implementation of an Entity Resource for a Person
+ * 
+ * @author sglover
+ * @author Gethin James
+ */
+@EntityResource(name="people", title = "People")
+public class PeopleEntityResource implements EntityResourceAction.ReadById<Person>, EntityResourceAction.Create<Person>,
+        EntityResourceAction.Update<Person>,EntityResourceAction.Read<Person>,
+
+        BinaryResourceAction.Read, BinaryResourceAction.Update<Person>, BinaryResourceAction.Delete, InitializingBean
+{
+    private static Log logger = LogFactory.getLog(PeopleEntityResource.class);
+    
+    private People people;
+
+    public void setPeople(People people)
+    {
+        this.people = people;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        PropertyCheck.mandatory(this, "people", people);
+    }
+
+    /**
+     * Get a person by userName.
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction.ReadById#readById(String, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+    @Override
+    @WebApiDescription(title = "Get Person Information", description = "Get information for the person with id 'personId'")
+    @WebApiParam(name = "personId", title = "The person's username")
+    public Person readById(String personId, Parameters parameters)
+    {
+        Person person = people.getPerson(personId);
+        return person;
+    }
+
+    @Override
+    @WebApiDescription(title="Create person", description="Create a person")
+    @WebApiParam(name="persons", title="A single person", description="A single person, multiple people are not supported.",
+            kind= ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple=false, required = true)
+    public List<Person> create(List<Person> persons, Parameters parameters)
+    {
+        Person p = persons.get(0);
+
+        validateDerivedFieldsExistence(p);
+
+        List<Person> result = new ArrayList<>(1);
+        result.add(people.create(p));
+        return result;
+    }
+
+    @Override
+    @WebApiDescription(title="Update person", description="Update the given person's details")
+    public Person update(String personId, Person person, Parameters parameters)
+    {
+        if (person.wasSet(ContentModel.PROP_USERNAME))
+        {
+            // REPO-1537
+            throw new InvalidArgumentException("Unsupported field: id");
+        }
+
+        validateDerivedFieldsExistence(person);
+
+        return people.update(personId, person);
+    }
+
+    /**
+     * Explicitly test for the presence of system-maintained (derived) fields that are settable on Person (see also REPO-110).
+     * 
+     * @param person
+     */
+    private void validateDerivedFieldsExistence(Person person)
+    {
+        if (person.wasSet(ContentModel.PROP_USER_STATUS_TIME))
+        {
+            throw new InvalidArgumentException("Unsupported field: statusUpdatedAt");
+        }
+
+        if (person.wasSet(Person.PROP_PERSON_AVATAR_ID))
+        {
+            throw new InvalidArgumentException("Unsupported field: avatarId");
+        }
+
+        if (person.wasSet(ContentModel.PROP_SIZE_QUOTA))
+        {
+            throw new InvalidArgumentException("Unsupported field: quota");
+        }
+
+        if (person.wasSet(ContentModel.PROP_SIZE_CURRENT))
+        {
+            throw new InvalidArgumentException("Unsupported field: quotaUsed");
+        }
+    }
+
+    @Override
+    @WebApiDescription(title = "Get List of People", description = "Get List of People")
+    public CollectionWithPagingInfo<Person> readAll(Parameters params)
+    {
+        return people.getPeople(params);
+    }
+
+    @Operation("request-password-reset")
+    @WebApiDescription(title = "Request Password Reset", description = "Request password reset",
+                       successStatus = HttpServletResponse.SC_ACCEPTED)
+    @WebApiNoAuth
+    public void requestPasswordReset(String personId, Client client, Parameters parameters, WithResponse withResponse)
+    {
+        people.requestPasswordReset(personId, client.getClient());
+    }
+
+    @Operation("reset-password")
+    @WebApiDescription(title = "Reset Password", description = "Performs password reset", successStatus = HttpServletResponse.SC_ACCEPTED)
+    @WebApiNoAuth
+    public void resetPassword(String personId, PasswordReset passwordReset, Parameters parameters, WithResponse withResponse)
+    {
+        people.resetPassword(personId, passwordReset);
+    }
+
+    /**
+     * Download avatar image content
+     *
+     * @param personId
+     * @param parameters {@link Parameters}
+     * @return
+     * @throws EntityNotFoundException
+     */
+    @Override
+    @WebApiDescription(title = "Download avatar", description = "Download avatar")
+    @BinaryProperties({"avatar"})
+    public BinaryResource readProperty(String personId, Parameters parameters) throws EntityNotFoundException
+    {
+        return people.downloadAvatarContent(personId, parameters);
+    }
+
+    /**
+     * Upload avatar image content
+     *
+     * @param personId
+     * @param contentInfo Basic information about the content stream
+     * @param stream An inputstream
+     * @param parameters
+     * @return
+     */
+    @Override
+    @WebApiDescription(title = "Upload avatar", description = "Upload avatar")
+    @BinaryProperties({"avatar"})
+    public Person updateProperty(String personId, BasicContentInfo contentInfo, InputStream stream, Parameters parameters)
+    {
+        return people.uploadAvatarContent(personId, contentInfo, stream, parameters);
+    }
+
+    /**
+     * Delete avatar image content
+     *
+     * @param personId
+     * @param parameters
+     * @return
+     */
+    @Override
+    @WebApiDescription(title = "Delete avatar image", description = "Delete avatar image")
+    @BinaryProperties({ "avatar" })
+    public void deleteProperty(String personId, Parameters parameters)
+    {
+        people.deleteAvatarContent(personId);
+    }
+
+
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/people/PersonActivitiesRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonActivitiesRelation.java
new file mode 100644
index 00000000000..bf4d59d7055
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonActivitiesRelation.java
@@ -0,0 +1,87 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.people;
+
+import org.alfresco.rest.api.Activities;
+import org.alfresco.rest.api.model.Activity;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.WebApiParameters;
+import org.alfresco.rest.framework.core.ResourceParameter.KIND;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * 
+ * @author steveglover
+ *
+ */
+@RelationshipResource(name = "activities", entityResource = PeopleEntityResource.class, title = "Person Activities")
+public class PersonActivitiesRelation implements RelationshipResourceAction.Read<Activity>, InitializingBean
+{
+    private static final Log logger = LogFactory.getLog(PersonActivitiesRelation.class);
+
+    private Activities activities;
+
+	public void setActivities(Activities activities)
+	{
+		this.activities = activities;
+	}
+
+	@Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("activities", this.activities);
+    }
+
+    /*
+     * List the user's activities, excluding those of other users.
+     * 
+     * /people/[id]/activities
+     * 
+     * ordered by postDate
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Get#get(java.io.Serializable)
+     */
+    @Override
+    @WebApiDescription(title = "List the user's activities, excluding those of other users.")
+    @WebApiParameters({
+    		@WebApiParam(name = "who", title = "Who",
+    		            description="Filter to include the user's activities only ('me'), other user's activities only ('others'), or all activities (don't include the parameter).", kind=KIND.QUERY_STRING),
+    		@WebApiParam(name = "siteId", title="siteId", description = "Include only activity feed entries relating to this site.", kind=KIND.QUERY_STRING)
+    })
+    public CollectionWithPagingInfo<Activity> readAll(String personId, Parameters parameters)
+    {
+    	return activities.getUserActivities(personId, parameters);
+    }
+	
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/people/PersonFavouriteSitesRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonFavouriteSitesRelation.java
new file mode 100644
index 00000000000..9358390c213
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonFavouriteSitesRelation.java
@@ -0,0 +1,113 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.people;
+
+import java.util.List;
+
+import org.alfresco.rest.api.Sites;
+import org.alfresco.rest.api.model.FavouriteSite;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * 
+ * @author steveglover
+ *
+ */
+@RelationshipResource(name = "favorite-sites", entityResource = PeopleEntityResource.class, title = "Person Favorite Sites")
+public class PersonFavouriteSitesRelation implements RelationshipResourceAction.Read<FavouriteSite>, RelationshipResourceAction.ReadById<FavouriteSite>,
+RelationshipResourceAction.Create<FavouriteSite>,  RelationshipResourceAction.Delete, InitializingBean
+{
+    private static final Log logger = LogFactory.getLog(PersonFavouriteSitesRelation.class);
+
+    private Sites sites;
+
+	public void setSites(Sites sites)
+	{
+		this.sites = sites;
+	}
+
+	@Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("sites", this.sites);
+    }
+
+    /**
+     * List the user's favourite sites.
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Read#readAll(java.lang.String, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+    @Override
+    @WebApiDescription(title = "Get Person Favorite Sites", description = "Get a paged list of the person's favorite sites")
+    public CollectionWithPagingInfo<FavouriteSite> readAll(String personId, Parameters parameters)
+    {
+        return sites.getFavouriteSites(personId, parameters);
+    }
+
+    /**
+     * List the favourite site information for a specific site.
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.ReadById#readById(String, String, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+	@Override
+    @WebApiDescription(title = "Get Person Favorite Site", description = "Get information on a person's specific favorite site")
+	public FavouriteSite readById(String personId, String siteShortName, Parameters parameters)
+	{
+		return sites.getFavouriteSite(personId, siteShortName);
+	}
+
+	/**
+     * Adds the given site as a favourite site for the user.
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Create#create(String, java.util.List, org.alfresco.rest.framework.resource.parameters.Parameters)
+	 */
+	@Override
+    @WebApiDescription(title = "Add Person Favorite Site", description = "Favorite a site")
+	public List<FavouriteSite> create(String personId, List<FavouriteSite> entity, Parameters parameters)
+	{
+        for (FavouriteSite favSite : entity)
+        {
+           sites.addFavouriteSite(personId, favSite);
+        }
+        return entity;
+	}
+
+	@Override
+    @WebApiDescription(title = "Remove Person Favorite Site", description = "Un-favorite a site")
+	public void delete(String personId, String siteId, Parameters parameters)
+	{
+		sites.removeFavouriteSite(personId, siteId);
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/people/PersonFavouritesRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonFavouritesRelation.java
new file mode 100644
index 00000000000..5124a765a23
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonFavouritesRelation.java
@@ -0,0 +1,105 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.people;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.Favourites;
+import org.alfresco.rest.api.model.Favourite;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+@RelationshipResource(name = "favorites", entityResource = PeopleEntityResource.class, title = "Person Favorites")
+public class PersonFavouritesRelation implements RelationshipResourceAction.Read<Favourite>, RelationshipResourceAction.ReadById<Favourite>,
+RelationshipResourceAction.Create<Favourite>,  RelationshipResourceAction.Delete, InitializingBean
+{
+    private static final Log logger = LogFactory.getLog(PersonFavouritesRelation.class);
+
+    private Favourites favourites;
+
+    public void setFavourites(Favourites favourites)
+    {
+        this.favourites = favourites;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("favourites", this.favourites);
+    }
+
+    /**
+     * List the user's favourites.
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Read#readAll(java.lang.String, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+    @Override
+    @WebApiDescription(title = "Get Person Favorites", description = "Get a paged list of the person's favorites")
+    public CollectionWithPagingInfo<Favourite> readAll(String personId, Parameters parameters)
+    {
+        return favourites.getFavourites(personId, parameters);
+    }
+
+    /**
+     * Adds the given site as a favourite site for the user.
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Create#create(String, java.util.List, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+    @Override
+    @WebApiDescription(title = "Add Person Favorite", description = "Favorite something")
+    public List<Favourite> create(String personId, List<Favourite> entity, Parameters parameters)
+    {
+        List<Favourite> ret = new ArrayList<Favourite>(entity.size());
+        for(Favourite favourite : entity)
+        {
+            ret.add(favourites.addFavourite(personId, favourite, parameters));
+        }
+        return ret;
+    }
+
+    @Override
+    @WebApiDescription(title = "Remove Person Favorite", description = "Un-favorite something")
+    public void delete(String personId, String id, Parameters parameters)
+    {
+        favourites.removeFavourite(personId, id);
+    }
+
+    @Override
+    public Favourite readById(String personId, String favouriteId, Parameters parameters)
+            throws RelationshipResourceNotFoundException
+    {
+        return favourites.getFavourite(personId, favouriteId, parameters);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/people/PersonGroupsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonGroupsRelation.java
new file mode 100644
index 00000000000..e330d9e7c03
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonGroupsRelation.java
@@ -0,0 +1,68 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.people;
+
+import org.alfresco.rest.api.Groups;
+import org.alfresco.rest.api.model.Group;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * Provide access to the groups of which a person is a member.
+ * <p>
+ * For example, list groups for person jbloggs.
+ *
+ * @author Matt Ward
+ */
+@RelationshipResource(
+        name = "groups",
+        entityResource = PeopleEntityResource.class,
+        title = "Person Groups")
+public class PersonGroupsRelation implements RelationshipResourceAction.Read<Group>, InitializingBean
+{
+    private Groups groups;
+
+    public void setGroups(Groups groups)
+    {
+        this.groups = groups;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("groups", groups);
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Group> readAll(String personId, Parameters params)
+    {
+        return groups.getGroupsByPersonId(personId, params);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/people/PersonNetworksRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonNetworksRelation.java
new file mode 100644
index 00000000000..71c66f11ec2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonNetworksRelation.java
@@ -0,0 +1,77 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.people;
+
+import org.alfresco.rest.api.Networks;
+import org.alfresco.rest.api.model.PersonNetwork;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * 
+ * @author steveglover
+ *
+ */
+@RelationshipResource(name = "networks", entityResource = PeopleEntityResource.class, title = "Person Networks")
+public class PersonNetworksRelation implements RelationshipResourceAction.Read<PersonNetwork>, RelationshipResourceAction.ReadById<PersonNetwork>, InitializingBean
+{
+    private static final Log logger = LogFactory.getLog(PersonNetworksRelation.class);
+
+    private Networks networks;
+
+	public void setNetworks(Networks networks)
+	{
+		this.networks = networks;
+	}
+
+	@Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("networks", this.networks);
+    }
+
+    @Override
+    @WebApiDescription(title = "A paged list of the person's network memberships.")
+    public CollectionWithPagingInfo<PersonNetwork> readAll(String personId, Parameters parameters)
+	{
+        return networks.getNetworks(personId, parameters.getPaging());
+	}
+
+	@Override
+    @WebApiDescription(title = "Network membership for person 'personId' in network 'networkId'.")
+	public PersonNetwork readById(String personId, String networkId, Parameters parameters)
+	{
+        return networks.getNetwork(personId, networkId);
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/people/PersonPreferencesRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonPreferencesRelation.java
new file mode 100644
index 00000000000..b5ca948cf29
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonPreferencesRelation.java
@@ -0,0 +1,93 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.people;
+
+import org.alfresco.rest.api.Preferences;
+import org.alfresco.rest.api.model.Preference;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+@RelationshipResource(name = "preferences", entityResource = PeopleEntityResource.class, title = "Person Preferences")
+public class PersonPreferencesRelation implements RelationshipResourceAction.Read<Preference>, RelationshipResourceAction.ReadById<Preference>, InitializingBean
+{
+    private static final Log logger = LogFactory.getLog(PersonPreferencesRelation.class);
+
+    private Preferences preferences;
+
+	public void setPreferences(Preferences preferences)
+	{
+		this.preferences = preferences;
+	}
+
+	@Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("preferences", this.preferences);
+    }
+	
+	/**
+	 * Returns a paged list of preferences for the user personId.
+	 * 
+	 * If personId does not exist, NotFoundException (status 404).
+	 * 
+	 * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Read#readAll(java.lang.String, org.alfresco.rest.framework.resource.parameters.Parameters)
+	 */
+    @Override
+    @WebApiDescription(title = "A paged list of the persons preferences.")
+    public CollectionWithPagingInfo<Preference> readAll(String personId, Parameters parameters)
+	{
+    	return preferences.getPreferences(personId, parameters.getPaging());
+	}
+    
+	/**
+	 * Returns information regarding the preference 'preferenceName' for user personId.
+	 * 
+	 * If personId does not exist, NotFoundException (status 404).
+	 * 
+	 * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.ReadById#readById(String, String, org.alfresco.rest.framework.resource.parameters.Parameters)
+	 */
+    @Override
+    @WebApiDescription(title = "Preference value for preference 'preferenceName' for person 'personId'.")
+    public Preference readById(String personId, String preferenceName, Parameters parameters)
+	{
+        // fix for REPO-855
+		String url = parameters.getRequest().getURL();
+		if(url.matches(".*workspace://SpacesStore/.*")){
+            preferenceName += url.substring(url.indexOf("//SpacesStore/"));
+        }
+		//
+
+    	return preferences.getPreference(personId, preferenceName);
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/people/PersonSiteMembershipRequestsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonSiteMembershipRequestsRelation.java
new file mode 100644
index 00000000000..3d7c018e265
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonSiteMembershipRequestsRelation.java
@@ -0,0 +1,102 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.people;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.SiteMembershipRequests;
+import org.alfresco.rest.api.model.SiteMembershipRequest;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+@RelationshipResource(name = "site-membership-requests", entityResource = PeopleEntityResource.class, title = "Site Membership Requests")
+public class PersonSiteMembershipRequestsRelation implements RelationshipResourceAction.Read<SiteMembershipRequest>, RelationshipResourceAction.Delete, RelationshipResourceAction.Update<SiteMembershipRequest>, 
+RelationshipResourceAction.Create<SiteMembershipRequest>, RelationshipResourceAction.ReadById<SiteMembershipRequest>, InitializingBean
+{
+    private static final Log logger = LogFactory.getLog(PersonSiteMembershipRequestsRelation.class);
+
+	private SiteMembershipRequests siteMembershipRequests;
+
+	public void setSiteMembershipRequests(SiteMembershipRequests siteMembershipRequests)
+	{
+		this.siteMembershipRequests = siteMembershipRequests;
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception
+	{
+	}
+
+    @Override
+    @WebApiDescription(title = "The site membership request for personId and siteId, if it exists.")
+	public SiteMembershipRequest readById(String personId, String siteId, Parameters parameters) throws RelationshipResourceNotFoundException
+	{
+		SiteMembershipRequest siteInvite = siteMembershipRequests.getSiteMembershipRequest(personId, siteId);
+		return siteInvite;
+	}
+
+	@Override
+    @WebApiDescription(title = "Create a site membership request for personId and siteIds. The personId will be invited to the site as a SiteConsumer.")
+	public List<SiteMembershipRequest> create(String personId, List<SiteMembershipRequest> invites, Parameters parameters)
+	{
+        List<SiteMembershipRequest> result = new ArrayList<SiteMembershipRequest>(invites.size());
+		for(SiteMembershipRequest invite : invites)
+		{
+			SiteMembershipRequest siteInvite = siteMembershipRequests.createSiteMembershipRequest(personId, invite);
+			result.add(siteInvite);
+		}
+		return result;
+	}
+
+	@Override
+    @WebApiDescription(title = "Remove an existing site membership request for personId and siteId, if it exists.")
+	public void delete(String personId, String siteId, Parameters parameters)
+	{
+		siteMembershipRequests.cancelSiteMembershipRequest(personId, siteId);
+	}
+
+	@Override
+    @WebApiDescription(title = "A paged list of site membership requests for personId.")
+	public CollectionWithPagingInfo<SiteMembershipRequest> readAll(String personId, Parameters parameters)
+	{
+    	return siteMembershipRequests.getPagedSiteMembershipRequests(personId, parameters.getPaging());
+	}
+
+	@Override
+    @WebApiDescription(title = "Update the comment for the site membership request for personId and siteId.")
+	public SiteMembershipRequest update(String personId, SiteMembershipRequest siteInvite, Parameters parameters)
+	{
+		return siteMembershipRequests.updateSiteMembershipRequest(personId, siteInvite);
+	}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/people/PersonSitesRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonSitesRelation.java
new file mode 100644
index 00000000000..705bf2728cd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonSitesRelation.java
@@ -0,0 +1,96 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.people;
+
+import org.alfresco.rest.api.Sites;
+import org.alfresco.rest.api.model.MemberOfSite;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+@RelationshipResource(name = "sites", entityResource = PeopleEntityResource.class, title = "Person Sites")
+public class PersonSitesRelation implements RelationshipResourceAction.Read<MemberOfSite>, RelationshipResourceAction.ReadById<MemberOfSite>, 
+	RelationshipResourceAction.Delete, InitializingBean
+{
+    private static final Log logger = LogFactory.getLog(PersonSitesRelation.class);
+
+    private Sites sites;
+
+	public void setSites(Sites sites)
+	{
+		this.sites = sites;
+	}
+
+	@Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("sites", this.sites);
+    }
+
+    /**
+     * 
+     * List all the sites that the specified user has a explicit membership of.
+     * 
+     * THOR-1151: “F312: For a user, get the list of sites they are a member of”
+	 * 
+	 * If personId does not exist, NotFoundException (status 404).
+	 * 
+	 * @param personId the id (email) of the person
+	 * 
+	 * (non-Javadoc)
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Read#readAll(String, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+    @Override
+    @WebApiDescription(title = "A paged list of the person's site memberships.")
+    public CollectionWithPagingInfo<MemberOfSite> readAll(String personId, Parameters parameters)
+    {
+        return sites.getSites(personId, parameters);
+    }
+
+	/**
+	 * Returns site membership information for personId in siteId.
+	 * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.ReadById#readById(String, String, org.alfresco.rest.framework.resource.parameters.Parameters)
+	 */
+	@Override
+    @WebApiDescription(title="Site membership information for 'personId' in 'siteId'.")
+	public MemberOfSite readById(String personId, String siteId, Parameters parameters)
+	{
+		return sites.getMemberOfSite(personId, siteId);
+	}
+
+	@Override
+	public void delete(String personId, String siteId, Parameters parameters)
+	{
+		sites.removeSiteMember(personId, siteId);
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/people/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/people/package-info.java
new file mode 100644
index 00000000000..448cad15ee8
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/people/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="alfresco", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.api.people;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/probes/ProbeEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/probes/ProbeEntityResource.java
new file mode 100644
index 00000000000..d470efad266
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/probes/ProbeEntityResource.java
@@ -0,0 +1,209 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.probes;
+
+import org.alfresco.rest.api.discovery.DiscoveryApiWebscript;
+import org.alfresco.rest.api.model.Probe;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiNoAuth;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.ServiceUnavailableException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * An implementation of an Entity Resource for Probes.
+ */
+@EntityResource(name="probes", title = "Probes")
+public class ProbeEntityResource implements EntityResourceAction.ReadById<Probe>
+{
+    public static final String LIVE = "-live-";
+    public static final String READY = "-ready-";
+
+    public static final long CHECK_PERIOD = 10 * 1000; // Maximum of only one checkResult every 10 seconds.
+
+    protected static Log logger = LogFactory.getLog(ProbeEntityResource.class);;
+
+    private long nextCheckTime = 0;
+    private Boolean checkResult;
+    private Boolean checking = false;
+    private boolean readySent;
+
+    private DiscoveryApiWebscript discovery;
+
+    public DiscoveryApiWebscript setDiscovery(DiscoveryApiWebscript discovery)
+    {
+        DiscoveryApiWebscript result = this.discovery;
+        this.discovery = discovery;
+        return result;
+    }
+
+    /**
+     * Returns a status code of 200 for okay. The probe contains little information for security reasons.
+     *
+     * Note: does *not* require authenticated access, so limits the amount of work performed to avoid a DDOS.
+     */
+    @Override
+    @WebApiDescription(title="Get probe status", description = "Returns 200 if valid")
+    @WebApiParam(name = "probeName", title = "The probe's name")
+    @WebApiNoAuth
+    public Probe readById(String name, Parameters parameters)
+    {
+        boolean isLiveProbe = LIVE.equalsIgnoreCase(name);
+        if (!isLiveProbe && !READY.equalsIgnoreCase(name))
+        {
+            throw new InvalidArgumentException("Bad probe name");
+        }
+
+        String message = doCheckOrNothing(isLiveProbe);
+        return new Probe(message);
+    }
+
+    // We don't want to be doing checks all the time or holding monitors for a long time to avoid a DDOS.
+    public String doCheckOrNothing(boolean isLiveProbe)
+    {
+        boolean doCheck = false;
+        long now = 0;
+        boolean result;
+        String message = "No test";
+        boolean logInfo = false;
+        synchronized(checking)
+        {
+            // Initially ready needs to be false so we don't get requests and live true so the pod is not killed.
+            if (checkResult == null)
+            {
+                result = isLiveProbe;
+            }
+            else
+            {
+                result = checkResult;
+            }
+
+            if (checking) // Is another thread is checking?
+            {
+                if (!readySent && result && !isLiveProbe)
+                {
+                    readySent = true;
+                    logInfo = true;
+                }
+            }
+            else // This thread will do a check
+            {
+                now = System.currentTimeMillis();
+                if (checkResult == null || nextCheckTime <= now)
+                {
+                    doCheck = true;
+                    checking = true;
+                }
+            }
+        }
+
+        if (doCheck)
+        {
+            try
+            {
+                message = "Tested";
+                doCheck(isLiveProbe);
+                result = true;
+            }
+            catch (Exception e)
+            {
+                result = false;
+            }
+            finally
+            {
+                synchronized (checking)
+                {
+                    checking = false;
+                    checkResult = result;
+                    setNextCheckTime(now);
+                    if (result && !readySent && !isLiveProbe) // Are we initially ready
+                    {
+                        readySent = true;
+                        logInfo = true;
+                    }
+                    else if (!result && (isLiveProbe || readySent)) // Are we sick
+                    {
+                        logInfo = true;
+                    }
+                }
+            }
+        }
+
+        message = getMessage(isLiveProbe, result, message);
+
+        if (logInfo)
+        {
+            logger.info(message);
+        }
+        else
+        {
+            logger.debug(message);
+        }
+
+        if (result)
+        {
+            return message;
+        }
+        throw new ServiceUnavailableException(message);
+    }
+
+    private String getMessage(boolean isLiveProbe, boolean result, String message)
+    {
+        return (isLiveProbe ? "liveProbe" : "readyProbe")+": "+
+        (result ? "Success" : "Failure") +
+        " - "+message;
+    }
+
+    private void doCheck(boolean isLiveProbe)
+    {
+        discovery.getRepositoryInfo();
+    }
+
+    private void setNextCheckTime(long now)
+    {
+        long oldValue = nextCheckTime;
+        if (nextCheckTime == 0)
+        {
+            nextCheckTime = (now / 60000) * 60000;
+        }
+
+        do
+        {
+            nextCheckTime += CHECK_PERIOD;
+        }
+        while (nextCheckTime <= now);
+
+        if (logger.isTraceEnabled())
+        {
+            logger.trace("nextCheckTime: " + nextCheckTime + " (+" + ((nextCheckTime - oldValue) / 1000) + " secs)");
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/probes/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/probes/package-info.java
new file mode 100644
index 00000000000..45a640dee5c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/probes/package-info.java
@@ -0,0 +1,30 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+@WebApi(name="alfresco", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.api.probes;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/queries/QueriesEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/queries/QueriesEntityResource.java
new file mode 100644
index 00000000000..f99d8be261c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/queries/QueriesEntityResource.java
@@ -0,0 +1,83 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.queries;
+
+import org.alfresco.rest.api.Queries;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * An implementation of an Entity Resource for Queries.
+ *
+ * @author janv
+ * @author Alan Davis
+ */
+@EntityResource(name="queries", title = "Queries")
+public class QueriesEntityResource implements
+        EntityResourceAction.ReadById<CollectionWithPagingInfo<? extends Object>>,
+        InitializingBean
+{
+    private final static String QUERY_NODES = "nodes";
+    private final static String QUERY_PEOPLE = "people";
+    private final static String QUERY_SITES = "sites";
+
+    private Queries queries;
+
+    public void setQueries(Queries queries)
+    {
+        this.queries = queries;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("queries", this.queries);
+    }
+
+    // hmm - a little unorthodox
+    @Override
+    @WebApiDescription(title="Find results", description = "Find & list search results for given query id")
+    public CollectionWithPagingInfo<? extends Object> readById(String queryId, Parameters parameters)
+    {
+        switch (queryId)
+        {
+        case QUERY_NODES:
+            return queries.findNodes(parameters);
+        case QUERY_PEOPLE:
+            return queries.findPeople(parameters);
+        case QUERY_SITES:
+            return queries.findSites(parameters);
+        default:
+            throw new NotFoundException(queryId);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/queries/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/queries/package-info.java
new file mode 100644
index 00000000000..56e11cb500a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/queries/package-info.java
@@ -0,0 +1,30 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+ 
+@WebApi(name="alfresco", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.api.queries;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkEntityResource.java
new file mode 100644
index 00000000000..83c23497261
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkEntityResource.java
@@ -0,0 +1,159 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.quicksharelinks;
+
+import org.alfresco.rest.api.QuickShareLinks;
+import org.alfresco.rest.api.model.QuickShareLink;
+import org.alfresco.rest.api.model.QuickShareLinkEmailRequest;
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.Operation;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiNoAuth;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.extensions.webscripts.Status;
+
+import java.util.List;
+
+/**
+ * An implementation of an Entity Resource for Shared Links.
+ *
+ * @author janv
+ * @author Jamal Kaabi-Mofrad
+ */
+@EntityResource(name="shared-links", title = "Shared Links")
+public class QuickShareLinkEntityResource implements EntityResourceAction.ReadById<QuickShareLink>,
+                                                     BinaryResourceAction.Read,
+                                                     EntityResourceAction.Delete,
+                                                     EntityResourceAction.Create<QuickShareLink>,
+                                                     EntityResourceAction.Read<QuickShareLink>,
+                                                     InitializingBean
+{
+    private QuickShareLinks quickShareLinks;
+
+    public void setQuickShareLinks(QuickShareLinks quickShareLinks)
+    {
+        this.quickShareLinks = quickShareLinks;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("quickShareLinks", this.quickShareLinks);
+    }
+
+    /**
+     * Returns limited metadata regarding the shared (content) link.
+     *
+     * Note: does *not* require authenticated access for (public) shared link.
+     */
+    @Override
+    @WebApiDescription(title="Get shared link info", description = "Return limited metadata for shared link")
+    @WebApiNoAuth
+    public QuickShareLink readById(String sharedId, Parameters parameters)
+    {
+        return quickShareLinks.readById(sharedId, parameters);
+    }
+
+    /**
+     * Download content via shared link.
+     *
+     * Note: does *not* require authenticated access for (public) shared link.
+     *
+     * @param sharedId
+     * @param parameters {@link Parameters}
+     * @return
+     * @throws EntityNotFoundException
+     */
+    @Override
+    @WebApiDescription(title = "Download shared link content", description = "Download content for shared link")
+    @WebApiNoAuth
+    @BinaryProperties({"content"})
+    public BinaryResource readProperty(String sharedId, Parameters parameters) throws EntityNotFoundException
+    {
+        return quickShareLinks.readProperty(sharedId, null, parameters);
+    }
+
+    /**
+     * Delete the shared link.
+     *
+     * Once deleted, the shared link will no longer exist hence get/download will no longer work (ie. return 404).
+     * If the link is later re-created then a new unique shared id will be generated.
+     *
+     * Requires authenticated access.
+     *
+     * @param sharedId String id of the quick share
+     */
+    @Override
+    @WebApiDescription(title = "Delete shared link", description="Delete the shared link")
+    public void delete(String sharedId, Parameters parameters)
+    {
+        quickShareLinks.delete(sharedId, parameters);
+    }
+
+    /**
+     * Create quick share.
+     *
+     * Requires authenticated access.
+     *
+     * @param nodeIds
+     * @param parameters
+     * @return
+     */
+    @Override
+    @WebApiDescription(title="Create shared link", description="Create a new unique system-generated shared (link) id")
+    public List<QuickShareLink> create(List<QuickShareLink> nodeIds, Parameters parameters)
+    {
+        return quickShareLinks.create(nodeIds, parameters);
+    }
+
+    @Operation("email")
+    @WebApiDescription(title = "Email shared link", successStatus = Status.STATUS_ACCEPTED)
+    public void email(String sharedId, QuickShareLinkEmailRequest emailRequest, Parameters parameters, WithResponse response)
+    {
+        quickShareLinks.emailSharedLink(sharedId, emailRequest, parameters);
+    }
+
+    /**
+     * Find shared links
+     *
+     */
+    @Override
+    @WebApiDescription(title="Find shared links", description = "Find ('search') & return result set of shared links")
+    public CollectionWithPagingInfo<QuickShareLink> readAll(Parameters parameters)
+    {
+        return quickShareLinks.findLinks(parameters);
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkRenditionsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkRenditionsRelation.java
new file mode 100644
index 00000000000..e63bfa73da7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkRenditionsRelation.java
@@ -0,0 +1,92 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.quicksharelinks;
+
+import org.alfresco.rest.api.QuickShareLinks;
+import org.alfresco.rest.api.model.Rendition;
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiNoAuth;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * Enable rendition(s) to be download via Shared Link
+ *
+ * @author janv
+ */
+@RelationshipResource(name = "renditions", entityResource = QuickShareLinkEntityResource.class, title = "Node renditions via shared link")
+public class QuickShareLinkRenditionsRelation implements
+            RelationshipResourceAction.Read<Rendition>,
+            RelationshipResourceAction.ReadById<Rendition>,
+            RelationshipResourceBinaryAction.Read,
+            InitializingBean
+{
+    private QuickShareLinks quickShareLinks;
+
+    public void setQuickShareLinks(QuickShareLinks quickShareLinks)
+    {
+        this.quickShareLinks = quickShareLinks;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("quickShareLinks", this.quickShareLinks);
+    }
+
+    @WebApiDescription(title = "Download shared link rendition", description = "Download rendition for shared link")
+    @WebApiNoAuth
+    @BinaryProperties({"content"})
+    @Override
+    public BinaryResource readProperty(String sharedId, String renditionId, Parameters parameters)
+    {
+        return quickShareLinks.readProperty(sharedId, renditionId, parameters);
+    }
+
+    @WebApiDescription(title = "List renditions", description = "List available (created) renditions")
+    @WebApiNoAuth
+    @Override
+    public CollectionWithPagingInfo<Rendition> readAll(String sharedId, Parameters parameters)
+    {
+        return quickShareLinks.getRenditions(sharedId);
+    }
+
+    @WebApiDescription(title = "Retrieve rendition information", description = "Retrieve (created) rendition information")
+    @WebApiNoAuth
+    @Override
+    public Rendition readById(String entityResourceId, String id, Parameters parameters)
+    {
+        return quickShareLinks.getRendition(entityResourceId, id);
+    }
+}
+
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/quicksharelinks/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/quicksharelinks/package-info.java
new file mode 100644
index 00000000000..195a9dda164
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/quicksharelinks/package-info.java
@@ -0,0 +1,30 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+@WebApi(name="alfresco", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.api.quicksharelinks;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/SearchApiWebscript.java b/remote-api/src/main/java/org/alfresco/rest/api/search/SearchApiWebscript.java
new file mode 100644
index 00000000000..44000aaf5fb
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/SearchApiWebscript.java
@@ -0,0 +1,168 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search;
+
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.search.context.SearchRequestContext;
+import org.alfresco.rest.api.search.impl.ResultMapper;
+import org.alfresco.rest.api.search.impl.SearchMapper;
+import org.alfresco.rest.api.search.model.SearchQuery;
+import org.alfresco.rest.framework.jacksonextensions.BeanPropertiesFilter;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.tools.ApiAssistant;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+import org.alfresco.rest.framework.tools.RequestReader;
+import org.alfresco.rest.framework.tools.ResponseWriter;
+import org.alfresco.rest.framework.webscripts.ResourceWebScriptHelper;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.util.ParameterCheck;
+import org.alfresco.util.PropertyCheck;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * An implementation of the {{baseUrl}}/{{networkId}}/public/search/versions/1/search endpoint
+ *
+ * @author Gethin James
+ */
+public class SearchApiWebscript extends AbstractWebScript implements RecognizedParamsExtractor, RequestReader, ResponseWriter,
+                                                                InitializingBean
+{
+    private ServiceRegistry serviceRegistry;
+    private SearchService searchService;
+    private SearchMapper searchMapper;
+    private ResultMapper resultMapper;
+    protected ApiAssistant assistant;
+    protected ResourceWebScriptHelper helper;
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        PropertyCheck.mandatory(this, "serviceRegistry", serviceRegistry);
+        this.searchService = serviceRegistry.getSearchService();
+        ParameterCheck.mandatory("assistant", this.assistant);
+        ParameterCheck.mandatory("searchMapper", this.searchMapper);
+        ParameterCheck.mandatory("resultMapper", this.resultMapper);
+    }
+
+    @Override
+    public void execute(WebScriptRequest webScriptRequest, WebScriptResponse webScriptResponse) throws IOException
+    {
+
+        try {
+            //Turn JSON into a Java object respresentation
+            SearchQuery searchQuery = extractJsonContent(webScriptRequest, assistant.getJsonHelper(), SearchQuery.class);
+
+            //Parse the parameters
+            Params params = getParams(webScriptRequest, searchQuery.getFields(), searchQuery.getInclude(), searchQuery.getPaging());
+
+            //Make a copy of the request
+            SearchRequestContext searchRequestContext = SearchRequestContext.from(searchQuery);
+
+            //Turn the SearchQuery json into the Java SearchParameters object
+            SearchParameters searchParams = searchMapper.toSearchParameters(params, searchQuery, searchRequestContext);
+
+            //Call searchService
+            ResultSet results = searchService.query(searchParams);
+
+            //Turn solr results into JSON
+            CollectionWithPagingInfo<Node> resultJson = resultMapper.toCollectionWithPagingInfo(params, searchRequestContext, searchQuery, results);
+            //Post-process the request and pass in params, eg. params.getFilter()
+            Object toRender = helper.processAdditionsToTheResponse(null, null, null, params, resultJson);
+
+            //Write response
+            setResponse(webScriptResponse, DEFAULT_SUCCESS);
+            renderJsonResponse(webScriptResponse, toRender, assistant.getJsonHelper());
+
+        } catch (Exception exception) {
+            renderException(exception,webScriptResponse,assistant);
+        }
+    }
+
+    /**
+     * Gets the Params object, parameters come from the SearchQuery json not the request
+     * @param webScriptRequest
+     * @param searchQuery
+     * @return Params
+     */
+    protected Params getParams(WebScriptRequest webScriptRequest, List<String> fields, List<String> include, Paging paging)
+    {
+        if (paging == null)
+        {
+            paging = Paging.DEFAULT;
+        }
+        BeanPropertiesFilter filter = null;
+        if (fields != null && !fields.isEmpty())
+        {
+            List<String> selectList = new ArrayList<>(fields.size());
+            selectList.addAll(fields);
+
+            if (include != null &&  !include.isEmpty())
+            {
+                selectList.addAll(include);
+            }
+
+          filter = getFilter("", selectList);
+        }
+
+        Params.RecognizedParams recognizedParams = new Params.RecognizedParams(null, paging, filter, null, include, null, null, null, false);
+        return Params.valueOf(null, recognizedParams, null, webScriptRequest);
+    }
+
+    public void setSearchMapper(SearchMapper searchMapper)
+    {
+        this.searchMapper = searchMapper;
+    }
+
+    public void setResultMapper(ResultMapper resultMapper)
+    {
+        this.resultMapper = resultMapper;
+    }
+
+    public void setAssistant(ApiAssistant assistant) {
+        this.assistant = assistant;
+    }
+
+    public void setServiceRegistry(ServiceRegistry serviceRegistry) {
+        this.serviceRegistry = serviceRegistry;
+    }
+
+    public void setHelper(ResourceWebScriptHelper helper)
+    {
+        this.helper = helper;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/SearchSQLApiWebscript.java b/remote-api/src/main/java/org/alfresco/rest/api/search/SearchSQLApiWebscript.java
new file mode 100644
index 00000000000..b784d6c052b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/SearchSQLApiWebscript.java
@@ -0,0 +1,181 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search;
+import java.io.IOException;
+import java.util.Locale;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.search.impl.lucene.LuceneQueryParserException;
+import org.alfresco.repo.search.impl.solr.SolrSQLJSONResultSet;
+import org.alfresco.repo.security.permissions.impl.acegi.FilteringResultSet;
+import org.alfresco.rest.api.search.impl.ResultMapper;
+import org.alfresco.rest.api.search.impl.SearchMapper;
+import org.alfresco.rest.api.search.model.SearchSQLQuery;
+import org.alfresco.rest.api.search.model.TupleList;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.tools.ApiAssistant;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+import org.alfresco.rest.framework.tools.RequestReader;
+import org.alfresco.rest.framework.tools.ResponseWriter;
+import org.alfresco.rest.framework.webscripts.ResourceWebScriptHelper;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.util.ParameterCheck;
+import org.alfresco.util.PropertyCheck;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+
+/**
+ * Search SQL API end point.
+ * An implementation of the {{baseUrl}}/{{networkId}}/public/search/versions/1/sql
+ * @author Michael Suzuki
+ *
+ */
+public class SearchSQLApiWebscript extends AbstractWebScript implements RecognizedParamsExtractor,
+                                                                        RequestReader,
+                                                                        ResponseWriter,
+                                                                        InitializingBean
+{
+    private ServiceRegistry serviceRegistry;
+    private SearchService searchService;
+    private SearchMapper searchMapper;
+    private ResultMapper resultMapper;
+    protected ApiAssistant assistant;
+    protected ResourceWebScriptHelper helper;
+    
+    @Override
+    public void execute(WebScriptRequest webScriptRequest, WebScriptResponse res) throws IOException
+    {
+        try
+        {
+            //Turn JSON into a Java object representation
+            SearchSQLQuery searchQuery = extractJsonContent(webScriptRequest, assistant.getJsonHelper(), SearchSQLQuery.class);
+            SearchParameters sparams = buildSearchParameters(searchQuery);
+
+            ResultSet results = searchService.query(sparams);
+            FilteringResultSet frs = (FilteringResultSet) results;
+            SolrSQLJSONResultSet ssjr = (SolrSQLJSONResultSet) frs.getUnFilteredResultSet();
+            //When solr format is requested pass the solr output directly.
+            if(searchQuery.getFormat().equalsIgnoreCase("solr"))
+            {
+                res.getWriter().write(ssjr.getSolrResponse());
+            }
+            else
+            {
+                CollectionWithPagingInfo<TupleList> nodes = resultMapper.toCollectionWithPagingInfo(ssjr.getDocs(), searchQuery);
+                renderJsonResponse(res, nodes, assistant.getJsonHelper());
+            }
+            setResponse(res, DEFAULT_SUCCESS);
+        }
+        catch (Exception exception) 
+        {
+            if (exception instanceof LuceneQueryParserException)
+            {
+                renderException(exception,res,assistant);
+            }
+            else
+            {
+                renderException(new WebScriptException(400, exception.getMessage()), res, assistant);
+            }
+        }
+    }
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        PropertyCheck.mandatory(this, "serviceRegistry", serviceRegistry);
+        this.searchService = serviceRegistry.getSearchService();
+        ParameterCheck.mandatory("assistant", this.assistant);
+        ParameterCheck.mandatory("searchMapper", this.searchMapper);
+        ParameterCheck.mandatory("resultMapper", this.resultMapper);
+    }
+    
+    public SearchParameters buildSearchParameters(SearchSQLQuery searchQuery)
+    {
+        SearchParameters sparams = new SearchParameters();
+        sparams.setLanguage(SearchService.LANGUAGE_SOLR_SQL);
+        sparams.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+        if(StringUtils.isEmpty(searchQuery.getStmt()))
+        {
+            throw new AlfrescoRuntimeException("Required stmt parameter is missing.");
+        }
+        if(searchQuery.getFormat().equalsIgnoreCase("solr"))
+        {
+            sparams.addExtraParameter("format", "solr");
+        }
+        if(!StringUtils.isEmpty(searchQuery.getTimezone()))
+        {
+            sparams.setTimezone(searchQuery.getTimezone());
+        }
+        sparams.setQuery(searchQuery.getStmt());
+        searchQuery.getLocales().forEach(action->{
+            Locale locale = new Locale(action);
+            sparams.addLocale(locale);
+        });
+        searchQuery.getFilterQueries().forEach(sparams::addFilterQuery);
+        
+        sparams.setIncludeMetadata(searchQuery.isIncludeMetadata());
+        return sparams;
+    }
+    
+    public void setServiceRegistry(ServiceRegistry serviceRegistry)
+    {
+        this.serviceRegistry = serviceRegistry;
+    }
+
+    public void setSearchService(SearchService searchService)
+    {
+        this.searchService = searchService;
+    }
+
+    public void setSearchMapper(SearchMapper searchMapper)
+    {
+        this.searchMapper = searchMapper;
+    }
+
+    public void setResultMapper(ResultMapper resultMapper)
+    {
+        this.resultMapper = resultMapper;
+    }
+
+    public void setAssistant(ApiAssistant assistant)
+    {
+        this.assistant = assistant;
+    }
+
+    public void setHelper(ResourceWebScriptHelper helper)
+    {
+        this.helper = helper;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/context/FacetFieldContext.java b/remote-api/src/main/java/org/alfresco/rest/api/search/context/FacetFieldContext.java
new file mode 100644
index 00000000000..82c3f3fac8b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/context/FacetFieldContext.java
@@ -0,0 +1,137 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.context;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericBucket;
+
+/**
+ * The results of a Field Faceting
+ */
+public class FacetFieldContext
+{
+    private final String label;
+    private final List<Bucket> buckets;
+
+    public FacetFieldContext(String label, List<Bucket> buckets)
+    {
+        this.label = label;
+        this.buckets = buckets;
+    }
+
+    public String getLabel()
+    {
+        return label;
+    }
+
+    public List<Bucket> getBuckets()
+    {
+        return buckets;
+    }
+
+    public static class Bucket
+    {
+        @JsonInclude(JsonInclude.Include.NON_NULL)
+        private final String label;
+        private final String filterQuery;
+        private final int count;
+        private final Object display;
+
+        public Bucket(String label, String filterQuery, int count, Object display)
+        {
+            this.label = label;
+            this.filterQuery = filterQuery;
+            this.count = count;
+            this.display = display;
+        }
+
+        public String getFilterQuery()
+        {
+            return filterQuery;
+        }
+
+        public Object getDisplay()
+        {
+            return display;
+        }
+
+        public String getLabel()
+        {
+            return label;
+        }
+
+        public int getCount()
+        {
+            return count;
+        }
+
+        @Override
+        public boolean equals(Object o)
+        {
+            if (this == o)
+                return true;
+            if (o == null || getClass() != o.getClass())
+                return false;
+
+            Bucket bucket = (Bucket) o;
+
+            if (count != bucket.count)
+                return false;
+            if (label != null ? !label.equals(bucket.label) : bucket.label != null)
+                return false;
+            if (filterQuery != null ? !filterQuery.equals(bucket.filterQuery) : bucket.filterQuery != null)
+                return false;
+            if (display != null ? !display.equals(bucket.display) : bucket.display != null)
+                return false;
+
+            return true;
+        }
+
+        @Override
+        public int hashCode()
+        {
+            int result = label != null ? label.hashCode() : 0;
+            result = 31 * result + (filterQuery != null ? filterQuery.hashCode() : 0);
+            result = 31 * result + count;
+            result = 31 * result + (display != null ? display.hashCode() : 0);
+            return result;
+        }
+
+        @Override
+        public String toString()
+        {
+            return "Bucket{" +
+                        "label='" + label + '\'' +
+                        ", filterQuery='" + filterQuery + '\'' +
+                        ", count=" + count +
+                        ", display=" + display +
+                        '}';
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/context/FacetQueryContext.java b/remote-api/src/main/java/org/alfresco/rest/api/search/context/FacetQueryContext.java
new file mode 100644
index 00000000000..528f61b55fd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/context/FacetQueryContext.java
@@ -0,0 +1,97 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.context;
+
+/**
+ * The results of a facet query
+ */
+public class FacetQueryContext
+{
+    private final String label;
+    private final String filterQuery;
+    private final int count;
+
+    public FacetQueryContext(String label, String filterQuery, int count)
+    {
+        this.label = label;
+        this.filterQuery = filterQuery;
+        this.count = count;
+    }
+
+    public String getFilterQuery()
+    {
+        return filterQuery;
+    }
+
+    public String getLabel()
+    {
+        return label;
+    }
+
+    public int getCount()
+    {
+        return count;
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+
+        FacetQueryContext that = (FacetQueryContext) o;
+
+        if (count != that.count)
+            return false;
+        if (label != null ? !label.equals(that.label) : that.label != null)
+            return false;
+        if (filterQuery != null ? !filterQuery.equals(that.filterQuery) : that.filterQuery != null)
+            return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        int result = label != null ? label.hashCode() : 0;
+        result = 31 * result + (filterQuery != null ? filterQuery.hashCode() : 0);
+        result = 31 * result + count;
+        return result;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "FacetQueryContext{" +
+                    "label='" + label + '\'' +
+                    ", filterQuery='" + filterQuery + '\'' +
+                    ", count=" + count +
+                    '}';
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/context/SearchContext.java b/remote-api/src/main/java/org/alfresco/rest/api/search/context/SearchContext.java
new file mode 100644
index 00000000000..f5bb7d0122d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/context/SearchContext.java
@@ -0,0 +1,107 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.context;
+
+import java.util.List;
+
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericFacetResponse;
+import org.alfresco.rest.api.search.model.SearchQuery;
+
+/**
+ * The contextual results of a Search
+ */
+public class SearchContext
+{
+    private final Consistency consistency;
+    private final List<FacetQueryContext> facetQueries;
+    private final SpellCheckContext spellCheck;
+    private final List<FacetFieldContext> facetsFields;
+    private final List<GenericFacetResponse> facets;
+    private final SearchQuery request;
+
+    public SearchContext(long lastTxId, List<GenericFacetResponse> facets, List<FacetQueryContext> facetResults, List<FacetFieldContext> facetsFields, SpellCheckContext spellCheck,
+                SearchQuery request)
+    {
+        this.spellCheck = spellCheck;
+        this.request = request;
+        if (lastTxId > 0)
+        {
+            consistency = new Consistency(lastTxId);
+        }
+        else
+        {
+            consistency = null;
+        }
+        this.facetQueries = facetResults;
+        this.facetsFields = facetsFields;
+        this.facets = facets;
+    }
+
+    public Consistency getConsistency()
+    {
+        return consistency;
+    }
+
+    public List<FacetQueryContext> getFacetQueries()
+    {
+        return facetQueries;
+    }
+
+    public SpellCheckContext getSpellCheck()
+    {
+        return spellCheck;
+    }
+
+    public List<GenericFacetResponse> getFacets()
+    {
+        return facets;
+    }
+
+    public List<FacetFieldContext> getFacetsFields()
+    {
+        return facetsFields;
+    }
+
+    public SearchQuery getRequest()
+    {
+        return request;
+    }
+
+    public class Consistency
+    {
+        private final long lastTxId;
+
+        public Consistency(long lastTxId)
+        {
+            this.lastTxId = lastTxId;
+        }
+
+        public long getlastTxId()
+        {
+            return lastTxId;
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/context/SearchRequestContext.java b/remote-api/src/main/java/org/alfresco/rest/api/search/context/SearchRequestContext.java
new file mode 100644
index 00000000000..4706b22915c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/context/SearchRequestContext.java
@@ -0,0 +1,80 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.context;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.rest.api.search.model.Query;
+import org.alfresco.rest.api.search.model.SearchQuery;
+import org.alfresco.service.cmr.search.FacetFormat;
+
+/**
+ * This is a snapshot of the SearchQuery before the request is made.
+ * It isn't a complete copy of SearchQuery but only has fields that are useful when building
+ * the response
+ */
+public class SearchRequestContext
+{
+
+    private final Query query;
+    private final boolean includeRequest;
+    private final Map<String, String> pivotKeys;
+    private final Set<String> stores;
+
+    private SearchRequestContext(Query query, boolean includeRequest)
+    {
+        this.query = query;
+        this.includeRequest = includeRequest;
+        this.pivotKeys = new HashMap<>();
+        this.stores = new HashSet<>();
+    }
+
+    public static final SearchRequestContext from(SearchQuery searchQuery)
+    {
+        return new SearchRequestContext(searchQuery.getQuery(), searchQuery.includeRequest());
+    }
+
+    public Query getQuery()
+    {
+        return query;
+    }
+    public boolean includeRequest()
+    {
+        return includeRequest;
+    }
+
+    public Map<String, String> getPivotKeys()
+    {
+        return pivotKeys;
+    }
+    public Set<String> getStores()
+    {
+        return stores;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/context/SpellCheckContext.java b/remote-api/src/main/java/org/alfresco/rest/api/search/context/SpellCheckContext.java
new file mode 100644
index 00000000000..2ecde4907ff
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/context/SpellCheckContext.java
@@ -0,0 +1,53 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.context;
+
+import java.util.List;
+
+/**
+ * The results of a SpellCheck
+ */
+public class SpellCheckContext
+{
+    private final String type;
+    private final List<String> suggestions;
+
+    public SpellCheckContext(String type, List<String> suggestions)
+    {
+        this.type = type;
+        this.suggestions = suggestions;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+
+    public List<String> getSuggestions()
+    {
+        return suggestions;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/impl/ResultMapper.java b/remote-api/src/main/java/org/alfresco/rest/api/search/impl/ResultMapper.java
new file mode 100644
index 00000000000..6ebba523bd4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/impl/ResultMapper.java
@@ -0,0 +1,672 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.search.impl;
+
+import static org.alfresco.rest.api.search.impl.StoreMapper.DELETED;
+import static org.alfresco.rest.api.search.impl.StoreMapper.HISTORY;
+import static org.alfresco.rest.api.search.impl.StoreMapper.LIVE_NODES;
+import static org.alfresco.rest.api.search.impl.StoreMapper.VERSIONS;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.alfresco.repo.search.impl.lucene.SolrJSONResultSet;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericBucket;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericFacetResponse;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericFacetResponse.FACET_TYPE;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.Metric;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.Metric.METRIC_TYPE;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.RangeResultMapper;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.SimpleMetric;
+import org.alfresco.repo.security.permissions.impl.acegi.FilteringResultSet;
+import org.alfresco.repo.version.Version2Model;
+import org.alfresco.rest.api.DeletedNodes;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.lookups.PropertyLookupRegistry;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.UserInfo;
+import org.alfresco.rest.api.nodes.NodeVersionsRelation;
+import org.alfresco.rest.api.search.context.FacetFieldContext;
+import org.alfresco.rest.api.search.context.FacetFieldContext.Bucket;
+import org.alfresco.rest.api.search.context.FacetQueryContext;
+import org.alfresco.rest.api.search.context.SearchContext;
+import org.alfresco.rest.api.search.context.SearchRequestContext;
+import org.alfresco.rest.api.search.context.SpellCheckContext;
+import org.alfresco.rest.api.search.model.FacetField;
+import org.alfresco.rest.api.search.model.FacetQuery;
+import org.alfresco.rest.api.search.model.HighlightEntry;
+import org.alfresco.rest.api.search.model.SearchEntry;
+import org.alfresco.rest.api.search.model.SearchQuery;
+import org.alfresco.rest.api.search.model.SearchSQLQuery;
+import org.alfresco.rest.api.search.model.TupleEntry;
+import org.alfresco.rest.api.search.model.TupleList;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.search.FacetFormat;
+import org.alfresco.service.cmr.search.Interval;
+import org.alfresco.service.cmr.search.IntervalSet;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.ResultSetRow;
+import org.alfresco.service.cmr.search.SpellCheckResult;
+import org.alfresco.service.cmr.version.Version;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Maps from a ResultSet to a json public api representation.
+ *
+ * @author Gethin James
+ */
+public class ResultMapper
+{
+    private ServiceRegistry serviceRegistry;
+    private Nodes nodes;
+    private NodeVersionsRelation nodeVersions;
+    private PropertyLookupRegistry propertyLookup;
+    private StoreMapper storeMapper;
+    private DeletedNodes deletedNodes;
+    private static Log logger = LogFactory.getLog(ResultMapper.class);
+
+    public ResultMapper()
+    {
+    }
+
+    public void setServiceRegistry(ServiceRegistry serviceRegistry)
+    {
+        this.serviceRegistry = serviceRegistry;
+    }
+
+    public void setNodeVersions(NodeVersionsRelation nodeVersions)
+    {
+        this.nodeVersions = nodeVersions;
+    }
+
+    public void setDeletedNodes(DeletedNodes deletedNodes)
+    {
+        this.deletedNodes = deletedNodes;
+    }
+
+    public void setStoreMapper(StoreMapper storeMapper)
+    {
+        this.storeMapper = storeMapper;
+    }
+
+    public void setNodes(Nodes nodes)
+    {
+        this.nodes = nodes;
+    }
+
+    public void setPropertyLookup(PropertyLookupRegistry propertyLookup)
+    {
+        this.propertyLookup = propertyLookup;
+    }
+
+    /**
+     * Turns the results into a CollectionWithPagingInfo
+     * @param params
+     * @param searchQuery
+     *@param results  @return CollectionWithPagingInfo<Node>
+     */
+    public CollectionWithPagingInfo<Node> toCollectionWithPagingInfo(Params params, SearchRequestContext searchRequestContext, SearchQuery searchQuery, ResultSet results)
+    {
+        SearchContext context = null;
+        Integer total = null;
+        List<Node> noderesults = new ArrayList<Node>();
+        Map<String, UserInfo> mapUserInfo = new HashMap<>(10);
+        Map<NodeRef, List<Pair<String, List<String>>>> hightLighting = results.getHighlighting();
+        int notFound = 0;
+        boolean isHistory = searchRequestContext.getStores().contains(StoreMapper.HISTORY);
+
+        for (ResultSetRow row:results)
+        {
+            Node aNode = getNode(row, params, mapUserInfo, isHistory);
+
+            if (aNode != null)
+            {
+                float f = row.getScore();
+                List<HighlightEntry> highlightEntries = null;
+                List<Pair<String, List<String>>> high = hightLighting.get(row.getNodeRef());
+
+                if (high != null && !high.isEmpty())
+                {
+                    highlightEntries = new ArrayList<HighlightEntry>(high.size());
+                    for (Pair<String, List<String>> highlight:high)
+                    {
+                        highlightEntries.add(new HighlightEntry(highlight.getFirst(), highlight.getSecond()));
+                    }
+                }
+                aNode.setSearch(new SearchEntry(f, highlightEntries));
+                noderesults.add(aNode);
+            }
+            else
+            {
+                logger.debug("Unknown noderef returned from search results "+row.getNodeRef());
+                notFound++;
+            }
+        }
+
+        SolrJSONResultSet solrResultSet = findSolrResultSet(results);
+
+        if (solrResultSet != null)
+        {
+            //We used Solr for this query
+            context = toSearchContext(solrResultSet, searchRequestContext, searchQuery, notFound);
+        }
+
+        total = setTotal(results);
+
+        return CollectionWithPagingInfo.asPaged(params.getPaging(), noderesults, results.hasMore(), total, null, context);
+    }
+
+    /**
+     * Builds a node representation based on a ResultSetRow;
+     * @param searchRequestContext
+     * @param aRow
+     * @param params
+     * @param mapUserInfo
+     * @param isHistory
+     * @return Node
+     */
+    public Node getNode(ResultSetRow aRow, Params params, Map<String, UserInfo> mapUserInfo, boolean isHistory)
+    {
+        String nodeStore = storeMapper.getStore(aRow.getNodeRef());
+        if (isHistory) nodeStore = HISTORY;
+        Node aNode = null;
+
+        switch (nodeStore)
+        {
+            case LIVE_NODES:
+                aNode = nodes.getFolderOrDocument(aRow.getNodeRef(), null, null, params.getInclude(), mapUserInfo);
+                break;
+            case HISTORY:
+                aNode = nodes.getFolderOrDocument(aRow.getNodeRef(), null, null, params.getInclude(), mapUserInfo);
+                break;
+            case VERSIONS:
+                Map<QName, Serializable> properties = serviceRegistry.getNodeService().getProperties(aRow.getNodeRef());
+                NodeRef frozenNodeRef = ((NodeRef) properties.get(Version2Model.PROP_QNAME_FROZEN_NODE_REF));
+                String versionLabelId = (String) properties.get(Version2Model.PROP_QNAME_VERSION_LABEL);
+                Version v = null;
+                try
+                {
+                    if (frozenNodeRef != null && versionLabelId != null)
+                    {
+                        v = nodeVersions.findVersion(frozenNodeRef.getId(),versionLabelId);
+                        aNode = nodes.getFolderOrDocument(v.getFrozenStateNodeRef(), null, null, params.getInclude(), mapUserInfo);
+                    }
+                }
+                catch (EntityNotFoundException|InvalidNodeRefException e)
+                {
+                    //Solr says there is a node but we can't find it
+                    logger.debug("Failed to find a versioned node with id of "+frozenNodeRef
+                                + " this is probably because the original node has been deleted.");
+                }
+
+                if (v != null && aNode != null)
+                {
+                    nodeVersions.mapVersionInfo(v, aNode, aRow.getNodeRef());
+                    aNode.setNodeId(frozenNodeRef.getId());
+                    aNode.setVersionLabel(versionLabelId);
+                }
+                break;
+            case DELETED:
+                try
+                {
+                    aNode = deletedNodes.getDeletedNode(aRow.getNodeRef().getId(), params, false, mapUserInfo);
+                }
+                catch (EntityNotFoundException enfe)
+                {
+                    //Solr says there is a deleted node but we can't find it, we want the rest of the search to return so lets ignore it.
+                    logger.debug("Failed to find a deleted node with id of "+aRow.getNodeRef().getId());
+                }
+                break;
+        }
+        if (aNode != null)
+        {
+            aNode.setLocation(nodeStore);
+        }
+        return aNode;
+    }
+
+    /**
+     * Sets the total number found.
+     * @param results
+     * @return An integer total
+     */
+    public Integer setTotal(ResultSet results)
+    {
+        Long totalItems = results.getNumberFound();
+        Integer total = totalItems.intValue();
+        return total;
+    }
+
+    /**
+     * Uses the results from Solr to set the Search Context
+     * @param SolrJSONResultSet
+     * @param searchQuery
+     * @return SearchContext
+     */
+    public SearchContext toSearchContext(SolrJSONResultSet solrResultSet, SearchRequestContext searchRequestContext, SearchQuery searchQuery, int notFound)
+    {
+        SearchContext context = null;
+        Map<String, Integer> facetQueries = solrResultSet.getFacetQueries();
+        List<GenericFacetResponse> facets = new ArrayList<>();
+        List<FacetQueryContext> facetResults = null;
+        SpellCheckContext spellCheckContext = null;
+        List<FacetFieldContext> ffcs = new ArrayList<FacetFieldContext>();
+
+        if (searchQuery == null)
+        {
+            throw new IllegalArgumentException("searchQuery can't be null");
+        }
+
+        //Facet queries
+        if(facetQueries!= null && !facetQueries.isEmpty())
+        {
+            //If group by field populated in query facet return bucketing into facet field.
+            List<GenericFacetResponse> facetQueryForFields = getFacetBucketsFromFacetQueries(facetQueries,searchQuery);
+            if(hasGroup(searchQuery) || FacetFormat.V2 == searchQuery.getFacetFormat())
+            {
+                facets.addAll(facetQueryForFields);
+            }
+            else
+            {
+                // Return the old way facet query with no bucketing.
+                facetResults = new ArrayList<>(facetQueries.size());
+                for (Entry<String, Integer> fq:facetQueries.entrySet())
+                {
+                    String filterQuery = null;
+                    if (searchQuery.getFacetQueries() != null)
+                    {
+                        Optional<FacetQuery> found = searchQuery.getFacetQueries().stream().filter(facetQuery -> fq.getKey().equals(facetQuery.getLabel())).findFirst();
+                        filterQuery = found.isPresent()? found.get().getQuery():fq.getKey();
+                    }
+                    facetResults.add(new FacetQueryContext(fq.getKey(), filterQuery, fq.getValue()));
+                }
+            }
+        }
+
+        //Field Facets
+        Map<String, List<Pair<String, Integer>>> facetFields = solrResultSet.getFieldFacets();
+        if(FacetFormat.V2 == searchQuery.getFacetFormat())
+        {
+            facets.addAll(getFacetBucketsForFacetFieldsAsFacets(facetFields, searchQuery));
+        }
+        else
+        {
+            ffcs.addAll(getFacetBucketsForFacetFields(facetFields, searchQuery));
+        }
+
+        Map<String, List<Pair<String, Integer>>> facetInterval = solrResultSet.getFacetIntervals();
+        facets.addAll(getGenericFacetsForIntervals(facetInterval, searchQuery));
+        
+        Map<String,List<Map<String,String>>> facetRanges = solrResultSet.getFacetRanges();
+        facets.addAll(RangeResultMapper.getGenericFacetsForRanges(facetRanges, searchQuery.getFacetRanges()));
+
+        List<GenericFacetResponse> stats = getFieldStats(searchRequestContext, solrResultSet.getStats());
+        List<GenericFacetResponse> pimped = getPivots(searchRequestContext, solrResultSet.getPivotFacets(), stats);
+        facets.addAll(pimped);
+        facets.addAll(stats);
+
+        //Spelling
+        SpellCheckResult spell = solrResultSet.getSpellCheckResult();
+        if (spell != null && spell.getResultName() != null && !spell.getResults().isEmpty())
+        {
+            spellCheckContext = new SpellCheckContext(spell.getResultName(),spell.getResults());
+        }
+
+        //Put it all together
+        context = new SearchContext(solrResultSet.getLastIndexedTxId(), facets, facetResults, ffcs, spellCheckContext, searchRequestContext.includeRequest()?searchQuery:null);
+        return isNullContext(context)?null:context;
+    }
+    public static boolean hasGroup(SearchQuery searchQuery)
+    {
+        if(searchQuery != null && searchQuery.getFacetQueries() != null)
+        {
+            return searchQuery.getFacetQueries().stream().anyMatch(facetQ -> facetQ.getGroup() != null);
+        }
+        return false;
+    }
+    /**
+     * Builds a facet field from facet queries.
+     * @param facetQueries
+     * @return
+     */
+    protected List<GenericFacetResponse> getFacetBucketsFromFacetQueries(Map<String, Integer> facetQueries, SearchQuery searchQuery)
+    {
+        List<GenericFacetResponse> facetResults = new ArrayList<GenericFacetResponse>();
+        Map<String,List<GenericBucket>> groups = new HashMap<>();
+        
+        for (Entry<String, Integer> fq:facetQueries.entrySet())
+        {
+            String group = null;
+            String filterQuery = null;
+            if (searchQuery != null && searchQuery.getFacetQueries() != null)
+            {
+                Optional<FacetQuery> found = searchQuery.getFacetQueries().stream().filter(facetQuery -> fq.getKey().equals(facetQuery.getLabel())).findFirst();
+                filterQuery = found.isPresent()? found.get().getQuery():fq.getKey();
+                if(found.isPresent() && found.get().getGroup() != null)
+                {
+                    group = found.get().getGroup();
+                }
+            }
+//            if(group != null && !group.isEmpty() || FacetFormat.V2 == searchQuery.getFacetFormat())
+//            {
+                if(groups.containsKey(group)) 
+                {
+                    Set<Metric> metrics = new HashSet<>(1);
+                    metrics.add(new SimpleMetric(METRIC_TYPE.count, fq.getValue()));
+                    groups.get(group).add(new GenericBucket(fq.getKey(), filterQuery, null,metrics, null));
+                }
+                else
+                {
+                    List<GenericBucket> l = new ArrayList<GenericBucket>();
+                    Set<Metric> metrics = new HashSet<>(1);
+                    metrics.add(new SimpleMetric(METRIC_TYPE.count, fq.getValue()));
+                    l.add(new GenericBucket(fq.getKey(),filterQuery, null, metrics, null));
+                    groups.put(group, l);
+                }
+            }
+//        }
+        if(!groups.isEmpty())
+        {
+            groups.forEach((a,v) -> facetResults.add(new GenericFacetResponse(FACET_TYPE.query, a, v)));
+        }
+        return facetResults;
+    }
+
+    protected List<GenericFacetResponse> getFieldStats(SearchRequestContext searchRequestContext, Map<String, Set<Metric>> stats)
+    {
+        if(stats != null && !stats.isEmpty())
+        {
+            return stats.entrySet().stream().map(statsFieldEntry -> {
+               return new GenericFacetResponse(FACET_TYPE.stats, statsFieldEntry.getKey(),
+                           Arrays.asList(new GenericBucket(null,null, null,
+                                       statsFieldEntry.getValue(), null)) );
+            }
+            ).collect(Collectors.toList());
+        }
+
+        return Collections.emptyList();
+    }
+
+    protected List<GenericFacetResponse> getPivots(SearchRequestContext searchRequest, List<GenericFacetResponse> pivots,
+                List<GenericFacetResponse> stats)
+    {
+        if(pivots != null && !pivots.isEmpty())
+        {
+            Map<String, String> pivotKeys = searchRequest.getPivotKeys();
+
+            return pivots.stream().map(aFacet -> {
+
+                String pivotLabel = pivotKeys.containsKey(aFacet.getLabel())?pivotKeys.get(aFacet.getLabel()):aFacet.getLabel();
+
+                //can reference, facetfield, the last one can be rangefacet, facetquery or stats
+                List<GenericBucket> bucks = new ArrayList<>();
+                Optional<GenericFacetResponse> foundStat = stats.stream().filter(
+                            aStat -> aStat.getLabel().equals(pivotLabel)).findFirst();
+                if (foundStat.isPresent())
+                {
+                   bucks.add(foundStat.get().getBuckets().get(0));
+                   stats.remove(foundStat.get());
+                }
+                bucks.addAll(aFacet.getBuckets().stream().map(genericBucket -> {
+                    Object display = propertyLookup.lookup(aFacet.getLabel(), genericBucket.getLabel());
+                    return new GenericBucket(genericBucket.getLabel(), genericBucket.getFilterQuery(),
+                                display,genericBucket.getMetrics(), getPivots(searchRequest, genericBucket.getFacets(), stats));
+                }).collect(Collectors.toList()));
+
+                return new GenericFacetResponse(aFacet.getType(), pivotLabel, bucks);
+            }).collect(Collectors.toList());
+        }
+
+        return Collections.emptyList();
+    }
+    protected List<GenericFacetResponse> getFacetBucketsForFacetFieldsAsFacets(Map<String, List<Pair<String, Integer>>> facetFields, SearchQuery searchQuery)
+    {
+        if (facetFields != null && !facetFields.isEmpty())
+        {
+            List<GenericFacetResponse> ffcs = new ArrayList<>(facetFields.size());
+            for (Entry<String, List<Pair<String, Integer>>> facet:facetFields.entrySet())
+            {
+                if (facet.getValue() != null && !facet.getValue().isEmpty())
+                {
+                    List<GenericBucket> buckets = new ArrayList<>(facet.getValue().size());
+                    for (Pair<String, Integer> buck:facet.getValue())
+                    {
+                        Object display = null;
+                        String filterQuery = null;
+                        if (searchQuery != null
+                                    && searchQuery.getFacetFields() != null
+                                    && searchQuery.getFacetFields().getFacets() != null
+                                    && !searchQuery.getFacetFields().getFacets().isEmpty())
+                        {
+                            Optional<FacetField> found = searchQuery.getFacetFields().getFacets().stream().filter(
+                                        queryable -> facet.getKey().equals(queryable.getLabel()!=null?queryable.getLabel():queryable.getField())).findFirst();
+                            if (found.isPresent())
+                            {
+                                display = propertyLookup.lookup(found.get().getField(), buck.getFirst());
+                                String fq = found.get().toFilterQuery(buck.getFirst());
+                                if (fq != null)
+                                {
+                                    filterQuery = fq;
+                                }
+                            }
+                        }
+                        GenericBucket bucket = new GenericBucket(buck.getFirst(), filterQuery, display, new HashSet<Metric>(Arrays.asList(new SimpleMetric(METRIC_TYPE.count,String.valueOf(buck.getSecond())))), null, null);
+                        buckets.add(bucket);
+                    }
+                    ffcs.add(new GenericFacetResponse(FACET_TYPE.field,facet.getKey(), buckets));
+                }
+            }
+            return ffcs;
+        }
+        return Collections.emptyList();
+    }
+    protected List<FacetFieldContext> getFacetBucketsForFacetFields(Map<String, List<Pair<String, Integer>>> facetFields, SearchQuery searchQuery)
+    {
+        if (facetFields != null && !facetFields.isEmpty())
+        {
+            List<FacetFieldContext> ffcs = new ArrayList<>(facetFields.size());
+            for (Entry<String, List<Pair<String, Integer>>> facet:facetFields.entrySet())
+            {
+                if (facet.getValue() != null && !facet.getValue().isEmpty())
+                {
+                    List<Bucket> buckets = new ArrayList<>(facet.getValue().size());
+                    for (Pair<String, Integer> buck:facet.getValue())
+                    {
+                        Object display = null;
+                        String filterQuery = null;
+                        if (searchQuery != null
+                                    && searchQuery.getFacetFields() != null
+                                    && searchQuery.getFacetFields().getFacets() != null
+                                    && !searchQuery.getFacetFields().getFacets().isEmpty())
+                        {
+                            Optional<FacetField> found = searchQuery.getFacetFields().getFacets().stream().filter(
+                                        queryable -> facet.getKey().equals(queryable.getLabel()!=null?queryable.getLabel():queryable.getField())).findFirst();
+                            if (found.isPresent())
+                            {
+                                display = propertyLookup.lookup(found.get().getField(), buck.getFirst());
+                                String fq = found.get().toFilterQuery(buck.getFirst());
+                                if (fq != null)
+                                {
+                                    filterQuery = fq;
+                                }
+                            }
+                        }
+                        buckets.add(new Bucket(buck.getFirst(), filterQuery,buck.getSecond(),display));
+                    }
+                    ffcs.add(new FacetFieldContext(facet.getKey(), buckets));
+                }
+            }
+
+            return ffcs;
+        }
+        return Collections.emptyList();
+    }
+    /**
+     * Returns generic faceting responses for Intervals
+     * @param facetFields
+     * @param searchQuery
+     * @return GenericFacetResponse
+     */
+    protected static List<GenericFacetResponse> getGenericFacetsForIntervals(Map<String, List<Pair<String, Integer>>> facetFields, SearchQuery searchQuery)
+    {
+        if (facetFields != null && !facetFields.isEmpty())
+        {
+            List<GenericFacetResponse> ffcs = new ArrayList<>(facetFields.size());
+            for (Entry<String, List<Pair<String, Integer>>> facet:facetFields.entrySet())
+            {
+                if (facet.getValue() != null && !facet.getValue().isEmpty())
+                {
+                    List<GenericBucket> buckets = new ArrayList<>(facet.getValue().size());
+                    for (Pair<String, Integer> buck:facet.getValue())
+                    {
+                        String filterQuery = null;
+                        Map<String, String> bucketInfo = new HashMap<>();
+
+                        if (searchQuery != null
+                                    && searchQuery.getFacetIntervals() != null
+                                    && searchQuery.getFacetIntervals().getIntervals() != null
+                                    && !searchQuery.getFacetIntervals().getIntervals().isEmpty())
+                        {
+                            Optional<Interval> found = searchQuery.getFacetIntervals().getIntervals().stream().filter(
+                                        interval -> facet.getKey().equals(interval.getLabel()!=null?interval.getLabel():interval.getField())).findFirst();
+                            if (found.isPresent())
+                            {
+                                if (found.get().getSets() != null)
+                                {
+                                    Optional<IntervalSet> foundSet = found.get().getSets().stream().filter(aSet -> buck.getFirst().equals(aSet.getLabel())).findFirst();
+                                    if (foundSet.isPresent())
+                                    {
+                                        filterQuery = found.get().getField() + ":" + foundSet.get().toAFTSQuery();
+                                        bucketInfo.put(GenericFacetResponse.START, foundSet.get().getStart());
+                                        bucketInfo.put(GenericFacetResponse.END, foundSet.get().getEnd());
+                                        bucketInfo.put(GenericFacetResponse.START_INC, String.valueOf(foundSet.get().isStartInclusive()));
+                                        bucketInfo.put(GenericFacetResponse.END_INC, String.valueOf(foundSet.get().isEndInclusive()));
+                                    }
+                                }
+                            }
+                        }
+                        GenericBucket bucket = new GenericBucket(buck.getFirst(), filterQuery, null , new HashSet<Metric>(Arrays.asList(new SimpleMetric(METRIC_TYPE.count,String.valueOf(buck.getSecond())))), null, bucketInfo);
+                        buckets.add(bucket);
+                    }
+                    ffcs.add(new GenericFacetResponse(FACET_TYPE.interval, facet.getKey(), buckets));
+                }
+            }
+
+            return ffcs;
+        }
+        return Collections.emptyList();
+    }
+
+    /**
+     * Is the context null?
+     * @param context
+     * @return true if its null
+     */
+    public boolean isNullContext(SearchContext context)
+    {
+        return (context.getFacetQueries() == null
+                    && context.getConsistency() == null
+                    && context.getSpellCheck() == null
+                    && context.getFacetsFields() == null
+                    && context.getFacets() == null);
+    }
+
+    /**
+     * Gets SolrJSONResultSet class if there is one.
+     * @param results
+     * @return
+     */
+    protected SolrJSONResultSet findSolrResultSet(ResultSet results)
+    {
+        ResultSet theResultSet = results;
+
+        if (results instanceof FilteringResultSet)
+        {
+            theResultSet = ((FilteringResultSet) results).getUnFilteredResultSet();
+        }
+
+        if (theResultSet instanceof SolrJSONResultSet)
+        {
+            return (SolrJSONResultSet) theResultSet;
+        }
+
+        return null;
+    }
+    public CollectionWithPagingInfo<TupleList> toCollectionWithPagingInfo(JSONArray docs, SearchSQLQuery searchQuery) throws JSONException
+    {
+        if(docs == null )
+        {
+            throw new RuntimeException("Solr response is required instead of JSONArray docs was null" );
+        }
+        if(searchQuery == null )
+        {
+            throw new RuntimeException("SearchSQLQuery is required" );
+        }
+        List<TupleList> entries = new ArrayList<TupleList>();
+        for(int i = 0; i < docs.length() -1; i++)
+        {
+            List<TupleEntry> row = new ArrayList<TupleEntry>();
+            JSONObject docObj = (JSONObject) docs.get(i);
+            docObj.keys().forEachRemaining(action -> {
+                try
+                {
+                    String value = docObj.get(action.toString()).toString();
+                    row.add(new TupleEntry(action.toString(), value));
+                } 
+                catch (JSONException e)
+                {
+                    throw new RuntimeException("Unable to parse SQL response. " + e);
+                }
+            });
+            entries.add(new TupleList(row));
+        }
+        Paging paging  = Paging.valueOf(0, searchQuery.getItemLimit());
+        return CollectionWithPagingInfo.asPaged(paging, entries);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/impl/SearchMapper.java b/remote-api/src/main/java/org/alfresco/rest/api/search/impl/SearchMapper.java
new file mode 100644
index 00000000000..2df9fe4e0a5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/impl/SearchMapper.java
@@ -0,0 +1,833 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.search.impl;
+
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toList;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ALLOWABLEOPERATIONS;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ASPECTNAMES;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ASSOCIATION;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ISLINK;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ISLOCKED;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_PATH;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_PERMISSIONS;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_PROPERTIES;
+import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_CMIS_ALFRESCO;
+import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_FTS_ALFRESCO;
+import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_LUCENE;
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.search.impl.lucene.LuceneQueryLanguageSPI;
+import org.alfresco.rest.api.search.context.SearchRequestContext;
+import org.alfresco.rest.api.search.model.Default;
+import org.alfresco.rest.api.search.model.FacetField;
+import org.alfresco.rest.api.search.model.FacetFields;
+import org.alfresco.rest.api.search.model.FacetQuery;
+import org.alfresco.rest.api.search.model.FilterQuery;
+import org.alfresco.rest.api.search.model.Limits;
+import org.alfresco.rest.api.search.model.Localization;
+import org.alfresco.rest.api.search.model.Pivot;
+import org.alfresco.rest.api.search.model.Query;
+import org.alfresco.rest.api.search.model.Scope;
+import org.alfresco.rest.api.search.model.SearchQuery;
+import org.alfresco.rest.api.search.model.SortDef;
+import org.alfresco.rest.api.search.model.Spelling;
+import org.alfresco.rest.api.search.model.Template;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.GeneralHighlightParameters;
+import org.alfresco.service.cmr.search.Interval;
+import org.alfresco.service.cmr.search.IntervalParameters;
+import org.alfresco.service.cmr.search.IntervalSet;
+import org.alfresco.service.cmr.search.LimitBy;
+import org.alfresco.service.cmr.search.RangeParameters;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchParameters.FieldFacet;
+import org.alfresco.service.cmr.search.SearchParameters.FieldFacetMethod;
+import org.alfresco.service.cmr.search.SearchParameters.FieldFacetSort;
+import org.alfresco.service.cmr.search.SearchParameters.Operator;
+import org.alfresco.service.cmr.search.SearchParameters.SortDefinition;
+import org.alfresco.service.cmr.search.SearchParameters.SortDefinition.SortType;
+import org.alfresco.service.cmr.search.StatsRequestParameters;
+import org.alfresco.util.ParameterCheck;
+
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.stream.Collectors;
+
+/**
+ * Maps from a json request and a solr SearchParameters object.
+ *
+ * @author Gethin James
+ */
+public class SearchMapper
+{
+    public static final List<String> PERMITTED_INCLUDES
+                = Arrays.asList(PARAM_INCLUDE_ALLOWABLEOPERATIONS,PARAM_INCLUDE_ASPECTNAMES,
+                                PARAM_INCLUDE_ISLINK, PARAM_INCLUDE_PATH, PARAM_INCLUDE_PROPERTIES,
+                                PARAM_INCLUDE_ASSOCIATION, PARAM_INCLUDE_ISLOCKED, PARAM_INCLUDE_PERMISSIONS);
+
+    public static final String CMIS = "cmis";
+    public static final String LUCENE = "lucene";
+    public static final String AFTS = "afts";
+    private StoreMapper storeMapper;
+
+    /**
+     * Turn the SearchQuery params serialized by Jackson into the Java SearchParameters object
+     * @param params
+     * @return SearchParameters
+     */
+    public SearchParameters toSearchParameters(Params params, SearchQuery searchQuery, SearchRequestContext searchRequestContext)
+    {
+        ParameterCheck.mandatory("query", searchQuery.getQuery());
+
+        SearchParameters sp = new SearchParameters();
+        setDefaults(sp);
+        fromLocalization(sp, searchQuery.getLocalization());
+        fromQuery(sp,  searchQuery.getQuery());
+        fromPaging(sp, params.getPaging());
+        fromSort(sp, searchQuery.getSort());
+        fromTemplate(sp, searchQuery.getTemplates());
+        validateInclude(searchQuery.getInclude());
+        fromDefault(sp, searchQuery.getDefaults());
+        fromFilterQuery(sp, searchQuery.getFilterQueries());
+        fromFacetQuery(sp, searchQuery.getFacetQueries());
+        fromPivot(sp, searchQuery.getStats(), searchQuery.getFacetFields(), searchQuery.getFacetRanges(), searchQuery.getPivots(), searchRequestContext);
+        fromStats(sp, searchQuery.getStats());
+        fromFacetFields(sp, searchQuery.getFacetFields());
+        fromSpellCheck(sp, searchQuery.getSpellcheck());
+        fromHighlight(sp, searchQuery.getHighlight());
+        fromFacetIntervals(sp, searchQuery.getFacetIntervals());
+        fromRange(sp, searchQuery.getFacetRanges());
+        fromScope(sp, searchQuery.getScope(), searchRequestContext);
+        fromLimits(sp, searchQuery.getLimits());
+        return sp;
+    }
+
+    /**
+     * Sets the API defaults
+     * @param sp
+     */
+    public void setDefaults(SearchParameters sp)
+    {
+        //Hardcode workspace store
+        sp.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+    }
+
+    /**
+     * SearchParameters from the Query object
+     * @param sp SearchParameters
+     * @param q Query
+     */
+    public void fromQuery(SearchParameters sp, Query q)
+    {
+        ParameterCheck.mandatoryString("query", q.getQuery());
+        String lang = q.getLanguage()==null?AFTS:q.getLanguage();
+
+        switch (lang.toLowerCase())
+        {
+            case AFTS:
+                sp.setLanguage(LANGUAGE_FTS_ALFRESCO);
+                break;
+            case LUCENE:
+                sp.setLanguage(LANGUAGE_LUCENE);
+                break;
+            case CMIS:
+                sp.setLanguage(LANGUAGE_CMIS_ALFRESCO);
+                break;
+            default:
+                throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                            new Object[] { ": language allowed values: afts,lucene,cmis" });
+        }
+        sp.setQuery(q.getQuery());
+        sp.setSearchTerm(q.getUserQuery());
+    }
+
+    /**
+     * SearchParameters from the Paging object
+     * @param sp SearchParameters
+     * @param paging Paging
+     */
+    public void fromPaging(SearchParameters sp, Paging paging)
+    {
+        if (paging != null)
+        {
+            sp.setLimitBy(LimitBy.FINAL_SIZE);
+            sp.setLimit(paging.getMaxItems());
+            sp.setSkipCount(paging.getSkipCount());
+        }
+    }
+
+    /**
+     * SearchParameters from List<SortDef>
+     * @param sp SearchParameters
+     * @param sort List<SortDef>
+     */
+    public void fromSort(SearchParameters sp, List<SortDef> sort)
+    {
+        if (sort != null && !sort.isEmpty())
+        {
+            if (LANGUAGE_CMIS_ALFRESCO.equals(sp.getLanguage()))
+            {
+                throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                            new Object[] { ": sort {} not allowed with cmis language" });
+            }
+            for (SortDef sortDef:sort)
+            {
+
+                try
+                {
+                    SortType sortType = SortType.valueOf(sortDef.getType());
+                    String field = sortDef.getField();
+                    sp.addSort(new SortDefinition(sortType, field, sortDef.isAscending()));
+                }
+                catch (IllegalArgumentException e)
+                {
+                    throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID, new Object[] { sortDef.getType() });
+                }
+            }
+        }
+    }
+
+    /**
+     * SearchParameters from List<Template>
+     * @param sp SearchParameters
+     * @param templates List<Template>
+     */
+    public void fromTemplate(SearchParameters sp, List<Template> templates)
+    {
+        if (templates != null && !templates.isEmpty())
+        {
+            for (Template aTemplate:templates)
+            {
+                ParameterCheck.mandatoryString("template name", aTemplate.getName());
+                ParameterCheck.mandatoryString("template template", aTemplate.getTemplate());
+                sp.addQueryTemplate(aTemplate.getName(), aTemplate.getTemplate());
+            }
+        }
+    }
+
+    /**
+     * SearchParameters from Default object
+     * @param sp SearchParameters
+     * @param defaults Default
+     */
+    public void fromDefault(SearchParameters sp, Default defaults)
+    {
+        if (defaults != null)
+        {
+            List<String> txtAttribs = defaults.getTextAttributes();
+            if (txtAttribs!= null && !txtAttribs.isEmpty())
+            {
+                for (String attrib:txtAttribs)
+                {
+                    sp.addTextAttribute(attrib);
+                }
+            }
+
+            if (defaults.getDefaultFTSOperator() != null)
+            {
+                sp.setDefaultFTSOperator(Operator.valueOf(defaults.getDefaultFTSOperator().toUpperCase()));
+            }
+            if (defaults.getDefaultFTSFieldOperator() != null)
+            {
+                sp.setDefaultFTSFieldConnective(Operator.valueOf(defaults.getDefaultFTSFieldOperator().toUpperCase()));
+            }
+
+            sp.setNamespace(defaults.getNamespace());
+            sp.setDefaultFieldName(defaults.getDefaultFieldName());
+        }
+    }
+
+    /**
+     * Validates the List<String> includes
+     * @param includes List<String>
+     */
+    public void validateInclude(List<String> includes)
+    {
+        if (includes != null && !includes.isEmpty())
+        {
+            for (String inc:includes)
+            {
+                if (!PERMITTED_INCLUDES.contains(inc))
+                {
+                    throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID, new Object[] { inc });
+                }
+            }
+
+        }
+    }
+
+    /**
+     ** SearchParameters from List<FilterQuery>
+     * @param sp
+     * @param filterQueries
+     */
+    public void fromFilterQuery(SearchParameters sp, List<FilterQuery> filterQueries)
+    {
+        if (filterQueries != null && !filterQueries.isEmpty())
+        {
+            if (LANGUAGE_CMIS_ALFRESCO.equals(sp.getLanguage()))
+            {
+                throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                            new Object[] { ": filterQueries {} not allowed with cmis language" });
+            }
+            for (FilterQuery fq:filterQueries)
+            {
+                String query = null;
+
+                if (fq.getQuery() != null && !fq.getQuery().isEmpty())
+                {
+                    query = fq.getQuery().trim();
+                }
+
+                if (fq.getQueries() != null && !fq.getQueries().isEmpty() && query == null)
+                {
+                    query = String.join(" OR ", fq.getQueries());
+                }
+
+                ParameterCheck.mandatoryString("filterQueries query", query);
+
+                if (fq.getTags() == null || fq.getTags().isEmpty() || query.contains("afts tag"))
+                {
+                    //If its already got tags then just let it through
+                    sp.addFilterQuery(query);
+                }
+                else
+                {
+                    String tags = "tag="+String.join(",", fq.getTags());
+                    Matcher matcher = LuceneQueryLanguageSPI.AFTS_QUERY.matcher(query);
+                    if (matcher.find())
+                    {
+                        query = "{!afts "+tags+" "+matcher.group(1).trim()+"}"+matcher.group(2);
+                    }
+                    else
+                    {
+                        query = "{!afts "+tags+" }"+query;
+                    }
+                    sp.addFilterQuery(query);
+                }
+            }
+        }
+    }
+
+    /**
+     ** SearchParameters from List<FacetQuery>
+     * @param sp
+     * @param facetQueries
+     */
+    public void fromFacetQuery(SearchParameters sp, List<FacetQuery> facetQueries)
+    {
+        if (facetQueries != null && !facetQueries.isEmpty())
+        {
+            for (FacetQuery fq:facetQueries)
+            {
+                ParameterCheck.mandatoryString("facetQuery query", fq.getQuery());
+                String query = fq.getQuery();
+                String label = fq.getLabel()!=null?fq.getLabel():query;
+
+                if (query.startsWith("{!afts"))
+                {
+                    throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                                new Object[] { ": Facet queries should not start with !afts" });
+                }
+                query = "{!afts key='"+label+"'}"+query;
+                sp.addFacetQuery(query);
+            }
+        }
+    }
+
+
+    /**
+     * SearchParameters from FacetFields object
+     * @param sp SearchParameters
+     * @param FacetFields facetFields
+     */
+    public void fromFacetFields(SearchParameters sp, FacetFields facetFields)
+    {
+        if (facetFields != null)
+        {
+            ParameterCheck.mandatory("facetFields facets", facetFields.getFacets());
+
+            if (facetFields.getFacets() != null && !facetFields.getFacets().isEmpty())
+            {
+                for (FacetField facet : facetFields.getFacets())
+                {
+                    ParameterCheck.mandatoryString("facetFields facet field", facet.getField());
+                    String field = facet.getField();
+
+                    FieldFacet ff = new FieldFacet(field);
+
+                    if (facet.getSort() != null && !facet.getSort().isEmpty())
+                    {
+                        try
+                        {
+                            ff.setSort(FieldFacetSort.valueOf(facet.getSort()));
+                        }
+                        catch (IllegalArgumentException e)
+                        {
+                            throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID, new Object[] { facet.getSort() });
+                        }
+                    }
+                    if (facet.getMethod() != null && !facet.getMethod().isEmpty())
+                    {
+                        try
+                        {
+                            ff.setMethod(FieldFacetMethod.valueOf(facet.getMethod()));
+                        }
+                        catch (IllegalArgumentException e)
+                        {
+                            throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID, new Object[] { facet.getMethod() });
+                        }
+
+                    }
+
+                    ff.setPrefix(facet.getPrefix());
+                    ff.setLabel(facet.getLabel());
+                    ff.setExcludeFilters(facet.getExcludeFilters());
+                    ff.setCountDocsMissingFacetField(facet.getMissing());
+                    ff.setLimitOrNull(facet.getLimit());
+                    ff.setOffset(facet.getOffset());
+                    ff.setMinCount(facet.getMincount());
+                    ff.setEnumMethodCacheMinDF(facet.getFacetEnumCacheMinDf());
+                    sp.addFieldFacet(ff);
+                }
+            }
+        }
+    }
+
+    /**
+     * SearchParameters from SpellCheck object
+     * @param sp SearchParameters
+     * @param defaults SpellCheck
+     */
+    public void fromSpellCheck(SearchParameters sp, Spelling spelling)
+    {
+        if (spelling != null)
+        {
+            if (spelling.getQuery() != null && !spelling.getQuery().isEmpty())
+            {
+                sp.setSearchTerm(spelling.getQuery());
+            }
+            else
+            {
+                if (sp.getSearchTerm() == null || sp.getSearchTerm().isEmpty())
+                {
+                    //We don't have a valid search term to use with the spelling
+                    throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                                new Object[] { ": userQuery or spelling.query required." });
+                }
+            }
+            sp.setSpellCheck(true);
+        }
+    }
+
+    /**
+     * SearchParameters from Scope object
+     * @param Scope scope
+     * @param sp SearchParameters
+     * @param searchRequestContext
+     */
+    public void fromScope(SearchParameters sp, Scope scope, SearchRequestContext searchRequestContext)
+    {
+        if (scope != null)
+        {
+            List<String> stores = scope.getLocations();
+            if (stores!= null && !stores.isEmpty())
+            {
+                //First reset the stores then add them.
+                sp.getStores().clear();
+
+                searchRequestContext.getStores().addAll(stores);
+                for (String aStore:stores)
+                {
+                    try
+                    {
+                        sp.addStore(storeMapper.getStoreRef(aStore));
+                    }
+                    catch (AlfrescoRuntimeException are)
+                    {
+                        throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                                    new Object[] { aStore });
+                    }
+                }
+
+                if (stores.contains(StoreMapper.HISTORY) && (stores.size() > 1))
+                {
+                    throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                                new Object[] { ": scope 'history' can only be used on its own" });
+                }
+            }
+        }
+    }
+
+    /**
+     * Sets the Interval Parameters object on search parameters
+     *
+     * It does some valiation then takes any "SETS" at the top level and sets them at every field level.
+     *
+     * @param sp SearchParameters
+     * @param facetIntervals IntervalParameters
+     */
+    public void fromFacetIntervals(SearchParameters sp, IntervalParameters facetIntervals)
+    {
+        if (facetIntervals != null)
+        {
+            ParameterCheck.mandatory("facetIntervals intervals", facetIntervals.getIntervals());
+
+            Set<IntervalSet> globalSets = facetIntervals.getSets();
+            validateSets(globalSets, "facetIntervals");
+
+            if (facetIntervals.getIntervals() != null && !facetIntervals.getIntervals().isEmpty())
+            {
+                List<String> intervalLabels = new ArrayList<>(facetIntervals.getIntervals().size());
+                for (Interval interval:facetIntervals.getIntervals())
+                {
+                    ParameterCheck.mandatory("facetIntervals intervals field", interval.getField());
+                    validateSets(interval.getSets(), "facetIntervals intervals "+interval.getField());
+                    if (interval.getSets() != null && globalSets != null)
+                    {
+                        interval.getSets().addAll(globalSets);
+                    }
+                    ParameterCheck.mandatoryCollection("facetIntervals intervals sets", interval.getSets());
+
+                    List<Map.Entry<String, Long>> duplicateSetLabels =
+                                interval.getSets().stream().collect(groupingBy(IntervalSet::getLabel, Collectors.counting()))
+                                .entrySet().stream().filter(e -> e.getValue().intValue() > 1).collect(toList());
+                    if (!duplicateSetLabels.isEmpty())
+                    {
+                        throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                                    new Object[] { ": duplicate set interval label "+duplicateSetLabels.toString() });
+
+                    }
+                    if (interval.getLabel() != null) intervalLabels.add(interval.getLabel());
+                }
+
+                List<Map.Entry<String, Long>> duplicateIntervalLabels =
+                            intervalLabels.stream().collect(groupingBy(Function.identity(), Collectors.counting()))
+                            .entrySet().stream().filter(e -> e.getValue().intValue() > 1).collect(toList());
+                if (!duplicateIntervalLabels.isEmpty())
+                {
+                    throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                                new Object[] { ": duplicate interval label "+duplicateIntervalLabels.toString() });
+                }
+            }
+
+            if (facetIntervals.getSets() != null)
+            {
+                facetIntervals.getSets().clear();
+            }
+        }
+        sp.setInterval(facetIntervals);
+    }
+    /**
+     * Sets the Range Parameters object on search parameters
+     * @param sp SearchParameters
+     * @param rangeParams RangeParameters
+     */
+    public void fromRange(SearchParameters sp, List<RangeParameters> ranges)
+    {
+        if(ranges != null && !ranges.isEmpty())
+        {
+            for(RangeParameters rangeParams : ranges)
+            {
+                ParameterCheck.mandatory("ranges", rangeParams);
+                ParameterCheck.mandatory("field", rangeParams.getField());
+                ParameterCheck.mandatory("start", rangeParams.getStart());
+                ParameterCheck.mandatory("end", rangeParams.getEnd());
+                ParameterCheck.mandatory("gap", rangeParams.getGap());
+            }
+            sp.setRanges(ranges);
+        }
+        
+    }
+
+    public void fromPivot(SearchParameters sp, List<StatsRequestParameters> stats, FacetFields facetFields, List<RangeParameters> ranges, List<Pivot> multiplePivots,
+                SearchRequestContext searchRequestContext)
+    {
+        if (multiplePivots != null && !multiplePivots.isEmpty())
+        {
+            multiplePivots.forEach(aPivot -> {
+                List<String> pivotKeys = new ArrayList<>();
+                buildPivotKeys(pivotKeys, aPivot, stats, facetFields, ranges, searchRequestContext);
+                sp.addPivots(pivotKeys);
+            });
+
+        }
+    }
+
+    protected void buildPivotKeys(List<String> pivotKeys, Pivot aPivot, List<StatsRequestParameters> stats, FacetFields facetFields,
+                List<RangeParameters> ranges, SearchRequestContext searchRequestContext)
+    {
+        if (aPivot == null) return;
+        String pivotKey = null;
+        ParameterCheck.mandatoryString("pivot key", aPivot.getKey());
+
+        if (facetFields.getFacets() != null && !facetFields.getFacets().isEmpty())
+        {
+            Optional<FacetField> found = facetFields.getFacets().stream()
+                        .filter(queryable -> aPivot.getKey().equals(queryable.getLabel() != null ? queryable.getLabel() : queryable.getField())).findFirst();
+
+            if (found.isPresent())
+            {
+                pivotKey = aPivot.getKey();
+                if (searchRequestContext.getPivotKeys().containsValue(pivotKey))
+                {
+                    throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                                new Object[] { ": Duplicate pivot parameter " + aPivot.getKey() + "" });
+                }
+
+                pivotKeys.add(found.get().getField());
+                facetFields.getFacets().remove(found.get());
+                searchRequestContext.getPivotKeys().put(found.get().getField(), pivotKey);
+            }
+        }
+
+        if (pivotKey == null && ((aPivot.getPivots() == null) || aPivot.getPivots().isEmpty()))
+        {
+            //It is the last one so it can reference stats or range
+            if (stats != null && !stats.isEmpty())
+            {
+                Optional<StatsRequestParameters> foundStat =  stats.stream().filter(stas -> aPivot.getKey().equals(stas.getLabel()!=null?stas.getLabel():stas.getField())).findFirst();
+                if (foundStat.isPresent())
+                {
+                    pivotKey = aPivot.getKey();
+                    if (pivotKeys.isEmpty())
+                    {
+                        throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                                    new Object[] { ": Stats key " + pivotKey + " cannot be used here" });
+                    }
+                    pivotKeys.add(pivotKey);
+                    searchRequestContext.getPivotKeys().put(pivotKey, pivotKey);
+                }
+            }
+
+            if (ranges != null && !ranges.isEmpty())
+            {
+                for (RangeParameters aRange:ranges)
+                {
+                    if (aPivot.getKey().equals(aRange.getLabel()))
+                    {
+                        pivotKey = aPivot.getKey();
+                        if (pivotKeys.isEmpty())
+                        {
+                            throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                                        new Object[] { ": Range key " + pivotKey + " cannot be used here" });
+                        }
+                        pivotKeys.add(pivotKey);
+                        searchRequestContext.getPivotKeys().put(pivotKey, pivotKey);
+                    }
+                }
+            }
+        }
+
+        if (pivotKey == null)
+        {
+            String invalidMessage = searchRequestContext.getPivotKeys().values().contains(aPivot.getKey())
+                        ? " cannot be used more than once.":" does not reference a facet Field, range or stats.";
+            throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                        new Object[] { ": Pivot parameter " + aPivot.getKey() + invalidMessage });
+        }
+
+        if (aPivot.getPivots() != null && !aPivot.getPivots().isEmpty() && aPivot.getPivots().size()>1)
+        {
+            throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                        new Object[] { ": Currently only 1 nested pivot is supported, you have "+aPivot.getPivots().size()});
+        }
+
+        aPivot.getPivots().forEach(subPivot ->
+        {
+            buildPivotKeys(pivotKeys, subPivot, stats, facetFields, ranges, searchRequestContext);
+        });
+
+    }
+
+    public void fromStats(SearchParameters sp, List<StatsRequestParameters> stats)
+    {
+        if (stats != null && !stats.isEmpty())
+        {
+            for (StatsRequestParameters aStat:stats)
+            {
+                ParameterCheck.mandatory("stats field", aStat.getField());
+
+                List<Float> perc = aStat.getPercentiles();
+                if (perc != null && !perc.isEmpty())
+                {
+                    for (Float percentile:perc)
+                    {
+                        if (percentile == null || percentile < 0 || percentile > 100)
+                        {
+                            throw new IllegalArgumentException("Invalid percentile "+percentile);
+                        }
+                    }
+                }
+
+                if (aStat.getCardinality() && (aStat.getCardinalityAccuracy() < 0 || aStat.getCardinalityAccuracy() > 1))
+                {
+                    throw new IllegalArgumentException("Invalid cardinality accuracy "+aStat.getCardinalityAccuracy() + " It must be between 0 and 1.");
+                }
+            }
+
+            sp.setStats(stats);
+        }
+
+    }
+
+    protected void validateSets(Set<IntervalSet> intervalSets, String prefix)
+    {
+        if (intervalSets != null && !intervalSets.isEmpty())
+        {
+            for (IntervalSet aSet:intervalSets)
+            {
+                ParameterCheck.mandatory(prefix+" sets start", aSet.getStart());
+                ParameterCheck.mandatory(prefix+" sets end", aSet.getEnd());
+
+                if (aSet.getLabel() == null)
+                {
+                    aSet.setLabel(aSet.toRange());
+                }
+            }
+        }
+    }
+
+    /**
+     * Sets the hightlight object on search parameters
+     * @param sp SearchParameters
+     * @param highlight GeneralHighlightParameters
+     */
+    public void fromHighlight(SearchParameters sp, GeneralHighlightParameters highlight)
+    {
+        sp.setHighlight(highlight);
+    }
+
+    /**
+     * Validates and sets the timezone
+     * @param sp SearchParameters
+     * @param timezoneId a valid java.time.ZoneId
+     */
+    public void fromLocalization(SearchParameters sp, Localization localization)
+    {
+        if (localization != null)
+        {
+
+            if (!localization.getLocales().isEmpty())
+            {
+                try
+                {
+                    localization.getLocales().forEach(localeStr -> {
+                        if (localeStr != null) localeStr = localeStr.replace('_','-');
+                        sp.addLocale(Locale.forLanguageTag(localeStr));
+                    });
+                }
+                catch (Exception e)
+                {
+                    throw new IllegalArgumentException("Invalid locale " + localization.getLocales());
+                }
+
+            }
+
+            /*
+             * java.util.TimeZone will not error if you set an invalid timezone
+             * it just falls back to GMT without telling you.
+             *
+             * So I am using java.time.ZoneId because that throws an error,
+             * if I then convert a ZoneId to Timezone I have the same problem (silently uses GMT)
+             * so
+             * I am converting using both methods:
+             * If a timezoneId is invalid then an Invalid error is thrown
+             * If its not possible to take a java.time.ZoneId and convert it to a java.util.TimeZone then an Incompatible error is thrown
+             *
+             */
+            String timezoneId = localization.getTimezone();
+            if (timezoneId != null && !timezoneId.isEmpty())
+            {
+                ZoneId validZoneId = null;
+                TimeZone timeZone = null;
+
+                try
+                {
+                    validZoneId = ZoneId.of(timezoneId);
+                    timeZone = TimeZone.getTimeZone(timezoneId);
+                }
+                catch (Exception e)
+                {
+                    throw new IllegalArgumentException("Invalid timezoneId " + timezoneId);
+                }
+
+                if (validZoneId.getId().equals(timeZone.getID()))
+                {
+                    sp.setTimezone(validZoneId.getId());
+                }
+                else
+                {
+                    throw new IllegalArgumentException("Incompatible timezoneId " + timezoneId);
+                }
+
+            }
+        }
+    }
+
+    /**
+     * SearchParameters from the Limits object
+     * @param sp SearchParameters
+     * @param paging Paging
+     */
+    public void fromLimits(SearchParameters sp, Limits limits)
+    {
+        if (limits != null)
+        {
+            if (limits.getPermissionEvaluationCount() != null)
+            {
+                sp.setLimit(-1);
+                sp.setLimitBy(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS);
+                sp.setMaxPermissionChecks(limits.getPermissionEvaluationCount());
+            }
+
+            if (limits.getPermissionEvaluationTime() != null)
+            {
+                sp.setLimit(-1);
+                sp.setLimitBy(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS);
+                sp.setMaxPermissionCheckTimeMillis(limits.getPermissionEvaluationTime());
+            }
+        }
+    }
+
+    public void setStoreMapper(StoreMapper storeMapper)
+    {
+        this.storeMapper = storeMapper;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/impl/StoreMapper.java b/remote-api/src/main/java/org/alfresco/rest/api/search/impl/StoreMapper.java
new file mode 100644
index 00000000000..fd9352fb68c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/impl/StoreMapper.java
@@ -0,0 +1,111 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.impl;
+
+import org.alfresco.repo.version.Version2Model;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Maps to and from a StoreRef for the json public api.
+ *
+ * @author Gethin James
+ */
+public class StoreMapper
+{
+
+    public static final String LIVE_NODES = "nodes";
+    public static final String VERSIONS = "versions";
+    public static final String DELETED = "deleted-nodes";
+    public static final String HISTORY = "history";
+
+    private static Log logger = LogFactory.getLog(StoreMapper.class);
+
+    public static final StoreRef STORE_REF_VERSION2_SPACESSTORE = new StoreRef("workspace", Version2Model.STORE_ID);
+    public static final StoreRef STORE_REF_HISTORY = new StoreRef("workspace", "history");
+
+    /**
+     * Work out which StoreRef this store belongs to.
+     * @param String representing a store
+     * @return StoreRef
+     */
+    public StoreRef getStoreRef(String store)
+    {
+        if (store != null && !store.isEmpty())
+        {
+            switch (store.toLowerCase())
+            {
+                case LIVE_NODES:
+                    return StoreRef.STORE_REF_WORKSPACE_SPACESSTORE;
+                case VERSIONS:
+                    return STORE_REF_VERSION2_SPACESSTORE;
+                case DELETED:
+                    return StoreRef.STORE_REF_ARCHIVE_SPACESSTORE;
+                case HISTORY:
+                    return STORE_REF_HISTORY;
+            }
+        }
+        throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
+                    new Object[] { ": scope allowed values: nodes,deleted-nodes,versions" });
+    }
+
+    /**
+     * Work out which store this noderef belongs to.
+     * @param nodeRef
+     * @return String representing a store
+     */
+    public String getStore(NodeRef nodeRef)
+    {
+        if (nodeRef != null)
+        {
+            if (StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.equals(nodeRef.getStoreRef()))
+            {
+                return LIVE_NODES;
+            }
+
+            if (STORE_REF_VERSION2_SPACESSTORE.equals(nodeRef.getStoreRef()))
+            {
+                return VERSIONS;
+            }
+
+            if (StoreRef.STORE_REF_ARCHIVE_SPACESSTORE.equals(nodeRef.getStoreRef()))
+            {
+                return DELETED;
+            }
+
+            if (STORE_REF_HISTORY.equals(nodeRef.getStoreRef()))
+            {
+                return HISTORY;
+            }
+        }
+
+        logger.warn("Unknown store ref: "+nodeRef);
+        return null;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/Default.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Default.java
new file mode 100644
index 00000000000..2f4e0989faa
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Default.java
@@ -0,0 +1,82 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+/**
+ * POJO class representing the search Defaults
+ */
+public class Default
+{
+    private final List<String> textAttributes;
+    private final String defaultFTSOperator;
+    private final String defaultFTSFieldOperator;
+    private final String namespace;
+    private final String defaultFieldName;
+
+    @JsonCreator
+    public Default(@JsonProperty("textAttributes")  List<String> textAttributes,
+                   @JsonProperty("defaultFTSOperator")  String defaultFTSOperator,
+                   @JsonProperty("defaultFTSFieldOperator")  String defaultFTSFieldOperator,
+                   @JsonProperty("namespace")  String namespace,
+                   @JsonProperty("defaultFieldName")  String defaultFieldName)
+    {
+        this.textAttributes = textAttributes;
+        this.defaultFTSOperator = defaultFTSOperator;
+        this.defaultFTSFieldOperator = defaultFTSFieldOperator;
+        this.namespace = namespace;
+        this.defaultFieldName = defaultFieldName;
+    }
+
+    public List<String> getTextAttributes()
+    {
+        return textAttributes;
+    }
+
+    public String getDefaultFTSOperator()
+    {
+        return defaultFTSOperator;
+    }
+
+    public String getDefaultFTSFieldOperator()
+    {
+        return defaultFTSFieldOperator;
+    }
+
+    public String getNamespace()
+    {
+        return namespace;
+    }
+
+    public String getDefaultFieldName()
+    {
+        return defaultFieldName;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/FacetField.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/FacetField.java
new file mode 100644
index 00000000000..409bc811e17
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/FacetField.java
@@ -0,0 +1,138 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * POJO class representing the FacetField
+ *
+ * @author Gethin James
+ */
+public class FacetField
+{
+    private final String field;
+    private final String label;
+    private final String prefix;
+    private final String sort; //actually an enum
+    private final String method; //actually an enum
+    private final Boolean missing;
+    private final Integer limit;
+    private final Integer offset;
+    private final Integer mincount;
+    private final Integer facetEnumCacheMinDf;
+    private final List<String> excludeFilters;
+
+    @JsonCreator
+    public FacetField(@JsonProperty("field") String field,
+                @JsonProperty("label") String label,
+                @JsonProperty("prefix") String prefix,
+                @JsonProperty("sort") String sort,
+                @JsonProperty("method") String method,
+                @JsonProperty("missing") Boolean missing,
+                @JsonProperty("limit") Integer limit,
+                @JsonProperty("offset") Integer offset,
+                @JsonProperty("mincount") Integer mincount,
+                @JsonProperty("excludeFilters") List<String> excludeFilters,
+                @JsonProperty("facetEnumCacheMinDf") Integer facetEnumCacheMinDf)
+    {
+        this.field = field;
+        this.label = label;
+        this.prefix = prefix;
+        this.sort = sort;
+        this.method = method;
+        this.missing = missing == null?false:missing;
+        this.limit = limit; //Can be null
+        this.offset = offset == null?0:offset;
+        this.mincount = mincount == null?1:mincount;
+        this.excludeFilters = excludeFilters == null? Collections.emptyList():excludeFilters;
+        this.facetEnumCacheMinDf = facetEnumCacheMinDf == null?0:facetEnumCacheMinDf;
+    }
+
+    public List<String> getExcludeFilters()
+    {
+        return excludeFilters;
+    }
+
+    public String getField()
+    {
+        return field;
+    }
+
+    public String getLabel()
+    {
+        return label;
+    }
+
+    public String toFilterQuery(String value)
+    {
+        return field+":\""+value+"\"";
+    }
+
+    public String getPrefix()
+    {
+        return prefix;
+    }
+
+    public String getSort()
+    {
+        return sort;
+    }
+
+    public String getMethod()
+    {
+        return method;
+    }
+
+    public Boolean getMissing()
+    {
+        return missing;
+    }
+
+    public Integer getLimit()
+    {
+        return limit;
+    }
+
+    public Integer getOffset()
+    {
+        return offset;
+    }
+
+    public Integer getMincount()
+    {
+        return mincount;
+    }
+
+    public Integer getFacetEnumCacheMinDf()
+    {
+        return facetEnumCacheMinDf;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/FacetFields.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/FacetFields.java
new file mode 100644
index 00000000000..d5891e06c79
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/FacetFields.java
@@ -0,0 +1,50 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+/**
+ * POJO class representing a FacetField
+ */
+public class FacetFields
+{
+    private final List<FacetField> facets;
+
+    @JsonCreator
+    public FacetFields(@JsonProperty("facets") List<FacetField> facets)
+    {
+        this.facets = facets;
+    }
+
+    public List<FacetField> getFacets()
+    {
+        return facets;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/FacetQuery.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/FacetQuery.java
new file mode 100644
index 00000000000..b263d8192e8
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/FacetQuery.java
@@ -0,0 +1,63 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * POJO class representing the FacetQuery
+ */
+public class FacetQuery
+{
+    private final String query;
+    private final String label;
+    private final String group;
+
+    @JsonCreator
+    public FacetQuery(@JsonProperty("query") String query,
+                      @JsonProperty("label") String label,
+                      @JsonProperty("group") String group)
+    {
+        this.query = query;
+        this.label = label;
+        this.group = group;
+    }
+
+    public String getQuery()
+    {
+        return query;
+    }
+
+    public String getLabel()
+    {
+        return label;
+    }
+    public String getGroup()
+    {
+        return group;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/FilterQuery.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/FilterQuery.java
new file mode 100644
index 00000000000..eb9cc65f556
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/FilterQuery.java
@@ -0,0 +1,67 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+
+/**
+ * POJO class representing a FilterQuery
+ *
+ * @author Gethin James
+ */
+public class FilterQuery
+{
+    private final List<String> queries;
+    private final String query;
+    private final List<String> tags;
+
+    @JsonCreator
+    public FilterQuery(@JsonProperty("query")  String query, @JsonProperty("tags") List<String> tags, @JsonProperty("queries") List<String> queries)
+    {
+        this.query = query;
+        this.tags = tags;
+        this.queries = queries;
+    }
+
+    public List<String> getQueries()
+    {
+        return queries;
+    }
+
+    public String getQuery()
+    {
+        return query;
+    }
+
+    public List<String> getTags()
+    {
+        return tags;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/HighlightEntry.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/HighlightEntry.java
new file mode 100644
index 00000000000..3971b6e88fd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/HighlightEntry.java
@@ -0,0 +1,55 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+import java.util.List;
+
+/**
+ * POJO class representing a HighlightEntry
+ *
+ * @author Gethin James
+ */
+public class HighlightEntry
+{
+    private final String field;
+    private final List<String> snippets;
+
+    public HighlightEntry(String field, List<String> snippets)
+    {
+        this.field = field;
+        this.snippets = snippets;
+    }
+
+    public String getField()
+    {
+        return field;
+    }
+
+    public List<String> getSnippets()
+    {
+        return snippets;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/Limits.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Limits.java
new file mode 100644
index 00000000000..113d119153e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Limits.java
@@ -0,0 +1,58 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.search.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * POJO class representing the query Limits
+ **/
+public class Limits
+{
+
+    private final Integer permissionEvaluationTime;
+    private final Integer permissionEvaluationCount;
+
+    @JsonCreator
+    public Limits(@JsonProperty("permissionEvaluationTime") Integer permissionEvaluationTime,
+                  @JsonProperty("permissionEvaluationCount") Integer permissionEvaluationCount)
+    {
+        this.permissionEvaluationTime = permissionEvaluationTime;
+        this.permissionEvaluationCount = permissionEvaluationCount;
+    }
+
+    public Integer getPermissionEvaluationTime()
+    {
+        return permissionEvaluationTime;
+    }
+
+    public Integer getPermissionEvaluationCount()
+    {
+        return permissionEvaluationCount;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/Localization.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Localization.java
new file mode 100644
index 00000000000..d37d0bca58d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Localization.java
@@ -0,0 +1,59 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * POJO class representing Localization parameters
+ */
+public class Localization
+{
+    private final String timezone;
+    private final List<String> locales;
+
+    @JsonCreator
+    public Localization(@JsonProperty("timezone") String timezone,
+                        @JsonProperty("locales") List<String> locales)
+    {
+        this.timezone = timezone;
+        this.locales = locales == null? Collections.emptyList():locales;
+    }
+
+    public String getTimezone()
+    {
+        return timezone;
+    }
+
+    public List<String> getLocales()
+    {
+        return locales;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/Pivot.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Pivot.java
new file mode 100644
index 00000000000..7d7b53f4950
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Pivot.java
@@ -0,0 +1,58 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * POJO class representing Pivot
+ */
+public class Pivot
+{
+    private final String key;
+    private final List<Pivot> pivots;
+
+    @JsonCreator
+    public Pivot(@JsonProperty("key") String key, @JsonProperty("pivots") List<Pivot> pivots)
+    {
+        this.key = key;
+        this.pivots = pivots == null? Collections.emptyList():pivots;
+    }
+
+    public String getKey()
+    {
+        return key;
+    }
+
+    public List<Pivot> getPivots()
+    {
+        return pivots;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/Query.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Query.java
new file mode 100644
index 00000000000..29f13e955cf
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Query.java
@@ -0,0 +1,67 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.search.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * POJO class representing the query element of the JSON body
+ **/
+public class Query
+{
+
+    private final String language;
+    private final String query;
+    private final String userQuery;
+
+    @JsonCreator
+    public Query(@JsonProperty("language")  String language,
+                 @JsonProperty("query")     String query,
+                 @JsonProperty("userQuery") String userQuery)
+    {
+        this.language = language;
+        this.query = query;
+        this.userQuery = userQuery;
+    }
+
+    public String getLanguage()
+    {
+        return language;
+    }
+
+    public String getQuery()
+    {
+        return query;
+    }
+
+    public String getUserQuery()
+    {
+        return userQuery;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/Scope.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Scope.java
new file mode 100644
index 00000000000..3112644233d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Scope.java
@@ -0,0 +1,52 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+/**
+ * POJO class representing a FilterQuery
+ *
+ * @author Gethin James
+ */
+public class Scope
+{
+    private final List<String> locations;
+
+    @JsonCreator
+    public Scope(@JsonProperty("locations") List<String> locations)
+    {
+        this.locations = locations;
+    }
+
+    public List<String> getLocations()
+    {
+        return locations;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/SearchEntry.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/SearchEntry.java
new file mode 100644
index 00000000000..4f83af7da2c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/SearchEntry.java
@@ -0,0 +1,53 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+import java.util.List;
+
+/**
+ * POJO class representing the extra information that comes back from Search.
+ **/
+public class SearchEntry
+{
+    private final Float score;
+    private final List<HighlightEntry> highlight;
+
+    public SearchEntry(Float score, List<HighlightEntry> highlight)
+    {
+        this.score = score;
+        this.highlight = highlight;
+    }
+
+    public Float getScore()
+    {
+        return score;
+    }
+
+    public List<HighlightEntry> getHighlight()
+    {
+        return highlight;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/SearchQuery.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/SearchQuery.java
new file mode 100644
index 00000000000..fe7a3237c2a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/SearchQuery.java
@@ -0,0 +1,223 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.search.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.service.cmr.search.FacetFormat;
+import org.alfresco.service.cmr.search.GeneralHighlightParameters;
+import org.alfresco.service.cmr.search.IntervalParameters;
+import org.alfresco.service.cmr.search.RangeParameters;
+import org.alfresco.service.cmr.search.StatsRequestParameters;
+
+import java.util.List;
+
+/**
+ * POJO class representing the JSON body for a search request
+ *
+ * @author Gethin James
+ */
+public class SearchQuery
+{
+    private final Query query;
+    private final Paging paging;
+    private final List<String> include;
+    private final List<String> fields;
+    private final List<SortDef> sort;
+    private final List<Template> templates;
+    private final Default defaults;
+    private final List<FilterQuery> filterQueries;
+    private final List<FacetQuery> facetQueries;
+    private final FacetFields facetFields;
+    private final Spelling spellcheck;
+    private final Scope scope;
+    private final Limits limits;
+    private final GeneralHighlightParameters highlight;
+    private final IntervalParameters facetIntervals;
+    private final boolean includeRequest;
+    private final List<Pivot> pivots;
+    private final List<StatsRequestParameters> stats;
+    private final List<RangeParameters> ranges;
+    private final Localization localization;
+    private final FacetFormat facetFormat;
+
+    public static final SearchQuery EMPTY = new SearchQuery(null, null, null, null, null, null,
+                null,null, null, null, null,null, null, null, null,
+                null, null, null,null, null,null);
+
+    @JsonCreator
+    public SearchQuery(@JsonProperty("query") Query query,
+                @JsonProperty("paging") Paging paging,
+                @JsonProperty("includeRequest") Boolean includeRequest,
+                @JsonProperty("include") List<String> include,
+                @JsonProperty("fields") List<String> fields,
+                @JsonProperty("sort") List<SortDef> sort,
+                @JsonProperty("templates") List<Template> templates,
+                @JsonProperty("defaults") Default defaults,
+                @JsonProperty("filterQueries")  List<FilterQuery> filterQueries,
+                @JsonProperty("facetFields") FacetFields facetFields,
+                @JsonProperty("facetQueries")  List<FacetQuery> facetQueries,
+                @JsonProperty("spellcheck") Spelling spellcheck,
+                @JsonProperty("scope") Scope scope,
+                @JsonProperty("limits")Limits limits,
+                @JsonProperty("highlight")GeneralHighlightParameters highlight,
+                @JsonProperty("facetIntervals")IntervalParameters facetIntervals,
+                @JsonProperty("pivots") List<Pivot> pivots,
+                @JsonProperty("stats") List<StatsRequestParameters> stats,
+                @JsonProperty("ranges") List<RangeParameters> ranges,
+                @JsonProperty("localization") Localization localization,
+                @JsonProperty("facetFormat") FacetFormat facetFormat)
+    {
+        this.query = query;
+        this.includeRequest = includeRequest==null?false:includeRequest;
+        this.paging = paging;
+        this.include = include;
+        this.fields = fields;
+        this.sort = sort;
+        this.templates = templates;
+        this.defaults = defaults;
+        this.filterQueries = filterQueries;
+        this.facetQueries = facetQueries;
+        this.spellcheck = spellcheck;
+        this.scope = scope;
+        this.facetFields = facetFields;
+        this.limits = limits;
+        this.highlight = highlight;
+        this.facetIntervals = facetIntervals;
+        this.pivots = pivots;
+        this.stats = stats;
+        this.ranges = ranges;
+        this.localization = localization;
+        this.facetFormat = facetFormat;
+    }
+
+    public Query getQuery()
+    {
+        return query;
+    }
+
+    public Paging getPaging()
+    {
+        return paging;
+    }
+
+    public List<String> getInclude()
+    {
+        return include;
+    }
+
+    public List<String> getFields()
+    {
+        return fields;
+    }
+
+    public List<SortDef> getSort()
+    {
+        return sort;
+    }
+    public List<Template> getTemplates()
+    {
+        return templates;
+    }
+
+    public Default getDefaults()
+    {
+        return defaults;
+    }
+
+    public List<FilterQuery> getFilterQueries()
+    {
+        return filterQueries;
+    }
+
+    public List<FacetQuery> getFacetQueries()
+    {
+        return facetQueries;
+    }
+
+    public Spelling getSpellcheck()
+    {
+        return spellcheck;
+    }
+
+    public Scope getScope()
+    {
+        return scope;
+    }
+
+    public FacetFields getFacetFields()
+    {
+        return facetFields;
+    }
+
+    public GeneralHighlightParameters getHighlight()
+    {
+        return highlight;
+    }
+
+    public IntervalParameters getFacetIntervals()
+    {
+        return facetIntervals;
+    }
+
+    public Limits getLimits()
+    {
+        return limits;
+    }
+
+    public boolean includeRequest()
+    {
+        return includeRequest;
+    }
+
+    public List<Pivot> getPivots()
+    {
+        return pivots;
+    }
+
+    public List<StatsRequestParameters> getStats()
+    {
+        return stats;
+    }
+
+    public List<RangeParameters> getFacetRanges()
+    {
+        return ranges;
+    }
+
+    public Localization getLocalization()
+    {
+        return localization;
+    }
+
+    public FacetFormat getFacetFormat()
+    {
+        return facetFormat;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/SearchSQLQuery.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/SearchSQLQuery.java
new file mode 100644
index 00000000000..0eb8c5d7659
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/SearchSQLQuery.java
@@ -0,0 +1,99 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * POJO class representing the JSON body for a sql search request
+ *
+ * @author Michael Suzuki
+ */
+public class SearchSQLQuery
+{
+    private final String stmt;
+    private Integer itemLimit;
+    private final String format;
+    private List<String> locales;
+    private boolean includeMetadata;
+    private String timezone;
+    private List<String> filterQueries;
+    
+    public SearchSQLQuery(@JsonProperty("stmt") String stmt,
+                          @JsonProperty("format") String format,
+                          @JsonProperty("locales") List<String> locales,
+                          @JsonProperty("limit") Integer itemLimit,
+                          @JsonProperty("includeMetadata") boolean includeMetadata,
+                          @JsonProperty("timezone") String timezone,
+                          @JsonProperty("filterQueries") List<String> filterQueries)
+    {
+        this.stmt = stmt;
+        this.format = format != null ? format : "default";
+        this.locales = locales != null ? locales : Collections.emptyList();
+        this.itemLimit = itemLimit == null || itemLimit < 1 ? new Integer(1000) : itemLimit;
+        this.includeMetadata = includeMetadata;
+        this.timezone = timezone;
+        this.filterQueries = filterQueries != null ? filterQueries : Collections.emptyList();
+    }
+
+    public String getStmt()
+    {
+        return stmt;
+    }
+
+    public Integer getItemLimit()
+    {
+        return itemLimit;
+    }
+
+    public String getFormat()
+    {
+        return format;
+    }
+
+    public List<String> getLocales()
+    {
+        return locales;
+    }
+
+    public boolean isIncludeMetadata()
+    {
+        return includeMetadata;
+    }
+
+    public String getTimezone()
+    {
+        return timezone;
+    }
+
+    public List<String> getFilterQueries()
+    {
+        return filterQueries;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/SortDef.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/SortDef.java
new file mode 100644
index 00000000000..61be92d78dd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/SortDef.java
@@ -0,0 +1,68 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * This is a copy of the SortDefinition class found in data-model.  Due to the use of a very old version
+ * of Jackson it is necessary to duplicate this class rather than reuse it.
+ *
+ * @author Gethin James
+ */
+public class SortDef
+{
+
+    String type;
+    String field;
+    boolean ascending;
+
+    @JsonCreator
+    public SortDef(@JsonProperty("type") String type,
+                   @JsonProperty("field")  String field,
+                   @JsonProperty("ascending") boolean ascending)
+    {
+        this.type = type;
+        this.field = field;
+        this.ascending = ascending;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+
+    public String getField()
+    {
+        return field;
+    }
+
+    public boolean isAscending()
+    {
+        return ascending;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/Spelling.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Spelling.java
new file mode 100644
index 00000000000..ff6273c95c2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Spelling.java
@@ -0,0 +1,49 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.search.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * POJO class representing the query Spelling of the JSON body
+ **/
+public class Spelling
+{
+
+    private final String query;
+
+    @JsonCreator
+    public Spelling(@JsonProperty("query")     String query)
+    {
+        this.query = query;
+    }
+    public String getQuery()
+    {
+        return query;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/Template.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Template.java
new file mode 100644
index 00000000000..9d5e03e1400
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Template.java
@@ -0,0 +1,57 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * POJO class representing the Template
+ */
+public class Template
+{
+    private final String name;
+    private final String template;
+
+    @JsonCreator
+    public Template(@JsonProperty("name")  String name,
+                    @JsonProperty("template") String template)
+    {
+        this.name = name;
+        this.template = template;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public String getTemplate()
+    {
+        return template;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/TupleEntry.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/TupleEntry.java
new file mode 100644
index 00000000000..f731836dc9e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/TupleEntry.java
@@ -0,0 +1,58 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+import java.io.Serializable;
+
+/**
+ * POJO class representing tuple response from Search.
+ **/
+public class TupleEntry implements Serializable
+{
+    /**
+     * Generated by eclipse.
+     */
+    private static final long serialVersionUID = 3782302321389777736L;
+    private final String label;
+    private final String value;
+
+    public TupleEntry(String key, String value)
+    {
+        this.label = key;
+        this.value = value;
+    }
+
+    public String getLabel()
+    {
+        return label;
+    }
+
+    public String getValue()
+    {
+        return value;
+    }
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/search/model/TupleList.java b/remote-api/src/main/java/org/alfresco/rest/api/search/model/TupleList.java
new file mode 100644
index 00000000000..68755979baf
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/TupleList.java
@@ -0,0 +1,48 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * POJO class representing row response from streaming Search.
+ **/
+public class TupleList implements Serializable
+{
+    private static final long serialVersionUID = 4905653895448980477L;
+    private final List<TupleEntry> entry;
+
+    public TupleList(List<TupleEntry> entry)
+    {
+        this.entry = entry;
+    }
+
+    public List<TupleEntry> getEntry()
+    {
+        return entry;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteContainersRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteContainersRelation.java
new file mode 100644
index 00000000000..92b3da5a6a6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteContainersRelation.java
@@ -0,0 +1,81 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.sites;
+
+import org.alfresco.query.PagingResults;
+import org.alfresco.rest.api.Sites;
+import org.alfresco.rest.api.model.SiteContainer;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+@RelationshipResource(name = "containers", entityResource = SiteEntityResource.class, title = "Site Containers")
+public class SiteContainersRelation implements RelationshipResourceAction.Read<SiteContainer>, RelationshipResourceAction.ReadById<SiteContainer>, InitializingBean
+{
+    private static final Log logger = LogFactory.getLog(SiteContainersRelation.class);
+
+    private Sites sites;
+
+	public void setSites(Sites sites)
+	{
+		this.sites = sites;
+	}
+
+	@Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("sites", this.sites);
+    }
+
+	/**
+	 * Returns information regarding the top level container 'containerId' for site 'siteId'.
+	 * 
+	 */
+	@Override
+    @WebApiDescription(title = "Site container information for container 'containerId' in site 'siteId'.")
+	public SiteContainer readById(String siteId, String containerId, Parameters parameters)
+	{
+		return sites.getSiteContainer(siteId, containerId);
+	}
+
+	/**
+	 * Returns information regarding the top level containers for site 'siteId'.
+	 * 
+	 */
+	@Override
+    @WebApiDescription(title = "A paged list of site containers.")
+	public CollectionWithPagingInfo<SiteContainer> readAll(String siteId, Parameters parameters) 
+	{
+		PagingResults<SiteContainer> siteContainers = sites.getSiteContainers(siteId, parameters.getPaging());
+		return CollectionWithPagingInfo.asPaged(parameters.getPaging(), siteContainers.getPage(), siteContainers.hasMoreItems(), siteContainers.getTotalResultCount().getFirst());
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteEntityResource.java
new file mode 100644
index 00000000000..3e90c68b4e2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteEntityResource.java
@@ -0,0 +1,180 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.sites;
+
+import org.alfresco.rest.api.Sites;
+import org.alfresco.rest.api.model.Site;
+import org.alfresco.rest.api.model.SiteUpdate;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * An implementation of an Entity Resource for a Site
+ *
+ * @author Gethin James
+ * @author steveglover
+ * @author janv
+ */
+@EntityResource(name="sites", title = "Sites")
+public class SiteEntityResource implements EntityResourceAction.Read<Site>,
+        EntityResourceAction.ReadById<Site>, EntityResourceAction.Delete,
+        EntityResourceAction.Create<Site>, EntityResourceAction.Update<Site>, InitializingBean
+{
+    private Sites sites;
+
+	public void setSites(Sites sites)
+	{
+		this.sites = sites;
+	}
+
+	@Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("sites", this.sites);
+    }
+
+    /**
+     * Returns a paged list of all sites in the current tenant.
+     * 
+     */
+    @Override
+    @WebApiDescription(title="A paged list of visible sites in the network.", description="A site is visible if it is public or if the person is a member")
+    public CollectionWithPagingInfo<Site> readAll(Parameters parameters)
+    { 
+        return sites.getSites(parameters);
+    }
+    
+    /**
+     * Returns information regarding the site 'siteId'.
+     * 
+     */
+    @Override
+    @WebApiDescription(title="Returns site information for site siteId.")
+    public Site readById(String siteId, Parameters parameters)
+    {
+        return sites.getSite(siteId);
+    }
+
+    /**
+     * Delete the given site.
+     *
+     * @param siteId String id of site.
+     */
+    @Override
+    @WebApiDescription(title = "Delete Site", description="Delete the site. This will cascade delete")
+    public void delete(String siteId, Parameters parameters)
+    {
+        sites.deleteSite(siteId, parameters);
+    }
+
+    /**
+     * Create the given site.
+     *
+     * @param entity
+     * @param parameters
+     * @return
+     */
+    @Override
+    @WebApiDescription(title="Create site", description="Create the default/functional Share site")
+    @WebApiParam(name="entity", title="A single site", description="A single site, multiple sites are not supported.",
+            kind= ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple=false, required = true)
+    public List<Site> create(List<Site> entity, Parameters parameters)
+    {
+        List<Site> result = new ArrayList<>(1);
+        result.add(sites.createSite(entity.get(0), parameters));
+        return result;
+    }
+
+    /**
+     * Update the given site. Not all fields are used,
+     * only those as defined in the Open API spec.
+     *
+     * @param siteId       The site ID (aka short name)
+     * @param site         Details to use for the update
+     * @param parameters
+     * @return Updated Site
+     */
+    @Override
+    @WebApiDescription(title="Update site", description="Update the Share site")
+    public Site update(String siteId, Site site, Parameters parameters)
+    {
+        return sites.updateSite(siteId, convert(site), parameters);
+    }
+
+    protected SiteUpdate convert(Site site)
+    {
+        // Until REPO-110 is solved, we need to explicitly test for the presence of fields
+        // on the Site object that aren't valid SiteUpdate fields. Once REPO-110 is solved,
+        // the update method will take a SiteUpdate as a parameter rather than a Site
+        // and only the correct fields will be exposed. Any attempt to access illegal fields
+        // should then result in the framework returning a 400 automatically.
+        if (site.wasSet(Site.ID))
+        {
+            throw new InvalidArgumentException("Site update does not support field: id");
+        }
+        if (site.wasSet(Site.GUID))
+        {
+            throw new InvalidArgumentException("Site update does not support field: guid");
+        }
+        if (site.wasSet(Site.ROLE))
+        {
+            throw new InvalidArgumentException("Site update does not support field: role");
+        }
+        if (site.wasSet(Site.PRESET))
+        {
+            throw new InvalidArgumentException("Site update does not support field: preset");
+        }
+
+        // Bind valid fields to a SiteUpdate instance.
+        SiteUpdate siteUpdate = new SiteUpdate();
+        if (site.wasSet(Site.TITLE))
+        {
+            siteUpdate.setTitle(site.getTitle());
+        }
+        if (site.wasSet(Site.DESCRIPTION))
+        {
+            siteUpdate.setDescription(site.getDescription());
+        }
+        if (site.wasSet(Site.VISIBILITY))
+        {
+            siteUpdate.setVisibility(site.getVisibility());
+        }
+
+        return siteUpdate;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteMembersRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteMembersRelation.java
new file mode 100644
index 00000000000..a80a17a5886
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteMembersRelation.java
@@ -0,0 +1,145 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.sites;
+
+import info.bliki.wiki.template.If;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.Sites;
+import org.alfresco.rest.api.model.SiteMember;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * @author steveglover
+ *
+ */
+@RelationshipResource(name = "members", entityResource = SiteEntityResource.class, title = "Site Members")
+public class SiteMembersRelation implements RelationshipResourceAction.Read<SiteMember>, RelationshipResourceAction.Delete, 
+RelationshipResourceAction.Create<SiteMember>, RelationshipResourceAction.Update<SiteMember>, RelationshipResourceAction.ReadById<SiteMember>, InitializingBean
+{
+    private static final Log logger = LogFactory.getLog(SiteMembersRelation.class);
+
+    private Sites sites;
+
+	public void setSites(Sites sites)
+	{
+		this.sites = sites;
+	}
+
+	@Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("sites", this.sites);
+    }
+
+    /**
+     * 
+     * Returns a paged list of all the members of the site 'siteId'.
+     * 
+     * If siteId does not exist, throws NotFoundException (status 404).
+	 * 
+	 * (non-Javadoc)
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction.Read#readAll(org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+    @Override
+    @WebApiDescription(title="A paged list of all the members of the site 'siteId'.")
+    public CollectionWithPagingInfo<SiteMember> readAll(String siteId, Parameters parameters)
+    {
+    	return sites.getSiteMembers(siteId, parameters);
+    }
+
+    /**
+     * 
+     * POST sites/<siteId>/members
+     * 
+     * Adds personId as a member of site siteId.
+     * 
+	 * If personId does not exist throws NotFoundException (status 404).
+	 * If siteMember. does not exist throws NotFoundException (status 404).
+	 * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Create#create(String, java.util.List, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+	@Override
+    @WebApiDescription(title="Adds personId as a member of site siteId.")
+	public List<SiteMember> create(String siteId, List<SiteMember> siteMembers, Parameters parameters)
+	{
+        List<SiteMember> result = new ArrayList<SiteMember>(siteMembers.size());
+        for (SiteMember siteMember : siteMembers)
+        {
+           result.add(sites.addSiteMember(siteId, siteMember));
+        }
+        return result;
+	}
+
+	/**
+	 * 
+	 * DELETE sites/<siteId>/members/<personId>
+	 * 
+	 * Removes personId as a member of site siteId.
+	 */
+	@Override
+    @WebApiDescription(title="Removes personId as a member of site siteId.")
+	public void delete(String siteId, String personId, Parameters parameters)
+	{
+		sites.removeSiteMember(personId, siteId);
+	}
+
+	/**
+	 * 
+	 * PUT sites/<siteId>/members
+	 * 
+	 * Updates the membership of personId in the site (of which personId must be an existing member).
+	 */
+	@Override
+    @WebApiDescription(title="Updates the membership of personId in the site (of which personId must be an existing member).")
+	public SiteMember update(String siteId, SiteMember siteMember, Parameters parameters)
+	{
+		return sites.updateSiteMember(siteId, siteMember);
+	}
+
+	/**
+	 * 
+	 * Returns site membership information for personId in siteId.
+	 * 
+	 * GET sites/<siteId>/members/<personId>
+	 */
+	@Override
+    @WebApiDescription(title="Returns site membership information for personId in siteId.")
+	public SiteMember readById(String siteId, String personId, Parameters parameters)
+	{
+		return sites.getSiteMember(personId, siteId);
+	}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteMembershipRequestsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteMembershipRequestsRelation.java
new file mode 100644
index 00000000000..945d775a382
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/sites/SiteMembershipRequestsRelation.java
@@ -0,0 +1,75 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.sites;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.rest.api.SiteMembershipRequests;
+import org.alfresco.rest.api.model.SiteMembershipApproval;
+import org.alfresco.rest.api.model.SiteMembershipRejection;
+import org.alfresco.rest.framework.Operation;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+@RelationshipResource(name = "site-membership-requests", entityResource = SiteEntityResource.class, title = "Site Membership Requests")
+public class SiteMembershipRequestsRelation implements InitializingBean
+{
+
+    private SiteMembershipRequests siteMembershipRequests;
+
+    public void setSiteMembershipRequests(SiteMembershipRequests siteMembershipRequests)
+    {
+        this.siteMembershipRequests = siteMembershipRequests;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("siteMembershipRequests", this.siteMembershipRequests);
+    }
+
+    @Operation("approve")
+    @WebApiParam(name = "siteMembershipApproval", title = "Site membership approval", description = "Site membership approval", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
+    @WebApiDescription(title = "Approve a site membership request.", description = "Approve a site membership request.", successStatus = HttpServletResponse.SC_OK)
+    public void approve(String siteId, String invitationId, SiteMembershipApproval siteMembershipApproval, Parameters parameters, WithResponse withResponse)
+    {
+        siteMembershipRequests.approveSiteMembershipRequest(siteId, invitationId, siteMembershipApproval);
+    }
+
+    @Operation("reject")
+    @WebApiParam(name = "siteMembershipRejection", title = "Site membership rejection", description = "Site membership rejection", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
+    @WebApiDescription(title = "Reject a site membership request.", description = "Reject a site membership request.", successStatus = HttpServletResponse.SC_OK)
+    public void reject(String siteId, String invitationId, SiteMembershipRejection siteMembershipRejection, Parameters parameters, WithResponse withResponse)
+    {
+        siteMembershipRequests.rejectSiteMembershipRequest(siteId, invitationId, siteMembershipRejection);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/sites/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/sites/package-info.java
new file mode 100644
index 00000000000..28764125aa0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/sites/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="alfresco", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.api.sites;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/sitesmembershipsrequests/SiteMembershipRequestEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/sitesmembershipsrequests/SiteMembershipRequestEntityResource.java
new file mode 100644
index 00000000000..0d8aeb754b1
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/sitesmembershipsrequests/SiteMembershipRequestEntityResource.java
@@ -0,0 +1,68 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.sitesmembershipsrequests;
+
+import org.alfresco.rest.api.SiteMembershipRequests;
+import org.alfresco.rest.api.model.SiteMembershipRequest;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * An implementation of an Entity Resource for a Site Membership Request
+ *
+ */
+@EntityResource(name = "site-membership-requests", title = "Site Membership Request")
+public class SiteMembershipRequestEntityResource implements EntityResourceAction.Read<SiteMembershipRequest>, InitializingBean
+{
+    private SiteMembershipRequests siteMembershipRequests;
+
+    public void setSiteMembershipRequests(SiteMembershipRequests siteMembershipRequests)
+    {
+        this.siteMembershipRequests = siteMembershipRequests;
+    }
+
+    @Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("siteMembershipRequests", this.siteMembershipRequests);
+    }
+
+    /**
+     * Returns a paged list of all site membership request the user can action.
+     * 
+     */
+    @Override
+    @WebApiDescription(title = "A paged list of visible site membership requests in the network.")
+    public CollectionWithPagingInfo<SiteMembershipRequest> readAll(Parameters parameters)
+    {
+        return siteMembershipRequests.getPagedSiteMembershipRequests(parameters);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/sitesmembershipsrequests/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/sitesmembershipsrequests/package-info.java
new file mode 100644
index 00000000000..6fb4308deca
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/sitesmembershipsrequests/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="alfresco", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.api.sitesmembershipsrequests;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/tags/TagsEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/tags/TagsEntityResource.java
new file mode 100644
index 00000000000..007bf218f10
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/tags/TagsEntityResource.java
@@ -0,0 +1,80 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tags;
+
+import org.alfresco.rest.api.Tags;
+import org.alfresco.rest.api.model.Tag;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+@EntityResource(name="tags", title = "Tags")
+public class TagsEntityResource implements EntityResourceAction.Read<Tag>, EntityResourceAction.ReadById<Tag>, EntityResourceAction.Update<Tag>, InitializingBean
+{
+    private Tags tags;
+
+    public void setTags(Tags tags)
+    {
+        this.tags = tags;
+    }
+
+	@Override
+    public void afterPropertiesSet()
+    {
+        ParameterCheck.mandatory("tags", this.tags);
+    }
+
+	/**
+	 * 
+	 * Returns a paged list of all currently used tags in the store workspace://SpacesStore for the current tenant.
+	 * 
+	 */
+	@Override
+    @WebApiDescription(title="A paged list of all tags in the network.")
+	public CollectionWithPagingInfo<Tag> readAll(Parameters parameters)
+	{
+		return tags.getTags(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, parameters);
+	}
+
+	@Override
+    @WebApiDescription(title="Updates a tag by unique Id")
+	public Tag update(String id, Tag entity, Parameters parameters)
+	{
+		return tags.changeTag(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, id, entity);
+	}
+
+	@Override
+	public Tag readById(String id, Parameters parameters) throws EntityNotFoundException
+	{
+		return tags.getTag(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, id);
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/tags/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/tags/package-info.java
new file mode 100644
index 00000000000..ef510cf090b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/tags/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="alfresco", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.api.tags;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java
new file mode 100644
index 00000000000..1a831ef3205
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java
@@ -0,0 +1,97 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.trashcan;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.rest.api.DeletedNodes;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.NodeTargetAssoc;
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.Operation;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+
+/**
+ * An implementation of an Entity Resource for handling archived content
+ *
+ * @author Gethin James
+ */
+@EntityResource(name="deleted-nodes", title = "Deleted Nodes")
+public class TrashcanEntityResource implements
+        EntityResourceAction.ReadById<Node>, EntityResourceAction.Read<Node>, EntityResourceAction.Delete, BinaryResourceAction.Read
+{
+    private DeletedNodes deletedNodes;
+
+    public void setDeletedNodes(DeletedNodes deletedNodes)
+    {
+        this.deletedNodes = deletedNodes;
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Node> readAll(Parameters params)
+    {
+        return deletedNodes.listDeleted(params);
+    }
+
+    @Override
+    public Node readById(String nodeId, Parameters parameters) throws EntityNotFoundException
+    {
+        return deletedNodes.getDeletedNode(nodeId, parameters, true, null);
+    }
+
+    @Operation("restore")
+    @WebApiDescription(title = "Restore deleted Node", description = "Restores an archived node", successStatus = HttpServletResponse.SC_OK)
+    @WebApiParam(name = "nodeAssocTarget", title = "Target parent id and association type", description = "Target parent id and association type", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT, required = false)
+    public Node restoreDeletedNode(String nodeId, NodeTargetAssoc nodeTargetAssoc, Parameters parameters, WithResponse withResponse)
+    {
+        return deletedNodes.restoreArchivedNode(nodeId, nodeTargetAssoc);
+    }
+
+    @Override
+    @WebApiDescription(title = "Download content", description = "Download content")
+    @BinaryProperties({ "content" })
+    public BinaryResource readProperty(String nodeId, Parameters parameters)
+    {
+        return deletedNodes.getContent(nodeId, null, parameters);
+    }
+
+    @Override
+    public void delete(String nodeId, Parameters parameters)
+    {
+        deletedNodes.purgeArchivedNode(nodeId);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanRenditionsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanRenditionsRelation.java
new file mode 100644
index 00000000000..72d427c3aea
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/trashcan/TrashcanRenditionsRelation.java
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.trashcan;
+
+import org.alfresco.rest.api.DeletedNodes;
+import org.alfresco.rest.api.model.Rendition;
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.ParameterCheck;
+import org.springframework.beans.factory.InitializingBean;
+
+@RelationshipResource(name = "renditions", entityResource = TrashcanEntityResource.class, title = "Node renditions via archived node")
+public class TrashcanRenditionsRelation
+        implements RelationshipResourceAction.Read<Rendition>, RelationshipResourceAction.ReadById<Rendition>, RelationshipResourceBinaryAction.Read, InitializingBean
+{
+
+    private DeletedNodes deletedNodes;
+
+    public void setDeletedNodes(DeletedNodes deletedNodes)
+    {
+        this.deletedNodes = deletedNodes;
+    }
+
+    @WebApiDescription(title = "List renditions", description = "List available (created) renditions")
+    @Override
+    public CollectionWithPagingInfo<Rendition> readAll(String nodeId, Parameters parameters)
+    {
+        return deletedNodes.getRenditions(nodeId, parameters);
+    }
+
+    @WebApiDescription(title = "Retrieve rendition information", description = "Retrieve (created) rendition information")
+    @Override
+    public Rendition readById(String nodeId, String renditionId, Parameters parameters)
+    {
+        return deletedNodes.getRendition(nodeId, renditionId, parameters);
+    }
+
+    @WebApiDescription(title = "Download archived node rendition", description = "Download rendition for an archived node")
+    @BinaryProperties({ "content" })
+    @Override
+    public BinaryResource readProperty(String nodeId, String renditionId, Parameters parameters)
+    {
+        return deletedNodes.getContent(nodeId, renditionId, parameters);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        ParameterCheck.mandatory("deletedNodes", this.deletedNodes);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/trashcan/package-info.java b/remote-api/src/main/java/org/alfresco/rest/api/trashcan/package-info.java
new file mode 100644
index 00000000000..f74903fb747
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/api/trashcan/package-info.java
@@ -0,0 +1,30 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+@WebApi(name="alfresco", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.api.trashcan;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/Api.java b/remote-api/src/main/java/org/alfresco/rest/framework/Api.java
new file mode 100644
index 00000000000..1d1f9e0b651
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/Api.java
@@ -0,0 +1,178 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework;
+
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Standard API settings for the Alfresco Rest API
+ * 
+ * SCOPE - PUBLIC_API -  Reserved for public API
+ *       - PRIVATE_API - Reserved for private API
+ *
+ * VERSION - A positive integer starting at 1.
+ * @author Gethin James
+ */
+public class Api implements Comparable<Api>
+{
+    private static Log logger = LogFactory.getLog(Api.class);
+    public enum SCOPE {PRIVATE,PUBLIC};
+    
+    private final String name;
+    private final SCOPE scope;
+    private final int version;
+    
+    //Minor optimization to reuse this object as it will probably be used a lot
+    public static final Api ALFRESCO_PUBLIC = new Api("alfresco", SCOPE.PUBLIC, 1);
+    
+    /**
+     * Constructor used to create an api
+     * @param name String
+     * @param scope SCOPE
+     * @param version int
+     */
+    private Api(String name, SCOPE scope, int version)
+    {
+        super();
+        this.name = name;
+        this.scope = scope;
+        this.version = version;
+    }
+
+    public String getName()
+    {
+        return this.name;
+    }
+
+    public SCOPE getScope()
+    {
+        return this.scope;
+    }
+
+    public int getVersion()
+    {
+        return this.version;
+    }
+
+    /*
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((this.name == null) ? 0 : this.name.hashCode());
+        result = prime * result + ((this.scope == null) ? 0 : this.scope.hashCode());
+        result = prime * result + this.version;
+        return result;
+    }
+
+    /*
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj) return true;
+        if (obj == null) return false;
+        if (getClass() != obj.getClass()) return false;
+        Api other = (Api) obj;
+        if (this.name == null)
+        {
+            if (other.name != null) return false;
+        }
+        else if (!this.name.equals(other.name)) return false;
+        if (this.scope != other.scope) return false;
+        if (this.version != other.version) return false;
+        return true;
+    }
+
+    /*
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("Api [name=");
+        builder.append(this.name);
+        builder.append(", scope=");
+        builder.append(this.scope);
+        builder.append(", version=");
+        builder.append(this.version);
+        builder.append("]");
+        return builder.toString();
+    }
+
+    /**
+     * Creates an valid instance of the Api object
+     * @param apiName a String in lowercase
+     * @param apiScope SCOPE
+     * @param apiVersion postive integer
+     * @return Api
+     */
+    public static Api valueOf(String apiName, String apiScope, String apiVersion) throws InvalidArgumentException
+    {
+        SCOPE scope = null;
+        int version = 1;
+        
+        try
+        {
+            if (!StringUtils.isAllLowerCase(apiName)) throw new InvalidArgumentException("Api name must be lowercase");
+            scope = SCOPE.valueOf(apiScope.toUpperCase());
+            version = Integer.parseInt(apiVersion);
+            if (version < 1) throw new InvalidArgumentException("Version must be a positive integer.");
+        }
+        catch (Exception error)
+        {
+            if (error instanceof InvalidArgumentException) throw (InvalidArgumentException)error;  //Just throw it on.
+            logger.debug("Invalid API definition: "+apiName+" "+apiScope+" "+apiVersion);
+            throw new InvalidArgumentException("Invalid API definition:"+error.getMessage());
+        }
+        
+        Api anApi = new Api(apiName, scope, version);
+        return ALFRESCO_PUBLIC.equals(anApi)?ALFRESCO_PUBLIC:anApi;
+        
+    }
+
+    @Override
+    public int compareTo(Api other)
+    {
+        int compare = this.scope.compareTo(other.scope);
+        if (compare !=0) return compare;
+   
+        compare = this.name.compareTo(other.name);
+        if (compare !=0) return compare;
+
+        if (this.version < other.version) return -1;
+        if (this.version > other.version) return 1;
+        return 0;  // All fields are equal
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/BinaryProperties.java b/remote-api/src/main/java/org/alfresco/rest/framework/BinaryProperties.java
new file mode 100755
index 00000000000..44c5178089b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/BinaryProperties.java
@@ -0,0 +1,43 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * An array of binary property names used on a resource method operation in the Rest API
+ *
+ * @author Gethin James
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface BinaryProperties {
+    String[] value();
+}
+
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/Operation.java b/remote-api/src/main/java/org/alfresco/rest/framework/Operation.java
new file mode 100755
index 00000000000..c10bd30ed9f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/Operation.java
@@ -0,0 +1,47 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * An Operation as on an entity in the Rest API
+ *
+ * Your method signature should have 4 parameters (uniqueId, typePassedin, Parameters, WithResponse),
+ " use Void if you are not interested in the second argument.
+
+ * @author Gethin James
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Operation
+{
+    String value();
+}
+
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/WebApi.java b/remote-api/src/main/java/org/alfresco/rest/framework/WebApi.java
new file mode 100644
index 00000000000..edf958abc88
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/WebApi.java
@@ -0,0 +1,48 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates inclusion in the web api
+ *
+ * @author Gethin James
+ */
+@Target(ElementType.PACKAGE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface WebApi
+{
+    String name();
+    Api.SCOPE scope();
+    int version();
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/WebApiDeleted.java b/remote-api/src/main/java/org/alfresco/rest/framework/WebApiDeleted.java
new file mode 100644
index 00000000000..e87d6c78a62
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/WebApiDeleted.java
@@ -0,0 +1,45 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates this feature is deleted from the Web api
+ *
+ * @author Gethin James
+ */
+@Target({ElementType.TYPE,ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface WebApiDeleted
+{
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/WebApiDescription.java b/remote-api/src/main/java/org/alfresco/rest/framework/WebApiDescription.java
new file mode 100644
index 00000000000..d1542061dbf
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/WebApiDescription.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework;
+
+import static java.lang.annotation.ElementType.METHOD;
+
+import org.alfresco.rest.framework.core.ResourceOperation;
+import org.springframework.extensions.webscripts.Status;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Used to describe a resource method operation in the Rest API
+ *
+ * @author Gethin James
+ */
+@Target({ METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface WebApiDescription {
+    String title();
+    String description() default "";
+    int successStatus() default ResourceOperation.UNSET_STATUS;
+}
+
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/WebApiNoAuth.java b/remote-api/src/main/java/org/alfresco/rest/framework/WebApiNoAuth.java
new file mode 100644
index 00000000000..b01b2de0d54
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/WebApiNoAuth.java
@@ -0,0 +1,45 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates this Web api is does *not* require authentication !
+ *
+ * @author janv
+ */
+@Target({ElementType.TYPE,ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface WebApiNoAuth
+{
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/WebApiParam.java b/remote-api/src/main/java/org/alfresco/rest/framework/WebApiParam.java
new file mode 100644
index 00000000000..327fdc978bb
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/WebApiParam.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework;
+
+import static java.lang.annotation.ElementType.METHOD;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.alfresco.rest.framework.core.ResourceParameter;
+
+/**
+ * A parameter used on a resource method operation in the Rest API
+ * 
+ * The parameter kind is one of :
+ * 
+ * QUERY_STRING - A query string parameter as part of the URL
+ * HTTP_BODY_OBJECT - A JSON object specified in a HTTP_BODY used by either a POST or PUT
+ * URL_PATH - Included as part of the actual url, e.g. entity id. (Does not support multiple values)
+ * HTTP_HEADER - Included in the request's HTTP Header
+ *
+ * @author Gethin James
+ */
+@Target({ METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface WebApiParam  {
+    String name();
+    String title();
+    String description() default "";
+    boolean required() default false;
+    ResourceParameter.KIND kind() default ResourceParameter.KIND.URL_PATH;
+    boolean allowMultiple() default true;  //For URL_PATH the only permitted value will be FALSE
+}
+
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/WebApiParameters.java b/remote-api/src/main/java/org/alfresco/rest/framework/WebApiParameters.java
new file mode 100644
index 00000000000..1b2692dc8d0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/WebApiParameters.java
@@ -0,0 +1,42 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * An array of parameters used on a resource method operation in the Rest API
+ *
+ * @author Gethin James
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface WebApiParameters {
+    WebApiParam[] value()  default {};
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/ApiBootstrap.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/ApiBootstrap.java
new file mode 100644
index 00000000000..84c91cd666e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/ApiBootstrap.java
@@ -0,0 +1,72 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core;
+
+import java.util.Map;
+
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.extensions.surf.util.AbstractLifecycleBean;
+
+/**
+ * Bootstraps the restful API
+ *
+ * @author Gethin James
+ */
+public class ApiBootstrap extends AbstractLifecycleBean
+{
+
+    private static Log logger = LogFactory.getLog(ApiBootstrap.class);  
+    
+    ResourceLookupDictionary apiDictionary;
+
+    @Override
+    protected void onBootstrap(ApplicationEvent event)
+    {
+        logger.info("Bootstapping the API");
+        ContextRefreshedEvent refreshEvent = (ContextRefreshedEvent)event;
+        ApplicationContext ac = refreshEvent.getApplicationContext();
+        Map<String, Object> entityResourceBeans = ac.getBeansWithAnnotation(EntityResource.class);
+        Map<String, Object> relationResourceBeans = ac.getBeansWithAnnotation(RelationshipResource.class);
+        apiDictionary.setDictionary(ResourceDictionaryBuilder.build(entityResourceBeans.values(), relationResourceBeans.values()));
+    }
+
+    @Override
+    protected void onShutdown(ApplicationEvent event)
+    {
+        logger.info("Shutting down the API");
+    }
+
+    public void setApiDictionary(ResourceLookupDictionary apiDictionary)
+    {
+        this.apiDictionary = apiDictionary;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/HttpMethodSupport.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/HttpMethodSupport.java
new file mode 100644
index 00000000000..aa7991251ed
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/HttpMethodSupport.java
@@ -0,0 +1,38 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core;
+
+import org.springframework.http.HttpMethod;
+
+/**
+ * Simple marker interface to indicate which HTTP method the implementation supports
+ *
+ * @author Gethin James
+ */
+public interface HttpMethodSupport
+{
+    public HttpMethod getHttpMethod();
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/OperationResourceMetaData.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/OperationResourceMetaData.java
new file mode 100644
index 00000000000..919028df794
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/OperationResourceMetaData.java
@@ -0,0 +1,110 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core;
+
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.resource.actions.interfaces.ResourceAction;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Extends ResourceMetaData to give more information about an Operation
+ *
+ * @author Gethin James
+ */
+public class OperationResourceMetaData extends ResourceMetadata
+{
+    private final Method operationMethod;
+    private final boolean noAuthRequired;
+
+    /**
+     * Use this constructor to create the resource metadata
+     * @param uniqueId
+     * @param operations
+     * @param api
+     * @param operationMethod
+     * @param noAuthRequired
+     */
+    public OperationResourceMetaData(String uniqueId, List<ResourceOperation> operations, Api api, Method operationMethod, boolean noAuthRequired)
+    {
+        super(uniqueId, RESOURCE_TYPE.OPERATION, operations, api, null, null, null);
+        if (operations.size()!= 1)
+        {
+            throw new IllegalArgumentException("Only 1 operation per url is supported for an entity");
+        }
+        this.operationMethod = operationMethod;
+        this.noAuthRequired = noAuthRequired;
+    }
+
+    /**
+     * Constructor to use when it has been deleted
+     * @param uniqueId
+     * @param api
+     * @param apiDeleted
+     * @param noAuthRequired
+     */
+    public OperationResourceMetaData(String uniqueId, Api api, Set<Class<? extends ResourceAction>> apiDeleted, boolean noAuthRequired)
+    {
+        super(uniqueId, RESOURCE_TYPE.OPERATION, null, api, apiDeleted, null, null);
+        this.operationMethod = null;
+        this.noAuthRequired = noAuthRequired;
+    }
+
+    public Method getOperationMethod()
+    {
+        return operationMethod;
+    }
+
+    @Override
+    public boolean isNoAuth(Class<? extends ResourceAction> resourceAction)
+    {
+        return this.noAuthRequired;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("OperationResourceMetaData [api=");
+        builder.append(this.getApi());
+        builder.append(", uniqueId=");
+        builder.append(this.getUniqueId());
+        builder.append(", type=");
+        builder.append(this.getType());
+        builder.append(", parent=");
+        builder.append(this.getParentResource());
+        builder.append(", operations=");
+        builder.append(this.getOperations());
+        builder.append(", apiDeleted=");
+        builder.append(this.getApiDeleted());
+        builder.append(", operationMethod=").append(operationMethod);
+        builder.append(", noAuthRequired=").append(noAuthRequired);
+        builder.append("]");
+        return builder.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceDictionary.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceDictionary.java
new file mode 100644
index 00000000000..10e604efb85
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceDictionary.java
@@ -0,0 +1,159 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.alfresco.rest.framework.Api;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * A container for all information about resources and apis.
+ *
+ * @author Gethin James
+ */
+public class ResourceDictionary
+{
+    private final Map<Api,Map<String, ResourceWithMetadata>> allResources = new HashMap<Api,Map<String, ResourceWithMetadata>>();
+    private final SortedSet<Api> publicApis = new TreeSet<Api>();
+    private final SortedSet<Api> privateApis  = new TreeSet<Api>();
+    private static final String NEW_LINE = "\n";
+    
+    protected ResourceDictionary()
+    {
+        super();
+    }
+
+    /*
+     * Return a key by combining the entity and relationship ids
+     */
+    public static String resourceKey(final String entity, final String relationship)
+    {
+        String rootEntity = entity.startsWith("/")?entity:"/"+entity;
+        if (StringUtils.isNotBlank(relationship))
+        {
+            String relationKey = (relationship.startsWith("/")?relationship:"/"+relationship);
+            return rootEntity+"/{entityId}"+relationKey;
+        }
+        else
+        {
+            return rootEntity;
+        }
+    }
+
+    /*
+     * Return a key by combining the rootEntity and property ids
+     */
+    public static String propertyResourceKey(String entity, String property)
+    {
+      String rootEntity = entity.startsWith("/")?entity:"/"+entity;
+      return rootEntity+"/{id}/"+property;
+    }
+    
+    /**
+     * @return the allResources
+     */
+    public Map<Api, Map<String, ResourceWithMetadata>> getAllResources()
+    {
+        return this.allResources;
+    }
+
+    /**
+     * @return the publicApis
+     */
+    public SortedSet<Api> getPublicApis()
+    {
+        return this.publicApis;
+    }
+
+    /**
+     * @return the privateApis
+     */
+    public SortedSet<Api> getPrivateApis()
+    {
+        return this.privateApis;
+    }
+
+    /*
+     * Prints a String representation of the Resource Dictionary
+     */
+    public String prettyPrint()
+    {
+
+        StringBuilder builder = new StringBuilder();
+        builder.append("*******Resources********:").append(NEW_LINE);
+        builder.append("**Public Apis **").append(NEW_LINE);
+        for (Api api : this.publicApis)
+        {
+            printApi(builder,api);
+        }
+        builder.append(NEW_LINE);
+        builder.append("**Private Apis **").append(NEW_LINE);
+        for (Api api : this.privateApis)
+        {
+            printApi(builder,api);
+        }
+        builder.append("*******End of Resources ********:");
+        return builder.toString();
+    }
+    
+    private void printApi(StringBuilder builder, Api api)
+    {
+        builder.append(api).append(NEW_LINE);
+        Map<String, ResourceWithMetadata> apiResources = allResources.get(api);     
+        builder.append(apiResources.size()+ " resources.").append(NEW_LINE);
+        
+        Set<String> keys = apiResources.keySet();
+        for (String key : keys)
+        {
+            builder.append("***"+key+"***").append(NEW_LINE);
+            builder.append(apiResources.get(key).getMetaData()).append(NEW_LINE); 
+        }
+    }
+    
+    /*
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("ResourceDictionary [allResources=");
+        builder.append(this.allResources);
+        builder.append(", publicApis=");
+        builder.append(this.publicApis);
+        builder.append(", privateApis=");
+        builder.append(this.privateApis);
+        builder.append("]");
+        return builder.toString();
+    }
+    
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceDictionaryBuilder.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceDictionaryBuilder.java
new file mode 100644
index 00000000000..0ad4e48b9b0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceDictionaryBuilder.java
@@ -0,0 +1,247 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.Api.SCOPE;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.exception.PlatformRuntimeException;
+
+/*
+ * Builds a Map representing the Resource entities and their permitted actions
+ */
+public class ResourceDictionaryBuilder
+{
+    private static Log logger = LogFactory.getLog(ResourceDictionaryBuilder.class);  
+    
+    private static void processResources(
+                ResourceDictionary rd, Map<ApiScopeKey,Map<Integer,List<ResourceWithMetadata>>> entityApiMap,
+                Map<ApiScopeKey,Map<Integer,List<ResourceWithMetadata>>> relationshipApiMap)
+    {
+        logger.debug("Will process resources ");
+        
+        for (Entry<ApiScopeKey, Map<Integer, List<ResourceWithMetadata>>> apiGroupedByNameAndScopeEntry : entityApiMap.entrySet())
+        {
+            logger.debug("Processing "+apiGroupedByNameAndScopeEntry.getKey());
+            
+            Map<Integer, List<ResourceWithMetadata>> apiVersions = apiGroupedByNameAndScopeEntry.getValue();
+            List<Integer> versions = new ArrayList<Integer>(apiVersions.keySet());
+            logger.debug("Versions "+String.valueOf(versions));
+            Collections.sort(versions);
+            
+            //Loop through the different versions of the API and add them to the Map of resources By API with Version.
+            for (int i=0;i<versions.size();i++)
+            {
+                Api apiVersion = Api.valueOf(apiGroupedByNameAndScopeEntry.getKey().name, apiGroupedByNameAndScopeEntry.getKey().scope.toString(), Integer.toString(versions.get(i)));
+                Map<String, ResourceWithMetadata> resourcesByApiAndVersion = findResources(rd.getAllResources(),apiVersion);         
+                
+                logger.debug("Working with api "+apiVersion);
+                //If there's a previous version, get them first.
+                if (i>0) {
+                    logger.debug("Has previous so adding all entities from previous version ");
+                    Api previousVersion = Api.valueOf(apiVersion.getName(), apiVersion.getScope().toString(), Integer.toString(apiVersion.getVersion()-1));
+                    logger.debug("Previous version is "+previousVersion);
+                    Map<String, ResourceWithMetadata> resourcesForPreviousVersion = findResources(rd.getAllResources(),previousVersion);
+                    resourcesByApiAndVersion.putAll(resourcesForPreviousVersion);
+                }
+                
+                //Now add this version's resource (overwriting any from the previous version)
+                for (ResourceWithMetadata resourceWithMetadata : apiGroupedByNameAndScopeEntry.getValue().get(apiVersion.getVersion()))
+                {
+                    resourcesByApiAndVersion.put(resourceWithMetadata.getMetaData().getUniqueId(), resourceWithMetadata);
+                }
+            }
+        }
+    }
+
+    /**
+     * Finds a resources map, if it doesn't exist then it will create it.
+     * @param allResources Map<Api, Map<String, ResourceWithMetadata>>
+     * @param api Key
+     * @return Map
+     */
+    private static Map<String, ResourceWithMetadata> findResources(Map<Api, Map<String, ResourceWithMetadata>> allResources, Api api)
+    {
+        Map<String, ResourceWithMetadata> resourcesByApiAndVersion = allResources.get(api);
+        if (resourcesByApiAndVersion == null)
+        {
+            resourcesByApiAndVersion = new HashMap<String, ResourceWithMetadata>();
+            allResources.put(api, resourcesByApiAndVersion);
+        }
+        return resourcesByApiAndVersion;
+    }
+
+    /**
+     * Sort through the resources grouping them by api name/scope, then version.
+     * @param resources Collection<Object>
+     * @return Map
+     */
+    private static <T> Map<ApiScopeKey,Map<Integer,List<ResourceWithMetadata>>> parseResources(Collection<Object> resources)
+    {
+        Map<ApiScopeKey,Map<Integer,List<ResourceWithMetadata>>> apiMap = new HashMap<ApiScopeKey,Map<Integer,List<ResourceWithMetadata>>>();
+        
+        for (Object bean : resources)
+        {
+           List<ResourceMetadata> metaData = ResourceInspector.inspect(bean.getClass());
+           Api api = ResourceInspector.inspectApi(bean.getClass());
+           if (api == null)
+           {
+               throw new PlatformRuntimeException("Invalid resource bean defintion.  No @WebApi defined for package: "+bean.getClass().getPackage().getName());
+           }
+           ApiScopeKey key = new ApiScopeKey(api);
+           
+           //Find api scope/name and use a key
+           Map<Integer,List<ResourceWithMetadata>> apiVersions = apiMap.get(key);
+           if (apiVersions == null)
+           {
+               //if doesn't exist then create it.
+               apiVersions = new HashMap<Integer,List<ResourceWithMetadata>>();
+               apiMap.put(key, apiVersions);
+           }
+           
+           List<ResourceWithMetadata> resourcesWithMeta = apiVersions.get(api.getVersion());
+           if (resourcesWithMeta == null)
+           {
+               //if doesn't exist then create it.
+               resourcesWithMeta = new ArrayList<ResourceWithMetadata>();
+               apiVersions.put(api.getVersion(), resourcesWithMeta);
+           }
+            //For each meta just add it to the list.
+            for (ResourceMetadata resourceMeta : metaData)
+            {
+                resourcesWithMeta.add(new ResourceWithMetadata(bean, resourceMeta));
+            }
+        }
+        
+        return apiMap;
+    }   
+
+    /**
+     * Builds a ResourceDictionary by parsing the resources that are passed in.
+     * @param entityResources - object annotated as @EntityResource
+     * @param relationshipResources - object annotated as @RelationshipResource
+     * @return ResourceDictionary
+     */
+    public static ResourceDictionary build(Collection<Object> entityResources, Collection<Object> relationshipResources) {
+   
+            Collection<Object> entitiesAndRelations = new ArrayList<Object>();
+            entitiesAndRelations.addAll(entityResources);
+            entitiesAndRelations.addAll(relationshipResources);
+            Map<ApiScopeKey,Map<Integer,List<ResourceWithMetadata>>> apiMap = parseResources(entitiesAndRelations);
+            ResourceDictionary rd = new ResourceDictionary();
+            processResources(rd,apiMap,null);
+            processTopLevelApis(rd);
+            
+            if (logger.isDebugEnabled()) {
+            	logger.debug(rd.prettyPrint());
+            }
+            
+            return rd;
+    }
+
+    private static void processTopLevelApis(ResourceDictionary rd)
+    {
+        List<Api> apis = new ArrayList<Api>(rd.getAllResources().keySet());
+
+        for (Api api : apis)
+        {
+            switch (api.getScope()) {
+                case PUBLIC:
+                    rd.getPublicApis().add(api);
+                case PRIVATE:
+                    rd.getPrivateApis().add(api);    
+            }
+        }
+    }
+
+    /**
+     * A helper class to create a unique key for the combination of API name and API scope
+     *
+     * @author Gethin James
+     */
+    public static class ApiScopeKey{
+        final String name;
+        final SCOPE scope;
+        
+        public ApiScopeKey(Api api)
+        {
+            this.name = api.getName();
+            this.scope = api.getScope();
+        }
+
+        /*
+         * @see java.lang.Object#hashCode()
+         */
+        @Override
+        public int hashCode()
+        {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + ((this.name == null) ? 0 : this.name.hashCode());
+            result = prime * result + ((this.scope == null) ? 0 : this.scope.hashCode());
+            return result;
+        }
+
+        /*
+         * @see java.lang.Object#equals(java.lang.Object)
+         */
+        @Override
+        public boolean equals(Object obj)
+        {
+            if (this == obj) return true;
+            if (obj == null) return false;
+            if (getClass() != obj.getClass()) return false;
+            ApiScopeKey other = (ApiScopeKey) obj;
+            if (this.name == null)
+            {
+                if (other.name != null) return false;
+            }
+            else if (!this.name.equals(other.name)) return false;
+            if (this.scope != other.scope) return false;
+            return true;
+        }
+        
+        /*
+         * @see java.lang.Object#toString()
+         */
+        @Override
+        public String toString()
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.append("ApiScopeKey [name=").append(this.name).append(", scope=").append(this.scope).append("]");
+            return builder.toString();
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceInspector.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceInspector.java
new file mode 100644
index 00000000000..13055300308
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceInspector.java
@@ -0,0 +1,944 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.core;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.alfresco.rest.framework.Operation;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.WebApi;
+import org.alfresco.rest.framework.WebApiDeleted;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiNoAuth;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.WebApiParameters;
+import org.alfresco.rest.framework.core.ResourceMetadata.RESOURCE_TYPE;
+import org.alfresco.rest.framework.core.ResourceParameter.KIND;
+import org.alfresco.rest.framework.resource.EmbeddedEntityResource;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartRelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.ResourceAction;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.util.Pair;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.http.HttpMethod;
+import org.springframework.util.ReflectionUtils;
+
+/**
+ * Looks at resources to see what they can do
+ * 
+ * @author Gethin James
+ * @author janv
+ */
+public class ResourceInspector
+{
+    private static Log logger = LogFactory.getLog(ResourceInspector.class);
+    private static final Set<Class<? extends ResourceAction>> ALL_ENTITY_RESOURCE_INTERFACES = new HashSet<Class<? extends ResourceAction>>();
+    private static final Set<Class<? extends ResourceAction>> ALL_RELATIONSHIP_RESOURCE_INTERFACES = new HashSet<Class<? extends ResourceAction>>();
+    private static final Set<Class<? extends ResourceAction>> ALL_PROPERTY_RESOURCE_INTERFACES = new HashSet<Class<? extends ResourceAction>>();
+    
+    private static String READ_BY_ID_METHODNAME = "readById";
+
+    static {
+        
+        ALL_ENTITY_RESOURCE_INTERFACES.add(EntityResourceAction.Create.class);
+        ALL_ENTITY_RESOURCE_INTERFACES.add(EntityResourceAction.Read.class);
+        ALL_ENTITY_RESOURCE_INTERFACES.add(EntityResourceAction.ReadById.class);
+        ALL_ENTITY_RESOURCE_INTERFACES.add(EntityResourceAction.Update.class);
+        ALL_ENTITY_RESOURCE_INTERFACES.add(EntityResourceAction.Delete.class);
+        ALL_ENTITY_RESOURCE_INTERFACES.add(EntityResourceAction.DeleteSet.class);
+        
+        ALL_ENTITY_RESOURCE_INTERFACES.add(BinaryResourceAction.Read.class);
+
+        ALL_ENTITY_RESOURCE_INTERFACES.add(EntityResourceAction.CreateWithResponse.class);
+        ALL_ENTITY_RESOURCE_INTERFACES.add(EntityResourceAction.ReadWithResponse.class);
+        ALL_ENTITY_RESOURCE_INTERFACES.add(EntityResourceAction.ReadByIdWithResponse.class);
+        ALL_ENTITY_RESOURCE_INTERFACES.add(EntityResourceAction.UpdateWithResponse.class);
+        ALL_ENTITY_RESOURCE_INTERFACES.add(EntityResourceAction.DeleteWithResponse.class);
+        ALL_ENTITY_RESOURCE_INTERFACES.add(EntityResourceAction.DeleteSetWithResponse.class);
+        
+        ALL_ENTITY_RESOURCE_INTERFACES.add(BinaryResourceAction.ReadWithResponse.class);
+
+        ALL_ENTITY_RESOURCE_INTERFACES.add(MultiPartResourceAction.Create.class);
+
+        ALL_RELATIONSHIP_RESOURCE_INTERFACES.add(RelationshipResourceAction.Create.class);
+        ALL_RELATIONSHIP_RESOURCE_INTERFACES.add(RelationshipResourceAction.Read.class);
+        ALL_RELATIONSHIP_RESOURCE_INTERFACES.add(RelationshipResourceAction.ReadById.class);
+        ALL_RELATIONSHIP_RESOURCE_INTERFACES.add(RelationshipResourceAction.Update.class);
+        ALL_RELATIONSHIP_RESOURCE_INTERFACES.add(RelationshipResourceAction.Delete.class);
+        ALL_RELATIONSHIP_RESOURCE_INTERFACES.add(RelationshipResourceAction.DeleteSet.class);
+
+        ALL_RELATIONSHIP_RESOURCE_INTERFACES.add(RelationshipResourceAction.CreateWithResponse.class);
+        ALL_RELATIONSHIP_RESOURCE_INTERFACES.add(RelationshipResourceAction.ReadWithResponse.class);
+        ALL_RELATIONSHIP_RESOURCE_INTERFACES.add(RelationshipResourceAction.ReadByIdWithResponse.class);
+        ALL_RELATIONSHIP_RESOURCE_INTERFACES.add(RelationshipResourceAction.UpdateWithResponse.class);
+        ALL_RELATIONSHIP_RESOURCE_INTERFACES.add(RelationshipResourceAction.DeleteWithResponse.class);
+        ALL_RELATIONSHIP_RESOURCE_INTERFACES.add(RelationshipResourceAction.DeleteSetWithResponse.class);
+
+        ALL_RELATIONSHIP_RESOURCE_INTERFACES.add(MultiPartRelationshipResourceAction.Create.class);
+
+        ALL_PROPERTY_RESOURCE_INTERFACES.add(BinaryResourceAction.Read.class);
+        ALL_PROPERTY_RESOURCE_INTERFACES.add(BinaryResourceAction.Delete.class);
+        ALL_PROPERTY_RESOURCE_INTERFACES.add(BinaryResourceAction.Update.class);
+
+        ALL_PROPERTY_RESOURCE_INTERFACES.add(BinaryResourceAction.ReadWithResponse.class);
+        ALL_PROPERTY_RESOURCE_INTERFACES.add(BinaryResourceAction.DeleteWithResponse.class);
+        ALL_PROPERTY_RESOURCE_INTERFACES.add(BinaryResourceAction.UpdateWithResponse.class);
+    }
+    
+    /**
+     * Inspects the entity resource and returns meta data about it
+     * 
+     * @param annot EntityResource
+     * @param resource Class<?>
+     */
+    private static List<ResourceMetadata> inspectEntity(EntityResource annot, Class<?> resource)
+    {
+        
+        String urlPath = findEntityName(annot);
+        logger.debug("Found EntityResource: "+urlPath);
+        List<ResourceMetadata> metainfo = new ArrayList<ResourceMetadata>();
+        Api api = inspectApi(resource);
+        
+        MetaHelper helper = new MetaHelper(resource);
+        findOperation(EntityResourceAction.Create.class,   HttpMethod.POST, helper);
+        findOperation(EntityResourceAction.Read.class,     HttpMethod.GET, helper);
+        findOperation(EntityResourceAction.ReadById.class, HttpMethod.GET, helper);
+        findOperation(EntityResourceAction.Update.class,   HttpMethod.PUT, helper);  
+        findOperation(EntityResourceAction.Delete.class,   HttpMethod.DELETE, helper);
+        findOperation(EntityResourceAction.DeleteSet.class,   HttpMethod.DELETE, helper);
+
+        findOperation(EntityResourceAction.CreateWithResponse.class,   HttpMethod.POST, helper);
+        findOperation(EntityResourceAction.ReadWithResponse.class,     HttpMethod.GET, helper);
+        findOperation(EntityResourceAction.ReadByIdWithResponse.class, HttpMethod.GET, helper);
+        findOperation(EntityResourceAction.UpdateWithResponse.class,   HttpMethod.PUT, helper);
+        findOperation(EntityResourceAction.DeleteWithResponse.class,   HttpMethod.DELETE, helper);
+        findOperation(EntityResourceAction.DeleteSetWithResponse.class,   HttpMethod.DELETE, helper);
+
+        findOperation(MultiPartResourceAction.Create.class,   HttpMethod.POST, helper);
+
+        boolean noAuth = resource.isAnnotationPresent(WebApiNoAuth.class);
+        if (noAuth)
+        {
+            throw new IllegalArgumentException("@WebApiNoAuth should not be on all (entity resource class) - only on individual methods: "+urlPath);
+        }
+
+        Set<Class<? extends ResourceAction>> apiNoAuth = helper.apiNoAuth;
+
+        if (resource.isAnnotationPresent(WebApiDeleted.class))
+        {
+            metainfo.add(new ResourceMetadata(ResourceDictionary.resourceKey(urlPath,null), RESOURCE_TYPE.ENTITY,
+                                              null, api, ALL_ENTITY_RESOURCE_INTERFACES, apiNoAuth, null));
+        }
+        else 
+        {
+            if (!helper.apiDeleted.isEmpty() || !helper.operations.isEmpty())
+            {
+                metainfo.add(new ResourceMetadata(ResourceDictionary.resourceKey(urlPath,null), RESOURCE_TYPE.ENTITY,
+                                                  helper.operations, api, helper.apiDeleted, apiNoAuth, null));
+            }
+        }
+
+        inspectAddressedProperties(api, resource, urlPath, metainfo);
+        inspectOperations(api, resource, urlPath, metainfo);
+        return metainfo;
+    }
+
+    /**
+     * Inspects the entity resource and returns meta data about any addresssed/binary properties
+     * @param api Api
+     * @param entityPath String
+     */
+    public static void inspectAddressedProperties(Api api, Class<?> resource, final String entityPath, List<ResourceMetadata> metainfo)
+    {
+        final Map<String,List<ResourceOperation>> operationGroupedByProperty = new HashMap<String,List<ResourceOperation>>();
+
+        MetaHelperAddressable helperForAddressProps = new MetaHelperAddressable(resource, entityPath, operationGroupedByProperty);
+
+        findOperation(BinaryResourceAction.Read.class,   HttpMethod.GET, helperForAddressProps);
+        findOperation(BinaryResourceAction.Delete.class, HttpMethod.DELETE, helperForAddressProps);
+        findOperation(BinaryResourceAction.Update.class, HttpMethod.PUT, helperForAddressProps);
+
+        findOperation(BinaryResourceAction.ReadWithResponse.class,   HttpMethod.GET, helperForAddressProps);
+        findOperation(BinaryResourceAction.DeleteWithResponse.class, HttpMethod.DELETE, helperForAddressProps);
+        findOperation(BinaryResourceAction.UpdateWithResponse.class, HttpMethod.PUT, helperForAddressProps);
+
+        findOperation(RelationshipResourceBinaryAction.Read.class,   HttpMethod.GET, helperForAddressProps);
+        findOperation(RelationshipResourceBinaryAction.Delete.class, HttpMethod.DELETE, helperForAddressProps);
+        findOperation(RelationshipResourceBinaryAction.Update.class, HttpMethod.PUT, helperForAddressProps);
+
+        findOperation(RelationshipResourceBinaryAction.ReadWithResponse.class,   HttpMethod.GET, helperForAddressProps);
+        findOperation(RelationshipResourceBinaryAction.DeleteWithResponse.class, HttpMethod.DELETE, helperForAddressProps);
+        findOperation(RelationshipResourceBinaryAction.UpdateWithResponse.class, HttpMethod.PUT, helperForAddressProps);
+
+        boolean noAuth = resource.isAnnotationPresent(WebApiNoAuth.class);
+        if (noAuth)
+        {
+            throw new IllegalArgumentException("@WebApiNoAuth should not be on all (address properties) - only on individual methods: "+entityPath);
+        }
+
+        Set<Class<? extends ResourceAction>> apiNoAuth = helperForAddressProps.apiNoAuth;
+
+        if (resource.isAnnotationPresent(WebApiDeleted.class))
+        {
+            metainfo.add(new ResourceMetadata(ResourceDictionary.propertyResourceKey(entityPath,"FIX_ME"), RESOURCE_TYPE.PROPERTY,
+                                              null, inspectApi(resource), ALL_PROPERTY_RESOURCE_INTERFACES, apiNoAuth, null));
+        }
+        else 
+        {
+            for (Entry<String, List<ResourceOperation>> groupedOps : operationGroupedByProperty.entrySet())
+            {           
+                metainfo.add(new ResourceMetadata(groupedOps.getKey(), RESOURCE_TYPE.PROPERTY, groupedOps.getValue(), api, null, apiNoAuth, null));
+            }
+        }
+
+    }
+
+    /**
+     * Inspects the relationship resource and returns meta data about it
+     * 
+     * @param annot RelationshipResource
+     * @param resource Class<?>
+     */
+    private static List<ResourceMetadata> inspectRelationship(RelationshipResource annot, Class<?> resource)
+    {
+        Map<String, Object> annotAttribs = AnnotationUtils.getAnnotationAttributes(annot);
+        String urlPath = String.valueOf(annotAttribs.get("name"));
+
+        String entityPath;
+
+        Class<?> entityResource = (Class)annotAttribs.get("entityResource");
+        RelationshipResource relAnnot = AnnotationUtils.findAnnotation(entityResource, RelationshipResource.class);
+        if (relAnnot != null)
+        {
+            Map<String, Object> relAnnotAttribs = AnnotationUtils.getAnnotationAttributes(relAnnot);
+            String relUrlPath = String.valueOf(relAnnotAttribs.get("name"));
+            urlPath = ResourceDictionary.resourceKey(relUrlPath, urlPath);
+
+            entityPath = findEntityNameByAnnotationAttributes(relAnnotAttribs);
+        }
+        else
+        {
+            entityPath = findEntityNameByAnnotationAttributes(annotAttribs);
+        }
+
+        String relationshipKey = ResourceDictionary.resourceKey(entityPath, urlPath);
+        Api api = inspectApi(resource);
+        List<ResourceMetadata> metainfo = new ArrayList<ResourceMetadata>();
+
+        MetaHelper helper = new MetaHelper(resource);
+        findOperation(RelationshipResourceAction.Create.class,   HttpMethod.POST, helper);
+        findOperation(RelationshipResourceAction.Read.class,     HttpMethod.GET, helper);
+        findOperation(RelationshipResourceAction.ReadById.class, HttpMethod.GET, helper);
+        findOperation(RelationshipResourceAction.Update.class,   HttpMethod.PUT, helper);  
+        findOperation(RelationshipResourceAction.Delete.class,   HttpMethod.DELETE, helper);
+        findOperation(RelationshipResourceAction.DeleteSet.class,   HttpMethod.DELETE, helper);
+
+        findOperation(RelationshipResourceAction.CreateWithResponse.class,   HttpMethod.POST, helper);
+        findOperation(RelationshipResourceAction.ReadWithResponse.class,     HttpMethod.GET, helper);
+        findOperation(RelationshipResourceAction.ReadByIdWithResponse.class, HttpMethod.GET, helper);
+        findOperation(RelationshipResourceAction.UpdateWithResponse.class,   HttpMethod.PUT, helper);
+        findOperation(RelationshipResourceAction.DeleteWithResponse.class,   HttpMethod.DELETE, helper);
+        findOperation(RelationshipResourceAction.DeleteSetWithResponse.class,   HttpMethod.DELETE, helper);
+
+        findOperation(MultiPartRelationshipResourceAction.Create.class, HttpMethod.POST, helper);
+
+        boolean noAuth = resource.isAnnotationPresent(WebApiNoAuth.class);
+        if (noAuth)
+        {
+            throw new IllegalArgumentException("@WebApiNoAuth should not be on all (relationship resource class) - only on methods: "+urlPath);
+        }
+
+        Set<Class<? extends ResourceAction>> apiNoAuth = helper.apiNoAuth;
+
+        if (resource.isAnnotationPresent(WebApiDeleted.class))
+        {
+            metainfo.add(new ResourceMetadata(relationshipKey, RESOURCE_TYPE.RELATIONSHIP, null, inspectApi(resource), ALL_RELATIONSHIP_RESOURCE_INTERFACES, apiNoAuth, entityPath));
+        }
+        else 
+        {
+            metainfo.add(new ResourceMetadata(relationshipKey, RESOURCE_TYPE.RELATIONSHIP, helper.operations, inspectApi(resource), helper.apiDeleted, apiNoAuth, entityPath));
+        }
+
+        inspectAddressedProperties(api, resource, relationshipKey, metainfo);
+        inspectOperations(api, resource, relationshipKey, metainfo);
+        return metainfo;
+   }
+
+    /**
+     * Determines if the resources supports the resource action specified by resourceInterfaceWithOneMethod 
+     * @param resourceInterfaceWithOneMethod The resource action
+     * @param httpMethod http method the action supports.
+     * @param helper Holder of simple meta data
+     */
+    private static void findOperation(Class<? extends ResourceAction> resourceInterfaceWithOneMethod, HttpMethod httpMethod, MetaHelperCallback helper)
+    {
+        if (resourceInterfaceWithOneMethod.isAssignableFrom(helper.resource))
+        {
+            Method aMethod = findMethod(resourceInterfaceWithOneMethod, helper.resource);
+            ResourceOperation operation = inspectOperation(helper.resource, aMethod, httpMethod);
+
+            if (isDeleted(aMethod))
+            {
+                helper.whenOperationDeleted(resourceInterfaceWithOneMethod, aMethod);    
+            } 
+            else 
+            {
+                helper.whenNewOperation(operation, aMethod);
+            }
+
+            if (isNoAuth(aMethod))
+            {
+                if (! (httpMethod.equals(HttpMethod.GET) || httpMethod.equals(HttpMethod.POST)))
+                {
+                    throw new IllegalArgumentException("@WebApiNoAuth should only be on GET or POST methods: " + operation.getTitle());
+                }
+                helper.whenOperationNoAuth(resourceInterfaceWithOneMethod, aMethod);
+            }
+        }
+    }
+
+
+    /**
+     * Inspects the method and returns meta data about its operations
+     * @param aMethod Method
+     * @param httpMethod HttpMethod
+     * @return ResourceOperation
+     */
+    public static ResourceOperation inspectOperation(Class<?> resource, Method aMethod, HttpMethod httpMethod)
+    {
+        Annotation annot = AnnotationUtils.findAnnotation(aMethod, WebApiDescription.class);
+        List<ResourceParameter> parameters = new ArrayList<ResourceParameter>();
+        parameters.addAll(inspectParameters(resource, aMethod, httpMethod));
+
+        if (annot != null)
+        {
+            Map<String, Object> annotAttribs = AnnotationUtils.getAnnotationAttributes(annot);
+            String title = String.valueOf(annotAttribs.get("title"));
+            String desc = String.valueOf(annotAttribs.get("description"));
+            Integer success = (Integer) annotAttribs.get("successStatus");
+            return new ResourceOperation(httpMethod, title, desc, parameters, validSuccessCode(httpMethod,success));
+        }
+        else {
+            return new ResourceOperation(httpMethod, 
+                        "Missing @WebApiDescription annotation",
+                        "This method should be annotated with @WebApiDescription", parameters, validSuccessCode(httpMethod, ResourceOperation.UNSET_STATUS));
+        }
+    }
+
+    public static int validSuccessCode(HttpMethod httpMethod, int success)
+    {
+        if (!(ResourceOperation.UNSET_STATUS == success))
+        {
+            //The status has been set by the api implementor so use it.
+            return success;
+        }
+
+        switch (httpMethod)
+        {
+            case GET:
+                return Status.STATUS_OK;
+            case POST:
+                return Status.STATUS_CREATED;
+            case PUT:
+                return Status.STATUS_OK;
+            case DELETE:
+                return Status.STATUS_NO_CONTENT;
+            default:
+                return Status.STATUS_OK;
+        }
+
+    }
+
+    /**
+     * Inspects the Method to find any @WebApiParameters and @WebApiParam
+     * @param resource the class
+     * @param aMethod the method
+     * @param httpMethod HttpMethod
+     * @return a List of parameters
+     */
+    private static List<ResourceParameter> inspectParameters(Class<?> resource, Method aMethod, HttpMethod httpMethod)
+    {
+        List<ResourceParameter> params = new ArrayList<ResourceParameter>();
+        Annotation annot = AnnotationUtils.findAnnotation(aMethod, WebApiParameters.class);
+        if (annot != null)         
+        {
+            Map<String, Object> annotAttribs = AnnotationUtils.getAnnotationAttributes(annot);
+            WebApiParam[] apiParams = (WebApiParam[]) annotAttribs.get("value");
+            for (int i = 0; i < apiParams.length; i++)
+            {
+                params.add(findResourceParameter(apiParams[i], resource, aMethod));
+            }
+        }
+        else
+        {
+            Annotation paramAnot = AnnotationUtils.findAnnotation(aMethod, WebApiParam.class);
+            if (paramAnot!=null)
+            {
+                params.add(findResourceParameter(paramAnot, resource, aMethod));
+            }
+        }
+        
+        
+        //Setup default parameters
+        switch(httpMethod)
+        {
+            case POST:
+                if (paramsCount(params,ResourceParameter.KIND.URL_PATH) == 0)
+                {
+                    params.add(ResourceParameter.ENTITY_PARAM);  
+                }
+                if (paramsCount(params,ResourceParameter.KIND.HTTP_BODY_OBJECT) == 0)
+                {
+                    inspectBodyParamAndReturnType(resource, aMethod, params);
+                }
+                break;
+            case PUT:
+                int urlPathForPut = paramsCount(params,ResourceParameter.KIND.URL_PATH);
+                if (urlPathForPut == 0)
+                {
+                    params.add(ResourceParameter.ENTITY_PARAM);  
+                }
+                if (RelationshipResourceAction.Update.class.isAssignableFrom(resource) && urlPathForPut <2)
+                {
+                    params.add(ResourceParameter.RELATIONSHIP_PARAM);
+                }
+                if (paramsCount(params,ResourceParameter.KIND.HTTP_BODY_OBJECT)== 0)
+                {
+                    inspectBodyParamAndReturnType(resource, aMethod, params);
+                }
+                break;
+            case GET:
+                int urlPathForGet = paramsCount(params,ResourceParameter.KIND.URL_PATH);
+                if (urlPathForGet == 0 && (EntityResourceAction.ReadById.class.isAssignableFrom(resource) && READ_BY_ID_METHODNAME.equals(aMethod.getName())))
+                {
+                    params.add(ResourceParameter.ENTITY_PARAM);
+                }
+                else if (RelationshipResourceAction.ReadById.class.isAssignableFrom(resource)||RelationshipResourceAction.Read.class.isAssignableFrom(resource))
+                {
+                    //Its a RelationshipResourceAction
+                    if (urlPathForGet == 0)
+                    {
+                        params.add(ResourceParameter.ENTITY_PARAM);
+                    }
+                    //This method is what we are inspecting not what the class implements.
+                    if (READ_BY_ID_METHODNAME.equals(aMethod.getName()) && urlPathForGet< 2)
+                    {
+                        params.add(ResourceParameter.RELATIONSHIP_PARAM);
+                    }
+                }
+                if (!READ_BY_ID_METHODNAME.equals(aMethod.getName()))
+                {
+                    params.add(ResourceParameter.SKIP_PARAM);
+                    params.add(ResourceParameter.MAX_ITEMS_PARAM);
+                    params.add(ResourceParameter.PROPS_PARAM);
+                }
+                break;
+            case DELETE:
+                int urlPathForDelete = paramsCount(params,ResourceParameter.KIND.URL_PATH);
+                if (urlPathForDelete == 0)
+                {
+                    params.add(ResourceParameter.ENTITY_PARAM);  
+                }
+                //Add relationship param ?
+                if (RelationshipResourceAction.Delete.class.isAssignableFrom(resource) && urlPathForDelete <2)
+                {
+                    params.add(ResourceParameter.RELATIONSHIP_PARAM);
+                }
+        }
+        
+        return params;
+    }
+
+    private static void inspectBodyParamAndReturnType(Class<?> resource, Method aMethod, List<ResourceParameter> params)
+    {
+        Class<?> dType = ResourceInspectorUtil.determineType(resource,aMethod);
+        if (dType!= null)
+        {
+            params.add(ResourceParameter.valueOf(dType.getSimpleName().toUpperCase(), "The entity", "Unique entity properties", true, KIND.HTTP_BODY_OBJECT, true, dType));
+        }
+    }
+
+
+    /**
+     * Indicates the number of params of the Kind specified
+     * @param params List<ResourceParameter>
+     * @param kind kind of parameter eg. URL_PATH
+     * @return int count
+     */
+    private static int paramsCount(List<ResourceParameter> params, KIND kind)
+    {
+        int numParams = 0;
+    
+        for (ResourceParameter resourceParameter : params)
+        {
+           if (kind.equals(resourceParameter.getParamType())) numParams++;
+        }
+        return numParams; //the default
+    }
+
+
+    /**
+     * @param paramAnot Annotation
+     * @param resource Class<?>
+     * @param aMethod Method
+     * @return ResourceParameter
+     */
+    private static ResourceParameter findResourceParameter(Annotation paramAnot, Class<?> resource, Method aMethod)
+    {
+        Map<String, Object> annotAttribs = AnnotationUtils.getAnnotationAttributes(paramAnot);
+        ResourceParameter.KIND paramKind = (ResourceParameter.KIND) annotAttribs.get("kind");
+        Class<?> dType = String.class;
+        if (ResourceParameter.KIND.HTTP_BODY_OBJECT.equals(paramKind))
+        {
+            dType = ResourceInspectorUtil.determineType(resource, aMethod);
+        }
+        return ResourceParameter.valueOf(
+                    String.valueOf(annotAttribs.get("name")), 
+                    String.valueOf(annotAttribs.get("title")), 
+                    String.valueOf(annotAttribs.get("description")), 
+                    (Boolean)annotAttribs.get("required"),
+                    paramKind,
+                    (Boolean)annotAttribs.get("allowMultiple"),               
+                    dType);
+    }
+
+
+    /**
+     * Returns true if the method has been marked as deleted.
+     * @param method the method
+     * @return true - if is is marked as deleted.
+     */
+    public static boolean isDeleted(Method method)
+    {
+        WebApiDeleted deleted = AnnotationUtils.getAnnotation(method, WebApiDeleted.class);
+        return (deleted!=null);
+    }
+
+    /**
+     * Returns true if the method has been marked as no auth required.
+     * @param method the method
+     * @return true - if is is marked as no auth required.
+     */
+    public static boolean isNoAuth(Method method)
+    {
+        WebApiNoAuth noAuth = AnnotationUtils.getAnnotation(method, WebApiNoAuth.class);
+        return (noAuth!=null);
+    }
+    
+    /**
+     * Returns the method for the interface
+     * @return null or a Method
+     */
+    public static Method findMethod(Class<? extends ResourceAction> resourceInterfaceWithOneMethod, Class<?> resource)
+    {
+        Method[] resourceMethods = resourceInterfaceWithOneMethod.getMethods();
+        if (resourceMethods == null || resourceMethods.length != 1)
+        {
+            //All the interfaces should have just one method.
+            throw new IllegalArgumentException(resourceInterfaceWithOneMethod + " should be an interface with just one method.");
+        }
+        Method method = ReflectionUtils.findMethod(resource, resourceMethods[0].getName(), null);
+        return method;
+    }
+    
+    /**
+     * Finds the name of the entity using its annotation.
+     * @return the entity name/path
+     */
+    protected static String findEntityNameByAnnotationAttributes(Map<String, Object> annotAttribs)
+    {
+        Class<?> entityResourceRef = (Class<?>) annotAttribs.get("entityResource");
+        EntityResource entityAnnot = AnnotationUtils.findAnnotation(entityResourceRef, EntityResource.class);
+        return findEntityName(entityAnnot);
+    }
+    
+    /**
+     * Finds the name of the entity using its annotation.
+     * @param entityAnnot EntityResource
+     * @return the entity name/path
+     */
+    protected static String findEntityName(EntityResource entityAnnot)
+    {
+        Map<String, Object> annotAttribs =  AnnotationUtils.getAnnotationAttributes(entityAnnot);
+        String urlPath = String.valueOf(annotAttribs.get("name"));
+        return urlPath;
+    }
+
+    /**
+     * Finds the name of the entity collection using the meta information.
+     * @param meta ResourceMetadata
+     * @return the entity name/path
+     */
+    public static String findEntityCollectionNameName(ResourceMetadata meta)
+    {   
+        String name;
+        switch (meta.getType())
+        {
+            case RELATIONSHIP:
+                name = meta.getParentResource();
+                break;
+            default:
+                //an entity so just get its id.
+                name = meta.getUniqueId();
+        }
+        
+        if (name.startsWith("/"))
+        {
+            name = name.substring(1);
+        }
+        return name;
+    }
+   
+    /**
+     * For a given class, looks for @EmbeddedEntityResource annotations, using the annotation produce
+     * a Map of the property name key and the entity key
+     * @return A map of property key name and a value of the entity path name
+     */
+    public static Map<String,Pair<String,Method>> findEmbeddedResources(Class<?> anyClass)
+    {
+        Map<String, Pair<String,Method>> embeds = new HashMap<String, Pair<String,Method>>();
+        List<Method> annotatedMethods = ResourceInspectorUtil.findMethodsByAnnotation(anyClass, EmbeddedEntityResource.class);
+        if (annotatedMethods != null && !annotatedMethods.isEmpty())
+        {
+            for (Method annotatedMethod : annotatedMethods)
+            {
+                Annotation annot = AnnotationUtils.findAnnotation(annotatedMethod, EmbeddedEntityResource.class);
+                if (annot != null)
+                {
+                    Map<String, Object> annotAttribs = AnnotationUtils.getAnnotationAttributes(annot);
+                    String entityPath = findEntityNameByAnnotationAttributes(annotAttribs);
+                    String key = String.valueOf(annotAttribs.get("propertyName"));
+                    embeds.put(key, new Pair<String,Method>(entityPath,annotatedMethod));
+                }                
+            }
+
+        }
+        return embeds;
+    }
+    
+    /**
+     * Inspect a resource to find operations on it.
+     * @param api Api
+     * @param entityPath String
+     * @param metainfo resource metadata
+     */
+    public static void inspectOperations(Api api, Class<?> resource, final String entityPath, List<ResourceMetadata> metainfo)
+    {
+        Map<String,Pair<ResourceOperation,Method>> operations = findOperations(entityPath, resource);
+        if (operations != null && !operations.isEmpty())
+        {
+            for (Entry<String, Pair<ResourceOperation, Method>> opera : operations.entrySet())
+            {
+                Method annotatedMethod = opera.getValue().getSecond();
+                final boolean isNoAuthRequired = isNoAuth(annotatedMethod);
+
+                if (isDeleted(annotatedMethod))
+                {
+                    metainfo.add(new OperationResourceMetaData(opera.getKey(), api, new HashSet(Arrays.asList(opera.getValue().getFirst())), isNoAuthRequired));
+                }
+                else
+                {
+                    metainfo.add(new OperationResourceMetaData(opera.getKey(), Arrays.asList(opera.getValue().getFirst()), api, annotatedMethod, isNoAuthRequired));
+                }
+            }
+        }
+    }
+
+    /**
+     * Finds operations on an entity
+     * @param entityPath path to the entity
+     * @param anyClass resource clause
+     * @return The operations
+     */
+    private static Map<String,Pair<ResourceOperation,Method>> findOperations(String entityPath, Class<?> anyClass)
+    {
+        Map<String, Pair<ResourceOperation,Method>> embeds = new HashMap<String, Pair<ResourceOperation,Method>>();
+        List<Method> annotatedMethods = ResourceInspectorUtil.findMethodsByAnnotation(anyClass, Operation.class);
+        if (annotatedMethods != null && !annotatedMethods.isEmpty())
+            for (Method annotatedMethod : annotatedMethods)
+            {
+                //validateOperationMethod(annotatedMethod, anyClass);
+                Annotation annot = AnnotationUtils.findAnnotation(annotatedMethod, Operation.class);
+                if (annot != null)
+                {
+                    Map<String, Object> annotAttribs = AnnotationUtils.getAnnotationAttributes(annot);
+                    String actionName = String.valueOf(annotAttribs.get("value"));
+                    String actionPath = ResourceDictionary.propertyResourceKey(entityPath, actionName);
+                    ResourceOperation ro = inspectOperation(anyClass, annotatedMethod, HttpMethod.POST);
+                    embeds.put(actionPath, new Pair<ResourceOperation, Method>(ro, annotatedMethod));
+                }
+            }
+        return embeds;
+    }
+    
+    /**
+     * Inspects the resource to determine what api it belongs to.
+     * It does this by looking for the WebApi package annotation.
+     * 
+     * @return Api
+     */
+    public static Api inspectApi(Class<?> resource)
+    {
+        Package myPackage = resource.getPackage();
+        Annotation annot = myPackage.getAnnotation(WebApi.class);
+  
+        if (annot != null)
+        {
+            Map<String, Object> annotAttribs =  AnnotationUtils.getAnnotationAttributes(annot);
+            String apiName = String.valueOf(annotAttribs.get("name"));
+            String apiScope = String.valueOf(annotAttribs.get("scope"));
+            String apiVersion = String.valueOf(annotAttribs.get("version"));
+            return Api.valueOf(apiName, apiScope, apiVersion);
+        }
+        return null;
+    }
+
+    /**
+     * Inspects the annotated resource to understand its capabilities
+     * 
+     * @param resource Class
+     */
+    @SuppressWarnings("rawtypes")
+    public static List<ResourceMetadata> inspect(Class resource)
+    {
+        EntityResource annot = AnnotationUtils.findAnnotation(resource, EntityResource.class);
+        if (annot != null) { return inspectEntity(annot, resource); }
+
+        RelationshipResource relAnnot = AnnotationUtils.findAnnotation(resource, RelationshipResource.class);
+        if (relAnnot != null) { return inspectRelationship(relAnnot, resource); }
+
+        throw new UnsupportedOperationException("Unable to inspect " + resource.getName());
+
+    }
+
+    /**
+     * Finds the unique id of an object using the @UniqueId annotation.
+     * 
+     * @param obj any object
+     * @return a String object with the entity id set
+     */
+    public static String findUniqueId(Object obj)
+    {
+        @SuppressWarnings("rawtypes")
+        Class objClass = obj.getClass();
+
+        Method annotatedMethod = findUniqueIdMethod(objClass);
+        Object id = ResourceInspectorUtil.invokeMethod(annotatedMethod, obj);
+        if (id != null)
+        {
+            if (id instanceof NodeRef)
+            {
+                return ((NodeRef)id).getId();
+            }
+            return String.valueOf(id);
+        }
+        else
+        {
+            return null;
+        }
+
+    }
+
+
+    /**
+     * Finds a single method with the @UniqueId annotation.
+     * 
+     * @param objClass any object class
+     * @return the Method
+     * @throws IllegalArgumentException if there is is more than 1 method annotated with @UniqueId
+     */
+    public static Method findUniqueIdMethod(Class<?> objClass) throws IllegalArgumentException
+    {
+        List<Method> annotatedMethods = ResourceInspectorUtil.findMethodsByAnnotation(objClass, UniqueId.class);
+        if (annotatedMethods != null && !annotatedMethods.isEmpty())
+        {
+            if (annotatedMethods.size() != 1)
+            {
+                //There should only ever be 1 annotated method for unique id
+                throw new IllegalArgumentException("There should only ever be one UniqueId annotation on a class but "+objClass+" has "+annotatedMethods.size());
+            }
+            return annotatedMethods.get(0);
+        }
+
+        return null;
+    }
+
+    /**
+     * Finds the property name that is used as the unique id.
+     * @param uniqueIdMethod Method
+     * @return String the property name that is used as the unique id.
+     */
+    public static String findUniqueIdName(Method uniqueIdMethod)
+    {
+        Annotation annot = AnnotationUtils.findAnnotation(uniqueIdMethod, UniqueId.class);
+        if (annot != null)
+        {
+            Map<String, Object> annotAttribs =  AnnotationUtils.getAnnotationAttributes(annot);
+            String uniqueIdName = String.valueOf(annotAttribs.get("name"));
+            return uniqueIdName;
+        }
+        return UniqueId.UNIQUE_NAME;
+    }
+
+    private static class MetaHelperAddressable extends MetaHelperCallback {
+
+        private Set<Class<? extends ResourceAction>> apiNoAuth = new HashSet<Class<? extends ResourceAction>>();
+
+        private String entityPath;
+        private Map<String,List<ResourceOperation>> operationGroupedByProperty;
+
+        public MetaHelperAddressable(Class<?> resource, String entityPath, Map<String,List<ResourceOperation>> operationGroupedByProperty)
+        {
+            super(resource);
+
+            this.entityPath = entityPath;
+            this.operationGroupedByProperty = operationGroupedByProperty;
+        }
+
+        public MetaHelperAddressable(Class<?> resource)
+        {
+            super(resource);
+        }
+
+        @Override
+        public void whenNewOperation(ResourceOperation operation, Method aMethod)
+        {
+            Annotation addressableProps = AnnotationUtils.findAnnotation(aMethod, BinaryProperties.class);
+            if (addressableProps != null)
+            {
+                Map<String, Object> annotAttribs = AnnotationUtils.getAnnotationAttributes(addressableProps);
+                String[] props = (String[]) annotAttribs.get("value");
+                for (String property : props)
+                {
+                    String propKey = ResourceDictionary.propertyResourceKey(entityPath,property);
+                    if (!operationGroupedByProperty.containsKey(propKey))
+                    {
+                        List<ResourceOperation> ops = new ArrayList<ResourceOperation>();
+                        operationGroupedByProperty.put(propKey, ops);
+                    }
+                    List<ResourceOperation> operations = operationGroupedByProperty.get(propKey);
+                    operations.add(operation);
+                }
+
+            }
+            else
+            {
+                logger.warn("Resource "+resource.getCanonicalName()+" should declare a @BinaryProperties annotation.");
+            }
+        }
+
+        @Override
+        public void whenOperationDeleted(Class<? extends ResourceAction> deleted, Method aMethod)
+        {
+        }
+
+        @Override
+        public void whenOperationNoAuth(Class<? extends ResourceAction> noAuth, Method aMethod)
+        {
+            // TODO review - is this right ?
+            apiNoAuth.add(noAuth);
+        }
+    }
+    
+    /**
+     * Little container of a subset of metadata
+     *
+     * @author Gethin James
+     */
+    private static class MetaHelper extends MetaHelperCallback{
+        
+        public MetaHelper(Class<?> resource)
+        {
+            super(resource);
+        }
+        
+        private List<ResourceOperation> operations = new ArrayList<ResourceOperation>();
+
+        private Set<Class<? extends ResourceAction>> apiDeleted = new HashSet<Class<? extends ResourceAction>>();
+        private Set<Class<? extends ResourceAction>> apiNoAuth = new HashSet<Class<? extends ResourceAction>>();
+        
+        @Override
+        public void whenNewOperation(ResourceOperation operation, Method aMethod)
+        {
+            operations.add(operation);
+        }
+        
+        @Override
+        public void whenOperationDeleted(Class<? extends ResourceAction> deleted, Method aMethod)
+        {
+            apiDeleted.add(deleted);
+        }
+
+        @Override
+        public void whenOperationNoAuth(Class<? extends ResourceAction> noAuth, Method aMethod)
+        {
+            apiNoAuth.add(noAuth);
+        }
+    }
+    
+    /**
+     * Little container of a subset of metadata with a callback
+     *
+     * @author Gethin James
+     */
+    private abstract static class MetaHelperCallback {
+        
+        public MetaHelperCallback(Class<?> resource)
+        {
+            super();
+            this.resource = resource;
+        }
+        
+        final Class<?> resource;
+        
+        public abstract void whenNewOperation(ResourceOperation operation, Method aMethod);
+        public abstract void whenOperationDeleted(Class<? extends ResourceAction> deleted, Method aMethod);
+        public abstract void whenOperationNoAuth(Class<? extends ResourceAction> noAuth, Method aMethod);
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceInspectorUtil.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceInspectorUtil.java
new file mode 100755
index 00000000000..064d2b7bfd6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceInspectorUtil.java
@@ -0,0 +1,192 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.framework.Operation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.core.BridgeMethodResolver;
+import org.springframework.core.GenericTypeResolver;
+import org.springframework.core.ResolvableType;
+import org.springframework.core.annotation.AnnotationUtils;
+
+/**
+ * Generic methods used by ResourceInspector
+ * @author Gethin James
+ */
+public class ResourceInspectorUtil
+{
+    private static Log logger = LogFactory.getLog(ResourceInspectorUtil.class);
+    /**
+     * Determine the expected type as the returned type of the method.
+     * If the return type is a List it will return the generic element type instead of a List.
+     * @param resource - resource with methods
+     * @param method Method
+     * @return Class - type of class it needs.
+     */
+    @SuppressWarnings("rawtypes")
+    protected static Class determineType(Class resource, Method method)
+    {
+        Method resolvedMethod = BridgeMethodResolver.findBridgedMethod(method);
+
+        /*
+        * The api is consistent that the object passed in must match the object passed out
+        * however, operations are different, if the param is supplied  it doesn't have to match
+        * the return type.
+        * So we need special logic for operations
+         */
+        Annotation annot = AnnotationUtils.findAnnotation(resolvedMethod, Operation.class);
+        if (annot != null)
+        {
+            return determineOperationType(resource, method);
+        }
+        else
+        {
+            Class returnType = GenericTypeResolver.resolveReturnType(resolvedMethod, resource);
+            if (List.class.isAssignableFrom(returnType))
+            {
+                return ResolvableType.forMethodReturnType(method).asCollection().getGeneric(0).resolve();
+            }
+            return returnType;
+        }
+    }
+
+    protected static Class determineOperationType(Class resource, Method method)
+    {
+        //Its an operation annotated method and its a bit special
+        Class<?>[] paramTypes = method.getParameterTypes();
+        if (paramTypes!= null)
+        {
+            switch (paramTypes.length)
+            {
+                case 4:
+                    //EntityResource operation by id, same logic as RelationshipEntityResource operation by id
+                case 5:
+                int position = paramTypes.length-3;
+                if (Void.class.equals(paramTypes[position]))
+                {
+                    return null;
+                }
+                    else
+                {
+                    return paramTypes[position];
+                }
+            }
+        }
+
+        throw new IllegalArgumentException("Your method signature should have 4 parameters (uniqueId, typePassedin, Parameters, WithResponse)," +
+                " use Void if you are not interested in the second argument. "+resource.getName()+ " "+ method.getName());
+    }
+
+    /**
+     * Finds methods for the given annotation
+     * 
+     * It first finds all public member methods of the class or interface represented by objClass, 
+     * including those inherited from superclasses and superinterfaces.
+     * 
+     * It then loops through these methods searching for a single Annotation of annotationType,
+     * traversing its super methods if no annotation can be found on the given method itself.
+     * 
+     * @param objClass - the class
+     * @param annotationType - the annotation to find
+     * @return - the List of Method or an empty List
+     */
+    @SuppressWarnings("rawtypes")
+    public static List<Method> findMethodsByAnnotation(Class objClass, Class<? extends Annotation> annotationType)
+    {
+    
+        List<Method> annotatedMethods = new ArrayList<Method>();
+        Method[] methods = objClass.getMethods();
+        for (Method method : methods)
+        {
+            Annotation annot = AnnotationUtils.findAnnotation(method, annotationType);
+            if (annot != null) {
+                //Just to be sure, lets make sure its not a Bridged (Generic) Method
+                Method resolvedMethod = BridgeMethodResolver.findBridgedMethod(method);
+                annotatedMethods.add(resolvedMethod);
+            }
+        }
+        
+        return annotatedMethods;
+        
+    }
+    /**
+     * Invokes a no arg method and returns the result
+     * @param annotatedMethod Method
+     * @param obj Object
+     * @return result of method call
+     */
+    public static Object invokeMethod(Method annotatedMethod, Object obj)
+    {
+        try
+        {
+            return invokeMethod(annotatedMethod, obj, null);
+        }
+        catch (Throwable error)
+        {
+            logger.error("Invocation failure", error);
+            return null;
+        }
+    }
+
+    /**
+     * Invokes a method and returns the result
+     * @param annotatedMethod Method
+     * @param obj Object
+     * @return result of method call
+     */
+    public static Object invokeMethod(Method annotatedMethod, Object obj, Object... args) throws Throwable
+    {
+        if (annotatedMethod != null)
+        {
+            try
+            { 
+              return annotatedMethod.invoke(obj, args);
+            }
+            catch (IllegalArgumentException error)
+            {
+                logger.warn("Invocation error", error);
+            }
+            catch (IllegalAccessException error)
+            {
+                logger.warn("IllegalAccessException", error);
+            }
+            catch (InvocationTargetException error)
+            {
+                logger.warn("InvocationTargetException", error);
+                throw error.getCause();
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceLocator.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceLocator.java
new file mode 100644
index 00000000000..a365e5298f8
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceLocator.java
@@ -0,0 +1,127 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.http.HttpMethod;
+
+/**
+ * Locates rest resources in the system.  It can locate Entity,Relationship and Action resources.  It can also find embedded resources on a
+ * value object.  Additionally, it supports locating multiple relationship resources at the same time.
+ *
+ * @author Gethin James
+ */
+public interface ResourceLocator
+{
+    public static final String COLLECTION_RESOURCE = "collectionResource";
+    public static final String ENTITY_ID = "entityId";
+    public static final String RELATIONSHIP_RESOURCE = "relationResource";
+    public static final String RELATIONSHIP_ID = "relationshipId";
+    public static final String PROPERTY = "property";
+    public static final String LEFTOVER = "leftover";
+
+    public static final String RELATIONSHIP2_ID = "relationship2Id";
+    public static final String PROPERTY2 = "property2";
+
+    /**
+     *
+     * @param templateVars
+     * @return
+     */
+    Map<String, String> parseTemplateVars(Map<String, String> templateVars);
+
+    /**
+     * Finds an Entity Resource and returns it in ResourceWithMetadata wrapper. 
+     * @param api - The API being used.
+     * @param resourceName - The entity resource name - this is the "name" property on the @EntityResource annotation.
+     * @param httpMethod - A permitted HttpMethod
+     * @return ResourceWithMetadata - The resource and its metadata.
+     * @throws InvalidArgumentException - thrown if either the api or resourceName's are invalid. ie. A resource doesn't exist.
+     * @throws UnsupportedResourceOperationException - throw if the resource does not support the specified HttpMethod.
+     */
+    ResourceWithMetadata locateEntityResource(Api api, String resourceName, HttpMethod httpMethod) throws InvalidArgumentException, UnsupportedResourceOperationException;
+
+    /**
+     * Finds a property or action on a Relationship Resource and returns it in ResourceWithMetadata wrapper.
+     * @param api - The API being used.
+     * @param resourceName - The entity resource name - this is the "entityResourceName" property on the @RelationshipResource annotation.
+     * @param relationName - The relationship resource name - this is the "name" property on the @RelationshipResource annotation.
+     * @param property - The property resource name - can be either an action or a @BinaryProperty
+     * @param httpMethod - A permitted HttpMethod
+     * @return ResourceWithMetadata - The resource and its metadata.
+     * @throws InvalidArgumentException - thrown if either the api or resourceName's are invalid. ie. A resource doesn't exist.
+     * @throws UnsupportedResourceOperationException - throw if the resource does not support the specified HttpMethod.
+     */
+    ResourceWithMetadata locateRelationPropertyResource(Api api, String entityResource, String relationResource, String property, HttpMethod httpMethod) throws InvalidArgumentException,UnsupportedResourceOperationException;
+
+    /**
+     * Finds an Relationship Resource and returns it in ResourceWithMetadata wrapper. 
+     * @param api - The API being used.
+     * @param resourceName - The entity resource name - this is the "entityResourceName" property on the @RelationshipResource annotation.
+     * @param relationName - The relationship resource name - this is the "name" property on the @RelationshipResource annotation.
+     * @param httpMethod - A permitted HttpMethod
+     * @return ResourceWithMetadata - The resource and its metadata.
+     * @throws InvalidArgumentException - thrown if either the api or resourceName's are invalid. ie. A resource doesn't exist.
+     * @throws UnsupportedResourceOperationException - throw if the resource does not support the specified HttpMethod.
+     */
+    ResourceWithMetadata locateRelationResource(Api api, String resourceName, String relationName, HttpMethod httpMethod) throws InvalidArgumentException, UnsupportedResourceOperationException;
+    
+    /**
+     * Used by webscripts to locate a resource based on the URL template variables.
+     * @param api - The API being used.
+     * @param templateVars A map of variables representing the request
+     * @param httpMethod - A permitted HttpMethod
+     * @return ResourceWithMetadata - The resource and its metadata.
+     */
+    ResourceWithMetadata locateResource(Api api, Map<String, String> templateVars, HttpMethod httpMethod);
+
+    /**
+     * For a given Map finds any resources that should be embedded inside a class.
+     * @param api - The API being used.
+     * @param embeddedKeys - Likely to be the result of a call to ResourceInspector.findEmbeddedResources()
+     * @return ResourceWithMetadata - The resources with metadata.
+     */
+    Map<String, ResourceWithMetadata> locateEmbeddedResources(Api api, Map<String,String> embeddedKeys);
+
+    /**
+     * Finds multiple relationship Resources and returns them as a Map of ResourceWithMetadata. 
+     * @param api - The API being used.
+     * @param entityKey - this is the "entityResourceName" property on the @RelationshipResource annotation.
+     * @param relationshipKeys - The relationship resource names - this is the "name" property on the @RelationshipResource annotation.
+     * @param httpMethod - A permitted HttpMethod
+     * @return ResourceWithMetadata - The resource and its metadata.
+     * @throws InvalidArgumentException - thrown if either the api or resourceName's are invalid. ie. A resource doesn't exist.
+     * @throws UnsupportedResourceOperationException - throw if the resource does not support the specified HttpMethod.
+     */
+    Map<String, ResourceWithMetadata> locateRelationResource(Api api, String entityKey, Collection<String> relationshipKeys, HttpMethod httpMethod) throws InvalidArgumentException, UnsupportedResourceOperationException;
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceLookupDictionary.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceLookupDictionary.java
new file mode 100644
index 00000000000..5c578cc586c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceLookupDictionary.java
@@ -0,0 +1,269 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.http.HttpMethod;
+
+/**
+ * Used for locating resources, implements ResourceLocator
+ * Contains a ResourceDictionary (which is a reference to all the resources available)
+ *
+ * @author Gethin James
+ */
+public class ResourceLookupDictionary implements ResourceLocator
+{
+    private static Log logger = LogFactory.getLog(ResourceLookupDictionary.class);  
+    
+    private ResourceDictionary dictionary;
+
+    @Override
+    public Map<String, String> parseTemplateVars(Map<String, String> templateVars)
+    {
+        if ("preferences".equals(templateVars.get(ResourceLocator.RELATIONSHIP_RESOURCE)))
+        {
+            // REPO-855: special case for backwards-compatibility (see PersonPreferencesRelation.java)
+            return templateVars;
+        }
+
+        String leftover = templateVars.get(ResourceLocator.LEFTOVER);
+        if (StringUtils.isNotBlank(leftover))
+        {
+            Map<String, String> templateVars2 = new HashMap<>();
+            templateVars2.putAll(templateVars);
+
+            String[] split = leftover.split("/");
+            if (split.length > 0)
+            {
+                // eg. r1 in /nodes/n1/versions/v1/renditions/r1
+                templateVars2.put(RELATIONSHIP2_ID, split[0]);
+            }
+            if (split.length > 1)
+            {
+                // eg. content in /nodes/n1/versions/v1/renditions/r1/content
+                templateVars2.put(PROPERTY2, split[1]);
+            }
+
+            return templateVars2;
+        }
+        else
+        {
+            return templateVars;
+        }
+    }
+
+    @Override
+    public ResourceWithMetadata locateEntityResource(Api api, String entityResource, HttpMethod httpMethod) throws NotFoundException, UnsupportedResourceOperationException
+    {
+        return locateRelationResource(api, entityResource, (String)null, httpMethod);
+    }
+
+    @Override
+    public ResourceWithMetadata locateRelationPropertyResource(Api api, String entityResource, String relationResource, String property, HttpMethod httpMethod) throws NotFoundException,UnsupportedResourceOperationException
+    {
+        String resourceKey = ResourceDictionary.resourceKey(entityResource, relationResource);
+        String propertyResourceKey = ResourceDictionary.propertyResourceKey(resourceKey, property);
+        Map<String, ResourceWithMetadata> apiResources = dictionary.getAllResources().get(api);
+        if (apiResources == null)
+        {
+            throw new NotFoundException(NotFoundException.DEFAULT_MESSAGE_ID);
+        }
+
+        ResourceWithMetadata resource = apiResources.get(propertyResourceKey);
+        if (resource == null)
+        {
+            if (relationResource != null)
+            {
+                //Get entity/relationship resource and check if we are referencing a relation on it.
+                resourceKey = ResourceDictionary.resourceKey(entityResource, relationResource);
+                String relationResourceKey = ResourceDictionary.resourceKey(resourceKey, property);
+                resource = apiResources.get(relationResourceKey);
+                if (resource != null)
+                {
+                    ResourceOperation op = resource.getMetaData().getOperation(httpMethod);
+                    if (op == null) { throw new UnsupportedResourceOperationException(); }
+                    return resource;
+                }
+            }
+            logger.warn("Unable to locate resource resource for :"+entityResource+" "+relationResource==null?"":relationResource+" "+property==null?"":property);
+            throw new NotFoundException("Unable to locate resource resource for :"+entityResource+" "+(relationResource==null?"":relationResource+" "+property==null?"":property));
+        }
+        else
+        {
+            ResourceOperation op = resource.getMetaData().getOperation(httpMethod);
+            if (op == null) { throw new UnsupportedResourceOperationException(); }
+            return resource;
+        }
+    }
+
+    @Override
+    public ResourceWithMetadata locateRelationResource(Api api, String entityResource, String relationResource, HttpMethod httpMethod) throws NotFoundException,UnsupportedResourceOperationException
+    {
+        String resourceKey = ResourceDictionary.resourceKey(entityResource, relationResource);
+        if (logger.isDebugEnabled())
+        {
+          logger.debug("Locating resource :" + resourceKey);
+        }
+        Map<String, ResourceWithMetadata> apiResources = dictionary.getAllResources().get(api);
+        if (apiResources == null)
+        {
+          throw new NotFoundException(NotFoundException.DEFAULT_MESSAGE_ID);
+        } 
+        ResourceWithMetadata resource = apiResources.get(resourceKey);
+        if (resource == null)
+        {
+          if (relationResource != null)
+          {
+              //Get entity resource and check if we are referencing a property on it.
+              resourceKey = ResourceDictionary.propertyResourceKey(entityResource, relationResource);
+              resource = apiResources.get(resourceKey);
+              if (resource != null)
+              {
+                  ResourceOperation op = resource.getMetaData().getOperation(httpMethod);
+                  if (op == null) { throw new UnsupportedResourceOperationException(); }
+                  return resource;
+              }
+          }
+          logger.warn("Unable to locate resource resource for :"+entityResource+" "+relationResource==null?"":relationResource);
+          throw new NotFoundException("Unable to locate resource resource for :"+entityResource+" "+(relationResource==null?"":relationResource));
+        } 
+        else
+        {
+            ResourceOperation op = resource.getMetaData().getOperation(httpMethod);
+            if (op == null) { throw new UnsupportedResourceOperationException(); }
+            return resource;
+        }
+    }
+
+    /**
+     * Locates a resource by URI path and wraps it in an invoker
+     * 
+     * This will probably get refactored later when we work out what we 
+     * are doing with the discoverability model.  It shouldn't create
+     * a new instance every time.
+     */
+    @Override
+    public ResourceWithMetadata locateResource(Api api,Map<String, String> templateVars, HttpMethod httpMethod)
+    {
+        Map<String, String> resourceVars = parseTemplateVars(templateVars);
+
+        String collectionName = resourceVars.get(COLLECTION_RESOURCE);
+        String entityId = resourceVars.get(ENTITY_ID);
+        String resourceName = resourceVars.get(RELATIONSHIP_RESOURCE);
+        String property =  resourceVars.get(PROPERTY);
+        String property2 = resourceVars.get(PROPERTY2);
+
+        if (StringUtils.isNotBlank(property2))
+        {
+            String resourceName2 = ResourceDictionary.resourceKey(resourceName, property);
+            return locateRelationPropertyResource(api,collectionName ,resourceName2, property2, httpMethod);
+        }
+        if (StringUtils.isNotBlank(property))
+        {
+            return locateRelationPropertyResource(api,collectionName ,resourceName, property,httpMethod);
+        }
+        if (StringUtils.isNotBlank(resourceName))
+        {
+            return locateRelationResource(api,collectionName ,resourceName,httpMethod);
+        }
+        if (StringUtils.isNotBlank(entityId))
+        {
+            return locateEntityResource(api,collectionName,httpMethod);
+        }
+        if (StringUtils.isNotBlank(collectionName))
+        {
+            return locateEntityResource(api,collectionName,httpMethod);
+        }
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Unable to locate a resource for "+templateVars);
+        }
+        throw new NotFoundException();
+
+    }
+
+    @Override
+    public  Map<String,ResourceWithMetadata> locateEmbeddedResources(Api api, Map<String,String> embeddedKeys)
+    {
+        if (embeddedKeys!=null && !embeddedKeys.isEmpty())
+        {
+            Map<String,ResourceWithMetadata> embeds = new HashMap<String,ResourceWithMetadata>();
+            for (Entry<String, String> embeddedEntry : embeddedKeys.entrySet())
+            {
+                ResourceWithMetadata res = locateEntityResource(api,embeddedEntry.getValue(), HttpMethod.GET);  
+                embeds.put(embeddedEntry.getKey(), res);
+            }
+            return embeds;
+
+        }
+        return Collections.emptyMap();
+    }
+   
+    @Override
+    public Map<String, ResourceWithMetadata> locateRelationResource(Api api, String entityKey, Collection<String> relationshipKeys, HttpMethod httpMethod)
+    {
+        if (relationshipKeys != null && !relationshipKeys.isEmpty())
+        {
+            Map<String,ResourceWithMetadata> embeds = new HashMap<String,ResourceWithMetadata>();
+            
+            for (String key : relationshipKeys)
+            {
+                embeds.put(key, locateRelationResource(api, entityKey, key, httpMethod));
+            }
+
+            return embeds;
+        }
+        return Collections.emptyMap();
+    }
+
+    /**
+     * @param dictionary the dictionary to set
+     */
+    public void setDictionary(ResourceDictionary dictionary)
+    {
+        this.dictionary = dictionary;
+    }
+    
+    public ResourceDictionary getDictionary()
+    {
+        return this.dictionary;
+    }
+
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceMetadata.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceMetadata.java
new file mode 100644
index 00000000000..5596b8c3d8f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceMetadata.java
@@ -0,0 +1,210 @@
+/*
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.resource.actions.interfaces.ResourceAction;
+import org.springframework.http.HttpMethod;
+
+/**
+ * Describes a resource and its properties.  Metadata about what functions
+ * the resource can perform and what properties it has.
+ *
+ * @author Gethin James
+ * @author janv
+ */
+public class ResourceMetadata
+{
+    public enum RESOURCE_TYPE {ENTITY, RELATIONSHIP, PROPERTY, OPERATION};
+    private final String uniqueId;
+    private final RESOURCE_TYPE type;
+    private final List<ResourceOperation> operations;
+    private final String parentResource;
+    
+    @JsonIgnore
+    private final Api api;
+
+    private final Set<Class<? extends ResourceAction>> apiDeleted;
+    private Set<Class<? extends ResourceAction>> apiNoAuth;
+
+    @SuppressWarnings("unchecked")
+    public ResourceMetadata(String uniqueId, RESOURCE_TYPE type, List<ResourceOperation> operations, Api api,
+                            Set<Class<? extends ResourceAction>> apiDeleted,
+                            Set<Class<? extends ResourceAction>> apiNoAuth,
+                            String parentResource)
+    {
+        super();
+        this.uniqueId = uniqueId;
+        this.type = type;
+        this.operations = (List<ResourceOperation>) (operations==null?Collections.emptyList():operations);
+        this.api = api;
+        this.apiDeleted  = (Set<Class<? extends ResourceAction>>) (apiDeleted==null?Collections.emptySet():apiDeleted);
+        this.apiNoAuth  = (Set<Class<? extends ResourceAction>>) (apiNoAuth==null?Collections.emptySet():apiNoAuth);
+        this.parentResource = parentResource!=null?(parentResource.startsWith("/")?parentResource:"/"+parentResource):null;
+    }
+
+    /**
+     * Gets the operation for the specified HTTPMethod
+     * @param supportedMethod HttpMethod
+     * @return null if the operation is not supported
+     */
+    public ResourceOperation getOperation(HttpMethod supportedMethod)
+    {
+        for (ResourceOperation ops : operations)
+        {
+            if (ops.getHttpMethod().equals(supportedMethod)) return ops;
+        }
+        return null;
+    }
+
+    /**
+     * Gets the data type of the resource parameter
+     *
+     * @param operation {@code ResourceOperation} object
+     * @return The data type of the resource parameter
+     */
+    public Class getObjectType(ResourceOperation operation)
+    {
+        for (ResourceParameter param : operation.getParameters())
+        {
+            if (ResourceParameter.KIND.HTTP_BODY_OBJECT.equals(param.getParamType()))
+            {
+                return param.getDataType();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Indicates if this resource action is no longer supported.
+     * @return true if it is no longer supported
+     */
+    public boolean isDeleted(Class<? extends ResourceAction> resourceAction)
+    {
+       return apiDeleted.contains(resourceAction);
+    }
+
+    /**
+     * Indicates if this resource action supports unauthenticated access.
+     * @param resourceAction
+     * @return
+     */
+    public boolean isNoAuth(Class<? extends ResourceAction> resourceAction)
+    {
+        return apiNoAuth.contains(resourceAction);
+    }
+
+    /**
+     * URL uniqueId to the resource
+     * 
+     * @return String uniqueId
+     */
+    public String getUniqueId()
+    {
+        return this.uniqueId;
+    }
+
+    /**
+     * The type of this resource
+     * 
+     * @return RESOURCE_TYPE type
+     */
+    public RESOURCE_TYPE getType()
+    {
+        return this.type;
+    }
+
+    /**
+     * @return the api
+     */
+    public Api getApi()
+    {
+        return this.api;
+    }
+
+    /*
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("ResourceMetadata [api=");
+        builder.append(this.api);
+        builder.append(", uniqueId=");
+        builder.append(this.uniqueId);
+        builder.append(", type=");
+        builder.append(this.type);
+        builder.append(", parent=");
+        builder.append(this.parentResource);
+        builder.append(", operations=");
+        builder.append(this.operations);
+        builder.append(", apiDeleted=");
+        builder.append(this.apiDeleted);
+        builder.append(", apiNoAuth=");
+        builder.append(this.apiNoAuth);
+        builder.append("]");
+        return builder.toString();
+    }
+
+    public List<ResourceOperation> getOperations()
+    {
+        return this.operations;
+    }
+
+    protected Set<Class<? extends ResourceAction>> getApiDeleted()
+    {
+        return this.apiDeleted;
+    }
+
+    public String getParentResource()
+    {
+        return this.parentResource;
+    }
+//
+//    /**
+//     * Gets the properties for the specified http method. That are available to be changed by a url path.
+//     * Matches the first operation.
+//     * @param httpMethod
+//     * @return If not found returns an empty list
+//     */
+//    public List<String> getAddressableProperties(HttpMethod httpMethod)
+//    {
+//        for (ResourceOperation ops : operations)
+//        {
+//            if (ops.getHttpMethod().equals(httpMethod))return ops.getAddressableProperties();
+//        }
+//        return Collections.emptyList();
+//    }
+//
+  
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceOperation.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceOperation.java
new file mode 100644
index 00000000000..73726ea4e33
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceOperation.java
@@ -0,0 +1,104 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core;
+
+import java.util.List;
+
+import org.springframework.http.HttpMethod;
+
+/**
+ * Operations that can typically take place on a Restful resource
+ *
+ * @author Gethin James
+ */
+public class ResourceOperation
+{
+    public static final int UNSET_STATUS = -1;
+    private final HttpMethod httpMethod;
+    private final String title;
+    private final String description;
+    private final List<ResourceParameter> parameters;
+    private final int successStatus;
+    
+    /**
+     * @param httpMethod HttpMethod
+     * @param title String
+     * @param description String
+     * @param successStatus HTTP status
+     */
+    public ResourceOperation(HttpMethod httpMethod, String title, String description, List<ResourceParameter> parameters, int successStatus)
+    {
+        super();
+        this.httpMethod = httpMethod;
+        this.title = title;
+        this.description = description;
+        this.parameters = parameters;
+        this.successStatus = successStatus;
+    }
+
+    public HttpMethod getHttpMethod()
+    {
+        return this.httpMethod;
+    }
+
+    public String getTitle()
+    {
+        return this.title;
+    }
+
+    public String getDescription()
+    {
+        return this.description;
+    }
+
+    public List<ResourceParameter> getParameters()
+    {
+        return this.parameters;
+    }
+
+    public int getSuccessStatus()
+    {
+        return successStatus;
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("ResourceOperation [httpMethod=");
+        builder.append(this.httpMethod);
+        builder.append(", title=");
+        builder.append(this.title);
+        builder.append(", status=");
+        builder.append(this.successStatus);
+        builder.append(", description=");
+        builder.append(this.description);
+        builder.append(", parameters=");
+        builder.append(this.parameters);
+        builder.append("]");
+        return builder.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceParameter.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceParameter.java
new file mode 100644
index 00000000000..df1115ffa49
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceParameter.java
@@ -0,0 +1,186 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core;
+
+/**
+ * ResourceParameters are used on ResourceOperations
+ *
+ * The KIND is one of :
+ * QUERY_STRING - A query string parameter as part of the URL
+ * HTTP_BODY_OBJECT - A JSON object specified in a HTTP_BODY used by either a POST or PUT
+ * URL_PATH - Included as part of the actual url, e.g. entity id. (Does not support multiple values)
+ * HTTP_HEADER - Included in the request's HTTP Header
+ * 
+ * @author Gethin James
+ */
+public class ResourceParameter
+{
+    public static enum KIND {QUERY_STRING,HTTP_BODY_OBJECT,URL_PATH,HTTP_HEADER}
+    private final String name;
+    private final boolean required;
+    private final String title;
+    private final String description;
+    private final Class<?> dataType;
+    private final KIND kind;
+    private final boolean allowMultiple;
+    
+    public static final ResourceParameter ENTITY_PARAM = new ResourceParameter("entityId",
+                "The unique id of the entity being addressed",
+                "The unique id must be a String. It is returned as an 'id' from the entity", true,
+                String.class, KIND.URL_PATH, false);
+    
+    public static final ResourceParameter RELATIONSHIP_PARAM = new ResourceParameter("relationshipId",
+                "The unique id of the entity relationship being addressed",
+                "The unique id must be a String. It is only valid in the scope of the relationship", true,
+                String.class, KIND.URL_PATH, false);
+    
+    public static final ResourceParameter SKIP_PARAM = new ResourceParameter("skipCount",
+                "Skip count",
+                "An integer describing how many entities exist in the collection before those included in this list.",
+                false,
+                Integer.class, KIND.QUERY_STRING,
+                false); 
+    public static final ResourceParameter MAX_ITEMS_PARAM = new ResourceParameter("maxItems",
+                "Maximum items",
+                "The maximum items request to return.",
+                false,
+                Integer.class, KIND.QUERY_STRING,
+                false);
+    public static final ResourceParameter PROPS_PARAM = new ResourceParameter("properties",
+                "Properties to include.",
+                "The properties parameter is a comma-separated list of property names. You can use the properties parameter to restrict the returned properties.",
+                false,
+                Integer.class, KIND.QUERY_STRING,
+                false);
+    public static final ResourceParameter RELATIONS_PARAM = new ResourceParameter("relations",
+                "Use the relations parameter to include one or more child entities in a single response. ",
+                "You can reduce network traffic by using the relations parameter to include one or more child entities in a single response.",
+                false,
+                Integer.class, KIND.QUERY_STRING,
+                false); 
+    public static final ResourceParameter WHERE_PARAM = new ResourceParameter("where",
+                "A sql-like where clause",
+                "(EXISTS(propertyName)) is currently the only supported operator.",
+                false,
+                String.class, KIND.QUERY_STRING,
+                false); 
+
+    /**
+     * @param name - name used in the request
+     * @param title - a short description
+     * @param description - a long description
+     * @param required - is it mandatory?
+     * @param dataType - The expected data type of the parameter
+     * @param kind - The kind of parameter it is
+     * @param allowMultiple - Can allow multiple values?
+     */
+    private ResourceParameter(String name, String title, String description, boolean required,
+                Class<?> dataType, KIND kind, boolean allowMultiple)
+    {
+        super();
+        this.name = name;
+        this.title = title;
+        this.description = description;
+        this.required = required;
+        this.dataType = dataType;
+        this.kind = kind; 
+        if (KIND.URL_PATH.equals(kind)) allowMultiple = false;  //URL paths can never have multiple values
+        this.allowMultiple = allowMultiple;
+    }
+    
+    /**
+     * Creates a new ResourceParameter.
+     * @param name - name used in the request
+     * @param title - a short description
+     * @param description - a long description
+     * @param required - is it mandatory?
+     * @param kind - The kind of parameter it is
+     * @param allowMultiple - Can allow multiple values?
+     * @param dataType - The expected data type of the parameter
+     * @return ResourceParameter
+     */
+    protected static ResourceParameter valueOf(String name, String title, String description, boolean required, KIND kind, boolean allowMultiple, Class<?> dataType)
+    {
+        return new ResourceParameter(name,title, description, required, dataType, kind, allowMultiple);
+    }
+    
+    public String getName()
+    {
+        return this.name;
+    }
+
+    public boolean isRequired()
+    {
+        return this.required;
+    }
+
+    public String getTitle()
+    {
+        return this.title;
+    }
+
+    public String getDescription()
+    {
+        return this.description;
+    }
+
+    public Class<?> getDataType()
+    {
+        return this.dataType;
+    }
+
+    public boolean isAllowMultiple()
+    {
+        return this.allowMultiple;
+    }
+    
+    public KIND getParamType()
+    {
+        return this.kind;
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("ResourceParameter [name=");
+        builder.append(this.name);
+        builder.append(", required=");
+        builder.append(this.required);
+        builder.append(", title=");
+        builder.append(this.title);
+        builder.append(", description=");
+        builder.append(this.description);
+        builder.append(", dataType=");
+        builder.append(this.dataType);
+        builder.append(", kind=");
+        builder.append(this.kind);
+        builder.append(", allowMultiple=");
+        builder.append(this.allowMultiple);
+        builder.append("]");
+        return builder.toString();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceWithMetadata.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceWithMetadata.java
new file mode 100644
index 00000000000..13a2d942529
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/ResourceWithMetadata.java
@@ -0,0 +1,119 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * This wraps a resource object with its metadata.
+ * 
+ * A single source for both the information about the resource
+ * and the resource itself
+ *
+ * @author Gethin James
+ */
+public class ResourceWithMetadata
+{
+    private Object resource = null;
+    private ResourceMetadata metaData;
+
+    public ResourceWithMetadata(Object resource, ResourceMetadata metaData)
+    {
+        super();
+        this.resource = resource;
+        this.metaData = metaData;
+    }
+
+    /**
+     * Returns the REST resource object
+     * @return Object
+     */
+    @JsonIgnore
+    public Object getResource()
+    {
+        return this.resource;
+    }
+
+    /**
+     * Returns the meta data for this resource
+     * @return ResourceMetadata
+     */
+    public ResourceMetadata getMetaData()
+    {
+        return this.metaData;
+    }
+
+    /*
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("ResourceWithMetadata [metaData=");
+        builder.append(this.metaData);
+        builder.append(", resource=");
+        builder.append(this.resource);
+        builder.append("]");
+        return builder.toString();
+    }
+
+    /*
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((this.metaData == null) ? 0 : this.metaData.hashCode());
+        result = prime * result + ((this.resource == null) ? 0 : this.resource.hashCode());
+        return result;
+    }
+
+    /*
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj) return true;
+        if (obj == null) return false;
+        if (getClass() != obj.getClass()) return false;
+        ResourceWithMetadata other = (ResourceWithMetadata) obj;
+        if (this.metaData == null)
+        {
+            if (other.metaData != null) return false;
+        }
+        else if (!this.metaData.equals(other.metaData)) return false;
+        if (this.resource == null)
+        {
+            if (other.resource != null) return false;
+        }
+        else if (!this.resource.equals(other.resource)) return false;
+        return true;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ApiException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ApiException.java
new file mode 100644
index 00000000000..ade50b818cb
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ApiException.java
@@ -0,0 +1,100 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+import java.util.Map;
+
+import org.springframework.extensions.surf.exception.PlatformRuntimeException;
+
+/**
+ * Base exception for errors in the API framework.
+ * 
+ * In general, we don't want developers having to think about http status codes or rendering responses to the user.
+ * This exception hierarchy is designed to abstract the http logic away so the developer can concentrate on implementing
+ * services logic.  The framework will attempt to render errors in a consistent way.
+ * 
+ * Default status is STATUS_INTERNAL_SERVER_ERROR = 500.
+ *
+ * @author Gethin James
+ */
+public class ApiException extends PlatformRuntimeException
+{
+    private static final long serialVersionUID = 156335194944891591L;
+    
+    private Map<String,Object> additionalState;
+    private String msgId;
+    
+    public ApiException(String msgId)
+    {
+        super(msgId);
+        this.msgId = msgId;
+    }
+
+    public ApiException(String msgId, Object[] msgParams)
+    {
+        super(msgId, msgParams);
+        this.msgId = msgId;
+    }
+    
+    public ApiException(String msgId, Throwable cause)
+    {
+        super(msgId, cause);
+        this.msgId = msgId;
+    }
+    
+    public ApiException(String msgId, Throwable cause, Map<String,Object> additionalState)
+    {
+        super(msgId, cause);
+        this.msgId = msgId;
+        this.additionalState = additionalState;
+    }
+    
+    public ApiException(String msgId, Map<String,Object> additionalState)
+    {
+        super(msgId);
+        this.msgId = msgId;
+        this.additionalState = additionalState;
+    }
+
+    /**
+     * A free-form object that contains any additional state that the developer thinks might be relevant for troubleshooting.
+     * This object will be rendered as JSON.
+     */
+    public Map<String,Object> getAdditionalState()
+    {
+        return this.additionalState;
+    }
+
+    /**
+     * Returns the message id key.
+     * @return String messageId
+     */
+    public String getMsgId()
+    {
+        return this.msgId;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ConstraintViolatedException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ConstraintViolatedException.java
new file mode 100644
index 00000000000..e46a3a32118
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ConstraintViolatedException.java
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+
+/**
+ * A constraint was violated
+ *
+ * @author Gethin James
+ */
+public class ConstraintViolatedException extends ApiException
+{
+    
+    private static final long serialVersionUID = -6857652090677361159L;
+    
+    public static String DEFAULT_MESSAGE_ID = "framework.exception.ConstraintViolated";
+    
+    public ConstraintViolatedException()
+    {
+        super(DEFAULT_MESSAGE_ID);
+    }
+    
+    public ConstraintViolatedException(String msgId)
+    {
+        super(msgId);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/DefaultExceptionResolver.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/DefaultExceptionResolver.java
new file mode 100644
index 00000000000..9a7680dbaa6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/DefaultExceptionResolver.java
@@ -0,0 +1,47 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Default exception resolver for cases when no other exception resolver will do.
+ *
+ * @author Gethin James
+ */
+public class DefaultExceptionResolver implements ExceptionResolver<Exception>
+{
+    public static final String STACK_MESSAGE_ID = "framework.no.stacktrace";
+    public static final String ERROR_URL = "https://api-explorer.alfresco.com";
+    public static final String DEFAULT_MESSAGE_ID = "framework.exception.ApiDefault";
+    
+    @Override
+    public ErrorResponse resolveException(Exception ex)
+    {
+        return new ErrorResponse(DEFAULT_MESSAGE_ID, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex.getLocalizedMessage(), ex.getStackTrace(), null);
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/DeletedResourceException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/DeletedResourceException.java
new file mode 100644
index 00000000000..2f34ef84b5d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/DeletedResourceException.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+/**
+ * In this version of the API the specified resource has been deleted and is
+ * therefore not support
+ *
+ * @author Gethin James
+ */
+public class DeletedResourceException extends UnsupportedResourceOperationException
+{
+    private static final long serialVersionUID = -6475070011048033402L;
+    public static String DEFAULT_MESSAGE_ID = "framework.exception.DeletedResource";
+    
+    /**
+     * Creates the exception with the default message and the name of the resource
+     * @param resourceName String
+     */
+    public DeletedResourceException(String resourceName)
+    {
+        super(DEFAULT_MESSAGE_ID, new String[] {resourceName});
+    }
+
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/DisabledServiceException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/DisabledServiceException.java
new file mode 100644
index 00000000000..b69295f8387
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/DisabledServiceException.java
@@ -0,0 +1,48 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.core.exceptions;
+
+/**
+ * Thrown when the required service is disabled.
+ * Default status is <i>Not Implemented</i> server error = 501.
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class DisabledServiceException extends ApiException
+{
+    private static final long serialVersionUID = 1286704207931025507L;
+
+    public DisabledServiceException(String msgId)
+    {
+        super(msgId);
+    }
+
+    public DisabledServiceException(String msgId, Object[] msgParams)
+    {
+        super(msgId, msgParams);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/EntityNotFoundException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/EntityNotFoundException.java
new file mode 100644
index 00000000000..488ed3f4988
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/EntityNotFoundException.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+/**
+ * The addressed entity was not found
+ *
+ * @author Gethin James
+ */
+public class EntityNotFoundException extends NotFoundException
+{
+    private static final long serialVersionUID = -1198595000441207734L;
+    public static String DEFAULT_MESSAGE_ID = "framework.exception.EntityNotFound";
+    
+    /**
+     * The entity id param will be shown in the default error message.
+     * @param entityId String
+     */
+    public EntityNotFoundException(String entityId)
+    {
+        super(DEFAULT_MESSAGE_ID, new String[] {entityId});
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ErrorResponse.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ErrorResponse.java
new file mode 100644
index 00000000000..f643b453d9a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ErrorResponse.java
@@ -0,0 +1,121 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * A response object that can be represented to the client, based on the Alfresco API guidelines.
+ *
+ * @author Gethin James
+ */
+public class ErrorResponse
+{
+    private final String errorKey;
+    private final int statusCode;
+    private final String briefSummary;
+    private final String stackTrace;
+    private final Map<String,Object> additionalState;
+    private final String descriptionURL;
+    private final String logId;
+
+    public ErrorResponse(String errorKey, int statusCode, String briefSummary,
+                StackTraceElement[] stackTrace, Map<String,Object> additionalState)
+    {
+        super();
+        this.errorKey = errorKey;
+        this.statusCode = statusCode;
+        this.briefSummary = briefSummary;
+        this.stackTrace = Arrays.toString(stackTrace);
+        this.additionalState = additionalState==null?null:Collections.unmodifiableMap(additionalState);
+        this.descriptionURL = null;
+        this.logId = null;
+    }
+
+    public ErrorResponse(String errorKey, int statusCode, String briefSummary,
+                         String stackMessage, String logId, Map<String,Object> additionalState, String descriptionURL)
+    {
+        super();
+        this.errorKey = errorKey;
+        this.statusCode = statusCode;
+        this.briefSummary = briefSummary;
+        this.stackTrace = stackMessage;
+        this.logId = logId;
+        this.additionalState = additionalState==null?null:Collections.unmodifiableMap(additionalState);
+        this.descriptionURL = descriptionURL;
+    }
+
+    public String getErrorKey()
+    {
+        return this.errorKey;
+    }
+
+    public int getStatusCode()
+    {
+        return this.statusCode;
+    }
+
+    public String getBriefSummary()
+    {
+        return this.briefSummary;
+    }
+
+    public String getStackTrace()
+    {
+        return this.stackTrace;
+    }
+
+    public String getDescriptionURL()
+    {
+        return this.descriptionURL;
+    }
+
+    public Map<String, Object> getAdditionalState()
+    {
+        return this.additionalState;
+    }
+
+    public String getLogId() {
+        return logId;
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("ErrorResponse [errorKey=").append(this.errorKey).append(", statusCode=")
+               .append(this.statusCode).append(", briefSummary=").append(this.briefSummary)
+               .append(", descriptionURL=").append(this.descriptionURL)
+                .append(", logId=").append(this.logId)
+               .append(", stackTrace=").append(this.stackTrace).append(", additionalState=")
+               .append(this.additionalState).append("]");
+        return builder.toString();
+    }
+    
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ExceptionResolver.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ExceptionResolver.java
new file mode 100644
index 00000000000..066e84c4f1c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ExceptionResolver.java
@@ -0,0 +1,38 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+/**
+ * Loosely based on Spring's HandlerExceptionResolver
+ * 
+ * Resolves exception to the correct ErrorResponse
+ *
+ * @author Gethin James
+ */
+public interface ExceptionResolver<E extends Exception>
+{
+   ErrorResponse resolveException(E ex);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/InsufficientStorageException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/InsufficientStorageException.java
new file mode 100644
index 00000000000..247f5d8bd39
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/InsufficientStorageException.java
@@ -0,0 +1,52 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.core.exceptions;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class InsufficientStorageException extends ApiException
+{
+    private static final long serialVersionUID = 4188371184446611887L;
+
+    private static final String DEFAULT_MESSAGE_ID = "framework.exception.InsufficientStorage";
+
+    public InsufficientStorageException()
+    {
+        super(DEFAULT_MESSAGE_ID);
+    }
+
+    public InsufficientStorageException(String msgId)
+    {
+        super(msgId);
+    }
+
+    public InsufficientStorageException(String msgId, Object[] msgParams)
+    {
+        super(msgId, msgParams);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/InvalidArgumentException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/InvalidArgumentException.java
new file mode 100644
index 00000000000..07eacd064b9
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/InvalidArgumentException.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+/**
+ * An invalid argument was received
+ *
+ * @author Gethin James
+ */
+public class InvalidArgumentException extends ApiException
+{
+    private static final long serialVersionUID = -2132534145204191093L;
+    
+    public static String DEFAULT_MESSAGE_ID = "framework.exception.InvalidArgument";
+    public static String DEFAULT_INVALID_API = "framework.exception.InvalidApiArgument";
+    
+    public InvalidArgumentException()
+    {
+        super(DEFAULT_MESSAGE_ID);
+    }
+    
+    public InvalidArgumentException(String msgId)
+    {
+        super(msgId);
+    }
+
+    public InvalidArgumentException(String msgId, Object[] invalidObjects)
+    {
+        super(msgId, invalidObjects);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/NotFoundException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/NotFoundException.java
new file mode 100644
index 00000000000..62c0bcb26df
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/NotFoundException.java
@@ -0,0 +1,56 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+
+
+/**
+ * The addressed entity or function was not found
+ *
+ * @author Gethin James
+ */
+public class NotFoundException extends ApiException
+{
+    private static final long serialVersionUID = -4477985281644251575L;
+    
+    public static String DEFAULT_MESSAGE_ID = "framework.exception.NotFound";
+    
+    public NotFoundException()
+    {
+        super(DEFAULT_MESSAGE_ID);
+    }
+    
+    public NotFoundException(String msgId)
+    {
+        super(msgId);
+    }
+    
+    public NotFoundException(String msgId, String[] notFoundObjects)
+    {
+        super(msgId, notFoundObjects);
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/PermissionDeniedException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/PermissionDeniedException.java
new file mode 100644
index 00000000000..436d0dfbd84
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/PermissionDeniedException.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+/**
+ * Permission was denied
+ *
+ * @author Gethin James
+ */
+public class PermissionDeniedException extends ApiException
+{
+    private static final long serialVersionUID = 7263627408581826884L;
+    
+    public static String DEFAULT_MESSAGE_ID = "framework.exception.PermissionDenied";
+    
+    public PermissionDeniedException()
+    {
+        super(DEFAULT_MESSAGE_ID);
+    }
+        
+    public PermissionDeniedException(String msgId)
+    {
+        super(msgId);
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/RelationshipResourceNotFoundException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/RelationshipResourceNotFoundException.java
new file mode 100644
index 00000000000..d6d89f26a78
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/RelationshipResourceNotFoundException.java
@@ -0,0 +1,47 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+/**
+ * The addressed Relationship Resource was not found
+ *
+ * @author Gethin James
+ */
+public class RelationshipResourceNotFoundException extends NotFoundException
+{
+    private static final long serialVersionUID = 6780456990930538458L;
+    public static String DEFAULT_MESSAGE_ID = "framework.exception.RelationshipNotFound";
+    
+    /**
+     * The entity id param will be shown in the default error message.
+     * @param entityId String
+     * @param relationshipId String
+     */
+    public RelationshipResourceNotFoundException(String entityId, String relationshipId)
+    {
+        super(DEFAULT_MESSAGE_ID, new String[] {entityId, relationshipId});
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/RequestEntityTooLargeException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/RequestEntityTooLargeException.java
new file mode 100644
index 00000000000..30c2b8d2f20
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/RequestEntityTooLargeException.java
@@ -0,0 +1,47 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.core.exceptions;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class RequestEntityTooLargeException extends ApiException
+{
+    private static final long serialVersionUID = 3196212354672333823L;
+
+    public static String DEFAULT_MESSAGE_ID = "framework.exception.RequestEntityTooLarge";
+
+    public RequestEntityTooLargeException()
+    {
+        super(DEFAULT_MESSAGE_ID);
+    }
+
+    public RequestEntityTooLargeException(String msgId)
+    {
+        super(msgId);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ServiceUnavailableException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ServiceUnavailableException.java
new file mode 100644
index 00000000000..b83f4467491
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ServiceUnavailableException.java
@@ -0,0 +1,48 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+import java.io.Serializable;
+
+/**
+ * A service is currently unavailable.
+ */
+public class ServiceUnavailableException extends ApiException
+{
+    private static final long serialVersionUID = 7266627408681826999L;
+
+    public static String DEFAULT_MESSAGE_ID = "framework.exception.ServiceUnavailableException";
+
+    public ServiceUnavailableException()
+    {
+        super(DEFAULT_MESSAGE_ID);
+    }
+
+    public ServiceUnavailableException(String msgId)
+    {
+        super(msgId);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/SimpleMappingExceptionResolver.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/SimpleMappingExceptionResolver.java
new file mode 100644
index 00000000000..b0aaedde560
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/SimpleMappingExceptionResolver.java
@@ -0,0 +1,98 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+import java.util.Map;
+
+/**
+ * Exception Resolver that uses a simple Map to resolve the Status codes and error responses for exceptions
+ *
+ * @author Gethin James
+ */
+public class SimpleMappingExceptionResolver implements ExceptionResolver<Exception>
+{
+    private Map<String,Integer> exceptionMappings;
+    
+    @Override
+    public ErrorResponse resolveException(Exception ex)
+    {
+        ErrorResponse response = null;
+        
+        if (this.exceptionMappings != null) {
+            response = findMatchingException(this.exceptionMappings, ex);
+        }
+        return response;
+    }
+
+    private ErrorResponse findMatchingException(Map<String, Integer> exceptionMappings, Exception ex)
+    {
+        Integer statusCode = matchException(ex.getClass());
+        if (statusCode != null)
+        {
+            return makeErrorResponse(ex,statusCode);
+        }
+        else 
+        {
+            return null;            
+        }
+    }
+
+    /**
+     * Loop up the class hierarchy trying to match a class
+     * 
+     * @param ex Exceptions
+     * @return Integer Http status code
+     */
+    @SuppressWarnings("unchecked")
+    private Integer matchException(Class<? extends Exception> ex)
+    {
+        Integer statusCode = exceptionMappings.get(ex.getName());
+        if (statusCode == null && !(ex.isAssignableFrom(Exception.class)))
+        {
+            statusCode = matchException((Class<? extends Exception>) ex.getSuperclass());
+        }
+        return statusCode;
+    }
+
+    private ErrorResponse makeErrorResponse(Exception ex, Integer statusCode)
+    {
+        if (ex instanceof ApiException)
+        {
+            ApiException apEx = (ApiException) ex;
+            return new ErrorResponse(apEx.getMsgId(), statusCode, ex.getLocalizedMessage(), ex.getStackTrace(), apEx.getAdditionalState());
+        } 
+        else
+        {
+            return new ErrorResponse(DefaultExceptionResolver.DEFAULT_MESSAGE_ID, statusCode, ex.getLocalizedMessage(), ex.getStackTrace(), null); 
+        }
+    }
+
+    public void setExceptionMappings(Map<String, Integer> exceptionMappings)
+    {
+        this.exceptionMappings = exceptionMappings;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/StaleEntityException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/StaleEntityException.java
new file mode 100644
index 00000000000..269f9240db6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/StaleEntityException.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+
+/**
+ * Attempt to update a stale entity
+ *
+ * @author Gethin James
+ */
+public class StaleEntityException extends ApiException
+{
+    private static final long serialVersionUID = -3841266915415302734L;
+    
+    public static String DEFAULT_MESSAGE_ID = "framework.exception.StaleEntity";
+    
+    public StaleEntityException()
+    {
+        super(DEFAULT_MESSAGE_ID);
+    }
+    
+    public StaleEntityException(String msgId)
+    {
+        super(msgId);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/UnsupportedMediaTypeException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/UnsupportedMediaTypeException.java
new file mode 100644
index 00000000000..ed50a089260
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/UnsupportedMediaTypeException.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+/**
+ * The media type is unsupported.
+ *
+ * @author janv
+ */
+public class UnsupportedMediaTypeException extends ApiException
+{
+    public static String DEFAULT_MESSAGE_ID = "framework.exception.UnsupportedMediaType";
+
+    public UnsupportedMediaTypeException()
+    {
+        super(DEFAULT_MESSAGE_ID);
+    }
+
+    public UnsupportedMediaTypeException(String msgId)
+    {
+        super(msgId);
+    }
+
+    public UnsupportedMediaTypeException(String msgId, Object[] msgParams)
+    {
+        super(msgId, msgParams);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/UnsupportedResourceOperationException.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/UnsupportedResourceOperationException.java
new file mode 100644
index 00000000000..8fa7244b54d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/UnsupportedResourceOperationException.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+/**
+ * The operation is unsupported.
+ *
+ * @author Gethin James
+ */
+public class UnsupportedResourceOperationException extends ApiException
+{
+    
+    private static final long serialVersionUID = 4311271791719791823L;
+    
+    public static String DEFAULT_MESSAGE_ID = "framework.exception.UnsupportedResourceOperation";
+    
+    public UnsupportedResourceOperationException()
+    {
+        super(DEFAULT_MESSAGE_ID);
+    }
+    
+    public UnsupportedResourceOperationException(String msgId)
+    {
+        super(msgId);
+    }
+
+    public UnsupportedResourceOperationException(String msgId, Object[] msgParams)
+    {
+        super(msgId, msgParams);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/WebScriptExceptionResolver.java b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/WebScriptExceptionResolver.java
new file mode 100644
index 00000000000..8243442acc6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/WebScriptExceptionResolver.java
@@ -0,0 +1,43 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.core.exceptions;
+
+import org.springframework.extensions.webscripts.WebScriptException;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Resolves WebScriptExceptions
+ *
+ * @author Gethin James
+ */
+public class WebScriptExceptionResolver implements ExceptionResolver<WebScriptException> {
+
+    @Override
+    public ErrorResponse resolveException(WebScriptException ex) {
+        return new ErrorResponse(DefaultExceptionResolver.DEFAULT_MESSAGE_ID, ex.getStatus(), ex.getLocalizedMessage(), ex.getStackTrace(), null);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/BeanPropertiesFilter.java b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/BeanPropertiesFilter.java
new file mode 100644
index 00000000000..71aea29d275
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/BeanPropertiesFilter.java
@@ -0,0 +1,93 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.jacksonextensions;
+
+import java.util.Set;
+
+/**
+ * Basic bean filtering.
+ * 
+ * It's based on Jackson's BeanPropertyFilter but uses slightly different method signatures
+ *
+ * @author Gethin James
+ */
+public class BeanPropertiesFilter
+{
+    private final Set<String> filteredProperties;
+    public static final BeanPropertiesFilter ALLOW_ALL = new AllProperties();
+    
+    public BeanPropertiesFilter(Set<String> properties) {
+        filteredProperties = properties;
+ //       properties.add("id"); //always need id
+    }
+    
+    /**
+     * Indicates if the given property name is permitted to be used ie. is not filtered out
+     * @param propertyName - bean property name
+     * @return true - if the property is allowed to be used.
+     */
+    public boolean isAllowed(String propertyName)
+    {
+      return filteredProperties.contains(propertyName);  
+    }
+    
+    /*
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("BeanPropertiesFilter [filteredProperties=").append(this.filteredProperties).append("]");
+        return builder.toString();
+    }
+    
+    /**
+     * Default All properties filter
+     *
+     * @author Gethin James
+     */
+    public static class AllProperties extends BeanPropertiesFilter
+    {
+
+        public AllProperties()
+        {
+            super(null);
+        }
+
+        /*
+         * @see org.alfresco.rest.framework.jacksonextensions.BeanPropertiesFilter#isAllowed(java.lang.String)
+         */
+        @Override
+        public boolean isAllowed(String propertyName)
+        {
+            return true;
+        }
+        
+        
+    }
+                
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/ExecutionResult.java b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/ExecutionResult.java
new file mode 100644
index 00000000000..d8c283c9936
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/ExecutionResult.java
@@ -0,0 +1,144 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.jacksonextensions;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Represents the result of 1 or more executions.  This object will be rendered as JSON
+ *
+ * @author Gethin James
+ */
+public class ExecutionResult
+{
+    private final Object root;
+    private boolean anEmbeddedEntity;
+    private final Map<String,Object> embedded = new HashMap<String,Object>();
+    private final Map<String,Object> related = new HashMap<String,Object>();
+    private final BeanPropertiesFilter filter;
+    
+    public ExecutionResult(Object root,BeanPropertiesFilter filter)
+    {
+        super();
+        this.root = root;
+        this.filter = filter;
+        this.anEmbeddedEntity = false;
+    }
+
+    /**
+     * @return the filter
+     */
+    public BeanPropertiesFilter getFilter()
+    {
+        return this.filter;
+    }
+    
+    public Object getRoot()
+    {
+        return this.root;
+    }
+    
+    /**
+     * Adds embeddeds object to the enclosing root object
+     * @param embedded objects to add
+     */
+    public void addEmbedded(Map<String,Object> embedded)
+    {
+        this.embedded.putAll(embedded);
+    }
+    
+    /**
+     * Adds related object to the enclosing root object
+     * @param related objects to add
+     */
+    public void addRelated(Map<String,Object> related)
+    {
+        this.related.putAll(related);
+    }
+
+    /**
+     * Is this object and embedded entity
+     * 
+     * @return boolean - true if it is embedded, defaults to false
+     */
+    public boolean isAnEmbeddedEntity()
+    {
+        return this.anEmbeddedEntity;
+    }
+    
+    /**
+     * Is this object and embedded entity
+     * 
+     * @param anEmbeddedEntity - true if it is embedded, defaults to false
+     */   
+    public void setAnEmbeddedEntity(boolean anEmbeddedEntity)
+    {
+        this.anEmbeddedEntity = anEmbeddedEntity;
+    }
+
+    
+    /**
+     * Returns the Map of related objects
+     * 
+     * @return Map
+     */
+    public Map<String, Object> getRelated()
+    {
+        return this.related;
+    }
+
+    /**
+     * Returns the Map of embedded objects
+     * 
+     * @return Map
+     */
+    public Map<String, Object> getEmbedded()
+    {
+        return this.embedded;
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("ExecutionResult [root=");
+        builder.append(this.root);
+        builder.append(", anEmbeddedEntity=");
+        builder.append(this.anEmbeddedEntity);
+        builder.append(", embedded=");
+        builder.append(this.embedded);
+        builder.append(", related=");
+        builder.append(this.related);
+        builder.append(", filter=");
+        builder.append(this.filter);
+        builder.append("]");
+        return builder.toString();
+    }
+
+ 
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/JacksonHelper.java b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/JacksonHelper.java
new file mode 100644
index 00000000000..15f471e77ea
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/JacksonHelper.java
@@ -0,0 +1,174 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.jacksonextensions;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.Module;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
+import com.fasterxml.jackson.databind.type.TypeFactory;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.TimeZone;
+
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * Helper Class for outputting Jackson content, makes use of the RestJsonModule (main Jackson config).
+ * Default settings : Date format is ISO8601, only serializes non-empty / non-null values.
+ *
+ * @author Gethin James
+ */
+public class JacksonHelper implements InitializingBean
+{
+    private static Log logger = LogFactory.getLog(JacksonHelper.class);  
+    
+    private Module module;
+    private ObjectMapper objectMapper = null;
+    private JsonEncoding encoding = JsonEncoding.UTF8;
+    public static final String DEFAULT_FILTER_NAME = "defaultFilterName";
+    
+
+    /**
+     * Sets the Jackson Module to be used.
+     * 
+     * @param module Module
+     */
+    public void setModule(Module module)
+    {
+        this.module = module;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        //Configure the objectMapper ready for use
+        objectMapper = new ObjectMapper();
+        objectMapper.registerModule(module);
+        objectMapper.setDefaultPropertyInclusion(JsonInclude.Include.NON_EMPTY);
+        objectMapper.configOverride(java.util.Map.class)
+                        .setInclude(JsonInclude.Value.construct(JsonInclude.Include.NON_EMPTY, null));
+        objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+        DateFormat DATE_FORMAT_ISO8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+        DATE_FORMAT_ISO8601.setTimeZone(TimeZone.getTimeZone("UTC"));
+        objectMapper.setDateFormat(DATE_FORMAT_ISO8601);
+        objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+    }
+    
+    /**
+     * A callback so a JsonGenerator can be used inline but exception are handled here
+     * @param outStream OutputStream
+     * @param writer The writer interface
+     * @throws IOException
+     */
+    public void withWriter(OutputStream outStream, Writer writer) throws IOException
+    {
+        try
+        {
+            JsonGenerator generator = objectMapper.getFactory().createGenerator(outStream, encoding);
+            writer.writeContents(generator, objectMapper);
+        }
+        catch (JsonMappingException error)
+        {
+            logger.error("Failed to write Json output", error);
+        } 
+        catch (JsonGenerationException generror)
+        {
+            logger.error("Failed to write Json output", generror);
+        }
+    }
+       
+    /**
+     * Constructs the object based on the content.
+     * @param content Reader
+     * @return T
+     */
+    public <T> T construct(Reader content, Class<T> requiredType)
+    {
+        ObjectReader reader = objectMapper.readerFor(requiredType);
+        try
+        {
+            return reader.readValue(content);
+        }
+        catch (IOException error)
+        {
+            throw new InvalidArgumentException("Could not read content from HTTP request body: "+error.getMessage());
+        }
+    }
+    
+    /**
+     * Constructs the object based on the content as a List, the JSON can be an array or just a single value without the [] symbols
+     * @param content Reader
+     * @return A collection of the specified type
+     */
+    public <T> List<T> constructList(Reader content, Class<T> requiredType)
+    {
+        ObjectReader reader = objectMapper.readerFor(TypeFactory.defaultInstance().constructParametricType(List.class, requiredType));
+        try
+        {
+            List<T> toReturn = reader.readValue(content);
+            if (toReturn == null || toReturn.isEmpty())
+            {
+              throw new InvalidArgumentException("Could not read content from HTTP request body, the list is empty");
+            }
+            return toReturn;
+        }
+        catch (IOException error)
+        {
+            throw new InvalidArgumentException("Could not read content from HTTP request body: "+error.getMessage());
+        }
+    }
+    
+    /**
+     * A callback interface for use with the withWriter() method
+     */
+    public static interface Writer
+    {
+        public void writeContents(JsonGenerator generator, ObjectMapper objectMapper) throws JsonGenerationException, JsonMappingException, IOException;
+    }
+
+    /*
+     * Always returns all properties
+     */
+    public static class ReturnAllBeanProperties extends SimpleBeanPropertyFilter
+    {
+
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/NodeRefDeserializer.java b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/NodeRefDeserializer.java
new file mode 100644
index 00000000000..34ac5a31444
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/NodeRefDeserializer.java
@@ -0,0 +1,73 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.jacksonextensions;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+
+public class NodeRefDeserializer extends JsonDeserializer<NodeRef>
+{
+	private NodeRef getNodeRef(String nodeRefString)
+	{
+		NodeRef nodeRef = null;
+
+        if(!NodeRef.isNodeRef(nodeRefString))
+        {
+        	nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeRefString);
+        }
+        else
+        {
+        	nodeRef = new NodeRef(nodeRefString);
+        }
+
+		return nodeRef;
+	}
+
+	@Override
+	public NodeRef deserialize(JsonParser jp, DeserializationContext ctxt)
+			throws IOException, JsonProcessingException
+	{
+        JsonToken curr = jp.getCurrentToken();
+
+        if (curr == JsonToken.VALUE_STRING)
+        {
+            String nodeRefString = jp.getText();
+            NodeRef nodeRef = getNodeRef(nodeRefString);
+            return nodeRef;
+        }
+        else
+        {
+        	throw new IOException("Unable to deserialize nodeRef: " + curr.asString());
+        }
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/NodeRefSerializer.java b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/NodeRefSerializer.java
new file mode 100644
index 00000000000..2465ec37104
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/NodeRefSerializer.java
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.jacksonextensions;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+public class NodeRefSerializer extends StdSerializer<NodeRef>
+{
+    protected NodeRefSerializer()
+    {
+        super(NodeRef.class);
+    }
+
+    @Override
+    public void serialize(NodeRef nodeRef, JsonGenerator jgen, SerializerProvider provider)
+                throws IOException, JsonGenerationException
+    {
+    	jgen.writeString(nodeRef.getId());
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/RestApiStringDeserializer.java b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/RestApiStringDeserializer.java
new file mode 100644
index 00000000000..c81ebd03bfd
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/RestApiStringDeserializer.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.jacksonextensions;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StringDeserializer;
+import java.io.IOException;
+
+/**
+ * Rest Api string deserializer that ensures that empty strings are treated as null strings.
+ *
+ * @author steveglover
+ * @author amukha
+ */
+public class RestApiStringDeserializer extends StringDeserializer
+{
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOException
+    {
+        String ret = super.deserialize(p, ctxt);
+        // Return null for empty string
+        if(ret != null && ret.length() == 0)
+        {
+            ret = null;
+        }
+        return ret;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/RestJsonModule.java b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/RestJsonModule.java
new file mode 100644
index 00000000000..19c55f6daa2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/RestJsonModule.java
@@ -0,0 +1,106 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.jacksonextensions;
+
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * This is the main Jackson configuration, it configures the Rest Json settings.
+ * It is possible to add custom serializers and deserializers using
+ * the Spring bean config.
+ *
+ * @author Gethin James
+ */
+public class RestJsonModule extends SimpleModule implements InitializingBean
+{
+    private static Log logger = LogFactory.getLog(RestJsonModule.class);  
+    private final static String NAME = "AlfrescoRestJsonModule";
+     
+    @SuppressWarnings("rawtypes")
+    private List<JsonSerializer> jsonSerializers;
+    @SuppressWarnings("rawtypes")
+    private Map<String,JsonDeserializer> jsonDeserializers;
+    
+    public RestJsonModule()
+    {
+        super(NAME, new Version(1, 0, 0, null));
+    }
+    
+    @Override
+    public void setupModule(SetupContext context)
+    {
+        super.setupModule(context);
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @Override
+    public void afterPropertiesSet() throws Exception
+    {
+        if (jsonSerializers != null) 
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Setting up Json Module serializers");
+            }
+            for (JsonSerializer aSerializer : jsonSerializers)
+            {
+                addSerializer(aSerializer);
+            }
+        }
+        if (jsonDeserializers != null) 
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Setting up Json Module deserializers");
+            }
+            for (Entry<String, JsonDeserializer> aDeserializer : jsonDeserializers.entrySet())
+            {
+                Class theDeserializer = Class.forName(aDeserializer.getKey());
+                addDeserializer(theDeserializer, aDeserializer.getValue());
+            }
+        }
+    }
+
+    public void setJsonSerializers(@SuppressWarnings("rawtypes") List<JsonSerializer> jsonSerializers)
+    {
+        this.jsonSerializers = jsonSerializers;
+    }
+
+    public void setJsonDeserializers(@SuppressWarnings("rawtypes") Map<String, JsonDeserializer> jsonDeserializers)
+    {
+        this.jsonDeserializers = jsonDeserializers;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/SerializerOfCollectionWithPaging.java b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/SerializerOfCollectionWithPaging.java
new file mode 100644
index 00000000000..eea0793eceb
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/SerializerOfCollectionWithPaging.java
@@ -0,0 +1,107 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.jacksonextensions;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.alfresco.rest.framework.resource.SerializablePagedCollection;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+
+/**
+ * Serializes SerializablePagedCollection into the correct response format, with Paging information and entries
+ * 
+ * @author Gethin James
+ */
+@SuppressWarnings("rawtypes")
+public class SerializerOfCollectionWithPaging extends StdSerializer<SerializablePagedCollection>
+{
+
+    protected SerializerOfCollectionWithPaging()
+    {
+        super(SerializablePagedCollection.class);
+    }
+    
+    @Override
+    public void serialize(SerializablePagedCollection pagedCol, JsonGenerator jgen, SerializerProvider provider)
+                throws IOException, JsonGenerationException
+    {
+        if (pagedCol != null)
+        {
+            jgen.writeStartObject();
+            jgen.writeFieldName("list");
+                jgen.writeStartObject();
+                serializePagination(pagedCol, jgen);
+                serializeContext(pagedCol, jgen);
+                jgen.writeObjectField("entries", pagedCol.getCollection());
+                serializeIncludedSource(pagedCol, jgen);
+                jgen.writeEndObject(); 
+            jgen.writeEndObject();  
+        }
+    }
+
+    private void serializeIncludedSource(SerializablePagedCollection pagedCol, JsonGenerator jgen) throws IOException,
+            JsonProcessingException
+    {
+        if (pagedCol.getSourceEntity() != null)
+        {
+            jgen.writeObjectField("source",pagedCol.getSourceEntity());
+        }
+    }
+
+    private void serializeContext(SerializablePagedCollection pagedCol, JsonGenerator jgen) throws IOException,
+                JsonProcessingException
+    {
+        if (pagedCol.getContext() != null)
+        {
+            jgen.writeObjectField("context",pagedCol.getContext());
+        }
+    }
+
+    private void serializePagination(SerializablePagedCollection pagedCol, JsonGenerator jgen) throws IOException,
+    JsonProcessingException
+    {
+        jgen.writeFieldName("pagination");
+        jgen.writeStartObject();
+        jgen.writeNumberField("count", pagedCol.getCollection().size());
+        jgen.writeBooleanField("hasMoreItems", pagedCol.hasMoreItems());
+        Integer totalItems = pagedCol.getTotalItems();
+        if(totalItems != null)
+        {
+        	jgen.writeNumberField("totalItems", totalItems);
+        }
+        if (pagedCol.getPaging() != null)
+        {
+            jgen.writeNumberField(RecognizedParamsExtractor.PARAM_PAGING_SKIP, pagedCol.getPaging().getSkipCount());
+            jgen.writeNumberField(RecognizedParamsExtractor.PARAM_PAGING_MAX, pagedCol.getPaging().getMaxItems());
+        }
+        jgen.writeEndObject();
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/SerializerOfExecutionResult.java b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/SerializerOfExecutionResult.java
new file mode 100644
index 00000000000..7814289ea62
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/SerializerOfExecutionResult.java
@@ -0,0 +1,139 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.jacksonextensions;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.BeanDescription;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.SerializationConfig;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.alfresco.rest.framework.core.ResourceInspectorUtil;
+
+/**
+ * Serializes ExecutionResult into the correct response format
+ * 
+ * @author Gethin James
+ */
+public class SerializerOfExecutionResult extends StdSerializer<ExecutionResult>
+{
+
+    protected SerializerOfExecutionResult()
+    {
+        super(ExecutionResult.class);
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @Override
+    public void serialize(ExecutionResult value, JsonGenerator jgen, SerializerProvider provider)
+                throws IOException, JsonGenerationException
+    {
+        
+        SerializationConfig config = provider.getConfig();
+        Object rootObj = value.getRoot();
+        if (rootObj == null)
+        {
+            provider.getDefaultNullValueSerializer().serialize(null, jgen, provider);
+        }
+        else
+        {
+            Class<?> cls = rootObj.getClass();
+            Map toBeSerialized = new HashMap(); //create an untyped map, add the contents of the root + the embeds.
+            BeanPropertiesFilter filter = value.getFilter();
+            if (filter == null) filter = BeanPropertiesFilter.ALLOW_ALL;
+            
+            if (Map.class.isAssignableFrom(cls))
+            {
+                // Its a map so 
+                Map rootAsaMap = (Map) rootObj;
+                toBeSerialized.putAll(rootAsaMap);
+            }
+            else
+            {
+                JavaType classType = config.constructType(cls);
+                BeanDescription beanDesc = provider.getConfig().introspect(classType);
+                List<BeanPropertyDefinition> props = beanDesc.findProperties();
+                for (BeanPropertyDefinition beanProperty : props)
+                {
+                    if (beanProperty.couldSerialize() && filter.isAllowed(beanProperty.getName()))
+                    {
+                        Object propertyValue = ResourceInspectorUtil.invokeMethod(beanProperty.getGetter().getAnnotated(), rootObj);
+                        if (propertyValue != null)
+                        {
+                            if((propertyValue instanceof String))
+                            {
+                            	if(((String)propertyValue).trim().length() > 0)
+                            	{
+                            		toBeSerialized.put(beanProperty.getName(), propertyValue);
+                            	}
+                            }
+                            else
+                            {
+                            	toBeSerialized.put(beanProperty.getName(), propertyValue);
+                            }
+                        }
+                    }
+                }
+            }
+            
+            //Add embedded
+            for (Entry<String, Object> embedded : value.getEmbedded().entrySet())
+            {
+                if (filter == null || filter.isAllowed(embedded.getKey()))
+                {
+                  toBeSerialized.put(embedded.getKey(),embedded.getValue());
+                }
+            }
+
+            //if its an embedded entity then render the properties (not as an "entry:")
+            if (value.isAnEmbeddedEntity())
+            {
+                jgen.writeObject(toBeSerialized);
+            }
+            else
+            {
+                jgen.writeStartObject();
+                jgen.writeObjectField("entry", toBeSerialized);
+                if (value.getRelated() != null && !value.getRelated().isEmpty())
+                {
+                  jgen.writeObjectField("relations", value.getRelated());
+                }
+                jgen.writeEndObject();
+            }
+
+        }
+
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/TargetDeserializer.java b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/TargetDeserializer.java
new file mode 100644
index 00000000000..3b3f5f3e520
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/jacksonextensions/TargetDeserializer.java
@@ -0,0 +1,123 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.jacksonextensions;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.PropertyName;
+import com.fasterxml.jackson.databind.type.SimpleType;
+import java.io.IOException;
+
+import org.alfresco.rest.api.model.Document;
+import org.alfresco.rest.api.model.DocumentTarget;
+import org.alfresco.rest.api.model.Folder;
+import org.alfresco.rest.api.model.FolderTarget;
+import org.alfresco.rest.api.model.Site;
+import org.alfresco.rest.api.model.SiteTarget;
+import org.alfresco.rest.api.model.Target;
+import org.alfresco.service.cmr.favourites.FavouritesService.Type;
+
+public class TargetDeserializer extends JsonDeserializer<Target>
+{
+	@Override
+	public Target deserialize(JsonParser jp, DeserializationContext ctxt)
+			throws IOException, JsonProcessingException
+	{
+		Target target = null;
+        JsonToken curr = jp.getCurrentToken();
+        
+        if (curr == JsonToken.START_OBJECT)
+        {
+            while(jp.nextToken() != JsonToken.END_OBJECT)
+            {
+        		String fieldname = jp.getCurrentName();
+        		if(Type.SITE.toString().equals(fieldname.toUpperCase()))
+        		{
+        			jp.nextToken();
+        			try
+        			{
+        		        JavaType t = SimpleType.construct(Site.class);
+        		        BeanProperty p = new BeanProperty.Std(new PropertyName(""), t, null, null, null, null);
+        		        JsonDeserializer<?> siteDeserializer = ctxt.findContextualValueDeserializer(t, p);
+
+        				Site site = (Site)siteDeserializer.deserialize(jp, ctxt);
+                    	target = new SiteTarget(site);
+        			}
+        			catch(JsonMappingException e)
+        			{
+        				throw new IllegalArgumentException("Target body is invalid for target type");
+        			}
+        		}
+        		else if(Type.FILE.toString().equals(fieldname.toUpperCase()))
+        		{
+        			jp.nextToken();
+        			try
+        			{
+        				JavaType t = SimpleType.construct(Document.class);
+                        BeanProperty p = new BeanProperty.Std(new PropertyName(""), t, null, null, null, null);
+                        JsonDeserializer<?> documentDeserializer = ctxt.findContextualValueDeserializer(t, p);
+
+	        			Document document = (Document)documentDeserializer.deserialize(jp, ctxt);
+	                	target = new DocumentTarget(document);
+        			}
+        			catch(JsonMappingException e)
+        			{
+        				throw new IllegalArgumentException("Target body is invalid for target type");
+        			}
+        		}
+        		else if(Type.FOLDER.toString().equals(fieldname.toUpperCase()))
+        		{
+        			jp.nextToken();
+        			try
+        			{
+        				JavaType t = SimpleType.construct(Folder.class);
+                        BeanProperty p = new BeanProperty.Std(new PropertyName(""), t, null, null, null, null);
+                        JsonDeserializer<?> folderDeserializer = ctxt.findContextualValueDeserializer(t, p);
+
+	        			Folder folder = (Folder)folderDeserializer.deserialize(jp, ctxt);
+	        			target = new FolderTarget(folder);
+        			}
+        			catch(JsonMappingException e)
+        			{
+        				throw new IllegalArgumentException("Target body is invalid for target type");
+        			}
+        		}
+            }
+
+        	return target;
+        }
+        else
+        {
+        	throw new IOException("Unable to deserialize favourite: " + curr.asString());
+        }
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/metadata/ResourceMetaDataWriter.java b/remote-api/src/main/java/org/alfresco/rest/framework/metadata/ResourceMetaDataWriter.java
new file mode 100644
index 00000000000..cdf80fe265a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/metadata/ResourceMetaDataWriter.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.metadata;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Map;
+
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+
+/**
+ * Writes out the metadata for resources in the required format.  The resources will already be selected based on api version
+ *
+ * @author Gethin James
+ */
+public interface ResourceMetaDataWriter
+{
+    /**
+     * Write the metadata to the OutputStream
+     * @param out OutputStream
+     * @param resource - the selected resource
+     * @param allApiResources - all resources for the API version
+     * @throws IOException
+     */
+    public void writeMetaData(OutputStream out, ResourceWithMetadata resource, Map<String, ResourceWithMetadata> allApiResources) throws IOException;
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/EmbeddedEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/EmbeddedEntityResource.java
new file mode 100644
index 00000000000..abb9e183a58
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/EmbeddedEntityResource.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates a method and indicates it is the unique id of a embedded object.
+ * 
+ * The method must have zero arguments.  It will be executed and the enclosing class will have
+ * the result of a call to the entity resource embedded in it.
+ *
+ * @author Gethin James
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface EmbeddedEntityResource
+{
+    String propertyName();
+    Class<?> entityResource();
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/EntityResource.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/EntityResource.java
new file mode 100644
index 00000000000..b4d6ad9171b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/EntityResource.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * Respresents an entity resource
+ *
+ * @author Gethin James
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Component
+public @interface EntityResource
+{
+    String name();
+    String title();
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/RelationshipResource.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/RelationshipResource.java
new file mode 100644
index 00000000000..800f0ad75ae
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/RelationshipResource.java
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * Represents a relationship to an entity resource
+ *
+ * @author Gethin James
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Component
+public @interface RelationshipResource
+{
+    String name();
+    String title();
+    Class<?> entityResource();
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/SerializablePagedCollection.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/SerializablePagedCollection.java
new file mode 100644
index 00000000000..968b9c6172b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/SerializablePagedCollection.java
@@ -0,0 +1,74 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.resource;
+
+import org.alfresco.rest.api.search.context.SearchContext;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+
+import java.util.Collection;
+
+/**
+ * A specialist representation of a Collection that can be serialized to json with paging information
+ *
+ * @author Gethin James.
+ */
+public interface SerializablePagedCollection<T>
+{
+    /**
+     * Returns the Collection object
+     * @return Collection
+     */
+    Collection<T> getCollection();
+
+    /**
+     * Indicates if the returned collection has more items after the current returned list.
+     */
+    boolean hasMoreItems();
+
+    /**
+     * Indicates the total number of items available.
+     *
+     * Can be greater than the number of items returned in the list.
+     *
+     */
+    Integer getTotalItems();
+
+    /**
+     * The parent/source entity responsible for the collection
+     */
+    Object getSourceEntity();
+
+    /**
+     * The requested paging parameters set by the client
+     */
+    Paging getPaging();
+
+    /**
+     * The search context for the collection
+     */
+    SearchContext getContext();
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/UniqueId.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/UniqueId.java
new file mode 100644
index 00000000000..42a02eeb07c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/UniqueId.java
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates a method (to be invoked) that returns the unique id of the object.
+ * 
+ * The method must have zero arguments.
+ * 
+ * The "name" argument allows you to specify an alternative name for this "id" property.  The preferred/default value is "id"
+ *
+ * @author Gethin James
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface UniqueId
+{
+    String UNIQUE_NAME = "id";
+    String name() default UNIQUE_NAME;
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/ActionExecutor.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/ActionExecutor.java
new file mode 100644
index 00000000000..dd036d58d98
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/ActionExecutor.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.actions;
+
+import org.alfresco.rest.framework.core.HttpMethodSupport;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+
+/**
+ * Executes an action in the system
+ *
+ * @author Gethin James
+ */
+public interface ActionExecutor extends HttpMethodSupport
+{
+
+    /**
+     * Invokes the resource with the Params
+     * @param resource ResourceWithMetadata
+     * @param params Params
+     */
+    @SuppressWarnings("rawtypes")
+    public Object executeAction(ResourceWithMetadata resource, Params params, WithResponse withResponse) throws Throwable;
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/BinaryResourceAction.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/BinaryResourceAction.java
new file mode 100755
index 00000000000..4b73d78f4ee
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/BinaryResourceAction.java
@@ -0,0 +1,144 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.actions.interfaces;
+
+import java.io.InputStream;
+
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.content.FileBinaryResource;
+import org.alfresco.rest.framework.resource.content.NodeBinaryResource;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+
+/**
+ * Permissible actions for binary resources of an Entity Resource
+ * 
+ * Supports full CRUD (Read, Update, Delete)
+ *
+ * @author Gethin James
+ */
+
+public interface BinaryResourceAction
+{
+
+    /**
+     * HTTP GET - Retrieve a binary resource
+     */
+    public static interface Read extends ResourceAction
+    {
+        /**
+         * Retrieves a binary property by returning a BinaryResource object.  The specific property is specified in the {@link Parameters} object.
+         * See {@link Parameters#hasBinaryProperty(String)} or {@link Parameters#getBinaryProperty()}
+         * @param entityId unique id
+         * @param parameters {@link Parameters}
+         * @return BinaryResource  - Either {@link FileBinaryResource} or {@link NodeBinaryResource}
+         * @throws EntityNotFoundException
+         */
+        public BinaryResource readProperty (String entityId,  Parameters parameters) throws EntityNotFoundException;
+    }
+
+    /**
+     * HTTP GET - Retrieve a binary resource
+     */
+    public static interface ReadWithResponse extends ResourceAction
+    {
+        /**
+         * Retrieves a binary property by returning a BinaryResource object.  The specific property is specified in the {@link Parameters} object.
+         * See {@link Parameters#hasBinaryProperty(String)} or {@link Parameters#getBinaryProperty()}
+         * @param entityId unique id
+         * @param parameters {@link Parameters}
+         * @return BinaryResource  - Either {@link FileBinaryResource} or {@link NodeBinaryResource}
+         * @throws EntityNotFoundException
+         */
+        public BinaryResource readProperty (String entityId,  Parameters parameters, WithResponse withResponse) throws EntityNotFoundException;
+    }
+
+    /**
+     * HTTP DELETE - Deletes a binary resource
+     */
+    public static interface Delete extends ResourceAction
+    {
+        
+        /**
+         * Deletes a binary property.  The specific property is specified in the {@link Parameters} object.
+         * See {@link Parameters#hasBinaryProperty(String)} or {@link Parameters#getBinaryProperty()}
+         * @param entityId unique id
+         * @param parameters {@link Parameters}
+         */
+        public void deleteProperty (String entityId, Parameters parameters);
+    }
+
+    /**
+     * HTTP DELETE - Deletes a binary resource
+     */
+    public static interface DeleteWithResponse extends ResourceAction
+    {
+
+        /**
+         * Deletes a binary property.  The specific property is specified in the {@link Parameters} object.
+         * See {@link Parameters#hasBinaryProperty(String)} or {@link Parameters#getBinaryProperty()}
+         * @param entityId unique id
+         * @param parameters {@link Parameters}
+         */
+        public void deleteProperty (String entityId, Parameters parameters, WithResponse withResponse);
+    }
+
+    /**
+     * HTTP PUT - Updates a binary resource if it exists, error if not
+     */
+    public static interface Update<E> extends ResourceAction
+    {
+
+        /**
+         * Updates a binary property.  The specific property is specified in the {@link Parameters} object.
+         * See {@link Parameters#hasBinaryProperty(String)} or {@link Parameters#getBinaryProperty()}
+         * @param entityId unique id
+         * @param stream An inputstream
+         * @param contentInfo Basic information about the content stream
+         * @param params {@link Parameters}
+         */
+        public E updateProperty (String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params);
+    }
+
+    /**
+     * HTTP PUT - Updates a binary resource if it exists, error if not
+     */
+    public static interface UpdateWithResponse<E> extends ResourceAction
+    {
+
+        /**
+         * Updates a binary property.  The specific property is specified in the {@link Parameters} object.
+         * See {@link Parameters#hasBinaryProperty(String)} or {@link Parameters#getBinaryProperty()}
+         * @param entityId unique id
+         * @param stream An inputstream
+         * @param contentInfo Basic information about the content stream
+         * @param params {@link Parameters}
+         */
+        public E updateProperty (String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params, WithResponse withResponse);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/EntityResourceAction.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/EntityResourceAction.java
new file mode 100644
index 00000000000..029b2b75e37
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/EntityResourceAction.java
@@ -0,0 +1,164 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.actions.interfaces;
+
+import java.util.List;
+
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+
+/**
+ * Permissible actions for an Entity Resource
+ * 
+ * Supports full CRUD (Create, Read, Update, Delete) and ReadAll
+ *
+ * @author Gethin James
+ */
+
+public interface EntityResourceAction
+{
+    /**
+     * HTTP POST - Create a new entity
+     */
+    public static interface Create<E> extends ResourceAction
+    {
+        public List<E> create (List<E> entity,  Parameters parameters);
+    }
+
+    /**
+     * HTTP POST - Create a new entity
+     */
+    public static interface CreateWithResponse<E> extends ResourceAction
+    {
+        public List<E> create (List<E> entity,  Parameters parameters, WithResponse withResponse);
+    }
+
+    /**
+     * HTTP GET - Retrieve list of entities
+     */
+    public static interface Read<E> extends ResourceAction
+    {
+        
+        /**
+         * Reads all the entries from the collection.
+         * 
+         * Paging information is provided.
+         * @param params - will never be null and will have the PAGING default values
+         */
+        public CollectionWithPagingInfo<E> readAll (Parameters params);
+    }
+
+    /**
+     * HTTP GET - Retrieve list of entities
+     */
+    public static interface ReadWithResponse<E> extends ResourceAction
+    {
+
+        /**
+         * Reads all the entries from the collection.
+         *
+         * Paging information is provided.
+         * @param params - will never be null and will have the PAGING default values
+         */
+        public CollectionWithPagingInfo<E> readAll (Parameters params, WithResponse withResponse);
+    }
+
+    /**
+     * HTTP GET - Retrieve an entity by its unique id
+     */
+    public static interface ReadById<E> extends ResourceAction
+    {
+        public E readById (String id, Parameters parameters) throws EntityNotFoundException;
+    }
+
+    /**
+     * HTTP GET - Retrieve an entity by its unique id
+     */
+    public static interface ReadByIdWithResponse<E> extends ResourceAction
+    {
+        public E readById (String id, Parameters parameters, WithResponse withResponse) throws EntityNotFoundException;
+    }
+
+    /**
+     * HTTP PUT - Update entity if it exists, error if not
+     */
+    public static interface Update<E> extends ResourceAction
+    {
+        public E update (String id, E entity,  Parameters parameters);
+    }
+
+    /**
+     * HTTP PUT - Update entity if it exists, error if not
+     */
+    public static interface UpdateWithResponse<E> extends ResourceAction
+    {
+        public E update (String id, E entity,  Parameters parameters, WithResponse withResponse);
+    }
+
+    /**
+     * HTTP DELETE - Deletes an entity
+     */
+    public static interface Delete extends ResourceAction
+    {
+        public void delete (String id,  Parameters parameters);
+    }
+
+    /**
+     * HTTP DELETE - Deletes an entity
+     */
+    public static interface DeleteWithResponse extends ResourceAction
+    {
+        public void delete (String id,  Parameters parameters, WithResponse withResponse);
+    }
+
+    /**
+     * HTTP DELETE - Delete entities
+     */
+    public static interface DeleteSet extends ResourceAction
+    {
+        /**
+         * Deletes entities from the collection
+         *
+         * @param params implementation may choose to restrict the set to be be deleted based on params (ie. not necessarily "all")
+         */
+        public void deleteSet(Parameters params);
+    }
+
+    /**
+     * HTTP DELETE - Delete entities
+     */
+    public static interface DeleteSetWithResponse extends ResourceAction
+    {
+        /**
+         * Deletes entities from the collection
+         *
+         * @param params implementation may choose to restrict the set to be be deleted based on params (ie. not necessarily "all")
+         */
+        public void deleteSet(Parameters params, WithResponse withResponse);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/MultiPartRelationshipResourceAction.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/MultiPartRelationshipResourceAction.java
new file mode 100644
index 00000000000..94056138ba0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/MultiPartRelationshipResourceAction.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.resource.actions.interfaces;
+
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.springframework.extensions.webscripts.servlet.FormData;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public interface MultiPartRelationshipResourceAction
+{
+
+    /**
+     * HTTP POST - Upload file content and meta-data into repository
+     */
+    public static interface Create<E> extends ResourceAction
+    {
+        public E create(String entityResourceId, FormData formData, Parameters parameters, WithResponse withResponse);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/MultiPartResourceAction.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/MultiPartResourceAction.java
new file mode 100644
index 00000000000..9cabba29e36
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/MultiPartResourceAction.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.resource.actions.interfaces;
+
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.springframework.extensions.webscripts.servlet.FormData;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public interface MultiPartResourceAction
+{
+
+    /**
+     * HTTP POST - Upload file content and meta-data into repository
+     */
+    public static interface Create<E> extends ResourceAction
+    {
+        public E create(FormData formData, Parameters parameters, WithResponse withResponse);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/RelationshipResourceAction.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/RelationshipResourceAction.java
new file mode 100644
index 00000000000..071641503fc
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/RelationshipResourceAction.java
@@ -0,0 +1,166 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.actions.interfaces;
+
+import java.util.List;
+
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+
+/**
+ * Permissible actions for an Relationship Resources
+ * Based around CRUD - Create, ReadAll, ReadById, Update, Delete, DeleteSet
+ * 
+ * @author Gethin James
+ */
+public interface RelationshipResourceAction
+{
+
+    /**
+     * HTTP GET - Retrieve list of related entities by its related entityResource Id
+     */
+    public static interface Read<E> extends ResourceAction
+    {
+        /**
+         * Reads set the relationship entities from the collection using the related entityResourceId.
+         * 
+         * Paging information is provided.  
+         * @param entityResourceId Entity resource context for this relationship
+         * @param params - will never be null and will have the PAGING default values
+         */
+        public CollectionWithPagingInfo<E> readAll(String entityResourceId, Parameters params);
+    }
+
+    /**
+     * HTTP GET - Retrieve list of related entities by its related entityResource Id
+     */
+    public static interface ReadWithResponse<E> extends ResourceAction
+    {
+        /**
+         * Reads all the relationship entities from the collection using the related entityResourceId.
+         *
+         * Paging information is provided.
+         * @param entityResourceId Entity resource context for this relationship
+         * @param params will never be null and will have the PAGING default values, 
+         *               implementation may choose to filter the set based on params (ie. not necessarily "all")
+         */
+        public CollectionWithPagingInfo<E> readAll(String entityResourceId, Parameters params, WithResponse withResponse);
+    }
+
+    /**
+     * HTTP GET - Retrieve a relation by its unique id & entity context
+     */
+    public static interface ReadById<E> extends ResourceAction
+    {
+        public E readById(String entityResourceId, String id,  Parameters parameters) throws RelationshipResourceNotFoundException;
+    }
+
+    /**
+     * HTTP GET - Retrieve a relation by its unique id & entity context
+     */
+    public static interface ReadByIdWithResponse<E> extends ResourceAction
+    {
+        public E readById(String entityResourceId, String id,  Parameters parameters, WithResponse withResponse) throws RelationshipResourceNotFoundException;
+    }
+
+    /**
+     * HTTP PUT - Update entity (by its related entityResource Id) if it exists, error if not
+     */
+    public static interface Update<E> extends ResourceAction
+    {
+        public E update(String entityResourceId, E entity,  Parameters parameters);
+    }
+
+    /**
+     * HTTP PUT - Update entity (by its related entityResource Id) if it exists, error if not
+     */
+    public static interface UpdateWithResponse<E> extends ResourceAction
+    {
+        public E update(String entityResourceId, E entity,  Parameters parameters, WithResponse withResponse);
+    }
+
+    /**
+     * HTTP POST - Create one or more new entity
+     */
+    public static interface Create<E> extends ResourceAction
+    {
+        public List<E> create(String entityResourceId, List<E> entity,  Parameters parameters);
+    }
+
+    /**
+     * HTTP POST - Create one or more new entity
+     */
+    public static interface CreateWithResponse<E> extends ResourceAction
+    {
+        public List<E> create(String entityResourceId, List<E> entity,  Parameters parameters, WithResponse withResponse);
+    }
+
+    /**
+     * HTTP DELETE - Deletes a relation by its unique id & entity context
+     */
+    public static interface Delete extends ResourceAction
+    {
+        public void delete(String entityResourceId, String id,  Parameters parameters);
+    }
+
+    /**
+     * HTTP DELETE - Deletes a relation by its unique id & entity context
+     */
+    public static interface DeleteWithResponse extends ResourceAction
+    {
+        public void delete(String entityResourceId, String id,  Parameters parameters, WithResponse withResponse);
+    }
+
+    /**
+     * HTTP DELETE - Delete related entities by its related entityResource Id
+     */
+    public static interface DeleteSet extends ResourceAction
+    {
+        /**
+         * Deletes related entities from the collection
+         *
+         * @param entityResourceId Entity resource context for this relationship
+         * @param params implementation may choose to restrict the set to be be deleted based on params (ie. not necessarily "all")
+         */
+        public void deleteSet(String entityResourceId, Parameters params);
+    }
+
+    /**
+     * HTTP DELETE - Delete related entities by its related entityResource Id
+     */
+    public static interface DeleteSetWithResponse extends ResourceAction
+    {
+        /**
+         * Deletes related entities from the collection
+         *
+         * @param entityResourceId Entity resource context for this relationship
+         * @param params implementation may choose to restrict the set to be be deleted based on params (ie. not necessarily "all")
+         */
+        public void deleteSet(String entityResourceId, Parameters params, WithResponse withResponse);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/RelationshipResourceBinaryAction.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/RelationshipResourceBinaryAction.java
new file mode 100755
index 00000000000..fc96fa3dfb1
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/RelationshipResourceBinaryAction.java
@@ -0,0 +1,151 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+ 
+package org.alfresco.rest.framework.resource.actions.interfaces;
+
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.content.FileBinaryResource;
+import org.alfresco.rest.framework.resource.content.NodeBinaryResource;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+
+import java.io.InputStream;
+
+/**
+ * Permissible actions for binary resources of an @RelationshipResource
+ * 
+ * Supports full CRUD (Read, Update, Delete)
+ *
+ * @author Gethin James
+ */
+
+public interface RelationshipResourceBinaryAction
+{
+
+    /**
+     * HTTP GET - Retrieve a binary resource
+     */
+    public static interface Read extends ResourceAction
+    {
+        /**
+         * Retrieves a binary property by returning a BinaryResource object.  The specific property is specified in the {@link Parameters} object.
+         * See {@link Parameters#hasBinaryProperty(String)} or {@link Parameters#getBinaryProperty()}
+         * @param entityId unique id
+         * @param entityResourceId Entity resource context for this relationship
+         * @param parameters {@link Parameters}
+         * @return BinaryResource  - Either {@link FileBinaryResource} or {@link NodeBinaryResource}
+         * @throws EntityNotFoundException
+         */
+        public BinaryResource readProperty(String entityId, String entityResourceId, Parameters parameters) throws EntityNotFoundException;
+    }
+
+    /**
+     * HTTP GET - Retrieve a binary resource
+     */
+    public static interface ReadWithResponse extends ResourceAction
+    {
+        /**
+         * Retrieves a binary property by returning a BinaryResource object.  The specific property is specified in the {@link Parameters} object.
+         * See {@link Parameters#hasBinaryProperty(String)} or {@link Parameters#getBinaryProperty()}
+         * @param entityId unique id
+         * @param entityResourceId Entity resource context for this relationship
+         * @param parameters {@link Parameters}
+         * @return BinaryResource  - Either {@link FileBinaryResource} or {@link NodeBinaryResource}
+         * @throws EntityNotFoundException
+         */
+        public BinaryResource readProperty(String entityId, String entityResourceId, Parameters parameters, WithResponse withResponse) throws EntityNotFoundException;
+    }
+
+    /**
+     * HTTP DELETE - Deletes a binary resource
+     */
+    public static interface Delete extends ResourceAction
+    {
+        
+        /**
+         * Deletes a binary property.  The specific property is specified in the {@link Parameters} object.
+         * See {@link Parameters#hasBinaryProperty(String)} or {@link Parameters#getBinaryProperty()}
+         * @param entityId unique id
+         * @param entityResourceId Entity resource context for this relationship
+         * @param parameters {@link Parameters}
+         */
+        public void deleteProperty(String entityId, String entityResourceId, Parameters parameters);
+    }
+
+    /**
+     * HTTP DELETE - Deletes a binary resource
+     */
+    public static interface DeleteWithResponse extends ResourceAction
+    {
+
+        /**
+         * Deletes a binary property.  The specific property is specified in the {@link Parameters} object.
+         * See {@link Parameters#hasBinaryProperty(String)} or {@link Parameters#getBinaryProperty()}
+         * @param entityId unique id
+         * @param entityResourceId Entity resource context for this relationship
+         * @param parameters {@link Parameters}
+         */
+        public void deleteProperty(String entityId, String entityResourceId, Parameters parameters, WithResponse withResponse);
+    }
+    /**
+     * HTTP PUT - Updates a binary resource if it exists, error if not
+     */
+    public static interface Update<E> extends ResourceAction
+    {
+
+        /**
+         * Updates a binary property.  The specific property is specified in the {@link Parameters} object.
+         * See {@link Parameters#hasBinaryProperty(String)} or {@link Parameters#getBinaryProperty()}
+         * @param entityId unique id
+         * @param entityResourceId Entity resource context for this relationship
+         * @param stream An inputstream
+         * @param contentInfo Basic information about the content stream
+         * @param params {@link Parameters}
+         */
+        public E updateProperty(String entityId, String entityResourceId, BasicContentInfo contentInfo, InputStream stream, Parameters params);
+    }
+
+    /**
+     * HTTP PUT - Updates a binary resource if it exists, error if not
+     */
+    public static interface UpdateWithResponse<E> extends ResourceAction
+    {
+
+        /**
+         * Updates a binary property.  The specific property is specified in the {@link Parameters} object.
+         * See {@link Parameters#hasBinaryProperty(String)} or {@link Parameters#getBinaryProperty()}
+         * @param entityId unique id
+         * @param entityResourceId Entity resource context for this relationship
+         * @param stream An inputstream
+         * @param contentInfo Basic information about the content stream
+         * @param params {@link Parameters}
+         */
+        public E updateProperty(String entityId, String entityResourceId, BasicContentInfo contentInfo,
+                                InputStream stream, Parameters params, WithResponse withResponse);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/ResourceAction.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/ResourceAction.java
new file mode 100644
index 00000000000..978029eff4c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/actions/interfaces/ResourceAction.java
@@ -0,0 +1,36 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.actions.interfaces;
+
+/**
+ * Simple marker interface, for all Resource Actions
+ *
+ * @author Gethin James
+ */
+public interface ResourceAction
+{
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/AbstractBinaryResource.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/AbstractBinaryResource.java
new file mode 100644
index 00000000000..a4ab08ea932
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/AbstractBinaryResource.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.resource.content;
+
+/**
+ * An abstract binary resource.
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class AbstractBinaryResource implements BinaryResource
+{
+    final String attachFileName;
+    final CacheDirective cacheDirective;
+
+    public AbstractBinaryResource(String attachFileName, CacheDirective cacheDirective)
+    {
+        this.attachFileName = attachFileName;
+        this.cacheDirective = cacheDirective;
+    }
+
+    public String getAttachFileName()
+    {
+        return attachFileName;
+    }
+
+    public CacheDirective getCacheDirective()
+    {
+        return cacheDirective;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/BasicContentInfo.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/BasicContentInfo.java
new file mode 100644
index 00000000000..fd1135933e7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/BasicContentInfo.java
@@ -0,0 +1,37 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.content;
+
+
+/**
+ * Basic information about content.  Typically taken from a HTTPServletRequest.
+ * You may choose to trust it but there is no guarantee that it accurately describes the content.
+ */
+public interface BasicContentInfo {
+    public String getMimeType();
+    public String getEncoding();
+    
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/BinaryProperty.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/BinaryProperty.java
new file mode 100755
index 00000000000..638c10faeda
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/BinaryProperty.java
@@ -0,0 +1,127 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.content;
+
+import java.io.Serializable;
+import java.util.Locale;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.alfresco.service.cmr.repository.ContentReader;
+
+/**
+ * A POJO property that is of type "Binary"
+ * 
+ * You can add this to your object to be serialized as a normal property.
+ * 
+ * @author Gethin James
+ */
+
+public class BinaryProperty implements ContentInfo, Serializable
+{
+    private static final long serialVersionUID = 7392073427641063968L;
+    
+    private final String mimeType;
+    private final String encoding;
+    private final long length;
+    private final Locale locale;
+    
+    /**
+     * Sets the content length to zero, Locale to null, no stream and no caching
+     * @param mimeType String
+     * @param encoding String
+     */
+    public BinaryProperty(String mimeType, String encoding)
+    {
+        super();
+        this.mimeType = mimeType;
+        this.encoding = encoding;
+        this.length = 0;
+        this.locale = null;
+    }
+    
+    /**
+     * This is the preferred constructor to use. Takes the properties from content reader that it needs.
+     * @param reader ContentReader
+     */
+    public BinaryProperty(ContentReader reader)
+    {
+        super();
+        this.mimeType = reader.getMimetype();
+        this.encoding = reader.getEncoding();
+        this.length = reader.getSize();
+        this.locale = reader.getLocale();
+    }
+    
+    /**
+     * Sets no stream and no caching
+     * @param mimeType String
+     * @param encoding String
+     * @param length long
+     * @param locale Locale
+     */
+    public BinaryProperty(String mimeType, String encoding, long length, Locale locale)
+    {
+        super();
+        this.mimeType = mimeType;
+        this.encoding = encoding;
+        this.length = length;
+        this.locale = locale;
+    }
+
+    public String getMimeType()
+    {
+        return this.mimeType;
+    }
+    
+    @JsonIgnore
+    public String getEncoding()
+    {
+        return this.encoding;
+    }
+    
+    /**
+     * Used for serialization.  If the length is unknown then this method returns null
+     * and is therefore not serialized.
+     * 
+     * @return Long size - null if unknown.
+     */
+    public Long getSizeInBytes()
+    {
+        return this.length>0?this.length:null;
+    }
+
+    @JsonIgnore
+    public long getLength()
+    {
+        return this.length;
+    }
+    @JsonIgnore
+    public Locale getLocale()
+    {
+        return this.locale;
+    }
+   
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/BinaryResource.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/BinaryResource.java
new file mode 100755
index 00000000000..9f7457eda2d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/BinaryResource.java
@@ -0,0 +1,36 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.content;
+
+/**
+ * A resource that is of type "Binary"
+ * 
+ * @author Gethin James
+ */
+public interface BinaryResource
+{
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/CacheDirective.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/CacheDirective.java
new file mode 100644
index 00000000000..9cf0483725e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/CacheDirective.java
@@ -0,0 +1,140 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.resource.content;
+
+import java.util.Date;
+
+/**
+ * An immutable builder for setting the HTTP cache.
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class CacheDirective
+{
+    private final boolean neverCache;
+    private final boolean isPublic;
+    private final boolean mustRevalidate;
+    private final Date lastModified;
+    private final String eTag;
+    private final Long maxAge;
+
+    private CacheDirective(Builder builder)
+    {
+        this.neverCache = builder.neverCache;
+        this.isPublic = builder.isPublic;
+        this.mustRevalidate = builder.mustRevalidate;
+        this.lastModified = builder.lastModified == null ? null : new Date(builder.lastModified.getTime());
+        this.eTag = builder.eTag;
+        this.maxAge = builder.maxAge;
+    }
+
+    public boolean isNeverCache()
+    {
+        return neverCache;
+    }
+
+    public boolean isPublic()
+    {
+        return isPublic;
+    }
+
+    public boolean isMustRevalidate()
+    {
+        return mustRevalidate;
+    }
+
+    public Date getLastModified()
+    {
+        if (lastModified != null)
+        {
+            return new Date(lastModified.getTime());
+        }
+        return null;
+    }
+
+    public String getETag()
+    {
+        return eTag;
+    }
+
+    public Long getMaxAge()
+    {
+        return maxAge;
+    }
+
+    public static class Builder
+    {
+        // The default values are the same as the org.springframework.extensions.webscripts.Cache
+        private boolean neverCache = true;
+        private boolean isPublic = false;
+        private boolean mustRevalidate = true;
+        private Date lastModified = null;
+        private String eTag = null;
+        private Long maxAge = null;
+
+        public Builder setNeverCache(boolean neverCache)
+        {
+            this.neverCache = neverCache;
+            return this;
+        }
+
+        public Builder setPublic(boolean aPublic)
+        {
+            isPublic = aPublic;
+            return this;
+        }
+
+        public Builder setMustRevalidate(boolean mustRevalidate)
+        {
+            this.mustRevalidate = mustRevalidate;
+            return this;
+        }
+
+        public Builder setLastModified(Date lastModified)
+        {
+            this.lastModified = lastModified;
+            return this;
+        }
+
+        public Builder setETag(String eTag)
+        {
+            this.eTag = eTag;
+            return this;
+        }
+
+        public Builder setMaxAge(Long maxAge)
+        {
+            this.maxAge = maxAge;
+            return this;
+        }
+
+        public CacheDirective build()
+        {
+            return new CacheDirective(this);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/ContentInfo.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/ContentInfo.java
new file mode 100755
index 00000000000..749fde2993a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/ContentInfo.java
@@ -0,0 +1,36 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.content;
+
+import java.util.Locale;
+
+/**
+ * Basic information about content.  Typically used with HTTPServletResponse
+ */
+public interface ContentInfo extends BasicContentInfo{
+    public long getLength();
+    public Locale getLocale();
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/ContentInfoImpl.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/ContentInfoImpl.java
new file mode 100755
index 00000000000..89046e32e57
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/ContentInfoImpl.java
@@ -0,0 +1,69 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.content;
+
+import java.util.Locale;
+
+/**
+ * Basic implementation of information about the returned content.
+ */
+public class ContentInfoImpl implements ContentInfo
+{
+    private final String mimeType;
+    private final String encoding;
+    private final long length;
+    private final Locale locale;
+    
+    public ContentInfoImpl(String mimeType, String encoding, long length, Locale locale)
+    {
+        super();
+        this.mimeType = mimeType;
+        this.encoding = encoding;
+        this.length = length;
+        this.locale = locale;
+    }
+    
+    @Override
+    public String getMimeType()
+    {
+        return this.mimeType;
+    }
+    @Override
+    public String getEncoding()
+    {
+        return this.encoding;
+    }
+    @Override
+    public long getLength()
+    {
+        return this.length;
+    }
+    @Override
+    public Locale getLocale()
+    {
+        return this.locale;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/FileBinaryResource.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/FileBinaryResource.java
new file mode 100755
index 00000000000..fced1bffd7b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/FileBinaryResource.java
@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.resource.content;
+
+import java.io.File;
+
+/**
+ * A binary resource based on a File.
+ *
+ * @author Gethin James
+ */
+public class FileBinaryResource extends AbstractBinaryResource
+{
+    final File file;
+
+    public FileBinaryResource(File file)
+    {
+        this(file, null);
+    }
+
+    public FileBinaryResource(File file, String attachFileName)
+    {
+        super(attachFileName, null);
+        this.file = file;
+    }
+
+    public File getFile()
+    {
+        return this.file;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/NodeBinaryResource.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/NodeBinaryResource.java
new file mode 100755
index 00000000000..7d275255e03
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/content/NodeBinaryResource.java
@@ -0,0 +1,70 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.content;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * A binary resource based on a Node reference.
+ *
+ * @author Gethin James
+ */
+public class NodeBinaryResource extends AbstractBinaryResource
+{
+
+    final NodeRef nodeRef;
+    final QName propertyQName;
+    final ContentInfo contentInfo;
+
+    public NodeBinaryResource(NodeRef nodeRef, QName propertyQName, ContentInfo contentInfo, String attachFileName)
+    {
+        this(nodeRef, propertyQName, contentInfo, attachFileName, null);
+    }
+
+    public NodeBinaryResource(NodeRef nodeRef, QName propertyQName, ContentInfo contentInfo, String attachFileName, CacheDirective cacheDirective)
+    {
+        super(attachFileName, cacheDirective);
+        this.nodeRef = nodeRef;
+        this.propertyQName = propertyQName;
+        this.contentInfo = contentInfo;
+    }
+
+    public NodeRef getNodeRef()
+    {
+        return this.nodeRef;
+    }
+
+    public QName getPropertyQName()
+    {
+        return this.propertyQName;
+    }
+
+    public ContentInfo getContentInfo()
+    {
+        return this.contentInfo;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/CollectionWithPagingInfo.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/CollectionWithPagingInfo.java
new file mode 100644
index 00000000000..cff6072f6e4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/CollectionWithPagingInfo.java
@@ -0,0 +1,212 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.parameters;
+
+import org.alfresco.rest.api.search.context.SearchContext;
+import org.alfresco.rest.framework.resource.SerializablePagedCollection;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * A wrapper around Collection that supports paging information.
+ *
+ * CollectionWithPagingInfo is immutable and collections are unmodifiable. Use the asPaged methods to construct it.
+ * 
+ * collection - The collection
+ * hasMoreItems - Indicates the total number of items available. Can be greater than the number of items returned in the list.
+ * totalItems - Indicates the total number of items available. Can be greater than the number of items returned in the list.
+ * 
+ * @author Gethin James.
+ */
+public class CollectionWithPagingInfo<T> implements SerializablePagedCollection
+{
+
+    private final Collection<T> collection;
+    private final boolean hasMoreItems;
+    private final Integer totalItems;
+    private final Paging paging;
+    private final Object sourceEntity;
+    private final SearchContext context;
+        
+    /**
+     * Constructs a new CollectionWithPagingInfo.
+     * @param collection - the collection that needs to be paged.
+     * @param paging - Paging request info
+     * @param hasMoreItems - Are there more items after this Collection?
+     * @param totalItems - The total number of items available.
+     */
+    protected CollectionWithPagingInfo(Collection<T> collection, Paging paging, boolean hasMoreItems, Integer totalItems, Object sourceEntity, SearchContext context)
+    {
+        super();
+        this.hasMoreItems = hasMoreItems;
+        this.paging = paging;
+        
+        if (collection == null)
+        {
+            this.collection = Collections.emptyList();
+            this.totalItems = 0;        
+        }
+        else
+        {
+            this.collection = collection;
+            this.totalItems = totalItems;    
+        }
+        this.sourceEntity = sourceEntity;
+        this.context = context;
+    }
+
+    /**
+     * Constructs a new CollectionWithPagingInfo.
+     * It automatically sets the total items based on the collection size and
+     * sets the hasMoreItems variable to false.
+     * 
+     * @param paging - Paging request info
+     * @param aCollection - the collection that needs to be paged.
+     * @return CollectionWithPagingInfo
+     */
+    public static <T> CollectionWithPagingInfo<T> asPaged(Paging paging, Collection<T> aCollection)
+    {
+        int collectionSize = aCollection==null?0:aCollection.size();
+        return new CollectionWithPagingInfo<T>(aCollection, paging, false, collectionSize, null, null);
+    }
+    
+    /**
+     * Constructs a new CollectionWithPagingInfo using a number of entity values.
+     * It automatically creates a Collection, sets the total items and
+     * sets the hasMoreItems variable to false.  Paging is set to the default values.
+     * 
+     * @param entity - the entities to turn into a collection
+     * @return CollectionWithPagingInfo
+     */
+    public static <T> CollectionWithPagingInfo<T> asPagedCollection(T ...entity)
+    {
+        Collection<T> aNewCollection = Arrays.asList(entity);
+        return new CollectionWithPagingInfo<T>(aNewCollection, Paging.DEFAULT, false, aNewCollection.size(), null, null);
+    }
+
+    /**
+     * Constructs a new CollectionWithPagingInfo.
+     *
+     * @param paging - Paging request info
+     * @param aCollection - the collection that needs to be paged.
+     * @param hasMoreItems - Are there more items after this Collection?
+     * @param totalItems - The total number of items available.
+     * @return CollectionWithPagingInfo
+     */
+    public static <T> CollectionWithPagingInfo<T> asPaged(Paging paging, Collection<T> aCollection, boolean hasMoreItems, Integer totalItems)
+    {
+        return new CollectionWithPagingInfo<T>(aCollection, paging, hasMoreItems, totalItems, null, null);
+    }
+
+    /**
+     * Constructs a new CollectionWithPagingInfo. Not for public use.
+     *
+     * @param paging - Paging request info
+     * @param aCollection - the collection that needs to be paged.
+     * @param hasMoreItems - Are there more items after this Collection?
+     * @param totalItems - The total number of items available.
+     * @param sourceEntity - The parent/source entity responsible for the collection
+     * @return CollectionWithPagingInfo
+     */
+    public static <T> CollectionWithPagingInfo<T> asPaged(Paging paging, Collection<T> aCollection, boolean hasMoreItems, Integer totalItems, Object sourceEntity)
+    {
+        return new CollectionWithPagingInfo<T>(aCollection, paging, hasMoreItems, totalItems, sourceEntity, null);
+    }
+
+    /**
+     * Constructs a new CollectionWithPagingInfo. Not for public use.
+     * 
+     * @param paging - Paging request info
+     * @param aCollection - the collection that needs to be paged.
+     * @param hasMoreItems - Are there more items after this Collection?
+     * @param totalItems - The total number of items available.
+     * @param sourceEntity - The parent/source entity responsible for the collection
+     * @param context - The search context
+     * @return CollectionWithPagingInfo
+     */
+    public static <T> CollectionWithPagingInfo<T> asPaged(Paging paging, Collection<T> aCollection, boolean hasMoreItems, Integer totalItems, Object sourceEntity, SearchContext context)
+    {
+        return new CollectionWithPagingInfo<T>(aCollection, paging, hasMoreItems, totalItems, sourceEntity, context);
+    }
+    
+    /**
+     * Returns the Collection object
+     * @return Collection
+     */
+    @Override
+    public Collection<T> getCollection()
+    {
+        return this.collection;
+    }
+
+    /**
+     * Indicates if the returned collection has more items after the current returned list.
+     */
+    @Override
+    public boolean hasMoreItems()
+    {
+        return this.hasMoreItems;
+    }
+    
+    /**
+     * Indicates the total number of items available.
+     * 
+     * Can be greater than the number of items returned in the list.
+     * 
+     */
+    @Override
+    public Integer getTotalItems()
+    {
+        return this.totalItems;
+    }
+
+    /**
+     * The parent/source entity responsible for the collection
+     */
+    @Override
+    public Object getSourceEntity()
+    {
+        return sourceEntity;
+    }
+
+    /**
+     * The requested paging parameters set by the client
+     */
+    @Override
+    public Paging getPaging()
+    {
+        return this.paging;
+    }
+
+    @Override
+    public SearchContext getContext()
+    {
+        return context;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/InvalidSelectException.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/InvalidSelectException.java
new file mode 100755
index 00000000000..63c8b7d659c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/InvalidSelectException.java
@@ -0,0 +1,45 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.parameters;
+
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+
+/**
+ * Thrown when an invalid select syntax is used.
+ * 
+ * @author Gethin James
+ */
+public class InvalidSelectException extends InvalidArgumentException
+{
+    private static final long serialVersionUID = -8631890798598434965L;
+    
+    public static String DEFAULT_MESSAGE_ID = "framework.exception.InvalidSelect";
+    
+    public InvalidSelectException(String paramName, Object queryParam)
+    {
+        super(DEFAULT_MESSAGE_ID, new Object[] {queryParam, paramName});
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/Paging.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/Paging.java
new file mode 100644
index 00000000000..83cfc3c3ff7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/Paging.java
@@ -0,0 +1,100 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.parameters;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+
+/**
+ * Represents paging of collections of resources. Set by the client request.<br/>
+ * skipCount - How many entries exist in the entire collection before those included in the list<br/>
+ * maxItems - The maximum number of items the client requires. Defaults to 100.
+ * 
+ * @author Gethin James, Martin Muller (mmuller)
+ */
+public class Paging
+{
+    
+    public static final int DEFAULT_SKIP_COUNT = 0;
+    public static final int DEFAULT_MAX_ITEMS = 100;
+    public static final Paging DEFAULT = Paging.valueOf(DEFAULT_SKIP_COUNT, DEFAULT_MAX_ITEMS);
+        
+    private final int skipCount;
+    private final int maxItems;
+
+    private Paging(int skipCount, int maxItems)
+    {
+        super();
+        if(skipCount < 0)
+        {
+        	throw new InvalidArgumentException("Negative values not supported for skipCount.");
+        }
+        if(maxItems < 1)
+        {
+        	throw new InvalidArgumentException("Only positive values supported for maxItems.");
+        }
+        this.skipCount = skipCount;
+        this.maxItems = maxItems;
+    }
+
+    /**
+     * How many entries exist in the entire collection before those included in the list
+     * @return Integer
+     */
+    public int getSkipCount()
+    {
+        return this.skipCount;
+    }
+
+    /**
+     * The maximum number of items the client requires. Defaults to 100.
+     * @return Integer
+     */
+    public int getMaxItems()
+    {
+        return this.maxItems;
+    }
+
+    @JsonCreator
+    public static Paging valueOf(@JsonProperty("skipCount") int skipCount, @JsonProperty("maxItems") int maxItems)
+    {
+        return new Paging(skipCount,maxItems);
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("Paging [skipCount=");
+        builder.append(this.skipCount);
+        builder.append(", maxItems=");
+        builder.append(this.maxItems);
+        builder.append("]");
+        return builder.toString();
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/Parameters.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/Parameters.java
new file mode 100644
index 00000000000..c1d102d6c21
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/Parameters.java
@@ -0,0 +1,146 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.parameters;
+
+import java.util.List;
+
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.jacksonextensions.BeanPropertiesFilter;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.parameters.where.Query;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+
+/**
+ * Parameters passed into a request.
+ *
+ * @author Gethin James
+ */
+public interface Parameters
+{
+    String getEntityId();
+    String getRelationshipId();
+    String getRelationship2Id();
+    boolean isCollectionResource();
+
+    /**
+     * Gets a single request query parameter passed in by the user.
+     * Currently doesn't support multiple values.
+     * @param parameterName String
+     * @return String The Parameter value
+     */
+    String getParameter(String parameterName);
+    
+    /**
+     * Gets a single request parameter passed in by the user.
+     * Attempts to convert the parameter to the specified type.
+     * If unable to convert the parameter to the specified type then throws an InvalidArgumentException.
+     * Currently doesn't support multiple values.
+     * @param parameterName String
+     * @param clazz - type to use for conversion.
+     * @return The Parameter value
+     * @throws InvalidArgumentException
+     */
+    T getParameter(String parameterName, Class<T> clazz) throws InvalidArgumentException;
+    
+    /**
+     * Returns a representation of the Paging of collections of resources, with skip count and max items. 
+     * See {@link Paging}
+     * Specified by the "skipCount" and "maxItems" request parameters.
+     * @return Paging Paging information
+     */
+    Paging getPaging();
+    
+    /**
+     * Returns a List of {@link SortColumn} for sorting properties.
+     * Specified by the "orderBy" request parameter.
+     * @return List of {@link SortColumn}
+     */
+    List<SortColumn> getSorting();
+    
+    /**
+     * Returns a {@link BeanPropertiesFilter} for filtering out properties.
+     * Specified by the "properties" request parameter.
+     * @return BeanPropertiesFilter {@link BeanPropertiesFilter}
+     */
+    BeanPropertiesFilter getFilter();
+    
+    /**
+     * Indicates if the specified property was requested.
+     * @param propertyName the property
+     * Specified as part of the url request.
+     * @return true if the propertyName was specified as part of the url request
+     */
+    boolean hasBinaryProperty(String propertyName);
+    
+    /**
+     * Gets the name of the property that was requested.
+     * @return String the propertyName
+     */
+    String getBinaryProperty();
+
+    /**
+     * Indicates if the source entity should be includes in the request.
+     * This will normally be done by the framework but implentations may prefer
+     * to do it themselves.
+     * @return true if the source should be included.
+     */
+    boolean includeSource();
+
+    /**
+     * Represents a Query specified by the client.
+     * Specified by the "WHERE" request parameter.
+     * @return Query {@link Query}
+     */
+    Query getQuery();
+    
+    /**
+     * A list of property names passed in the request using the json pointer syntax
+     * Specified by the "SELECT" request parameter.
+     */
+    @Deprecated
+    List<String> getSelectedProperties();
+
+    /**
+     * A list of property names passed in the request using the json pointer syntax
+     * Specified by the "INCLUDE" request parameter.
+     * @return the propertyNames
+     */
+    List<String> getInclude();
+
+    /**
+     * Gets the basic information about content, typically taken from a HTTPServletRequest.
+     * @return BasicContentInfo the content info
+     */
+    BasicContentInfo getContentInfo();
+
+    /**
+     * Gets access to the entire webscript request.
+     * @return WebScriptRequest
+     */
+    WebScriptRequest getRequest();
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/Params.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/Params.java
new file mode 100644
index 00000000000..a3f9fa9613a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/Params.java
@@ -0,0 +1,325 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.parameters;
+
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.jacksonextensions.BeanPropertiesFilter;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.ContentInfoImpl;
+import org.alfresco.rest.framework.resource.parameters.where.Query;
+import org.alfresco.rest.framework.resource.parameters.where.QueryImpl;
+import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Parameters passed in from a Rest client for use in calls to the rest api.
+ *
+ * @author Gethin James
+ */
+public class Params implements Parameters
+{
+    // Note: isCollectionResource maps to "readAll". It can apply to these levels, eg ...
+    //            /entities,
+    //            /entities/{entityAId}/relationship1,
+    //            /entities/{entityAId}/relationship1/{entityBId}/relationship2
+    private final boolean isCollectionResource;
+
+    private final String entityId;
+    private final String relationshipId;
+    private final String relationship2Id;
+
+    private final Object passedIn;
+    private final InputStream stream;
+    private final RecognizedParams recognizedParams;
+    private final String addressedProperty;
+    private final BasicContentInfo contentInfo;
+    private final WebScriptRequest request;
+
+    //Constants
+    private static final RecognizedParams NULL_PARAMS = new RecognizedParams(null, null, null, null, null, null, null, null, false);
+    private static final BasicContentInfo DEFAULT_CONTENT_INFO = new ContentInfoImpl(MimetypeMap.MIMETYPE_BINARY, "UTF-8", -1, null);
+    
+    protected Params(Boolean isCollectionResource, String entityId, String relationshipId, String relationship2Id, Object passedIn, InputStream stream, String addressedProperty, RecognizedParams recognizedParams, BasicContentInfo contentInfo, WebScriptRequest request)
+    {
+        super();
+        this.isCollectionResource = (isCollectionResource != null ? isCollectionResource : (entityId == null));
+        this.entityId = entityId;
+        this.relationshipId = relationshipId;
+        this.relationship2Id = relationship2Id;
+        this.passedIn = passedIn;
+        this.stream = stream;
+        this.recognizedParams = recognizedParams;
+        this.addressedProperty = addressedProperty;
+        this.request = request;
+        this.contentInfo = contentInfo==null?DEFAULT_CONTENT_INFO:contentInfo;
+    }
+
+    public static Params valueOf(BeanPropertiesFilter paramFilter, String entityId, WebScriptRequest request)
+    {
+        return new Params(null, entityId, null, null, null, null, null, new RecognizedParams(null, null, paramFilter, null, null, null, null, null, false), null, request);
+    }
+
+    public static Params valueOf(String entityId, String relationshipId, WebScriptRequest request)
+    {
+        return new Params(null, entityId, relationshipId, null, null,null, null, NULL_PARAMS, null, request);
+    }
+    
+    public static Params valueOf(RecognizedParams recognizedParams, String entityId, String relationshipId, WebScriptRequest request)
+    {
+        return new Params(null, entityId, relationshipId, null, null, null, null, recognizedParams, null, request);
+    }
+    
+    public static Params valueOf(String entityId, RecognizedParams recognizedParams, Object passedIn, WebScriptRequest request)
+    {
+        return new Params(null, entityId, null, null, passedIn, null, null, recognizedParams, null, request);
+    }
+
+    public static Params valueOf(String entityId, String relationshipId, RecognizedParams recognizedParams, Object passedIn, WebScriptRequest request)
+    {
+        return new Params(null, entityId, relationshipId, null, passedIn, null, null, recognizedParams, null, request);
+    }
+
+    public static Params valueOf(String entityId, String relationshipId, Object passedIn, InputStream stream,
+                                 String addressedProperty, RecognizedParams recognizedParams, BasicContentInfo contentInfo, WebScriptRequest request)
+    {
+        return new Params(null, entityId, relationshipId, null, passedIn, stream, addressedProperty, recognizedParams, contentInfo, request);
+    }
+
+    public static Params valueOf(boolean isCollectionResource, String entityId, String relationshipId, String relationship2Id, Object passedIn, InputStream stream,
+                                 String addressedProperty, RecognizedParams recognizedParams, BasicContentInfo contentInfo, WebScriptRequest request)
+    {
+        return new Params(isCollectionResource, entityId, relationshipId, relationship2Id, passedIn, stream, addressedProperty, recognizedParams, contentInfo, request);
+    }
+    
+    public String getEntityId()
+    {
+        return this.entityId;
+    }
+
+    public Object getPassedIn()
+    {
+        return this.passedIn;
+    }
+
+    public String getRelationshipId()
+    {
+        return this.relationshipId;
+    }
+
+    public String getRelationship2Id()
+    {
+        return this.relationship2Id;
+    }
+
+    public boolean isCollectionResource()
+    {
+        return this.isCollectionResource;
+    }
+
+    public Query getQuery()
+    {
+        return this.recognizedParams.query;
+    }
+
+    public Paging getPaging()
+    {
+        return this.recognizedParams.paging;
+    }
+
+    public BeanPropertiesFilter getFilter()
+    {
+        return this.recognizedParams.filter;
+    }
+
+    @Override
+    public boolean includeSource()
+    {
+        return this.recognizedParams.includeSource;
+    }
+
+    public Map<String, BeanPropertiesFilter> getRelationsFilter()
+    {
+        return this.recognizedParams.relationshipFilter;
+    }
+
+    public InputStream getStream()
+    {
+        return this.stream;
+    }
+
+    /*
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("Params [entityId=");
+        builder.append(this.entityId);
+        builder.append(", relationshipId=");
+        builder.append(this.relationshipId);
+        builder.append(", passedIn=");
+        builder.append(this.passedIn);
+        builder.append(", paging=");
+        builder.append(this.recognizedParams.paging);
+        builder.append(", query=");
+        builder.append(this.recognizedParams.query);
+        builder.append(", sorting=");
+        builder.append(this.recognizedParams.sorting);
+        builder.append(", include=");
+        builder.append(this.recognizedParams.include);
+        builder.append(", select=");
+        builder.append(this.recognizedParams.select);
+        builder.append(", filter=");
+        builder.append(this.recognizedParams.filter);
+        builder.append(", relationshipFilter=");
+        builder.append(this.recognizedParams.relationshipFilter);
+        builder.append(", includeSource=");
+        builder.append(this.recognizedParams.includeSource);
+        builder.append(", addressedProperty=");
+        builder.append(this.addressedProperty);
+        builder.append("]");
+        return builder.toString();
+    }
+    
+    @Override
+    /**
+     * Similar to the standard HTTPRequest method.  Just returns the first parameter value or NULL.
+     */
+    public String getParameter(String parameterName)
+    {
+        if (recognizedParams.requestParameters!= null && !recognizedParams.requestParameters.isEmpty())
+        {
+            String[] vals = recognizedParams.requestParameters.get(parameterName);
+            if (vals!= null && vals.length>0)
+            {
+                return vals[0]; //Just return the first element.
+            }
+        }
+        return null;
+    }
+
+	@Override
+	public T getParameter(String parameterName, Class<T> clazz) throws InvalidArgumentException {
+		String param = getParameter(parameterName);
+		if (param == null) return null;
+		Object obj = ConvertUtils.convert(param, clazz);
+		if (obj != null && obj.getClass().equals(clazz))
+		{
+			return (T) obj;
+		}
+		throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID, new Object[] {parameterName});
+	}
+	
+    @Override
+    public boolean hasBinaryProperty(String propertyName)
+    {
+        return (addressedProperty != null && addressedProperty.equals(propertyName));
+    }
+
+    @Override
+    public List<SortColumn> getSorting()
+    {
+        return recognizedParams.sorting;
+    }
+
+    @Override
+    public String getBinaryProperty()
+    {
+        return addressedProperty;
+    }
+    
+    @Override
+    public List<String> getSelectedProperties()
+    {
+        return recognizedParams.select;
+    }
+
+    @Override
+    public List<String> getInclude()
+    {
+        return recognizedParams.include;
+    }
+    
+    @Override
+    public BasicContentInfo getContentInfo()
+    {
+        return contentInfo;
+    }
+
+    @Override
+    public WebScriptRequest getRequest()
+    {
+        return request;
+    }
+
+    /**
+     * A formal set of params that any rest service could potentially have passed in as request params
+     */
+    public static class RecognizedParams 
+    {
+        final Paging paging;
+        private final BeanPropertiesFilter filter;
+        private final Map<String, BeanPropertiesFilter> relationshipFilter;
+        private final Map<String, String[]> requestParameters;
+        private final Query query;
+
+        private final List<String> include;
+        @Deprecated
+        private final List<String> select; // see include
+
+        private final List<SortColumn> sorting;
+        private final boolean includeSource;
+        
+        @SuppressWarnings("unchecked")
+        public RecognizedParams(Map<String, String[]> requestParameters, Paging paging, BeanPropertiesFilter filter,
+                                Map<String, BeanPropertiesFilter> relationshipFilter, List<String> include, List<String> select,
+                                Query query, List<SortColumn> sorting, boolean includeSource)
+        {
+            super();
+
+            this.requestParameters = requestParameters;
+            this.paging = paging==null?Paging.DEFAULT:paging;
+            this.filter = filter==null?BeanPropertiesFilter.ALLOW_ALL:filter;
+            this.query = query==null?QueryImpl.EMPTY:query;
+            this.relationshipFilter = (Map<String, BeanPropertiesFilter>) (relationshipFilter==null?Collections.emptyMap():relationshipFilter);
+
+            this.include = (List<String>) (include==null?Collections.emptyList():include);
+            this.select = (List<String>) (select==null?Collections.emptyList():select);
+
+            this.sorting = (List<SortColumn>) (sorting==null?Collections.emptyList():sorting);
+            this.includeSource = includeSource;
+        }
+        
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/SortColumn.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/SortColumn.java
new file mode 100644
index 00000000000..88c3719b455
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/SortColumn.java
@@ -0,0 +1,62 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.parameters;
+
+/**
+ * Search sort column 
+ */
+public class SortColumn
+{
+    public static final String ASCENDING = "ASC";
+    public static final String DESCENDING = "DESC";
+    
+    /**
+     * Constructor
+     * 
+     * @param column  column to sort on
+     * @param asc  sort direction
+     */
+    public SortColumn(String column, boolean asc)
+    {
+        this.column = column;
+        this.asc = asc;
+    }
+    
+    public String column;
+    public boolean asc;
+    
+    @Override
+    public String toString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("SortColumn [column=");
+        builder.append(this.column);
+        builder.append(", asc=");
+        builder.append(this.asc);
+        builder.append("]");
+        return builder.toString();
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/InvalidQueryException.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/InvalidQueryException.java
new file mode 100644
index 00000000000..b33e776b475
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/InvalidQueryException.java
@@ -0,0 +1,56 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.parameters.where;
+
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+
+/**
+ * Thrown when an invalid query syntax is used.
+ * 
+ * @author Gethin James
+ */
+public class InvalidQueryException extends InvalidArgumentException
+{
+    private static final long serialVersionUID = 8825573452685077660L;
+    public static String DEFAULT_MESSAGE_ID = "framework.exception.InvalidQuery";
+    private Object queryParam;
+
+	public InvalidQueryException() {
+		 super(DEFAULT_MESSAGE_ID);
+	}
+
+    public InvalidQueryException(Object queryParam)
+    {
+        super(DEFAULT_MESSAGE_ID, new Object[] {queryParam});
+        this.queryParam = queryParam;
+    }
+
+    public Object getQueryParam()
+    {
+        return queryParam;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/Query.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/Query.java
new file mode 100644
index 00000000000..b72f061a05c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/Query.java
@@ -0,0 +1,43 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.parameters.where;
+
+import org.antlr.runtime.tree.CommonTree;
+
+/**
+ * Represents a Query defined by a WHERE clause, passed in as a parameter in a GET call to the Rest api.
+ * 
+ * @author Gethin James
+ */
+public interface Query
+{
+    
+    /**
+     * Returns the list of operations
+     */
+    CommonTree getTree();
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/QueryHelper.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/QueryHelper.java
new file mode 100644
index 00000000000..65e951b6799
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/QueryHelper.java
@@ -0,0 +1,289 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.parameters.where;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.antlr.runtime.tree.CommonTree;
+import org.antlr.runtime.tree.Tree;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Provides helper methods for handling a WHERE query.
+ * 
+ * @author Gethin James
+ */
+public abstract class QueryHelper
+{
+    /**
+     * An interface used when walking a query tree.  Calls are made to methods when the particular clause is encountered.
+     */
+    public static interface WalkerCallback
+    {
+        /**
+         * Called any time an EXISTS clause is encountered.
+         * @param propertyName Name of the property
+         * @param negated returns true if "NOT EXISTS" was used
+         */
+        void exists(String propertyName, boolean negated);
+
+        /**
+         * Called any time a BETWEEN clause is encountered.
+         * @param propertyName Name of the property
+         * @param firstValue String
+         * @param secondValue String
+         * @param negated returns true if "NOT BETWEEN" was used
+         */
+        void between(String propertyName, String firstValue, String secondValue, boolean negated);
+
+        /**
+         * One of EQUALS LESSTHAN GREATERTHAN LESSTHANOREQUALS GREATERTHANOREQUALS;
+         */
+        void comparison(int type, String propertyName, String propertyValue, boolean negated);
+
+        /**
+         * Called any time an IN clause is encountered.
+         * @param property Name of the property
+         * @param negated returns true if "NOT IN" was used
+         * @param propertyValues the property values
+         */
+        void in(String property, boolean negated, String... propertyValues);
+
+        /**
+         * Called any time a MATCHES clause is encountered.
+         * @param property Name of the property
+         * @param propertyValue String
+         * @param negated returns true if "NOT MATCHES" was used
+         */
+        void matches(String property, String propertyValue, boolean negated);
+
+        /**
+         * Called any time an AND is encountered.
+         */  
+        void and();
+        /**
+         * Called any time an OR is encountered.
+         */  
+        void or();
+    }
+
+    /**
+     * Default implementation.  Override the methods you are interested in. If you don't
+     * override the methods then an InvalidQueryException will be thrown.
+     */
+    public static class WalkerCallbackAdapter implements WalkerCallback
+    {
+        private static final String UNSUPPORTED_TEXT = "Unsupported Predicate";
+        protected static final InvalidQueryException UNSUPPORTED = new InvalidQueryException(UNSUPPORTED_TEXT);
+
+        @Override
+        public void exists(String propertyName, boolean negated) { throw UNSUPPORTED;}
+        @Override
+        public void between(String propertyName, String firstValue, String secondValue, boolean negated) { throw UNSUPPORTED;}
+        @Override
+        public void comparison(int type, String propertyName, String propertyValue, boolean negated) { throw UNSUPPORTED;}
+        @Override
+        public void in(String propertyName, boolean negated, String... propertyValues) { throw UNSUPPORTED;}
+        @Override
+        public void matches(String property, String value, boolean negated)  { throw UNSUPPORTED;}
+        @Override
+        public void and() {throw UNSUPPORTED;}
+        @Override
+        public void or() {throw UNSUPPORTED;}
+    }
+
+    /**
+     * Walks a query with a callback for each operation
+     * @param query the query
+     * @param callback a callback
+     */
+    public static void walk(Query query, WalkerCallback callback)
+    {
+        CommonTree tree = query.getTree();
+        if (tree != null)
+        {
+            LinkedList<Tree> stack = new LinkedList<Tree>();
+            stack.push(tree);
+            callbackTree(tree, callback, false);
+        }
+    }
+
+    /**
+     * Processes a tree type and calls the corresponding callback method.
+     * @param tree Tree
+     * @param callback WalkerCallback
+     * @param negated boolean
+     */
+    protected static void callbackTree(Tree tree, WalkerCallback callback, boolean negated)
+    {
+        if (tree != null)
+        {
+            switch (tree.getType()) {
+            case WhereClauseParser.EXISTS:
+                if (WhereClauseParser.PROPERTYNAME == tree.getChild(0).getType())
+                {
+                    callback.exists(tree.getChild(0).getText(), negated);
+                    return;
+                }
+                break;
+            case WhereClauseParser.MATCHES:
+                if (WhereClauseParser.PROPERTYNAME == tree.getChild(0).getType())
+                {
+                    callback.matches(tree.getChild(0).getText(), stripQuotes(tree.getChild(1).getText()), negated);
+                    return;
+                }
+                break;
+            case WhereClauseParser.IN:
+                if (WhereClauseParser.PROPERTYNAME == tree.getChild(0).getType())
+                {
+                    List<Tree> children = getChildren(tree);
+                    //Don't need the first item because its the property name
+                    String[] inVals = new String[children.size()-1];
+                    for (int i = 1; i < children.size(); i++) 
+                    {
+                        inVals[i-1] = stripQuotes(children.get(i).getText());
+                    }
+                    callback.in(tree.getChild(0).getText(), negated, inVals);
+                    return;
+                }
+                break;
+            case WhereClauseParser.BETWEEN:
+                if (WhereClauseParser.PROPERTYNAME == tree.getChild(0).getType())
+                {
+                    callback.between(tree.getChild(0).getText(), stripQuotes(tree.getChild(1).getText()), stripQuotes(tree.getChild(2).getText()), negated);
+                    return;
+                }
+                break;
+            case WhereClauseParser.EQUALS: //fall through (comparison)
+            case WhereClauseParser.LESSTHAN: //fall through (comparison)
+            case WhereClauseParser.GREATERTHAN: //fall through (comparison)
+            case WhereClauseParser.LESSTHANOREQUALS: //fall through (comparison)
+            case WhereClauseParser.GREATERTHANOREQUALS:		
+                if (WhereClauseParser.PROPERTYNAME == tree.getChild(0).getType() &&
+                    WhereClauseParser.PROPERTYVALUE == tree.getChild(1).getType())
+                {
+                    callback.comparison(tree.getType(), tree.getChild(0).getText(), stripQuotes(tree.getChild(1).getText()), negated);
+                    return;
+                }
+                break;
+            case WhereClauseParser.NEGATION:
+                //Negate the next element
+                callbackTree(tree.getChild(0), callback, true);
+                return;
+            case WhereClauseParser.OR:
+                callback.or();
+                List<Tree> children = getChildren(tree);
+                for (Tree child : children) 
+                {
+                    callbackTree(child, callback, negated);
+                }
+                return;				
+            case WhereClauseParser.AND:
+                callback.and();
+                List<Tree> childrenOfAnd = getChildren(tree);
+                for (Tree child : childrenOfAnd) 
+                {
+                    callbackTree(child, callback, negated);
+                }
+                return;
+            default:
+            }
+            callbackTree(tree.getChild(0), callback, negated);  //Callback on the next node
+        }
+    }
+
+    /**
+     * Finds the siblings of the current tree item (does not include the current item)
+     * that are after it in the tree (but at the same level).
+     * @param tree the current tree
+     * @return siblings - all the elements at the same level in the tree
+     */
+    //    public static List<Tree> getYoungerSiblings(Tree tree) 
+    //    {
+    //    	Tree parent = tree.getParent();
+    //    	
+    //    	if (parent!=null && parent.getChildCount() > 0)
+    //    	{
+    //    		List<Tree> sibs = new ArrayList<Tree>(parent.getChildCount()-1);
+    //    		boolean laterChildren = false;
+    //    		for (int i = 0; i < parent.getChildCount(); i++) {
+    //    			Tree child = parent.getChild(i);
+    //    			if (tree.equals(child))
+    //    			{
+    //    				laterChildren = true;
+    //    			}
+    //    			else
+    //    			{
+    //    				if (laterChildren)	sibs.add(child);
+    //    			}
+    //			}
+    //    		return sibs;
+    //    	}
+    //    	
+    //
+    //	}
+
+    /**
+     * Gets the children as a List
+     * @param tree Tree
+     * @return either emptyList or the children.
+     */
+    public static List<Tree> getChildren(Tree tree)
+    {
+        if (tree!=null && tree.getChildCount() > 0)
+        {
+            List<Tree> children = new ArrayList<Tree>(tree.getChildCount());
+            for (int i = 0; i < tree.getChildCount(); i++) {
+                Tree child = tree.getChild(i);
+                children.add(child);
+            }
+            return children;
+        }
+
+        //Default
+        return Collections.emptyList();
+    }
+
+    private static final String SINGLE_QUOTE = "'";
+
+    /**
+     * Strips off any leading or trailing single quotes.
+     * @param toBeStripped String
+     * @return the String that has been stripped
+     */
+    public static String stripQuotes(String toBeStripped)
+    {
+        if (StringUtils.isNotEmpty(toBeStripped) && toBeStripped.startsWith(SINGLE_QUOTE) && toBeStripped.endsWith(SINGLE_QUOTE))
+        {
+            return toBeStripped.substring(1,toBeStripped.length()-1);
+        }
+        return toBeStripped; //default to return the String unchanged.
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/QueryImpl.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/QueryImpl.java
new file mode 100644
index 00000000000..ac35947516d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/QueryImpl.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.parameters.where;
+
+import org.antlr.runtime.tree.CommonTree;
+
+/**
+ * Represents a Query defined by a WHERE clause, passed in as a parameter in a GET call to the Rest api.
+ * @author Gethin James
+ */
+public class QueryImpl implements Query
+{
+    public static final Query EMPTY = new QueryImpl();
+    private final CommonTree tree;
+    
+    private QueryImpl()
+    {
+        super();
+        this.tree = null;
+    }
+
+    public QueryImpl(CommonTree tree) {
+        super();
+        this.tree = tree;
+	}
+    
+    @Override
+	public CommonTree getTree() {
+		return tree;
+	}
+
+	@Override
+	public String toString() {
+		return "QueryImpl [tree=" + tree + "]";
+	}
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/WhereCompiler.java b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/WhereCompiler.java
new file mode 100644
index 00000000000..b92115927ee
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/resource/parameters/where/WhereCompiler.java
@@ -0,0 +1,106 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.resource.parameters.where;
+
+import org.alfresco.rest.antlr.WhereClauseLexer;
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.antlr.runtime.ANTLRStringStream;
+import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.TokenStream;
+import org.antlr.runtime.tree.CommonTree;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Processes a String expression using Antlr, it uses the Where grammar for the public api.
+ */
+public class WhereCompiler {
+	
+    private static Log logger = LogFactory.getLog(WhereCompiler.class);
+    
+	public static CommonTree compileWhereClause(String expression) throws RecognitionException {
+		//lexer splits input into tokens
+		ANTLRStringStream input = new ANTLRStringStream(expression);
+		TokenStream tokens = new CommonTokenStream(new WhereClauseLexer(input));
+		
+		//parser generates abstract syntax tree
+		WhereClauseParser parser = new WhereClauseParser(tokens);
+	    WhereClauseParser.whereclause_return ret = parser.whereclause();
+		
+		//acquire parse result
+		CommonTree ast = (CommonTree) ret.getTree();
+		if (logger.isDebugEnabled()) print(ast, 0);
+		return ast;
+	}
+
+	public static CommonTree compileSelectClause(String selectParam)  throws RecognitionException {
+		//lexer splits input into tokens
+		ANTLRStringStream input = new ANTLRStringStream(selectParam);
+		TokenStream tokens = new CommonTokenStream(new WhereClauseLexer(input));
+		
+		//parser generates abstract syntax tree
+		WhereClauseParser parser = new WhereClauseParser(tokens);
+		WhereClauseParser.selectClause_return ret = parser.selectClause();
+		
+		//acquire parse result
+		CommonTree ast = (CommonTree) ret.getTree();
+		if (logger.isDebugEnabled()) print(ast, 0);
+		return ast;
+	}
+	
+	private static void print(CommonTree tree, int level) {
+		//indent level
+		for (int i = 0; i < level; i++)
+			logger.debug("--");
+
+		//print node description: type code followed by token text
+		logger.debug(" " + tree.getType() + " " + tree.getText());
+		
+		//print all children
+		if (tree.getChildren() != null)
+			for (Object ie : tree.getChildren()) {
+				print((CommonTree) ie, level + 1);
+			}
+	}
+	
+	/**
+	 * Returns a message based on the information in the RecognitionException
+	 * @param exception RecognitionException
+	 * @return String explaining the error
+	 */
+	public static String resolveMessage(RecognitionException exception)
+	{
+		if (exception != null)
+		{
+			return "Error at char position "+exception.charPositionInLine;
+		}
+		
+		return ""; //No message
+	}
+
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/tools/ApiAssistant.java b/remote-api/src/main/java/org/alfresco/rest/framework/tools/ApiAssistant.java
new file mode 100644
index 00000000000..4d2b137113c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/tools/ApiAssistant.java
@@ -0,0 +1,123 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tools;
+
+import org.alfresco.metrics.rest.RestMetricsReporter;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.exceptions.DefaultExceptionResolver;
+import org.alfresco.rest.framework.core.exceptions.ErrorResponse;
+import org.alfresco.rest.framework.core.exceptions.ExceptionResolver;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.*;
+
+import java.util.Map;
+
+/**
+ * Assists you in creating a great Rest API.
+ *
+ * @author Gethin James
+ */
+public class ApiAssistant {
+
+    private static Log logger = LogFactory.getLog(ApiAssistant.class);
+
+    private ExceptionResolver<Exception> defaultResolver = new DefaultExceptionResolver();
+    private ExceptionResolver<WebScriptException> webScriptExceptionResolver;
+    private ExceptionResolver<Exception> resolver;
+    private JacksonHelper jsonHelper;
+    private RestMetricsReporter restMetricsReporter;
+
+    /**
+     * Determines the api being used from the templateVars
+     * @param templateVars
+     * @return Api
+     */
+    public static Api determineApi(Map<String, String> templateVars)
+    {
+        String apiScope = templateVars.get("apiScope");
+        String apiVersion = templateVars.get("apiVersion");
+        String apiName = templateVars.get("apiName");
+        return Api.valueOf(apiName,apiScope,apiVersion);
+    }
+
+    /**
+     * Resolves an exception as a json error.
+     * @param exception
+     * @return ErrorResponse
+     */
+    public ErrorResponse resolveException(Exception ex)
+    {
+        ErrorResponse error = null;
+        if (ex instanceof WebScriptException)
+        {
+            error = webScriptExceptionResolver.resolveException((WebScriptException) ex);
+        }
+        else
+        {
+            error = resolver.resolveException(ex);
+        }
+        if (error == null)
+        {
+            error = defaultResolver.resolveException(ex);
+        }
+        return error;
+    }
+
+    public JacksonHelper getJsonHelper() {
+        return jsonHelper;
+    }
+
+    public void setDefaultResolver(ExceptionResolver<Exception> defaultResolver) {
+        this.defaultResolver = defaultResolver;
+    }
+
+    public void setWebScriptExceptionResolver(ExceptionResolver<WebScriptException> webScriptExceptionResolver) {
+        this.webScriptExceptionResolver = webScriptExceptionResolver;
+    }
+
+    public void setResolver(ExceptionResolver<Exception> resolver) {
+        this.resolver = resolver;
+    }
+
+    public void setJsonHelper(JacksonHelper jsonHelper) {
+        this.jsonHelper = jsonHelper;
+    }
+
+    /**
+     * @return null if the code is run in community mode
+     */
+    public RestMetricsReporter getRestMetricsReporter()
+    {
+        return restMetricsReporter;
+    }
+
+    public void setRestMetricsReporter(RestMetricsReporter restMetricsReporterImpl)
+    {
+        this.restMetricsReporter = restMetricsReporterImpl;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/tools/RecognizedParamsExtractor.java b/remote-api/src/main/java/org/alfresco/rest/framework/tools/RecognizedParamsExtractor.java
new file mode 100644
index 00000000000..bb952746816
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/tools/RecognizedParamsExtractor.java
@@ -0,0 +1,484 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.tools;
+
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.jacksonextensions.BeanPropertiesFilter;
+import org.alfresco.rest.framework.resource.parameters.InvalidSelectException;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.rest.framework.resource.parameters.where.InvalidQueryException;
+import org.alfresco.rest.framework.resource.parameters.where.Query;
+import org.alfresco.rest.framework.resource.parameters.where.QueryImpl;
+import org.alfresco.rest.framework.resource.parameters.where.WhereCompiler;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.tree.CommonErrorNode;
+import org.antlr.runtime.tree.CommonTree;
+import org.antlr.runtime.tree.RewriteCardinalityException;
+import org.antlr.runtime.tree.Tree;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+/*
+ * Extracts recognized parameters from the HTTP request.
+ *
+ * @author Gethin James
+ */
+public interface RecognizedParamsExtractor
+{
+    public static final String PARAM_RELATIONS = "relations";
+    public static final String PARAM_FILTER_FIELDS = "fields";
+
+    @Deprecated
+    public static final String PARAM_FILTER_PROPERTIES = "properties";
+
+    public static final String PARAM_PAGING_SKIP = "skipCount";
+    public static final String PARAM_PAGING_MAX = "maxItems";
+    public static final String PARAM_ORDERBY = "orderBy";
+    public static final String PARAM_WHERE = "where";
+    public static final String PARAM_SELECT = "select";
+    public static final String PARAM_INCLUDE = "include";
+    public static final String PARAM_INCLUDE_SOURCE_ENTITY = "includeSource";
+    public static final List<String> KNOWN_PARAMS = Arrays
+                .asList(PARAM_RELATIONS, PARAM_FILTER_PROPERTIES, PARAM_FILTER_FIELDS, PARAM_PAGING_SKIP, PARAM_PAGING_MAX, PARAM_ORDERBY,
+                            PARAM_WHERE, PARAM_SELECT, PARAM_INCLUDE_SOURCE_ENTITY);
+
+    default Log rpeLogger()
+    {
+        return LogFactory.getLog(this.getClass());
+    }
+
+    /**
+     * Finds the formal set of params that any rest service could potentially have passed in as request params
+     *
+     * @param req WebScriptRequest
+     * @return RecognizedParams a POJO containing the params for use with the Params objects
+     */
+    default Params.RecognizedParams getRecognizedParams(WebScriptRequest req)
+    {
+        Paging paging = findPaging(req);
+        List<SortColumn> sorting = getSort(req.getParameter(PARAM_ORDERBY));
+        Map<String, BeanPropertiesFilter> relationFilter = getRelationFilter(req.getParameter(PARAM_RELATIONS));
+        Query whereQuery = getWhereClause(req.getParameter(PARAM_WHERE));
+        Map<String, String[]> requestParams = getRequestParameters(req);
+        boolean includeSource = Boolean.valueOf(req.getParameter(PARAM_INCLUDE_SOURCE_ENTITY));
+
+        List<String> includedFields = getIncludeClause(req.getParameter(PARAM_INCLUDE));
+        List<String> selectFields = getSelectClause(req.getParameter(PARAM_SELECT));
+
+        String fields = req.getParameter(PARAM_FILTER_FIELDS);
+        String properties = req.getParameter(PARAM_FILTER_PROPERTIES);
+
+        if ((fields != null) && (properties != null))
+        {
+            if (rpeLogger().isWarnEnabled())
+            {
+                rpeLogger().warn("Taking 'fields' param [" + fields + "] and ignoring deprecated 'properties' param [" + properties + "]");
+            }
+        }
+
+        BeanPropertiesFilter filter = getFilter((fields != null ? fields : properties), includedFields);
+
+        return new Params.RecognizedParams(requestParams, paging, filter, relationFilter, includedFields, selectFields, whereQuery, sorting,
+                    includeSource);
+    }
+
+    /**
+     * Takes the web request and looks for a "fields" parameter (otherwise deprecated "properties" parameter).
+     * Parses the parameter and produces a list of bean properties to use as a filter A
+     * SimpleBeanPropertyFilter it returned that uses the bean properties. If no
+     * filter param is set then a default BeanFilter is returned that will never
+     * filter fields (ie. Returns all bean properties).
+     * If selectList is provided then it will take precedence (ie. be included) over the fields/properties filter
+     * for top-level entries (bean properties).
+     * For example, this will return entries from both select & properties, eg.
+     * select=abc,def&properties=id,name,ghi
+     * Note: it should be noted that API-generic "fields" clause does not currently work for sub-entries.
+     * Hence, even if the API-specific "select" clause allows selection of a sub-entries this cannot be used
+     * with "fields" filtering. For example, an API-specific method may implement and return "abc/blah", eg.
+     * select=abc/blah
+     * However the following will not return "abc/blah" if used with fields filtering, eg.
+     * select=abc/blah&fields=id,name,ghi
+     * If fields filtering is desired then it would require "abc" to be selected and returned as a whole, eg.
+     * select=abc&fields=id,name,ghi
+     *
+     * @param filterParams
+     * @param selectList
+     * @return
+     */
+    default BeanPropertiesFilter getFilter(String filterParams, List<String> selectList)
+    {
+        if (filterParams != null)
+        {
+            StringTokenizer st = new StringTokenizer(filterParams, ",");
+            Set<String> filteredProperties = new HashSet<String>(st.countTokens());
+            while (st.hasMoreTokens())
+            {
+                filteredProperties.add(st.nextToken().trim());
+            }
+
+            // if supplied, the select takes precedence over the filter (fields/properties) for top-level bean properties
+            if (selectList != null)
+            {
+                for (String select : selectList)
+                {
+                    String[] split = select.split("/");
+                    filteredProperties.add(split[0]);
+                }
+            }
+
+            rpeLogger().debug("Filtering using the following properties: " + filteredProperties);
+            BeanPropertiesFilter filter = new BeanPropertiesFilter(filteredProperties);
+            return filter;
+        }
+        return BeanPropertiesFilter.ALLOW_ALL;
+    }
+
+    /**
+     * Takes the "select" parameter and turns it into a List<String> property names
+     *
+     * @param selectParam String
+     * @return bean property names potentially using JSON Pointer syntax
+     */
+    @SuppressWarnings("unchecked")
+    @Deprecated
+    default List<String> getSelectClause(String selectParam) throws InvalidArgumentException
+    {
+        return getClause(selectParam, "SELECT");
+    }
+
+    /**
+     * Takes the "include" parameter and turns it into a List<String> property names
+     *
+     * @param includeParam String
+     * @return bean property names potentially using JSON Pointer syntax
+     */
+    @SuppressWarnings("unchecked")
+    default List<String> getIncludeClause(String includeParam) throws InvalidArgumentException
+    {
+        return getClause(includeParam, "INCLUDE");
+    }
+
+    /**
+     * Gets the clause specificed in paramName
+     *
+     * @param param
+     * @param paramName
+     * @return bean property names potentially using JSON Pointer syntax
+     */
+    default List<String> getClause(String param, String paramName)
+    {
+        if (param == null)
+            return Collections.emptyList();
+
+        try
+        {
+            CommonTree selectedPropsTree = WhereCompiler.compileSelectClause(param);
+            if (selectedPropsTree instanceof CommonErrorNode)
+            {
+                rpeLogger().debug("Error parsing the " + paramName + " clause " + selectedPropsTree);
+                throw new InvalidSelectException(paramName, selectedPropsTree);
+            }
+            if (selectedPropsTree.getChildCount() == 0 && !selectedPropsTree.getText().isEmpty())
+            {
+                return Arrays.asList(selectedPropsTree.getText());
+            }
+            List<Tree> children = (List<Tree>) selectedPropsTree.getChildren();
+            if (children != null && !children.isEmpty())
+            {
+                List<String> properties = new ArrayList<String>(children.size());
+                for (Tree child : children)
+                {
+                    properties.add(child.getText());
+                }
+                return properties;
+            }
+        }
+        catch (RewriteCardinalityException re)
+        {
+            //Catch any error so it doesn't get thrown up the stack
+            rpeLogger().debug("Unhandled Error parsing the " + paramName + " clause: " + re);
+        }
+        catch (RecognitionException e)
+        {
+            rpeLogger().debug("Error parsing the \"+paramName+\" clause: " + param);
+        }
+        catch (InvalidQueryException iqe)
+        {
+            throw new InvalidSelectException(paramName, iqe.getQueryParam());
+        }
+        //Default to throw out an invalid query
+        throw new InvalidSelectException(paramName, param);
+    }
+
+    /**
+     * Takes the "where" parameter and turns it into a Java Object that can be used for querying
+     *
+     * @param whereParam String
+     * @return Query a parsed version of the where clause, represented in Java
+     */
+    default Query getWhereClause(String whereParam) throws InvalidQueryException
+    {
+        if (whereParam == null)
+            return QueryImpl.EMPTY;
+
+        try
+        {
+            CommonTree whereTree = WhereCompiler.compileWhereClause(whereParam);
+            if (whereTree instanceof CommonErrorNode)
+            {
+                rpeLogger().debug("Error parsing the WHERE clause " + whereTree);
+                throw new InvalidQueryException(whereTree);
+            }
+            return new QueryImpl(whereTree);
+        }
+        catch (RewriteCardinalityException re)
+        {  //Catch any error so it doesn't get thrown up the stack
+            rpeLogger().info("Unhandled Error parsing the WHERE clause: " + re);
+        }
+        catch (RecognitionException e)
+        {
+            whereParam += ", " + WhereCompiler.resolveMessage(e);
+            rpeLogger().info("Error parsing the WHERE clause: " + whereParam);
+        }
+        //Default to throw out an invalid query
+        throw new InvalidQueryException(whereParam);
+    }
+
+    /**
+     * Takes the Sort parameter as a String and parses it into a List of SortColumn objects.
+     * The format is a comma seperated list of "columnName sortDirection",
+     * e.g. "name DESC, age ASC".  It is not case sensitive and the sort direction is optional
+     * It default to sort ASCENDING.
+     *
+     * @param sortParams - String passed in on the request
+     * @return - the sort columns or an empty list if the params were invalid.
+     */
+    default List<SortColumn> getSort(String sortParams)
+    {
+        if (sortParams != null)
+        {
+            StringTokenizer st = new StringTokenizer(sortParams, ",");
+            List<SortColumn> sortedColumns = new ArrayList<SortColumn>(st.countTokens());
+            while (st.hasMoreTokens())
+            {
+                String token = st.nextToken();
+                StringTokenizer columnDesc = new StringTokenizer(token, " ");
+                if (columnDesc.countTokens() <= 2)
+                {
+                    String columnName = columnDesc.nextToken();
+                    String sortOrder = SortColumn.ASCENDING;
+                    if (columnDesc.hasMoreTokens())
+                    {
+                        String sortDef = columnDesc.nextToken().toUpperCase();
+                        if (SortColumn.ASCENDING.equals(sortDef) || SortColumn.DESCENDING.equals(sortDef))
+                        {
+                            sortOrder = sortDef;
+                        }
+                        else
+                        {
+                            rpeLogger().debug("Invalid sort order direction (" + sortDef + ").  Valid values are " + SortColumn.ASCENDING + " or "
+                                        + SortColumn.DESCENDING + ".");
+                            throw new InvalidArgumentException("Unknown sort order direction '"+sortDef+"', expected asc or desc");
+                        }
+                    }
+                    sortedColumns.add(new SortColumn(columnName, SortColumn.ASCENDING.equals(sortOrder)));
+                }
+                else
+                {
+                    rpeLogger().debug("Invalid sort order definition (" + token + ")");
+                    throw new InvalidArgumentException("Unknown sort order definition '" + token + "', expected 'field1,field2' or 'field1 asc,field2 desc' or similar");
+                }
+                // filteredProperties.add();
+            }
+            //            logger.debug("Filtering using the following properties: " + filteredProperties);
+            //            BeanPropertiesFilter filter = new BeanPropertiesFilter(filteredProperties);
+            return sortedColumns;
+        }
+        return Collections.emptyList();
+    }
+
+    /**
+     * Find paging setings based on the request parameters.
+     *
+     * @param req
+     * @return Paging
+     */
+    default Paging findPaging(WebScriptRequest req)
+    {
+        String skip = req.getParameter(PARAM_PAGING_SKIP);
+        String maxItems = req.getParameter(PARAM_PAGING_MAX);
+
+        return getPaging(skip,maxItems);
+    }
+
+    /**
+     * Gets the default paging object
+     * @param skip
+     * @param maxItems
+     * @return
+     */
+    default Paging getPaging(String skip, String maxItems)
+    {
+        int skipped = Paging.DEFAULT_SKIP_COUNT;
+        int max = Paging.DEFAULT_MAX_ITEMS;
+
+        try
+        {
+            if (skip != null) { skipped = Integer.parseInt(skip);}
+            if (maxItems != null) { max = Integer.parseInt(maxItems); }
+            if (skipped < 0)
+            {
+                throw new InvalidArgumentException("Negative values not supported for skipCount.");
+            }
+            if (max < 1)
+            {
+                throw new InvalidArgumentException("Only positive values supported for maxItems.");
+            }
+        }
+        catch (NumberFormatException error)
+        {
+            String errorMsg = "Invalid paging parameters skipCount: " + skip + ", maxItems:" + maxItems;
+            if (rpeLogger().isDebugEnabled())
+            {
+                rpeLogger().debug(errorMsg);
+            }
+            if (skip == null)
+            {
+                errorMsg = "Invalid paging parameter maxItems:" + maxItems;
+            }
+            if (maxItems == null)
+            {
+                errorMsg = "Invalid paging parameter skipCount:" + skip;
+            }
+            throw new InvalidArgumentException(errorMsg);
+        }
+
+        return Paging.valueOf(skipped, max);
+    }
+
+    /**
+     * Takes the web request and looks for a "fields" parameter  (otherwise deprecated "properties" parameter).
+     * Parses the parameter and produces a list of bean properties to use as a filter A
+     * SimpleBeanPropertyFilter it returned that uses the bean properties. If no
+     * filter param is set then a default BeanFilter is returned that will never
+     * filter fields (ie. Returns all bean properties).
+     *
+     * @param filterParams String
+     * @return BeanPropertyFilter - if no parameter then returns a new
+     * ReturnAllBeanProperties class
+     */
+    default BeanPropertiesFilter getFilter(String filterParams)
+    {
+        return getFilter(filterParams, null);
+    }
+
+    /**
+     * Takes the web request and looks for a "relations" parameter Parses the
+     * parameter and produces a list of bean properties to use as a filter A
+     * SimpleBeanPropertiesFilter it returned that uses the properties If no
+     * filter param is set then a default BeanFilter is returned that will never
+     * filter properties (ie. Returns all bean properties).
+     *
+     * @param filterParams String
+     * @return BeanPropertiesFilter - if no parameter then returns a new
+     * ReturnAllBeanProperties class
+     */
+    default Map<String, BeanPropertiesFilter> getRelationFilter(String filterParams)
+    {
+        if (filterParams != null)
+        {
+            // Split by a comma when not in a bracket
+            String[] relations = filterParams.split(",(?![^()]*+\\))");
+            Map<String, BeanPropertiesFilter> filterMap = new HashMap<String, BeanPropertiesFilter>(relations.length);
+
+            for (String relation : relations)
+            {
+                int bracketLocation = relation.indexOf("(");
+                if (bracketLocation != -1)
+                {
+                    // We have properties
+                    String relationKey = relation.substring(0, bracketLocation);
+                    String props = relation.substring(bracketLocation + 1, relation.length() - 1);
+                    filterMap.put(relationKey, getFilter(props));
+                }
+                else
+                {
+                    // no properties so just get the String
+                    filterMap.put(relation, getFilter(null));
+                }
+            }
+            return filterMap;
+        }
+        return Collections.emptyMap();
+    }
+
+    /**
+     * Finds all request parameters that aren't already know about (eg. not paging or filter params)
+     * and returns them for use.
+     *
+     * @param req - the WebScriptRequest object
+     * @return the request parameters
+     */
+    default Map<String, String[]> getRequestParameters(WebScriptRequest req)
+    {
+        if (req != null)
+        {
+            String[] paramNames = req.getParameterNames();
+            if (paramNames != null)
+            {
+                Map<String, String[]> requestParameteters = new HashMap<String, String[]>(paramNames.length);
+
+                for (int i = 0; i < paramNames.length; i++)
+                {
+                    String paramName = paramNames[i];
+                    if (!KNOWN_PARAMS.contains(paramName))
+                    {
+                        String[] vals = req.getParameterValues(paramName);
+                        requestParameteters.put(paramName, vals);
+                    }
+                }
+                return requestParameteters;
+            }
+        }
+
+        return Collections.emptyMap();
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/tools/RequestReader.java b/remote-api/src/main/java/org/alfresco/rest/framework/tools/RequestReader.java
new file mode 100644
index 00000000000..33243109fd3
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/tools/RequestReader.java
@@ -0,0 +1,102 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.tools;
+
+import com.fasterxml.jackson.databind.JsonMappingException;
+import org.alfresco.rest.framework.core.exceptions.ApiException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.List;
+
+/*
+ * Reads information from the request
+ *
+ * @author Gethin James
+ */
+public interface RequestReader
+{
+    /**
+     * Extracts the body contents from the request
+     *
+     * @param req          the request
+     * @param jsonHelper   Jackson Helper
+     * @param requiredType the type to return
+     * @return the Object in the required type
+     */
+    default <T> T extractJsonContent(WebScriptRequest req, JacksonHelper jsonHelper, Class<T> requiredType)
+    {
+        Reader reader;
+        try
+        {
+            reader = req.getContent().getReader();
+            return jsonHelper.construct(reader, requiredType);
+        }
+        catch (JsonMappingException e)
+        {
+            rrLogger().warn("Could not read content from HTTP request body.", e);
+            throw new InvalidArgumentException("Could not read content from HTTP request body.");
+        }
+        catch (IOException e)
+        {
+            throw new ApiException("Could not read content from HTTP request body.", e.getCause());
+        }
+    }
+
+    /**
+     * Extracts the body contents from the request as a List, the JSON can be an array or just a single value without the [] symbols
+     *
+     * @param req          the request
+     * @param jsonHelper   Jackson Helper
+     * @param requiredType the type to return (without the List param)
+     * @return A List of "Object" as the required type
+     */
+    default <T> List<T> extractJsonContentAsList(WebScriptRequest req, JacksonHelper jsonHelper, Class<T> requiredType)
+    {
+        Reader reader;
+        try
+        {
+            reader = req.getContent().getReader();
+            return jsonHelper.constructList(reader, requiredType);
+        }
+        catch (IOException e)
+        {
+            throw new ApiException("Could not read content from HTTP request body.", e.getCause());
+        }
+    }
+
+    default Log rrLogger()
+    {
+        return LogFactory.getLog(this.getClass());
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/tools/ResponseWriter.java b/remote-api/src/main/java/org/alfresco/rest/framework/tools/ResponseWriter.java
new file mode 100644
index 00000000000..baa4a0282ba
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/tools/ResponseWriter.java
@@ -0,0 +1,262 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.tools;
+
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.exceptions.DefaultExceptionResolver;
+import org.alfresco.rest.framework.core.exceptions.ErrorResponse;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.jacksonextensions.BeanPropertiesFilter;
+import org.alfresco.rest.framework.jacksonextensions.ExecutionResult;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
+import org.alfresco.rest.framework.resource.SerializablePagedCollection;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.content.ContentInfo;
+import org.alfresco.rest.framework.resource.content.ContentInfoImpl;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.simple.JSONObject;
+import org.springframework.beans.BeanUtils;
+import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.extensions.webscripts.*;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletResponse;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/*
+ * Writes to the response
+ *
+ * @author Gethin James
+ */
+public interface ResponseWriter
+{
+
+    String UTF8 = "UTF-8";
+    ContentInfo DEFAULT_JSON_CONTENT = new ContentInfoImpl(Format.JSON.mimetype(), UTF8, 0, null);
+    Cache CACHE_NEVER = new Cache(new Description.RequiredCache()
+    {
+        @Override
+        public boolean getNeverCache()
+        {
+            return true;
+        }
+
+        @Override
+        public boolean getIsPublic()
+        {
+            return false;
+        }
+
+        @Override
+        public boolean getMustRevalidate()
+        {
+            return true;
+        }
+    });
+
+    final WithResponse DEFAULT_SUCCESS = new WithResponse(Status.STATUS_OK, DEFAULT_JSON_CONTENT, CACHE_NEVER);
+
+    default Log resWriterLogger()
+    {
+        return LogFactory.getLog(this.getClass());
+    }
+
+    /**
+     * Sets the response headers with any information we know about the content
+     *
+     * @param res         WebScriptResponse
+     * @param contentInfo Content Information
+     */
+    default void setContentInfoOnResponse(WebScriptResponse res, ContentInfo contentInfo)
+    {
+        if (contentInfo != null)
+        {
+            //Set content info on the response
+            res.setContentType(contentInfo.getMimeType());
+            res.setContentEncoding(contentInfo.getEncoding());
+
+            if (res instanceof WrappingWebScriptResponse)
+            {
+                WrappingWebScriptResponse wrappedRes = ((WrappingWebScriptResponse) res);
+                res = wrappedRes.getNext();
+            }
+
+            if (res instanceof WebScriptServletResponse)
+            {
+                WebScriptServletResponse servletResponse = (WebScriptServletResponse) res;
+                if (contentInfo.getLength() > 0)
+                {
+                    if (contentInfo.getLength() > 0 && contentInfo.getLength() < Integer.MAX_VALUE)
+                    {
+                        servletResponse.getHttpServletResponse().setContentLength((int) contentInfo.getLength());
+                    }
+                }
+                if (contentInfo.getLocale() != null)
+                {
+                    servletResponse.getHttpServletResponse().setLocale(contentInfo.getLocale());
+                }
+            }
+        }
+    }
+
+    /**
+     * The response status must be set before the response is written by Jackson (which will by default close and commit the response).
+     * In a r/w txn, web script buffered responses ensure that it doesn't really matter but for r/o txns this is important.
+     * If you set content information via the contentInfo object and ALSO the headers then "headers" will win because they are
+     * set last.
+     *
+     * @param res
+     * @param status
+     * @param cache
+     * @param contentInfo
+     * @param headers
+     */
+    default void setResponse(final WebScriptResponse res, int status, Cache cache, ContentInfo contentInfo, Map<String, List<String>> headers)
+    {
+        res.setStatus(status);
+        if (cache != null) res.setCache(cache);
+        setContentInfoOnResponse(res,contentInfo);
+        if (headers != null && !headers.isEmpty())
+        {
+            for (Map.Entry<String, List<String>> header : headers.entrySet())
+            {
+                for (int i = 0; i < header.getValue().size(); i++)
+                {
+                    if (i == 0)
+                    {
+                        //If its the first one then set the header overwriting.
+                        res.setHeader(header.getKey(), header.getValue().get(i));
+                    }
+                    else
+                    {
+                        //If its not the first one than update the header
+                        res.addHeader(header.getKey(), header.getValue().get(i));
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Sets the response using the WithResponse object
+     *
+     * @param res
+     * @param withResponse
+     */
+    default void setResponse(final WebScriptResponse res, WithResponse withResponse)
+    {
+        setResponse(res, withResponse.getStatus(), withResponse.getCache(), withResponse.getContentInfo(), withResponse.getHeaders());
+    }
+
+    /**
+     * Renders a JSON error response
+     *
+     * @param errorResponse The error
+     * @param res           web script response
+     * @throws IOException
+     */
+    default void renderErrorResponse(final ErrorResponse errorResponse, final WebScriptResponse res, final JacksonHelper jsonHelper)
+                throws IOException
+    {
+
+        String logId = "";
+
+        if (Status.STATUS_INTERNAL_SERVER_ERROR == errorResponse.getStatusCode() || resWriterLogger().isDebugEnabled())
+        {
+            logId = org.alfresco.util.GUID.generate();
+            resWriterLogger().error(logId + " : " + errorResponse.getStackTrace());
+        }
+
+        String stackMessage = I18NUtil.getMessage(DefaultExceptionResolver.STACK_MESSAGE_ID);
+
+        final ErrorResponse errorToWrite = new ErrorResponse(errorResponse.getErrorKey(), errorResponse.getStatusCode(),
+                    errorResponse.getBriefSummary(), stackMessage, logId, errorResponse.getAdditionalState(), DefaultExceptionResolver.ERROR_URL);
+
+        setContentInfoOnResponse(res, DEFAULT_JSON_CONTENT);
+
+        // Status must be set before the response is written by Jackson (which will by default close and commit the response).
+        // In a r/w txn, web script buffered responses ensure that it doesn't really matter but for r/o txns this is important.
+        res.setStatus(errorToWrite.getStatusCode());
+
+        jsonHelper.withWriter(res.getOutputStream(), new JacksonHelper.Writer()
+        {
+            @SuppressWarnings("unchecked")
+            @Override
+            public void writeContents(JsonGenerator generator, ObjectMapper objectMapper)
+                        throws JsonGenerationException, JsonMappingException, IOException
+            {
+                JSONObject obj = new JSONObject();
+                obj.put("error", errorToWrite);
+                objectMapper.writeValue(generator, obj);
+            }
+        });
+    }
+
+    /**
+     * Renders an exception to the output stream as Json.
+     *
+     * @param exception
+     * @param response
+     * @throws IOException
+     */
+    default void renderException(final Exception exception, final WebScriptResponse response, final ApiAssistant assistant) throws IOException
+    {
+        renderErrorResponse(assistant.resolveException(exception), response, assistant.getJsonHelper());
+    }
+
+    /**
+     * Renders the result of an execution.
+     *
+     * @param res         WebScriptResponse
+     * @param toSerialize result of an execution
+     * @throws IOException
+     */
+    default void renderJsonResponse(final WebScriptResponse res, final Object toSerialize, final JacksonHelper jsonHelper) throws IOException
+    {
+        jsonHelper.withWriter(res.getOutputStream(), new JacksonHelper.Writer()
+        {
+            @Override
+            public void writeContents(JsonGenerator generator, ObjectMapper objectMapper)
+                        throws JsonGenerationException, JsonMappingException, IOException
+            {
+                objectMapper.writeValue(generator, toSerialize);
+            }
+        });
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java
new file mode 100644
index 00000000000..a6b32852261
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java
@@ -0,0 +1,309 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.webscripts;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.metrics.rest.RestMetricsReporter;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.web.scripts.BufferedRequest;
+import org.alfresco.repo.web.scripts.content.ContentStreamer;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.HttpMethodSupport;
+import org.alfresco.rest.framework.core.ResourceInspector;
+import org.alfresco.rest.framework.core.ResourceLocator;
+import org.alfresco.rest.framework.core.ResourceOperation;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.core.exceptions.ApiException;
+import org.alfresco.rest.framework.resource.actions.ActionExecutor;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.content.CacheDirective;
+import org.alfresco.rest.framework.resource.content.ContentInfo;
+import org.alfresco.rest.framework.resource.content.FileBinaryResource;
+import org.alfresco.rest.framework.resource.content.NodeBinaryResource;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.tools.ResponseWriter;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.http.HttpMethod;
+
+/**
+ * Webscript that handles the request for and execution of a Resource
+ * 
+ * 1) Finds a resource
+ * 2) Extracts params
+ * 3) Executes params on a resource
+ * 4) Post processes the response to add embeds or projected relationship
+ * 5) Renders the response
+ * 
+ * @author Gethin James
+ * @author janv
+ */
+// TODO for requests that pass in input streams e.g. binary content for workflow, this is going to need a way to re-read the input stream a la
+// code in RepositoryContainer due to retrying transaction logic
+public abstract class AbstractResourceWebScript extends ApiWebScript implements HttpMethodSupport, ActionExecutor, ResponseWriter
+{
+    private static Log logger = LogFactory.getLog(AbstractResourceWebScript.class);
+
+    protected ResourceLocator locator;
+    private HttpMethod httpMethod;
+    private ParamsExtractor paramsExtractor;
+    private ContentStreamer streamer;
+    protected ResourceWebScriptHelper helper;
+
+    @SuppressWarnings("rawtypes")
+    @Override
+    public void execute(final Api api, final WebScriptRequest req, final WebScriptResponse res) throws IOException
+    {
+        long startTime = System.currentTimeMillis();
+        
+        try
+        {
+            final Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+            final ResourceWithMetadata resource = locator.locateResource(api,templateVars, httpMethod);
+            final boolean isReadOnly = HttpMethod.GET==httpMethod;
+
+            // MNT-20308 - allow write transactions for authentication api
+            RetryingTransactionHelper transHelper = getTransactionHelper(resource.getMetaData().getApi().getName());
+
+            // encapsulate script within transaction
+            RetryingTransactionHelper.RetryingTransactionCallback<Object> work = new RetryingTransactionHelper.RetryingTransactionCallback<Object>()
+            {
+                @Override
+                public Object execute() throws Throwable
+                {
+                    try
+                    {
+                        final Params params = paramsExtractor.extractParams(resource.getMetaData(), req);
+                        return AbstractResourceWebScript.this.execute(resource, params, res, isReadOnly);
+                    }
+                    catch (Exception e)
+                    {
+                        if (req instanceof BufferedRequest)
+                        {
+                            // Reset the request in case of a transaction retry
+                            ((BufferedRequest) req).reset();
+                        }
+
+                        // re-throw original exception for retry
+                        throw e;
+                    }
+                }
+            };
+
+            //This execution usually takes place in a Retrying Transaction (see subclasses)
+            final Object toSerialize = transHelper.doInTransaction(work, isReadOnly, true);
+
+            //Outside the transaction.
+            if (toSerialize != null)
+            {
+                if (toSerialize instanceof BinaryResource)
+                {
+                    // TODO review (experimental) - can we move earlier & wrap complete execute ? Also for QuickShare (in MT/Cloud) needs to be tenant for the nodeRef (TBC).
+                    boolean noAuth = false;
+
+                    if (BinaryResourceAction.Read.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        noAuth = resource.getMetaData().isNoAuth(BinaryResourceAction.Read.class);
+                    }
+                    else if (RelationshipResourceBinaryAction.Read.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        noAuth = resource.getMetaData().isNoAuth(RelationshipResourceBinaryAction.Read.class);
+                    }
+                    else
+                    {
+                        logger.warn("Unexpected");
+                    }
+
+                    if (noAuth)
+                    {
+                        String networkTenantDomain = TenantUtil.getCurrentDomain();
+
+                        TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork<Void>()
+                        {
+                            public Void doWork() throws Exception
+                            {
+                                streamResponse(req, res, (BinaryResource) toSerialize);
+                                return null;
+                            }
+                        }, networkTenantDomain);
+                    }
+                    else
+                    {
+                        streamResponse(req, res, (BinaryResource) toSerialize);
+                    }
+                }
+                else
+                {
+                    renderJsonResponse(res, toSerialize, assistant.getJsonHelper());
+                }
+            }
+
+        }
+        catch (AlfrescoRuntimeException | ApiException | WebScriptException xception )
+        {
+            renderException(xception, res, assistant);
+        }
+        catch (RuntimeException runtimeException)
+        {
+            renderException(runtimeException, res, assistant);
+        }
+        finally
+        {
+            reportExecutionTimeMetric(startTime, req.getServicePath());
+        }
+    }
+
+    public Object execute(final ResourceWithMetadata resource, final Params params, final WebScriptResponse res, boolean isReadOnly)
+    {
+        final String entityCollectionName = ResourceInspector.findEntityCollectionNameName(resource.getMetaData());
+        final ResourceOperation operation = resource.getMetaData().getOperation(getHttpMethod());
+        final WithResponse callBack = new WithResponse(operation.getSuccessStatus(), DEFAULT_JSON_CONTENT,CACHE_NEVER);
+
+        // MNT-20308 - allow write transactions for authentication api
+        RetryingTransactionHelper transHelper = getTransactionHelper(resource.getMetaData().getApi().getName());
+
+        Object toReturn = transHelper.doInTransaction(
+                new RetryingTransactionHelper.RetryingTransactionCallback<Object>()
+                {
+                    @Override
+                    public Object execute() throws Throwable
+                    {
+
+                        Object result = executeAction(resource, params, callBack);
+                        if (result instanceof BinaryResource)
+                        {
+                            return result; //don't postprocess it.
+                        }
+        return helper.processAdditionsToTheResponse(res, resource.getMetaData().getApi(), entityCollectionName, params, result);
+                    }
+                }, isReadOnly, false);
+        setResponse(res,callBack);
+        return toReturn;
+    }
+
+    protected RetryingTransactionHelper getTransactionHelper(String api)
+    {
+        RetryingTransactionHelper transHelper = transactionService.getRetryingTransactionHelper();
+        if (api.equals("authentication"))
+        {
+            transHelper.setForceWritable(true);
+        }
+        return transHelper;
+    }
+
+    protected void streamResponse(final WebScriptRequest req, final WebScriptResponse res, BinaryResource resource) throws IOException
+    {
+        if (resource instanceof FileBinaryResource)
+        {
+            FileBinaryResource fileResource = (FileBinaryResource) resource;
+            // if requested, set attachment
+            boolean attach = StringUtils.isNotEmpty(fileResource.getAttachFileName());
+            Map<String, Object> model = getModelForCacheDirective(fileResource.getCacheDirective());
+            streamer.streamContent(req, res, fileResource.getFile(), null, attach, fileResource.getAttachFileName(), model);
+        }
+        else if (resource instanceof NodeBinaryResource)
+        {
+            NodeBinaryResource nodeResource = (NodeBinaryResource) resource;
+            ContentInfo contentInfo = nodeResource.getContentInfo();
+            setContentInfoOnResponse(res, contentInfo);
+            // if requested, set attachment
+            boolean attach = StringUtils.isNotEmpty(nodeResource.getAttachFileName());
+            Map<String, Object> model = getModelForCacheDirective(nodeResource.getCacheDirective());
+            streamer.streamContent(req, res, nodeResource.getNodeRef(), nodeResource.getPropertyQName(), attach, nodeResource.getAttachFileName(), model);
+        }
+
+    }
+
+    private void reportExecutionTimeMetric(final long startTime, final String servicePath)
+    {
+        try
+        {
+            final RestMetricsReporter restMetricsReporter = assistant.getRestMetricsReporter();
+            if (restMetricsReporter != null)
+            {
+                long delta = System.currentTimeMillis() - startTime;
+                restMetricsReporter.reportRestRequestExecutionTime(delta, httpMethod.toString(), servicePath);
+            }
+        }
+        catch (Exception e)
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Could not report rest api metric:" + e.getMessage(), e);
+            }
+        }
+    }
+
+    private static Map<String, Object> getModelForCacheDirective(CacheDirective cacheDirective)
+    {
+        if (cacheDirective != null)
+        {
+            return Collections.singletonMap(ContentStreamer.KEY_CACHE_DIRECTIVE, (Object) cacheDirective);
+        }
+        return null;
+    }
+
+    public void setLocator(ResourceLocator locator)
+    {
+        this.locator = locator;
+    }
+
+    public void setHttpMethod(HttpMethod httpMethod)
+    {
+        this.httpMethod = httpMethod;
+    }
+
+    public void setParamsExtractor(ParamsExtractor paramsExtractor)
+    {
+        this.paramsExtractor = paramsExtractor;
+    }
+
+    public void setHelper(ResourceWebScriptHelper helper)
+    {
+        this.helper = helper;
+    }
+
+    public HttpMethod getHttpMethod()
+    {
+        return this.httpMethod;
+    }
+
+    public void setStreamer(ContentStreamer streamer)
+    {
+        this.streamer = streamer;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ApiWebScript.java b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ApiWebScript.java
new file mode 100644
index 00000000000..c848eb05e76
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ApiWebScript.java
@@ -0,0 +1,147 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.webscripts;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+
+import org.alfresco.repo.web.scripts.BufferedRequest;
+import org.alfresco.repo.web.scripts.BufferedResponse;
+import org.alfresco.repo.web.scripts.TempOutputStreamFactory;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.tools.ApiAssistant;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.TempFileProvider;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * Entry point for API webscript.  Supports version/scope as well
+ * as discovery.
+ *
+ * @author Gethin James
+ */
+public abstract class ApiWebScript extends AbstractWebScript
+{
+    private static Log logger = LogFactory.getLog(ApiWebScript.class);
+    protected ApiAssistant assistant;
+    protected boolean encryptTempFiles = false;
+    protected String tempDirectoryName = null;
+    protected int memoryThreshold = 4 * 1024 * 1024; // 4mb
+    protected long maxContentSize = (long) 4 * 1024 * 1024 * 1024; // 4gb
+    protected TempOutputStreamFactory streamFactory = null;
+    protected TransactionService transactionService;
+
+    public void setTransactionService(TransactionService transactionService)
+    {
+        this.transactionService = transactionService;
+    }
+
+    public void setAssistant(ApiAssistant assistant) {
+        this.assistant = assistant;
+    }
+
+    public void setTempDirectoryName(String tempDirectoryName)
+    {
+        this.tempDirectoryName = tempDirectoryName;
+    }
+
+    public void setEncryptTempFiles(boolean encryptTempFiles)
+    {
+        this.encryptTempFiles = encryptTempFiles;
+    }
+
+    public void setMemoryThreshold(int memoryThreshold)
+    {
+        this.memoryThreshold = memoryThreshold;
+    }
+
+    public void setMaxContentSize(long maxContentSize)
+    {
+        this.maxContentSize = maxContentSize;
+    }
+
+    public void setStreamFactory(TempOutputStreamFactory streamFactory)
+    {
+        this.streamFactory = streamFactory;
+    }
+
+    public void init()
+    {
+        File tempDirectory = TempFileProvider.getTempDir(tempDirectoryName);
+        this.streamFactory = new TempOutputStreamFactory(tempDirectory, memoryThreshold, maxContentSize, false, false);
+    }
+
+    @Override
+    public void execute(final WebScriptRequest req, final WebScriptResponse res) throws IOException
+    {
+		Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+		Api api = assistant.determineApi(templateVars);
+		
+		final BufferedRequest bufferedReq = getRequest(req);
+		final BufferedResponse bufferedRes = getResponse(res);
+
+		try
+		{
+		    execute(api, bufferedReq, bufferedRes);
+		}
+		finally
+		{
+            // Get rid of any temporary files
+            if (bufferedReq != null)
+            {
+                bufferedReq.close();
+            }
+		}
+
+        // Ensure a response is always flushed after successful execution
+        if (bufferedRes != null)
+        {
+            bufferedRes.writeResponse();
+        }
+    }
+
+    protected BufferedRequest getRequest(final WebScriptRequest req)
+    {
+        // create buffered request and response that allow transaction retrying
+        final BufferedRequest bufferedReq = new BufferedRequest(req, streamFactory);
+        return bufferedReq;
+    }
+
+    protected BufferedResponse getResponse(final WebScriptResponse resp)
+    {
+        // create buffered request and response that allow transaction retrying
+        final BufferedResponse bufferedRes = new BufferedResponse(resp, memoryThreshold, streamFactory);
+        return bufferedRes;
+    }
+
+    public abstract void execute(final Api api, WebScriptRequest req, WebScriptResponse res) throws IOException;
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ParamsExtractor.java b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ParamsExtractor.java
new file mode 100644
index 00000000000..e5b9fe52157
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ParamsExtractor.java
@@ -0,0 +1,40 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.webscripts;
+
+import org.alfresco.rest.framework.core.HttpMethodSupport;
+import org.alfresco.rest.framework.core.ResourceMetadata;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/*
+ * Extracts parameters from the HTTP request.
+ * 
+ */
+public interface ParamsExtractor extends HttpMethodSupport
+{
+    public Params extractParams(ResourceMetadata resourceMeta,WebScriptRequest req);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptDelete.java b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptDelete.java
new file mode 100644
index 00000000000..ea8e62b23a3
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptDelete.java
@@ -0,0 +1,290 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.webscripts;
+
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.rest.framework.core.ResourceLocator;
+import org.alfresco.rest.framework.core.ResourceMetadata;
+import org.alfresco.rest.framework.core.ResourceOperation;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.core.exceptions.DeletedResourceException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.http.HttpMethod;
+
+import java.util.Map;
+
+/**
+ * Handles the HTTP DELETE for a Resource
+ * 
+ * @author Gethin James
+ */
+public class ResourceWebScriptDelete extends AbstractResourceWebScript implements ParamsExtractor, RecognizedParamsExtractor
+{
+
+    public ResourceWebScriptDelete()
+    {
+        super();
+        setHttpMethod(HttpMethod.DELETE);
+        setParamsExtractor(this);
+    }
+
+    @Override
+    public Params extractParams(ResourceMetadata resourceMeta, WebScriptRequest req)
+    {
+        final Map<String, String> resourceVars = locator.parseTemplateVars(req.getServiceMatch().getTemplateVars());
+        final String entityId = resourceVars.get(ResourceLocator.ENTITY_ID);
+        final String relationshipId = resourceVars.get(ResourceLocator.RELATIONSHIP_ID);
+
+        final Params.RecognizedParams params = getRecognizedParams(req);
+        
+        switch (resourceMeta.getType())
+        {
+            case ENTITY:
+                 // note: entityId can be null - when deleting a set/collection
+                 return Params.valueOf(params, entityId, relationshipId, req);
+            case RELATIONSHIP:
+                // note: relationshipId can be null - when deleting a related set/collection
+                return Params.valueOf(params, entityId, relationshipId, req);
+            case PROPERTY:
+                final String resourceName = resourceVars.get(ResourceLocator.RELATIONSHIP_RESOURCE);
+                final String propertyName = resourceVars.get(ResourceLocator.PROPERTY);
+
+                if (StringUtils.isNotBlank(entityId) && StringUtils.isNotBlank(resourceName))
+                {
+                    if (StringUtils.isNotBlank(propertyName))
+                    {
+                        return Params.valueOf(entityId, relationshipId, null, null, propertyName, params, null, req);
+                    }
+                    else
+                    {
+                        return Params.valueOf(entityId, null, null, null, resourceName, params, null, req);
+                    }
+                }
+                //Fall through to unsupported.
+            default:
+                throw new UnsupportedResourceOperationException("DELETE not supported for Actions");
+        }
+    }
+
+    /**
+     * Executes the action on the resource
+     * @param resource ResourceWithMetadata
+     * @param params parameters to use
+     * @return anObject the result of the execute
+     */
+    @Override
+    public Object executeAction(ResourceWithMetadata resource, Params params, WithResponse withResponse)
+    {
+        switch (resource.getMetaData().getType())
+        {
+            case ENTITY:
+                if (StringUtils.isNotBlank(params.getEntityId()))
+                {
+                    if (EntityResourceAction.DeleteWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(EntityResourceAction.DeleteWithResponse.class))
+                        {
+                            throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
+                        }
+                        EntityResourceAction.DeleteWithResponse entityDeleter = (EntityResourceAction.DeleteWithResponse) resource.getResource();
+                        entityDeleter.delete(params.getEntityId(), params, withResponse);
+                        //Don't pass anything to the callback - its just successful
+                        return null;
+                    }
+                    if (EntityResourceAction.Delete.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(EntityResourceAction.Delete.class))
+                        {
+                            throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
+                        }
+                        EntityResourceAction.Delete entityDeleter = (EntityResourceAction.Delete) resource.getResource();
+                        entityDeleter.delete(params.getEntityId(), params);
+                        //Don't pass anything to the callback - its just successful
+                        return null;
+                    }
+                }
+                else
+                {
+                    if (EntityResourceAction.DeleteSetWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(EntityResourceAction.DeleteSetWithResponse.class))
+                        {
+                            throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
+                        }
+                        EntityResourceAction.DeleteSetWithResponse entityDeleter = (EntityResourceAction.DeleteSetWithResponse) resource.getResource();
+                        entityDeleter.deleteSet(params, withResponse);
+                        //Don't pass anything to the callback - its just successful
+                        return null;
+                    }
+                    if (EntityResourceAction.DeleteSet.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(EntityResourceAction.DeleteSet.class))
+                        {
+                            throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
+                        }
+                        EntityResourceAction.DeleteSet entityDeleter = (EntityResourceAction.DeleteSet) resource.getResource();
+                        entityDeleter.deleteSet(params);
+                        //Don't pass anything to the callback - its just successful
+                        return null;
+                    }
+                }
+            case RELATIONSHIP:
+                if (StringUtils.isNotBlank(params.getRelationshipId()))
+                {
+                    if (RelationshipResourceAction.DeleteWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(RelationshipResourceAction.DeleteWithResponse.class))
+                        {
+                            throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
+                        }
+                        RelationshipResourceAction.DeleteWithResponse relationDeleter = (RelationshipResourceAction.DeleteWithResponse) resource.getResource();
+                        relationDeleter.delete(params.getEntityId(), params.getRelationshipId(), params, withResponse);
+                        //Don't pass anything to the callback - its just successful
+                        return null;
+                    } 
+                    if (RelationshipResourceAction.Delete.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(RelationshipResourceAction.Delete.class))
+                        {
+                            throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
+                        }
+                        RelationshipResourceAction.Delete relationDeleter = (RelationshipResourceAction.Delete) resource.getResource();
+                        relationDeleter.delete(params.getEntityId(), params.getRelationshipId(), params);
+                        //Don't pass anything to the callback - its just successful
+                        return null;
+                    }
+                }
+                else
+                {
+                    if (RelationshipResourceAction.DeleteSetWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(RelationshipResourceAction.DeleteSetWithResponse.class))
+                        {
+                            throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
+                        }
+                        RelationshipResourceAction.DeleteSetWithResponse relationDeleter = (RelationshipResourceAction.DeleteSetWithResponse) resource.getResource();
+                        relationDeleter.deleteSet(params.getEntityId(), params, withResponse);
+                        //Don't pass anything to the callback - its just successful
+                        return null;
+                    }
+                    if (RelationshipResourceAction.DeleteSet.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(RelationshipResourceAction.Delete.class))
+                        {
+                            throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
+                        }
+                        RelationshipResourceAction.DeleteSet relationDeleter = (RelationshipResourceAction.DeleteSet) resource.getResource();
+                        relationDeleter.deleteSet(params.getEntityId(), params);
+                        //Don't pass anything to the callback - its just successful
+                        return null;
+                    }
+                }
+            case PROPERTY:
+                if (BinaryResourceAction.DeleteWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                {
+                    if (resource.getMetaData().isDeleted(BinaryResourceAction.DeleteWithResponse.class))
+                    {
+                        throw new DeletedResourceException("(DELETE) "+resource.getMetaData().getUniqueId());
+                    }
+                    BinaryResourceAction.DeleteWithResponse binDeleter = (BinaryResourceAction.DeleteWithResponse) resource.getResource();
+                    binDeleter.deleteProperty(params.getEntityId(), params, withResponse);
+                    //Don't pass anything to the callback - its just successful
+                    return null;
+                }
+                if (BinaryResourceAction.Delete.class.isAssignableFrom(resource.getResource().getClass()))
+                {
+                    if (resource.getMetaData().isDeleted(BinaryResourceAction.Delete.class))
+                    {
+                        throw new DeletedResourceException("(DELETE) "+resource.getMetaData().getUniqueId());
+                    }
+                    BinaryResourceAction.Delete binDeleter = (BinaryResourceAction.Delete) resource.getResource();
+                    binDeleter.deleteProperty(params.getEntityId(), params);
+                    //Don't pass anything to the callback - its just successful
+                    return null;
+                }
+                if (RelationshipResourceBinaryAction.DeleteWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                {
+                    if (resource.getMetaData().isDeleted(RelationshipResourceBinaryAction.DeleteWithResponse.class))
+                    {
+                        throw new DeletedResourceException("(DELETE) "+resource.getMetaData().getUniqueId());
+                    }
+                    RelationshipResourceBinaryAction.DeleteWithResponse binDeleter = (RelationshipResourceBinaryAction.DeleteWithResponse) resource.getResource();
+                    binDeleter.deleteProperty(params.getEntityId(), params.getRelationshipId(), params, withResponse);
+                    //Don't pass anything to the callback - its just successful
+                    return null;
+                }
+                if (RelationshipResourceBinaryAction.Delete.class.isAssignableFrom(resource.getResource().getClass()))
+                {
+                    if (resource.getMetaData().isDeleted(RelationshipResourceBinaryAction.Delete.class))
+                    {
+                        throw new DeletedResourceException("(DELETE) "+resource.getMetaData().getUniqueId());
+                    }
+                    RelationshipResourceBinaryAction.Delete binDeleter = (RelationshipResourceBinaryAction.Delete) resource.getResource();
+                    binDeleter.deleteProperty(params.getEntityId(), params.getRelationshipId(), params);
+                    //Don't pass anything to the callback - its just successful
+                    return null;
+                }
+            default:
+                throw new UnsupportedResourceOperationException("DELETE not supported for Actions");
+        }
+    }
+    
+    @Override
+    public Void execute(final ResourceWithMetadata resource, final Params params, final WebScriptResponse res, boolean isReadOnly)
+    {
+        final ResourceOperation operation = resource.getMetaData().getOperation(HttpMethod.DELETE);
+        final WithResponse callBack = new WithResponse(operation.getSuccessStatus(), DEFAULT_JSON_CONTENT,CACHE_NEVER);
+
+        // MNT-20308 - allow write transactions for authentication api
+        RetryingTransactionHelper transHelper = getTransactionHelper(resource.getMetaData().getApi().getName());
+
+        transHelper.doInTransaction(
+            new RetryingTransactionCallback<Void>()
+            {
+                @Override
+                public Void execute() throws Throwable
+                {
+                    executeAction(resource, params, callBack); //ignore return result
+                    return null;
+                }
+            }, false, true);
+        setResponse(res,callBack);
+        return null;
+
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptGet.java b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptGet.java
new file mode 100644
index 00000000000..87ee84c074f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptGet.java
@@ -0,0 +1,333 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.webscripts;
+
+import org.alfresco.rest.framework.core.ResourceLocator;
+import org.alfresco.rest.framework.core.ResourceMetadata;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.core.exceptions.DeletedResourceException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction.Read;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction.ReadById;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.resource.parameters.Params.RecognizedParams;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.http.HttpMethod;
+
+import java.util.Map;
+
+/**
+ * Handles the HTTP Get for a Resource
+ * 
+ * @author Gethin James
+ */
+public class ResourceWebScriptGet extends AbstractResourceWebScript implements ParamsExtractor, RecognizedParamsExtractor
+{
+    private static Log logger = LogFactory.getLog(ResourceWebScriptGet.class);
+    
+    public ResourceWebScriptGet()
+    {
+        super();
+        setHttpMethod(HttpMethod.GET);
+        setParamsExtractor(this);
+    }
+
+    @Override
+    public Params extractParams(ResourceMetadata resourceMeta, WebScriptRequest req)
+    {
+        final Map<String, String> resourceVars = locator.parseTemplateVars(req.getServiceMatch().getTemplateVars());
+
+        final String entityId = resourceVars.get(ResourceLocator.ENTITY_ID);
+
+        final String resourceName = resourceVars.get(ResourceLocator.RELATIONSHIP_RESOURCE);
+        final String relationshipId = resourceVars.get(ResourceLocator.RELATIONSHIP_ID);
+
+        final String propertyName = resourceVars.get(ResourceLocator.PROPERTY);
+        final String relationship2Id = resourceVars.get(ResourceLocator.RELATIONSHIP2_ID);
+
+        final RecognizedParams params = getRecognizedParams(req);
+        
+        switch (resourceMeta.getType())
+        {
+            case ENTITY:
+                if (StringUtils.isNotBlank(entityId))
+                {
+                    return Params.valueOf(params, entityId, null, req);
+                } 
+                else
+                {
+                    // collection resource (top-level of entities)
+                    return Params.valueOf(params, null, null, req);
+                }
+            case RELATIONSHIP:
+
+                if (StringUtils.isNotBlank(propertyName))
+                {
+                    if (StringUtils.isNotBlank(relationship2Id))
+                    {
+                        return Params.valueOf(false, entityId, relationshipId, relationship2Id, null, null, null, params, null, req);
+                    }
+                    else
+                    {
+                        // collection resource (second level of relationship)
+                        return Params.valueOf(true, entityId, relationshipId, null, null, null, null, params, null, req);
+                    }
+                }
+                else if (StringUtils.isNotBlank(relationshipId))
+                {
+                    return Params.valueOf(false, entityId, relationshipId, null, null, null, null, params, null, req);
+                }
+                else
+                {
+                    // collection resource (first level of relationship)
+                    return Params.valueOf(true, entityId, null, null, null, null, null, params, null, req);
+                }
+            case PROPERTY:
+                if (StringUtils.isNotBlank(entityId) && StringUtils.isNotBlank(resourceName))
+                {
+                    if (StringUtils.isNotBlank(propertyName))
+                    {
+                        return Params.valueOf(false, entityId, relationshipId, relationship2Id, null, null, propertyName, params, null, req);
+                    }
+                    else
+                    {
+                        return Params.valueOf(entityId, null, null, null, resourceName, params, null, req);
+                    }
+                }
+                //Fall through to unsupported.
+            default:
+                throw new UnsupportedResourceOperationException("GET not supported for Actions");
+        }
+    }
+
+    /**
+     * Executes the action on the resource
+     * @param resource ResourceWithMetadata
+     * @param params parameters to use
+     * @return anObject the result of the execute
+     */
+    @Override
+    public Object executeAction(ResourceWithMetadata resource, Params params, WithResponse withResponse) throws Throwable
+    {
+        
+        switch (resource.getMetaData().getType())
+        {
+            case ENTITY:
+                if (StringUtils.isBlank(params.getEntityId()) || params.isCollectionResource())
+                {
+                    // Get the collection
+                    if (EntityResourceAction.Read.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(EntityResourceAction.Read.class))
+                        {
+                            throw new DeletedResourceException("(GET) "+resource.getMetaData().getUniqueId());
+                        }
+                        EntityResourceAction.Read<?> getter = (Read<?>) resource.getResource();
+                        CollectionWithPagingInfo<?> resources = getter.readAll(params);
+                        return resources;              
+                    }
+                    else if (EntityResourceAction.ReadWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(EntityResourceAction.ReadWithResponse.class))
+                        {
+                            throw new DeletedResourceException("(GET) "+resource.getMetaData().getUniqueId());
+                        }
+                        EntityResourceAction.ReadWithResponse<?> getter = (EntityResourceAction.ReadWithResponse<?>) resource.getResource();
+                        CollectionWithPagingInfo<?> resources = getter.readAll(params, withResponse);
+                        return resources;
+                    }
+                    else if (EntityResourceAction.DeleteSetWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(EntityResourceAction.DeleteSetWithResponse.class))
+                        {
+                            throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
+                        }
+                        EntityResourceAction.DeleteSetWithResponse relationDeleter = (EntityResourceAction.DeleteSetWithResponse) resource.getResource();
+                        relationDeleter.deleteSet(params, withResponse);
+                        //Don't pass anything to the callback - its just successful
+                        return null;
+                    }
+                    else if (EntityResourceAction.DeleteSet.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(EntityResourceAction.Delete.class))
+                        {
+                            throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
+                        }
+                        EntityResourceAction.DeleteSet relationDeleter = (EntityResourceAction.DeleteSet) resource.getResource();
+                        relationDeleter.deleteSet(params);
+                        //Don't pass anything to the callback - its just successful
+                        return null;
+                    }
+                    else
+                    {
+                        throw new UnsupportedResourceOperationException();
+                    }
+
+                }
+                else
+                {
+                    if (EntityResourceAction.ReadById.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(EntityResourceAction.ReadById.class))
+                        {
+                            throw new DeletedResourceException("(GET by id) "+resource.getMetaData().getUniqueId());
+                        }
+                        EntityResourceAction.ReadById<?> entityGetter = (ReadById<?>) resource.getResource();
+                        Object result = entityGetter.readById(params.getEntityId(), params);
+                        return result;   
+                    }
+                    else if (EntityResourceAction.ReadByIdWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(EntityResourceAction.ReadByIdWithResponse.class))
+                        {
+                            throw new DeletedResourceException("(GET by id) "+resource.getMetaData().getUniqueId());
+                        }
+                        EntityResourceAction.ReadByIdWithResponse<?> entityGetter = (EntityResourceAction.ReadByIdWithResponse<?>) resource.getResource();
+                        Object result = entityGetter.readById(params.getEntityId(), params, withResponse);
+                        return result;
+                    }
+                    else
+                    {
+                        throw new UnsupportedResourceOperationException();
+                    }
+                }
+            case RELATIONSHIP:
+                if (StringUtils.isBlank(params.getRelationshipId()) || (params.isCollectionResource()))
+                {
+                    // Get the collection
+                    if (RelationshipResourceAction.Read.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(RelationshipResourceAction.Read.class))
+                        {
+                            throw new DeletedResourceException("(GET) "+resource.getMetaData().getUniqueId());
+                        }
+                        RelationshipResourceAction.Read<?> relationGetter = (RelationshipResourceAction.Read<?>) resource.getResource();
+                        CollectionWithPagingInfo<?> relations = relationGetter.readAll(params.getEntityId(),params);
+                        return relations;
+                    }
+                    else
+                    {
+                        if (resource.getMetaData().isDeleted(RelationshipResourceAction.ReadWithResponse.class))
+                        {
+                            throw new DeletedResourceException("(GET) "+resource.getMetaData().getUniqueId());
+                        }
+                        RelationshipResourceAction.ReadWithResponse<?> relationGetter = (RelationshipResourceAction.ReadWithResponse<?>) resource.getResource();
+                        CollectionWithPagingInfo<?> relations = relationGetter.readAll(params.getEntityId(),params,withResponse);
+                        return relations;
+                    }
+                } 
+                else 
+                {
+                    if (RelationshipResourceAction.ReadById.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(RelationshipResourceAction.ReadById.class))
+                        {
+                            throw new DeletedResourceException("(GET by id) "+resource.getMetaData().getUniqueId());
+                        }
+                        RelationshipResourceAction.ReadById<?> relationGetter = (RelationshipResourceAction.ReadById<?>) resource.getResource();
+                        Object result = relationGetter.readById(params.getEntityId(), params.getRelationshipId(), params);
+                        return result;
+                    }
+                    else if (RelationshipResourceAction.ReadByIdWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(RelationshipResourceAction.ReadByIdWithResponse.class))
+                        {
+                            throw new DeletedResourceException("(GET by id) "+resource.getMetaData().getUniqueId());
+                        }
+                        RelationshipResourceAction.ReadByIdWithResponse<?> relationGetter = (RelationshipResourceAction.ReadByIdWithResponse<?>) resource.getResource();
+                        Object result = relationGetter.readById(params.getEntityId(), params.getRelationshipId(), params, withResponse);
+                        return result;
+                    }
+                    else
+                    {
+                        throw new UnsupportedResourceOperationException();
+                    }
+                }
+            case PROPERTY:
+                if (StringUtils.isNotBlank(params.getEntityId()))
+                {
+                    if (BinaryResourceAction.Read.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(BinaryResourceAction.Read.class))
+                        {
+                            throw new DeletedResourceException("(GET) "+resource.getMetaData().getUniqueId());
+                        }
+                        BinaryResourceAction.Read getter = (BinaryResourceAction.Read) resource.getResource();
+                        BinaryResource prop = getter.readProperty(params.getEntityId(), params);
+                        return prop;
+                    }
+                    if (BinaryResourceAction.ReadWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(BinaryResourceAction.ReadWithResponse.class))
+                        {
+                            throw new DeletedResourceException("(GET) "+resource.getMetaData().getUniqueId());
+                        }
+                        BinaryResourceAction.ReadWithResponse getter = (BinaryResourceAction.ReadWithResponse) resource.getResource();
+                        BinaryResource prop = getter.readProperty(params.getEntityId(), params, withResponse);
+                        return prop;
+                    }
+                    if (RelationshipResourceBinaryAction.Read.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(RelationshipResourceBinaryAction.Read.class))
+                        {
+                            throw new DeletedResourceException("(GET) "+resource.getMetaData().getUniqueId());
+                        }
+                        RelationshipResourceBinaryAction.Read getter = (RelationshipResourceBinaryAction.Read) resource.getResource();
+                        BinaryResource prop = getter.readProperty(params.getEntityId(), params.getRelationshipId(), params);
+                        return prop;
+                    }
+                    if (RelationshipResourceBinaryAction.ReadWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(RelationshipResourceBinaryAction.ReadWithResponse.class))
+                        {
+                            throw new DeletedResourceException("(GET) "+resource.getMetaData().getUniqueId());
+                        }
+                        RelationshipResourceBinaryAction.ReadWithResponse getter = (RelationshipResourceBinaryAction.ReadWithResponse) resource.getResource();
+                        BinaryResource prop = getter.readProperty(params.getEntityId(), params.getRelationshipId(), params, withResponse);
+                        return prop;
+                    }
+                }
+                else
+                {
+                    throw new UnsupportedResourceOperationException();
+                }
+            default:
+                throw new UnsupportedResourceOperationException("GET not supported for Actions");
+        }
+    }
+
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
new file mode 100644
index 00000000000..08725a76c7f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
@@ -0,0 +1,332 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.webscripts;
+
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.ResourceInspector;
+import org.alfresco.rest.framework.core.ResourceInspectorUtil;
+import org.alfresco.rest.framework.core.ResourceLocator;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.jacksonextensions.BeanPropertiesFilter;
+import org.alfresco.rest.framework.jacksonextensions.ExecutionResult;
+import org.alfresco.rest.framework.resource.actions.ActionExecutor;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.tools.ResponseWriter;
+import org.alfresco.util.Pair;
+import org.alfresco.util.PropertyCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.http.HttpMethod;
+
+/**
+ * Helps a Webscript with various tasks
+ * 
+ * @author Gethin James
+ * @author janv
+ */
+public class ResourceWebScriptHelper
+{
+    private static Log logger = LogFactory.getLog(ResourceWebScriptHelper.class);
+    private ResourceLocator locator;
+
+    private ActionExecutor executor;
+
+    /**
+     * Set the id of theObj to the uniqueId. Attempts to find a set method and
+     * invoke it. If it fails it just swallows the exceptions and doesn't throw
+     * them further.
+     * 
+     * @param theObj Object
+     * @param uniqueId String
+     */
+    public static void setUniqueId(Object theObj, String uniqueId)
+    {
+        Method annotatedMethod = ResourceInspector.findUniqueIdMethod(theObj.getClass());
+        if (annotatedMethod != null)
+        {
+            PropertyDescriptor pDesc = BeanUtils.findPropertyForMethod(annotatedMethod);
+            if (pDesc != null)
+            {
+                Method writeMethod = pDesc.getWriteMethod();
+                if (writeMethod != null)
+                {
+                    try
+                    {
+                        writeMethod.invoke(theObj, uniqueId);
+                        if (logger.isDebugEnabled())
+                        {
+                            logger.debug("Unique id set for property: " + pDesc.getName());
+                        }
+                    }
+                    catch (IllegalArgumentException error)
+                    {
+                        logger.warn("Invocation error", error);
+                    }
+                    catch (IllegalAccessException error)
+                    {
+                        logger.warn("IllegalAccessException", error);
+                    }
+                    catch (InvocationTargetException error)
+                    {
+                        logger.warn("InvocationTargetException", error);
+                    }
+                }
+                else
+                {
+                    logger.warn("No setter method for property: " + pDesc.getName());
+                }
+            }
+
+        }
+    }
+
+    /**
+     * Looks at the object passed in and recursively expands any @EmbeddedEntityResource annotations or related relationship.
+     * {@link org.alfresco.rest.framework.resource.EmbeddedEntityResource EmbeddedEntityResource} is expanded by calling the ReadById method for this entity.
+     * 
+     * Either returns a ExecutionResult object or a CollectionWithPagingInfo containing a collection of ExecutionResult objects.
+     * 
+     * @param api Api
+     * @param entityCollectionName String
+     * @param params  Params
+     * @param objectToWrap Object
+     * @return Object - Either ExecutionResult or CollectionWithPagingInfo<ExecutionResult>
+     */
+    public Object processAdditionsToTheResponse(WebScriptResponse res, Api api, String entityCollectionName, Params params, Object objectToWrap)
+    {
+        PropertyCheck.mandatory(this, null, params);
+        if (objectToWrap == null ) return null;
+        if (objectToWrap instanceof CollectionWithPagingInfo<?>)
+        {
+            CollectionWithPagingInfo<?> collectionToWrap = (CollectionWithPagingInfo<?>) objectToWrap;
+            Object sourceEntity = executeIncludedSource(api, params, entityCollectionName, collectionToWrap);
+            Collection<Object> resultCollection = new ArrayList(collectionToWrap.getCollection().size());
+            if (!collectionToWrap.getCollection().isEmpty())
+            {
+                for (Object obj : collectionToWrap.getCollection())
+                {
+                    resultCollection.add(processAdditionsToTheResponse(res, api,entityCollectionName,params,obj));
+                }
+            }
+            return CollectionWithPagingInfo.asPaged(collectionToWrap.getPaging(), resultCollection, collectionToWrap.hasMoreItems(),
+                                                    collectionToWrap.getTotalItems(), sourceEntity, collectionToWrap.getContext());
+        }
+        else
+        {           
+            if (BeanUtils.isSimpleProperty(objectToWrap.getClass())  || objectToWrap instanceof Collection)
+            {
+                //Simple property or Collection that can't be embedded so just return it.
+                return objectToWrap;
+            }
+
+            final ExecutionResult execRes = new ExecutionResult(objectToWrap, params.getFilter());
+            
+            Map<String,Pair<String,Method>> embeddded = ResourceInspector.findEmbeddedResources(objectToWrap.getClass());
+            if (embeddded != null && !embeddded.isEmpty())
+            {
+                Map<String, Object> results = executeEmbeddedResources(api, params,objectToWrap, embeddded);
+                execRes.addEmbedded(results);
+            }
+            
+            if (params.getRelationsFilter() != null && !params.getRelationsFilter().isEmpty())
+            {
+                Map<String, ResourceWithMetadata> relationshipResources = locator.locateRelationResource(api,entityCollectionName, params.getRelationsFilter().keySet(), HttpMethod.GET);
+                String uniqueEntityId = ResourceInspector.findUniqueId(objectToWrap);
+                Map<String,Object> relatedResources = executeRelatedResources(api, params, relationshipResources, uniqueEntityId);
+                execRes.addRelated(relatedResources);
+            }
+
+            return execRes; 
+
+        }
+    }
+
+    private Object executeIncludedSource(Api api, Params params, String entityCollectionName, CollectionWithPagingInfo<?> collectionToWrap)
+    {
+        if (params.includeSource())
+        {
+            if (collectionToWrap.getSourceEntity() != null)
+            {
+                //The implementation has already set it so return it;
+                return collectionToWrap.getSourceEntity();
+            }
+
+            ResourceWithMetadata res = locator.locateEntityResource(api, entityCollectionName, HttpMethod.GET);
+            if (res != null)
+            {
+                Object result = executeResource(api, params, params.getEntityId(), null, res);
+                if (result!=null && result instanceof ExecutionResult) return ((ExecutionResult) result).getRoot();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Loops through the embedded Resources and executes them.  The results are added to list of embedded results used by
+     * the ExecutionResult object.
+     *
+     * @param api Api
+     * @param params Params
+     * @param objectToWrap Object
+     * @param embeddded Map<String, Pair<String, Method>>
+     * @return Map
+     */
+    private Map<String, Object> executeEmbeddedResources(Api api, Params params, Object objectToWrap, Map<String, Pair<String, Method>> embeddded)
+    {
+        final Map<String,Object> results = new HashMap<String,Object>(embeddded.size());
+        for (Entry<String, Pair<String,Method>> embeddedEntry : embeddded.entrySet())
+        {
+            ResourceWithMetadata res = locator.locateEntityResource(api, embeddedEntry.getValue().getFirst(), HttpMethod.GET);
+            if (res != null)
+            {
+                Object id = ResourceInspectorUtil.invokeMethod(embeddedEntry.getValue().getSecond(), objectToWrap);
+                if (id != null)
+                {
+                    Object execEmbeddedResult = executeResource(api, params, String.valueOf(id), embeddedEntry.getKey(), res);
+                    if (execEmbeddedResult != null)
+                    {
+                        if (execEmbeddedResult instanceof ExecutionResult)
+                        {
+                           ((ExecutionResult) execEmbeddedResult).setAnEmbeddedEntity(true);
+                        }
+                        results.put(embeddedEntry.getKey(), execEmbeddedResult);
+                    }
+                }
+                else
+                {
+                    //Call to embedded id for null value, 
+                    logger.warn("Cannot embed resource with path "+embeddedEntry.getKey()+". No unique id because the method annotated with @EmbeddedEntityResource returned null.");
+                }
+            }
+        }
+        return results;
+    }
+
+    /**
+     * Loops through the related Resources and executed them.  The results are added to list of embedded results used by
+     * the ExecutionResult object.
+     *
+     * @param api Api
+     * @param params Params
+     * @param relatedResources Map<String, ResourceWithMetadata>
+     * @param uniqueEntityId String
+     * @return Map
+     */
+    private Map<String,Object> executeRelatedResources(final Api api, Params params,
+                                                       Map<String, ResourceWithMetadata> relatedResources,
+                                                       String uniqueEntityId)
+    {
+        final Map<String,Object> results = new HashMap<String,Object>(relatedResources.size());
+        for (final Entry<String, ResourceWithMetadata> relation : relatedResources.entrySet())
+        {
+            Object execResult = executeResource(api, params, uniqueEntityId, relation.getKey(), relation.getValue());
+            if (execResult != null)
+            {
+              results.put(relation.getKey(), execResult);
+            }
+        }
+        return results;
+    }
+
+    /**
+     * Executes a single related Resource.  The results are added to list of embedded results used by
+     * the ExecutionResult object.
+     *
+     * @param api Api
+     * @param params Params
+     * @param uniqueEntityId String
+     * @param resourceKey String
+     * @param resource ResourceWithMetadata
+     * @return Object
+     */
+    private Object executeResource(final Api api, Params params,
+                                   final String uniqueEntityId, final String resourceKey, final ResourceWithMetadata resource)
+    {
+        try
+        {
+            BeanPropertiesFilter paramFilter = null;
+            final Object[] resultOfExecution = new Object[1];
+            Map<String, BeanPropertiesFilter> filters = params.getRelationsFilter();
+            if (filters!=null)
+            {
+                paramFilter = filters.get(resourceKey);
+            }
+            final Params executionParams = Params.valueOf(paramFilter, uniqueEntityId, params.getRequest());
+            final WithResponse callBack = new WithResponse(Status.STATUS_OK, ResponseWriter.DEFAULT_JSON_CONTENT,ResponseWriter.CACHE_NEVER);
+            //Read only because this only occurs for GET requests
+            Object result = executor.executeAction(resource, executionParams, callBack);
+            return processAdditionsToTheResponse(null, api, null, executionParams, result);
+        }
+        catch(NotFoundException e)
+        {
+        	// ignore, cannot access the object so don't embed it
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Ignored error, cannot access the object so can't embed it ", e);
+            }
+        }
+        catch(PermissionDeniedException e)
+        {
+        	// ignore, cannot access the object so don't embed it
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Ignored error, cannot access the object so can't embed it ", e);
+            }
+        } catch (Throwable throwable)
+        {
+            logger.warn("Failed to execute a RelatedResource for "+resourceKey+" "+throwable.getMessage());
+        }
+
+        return null; //default
+    }
+
+    public void setLocator(ResourceLocator locator)
+    {
+        this.locator = locator;
+    }
+
+    public void setExecutor(ActionExecutor executor)
+    {
+        this.executor = executor;
+    }
+        
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPost.java b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPost.java
new file mode 100644
index 00000000000..780b99d557a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPost.java
@@ -0,0 +1,387 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.webscripts;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.rest.framework.core.OperationResourceMetaData;
+import org.alfresco.rest.framework.core.ResourceInspectorUtil;
+import org.alfresco.rest.framework.core.ResourceLocator;
+import org.alfresco.rest.framework.core.ResourceMetadata;
+import org.alfresco.rest.framework.core.ResourceOperation;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.core.exceptions.DeletedResourceException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartRelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.resource.parameters.Params.RecognizedParams;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+import org.alfresco.rest.framework.tools.RequestReader;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptRequestImpl;
+import org.springframework.extensions.webscripts.servlet.FormData;
+import org.springframework.http.HttpMethod;
+
+/**
+ * Handles the HTTP POST for a Resource, equivalent to CRUD Create
+ * 
+ * @author Gethin James
+ */
+public class ResourceWebScriptPost extends AbstractResourceWebScript implements ParamsExtractor,
+                                                                                RecognizedParamsExtractor, RequestReader
+{
+
+    public ResourceWebScriptPost()
+    {
+       super();
+       setHttpMethod(HttpMethod.POST);
+       setParamsExtractor(this);
+    }
+    
+    @Override
+    public Params extractParams(ResourceMetadata resourceMeta, WebScriptRequest req)
+    {
+        final Map<String, String> resourceVars = locator.parseTemplateVars(req.getServiceMatch().getTemplateVars());
+        final String entityId = resourceVars.get(ResourceLocator.ENTITY_ID);
+        final String relationshipId = resourceVars.get(ResourceLocator.RELATIONSHIP_ID);
+
+        final String operationName = resourceVars.get(ResourceLocator.RELATIONSHIP_RESOURCE);
+        final String propertyName = resourceVars.get(ResourceLocator.PROPERTY);
+
+        final RecognizedParams params = getRecognizedParams(req);
+        final ResourceOperation operation = resourceMeta.getOperation(HttpMethod.POST);
+
+        switch (resourceMeta.getType())
+        {
+            case ENTITY:
+
+                if (StringUtils.isNotBlank(entityId))
+                {
+                    throw new UnsupportedResourceOperationException("POST is executed against a collection URL");
+                }
+                else
+                {
+                    Object postedObj = processRequest(resourceMeta, operation, req);
+                    return Params.valueOf(null, params, postedObj, req);
+                }
+            case RELATIONSHIP:
+                if (StringUtils.isNotBlank(propertyName) && (StringUtils.isNotBlank(relationshipId)))
+                {
+                    // collection resource (second level of relationship)
+                    Object postedRel = processRequest(resourceMeta, operation, req);
+                    return Params.valueOf(true, entityId, relationshipId, null, postedRel, null, null, params, null, req);
+                }
+                else if (StringUtils.isNotBlank(relationshipId))
+                {
+                    throw new UnsupportedResourceOperationException("POST is executed against a collection URL");
+                }
+                else
+                {
+                    Object postedRel = processRequest(resourceMeta, operation, req);
+                    return Params.valueOf(entityId, params, postedRel, req);
+                }
+            case OPERATION:
+                if (StringUtils.isNotBlank(entityId) && StringUtils.isNotBlank(operationName))
+                {
+                    Object postedObj = processRequest(resourceMeta, operation, req);
+                    
+                    if (StringUtils.isNotBlank(propertyName))
+                    {
+                        return Params.valueOf(entityId, relationshipId, params, postedObj, req);
+                    }
+                    else
+                    {
+                        return Params.valueOf(entityId, params, postedObj, req);
+                    }
+                }
+                //Fall through to unsupported.
+            default:
+                throw new UnsupportedResourceOperationException("POST not supported for Actions");
+        }
+    }
+
+    /**
+     * If the request content-type is <i><b>multipart/form-data</b></i> then it
+     * returns the {@link FormData}, otherwise it tries to extract the required
+     * object from the JSON payload.
+     */
+    private Object processRequest(ResourceMetadata resourceMeta, ResourceOperation operation, WebScriptRequest req)
+    {
+        if (WebScriptRequestImpl.MULTIPART_FORM_DATA.equals(req.getContentType()))
+        {
+            return (FormData) req.parseContent();
+        }
+
+        return extractObjFromJson(resourceMeta, operation, req);
+    }
+
+    /**
+     * If the @WebApiParam has been used and set allowMultiple to false then this will get a single entry.  It
+     * should error if an array is passed in.
+     * @param resourceMeta ResourceMetadata
+     * @param req WebScriptRequest
+     * @return Either an object 
+     */
+    private Object extractObjFromJson(ResourceMetadata resourceMeta, ResourceOperation operation, WebScriptRequest req)
+    {
+        if (operation == null)
+        {
+            return null;
+        }
+        
+        Class<?> objType = resourceMeta.getObjectType(operation);
+        boolean isTypeOperation = resourceMeta.getType().equals(ResourceMetadata.RESOURCE_TYPE.OPERATION);
+        List<ResourceParameter> params = operation.getParameters();
+
+        if (!params.isEmpty())
+        {
+            for (ResourceParameter resourceParameter : params)
+            {
+                // POST to collection may or may not support List as json body, Operations don't support a List as json body
+                boolean notMultiple = ((! resourceParameter.isAllowMultiple()) || isTypeOperation);
+                
+                if (ResourceParameter.KIND.HTTP_BODY_OBJECT.equals(resourceParameter.getParamType()) && notMultiple)
+                {
+                    // Only allow 1 value.
+                    try
+                    {
+                        Object jsonContent = null;
+                        if (objType != null)
+                        {
+                            // check if the body is optional and is not provided
+                            if (!resourceParameter.isRequired() && Integer.valueOf(req.getHeader("content-length")) <= 0)
+                            {
+                                // in some cases the body is optional and the json doesn't need to be extracted
+                                return null;
+                            }
+                            else
+                            {
+                                jsonContent = extractJsonContent(req, assistant.getJsonHelper(), objType);
+                            }
+                        }
+                        
+                        if (isTypeOperation)
+                        {
+                            return jsonContent;
+                        }
+                        else
+                        {
+                            return Arrays.asList(jsonContent);
+                        }
+                    }
+                    catch (InvalidArgumentException iae)
+                    {
+                        if (iae.getMessage().contains("START_ARRAY") && iae.getMessage().contains("line: 1, column: 1"))
+                        {
+                            throw new UnsupportedResourceOperationException("Only 1 entity is supported in the HTTP request body");
+                        }
+                        else
+                        {
+                            throw iae;
+                        }
+                    }
+               }
+            }
+        }
+        
+        if (objType == null)
+        {
+            return null;
+        }
+        
+        if (isTypeOperation)
+        {
+            // Operations don't support a List as json body
+            return extractJsonContent(req, assistant.getJsonHelper(), objType);
+        }
+        else
+        {
+            return extractJsonContentAsList(req, assistant.getJsonHelper(), objType);
+        }
+    }
+
+
+    /**
+     * Execute a generic operation method
+     * @param resource
+     * @param params
+     * @return the result of the execution.
+     */
+    private Object executeOperation(ResourceWithMetadata resource, Params params, WithResponse withResponse)  throws Throwable
+    {
+        OperationResourceMetaData operationResourceMetaData = (OperationResourceMetaData) resource.getMetaData();
+
+        switch (operationResourceMetaData.getOperationMethod().getParameterTypes().length)
+        {
+            case 4:
+                //EntityResource operation by id
+                return ResourceInspectorUtil.invokeMethod(operationResourceMetaData.getOperationMethod(),resource.getResource(), params.getEntityId(), params.getPassedIn(), params, withResponse);
+            case 5:
+                //RelationshipEntityResource operation by id
+                return ResourceInspectorUtil.invokeMethod(operationResourceMetaData.getOperationMethod(),resource.getResource(), params.getEntityId(), params.getRelationshipId(), params.getPassedIn(), params, withResponse);
+        }
+
+        throw new UnsupportedResourceOperationException("The operation method has an invalid signature");
+    }
+
+    /**
+     * Executes the action on the resource
+     * @param resource ResourceWithMetadata
+     * @param params parameters to use
+     * @return anObject the result of the execute
+     */
+    @Override
+    public Object executeAction(ResourceWithMetadata resource, Params params, WithResponse withResponse) throws Throwable
+    {
+        final Object resObj = resource.getResource();
+
+        switch (resource.getMetaData().getType())
+        {
+            case ENTITY:
+
+                if (resObj instanceof MultiPartResourceAction.Create<?> && params.getPassedIn() instanceof FormData)
+                {
+                    MultiPartResourceAction.Create<Object> creator = (MultiPartResourceAction.Create<Object>) resObj;
+                    return creator.create((FormData) params.getPassedIn(), params, withResponse);
+
+                }
+                else
+                {
+                    if (EntityResourceAction.Create.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(EntityResourceAction.Create.class))
+                        {
+                            throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
+                        }
+                        EntityResourceAction.Create<Object> creator = (EntityResourceAction.Create<Object>) resObj;
+                        List<Object> created = creator.create((List<Object>) params.getPassedIn(), params);
+                        if (created != null && created.size() == 1)
+                        {
+                            // return just one object instead of an array
+                            return created.get(0);
+                        }
+                        else
+                        {
+                            return wrapWithCollectionWithPaging(created);
+                        }
+                    }
+                    if (EntityResourceAction.CreateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(EntityResourceAction.CreateWithResponse.class))
+                        {
+                            throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
+                        }
+                        EntityResourceAction.CreateWithResponse<Object> creator = (EntityResourceAction.CreateWithResponse<Object>) resObj;
+                        List<Object> created = creator.create((List<Object>) params.getPassedIn(), params, withResponse);
+                        if (created != null && created.size() == 1)
+                        {
+                            // return just one object instead of an array
+                            return created.get(0);
+                        }
+                        else
+                        {
+                            return wrapWithCollectionWithPaging(created);
+                        }
+                    }
+                }
+
+            case RELATIONSHIP:
+                if (resObj instanceof MultiPartRelationshipResourceAction.Create<?> && params.getPassedIn() instanceof FormData)
+                {
+                    MultiPartRelationshipResourceAction.Create<Object> creator = (MultiPartRelationshipResourceAction.Create<Object>) resObj;
+                    return creator.create(params.getEntityId(), (FormData) params.getPassedIn(), params, withResponse);
+                }
+                else
+                {
+                    if (RelationshipResourceAction.Create.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(RelationshipResourceAction.Create.class))
+                        {
+                            throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
+                        }
+
+                        RelationshipResourceAction.Create<Object> createRelation = (RelationshipResourceAction.Create<Object>) resource.getResource();
+                        List<Object> createdRel = createRelation.create(params.getEntityId(), (List<Object>) params.getPassedIn(), params);
+                        if (createdRel != null && createdRel.size() == 1)
+                        {
+                            // return just one object instead of an array
+                            return createdRel.get(0);
+                        }
+                        else
+                        {
+                            return wrapWithCollectionWithPaging(createdRel);
+                        }
+                    }
+
+                    if (RelationshipResourceAction.CreateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                    {
+                        if (resource.getMetaData().isDeleted(RelationshipResourceAction.CreateWithResponse.class))
+                        {
+                            throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
+                        }
+
+                        RelationshipResourceAction.CreateWithResponse<Object> createRelation = (RelationshipResourceAction.CreateWithResponse<Object>) resource.getResource();
+                        List<Object> createdRel = createRelation.create(params.getEntityId(), (List<Object>) params.getPassedIn(), params, withResponse);
+                        if (createdRel != null && createdRel.size() == 1)
+                        {
+                            // return just one object instead of an array
+                            return createdRel.get(0);
+                        }
+                        else
+                        {
+                            return wrapWithCollectionWithPaging(createdRel);
+                        }
+                    }
+                }
+            case OPERATION:
+                return executeOperation(resource, params, withResponse);
+            default:
+                throw new UnsupportedResourceOperationException("POST not supported for Actions");
+        }
+    }
+
+    private Object wrapWithCollectionWithPaging(List<Object> created)
+    {
+        if (created !=null && created.size() > 1)
+        {
+            return CollectionWithPagingInfo.asPagedCollection(created.toArray());
+        }
+        else
+        {
+            return created;
+        }
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java
new file mode 100644
index 00000000000..24e6e385c4f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java
@@ -0,0 +1,277 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.webscripts;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Locale;
+import java.util.Map;
+
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.rest.framework.core.ResourceLocator;
+import org.alfresco.rest.framework.core.ResourceMetadata;
+import org.alfresco.rest.framework.core.ResourceOperation;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.core.exceptions.DeletedResourceException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.ContentInfoImpl;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.resource.parameters.Params.RecognizedParams;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+import org.alfresco.rest.framework.tools.RequestReader;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+/**
+ * Handles the HTTP PUT for a Resource, equivalent to CRUD Update
+ * 
+ * @author Gethin James
+ */
+public class ResourceWebScriptPut extends AbstractResourceWebScript implements ParamsExtractor,
+        RecognizedParamsExtractor, RequestReader
+{
+
+    private static Log logger = LogFactory.getLog(ResourceWebScriptPut.class);
+    
+    public ResourceWebScriptPut()
+    {
+       super();
+       setHttpMethod(HttpMethod.PUT);
+       setParamsExtractor(this);
+    }
+    
+    @Override
+    public Params extractParams(ResourceMetadata resourceMeta, WebScriptRequest req)
+    {
+        final Map<String, String> resourceVars = locator.parseTemplateVars(req.getServiceMatch().getTemplateVars());
+        final String entityId = resourceVars.get(ResourceLocator.ENTITY_ID);
+        final String relationshipId = resourceVars.get(ResourceLocator.RELATIONSHIP_ID);
+
+        final RecognizedParams params = getRecognizedParams(req);
+        final ResourceOperation operation = resourceMeta.getOperation(HttpMethod.PUT);
+
+        switch (resourceMeta.getType())
+        {
+            case ENTITY:
+                if (StringUtils.isBlank(entityId))
+                {
+                    throw new UnsupportedResourceOperationException("PUT is executed against the instance URL");                  
+                } else
+                {
+
+                    Object putEnt = extractJsonContent(req, assistant.getJsonHelper(), resourceMeta.getObjectType(operation));
+                    return Params.valueOf(entityId,params,putEnt, req);
+                }
+            case RELATIONSHIP:
+                if (StringUtils.isBlank(relationshipId))
+                {
+                    throw new UnsupportedResourceOperationException("PUT is executed against the instance URL");                  
+                } else
+                {
+                    Object putRel = extractJsonContent(req, assistant.getJsonHelper(), resourceMeta.getObjectType(operation));
+                    ResourceWebScriptHelper.setUniqueId(putRel,relationshipId);
+                    return Params.valueOf(entityId, params, putRel, req);
+                }
+            case PROPERTY:
+                final String resourceName = resourceVars.get(ResourceLocator.RELATIONSHIP_RESOURCE);
+                final String propertyName = resourceVars.get(ResourceLocator.PROPERTY);
+
+                if (StringUtils.isNotBlank(entityId) && StringUtils.isNotBlank(resourceName))
+                {
+                    if (StringUtils.isNotBlank(propertyName))
+                    {
+                        return Params.valueOf(entityId, relationshipId, null, getStream(req), propertyName, params, getContentInfo(req), req);
+                    }
+                    else
+                    {
+                        return Params.valueOf(entityId, null, null, getStream(req), resourceName, params, getContentInfo(req), req);
+                    }
+
+                }
+                //Fall through to unsupported.
+            default:
+                throw new UnsupportedResourceOperationException("PUT not supported for this request.");
+        }
+    }
+
+	/**
+     * Returns the basic content info from the request.
+     * @param req WebScriptRequest
+     * @return BasicContentInfo
+     */
+    private BasicContentInfo getContentInfo(WebScriptRequest req) {
+    	
+		String encoding = "UTF-8";
+		String contentType = MimetypeMap.MIMETYPE_BINARY;
+		
+		if (StringUtils.isNotEmpty(req.getContentType()))
+		{
+			MediaType media = MediaType.parseMediaType(req.getContentType());
+			contentType = media.getType()+'/'+media.getSubtype();
+			if (media.getCharset() != null)
+			{
+				encoding = media.getCharset().toString();
+			}			
+		}
+
+        return new ContentInfoImpl(contentType, encoding, -1, Locale.getDefault());
+	}
+
+	/**
+     * Returns the input stream for the request
+     * @param req WebScriptRequest
+     * @return InputStream
+     */
+    private InputStream getStream(WebScriptRequest req)
+    {
+        try
+        {
+            if (req instanceof WebScriptServletRequest)
+            {
+                WebScriptServletRequest servletRequest = (WebScriptServletRequest) req;
+                return servletRequest.getHttpServletRequest().getInputStream();
+            }
+            else if (req instanceof WrappingWebScriptRequest)
+            {
+                // eg. BufferredRequest
+                WrappingWebScriptRequest wrappedRequest = (WrappingWebScriptRequest) req;
+                return wrappedRequest.getContent().getInputStream();
+            }
+        }
+        catch (IOException error)
+        {
+            logger.warn("Failed to get the input stream.", error);
+        }
+
+        return null;
+    }
+    
+    /**
+     * Executes the action on the resource
+     * @param resource ResourceWithMetadata
+     * @param params parameters to use
+     * @return anObject the result of the execute
+     */
+    @Override
+    public Object executeAction(ResourceWithMetadata resource, Params params, WithResponse withResponse) throws Throwable
+    {
+        switch (resource.getMetaData().getType())
+        {
+            case ENTITY:
+                if (EntityResourceAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+                {
+                    if (resource.getMetaData().isDeleted(EntityResourceAction.Update.class))
+                    {
+                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
+                    }
+                    EntityResourceAction.Update<Object> updateEnt = (EntityResourceAction.Update<Object>) resource.getResource();
+                    Object result = updateEnt.update(params.getEntityId(), params.getPassedIn(), params);
+                    return result;
+                }
+                else
+                {
+                    if (resource.getMetaData().isDeleted(EntityResourceAction.UpdateWithResponse.class))
+                    {
+                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
+                    }
+                    EntityResourceAction.UpdateWithResponse<Object> updateEnt = (EntityResourceAction.UpdateWithResponse<Object>) resource.getResource();
+                    Object result = updateEnt.update(params.getEntityId(), params.getPassedIn(), params, withResponse);
+                    return result;
+                }
+            case RELATIONSHIP:
+                if (RelationshipResourceAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                {
+                    if (resource.getMetaData().isDeleted(RelationshipResourceAction.UpdateWithResponse.class))
+                    {
+                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
+                    }
+                    RelationshipResourceAction.UpdateWithResponse<Object> relationUpdater = (RelationshipResourceAction.UpdateWithResponse<Object>) resource.getResource();
+                    Object relResult = relationUpdater.update(params.getEntityId(), params.getPassedIn(), params, withResponse);
+                    return relResult;
+                }
+                else
+                {
+                    if (resource.getMetaData().isDeleted(RelationshipResourceAction.Update.class))
+                    {
+                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
+                    }
+                    RelationshipResourceAction.Update<Object> relationUpdater = (RelationshipResourceAction.Update<Object>) resource.getResource();
+                    Object relResult = relationUpdater.update(params.getEntityId(), params.getPassedIn(), params);
+                    return relResult;
+                }
+            case PROPERTY:
+                if (BinaryResourceAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+                {
+                    if (resource.getMetaData().isDeleted(BinaryResourceAction.Update.class))
+                    {
+                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
+                    }
+                    BinaryResourceAction.Update<Object> binUpdater = (BinaryResourceAction.Update<Object>) resource.getResource();
+                    return binUpdater.updateProperty(params.getEntityId(), params.getContentInfo(), params.getStream(), params);
+                }
+                if (BinaryResourceAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                {
+                    if (resource.getMetaData().isDeleted(BinaryResourceAction.UpdateWithResponse.class))
+                    {
+                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
+                    }
+                    BinaryResourceAction.UpdateWithResponse<Object> binUpdater = (BinaryResourceAction.UpdateWithResponse<Object>) resource.getResource();
+                    return binUpdater.updateProperty(params.getEntityId(), params.getContentInfo(), params.getStream(), params, withResponse);
+                }
+                if (RelationshipResourceBinaryAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+                {
+                    if (resource.getMetaData().isDeleted(RelationshipResourceBinaryAction.Update.class))
+                    {
+                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
+                    }
+                    RelationshipResourceBinaryAction.Update<Object> binUpdater = (RelationshipResourceBinaryAction.Update<Object>) resource.getResource();
+                    return binUpdater.updateProperty(params.getEntityId(), params.getRelationshipId(), params.getContentInfo(), params.getStream(), params);
+                }
+                if (RelationshipResourceBinaryAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                {
+                    if (resource.getMetaData().isDeleted(RelationshipResourceBinaryAction.UpdateWithResponse.class))
+                    {
+                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
+                    }
+                    RelationshipResourceBinaryAction.UpdateWithResponse<Object> binUpdater = (RelationshipResourceBinaryAction.UpdateWithResponse<Object>) resource.getResource();
+                    return binUpdater.updateProperty(params.getEntityId(), params.getRelationshipId(), params.getContentInfo(), params.getStream(), params, withResponse);
+                }
+            default:
+                throw new UnsupportedResourceOperationException("PUT not supported for Actions");
+        }
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/WithResponse.java b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/WithResponse.java
new file mode 100644
index 00000000000..8bbd6b04979
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/WithResponse.java
@@ -0,0 +1,142 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.webscripts;
+
+import org.alfresco.rest.framework.resource.content.ContentInfo;
+import org.springframework.extensions.webscripts.Cache;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Values to be set on the response at the appropriate time.
+ *
+ * It should be ok to set these variables multiple times but only the latest values are used.
+ *
+ * @author Gethin James
+ */
+public class WithResponse
+{
+    private ContentInfo contentInfo;
+    private int status;
+    private Map<String, List<String>> headers;
+    private Cache cache;
+
+    public WithResponse(int status, ContentInfo contentInfo, Cache cache)
+    {
+        this.contentInfo = contentInfo;
+        this.status = status;
+        this.headers = new HashMap<>();
+        this.cache = cache;
+    }
+
+    /**
+     * Sets the information about the content: mimetype, encoding, locale, length
+     *
+     * @param contentInfo
+     */
+    public void setContentInfo(ContentInfo contentInfo)
+    {
+        this.contentInfo = contentInfo;
+    }
+
+    /**
+     * Sets the Response Status
+     *
+     * @param status int
+     */
+    public void setStatus(int status)
+    {
+        this.status = status;
+    }
+
+    /**
+     * Set a response header with the given name and value.  If the header has
+     * already been set, the new value overwrites the previous one.
+     *
+     * @param name  header name
+     * @param value  header value
+     */
+    public void setHeader(String name, String value)
+    {
+        headers.put(name, new ArrayList<String>(Arrays.asList(value)));
+    }
+
+    /**
+     * Adds a response header with the given name and value.  This method
+     * allows a response header to have multiple values.
+     *
+     * @param name  header name
+     * @param value  header value
+     */
+    public void addHeader(String name, String value)
+    {
+        List<String> existing = headers.get(name);
+        if (existing != null)
+        {
+            existing.add(value);
+        }
+        else
+        {
+            setHeader(name, value);
+        }
+    }
+
+    /**
+     * Sets the Cache control
+     *
+     * @param  cache  cache control
+     */
+    public void setCache(Cache cache)
+    {
+        this.cache = cache;
+    }
+
+    public ContentInfo getContentInfo()
+    {
+        return contentInfo;
+    }
+
+    public int getStatus()
+    {
+        return status;
+    }
+
+    public Cache getCache()
+    {
+        return cache;
+    }
+
+    public Map<String, List<String>> getHeaders()
+    {
+        return headers;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/metadata/InfoWebScriptGet.java b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/metadata/InfoWebScriptGet.java
new file mode 100644
index 00000000000..3cec3e52a69
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/metadata/InfoWebScriptGet.java
@@ -0,0 +1,105 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.webscripts.metadata;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.ResourceDictionary;
+import org.alfresco.rest.framework.core.ResourceLookupDictionary;
+import org.alfresco.rest.framework.core.ResourceMetadata;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.jacksonextensions.ExecutionResult;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper.Writer;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.webscripts.ApiWebScript;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * Provides general information about the Api calls and methods.
+ * 
+ * @author Gethin James
+ */
+public class InfoWebScriptGet extends ApiWebScript
+{
+
+    private ResourceLookupDictionary lookupDictionary;
+    
+
+    public void setLookupDictionary(ResourceLookupDictionary lookupDictionary)
+    {
+        this.lookupDictionary = lookupDictionary;
+    }
+
+
+    @Override
+    public void execute(final Api api, WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        
+        ResourceDictionary resourceDic = lookupDictionary.getDictionary();
+        final Map<String, ResourceWithMetadata> apiResources = resourceDic.getAllResources().get(api);
+        if (apiResources == null)
+        {
+          throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_INVALID_API);         
+        }
+
+        assistant.getJsonHelper().withWriter(res.getOutputStream(), new Writer()
+        {
+            @Override
+            public void writeContents(JsonGenerator generator, ObjectMapper objectMapper)
+                        throws JsonGenerationException, JsonMappingException, IOException
+            {   
+
+               List<ExecutionResult> entities = new ArrayList<ExecutionResult>();
+               for (ResourceWithMetadata resource : apiResources.values())
+               {
+                 entities.add(new ExecutionResult(resource.getMetaData(), null));
+               }
+               Collections.sort(entities, new Comparator<ExecutionResult>()
+               {
+                    public int compare(ExecutionResult r1, ExecutionResult r2)
+                    {
+                        return ((ResourceMetadata) r1.getRoot()).getUniqueId().compareTo(((ResourceMetadata) r2.getRoot()).getUniqueId());
+                    }
+               });
+               objectMapper.writeValue(generator, CollectionWithPagingInfo.asPaged(Paging.DEFAULT,entities));
+            }
+        });
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/metadata/WebScriptOptionsMetaData.java b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/metadata/WebScriptOptionsMetaData.java
new file mode 100644
index 00000000000..05fb3f556e6
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/webscripts/metadata/WebScriptOptionsMetaData.java
@@ -0,0 +1,174 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.webscripts.metadata;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.ResourceDictionary;
+import org.alfresco.rest.framework.core.ResourceLocator;
+import org.alfresco.rest.framework.core.ResourceLookupDictionary;
+import org.alfresco.rest.framework.core.ResourceMetadata.RESOURCE_TYPE;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.jacksonextensions.ExecutionResult;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper.Writer;
+import org.alfresco.rest.framework.metadata.ResourceMetaDataWriter;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.webscripts.ApiWebScript;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+/**
+ * Provides general information about an Api call and its methods.
+ * 
+ * @author Gethin James
+ */
+public class WebScriptOptionsMetaData extends ApiWebScript implements ResourceMetaDataWriter
+{
+
+    private static Log logger = LogFactory.getLog(WebScriptOptionsMetaData.class);
+    private ResourceLookupDictionary lookupDictionary;
+    private Map<String, ResourceMetaDataWriter> writers;
+    
+    public void setLookupDictionary(ResourceLookupDictionary lookupDictionary)
+    {
+        this.lookupDictionary = lookupDictionary;
+    }
+
+
+    @Override
+    public void execute(final Api api, WebScriptRequest req, WebScriptResponse res) throws IOException
+    {
+        final Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
+        
+        ResourceDictionary resourceDic = lookupDictionary.getDictionary();
+        Map<String, ResourceWithMetadata> apiResources = resourceDic.getAllResources().get(api);
+        if (apiResources == null)
+        {
+          throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_INVALID_API);         
+        }
+        String collectionName = templateVars.get(ResourceLocator.COLLECTION_RESOURCE);
+        String resourceName = templateVars.get(ResourceLocator.RELATIONSHIP_RESOURCE);
+        String resourceKey = ResourceDictionary.resourceKey(collectionName, resourceName);
+        if (logger.isDebugEnabled())
+        {
+          logger.debug("Locating resource :" + resourceKey);
+        }
+        ResourceWithMetadata resource = apiResources.get(resourceKey);
+        if (resource == null)
+        {
+          //Get entity resource and check if we are referencing a property on it.
+          resourceKey = ResourceDictionary.propertyResourceKey(collectionName, resourceName);
+          resource = apiResources.get(resourceKey);     
+        } 
+        ResourceMetaDataWriter writer = chooseWriter(req);
+        writer.writeMetaData(res.getOutputStream(), resource, apiResources);
+
+    }
+
+
+    /**
+     * Chooses the correct writer to use based on the supplied "format" param
+     * @param req - the WebScriptRequest
+     * @return ResourceMetaDataWriter - a matching writer - DEFAULT is this class.
+     */
+    protected ResourceMetaDataWriter chooseWriter(WebScriptRequest req)
+    {
+        if (writers != null)
+        {
+            ResourceMetaDataWriter theWriter = writers.get(req.getParameter("format"));
+            if (theWriter != null) return theWriter;
+        }
+        return this;
+    }
+
+
+    /**
+     * Processes the resulting resource and returns the data to be displayed
+     * @param resource ResourceWithMetadata
+     * @return Either a ExecutionResult or a CollectionWithPagingInfo
+     */
+    public static Object processResult(ResourceWithMetadata resource, Map<String, ResourceWithMetadata> apiResources)
+    {
+        List<ExecutionResult> results = new ArrayList();
+        if (RESOURCE_TYPE.ENTITY.equals(resource.getMetaData().getType()))
+        {
+            results.add(new ExecutionResult(resource, null));
+            for (ResourceWithMetadata aResource : apiResources.values())
+            {
+              if (resource.getMetaData().getUniqueId().equals(aResource.getMetaData().getParentResource()))
+              {
+                  results.add(new ExecutionResult(aResource, null));
+              }
+            }
+        } 
+        if (results.isEmpty())
+        {     
+            return new ExecutionResult(resource, null);
+        }
+        else
+        {
+            return CollectionWithPagingInfo.asPaged(Paging.DEFAULT, results);
+        }
+    }
+
+
+    @Override
+    public void writeMetaData(OutputStream out, ResourceWithMetadata resource, Map<String, ResourceWithMetadata> allApiResources) throws IOException
+    {
+        
+        final Object result = processResult(resource,allApiResources);
+
+        assistant.getJsonHelper().withWriter(out, new Writer()
+        {
+            @Override
+            public void writeContents(JsonGenerator generator, ObjectMapper objectMapper)
+                        throws JsonGenerationException, JsonMappingException, IOException
+            {           
+               objectMapper.writeValue(generator, result);
+            }
+        });
+    }
+
+
+    public void setWriters(Map<String, ResourceMetaDataWriter> writers)
+    {
+        this.writers = writers;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/Activities.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/Activities.java
new file mode 100644
index 00000000000..04f75a70ed7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/Activities.java
@@ -0,0 +1,35 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api;
+
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.model.Activity;
+
+public interface Activities
+{
+    CollectionWithPagingInfo<Activity> getActivities(String processId, Parameters parameters);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/Deployments.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/Deployments.java
new file mode 100644
index 00000000000..fe857d5522c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/Deployments.java
@@ -0,0 +1,37 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api;
+
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.workflow.api.model.Deployment;
+
+public interface Deployments
+{
+    public CollectionWithPagingInfo<Deployment> getDeployments(Paging paging);
+    
+    public Deployment getDeployment(String deploymentId);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/ProcessDefinitions.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/ProcessDefinitions.java
new file mode 100644
index 00000000000..e9ff5bda9a5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/ProcessDefinitions.java
@@ -0,0 +1,44 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api;
+
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.model.FormModelElement;
+import org.alfresco.rest.workflow.api.model.ProcessDefinition;
+
+public interface ProcessDefinitions
+{
+    public CollectionWithPagingInfo<ProcessDefinition> getProcessDefinitions(Parameters parameters);
+    
+    public ProcessDefinition getProcessDefinition(String definitionId);
+    
+    public BinaryResource getProcessDefinitionImage(String definitionId);
+    
+    public CollectionWithPagingInfo<FormModelElement> getStartFormModel(String definitionId, Paging paging);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/Processes.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/Processes.java
new file mode 100644
index 00000000000..5c0a4aea1cb
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/Processes.java
@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api;
+
+import java.util.List;
+
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.model.Item;
+import org.alfresco.rest.workflow.api.model.ProcessInfo;
+import org.alfresco.rest.workflow.api.model.Variable;
+
+public interface Processes
+{
+    CollectionWithPagingInfo<ProcessInfo> getProcesses(Parameters parameters);
+    
+    ProcessInfo getProcess(String processId);
+    
+    ProcessInfo create(ProcessInfo process);
+    
+    CollectionWithPagingInfo<Item> getItems(String processId, Paging paging);
+    
+    Item getItem(String processId, String itemId);
+    
+    Item createItem(String processId, Item item);
+    
+    void deleteItem(String processId, String itemId);
+
+    void deleteProcess(String id);
+
+    CollectionWithPagingInfo<Variable> getVariables(String processId, Paging paging);
+
+    Variable updateVariable(String processId, Variable entity);
+    
+    List<Variable> updateVariables(String processId, List<Variable> variables);
+
+    void deleteVariable(String processId, String id);
+
+    BinaryResource getProcessImage(String processId);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/Tasks.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/Tasks.java
new file mode 100644
index 00000000000..914c9ca9f17
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/Tasks.java
@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api;
+
+import java.util.List;
+
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.model.FormModelElement;
+import org.alfresco.rest.workflow.api.model.Item;
+import org.alfresco.rest.workflow.api.model.Task;
+import org.alfresco.rest.workflow.api.model.TaskCandidate;
+import org.alfresco.rest.workflow.api.model.TaskVariable;
+import org.alfresco.rest.workflow.api.model.Variable;
+import org.alfresco.rest.workflow.api.model.VariableScope;
+
+public interface Tasks
+{
+     CollectionWithPagingInfo<Task> getTasks(Parameters parameters);
+     
+     CollectionWithPagingInfo<Task> getTasks(String processId, Parameters parameters);
+    
+     Task getTask(String taskId);
+    
+     CollectionWithPagingInfo<TaskCandidate> getTaskCandidates(String taskId, Paging paging);
+    
+     Task update(String taskId, Task task, Parameters parameters);
+    
+     CollectionWithPagingInfo<FormModelElement> getTaskFormModel(String entityResourceId, Paging paging);
+    
+    // task variables
+     CollectionWithPagingInfo<TaskVariable> getTaskVariables(String taskId, Paging paging, VariableScope scope);
+    
+     TaskVariable updateTaskVariable(String taskId, TaskVariable taskVariable);
+     
+     List<TaskVariable> updateTaskVariables(String taskId, List<TaskVariable> variables);
+    
+     void deleteTaskVariable(String taskId, String variableName);
+
+     Item getItem(String taskId, String itemId);
+
+     CollectionWithPagingInfo<Item> getItems(String taskId, Paging paging);
+
+     Item createItem(String taskId, Item item);
+
+     void deleteItem(String taskId, String itemId);
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/deployments/DeploymentsRestEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/deployments/DeploymentsRestEntityResource.java
new file mode 100644
index 00000000000..f798d312934
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/deployments/DeploymentsRestEntityResource.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.deployments;
+
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.Deployments;
+import org.alfresco.rest.workflow.api.model.Deployment;
+
+@EntityResource(name="deployments", title = "Deployments")
+public class DeploymentsRestEntityResource implements EntityResourceAction.Read<Deployment>,  
+                                                      EntityResourceAction.ReadById<Deployment> {
+
+    Deployments deployments;
+    
+    public void setDeployments(Deployments deployments)
+    {
+        this.deployments = deployments;
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Deployment> readAll(Parameters params)
+    {
+        return deployments.getDeployments(params.getPaging());
+    }
+    
+    @Override
+	public Deployment readById(String id, Parameters parameters) throws EntityNotFoundException
+	{
+        return deployments.getDeployment(id);
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/deployments/package-info.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/deployments/package-info.java
new file mode 100644
index 00000000000..e570711fba5
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/deployments/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="workflow", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.workflow.api.deployments;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/ActivitiesImpl.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/ActivitiesImpl.java
new file mode 100644
index 00000000000..7ace5e94ff2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/ActivitiesImpl.java
@@ -0,0 +1,75 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.activiti.engine.history.HistoricActivityInstance;
+import org.activiti.engine.history.HistoricActivityInstanceQuery;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.Activities;
+import org.alfresco.rest.workflow.api.model.Activity;
+
+public class ActivitiesImpl extends WorkflowRestImpl implements Activities
+{
+    private static final String STATUS_ACTIVE = "active";
+    private static final String STATUS_COMPLETED = "completed";
+
+    @Override
+    public CollectionWithPagingInfo<Activity> getActivities(String processId, Parameters parameters)
+    {
+        Paging paging = parameters.getPaging();
+        String status = parameters.getParameter("status");
+        
+        validateIfUserAllowedToWorkWithProcess(processId);
+
+        HistoricActivityInstanceQuery query = activitiProcessEngine
+                .getHistoryService()
+                .createHistoricActivityInstanceQuery();
+        
+        if (STATUS_ACTIVE.equals(status)) query.unfinished();
+        else if (STATUS_COMPLETED.equals(status)) query.finished();
+        
+        query.processInstanceId(processId);
+        
+        query.orderByExecutionId().asc();
+        
+        List<HistoricActivityInstance> activities = query.listPage(paging.getSkipCount(), paging.getMaxItems());
+
+        List<Activity> page = new ArrayList<Activity>(activities.size());
+        for (HistoricActivityInstance activityInstance: activities) 
+        {
+            Activity activity = new Activity(activityInstance);
+            page.add(activity);
+        }
+        
+        return CollectionWithPagingInfo.asPaged(paging, page, false, page.size());
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/DeploymentsImpl.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/DeploymentsImpl.java
new file mode 100644
index 00000000000..c17ce7785ae
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/DeploymentsImpl.java
@@ -0,0 +1,117 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.DeploymentQuery;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.workflow.WorkflowDeployer;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.workflow.api.Deployments;
+import org.alfresco.rest.workflow.api.model.Deployment;
+
+public class DeploymentsImpl extends WorkflowRestImpl implements Deployments
+{
+    @Override
+    public CollectionWithPagingInfo<Deployment> getDeployments(Paging paging)
+    {
+        // Only admin-user is allowed to get deployments
+        if(!authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser())) {
+            throw new PermissionDeniedException();
+        }
+        
+        DeploymentQuery query = activitiProcessEngine
+                .getRepositoryService()
+                .createDeploymentQuery()
+                .deploymentCategoryNotEquals(WorkflowDeployer.CATEGORY_ALFRESCO_INTERNAL);
+        
+        if (tenantService.isEnabled() && deployWorkflowsInTenant) 
+        {
+            query.processDefinitionKeyLike("@" + TenantUtil.getCurrentDomain() + "@%");
+        }
+        
+        query.orderByDeploymenTime().desc();
+        List<org.activiti.engine.repository.Deployment> deployments = query.listPage(paging.getSkipCount(), paging.getMaxItems());
+        int totalCount = (int) query.count();
+
+        List<Deployment> page = new ArrayList<Deployment>(deployments.size());
+        for (org.activiti.engine.repository.Deployment deployment: deployments) 
+        {
+            page.add(new Deployment(deployment));
+        }
+          
+        return CollectionWithPagingInfo.asPaged(paging, page, (page.size() + paging.getSkipCount()) < totalCount, totalCount);
+    }
+    
+    @Override
+    public Deployment getDeployment(String deploymentId) 
+    {
+        // Only admin-user is allowed to get deployments
+        if(!authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser())) {
+            throw new PermissionDeniedException();
+        }
+        
+        RepositoryService repositoryService = activitiProcessEngine.getRepositoryService();
+        
+        DeploymentQuery query = repositoryService
+                .createDeploymentQuery()
+                .deploymentId(deploymentId);
+        
+        if (tenantService.isEnabled() && deployWorkflowsInTenant) 
+        {
+            query.processDefinitionKeyLike("@" + TenantUtil.getCurrentDomain() + "@%");
+        }
+        
+        org.activiti.engine.repository.Deployment deployment = null;
+        try 
+        {
+            deployment = query.singleResult();
+        } 
+        catch(ActivitiException e) 
+        {
+            // The next exception will cause a response status 400: Bad request
+            throw new InvalidArgumentException("Invalid deployment id: " + deploymentId); 
+        }
+        
+        if (deployment == null) 
+        {
+            // The next exception will cause a response status 404: Not found
+            throw new EntityNotFoundException(deploymentId);
+        }
+
+        Deployment deploymentRest = new Deployment(deployment);
+        return deploymentRest;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/ISO8601Converter.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/ISO8601Converter.java
new file mode 100644
index 00000000000..3fd36d4570a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/ISO8601Converter.java
@@ -0,0 +1,124 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.impl;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import org.alfresco.util.ISO8601DateFormat;
+import org.apache.commons.beanutils.Converter;
+
+public class ISO8601Converter implements Converter
+{
+    @Override
+    @SuppressWarnings("rawtypes")
+    public Object convert(Class clazz, Object value)
+    {
+        Object result = false;
+        
+        if(value != null)
+        {
+            if(clazz.equals(Date.class))
+            {
+            	if(value instanceof Date)
+            	{
+            		result = value;
+            	}
+            	else if(value instanceof String)
+            	{
+            		result = ISO8601DateFormat.parse((String) value);
+            	}
+            	else if (value instanceof Long) 
+            	{
+            		Long longObj = (Long)value;
+            		result =  new Date(longObj);
+            	}
+            	else if (value instanceof java.sql.Date) 
+            	{
+            		java.sql.Date valueX = (java.sql.Date)value;
+            		result = new Date(valueX.getTime());        
+                }
+            	else if (value instanceof java.sql.Time) 
+            	{
+            		java.sql.Time valueX = (java.sql.Time)value;
+            		result = new Date(valueX.getTime());        
+                }
+            	else if(value instanceof Calendar)
+            	{
+            		result = ((Calendar)value).getTime();
+            	}
+            	else
+            	{
+            		throw new IllegalArgumentException("Unsupported value type: " + value.getClass());
+            	}
+            }
+            else if(clazz.equals(Calendar.class))
+            {
+            	if(value instanceof Calendar)
+            	{
+            		result = value;
+            	}
+            	else if(value instanceof String)
+            	{
+            		result = Calendar.getInstance();
+            		((Calendar) result).setTime(ISO8601DateFormat.parse((String) value));
+            	}
+            	else if(value instanceof Date)
+            	{
+            		result = Calendar.getInstance();
+            		((Calendar) result).setTime((Date)value);
+            	}
+            	else if (value instanceof Long) 
+            	{
+            		result = Calendar.getInstance();
+            		Long longObj = (Long)value;
+            		((Calendar) result).setTime(new Date(longObj));
+            	}
+            	else if (value instanceof java.sql.Date) 
+            	{
+            		result = Calendar.getInstance();
+            		java.sql.Date longObj = (java.sql.Date)value;
+            		((Calendar) result).setTime(new Date(longObj.getTime()));
+                }
+            	else if (value instanceof java.sql.Time) 
+            	{
+            		result = Calendar.getInstance();
+            		java.sql.Time longObj = (java.sql.Time)value;
+            		((Calendar) result).setTime(new Date(longObj.getTime()));
+                }
+            	else
+            	{
+            		throw new IllegalArgumentException("Unsupported value type: " + value.getClass());
+            	}
+            }
+            else 
+            {
+                throw new IllegalArgumentException("Unsupported type: " + clazz.getName());
+            }
+        }
+        return result;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/MapBasedQueryWalker.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/MapBasedQueryWalker.java
new file mode 100644
index 00000000000..25c565ee91e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/MapBasedQueryWalker.java
@@ -0,0 +1,474 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.framework.core.exceptions.ApiException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper.WalkerCallbackAdapter;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ISO8601DateFormat;
+import org.apache.commons.beanutils.ConversionException;
+import org.apache.commons.beanutils.ConvertUtils;
+
+/**
+ * Query walker that adds all properties for "equals" comparison to a map. If an
+ * unsupported property or comparison operation is encountered, an
+ * {@link InvalidArgumentException} is thrown unless the method
+ * {@link #handleUnmatchedComparison(int, String, String)} returns true (default
+ * implementation returns false).
+ * 
+ * @author Frederik Heremans
+ * @author Tijs Rademakers
+ */
+public class MapBasedQueryWalker extends WalkerCallbackAdapter
+{
+    private Set<String> supportedEqualsParameters;
+
+    private Set<String> supportedMatchesParameters;
+
+    private Set<String> supportedGreaterThanParameters;
+
+    private Set<String> supportedGreaterThanOrEqualParameters;
+
+    private Set<String> supportedLessThanParameters;
+
+    private Set<String> supportedLessThanOrEqualParameters;
+
+    private Map<String, String> equalsProperties;
+
+    private Map<String, String> matchesProperties;
+    
+    private Map<String, String> greaterThanProperties;
+    
+    private Map<String, String> greaterThanOrEqualProperties;
+    
+    private Map<String, String> lessThanProperties;
+    
+    private Map<String, String> lessThanOrEqualProperties;
+    
+    private List<QueryVariableHolder> variableProperties;
+    
+    private boolean variablesEnabled;
+    
+    private NamespaceService namespaceService;
+    
+    private DictionaryService dictionaryService;
+
+    public MapBasedQueryWalker(Set<String> supportedEqualsParameters, Set<String> supportedMatchesParameters)
+    {
+        this.supportedEqualsParameters = supportedEqualsParameters;
+        this.supportedMatchesParameters = supportedMatchesParameters;
+        this.equalsProperties = new HashMap<String, String>();
+        this.matchesProperties = new HashMap<String, String>();
+    }
+
+    public void setSupportedGreaterThanParameters(Set<String> supportedGreaterThanParameters)
+    {
+        this.supportedGreaterThanParameters = supportedGreaterThanParameters;
+        if (greaterThanProperties == null)
+        {
+            greaterThanProperties = new HashMap<String, String>();
+        }
+    }
+
+    public void setSupportedGreaterThanOrEqualParameters(Set<String> supportedGreaterThanOrEqualParameters)
+    {
+        this.supportedGreaterThanOrEqualParameters = supportedGreaterThanOrEqualParameters;
+        if (greaterThanOrEqualProperties == null)
+        {
+            greaterThanOrEqualProperties = new HashMap<String, String>();
+        }
+    }
+
+    public void setSupportedLessThanParameters(Set<String> supportedLessThanParameters)
+    {
+        this.supportedLessThanParameters = supportedLessThanParameters;
+        if (lessThanProperties == null)
+        {
+            lessThanProperties = new HashMap<String, String>();
+        }
+    }
+
+    public void setSupportedLessThanOrEqualParameters(Set<String> supportedLessThanOrEqualParameters)
+    {
+        this.supportedLessThanOrEqualParameters = supportedLessThanOrEqualParameters;
+        if (lessThanOrEqualProperties == null)
+        {
+            lessThanOrEqualProperties = new HashMap<String, String>();
+        }
+    }
+    
+    public void enableVariablesSupport(NamespaceService namespaceService, DictionaryService dictionaryService)
+    {
+        variablesEnabled = true;
+        if (namespaceService == null)
+        {
+            throw new IllegalArgumentException("namespace service can't be null");
+        }
+        if (dictionaryService == null)
+        {
+            throw new IllegalArgumentException("dictionary service can't be null");
+        }
+        this.namespaceService = namespaceService;
+        this.dictionaryService = dictionaryService;
+        variableProperties = new ArrayList<QueryVariableHolder>();
+    }
+    
+    public List<QueryVariableHolder> getVariableProperties() {
+        return variableProperties;
+    }
+
+    @Override
+    public void matches(String property, String value, boolean negated)
+    {
+        if(negated)
+        {
+            throw new InvalidArgumentException("Cannot use negated matching for property: " + property); 
+        }
+        if (variablesEnabled && property.startsWith("variables/")) 
+        {
+            processVariable(property, value, WhereClauseParser.MATCHES);
+        }
+        else if (supportedMatchesParameters != null && supportedMatchesParameters.contains(property))
+        {
+            matchesProperties.put(property, value);
+        }
+        else
+        {
+            throw new InvalidArgumentException("Cannot use matching for property: " + property); 
+        }
+    }
+    
+    @Override
+    public void comparison(int type, String propertyName, String propertyValue, boolean negated)
+    {
+        if (variablesEnabled && propertyName.startsWith("variables/")) 
+        {
+            processVariable(propertyName, propertyValue, type);
+            return;
+        }
+        
+        boolean throwError = false;
+        if (type == WhereClauseParser.EQUALS)
+        {
+            if (supportedEqualsParameters != null && supportedEqualsParameters.contains(propertyName))
+            {
+                equalsProperties.put(propertyName, propertyValue);
+            }
+            else
+            {
+                throwError = !handleUnmatchedComparison(type, propertyName, propertyValue);
+            }
+        }
+        else if (type == WhereClauseParser.MATCHES)
+        {
+            if (supportedMatchesParameters != null && supportedMatchesParameters.contains(propertyName))
+            {
+                matchesProperties.put(propertyName, propertyValue);
+            }
+            else
+            {
+                throwError = !handleUnmatchedComparison(type, propertyName, propertyValue);
+            }
+        }
+        else if (type == WhereClauseParser.GREATERTHAN)
+        {
+            if (supportedGreaterThanParameters != null && supportedGreaterThanParameters.contains(propertyName))
+            {
+                greaterThanProperties.put(propertyName, propertyValue);
+            }
+            else
+            {
+                throwError = !handleUnmatchedComparison(type, propertyName, propertyValue);
+            }
+        }
+        else if (type == WhereClauseParser.GREATERTHANOREQUALS)
+        {
+            if (supportedGreaterThanOrEqualParameters != null && supportedGreaterThanOrEqualParameters.contains(propertyName))
+            {
+                greaterThanOrEqualProperties.put(propertyName, propertyValue);
+            }
+            else
+            {
+                throwError = !handleUnmatchedComparison(type, propertyName, propertyValue);
+            }
+        }
+        else if (type == WhereClauseParser.LESSTHAN)
+        {
+            if (supportedLessThanParameters != null && supportedLessThanParameters.contains(propertyName))
+            {
+                lessThanProperties.put(propertyName, propertyValue);
+            }
+            else
+            {
+                throwError = !handleUnmatchedComparison(type, propertyName, propertyValue);
+            }
+        }
+        else if (type == WhereClauseParser.LESSTHANOREQUALS)
+        {
+            if (supportedLessThanOrEqualParameters != null && supportedLessThanOrEqualParameters.contains(propertyName))
+            {
+                lessThanOrEqualProperties.put(propertyName, propertyValue);
+            }
+            else
+            {
+                throwError = !handleUnmatchedComparison(type, propertyName, propertyValue);
+            }
+        }
+        else
+        {
+            throwError = !handleUnmatchedComparison(type, propertyName, propertyValue);
+        }
+
+        if (throwError) 
+        { 
+            throw new InvalidArgumentException("framework.exception.InvalidProperty", new Object[] {propertyName, propertyValue, WhereClauseParser.tokenNames[type]});
+        }
+        else if (negated)
+        {
+            // Throw error for the unsupported negation only if the property was valid for comparison, show the more meaningful error first.
+            throw new InvalidArgumentException("Cannot use NOT for " + WhereClauseParser.tokenNames[type] + " comparison."); 
+        }
+    }
+
+    public String getProperty(String propertyName, int type)
+    {
+        if (type == WhereClauseParser.EQUALS)
+        {
+            return equalsProperties.get(propertyName);
+        }
+        else if (type == WhereClauseParser.MATCHES)
+        {
+            return matchesProperties.get(propertyName);
+        }
+        else if (type == WhereClauseParser.GREATERTHAN && greaterThanProperties != null)
+        {
+            return greaterThanProperties.get(propertyName);
+        }
+        else if (type == WhereClauseParser.GREATERTHANOREQUALS && greaterThanOrEqualProperties != null)
+        {
+            return greaterThanOrEqualProperties.get(propertyName);
+        }
+        else if (type == WhereClauseParser.LESSTHAN && lessThanProperties != null)
+        {
+            return lessThanProperties.get(propertyName);
+        }
+        else if (type == WhereClauseParser.LESSTHANOREQUALS && lessThanOrEqualProperties != null)
+        {
+            return lessThanOrEqualProperties.get(propertyName);
+        }
+        else
+        {
+            throw new IllegalArgumentException("type " + type + " is not supported");
+        }
+    }
+
+    /**
+     * Get the property value, converted to the requested type.
+     * 
+     * @param propertyName name of the parameter
+     * @param type int
+     * @param returnType type of object to return
+     * @return the converted parameter value. Null, if the property has no
+     *         value.
+     * @throws IllegalArgumentException when no conversion for the given
+     *             returnType is available or if returnType is null.
+     * @throws InvalidArgumentException when conversion to the given type was
+     *             not possible due to an error while converting
+     */
+    @SuppressWarnings("unchecked")
+    public <T extends Object> T getProperty(String propertyName, int type, Class<T> returnType)
+    {
+        if (returnType == null) { throw new IllegalArgumentException("ReturnType cannot be null"); }
+        try
+        {
+            Object result = null;
+            String stringValue = getProperty(propertyName, type);
+            if (stringValue != null)
+            {
+                result = ConvertUtils.convert(stringValue, returnType);
+                if ((result instanceof String) && (! returnType.equals(String.class)))
+                {
+                    // If a string is returned, no converter has been found (for non-String return type)
+                    throw new IllegalArgumentException("Unable to convert parameter to type: " + returnType.getName());
+                }
+            }
+            return (T) result;
+        }
+        catch (ConversionException ce)
+        {
+            // Conversion failed, wrap in Illegal
+            throw new InvalidArgumentException("Query property value for '" + propertyName + "' should be a valid "
+                    + returnType.getSimpleName());
+        }
+    }
+
+    @Override
+    public void and()
+    {
+        // We don't need to do anything in this method. However, overriding the
+        // method indicates that AND is
+        // supported. OR is not supported at the same time.
+    }
+    
+    protected void processVariable(String propertyName, String propertyValue, int type)
+    {
+        String localPropertyName = propertyName.replaceFirst("variables/", "");
+        Object actualValue = null;
+        DataTypeDefinition dataTypeDefinition = null;
+        // variable scope global is default
+        String scopeDef = "global";
+        
+        // look for variable scope
+        if (localPropertyName.contains("local/"))
+        {
+            scopeDef = "local";
+            localPropertyName = localPropertyName.replaceFirst("local/", "");
+        }
+    
+        if (localPropertyName.contains("global/"))
+        {
+            localPropertyName = localPropertyName.replaceFirst("global/", "");
+        }
+        
+        // look for variable type definition
+        if ((propertyValue.contains("_") || propertyValue.contains(":")) && propertyValue.contains(" ")) 
+        {
+            int indexOfSpace = propertyValue.indexOf(' ');
+            if ((propertyValue.contains("_") && indexOfSpace > propertyValue.indexOf("_")) || 
+                    (propertyValue.contains(":") && indexOfSpace > propertyValue.indexOf(":")))
+            {
+                String typeDef = propertyValue.substring(0, indexOfSpace);
+                try
+                {
+                    QName dataType = QName.createQName(typeDef.replace('_', ':'), namespaceService);
+                    dataTypeDefinition = dictionaryService.getDataType(dataType);
+                    propertyValue = propertyValue.substring(indexOfSpace + 1);
+                }
+                catch (Exception e)
+                {
+                    throw new ApiException("Error translating propertyName " + propertyName + " with value " + propertyValue);
+                }
+            }
+        }
+        
+        if (dataTypeDefinition != null && "java.util.Date".equalsIgnoreCase(dataTypeDefinition.getJavaClassName()))
+        {
+            // fix for different ISO 8601 Date format classes in Alfresco (org.alfresco.util and Spring Surf)
+            actualValue = ISO8601DateFormat.parse(propertyValue);
+        }
+        else if (dataTypeDefinition != null)
+        {
+            actualValue = DefaultTypeConverter.INSTANCE.convert(dataTypeDefinition, propertyValue);
+        }
+        else 
+        {
+            actualValue = propertyValue;
+        }
+        
+        variableProperties.add(new QueryVariableHolder(localPropertyName, type, actualValue, scopeDef));
+    }
+
+    /**
+     * Called when unsupported property is encountered or comparison operator
+     * other than equals.
+     * 
+     * @return true, if the comparison is handles successfully. False, if an
+     *         exception should be thrown because the comparison can't be
+     *         handled.
+     */
+    protected boolean handleUnmatchedComparison(int type, String propertyName, String propertyValue)
+    {
+        return false;
+    }
+    
+    public static class QueryVariableHolder implements Serializable
+    {
+        private static final long serialVersionUID = 1L;
+        
+        private String propertyName;
+        private int operator;
+        private Object propertyValue;
+        private String scope;
+        
+        public QueryVariableHolder() {}
+        
+        public QueryVariableHolder(String propertyName, int operator, Object propertyValue, String scope) {
+            this.propertyName = propertyName;
+            this.operator = operator;
+            this.propertyValue = propertyValue;
+            this.scope = scope;
+        }
+        
+        public String getPropertyName()
+        {
+            return propertyName;
+        }
+        public void setPropertyName(String propertyName)
+        {
+            this.propertyName = propertyName;
+        }
+        public int getOperator()
+        {
+            return operator;
+        }
+        public void setOperator(int operator)
+        {
+            this.operator = operator;
+        }
+        public Object getPropertyValue()
+        {
+            return propertyValue;
+        }
+        public void setPropertyValue(Object propertyValue)
+        {
+            this.propertyValue = propertyValue;
+        }
+        public String getScope()
+        {
+            return scope;
+        }
+        public void setScope(String scope)
+        {
+            this.scope = scope;
+        }
+        public boolean isGlobalScope() {
+            return "global".equals(scope);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/MapBasedQueryWalkerOrSupported.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/MapBasedQueryWalkerOrSupported.java
new file mode 100644
index 00000000000..530d98eb4c0
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/MapBasedQueryWalkerOrSupported.java
@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.impl;
+
+import java.util.Set;
+
+/**
+ * Query walker extension of MapBasedQueryWalker created to
+ * add support for OR operation and set AND operation as unsupported.
+ *
+ */
+public class MapBasedQueryWalkerOrSupported extends MapBasedQueryWalker
+{
+
+    public MapBasedQueryWalkerOrSupported(Set<String> supportedEqualsParameters, Set<String> supportedMatchesParameters)
+    {
+        super(supportedEqualsParameters, supportedMatchesParameters);
+    }
+
+    @Override
+    public void or()
+    {
+        // We don't need to do anything in this method. However, overriding the
+        // method indicates that OR is supported.
+    }
+
+    @Override
+    public void and()
+    {
+        throw UNSUPPORTED;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/ProcessDefinitionsImpl.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/ProcessDefinitionsImpl.java
new file mode 100644
index 00000000000..bfdeda770ec
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/ProcessDefinitionsImpl.java
@@ -0,0 +1,406 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.impl;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import org.activiti.engine.form.StartFormData;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.repository.ProcessDefinitionQuery;
+import org.alfresco.repo.i18n.MessageService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.workflow.WorkflowDeployer;
+import org.alfresco.repo.workflow.WorkflowModel;
+import org.alfresco.repo.workflow.WorkflowObjectFactory;
+import org.alfresco.repo.workflow.WorkflowQNameConverter;
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.framework.core.exceptions.ApiException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.content.FileBinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.workflow.api.ProcessDefinitions;
+import org.alfresco.rest.workflow.api.model.FormModelElement;
+import org.alfresco.rest.workflow.api.model.ProcessDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.TempFileProvider;
+import org.apache.commons.io.IOUtils;
+
+public class ProcessDefinitionsImpl extends WorkflowRestImpl implements ProcessDefinitions
+{
+    private static final Set<String> PROCESS_DEFINITION_COLLECTION_EQUALS_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(new String[] {
+        "category", "key", "name", "deploymentId", "version"
+    }));
+    
+    private static final Set<String> PROCESS_DEFINITION_COLLECTION_MATCHES_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(new String[] {
+        "category", "key", "name"
+    }));
+    
+    private static final Set<String> PROCESS_DEFINITION_COLLECTION_SORT_PROPERTIES = new HashSet<String>(Arrays.asList(
+        "deploymentId", "key", "category", "id", "version", "name"
+    ));
+    
+    MessageService messageService;
+    String engineId;
+    
+    WorkflowQNameConverter qNameConverter;
+    QName defaultStartTaskType = WorkflowModel.TYPE_ACTIVTI_START_TASK;
+    WorkflowObjectFactory workflowFactory;
+    
+    public void setMessageService(MessageService messageService)
+    {
+        this.messageService = messageService;
+    }
+    
+    public void setEngineId(String engineId)
+    {
+        this.engineId = engineId;
+    }
+
+    @Override
+    public CollectionWithPagingInfo<ProcessDefinition> getProcessDefinitions(Parameters parameters)
+    {
+        ProcessDefinitionQuery query = activitiProcessEngine
+                .getRepositoryService()
+                .createProcessDefinitionQuery()
+                .processDefinitionCategoryNotEquals(WorkflowDeployer.CATEGORY_ALFRESCO_INTERNAL);
+        
+        MapBasedQueryWalker propertyWalker = new MapBasedQueryWalker(PROCESS_DEFINITION_COLLECTION_EQUALS_QUERY_PROPERTIES, 
+                    PROCESS_DEFINITION_COLLECTION_MATCHES_QUERY_PROPERTIES);
+        
+        boolean keyQueryIncluded = false;
+        
+        if(parameters.getQuery() != null)
+        {
+            QueryHelper.walk(parameters.getQuery(), propertyWalker);
+            
+            // Property equals
+            String categoryProperty = propertyWalker.getProperty("category", WhereClauseParser.EQUALS);
+            if (categoryProperty != null) 
+            {
+                query.processDefinitionCategory(categoryProperty);
+            }
+            
+            String keyProperty = propertyWalker.getProperty("key", WhereClauseParser.EQUALS);
+            if (keyProperty != null) 
+            {
+                query.processDefinitionKey(getProcessDefinitionKey(keyProperty));
+                keyQueryIncluded = true;
+            }
+            
+            String nameProperty = propertyWalker.getProperty("name", WhereClauseParser.EQUALS);
+            if (nameProperty != null) 
+            {
+                query.processDefinitionName(nameProperty);
+            }
+            
+            Integer versionProperty = propertyWalker.getProperty("version", WhereClauseParser.EQUALS, Integer.class);
+            if (versionProperty != null) 
+            {
+                query.processDefinitionVersion(versionProperty);
+            }
+            
+            String deploymentProperty = propertyWalker.getProperty("deploymentId", WhereClauseParser.EQUALS);
+            if (deploymentProperty != null) 
+            {
+                query.deploymentId(deploymentProperty);
+            }
+            
+            // Property matches
+            String categoryMatchesProperty = propertyWalker.getProperty("category", WhereClauseParser.MATCHES);
+            if (categoryMatchesProperty != null) 
+            {
+                query.processDefinitionCategoryLike(categoryMatchesProperty);
+            }
+            
+            String keyMatchesProperty = propertyWalker.getProperty("key", WhereClauseParser.MATCHES);
+            if (keyMatchesProperty != null) 
+            {
+                query.processDefinitionKeyLike(getProcessDefinitionKey(keyMatchesProperty));
+                keyQueryIncluded = true;
+            }
+            
+            String nameLikeProperty = propertyWalker.getProperty("name", WhereClauseParser.MATCHES);
+            if (nameLikeProperty != null) 
+            {
+                query.processDefinitionNameLike(nameLikeProperty);
+            }
+        }
+        
+        // Filter based on tenant, if required
+        if (keyQueryIncluded == false && tenantService.isEnabled() && deployWorkflowsInTenant) 
+        {
+            query.processDefinitionKeyLike("@" + TenantUtil.getCurrentDomain() + "@%");
+        }
+
+        List<SortColumn> sortList = parameters.getSorting();
+        SortColumn sortColumn = null;
+        if (sortList != null && sortList.size() > 0)
+        {
+            if (sortList.size() != 1)
+            {
+                throw new InvalidArgumentException("Only one orderBy parameter is supported");
+            }
+            sortColumn = sortList.get(0);
+
+            switch (sortColumn.column) {
+                case "id":
+                    query.orderByProcessDefinitionId();
+                    break;
+                case "deploymentId":
+                    query.orderByDeploymentId();
+                    break;
+                case "key":
+                    query.orderByProcessDefinitionKey();
+                    break;
+                case "category":
+                    query.orderByProcessDefinitionCategory();
+                    break;
+                case "version":
+                    query.orderByProcessDefinitionVersion();
+                    break;
+                case "name":
+                    query.orderByProcessDefinitionName();
+                    break;
+                default:
+                    throw new InvalidArgumentException("OrderBy " + sortColumn.column +
+                            " is not supported, supported items are " + PROCESS_DEFINITION_COLLECTION_SORT_PROPERTIES);
+            }
+
+            if (sortColumn.asc)
+            {
+                query.asc();
+            }
+            else
+            {
+                query.desc();
+            }
+        }
+        else
+        {
+            query.orderByProcessDefinitionId().asc();
+        }
+        
+        List<org.activiti.engine.repository.ProcessDefinition> processDefinitions = 
+                query.listPage(parameters.getPaging().getSkipCount(), parameters.getPaging().getMaxItems());
+        int totalCount = (int) query.count();
+
+        List<ProcessDefinition> page = new ArrayList<ProcessDefinition>(processDefinitions.size());
+        for (org.activiti.engine.repository.ProcessDefinition processDefinition: processDefinitions) 
+        {
+            page.add(createProcessDefinitionRest((ProcessDefinitionEntity) processDefinition));
+        }
+        
+        return CollectionWithPagingInfo.asPaged(parameters.getPaging(), page, (page.size() + parameters.getPaging().getSkipCount()) < totalCount, totalCount);
+    }
+
+    @Override
+    public ProcessDefinition getProcessDefinition(String definitionId)
+    {
+        ProcessDefinitionQuery query = activitiProcessEngine
+                .getRepositoryService()
+                .createProcessDefinitionQuery()
+                .processDefinitionId(definitionId);
+        
+        if (tenantService.isEnabled() && deployWorkflowsInTenant) 
+        {
+            query.processDefinitionKeyLike("@" + TenantUtil.getCurrentDomain() + "@%");
+        }
+        
+        org.activiti.engine.repository.ProcessDefinition processDefinition = query.singleResult();
+        
+        if (processDefinition == null) 
+        {
+            throw new EntityNotFoundException(definitionId); 
+        }
+
+        ProcessDefinition deploymentRest = createProcessDefinitionRest((ProcessDefinitionEntity) processDefinition);
+        return deploymentRest;
+    }
+    
+    @Override
+    public BinaryResource getProcessDefinitionImage(String definitionId)
+    {
+    	ProcessDefinitionQuery query = activitiProcessEngine
+                .getRepositoryService()
+                .createProcessDefinitionQuery()
+                .processDefinitionId(definitionId);
+        
+        if (tenantService.isEnabled() && deployWorkflowsInTenant) 
+        {
+            query.processDefinitionKeyLike("@" + TenantUtil.getCurrentDomain() + "@%");
+        }
+        
+        org.activiti.engine.repository.ProcessDefinition processDefinition = query.singleResult();
+        
+        if (processDefinition == null) 
+        {
+            throw new EntityNotFoundException(definitionId); 
+        }
+        
+        try
+        {
+        	InputStream processDiagram = activitiProcessEngine.getRepositoryService().getProcessDiagram(definitionId);
+        	if (processDiagram != null) 
+        	{
+	            File file = TempFileProvider.createTempFile(definitionId + UUID.randomUUID(), ".png");
+	            FileOutputStream fos = new FileOutputStream(file);
+	            IOUtils.copy(processDiagram, fos);
+	            fos.close();
+	                
+	            return new FileBinaryResource(file);
+        	}
+        	else
+        	{
+        		throw new ApiException("No image available for definitionId " + definitionId); 
+        	}
+        }
+        catch (IOException error)
+        {
+            throw new ApiException("Error while getting process definition image.");
+        }
+    }
+
+    @Override
+    public CollectionWithPagingInfo<FormModelElement> getStartFormModel(String definitionId, Paging paging)
+    {
+        // first validate if user is allowed to access the process definition if workflows are deployed per tenant
+        if (tenantService.isEnabled() && deployWorkflowsInTenant) 
+        {
+            ProcessDefinitionQuery query = activitiProcessEngine
+                    .getRepositoryService()
+                    .createProcessDefinitionQuery()
+                    .processDefinitionId(definitionId);
+        
+            query.processDefinitionKeyLike("@" + TenantUtil.getCurrentDomain() + "@%");
+            org.activiti.engine.repository.ProcessDefinition processDefinition = query.singleResult();
+            
+            if (processDefinition == null) 
+            {
+                throw new EntityNotFoundException(definitionId); 
+            }
+        }
+        
+        StartFormData startFormData = activitiProcessEngine.getFormService().getStartFormData(definitionId);
+        if (startFormData == null)
+        {
+            throw new EntityNotFoundException(definitionId);
+        }
+        
+        if (qNameConverter == null)
+        {
+            qNameConverter = new WorkflowQNameConverter(namespaceService);
+        }
+        if (workflowFactory == null) 
+        {
+            workflowFactory = new WorkflowObjectFactory(qNameConverter, tenantService, messageService, dictionaryService, engineId, defaultStartTaskType);
+        }
+        
+        // Lookup type definition for the startTask
+        TypeDefinition startTaskType = workflowFactory.getTaskFullTypeDefinition(startFormData.getFormKey(), true);
+        return getFormModelElements(startTaskType, paging);
+    }
+    
+    protected String getProcessDefinitionKey(String key)
+    {
+        String processDefKey = null;
+        if (tenantService.isEnabled() && deployWorkflowsInTenant)
+        {
+            processDefKey = "@" + TenantUtil.getCurrentDomain() + "@" + key;
+        }
+        else
+        {
+            processDefKey = key;
+        }
+        return processDefKey;
+    }
+    
+    protected String getLocalProcessDefinitionKey(String key)
+    {
+        String processDefKey = null;
+        if (tenantService.isEnabled() && deployWorkflowsInTenant)
+        {
+            processDefKey = key.substring(key.lastIndexOf("@") + 1);
+        }
+        else
+        {
+            processDefKey = key;
+        }
+        return processDefKey;
+    }
+
+    protected ProcessDefinition createProcessDefinitionRest(ProcessDefinitionEntity processDefinition)
+    {
+        ProcessDefinition processDefinitionRest = new ProcessDefinition(processDefinition);
+        String localKey = getLocalProcessDefinitionKey(processDefinition.getKey());
+        processDefinitionRest.setKey(localKey);
+        
+        String displayId = localKey + ".workflow";
+        processDefinitionRest.setTitle(getLabel(displayId, "title"));
+        processDefinitionRest.setDescription(getLabel(displayId, "description"));
+       
+        processDefinitionRest.setGraphicNotationDefined(processDefinition.isGraphicalNotationDefined());
+        if (processDefinition.hasStartFormKey()) 
+        {
+            try 
+            {
+                StartFormData startFormData = activitiProcessEngine.getFormService().getStartFormData(processDefinition.getId());
+                if (startFormData != null) 
+                {
+                    processDefinitionRest.setStartFormResourceKey(startFormData.getFormKey());
+                }
+            }
+            catch (Exception e) 
+            {
+                throw new ApiException("Error while retrieving start form key");
+            }
+        }
+        return processDefinitionRest;
+    }
+    
+    protected String getLabel(String displayId, String labelKey)
+    {
+        String keyBase = displayId.replace(":", "_");
+        String key = keyBase+ "." + labelKey;
+        String label = messageService.getMessage(key);
+        return label;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/ProcessesImpl.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/ProcessesImpl.java
new file mode 100644
index 00000000000..88683070c3f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/ProcessesImpl.java
@@ -0,0 +1,1198 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.impl;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.engine.ActivitiObjectNotFoundException;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.form.StartFormData;
+import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.history.HistoricProcessInstanceQuery;
+import org.activiti.engine.history.HistoricVariableInstance;
+import org.activiti.engine.impl.identity.Authentication;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.activiti.engine.repository.ProcessDefinitionQuery;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.image.ProcessDiagramGenerator;
+import org.activiti.image.impl.DefaultProcessDiagramGenerator;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.i18n.MessageService;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authority.AuthorityDAO;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.workflow.DefaultWorkflowPropertyHandler;
+import org.alfresco.repo.workflow.WorkflowAuthorityManager;
+import org.alfresco.repo.workflow.WorkflowConstants;
+import org.alfresco.repo.workflow.WorkflowModel;
+import org.alfresco.repo.workflow.WorkflowObjectFactory;
+import org.alfresco.repo.workflow.WorkflowPackageImpl;
+import org.alfresco.repo.workflow.WorkflowPropertyHandlerRegistry;
+import org.alfresco.repo.workflow.WorkflowQNameConverter;
+import org.alfresco.repo.workflow.activiti.ActivitiConstants;
+import org.alfresco.repo.workflow.activiti.ActivitiNodeConverter;
+import org.alfresco.repo.workflow.activiti.ActivitiScriptNode;
+import org.alfresco.repo.workflow.activiti.ActivitiUtil;
+import org.alfresco.repo.workflow.activiti.properties.ActivitiPropertyConverter;
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.framework.core.exceptions.ApiException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.content.FileBinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.workflow.api.Processes;
+import org.alfresco.rest.workflow.api.impl.MapBasedQueryWalker.QueryVariableHolder;
+import org.alfresco.rest.workflow.api.model.Item;
+import org.alfresco.rest.workflow.api.model.ProcessInfo;
+import org.alfresco.rest.workflow.api.model.Variable;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.InvalidQNameException;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ISO8601DateFormat;
+import org.alfresco.util.TempFileProvider;
+import org.alfresco.util.collections.CollectionUtils;
+import org.apache.commons.io.IOUtils;
+
+public class ProcessesImpl extends WorkflowRestImpl implements Processes
+{
+    protected static String PROCESS_STATUS_ANY = "any";
+    protected static String PROCESS_STATUS_ACTIVE = "active";
+    protected static String PROCESS_STATUS_COMPLETED = "completed";
+    protected static String PROCESS_STATUS_DELETED = "deleted";
+    
+    protected static final Set<String> PROCESS_STATUS_LIST = new HashSet<String>(Arrays.asList(
+            PROCESS_STATUS_ANY, PROCESS_STATUS_ACTIVE, PROCESS_STATUS_COMPLETED, PROCESS_STATUS_DELETED
+    ));
+    
+    protected static final Set<String> PROCESS_COLLECTION_EQUALS_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
+        "processDefinitionId", "businessKey", "processDefinitionKey", "startUserId", "status", "includeVariables"
+    ));
+    
+    protected static final Set<String> PROCESS_COLLECTION_GREATERTHAN_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
+        "startedAt", "endedAt"
+    ));
+    
+    protected static final Set<String> PROCESS_COLLECTION_LESSTHAN_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
+        "startedAt", "endedAt"
+    ));
+    
+    protected static final Set<String> PROCESS_COLLECTION_SORT_PROPERTIES = new HashSet<String>(Arrays.asList(
+        "processDefinitionId", "businessKey", "id", "startedAt", "endedAt", "durationInMillis"
+    ));
+    
+    protected WorkflowPackageImpl workflowPackageComponent;
+    protected ServiceRegistry serviceRegistry;
+    protected AuthorityDAO authorityDAO;
+    protected PersonService personService;
+    protected MessageService messageService;
+    protected String engineId;
+    protected Repository repositoryHelper;
+    protected RestVariableHelper restVariableHelper;
+    
+    protected ActivitiNodeConverter nodeConverter;
+    protected ActivitiUtil activitiUtil;
+    protected DefaultWorkflowPropertyHandler defaultPropertyHandler;
+    protected WorkflowQNameConverter qNameConverter;
+    protected QName defaultStartTaskType = WorkflowModel.TYPE_ACTIVTI_START_TASK;
+    protected WorkflowObjectFactory workflowFactory;
+    protected WorkflowPropertyHandlerRegistry handlerRegistry;
+    protected WorkflowAuthorityManager authorityManager;
+    protected ActivitiPropertyConverter propertyConverter;
+    
+    public void setAuthorityDAO(AuthorityDAO authorityDAO)
+    {
+        this.authorityDAO = authorityDAO;
+    }
+
+    public void setServiceRegistry(ServiceRegistry serviceRegistry)
+    {
+        this.serviceRegistry = serviceRegistry;
+    }
+
+    public void setWorkflowPackageComponent(WorkflowPackageImpl workflowPackageComponent)
+    {
+        this.workflowPackageComponent = workflowPackageComponent;
+    }
+
+    public void setPersonService(PersonService personService)
+    {
+        this.personService = personService;
+    }
+
+    public void setRepositoryHelper(Repository repositoryHelper)
+    {
+        this.repositoryHelper = repositoryHelper;
+    }
+
+    public void setMessageService(MessageService messageService)
+    {
+        this.messageService = messageService;
+    }
+    
+    public void setEngineId(String engineId)
+    {
+        this.engineId = engineId;
+    }
+    
+    public void setRestVariableHelper(RestVariableHelper restVariableHelper)
+    {
+        this.restVariableHelper = restVariableHelper;
+    }
+
+    protected ActivitiNodeConverter getNodeConverter()
+    {
+        if (nodeConverter == null)
+        {
+            nodeConverter = new ActivitiNodeConverter(serviceRegistry);
+        }
+        return nodeConverter;
+    }
+    
+    protected DefaultWorkflowPropertyHandler getDefaultPropertyHandler()
+    {
+        if (defaultPropertyHandler == null)
+        {
+            defaultPropertyHandler = new DefaultWorkflowPropertyHandler();
+            defaultPropertyHandler.setMessageService(messageService);
+            defaultPropertyHandler.setNodeConverter(getNodeConverter());
+        }
+        return defaultPropertyHandler;
+    }
+        
+    protected ActivitiUtil getActivitiUtil()
+    {
+        if (activitiUtil == null)
+        {
+            activitiUtil = new ActivitiUtil(activitiProcessEngine, deployWorkflowsInTenant);
+        }
+        return activitiUtil;
+    }
+    
+    protected WorkflowQNameConverter getQNameConverter()
+    {
+        if (qNameConverter == null)
+        {
+            qNameConverter = new WorkflowQNameConverter(namespaceService);
+        }
+        return qNameConverter;
+    }
+    
+    protected WorkflowObjectFactory getWorkflowFactory()
+    {
+        if (workflowFactory == null) 
+        {
+            workflowFactory = new WorkflowObjectFactory(getQNameConverter(), tenantService, messageService, dictionaryService, engineId, defaultStartTaskType);
+        }
+        return workflowFactory;
+    }
+    
+    protected WorkflowPropertyHandlerRegistry getHandlerRegistry()
+    {
+        if (handlerRegistry == null)
+        {
+            handlerRegistry = new WorkflowPropertyHandlerRegistry(getDefaultPropertyHandler(), getQNameConverter());
+        }
+        return handlerRegistry;
+    }
+    
+    protected WorkflowAuthorityManager getAuthorityManager()
+    {
+        if (authorityManager == null)
+        {
+            authorityManager = new WorkflowAuthorityManager(authorityDAO);
+        }
+        return authorityManager;
+    }
+    
+    protected ActivitiPropertyConverter getPropertyConverter()
+    {
+        if (propertyConverter == null)
+        {
+            propertyConverter = new ActivitiPropertyConverter(getActivitiUtil(), getWorkflowFactory(), getHandlerRegistry(), getAuthorityManager(), messageService, getNodeConverter());
+        }
+        return propertyConverter;
+    }
+
+    @Override
+    public CollectionWithPagingInfo<ProcessInfo> getProcesses(Parameters parameters)
+    {
+        Paging paging = parameters.getPaging();
+        
+        MapBasedQueryWalker propertyWalker = new MapBasedQueryWalker(PROCESS_COLLECTION_EQUALS_QUERY_PROPERTIES, null);
+        
+        propertyWalker.setSupportedGreaterThanParameters(PROCESS_COLLECTION_GREATERTHAN_QUERY_PROPERTIES);
+        propertyWalker.setSupportedLessThanParameters(PROCESS_COLLECTION_LESSTHAN_QUERY_PROPERTIES);
+        propertyWalker.enableVariablesSupport(namespaceService, dictionaryService);
+        
+        if(parameters.getQuery() != null)
+        {
+            QueryHelper.walk(parameters.getQuery(), propertyWalker);
+        }
+        
+        String status = propertyWalker.getProperty("status", WhereClauseParser.EQUALS);
+        String processDefinitionId = propertyWalker.getProperty("processDefinitionId", WhereClauseParser.EQUALS);
+        String businessKey = propertyWalker.getProperty("businessKey", WhereClauseParser.EQUALS);
+        String processDefinitionKey = propertyWalker.getProperty("processDefinitionKey", WhereClauseParser.EQUALS);
+        String startUserId = propertyWalker.getProperty("startUserId", WhereClauseParser.EQUALS);
+        Date startedAtGreaterThan = propertyWalker.getProperty("startedAt", WhereClauseParser.GREATERTHAN, Date.class);
+        Date startedAtLessThan = propertyWalker.getProperty("startedAt", WhereClauseParser.LESSTHAN, Date.class);
+        Date endedAtGreaterThan = propertyWalker.getProperty("endedAt", WhereClauseParser.GREATERTHAN, Date.class);
+        Date endedAtLessThan = propertyWalker.getProperty("endedAt", WhereClauseParser.LESSTHAN, Date.class);
+        Boolean includeVariables = propertyWalker.getProperty("includeVariables", WhereClauseParser.EQUALS, Boolean.class);
+        
+        if (status != null && PROCESS_STATUS_LIST.contains(status) == false)
+        {
+            throw new InvalidArgumentException("Invalid status parameter: " + status);
+        }
+        
+        List<SortColumn> sortList = parameters.getSorting();
+        SortColumn sortColumn = null;
+        if (sortList != null && sortList.size() > 0)
+        {
+            if (sortList.size() != 1)
+            {
+                throw new InvalidArgumentException("Only one order by parameter is supported");
+            }
+            sortColumn = sortList.get(0);
+        }
+        
+        final HistoricProcessInstanceQuery query = activitiProcessEngine
+                .getHistoryService()
+                .createHistoricProcessInstanceQuery();
+
+        if (processDefinitionId != null) query.processDefinitionId(processDefinitionId);
+        if (businessKey != null) query.processInstanceBusinessKey(businessKey);
+        if (processDefinitionKey != null)
+        {
+            if (tenantService.isEnabled() && deployWorkflowsInTenant) 
+            {
+                if (processDefinitionKey.startsWith("@" + TenantUtil.getCurrentDomain() + "@"))
+                {
+                    query.processDefinitionKey(processDefinitionKey);
+                }
+                else
+                {
+                    query.processDefinitionKey("@" + TenantUtil.getCurrentDomain() + "@" + processDefinitionKey);
+                }
+            }
+            else
+            {
+                query.processDefinitionKey(processDefinitionKey);
+            }
+        }
+        if (startUserId != null) query.startedBy(startUserId);
+        if (startedAtGreaterThan != null) query.startedAfter(startedAtGreaterThan);
+        if (startedAtLessThan != null) query.startedBefore(startedAtLessThan);
+        if (endedAtGreaterThan != null) query.finishedAfter(endedAtGreaterThan);
+        if (endedAtLessThan != null) query.finishedBefore(endedAtLessThan);
+        
+        if (status == null || PROCESS_STATUS_ACTIVE.equals(status))
+        {
+            query.unfinished();
+        }
+        else if (PROCESS_STATUS_COMPLETED.equals(status))
+        {
+            query.finished();
+            query.notDeleted();
+        }
+        else if (PROCESS_STATUS_DELETED.equals(status))
+        {
+            query.deleted();
+        }
+        
+        if (includeVariables != null && includeVariables) {
+            query.includeProcessVariables();
+        }
+        
+        List<QueryVariableHolder> variableProperties = propertyWalker.getVariableProperties();
+        if (variableProperties != null)
+        {
+            for (QueryVariableHolder queryVariableHolder : variableProperties)
+            {
+                if (queryVariableHolder.getOperator() == WhereClauseParser.EQUALS)
+                {    
+                    query.variableValueEquals(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                }
+                else if (queryVariableHolder.getOperator() == WhereClauseParser.GREATERTHAN)
+                {
+                    query.variableValueGreaterThan(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                }
+                else if (queryVariableHolder.getOperator() == WhereClauseParser.GREATERTHANOREQUALS)
+                {
+                    query.variableValueGreaterThanOrEqual(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                }
+                else if (queryVariableHolder.getOperator() == WhereClauseParser.LESSTHAN)
+                {
+                    query.variableValueLessThan(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                }
+                else if (queryVariableHolder.getOperator() == WhereClauseParser.LESSTHANOREQUALS)
+                {
+                    query.variableValueLessThanOrEqual(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                }
+                else if (queryVariableHolder.getOperator() == WhereClauseParser.MATCHES)
+                {
+                    if (queryVariableHolder.getPropertyValue() instanceof String == false)
+                    {
+                        throw new InvalidArgumentException("the matches operator can only be used with a String value for property " + queryVariableHolder.getPropertyName());
+                    }
+                    
+                    if (((String) queryVariableHolder.getPropertyValue()).startsWith("(?i)"))
+                    {
+                        query.variableValueLikeIgnoreCase(queryVariableHolder.getPropertyName(), ((String) queryVariableHolder.getPropertyValue()).substring("(?i)".length()).toLowerCase());
+                    }
+                    else
+                    {
+                        query.variableValueLike(queryVariableHolder.getPropertyName(), (String) queryVariableHolder.getPropertyValue());
+                    }
+                }
+                else if (queryVariableHolder.getOperator() == WhereClauseParser.NEGATION)
+                {
+                    query.variableValueNotEquals(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                }
+                else
+                {
+                    throw new InvalidArgumentException("variable " + queryVariableHolder.getPropertyName() + 
+                            " can only be used with an =, >, >=, <=, <, not, matches comparison type");
+                }
+            }
+        }
+        
+        if (authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser())) 
+        {
+            // Admin is allowed to read all processes in the current tenant
+            if (tenantService.isEnabled()) 
+            {
+                query.variableValueEquals(ActivitiConstants.VAR_TENANT_DOMAIN, TenantUtil.getCurrentDomain());
+            }
+        }
+        else
+        {
+            // If non-admin user, involvement in the process is required (either owner, assignee or externally involved).
+            query.involvedUser(AuthenticationUtil.getRunAsUser());
+        }
+        
+        if (sortColumn != null)
+        {
+            if (PROCESS_COLLECTION_SORT_PROPERTIES.contains(sortColumn.column))
+            {
+                if ("processDefinitionId".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByProcessDefinitionId();
+                }
+                else if ("id".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByProcessInstanceId();
+                }
+                else if ("businessKey".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByProcessInstanceBusinessKey();
+                }
+                else if ("startedAt".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByProcessInstanceStartTime();
+                }
+                else if ("endedAt".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByProcessInstanceEndTime();
+                }
+                else if ("durationInMillis".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByProcessInstanceDuration();
+                }
+            }
+            else
+            {
+                throw new InvalidArgumentException("sort " + sortColumn.column + 
+                        " is not supported, supported items are " + Arrays.toString(PROCESS_COLLECTION_SORT_PROPERTIES.toArray()));
+            }
+            
+            if (sortColumn.asc)
+            {
+                query.asc();
+            }
+            else
+            {
+                query.desc();
+            }
+        }
+        else
+        {
+            query.orderByProcessInstanceStartTime().desc();
+        }
+        
+        List<HistoricProcessInstance> processInstances = query.listPage(paging.getSkipCount(), paging.getMaxItems());
+        int totalCount = (int) query.count();
+
+        List<ProcessInfo> page = new ArrayList<ProcessInfo>(processInstances.size());
+        Map<String, TypeDefinition> definitionTypeMap = new HashMap<String, TypeDefinition>();
+        for (HistoricProcessInstance processInstance: processInstances) 
+        {
+            ProcessInfo processInfo = createProcessInfo(processInstance);
+            if (includeVariables != null && includeVariables) 
+            {
+                if (definitionTypeMap.containsKey(processInfo.getProcessDefinitionId()) == false)
+                {
+                    StartFormData startFormData = activitiProcessEngine.getFormService().getStartFormData(processInfo.getProcessDefinitionId());
+                    if (startFormData != null)
+                    {
+                        String formKey = startFormData.getFormKey();
+                        definitionTypeMap.put(processInfo.getProcessDefinitionId(), getWorkflowFactory().getTaskFullTypeDefinition(formKey, true));
+                    }
+                }
+                
+                if (definitionTypeMap.containsKey(processInfo.getProcessDefinitionId()))
+                {
+                    // Convert raw variables to Variable objects
+                    List<Variable> resultingVariables = restVariableHelper.getVariables(
+                            processInstance.getProcessVariables(), definitionTypeMap.get(processInfo.getProcessDefinitionId()));
+                    processInfo.setProcessVariables(resultingVariables);
+                }
+            }
+            page.add(processInfo);
+        }
+        
+        return CollectionWithPagingInfo.asPaged(paging, page, (page.size() + paging.getSkipCount()) < totalCount, totalCount);
+    }
+
+    @Override
+    public ProcessInfo getProcess(String processId)
+    {
+        if (processId == null) 
+        {
+            throw new InvalidArgumentException("processId is required to get the process info");
+        }
+        
+        HistoricProcessInstance processInstance = activitiProcessEngine
+                .getHistoryService()
+                .createHistoricProcessInstanceQuery()
+                .processInstanceId(processId)
+                .singleResult();
+        
+        if (processInstance == null) 
+        {
+            throw new EntityNotFoundException(processId);
+        }
+
+        return createProcessInfo(processInstance);
+    }
+
+    @Override
+    public ProcessInfo create(ProcessInfo process)
+    {
+        if (process == null) 
+        {
+            throw new InvalidArgumentException("post body expected when starting a new process instance");
+        }
+        
+        boolean definitionExistingChecked = false;
+        RuntimeService runtimeService = activitiProcessEngine.getRuntimeService();
+        String processDefinitionId = null;
+        if (process.getProcessDefinitionId() != null) 
+        {
+            processDefinitionId = process.getProcessDefinitionId();
+        } 
+        else if (process.getProcessDefinitionKey() != null) 
+        {
+            ProcessDefinition definition = activitiProcessEngine
+                    .getRepositoryService()
+                    .createProcessDefinitionQuery()
+                    .processDefinitionKey(getProcessDefinitionKey(process.getProcessDefinitionKey()))
+                    .latestVersion()
+                    .singleResult();
+            
+            if (definition == null)
+            {
+                throw new InvalidArgumentException("No workflow definition could be found with key '" + process.getProcessDefinitionKey() +"'.");
+            }
+            
+            processDefinitionId = definition.getId();
+            definitionExistingChecked = true;
+        } 
+        else 
+        {
+            throw new InvalidArgumentException("Either processDefinitionId or processDefinitionKey is required");
+        }
+        
+        if (definitionExistingChecked == false)
+        {
+            // Check if the required definition actually exists
+            ProcessDefinitionQuery query = activitiProcessEngine
+                    .getRepositoryService()
+                    .createProcessDefinitionQuery()
+                    .processDefinitionId(processDefinitionId);
+            
+            if (tenantService.isEnabled() && deployWorkflowsInTenant) 
+            {
+                query.processDefinitionKeyLike("@" + TenantUtil.getCurrentDomain() + "@%");
+            }
+            
+            if(query.count() == 0)
+            {
+                throw new InvalidArgumentException("No workflow definition could be found with id '" + processDefinitionId +"'.");
+            }
+        }
+        
+        Map<QName, Serializable> startParams = new HashMap<QName, Serializable>();
+        
+        StartFormData startFormData = activitiProcessEngine.getFormService().getStartFormData(processDefinitionId);
+        if (startFormData != null)
+        {
+            if (CollectionUtils.isEmpty(process.getVariables()) == false)
+            {
+                TypeDefinition startTaskType = getWorkflowFactory().getTaskFullTypeDefinition(startFormData.getFormKey(), true);
+                
+                // Lookup type definition for the startTask
+                Map<QName, PropertyDefinition> taskProperties = startTaskType.getProperties();
+                Map<String, QName> propNameMap = new HashMap<String, QName>();
+                for (QName key : taskProperties.keySet())
+                {
+                    propNameMap.put(key.getPrefixString().replace(':', '_'), key);
+                }
+                
+                Map<QName, AssociationDefinition> taskAssociations = startTaskType.getAssociations();
+                for (QName key : taskAssociations.keySet())
+                {
+                    propNameMap.put(key.getPrefixString().replace(':', '_'), key);
+                }
+                
+                for (String variableName : process.getVariables().keySet())
+                {
+                    if (propNameMap.containsKey(variableName))
+                    {
+                        Object variableValue = process.getVariables().get(variableName);
+                        if (taskAssociations.containsKey(propNameMap.get(variableName)))
+                        {
+                            AssociationDefinition associationDef = taskAssociations.get(propNameMap.get(variableName));
+                            variableValue = convertAssociationDefinitionValue(associationDef, variableName, variableValue);
+                        }
+                        else if (taskProperties.containsKey(propNameMap.get(variableName)))
+                        {
+                            PropertyDefinition propDef = taskProperties.get(propNameMap.get(variableName));
+                            DataTypeDefinition propDataType = propDef.getDataType();
+                            if ("java.util.Date".equalsIgnoreCase(propDataType.getJavaClassName()))
+                            {
+                                // fix for different ISO 8601 Date format classes in Alfresco (org.alfresco.util and Spring Surf)
+                                variableValue = ISO8601DateFormat.parse((String) variableValue);
+                            }
+                        }
+                        
+                        if (variableValue instanceof Serializable)
+                        {
+                            startParams.put(propNameMap.get(variableName), (Serializable) variableValue);
+                        }
+                    } 
+                }
+            }
+        }
+        
+        String currentUserName = AuthenticationUtil.getFullyAuthenticatedUser();
+        Authentication.setAuthenticatedUserId(currentUserName);
+        
+        NodeRef workflowPackageNodeRef = null;
+        try 
+        {
+            workflowPackageNodeRef = workflowPackageComponent.createPackage(null);
+            startParams.put(WorkflowModel.ASSOC_PACKAGE, workflowPackageNodeRef);
+        } 
+        catch (Exception e) 
+        {
+            throw new ApiException("couldn't create workflow package: " + e.getMessage(), e);
+        }
+        
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(process.getItems())) 
+        {
+            try 
+            {
+                for (String item: process.getItems()) 
+                {
+                    NodeRef itemNodeRef = getNodeRef(item);
+                    QName workflowPackageItemId = QName.createQName("wpi", itemNodeRef.toString());
+                    nodeService.addChild(workflowPackageNodeRef, itemNodeRef, WorkflowModel.ASSOC_PACKAGE_CONTAINS, workflowPackageItemId);
+                }
+            } 
+            catch (Exception e) 
+            {
+                throw new ApiException("Error while adding items to package: " + e.getMessage(), e);
+            }
+        }
+        
+        // Set start task properties. This should be done before instance is started, since it's id will be used
+        Map<String, Object> variables = getPropertyConverter().getStartVariables(processDefinitionId, startParams);
+        variables.put(WorkflowConstants.PROP_CANCELLED, Boolean.FALSE);
+        
+        // Add company home
+        Object companyHome = getNodeConverter().convertNode(repositoryHelper.getCompanyHome());
+        variables.put(WorkflowConstants.PROP_COMPANY_HOME, companyHome);
+         
+        // Add the initiator
+        NodeRef initiator = getPersonNodeRef(currentUserName);
+        if (initiator != null)
+        {
+            variables.put(WorkflowConstants.PROP_INITIATOR, nodeConverter.convertNode(initiator));
+            // Also add the initiator home reference, if one exists
+            NodeRef initiatorHome = (NodeRef) nodeService.getProperty(initiator, ContentModel.PROP_HOMEFOLDER);
+            if (initiatorHome != null)
+            {
+                variables.put(WorkflowConstants.PROP_INITIATOR_HOME, nodeConverter.convertNode(initiatorHome));
+            }
+        }
+        
+        if (tenantService.isEnabled()) 
+        {
+            // Specify which tenant domain the workflow was started in.
+            variables.put(ActivitiConstants.VAR_TENANT_DOMAIN, TenantUtil.getCurrentDomain());
+        }
+        
+        // Start the process-instance
+        ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefinitionId, process.getBusinessKey(), variables);
+        
+        if (processInstance.isEnded() == false)
+        {
+            runtimeService.setVariable(processInstance.getProcessInstanceId(), ActivitiConstants.PROP_START_TASK_END_DATE, new Date());
+        }
+        
+        HistoricProcessInstance historicProcessInstance = activitiProcessEngine
+            .getHistoryService()
+            .createHistoricProcessInstanceQuery()
+            .processInstanceId(processInstance.getId())
+            .singleResult();
+        
+        return createProcessInfo(historicProcessInstance);
+    }
+    
+    @Override
+    public void deleteProcess(String id)
+    {
+        validateIfUserAllowedToWorkWithProcess(id);
+        
+        ProcessInstance processInstance = activitiProcessEngine.getRuntimeService()
+                .createProcessInstanceQuery()
+                .processInstanceId(id)
+                .singleResult();
+        
+        if (processInstance == null)
+        {
+            throw new EntityNotFoundException(id);
+        }
+        
+        activitiProcessEngine.getRuntimeService().deleteProcessInstance(id, "deleted through REST API call");
+    }
+    
+    @Override
+    public CollectionWithPagingInfo<Item> getItems(String processId, Paging paging)
+    {
+        if (processId == null) 
+        {
+            throw new InvalidArgumentException("processId is required to get the attached items of a process instance");
+        }
+        
+        validateIfUserAllowedToWorkWithProcess(processId);
+        return getItemsFromProcess(processId, paging);
+    }
+    
+    @Override
+    public Item getItem(String processId, String itemId)
+    {
+        if (processId == null) 
+        {
+            throw new InvalidArgumentException("processId is required to get the attached item of a process instance");
+        }
+        
+        if (itemId == null) 
+        {
+            throw new InvalidArgumentException("itemId is required to get an attached item");
+        }
+        
+        validateIfUserAllowedToWorkWithProcess(processId);
+        return getItemFromProcess(itemId, processId);
+    }
+
+    @Override
+    public Item createItem(String processId, Item item)
+    {
+        if (processId == null) 
+        {
+            throw new InvalidArgumentException("processId is required to add an attached item to a process instance");
+        }
+        
+        if (item == null || item.getId() == null) 
+        {
+            throw new InvalidArgumentException("itemId is required to add an attached item");
+        }
+        
+        validateIfUserAllowedToWorkWithProcess(processId);
+        return createItemInProcess(item.getId(), processId);
+    }
+
+    @Override
+    public void deleteItem(String processId, String itemId)
+    {
+        if (processId == null) 
+        {
+            throw new InvalidArgumentException("processId is required to delete an attached item to a process instance");
+        }
+        
+        if (itemId == null) 
+        {
+            throw new InvalidArgumentException("itemId is required to delete an attached item");
+        }
+        
+        validateIfUserAllowedToWorkWithProcess(processId);
+        deleteItemFromProcess(itemId, processId);
+    }
+    
+    @Override
+    public CollectionWithPagingInfo<Variable> getVariables(String processId, Paging paging)
+    {
+        CollectionWithPagingInfo<Variable> result = null;
+        
+        // Check if user is allowed to get variables
+        List<HistoricVariableInstance> variableInstances = validateIfUserAllowedToWorkWithProcess(processId);
+        Map<String, Object> variables = new HashMap<String, Object>();
+        for (HistoricVariableInstance variable : variableInstances)
+        {
+            variables.put(variable.getVariableName(), variable.getValue());
+        }
+        
+        ProcessInstance processInstance = activitiProcessEngine.getRuntimeService()
+                .createProcessInstanceQuery()
+                .processInstanceId(processId)
+                .singleResult();
+        
+        String processDefinitionId = null;
+        
+        if (processInstance != null)
+        {
+            processDefinitionId = processInstance.getProcessDefinitionId();
+        }
+        else
+        {
+            // Completed process instance
+            HistoricProcessInstance historicInstance = activitiProcessEngine.getHistoryService().createHistoricProcessInstanceQuery()
+                .processInstanceId(processId).singleResult();
+            
+            if (historicInstance == null)
+            {
+                throw new EntityNotFoundException(processId);
+            }
+            
+            processDefinitionId = historicInstance.getProcessDefinitionId();
+        }
+
+        // Get start-task definition for explicit typing of variables submitted at the start
+        String formKey = null;
+        StartFormData startFormData = activitiProcessEngine.getFormService().getStartFormData(processDefinitionId);
+        if (startFormData != null)
+        {
+            formKey = startFormData.getFormKey();
+        }
+        
+        TypeDefinition startTaskTypeDefinition = getWorkflowFactory().getTaskFullTypeDefinition(formKey, true);
+        
+        // Convert raw variables to Variable objects
+        List<Variable> resultingVariables = restVariableHelper.getVariables(variables, startTaskTypeDefinition);
+        result = CollectionWithPagingInfo.asPaged(paging, resultingVariables);
+        return result;
+    }
+    
+    @Override
+    public Variable updateVariable(String processId, Variable variable)
+    {
+        validateIfUserAllowedToWorkWithProcess(processId);
+        
+        ProcessInstance processInstance = activitiProcessEngine.getRuntimeService()
+                .createProcessInstanceQuery()
+                .processInstanceId(processId)
+                .singleResult();
+        
+        if (processInstance == null)
+        {
+            throw new EntityNotFoundException(processId);
+        }
+        
+        return updateVariableInProcess(processId, processInstance.getProcessDefinitionId(), variable);
+    }
+    
+    @Override
+    public List<Variable> updateVariables(String processId, List<Variable> variables) 
+    {
+        validateIfUserAllowedToWorkWithProcess(processId);
+        
+        ProcessInstance processInstance = activitiProcessEngine.getRuntimeService()
+                .createProcessInstanceQuery()
+                .processInstanceId(processId)
+                .singleResult();
+        
+        if (processInstance == null)
+        {
+            throw new EntityNotFoundException(processId);
+        }
+        
+        List<Variable> updatedVariables = new ArrayList<Variable>();
+        if (variables != null)
+        {
+            for (Variable variable : variables)
+            {
+                updatedVariables.add(updateVariableInProcess(processId, processInstance.getProcessDefinitionId(), variable));
+            }
+        }
+        return updatedVariables;
+    }
+    
+    protected Variable updateVariableInProcess(String processId, String processDefinitionId, Variable variable)
+    {
+        if (variable.getName() == null)
+        {
+            throw new InvalidArgumentException("Variable name is required.");
+        }
+        
+        // Get start-task definition for explicit typing of variables submitted at the start
+        String formKey = null;
+        StartFormData startFormData = activitiProcessEngine.getFormService().getStartFormData(processDefinitionId);
+        if (startFormData != null)
+        {
+            formKey = startFormData.getFormKey();
+        }
+        
+        DataTypeDefinition dataTypeDefinition = null;
+        
+        TypeDefinition startTaskTypeDefinition = getWorkflowFactory().getTaskFullTypeDefinition(formKey, true);
+        TypeDefinitionContext context = new TypeDefinitionContext(startTaskTypeDefinition, getQNameConverter());
+        if (context.getPropertyDefinition(variable.getName()) != null) 
+        {
+            dataTypeDefinition = context.getPropertyDefinition(variable.getName()).getDataType();
+            if (variable.getType() != null && dataTypeDefinition.getName().toPrefixString(namespaceService).equals(variable.getType()) == false) {
+                throw new InvalidArgumentException("type of variable " + variable.getName() + " should be " + 
+                        dataTypeDefinition.getName().toPrefixString(namespaceService));
+            }
+        }
+        else if (context.getAssociationDefinition(variable.getName()) != null) 
+        {
+            dataTypeDefinition = dictionaryService.getDataType(DataTypeDefinition.NODE_REF);
+        }
+        
+        if (dataTypeDefinition == null && variable.getType() != null)
+        {
+            try
+            {
+                QName dataType = QName.createQName(variable.getType(), namespaceService);
+                dataTypeDefinition = dictionaryService.getDataType(dataType);
+            }
+            catch(InvalidQNameException iqne)
+            {
+                throw new InvalidArgumentException("Unsupported type of variable: '" + variable.getType() +"'.");
+            }
+        } 
+        else if (dataTypeDefinition == null)
+        {
+            // Fallback to raw value when no type has been passed and not present in model
+            dataTypeDefinition = dictionaryService.getDataType(restVariableHelper.extractTypeFromValue(variable.getValue()));
+        }
+        
+        if (dataTypeDefinition == null)
+        {
+            throw new InvalidArgumentException("Unsupported type of variable: '" + variable.getType() +"'.");
+        }
+
+        Object actualValue = null;
+        if ("java.util.Date".equalsIgnoreCase(dataTypeDefinition.getJavaClassName()))
+        {
+            // fix for different ISO 8601 Date format classes in Alfresco (org.alfresco.util and Spring Surf)
+            actualValue = ISO8601DateFormat.parse((String) variable.getValue());
+        }
+        else if (variable.getName().equals(WorkflowConstants.PROP_INITIATOR))
+        {
+            // update the initiator if exists
+            NodeRef initiator = getNodeRef((String) variable.getValue());
+
+            if (nodeService.exists(initiator))
+            {
+
+                actualValue = getNodeConverter().convertNode(initiator);
+
+                // Also update the initiator home reference, if one exists
+                NodeRef initiatorHome = (NodeRef) nodeService.getProperty(initiator, ContentModel.PROP_HOMEFOLDER);
+                if (initiatorHome != null)
+                {
+                    Variable initiatorHomeVar = new Variable();
+                    initiatorHomeVar.setName(WorkflowConstants.PROP_INITIATOR_HOME);
+                    initiatorHomeVar.setValue(initiatorHome);
+                    updateVariableInProcess(processId, processDefinitionId, initiatorHomeVar);
+                }
+            }
+            else
+            {
+                throw new InvalidArgumentException("Variable value should be a valid person NodeRef.");
+            }
+        }
+        else
+        {
+            if (context.getAssociationDefinition(variable.getName()) != null)
+            {
+                actualValue = convertAssociationDefinitionValue(context.getAssociationDefinition(variable.getName()), 
+                        variable.getName(), variable.getValue());
+            }
+            else
+            {
+                actualValue = DefaultTypeConverter.INSTANCE.convert(dataTypeDefinition, variable.getValue());
+            }
+        }
+
+        activitiProcessEngine.getRuntimeService().setVariable(processId, variable.getName(), actualValue);
+
+        // Set variable value before returning
+        // Variable value needs to be of type NodeRef
+        if (actualValue instanceof ActivitiScriptNode)
+        {
+            variable.setValue(((ActivitiScriptNode) actualValue).getNodeRef());
+        }
+        else
+        {
+            variable.setValue(actualValue);
+        }
+
+        // Set actual used type before returning
+        variable.setType(dataTypeDefinition.getName().toPrefixString(namespaceService));
+        return variable;
+    }
+    
+    @Override
+    public void deleteVariable(String processId, String variableName)
+    {
+        validateIfUserAllowedToWorkWithProcess(processId);
+        
+        if(variableName == null)
+        {
+            throw new InvalidArgumentException("Variable name is required.");
+        }
+
+        try
+        {
+            if (activitiProcessEngine.getRuntimeService().hasVariable(processId, variableName) == false)
+            {
+                throw new EntityNotFoundException(variableName);
+            }
+            activitiProcessEngine.getRuntimeService().removeVariable(processId, variableName);
+        }
+        catch(ActivitiObjectNotFoundException aonfe)
+        {
+            throw new EntityNotFoundException(processId);
+        }
+    }
+    
+    @Override
+    public BinaryResource getProcessImage(String processId)
+    {
+        validateIfUserAllowedToWorkWithProcess(processId);
+        
+        ProcessInstance processInstance = activitiProcessEngine.getRuntimeService()
+                .createProcessInstanceQuery()
+                .processInstanceId(processId)
+                .singleResult();
+        
+        if (processInstance == null)
+        {
+            throw new EntityNotFoundException(processId);
+        }
+        
+        try
+        {
+        	BpmnModel model = activitiProcessEngine.getRepositoryService().getBpmnModel(processInstance.getProcessDefinitionId());
+            
+            if(model != null && model.getLocationMap().size() > 0)
+            {
+                List<String> activeActivities = activitiProcessEngine.getRuntimeService().getActiveActivityIds(processId);
+                ProcessDiagramGenerator generator = new DefaultProcessDiagramGenerator();
+                InputStream generateDiagram = generator.generateDiagram(model, "png", activeActivities);
+                
+                File file = TempFileProvider.createTempFile(processId + UUID.randomUUID(), ".png");
+                FileOutputStream fos = new FileOutputStream(file);
+                IOUtils.copy(generateDiagram, fos);
+                fos.close();
+                
+                return new FileBinaryResource(file);
+            }
+            else
+            {
+                throw new EntityNotFoundException(processId + "/image");
+            }
+        }
+        catch (IOException error)
+        {
+            throw new ApiException("Error while getting process image.");
+        }
+    }
+    
+    protected Object convertAssociationDefinitionValue(AssociationDefinition associationDef, String variableName, Object variableValue) 
+    {
+        if (variableValue != null && ContentModel.TYPE_PERSON.equals(associationDef.getTargetClass().getName()))
+        {
+            if (associationDef.isTargetMany())
+            {
+                if (variableValue instanceof List<?>)
+                {
+                    List<NodeRef> personList = new ArrayList<NodeRef>();
+                    List<?> values = (List<?>) variableValue;
+                    for (Object value : values)
+                    {
+                        NodeRef personRef = getPersonNodeRef(value.toString());
+                        if (personRef == null)
+                        {
+                            throw new InvalidArgumentException(value.toString() + " is not a valid person user id");
+                        }
+                        personList.add(personRef);
+                    }
+                    variableValue = personList;
+                }
+                else
+                {
+                    throw new InvalidArgumentException(variableName + " should have an array value");
+                }
+            }
+            else
+            {
+                NodeRef personRef = getPersonNodeRef(variableValue.toString());
+                if (personRef == null)
+                {
+                    throw new InvalidArgumentException(variableValue.toString() + " is not a valid person user id");
+                }
+                variableValue = personRef;
+            }
+        }
+        else if (variableValue != null && ContentModel.TYPE_AUTHORITY_CONTAINER.equals(associationDef.getTargetClass().getName()))
+        {
+            if (associationDef.isTargetMany())
+            {
+                if (variableValue instanceof List<?>)
+                {
+                    List<NodeRef> authorityList = new ArrayList<NodeRef>();
+                    List<?> values = (List<?>) variableValue;
+                    for (Object value : values)
+                    {
+                        NodeRef authorityRef = authorityService.getAuthorityNodeRef(value.toString());
+                        if (authorityRef == null)
+                        {
+                            throw new InvalidArgumentException(value.toString() + " is not a valid authority id");
+                        }
+                        authorityList.add(authorityRef);
+                    }
+                    variableValue = authorityList;
+                }
+                else
+                {
+                    throw new InvalidArgumentException(variableName + " should have an array value");
+                }
+            }
+            else
+            {
+                NodeRef authorityRef = authorityService.getAuthorityNodeRef(variableValue.toString());
+                if (authorityRef == null)
+                {
+                    throw new InvalidArgumentException(variableValue.toString() + " is not a valid authority id");
+                }
+                variableValue = authorityRef;
+            }
+        }
+        return variableValue;
+    }
+    
+    protected String getProcessDefinitionKey(String paramProcessDefinitionKey)
+    {
+        String processDefinitionKey = null;
+        if (tenantService.isEnabled() && deployWorkflowsInTenant) 
+        {
+            processDefinitionKey = "@" + TenantUtil.getCurrentDomain() + "@" + paramProcessDefinitionKey;
+        }
+        else
+        {
+            processDefinitionKey = paramProcessDefinitionKey;
+        }
+        return processDefinitionKey;
+    }
+    
+    protected String getLocalProcessDefinitionKey(String key)
+    {
+        String processDefKey = null;
+        if (tenantService.isEnabled() && deployWorkflowsInTenant)
+        {
+            processDefKey = key.substring(key.lastIndexOf("@") + 1);
+        }
+        else
+        {
+            processDefKey = key;
+        }
+        return processDefKey;
+    }
+
+    protected NodeRef getPersonNodeRef(String name)
+    {
+        NodeRef authority = null;
+        if (name != null)
+        {
+            if (personService.personExists(name))
+            {
+                authority = personService.getPerson(name);
+            }
+        }
+        return authority;
+    }
+    
+    protected ProcessInfo createProcessInfo(HistoricProcessInstance processInstance)
+    {
+        ProcessInfo processInfo = new ProcessInfo(processInstance);
+        ProcessDefinition definitionEntity = activitiProcessEngine.getRepositoryService()
+                .getProcessDefinition(processInstance.getProcessDefinitionId());
+        processInfo.setProcessDefinitionKey(getLocalProcessDefinitionKey(definitionEntity.getKey()));
+        return processInfo;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/RestVariableHelper.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/RestVariableHelper.java
new file mode 100644
index 00000000000..a4f818c7793
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/RestVariableHelper.java
@@ -0,0 +1,404 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.jscript.ScriptNode;
+import org.alfresco.repo.workflow.WorkflowQNameConverter;
+import org.alfresco.repo.workflow.activiti.ActivitiConstants;
+import org.alfresco.rest.framework.core.exceptions.ApiException;
+import org.alfresco.rest.workflow.api.model.TaskVariable;
+import org.alfresco.rest.workflow.api.model.Variable;
+import org.alfresco.rest.workflow.api.model.VariableScope;
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Helper class for handling conversion between variable representations in rest and raw values
+ * used in the Activiti-engine.
+ *
+ * @author Frederik Heremans
+ */
+public class RestVariableHelper
+{
+    private NodeService nodeService;
+    
+    private NamespaceService namespaceService;
+    
+    private WorkflowQNameConverter qNameConverter;
+    
+    private DictionaryService dictionaryService;
+    
+    public static final Set<String> INTERNAL_PROPERTIES = new HashSet<String>(Arrays.asList(ActivitiConstants.VAR_TENANT_DOMAIN));
+    
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+    
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+    
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService;
+    }
+    
+    protected WorkflowQNameConverter getQNameConverter()
+    {
+        if (qNameConverter == null)
+        {
+            qNameConverter = new WorkflowQNameConverter(namespaceService);
+        }
+        return qNameConverter;
+    }
+    
+    /**
+     * @param localVariables raw local task variables, can be null.
+     * @param globalVariables raw global taks variables, can be null.
+     * @param startFormTypeDefinition TypeDefinition
+     * @param taskTypeDefinition the typê definition for this task, used to extract types.
+     * @return list of {@link TaskVariable}, representing the given raw variables
+     */
+    public List<TaskVariable> getTaskVariables(Map<String, Object> localVariables, Map<String, Object> globalVariables, 
+            TypeDefinition startFormTypeDefinition, TypeDefinition taskTypeDefinition)
+    {
+        List<TaskVariable> result = new ArrayList<TaskVariable>();
+        if (localVariables != null && localVariables.size() > 0) 
+        {
+            TypeDefinitionContext context = new TypeDefinitionContext(taskTypeDefinition, getQNameConverter());
+            addTaskVariables(result, localVariables, context, VariableScope.LOCAL);
+        }
+        
+        if (globalVariables != null && globalVariables.size() > 0) 
+        {
+            TypeDefinitionContext context = new TypeDefinitionContext(startFormTypeDefinition, getQNameConverter());
+            addTaskVariables(result, globalVariables, context, VariableScope.GLOBAL);
+        }
+        
+        return result;
+    }
+    
+    /**
+     * @param variables raw variables
+     * @param typeDefinition the typê definition for the start-task of the process, used to extract types.
+     * @return list of {@link Variable}, representing the given raw variables
+     */
+    public List<Variable> getVariables(Map<String, Object> variables, TypeDefinition typeDefinition)
+    {
+        List<Variable> result = new ArrayList<Variable>();
+        TypeDefinitionContext context = new TypeDefinitionContext(typeDefinition, getQNameConverter());
+        
+        Variable variable = null;
+        for(Entry<String, Object> entry : variables.entrySet()) 
+        {
+            if(!INTERNAL_PROPERTIES.contains(entry.getKey()))
+            {
+                variable = new Variable();
+                variable.setName(entry.getKey());
+                
+                // Set value and type
+                setVariableValueAndType(variable, entry.getValue(), context);
+                result.add(variable);
+            }
+        }
+        return result;
+    }
+    
+    
+
+    /**
+     * Converts the raw variables to {@link TaskVariable}s and adds them to the given result-list.
+     */
+    public void addTaskVariables(List<TaskVariable> result, Map<String, Object> variables,
+                TypeDefinitionContext context, VariableScope scope)
+    {
+        TaskVariable variable = null;
+        for(Entry<String, Object> entry : variables.entrySet()) 
+        {
+            if(!INTERNAL_PROPERTIES.contains(entry.getKey()))
+            {
+                variable = new TaskVariable();
+                variable.setName(entry.getKey());
+                variable.setVariableScope(scope);
+                
+                // Set value and type
+                setVariableValueAndType(variable, entry.getValue(), context);
+                result.add(variable);
+            }
+        }
+    }
+
+    /**
+     * Sets the variable value with possible conversion to the correct format to be used in the response and sets
+     * the type accordingly. If the variables is defined on the {@link TypeDefinition}, the data-type is used. If it's not
+     * defined, the type is deducted from the raw variable value.
+     */
+    protected void setVariableValueAndType(Variable variable, Object value, TypeDefinitionContext context)
+    {
+        PropertyDefinition propDef = context.getPropertyDefinition(variable.getName());
+        if (propDef != null)
+        {
+            variable.setValue(getSafePropertyValue(value));
+            variable.setType(propDef.getDataType().getName().toPrefixString(namespaceService));
+        }
+        else
+        {
+            // Not defined as a property, check if it's an association
+            AssociationDefinition assocDef = context.getAssociationDefinition(variable.getName());
+            if (assocDef == null)
+            {
+                // Try to get an association definition through dictionary
+                String[] prefixLocalName = variable.getName().split("_");
+                if (prefixLocalName.length == 2)
+                {
+                    QName qName = QName.createQName(prefixLocalName[0], prefixLocalName[1], namespaceService);
+                    assocDef = dictionaryService.getAssociation(qName);
+                }
+            }
+            
+            if (assocDef != null)
+            {
+                // Type of variable is the target class-name
+                variable.setType(assocDef.getTargetClass().getName().toPrefixString(namespaceService));
+                variable.setValue(getAssociationRepresentation(value, assocDef));
+            }
+            else
+            {
+                // Variable is not declared as property or association type-def. Use actual raw value as base for conversion.
+                variable.setValue(getSafePropertyValue(value));
+                variable.setType(extractTypeStringFromValue(value));
+            }
+        }
+    }
+    
+    /**
+     * @return object that represents the association value. 
+     */
+    protected Object getAssociationRepresentation(Object value, AssociationDefinition assocDef)
+    {
+        Object result = null;
+        if(value != null)
+        {
+            if(assocDef.isTargetMany()) 
+            {
+                // Construct list of representations of the nodeRefs
+                List<Object> list = new ArrayList<Object>();
+                if(value instanceof Collection<?>)
+                {
+                    for(Object entry : (Collection<?>) value)
+                    {
+                        list.add(getRepresentationForNodeRef(entry, assocDef.getTargetClass()));
+                    }
+                }
+                else
+                {
+                    // Many-property but only single value present
+                    list.add(getRepresentationForNodeRef(value, assocDef.getTargetClass()));
+                }
+                result = list;
+            }
+            else
+            {
+                // Association is a single nodeRef, get representation for it
+                result = getRepresentationForNodeRef(value, assocDef.getTargetClass());
+            }
+        }
+        return result;
+    }
+    
+    protected Object getSafePropertyValue(Object value)
+    {
+        if (value instanceof NodeRef)
+        {
+            return value.toString();
+        }
+        else if (value instanceof ScriptNode)
+        {
+            NodeRef ref = ((ScriptNode) value).getNodeRef();
+            try
+            {
+                QName nodeQName = nodeService.getType(ref);
+                if (ContentModel.TYPE_PERSON.equals(nodeQName))
+                {
+                    // Extract username from person and return
+                    return (String) nodeService.getProperty(ref, ContentModel.PROP_USERNAME);
+                }
+                else if (ContentModel.TYPE_AUTHORITY_CONTAINER.equals(nodeQName))
+                {
+                    // Extract name from group and return
+                    return (String) nodeService.getProperty(ref, ContentModel.PROP_AUTHORITY_NAME);
+                }
+                else
+                {
+                    return ((ScriptNode) value).getNodeRef().toString();
+                }
+            }
+            catch (Exception e)
+            {
+                // node ref QName could not be found, just creating a String
+                return ((ScriptNode) value).getNodeRef().toString();
+            }
+        }
+        else if (value instanceof QName) 
+        {
+            return ((QName) value).toPrefixString(namespaceService);
+        }
+        else if (value instanceof Collection<?>)
+        {
+            if (value != null)
+            {
+                List<Object> resultValues = new ArrayList<Object>();
+                for (Object itemValue : (Collection<?>) value)
+                {
+                    resultValues.add(getSafePropertyValue(itemValue));
+                }
+                value = resultValues;
+            }
+        }
+        
+        return value;
+    }
+    
+    protected String getRepresentationForNodeRef(Object value, ClassDefinition classDefinition) 
+    {
+        // First, extract the referenced node
+        NodeRef ref = null;
+        if(value instanceof NodeRef) 
+        {
+            ref = (NodeRef) value;
+        }
+        else if(value instanceof ScriptNode)
+        {
+            ref = ((ScriptNode) value).getNodeRef();
+        }
+        else if (value instanceof String)
+        {
+            return (String) value;
+        }
+        
+        if(ref != null)
+        {
+            if(ContentModel.TYPE_PERSON.equals(classDefinition.getName()))
+            {
+                // Extract username from person and return
+                return (String) nodeService.getProperty(ref, ContentModel.PROP_USERNAME);
+            }
+            else
+            {
+                return ref.toString();
+            }
+        }
+        else
+        {
+            throw new ApiException("Association value did not contian valid nodeRef: " + value);
+        }
+    }
+    
+    public QName extractTypeFromValue(Object value) {
+        QName type = null;
+        if(value instanceof Collection<?>)
+        {
+            Collection<?> collection = (Collection<?>) value;
+            if(collection.size() > 0)
+            {
+                type = extractTypeFromValue(collection.iterator().next());
+            }
+        }
+        else
+        {
+            if(value instanceof String) 
+            {
+                type = DataTypeDefinition.TEXT;
+            }
+            else if(value instanceof Integer)
+            {
+                type = DataTypeDefinition.INT;
+            }
+            else if(value instanceof Long)
+            {
+                type = DataTypeDefinition.LONG;
+            }
+            else if(value instanceof Double)
+            {
+                type = DataTypeDefinition.DOUBLE;
+            }
+            else if(value instanceof Float)
+            {
+                type = DataTypeDefinition.FLOAT;
+            }
+            else if(value instanceof Date)
+            {
+                type = DataTypeDefinition.DATETIME;
+            }
+            else if(value instanceof Boolean)
+            {
+                type = DataTypeDefinition.BOOLEAN;
+            }
+            else if(value instanceof QName)
+            {
+                type = DataTypeDefinition.QNAME;
+            }
+            else if(value instanceof NodeRef || value instanceof ScriptNode)
+            {
+                type = DataTypeDefinition.NODE_REF;
+            }
+        }
+       
+        if(type == null)
+        {
+            // Type cannot be determined, revert to default for unknown types
+            type = DataTypeDefinition.ANY;
+        }
+        return type;
+    }
+    
+    public String extractTypeStringFromValue(Object value)
+    {
+       QName type = extractTypeFromValue(value);
+       return type.toPrefixString(namespaceService);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/TaskVariablesWalkerCallback.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/TaskVariablesWalkerCallback.java
new file mode 100644
index 00000000000..40e21dcd311
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/TaskVariablesWalkerCallback.java
@@ -0,0 +1,66 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.impl;
+
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.framework.resource.parameters.where.InvalidQueryException;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper.WalkerCallbackAdapter;
+import org.alfresco.rest.workflow.api.model.VariableScope;
+
+public class TaskVariablesWalkerCallback extends WalkerCallbackAdapter
+{
+    private static final String PROPERTY_SCOPE = "scope";
+    
+    private VariableScope scope = VariableScope.ANY;
+    
+   @Override
+    public void comparison(int type, String propertyName, String propertyValue, boolean negated)
+    {
+       if (PROPERTY_SCOPE.equals(propertyName)) 
+       {
+           if (type != WhereClauseParser.EQUALS)
+           {
+               throw new InvalidQueryException("Only equals is allowed for 'scope' comparison.");
+           }
+           
+           scope = VariableScope.getScopeForValue(propertyValue);
+           if (scope == null)
+           {
+               throw new InvalidQueryException("Invalid value for 'scope' used in query: " + propertyValue + ".");
+           }
+       }
+       else
+       {
+           throw new InvalidQueryException("Only property 'scope' is allowed in the query.");
+       }
+    }
+   
+   public VariableScope getScope()
+   {
+        return this.scope;
+   }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/TasksImpl.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/TasksImpl.java
new file mode 100644
index 00000000000..8b60b59dc70
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/TasksImpl.java
@@ -0,0 +1,1689 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.activiti.engine.ActivitiTaskAlreadyClaimedException;
+import org.activiti.engine.form.StartFormData;
+import org.activiti.engine.history.HistoricTaskInstance;
+import org.activiti.engine.history.HistoricTaskInstanceQuery;
+import org.activiti.engine.history.HistoricVariableInstance;
+import org.activiti.engine.task.DelegationState;
+import org.activiti.engine.task.IdentityLink;
+import org.activiti.engine.task.IdentityLinkType;
+import org.activiti.engine.task.TaskInfo;
+import org.activiti.engine.task.TaskInfoQuery;
+import org.activiti.engine.task.TaskQuery;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.i18n.MessageService;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.workflow.WorkflowModel;
+import org.alfresco.repo.workflow.WorkflowObjectFactory;
+import org.alfresco.repo.workflow.WorkflowQNameConverter;
+import org.alfresco.repo.workflow.activiti.ActivitiConstants;
+import org.alfresco.repo.workflow.activiti.properties.ActivitiPropertyConverter;
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.workflow.api.Tasks;
+import org.alfresco.rest.workflow.api.impl.MapBasedQueryWalker.QueryVariableHolder;
+import org.alfresco.rest.workflow.api.model.FormModelElement;
+import org.alfresco.rest.workflow.api.model.Item;
+import org.alfresco.rest.workflow.api.model.Task;
+import org.alfresco.rest.workflow.api.model.TaskCandidate;
+import org.alfresco.rest.workflow.api.model.TaskStateTransition;
+import org.alfresco.rest.workflow.api.model.TaskVariable;
+import org.alfresco.rest.workflow.api.model.VariableScope;
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.InvalidQNameException;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ISO8601DateFormat;
+
+public class TasksImpl extends WorkflowRestImpl implements Tasks
+{
+    private static final String STATUS_ACTIVE = "active";
+    private static final String STATUS_ANY = "any";
+    private static final String STATUS_COMPLETED = "completed";
+    /**
+     * All properties that are read-only and cannot be updated on a single task-resource.
+     */
+    private static final List<String> TASK_READ_ONLY_PROPERTIES = Arrays.asList(
+        "id", "processId", "processDefinitionId", "activityDefinitionId", "startedAt", "endedAt", "durationInMs", "formResourceKey"
+    );
+    
+    private static final Set<String> TASK_COLLECTION_EQUALS_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
+        "status", "assignee", "owner", "candidateUser", "candidateGroup", "name", "description", "priority", "processId",
+        "processBusinessKey", "activityDefinitionId", "processDefinitionId", "processDefinitionKey", "processDefinitionName", "startedAt", 
+        "endedAt", "dueAt", "includeTaskVariables", "includeProcessVariables"
+    ));
+    
+    private static final Set<String> TASK_COLLECTION_MATCHES_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
+        "assignee", "owner", "name", "description", "processBusinessKey", "activityDefinitionId", "processDefinitionKey", "processDefinitionName"
+    ));
+    
+    private static final Set<String> TASK_COLLECTION_GREATERTHAN_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
+        "startedAt", "endedAt", "dueAt"
+    ));
+    
+    private static final Set<String> TASK_COLLECTION_GREATERTHANOREQUAL_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
+        "priority"
+    ));
+    
+    private static final Set<String> TASK_COLLECTION_LESSTHAN_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
+        "startedAt", "endedAt", "dueAt"
+    ));
+    
+    private static final Set<String> TASK_COLLECTION_LESSTHANOREQUAL_QUERY_PROPERTIES = new HashSet<String>(Arrays.asList(
+        "priority"
+    ));
+    
+    private static final Set<String> TASK_COLLECTION_RUNNING_SORT_PROPERTIES = new HashSet<String>(Arrays.asList(
+        "id", "name", "description", "priority", "processId", "assignee", "startedAt", "dueAt"
+    ));
+    
+    private static final Set<String> TASK_COLLECTION_HISTORY_SORT_PROPERTIES = new HashSet<String>(Arrays.asList(
+        "id", "name", "description", "priority", "processId", "processDefinitionId", "assignee", "owner", "startedAt", "endedAt", "durationInMs", "dueAt"
+    ));
+    
+    private RestVariableHelper restVariableHelper;
+    private WorkflowObjectFactory workflowFactory;
+    private WorkflowQNameConverter qNameConverter;
+    private MessageService messageService;
+    private PersonService personService;
+    private ActivitiPropertyConverter propertyConverter;
+    private int taskVariablesLimit = 20000;
+    
+    public void setPropertyConverter(ActivitiPropertyConverter propertyConverter)
+    {
+        this.propertyConverter = propertyConverter;
+    }
+
+    public void setRestVariableHelper(RestVariableHelper restVariableHelper)
+    {
+        this.restVariableHelper = restVariableHelper;
+    }
+    
+    public void setMessageService(MessageService messageService)
+    {
+        this.messageService = messageService;
+    }
+    
+    public void setPersonService(PersonService personService)
+    {
+        this.personService = personService;
+    }
+    
+    public int getTaskVariablesLimit()
+    {
+        return taskVariablesLimit;
+    }
+    
+    public void setTaskVariablesLimit(int taskVariablesLimit)
+    {
+        this.taskVariablesLimit = taskVariablesLimit;
+    }
+    
+    @Override
+    public CollectionWithPagingInfo<Task> getTasks(Parameters parameters)
+    {
+        Paging paging = parameters.getPaging();
+        MapBasedQueryWalker propertyWalker = new MapBasedQueryWalker(TASK_COLLECTION_EQUALS_QUERY_PROPERTIES, 
+                TASK_COLLECTION_MATCHES_QUERY_PROPERTIES);
+        
+        propertyWalker.setSupportedGreaterThanParameters(TASK_COLLECTION_GREATERTHAN_QUERY_PROPERTIES);
+        propertyWalker.setSupportedGreaterThanOrEqualParameters(TASK_COLLECTION_GREATERTHANOREQUAL_QUERY_PROPERTIES);
+        propertyWalker.setSupportedLessThanParameters(TASK_COLLECTION_LESSTHAN_QUERY_PROPERTIES);
+        propertyWalker.setSupportedLessThanOrEqualParameters(TASK_COLLECTION_LESSTHANOREQUAL_QUERY_PROPERTIES);
+        propertyWalker.enableVariablesSupport(namespaceService, dictionaryService);
+        
+        if (parameters.getQuery() != null)
+        {
+            QueryHelper.walk(parameters.getQuery(), propertyWalker);
+        }
+        
+        String status = propertyWalker.getProperty("status", WhereClauseParser.EQUALS);
+        String assignee = propertyWalker.getProperty("assignee", WhereClauseParser.EQUALS);
+        String assigneeLike = propertyWalker.getProperty("assignee", WhereClauseParser.MATCHES);
+        String owner = propertyWalker.getProperty("owner", WhereClauseParser.EQUALS);
+        String ownerLike = propertyWalker.getProperty("owner", WhereClauseParser.MATCHES);
+        String candidateUser = propertyWalker.getProperty("candidateUser", WhereClauseParser.EQUALS);
+        String candidateGroup = propertyWalker.getProperty("candidateGroup", WhereClauseParser.EQUALS);
+        String name = propertyWalker.getProperty("name", WhereClauseParser.EQUALS);
+        String nameLike = propertyWalker.getProperty("name", WhereClauseParser.MATCHES);
+        String description = propertyWalker.getProperty("description", WhereClauseParser.EQUALS);
+        String descriptionLike = propertyWalker.getProperty("description", WhereClauseParser.MATCHES);
+        Integer priority = propertyWalker.getProperty("priority", WhereClauseParser.EQUALS, Integer.class);
+        Integer priorityGreaterThanOrEquals = propertyWalker.getProperty("priority", WhereClauseParser.GREATERTHANOREQUALS, Integer.class);
+        Integer priorityLessThanOrEquals = propertyWalker.getProperty("priority", WhereClauseParser.LESSTHANOREQUALS, Integer.class);
+        String processInstanceId = propertyWalker.getProperty("processId", WhereClauseParser.EQUALS);
+        String processInstanceBusinessKey = propertyWalker.getProperty("processBusinessKey", WhereClauseParser.EQUALS);
+        String processInstanceBusinessKeyLike = propertyWalker.getProperty("processBusinessKey", WhereClauseParser.MATCHES);
+        String activityDefinitionId = propertyWalker.getProperty("activityDefinitionId", WhereClauseParser.EQUALS);
+        String activityDefinitionIdLike = propertyWalker.getProperty("activityDefinitionId", WhereClauseParser.MATCHES);
+        String processDefinitionId = propertyWalker.getProperty("processDefinitionId", WhereClauseParser.EQUALS);
+        String processDefinitionKey = propertyWalker.getProperty("processDefinitionKey", WhereClauseParser.EQUALS);
+        String processDefinitionKeyLike = propertyWalker.getProperty("processDefinitionKey", WhereClauseParser.MATCHES);
+        String processDefinitionName = propertyWalker.getProperty("processDefinitionName", WhereClauseParser.EQUALS);
+        String processDefinitionNameLike = propertyWalker.getProperty("processDefinitionName", WhereClauseParser.MATCHES);
+        Date startedAt = propertyWalker.getProperty("startedAt", WhereClauseParser.EQUALS, Date.class);
+        Date startedAtGreaterThan = propertyWalker.getProperty("startedAt", WhereClauseParser.GREATERTHAN, Date.class);
+        Date startedAtLessThan = propertyWalker.getProperty("startedAt", WhereClauseParser.LESSTHAN, Date.class);
+        Date endedAt = propertyWalker.getProperty("endedAt", WhereClauseParser.EQUALS, Date.class);
+        Date endedAtGreaterThan = propertyWalker.getProperty("endedAt", WhereClauseParser.GREATERTHAN, Date.class);
+        Date endedAtLessThan = propertyWalker.getProperty("endedAt", WhereClauseParser.LESSTHAN, Date.class);
+        Date dueAt = propertyWalker.getProperty("dueAt", WhereClauseParser.EQUALS, Date.class);
+        Date dueAtGreaterThan = propertyWalker.getProperty("dueAt", WhereClauseParser.GREATERTHAN, Date.class);
+        Date dueAtLessThan = propertyWalker.getProperty("dueAt", WhereClauseParser.LESSTHAN, Date.class);
+        Boolean includeProcessVariables = propertyWalker.getProperty("includeProcessVariables", WhereClauseParser.EQUALS, Boolean.class);
+        Boolean includeTaskVariables = propertyWalker.getProperty("includeTaskVariables", WhereClauseParser.EQUALS, Boolean.class);
+
+        List<SortColumn> sortList = parameters.getSorting();
+        SortColumn sortColumn = null;
+        if (sortList != null && sortList.size() > 0)
+        {
+            if (sortList.size() != 1)
+            {
+                throw new InvalidArgumentException("Only one order by parameter is supported");
+            }
+            sortColumn = sortList.get(0);
+        }
+        
+        List<Task> page = null;
+        int totalCount = 0;
+        if (status == null || STATUS_ACTIVE.equals(status))
+        {
+            TaskQuery query = activitiProcessEngine
+                    .getTaskService()
+                    .createTaskQuery();
+            
+            if (assignee != null) query.taskAssignee(assignee);
+            if (assigneeLike != null) query.taskAssigneeLike(assigneeLike);
+            if (owner != null) query.taskOwner(owner);
+            if (ownerLike != null) query.taskOwner(ownerLike);
+            if (candidateUser != null)
+            {
+            	Set<String> parents = authorityService.getContainingAuthorities(AuthorityType.GROUP, candidateUser, false);
+            	if (parents != null)
+            	{
+            		List<String> authorities = new ArrayList<String>();
+            		authorities.addAll(parents);
+            		
+            		// there's a limitation in at least Oracle for using an IN statement with more than 1000 items
+            		if (parents.size() > 1000)
+            		{
+            			authorities = authorities.subList(0, 1000);
+            		}
+            		
+            		if (authorities.size() > 0)
+            		{
+            		    query.taskCandidateGroupIn(authorities);
+            		}
+            		else
+            		{
+            		    query.taskCandidateUser(candidateUser);
+            		}
+            	}
+            }
+            if (candidateGroup != null) query.taskCandidateGroup(candidateGroup);
+            if (name != null) query.taskName(name);
+            if (nameLike != null) query.taskNameLike(nameLike);
+            if (description != null) query.taskDescription(description);
+            if (descriptionLike != null) query.taskDescriptionLike(descriptionLike);
+            if (priority != null) query.taskPriority(priority);
+            if (priorityGreaterThanOrEquals != null) query.taskMinPriority(priorityGreaterThanOrEquals);
+            if (priorityLessThanOrEquals != null) query.taskMaxPriority(priorityLessThanOrEquals);
+            if (processInstanceId != null) query.processInstanceId(processInstanceId);
+            if (processInstanceBusinessKey != null) query.processInstanceBusinessKey(processInstanceBusinessKey);
+            if (processInstanceBusinessKeyLike != null) query.processInstanceBusinessKeyLike(processInstanceBusinessKeyLike);
+            if (activityDefinitionId != null) query.taskDefinitionKey(activityDefinitionId);
+            if (activityDefinitionIdLike != null) query.taskDefinitionKey(activityDefinitionIdLike);
+            if (processDefinitionId != null) query.processDefinitionId(processDefinitionId);
+            if (processDefinitionKey != null) query.processDefinitionKey(processDefinitionKey);
+            if (processDefinitionKeyLike != null) query.processDefinitionKeyLike(processDefinitionKeyLike);
+            if (processDefinitionName != null) query.processDefinitionName(processDefinitionName);
+            if (processDefinitionNameLike != null) query.processDefinitionNameLike(processDefinitionNameLike);
+            if (dueAt != null) query.dueDate(dueAt);
+            if (dueAtGreaterThan != null) query.dueAfter(dueAtGreaterThan);
+            if (dueAtLessThan != null) query.dueBefore(dueAtLessThan);
+            if (startedAt != null) query.taskCreatedOn(startedAt);
+            if (startedAtGreaterThan != null) query.taskCreatedAfter(startedAtGreaterThan);
+            if (startedAtLessThan != null) query.taskCreatedBefore(startedAtLessThan);
+            
+            if (includeProcessVariables != null && includeProcessVariables) {
+                query.includeProcessVariables();
+            }
+            
+            if (includeTaskVariables != null && includeTaskVariables) {
+                query.includeTaskLocalVariables();
+            }
+            
+            // use the limit set in alfresco-global.properties
+            query.limitTaskVariables(taskVariablesLimit);
+            
+            List<QueryVariableHolder> variableProperties = propertyWalker.getVariableProperties();
+            setQueryUsingVariables(query, variableProperties);
+
+            // Add tenant-filtering
+            if(tenantService.isEnabled()) {
+                query.processVariableValueEquals(ActivitiConstants.VAR_TENANT_DOMAIN, TenantUtil.getCurrentDomain());
+            }
+
+            // Add involvement filtering if user is not admin
+            if(processInstanceId == null && !authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser()) &&
+                    candidateUser == null && candidateGroup == null)
+            {
+                query.taskInvolvedUser(AuthenticationUtil.getRunAsUser());
+            }
+            
+            setSorting(query, sortColumn);
+            
+            List<org.activiti.engine.task.Task> tasks = query.listPage(paging.getSkipCount(), paging.getMaxItems());
+            totalCount = (int) query.count();
+            
+            page = new ArrayList<Task>(tasks.size());
+            Map<String, TypeDefinition> definitionTypeMap = new HashMap<String, TypeDefinition>();
+            for (org.activiti.engine.task.Task taskInstance: tasks) 
+            {
+                Task task = new Task(taskInstance);
+                task.setFormResourceKey(getFormResourceKey(taskInstance));
+                if ((includeProcessVariables != null && includeProcessVariables) || (includeTaskVariables != null && includeTaskVariables))
+                {
+                    addVariables(task, includeProcessVariables, includeTaskVariables, taskInstance.getProcessVariables(), 
+                            taskInstance.getTaskLocalVariables(), definitionTypeMap);
+                }
+                page.add(task);
+            }
+        }
+        else if (STATUS_COMPLETED.equals(status) || STATUS_ANY.equals(status))
+        {
+            // Candidate user and group is only supported with STATUS_ACTIVE
+            if (candidateUser != null)
+            {
+                throw new InvalidArgumentException("Filtering on candidateUser is only allowed in combination with status-parameter 'active'");
+            }
+            if (candidateGroup != null)
+            {
+                throw new InvalidArgumentException("Filtering on candidateGroup is only allowed in combination with status-parameter 'active'");
+            }
+            
+            HistoricTaskInstanceQuery query = activitiProcessEngine
+                    .getHistoryService()
+                    .createHistoricTaskInstanceQuery();
+            
+            if (STATUS_COMPLETED.equals(status)) query.finished();
+            if (assignee != null) query.taskAssignee(assignee);
+            if (assigneeLike != null) query.taskAssigneeLike(assigneeLike);
+            if (owner != null) query.taskOwner(owner);
+            if (ownerLike != null) query.taskOwnerLike(ownerLike);
+            if (name != null) query.taskName(name);
+            if (nameLike != null) query.taskNameLike(nameLike);
+            if (description != null) query.taskDescription(description);
+            if (descriptionLike != null) query.taskDescriptionLike(descriptionLike);
+            if (priority != null) query.taskPriority(priority);
+            if (priorityGreaterThanOrEquals != null) query.taskMinPriority(priorityGreaterThanOrEquals);
+            if (priorityLessThanOrEquals != null) query.taskMaxPriority(priorityLessThanOrEquals);
+            if (processInstanceId != null) query.processInstanceId(processInstanceId);
+            if (processInstanceBusinessKey != null) query.processInstanceBusinessKey(processInstanceBusinessKey);
+            if (processInstanceBusinessKeyLike != null) query.processInstanceBusinessKeyLike(processInstanceBusinessKeyLike);
+            if (activityDefinitionId != null) query.taskDefinitionKey(activityDefinitionId);
+            if (activityDefinitionIdLike != null) query.taskDefinitionKey(activityDefinitionIdLike);
+            if (processDefinitionId != null) query.processDefinitionId(processDefinitionId);
+            if (processDefinitionKey != null) query.processDefinitionKey(processDefinitionKey);
+            if (processDefinitionKeyLike != null) query.processDefinitionKeyLike(processDefinitionKeyLike);
+            if (processDefinitionName != null) query.processDefinitionName(processDefinitionName);
+            if (processDefinitionNameLike != null) query.processDefinitionNameLike(processDefinitionNameLike);
+            if (dueAt != null) query.taskDueDate(dueAt);
+            if (dueAtGreaterThan != null) query.taskDueAfter(dueAtGreaterThan);
+            if (dueAtLessThan != null) query.taskDueBefore(dueAtLessThan);
+            if (startedAt != null) query.taskCreatedOn(startedAt);
+            if (startedAtGreaterThan != null) query.taskCreatedAfter(startedAtGreaterThan);
+            if (startedAtLessThan != null) query.taskCreatedBefore(startedAtLessThan);
+            if (endedAt != null) query.taskCompletedOn(endedAt);
+            if (endedAtGreaterThan != null) query.taskCompletedAfter(endedAtGreaterThan);
+            if (endedAtLessThan != null) query.taskCompletedBefore(endedAtLessThan);
+            
+            if (includeProcessVariables != null && includeProcessVariables) {
+                query.includeProcessVariables();
+            }
+            
+            if (includeTaskVariables != null && includeTaskVariables) {
+                query.includeTaskLocalVariables();
+            }
+            
+            List<QueryVariableHolder> variableProperties = propertyWalker.getVariableProperties();
+            setQueryUsingVariables(query, variableProperties);
+
+            // Add tenant filtering
+            if (tenantService.isEnabled()) 
+            {
+                query.processVariableValueEquals(ActivitiConstants.VAR_TENANT_DOMAIN, TenantUtil.getCurrentDomain());
+            }
+            
+            // Add involvement filtering if user is not admin
+            if(processInstanceId == null && !authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser()))
+            {
+                query.taskInvolvedUser(AuthenticationUtil.getRunAsUser());
+            }
+            
+            setSorting(query, sortColumn);
+            
+            List<HistoricTaskInstance> tasks = query.listPage(paging.getSkipCount(), paging.getMaxItems());
+            totalCount = (int) query.count();
+
+            page = new ArrayList<Task>(tasks.size());
+            Map<String, TypeDefinition> definitionTypeMap = new HashMap<String, TypeDefinition>();
+            for (HistoricTaskInstance taskInstance: tasks) 
+            {
+                Task task = new Task(taskInstance);
+                if ((includeProcessVariables != null && includeProcessVariables) || (includeTaskVariables != null && includeTaskVariables))
+                {
+                    addVariables(task, includeProcessVariables, includeTaskVariables, taskInstance.getProcessVariables(), 
+                            taskInstance.getTaskLocalVariables(), definitionTypeMap);
+                }
+                page.add(task);
+            }
+        } 
+        else 
+        {
+            throw new InvalidArgumentException("Invalid status parameter: " + status);
+        }
+        
+        return CollectionWithPagingInfo.asPaged(paging, page, (page.size() + paging.getSkipCount()) < totalCount, totalCount);
+    }
+
+    private void setQueryUsingVariables(TaskInfoQuery<?, ? extends TaskInfo> query, List<QueryVariableHolder> variableProperties)
+    {
+        if (variableProperties != null)
+        {
+            for (QueryVariableHolder queryVariableHolder : variableProperties)
+            {
+                if (queryVariableHolder.getOperator() == WhereClauseParser.EQUALS)
+                {
+                    if (queryVariableHolder.isGlobalScope())
+                    {
+                        query.processVariableValueEquals(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                    }
+                    else
+                    {
+                        query.taskVariableValueEquals(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                    }
+                }
+                else if (queryVariableHolder.getOperator() == WhereClauseParser.GREATERTHAN)
+                {
+                    if (queryVariableHolder.isGlobalScope())
+                    {
+                        query.processVariableValueGreaterThan(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                    }
+                    else
+                    {
+                        query.taskVariableValueGreaterThan(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                    }
+                }
+                else if (queryVariableHolder.getOperator() == WhereClauseParser.GREATERTHANOREQUALS)
+                {
+                    if (queryVariableHolder.isGlobalScope())
+                    {
+                        query.processVariableValueGreaterThanOrEqual(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                    }
+                    else
+                    {
+                        query.taskVariableValueGreaterThanOrEqual(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                    }
+                }
+                else if (queryVariableHolder.getOperator() == WhereClauseParser.LESSTHAN)
+                {
+                    if (queryVariableHolder.isGlobalScope())
+                    {
+                        query.processVariableValueLessThan(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                    }
+                    else
+                    {
+                        query.taskVariableValueLessThan(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                    }
+                }
+                else if (queryVariableHolder.getOperator() == WhereClauseParser.LESSTHANOREQUALS)
+                {
+                    if (queryVariableHolder.isGlobalScope())
+                    {
+                        query.processVariableValueLessThanOrEqual(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                    }
+                    else
+                    {
+                        query.taskVariableValueLessThanOrEqual(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                    }
+                }
+                else if (queryVariableHolder.getOperator() == WhereClauseParser.MATCHES)
+                {
+                    if (queryVariableHolder.getPropertyValue() instanceof String == false)
+                    {
+                        throw new InvalidArgumentException("the matches operator can only be used with a String value for property " + queryVariableHolder.getPropertyName());
+                    }
+
+                    if (queryVariableHolder.isGlobalScope())
+                    {
+                        query.processVariableValueLike(queryVariableHolder.getPropertyName(), (String) queryVariableHolder.getPropertyValue());
+                    }
+                    else
+                    {
+                        query.taskVariableValueLike(queryVariableHolder.getPropertyName(), (String) queryVariableHolder.getPropertyValue());
+                    }
+                }
+                else if (queryVariableHolder.getOperator() == WhereClauseParser.NEGATION)
+                {
+                    if (queryVariableHolder.isGlobalScope())
+                    {
+                        query.processVariableValueNotEquals(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                    }
+                    else
+                    {
+                        query.taskVariableValueNotEquals(queryVariableHolder.getPropertyName(), queryVariableHolder.getPropertyValue());
+                    }
+                }
+                else
+                {
+                    throw new InvalidArgumentException("variable " + queryVariableHolder.getPropertyName() +
+                            " can only be used with an =, not comparison type");
+                }
+            }
+        }
+    }
+
+    protected void addVariables(Task task, Boolean includeProcessVariables, Boolean includeTaskVariables, 
+            Map<String, Object> processVariables, Map<String, Object> taskVariables, Map<String, TypeDefinition> definitionTypeMap)
+    {
+        TypeDefinition startFormTypeDefinition = null;
+        if (includeProcessVariables != null && includeProcessVariables) 
+        {
+            if (definitionTypeMap.containsKey(task.getProcessDefinitionId()) == false)
+            {
+                StartFormData startFormData = activitiProcessEngine.getFormService().getStartFormData(task.getProcessDefinitionId());
+                if (startFormData != null)
+                {
+                    String formKey = startFormData.getFormKey();
+                    definitionTypeMap.put(task.getProcessDefinitionId(), getWorkflowFactory().getTaskFullTypeDefinition(formKey, true));
+                }
+            }
+            
+            if (definitionTypeMap.containsKey(task.getProcessDefinitionId()))
+            {
+                startFormTypeDefinition = definitionTypeMap.get(task.getProcessDefinitionId());
+            }
+        }
+        
+        TypeDefinition taskTypeDefinition = null;
+        if (includeTaskVariables != null && includeTaskVariables) 
+        {
+            taskTypeDefinition = getWorkflowFactory().getTaskFullTypeDefinition(task.getFormResourceKey(), false);
+        }
+        
+        List<TaskVariable> variables = restVariableHelper.getTaskVariables(taskVariables, processVariables, 
+                startFormTypeDefinition, taskTypeDefinition);
+        task.setVariables(variables);
+    }
+    
+    @Override
+    public CollectionWithPagingInfo<Task> getTasks(String processId, Parameters parameters)
+    {
+        Paging paging = parameters.getPaging();
+        String status = parameters.getParameter("status");
+        
+        List<SortColumn> sortList = parameters.getSorting();
+        SortColumn sortColumn = null;
+        if (sortList != null && sortList.size() > 0)
+        {
+            if (sortList.size() != 1)
+            {
+                throw new InvalidArgumentException("Only one order by parameter is supported");
+            }
+            sortColumn = sortList.get(0);
+        }
+        
+        validateIfUserAllowedToWorkWithProcess(processId);
+
+        List<Task> page = null;
+        int totalCount = 0;
+        if (status == null || STATUS_ACTIVE.equals(status))
+        {
+            TaskQuery query = activitiProcessEngine
+                    .getTaskService()
+                    .createTaskQuery();
+            
+            query.processInstanceId(processId);
+            setSorting(query, sortColumn);
+            
+            List<org.activiti.engine.task.Task> tasks = query.listPage(paging.getSkipCount(), paging.getMaxItems());
+            totalCount = (int) query.count();
+
+            page = new ArrayList<Task>(tasks.size());
+            for (org.activiti.engine.task.Task taskInstance: tasks) 
+            {
+                Task task = new Task(taskInstance);
+                task.setFormResourceKey(getFormResourceKey(taskInstance));
+                page.add(task);
+            }
+        }
+        else if (STATUS_COMPLETED.equals(status) || STATUS_ANY.equals(status))
+        {
+            HistoricTaskInstanceQuery query = activitiProcessEngine
+                    .getHistoryService()
+                    .createHistoricTaskInstanceQuery();
+            
+            if (STATUS_COMPLETED.equals(status)) query.finished();
+            
+            query.processInstanceId(processId);
+            
+            // Add tenant filtering
+            if(tenantService.isEnabled()) {
+                query.processVariableValueEquals(ActivitiConstants.VAR_TENANT_DOMAIN, TenantUtil.getCurrentDomain());
+            }
+            
+            setSorting(query, sortColumn);
+            
+            List<HistoricTaskInstance> tasks = query.listPage(paging.getSkipCount(), paging.getMaxItems());
+            totalCount = (int) query.count();
+
+            page = new ArrayList<Task>(tasks.size());
+            for (HistoricTaskInstance taskInstance: tasks) 
+            {
+                Task task = new Task(taskInstance);
+                page.add(task);
+            }
+        } 
+        else 
+        {
+            throw new InvalidArgumentException("Invalid status parameter: " + status);
+        }
+        
+        return CollectionWithPagingInfo.asPaged(paging, page, (page.size() + paging.getSkipCount()) < totalCount, totalCount);
+    }
+
+    @Override
+    public Task getTask(String taskId)
+    {
+        if(taskId == null) 
+        {
+            throw new InvalidArgumentException("Task id is required"); 
+        }
+
+        HistoricTaskInstance taskInstance = getValidHistoricTask(taskId);
+
+        return new Task(taskInstance);
+    }
+    
+    @Override
+    public Task update(String taskId, Task task, Parameters parameters)
+    {
+        TaskStateTransition taskAction = null;
+        
+        List<String> selectedProperties = parameters.getSelectedProperties();
+        if (selectedProperties.contains("state")) 
+        {
+            taskAction = TaskStateTransition.getTaskActionFromString(task.getState());
+        }
+        
+        // Fetch the task unfiltered, we check authorization below
+        TaskQuery query = activitiProcessEngine.getTaskService().createTaskQuery().taskId(taskId);
+        org.activiti.engine.task.Task taskInstance = query.singleResult();
+        
+        if (taskInstance == null) 
+        {
+            // Check if task exists in history, to be able to return appropriate error when trying to update an
+            // existing completed task vs. an unexisting task vs. unauthorized
+            boolean taskHasExisted = activitiProcessEngine.getHistoryService().createHistoricTaskInstanceQuery()
+                .taskId(taskId)
+                .count() > 0;
+            
+            if (taskHasExisted)
+            {
+                throw new UnsupportedResourceOperationException("Task with id: " + taskId + " cannot be updated, it's completed");
+            }
+            else
+            {
+                throw new EntityNotFoundException(taskId);
+            }
+        }
+        else
+        {
+            String user = AuthenticationUtil.getRunAsUser();
+            
+            // Check if user is either assignee, owner or admin
+            boolean authorized = authorityService.isAdminAuthority(user)
+                || user.equals(taskInstance.getOwner())
+                || user.equals(taskInstance.getAssignee());
+            
+            Set<String> candidateGroups = new HashSet<String>();
+            
+            if (!authorized) 
+            {
+                // Check if user is initiator of the process this task is involved with
+                List<IdentityLink> linksForTask = activitiProcessEngine.getTaskService().getIdentityLinksForTask(taskId);
+                
+                // In case the action is claim, we gather all candidate groups for this tasks, since we already have
+                // the identity-links, there is no reason why we should check candidate using a DB-query
+                for (IdentityLink link : linksForTask) 
+                {
+                    if (user.equals(link.getUserId()) && IdentityLinkType.STARTER.equals(link.getType()))
+                    {
+                        authorized = true;
+                        break;
+                    }
+                    // MNT-13276
+                    if ((taskInstance.getAssignee() == null) && (link.getGroupId() != null) && link.getType().equals(IdentityLinkType.CANDIDATE))
+                    {
+                        Set<String> userGroups = authorityService.getAuthoritiesForUser(user);
+                        if (userGroups.contains(link.getGroupId()))
+                        {
+                            authorized = true;
+                            break;
+                        }
+                    }
+                    if (taskAction == TaskStateTransition.CLAIMED && link.getGroupId() != null && link.getType().equals(IdentityLinkType.CANDIDATE)) 
+                    {
+                        candidateGroups.add(link.getGroupId());
+                    }
+                    if (taskAction == TaskStateTransition.CLAIMED && 
+                            link.getUserId() != null && link.getType().equals(IdentityLinkType.CANDIDATE) &&
+                            user.equals(link.getUserId())) 
+                    {
+                        // User is a direct candidate for the task, authorized to claim
+                        authorized = true;
+                        break;
+                    }
+                }
+            }
+            
+            // When claiming, a limited update (set assignee through claim) is allowed
+            if (!authorized && taskAction == TaskStateTransition.CLAIMED)
+            {
+                Set<String> userGroups = authorityService.getAuthoritiesForUser(user);
+                for(String group : candidateGroups)
+                {
+                    if(userGroups.contains(group)) 
+                    {
+                        authorized = true;
+                        break;
+                    }
+                }
+            }
+            
+            if (!authorized) 
+            {
+                // None of the above conditions are met, not authorized to update task
+                throw new PermissionDeniedException();
+            }
+        }
+        
+        // Update fields if no action is required
+        if (taskAction == null)
+        {
+            // Only update task in Activiti API if actual properties are changed
+            if (updateTaskProperties(selectedProperties, task, taskInstance))
+            {
+                activitiProcessEngine.getTaskService().saveTask(taskInstance);
+            }
+        }
+        else
+        {
+            // Perform actions associated to state transition 
+            if (taskAction != null) 
+            {
+                // look for variables submitted with task action
+                Map<String, Object> globalVariables = new HashMap<String, Object>();
+                Map<String, Object> localVariables = new HashMap<String, Object>();
+                if (selectedProperties.contains("variables") && task.getVariables() != null && task.getVariables().size() > 0) 
+                {
+                    for (TaskVariable taskVariable : task.getVariables())
+                    {
+                        taskVariable = convertToTypedVariable(taskVariable, taskInstance);
+                        if (taskVariable.getVariableScope() == VariableScope.GLOBAL)
+                        {
+                            globalVariables.put(taskVariable.getName(), taskVariable.getValue());
+                        }
+                        else
+                        {
+                            localVariables.put(taskVariable.getName(), taskVariable.getValue());
+                        }
+                    }
+                }
+                switch (taskAction) 
+                {
+                    case CLAIMED:
+                        try
+                        {
+                            activitiProcessEngine.getTaskService().claim(taskId, AuthenticationUtil.getRunAsUser());
+                        }
+                        catch(ActivitiTaskAlreadyClaimedException atace)
+                        {
+                            throw new ConstraintViolatedException("The task is already claimed by another user.");
+                        }
+                        break;
+                    case COMPLETED:
+                        if (localVariables.size() > 0)
+                        {
+                            activitiProcessEngine.getTaskService().setVariablesLocal(taskId, localVariables);
+                        }
+                        
+                        setOutcome(taskId);
+                        
+                        if (globalVariables.size() > 0)
+                        {
+                            activitiProcessEngine.getTaskService().complete(taskId, globalVariables);
+                        }
+                        else
+                        {    
+                            activitiProcessEngine.getTaskService().complete(taskId);
+                        }
+                        
+                        break;
+                    case DELEGATED:
+                        if(selectedProperties.contains("assignee") && task.getAssignee() != null)
+                        {
+                            if(taskInstance.getAssignee() == null || !taskInstance.getAssignee().equals(AuthenticationUtil.getRunAsUser()))
+                            {
+                                // Alter assignee before delegating to preserve trail of who actually delegated
+                                activitiProcessEngine.getTaskService().setAssignee(taskId, AuthenticationUtil.getRunAsUser());
+                            }
+                            activitiProcessEngine.getTaskService().delegateTask(taskId, task.getAssignee());
+                        }
+                        else
+                        {
+                            throw new InvalidArgumentException("When delegating a task, assignee should be selected and provided in the request.");
+                        }
+                        break;
+                    case RESOLVED:
+                        if (localVariables.size() > 0)
+                        {
+                            activitiProcessEngine.getTaskService().setVariablesLocal(taskId, localVariables);
+                        }
+                        
+                        setOutcome(taskId);
+                        
+                        if (globalVariables.size() > 0)
+                        {
+                            activitiProcessEngine.getTaskService().resolveTask(taskId, globalVariables);
+                        }
+                        else
+                        {    
+                            activitiProcessEngine.getTaskService().resolveTask(taskId);
+                        }
+                        break;
+                        
+                    case UNCLAIMED:
+                        activitiProcessEngine.getTaskService().setAssignee(taskId, null);
+                        break;
+                }
+            }
+        }
+        
+        Task responseTask = new Task(activitiProcessEngine.getHistoryService()
+                    .createHistoricTaskInstanceQuery()
+                    .taskId(taskId).singleResult());
+        
+        // if the task is not ended the task state might be pending or resolved
+        if (responseTask.getEndedAt() == null)
+        {
+            try
+            {
+                org.activiti.engine.task.Task runningTask = activitiProcessEngine.getTaskService().createTaskQuery().taskId(taskId).singleResult();
+                if (runningTask != null)
+                {
+                    if (runningTask.getDelegationState() == DelegationState.PENDING)
+                    {
+                        responseTask.setState(TaskStateTransition.DELEGATED.name().toLowerCase());
+                    }
+                    else if (runningTask.getDelegationState() == DelegationState.RESOLVED)
+                    {
+                        responseTask.setState(TaskStateTransition.RESOLVED.name().toLowerCase());
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                // ignore the exception
+            }
+        }
+        
+        return responseTask;
+    }
+    
+    @Override
+    public CollectionWithPagingInfo<FormModelElement> getTaskFormModel(String taskId, Paging paging)
+    {
+        // Check if task can be accessed by the current user
+        HistoricTaskInstance task = getValidHistoricTask(taskId);
+        String formKey = task.getFormKey();
+        
+        // Lookup type definition for the task
+        TypeDefinition taskType = getWorkflowFactory().getTaskFullTypeDefinition(formKey, true);
+        return getFormModelElements(taskType, paging);
+    }
+    
+    @Override
+    public CollectionWithPagingInfo<TaskVariable> getTaskVariables(String taskId, Paging paging, VariableScope scope) 
+    {
+        // Ensure the user is allowed to get variables for the task involved. 
+        HistoricTaskInstance taskInstance = getValidHistoricTask(taskId);
+        String formKey = taskInstance.getFormKey();
+
+        // Based on the scope, right variables are queried
+        Map<String, Object> taskvariables = new HashMap<String, Object>();
+        Map<String, Object> processVariables = new HashMap<String, Object>();
+        
+        if (scope == VariableScope.ANY || scope == VariableScope.LOCAL)
+        {
+             List<HistoricVariableInstance> variables = activitiProcessEngine.getHistoryService()
+                     .createHistoricVariableInstanceQuery()
+                     .taskId(taskId)
+                     .list();
+             
+             if (variables != null)
+             {
+                 for (HistoricVariableInstance variable : variables)
+                 {
+                     taskvariables.put(variable.getVariableName(), variable.getValue());
+                 }
+             }
+        }
+        
+        if ((scope == VariableScope.ANY || scope == VariableScope.GLOBAL) && taskInstance.getProcessInstanceId() != null)
+        {
+            List<HistoricVariableInstance> variables = activitiProcessEngine.getHistoryService()
+                    .createHistoricVariableInstanceQuery()
+                    .processInstanceId(taskInstance.getProcessInstanceId())
+                    .excludeTaskVariables()
+                    .list();
+            
+            if (variables != null)
+            {
+                for (HistoricVariableInstance variable : variables)
+                {
+                    processVariables.put(variable.getVariableName(), variable.getValue());
+                }
+            }
+        }
+        
+        // Convert raw variables to TaskVariables
+        TypeDefinition taskTypeDefinition = getWorkflowFactory().getTaskFullTypeDefinition(formKey, false);
+        TypeDefinition startFormTypeDefinition = null;
+        StartFormData startFormData = activitiProcessEngine.getFormService().getStartFormData(taskInstance.getProcessDefinitionId());
+        if (startFormData != null)
+        {
+            startFormTypeDefinition = getWorkflowFactory().getTaskFullTypeDefinition(startFormData.getFormKey(), true);
+        }
+        else
+        {
+            // fall back
+            startFormTypeDefinition = taskTypeDefinition;
+        }
+        List<TaskVariable> page = restVariableHelper.getTaskVariables(taskvariables, processVariables, 
+                startFormTypeDefinition, taskTypeDefinition);
+        return CollectionWithPagingInfo.asPaged(paging, page, false, page.size());
+    }
+    
+    @Override
+    public TaskVariable updateTaskVariable(String taskId, TaskVariable taskVariable) 
+    {
+        org.activiti.engine.task.Task taskInstance = getValidTask(taskId);
+        return updateVariableInTask(taskInstance, taskVariable);
+    }
+    
+    public List<TaskVariable> updateTaskVariables(String taskId, List<TaskVariable> variables)
+    {
+        org.activiti.engine.task.Task taskInstance = getValidTask(taskId);
+        List<TaskVariable> updatedVariables = new ArrayList<TaskVariable>();
+        if (variables != null)
+        {
+            for (TaskVariable variable : variables)
+            {
+                updatedVariables.add(updateVariableInTask(taskInstance, variable));
+            }
+        }
+        return updatedVariables;
+    }
+    
+    protected TaskVariable updateVariableInTask(org.activiti.engine.task.Task taskInstance, TaskVariable taskVariable)
+    {
+        taskVariable = convertToTypedVariable(taskVariable, taskInstance);
+        
+        if (VariableScope.LOCAL.equals(taskVariable.getVariableScope()))
+        {
+            activitiProcessEngine.getTaskService().setVariableLocal(taskInstance.getId(), taskVariable.getName(), taskVariable.getValue());
+        }
+        else if(VariableScope.GLOBAL.equals(taskVariable.getVariableScope()))
+        {
+            if(taskInstance.getExecutionId() != null)
+            {
+                activitiProcessEngine.getRuntimeService().setVariable(taskInstance.getExecutionId(), taskVariable.getName(), taskVariable.getValue());
+            }
+            else
+            {
+                throw new InvalidArgumentException("Cannot set global variables on a task that is not part of a process.");
+            }
+        }
+        
+        return taskVariable;
+    }
+    
+    protected TaskVariable convertToTypedVariable(TaskVariable taskVariable, org.activiti.engine.task.Task taskInstance)
+    {
+        if (taskVariable.getName() == null)
+        {
+            throw new InvalidArgumentException("Variable name is required.");
+        }
+        
+        if (taskVariable.getVariableScope() == null || (taskVariable.getVariableScope() != VariableScope.GLOBAL && 
+                taskVariable.getVariableScope() != VariableScope.LOCAL))
+        {
+            throw new InvalidArgumentException("Variable scope is required and can only be 'local' or 'global'.");
+        }
+        
+        DataTypeDefinition dataTypeDefinition = null;
+        TypeDefinitionContext context = null;
+        if (taskVariable.getVariableScope() == VariableScope.GLOBAL)
+        {
+            // Get start-task definition for explicit typing of variables submitted at the start
+            String formKey = null;
+            StartFormData startFormData = activitiProcessEngine.getFormService().getStartFormData(taskInstance.getProcessDefinitionId());
+            if (startFormData != null)
+            {
+                formKey = startFormData.getFormKey();
+            }
+            
+            TypeDefinition startTaskTypeDefinition = getWorkflowFactory().getTaskFullTypeDefinition(formKey, true);
+            context = new TypeDefinitionContext(startTaskTypeDefinition, getQNameConverter());
+            if (context.getPropertyDefinition(taskVariable.getName()) != null) 
+            {
+                dataTypeDefinition = context.getPropertyDefinition(taskVariable.getName()).getDataType();
+                if (taskVariable.getType() != null && dataTypeDefinition.getName().toPrefixString(namespaceService).equals(taskVariable.getType()) == false) {
+                    throw new InvalidArgumentException("type of variable " + taskVariable.getName() + " should be " + 
+                            dataTypeDefinition.getName().toPrefixString(namespaceService));
+                }
+            }
+            else if (context.getAssociationDefinition(taskVariable.getName()) != null) 
+            {
+                dataTypeDefinition = dictionaryService.getDataType(DataTypeDefinition.NODE_REF);
+            }
+        } 
+        else
+        {
+            // Revert to either the content-model type or the raw type provided by the request
+            try 
+            {
+                String formKey = activitiProcessEngine.getFormService().getTaskFormKey(taskInstance.getProcessDefinitionId(), taskInstance.getTaskDefinitionKey());
+                TypeDefinition typeDefinition = getWorkflowFactory().getTaskFullTypeDefinition(formKey, false);
+                context = new TypeDefinitionContext(typeDefinition, getQNameConverter());
+                if (context.getPropertyDefinition(taskVariable.getName()) != null) 
+                {
+                    dataTypeDefinition = context.getPropertyDefinition(taskVariable.getName()).getDataType();
+                    if (taskVariable.getType() != null && dataTypeDefinition.getName().toPrefixString(namespaceService).equals(taskVariable.getType()) == false) {
+                        throw new InvalidArgumentException("type of variable " + taskVariable.getName() + " should be " + 
+                                dataTypeDefinition.getName().toPrefixString(namespaceService));
+                    }
+                }
+                else if (context.getAssociationDefinition(taskVariable.getName()) != null) 
+                {
+                    dataTypeDefinition = dictionaryService.getDataType(DataTypeDefinition.NODE_REF);
+                }
+            }
+            catch (InvalidQNameException ignore)
+            {
+                // In case the property is not part of the model, it's possible that the property-name is not a valid.
+                // This can be ignored safeley as it falls back to the raw type
+            }
+        }
+        
+        if (dataTypeDefinition == null && taskVariable.getType() != null)
+        {
+            try
+            {
+                QName dataType = QName.createQName(taskVariable.getType(), namespaceService);
+                dataTypeDefinition = dictionaryService.getDataType(dataType);
+            }
+            catch (InvalidQNameException iqne)
+            {
+                throw new InvalidArgumentException("Unsupported type of variable: '" + taskVariable.getType() +"'.");
+            }
+        }
+        else if (dataTypeDefinition == null)
+        {
+            // Final fallback to raw value when no type has been passed and not present in model
+            dataTypeDefinition = dictionaryService.getDataType(restVariableHelper.extractTypeFromValue(taskVariable.getValue()));
+        }
+        
+        if (dataTypeDefinition == null)
+        {
+            throw new InvalidArgumentException("Unsupported type of variable: '" + taskVariable.getType() +"'.");
+        }
+        
+        Object actualValue = null;
+        if ("java.util.Date".equalsIgnoreCase(dataTypeDefinition.getJavaClassName()))
+        {
+            // fix for different ISO 8601 Date format classes in Alfresco (org.alfresco.util and Spring Surf)
+            actualValue = ISO8601DateFormat.parse((String) taskVariable.getValue());
+        }
+        else
+        {
+            if (context != null && context.getAssociationDefinition(taskVariable.getName()) != null)
+            {
+                actualValue = convertAssociationDefinitionValue(context.getAssociationDefinition(taskVariable.getName()), 
+                        taskVariable.getName(), taskVariable.getValue());
+            }
+            else
+            {
+                actualValue = DefaultTypeConverter.INSTANCE.convert(dataTypeDefinition, taskVariable.getValue());
+            }
+        }
+        
+        taskVariable.setValue(actualValue);
+        
+        // Set type so it's returned in case it was left empty
+        taskVariable.setType(dataTypeDefinition.getName().toPrefixString(namespaceService));
+        
+        return taskVariable;
+    }
+    
+    public void deleteTaskVariable(String taskId, String variableName)
+    {
+        if(variableName == null)
+        {
+            throw new InvalidArgumentException("Variable name is required.");
+        }
+        
+        // Fetch task to check if user is authorized to perform the delete
+        getValidTask(taskId);
+        
+        // Check if variable is present on the scope
+        if (activitiProcessEngine.getTaskService().hasVariableLocal(taskId, variableName) == false)
+        {
+            throw new EntityNotFoundException(variableName);
+        }
+        activitiProcessEngine.getTaskService().removeVariableLocal(taskId, variableName);
+    }
+    
+    @Override
+    public CollectionWithPagingInfo<TaskCandidate> getTaskCandidates(String taskId, Paging paging) 
+    {
+        // Fetch task to check if user is authorized to perform the delete
+        getValidTask(taskId);
+        
+        List<IdentityLink> links = activitiProcessEngine.getTaskService().getIdentityLinksForTask(taskId);
+        List<TaskCandidate> page = new ArrayList<TaskCandidate>();
+        if (links != null) 
+        {
+            for (IdentityLink identityLink : links)
+            {
+                if (IdentityLinkType.CANDIDATE.equals(identityLink.getType())) 
+                {
+                    page.add(new TaskCandidate(identityLink));
+                }
+            }
+        }
+        
+        return CollectionWithPagingInfo.asPaged(paging, page, false, page.size());
+    }
+    
+    @Override
+    public Item createItem(String taskId, Item item)
+    {
+        org.activiti.engine.task.Task task = getValidTask(taskId);
+      
+        if (task.getProcessInstanceId() == null)
+        {
+            throw new UnsupportedResourceOperationException("Task is not part of process, no items available.");
+        }
+        return createItemInProcess(item.getId(), task.getProcessInstanceId());
+    }
+    
+    @Override
+    public void deleteItem(String taskId, String itemId)
+    {
+        org.activiti.engine.task.Task task = getValidTask(taskId);
+        
+        if (task.getProcessInstanceId() == null)
+        {
+            throw new UnsupportedResourceOperationException("Task is not part of process, no items available.");
+        }
+        deleteItemFromProcess(itemId, task.getProcessInstanceId());
+    }
+    
+    @Override
+    public Item getItem(String taskId, String itemId)
+    {
+        HistoricTaskInstance task = getValidHistoricTask(taskId);
+        
+        if (task.getProcessInstanceId() == null)
+        {
+            throw new UnsupportedResourceOperationException("Task is not part of process, no items available.");
+        }
+        return getItemFromProcess(itemId, task.getProcessInstanceId());
+    }
+    
+    @Override
+    public CollectionWithPagingInfo<Item> getItems(String taskId, Paging paging)
+    {
+        HistoricTaskInstance task = getValidHistoricTask(taskId);
+        
+        if (task.getProcessInstanceId() == null)
+        {
+            throw new UnsupportedResourceOperationException("Task is not part of process, no items available.");
+        }
+        return getItemsFromProcess(task.getProcessInstanceId(), paging);
+    }
+
+    protected String getFormResourceKey(final org.activiti.engine.task.Task task) 
+    {
+        if (task.getProcessDefinitionId() != null)
+        {
+            String formKey = activitiProcessEngine.getFormService().getTaskFormKey(task.getProcessDefinitionId(), task.getTaskDefinitionKey());
+            return formKey;
+        } 
+        else 
+        {
+            // Standalone task, no form key available
+            return null;
+        }
+    }
+    
+    /**
+     * @return true, if at least one task property has been changed based on the given parameters.
+     */
+    protected boolean updateTaskProperties(List<String> selectedProperties, Task task, 
+                org.activiti.engine.task.Task taskInstance)
+    {
+        boolean taskNeedsUpdate = false;
+        for(String selected : selectedProperties) 
+        {
+            if(!"state".equals(selected))
+            {
+                // "name", "description", "dueAt", "priority", "assignee", "owner"
+                taskNeedsUpdate = true;
+                if("name".equals(selected))
+                {
+                    taskInstance.setName(task.getName());
+                }
+                else if("description".equals(selected))
+                {
+                    taskInstance.setDescription(task.getDescription());
+                }
+                else if("dueAt".equals(selected))
+                {
+                    taskInstance.setDueDate(task.getDueAt());
+                }
+                else if("priority".equals(selected))
+                {
+                    taskInstance.setPriority(task.getPriority());   
+                }
+                else if("assignee".equals(selected))
+                {
+                    taskInstance.setAssignee(task.getAssignee());
+                }
+                else if("owner".equals(selected))
+                {
+                    taskInstance.setOwner(task.getOwner());
+                }
+                else
+                {
+                    if(TASK_READ_ONLY_PROPERTIES.contains(selected))
+                    {
+                        // Trying to update a read-only -but existing- property
+                        throw new InvalidArgumentException("The property selected for update is read-only: " + selected);
+                    }
+                    else
+                    {
+                        // Trying to update unexisting property
+                        throw new InvalidArgumentException("The property selected for update does not exist for this resource: " + selected);
+                    }
+                }
+            }
+        }
+        return taskNeedsUpdate;
+    }
+    
+    /**
+     * Get a valid {@link HistoricTaskInstance} based on the given task id. Checks if current logged
+     * in user is assignee/owner/involved with the task. In case true was passed for "validIfClaimable", 
+     * the task is also valid if the current logged in user is a candidate for claiming the task.
+     *  
+     * @throws EntityNotFoundException when the task was not found
+     * @throws PermissionDeniedException when the current logged in user isn't allowed to access task.
+     */
+    protected HistoricTaskInstance getValidHistoricTask(String taskId)
+    {
+        HistoricTaskInstanceQuery query = activitiProcessEngine.getHistoryService()
+            .createHistoricTaskInstanceQuery()
+            .taskId(taskId);
+        
+        if (authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser())) 
+        {
+            // Admin is allowed to read all tasks in the current tenant
+            if (tenantService.isEnabled()) 
+            {
+                query.processVariableValueEquals(ActivitiConstants.VAR_TENANT_DOMAIN, TenantUtil.getCurrentDomain());
+            }
+        }
+        else
+        {
+            // If non-admin user, involvement in the task is required (either owner, assignee or externally involved).
+            query.taskInvolvedUser(AuthenticationUtil.getRunAsUser());
+        }
+        
+        HistoricTaskInstance taskInstance = query.singleResult();
+        
+        if (taskInstance == null) 
+        {
+            // Either the task doesn't exist or the user is not involved directly. We can differentiate by
+            // checking if the task exists without applying the additional filtering
+            taskInstance =  activitiProcessEngine.getHistoryService()
+                .createHistoricTaskInstanceQuery()
+                .taskId(taskId)
+                .singleResult();
+            
+            if (taskInstance == null) 
+            {
+                // Full error message will be "Task with id: 'id' was not found" 
+                throw new EntityNotFoundException(taskId); 
+            }
+            else
+            {
+                boolean isTaskClaimable = false;
+                if (taskInstance.getEndTime() == null) 
+                {
+                    // Task is not yet finished, so potentially claimable. If user is part of a "candidateGroup", the task is accessible to the
+                    // user regardless of not being involved/owner/assignee
+                    isTaskClaimable = activitiProcessEngine.getTaskService()
+                            .createTaskQuery()
+                            .taskCandidateGroupIn(new ArrayList<String>(authorityService.getAuthoritiesForUser(AuthenticationUtil.getRunAsUser())))
+                            .taskId(taskId)
+                            .count() == 1;
+                }
+                
+                if (isTaskClaimable == false)
+                {
+                    throw new PermissionDeniedException();
+                }
+            }
+        }
+        return taskInstance;
+    }
+    
+    /**
+     * Get a valid {@link org.activiti.engine.task.Task} based on the given task id. Checks if current logged
+     * in user is assignee/owner/involved with the task. In case true was passed for "validIfClaimable", 
+     * the task is also valid if the current logged in user is a candidate for claiming the task.
+     *  
+     * @throws EntityNotFoundException when the task was not found
+     * @throws PermissionDeniedException when the current logged in user isn't allowed to access task.
+     */
+    protected org.activiti.engine.task.Task getValidTask(String taskId)
+    {
+        if (taskId == null)
+        {
+            throw new InvalidArgumentException("Task id is required.");
+        }
+        
+        TaskQuery query = activitiProcessEngine.getTaskService()
+            .createTaskQuery()
+            .taskId(taskId);
+        
+        if (authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser())) 
+        {
+            // Admin is allowed to read all tasks in the current tenant
+            if (tenantService.isEnabled()) 
+            {
+                query.processVariableValueEquals(ActivitiConstants.VAR_TENANT_DOMAIN, TenantUtil.getCurrentDomain());
+            }
+        }
+        else
+        {
+            // If non-admin user, involvement in the task is required (either owner, assignee or externally involved).
+            query.taskInvolvedUser(AuthenticationUtil.getRunAsUser());
+        }
+        
+        org.activiti.engine.task.Task taskInstance =  query.singleResult();
+        
+        if (taskInstance == null) 
+        {
+            // Either the task doesn't exist or the user is not involved directly. We can differentiate by
+            // checking if the task exists without applying the additional filtering
+            taskInstance =  activitiProcessEngine.getTaskService()
+                .createTaskQuery()
+                .taskId(taskId)
+                .singleResult();
+            
+            if (taskInstance == null) 
+            {
+                // Full error message will be "Task with id: 'id' was not found" 
+                throw new EntityNotFoundException(taskId); 
+            }
+            else
+            {
+                // Task is not yet finished, so potentially claimable. If user is part of a "candidateGroup", the task is accessible to the
+                // user regardless of not being involved/owner/assignee
+                boolean isTaskClaimable = activitiProcessEngine.getTaskService()
+                        .createTaskQuery()
+                        .taskCandidateGroupIn(new ArrayList<String>(authorityService.getAuthoritiesForUser(AuthenticationUtil.getRunAsUser())))
+                        .taskId(taskId)
+                        .count() == 1;
+                
+                if (isTaskClaimable == false)
+                {
+                    throw new PermissionDeniedException();
+                }
+            }
+        }
+        return taskInstance;
+    }
+    
+    protected void setSorting(TaskQuery query, SortColumn sortColumn)
+    {
+        if (sortColumn != null)
+        {
+            if (TASK_COLLECTION_RUNNING_SORT_PROPERTIES.contains(sortColumn.column))
+            {
+                if ("id".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByTaskId();
+                }
+                else if ("name".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByTaskName();
+                }
+                else if ("description".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByTaskDescription();
+                }
+                else if ("priority".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByTaskPriority();
+                }
+                else if ("processId".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByProcessInstanceId();
+                }
+                else if ("assignee".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByTaskAssignee();
+                }
+                else if ("startedAt".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByTaskCreateTime();
+                }
+                else if ("dueAt".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByDueDate();
+                }
+            }
+            else
+            {
+                throw new InvalidArgumentException("sort " + sortColumn.column + 
+                        " is not supported, supported items are " + Arrays.toString(TASK_COLLECTION_RUNNING_SORT_PROPERTIES.toArray()));
+            }
+            
+            if (sortColumn.asc)
+            {
+                query.asc();
+            }
+            else
+            {
+                query.desc();
+            }
+        }
+        else
+        {
+            query.orderByDueDate().asc();
+        }
+    }
+    
+    protected void setSorting(HistoricTaskInstanceQuery query, SortColumn sortColumn)
+    {
+        if (sortColumn != null)
+        {
+            if (TASK_COLLECTION_HISTORY_SORT_PROPERTIES.contains(sortColumn.column))
+            {
+                if ("id".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByTaskId();
+                }
+                else if ("name".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByTaskName();
+                }
+                else if ("description".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByTaskDescription();
+                }
+                else if ("priority".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByTaskPriority();
+                }
+                else if ("processId".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByProcessInstanceId();
+                }
+                else if ("processDefinitionId".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByProcessDefinitionId();
+                }
+                else if ("assignee".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByTaskAssignee();
+                }
+                else if ("owner".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByTaskOwner();
+                }
+                else if ("startedAt".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByHistoricTaskInstanceStartTime();
+                }
+                else if ("endedAt".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByHistoricTaskInstanceEndTime();
+                }
+                else if ("durationInMs".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByHistoricTaskInstanceDuration();
+                }
+                else if ("dueAt".equalsIgnoreCase(sortColumn.column))
+                {
+                    query.orderByTaskDueDate();
+                }
+            }
+            else
+            {
+                throw new InvalidArgumentException("sort " + sortColumn.column + 
+                        " is not supported, supported items are " + Arrays.toString(TASK_COLLECTION_HISTORY_SORT_PROPERTIES.toArray()));
+            }
+            
+            if (sortColumn.asc)
+            {
+                query.asc();
+            }
+            else
+            {
+                query.desc();
+            }
+        }
+        else
+        {
+            query.orderByTaskDueDate().asc();
+        }
+    }
+    
+    protected Object convertAssociationDefinitionValue(AssociationDefinition associationDef, String variableName, Object variableValue) 
+    {
+        if (variableValue != null && ContentModel.TYPE_PERSON.equals(associationDef.getTargetClass().getName()))
+        {
+            if (associationDef.isTargetMany())
+            {
+                if (variableValue instanceof List<?>)
+                {
+                    List<NodeRef> personList = new ArrayList<NodeRef>();
+                    List<?> values = (List<?>) variableValue;
+                    for (Object value : values)
+                    {
+                        NodeRef personRef = getPersonNodeRef(value.toString());
+                        if (personRef == null)
+                        {
+                            throw new InvalidArgumentException(value.toString() + " is not a valid person user id");
+                        }
+                        personList.add(personRef);
+                    }
+                    variableValue = personList;
+                }
+                else
+                {
+                    throw new InvalidArgumentException(variableName + " should have an array value");
+                }
+            }
+            else
+            {
+                NodeRef personRef = getPersonNodeRef(variableValue.toString());
+                if (personRef == null)
+                {
+                    throw new InvalidArgumentException(variableValue.toString() + " is not a valid person user id");
+                }
+                variableValue = personRef;
+            }
+        }
+        else if (variableValue != null && ContentModel.TYPE_AUTHORITY_CONTAINER.equals(associationDef.getTargetClass().getName()))
+        {
+            if (associationDef.isTargetMany())
+            {
+                if (variableValue instanceof List<?>)
+                {
+                    List<NodeRef> authorityList = new ArrayList<NodeRef>();
+                    List<?> values = (List<?>) variableValue;
+                    for (Object value : values)
+                    {
+                        NodeRef authorityRef = authorityService.getAuthorityNodeRef(value.toString());
+                        if (authorityRef == null)
+                        {
+                            throw new InvalidArgumentException(value.toString() + " is not a valid authority id");
+                        }
+                        authorityList.add(authorityRef);
+                    }
+                    variableValue = authorityList;
+                }
+                else
+                {
+                    throw new InvalidArgumentException(variableName + " should have an array value");
+                }
+            }
+            else
+            {
+                NodeRef authorityRef = authorityService.getAuthorityNodeRef(variableValue.toString());
+                if (authorityRef == null)
+                {
+                    throw new InvalidArgumentException(variableValue.toString() + " is not a valid authority id");
+                }
+                variableValue = authorityRef;
+            }
+        }
+        return variableValue;
+    }
+    
+    protected NodeRef getPersonNodeRef(String name)
+    {
+        NodeRef authority = null;
+        if (name != null)
+        {
+            if (personService.personExists(name))
+            {
+                authority = personService.getPerson(name);
+            }
+        }
+        return authority;
+    }
+    
+    protected WorkflowQNameConverter getQNameConverter()
+    {
+        if (qNameConverter == null)
+        {
+            qNameConverter = new WorkflowQNameConverter(namespaceService);
+        }
+        return qNameConverter;
+    }
+    
+    protected WorkflowObjectFactory getWorkflowFactory()
+    {
+        if (workflowFactory == null) 
+        {
+            workflowFactory = new WorkflowObjectFactory(getQNameConverter(), tenantService, messageService, dictionaryService, 
+                        ActivitiConstants.ENGINE_ID, WorkflowModel.TYPE_ACTIVTI_START_TASK);
+        }
+        return workflowFactory;
+    }
+
+    /**
+     * Set bpm:outcome variable to the local variables of the specified task.
+     * <br>The variables should be set separately via {@link org.activiti.engine.TaskService}
+     * @param localVariables The variable, that will be set to the task
+     * @param taskId The id of the task
+     */
+    private void setOutcome(String taskId)
+    {
+        org.activiti.engine.task.Task task = activitiProcessEngine.getTaskService().createTaskQuery().taskId(taskId).singleResult();
+        String outcomeValue = ActivitiConstants.DEFAULT_TRANSITION_NAME;
+        HashMap<QName, Serializable> updates = new HashMap<QName, Serializable>();
+        Map<QName, Serializable> properties = propertyConverter.getTaskProperties(task);
+        QName outcomePropName = (QName) properties.get(WorkflowModel.PROP_OUTCOME_PROPERTY_NAME);
+        if (outcomePropName != null)
+        {
+            Serializable rawOutcome = properties.get(outcomePropName);
+            if (rawOutcome != null)
+            {
+                outcomeValue = DefaultTypeConverter.INSTANCE.convert(String.class, rawOutcome);
+            }
+        }
+        updates.put(WorkflowModel.PROP_OUTCOME, outcomeValue);
+        propertyConverter.updateTask(task, updates, null, null);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/TypeDefinitionContext.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/TypeDefinitionContext.java
new file mode 100644
index 00000000000..b68e540a375
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/TypeDefinitionContext.java
@@ -0,0 +1,73 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.alfresco.repo.workflow.WorkflowQNameConverter;
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Helper contxt class used when checking variable types based on {@link TypeDefinition}. 
+ *
+ * @author Frederik Heremans
+ */
+public class TypeDefinitionContext {
+    
+    private Map<String, PropertyDefinition> propertyDefinitions;
+    private Map<String, AssociationDefinition> associationDefinitions;
+
+    public TypeDefinitionContext(TypeDefinition typeDefinition, WorkflowQNameConverter qNameConverter)
+    {
+        propertyDefinitions = new HashMap<String, PropertyDefinition>();
+        associationDefinitions = new HashMap<String, AssociationDefinition>();
+        
+        for (Entry<QName, PropertyDefinition> entry : typeDefinition.getProperties().entrySet())
+        {
+            propertyDefinitions.put(qNameConverter.mapQNameToName(entry.getKey()), entry.getValue());
+        }
+        
+        for (Entry<QName, AssociationDefinition> entry : typeDefinition.getAssociations().entrySet())
+        {
+            associationDefinitions.put(qNameConverter.mapQNameToName(entry.getKey()), entry.getValue());
+        }
+    }
+    
+    public PropertyDefinition getPropertyDefinition(String rawVariableName) 
+    {
+        return propertyDefinitions.get(rawVariableName);
+    }
+    
+    public AssociationDefinition getAssociationDefinition(String rawVariableName)
+    {
+        return associationDefinitions.get(rawVariableName);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/WorkflowRestImpl.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/WorkflowRestImpl.java
new file mode 100644
index 00000000000..a434e664f9c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/WorkflowRestImpl.java
@@ -0,0 +1,608 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.activiti.engine.ActivitiObjectNotFoundException;
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.history.HistoricTaskInstance;
+import org.activiti.engine.history.HistoricTaskInstanceQuery;
+import org.activiti.engine.history.HistoricVariableInstance;
+import org.activiti.engine.task.Task;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.dictionary.constraint.ListOfValuesConstraint;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.workflow.WorkflowConstants;
+import org.alfresco.repo.workflow.WorkflowModel;
+import org.alfresco.repo.workflow.activiti.ActivitiConstants;
+import org.alfresco.repo.workflow.activiti.ActivitiScriptNode;
+import org.alfresco.repo.workflow.activiti.ActivitiWorkflowEngine;
+import org.alfresco.rest.framework.core.exceptions.ApiException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.model.FormModelElement;
+import org.alfresco.rest.workflow.api.model.Item;
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.Constraint;
+import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.beanutils.ConversionException;
+import org.apache.commons.beanutils.ConvertUtils;
+
+/**
+ * Base class for rest-implementations related to workflow. Contains utility-methods that
+ * can be used, regardless of the type of resources the implementing class can handle.
+ *
+ * @author Frederik Heremans
+ */
+public class WorkflowRestImpl
+{
+    protected static final String BPM_PACKAGE = "bpm_package";
+    
+    protected TenantService tenantService;
+    protected AuthorityService authorityService;
+    protected NamespaceService namespaceService;
+    protected DictionaryService dictionaryService;
+    protected NodeService nodeService;
+    protected ProcessEngine activitiProcessEngine;
+    protected boolean deployWorkflowsInTenant;
+    protected List<String> excludeModelTypes = new ArrayList<String>(Arrays.asList("bpm_priority", "bpm_description", "bpm_dueDate"));
+    private ActivitiWorkflowEngine activitiWorkflowEngine;
+    
+    static 
+    {
+        // Register a custom date-converter to cope with ISO8601-parameters
+        ISO8601Converter dateConverter = new ISO8601Converter();
+        ConvertUtils.register(dateConverter, Date.class);
+        ConvertUtils.register(dateConverter, Calendar.class);
+    }
+    
+    public void setTenantService(TenantService tenantService)
+    {
+        this.tenantService = tenantService;
+    }
+    
+    public void setAuthorityService(AuthorityService authorityService)
+    {
+        this.authorityService = authorityService;
+    }
+    
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+    
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService;
+    }
+    
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+    
+    public void setActivitiProcessEngine(ProcessEngine activitiProcessEngine)
+    {
+        this.activitiProcessEngine = activitiProcessEngine;
+    }
+    
+    public void setDeployWorkflowsInTenant(boolean deployWorkflowsInTenant)
+    {
+        this.deployWorkflowsInTenant = deployWorkflowsInTenant;
+    }
+    
+    /**
+     * Create NodeRef from item id String
+     */
+    public NodeRef getNodeRef(String itemId)
+    {
+        NodeRef nodeRef = null;
+        if (NodeRef.isNodeRef(itemId) == false)
+        {
+            nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, itemId);
+        }
+        else
+        {
+            nodeRef = new NodeRef(itemId);
+        }
+        return nodeRef;
+    }
+    
+    /**
+     * Get all items from the process package variable
+     */
+    public CollectionWithPagingInfo<Item> getItemsFromProcess(String processId, Paging paging)
+    {
+        ActivitiScriptNode packageScriptNode = null;
+        try 
+        {
+            HistoricVariableInstance variableInstance = activitiProcessEngine.getHistoryService()
+                    .createHistoricVariableInstanceQuery()
+                    .processInstanceId(processId)
+                    .variableName(BPM_PACKAGE)
+                    .singleResult();
+            
+            if (variableInstance != null)
+            {
+                packageScriptNode = (ActivitiScriptNode) variableInstance.getValue();
+            }
+            else
+            {
+                throw new EntityNotFoundException(processId);
+            }
+        } 
+        catch (ActivitiObjectNotFoundException e)
+        {
+            throw new EntityNotFoundException(processId);
+        }
+        
+        List<Item> page = new ArrayList<Item>();
+        if (packageScriptNode != null)
+        {
+            List<ChildAssociationRef> documentList = nodeService.getChildAssocs(packageScriptNode.getNodeRef());
+            for (ChildAssociationRef childAssociationRef : documentList)
+            {
+                Item item = createItemForNodeRef(childAssociationRef.getChildRef());
+                page.add(item);
+            }
+        }
+        
+        return CollectionWithPagingInfo.asPaged(paging, page, false, page.size());
+    }
+    
+    /**
+     * Get an item from the process package variable
+     */
+    public Item getItemFromProcess(String itemId, String processId)
+    {
+        NodeRef nodeRef = getNodeRef(itemId);
+        ActivitiScriptNode packageScriptNode = null;
+        try 
+        {
+            HistoricVariableInstance variableInstance = activitiProcessEngine.getHistoryService()
+                    .createHistoricVariableInstanceQuery()
+                    .processInstanceId(processId)
+                    .variableName(BPM_PACKAGE)
+                    .singleResult();
+            
+            if (variableInstance != null)
+            {
+                packageScriptNode = (ActivitiScriptNode) variableInstance.getValue();
+            }
+            else
+            {
+                throw new EntityNotFoundException(processId);
+            }
+        } 
+        catch (ActivitiObjectNotFoundException e)
+        {
+            throw new EntityNotFoundException(processId);
+        }
+        
+        Item item = null;
+        if (packageScriptNode != null)
+        {
+            List<ChildAssociationRef> documentList = nodeService.getChildAssocs(packageScriptNode.getNodeRef());
+            for (ChildAssociationRef childAssociationRef : documentList)
+            {
+                if (childAssociationRef.getChildRef().equals(nodeRef)) 
+                {
+                    item = createItemForNodeRef(childAssociationRef.getChildRef());
+                    break;
+                }
+            }
+        }
+        
+        if (item == null) {
+            throw new EntityNotFoundException(itemId);
+        }
+        
+        return item;
+    }
+    
+    /**
+     *  Create a new item in the process package variable
+     */
+    public Item createItemInProcess(String itemId, String processId)
+    {
+        NodeRef nodeRef = getNodeRef(itemId);
+        
+        ActivitiScriptNode packageScriptNode = null;
+        try 
+        {
+            packageScriptNode = (ActivitiScriptNode) activitiProcessEngine.getRuntimeService().getVariable(processId, BPM_PACKAGE);
+        } 
+        catch (ActivitiObjectNotFoundException e)
+        {
+            throw new EntityNotFoundException(processId);
+        }
+        
+        if (packageScriptNode == null)
+        {
+            throw new InvalidArgumentException("process doesn't contain a workflow package variable");
+        }
+        
+        // check if noderef exists
+        try 
+        {
+            nodeService.getProperties(nodeRef);
+        }
+        catch (Exception e)
+        {
+            throw new EntityNotFoundException("item with id " + nodeRef.toString() + " not found");
+        }
+        
+        try 
+        {
+            QName workflowPackageItemId = QName.createQName("wpi", nodeRef.toString());
+            nodeService.addChild(packageScriptNode.getNodeRef(), nodeRef, 
+                    WorkflowModel.ASSOC_PACKAGE_CONTAINS, workflowPackageItemId);
+        }
+        catch (Exception e)
+        {
+            throw new ApiException("could not add item to process " + e.getMessage(), e);
+        }
+        
+        Item responseItem = createItemForNodeRef(nodeRef);
+        activitiWorkflowEngine.dispatchPackageUpdatedEvent(packageScriptNode, null, null, processId, null);
+        return responseItem;
+    }
+    
+    /**
+     *  Delete an item from the process package variable
+     */
+    public void deleteItemFromProcess(String itemId, String processId)
+    {
+        NodeRef nodeRef = getNodeRef(itemId);
+        ActivitiScriptNode packageScriptNode = null;
+        try 
+        {
+            packageScriptNode = (ActivitiScriptNode) activitiProcessEngine.getRuntimeService().getVariable(processId, BPM_PACKAGE);
+        } 
+        catch (ActivitiObjectNotFoundException e)
+        {
+            throw new EntityNotFoundException(processId);
+        }
+        
+        if (packageScriptNode == null)
+        {
+            throw new InvalidArgumentException("process doesn't contain a workflow package variable");
+        }
+        
+        boolean itemIdFoundInPackage = false;
+        List<ChildAssociationRef> documentList = nodeService.getChildAssocs(packageScriptNode.getNodeRef());
+        for (ChildAssociationRef childAssociationRef : documentList)
+        {
+            if (childAssociationRef.getChildRef().equals(nodeRef)) 
+            {
+                itemIdFoundInPackage = true;
+                break;
+            }
+        }
+        
+        if (itemIdFoundInPackage == false)
+        {
+            throw new EntityNotFoundException("Item " + itemId + " not found in the process package variable");
+        }
+        
+        try 
+        {
+            nodeService.removeChild(packageScriptNode.getNodeRef(), nodeRef);
+            activitiWorkflowEngine.dispatchPackageUpdatedEvent(packageScriptNode, null, null, processId, null);
+        }
+        catch (InvalidNodeRefException e)
+        {
+            throw new EntityNotFoundException("Item " + itemId + " not found");
+        }
+    }
+    
+    /**
+     * Get the first parameter value, converted to the requested type.
+     * @param parameters used to extract parameter value from
+     * @param parameterName name of the parameter
+     * @param returnType type of object to return
+     * @return the converted parameter value. Null, if the parameter has no value.
+     * @throws IllegalArgumentException when no conversion for the given returnType is available or if returnType is null.
+     * @throws InvalidArgumentException when conversion to the given type was not possible
+     */
+    @SuppressWarnings("unchecked")
+    public <T extends Object> T getParameter(Parameters parameters, String parameterName, Class<T> returnType) {
+        if(returnType == null) 
+        {
+            throw new IllegalArgumentException("ReturnType cannot be null");
+        }
+        try
+        {
+            Object result = null;
+            String stringValue = parameters.getParameter(parameterName);
+            if(stringValue != null) 
+            {
+                result = ConvertUtils.convert(stringValue, returnType);
+                if(result instanceof String)
+                {
+                    // If a string is returned, no converter has been found
+                    throw new IllegalArgumentException("Unable to convert parameter to type: " + returnType.getName());
+                }
+            }
+            return (T) result;
+        }
+        catch(ConversionException ce)
+        {
+            // Conversion failed, wrap in Illegal
+            throw new InvalidArgumentException("Parameter value for '" + parameterName + "' should be a valid " + returnType.getSimpleName());
+        }
+    }
+
+    /**
+     * @param type the type to get the elements for
+     * @param paging Paging
+     * @return collection with all valid form-model elements for the given type.
+     */
+    public CollectionWithPagingInfo<FormModelElement> getFormModelElements(TypeDefinition type, Paging paging)
+    {
+        Map<QName, PropertyDefinition> taskProperties = type.getProperties();
+        Set<QName> typesToExclude = getTypesToExclude(type);
+        
+        List<FormModelElement> page = new ArrayList<FormModelElement>();
+        for (Entry<QName, PropertyDefinition> entry : taskProperties.entrySet())
+        {
+        	String name = entry.getKey().toPrefixString(namespaceService).replace(':', '_');
+            
+            // Only add properties which are not part of an excluded type
+            if(!typesToExclude.contains(entry.getValue().getContainerClass().getName()) && excludeModelTypes.contains(name) == false)
+            {
+                FormModelElement element = new FormModelElement();
+                element.setName(name);
+                element.setQualifiedName(entry.getKey().toString());
+                element.setTitle(entry.getValue().getTitle(dictionaryService));
+                element.setRequired(entry.getValue().isMandatory());
+                element.setDataType(entry.getValue().getDataType().getName().toPrefixString(namespaceService));
+                element.setDefaultValue(entry.getValue().getDefaultValue());
+                if (entry.getValue().getConstraints() != null)
+                {
+                    for (ConstraintDefinition constraintDef : entry.getValue().getConstraints())
+                    {
+                    	Constraint constraint = constraintDef.getConstraint();
+                    	if (constraint != null && constraint instanceof ListOfValuesConstraint)
+                    	{
+                    		ListOfValuesConstraint valuesConstraint = (ListOfValuesConstraint) constraint;
+                    		if (valuesConstraint.getAllowedValues() != null && valuesConstraint.getAllowedValues().size() > 0)
+                    		{
+                    			element.setAllowedValues(valuesConstraint.getAllowedValues());
+                    		}
+                    	}
+                    }
+                }
+                page.add(element);
+            }
+        }
+        
+        Map<QName, AssociationDefinition> taskAssociations = type.getAssociations();
+        for (Entry<QName, AssociationDefinition> entry : taskAssociations.entrySet())
+        {
+            // Only add associations which are not part of an excluded type
+            if(!typesToExclude.contains(entry.getValue().getSourceClass().getName()))
+            {
+                FormModelElement element = new FormModelElement();
+                element.setName(entry.getKey().toPrefixString(namespaceService).replace(':', '_'));
+                element.setQualifiedName(entry.getKey().toString());
+                element.setTitle(entry.getValue().getTitle(dictionaryService));
+                element.setRequired(entry.getValue().isTargetMandatory());
+                element.setDataType(entry.getValue().getTargetClass().getName().toPrefixString(namespaceService));
+                page.add(element);
+            }
+        }
+        
+        return CollectionWithPagingInfo.asPaged(paging, page, false, page.size());
+    }
+    
+    /**
+     * @param taskType type of the task
+     * @return all types (and aspects) which properties should not be used for form-model elements
+     */
+    protected Set<QName> getTypesToExclude(TypeDefinition taskType)
+    {
+        HashSet<QName> typesToExclude = new HashSet<QName>();
+        
+        ClassDefinition parentClassDefinition = taskType.getParentClassDefinition();
+        boolean contentClassFound = false;
+        while(parentClassDefinition != null) 
+        {
+            if(contentClassFound)
+            {
+                typesToExclude.add(parentClassDefinition.getName());
+            }
+            else if(ContentModel.TYPE_CONTENT.equals(parentClassDefinition.getName()))
+            {
+                // All parents of "cm:content" should be ignored as well for fetching start-properties 
+                typesToExclude.add(ContentModel.TYPE_CONTENT);
+                typesToExclude.addAll(parentClassDefinition.getDefaultAspectNames());
+                contentClassFound = true;
+            }
+            parentClassDefinition = parentClassDefinition.getParentClassDefinition();
+        }
+        return typesToExclude;
+    }
+    
+    /**
+     * Validates if the logged in user is allowed to get information about a specific process instance.
+     * If the user is not allowed an exception is thrown.
+     * 
+     * @param processId identifier of the process instance
+     */
+    protected List<HistoricVariableInstance> validateIfUserAllowedToWorkWithProcess(String processId)
+    {
+        List<HistoricVariableInstance> variableInstances = activitiProcessEngine.getHistoryService()
+                .createHistoricVariableInstanceQuery()
+                .processInstanceId(processId)
+                .list();
+        
+        Map<String, Object> variableMap = new HashMap<String, Object>();
+        if (variableInstances != null && variableInstances.size() > 0) 
+        {
+            for (HistoricVariableInstance variableInstance : variableInstances)
+            {
+                variableMap.put(variableInstance.getVariableName(), variableInstance.getValue());
+            }
+        }
+        else
+        {
+            throw new EntityNotFoundException(processId);
+        }
+        
+        if (tenantService.isEnabled())
+        {
+            String tenantDomain = (String) variableMap.get(ActivitiConstants.VAR_TENANT_DOMAIN);
+            if (TenantUtil.getCurrentDomain().equals(tenantDomain) == false)
+            {
+                throw new PermissionDeniedException("Process is running in another tenant");
+            }
+        }
+
+        //MNT-17918 - required for initiator variable already updated as NodeRef type
+        Object initiator = variableMap.get(WorkflowConstants.PROP_INITIATOR);
+        String nodeId = ((initiator instanceof ActivitiScriptNode) ? ((ActivitiScriptNode) initiator).getNodeRef().getId() : ((NodeRef) initiator).getId());
+
+        if (initiator != null && AuthenticationUtil.getRunAsUser().equals(nodeId))
+        {
+            // user is allowed
+            return variableInstances;
+        }
+
+        String username = AuthenticationUtil.getRunAsUser();
+        if (authorityService.isAdminAuthority(username)) 
+        {
+            // Admin is allowed to read all processes in the current tenant
+            return variableInstances;
+        }
+        else
+        {
+            // MNT-12382 check for membership in the assigned group
+            ActivitiScriptNode group = (ActivitiScriptNode) variableMap.get("bpm_groupAssignee");
+            if (group != null)
+            {
+                // check that the process is unclaimed
+                Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processId).singleResult();
+                if ((task != null) && (task.getAssignee() == null) && isUserInGroup(username, group.getNodeRef()))
+                {
+                    return variableInstances;
+                }
+            }
+
+            // If non-admin user, involvement in the task is required (either owner, assignee or externally involved).
+            HistoricTaskInstanceQuery query = activitiProcessEngine.getHistoryService()
+                    .createHistoricTaskInstanceQuery()
+                    .processInstanceId(processId)
+                    .taskInvolvedUser(AuthenticationUtil.getRunAsUser());
+            
+            List<HistoricTaskInstance> taskList = query.list();
+            
+            if (org.apache.commons.collections.CollectionUtils.isEmpty(taskList)) 
+            {
+                throw new PermissionDeniedException("user is not allowed to access information about process " + processId);
+            }
+        }
+        
+        return variableInstances;
+    }
+    
+    protected Item createItemForNodeRef(NodeRef nodeRef) {
+        Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
+        Item item = new Item();
+        String name = (String) properties.get(ContentModel.PROP_NAME);
+        String title = (String) properties.get(ContentModel.PROP_TITLE);
+        String description = (String) properties.get(ContentModel.PROP_DESCRIPTION);
+        Date createdAt = (Date) properties.get(ContentModel.PROP_CREATED);
+        String createdBy = (String) properties.get(ContentModel.PROP_CREATOR);
+        Date modifiedAt = (Date) properties.get(ContentModel.PROP_MODIFIED);
+        String modifiedBy = (String) properties.get(ContentModel.PROP_MODIFIER);
+        
+        ContentData contentData = (ContentData) nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT);
+        
+        item.setId(nodeRef.getId());
+        item.setName(name);
+        item.setTitle(title);
+        item.setDescription(description);
+        item.setCreatedAt(createdAt);
+        item.setCreatedBy(createdBy);
+        item.setModifiedAt(modifiedAt);
+        item.setModifiedBy(modifiedBy);
+        if (contentData != null) 
+        {
+            item.setMimeType(contentData.getMimetype());
+            item.setSize(contentData.getSize());
+        }
+        return item;
+    }
+
+    public void setActivitiWorkflowEngine(ActivitiWorkflowEngine activitiWorkflowEngine)
+    {
+        this.activitiWorkflowEngine = activitiWorkflowEngine;
+    }
+    
+    private boolean isUserInGroup(String username, NodeRef group)
+    {
+        // Get the group name
+        String groupName = (String) nodeService.getProperty(group, ContentModel.PROP_AUTHORITY_NAME);
+
+        // Get all group members
+        Set<String> groupMembers = authorityService.getContainedAuthorities(AuthorityType.USER, groupName, false);
+
+        // Check if the user is a group member.
+        return (groupMembers != null) && groupMembers.contains(username);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Activity.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Activity.java
new file mode 100644
index 00000000000..c4b74e7039d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Activity.java
@@ -0,0 +1,126 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.model;
+
+import java.util.Date;
+
+import org.activiti.engine.history.HistoricActivityInstance;
+
+/**
+ * Representation of an activity in the Activiti engine.
+ * 
+ * @author Tijs Rademakers
+ */
+public class Activity
+{
+    String id;
+    String activityDefinitionId;
+    String activityDefinitionName;
+    String activityDefinitionType;
+    Date startedAt;
+    Date endedAt;
+    Long durationInMs;
+    
+    public Activity(HistoricActivityInstance activity) {
+        this.id = activity.getId();
+        this.activityDefinitionId = activity.getActivityId();
+        this.activityDefinitionName = activity.getActivityName();
+        this.activityDefinitionType = activity.getActivityType();
+        this.startedAt = activity.getStartTime();
+        this.endedAt = activity.getEndTime();
+        this.durationInMs = activity.getDurationInMillis();
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getActivityDefinitionId()
+    {
+        return activityDefinitionId;
+    }
+
+    public void setActivityDefinitionId(String activityDefinitionId)
+    {
+        this.activityDefinitionId = activityDefinitionId;
+    }
+
+    public String getActivityDefinitionName()
+    {
+        return activityDefinitionName;
+    }
+
+    public void setActivityDefinitionName(String activityDefinitionName)
+    {
+        this.activityDefinitionName = activityDefinitionName;
+    }
+
+    public String getActivityDefinitionType()
+    {
+        return activityDefinitionType;
+    }
+
+    public void setActivityDefinitionType(String activityDefinitionType)
+    {
+        this.activityDefinitionType = activityDefinitionType;
+    }
+
+    public Date getStartedAt()
+    {
+        return startedAt;
+    }
+
+    public void setStartedAt(Date startedAt)
+    {
+        this.startedAt = startedAt;
+    }
+
+    public Date getEndedAt()
+    {
+        return endedAt;
+    }
+
+    public void setEndedAt(Date endedAt)
+    {
+        this.endedAt = endedAt;
+    }
+
+    public Long getDurationInMs()
+    {
+        return durationInMs;
+    }
+
+    public void setDurationInMs(Long durationInMs)
+    {
+        this.durationInMs = durationInMs;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Deployment.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Deployment.java
new file mode 100644
index 00000000000..f6cab0bf6e3
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Deployment.java
@@ -0,0 +1,89 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.model;
+
+import java.util.Date;
+
+public class Deployment
+{
+
+    String id;
+    String name;
+    String category;
+    Date deployedAt;
+    
+    public Deployment()
+    {
+    }
+
+    public Deployment(org.activiti.engine.repository.Deployment deployment)
+    {
+        this.id = deployment.getId();
+        this.name = deployment.getName();
+        this.category = deployment.getCategory();
+        this.deployedAt = deployment.getDeploymentTime();
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+    
+    public String getCategory()
+    {
+        return category;
+    }
+
+    public void setCategory(String category)
+    {
+        this.category = category;
+    }
+
+    public Date getDeployedAt()
+    {
+        return deployedAt;
+    }
+
+    public void setDeployedAt(Date deployedAt)
+    {
+        this.deployedAt = deployedAt;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/FormModelElement.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/FormModelElement.java
new file mode 100644
index 00000000000..73479f59037
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/FormModelElement.java
@@ -0,0 +1,96 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.model;
+
+import java.util.List;
+
+public class FormModelElement
+{
+    String name;
+    String qualifiedName;
+    String title;
+    String dataType;
+    boolean required;
+    String defaultValue;
+    List<String> allowedValues;
+    
+    public String getName()
+    {
+        return name;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+    public String getQualifiedName()
+    {
+        return qualifiedName;
+    }
+    public void setQualifiedName(String qualifiedName)
+    {
+        this.qualifiedName = qualifiedName;
+    }
+    public String getTitle()
+    {
+        return title;
+    }
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+    public String getDataType()
+    {
+        return dataType;
+    }
+    public void setDataType(String dataType)
+    {
+        this.dataType = dataType;
+    }
+    public boolean isRequired()
+    {
+        return required;
+    }
+    public void setRequired(boolean required)
+    {
+        this.required = required;
+    }
+    public String getDefaultValue()
+    {
+        return defaultValue;
+    }
+    public void setDefaultValue(String defaultValue)
+    {
+        this.defaultValue = defaultValue;
+    }
+	public List<String> getAllowedValues() 
+	{
+		return allowedValues;
+	}
+	public void setAllowedValues(List<String> allowedValues) 
+	{
+		this.allowedValues = allowedValues;
+	}
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Item.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Item.java
new file mode 100644
index 00000000000..aaecd566506
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Item.java
@@ -0,0 +1,123 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.model;
+
+import java.util.Date;
+
+public class Item
+{
+    String id;
+    String name;
+    String title;
+    String description;
+    String mimeType;
+    String createdBy;
+    Date createdAt;
+    String modifiedBy;
+    Date modifiedAt;
+    Long size;
+    
+    public String getId()
+    {
+        return id;
+    }
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+    public String getName()
+    {
+        return name;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+    public String getTitle()
+    {
+        return title;
+    }
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+    public String getDescription()
+    {
+        return description;
+    }
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+    public String getMimeType()
+    {
+        return mimeType;
+    }
+    public void setMimeType(String mimeType)
+    {
+        this.mimeType = mimeType;
+    }
+    public String getCreatedBy()
+    {
+        return createdBy;
+    }
+    public void setCreatedBy(String createdBy)
+    {
+        this.createdBy = createdBy;
+    }
+    public Date getCreatedAt()
+    {
+        return createdAt;
+    }
+    public void setCreatedAt(Date createdAt)
+    {
+        this.createdAt = createdAt;
+    }
+    public String getModifiedBy()
+    {
+        return modifiedBy;
+    }
+    public void setModifiedBy(String modifiedBy)
+    {
+        this.modifiedBy = modifiedBy;
+    }
+    public Date getModifiedAt()
+    {
+        return modifiedAt;
+    }
+    public void setModifiedAt(Date modifiedAt)
+    {
+        this.modifiedAt = modifiedAt;
+    }
+    public Long getSize()
+    {
+        return size;
+    }
+    public void setSize(Long size)
+    {
+        this.size = size;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/ProcessDefinition.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/ProcessDefinition.java
new file mode 100644
index 00000000000..2945ecdf32b
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/ProcessDefinition.java
@@ -0,0 +1,154 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.model;
+
+public class ProcessDefinition
+{
+
+    String id;
+    String key;
+    String name;
+    String category;
+    int version;
+    String deploymentId;
+    String title;
+    String description;
+    String startFormResourceKey;
+    Boolean isGraphicNotationDefined;
+    
+    public ProcessDefinition()
+    {
+    }
+
+    public ProcessDefinition(org.activiti.engine.repository.ProcessDefinition processDefinition)
+    {
+        this.id = processDefinition.getId();
+        this.name = processDefinition.getName();
+        this.category = processDefinition.getCategory();
+        this.version = processDefinition.getVersion();
+        this.deploymentId = processDefinition.getDeploymentId();
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getKey()
+    {
+        return key;
+    }
+
+    public void setKey(String key)
+    {
+        this.key = key;
+    }
+
+    public String getCategory()
+    {
+        return category;
+    }
+
+    public void setCategory(String category)
+    {
+        this.category = category;
+    }
+
+    public int getVersion()
+    {
+        return version;
+    }
+
+    public void setVersion(int version)
+    {
+        this.version = version;
+    }
+
+    public String getDeploymentId()
+    {
+        return deploymentId;
+    }
+
+    public void setDeploymentId(String deploymentId)
+    {
+        this.deploymentId = deploymentId;
+    }
+    
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    public String getStartFormResourceKey()
+    {
+        return startFormResourceKey;
+    }
+
+    public void setStartFormResourceKey(String startFormResourceKey)
+    {
+        this.startFormResourceKey = startFormResourceKey;
+    }
+
+    public Boolean isGraphicNotationDefined()
+    {
+        return isGraphicNotationDefined;
+    }
+
+    public void setGraphicNotationDefined(Boolean isGraphicNotationDefined)
+    {
+        this.isGraphicNotationDefined = isGraphicNotationDefined;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/ProcessInfo.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/ProcessInfo.java
new file mode 100644
index 00000000000..240970e50ba
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/ProcessInfo.java
@@ -0,0 +1,235 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.model;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.activiti.engine.history.HistoricProcessInstance;
+
+public class ProcessInfo
+{
+
+    String id;
+    String processDefinitionId;
+    String processDefinitionKey;
+    Date startedAt;
+    Date endedAt;
+    Long durationInMs;
+    String deleteReason;
+    String startUserId;
+    String startActivityId;
+    String endActivityId;
+    String businessKey;
+    String superProcessInstanceId;
+    boolean completed;
+    
+    Map<String, Object> variables;
+    List<Variable> processVariables;
+    Set<String> items;
+
+    public ProcessInfo()
+    {
+    }
+
+    public ProcessInfo(HistoricProcessInstance processInstance)
+    {
+        this.id = processInstance.getId();
+        this.processDefinitionId = processInstance.getProcessDefinitionId();
+        this.startedAt = processInstance.getStartTime();
+        this.endedAt = processInstance.getEndTime();
+        this.durationInMs = processInstance.getDurationInMillis();
+        this.deleteReason = processInstance.getDeleteReason();
+        this.startUserId = processInstance.getStartUserId();
+        this.startActivityId = processInstance.getStartActivityId();
+        this.endActivityId = processInstance.getEndActivityId();
+        this.businessKey = processInstance.getBusinessKey();
+        this.superProcessInstanceId = processInstance.getSuperProcessInstanceId();
+        this.completed = (processInstance.getEndTime() != null);
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getProcessDefinitionId()
+    {
+        return processDefinitionId;
+    }
+
+    public void setProcessDefinitionId(String processDefinitionId)
+    {
+        this.processDefinitionId = processDefinitionId;
+    }
+
+    public Long getDurationInMs()
+    {
+        return durationInMs;
+    }
+
+    public void setDurationInMs(Long durationInMs)
+    {
+        this.durationInMs = durationInMs;
+    }
+
+    public String getDeleteReason()
+    {
+        return deleteReason;
+    }
+
+    public void setDeleteReason(String deleteReason)
+    {
+        this.deleteReason = deleteReason;
+    }
+
+    public String getBusinessKey()
+    {
+        return businessKey;
+    }
+
+    public void setBusinessKey(String businessKey)
+    {
+        this.businessKey = businessKey;
+    }
+
+    public String getSuperProcessInstanceId()
+    {
+        return superProcessInstanceId;
+    }
+
+    public void setSuperProcessInstanceId(String superProcessInstanceId)
+    {
+        this.superProcessInstanceId = superProcessInstanceId;
+    }
+
+    public String getProcessDefinitionKey()
+    {
+        return processDefinitionKey;
+    }
+
+    public void setProcessDefinitionKey(String processDefinitionKey)
+    {
+        this.processDefinitionKey = processDefinitionKey;
+    }
+
+    public Date getStartedAt()
+    {
+        return startedAt;
+    }
+
+    public void setStartedAt(Date startedAt)
+    {
+        this.startedAt = startedAt;
+    }
+
+    public Date getEndedAt()
+    {
+        return endedAt;
+    }
+
+    public void setEndedAt(Date endedAt)
+    {
+        this.endedAt = endedAt;
+    }
+
+    public String getStartUserId()
+    {
+        return startUserId;
+    }
+
+    public void setStartUserId(String startUserId)
+    {
+        this.startUserId = startUserId;
+    }
+
+    public String getStartActivityId()
+    {
+        return startActivityId;
+    }
+
+    public void setStartActivityId(String startActivityId)
+    {
+        this.startActivityId = startActivityId;
+    }
+
+    public String getEndActivityId()
+    {
+        return endActivityId;
+    }
+
+    public void setEndActivityId(String endActivityId)
+    {
+        this.endActivityId = endActivityId;
+    }
+
+    public boolean isCompleted()
+    {
+        return completed;
+    }
+
+    public void setCompleted(boolean completed)
+    {
+        this.completed = completed;
+    }
+
+    public Map<String, Object> getVariables()
+    {
+        return variables;
+    }
+
+    public void setVariables(Map<String, Object> variables)
+    {
+        this.variables = variables;
+    }
+
+    public List<Variable> getProcessVariables()
+    {
+        return processVariables;
+    }
+
+    public void setProcessVariables(List<Variable> processVariables)
+    {
+        this.processVariables = processVariables;
+    }
+
+    public Set<String> getItems()
+    {
+        return items;
+    }
+
+    public void setItems(Set<String> items)
+    {
+        this.items = items;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Task.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Task.java
new file mode 100644
index 00000000000..44520a1113d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Task.java
@@ -0,0 +1,277 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.model;
+
+import java.util.Date;
+import java.util.List;
+
+import org.activiti.engine.history.HistoricTaskInstance;
+import org.activiti.engine.task.DelegationState;
+
+public class Task
+{
+    String id;
+    String processId;
+    String processDefinitionId;
+    String activityDefinitionId;
+    String name;
+    String description;
+    Date dueAt;
+    Date startedAt;
+    Date endedAt;
+    Long durationInMs;
+    int priority;
+    String owner;
+    String assignee;
+    String formResourceKey;
+    String state;
+    List<TaskVariable> variables;
+    
+    public Task()
+    {
+    }
+
+    public Task(HistoricTaskInstance taskInstance)
+    {
+        this.id = taskInstance.getId();
+        this.processId = taskInstance.getProcessInstanceId();
+        this.processDefinitionId = taskInstance.getProcessDefinitionId();
+        this.activityDefinitionId = taskInstance.getTaskDefinitionKey();
+        this.name = taskInstance.getName();
+        this.description = taskInstance.getDescription();
+        this.dueAt = taskInstance.getDueDate();
+        this.startedAt = taskInstance.getStartTime();
+        this.endedAt = taskInstance.getEndTime();
+        this.durationInMs = taskInstance.getDurationInMillis();
+        this.priority = taskInstance.getPriority();
+        this.owner = taskInstance.getOwner();
+        this.assignee = taskInstance.getAssignee();
+        this.formResourceKey = taskInstance.getFormKey();
+        if (taskInstance.getEndTime() != null)
+        {
+        	this.state = TaskStateTransition.COMPLETED.name().toLowerCase();
+        }
+        else if (taskInstance.getAssignee() != null)
+        {
+        	this.state = TaskStateTransition.CLAIMED.name().toLowerCase();
+        }
+        else
+        {
+        	this.state = TaskStateTransition.UNCLAIMED.name().toLowerCase();
+        }
+    }
+    
+    public Task(org.activiti.engine.task.Task taskInstance)
+    {
+        this.id = taskInstance.getId();
+        this.processId = taskInstance.getProcessInstanceId();
+        this.processDefinitionId = taskInstance.getProcessDefinitionId();
+        this.activityDefinitionId = taskInstance.getTaskDefinitionKey();
+        this.name = taskInstance.getName();
+        this.description = taskInstance.getDescription();
+        this.dueAt = taskInstance.getDueDate();
+        this.startedAt = taskInstance.getCreateTime();
+        this.priority = taskInstance.getPriority();
+        this.owner = taskInstance.getOwner();
+        this.assignee = taskInstance.getAssignee();
+        if (taskInstance.getDelegationState() == DelegationState.PENDING)
+        {
+            this.state = TaskStateTransition.DELEGATED.name().toLowerCase();
+        }
+        else if (taskInstance.getDelegationState() == DelegationState.RESOLVED)
+        {
+            this.state = TaskStateTransition.RESOLVED.name().toLowerCase();
+        }
+        else if (taskInstance.getAssignee() != null)
+        {
+        	this.state = TaskStateTransition.CLAIMED.name().toLowerCase();
+        }
+        else
+        {
+        	this.state = TaskStateTransition.UNCLAIMED.name().toLowerCase();
+        }
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getProcessId()
+    {
+        return processId;
+    }
+
+    public void setProcessId(String processId)
+    {
+        this.processId = processId;
+    }
+
+    public String getProcessDefinitionId()
+    {
+        return processDefinitionId;
+    }
+
+    public void setProcessDefinitionId(String processDefinitionId)
+    {
+        this.processDefinitionId = processDefinitionId;
+    }
+
+    public String getActivityDefinitionId()
+    {
+        return activityDefinitionId;
+    }
+
+    public void setActivityDefinitionId(String activityDefinitionId)
+    {
+        this.activityDefinitionId = activityDefinitionId;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    public Date getDueAt()
+    {
+        return dueAt;
+    }
+
+    public void setDueAt(Date dueAt)
+    {
+        this.dueAt = dueAt;
+    }
+
+    public Date getStartedAt()
+    {
+        return startedAt;
+    }
+
+    public void setStartedAt(Date startedAt)
+    {
+        this.startedAt = startedAt;
+    }
+
+    public Date getEndedAt()
+    {
+        return endedAt;
+    }
+
+    public void setEndedAt(Date endedAt)
+    {
+        this.endedAt = endedAt;
+    }
+
+    public Long getDurationInMs()
+    {
+        return durationInMs;
+    }
+
+    public void setDurationInMs(Long durationInMs)
+    {
+        this.durationInMs = durationInMs;
+    }
+
+    public int getPriority()
+    {
+        return priority;
+    }
+
+    public void setPriority(int priority)
+    {
+        this.priority = priority;
+    }
+
+    public String getOwner()
+    {
+        return owner;
+    }
+
+    public void setOwner(String owner)
+    {
+        this.owner = owner;
+    }
+
+    public String getAssignee()
+    {
+        return assignee;
+    }
+
+    public void setAssignee(String assignee)
+    {
+        this.assignee = assignee;
+    }
+
+    public String getFormResourceKey()
+    {
+        return formResourceKey;
+    }
+
+    public void setFormResourceKey(String formResourceKey)
+    {
+        this.formResourceKey = formResourceKey;
+    }
+    
+    public String getState()
+    {
+        return this.state;
+    }
+    
+    public void setState(String state)
+    {
+        this.state = state;
+    }
+
+    public List<TaskVariable> getVariables()
+    {
+        return variables;
+    }
+
+    public void setVariables(List<TaskVariable> variables)
+    {
+        this.variables = variables;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/TaskCandidate.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/TaskCandidate.java
new file mode 100644
index 00000000000..54b9815d323
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/TaskCandidate.java
@@ -0,0 +1,70 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.model;
+
+import org.activiti.engine.task.IdentityLink;
+import org.apache.commons.lang3.StringUtils;
+
+public class TaskCandidate
+{
+    String candidateId;
+    String candidateType;
+    
+    public TaskCandidate()
+    {
+    }
+
+    public TaskCandidate(IdentityLink identityLink)
+    {
+        if (StringUtils.isNotEmpty(identityLink.getUserId())) {
+            candidateId = identityLink.getUserId();
+            candidateType = "user";
+        } else {
+            candidateId = identityLink.getGroupId();
+            candidateType = "group";
+        }
+    }
+
+    public String getCandidateId()
+    {
+        return candidateId;
+    }
+
+    public void setCandidateId(String candidateId)
+    {
+        this.candidateId = candidateId;
+    }
+
+    public String getCandidateType()
+    {
+        return candidateType;
+    }
+
+    public void setCandidateType(String candidateType)
+    {
+        this.candidateType = candidateType;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/TaskStateTransition.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/TaskStateTransition.java
new file mode 100644
index 00000000000..9aa9ac430b4
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/TaskStateTransition.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.model;
+
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+
+public enum TaskStateTransition {
+    
+    COMPLETED, CLAIMED, UNCLAIMED, DELEGATED, RESOLVED;
+    
+    /**
+     * @return the {@link TaskStateTransition} for the given string
+     * @throws InvalidArgumentException when no action exists for the given string
+     */
+    public static TaskStateTransition getTaskActionFromString(String action) 
+    {
+        for(TaskStateTransition taskAction : values())
+        {
+            if(taskAction.name().toLowerCase().equals(action))
+            {
+                return taskAction;
+            }
+        }
+        throw new InvalidArgumentException("The task state property has an invalid value: " + action);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/TaskVariable.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/TaskVariable.java
new file mode 100644
index 00000000000..da69866bb4d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/TaskVariable.java
@@ -0,0 +1,76 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+
+/**
+ * Representation of a variable used in an Activiti task.
+ * 
+ * @author Frederik Heremans
+ */
+public class TaskVariable extends Variable
+{
+    protected String scope;
+    
+    public void setScope(String scope) 
+    {
+       this.scope = scope;
+    }
+    
+    public String getScope()
+    {
+       return scope;
+    }
+    
+    @JsonIgnore
+    public VariableScope getVariableScope()
+    {
+        VariableScope result = null;
+        if(scope != null)
+        {
+            result = VariableScope.getScopeForValue(scope);
+            if(result == null)
+            {
+                throw new InvalidArgumentException("Illegal value for variable scope: '" + scope + "'.");
+            }
+        }
+        return result;
+    }
+    
+    public void setVariableScope(VariableScope variableScope)
+    {
+        if(variableScope != null)
+        {
+            this.scope = variableScope.getValue();
+        }
+        else
+        {
+            this.scope = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Variable.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Variable.java
new file mode 100644
index 00000000000..4b11a4374a1
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/Variable.java
@@ -0,0 +1,67 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.model;
+
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+/**
+ * Representation of a variable in the Activiti engine.
+ * 
+ * @author Frederik Heremans
+ */
+public class Variable
+{
+    protected String name;
+    protected String type;
+    protected Object value;
+    
+    public String getName()
+    {
+        return this.name;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+    public String getType()
+    {
+        return this.type;
+    }
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+    @JsonSerialize(include= JsonSerialize.Inclusion.ALWAYS)
+    public Object getValue()
+    {
+        return this.value;
+    }
+    public void setValue(Object value)
+    {
+        this.value = value;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/VariableScope.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/VariableScope.java
new file mode 100644
index 00000000000..f24cfe7d8b2
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/model/VariableScope.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.model;
+
+
+public enum VariableScope
+{
+    LOCAL("local"), GLOBAL("global"), ANY("any");
+    
+    private String value;
+    
+    private VariableScope(String value) {
+        this.value = value;
+    }
+    /**
+     * @param scopeValue value of the scope, see {@link #getValue()}.
+     * @return {@link VariableScope} for the given value. Returns null if the given value is not
+     * a valid scope. 
+     */
+    public static VariableScope getScopeForValue(String scopeValue) {
+        for(VariableScope scope : values()) 
+        {
+            if(scope.getValue().equals(scopeValue)) 
+            {
+                return scope;
+            }
+        }
+        return null;
+    }
+    
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/package-info.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/package-info.java
new file mode 100644
index 00000000000..24ed50f4ccc
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="workflow", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.workflow.api;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/processdefinitions/ProcessDefinitionsRestEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processdefinitions/ProcessDefinitionsRestEntityResource.java
new file mode 100644
index 00000000000..2aa9a105fd7
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processdefinitions/ProcessDefinitionsRestEntityResource.java
@@ -0,0 +1,81 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.processdefinitions;
+
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.WebApiParameters;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.ProcessDefinitions;
+import org.alfresco.rest.workflow.api.model.ProcessDefinition;
+
+@EntityResource(name="process-definitions", title = "Process definitions")
+public class ProcessDefinitionsRestEntityResource implements EntityResourceAction.Read<ProcessDefinition>, 
+                                                             EntityResourceAction.ReadById<ProcessDefinition>,
+                                                             BinaryResourceAction.Read {
+
+    ProcessDefinitions processDefinitions;
+    
+    public void setProcessDefinitions(ProcessDefinitions processDefinitions)
+    {
+        this.processDefinitions = processDefinitions;
+    }
+
+    @Override
+    @WebApiDescription(title = "Get Process Definitions", description = "Get information for the process definitions")
+    @WebApiParameters(value = { 
+            @WebApiParam(name = "key", title = "Only return process definitions with the given key", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "category", title = "Only return process definitions with the given category", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "name", title = "Only return process definitions with the given name", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "deploymentId", title = "Only return process definitions with the given definitionId", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "version", title = "Only return process definitions with the given version", kind=ResourceParameter.KIND.QUERY_STRING)})
+    public CollectionWithPagingInfo<ProcessDefinition> readAll(Parameters params)
+    {
+        return processDefinitions.getProcessDefinitions(params);
+    }
+
+    @Override
+    public ProcessDefinition readById(String id, Parameters parameters) throws EntityNotFoundException
+    {
+        return processDefinitions.getProcessDefinition(id);
+    }
+    
+    @Override
+    @WebApiDescription(title = "Get a process definition image", description = "Get a process definition image")
+    @BinaryProperties({"image"})
+    public BinaryResource readProperty(String id, Parameters parameters) throws EntityNotFoundException
+    {
+        return processDefinitions.getProcessDefinitionImage(id);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/processdefinitions/StartFormModelRelation.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processdefinitions/StartFormModelRelation.java
new file mode 100644
index 00000000000..91369b1690e
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processdefinitions/StartFormModelRelation.java
@@ -0,0 +1,62 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.processdefinitions;
+
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.ProcessDefinitions;
+import org.alfresco.rest.workflow.api.model.FormModelElement;
+
+/**
+ * 
+ * @author Tijs Rademakers
+ *
+ */
+@RelationshipResource(name = "start-form-model", entityResource = ProcessDefinitionsRestEntityResource.class, title = "Start form model of a process definition")
+public class StartFormModelRelation implements RelationshipResourceAction.Read<FormModelElement>
+{
+    private ProcessDefinitions processDefinitions;
+
+	public void setProcessDefinitions(ProcessDefinitions processDefinitions)
+	{
+		this.processDefinitions = processDefinitions;
+	}
+
+    /**
+     * List the tasks candidate users and groups.
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Read#readAll(java.lang.String, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+    @Override
+    @WebApiDescription(title = "Get Start Form Model of a Process Definition", description = "Get a paged list of the start form model of a process definition")
+    public CollectionWithPagingInfo<FormModelElement> readAll(String definitionId, Parameters parameters)
+    {
+        return processDefinitions.getStartFormModel(definitionId, parameters.getPaging());
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/processdefinitions/package-info.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processdefinitions/package-info.java
new file mode 100644
index 00000000000..f34ce0a9806
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processdefinitions/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="workflow", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.workflow.api.processdefinitions;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessActivitiesRelation.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessActivitiesRelation.java
new file mode 100644
index 00000000000..975a0db48a8
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessActivitiesRelation.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.processes;
+
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.Activities;
+import org.alfresco.rest.workflow.api.model.Activity;
+
+/**
+ * 
+ * @author Tijs Rademakers
+ *
+ */
+@RelationshipResource(name = "activities", entityResource = ProcessesRestEntityResource.class, title = "Activities for the current process")
+public class ProcessActivitiesRelation implements RelationshipResourceAction.Read<Activity>
+{
+    protected Activities activities;
+    
+    public void setActivities(Activities activities)
+    {
+        this.activities = activities;
+    }
+
+    /**
+     * List the activities.
+     */
+    @Override
+    @WebApiDescription(title = "Get Activities", description = "Get a paged list of the activities")
+    public CollectionWithPagingInfo<Activity> readAll(String processId, Parameters parameters)
+    {
+        return activities.getActivities(processId, parameters);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessItemsRelation.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessItemsRelation.java
new file mode 100644
index 00000000000..0acf2a4aa9c
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessItemsRelation.java
@@ -0,0 +1,90 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.processes;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.Processes;
+import org.alfresco.rest.workflow.api.model.Item;
+
+/**
+ * 
+ * @author Tijs Rademakers
+ *
+ */
+@RelationshipResource(name = "items", entityResource = ProcessesRestEntityResource.class, title = "The items attached to a process instance")
+public class ProcessItemsRelation implements RelationshipResourceAction.ReadById<Item>, RelationshipResourceAction.Read<Item>, RelationshipResourceAction.Create<Item>, RelationshipResourceAction.Delete
+{
+    private Processes processes;
+
+	public void setProcesses(Processes processes)
+	{
+		this.processes = processes;
+	}
+	
+	@Override
+    public Item readById(String processId, String id, Parameters parameters) throws RelationshipResourceNotFoundException
+    {
+        return processes.getItem(processId, id);
+    }
+
+    /**
+     * List the attached items.
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Read#readAll(java.lang.String, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+    @Override
+    @WebApiDescription(title = "Get the attached items of a Process Instance", description = "Get a paged list of all the possible items")
+    public CollectionWithPagingInfo<Item> readAll(String processId, Parameters parameters)
+    {
+        return processes.getItems(processId, parameters.getPaging());
+    }
+
+    @Override
+    public List<Item> create(String processId, List<Item> entity, Parameters parameters)
+    {
+        List<Item> result = new ArrayList<Item>(entity.size());
+        for (Item item : entity)
+        {
+           result.add(processes.createItem(processId, item));
+        }
+        return result;
+    }
+    
+    @Override
+    public void delete(String processId, String id, Parameters parameters)
+    {
+        processes.deleteItem(processId, id);
+        
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessTasksRelation.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessTasksRelation.java
new file mode 100644
index 00000000000..32da28f6871
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessTasksRelation.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.processes;
+
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.Tasks;
+import org.alfresco.rest.workflow.api.model.Task;
+
+/**
+ * 
+ * @author Tijs Rademakers
+ *
+ */
+@RelationshipResource(name = "tasks", entityResource = ProcessesRestEntityResource.class, title = "Tasks for the current process")
+public class ProcessTasksRelation implements RelationshipResourceAction.Read<Task>
+{
+    protected Tasks tasks;
+    
+    public void setTasks(Tasks tasks)
+    {
+        this.tasks = tasks;
+    }
+
+    /**
+     * List the tasks.
+     */
+    @Override
+    @WebApiDescription(title = "Get Tasks", description = "Get a paged list of the tasks")
+    public CollectionWithPagingInfo<Task> readAll(String processId, Parameters parameters)
+    {
+        return tasks.getTasks(processId, parameters);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessVariablesRelation.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessVariablesRelation.java
new file mode 100644
index 00000000000..0ebf6c26e62
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessVariablesRelation.java
@@ -0,0 +1,93 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.processes;
+
+import java.util.List;
+
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.Processes;
+import org.alfresco.rest.workflow.api.model.Variable;
+
+/**
+ * 
+ * @author Tijs Rademakers
+ *
+ */
+@RelationshipResource(name = "variables", entityResource = ProcessesRestEntityResource.class, title = "Variables for the current process")
+public class ProcessVariablesRelation implements RelationshipResourceAction.Read<Variable>, RelationshipResourceAction.Create<Variable>, 
+    RelationshipResourceAction.Update<Variable>, RelationshipResourceAction.Delete
+{
+    protected Processes processes;
+    
+    public void setProcesses(Processes processes)
+    {
+        this.processes = processes;
+    }
+
+    /**
+     * List the variables.
+     */
+    @Override
+    @WebApiDescription(title = "Get Task Variables", description = "Get a paged list of the task variables")
+    public CollectionWithPagingInfo<Variable> readAll(String processId, Parameters parameters)
+    {
+        return processes.getVariables(processId, parameters.getPaging());
+    }
+    
+    /**
+     * Creates or updates multiple variables. If the variable name doesn't exist yet it will be created
+     */
+    @Override
+    @WebApiDescription(title = "Create or Update Variables", description = "Create or update multiple variable")
+    public List<Variable> create(String processId, List<Variable> variables, Parameters parameters)
+    {
+        return processes.updateVariables(processId, variables);
+    }
+
+    /**
+     * Update a variable. If the variable name doesn't exist yet it will be created
+     */
+    @Override
+    @WebApiDescription(title = "Update Variable", description = "Update a variable")
+    public Variable update(String processId, Variable entity, Parameters parameters)
+    {
+        return processes.updateVariable(processId, entity);
+    }
+
+    /**
+     * Delete a variable. If the variable name doesn't exist the delete call throws an exception.
+     */
+    @Override
+    @WebApiDescription(title = "Delete Variable", description = "Delete a variable")
+    public void delete(String processId, String id, Parameters parameters)
+    {
+        processes.deleteVariable(processId, id);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessesRestEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessesRestEntityResource.java
new file mode 100644
index 00000000000..3e7d12d232a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/ProcessesRestEntityResource.java
@@ -0,0 +1,106 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.processes;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.WebApiParameters;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.Processes;
+import org.alfresco.rest.workflow.api.model.ProcessInfo;
+
+@EntityResource(name="processes", title = "Processes")
+public class ProcessesRestEntityResource implements EntityResourceAction.Read<ProcessInfo>, 
+                                                           EntityResourceAction.ReadById<ProcessInfo>,
+                                                           EntityResourceAction.Create<ProcessInfo>,
+                                                           EntityResourceAction.Delete,
+                                                           BinaryResourceAction.Read {
+
+    Processes processes;
+    
+    public void setProcesses(Processes processes)
+    {
+        this.processes = processes;
+    }
+
+    @Override
+    @WebApiDescription(title = "Start a new process instance", description = "Start a new process instance")
+    @WebApiParameters(value = { 
+            @WebApiParam(name = "processDefinitionId", title = "The process instance will be started in the given process definition", kind=ResourceParameter.KIND.HTTP_BODY_OBJECT),
+            @WebApiParam(name = "processDefinitionKey", title = "The process instance will be started in the latest version of the process definition having the given key", kind=ResourceParameter.KIND.HTTP_BODY_OBJECT),
+            @WebApiParam(name = "businessKey", title = "The business key is a unique, user defined reference to the newly created process instance that can be used in future queries", kind=ResourceParameter.KIND.HTTP_BODY_OBJECT),
+            @WebApiParam(name = "variables", title = "A set of process instance variables that will be set on the new process instance", kind=ResourceParameter.KIND.HTTP_BODY_OBJECT),
+            @WebApiParam(name = "items", title = "A list of nodes in the repository that will be associated with this process instance", kind=ResourceParameter.KIND.HTTP_BODY_OBJECT),
+            })
+    public List<ProcessInfo> create(List<ProcessInfo> entity, Parameters parameters)
+    {
+        List<ProcessInfo> result = new ArrayList<ProcessInfo>(entity.size());
+        for (ProcessInfo process : entity)
+        {
+           result.add(processes.create(process));
+        }
+        return result;
+    }
+
+    @Override
+    @WebApiDescription(title = "Get Process Instances", description = "Get information for the process instances")
+    @WebApiParameters(value = { @WebApiParam(name = "where", title = "Where parameter to define the process query", kind=ResourceParameter.KIND.QUERY_STRING)})
+    public CollectionWithPagingInfo<ProcessInfo> readAll(Parameters params)
+    {
+        return processes.getProcesses(params);
+    }
+    
+    @Override
+    @WebApiDescription(title = "Get a process instance image", description = "Get a process instance image")
+    @BinaryProperties({"image"})
+    public BinaryResource readProperty(String entityId, Parameters parameters) throws EntityNotFoundException
+    {
+        return processes.getProcessImage(entityId);
+    }
+
+    @Override
+    public ProcessInfo readById(String id, Parameters parameters) throws EntityNotFoundException
+    {
+        return processes.getProcess(id);
+    }
+
+    @Override
+    public void delete(String id, Parameters parameters)
+    {
+        processes.deleteProcess(id);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/package-info.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/package-info.java
new file mode 100644
index 00000000000..b0d7fb13705
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/processes/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="workflow", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.workflow.api.processes;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TaskCandidatesRelation.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TaskCandidatesRelation.java
new file mode 100644
index 00000000000..3f3754736bc
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TaskCandidatesRelation.java
@@ -0,0 +1,66 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tasks;
+
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.Tasks;
+import org.alfresco.rest.workflow.api.model.TaskCandidate;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * 
+ * @author Tijs Rademakers
+ *
+ */
+@RelationshipResource(name = "candidates", entityResource = TasksRestEntityResource.class, title = "Candidates for the current task")
+public class TaskCandidatesRelation implements RelationshipResourceAction.Read<TaskCandidate>
+{
+    private static final Log logger = LogFactory.getLog(TaskCandidatesRelation.class);
+
+    private Tasks tasks;
+
+	public void setTasks(Tasks tasks)
+	{
+		this.tasks = tasks;
+	}
+
+    /**
+     * List the tasks candidate users and groups.
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Read#readAll(java.lang.String, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+    @Override
+    @WebApiDescription(title = "Get Task Candidate Users and Groups", description = "Get a paged list of the the task candidate users and groups")
+    public CollectionWithPagingInfo<TaskCandidate> readAll(String taskId, Parameters parameters)
+    {
+        return tasks.getTaskCandidates(taskId, parameters.getPaging());
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TaskFormModelRelation.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TaskFormModelRelation.java
new file mode 100644
index 00000000000..c6dd0bcdd39
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TaskFormModelRelation.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tasks;
+
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.Tasks;
+import org.alfresco.rest.workflow.api.model.FormModelElement;
+
+/**
+ * 
+ * @author Frederik Heremans
+ *
+ */
+@RelationshipResource(name = "task-form-model", entityResource = TasksRestEntityResource.class, title = "Model for the task's form")
+public class TaskFormModelRelation implements RelationshipResourceAction.Read<FormModelElement>
+{
+    private Tasks tasks;
+
+	public void setTasks(Tasks tasks)
+	{
+		this.tasks = tasks;
+	}
+
+    @Override
+    public CollectionWithPagingInfo<FormModelElement> readAll(String entityResourceId,
+                Parameters params)
+    {
+        return tasks.getTaskFormModel(entityResourceId, params.getPaging());
+    }
+
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TaskItemsRelation.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TaskItemsRelation.java
new file mode 100644
index 00000000000..3a5bea2c746
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TaskItemsRelation.java
@@ -0,0 +1,89 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tasks;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.Tasks;
+import org.alfresco.rest.workflow.api.model.Item;
+
+/**
+ * 
+ * @author Frederik Heremans
+ *
+ */
+@RelationshipResource(name = "items", entityResource = TasksRestEntityResource.class, title = "The items attached to a task")
+public class TaskItemsRelation implements RelationshipResourceAction.ReadById<Item>, RelationshipResourceAction.Read<Item>, RelationshipResourceAction.Create<Item>, RelationshipResourceAction.Delete
+{
+    private Tasks tasks;
+
+    public void setTasks(Tasks tasks)
+    {
+        this.tasks = tasks;
+    }
+    
+	@Override
+    public Item readById(String taskId, String itemId, Parameters parameters) throws RelationshipResourceNotFoundException
+    {
+        return tasks.getItem(taskId, itemId);
+    }
+
+    /**
+     * List the attached items.
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Read#readAll(java.lang.String, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+    @Override
+    @WebApiDescription(title = "Get the attached items of a Task", description = "Get a paged list of all the items")
+    public CollectionWithPagingInfo<Item> readAll(String taskId, Parameters parameters)
+    {
+        return tasks.getItems(taskId, parameters.getPaging());
+    }
+
+    @Override
+    public List<Item> create(String taskId, List<Item> entity, Parameters parameters)
+    {
+        List<Item> result = new ArrayList<Item>(entity.size());
+        for (Item item : entity)
+        {
+           result.add(tasks.createItem(taskId, item));
+        }
+        return result;
+    }
+    
+    @Override
+    public void delete(String taskId, String itemId, Parameters parameters)
+    {
+       tasks.deleteItem(taskId, itemId);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TaskVariablesRelation.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TaskVariablesRelation.java
new file mode 100644
index 00000000000..b3c5f13612f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TaskVariablesRelation.java
@@ -0,0 +1,107 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tasks;
+
+import java.util.List;
+
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.workflow.api.Tasks;
+import org.alfresco.rest.workflow.api.impl.TaskVariablesWalkerCallback;
+import org.alfresco.rest.workflow.api.model.TaskVariable;
+import org.alfresco.rest.workflow.api.model.VariableScope;
+
+/**
+ * 
+ * @author Tijs Rademakers
+ *
+ */
+@RelationshipResource(name = "variables", entityResource = TasksRestEntityResource.class, title = "Variables for the current task")
+public class TaskVariablesRelation implements RelationshipResourceAction.Read<TaskVariable>, RelationshipResourceAction.Create<TaskVariable>,
+    RelationshipResourceAction.Update<TaskVariable>, RelationshipResourceAction.Delete
+{
+    private Tasks tasks;
+
+	public void setTasks(Tasks tasks)
+	{
+		this.tasks = tasks;
+	}
+
+    /**
+     * List the tasks variables.
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Read#readAll(java.lang.String, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
+    @Override
+    @WebApiDescription(title = "Get Task Variables", description = "Get a paged list of the task variables")
+    public CollectionWithPagingInfo<TaskVariable> readAll(String taskId, Parameters parameters)
+    {
+        VariableScope scope = VariableScope.ANY;
+        if(parameters.getQuery() != null)
+        {
+            TaskVariablesWalkerCallback callback = new TaskVariablesWalkerCallback();
+            QueryHelper.walk(parameters.getQuery(), callback);
+            
+            scope = callback.getScope();
+        }
+        return tasks.getTaskVariables(taskId, parameters.getPaging(), scope);
+    }
+    
+    /**
+     * Creates or updates multiple task variables. If the variable name doesn't exist yet it will be created
+     */
+    @Override
+    @WebApiDescription(title = "Create or Update Variables", description = "Create or update multiple variable")
+    public List<TaskVariable> create(String taskId, List<TaskVariable> variables, Parameters parameters)
+    {
+        return tasks.updateTaskVariables(taskId, variables);
+    }
+
+    /**
+     * Update a task variable. If the variable name doesn't exist yet it will be created
+     */
+    @Override
+    @WebApiDescription(title = "Update Task Variable", description = "Update a task variable")
+    public TaskVariable update(String taskId, TaskVariable entity, Parameters parameters)
+    {
+        return tasks.updateTaskVariable(taskId, entity);
+    }
+
+    /**
+     * Delete a task variable. If the variable name doesn't exist the delete call throws an exception.
+     */
+    @Override
+    @WebApiDescription(title = "Delete Task Variable", description = "Delete a task variable")
+    public void delete(String entityResourceId, String id, Parameters parameters)
+    {
+        tasks.deleteTaskVariable(entityResourceId, id);
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TasksRestEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TasksRestEntityResource.java
new file mode 100644
index 00000000000..fd0c80d9efb
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/TasksRestEntityResource.java
@@ -0,0 +1,85 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tasks;
+
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.WebApiParameters;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.workflow.api.Tasks;
+import org.alfresco.rest.workflow.api.model.Task;
+
+@EntityResource(name="tasks", title = "Tasks")
+public class TasksRestEntityResource implements EntityResourceAction.Read<Task>, 
+                                                           EntityResourceAction.ReadById<Task>, EntityResourceAction.Update<Task> {
+
+    Tasks tasks;
+    
+    public void setTasks(Tasks tasks)
+    {
+        this.tasks = tasks;
+    }
+
+    @Override
+    @WebApiDescription(title = "Get Tasks", description = "Get information for tasks")
+    @WebApiParameters(value = { 
+            @WebApiParam(name = "status", title = "The status of the task", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "assignee", title = "The assignee of the task", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "owner", title = "The owner of the task", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "candidateUser", title = "A candidate user of the task, only returns unassigned tasks. Can only be used toghether with status parameter set to 'active'", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "candidateGroup", title = "A candidate group of the task, only returns unassigned tasks. Can only be used toghether with status parameter set to 'active'", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "name", title = "The name of the task", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "description", title = "The description of the task", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "priority", title = "The priotiry of the task", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "processInstanceId", title = "The id of the process instance this task is part of", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "processInstanceBusinessKey", title = "The unique business key of the process instance this task is part of", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "startedAt", title = "The date the task was creates/started", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "dueAt", title = "The date the task is due", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "activityDefinitionId", title = "The id of the activity definition in the process", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "processDefinitionId", title = "The id of the process definition for the process this task is part of", kind=ResourceParameter.KIND.QUERY_STRING),
+            @WebApiParam(name = "processDefinitionName", title = "The name of the process definition for the process this task is part of", kind=ResourceParameter.KIND.QUERY_STRING)})
+    public CollectionWithPagingInfo<Task> readAll(Parameters params)
+    {
+        return tasks.getTasks(params);
+    }
+
+    @Override
+    public Task readById(String id, Parameters parameters) throws EntityNotFoundException
+    {
+        return tasks.getTask(id);
+    }
+
+    @Override
+    public Task update(String id, Task entity, Parameters parameters)
+    {
+        return tasks.update(id, entity, parameters);
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/package-info.java b/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/package-info.java
new file mode 100644
index 00000000000..ab59030ef36
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/tasks/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="workflow", scope=Api.SCOPE.PUBLIC, version=1)
+package org.alfresco.rest.workflow.api.tasks;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java
new file mode 100644
index 00000000000..f433c0dbf25
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.web.app.servlet;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.servlet.ServletContext;
+
+import org.alfresco.web.scripts.servlet.X509ServletFilterBase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * The AlfrescoX509ServletFilter implements the checkEnforce method of the X509ServletFilterBase.
+ * This allows the configuration of X509 authentication to be toggled on/off through a
+ * configuration outside of the web.xml.
+ **/
+
+public class AlfrescoX509ServletFilter extends X509ServletFilterBase
+{
+    private static final String BEAN_GLOBAL_PROPERTIES = "global-properties";
+    private static final String SECURE_COMMS = "solr.secureComms";
+
+    private static Log logger = LogFactory.getLog(AlfrescoX509ServletFilter.class);
+
+    @Override
+    protected boolean checkEnforce(ServletContext servletContext) throws IOException
+    {
+        /*
+        * Get the secureComms setting from the global properties bean.
+        */
+
+        WebApplicationContext wc = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
+        Properties globalProperties = (Properties) wc.getBean(BEAN_GLOBAL_PROPERTIES);
+        String prop = globalProperties.getProperty(SECURE_COMMS);
+
+        if(logger.isDebugEnabled())
+        {
+            logger.debug("secureComms:"+prop);
+        }
+
+        /*
+         * Return true or false based on the property. This will switch on/off X509 enforcement in the X509ServletFilterBase.
+         */
+
+        if (prop == null || "none".equals(prop))
+        {
+            return false;
+        }
+        else
+        {
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/CORSContextListener.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/CORSContextListener.java
new file mode 100644
index 00000000000..01cb4958d1a
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/CORSContextListener.java
@@ -0,0 +1,99 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.web.app.servlet;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import javax.servlet.DispatcherType;
+import javax.servlet.FilterRegistration;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import java.util.EnumSet;
+import java.util.Properties;
+
+/**
+ * The CORSContextListener adds the Tomcat CORS filter org.apache.catalina.filters.CorsFilter which allows to enable/disable and configure Cross-Origin Resource Sharing (CORS) with alfresco properties.
+ */
+public class CORSContextListener implements ServletContextListener
+{
+    private static final String BEAN_GLOBAL_PROPERTIES = "global-properties";
+    private static final String CORS_ENABLED = "cors.enabled";
+    private static final String CORS_ALLOWED_ORIGINS = "cors.allowed.origins";
+    private static final String CORS_ALLOWED_METHODS = "cors.allowed.methods";
+    private static final String CORS_ALLOWED_HEADERS = "cors.allowed.headers";
+    private static final String CORS_EXPOSED_HEADERS = "cors.exposed.headers";
+    private static final String CORS_SUPPORT_CREDENTIALS = "cors.support.credentials";
+    private static final String CORS_PREFLIGHT_CREDENTIALS = "cors.preflight.maxage";
+
+    private Log logger = LogFactory.getLog(getClass());
+
+    private final EnumSet<DispatcherType> DISPATCHER_TYPE = EnumSet
+            .of(DispatcherType.REQUEST, DispatcherType.FORWARD, DispatcherType.ASYNC);
+
+    @Override
+    public void contextInitialized(ServletContextEvent sce)
+    {
+        ServletContext servletContext = sce.getServletContext();
+        initCORS(servletContext);
+    }
+
+    /**
+     * Initializes CORS filter
+     */
+    private void initCORS(ServletContext servletContext)
+    {
+        WebApplicationContext wc = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
+
+        Properties gP = (Properties) wc.getBean(BEAN_GLOBAL_PROPERTIES);
+        Boolean corsEnabled = new Boolean(gP.getProperty(CORS_ENABLED));
+
+        if(logger.isDebugEnabled())
+        {
+            logger.debug("CORS filter is" + (corsEnabled?" ":" not ") + "enabled");
+        }
+        if (corsEnabled)
+        {
+            FilterRegistration.Dynamic corsFilter = servletContext.addFilter("CorsFilter", "org.apache.catalina.filters.CorsFilter");
+            corsFilter.setInitParameter(CORS_ALLOWED_ORIGINS, gP.getProperty(CORS_ALLOWED_ORIGINS));
+            corsFilter.setInitParameter(CORS_ALLOWED_METHODS, gP.getProperty(CORS_ALLOWED_METHODS));
+            corsFilter.setInitParameter(CORS_ALLOWED_HEADERS, gP.getProperty(CORS_ALLOWED_HEADERS));
+            corsFilter.setInitParameter(CORS_EXPOSED_HEADERS, gP.getProperty(CORS_EXPOSED_HEADERS));
+            corsFilter.setInitParameter(CORS_SUPPORT_CREDENTIALS, gP.getProperty(CORS_SUPPORT_CREDENTIALS));
+            corsFilter.setInitParameter(CORS_PREFLIGHT_CREDENTIALS, gP.getProperty(CORS_PREFLIGHT_CREDENTIALS));
+            corsFilter.addMappingForUrlPatterns(DISPATCHER_TYPE, false, "/*");
+        }
+    }
+
+    @Override
+    public void contextDestroyed(ServletContextEvent sce)
+    {
+
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/ClearSecurityContextFilter.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/ClearSecurityContextFilter.java
new file mode 100644
index 00000000000..3e1563a4693
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/ClearSecurityContextFilter.java
@@ -0,0 +1,143 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.web.app.servlet;
+
+import net.sf.acegisecurity.context.Context;
+import net.sf.acegisecurity.context.ContextHolder;
+import org.alfresco.repo.security.authentication.AlfrescoSecureContext;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+public class ClearSecurityContextFilter implements Filter
+{
+    private Log logger = LogFactory.getLog(getClass());
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException
+    {
+        try
+        {
+            chain.doFilter(servletRequest, servletResponse);
+        }
+        finally
+        {
+            logClearContextInfo(servletRequest);
+            AuthenticationUtil.clearCurrentSecurityContext();
+        }
+    }
+
+    private void logClearContextInfo(ServletRequest servletRequest)
+    {
+        if (!logger.isDebugEnabled())
+        {
+            return;
+        }
+
+        try
+        {
+            // print information about the request and leaked context
+            String identifiedUserName = null;
+            final String fullyAuthenticatedUser = AuthenticationUtil.getFullyAuthenticatedUser();
+            final Context context = ContextHolder.getContext();
+
+            if (context instanceof AlfrescoSecureContext)
+            {
+                AlfrescoSecureContext sc = (AlfrescoSecureContext) context;
+                identifiedUserName = AuthenticationUtil.getMaskedUsername(sc.getRealAuthentication());
+            }
+            if (context == null && fullyAuthenticatedUser == null)
+            {
+                // nothing unusual to log
+                return;
+            }
+
+            final String newLine = System.lineSeparator();
+            String url = null;
+            if (servletRequest instanceof HttpServletRequest)
+            {
+                url = ((HttpServletRequest) servletRequest).getRequestURL().toString();
+            }
+
+            StringBuilder sb = new StringBuilder();
+            sb.append("When clearing out the context for request: ");
+            sb.append(url);
+            sb.append(newLine);
+
+            sb.append("There was some information still present in the security context for this thread: ");
+            sb.append(Thread.currentThread().getName());
+            sb.append(newLine);
+
+            if (context != null)
+            {
+                if (identifiedUserName != null)
+                {
+                    sb.append("Real authenticated user found: " + AuthenticationUtil.maskUsername(identifiedUserName));
+                    sb.append(newLine);
+                }
+                else
+                {
+                    sb.append("ContextHolder was not null");
+                    sb.append(newLine);
+                }
+            }
+            if (fullyAuthenticatedUser != null)
+            {
+                sb.append("Fully authenticated user found: " + AuthenticationUtil.maskUsername(fullyAuthenticatedUser));
+                sb.append(newLine);
+            }
+            sb.append("Other information about leaking ticket and tenant information may follow in the log, "
+                + "if org.alfresco.repo.security.authentication.InMemoryTicketComponentImpl "
+                + "and org.alfresco.repo.tenant.TenantContextHolder loggers are set to 'trace'");
+            sb.append(newLine);
+
+            logger.debug(sb.toString());
+        }
+        catch (Exception e)
+        {
+            logger.debug("Error building proper logging message:" + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public void init(FilterConfig config) throws ServletException
+    {
+    }
+
+    @Override
+    public void destroy()
+    {
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java
new file mode 100644
index 00000000000..4a2bfabae39
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java
@@ -0,0 +1,145 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.web.app.servlet;
+
+import java.io.IOException;
+import java.util.Locale;
+import java.util.StringTokenizer;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * @author Stas Sokolovsky
+ * 
+ * Servlet filter responsible for setting a fallback default locale for ALL requests. 
+ */
+public class GlobalLocalizationFilter implements Filter
+{
+    /**
+     * Run the filter
+     * 
+     * @param request ServletRequest
+     * @param response ServletResponse
+     * @param chain FilterChain
+     * @exception IOException
+     * @exception ServletException
+     */
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
+    {
+        // Clear content locale from this thread (it may be set later)
+        I18NUtil.setContentLocale(null);
+
+        setLanguageFromRequestHeader((HttpServletRequest) request);        
+
+        // continue filter chaining
+        chain.doFilter(request, new HttpServletResponseWrapper((HttpServletResponse) response){
+
+            /* (non-Javadoc)
+             * @see javax.servlet.ServletResponseWrapper#setContentType(java.lang.String)
+             */
+            @Override
+            public void setContentType(String type)
+            {
+                super.setContentType(type);
+
+                // Parse the parameters of the media type, since some app servers (Websphere) refuse to pay attention if the
+                // character encoding isn't explicitly set
+                int startIndex = type.indexOf(';') + 1;
+                int length = type.length();
+                while (startIndex != 0 && startIndex < length)
+                {
+                  int endIndex = type.indexOf(';', startIndex);
+                  if (endIndex == -1)
+                  {
+                      endIndex = length;
+                  }
+                  String param = type.substring(startIndex, endIndex);
+                  int sepIndex = param.indexOf('=');
+                  if (sepIndex != -1)
+                  {
+                      String name = param.substring(0, sepIndex).trim();
+                      if (name.equalsIgnoreCase("charset"))
+                      {
+                          String charset = param.substring(sepIndex + 1).trim();
+                          if ((null != charset) && ((charset.startsWith("\"") && charset.endsWith("\"")) || (charset.startsWith("'") && charset.endsWith("'"))))
+                          {
+                              charset = charset.substring(1, (charset.length() - 1));
+                          }
+                          setCharacterEncoding(charset);
+                          break;
+                      }
+                  }
+                  startIndex = endIndex + 1;
+                }                        
+            }
+        });
+
+    }
+
+    /**
+     * Apply Client and Repository language locale based on the 'Accept-Language' request header
+     *
+     * @param req HttpServletRequest
+     */
+    public void setLanguageFromRequestHeader(HttpServletRequest req)
+    {
+        Locale locale = null;
+
+        String acceptLang = req.getHeader("Accept-Language");
+        if (acceptLang != null && acceptLang.length() > 0)
+        {
+            StringTokenizer tokenizer = new StringTokenizer(acceptLang, ",; ");
+            // get language and convert to java locale format
+            String language = tokenizer.nextToken().replace('-', '_');
+            locale = I18NUtil.parseLocale(language);
+            I18NUtil.setLocale(locale);
+        }
+        else
+        {
+            I18NUtil.setLocale(Locale.getDefault());
+        }
+    }
+
+    public void init(FilterConfig filterConfig) throws ServletException
+    {
+        // Nothing to do        
+    }
+
+    public void destroy()
+    {
+        // Nothing to do
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/HTTPProxy.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/HTTPProxy.java
new file mode 100644
index 00000000000..1785a6c2e5f
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/HTTPProxy.java
@@ -0,0 +1,155 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.web.app.servlet;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * Simple server-side HTTP Request / Response
+ * 
+ * @author davidc
+ */
+public class HTTPProxy
+{
+    protected URL url;
+    protected HttpServletResponse response;
+
+    
+    /**
+     * Construct
+     * 
+     * @param requestUrl  url to request
+     * @param response  response to write request back to
+     * @throws MalformedURLException
+     */
+    public HTTPProxy(String requestUrl, HttpServletResponse response)
+        throws MalformedURLException
+    {
+        this.url = new URL(requestUrl);
+        this.response = response;
+    }
+
+    /**
+     * Perform request
+     *  
+     * @throws IOException
+     */
+    public void service()
+        throws IOException
+    {
+        HttpURLConnection connection = (HttpURLConnection)url.openConnection();
+        setRequestHeaders(connection);
+        initialiseResponse(connection);
+        InputStream input = connection.getInputStream();
+        OutputStream output = response.getOutputStream();
+        try
+        {
+            writeResponse(input, output);
+        }
+        finally
+        {
+            try
+            {
+                if (input != null)
+                {
+                    input.close();
+                }
+                if (output != null)
+                {
+                    output.flush();
+                    output.close();
+                }
+                // TODO: required?
+                connection.disconnect();
+            }
+            catch(IOException e)
+            {
+               // TODO: log io exceptions?
+            }
+        }
+    }
+    
+    /**
+     * Initialise response
+     * 
+     * @param urlConnection  url connection
+     */
+    protected void initialiseResponse(URLConnection urlConnection)
+    {
+        String type = urlConnection.getContentType();
+        if (type != null)
+        {
+            int encodingIdx = type.lastIndexOf("charset=");
+            if (encodingIdx == -1)
+            {
+                String encoding = urlConnection.getContentEncoding();
+                if (encoding != null && encoding.length() > 0)
+                {
+                    type += ";charset=" + encoding;
+                }
+            }
+            
+            response.setContentType(type);
+        }
+    }
+    
+    /**
+     * Set request headers
+     *
+     * @param urlConnection  url connection
+     */
+    protected void setRequestHeaders(URLConnection urlConnection)
+    {
+    }
+
+    /**
+     * Write response
+     * 
+     * @param input  input stream of request
+     * @param output  output stream of response
+     * @throws IOException
+     */
+    protected void writeResponse(InputStream input, OutputStream output)
+        throws IOException
+    {
+        byte[] buffer = new byte[4096];
+        int read = input.read(buffer);
+        while (read != -1)
+        {
+            output.write(buffer, 0, read);
+            read = input.read(buffer);
+        }
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/HTTPProxyServlet.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/HTTPProxyServlet.java
new file mode 100644
index 00000000000..fac9650a020
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/HTTPProxyServlet.java
@@ -0,0 +1,135 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.web.app.servlet;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.extensions.surf.util.URLEncoder;
+
+
+/**
+ * HTTP Proxy Servlet
+ * 
+ * Provides the ability to submit a URL request via the Alfresco Server i.e.
+ * the Alfresco server acts as a proxy.
+ * 
+ * This servlet accepts:
+ * 
+ * /proxy?endpoint=<endpointUrl>[&<argName>=<argValue>]*
+ * 
+ * Where:
+ * 
+ * - endpointUrl is the URL to make a request against
+ * - argName is the name of a URL argument to append to the request
+ * - argValue is the value of URL argument
+ * 
+ * E.g.:
+ * 
+ * /proxy?endpoint=http://www.alfresco.com&arg1=value1&arg2=value2
+ * 
+ * @author davidc
+ */
+public class HTTPProxyServlet extends HttpServlet
+{
+    private static final long serialVersionUID = -576405943603122206L;
+    
+    private static final String PARAM_ENDPOINT = "endpoint";
+    
+    
+    /**
+     * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    protected void doGet(HttpServletRequest req, HttpServletResponse res)
+            throws ServletException, IOException
+    {
+        String endpoint = null;
+        StringBuilder args = new StringBuilder(32);
+        
+        Map<String, String[]> parameters = req.getParameterMap();
+        for (Map.Entry<String, String[]> parameter : parameters.entrySet())
+        {
+            String[] values = parameter.getValue();
+            int startIdx = 0;
+            
+            if (parameter.getKey().equals(PARAM_ENDPOINT) && values.length != 0)
+            {
+                endpoint = values[0];
+                startIdx++;
+            }
+            
+            for (int i = startIdx; i < values.length; i++)
+            {
+                if (args.length() != 0)
+                {
+                    args.append("&");
+                }
+                args.append(parameter.getKey()).append('=').append(URLEncoder.encode(values[i]));
+            }
+        }
+        
+        if (endpoint == null || endpoint.length() == 0)
+        {
+            throw new IllegalArgumentException("endpoint argument not specified");
+        }
+        
+        String url = endpoint + ((args.length() == 0) ? "" : "?" + args.toString());
+        HTTPProxy proxy = new HTTPProxy(url, res);
+        proxy.service();
+    }
+
+    /**
+     * Construct a "proxied" URL
+     * 
+     * Note: the "proxied" URL is a relative url - it is assumed that the servlet path is /proxy
+     * 
+     * @param url  the URL to proxy
+     * @return  the "proxied" url
+     */
+    public static String createProxyUrl(String url)
+    {
+        String proxy = "/proxy";
+        if (url != null && url.length() > 0)
+        {
+            int argIndex = url.lastIndexOf("?");
+            if (argIndex == -1)
+            {
+                proxy += "?endpoint=" + url;
+            }
+            else
+            {
+                proxy += "?endpoint=" + url.substring(0, argIndex) + "&" + url.substring(argIndex + 1);
+            }
+        }
+        
+        return proxy;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java
new file mode 100644
index 00000000000..6479be48c16
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java
@@ -0,0 +1,109 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.web.app.servlet;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.alfresco.repo.web.auth.WebCredentials;
+import org.alfresco.repo.webdav.auth.AuthenticationDriver;
+import org.alfresco.repo.webdav.auth.BaseKerberosAuthenticationFilter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Kerberos Authentication Filter Class
+ * 
+ * @author GKSpencer
+ */
+public class KerberosAuthenticationFilter extends BaseKerberosAuthenticationFilter
+{
+    // Debug logging
+    
+    private static Log logger = LogFactory.getLog(KerberosAuthenticationFilter.class);
+  
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.webdav.auth.BaseKerberosAuthenticationFilter#init()
+     */
+    @Override
+    protected void init() throws ServletException
+    {
+        // Call the base Kerberos filter initialization
+        super.init();
+
+        // Use the web client user attribute name
+        setUserAttributeName(AuthenticationDriver.AUTHENTICATION_USER);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#onValidateFailed(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.http.HttpSession)
+     */
+    @Override
+    protected void onValidateFailed(ServletContext sc, HttpServletRequest req, HttpServletResponse res, HttpSession session, WebCredentials credentials)
+        throws IOException
+    {
+        super.onValidateFailed(sc, req, res, session, credentials);
+        
+        // Redirect to the login page if user validation fails
+    	redirectToLoginPage(req, res);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#writeLoginPageLink(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    @Override
+    protected void writeLoginPageLink(ServletContext context, HttpServletRequest req, HttpServletResponse resp)
+            throws IOException
+    {
+        resp.setContentType("text/html; charset=UTF-8");
+        resp.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+        
+        try (PrintWriter out = resp.getWriter())
+        {
+            out.println("<html><head>");
+            // Removed the auto refresh to avoid refresh loop, MNT-16931
+            // Removed the link to the login page, MNT-20200
+            out.println("</head><body><p>Login failed. Please try again.</p>");
+            out.println("</body></html>");
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.webdav.auth.BaseNTLMAuthenticationFilter#getLogger()
+     */
+    @Override
+    final protected Log getLogger()
+    {
+        return logger;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/WebScriptSSOAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/WebScriptSSOAuthenticationFilter.java
new file mode 100644
index 00000000000..7e2ca0311bf
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/WebScriptSSOAuthenticationFilter.java
@@ -0,0 +1,135 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.web.app.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+import org.alfresco.repo.management.subsystems.ActivateableBean;
+import org.alfresco.repo.web.filter.beans.DependencyInjectedFilter;
+import org.alfresco.repo.webdav.auth.BaseAuthenticationFilter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.URLDecoder;
+import org.springframework.extensions.webscripts.Description.RequiredAuthentication;
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.RuntimeContainer;
+
+/**
+ * WebScript aware Authentication Filter Class. Takes into account the authentication setting in the descriptor for the
+ * webscript before chaining to the downstream authentication filters. If authentication is not required then chains
+ * with the NO_AUTH_REQUIRED request attribute set, which should cause any downstream authentication filter to bypass
+ * authentication checks.
+ * 
+ * @author Kevin Roast
+ * @author dward
+ */
+public class WebScriptSSOAuthenticationFilter extends BaseAuthenticationFilter implements DependencyInjectedFilter,
+        ActivateableBean
+{
+    private static final Log logger = LogFactory.getLog(WebScriptSSOAuthenticationFilter.class);
+    private RuntimeContainer container;        
+    private boolean isActive = true;
+
+    /**
+     * @param container the container to set
+     */
+    public void setContainer(RuntimeContainer container)
+    {
+        this.container = container;
+    }
+   
+    /**
+     * Activates or deactivates the bean
+     * 
+     * @param active
+     *            <code>true</code> if the bean is active and initialization should complete
+     */
+    public final void setActive(boolean active)
+    {
+        this.isActive = active;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.repo.management.subsystems.ActivateableBean#isActive()
+     */
+    public final boolean isActive()
+    {
+        return isActive;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.webdav.auth.BaseNTLMAuthenticationFilter#doFilter(javax.servlet.ServletContext, javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
+     */
+    public void doFilter(ServletContext context, ServletRequest sreq, ServletResponse sresp, FilterChain chain)
+            throws IOException, ServletException
+    {
+        // Get the HTTP request/response
+        HttpServletRequest req = (HttpServletRequest)sreq;
+        
+        // find a webscript match for the requested URI
+        String requestURI = req.getRequestURI();
+        String pathInfo = requestURI.substring((req.getContextPath() + req.getServletPath()).length());
+
+        if (getLogger().isTraceEnabled())
+        {
+            getLogger().trace("Processing request: " + requestURI + " SID:" + (req.getSession(false) != null ? req.getSession().getId() : null));
+        }
+        
+        Match match = container.getRegistry().findWebScript(req.getMethod(), URLDecoder.decode(pathInfo));
+        if (match != null && match.getWebScript() != null)
+        {
+            // check the authentication required - if none then we don't want any of
+            // the filters down the chain to require any authentication checks
+            if (RequiredAuthentication.none == match.getWebScript().getDescription().getRequiredAuthentication())
+            {
+                if (getLogger().isDebugEnabled())
+                {
+                    getLogger().debug("Found webscript with no authentication - set NO_AUTH_REQUIRED flag.");
+                }
+                req.setAttribute(NO_AUTH_REQUIRED, Boolean.TRUE);
+            }
+        }
+
+        chain.doFilter(sreq, sresp);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.webdav.auth.BaseAuthenticationFilter#getLogger()
+     */
+    @Override
+    protected Log getLogger()
+    {
+        return logger;
+    }
+}
diff --git a/remote-api/src/main/java/org/alfresco/web/app/servlet/WebscriptCookieAuthenticationFilter.java b/remote-api/src/main/java/org/alfresco/web/app/servlet/WebscriptCookieAuthenticationFilter.java
new file mode 100644
index 00000000000..4844ccfab5d
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/web/app/servlet/WebscriptCookieAuthenticationFilter.java
@@ -0,0 +1,87 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.web.app.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.web.filter.beans.DependencyInjectedFilter;
+import org.alfresco.repo.webdav.auth.AuthenticationDriver;
+import org.alfresco.repo.webdav.auth.BaseAuthenticationFilter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * WebScript aware Authentication Filter. Directly handles login script calls, allowing Surf to establish a cookie
+ * for a manual login, rather than the usual stateless ticket based logins.
+ * <p>
+ * This functionality has been extracted from the WebScriptSSOAuthenticationFilter so that they can work independently.
+ * 
+ * @author Gethin James
+ */
+public class WebscriptCookieAuthenticationFilter extends BaseAuthenticationFilter implements DependencyInjectedFilter
+{
+    private static final Log logger = LogFactory.getLog(WebscriptCookieAuthenticationFilter.class);
+    private static final String API_LOGIN = "/api/login";
+    
+    public WebscriptCookieAuthenticationFilter()
+    {
+        setUserAttributeName(AuthenticationDriver.AUTHENTICATION_USER);
+    }
+
+    
+    @Override
+    public void doFilter(ServletContext context, ServletRequest sreq, ServletResponse sresp, FilterChain chain) throws IOException, ServletException
+    {
+        // Get the HTTP request/response
+        HttpServletRequest req = (HttpServletRequest)sreq;
+        HttpServletResponse res = (HttpServletResponse)sresp;
+        
+        // Allow propagation of manual logins to the session user
+        if (API_LOGIN.equals(req.getPathInfo()) && req.getMethod().equalsIgnoreCase("POST"))
+        {
+            handleLoginForm(req, res);
+        }
+        else
+        {
+            chain.doFilter(sreq, sresp);
+        }
+    }
+    
+    @Override
+    protected Log getLogger()
+    {
+        return logger;
+    }
+
+}
diff --git a/remote-api/src/main/java/org/alfresco/web/scripts/WebScriptUtils.java b/remote-api/src/main/java/org/alfresco/web/scripts/WebScriptUtils.java
new file mode 100644
index 00000000000..ee2a7dbe2a8
--- /dev/null
+++ b/remote-api/src/main/java/org/alfresco/web/scripts/WebScriptUtils.java
@@ -0,0 +1,132 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.web.scripts;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.alfresco.repo.jscript.ScriptUtils;
+import org.alfresco.repo.web.scripts.RepositoryContainer;
+import org.alfresco.service.cmr.admin.RepoUsage;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.springframework.extensions.webscripts.WebScript;
+
+/**
+ * Override of the JavaScript API ScriptUtils bean "utilsScript" to provide additional
+ * Remote API methods using objects not available to base Repository project.
+ * <p>
+ * See "web-scripts-application-context.xml" for bean definition.
+ * 
+ * @since 4.2.0
+ * @since 5.1 (Moved to Remote API project)
+ * @author Kevin Roast
+ */
+public class WebScriptUtils extends ScriptUtils
+{
+    protected RepositoryContainer repositoryContainer;
+    
+    public void setRepositoryContainer(RepositoryContainer repositoryContainer)
+    {
+        this.repositoryContainer = repositoryContainer;
+    }
+    
+    /**
+     * Searches for webscript components with the given family name.
+     * 
+     * @param family        the family
+     * 
+     * @return An array of webscripts that match the given family name
+     */
+    public Object[] findWebScripts(String family)
+    {
+        List<Object> values = new ArrayList<Object>();
+        
+        for (WebScript webscript : this.repositoryContainer.getRegistry().getWebScripts())
+        {
+            if (family != null)
+            {
+                Set<String> familys = webscript.getDescription().getFamilys();
+                if (familys != null && familys.contains(family))
+                {
+                    values.add(webscript.getDescription());
+                }
+            }
+            else
+            {
+                values.add(webscript.getDescription());
+            }
+        }
+        
+        return values.toArray(new Object[values.size()]);
+    }
+    
+    public String getHostAddress()
+    {
+        try
+        {
+            return InetAddress.getLocalHost().getHostAddress();
+        }
+        catch (UnknownHostException e)
+        {
+            return "Unknown";
+        }
+    }
+    
+    public String getHostName()
+    {
+        try
+        {
+            return InetAddress.getLocalHost().getHostName();
+        }
+        catch (UnknownHostException e)
+        {
+            return "Unknown";
+        }
+    }
+    
+    public RepoUsage getRestrictions()
+    {
+        return this.services.getRepoAdminService().getRestrictions();
+    }
+    
+    public RepoUsage getUsage()
+    {
+        return this.services.getRepoAdminService().getUsage();
+    }
+    
+    /**
+     * Gets the list of repository stores
+     * 
+     * @return stores
+     */
+    public List<StoreRef> getStores()
+    {
+        return this.services.getNodeService().getStores();
+    }
+}
diff --git a/remote-api/src/main/resources/alfresco/blogs/web-scripts-blog-context.xml b/remote-api/src/main/resources/alfresco/blogs/web-scripts-blog-context.xml
new file mode 100644
index 00000000000..c2b0334acf6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/blogs/web-scripts-blog-context.xml
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="abstractBlogWebScript" parent="webscript" abstract="true">
+       <property name="repository" ref="repositoryHelper"/>
+       <property name="blogService" ref="BlogService"/>
+       <property name="nodeService" ref="NodeService"/>
+       <property name="siteService" ref="SiteService"/>
+       <property name="serviceRegistry" ref="ServiceRegistry"/>
+       <property name="activityService" ref="activityService"/>
+    </bean>
+
+    <!-- repository/blogs/blog -->
+    <bean id="webscript.org.alfresco.repository.blogs.blog.blog.get"
+          class="org.alfresco.repo.web.scripts.blogs.blog.BlogGet"
+          parent="abstractBlogWebScript">
+    </bean>
+    
+    <bean id="webscript.org.alfresco.repository.blogs.blog.blog.put"
+          class="org.alfresco.repo.web.scripts.blogs.blog.BlogPut"
+          parent="abstractBlogWebScript">
+    </bean>
+    
+    
+    <!-- repository/blogs/post -->
+    <bean id="webscript.org.alfresco.repository.blogs.post.blog-post.delete"
+          class="org.alfresco.repo.web.scripts.blogs.post.BlogPostDelete"
+          parent="abstractBlogWebScript">
+    </bean>
+    
+    <bean id="webscript.org.alfresco.repository.blogs.post.blog-post.get"
+          class="org.alfresco.repo.web.scripts.blogs.post.BlogPostGet"
+          parent="abstractBlogWebScript">
+    </bean>
+    
+    
+    <!-- repository/blogs/posts -->
+    <bean id="webscript.org.alfresco.repository.blogs.posts.blog-posts.get"
+          class="org.alfresco.repo.web.scripts.blogs.posts.BlogPostsGet"
+          parent="abstractBlogWebScript">
+    </bean>
+    
+    <bean id="webscript.org.alfresco.repository.blogs.posts.blog-posts-mydrafts.get"
+          class="org.alfresco.repo.web.scripts.blogs.posts.BlogPostsMyDraftsGet"
+          parent="abstractBlogWebScript">
+    </bean>
+    
+    <bean id="webscript.org.alfresco.repository.blogs.posts.blog-posts-mypublished.get"
+          class="org.alfresco.repo.web.scripts.blogs.posts.BlogPostsMyPublishedGet"
+          parent="abstractBlogWebScript">
+    </bean>
+    
+    <bean id="webscript.org.alfresco.repository.blogs.posts.blog-posts-new.get"
+          class="org.alfresco.repo.web.scripts.blogs.posts.BlogPostsNewGet"
+          parent="abstractBlogWebScript">
+    </bean>
+    
+    <bean id="webscript.org.alfresco.repository.blogs.posts.blog-posts-per-month.get"
+          class="org.alfresco.repo.web.scripts.blogs.posts.BlogPostsPerMonthGet"
+          parent="abstractBlogWebScript">
+    </bean>
+    
+    <bean id="webscript.org.alfresco.repository.blogs.posts.blog-posts.post"
+          class="org.alfresco.repo.web.scripts.blogs.posts.BlogPostsPost"
+          parent="abstractBlogWebScript">
+        <property name="taggingService" ref="TaggingService"/>
+    </bean>
+</beans>
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console.properties b/remote-api/src/main/resources/alfresco/messages/admin-console.properties
new file mode 100644
index 00000000000..b5f2a8469ee
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=Admin Console
+admin-console.help=Help
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=Successfully saved values.
+
+admin-console.host=Host
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=Save
+admin-console.cancel=Cancel
+admin-console.enabled=Enabled
+admin-console.disabled=Disabled
+admin-console.true=True
+admin-console.false=False
+admin-console.yesno.true=Yes
+admin-console.yesno.false=No
+admin-console.close=Close
+admin-console.password.show=Show Password
+admin-console.password.hide=Hide Password
+admin-console.unavailable=Information is currently unavailable
+admin-console.not.installed=Not Installed
+
+admin-console.requesterror=We couldn't complete your request. Try again.
+
+# Admin Tool Group labels
+admin-console.tool.group.general=General
+admin-console.tool.group.support-tools=Support Tools
+admin-console.tool.group.consoles=Consoles
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=System Summary
+admin-console.tool.admin-communitysummary.description=Summary of general system information
+
+admin-console.tool.admin-tenantconsole.label=Tenant Console
+admin-console.tool.admin-tenantconsole.description=Command console for Tenant admin.
+
+admin-console.tool.admin-repoconsole.label=Model and Messages Console
+admin-console.tool.admin-repoconsole.description=Command console for Model and Messages admin.
+
+admin-console.tool.admin-workflowconsole.label=Workflow Console
+admin-console.tool.admin-workflowconsole.description=Command console for Workflow admin.
+
+admin-console.tool.admin-nodebrowser.label=Node Browser
+admin-console.tool.admin-nodebrowser.description=Repository Node Browser tool.
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_cs.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_cs.properties
new file mode 100644
index 00000000000..c25789f47a6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_cs.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=Konzole pro spr\u00e1vce
+admin-console.help=N\u00e1pov\u011bda
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=Hodnoty byly \u00fasp\u011b\u0161n\u011b ulo\u017eeny.
+
+admin-console.host=Hostitel
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=Ulo\u017eit
+admin-console.cancel=Zru\u0161it
+admin-console.enabled=Povoleno
+admin-console.disabled=Zak\u00e1z\u00e1no
+admin-console.true=Pravda
+admin-console.false=Nepravda
+admin-console.yesno.true=Ano
+admin-console.yesno.false=Ne
+admin-console.close=Zav\u0159\u00edt
+admin-console.password.show=Zobrazit heslo
+admin-console.password.hide=Skr\u00fdt heslo
+admin-console.unavailable=Informace nejsou moment\u00e1ln\u011b k\u00a0dispozici
+admin-console.not.installed=Nen\u00ed nainstalov\u00e1no
+
+admin-console.requesterror=V\u00e1\u0161 po\u017eadavek nebylo mo\u017en\u00e9 dokon\u010dit. Zkuste to znovu.
+
+# Admin Tool Group labels
+admin-console.tool.group.general=Obecn\u00e9
+admin-console.tool.group.support-tools=N\u00e1stroje podpory
+admin-console.tool.group.consoles=Konzole
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=P\u0159ehled syst\u00e9mu
+admin-console.tool.admin-communitysummary.description=P\u0159ehled obecn\u00fdch informac\u00ed o\u00a0syst\u00e9mu
+
+admin-console.tool.admin-tenantconsole.label=Konzole pro tenanty
+admin-console.tool.admin-tenantconsole.description=Konzole pro spr\u00e1vce umo\u017e\u0148uj\u00edc\u00ed ovl\u00e1d\u00e1n\u00ed tenanta.
+
+admin-console.tool.admin-repoconsole.label=Konzole pro modely a\u00a0zpr\u00e1vy
+admin-console.tool.admin-repoconsole.description=Konzole pro spr\u00e1vce umo\u017e\u0148uj\u00edc\u00ed ovl\u00e1d\u00e1n\u00ed model\u016f a\u00a0zpr\u00e1v.
+
+admin-console.tool.admin-workflowconsole.label=Konzole pro pracovn\u00ed postupy
+admin-console.tool.admin-workflowconsole.description=Konzole pro spr\u00e1vce umo\u017e\u0148uj\u00edc\u00ed ovl\u00e1d\u00e1n\u00ed pracovn\u00edch postup\u016f.
+
+admin-console.tool.admin-nodebrowser.label=Prohl\u00ed\u017ee\u010d uzlu
+admin-console.tool.admin-nodebrowser.description=N\u00e1stroj pro proch\u00e1zen\u00ed uzlu \u00falo\u017ei\u0161t\u011b.
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_da.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_da.properties
new file mode 100644
index 00000000000..56ef65033d3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_da.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=Administrationskonsol
+admin-console.help=Hj\u00e6lp
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=V\u00e6rdierne blev gemt.
+
+admin-console.host=V\u00e6rt
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=Gem
+admin-console.cancel=Annuller
+admin-console.enabled=Aktiveret
+admin-console.disabled=Deaktiveret
+admin-console.true=Sand
+admin-console.false=Falsk
+admin-console.yesno.true=Ja
+admin-console.yesno.false=Nej
+admin-console.close=Luk
+admin-console.password.show=Vis adgangskode
+admin-console.password.hide=Skjul adgangskode
+admin-console.unavailable=Oplysningerne er i \u00f8jeblikket ikke tilg\u00e6ngelige
+admin-console.not.installed=Ikke installeret
+
+admin-console.requesterror=Vi kunne ikke fuldf\u00f8re anmodningen. Pr\u00f8v igen.
+
+# Admin Tool Group labels
+admin-console.tool.group.general=Generel
+admin-console.tool.group.support-tools=Supportv\u00e6rkt\u00f8jer
+admin-console.tool.group.consoles=Konsoller
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=Systemoversigt
+admin-console.tool.admin-communitysummary.description=Oversigt over generelle systemoplysninger
+
+admin-console.tool.admin-tenantconsole.label=Tenant-konsol
+admin-console.tool.admin-tenantconsole.description=Kommandokonsol for tenant-administratoren.
+
+admin-console.tool.admin-repoconsole.label=Model- og meddelelseskonsol
+admin-console.tool.admin-repoconsole.description=Kommandokonsol for model- og meddelelsesadministratoren.
+
+admin-console.tool.admin-workflowconsole.label=Workflowkonsol
+admin-console.tool.admin-workflowconsole.description=Kommandokonsol for workflowadministratoren.
+
+admin-console.tool.admin-nodebrowser.label=Nodebrowser
+admin-console.tool.admin-nodebrowser.description=V\u00e6rkt\u00f8j til at finde lagernode.
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_de.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_de.properties
new file mode 100644
index 00000000000..d881bcca998
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_de.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=Administratorkonsole
+admin-console.help=Hilfe
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=Erfolgreich gespeicherte Werte.
+
+admin-console.host=Host
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=Speichern
+admin-console.cancel=Abbrechen
+admin-console.enabled=Aktiviert
+admin-console.disabled=Deaktiviert
+admin-console.true=Wahr
+admin-console.false=Falsch
+admin-console.yesno.true=Ja
+admin-console.yesno.false=Nein
+admin-console.close=Schlie\u00dfen
+admin-console.password.show=Passwort anzeigen
+admin-console.password.hide=Passwort ausblenden
+admin-console.unavailable=Information ist derzeit nicht verf\u00fcgbar
+admin-console.not.installed=Nicht installiert
+
+admin-console.requesterror=Die Anfrage konnte nicht durchgef\u00fchrt werden.
+
+# Admin Tool Group labels
+admin-console.tool.group.general=Allgemein
+admin-console.tool.group.support-tools=Support-Tools
+admin-console.tool.group.consoles=Konsolen
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=System-\u00dcbersicht
+admin-console.tool.admin-communitysummary.description=\u00dcbersicht \u00fcber allgemeine Systemangaben
+
+admin-console.tool.admin-tenantconsole.label=Mandanten-Konsole
+admin-console.tool.admin-tenantconsole.description=Befehlskonsole f\u00fcr Mandanten-Admin.
+
+admin-console.tool.admin-repoconsole.label=Modell- und Nachrichtenkonsole
+admin-console.tool.admin-repoconsole.description=Befehlskonsole f\u00fcr Modell- und Nachrichten-Admin.
+
+admin-console.tool.admin-workflowconsole.label=Konsole Arbeitsablauf
+admin-console.tool.admin-workflowconsole.description=Befehlskonsole f\u00fcr Arbeitsablauf-Admin.
+
+admin-console.tool.admin-nodebrowser.label=Node-Browser
+admin-console.tool.admin-nodebrowser.description=Repository-Node-Browser-Tool.
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_es.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_es.properties
new file mode 100644
index 00000000000..6614ea9123d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_es.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=Consola de administraci\u00f3n
+admin-console.help=Ayuda
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=Valores guardados correctamente.
+
+admin-console.host=Host
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=Guardar
+admin-console.cancel=Cancelar
+admin-console.enabled=Activado
+admin-console.disabled=Desactivado
+admin-console.true=Verdadero
+admin-console.false=Falso
+admin-console.yesno.true=S\u00ed
+admin-console.yesno.false=No
+admin-console.close=Cerrar
+admin-console.password.show=Mostrar contrase\u00f1a
+admin-console.password.hide=Ocultar contrase\u00f1a
+admin-console.unavailable=La informaci\u00f3n no est\u00e1 disponible en este momento
+admin-console.not.installed=No instalado
+
+admin-console.requesterror=No se ha podido realizar la solicitud.
+
+# Admin Tool Group labels
+admin-console.tool.group.general=General
+admin-console.tool.group.support-tools=Herramientas de soporte
+admin-console.tool.group.consoles=Consolas
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=Resumen del sistema
+admin-console.tool.admin-communitysummary.description=Resumen de informaci\u00f3n general del sistema
+
+admin-console.tool.admin-tenantconsole.label=Consola de inquilino
+admin-console.tool.admin-tenantconsole.description=Consola de comandos para administraci\u00f3n de inquilino.
+
+admin-console.tool.admin-repoconsole.label=Consola de mensajes y modelo
+admin-console.tool.admin-repoconsole.description=Consola de comandos para administraci\u00f3n de modelo y mensajes.
+
+admin-console.tool.admin-workflowconsole.label=Consola de flujos de trabajo
+admin-console.tool.admin-workflowconsole.description=Consola de comandos para administraci\u00f3n de flujo de trabajo.
+
+admin-console.tool.admin-nodebrowser.label=Navegador de nodos
+admin-console.tool.admin-nodebrowser.description=Herramienta de navegador de nodos de repositorio.
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_fi.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_fi.properties
new file mode 100644
index 00000000000..46439047723
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_fi.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=Hallintakonsoli
+admin-console.help=Ohje
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=Arvot tallennettiin.
+
+admin-console.host=Is\u00e4nt\u00e4
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=Tallenna
+admin-console.cancel=Peruuta
+admin-console.enabled=K\u00e4yt\u00f6ss\u00e4
+admin-console.disabled=Ei k\u00e4yt\u00f6ss\u00e4
+admin-console.true=Tosi
+admin-console.false=Ep\u00e4tosi
+admin-console.yesno.true=Kyll\u00e4
+admin-console.yesno.false=Ei
+admin-console.close=Sulje
+admin-console.password.show=N\u00e4yt\u00e4 salasana
+admin-console.password.hide=Piilota salasana
+admin-console.unavailable=Tiedot eiv\u00e4t ole juuri nyt saatavilla
+admin-console.not.installed=Ei asennettu
+
+admin-console.requesterror=Pyynn\u00f6n suorittaminen ei onnistu. Yrit\u00e4 uudelleen.
+
+# Admin Tool Group labels
+admin-console.tool.group.general=Yleiset
+admin-console.tool.group.support-tools=Tukity\u00f6kalut
+admin-console.tool.group.consoles=Konsolit
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=J\u00e4rjestelm\u00e4n yhteenveto
+admin-console.tool.admin-communitysummary.description=Yhteenveto yleisist\u00e4 j\u00e4rjestelm\u00e4tiedoista
+
+admin-console.tool.admin-tenantconsole.label=Tilaajakonsoli
+admin-console.tool.admin-tenantconsole.description=T\u00e4m\u00e4 on tilaajan j\u00e4rjestelm\u00e4nvalvojan komentokonsoli.
+
+admin-console.tool.admin-repoconsole.label=Malli- ja viestikonsoli
+admin-console.tool.admin-repoconsole.description=T\u00e4m\u00e4 on mallien ja viestien j\u00e4rjestelm\u00e4nvalvojan komentokonsoli.
+
+admin-console.tool.admin-workflowconsole.label=Ty\u00f6nkulkukonsoli
+admin-console.tool.admin-workflowconsole.description=T\u00e4m\u00e4 on ty\u00f6nkulkujen j\u00e4rjestelm\u00e4nvalvojan komentokonsoli.
+
+admin-console.tool.admin-nodebrowser.label=Solmuselain
+admin-console.tool.admin-nodebrowser.description=T\u00e4m\u00e4 on s\u00e4il\u00f6solmujen selain.
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_fr.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_fr.properties
new file mode 100644
index 00000000000..b3f44ff2ddf
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_fr.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=Console d'administration
+admin-console.help=Aide
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=Les valeurs ont bien \u00e9t\u00e9 enregistr\u00e9es.
+
+admin-console.host=H\u00f4te
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=Enregistrer
+admin-console.cancel=Annuler
+admin-console.enabled=Activ\u00e9
+admin-console.disabled=D\u00e9sactiv\u00e9
+admin-console.true=True
+admin-console.false=False
+admin-console.yesno.true=Oui
+admin-console.yesno.false=Non
+admin-console.close=Fermer
+admin-console.password.show=Afficher le mot de passe
+admin-console.password.hide=Masquer le mot de passe
+admin-console.unavailable=Informations actuellement indisponibles
+admin-console.not.installed=Pas install\u00e9
+
+admin-console.requesterror=Echec de la requ\u00eate.
+
+# Admin Tool Group labels
+admin-console.tool.group.general=G\u00e9n\u00e9ral
+admin-console.tool.group.support-tools=Outils de support
+admin-console.tool.group.consoles=Consoles
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=R\u00e9sum\u00e9 syst\u00e8me
+admin-console.tool.admin-communitysummary.description=R\u00e9sum\u00e9 des informations g\u00e9n\u00e9rales sur le syst\u00e8me
+
+admin-console.tool.admin-tenantconsole.label=Console de gestion des entrep\u00f4ts en colocation
+admin-console.tool.admin-tenantconsole.description=Console de commande pour l'administration de la gestion des entrep\u00f4ts en colocation.
+
+admin-console.tool.admin-repoconsole.label=Console des mod\u00e8les et messages
+admin-console.tool.admin-repoconsole.description=Console de commande pour l'administration des mod\u00e8les et messages.
+
+admin-console.tool.admin-workflowconsole.label=Console du workflow
+admin-console.tool.admin-workflowconsole.description=Console de commande pour l'administration du workflow.
+
+admin-console.tool.admin-nodebrowser.label=Navigateur de n\u0153uds
+admin-console.tool.admin-nodebrowser.description=Outil Navigateur de noeuds d'entrep\u00f4t.
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_it.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_it.properties
new file mode 100644
index 00000000000..dd914cc8135
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_it.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=Console di amministrazione
+admin-console.help=Aiuto
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=I valori sono stati salvati.
+
+admin-console.host=Host
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=Salva
+admin-console.cancel=Annulla
+admin-console.enabled=Abilitato
+admin-console.disabled=Disabilitato
+admin-console.true=Vero
+admin-console.false=Falso
+admin-console.yesno.true=S\u00ec
+admin-console.yesno.false=No
+admin-console.close=Chiudi
+admin-console.password.show=Mostra password
+admin-console.password.hide=Nascondi password
+admin-console.unavailable=Le informazioni non sono al momento disponibili
+admin-console.not.installed=Non installato
+
+admin-console.requesterror=Impossibile completare la richiesta.
+
+# Admin Tool Group labels
+admin-console.tool.group.general=Generale
+admin-console.tool.group.support-tools=Strumenti di supporto
+admin-console.tool.group.consoles=Console
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=Risorse di sistema
+admin-console.tool.admin-communitysummary.description=Riepilogo delle informazioni generali del sistema
+
+admin-console.tool.admin-tenantconsole.label=Console dei tenant
+admin-console.tool.admin-tenantconsole.description=Console di comando per l'amministrazione dei tenant.
+
+admin-console.tool.admin-repoconsole.label=Console di modelli e messaggi
+admin-console.tool.admin-repoconsole.description=Console di comando per l'amministrazione di modelli e messaggi.
+
+admin-console.tool.admin-workflowconsole.label=Console dei workflow
+admin-console.tool.admin-workflowconsole.description=Console di comando per l'amministrazione dei workflow.
+
+admin-console.tool.admin-nodebrowser.label=Browser nodi
+admin-console.tool.admin-nodebrowser.description=Strumento browser nodi del repository.
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_ja.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_ja.properties
new file mode 100644
index 00000000000..7fed11a6f7a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_ja.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=\u7ba1\u7406\u30b3\u30f3\u30bd\u30fc\u30eb
+admin-console.help=\u30d8\u30eb\u30d7
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=\u5024\u3092\u6b63\u5e38\u306b\u4fdd\u5b58\u3057\u307e\u3057\u305f\u3002
+
+admin-console.host=\u30db\u30b9\u30c8
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=\u4fdd\u5b58
+admin-console.cancel=\u30ad\u30e3\u30f3\u30bb\u30eb
+admin-console.enabled=\u6709\u52b9
+admin-console.disabled=\u7121\u52b9
+admin-console.true=True
+admin-console.false=False
+admin-console.yesno.true=\u306f\u3044
+admin-console.yesno.false=\u3044\u3044\u3048
+admin-console.close=\u9589\u3058\u308b
+admin-console.password.show=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u8868\u793a\u3059\u308b
+admin-console.password.hide=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u975e\u8868\u793a\u306b\u3059\u308b
+admin-console.unavailable=\u73fe\u5728\u3001\u60c5\u5831\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093
+admin-console.not.installed=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+
+admin-console.requesterror=\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u5b8c\u4e86\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+
+# Admin Tool Group labels
+admin-console.tool.group.general=\u4e00\u822c
+admin-console.tool.group.support-tools=\u30b5\u30dd\u30fc\u30c8\u30c4\u30fc\u30eb
+admin-console.tool.group.consoles=\u30b3\u30f3\u30bd\u30fc\u30eb
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=\u30b7\u30b9\u30c6\u30e0\u306e\u6982\u8981
+admin-console.tool.admin-communitysummary.description=\u30b7\u30b9\u30c6\u30e0\u306e\u4e00\u822c\u60c5\u5831\u306e\u6982\u8981
+
+admin-console.tool.admin-tenantconsole.label=\u30c6\u30ca\u30f3\u30c8\u30b3\u30f3\u30bd\u30fc\u30eb
+admin-console.tool.admin-tenantconsole.description=\u30c6\u30ca\u30f3\u30c8\u7ba1\u7406\u7528\u306e\u30b3\u30de\u30f3\u30c9\u30b3\u30f3\u30bd\u30fc\u30eb\u3002
+
+admin-console.tool.admin-repoconsole.label=\u30e2\u30c7\u30eb\u3068\u30e1\u30c3\u30bb\u30fc\u30b8\u30b3\u30f3\u30bd\u30fc\u30eb
+admin-console.tool.admin-repoconsole.description=\u30e2\u30c7\u30eb\u3068\u30e1\u30c3\u30bb\u30fc\u30b8\u7ba1\u7406\u7528\u306e\u30b3\u30de\u30f3\u30c9\u30b3\u30f3\u30bd\u30fc\u30eb\u3002
+
+admin-console.tool.admin-workflowconsole.label=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u30b3\u30f3\u30bd\u30fc\u30eb
+admin-console.tool.admin-workflowconsole.description=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u7ba1\u7406\u7528\u306e\u30b3\u30de\u30f3\u30c9\u30b3\u30f3\u30bd\u30fc\u30eb\u3067\u3059\u3002
+
+admin-console.tool.admin-nodebrowser.label=\u30ce\u30fc\u30c9\u30d6\u30e9\u30a6\u30b6
+admin-console.tool.admin-nodebrowser.description=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30ce\u30fc\u30c9\u30d6\u30e9\u30a6\u30b6\u30c4\u30fc\u30eb\u3002
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_nb.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_nb.properties
new file mode 100644
index 00000000000..40de4e6daf1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_nb.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=Admin-konsoll
+admin-console.help=Hjelp
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=Verdier som ble lagret.
+
+admin-console.host=Vert
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=Lagre
+admin-console.cancel=Avbryt
+admin-console.enabled=Aktivert
+admin-console.disabled=Deaktivert
+admin-console.true=Sann
+admin-console.false=Usann
+admin-console.yesno.true=Ja
+admin-console.yesno.false=Nei
+admin-console.close=Lukk
+admin-console.password.show=Vis passord
+admin-console.password.hide=Skjul passord
+admin-console.unavailable=Informasjon er for tiden ikke tilgjengelig
+admin-console.not.installed=Ikke installert
+
+admin-console.requesterror=Vi kunne ikke fullf\u00f8re foresp\u00f8rselen.
+
+# Admin Tool Group labels
+admin-console.tool.group.general=Generelt
+admin-console.tool.group.support-tools=St\u00f8tteverkt\u00f8y
+admin-console.tool.group.consoles=Konsoller
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=Systemsammendrag
+admin-console.tool.admin-communitysummary.description=Sammendrag av generell systeminformasjon
+
+admin-console.tool.admin-tenantconsole.label=Leietakerkonsoll
+admin-console.tool.admin-tenantconsole.description=Kommandokonsoll til leietakeradmin.
+
+admin-console.tool.admin-repoconsole.label=Modell- og meldingskonsoll
+admin-console.tool.admin-repoconsole.description=Kommandokonsoll til modell- og meldingsadmin.
+
+admin-console.tool.admin-workflowconsole.label=Arbeidsflytkonsoll
+admin-console.tool.admin-workflowconsole.description=Kommandokonsoll til arbeidsflytadmin.
+
+admin-console.tool.admin-nodebrowser.label=Nodeleser
+admin-console.tool.admin-nodebrowser.description=Arkivlager-nodeleserverkt\u00f8y.
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_nl.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_nl.properties
new file mode 100644
index 00000000000..e0fcb37a880
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_nl.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=Beheerconsole
+admin-console.help=Help
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=Waarden zijn opgeslagen.
+
+admin-console.host=Host
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=Opslaan
+admin-console.cancel=Annuleren
+admin-console.enabled=Ingeschakeld
+admin-console.disabled=Uitgeschakeld
+admin-console.true=True
+admin-console.false=False
+admin-console.yesno.true=Ja
+admin-console.yesno.false=Nee
+admin-console.close=Sluiten
+admin-console.password.show=Wachtwoord weergeven
+admin-console.password.hide=Wachtwoord verbergen
+admin-console.unavailable=Informatie is momenteel niet beschikbaar
+admin-console.not.installed=Niet ge\u00efnstalleerd
+
+admin-console.requesterror=Kan de aanvraag niet uitvoeren.
+
+# Admin Tool Group labels
+admin-console.tool.group.general=Algemeen
+admin-console.tool.group.support-tools=Ondersteuningsfuncties
+admin-console.tool.group.consoles=Consoles
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=Systeemoverzicht
+admin-console.tool.admin-communitysummary.description=Overzicht van algemene systeeminformatie
+
+admin-console.tool.admin-tenantconsole.label=Tenant-console
+admin-console.tool.admin-tenantconsole.description=Opdrachtconsole voor tenantbeheer.
+
+admin-console.tool.admin-repoconsole.label=Model- en berichtenconsole
+admin-console.tool.admin-repoconsole.description=Opdrachtconsole voor model- en berichtenbeheer.
+
+admin-console.tool.admin-workflowconsole.label=Workflowconsole
+admin-console.tool.admin-workflowconsole.description=Opdrachtconsole voor workflowbeheer.
+
+admin-console.tool.admin-nodebrowser.label=Nodebrowser
+admin-console.tool.admin-nodebrowser.description=Repositorynodebrowsertool.
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_pl.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_pl.properties
new file mode 100644
index 00000000000..f4a949780ec
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_pl.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=Konsola administracyjna
+admin-console.help=Pomoc
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=Warto\u015bci zosta\u0142y zapisane pomy\u015blnie.
+
+admin-console.host=Host
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=Zapisz
+admin-console.cancel=Anuluj
+admin-console.enabled=W\u0142\u0105czone
+admin-console.disabled=Wy\u0142\u0105czone
+admin-console.true=Prawda
+admin-console.false=Fa\u0142sz
+admin-console.yesno.true=Tak
+admin-console.yesno.false=Nie
+admin-console.close=Zamknij
+admin-console.password.show=Poka\u017c has\u0142o
+admin-console.password.hide=Ukryj has\u0142o
+admin-console.unavailable=Informacja nie jest aktualnie dost\u0119pna
+admin-console.not.installed=Niezainstalowane
+
+admin-console.requesterror=Nie mo\u017cna wykona\u0107 Twojego zapytania. Spr\u00f3buj ponownie.
+
+# Admin Tool Group labels
+admin-console.tool.group.general=Og\u00f3lne
+admin-console.tool.group.support-tools=Narz\u0119dzia obs\u0142ugi
+admin-console.tool.group.consoles=Konsole
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=Kr\u00f3tki opis systemu
+admin-console.tool.admin-communitysummary.description=Podsumowanie og\u00f3lnych informacji o systemie
+
+admin-console.tool.admin-tenantconsole.label=Konsola dzier\u017cawcy
+admin-console.tool.admin-tenantconsole.description=Konsola polece\u0144 dla administratora dzier\u017cawcy.
+
+admin-console.tool.admin-repoconsole.label=Konsola modeli i komunikat\u00f3w
+admin-console.tool.admin-repoconsole.description=Konsola polece\u0144 administratora modeli i komunikat\u00f3w.
+
+admin-console.tool.admin-workflowconsole.label=Konsola przep\u0142yw\u00f3w roboczych
+admin-console.tool.admin-workflowconsole.description=Konsola polece\u0144 administratora przep\u0142yw\u00f3w roboczych.
+
+admin-console.tool.admin-nodebrowser.label=Przegl\u0105darka w\u0119z\u0142\u00f3w
+admin-console.tool.admin-nodebrowser.description=Narz\u0119dzie do przegl\u0105dania w\u0119z\u0142\u00f3w repozytorium.
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_pt_BR.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_pt_BR.properties
new file mode 100644
index 00000000000..b27905f074d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_pt_BR.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=Console de administra\u00e7\u00e3o
+admin-console.help=Ajuda
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=Valores salvos com sucesso.
+
+admin-console.host=Host
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=Salvar
+admin-console.cancel=Cancelar
+admin-console.enabled=Ativado
+admin-console.disabled=Desativado
+admin-console.true=True
+admin-console.false=False
+admin-console.yesno.true=Sim
+admin-console.yesno.false=N\u00e3o
+admin-console.close=Fechar
+admin-console.password.show=Mostrar senha
+admin-console.password.hide=Ocultar senha
+admin-console.unavailable=Informa\u00e7\u00e3o indispon\u00edvel no momento
+admin-console.not.installed=N\u00e3o instalado
+
+admin-console.requesterror=N\u00e3o conseguimos concluir a solicita\u00e7\u00e3o.
+
+# Admin Tool Group labels
+admin-console.tool.group.general=Geral
+admin-console.tool.group.support-tools=Ferramentas de suporte
+admin-console.tool.group.consoles=Consoles
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=Resumo do sistema
+admin-console.tool.admin-communitysummary.description=Resumo das informa\u00e7\u00f5es gerais do sistema
+
+admin-console.tool.admin-tenantconsole.label=Console Tenant
+admin-console.tool.admin-tenantconsole.description=Console de comandos para admin. Tenant.
+
+admin-console.tool.admin-repoconsole.label=Console de Modelo e Mensagens
+admin-console.tool.admin-repoconsole.description=Console de comandos para admin. de modelo e mensagens.
+
+admin-console.tool.admin-workflowconsole.label=Console de fluxo de trabalho
+admin-console.tool.admin-workflowconsole.description=Console de comandos para admin. do fluxo de trabalho.
+
+admin-console.tool.admin-nodebrowser.label=Navegador de n\u00f3s
+admin-console.tool.admin-nodebrowser.description=Reposit\u00f3rio da ferramenta do navegador de n\u00f3s.
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_ru.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_ru.properties
new file mode 100644
index 00000000000..e1f6ce4cd12
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_ru.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=\u041a\u043e\u043d\u0441\u043e\u043b\u044c \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430
+admin-console.help=\u0421\u043f\u0440\u0430\u0432\u043a\u0430
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=\u0423\u0441\u043f\u0435\u0448\u043d\u043e \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u043d\u044b\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f.
+
+admin-console.host=\u0425\u043e\u0441\u0442
+admin-console.ipaddress=IP-\u0430\u0434\u0440\u0435\u0441
+
+# Common label messages
+admin-console.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
+admin-console.cancel=\u041e\u0442\u043c\u0435\u043d\u0430
+admin-console.enabled=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u043e
+admin-console.disabled=\u041e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u043e
+admin-console.true=\u0418\u0441\u0442\u0438\u043d\u0430
+admin-console.false=\u041b\u043e\u0436\u044c
+admin-console.yesno.true=\u0414\u0430
+admin-console.yesno.false=\u041d\u0435\u0442
+admin-console.close=\u0417\u0430\u043a\u0440\u044b\u0442\u044c
+admin-console.password.show=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c
+admin-console.password.hide=\u0421\u043a\u0440\u044b\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c
+admin-console.unavailable=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u0441\u0435\u0439\u0447\u0430\u0441 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430
+admin-console.not.installed=\u041d\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e
+
+admin-console.requesterror=\u041d\u0430\u043c \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0437\u0430\u043f\u0440\u043e\u0441.
+
+# Admin Tool Group labels
+admin-console.tool.group.general=\u041e\u0431\u0449\u0435\u0435
+admin-console.tool.group.support-tools=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u044b \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0438
+admin-console.tool.group.consoles=\u041a\u043e\u043d\u0441\u043e\u043b\u0438
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=\u0421\u0432\u043e\u0434\u043a\u0430 \u043f\u043e \u0441\u0438\u0441\u0442\u0435\u043c\u0435
+admin-console.tool.admin-communitysummary.description=\u0421\u0432\u043e\u0434\u043a\u0430 \u043e\u0431\u0449\u0435\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e \u0441\u0438\u0441\u0442\u0435\u043c\u0435
+
+admin-console.tool.admin-tenantconsole.label=\u041a\u043e\u043d\u0441\u043e\u043b\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
+admin-console.tool.admin-tenantconsole.description=\u041a\u043e\u043c\u0430\u043d\u0434\u043d\u0430\u044f \u043a\u043e\u043d\u0441\u043e\u043b\u044c \u0434\u043b\u044f \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439.
+
+admin-console.tool.admin-repoconsole.label=\u041a\u043e\u043d\u0441\u043e\u043b\u044c \u043c\u043e\u0434\u0435\u043b\u0435\u0439 \u0438 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439
+admin-console.tool.admin-repoconsole.description=\u041a\u043e\u043c\u0430\u043d\u0434\u043d\u0430\u044f \u043a\u043e\u043d\u0441\u043e\u043b\u044c \u0434\u043b\u044f \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430 \u043c\u043e\u0434\u0435\u043b\u0435\u0439 \u0438 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439.
+
+admin-console.tool.admin-workflowconsole.label=\u041a\u043e\u043d\u0441\u043e\u043b\u044c \u0431\u0438\u0437\u043d\u0435\u0441-\u043f\u0440\u043e\u0446\u0435\u0441\u0441\u043e\u0432
+admin-console.tool.admin-workflowconsole.description=\u041a\u043e\u043c\u0430\u043d\u0434\u043d\u0430\u044f \u043a\u043e\u043d\u0441\u043e\u043b\u044c \u0434\u043b\u044f \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430 \u0431\u0438\u0437\u043d\u0435\u0441-\u043f\u0440\u043e\u0446\u0435\u0441\u0441\u043e\u0432.
+
+admin-console.tool.admin-nodebrowser.label=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432
+admin-console.tool.admin-nodebrowser.description=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0430 \u0443\u0437\u043b\u0430 \u0440\u0435\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u0438\u044f.
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_sv.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_sv.properties
new file mode 100644
index 00000000000..2bbeb794db4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_sv.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=Admin-konsol
+admin-console.help=Hj\u00e4lp
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=V\u00e4rden sparades.
+
+admin-console.host=V\u00e4rd
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=Spara
+admin-console.cancel=Avbryt
+admin-console.enabled=Aktiverad
+admin-console.disabled=Avaktiverad
+admin-console.true=Sant
+admin-console.false=Falsk
+admin-console.yesno.true=Ja
+admin-console.yesno.false=Nej
+admin-console.close=St\u00e4ng
+admin-console.password.show=Visa l\u00f6senord
+admin-console.password.hide=D\u00f6lj l\u00f6senord
+admin-console.unavailable=Informationen \u00e4r f\u00f6r n\u00e4rvarande otillg\u00e4nglig
+admin-console.not.installed=Inte installerad
+
+admin-console.requesterror=Vi kunde inte slutf\u00f6ra din beg\u00e4ran. F\u00f6rs\u00f6k igen.
+
+# Admin Tool Group labels
+admin-console.tool.group.general=Generell
+admin-console.tool.group.support-tools=St\u00f6dverktyg
+admin-console.tool.group.consoles=Konsoler
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=Systemsammanfattning
+admin-console.tool.admin-communitysummary.description=Sammanfattning av generell systeminformation
+
+admin-console.tool.admin-tenantconsole.label=Kundkonsol
+admin-console.tool.admin-tenantconsole.description=Kommandokonsol f\u00f6r kund-admin.
+
+admin-console.tool.admin-repoconsole.label=Modell- och meddelandenkonsol
+admin-console.tool.admin-repoconsole.description=Kommandokonsol f\u00f6r modell- och meddelandenadmin.
+
+admin-console.tool.admin-workflowconsole.label=Arbetsfl\u00f6deskonsoll
+admin-console.tool.admin-workflowconsole.description=Kommandokonsol f\u00f6r arbetsfl\u00f6des-admin.
+
+admin-console.tool.admin-nodebrowser.label=Nodnavigator
+admin-console.tool.admin-nodebrowser.description=Arkivnodnavigatorverktyg.
diff --git a/remote-api/src/main/resources/alfresco/messages/admin-console_zh_CN.properties b/remote-api/src/main/resources/alfresco/messages/admin-console_zh_CN.properties
new file mode 100644
index 00000000000..4b51ba51aef
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/admin-console_zh_CN.properties
@@ -0,0 +1,46 @@
+# I18N messages for the Repository Admin Console
+admin-console.header=\u7ba1\u7406\u63a7\u5236\u53f0
+admin-console.help=\u5e2e\u52a9
+admin-console.help-link=http://docs.alfresco.com/{0}/concepts/ch-administering.html
+admin-console.success=\u5df2\u6210\u529f\u4fdd\u5b58\u7684\u503c\u3002
+
+admin-console.host=\u4e3b\u673a
+admin-console.ipaddress=IP
+
+# Common label messages
+admin-console.save=\u4fdd\u5b58
+admin-console.cancel=\u53d6\u6d88
+admin-console.enabled=\u5df2\u542f\u7528
+admin-console.disabled=\u5df2\u7981\u7528
+admin-console.true=\u771f
+admin-console.false=\u5047
+admin-console.yesno.true=\u662f
+admin-console.yesno.false=\u5426
+admin-console.close=\u5173\u95ed
+admin-console.password.show=\u663e\u793a\u5bc6\u7801
+admin-console.password.hide=\u9690\u85cf\u5bc6\u7801
+admin-console.unavailable=\u4fe1\u606f\u5f53\u524d\u4e0d\u53ef\u7528
+admin-console.not.installed=\u672a\u5b89\u88c5
+
+admin-console.requesterror=\u6211\u4eec\u65e0\u6cd5\u5b8c\u6210\u8bf7\u6c42\u3002
+
+# Admin Tool Group labels
+admin-console.tool.group.general=\u5e38\u89c4
+admin-console.tool.group.support-tools=\u652f\u6301\u5de5\u5177
+admin-console.tool.group.consoles=\u63a7\u5236\u53f0
+
+# Individual Admin Tool labels - format is admin-console.tool.<tool-scriptid>.label/description
+admin-console.tool.admin-communitysummary.label=\u7cfb\u7edf\u6458\u8981
+admin-console.tool.admin-communitysummary.description=\u5e38\u89c4\u7cfb\u7edf\u4fe1\u606f\u6458\u8981
+
+admin-console.tool.admin-tenantconsole.label=\u79df\u6237\u63a7\u5236\u53f0
+admin-console.tool.admin-tenantconsole.description=\u79df\u6237\u7ba1\u7406\u7684\u547d\u4ee4\u63a7\u5236\u53f0\u3002
+
+admin-console.tool.admin-repoconsole.label=\u6a21\u578b\u548c\u6d88\u606f\u63a7\u5236\u53f0
+admin-console.tool.admin-repoconsole.description=\u6a21\u578b\u548c\u6d88\u606f\u7ba1\u7406\u7684\u547d\u4ee4\u63a7\u5236\u53f0\u3002
+
+admin-console.tool.admin-workflowconsole.label=\u5de5\u4f5c\u6d41\u7a0b\u63a7\u5236\u53f0
+admin-console.tool.admin-workflowconsole.description=\u5de5\u4f5c\u6d41\u7a0b\u7ba1\u7406\u7684\u547d\u4ee4\u63a7\u5236\u53f0\u3002
+
+admin-console.tool.admin-nodebrowser.label=\u8282\u70b9\u6d4f\u89c8\u5668
+admin-console.tool.admin-nodebrowser.description=\u5b58\u50a8\u5e93\u8282\u70b9\u6d4f\u89c8\u5668\u5de5\u5177\u3002
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages.properties
new file mode 100644
index 00000000000..6f97d4dcfdb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=Model name can't be null.
+cmm.rest_api.model_invalid=Invalid custom model.
+cmm.rest_api.model_status_null=Model status can't be null.
+cmm.rest_api.model_name_cannot_update=You can't update the model name.
+cmm.rest_api.model_update_failure=We couldn't update the model.
+cmm.rest_api.model_download_failure=We couldn't create a download node.
+cmm.rest_api.model_namespace_uri_null=The model namespace URI can't be null.
+cmm.rest_api.model_namespace_uri_invalid=The namespace URI is invalid. Use letters, numbers and URI characters only.
+cmm.rest_api.model_namespace_prefix_null=Model namespace prefix can't be null.
+# Type
+cmm.rest_api.type_name_null=Type name can't be null.
+cmm.rest_api.type_create_failure=We couldn't create the type.
+cmm.rest_api.type_update_failure=We couldn't update the type.
+cmm.rest_api.type_parent_cannot_update=You can't update the type's parent in an active custom model.
+cmm.rest_api.type_parent_not_exist=You can''t set the type''s parent to ''{0}'', because the type ''{0}'' doesn''t exist.
+cmm.rest_api.type_cannot_delete=You can't delete a type in an active model.
+cmm.rest_api.type_delete_failure=We couldn't delete the type.
+# Aspect
+cmm.rest_api.aspect_name_null=Aspect name can't be null.
+cmm.rest_api.aspect_create_failure=We couldn't create the aspect.
+cmm.rest_api.aspect_update_failure=We couldn't update the aspect.
+cmm.rest_api.aspect_parent_cannot_update=You can't update the aspect's parent in an active custom model.
+cmm.rest_api.aspect_parent_not_exist=You can''t set the aspect''s parent to ''{0}'', because the aspect ''{0}'' doesn''t exist.
+cmm.rest_api.aspect_cannot_delete=You can't delete an aspect in an active model.
+cmm.rest_api.aspect_delete_failure=We couldn't delete the aspect.
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=You can''t delete ''{0}'' as ''{1}'' depends on it.
+# Constraint
+cmm.rest_api.constraint_name_null=Constraint name can't be null.
+cmm.rest_api.constraint_create_failure=We couldn't create constraint.
+cmm.rest_api.constraint_parameter_name_null=Constraint parameter name can't be null.
+cmm.rest_api.constraint_type_null=Custom constraint must have a 'type' attribute.
+cmm.rest_api.constraint_ref_not_defined=Constraint reference ''{0}'' isn'' t defined by this model.
+cmm.rest_api.regex_constraint_invalid_expression=REGEX expression ''{0}'' isn''t valid.
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' isn''t a valid ''double'' value for MINMAX parameter ''{1}''.
+cmm.rest_api.minmax_constraint_invalid_max_value=Maximum value of the MINMAX constraint must be greater than zero.
+cmm.rest_api.minmax_constraint_invalid_use=MINMAX constraint can only be used with numeric data type.
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' isn''t a valid ''int'' value for LENGTH parameter ''{1}''.
+cmm.rest_api.length_constraint_invalid_use=You can only use the LENGTH constraint with TEXT, CONTENT and MLTEXT data types.
+# Property
+cmm.rest_api.property_name_null=Property name can't be null.
+cmm.rest_api.property_create_update_failure=We couldn't create/update property.
+cmm.rest_api.property_delete_failure=We couldn't delete the property.
+cmm.rest_api.property_datatype_invalid=''{0}'' isn''t a valid data type format. A valid format should consist of a namespace prefix, a colon, and a name, for example: d:text.
+cmm.rest_api.properties_empty_null=Properties can't be empty or null.
+cmm.rest_api.property_create_name_already_in_use=We couldn''t create the property as the property name ''{0}'' is already in use.
+cmm.rest_api.property_update_prop_not_found=We couldn''t find a property that matches ''{0}''.
+cmm.rest_api.property_change_datatype_err=You can't change the data type of a property in an active model.
+cmm.rest_api.property_change_mandatory_opt_err=You can't change the mandatory option of a property in an active model.
+cmm.rest_api.property_change_mandatory_enforced_opt_err=You can't change the mandatory-enforced option of a property in an active model.
+cmm.rest_api.property_change_multi_valued_opt_err=You can't change the multi-valued option of a property in an active model.
+# validation
+cmm.rest_api.input_validation_err=''{0}'' isn''t a valid value. Use numbers, letters, hyphens (-) and underscores (_) only.
+cmm.rest_api.prefix_not_registered=There isn''t a namespace prefix registered for the URI ''{0}''. Make sure the model is active.
+cmm.rest_api.prefixed_qname_invalid=''{0}'' isn''t a valid prefixed QName value. {1}
+cmm.rest_api.circular_dependency_err=A circular dependency was detected. You can''t set parent ''{0}'', as it''s model already depends on ''{1}''.
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' isn''t a valid prefixed QName format. A valid format should consist of a namespace prefix, a colon, and a name, for example: cm:content.
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=The custom model can only have one namespace. We found ''{0}''.
+cmm.rest_api.model.import_namespace_undefined=The custom model must define a namespace.
+cmm.rest_api.model.import_associations_unsupported=The custom model doesn't support the 'associations' element.
+cmm.rest_api.model.import_overrides_unsupported=The custom model doesn't support the 'overrides' element.
+cmm.rest_api.model.import_mandatory_aspects_unsupported=The custom model doesn't support the 'mandatory-aspects' element.
+cmm.rest_api.model.import_archive_unsupported=The custom model doesn't support the 'archive' element.
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=The custom model doesn't support the 'includedInSuperTypeQuery' element.
+cmm.rest_api.model.import_not_multi_part_req=Request isn't a multi-part form data.
+cmm.rest_api.model.import_not_zip_format=''{0}'' isn''t a valid zip file.
+cmm.rest_api.model.import_process_zip_file_failure=We couldn't process the zip file.
+cmm.rest_api.model.import_no_zip_file_uploaded=We couldn't upload the zip file.
+cmm.rest_api.model.import_invalid_zip_package=The zip file can't have more than two files. There should be one Model file and one Extension module file.
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' isn''t a model or a Share extension module file.
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' isn''t a valid model file.
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}'' isn''t a valid Share extension module file.
+cmm.rest_api.model.import_failure=We couldn't import the model.
+cmm.rest_api.model.import_process_ext_module_file_failure=We couldn't process the Share extension module file.
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_cs.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_cs.properties
new file mode 100644
index 00000000000..971c8092ba5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_cs.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=N\u00e1zev model nesm\u00ed z\u016fstat nevypln\u011bn.
+cmm.rest_api.model_invalid=Neplatn\u00fd vlastn\u00ed model.
+cmm.rest_api.model_status_null=Stav modelu nesm\u00ed z\u016fstat nevypln\u011bn.
+cmm.rest_api.model_name_cannot_update=N\u00e1zev modelu nelze upravit.
+cmm.rest_api.model_update_failure=Model nebylo mo\u017en\u00e9 upravit.
+cmm.rest_api.model_download_failure=Nepoda\u0159ilo se vytvo\u0159it uzel pro stahov\u00e1n\u00ed.
+cmm.rest_api.model_namespace_uri_null=URI oboru n\u00e1zv\u016f modelu nesm\u00ed z\u016fstat nevypln\u011bno.
+cmm.rest_api.model_namespace_uri_invalid=URI oboru n\u00e1zv\u016f je neplatn\u00e9. Povoleny jsou pouze p\u00edsmena, \u010d\u00edsla a\u00a0znaky URI.
+cmm.rest_api.model_namespace_prefix_null=Obor n\u00e1zv\u016f modelu nesm\u00ed z\u016fstat nevypln\u011bn.
+# Type
+cmm.rest_api.type_name_null=N\u00e1zev typu nesm\u00ed z\u016fstat nevypln\u011bn.
+cmm.rest_api.type_create_failure=Typ nebylo mo\u017en\u00e9 vytvo\u0159it.
+cmm.rest_api.type_update_failure=Typ nebylo mo\u017en\u00e9 zm\u011bnit.
+cmm.rest_api.type_parent_cannot_update=Nen\u00ed mo\u017en\u00e9 m\u011bnit nad\u0159azen\u00fd objekt typu v\u00a0aktivn\u00edm vlastn\u00edm modelu.
+cmm.rest_api.type_parent_not_exist=Nelze nastavit nad\u0159azen\u00fd objekt typu ''{0}'', proto\u017ee typ ''{0}'' neexistuje.
+cmm.rest_api.type_cannot_delete=Nen\u00ed mo\u017en\u00e9 odstranit typ v\u00a0aktivn\u00edm modelu.
+cmm.rest_api.type_delete_failure=Typ nebylo mo\u017en\u00e9 odstranit.
+# Aspect
+cmm.rest_api.aspect_name_null=N\u00e1zev aspektu nesm\u00ed z\u016fstat nevypln\u011bn.
+cmm.rest_api.aspect_create_failure=Aspekt nebylo mo\u017en\u00e9 vytvo\u0159it.
+cmm.rest_api.aspect_update_failure=Aspekt nebylo mo\u017en\u00e9 zm\u011bnit.
+cmm.rest_api.aspect_parent_cannot_update=Nen\u00ed mo\u017en\u00e9 m\u011bnit nad\u0159azen\u00fd objekt aspektu v\u00a0aktivn\u00edm vlastn\u00edm modelu.
+cmm.rest_api.aspect_parent_not_exist=Nelze nastavit nad\u0159azen\u00fd objekt aspektu ''{0}'', proto\u017ee aspekt ''{0}'' neexistuje.
+cmm.rest_api.aspect_cannot_delete=Nen\u00ed mo\u017en\u00e9 odstranit aspekt v\u00a0aktivn\u00edm vlastn\u00edm modelu.
+cmm.rest_api.aspect_delete_failure=Aspekt nebylo mo\u017en\u00e9 odstranit.
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=''{0}'' nelze odstranit, proto\u017ee na n\u011bm z\u00e1vis\u00ed ''{1}''.
+# Constraint
+cmm.rest_api.constraint_name_null=N\u00e1zev omezen\u00ed nesm\u00ed z\u016fstat nevypln\u011bn.
+cmm.rest_api.constraint_create_failure=Omezen\u00ed nebylo mo\u017en\u00e9 vytvo\u0159it.
+cmm.rest_api.constraint_parameter_name_null=N\u00e1zev parametru omezen\u00ed nesm\u00ed z\u016fstat nevypln\u011bn.
+cmm.rest_api.constraint_type_null=Vlastn\u00ed omezen\u00ed mus\u00ed m\u00edt atribut 'type'.
+cmm.rest_api.constraint_ref_not_defined=Reference omezen\u00ed ''{0}'' nejsou t\u00edmto modelem definov\u00e1ny.
+cmm.rest_api.regex_constraint_invalid_expression=V\u00fdraz REGEX ''{0}'' je neplatn\u00fd.
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' nen\u00ed platn\u00e1 hodnota ''double'' pro MINMAX parametr ''{1}''.
+cmm.rest_api.minmax_constraint_invalid_max_value=Maxim\u00e1ln\u00ed hodnota omezen\u00ed MINMAX mus\u00ed b\u00fdt kladn\u00e1.
+cmm.rest_api.minmax_constraint_invalid_use=Omezen\u00ed MINMAX lze pou\u017e\u00edvat pouze spole\u010dn\u011b s\u00a0\u010d\u00edseln\u00fdm datov\u00fdm typem.
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' nen\u00ed platn\u00e1 hodnota ''int'' LENGTH parametru ''{1}''.
+cmm.rest_api.length_constraint_invalid_use=Omezen\u00ed LENGTH lze pou\u017e\u00edvat pouze spole\u010dn\u011b s\u00a0datov\u00fdm typem TEXT, CONTENT nebo MLTEXT.
+# Property
+cmm.rest_api.property_name_null=N\u00e1zev vlastnosti nesm\u00ed z\u016fstat nevypln\u011bn.
+cmm.rest_api.property_create_update_failure=Vlastnost nebylo mo\u017en\u00e9 vytvo\u0159it/zm\u011bnit.
+cmm.rest_api.property_delete_failure=Vlastnost nebylo mo\u017en\u00e9 odstranit.
+cmm.rest_api.property_datatype_invalid=''{0}'' nen\u00ed platn\u00fdm form\u00e1tem datov\u00e9ho typu. Platn\u00fd form\u00e1t mus\u00ed obsahovat p\u0159edponu z\u00a0oboru n\u00e1zv\u016f, dvojte\u010dku a\u00a0n\u00e1zev (nap\u0159. d:text).
+cmm.rest_api.properties_empty_null=Vlastnosti nesm\u00ed z\u016fstat nevypln\u011bn\u00e9.
+cmm.rest_api.property_create_name_already_in_use=Vlastnost se nepoda\u0159ilo vytvo\u0159it, proto\u017ee n\u00e1zev vlastnosti ''{0}'' ji\u017e existuje.
+cmm.rest_api.property_update_prop_not_found=Nepoda\u0159ilo se vyhledat vlastnost, kter\u00e1 odpov\u00edd\u00e1 ''{0}''.
+cmm.rest_api.property_change_datatype_err=Nen\u00ed mo\u017en\u00e9 m\u011bnit datov\u00fd typ vlastnosti v\u00a0aktivn\u00edm modelu.
+cmm.rest_api.property_change_mandatory_opt_err=Nen\u00ed mo\u017en\u00e9 m\u011bnit povinnou mo\u017enost vlastnosti v\u00a0aktivn\u00edm modelu.
+cmm.rest_api.property_change_mandatory_enforced_opt_err=Nen\u00ed mo\u017en\u00e9 m\u011bnit povinnou vynucenou mo\u017enost vlastnosti v\u00a0aktivn\u00edm modelu.
+cmm.rest_api.property_change_multi_valued_opt_err=Nen\u00ed mo\u017en\u00e9 m\u011bnit v\u00edcehodnotovou mo\u017enost vlastnosti v\u00a0aktivn\u00edm modelu.
+# validation
+cmm.rest_api.input_validation_err=''{0}'' nen\u00ed platn\u00e1 hodnota. Pou\u017e\u00edt m\u016f\u017eete pouze \u010d\u00edsla, p\u00edsmena, poml\u010dky (-) a\u00a0podtr\u017e\u00edtka (_).
+cmm.rest_api.prefix_not_registered=Nebyla nalezena \u017e\u00e1dn\u00e1 zaregistrovan\u00e1 p\u0159edpona oboru n\u00e1zv\u016f pro URI ''{0}''. Ujist\u011bte se, \u017ee je model aktivn\u00ed.
+cmm.rest_api.prefixed_qname_invalid=''{0}'' nen\u00ed platn\u00e1 hodnota QName s\u00a0p\u0159edponou. {1}
+cmm.rest_api.circular_dependency_err=Byla zji\u0161t\u011bna cyklick\u00e1 z\u00e1vislost. Objekt ''{0}'' nelze nastavit jako nad\u0159azen\u00fd, proto\u017ee jeho model ji\u017e z\u00e1vis\u00ed na objektu ''{1}''.
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' nen\u00ed platn\u00fdm form\u00e1tem QName s\u00a0p\u0159edponou. Platn\u00fd form\u00e1t mus\u00ed obsahovat p\u0159edponu z\u00a0oboru n\u00e1zv\u016f, dvojte\u010dku a\u00a0n\u00e1zev (nap\u0159. cm:content).
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=Vlastn\u00ed model m\u016f\u017ee obsahovat pouze jeden obor n\u00e1zv\u016f. Nalezen\u00fd po\u010det: ''{0}''.
+cmm.rest_api.model.import_namespace_undefined=Vlastn\u00ed model mus\u00ed definovat obor n\u00e1zv\u016f.
+cmm.rest_api.model.import_associations_unsupported=Vlastn\u00ed model nepodporuje element 'associations'.
+cmm.rest_api.model.import_overrides_unsupported=Vlastn\u00ed model nepodporuje element 'overrides'.
+cmm.rest_api.model.import_mandatory_aspects_unsupported=Vlastn\u00ed model nepodporuje element 'mandatory-aspects'.
+cmm.rest_api.model.import_archive_unsupported=Vlastn\u00ed model nepodporuje element 'archive'.
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=Vlastn\u00ed model nepodporuje element 'includedInSuperTypeQuery'.
+cmm.rest_api.model.import_not_multi_part_req=Po\u017eadavek nen\u00ed v\u00edced\u00edln\u00fdm datov\u00fdm formul\u00e1\u0159em.
+cmm.rest_api.model.import_not_zip_format=''{0}'' nen\u00ed platn\u00fd soubor ZIP.
+cmm.rest_api.model.import_process_zip_file_failure=Soubor ZIP se nepoda\u0159ilo zpracovat.
+cmm.rest_api.model.import_no_zip_file_uploaded=Soubor ZIP se nepoda\u0159ilo odeslat.
+cmm.rest_api.model.import_invalid_zip_package=Soubor ZIP nesm\u00ed obsahovat v\u00edce ne\u017e dva soubory. Jedn\u00edm souborem je soubor s\u00a0modelem a\u00a0druh\u00fd s\u00a0modulem roz\u0161\u00ed\u0159en\u00ed.
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' nen\u00ed soubor s\u00a0modelem ani soubor s\u00a0modulem roz\u0161\u00ed\u0159en\u00ed.
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' nen\u00ed platn\u00fd soubor s\u00a0modelem.
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}'' nen\u00ed platn\u00fd soubor s\u00a0modulem roz\u0161\u00ed\u0159en\u00ed pro aplikaci Share.
+cmm.rest_api.model.import_failure=Model nebylo mo\u017en\u00e9 naimportovat.
+cmm.rest_api.model.import_process_ext_module_file_failure=Soubor s\u00a0modulem roz\u0161\u00ed\u0159en\u00ed pro aplikaci Share se nepoda\u0159ilo zpracovat.
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_da.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_da.properties
new file mode 100644
index 00000000000..0af247de7dd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_da.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=Modelnavnet m\u00e5 ikke v\u00e6re null.
+cmm.rest_api.model_invalid=Ugyldig brugerdefineret model.
+cmm.rest_api.model_status_null=Modelstatussen m\u00e5 ikke v\u00e6re null.
+cmm.rest_api.model_name_cannot_update=Du kan ikke opdatere modelnavnet.
+cmm.rest_api.model_update_failure=Vi kunne ikke opdatere modellen.
+cmm.rest_api.model_download_failure=Vi kunne ikke oprette en downloadnode.
+cmm.rest_api.model_namespace_uri_null=URI'en for modelnavneomr\u00e5det m\u00e5 ikke v\u00e6re null.
+cmm.rest_api.model_namespace_uri_invalid=Navneomr\u00e5de-URI'en er ugyldig. Brug kun bogstaver, tal og URI-tegn.
+cmm.rest_api.model_namespace_prefix_null=Pr\u00e6fikset for modelnavneomr\u00e5det m\u00e5 ikke v\u00e6re null.
+# Type
+cmm.rest_api.type_name_null=Typenavnet m\u00e5 ikke v\u00e6re null.
+cmm.rest_api.type_create_failure=Vi kunne ikke oprette typen.
+cmm.rest_api.type_update_failure=Vi kunne ikke opdatere typen.
+cmm.rest_api.type_parent_cannot_update=Du kan ikke opdatere typens overordnede i en aktiv brugerdefineret model.
+cmm.rest_api.type_parent_not_exist=Du kan ikke indstille typens overordnede til ''{0}'', da typen ''{0}'' ikke findes.
+cmm.rest_api.type_cannot_delete=Du kan ikke slette en type i en aktiv model.
+cmm.rest_api.type_delete_failure=Vi kunne ikke slette typen.
+# Aspect
+cmm.rest_api.aspect_name_null=Aspektnavnet m\u00e5 ikke v\u00e6re null.
+cmm.rest_api.aspect_create_failure=Vi kunne ikke oprette aspektet.
+cmm.rest_api.aspect_update_failure=Vi kunne ikke opdatere aspektet.
+cmm.rest_api.aspect_parent_cannot_update=Du kan ikke opdatere aspektets overordnede i en aktiv brugerdefineret model.
+cmm.rest_api.aspect_parent_not_exist=Du kan ikke indstille aspektets overordnede til ''{0}'', da aspektet ''{0}'' ikke findes.
+cmm.rest_api.aspect_cannot_delete=Du kan ikke slette et aspekt i en aktiv model.
+cmm.rest_api.aspect_delete_failure=Vi kunne ikke slette aspektet.
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=Du kan ikke slette ''{0}'', da ''{1}'' er afh\u00e6ngig af den/det.
+# Constraint
+cmm.rest_api.constraint_name_null=Begr\u00e6nsningsnavnet m\u00e5 ikke v\u00e6re null.
+cmm.rest_api.constraint_create_failure=Vi kunne ikke oprette begr\u00e6nsningen.
+cmm.rest_api.constraint_parameter_name_null=Navnet p\u00e5 begr\u00e6nsningsparameteren m\u00e5 ikke v\u00e6re null.
+cmm.rest_api.constraint_type_null=En brugerdefineret begr\u00e6nsning skal have attributten 'type'.
+cmm.rest_api.constraint_ref_not_defined=Begr\u00e6nsningsreferencen ''{0}'' er ikke defineret af denne model.
+cmm.rest_api.regex_constraint_invalid_expression=REGEX-udtrykket ''{0}'' er ugyldigt.
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' er ikke en gyldig ''double''-v\u00e6rdi for MINMAX-parameteren ''{1}''.
+cmm.rest_api.minmax_constraint_invalid_max_value=Maksimumv\u00e6rdien for begr\u00e6nsningen MINMAX skal v\u00e6re st\u00f8rre end nul.
+cmm.rest_api.minmax_constraint_invalid_use=Begr\u00e6nsningen MINMAX kan kun bruges med en numerisk datatype.
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' er ikke en gyldig ''int''-v\u00e6rdi for LENGTH-parameteren ''{1}''.
+cmm.rest_api.length_constraint_invalid_use=Du kan kun bruge begr\u00e6nsningen LENGTH med datatyperne TEXT, CONTENT og MLTEXT.
+# Property
+cmm.rest_api.property_name_null=Egenskabsnavnet m\u00e5 ikke v\u00e6re null.
+cmm.rest_api.property_create_update_failure=Vi kunne ikke oprette eller opdatere egenskaben.
+cmm.rest_api.property_delete_failure=Vi kunne ikke slette egenskaben.
+cmm.rest_api.property_datatype_invalid=''{0}'' er ikke et gyldigt datatypeformat. Et gyldigt format skal indeholde et navneomr\u00e5depr\u00e6fiks, et kolon og et navn, f.eks.: d:text.
+cmm.rest_api.properties_empty_null=Egenskaber m\u00e5 ikke v\u00e6re tomme eller null.
+cmm.rest_api.property_create_name_already_in_use=Vi kunne ikke oprette egenskaben, da egenskabsnavnet ''{0}'' allerede bruges.
+cmm.rest_api.property_update_prop_not_found=Vi kunne ikke finde en egenskab, der matcher ''{0}''.
+cmm.rest_api.property_change_datatype_err=Du kan ikke \u00e6ndre datatypen for en egenskab i en aktiv model.
+cmm.rest_api.property_change_mandatory_opt_err=Du kan ikke \u00e6ndre den obligatoriske indstilling for en egenskab i en aktiv model.
+cmm.rest_api.property_change_mandatory_enforced_opt_err=Du kan ikke \u00e6ndre den obligatoriske tvungne indstilling for en egenskab i en aktiv model.
+cmm.rest_api.property_change_multi_valued_opt_err=Du kan ikke \u00e6ndre indstillingen med flere v\u00e6rdier for en egenskab i en aktiv model.
+# validation
+cmm.rest_api.input_validation_err=''{0}'' er ikke en gyldig v\u00e6rdi. Brug kun tal, bogstaver bindestreger (-) og understregningstegn (_).
+cmm.rest_api.prefix_not_registered=Der er ikke registreret et navneomr\u00e5depr\u00e6fiks for URI''en ''{0}''. S\u00f8rg for, at modellen er aktiv.
+cmm.rest_api.prefixed_qname_invalid=''{0}'' er ikke en gyldig foranstillet QName-v\u00e6rdi. {1}
+cmm.rest_api.circular_dependency_err=Der blev registreret en cirkul\u00e6r afh\u00e6ngighed. Du kan ikke indstille den overordnede ''{0}'', da dens model allerede afh\u00e6nger af ''{1}''.
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' er ikke et gyldigt foranstillet QName-format. Et gyldigt format skal best\u00e5 af et navneomr\u00e5depr\u00e6fiks, et kolon og et navn, f.eks.: cm:content.
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=Den brugerdefinerede model kan kun indeholde \u00e9t navneomr\u00e5de. Vi fandt ''{0}''.
+cmm.rest_api.model.import_namespace_undefined=Den brugerdefinerede model skal angive et navneomr\u00e5de.
+cmm.rest_api.model.import_associations_unsupported=Den brugerdefinerede model underst\u00f8tter ikke elementet 'associations'.
+cmm.rest_api.model.import_overrides_unsupported=Den brugerdefinerede model underst\u00f8tter ikke elementet 'overrides'.
+cmm.rest_api.model.import_mandatory_aspects_unsupported=Den brugerdefinerede model underst\u00f8tter ikke elementet 'mandatory-aspects'.
+cmm.rest_api.model.import_archive_unsupported=Den brugerdefinerede model underst\u00f8tter ikke elementet 'archive'.
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=Den brugerdefinerede model underst\u00f8tter ikke elementet 'includedInSuperTypeQuery'.
+cmm.rest_api.model.import_not_multi_part_req=Anmodningen er ikke formulardata i flere dele.
+cmm.rest_api.model.import_not_zip_format=''{0}'' er ikke en gyldig zip-fil.
+cmm.rest_api.model.import_process_zip_file_failure=Vi kunne ikke behandle zip-filen.
+cmm.rest_api.model.import_no_zip_file_uploaded=Vi kunne ikke uploade zip-filen.
+cmm.rest_api.model.import_invalid_zip_package=Zip-filen kan ikke indeholde mere end to filer. Der skal v\u00e6re \u00e9n modelfil og \u00e9n udvidelsesmodulfil.
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' er ikke en model- eller en Share-udvidelsesmodulfil.
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' er ikke en gyldig modelfil.
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}'' er ikke en gyldig Share-udvidelsesmodulfil.
+cmm.rest_api.model.import_failure=Vi kunne ikke importere modellen.
+cmm.rest_api.model.import_process_ext_module_file_failure=Vi kunne ikke behandle Share-udvidelsesmodulfilen.
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_de.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_de.properties
new file mode 100644
index 00000000000..511286b90bd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_de.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=Modellname darf nicht Null sein.
+cmm.rest_api.model_invalid=Ung\u00fcltiges parametriertes Modell.
+cmm.rest_api.model_status_null=Modellstatus darf nicht Null sein.
+cmm.rest_api.model_name_cannot_update=Sie k\u00f6nnen den Modellnamen nicht aktualisieren.
+cmm.rest_api.model_update_failure=Wir konnten das Modell nicht aktualisieren.
+cmm.rest_api.model_download_failure=Wir konnten keinen Download-Node erstellen.
+cmm.rest_api.model_namespace_uri_null=Das Modell-Namespace-URI darf nicht Null sein.
+cmm.rest_api.model_namespace_uri_invalid=Das Namespace-URI ist ung\u00fcltig. Verwenden Sie nur Buchstaben, Zahlen und URI-Zeichen.
+cmm.rest_api.model_namespace_prefix_null=Modell-Namespace-Pr\u00e4fix darf nicht Null sein.
+# Type
+cmm.rest_api.type_name_null=Typenname darf nicht Null sein.
+cmm.rest_api.type_create_failure=Wir konnten den Typ nicht erstellen.
+cmm.rest_api.type_update_failure=Wir konnten den Typ nicht aktualisieren.
+cmm.rest_api.type_parent_cannot_update=Sie k\u00f6nnen das \u00fcbergeordnete Element eines Typs in einem aktiven parametrierten Modell nicht aktualisieren.
+cmm.rest_api.type_parent_not_exist=Sie k\u00f6nnen das \u00fcbergeordnete Element des Typs nicht auf ''{0}'' setzen, weil es den Typ ''{0}'' nicht gibt.
+cmm.rest_api.type_cannot_delete=Sie k\u00f6nnen einen Typ in einem aktiven Modell nicht l\u00f6schen.
+cmm.rest_api.type_delete_failure=Wir konnten den Typ nicht l\u00f6schen.
+# Aspect
+cmm.rest_api.aspect_name_null=Aspektname darf nicht Null sein.
+cmm.rest_api.aspect_create_failure=Wir konnten den Aspekt nicht erstellen.
+cmm.rest_api.aspect_update_failure=Wir konnten den Aspekt nicht aktualisieren.
+cmm.rest_api.aspect_parent_cannot_update=Sie k\u00f6nnen das \u00fcbergeordnete Element eines Aspektes in einem aktiven parametrierten Modell nicht aktualisieren.
+cmm.rest_api.aspect_parent_not_exist=Sie k\u00f6nnen das \u00fcbergeordnete Element des Aspektes nicht auf ''{0}'' setzen, weil es den Aspekt ''{0}'' nicht gibt.
+cmm.rest_api.aspect_cannot_delete=Sie k\u00f6nnen einen Aspekt in einem aktiven Modell nicht l\u00f6schen.
+cmm.rest_api.aspect_delete_failure=Wir konnten den Aspekt nicht l\u00f6schen.
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=Sie k\u00f6nnen ''{0}'' nicht l\u00f6schen, weil ''{1}'' davon abh\u00e4ngt.
+# Constraint
+cmm.rest_api.constraint_name_null=Constraint-Name darf nicht Null sein.
+cmm.rest_api.constraint_create_failure=Wir konnten den Constraint nicht erstellen.
+cmm.rest_api.constraint_parameter_name_null=Constraint-Parametername darf nicht Null sein.
+cmm.rest_api.constraint_type_null=Parametrierter Constraint muss ein Typenattribut haben.
+cmm.rest_api.constraint_ref_not_defined=Constraint-Verweis ''{0}'' ist von diesem Modell nicht definiert.
+cmm.rest_api.regex_constraint_invalid_expression=REGEX-Ausdruck ''{0}'' ist nicht zul\u00e4ssig.
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' ist kein zul\u00e4ssiger Doppelparameter f\u00fcr MINMAX-Parameter ''{1}''.
+cmm.rest_api.minmax_constraint_invalid_max_value=H\u00f6chstwert des MINMAX-Constraints muss gr\u00f6\u00dfer als Null sein.
+cmm.rest_api.minmax_constraint_invalid_use=MINMAX-Constraint kann nur mit numerischem Datentyp verwendet werden.
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' ist kein zul\u00e4ssiger Integer-Wert f\u00fcr LENGTH-Parameter ''{1}''.
+cmm.rest_api.length_constraint_invalid_use=Sie k\u00f6nnen den LENGTH-Constraint nur mit den Datentypen TEXT, CONTENT und MLTEXT verwenden.
+# Property
+cmm.rest_api.property_name_null=Eigenschaftenname darf nicht Null sein.
+cmm.rest_api.property_create_update_failure=Wir konnten die Eigenschaft nicht erstellen/aktualisieren.
+cmm.rest_api.property_delete_failure=Wir konnten die Eigenschaft nicht l\u00f6schen.
+cmm.rest_api.property_datatype_invalid=''{0}'' ist kein zul\u00e4ssiges Datentyp-Format. Ein zul\u00e4ssiges Format besteht aus einem Namespace-Pr\u00e4fix, einem Doppelpunkt und einem Namen (zum Beispiel d:text).
+cmm.rest_api.properties_empty_null=Eigenschaften d\u00fcrfen nicht leer oder Null sein.
+cmm.rest_api.property_create_name_already_in_use=Wir konnten die Eigenschaft nicht erstellen, weil der Eigenschaftenname ''{0}'' bereits verwendet wird.
+cmm.rest_api.property_update_prop_not_found=Wir konnten keine Eigenschaft finden, die mit ''{0}'' \u00fcbereinstimmt.
+cmm.rest_api.property_change_datatype_err=Der Datentyp einer Eigenschaft in einem aktiven Modell kann nicht ge\u00e4ndert werden.
+cmm.rest_api.property_change_mandatory_opt_err=Die Option ''Obligatorisch'' einer Eigenschaft in einem aktiven Modell kann nicht ge\u00e4ndert werden.
+cmm.rest_api.property_change_mandatory_enforced_opt_err=Die Option ''Obligatorisch (erzwungen)'' einer Eigenschaft in einem aktiven Modell kann nicht ge\u00e4ndert werden.
+cmm.rest_api.property_change_multi_valued_opt_err=Die Option f\u00fcr mehrere Werte einer Eigenschaft in einem aktiven Modell kann nicht ge\u00e4ndert werden.
+# validation
+cmm.rest_api.input_validation_err=''{0}'' ist kein zul\u00e4ssiger Wert. Verwenden Sie nur Zahlen, Buchstaben, Bindestriche (-) und Unterstriche (_).
+cmm.rest_api.prefix_not_registered=F\u00fcr das URI ''{0}'' ist kein Namespace-Pr\u00e4fix registriert. Stellen Sie sicher, dass das Modell aktiv ist.
+cmm.rest_api.prefixed_qname_invalid=''{0}'' ist kein zul\u00e4ssiger QName-Wert mit Pr\u00e4fix. {1}
+cmm.rest_api.circular_dependency_err=Es wurde eine Ringabh\u00e4ngigkeit entdeckt. Das \u00fcbergeordnete Element ''{0}'' kann nicht eingerichtet werden, weil sein Modell bereits von ''{1}'' abh\u00e4ngt.
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' ist kein zul\u00e4ssiges QName-Format mit Pr\u00e4fix. Ein zul\u00e4ssiges Format besteht aus einem Namespace-Pr\u00e4fix, einem Doppelpunkt und einem Namen (zum Beispiel cm:content).
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=Das parametrierte Modell darf nur \u00fcber einen Namespace verf\u00fcgen. Wir haben ''{0}'' gefunden.
+cmm.rest_api.model.import_namespace_undefined=Das parametrierte Modell muss einen Namespace definieren.
+cmm.rest_api.model.import_associations_unsupported=Das parametrierte Modell unterst\u00fctzt das Element 'associations' nicht.
+cmm.rest_api.model.import_overrides_unsupported=Das parametrierte Modell unterst\u00fctzt das Element 'overrides' nicht.
+cmm.rest_api.model.import_mandatory_aspects_unsupported=Das parametrierte Modell unterst\u00fctzt das Element 'mandatory-aspects' nicht.
+cmm.rest_api.model.import_archive_unsupported=Das parametrierte Modell unterst\u00fctzt das Element 'archive' nicht.
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=Das parametrierte Modell unterst\u00fctzt das Element 'includedInSuperTypeQuery' nicht.
+cmm.rest_api.model.import_not_multi_part_req=Bei der Anfrage handelt es sich nicht um mehrteilige Formulardaten.
+cmm.rest_api.model.import_not_zip_format=''{0}'' ist keine zul\u00e4ssige ZIP-Datei.
+cmm.rest_api.model.import_process_zip_file_failure=Wir konnten die ZIP-Datei nicht verarbeiten.
+cmm.rest_api.model.import_no_zip_file_uploaded=Wir konnten die ZIP-Datei nicht hochladen.
+cmm.rest_api.model.import_invalid_zip_package=Die ZIP-Datei darf nicht mehr als zwei Dateien beinhalten. Es sollte eine Modelldatei und eine Erweiterungsmodul-Datei geben.
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' ist keine Modell- oder Share-Erweiterungs-Modul-Datei.
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' ist keine zul\u00e4ssige Modelldatei.
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}'' ist keine zul\u00e4ssige Share-Erweiterungs-Modul-Datei.
+cmm.rest_api.model.import_failure=Wir konnten das Modell nicht importieren.
+cmm.rest_api.model.import_process_ext_module_file_failure=Wir konnten die Share-Erweiterungs-Modul-Datei nicht verarbeiten.
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_es.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_es.properties
new file mode 100644
index 00000000000..b52a77ce157
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_es.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=El nombre del modelo no puede ser nulo.
+cmm.rest_api.model_invalid=Modelo personalizado no v\u00e1lido.
+cmm.rest_api.model_status_null=El estado del modelo no puede ser nulo.
+cmm.rest_api.model_name_cannot_update=No puede actualizar el nombre del modelo.
+cmm.rest_api.model_update_failure=No se ha podido actualizar el modelo.
+cmm.rest_api.model_download_failure=No se ha podido crear un nodo de descarga.
+cmm.rest_api.model_namespace_uri_null=La URI de espacio de nombres del modelo no puede ser nula.
+cmm.rest_api.model_namespace_uri_invalid=La URI de espacio de nombres no es v\u00e1lida. Utilice n\u00fameros, letras y caracteres URI solamente.
+cmm.rest_api.model_namespace_prefix_null=El prefijo de espacio de nombres no puede ser nulo.
+# Type
+cmm.rest_api.type_name_null=El nombre del tipo no puede ser nulo.
+cmm.rest_api.type_create_failure=No se ha podido crear el tipo.
+cmm.rest_api.type_update_failure=No se ha podido actualizar el tipo.
+cmm.rest_api.type_parent_cannot_update=No puede actualizar el padre del tipo en un modelo personalizado activo.
+cmm.rest_api.type_parent_not_exist=No puede establecer el padre del tipo en ''{0}'', porque el tipo ''{0}'' no existe.
+cmm.rest_api.type_cannot_delete=No puede eliminar un tipo en un modelo activo.
+cmm.rest_api.type_delete_failure=No se ha podido eliminar el tipo.
+# Aspect
+cmm.rest_api.aspect_name_null=El nombre del aspecto no puede ser nulo.
+cmm.rest_api.aspect_create_failure=No se ha podido crear el aspecto.
+cmm.rest_api.aspect_update_failure=No se ha podido actualizar el aspecto.
+cmm.rest_api.aspect_parent_cannot_update=No puede actualizar el padre del aspecto en un modelo personalizado activo.
+cmm.rest_api.aspect_parent_not_exist=No puede establecer el padre del aspecto en ''{0}'', porque el aspecto ''{0}'' no existe.
+cmm.rest_api.aspect_cannot_delete=No puede eliminar un aspecto en un modelo activo.
+cmm.rest_api.aspect_delete_failure=No se ha podido eliminar el aspecto.
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=No puede eliminar ''{0}'' ya que ''{1}'' depende de \u00e9l.
+# Constraint
+cmm.rest_api.constraint_name_null=El nombre de la restricci\u00f3n no puede ser nulo.
+cmm.rest_api.constraint_create_failure=No se ha podido crear la restricci\u00f3n.
+cmm.rest_api.constraint_parameter_name_null=El nombre del par\u00e1metro de la restricci\u00f3n no puede ser nulo.
+cmm.rest_api.constraint_type_null=La restricci\u00f3n personalizada debe tener un atributo 'tipo'.
+cmm.rest_api.constraint_ref_not_defined=La referencia de la restricci\u00f3n ''{0}'' no la ha definido este modelo.
+cmm.rest_api.regex_constraint_invalid_expression=La expresi\u00f3n REGEX ''{0}'' no es v\u00e1lida.
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' no es un valor doble v\u00e1lido para el par\u00e1metro MINMAX ''{1}''.
+cmm.rest_api.minmax_constraint_invalid_max_value=El valor m\u00e1ximo de la restricci\u00f3n MINMAX debe ser superior a cero.
+cmm.rest_api.minmax_constraint_invalid_use=La restricci\u00f3n MINMAX solo puede usarse con un tipo de datos num\u00e9ricos.
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' no es un valor ''entero'' v\u00e1lido para el par\u00e1metro LENGTH ''{1}''.
+cmm.rest_api.length_constraint_invalid_use=Solo puede usar la restricci\u00f3n LENGTH con los tipos de datos TEXT, CONTENT y MLTEXT.
+# Property
+cmm.rest_api.property_name_null=El nombre de la propiedad no puede ser nulo.
+cmm.rest_api.property_create_update_failure=No se ha podido crear/actualizar la propiedad.
+cmm.rest_api.property_delete_failure=No se ha podido eliminar la propiedad.
+cmm.rest_api.property_datatype_invalid=''{0}'' no es un formato de tipo de datos v\u00e1lido. Un formato v\u00e1lido debe incluir un prefijo de espacio de nombres, dos puntos y un nombre, por ejemplo, d:text.
+cmm.rest_api.properties_empty_null=Las propiedades no pueden estar vac\u00edas o ser nulas.
+cmm.rest_api.property_create_name_already_in_use=No se ha podido crear la propiedad porque el nombre de propiedad ''{0}'' ya se est\u00e1 usando.
+cmm.rest_api.property_update_prop_not_found=No se ha podido encontrar una propiedad que coincida con ''{0}''.
+cmm.rest_api.property_change_datatype_err=No puede cambiar el tipo de datos de una propiedad en un modelo activo.
+cmm.rest_api.property_change_mandatory_opt_err=No puede cambiar la opci\u00f3n obligatoria de una propiedad en un modelo activo.
+cmm.rest_api.property_change_mandatory_enforced_opt_err=No puede cambiar la opci\u00f3n obligatoria (exigida) de una propiedad en un modelo activo.
+cmm.rest_api.property_change_multi_valued_opt_err=No puede cambiar la opci\u00f3n de m\u00faltiples valores de una propiedad en un modelo activo.
+# validation
+cmm.rest_api.input_validation_err=''{0}'' no es un valor v\u00e1lido. Utilice n\u00fameros, letras, guiones (-) y guiones bajos (_) solamente.
+cmm.rest_api.prefix_not_registered=No existe un prefijo de espacio de nombres registrado para la URI ''{0}''. Aseg\u00farese de que el modelo est\u00e1 activo.
+cmm.rest_api.prefixed_qname_invalid=''{0}'' no es un valor QName con prefijo v\u00e1lido. {1}
+cmm.rest_api.circular_dependency_err=Se ha detectado una dependencia circular. No puede establecer el padre ''{0}'', ya que su modelo ya depende de ''{1}''.
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' no es un formato QName con prefijo v\u00e1lido. Un formato v\u00e1lido debe incluir un prefijo de espacio de nombres, dos puntos y un nombre, por ejemplo, cm:content.
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=El modelo personalizado solo puede tener un espacio de nombres. Se encontr\u00f3 ''{0}''.
+cmm.rest_api.model.import_namespace_undefined=El modelo personalizado debe definir un espacio de nombres.
+cmm.rest_api.model.import_associations_unsupported=El modelo personalizado no es compatible con el elemento 'associations'.
+cmm.rest_api.model.import_overrides_unsupported=El modelo personalizado no es compatible con el elemento 'overrides'.
+cmm.rest_api.model.import_mandatory_aspects_unsupported=El modelo personalizado no es compatible con el elemento 'mandatory-aspects'.
+cmm.rest_api.model.import_archive_unsupported=El modelo personalizado no es compatible con el elemento 'archive'.
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=El modelo personalizado no es compatible con el elemento 'includedInSuperTypeQuery'.
+cmm.rest_api.model.import_not_multi_part_req=La solicitud no equivale a datos de formulario de varias partes.
+cmm.rest_api.model.import_not_zip_format=''{0}'' no es un fichero zip v\u00e1lido.
+cmm.rest_api.model.import_process_zip_file_failure=No se ha podido procesar el fichero zip.
+cmm.rest_api.model.import_no_zip_file_uploaded=No se ha podido cargar el fichero zip.
+cmm.rest_api.model.import_invalid_zip_package=El fichero zip no puede tener m\u00e1s de dos ficheros. Debe hacer un fichero de modelo y un fichero de m\u00f3dulo de extensi\u00f3n.
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' no es un modelo ni un fichero de m\u00f3dulo de extensi\u00f3n de Share.
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' no es un fichero de modelo v\u00e1lido.
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}'' no es un fichero de m\u00f3dulo de extensi\u00f3n de Share v\u00e1lido.
+cmm.rest_api.model.import_failure=No se ha podido importar el modelo.
+cmm.rest_api.model.import_process_ext_module_file_failure=No se ha podido procesar el fichero de m\u00f3dulo de extensi\u00f3n de Share.
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_fi.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_fi.properties
new file mode 100644
index 00000000000..0e44df2b2e1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_fi.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=Mallin nimi ei voi olla null-arvoinen.
+cmm.rest_api.model_invalid=Mukautettu malli on virheellinen.
+cmm.rest_api.model_status_null=Mallin tila ei voi olla null-arvoinen.
+cmm.rest_api.model_name_cannot_update=Et voi p\u00e4ivitt\u00e4\u00e4 mallin nime\u00e4.
+cmm.rest_api.model_update_failure=Mallin p\u00e4ivitt\u00e4minen ei onnistu.
+cmm.rest_api.model_download_failure=Lataussolmun luominen ei onnistu.
+cmm.rest_api.model_namespace_uri_null=Mallin nimitilan URI ei voi olla null-arvoinen.
+cmm.rest_api.model_namespace_uri_invalid=Nimitilan URI on virheellinen. K\u00e4yt\u00e4 vain kirjaimia, numeroita ja URI-merkkej\u00e4.
+cmm.rest_api.model_namespace_prefix_null=Mallin nimitilan etuliite ei voi olla null-arvoinen.
+# Type
+cmm.rest_api.type_name_null=Tyypin nimi ei voi olla null-arvoinen.
+cmm.rest_api.type_create_failure=Tyypin luominen ei onnistu.
+cmm.rest_api.type_update_failure=Tyypin p\u00e4ivitt\u00e4minen ei onnistu.
+cmm.rest_api.type_parent_cannot_update=Et voi p\u00e4ivitt\u00e4\u00e4 tyypin yl\u00e4tasoa aktiivisessa mukautetussa mallissa.
+cmm.rest_api.type_parent_not_exist=Et voi m\u00e4\u00e4ritt\u00e4\u00e4 tyypin yl\u00e4tasoksi tyyppi\u00e4 {0}, koska tyyppi\u00e4 {0} ei ole olemassa.
+cmm.rest_api.type_cannot_delete=Et voi poistaa aktiivisen mallin tyyppi\u00e4.
+cmm.rest_api.type_delete_failure=Tyypin poistaminen ei onnistu.
+# Aspect
+cmm.rest_api.aspect_name_null=Ominaisuusjoukon nimi ei voi olla null-arvoinen.
+cmm.rest_api.aspect_create_failure=Ominaisuusjoukon luominen ei onnistu.
+cmm.rest_api.aspect_update_failure=Ominaisuusjoukon p\u00e4ivitt\u00e4minen ei onnistu.
+cmm.rest_api.aspect_parent_cannot_update=Et voi p\u00e4ivitt\u00e4\u00e4 ominaisuusjoukon yl\u00e4tasoa aktiivisessa mukautetussa mallissa.
+cmm.rest_api.aspect_parent_not_exist=Et voi m\u00e4\u00e4ritt\u00e4\u00e4 ominaisuusjoukon yl\u00e4tasoksi kohdetta {0}, koska ominaisuusjoukkoa {0} ei ole olemassa.
+cmm.rest_api.aspect_cannot_delete=Et voi poistaa aktiivisen mallin ominaisuusjoukkoa.
+cmm.rest_api.aspect_delete_failure=Ominaisuusjoukon poistaminen ei onnistu.
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=Et voi poistaa kohdetta {0}, koska {1} on riippuvainen siit\u00e4.
+# Constraint
+cmm.rest_api.constraint_name_null=Rajoituksen nimi ei voi olla null-arvoinen.
+cmm.rest_api.constraint_create_failure=Rajoituksen luominen ei onnistu.
+cmm.rest_api.constraint_parameter_name_null=Rajoitusparametrin nimi ei voi olla null-arvoinen.
+cmm.rest_api.constraint_type_null=Mukautetulla rajoituksella t\u00e4ytyy olla type-m\u00e4\u00e4rite.
+cmm.rest_api.constraint_ref_not_defined=Rajoitusviittausta {0} ei ole m\u00e4\u00e4ritetty t\u00e4ss\u00e4 mallissa.
+cmm.rest_api.regex_constraint_invalid_expression=REGEX-lauseke {0} ei ole kelvollinen.
+cmm.rest_api.minmax_constraint_invalid_parameter={0} ei ole kelvollinen double-arvo MINMAX-parametrille {1}.
+cmm.rest_api.minmax_constraint_invalid_max_value=MINMAX-rajoituksen enimm\u00e4isarvon t\u00e4ytyy olla suurempi kuin nolla.
+cmm.rest_api.minmax_constraint_invalid_use=MINMAX-rajoitusta voi k\u00e4ytt\u00e4\u00e4 vain numeeristen tietotyyppien kanssa.
+cmm.rest_api.length_constraint_invalid_parameter={0} ei ole kelvollinen int-arvo LENGTH-parametrille {1}.
+cmm.rest_api.length_constraint_invalid_use=Voit k\u00e4ytt\u00e4\u00e4 LENGTH-rajoitusta vain TEXT-, CONTENT- ja MLTEXT-tietotyyppien kanssa.
+# Property
+cmm.rest_api.property_name_null=Ominaisuuden nimi ei voi olla null-arvoinen.
+cmm.rest_api.property_create_update_failure=Ominaisuuden luominen tai p\u00e4ivitt\u00e4minen ei onnistu.
+cmm.rest_api.property_delete_failure=Ominaisuuden poistaminen ei onnistu.
+cmm.rest_api.property_datatype_invalid={0} ei ole kelvollinen tietotyyppimuoto. Kelvolliseen muotoon sis\u00e4ltyy nimitilan etuliite, kaksoispiste ja nimi (esimerkiksi d:text).
+cmm.rest_api.properties_empty_null=Ominaisuudet eiv\u00e4t voi olla tyhji\u00e4 tai null-arvoisia.
+cmm.rest_api.property_create_name_already_in_use=Ominaisuuden luominen ei onnistu, koska ominaisuusnimi {0} on jo k\u00e4yt\u00f6ss\u00e4.
+cmm.rest_api.property_update_prop_not_found=Kohdetta {0} vastaavaa ominaisuutta ei l\u00f6ydy.
+cmm.rest_api.property_change_datatype_err=Et voi vaihtaa aktiivisen mallin ominaisuuden tietotyyppi\u00e4.
+cmm.rest_api.property_change_mandatory_opt_err=Et voi vaihtaa aktiivisen mallin ominaisuuden pakollista asetusta.
+cmm.rest_api.property_change_mandatory_enforced_opt_err=Et voi vaihtaa aktiivisen mallin ominaisuuden k\u00e4ytt\u00f6\u00f6n pakotettua asetusta.
+cmm.rest_api.property_change_multi_valued_opt_err=Et voi vaihtaa aktiivisen mallin ominaisuuden moniarvoista asetusta.
+# validation
+cmm.rest_api.input_validation_err={0} ei ole kelvollinen arvo. K\u00e4yt\u00e4 vain kirjaimia, numeroita, yhdysviivoja (-) ja alaviivoja (_).
+cmm.rest_api.prefix_not_registered=URI:lle {0} ei ole rekister\u00f6ity nimitilaetuliitett\u00e4. Varmista, ett\u00e4 malli on aktiivinen.
+cmm.rest_api.prefixed_qname_invalid={0} ei ole kelvollinen etuliitteell\u00e4 varustettu QName-arvo. {1}
+cmm.rest_api.circular_dependency_err=Havaittiin keh\u00e4riippuvuus. Et voi m\u00e4\u00e4ritt\u00e4\u00e4 yl\u00e4tasoa {0}, koska sen malli riippuu jo kohteesta {1}.
+cmm.rest_api.prefixed_qname_invalid_format={0} ei ole kelvollinen etuliitteell\u00e4 varustettu QName-muoto. Kelvolliseen muotoon sis\u00e4ltyy nimitilan etuliite, kaksoispiste ja nimi (esimerkiksi cm:content).
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=Mukautetussa mallissa voi olla vain yksi nimitila, mutta niit\u00e4 l\u00f6ytyi {0}.
+cmm.rest_api.model.import_namespace_undefined=Mukautetun mallin t\u00e4ytyy m\u00e4\u00e4ritt\u00e4\u00e4 nimitila.
+cmm.rest_api.model.import_associations_unsupported=Mukautettu malli ei tue associations-elementti\u00e4.
+cmm.rest_api.model.import_overrides_unsupported=Mukautettu malli ei tue overrides-elementti\u00e4.
+cmm.rest_api.model.import_mandatory_aspects_unsupported=Mukautettu malli ei tue mandatory-aspects-elementti\u00e4.
+cmm.rest_api.model.import_archive_unsupported=Mukautettu malli ei tue archive-elementti\u00e4.
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=Mukautettu malli ei tue includedInSuperTypeQuery-elementti\u00e4.
+cmm.rest_api.model.import_not_multi_part_req=Pyynt\u00f6 ei ole osa moniosaisia lomaketietoja.
+cmm.rest_api.model.import_not_zip_format={0} ei ole kelvollinen zip-tiedosto.
+cmm.rest_api.model.import_process_zip_file_failure=Zip-tiedoston k\u00e4sittely ei onnistu.
+cmm.rest_api.model.import_no_zip_file_uploaded=Zip-tiedoston lataaminen ei onnistu.
+cmm.rest_api.model.import_invalid_zip_package=Zip-tiedosto voi sis\u00e4lt\u00e4\u00e4 enint\u00e4\u00e4n kaksi tiedostoa. Sen tulisi sis\u00e4lt\u00e4\u00e4 yksi mallitiedosto ja yksi laajennusmoduulitiedosto.
+cmm.rest_api.model.import_invalid_zip_entry_format={0} ei ole malli tai Share-laajennusmoduulitiedosto.
+cmm.rest_api.model.import_invalid_model_entry={0} ei ole kelvollinen mallitiedosto.
+cmm.rest_api.model.import_invalid_ext_module_entry={0} ei ole kelvollinen Share-laajennusmoduulitiedosto.
+cmm.rest_api.model.import_failure=Mallin tuominen ei onnistu.
+cmm.rest_api.model.import_process_ext_module_file_failure=Share-laajennusmoduulitiedoston k\u00e4sittely ei onnistu.
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_fr.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_fr.properties
new file mode 100644
index 00000000000..9b87817954a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_fr.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=Le nom du mod\u00e8le ne peut pas \u00eatre null.
+cmm.rest_api.model_invalid=Mod\u00e8le personnalis\u00e9 non valide.
+cmm.rest_api.model_status_null=Le statut du mod\u00e8le ne peut pas \u00eatre null.
+cmm.rest_api.model_name_cannot_update=Impossible de mettre \u00e0 jour le nom du mod\u00e8le.
+cmm.rest_api.model_update_failure=Impossible de mettre \u00e0 jour le mod\u00e8le.
+cmm.rest_api.model_download_failure=Impossible de cr\u00e9er un n\u0153ud de t\u00e9l\u00e9chargement.
+cmm.rest_api.model_namespace_uri_null=L'URI d'espace de nom du mod\u00e8le ne peut pas \u00eatre null.
+cmm.rest_api.model_namespace_uri_invalid=L'URI d'espace de nom n'est pas valide. Utilisez uniquement des lettres, des chiffres et des caract\u00e8res URI.
+cmm.rest_api.model_namespace_prefix_null=Le pr\u00e9fixe d'espace de nom du mod\u00e8le ne peut pas \u00eatre null.
+# Type
+cmm.rest_api.type_name_null=Le nom du type ne peut pas \u00eatre null.
+cmm.rest_api.type_create_failure=Impossible de cr\u00e9er le type.
+cmm.rest_api.type_update_failure=Impossible de mettre \u00e0 jour le type.
+cmm.rest_api.type_parent_cannot_update=Impossible de mettre \u00e0 jour le parent du type dans un mod\u00e8le personnalis\u00e9 actif.
+cmm.rest_api.type_parent_not_exist=Impossible de d\u00e9finir le parent du type sur ''{0}'', car le type ''{0}'' n''existe pas.
+cmm.rest_api.type_cannot_delete=Impossible de supprimer un type dans un mod\u00e8le actif.
+cmm.rest_api.type_delete_failure=Impossible de supprimer le type.
+# Aspect
+cmm.rest_api.aspect_name_null=Le nom de l'aspect ne peut pas \u00eatre null.
+cmm.rest_api.aspect_create_failure=Impossible de cr\u00e9er l'aspect.
+cmm.rest_api.aspect_update_failure=Impossible de mettre \u00e0 jour l'aspect.
+cmm.rest_api.aspect_parent_cannot_update=Impossible de mettre \u00e0 jour le parent de l'aspect dans un mod\u00e8le personnalis\u00e9 actif.
+cmm.rest_api.aspect_parent_not_exist=Impossible de d\u00e9finir le parent de l''aspect sur ''{0}'', car l''aspect ''{0}'' n''existe pas.
+cmm.rest_api.aspect_cannot_delete=Impossible de supprimer un aspect dans un mod\u00e8le actif.
+cmm.rest_api.aspect_delete_failure=Impossible de supprimer l'aspect.
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=Impossible de supprimer ''{0}'' car ''{1}'' en d\u00e9pend.
+# Constraint
+cmm.rest_api.constraint_name_null=Le nom de la contrainte ne peut pas \u00eatre null.
+cmm.rest_api.constraint_create_failure=Impossible de cr\u00e9er la contrainte.
+cmm.rest_api.constraint_parameter_name_null=Le nom du param\u00e8tre de la contrainte ne peut pas \u00eatre null.
+cmm.rest_api.constraint_type_null=La contrainte personnalis\u00e9e doit avoir un attribut 'type'.
+cmm.rest_api.constraint_ref_not_defined=La r\u00e9f\u00e9rence de la contrainte ''{0}'' n''est pas d\u00e9finie par ce mod\u00e8le.
+cmm.rest_api.regex_constraint_invalid_expression=L''expression REGEX ''{0}'' n''est pas valide.
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' n''est pas une valeur ''double'' valide pour le param\u00e8tre MINMAX ''{1}''.
+cmm.rest_api.minmax_constraint_invalid_max_value=La valeur maximum de la contrainte MINMAX doit \u00eatre sup\u00e9rieure \u00e0 z\u00e9ro.
+cmm.rest_api.minmax_constraint_invalid_use=La contrainte MINMAX peut \u00eatre utilis\u00e9e uniquement avec un type de donn\u00e9es num\u00e9rique.
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' n''est pas une valeur ''entier'' valide pour le param\u00e8tre LENGTH ''{1}''.
+cmm.rest_api.length_constraint_invalid_use=La contrainte LENGTH peut \u00eatre utilis\u00e9e uniquement avec les types de donn\u00e9es TEXT, CONTENT et MLTEXT.
+# Property
+cmm.rest_api.property_name_null=Le nom de la propri\u00e9t\u00e9 ne peut pas \u00eatre null.
+cmm.rest_api.property_create_update_failure=Impossible de cr\u00e9er/mettre \u00e0 jour la propri\u00e9t\u00e9.
+cmm.rest_api.property_delete_failure=Impossible de supprimer la propri\u00e9t\u00e9.
+cmm.rest_api.property_datatype_invalid=''{0}'' n''est pas un format de type de donn\u00e9es valide. Un format valide se compose d''un pr\u00e9fixe d''espace de nom, suivi de deux-points et d''un nom, par exemple\u00a0: d:text.
+cmm.rest_api.properties_empty_null=Les propri\u00e9t\u00e9s ne peuvent pas \u00eatre vides ou null.
+cmm.rest_api.property_create_name_already_in_use=Impossible de cr\u00e9er la propri\u00e9t\u00e9 car le nom de propri\u00e9t\u00e9 ''{0}'' est d\u00e9j\u00e0 utilis\u00e9.
+cmm.rest_api.property_update_prop_not_found=Impossible de trouver une propri\u00e9t\u00e9 qui correspond \u00e0 ''{0}''.
+cmm.rest_api.property_change_datatype_err=Vous ne pouvez pas modifier le type de donn\u00e9es d'une propri\u00e9t\u00e9 dans un mod\u00e8le actif.
+cmm.rest_api.property_change_mandatory_opt_err=Vous ne pouvez pas modifier l'option obligatoire d'une propri\u00e9t\u00e9 dans un mod\u00e8le actif.
+cmm.rest_api.property_change_mandatory_enforced_opt_err=Vous ne pouvez pas modifier l'option obligatoire impos\u00e9e d'une propri\u00e9t\u00e9 dans un mod\u00e8le actif.
+cmm.rest_api.property_change_multi_valued_opt_err=Vous ne pouvez pas modifier l'option \u00e0 valeurs multiples d'une propri\u00e9t\u00e9 dans un mod\u00e8le actif.
+# validation
+cmm.rest_api.input_validation_err=''{0}'' n''est pas une valeur valide. Utilisez des chiffres, des lettres, des tirets (-) et des traits de soulignement (_) uniquement.
+cmm.rest_api.prefix_not_registered=Aucun pr\u00e9fixe d''espace de nom enregistr\u00e9 pour l''URI ''{0}''. Assurez-vous que le mod\u00e8le est actif.
+cmm.rest_api.prefixed_qname_invalid=''{0}'' n''est pas une valeur QName pr\u00e9fix\u00e9e valide. {1}
+cmm.rest_api.circular_dependency_err=Une d\u00e9pendance circulaire a \u00e9t\u00e9 d\u00e9tect\u00e9e. Impossible de d\u00e9finir le parent ''{0}'' car son mod\u00e8le d\u00e9pend d\u00e9j\u00e0 de ''{1}''.
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' n''est pas un format QName pr\u00e9fix\u00e9 valide. Un format valide se compose d''un pr\u00e9fixe d''espace de nom, suivi de deux-points et d''un nom, par exemple\u00a0: cm:content.
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=Le mod\u00e8le personnalis\u00e9 ne peut avoir qu''un seul espace de nom. ''{0}'' a \u00e9t\u00e9 trouv\u00e9.
+cmm.rest_api.model.import_namespace_undefined=Le mod\u00e8le personnalis\u00e9 doit d\u00e9finir un espace de nom.
+cmm.rest_api.model.import_associations_unsupported=Le mod\u00e8le personnalis\u00e9 ne prend pas en charge l'\u00e9l\u00e9ment 'associations'.
+cmm.rest_api.model.import_overrides_unsupported=Le mod\u00e8le personnalis\u00e9 ne prend pas en charge l'\u00e9l\u00e9ment 'overrides'.
+cmm.rest_api.model.import_mandatory_aspects_unsupported=Le mod\u00e8le personnalis\u00e9 ne prend pas en charge l'\u00e9l\u00e9ment 'mandatory-aspects'.
+cmm.rest_api.model.import_archive_unsupported=Le mod\u00e8le personnalis\u00e9 ne prend pas en charge l'\u00e9l\u00e9ment 'archive'.
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=Le mod\u00e8le personnalis\u00e9 ne prend pas en charge l'\u00e9l\u00e9ment 'includedInSuperTypeQuery'.
+cmm.rest_api.model.import_not_multi_part_req=La requ\u00eate n'est pas une donn\u00e9e de formulaire \u00e0 parties multiples.
+cmm.rest_api.model.import_not_zip_format=''{0}'' n''est pas un fichier zip valide.
+cmm.rest_api.model.import_process_zip_file_failure=Impossible de traiter le fichier zip.
+cmm.rest_api.model.import_no_zip_file_uploaded=Impossible d'importer le fichier zip.
+cmm.rest_api.model.import_invalid_zip_package=Le fichier zip ne peut pas comporter plus de deux fichiers. Il doit comporter un fichier de mod\u00e8le et un fichier de module d'extension.
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' n''est pas un fichier de mod\u00e8le ou de module d''extension Share.
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' n''est pas un fichier de mod\u00e8le valide.
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}'' n''est pas un fichier de module d''extension Share valide.
+cmm.rest_api.model.import_failure=Impossible d'importer le mod\u00e8le.
+cmm.rest_api.model.import_process_ext_module_file_failure=Impossible de traiter le fichier de module d'extension Share.
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_it.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_it.properties
new file mode 100644
index 00000000000..21ee6336259
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_it.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=Il nome modello non pu\u00f2 essere nullo.
+cmm.rest_api.model_invalid=Modello personalizzato non valido.
+cmm.rest_api.model_status_null=Lo stato del modello non pu\u00f2 essere nullo.
+cmm.rest_api.model_name_cannot_update=Impossibile aggiornare il nome modello.
+cmm.rest_api.model_update_failure=Impossibile aggiornare il modello.
+cmm.rest_api.model_download_failure=Impossibile creare un nodo di download.
+cmm.rest_api.model_namespace_uri_null=L'URI dello spazio dei nomi del modello non pu\u00f2 essere nullo.
+cmm.rest_api.model_namespace_uri_invalid=L'URI dello spazio dei nomi non \u00e8 valido. Utilizzare solo lettere, numeri e caratteri URI.
+cmm.rest_api.model_namespace_prefix_null=Il prefisso dello spazio dei nomi del modello non pu\u00f2 essere nullo.
+# Type
+cmm.rest_api.type_name_null=Il nome tipo non pu\u00f2 essere nullo.
+cmm.rest_api.type_create_failure=Impossibile creare il tipo.
+cmm.rest_api.type_update_failure=Impossibile aggiornare il tipo.
+cmm.rest_api.type_parent_cannot_update=Impossibile aggiornare il genitore del tipo in un modello personalizzato attivo.
+cmm.rest_api.type_parent_not_exist=Impossibile impostare il genitore del tipo su ''{0}'' perch\u00e9 il tipo ''{0}'' non esiste.
+cmm.rest_api.type_cannot_delete=Impossibile eliminare un tipo in un modello attivo.
+cmm.rest_api.type_delete_failure=Impossibile eliminare il tipo.
+# Aspect
+cmm.rest_api.aspect_name_null=Il nome aspetto non pu\u00f2 essere nullo.
+cmm.rest_api.aspect_create_failure=Impossibile creare l'aspetto.
+cmm.rest_api.aspect_update_failure=Impossibile aggiornare l'aspetto.
+cmm.rest_api.aspect_parent_cannot_update=Impossibile aggiornare il genitore dell'aspetto in un modello personalizzato attivo.
+cmm.rest_api.aspect_parent_not_exist=Impossibile impostare il genitore dell''aspetto su ''{0}'' perch\u00e9 l''aspetto ''{0}'' non esiste.
+cmm.rest_api.aspect_cannot_delete=Impossibile eliminare un aspetto in un modello attivo.
+cmm.rest_api.aspect_delete_failure=Impossibile eliminare l'aspetto.
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=Impossibile eliminare ''{0}'' perch\u00e9 ''{1}'' dipende da questo.
+# Constraint
+cmm.rest_api.constraint_name_null=Il nome vincolo non pu\u00f2 essere nullo.
+cmm.rest_api.constraint_create_failure=Impossibile creare il vincolo.
+cmm.rest_api.constraint_parameter_name_null=Il parametro del vincolo non pu\u00f2 essere nullo.
+cmm.rest_api.constraint_type_null=Il vincolo personalizzato deve avere un attributo ''tipo''.
+cmm.rest_api.constraint_ref_not_defined=Il riferimento vincolo ''{0}'' non \u00e8 definito da questo modello.
+cmm.rest_api.regex_constraint_invalid_expression=L''espressione REGEX ''{0}'' non \u00e8 valida.
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' non \u00e8 un valore ''doppio'' valido per il parametro MINMAX ''{1}''.
+cmm.rest_api.minmax_constraint_invalid_max_value=Il valore massimo del vincolo MINMAX deve essere maggiore di zero.
+cmm.rest_api.minmax_constraint_invalid_use=Il vincolo MINMAX pu\u00f2 essere utilizzato solo con il tipo di dati numerico.
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' non \u00e8 un valore ''intero'' valido per il parametro LENGTH ''{1}''.
+cmm.rest_api.length_constraint_invalid_use=\u00c8 possibile utilizzare solo il vincolo LENGTH con i tipi di dati TEXT, CONTENT e MLTEXT.
+# Property
+cmm.rest_api.property_name_null=Il nome propriet\u00e0 non pu\u00f2 essere nullo.
+cmm.rest_api.property_create_update_failure=Impossibile creare/aggiornare la propriet\u00e0.
+cmm.rest_api.property_delete_failure=Impossibile eliminare la propriet\u00e0.
+cmm.rest_api.property_datatype_invalid=''{0}'' non \u00e8 un formato tipo di dati valido. Un formato valido deve essere costituito da un prefisso dello spazio dei nomi, due punti e un nome, ad esempio: d:testo.
+cmm.rest_api.properties_empty_null=Le propriet\u00e0 non possono essere vuote o nulle.
+cmm.rest_api.property_create_name_already_in_use=Impossibile creare la propriet\u00e0 perch\u00e9 il nome propriet\u00e0 ''{0}'' \u00e8 gi\u00e0 in uso.
+cmm.rest_api.property_update_prop_not_found=Nessuna propriet\u00e0 trovata che corrisponda a ''{0}''.
+cmm.rest_api.property_change_datatype_err=Non \u00e8 possibile modificare il tipo di dati di una propriet\u00e0 in un modello attivo.
+cmm.rest_api.property_change_mandatory_opt_err=Non \u00e8 possibile modificare l'opzione obbligatoria di una propriet\u00e0 in un modello attivo.
+cmm.rest_api.property_change_mandatory_enforced_opt_err=Non \u00e8 possibile modificare l'opzione obbligatoria (imposta) di una propriet\u00e0 in un modello attivo.
+cmm.rest_api.property_change_multi_valued_opt_err=Non \u00e8 possibile modificare l'opzione multivalore di una propriet\u00e0 in un modello attivo.
+# validation
+cmm.rest_api.input_validation_err=''{0}'' non \u00e8 un valore valido. Utilizzare solo numeri, lettere, trattini (-) e caratteri di sottolineatura (_).
+cmm.rest_api.prefix_not_registered=Non esiste un prefisso dello spazio dei nomi registrato per l''URI ''{0}''. Assicurarsi che il modello sia attivo.
+cmm.rest_api.prefixed_qname_invalid=''{0}'' non \u00e8 un valore QName con prefisso valido. {1}
+cmm.rest_api.circular_dependency_err=\u00c8 stata rilevata una dipendenza circolare. Non \u00e8 possibile impostare il genitore''{0}'' perch\u00e9 il modello associato dipende gi\u00e0 da ''{1}''.
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' non \u00e8 un formato QName con prefisso valido. Un formato valido deve essere costituito da un prefisso dello spazio dei nomi, due punti e un nome, ad esempio: cm:contenuto.
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=Il modello personalizzato pu\u00f2 avere solo uno spazio dei nomi. \u00c8 stato trovato''{0}''.
+cmm.rest_api.model.import_namespace_undefined=Il modello personalizzato deve definire uno spazio dei nomi.
+cmm.rest_api.model.import_associations_unsupported=Il modello personalizzato non supporta l'elemento ''associations''.
+cmm.rest_api.model.import_overrides_unsupported=Il modello personalizzato non supporta l'elemento ''overrides''.
+cmm.rest_api.model.import_mandatory_aspects_unsupported=Il modello personalizzato non supporta l'elemento ''mandatory-aspects''.
+cmm.rest_api.model.import_archive_unsupported=Il modello personalizzato non supporta l'elemento ''archive''.
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=Il modello personalizzato non supporta l'elemento ''includedInSuperTypeQuery''.
+cmm.rest_api.model.import_not_multi_part_req=La richiesta non rappresenta dati di un modulo a pi\u00f9 parti.
+cmm.rest_api.model.import_not_zip_format=''{0}'' non \u00e8 un file zip valido.
+cmm.rest_api.model.import_process_zip_file_failure=Impossibile elaborare il file zip.
+cmm.rest_api.model.import_no_zip_file_uploaded=Impossibile caricare il file zip.
+cmm.rest_api.model.import_invalid_zip_package=Il file zip non pu\u00f2 contenere pi\u00f9 di due file. Deve contenere un file Modello e un file Estensione.
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' non \u00e8 un modello o un file modulo di estensione di Share.
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' non \u00e8 un file modello valido.
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}''non \u00e8 un file modulo di estensione di Share valido.
+cmm.rest_api.model.import_failure=Impossibile importare il modello.
+cmm.rest_api.model.import_process_ext_module_file_failure=Impossibile elaborare il file modulo di estensione di Share.
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_ja.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_ja.properties
new file mode 100644
index 00000000000..2c16716f2bd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_ja.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=\u30e2\u30c7\u30eb\u540d\u306f\u30cc\u30eb\u306b\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.model_invalid=\u7121\u52b9\u306a\u30ab\u30b9\u30bf\u30e0\u30e2\u30c7\u30eb\u3067\u3059\u3002
+cmm.rest_api.model_status_null=\u30e2\u30c7\u30eb\u306e\u30b9\u30c6\u30fc\u30bf\u30b9\u306f\u30cc\u30eb\u306b\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.model_name_cannot_update=\u30e2\u30c7\u30eb\u540d\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.model_update_failure=\u30e2\u30c7\u30eb\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+cmm.rest_api.model_download_failure=\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u30ce\u30fc\u30c9\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+cmm.rest_api.model_namespace_uri_null=\u30e2\u30c7\u30eb\u306e\u540d\u524d\u7a7a\u9593 URI \u306f\u30cc\u30eb\u306b\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.model_namespace_uri_invalid=\u540d\u524d\u7a7a\u9593 URI \u304c\u7121\u52b9\u3067\u3059\u3002 \u82f1\u5b57\u3001\u6570\u5b57\u3001URI \u6587\u5b57\u3060\u3051\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+cmm.rest_api.model_namespace_prefix_null=\u30e2\u30c7\u30eb\u306e\u540d\u524d\u7a7a\u9593\u30d7\u30ec\u30d5\u30a3\u30c3\u30af\u30b9\u306f\u30cc\u30eb\u306b\u3067\u304d\u307e\u305b\u3093\u3002
+# Type
+cmm.rest_api.type_name_null=\u30bf\u30a4\u30d7\u540d\u306f\u30cc\u30eb\u306b\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.type_create_failure=\u30bf\u30a4\u30d7\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+cmm.rest_api.type_update_failure=\u30bf\u30a4\u30d7\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+cmm.rest_api.type_parent_cannot_update=\u6709\u52b9\u5316\u3055\u308c\u3066\u3044\u308b\u30ab\u30b9\u30bf\u30e0\u30e2\u30c7\u30eb\u306e\u89aa\u30bf\u30a4\u30d7\u306f\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.type_parent_not_exist=\u30bf\u30a4\u30d7 ''{0}'' \u306f\u5b58\u5728\u3057\u306a\u3044\u305f\u3081\u3001''{0}'' \u306b\u89aa\u30bf\u30a4\u30d7\u306f\u8a2d\u5b9a\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.type_cannot_delete=\u6709\u52b9\u5316\u3055\u308c\u3066\u3044\u308b\u30e2\u30c7\u30eb\u306e\u30bf\u30a4\u30d7\u306f\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.type_delete_failure=\u30bf\u30a4\u30d7\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+# Aspect
+cmm.rest_api.aspect_name_null=\u30a2\u30b9\u30da\u30af\u30c8\u540d\u306f\u30cc\u30eb\u306b\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.aspect_create_failure=\u30a2\u30b9\u30da\u30af\u30c8\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+cmm.rest_api.aspect_update_failure=\u30a2\u30b9\u30da\u30af\u30c8\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+cmm.rest_api.aspect_parent_cannot_update=\u6709\u52b9\u5316\u3055\u308c\u3066\u3044\u308b\u30ab\u30b9\u30bf\u30e0\u30e2\u30c7\u30eb\u306e\u89aa\u30a2\u30b9\u30da\u30af\u30c8\u306f\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.aspect_parent_not_exist=\u30a2\u30b9\u30da\u30af\u30c8 ''{0}'' \u306f\u5b58\u5728\u3057\u306a\u3044\u305f\u3081\u3001''{0}'' \u306b\u89aa\u30a2\u30b9\u30da\u30af\u30c8\u306f\u8a2d\u5b9a\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.aspect_cannot_delete=\u6709\u52b9\u5316\u3055\u308c\u3066\u3044\u308b\u30e2\u30c7\u30eb\u306e\u30a2\u30b9\u30da\u30af\u30c8\u306f\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.aspect_delete_failure=\u30a2\u30b9\u30da\u30af\u30c8\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=''{0}'' \u306f ''{1}'' \u306e\u4f9d\u5b58\u5148\u3067\u3042\u308b\u305f\u3081\u3001\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002
+# Constraint
+cmm.rest_api.constraint_name_null=\u5236\u7d04\u540d\u306f\u30cc\u30eb\u306b\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.constraint_create_failure=\u5236\u7d04\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+cmm.rest_api.constraint_parameter_name_null=\u5236\u7d04\u30d1\u30e9\u30e1\u30fc\u30bf\u540d\u306f\u30cc\u30eb\u306b\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.constraint_type_null=\u30ab\u30b9\u30bf\u30e0\u306e\u5236\u7d04\u306b\u306f 'type' \u5c5e\u6027\u304c\u5fc5\u8981\u3067\u3059\u3002
+cmm.rest_api.constraint_ref_not_defined=\u5236\u7d04\u306e\u53c2\u7167 ''{0}'' \u306f\u3001\u3053\u306e\u30e2\u30c7\u30eb\u3067\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+cmm.rest_api.regex_constraint_invalid_expression=REGEX \u8868\u73fe ''{0}'' \u304c\u7121\u52b9\u3067\u3059\u3002
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' \u306f MINMAX \u30d1\u30e9\u30e1\u30fc\u30bf ''{1}'' \u306e\u6709\u52b9\u306a\u500d\u7cbe\u5ea6\u5024\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+cmm.rest_api.minmax_constraint_invalid_max_value=MINMAX \u5236\u7d04\u306e\u6700\u5927\u5024\u306f\u3001\u30bc\u30ed\u3088\u308a\u5927\u304d\u304f\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+cmm.rest_api.minmax_constraint_invalid_use=MINMAX \u5236\u7d04\u306f\u3001\u6570\u5b57\u306e\u30c7\u30fc\u30bf\u578b\u3067\u3057\u304b\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' \u306f\u3001LENGTH \u30d1\u30e9\u30e1\u30fc\u30bf ''{1}'' \u306e\u6709\u52b9\u306a\u6574\u6570\u5024\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+cmm.rest_api.length_constraint_invalid_use=LENGTH \u5236\u7d04\u306f\u3001TEXT\u3001CONTENT\u3001MLTEXT \u306e\u30c7\u30fc\u30bf\u578b\u3067\u3057\u304b\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
+# Property
+cmm.rest_api.property_name_null=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\u306f\u30cc\u30eb\u306b\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.property_create_update_failure=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u4f5c\u6210\u307e\u305f\u306f\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+cmm.rest_api.property_delete_failure=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+cmm.rest_api.property_datatype_invalid=''{0}'' \u306f\u6709\u52b9\u306a\u30c7\u30fc\u30bf\u578b\u5f62\u5f0f\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 \u6709\u52b9\u306a\u5f62\u5f0f\u306f\u3001\u540d\u524d\u7a7a\u9593\u30d7\u30ec\u30d5\u30a3\u30c3\u30af\u30b9\u3001\u30b3\u30ed\u30f3 (:)\u3001\u540d\u524d\u306e\u7d44\u307f\u5408\u308f\u305b\u3067\u3059\u3002\u4f8b: d:text\u3002
+cmm.rest_api.properties_empty_null=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u7a7a\u307e\u305f\u306f\u30cc\u30eb\u306b\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.property_create_name_already_in_use=''{0}'' \u3068\u3044\u3046\u30d7\u30ed\u30d1\u30c6\u30a3\u540d\u306f\u3059\u3067\u306b\u4f7f\u308f\u308c\u3066\u3044\u308b\u305f\u3081\u3001\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+cmm.rest_api.property_update_prop_not_found=''{0}'' \u3068\u4e00\u81f4\u3059\u308b\u30d7\u30ed\u30d1\u30c6\u30a3\u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+cmm.rest_api.property_change_datatype_err=\u6709\u52b9\u5316\u3055\u308c\u3066\u3044\u308b\u30e2\u30c7\u30eb\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u30c7\u30fc\u30bf\u578b\u306f\u5909\u66f4\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.property_change_mandatory_opt_err=\u6709\u52b9\u5316\u3055\u308c\u3066\u3044\u308b\u30e2\u30c7\u30eb\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u5fc5\u9808\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u5909\u66f4\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.property_change_mandatory_enforced_opt_err=\u6709\u52b9\u5316\u3055\u308c\u3066\u3044\u308b\u30e2\u30c7\u30eb\u306e\u5fc5\u9808\u81ea\u52d5\u5165\u529b\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u5909\u66f4\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.property_change_multi_valued_opt_err=\u6709\u52b9\u5316\u3055\u308c\u3066\u3044\u308b\u30e2\u30c7\u30eb\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u8907\u6570\u5024\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u5909\u66f4\u3067\u304d\u307e\u305b\u3093\u3002
+# validation
+cmm.rest_api.input_validation_err=''{0}'' \u306f\u6709\u52b9\u306a\u5024\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 \u6570\u5b57\u3001\u82f1\u5b57\u3001\u30cf\u30a4\u30d5\u30f3 (-)\u3001\u30a2\u30f3\u30c0\u30fc\u30b9\u30b3\u30a2 (_) \u3060\u3051\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+cmm.rest_api.prefix_not_registered=URI ''{0}'' \u7528\u306b\u767b\u9332\u3055\u308c\u3066\u3044\u308b\u540d\u524d\u7a7a\u9593\u30d7\u30ec\u30d5\u30a3\u30c3\u30af\u30b9\u304c\u3042\u308a\u307e\u305b\u3093\u3002 \u30e2\u30c7\u30eb\u304c\u6709\u52b9\u5316\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044.
+cmm.rest_api.prefixed_qname_invalid=''{0}'' \u306f\u6709\u52b9\u306a\u30d7\u30ec\u30d5\u30a3\u30c3\u30af\u30b9\u4ed8\u304d QName \u5024\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 {1}
+cmm.rest_api.circular_dependency_err=\u5faa\u74b0\u4f9d\u5b58\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f\u3002 ''{0}'' \u306f\u3059\u3067\u306b ''{1}'' \u306b\u4f9d\u5b58\u3059\u308b\u30e2\u30c7\u30eb\u3067\u3042\u308b\u305f\u3081\u3001\u89aa\u3092\u8a2d\u5b9a\u3067\u304d\u307e\u305b\u3093.
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' \u306f\u6709\u52b9\u306a\u30d7\u30ec\u30d5\u30a3\u30c3\u30af\u30b9\u4ed8\u304d QName \u5f62\u5f0f\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 \u6709\u52b9\u306a\u5f62\u5f0f\u306f\u3001\u540d\u524d\u7a7a\u9593\u30d7\u30ec\u30d5\u30a3\u30c3\u30af\u30b9\u3001\u30b3\u30ed\u30f3 (:)\u3001\u540d\u524d\u306e\u7d44\u307f\u5408\u308f\u305b\u3067\u3059\u3002\u4f8b: cm:content\u3002
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=\u30ab\u30b9\u30bf\u30e0\u30e2\u30c7\u30eb\u306b\u5b9a\u7fa9\u3067\u304d\u308b\u540d\u524d\u7a7a\u9593\u306f 1 \u3064\u3060\u3051\u3067\u3059\u304c\u3001 ''{0}'' \u500b\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002
+cmm.rest_api.model.import_namespace_undefined=\u30ab\u30b9\u30bf\u30e0\u30e2\u30c7\u30eb\u306b\u540d\u524d\u7a7a\u9593\u3092 1 \u3064\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
+cmm.rest_api.model.import_associations_unsupported=\u3053\u306e\u30ab\u30b9\u30bf\u30e0\u30e2\u30c7\u30eb\u3067\u306f 'associations' \u8981\u7d20\u3092\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.model.import_overrides_unsupported=\u3053\u306e\u30ab\u30b9\u30bf\u30e0\u30e2\u30c7\u30eb\u3067\u306f 'overrides' \u8981\u7d20\u3092\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.model.import_mandatory_aspects_unsupported=\u3053\u306e\u30ab\u30b9\u30bf\u30e0\u30e2\u30c7\u30eb\u3067\u306f 'mandatory-aspects' \u8981\u7d20\u3092\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.model.import_archive_unsupported=\u3053\u306e\u30ab\u30b9\u30bf\u30e0\u30e2\u30c7\u30eb\u3067\u306f 'archive' \u8981\u7d20\u3092\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=\u3053\u306e\u30ab\u30b9\u30bf\u30e0\u30e2\u30c7\u30eb\u3067\u306f 'includedInSuperTypeQuery' \u8981\u7d20\u3092\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
+cmm.rest_api.model.import_not_multi_part_req=\u30ea\u30af\u30a8\u30b9\u30c8\u306f\u30de\u30eb\u30c1\u30d1\u30fc\u30c8\u306e\u30d5\u30a9\u30fc\u30e0\u30c7\u30fc\u30bf\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+cmm.rest_api.model.import_not_zip_format=''{0}'' \u306f\u6709\u52b9\u306a zip \u30d5\u30a1\u30a4\u30eb\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+cmm.rest_api.model.import_process_zip_file_failure=zip \u30d5\u30a1\u30a4\u30eb\u3092\u51e6\u7406\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+cmm.rest_api.model.import_no_zip_file_uploaded=zip \u30d5\u30a1\u30a4\u30eb\u3092\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+cmm.rest_api.model.import_invalid_zip_package=\u3053\u306e zip \u30d5\u30a1\u30a4\u30eb\u306b 3 \u3064\u4ee5\u4e0a\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u542b\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002 \u30e2\u30c7\u30eb\u30d5\u30a1\u30a4\u30eb\u3068\u62e1\u5f35\u30e2\u30b8\u30e5\u30fc\u30eb\u30d5\u30a1\u30a4\u30eb\u3092\u305d\u308c\u305e\u308c 1 \u3064\u305a\u3064\u542b\u3081\u308b\u3088\u3046\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' \u306f\u30e2\u30c7\u30eb\u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f Share \u62e1\u5f35\u30e2\u30b8\u30e5\u30fc\u30eb\u30d5\u30a1\u30a4\u30eb\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' \u306f\u6709\u52b9\u306a\u30e2\u30c7\u30eb\u30d5\u30a1\u30a4\u30eb\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}'' \u306f\u6709\u52b9\u306a Share \u62e1\u5f35\u30e2\u30b8\u30e5\u30fc\u30eb\u30d5\u30a1\u30a4\u30eb\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+cmm.rest_api.model.import_failure=\u30e2\u30c7\u30eb\u3092\u30a4\u30f3\u30dd\u30fc\u30c8\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+cmm.rest_api.model.import_process_ext_module_file_failure=Share \u62e1\u5f35\u30e2\u30b8\u30e5\u30fc\u30eb\u30d5\u30a1\u30a4\u30eb\u3092\u51e6\u7406\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_nb.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_nb.properties
new file mode 100644
index 00000000000..1cbaf696697
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_nb.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=Modellnavn kan ikke v\u00e6re null.
+cmm.rest_api.model_invalid=Ugyldig tilpasset modell.
+cmm.rest_api.model_status_null=Modellstatus kan ikke v\u00e6re null.
+cmm.rest_api.model_name_cannot_update=Modellnavnet kan ikke oppdateres.
+cmm.rest_api.model_update_failure=Vi kan ikke oppdatere modellen.
+cmm.rest_api.model_download_failure=Vi kan ikke opprette en nedlastingsnode.
+cmm.rest_api.model_namespace_uri_null=Modellens URI for navneomr\u00e5det kan ikke v\u00e6re null.
+cmm.rest_api.model_namespace_uri_invalid=URI for navneomr\u00e5det er ugyldig. Bruk kun bokstaver, tall og URI-tegn.
+cmm.rest_api.model_namespace_prefix_null=Modellens prefiks for navneomr\u00e5det kan ikke v\u00e6re null.
+# Type
+cmm.rest_api.type_name_null=Type navn kan ikke v\u00e6re null.
+cmm.rest_api.type_create_failure=Vi kan ikke opprette typen.
+cmm.rest_api.type_update_failure=Vi kan ikke oppdatere typen.
+cmm.rest_api.type_parent_cannot_update=Du kan ikke oppdatere typens overordnede i en aktiv, tilpasset modell.
+cmm.rest_api.type_parent_not_exist=Du kan ikke angi typens overordnede som ''{0}'', fordi typen ''{0}'' finnes ikke.
+cmm.rest_api.type_cannot_delete=En type i en aktiv modell kan ikke slettes.
+cmm.rest_api.type_delete_failure=Vi kan ikke slette typen.
+# Aspect
+cmm.rest_api.aspect_name_null=Aspektnavn kan ikke v\u00e6re null.
+cmm.rest_api.aspect_create_failure=Vi kan ikke opprette aspektet.
+cmm.rest_api.aspect_update_failure=Vi kan ikke oppdatere aspektet.
+cmm.rest_api.aspect_parent_cannot_update=Du kan ikke oppdatere det aspektets overordnede i en aktiv, tilpasset modell.
+cmm.rest_api.aspect_parent_not_exist=Du kan ikke angi aspektets overordnede til ''{0}'', fordi aspektet ''{0}'' finnes ikke.
+cmm.rest_api.aspect_cannot_delete=Et aspekt i en aktiv modell kan ikke slettes.
+cmm.rest_api.aspect_delete_failure=Vi kan ikke slette aspektet.
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=''{0}'' kan ikke slettes fordi ''{1}'' er avhengig av den.
+# Constraint
+cmm.rest_api.constraint_name_null=Restriksjonsnavn kan ikke v\u00e6re null.
+cmm.rest_api.constraint_create_failure=Vi kan ikke opprette restriksjon.
+cmm.rest_api.constraint_parameter_name_null=Restriksjonsparameternavn kan ikke v\u00e6re null.
+cmm.rest_api.constraint_type_null=Tilpasset restriksjon m\u00e5 ha en 'type' attributt.
+cmm.rest_api.constraint_ref_not_defined=Restriksjonsreferansen ''{0}'' defineres ikke av denne modellen.
+cmm.rest_api.regex_constraint_invalid_expression=REGEX-uttrykket ''{0}'' er ikke gyldig.
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' er ikke et gyldig ''dobbel'' verdi for MINMAX-parameteret ''{1}''.
+cmm.rest_api.minmax_constraint_invalid_max_value=Maksimalverdien til MINMAX-restriksjonen m\u00e5 v\u00e6re st\u00f8rre enn null.
+cmm.rest_api.minmax_constraint_invalid_use=MINMAX-restriksjon kan bare brukes med nummerisk datatype.
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' er ikke et gyldig ''helt tall'' for LENGTH-parameteret ''{1}''.
+cmm.rest_api.length_constraint_invalid_use=Kun LENGTH-restriksjonen kan brukes sammen med TEXT-, CONTENT- og MLTEXT-datatyper.
+# Property
+cmm.rest_api.property_name_null=Egenskapsnavn kan ikke v\u00e6re null.
+cmm.rest_api.property_create_update_failure=Vi kan ikke opprette/oppdatere egenskap.
+cmm.rest_api.property_delete_failure=Vi kan ikke slette egenskapen.
+cmm.rest_api.property_datatype_invalid=''{0}'' er ikke gyldig datatypeformat. Et gyldig format skal best\u00e5 av prefiks for til navneomr\u00e5de, kolon og et navn, som f.eks: d:tekst.
+cmm.rest_api.properties_empty_null=Egenskapene kan ikke v\u00e6re tomme eller null.
+cmm.rest_api.property_create_name_already_in_use=Vi kan ikke opprette egenskapen fordi egenskapsnavnet ''{0}'' er allerede i bruk.
+cmm.rest_api.property_update_prop_not_found=Vi kan ikke finne en egenskap som stemmer overens med ''{0}''.
+cmm.rest_api.property_change_datatype_err=Du kan ikke endre datatypen til en egenskap i en aktiv modell.
+cmm.rest_api.property_change_mandatory_opt_err=Du kan ikke endre det obligatoriske alternativet til en egenskap i en aktiv modell.
+cmm.rest_api.property_change_mandatory_enforced_opt_err=Du kan ikke endre det obligatoriske, h\u00e5ndhevede alternativet til en egenskap i en aktiv modell.
+cmm.rest_api.property_change_multi_valued_opt_err=Du kan ikke endre alternativet med flere verdier til en egenskap i en aktiv modell.
+# validation
+cmm.rest_api.input_validation_err=''{0}'' er ikke en gyldig verdi. Bruk kun tall, bokstaver, bindestreker (-) og understreking (_).
+cmm.rest_api.prefix_not_registered=Det finnes ikke en prefiks for navneomr\u00e5det som er registrert for URI-en ''{0}''. Kontroller at modellen er aktiv.
+cmm.rest_api.prefixed_qname_invalid=''{0}'' er ikke en gyldig forh\u00e5ndsbestemt QName-verdi. {1}
+cmm.rest_api.circular_dependency_err=En det funnet en sirkul\u00e6r avhengighet. Du kan ikke angi overordnede ''{0}'' fordi dens modell er allerede avhengig av ''{1}''.
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' er ikke et gyldig forh\u00e5ndsbestemt QName-format. Et gyldig format skal best\u00e5 av en prefiks for navneomr\u00e5det, et kolon og et navn, som f.eks: cm:innhold.
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=Den tilpassede modellen kan bare ha ett navneomr\u00e5de. Vi fant ''{0}''.
+cmm.rest_api.model.import_namespace_undefined=Den tilpassede modellen m\u00e5 definere et navneomr\u00e5de.
+cmm.rest_api.model.import_associations_unsupported=Den tilpassede modellen st\u00f8tter ikke elementet 'associations'.
+cmm.rest_api.model.import_overrides_unsupported=Den tilpassede modellen st\u00f8tter ikke elementet 'overrides'.
+cmm.rest_api.model.import_mandatory_aspects_unsupported=Den tilpassed modellen st\u00f8tter ikke elementet 'mandatory-aspects'.
+cmm.rest_api.model.import_archive_unsupported=Den tilpassede modellen st\u00f8tter ikke elementet 'archive'.
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=Den tilpassede modellen st\u00f8tter ikke elementet 'includedInSuperTypeQuery'.
+cmm.rest_api.model.import_not_multi_part_req=Foresp\u00f8rselen har data med flere deler.
+cmm.rest_api.model.import_not_zip_format=''{0}'' er ikke gyldig zip-format.
+cmm.rest_api.model.import_process_zip_file_failure=Vi kan ikke behandle zip-filen.
+cmm.rest_api.model.import_no_zip_file_uploaded=Vi kan ikke laste opp zip-filen.
+cmm.rest_api.model.import_invalid_zip_package=Zip-filen kan ikke ha flere enn to filer. Det skal v\u00e6re \u00e9n modellfil og \u00e9n utvidelsesmodulfil.
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' er ikke en modell eller Share-utvidelsesmodulfil.
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' er ikke en gyldig modellfil.
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}'' er ikke en gyldig Share-utvidelsesmodulfil.
+cmm.rest_api.model.import_failure=Vi kan ikke importere modellen.
+cmm.rest_api.model.import_process_ext_module_file_failure=Vi kan ikke behandle Share-utvidelsesmodulfilen.
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_nl.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_nl.properties
new file mode 100644
index 00000000000..acd43d5757b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_nl.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=Modelnaam kan niet null zijn.
+cmm.rest_api.model_invalid=Ongeldig aangepast model.
+cmm.rest_api.model_status_null=Modelstatus kan niet null zijn.
+cmm.rest_api.model_name_cannot_update=U kunt de modelnaam niet bijwerken.
+cmm.rest_api.model_update_failure=Kan het model niet bijwerken.
+cmm.rest_api.model_download_failure=Kan geen downloadnode maken.
+cmm.rest_api.model_namespace_uri_null=De modelnaamruimte-URI kan niet null zijn.
+cmm.rest_api.model_namespace_uri_invalid=De naamruimte-URI is ongeldig. Gebruik alleen letters, cijfers en URI-tekens.
+cmm.rest_api.model_namespace_prefix_null=Modelnaamruimtevoorvoegsel kan niet null zijn.
+# Type
+cmm.rest_api.type_name_null=Typenaam kan niet null zijn.
+cmm.rest_api.type_create_failure=Kan het type niet maken.
+cmm.rest_api.type_update_failure=Kan het type niet bijwerken.
+cmm.rest_api.type_parent_cannot_update=U kunt het bovenliggende type van een type in een actief aangepast model niet bijwerken.
+cmm.rest_api.type_parent_not_exist=U kunt het bovenliggende type van het type niet instellen op ''{0}'' omdat het type ''{0}'' niet bestaat.
+cmm.rest_api.type_cannot_delete=U kunt een type in een actief model niet verwijderen.
+cmm.rest_api.type_delete_failure=Kan het type niet verwijderen.
+# Aspect
+cmm.rest_api.aspect_name_null=Aspectnaam kan niet null zijn.
+cmm.rest_api.aspect_create_failure=Kan het aspect niet maken.
+cmm.rest_api.aspect_update_failure=Kan het aspect niet bijwerken.
+cmm.rest_api.aspect_parent_cannot_update=U kunt het bovenliggende aspect van het aspect in een actief aangepast model niet bijwerken.
+cmm.rest_api.aspect_parent_not_exist=U kunt het bovenliggende aspect van het aspect niet instellen op ''{0}'' omdat het aspect ''{0}'' niet bestaat.
+cmm.rest_api.aspect_cannot_delete=U kunt een aspect in een actief model niet verwijderen.
+cmm.rest_api.aspect_delete_failure=Kan het aspect niet verwijderen.
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=U kunt ''{0}'' niet verwijderen omdat ''{1}'' hiervan afhankelijk is.
+# Constraint
+cmm.rest_api.constraint_name_null=Beperkingsnaam kan niet null zijn.
+cmm.rest_api.constraint_create_failure=Kan beperking niet maken.
+cmm.rest_api.constraint_parameter_name_null=Beperkingsparameter kan niet null zijn.
+cmm.rest_api.constraint_type_null=Aangepaste beperking moet een 'type'-kenmerk hebben.
+cmm.rest_api.constraint_ref_not_defined=Beperkingsverwijzing ''{0}'' wordt niet gedefinieerd door dit model.
+cmm.rest_api.regex_constraint_invalid_expression=REGEX-expressie ''{0}'' is niet geldig.
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' is geen geldige ''dubbele'' waarde voor de MINMAX-parameter ''{1}''.
+cmm.rest_api.minmax_constraint_invalid_max_value=De maximale waarde van de MINMAX-beperking moet hoger zijn dan nul.
+cmm.rest_api.minmax_constraint_invalid_use=MINMAX-beperking kan alleen worden gebruikt met een numeriek gegevenstype.
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' is geen geldige ''integer''-waarde voor de LENGTH-parameter ''{1}''.
+cmm.rest_api.length_constraint_invalid_use=U kunt de LENGTH-beperking alleen gebruiken met TEXT-, CONTENT- en MLTEXT-gegevenstypen.
+# Property
+cmm.rest_api.property_name_null=Eigenschapsnaam kan niet null zijn.
+cmm.rest_api.property_create_update_failure=Kan de eigenschap niet maken/bijwerken.
+cmm.rest_api.property_delete_failure=Kan de eigenschap niet verwijderen.
+cmm.rest_api.property_datatype_invalid=''{0}'' is geen geldige gegevenstype-indeling. Een geldige indeling moet bestaan uit een naamruimtevoorvoegsel, een dubbele punt en een naam, bijvoorbeeld: d:tekst.
+cmm.rest_api.properties_empty_null=Eigenschappen kunnen niet leeg of null zijn.
+cmm.rest_api.property_create_name_already_in_use=Kan de eigenschap niet maken omdat de eigenschapsnaam ''{0}'' al in gebruik is.
+cmm.rest_api.property_update_prop_not_found=Kan geen eigenschap vinden dat overeenkomt met ''{0}''.
+cmm.rest_api.property_change_datatype_err=U kunt het gegevenstype van een eigenschap in een actief model niet wijzigen.
+cmm.rest_api.property_change_mandatory_opt_err=U kunt de verplichte optie van een eigenschap in een actief model niet wijzigen.
+cmm.rest_api.property_change_mandatory_enforced_opt_err=U kunt de verplichte-afgedwongen optie van een eigenschap in een actief model niet wijzigen.
+cmm.rest_api.property_change_multi_valued_opt_err=U kunt de meerwaardige optie van een eigenschap in een actief model niet wijzigen.
+# validation
+cmm.rest_api.input_validation_err=''{0}'' is geen geldige waarde. Gebruik alleen cijfers, letters, afbreekstreepjes (-) en onderstrepingstekens (_).
+cmm.rest_api.prefix_not_registered=Er is geen naamruimtevoorvoegsel geregistreerd voor de URI ''{0}''. Controleer of het model actief is.
+cmm.rest_api.prefixed_qname_invalid=''{0}'' is geen geldige waarde voor QName met voorvoegsel. {1}
+cmm.rest_api.circular_dependency_err=Er is een circulaire afhankelijkheid vastgesteld. U kunt het bovenliggende element ''{0}'' niet instellen, omdat het bijbehorende model al afhankelijk is van ''{1}''.
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' is geen geldige indeling voor QName met voorvoegsel. Een geldige indeling moet bestaan uit een naamruimtevoorvoegsel, een dubbele punt en een naam, bijvoorbeeld: cm:content.
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=Het aangepaste model kan slechts \u00e9\u00e9n naamruimte hebben. ''{0}'' gevonden.
+cmm.rest_api.model.import_namespace_undefined=Het aangepaste model moet een naamruimte defini\u00ebren.
+cmm.rest_api.model.import_associations_unsupported=Het aangepaste model biedt geen ondersteuning voor het element 'associations'.
+cmm.rest_api.model.import_overrides_unsupported=Het aangepaste model biedt geen ondersteuning voor het element 'overrides'.
+cmm.rest_api.model.import_mandatory_aspects_unsupported=Het aangepaste model biedt geen ondersteuning voor het element 'mandatory-aspects'.
+cmm.rest_api.model.import_archive_unsupported=Het aangepaste model biedt geen ondersteuning voor het element 'archive'.
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=Het aangepaste model biedt geen ondersteuning voor het element 'includedInSuperTypeQuery'.
+cmm.rest_api.model.import_not_multi_part_req=Aanvraag betreft geen meerdelige-formuliergegevens.
+cmm.rest_api.model.import_not_zip_format=''{0}'' is geen geldig .zip-bestand.
+cmm.rest_api.model.import_process_zip_file_failure=Kan het .zip-bestand niet verwerken.
+cmm.rest_api.model.import_no_zip_file_uploaded=Kan het .zip-bestand niet uploaden.
+cmm.rest_api.model.import_invalid_zip_package=Het .zip-bestand kan niet meer dan twee bestanden bevatten. Er moet \u00e9\u00e9n modelbestand en \u00e9\u00e9n extensiemodulebestand zijn.
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' is geen modelbestand of een Share-extensiemodulebestand.
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' is geen geldig modelbestand.
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}'' is geen Share-extensiemodulebestand.
+cmm.rest_api.model.import_failure=Kan het model niet importeren.
+cmm.rest_api.model.import_process_ext_module_file_failure=Kan het Share-extensiemodulebestand niet verwerken.
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_pl.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_pl.properties
new file mode 100644
index 00000000000..43ad9590fa4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_pl.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=Nazwa modelu nie mo\u017ce by\u0107 pusta.
+cmm.rest_api.model_invalid=Nieprawid\u0142owy model niestandardowy.
+cmm.rest_api.model_status_null=Status modelu nie mo\u017ce by\u0107 pusty.
+cmm.rest_api.model_name_cannot_update=Nie mo\u017cna zaktualizowa\u0107 nazwy modelu.
+cmm.rest_api.model_update_failure=Nie mo\u017cna zaktualizowa\u0107 modelu.
+cmm.rest_api.model_download_failure=Nie mo\u017cna utworzy\u0107 w\u0119z\u0142a pobierania.
+cmm.rest_api.model_namespace_uri_null=Przestrze\u0144 nazw modelu URI nie mo\u017ce by\u0107 pusta.
+cmm.rest_api.model_namespace_uri_invalid=Przestrze\u0144 nazw URI jest nieprawid\u0142owa. U\u017cyj tylko liter, cyfr i znak\u00f3w identyfikatora URI.
+cmm.rest_api.model_namespace_prefix_null=Prefiks przestrzeni nazw modelu nie mo\u017ce by\u0107 pusty.
+# Type
+cmm.rest_api.type_name_null=Nazwa typu nie mo\u017ce by\u0107 pusta.
+cmm.rest_api.type_create_failure=Nie mo\u017cna utworzy\u0107 typu.
+cmm.rest_api.type_update_failure=Nie mo\u017cna zaktualizowa\u0107 typu.
+cmm.rest_api.type_parent_cannot_update=Nie mo\u017cna zaktualizowa\u0107 typu nadrz\u0119dnego w aktywnym modelu niestandardowym.
+cmm.rest_api.type_parent_not_exist=Nie mo\u017cna ustawi\u0107 typu nadrz\u0119dnego dla ''{0}'', poniewa\u017c typ ''{0}'' nie istnieje.
+cmm.rest_api.type_cannot_delete=Nie mo\u017cna usun\u0105\u0107 typu w aktywnym modelu.
+cmm.rest_api.type_delete_failure=Nie mo\u017cna usun\u0105\u0107 typu.
+# Aspect
+cmm.rest_api.aspect_name_null=Nazwa aspektu nie mo\u017ce by\u0107 pusta.
+cmm.rest_api.aspect_create_failure=Nie mo\u017cna utworzy\u0107 aspektu.
+cmm.rest_api.aspect_update_failure=Nie mo\u017cna zaktualizowa\u0107 aspektu.
+cmm.rest_api.aspect_parent_cannot_update=Nie mo\u017cna zaktualizowa\u0107 aspektu nadrz\u0119dnego w aktywnym modelu niestandardowym.
+cmm.rest_api.aspect_parent_not_exist=Nie mo\u017cna ustawi\u0107 aspektu nadrz\u0119dnego dla ''{0}'', poniewa\u017c typ ''{0}'' nie istnieje.
+cmm.rest_api.aspect_cannot_delete=Nie mo\u017cna usun\u0105\u0107 aspektu w aktywnym modelu.
+cmm.rest_api.aspect_delete_failure=Nie mo\u017cna usun\u0105\u0107 aspektu.
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=Nie mo\u017cna usun\u0105\u0107 ''{0}'', poniewa\u017c element ''{1}'' jest od niego zale\u017cny.
+# Constraint
+cmm.rest_api.constraint_name_null=Nazwa ograniczenia nie mo\u017ce by\u0107 pusta.
+cmm.rest_api.constraint_create_failure=Nie mo\u017cna utworzy\u0107 ograniczenia.
+cmm.rest_api.constraint_parameter_name_null=Nazwa parametru ograniczenia nie mo\u017ce by\u0107 pusta.
+cmm.rest_api.constraint_type_null=Ograniczenie niestandardowe musi mie\u0107 atrybut 'type'.
+cmm.rest_api.constraint_ref_not_defined=Ograniczenie odniesienia ''{0}'' nie jest zdefiniowane w tym modelu.
+cmm.rest_api.regex_constraint_invalid_expression=Wyra\u017cenie REGEX ''{0}'' nie jest prawid\u0142owe.
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' nie jest prawid\u0142ow\u0105 warto\u015bci\u0105 ''double'' dla parametru MINMAX ''{1}''.
+cmm.rest_api.minmax_constraint_invalid_max_value=Maksymalna warto\u015b\u0107 ograniczenia MINMAX musi by\u0107 wi\u0119ksza od zera.
+cmm.rest_api.minmax_constraint_invalid_use=Ograniczenia MINMAX nale\u017cy u\u017cywa\u0107 tylko z danymi typu numerycznego.
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' nie jest prawid\u0142ow\u0105 warto\u015bci\u0105 ''int'' parametru LENGTH ''{1}''.
+cmm.rest_api.length_constraint_invalid_use=Ograniczenia LENGTH mo\u017cna u\u017cywa\u0107 tylko z typami danych TEXT, CONTENT i MLTEXT.
+# Property
+cmm.rest_api.property_name_null=Nazwa w\u0142a\u015bciwo\u015bci nie mo\u017ce by\u0107 pusta.
+cmm.rest_api.property_create_update_failure=Nie mo\u017cna utworzy\u0107 lub zaktualizowa\u0107 w\u0142a\u015bciwo\u015bci.
+cmm.rest_api.property_delete_failure=Nie mo\u017cna usun\u0105\u0107 w\u0142a\u015bciwo\u015bci.
+cmm.rest_api.property_datatype_invalid=''{0}'' nie jest prawid\u0142owym formatem typu danych. Prawid\u0142owy format powinien sk\u0142ada\u0107 si\u0119 z prefiksu przestrzeni nazw, dwukropka i nazwy, na przyk\u0142ad: d:text.
+cmm.rest_api.properties_empty_null=W\u0142a\u015bciwo\u015b\u0107 nie mo\u017ce by\u0107 pusta ani r\u00f3wna null.
+cmm.rest_api.property_create_name_already_in_use=Nie mo\u017cna utworzy\u0107 w\u0142a\u015bciwo\u015bci. Nazwa ''{0}'' jest ju\u017c u\u017cywana.
+cmm.rest_api.property_update_prop_not_found=Nie mo\u017cna znale\u017a\u0107 w\u0142a\u015bciwo\u015bci, kt\u00f3ra jest zgodna z ''{0}''.
+cmm.rest_api.property_change_datatype_err=Nie mo\u017cna zmieni\u0107 typu danych w\u0142a\u015bciwo\u015bci w aktywnym modelu.
+cmm.rest_api.property_change_mandatory_opt_err=Nie mo\u017cna zmieni\u0107 wymaganej opcji w\u0142a\u015bciwo\u015bci w aktywnym modelu.
+cmm.rest_api.property_change_mandatory_enforced_opt_err=Nie mo\u017cna zmieni\u0107 obowi\u0105zkowej-wymuszonej opcji w\u0142a\u015bciwo\u015bci w aktywnym modelu.
+cmm.rest_api.property_change_multi_valued_opt_err=Nie mo\u017cna zmieni\u0107 wielowarto\u015bciowej opcji w\u0142a\u015bciwo\u015bci w aktywnym modelu.
+# validation
+cmm.rest_api.input_validation_err=''{0}'' nie jest prawid\u0142ow\u0105 warto\u015bci\u0105. Mo\u017cna u\u017cy\u0107 tylko cyfr, liter, \u0142\u0105cznik\u00f3w (-) i podkre\u015ble\u0144 (_).
+cmm.rest_api.prefix_not_registered=Nie ma prefiksu przestrzeni nazw zarejestrowanego dla identyfikatora URI ''{0}''. Upewnij si\u0119, \u017ce model jest aktywny.
+cmm.rest_api.prefixed_qname_invalid=''{0}'' nie jest prawid\u0142ow\u0105 warto\u015bci\u0105 prefiksu QName. {1}
+cmm.rest_api.circular_dependency_err=Wykryto zale\u017cno\u015b\u0107 cykliczn\u0105. Nie mo\u017cna ustawi\u0107 elementu nadrz\u0119dnego ''{0}'', poniewa\u017c model jest ju\u017c zale\u017cy od elementu ''{1}''.
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' nie jest prawid\u0142owym formatem prefiksu QName. Prawid\u0142owy format powinien sk\u0142ada\u0107 si\u0119 z prefiksu przestrzeni nazw, dwukropka i nazwy, na przyk\u0142ad: cm:content.
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=Model niestandardowy mo\u017ce mie\u0107 tylko jedn\u0105 przestrze\u0144 nazw. Znaleziono ''{0}''.
+cmm.rest_api.model.import_namespace_undefined=Dla modelu niestandardowego nale\u017cy zdefiniowa\u0107 przestrze\u0144 nazw.
+cmm.rest_api.model.import_associations_unsupported=Niestandardowy model nie obs\u0142uguje elementu 'associations'.
+cmm.rest_api.model.import_overrides_unsupported=Niestandardowy model nie obs\u0142uguje elementu 'overrides'.
+cmm.rest_api.model.import_mandatory_aspects_unsupported=Niestandardowy model nie obs\u0142uguje elementu 'mandatory-aspects'.
+cmm.rest_api.model.import_archive_unsupported=Niestandardowy model nie obs\u0142uguje elementu 'archive'.
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=Niestandardowy model nie obs\u0142uguje elementu 'includedInSuperTypeQuery'.
+cmm.rest_api.model.import_not_multi_part_req=Wniosek nie jest wielocz\u0119\u015bciowym formularzem danych.
+cmm.rest_api.model.import_not_zip_format=''{0}'' nie jest prawid\u0142owym plikiem zip.
+cmm.rest_api.model.import_process_zip_file_failure=Nie mo\u017cna przetworzy\u0107 pliku zip.
+cmm.rest_api.model.import_no_zip_file_uploaded=Nie mo\u017cna przes\u0142a\u0107 pliku zip.
+cmm.rest_api.model.import_invalid_zip_package=Plik zip nie mo\u017ce sk\u0142ada\u0107 si\u0119 z wi\u0119cej ni\u017c dw\u00f3ch plik\u00f3w. Powinien to by\u0107 jeden plik modelu i jeden modu\u0142 rozszerzenia.
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' nie jest modelem ani plikiem modu\u0142u rozszerzenia Share.
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' nie jest prawid\u0142owym plikiem modelu.
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}'' nie jest prawid\u0142owym plikiem modu\u0142u rozszerzenia Share.
+cmm.rest_api.model.import_failure=Nie mo\u017cna zaimportowa\u0107 modelu.
+cmm.rest_api.model.import_process_ext_module_file_failure=Nie mo\u017cna przetworzy\u0107 plik modu\u0142u rozszerzenia Share.
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_pt_BR.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_pt_BR.properties
new file mode 100644
index 00000000000..256a017173e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_pt_BR.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=O nome do modelo n\u00e3o pode ser nulo.
+cmm.rest_api.model_invalid=Modelo personalizado inv\u00e1lido.
+cmm.rest_api.model_status_null=O status do modelo n\u00e3o pode ser nulo.
+cmm.rest_api.model_name_cannot_update=N\u00e3o \u00e9 poss\u00edvel atualizar o nome do modelo.
+cmm.rest_api.model_update_failure=N\u00e3o foi poss\u00edvel atualizar o modelo.
+cmm.rest_api.model_download_failure=N\u00e3o foi poss\u00edvel criar um n\u00f3 de download.
+cmm.rest_api.model_namespace_uri_null=O URI do espa\u00e7o de nomes do modelo n\u00e3o pode ser nulo.
+cmm.rest_api.model_namespace_uri_invalid=O URI do espa\u00e7o de nomes \u00e9 inv\u00e1lido. Use apenas n\u00fameros, letras e caracteres URI.
+cmm.rest_api.model_namespace_prefix_null=O prefixo do espa\u00e7o de nomes do modelo n\u00e3o pode ser nulo.
+# Type
+cmm.rest_api.type_name_null=O nome do tipo n\u00e3o pode ser nulo.
+cmm.rest_api.type_create_failure=N\u00e3o foi poss\u00edvel criar o tipo.
+cmm.rest_api.type_update_failure=N\u00e3o foi poss\u00edvel atualizar o tipo.
+cmm.rest_api.type_parent_cannot_update=N\u00e3o \u00e9 poss\u00edvel atualizar o tipo principal em um modelo personalizado ativo.
+cmm.rest_api.type_parent_not_exist=N\u00e3o \u00e9 poss\u00edvel configurar o tipo principal como ''{0}'', porque o tipo ''{0}'' n\u00e3o existe.
+cmm.rest_api.type_cannot_delete=N\u00e3o \u00e9 poss\u00edvel excluir um tipo em um modelo ativo.
+cmm.rest_api.type_delete_failure=N\u00e3o foi poss\u00edvel excluir o tipo.
+# Aspect
+cmm.rest_api.aspect_name_null=O nome do aspecto n\u00e3o pode ser nulo.
+cmm.rest_api.aspect_create_failure=N\u00e3o foi poss\u00edvel criar o aspecto.
+cmm.rest_api.aspect_update_failure=N\u00e3o foi poss\u00edvel atualizar o aspecto.
+cmm.rest_api.aspect_parent_cannot_update=N\u00e3o \u00e9 poss\u00edvel atualizar o aspecto principal em um modelo personalizado ativo.
+cmm.rest_api.aspect_parent_not_exist=N\u00e3o \u00e9 poss\u00edvel configurar o aspecto principal como ''{0}'', porque o aspecto ''{0}'' n\u00e3o existe.
+cmm.rest_api.aspect_cannot_delete=N\u00e3o \u00e9 poss\u00edvel excluir um aspecto em um modelo ativo.
+cmm.rest_api.aspect_delete_failure=N\u00e3o foi poss\u00edvel excluir o aspecto.
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=N\u00e3o \u00e9 poss\u00edvel excluir ''{0}'', pois ''{1}'' depende dele.
+# Constraint
+cmm.rest_api.constraint_name_null=O nome da restri\u00e7\u00e3o n\u00e3o pode ser nulo.
+cmm.rest_api.constraint_create_failure=N\u00e3o foi poss\u00edvel criar a restri\u00e7\u00e3o.
+cmm.rest_api.constraint_parameter_name_null=O par\u00e2metro da restri\u00e7\u00e3o n\u00e3o pode ser nulo.
+cmm.rest_api.constraint_type_null=Restri\u00e7\u00e3o personalizada deve conter um atributo de 'tipo'.
+cmm.rest_api.constraint_ref_not_defined=A refer\u00eancia de restri\u00e7\u00e3o ''{0}'' n\u00e3o \u00e9 definida por este modelo.
+cmm.rest_api.regex_constraint_invalid_expression=A express\u00e3o REGEX ''{0}'' n\u00e3o \u00e9 v\u00e1lida.
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' n\u00e3o \u00e9 um valor ''duplo'' v\u00e1lido para o par\u00e2metro MINMAX ''{1}''.
+cmm.rest_api.minmax_constraint_invalid_max_value=O valor m\u00e1ximo da restri\u00e7\u00e3o MINMAX deve ser maior que zero.
+cmm.rest_api.minmax_constraint_invalid_use=A restri\u00e7\u00e3o MINMAX s\u00f3 pode ser usada com tipo de dados num\u00e9ricos.
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' n\u00e3o \u00e9 um valor ''inteiro'' v\u00e1lido para o par\u00e2metro LENGTH ''{1}''.
+cmm.rest_api.length_constraint_invalid_use=Voc\u00ea s\u00f3 pode usar a restri\u00e7\u00e3o LENGTH com tipos de dados TEXT, CONTENT e MLTEXT.
+# Property
+cmm.rest_api.property_name_null=O nome da propriedade n\u00e3o pode ser nulo.
+cmm.rest_api.property_create_update_failure=N\u00e3o foi poss\u00edvel criar/atualizar a propriedade.
+cmm.rest_api.property_delete_failure=N\u00e3o foi poss\u00edvel excluir a propriedade.
+cmm.rest_api.property_datatype_invalid=''{0}'' n\u00e3o \u00e9 um formato de tipo de dados v\u00e1lido. Um formato v\u00e1lido deve conter um prefixo do espa\u00e7o de nomes, dois pontos e um nome, por exemplo: d:texto.
+cmm.rest_api.properties_empty_null=As propriedades n\u00e3o podem estar em branco ou ser nulas.
+cmm.rest_api.property_create_name_already_in_use=N\u00e3o foi poss\u00edvel criar a propriedade j\u00e1 que o nome da propriedade ''{0}'' j\u00e1 est\u00e1 em uso.
+cmm.rest_api.property_update_prop_not_found=N\u00e3o foi poss\u00edvel encontrar uma propriedade que corresponda a ''{0}''.
+cmm.rest_api.property_change_datatype_err=N\u00e3o \u00e9 poss\u00edvel alterar o tipo de dados de uma propriedade em um modelo ativo.
+cmm.rest_api.property_change_mandatory_opt_err=N\u00e3o \u00e9 poss\u00edvel alterar a op\u00e7\u00e3o obrigat\u00f3ria de uma propriedade em um modelo ativo.
+cmm.rest_api.property_change_mandatory_enforced_opt_err=N\u00e3o \u00e9 poss\u00edvel alterar a op\u00e7\u00e3o obrigat\u00f3ria e for\u00e7ada de uma propriedade em um modelo ativo.
+cmm.rest_api.property_change_multi_valued_opt_err=N\u00e3o \u00e9 poss\u00edvel alterar a op\u00e7\u00e3o de multivalores de uma propriedade em um modelo ativo.
+# validation
+cmm.rest_api.input_validation_err=''{0}'' n\u00e3o \u00e9 um valor v\u00e1lido. Use apenas n\u00fameros, letras, h\u00edfen (-) e sublinhado (_).
+cmm.rest_api.prefix_not_registered=N\u00e3o h\u00e1 um prefixo do espa\u00e7o de nomes registrado para o URI ''{0}''. Assegure-se de que o modelo esteja ativo.
+cmm.rest_api.prefixed_qname_invalid=''{0}'' n\u00e3o \u00e9 um valor de QName com prefixo v\u00e1lido. {1}
+cmm.rest_api.circular_dependency_err=Foi detectada uma depend\u00eancia circular. N\u00e3o \u00e9 poss\u00edvel configurar o principal ''{0}'', pois seu modelo j\u00e1 depende de ''{1}''.
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' n\u00e3o \u00e9 um formato de QName com prefixo v\u00e1lido. Um formato v\u00e1lido deve conter um prefixo do espa\u00e7o de nomes, dois pontos e um nome, por exemplo: cm:conte\u00fado.
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=O modelo personalizado s\u00f3 pode ter um espa\u00e7o de nomes. Encontramos ''{0}''.
+cmm.rest_api.model.import_namespace_undefined=O modelo personalizado deve definir um espa\u00e7o de nomes.
+cmm.rest_api.model.import_associations_unsupported=O modelo personalizado n\u00e3o suporta o elemento 'associations'.
+cmm.rest_api.model.import_overrides_unsupported=O modelo personalizado n\u00e3o suporta o elemento 'overrides'.
+cmm.rest_api.model.import_mandatory_aspects_unsupported=O modelo personalizado n\u00e3o suporta o elemento 'mandatory-aspects'.
+cmm.rest_api.model.import_archive_unsupported=O modelo personalizado n\u00e3o suporta o elemento 'archive'.
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=O modelo personalizado n\u00e3o suporta o elemento 'includedInSuperTypeQuery'.
+cmm.rest_api.model.import_not_multi_part_req=A solicita\u00e7\u00e3o n\u00e3o \u00e9 um formul\u00e1rio de dados de m\u00faltiplas partes.
+cmm.rest_api.model.import_not_zip_format=''{0}'' n\u00e3o \u00e9 um arquivo zip v\u00e1lido.
+cmm.rest_api.model.import_process_zip_file_failure=N\u00e3o foi poss\u00edvel processar o arquivo zip.
+cmm.rest_api.model.import_no_zip_file_uploaded=N\u00e3o foi poss\u00edvel carregar o arquivo zip.
+cmm.rest_api.model.import_invalid_zip_package=O arquivo zip n\u00e3o pode conter mais do que dois arquivos. Deve existir um arquivo Modelo e um arquivo de m\u00f3dulo Extens\u00e3o.
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' n\u00e3o \u00e9 um modelo ou arquivo de m\u00f3dulo de extens\u00e3o Share.
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' n\u00e3o \u00e9 um arquivo modelo v\u00e1lido.
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}'' n\u00e3o \u00e9 um arquivo de m\u00f3dulo de extens\u00e3o Share v\u00e1lido.
+cmm.rest_api.model.import_failure=N\u00e3o foi poss\u00edvel importar o modelo.
+cmm.rest_api.model.import_process_ext_module_file_failure=N\u00e3o foi poss\u00edvel processar o arquivo de m\u00f3dulo de extens\u00e3o Share.
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_ru.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_ru.properties
new file mode 100644
index 00000000000..fdbde0b6d71
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_ru.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=\u0418\u043c\u044f \u043c\u043e\u0434\u0435\u043b\u0438 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c.
+cmm.rest_api.model_invalid=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u0430\u044f \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u0430\u044f \u043c\u043e\u0434\u0435\u043b\u044c.
+cmm.rest_api.model_status_null=\u0421\u0442\u0430\u0442\u0443\u0441 \u043c\u043e\u0434\u0435\u043b\u0438 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c.
+cmm.rest_api.model_name_cannot_update=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0438\u043c\u044f \u043c\u043e\u0434\u0435\u043b\u0438.
+cmm.rest_api.model_update_failure=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0438\u043c\u044f \u043c\u043e\u0434\u0435\u043b\u0438.
+cmm.rest_api.model_download_failure=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0443\u0437\u0435\u043b \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438.
+cmm.rest_api.model_namespace_uri_null=URI \u043e\u0431\u043b\u0430\u0441\u0442\u0438 \u0438\u043c\u0435\u043d \u043c\u043e\u0434\u0435\u043b\u0438 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c.
+cmm.rest_api.model_namespace_uri_invalid=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 URI \u043e\u0431\u043b\u0430\u0441\u0442\u0438 \u0438\u043c\u0435\u043d. \u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0442\u043e\u043b\u044c\u043a\u043e \u0431\u0443\u043a\u0432\u044b, \u0446\u0438\u0444\u0440\u044b \u0438 \u0441\u0438\u043c\u0432\u043e\u043b\u044b URI.
+cmm.rest_api.model_namespace_prefix_null=\u041f\u0440\u0435\u0444\u0438\u043a\u0441 \u043e\u0431\u043b\u0430\u0441\u0442\u0438 \u0438\u043c\u0435\u043d \u043c\u043e\u0434\u0435\u043b\u0438 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c.
+# Type
+cmm.rest_api.type_name_null=\u0418\u043c\u044f \u0442\u0438\u043f\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c.
+cmm.rest_api.type_create_failure=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0442\u0438\u043f.
+cmm.rest_api.type_update_failure=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0442\u0438\u043f.
+cmm.rest_api.type_parent_cannot_update=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u0442\u0438\u043f \u0432 \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0439 \u0441\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u043e\u0439 \u043c\u043e\u0434\u0435\u043b\u0438.
+cmm.rest_api.type_parent_not_exist=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0443\u043a\u0430\u0437\u0430\u0442\u044c ''{0}'' \u0432 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0433\u043e \u0442\u0438\u043f\u0430: \u0442\u0438\u043f ''{0}'' \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.
+cmm.rest_api.type_cannot_delete=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0432 \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0439 \u043c\u043e\u0434\u0435\u043b\u0438.
+cmm.rest_api.type_delete_failure=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0438\u043f.
+# Aspect
+cmm.rest_api.aspect_name_null=\u0418\u043c\u044f \u0430\u0441\u043f\u0435\u043a\u0442\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c.
+cmm.rest_api.aspect_create_failure=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0430\u0441\u043f\u0435\u043a\u0442.
+cmm.rest_api.aspect_update_failure=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0430\u0441\u043f\u0435\u043a\u0442.
+cmm.rest_api.aspect_parent_cannot_update=\u0412\u044b \u043d\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u043e\u0431\u043d\u043e\u0432\u043b\u044f\u0442\u044c \u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u0430\u0441\u043f\u0435\u043a\u0442 \u0432 \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0439 \u0441\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u043e\u0439 \u043c\u043e\u0434\u0435\u043b\u0438.
+cmm.rest_api.aspect_parent_not_exist=\u041d\u0435\u043b\u044c\u0437\u044f \u0443\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c ''{0}'' \u0432 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0433\u043e \u0430\u0441\u043f\u0435\u043a\u0442\u0430: \u0430\u0441\u043f\u0435\u043a\u0442 ''{0}'' \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.
+cmm.rest_api.aspect_cannot_delete=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0430\u0441\u043f\u0435\u043a\u0442 \u0432 \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0439 \u043c\u043e\u0434\u0435\u043b\u0438.
+cmm.rest_api.aspect_delete_failure=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0430\u0441\u043f\u0435\u043a\u0442.
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c ''{0}'', \u043f\u043e\u0441\u043a\u043e\u043b\u044c\u043a\u0443 ''{1}'' \u0437\u0430\u0432\u0438\u0441\u0438\u0442 \u043e\u0442 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0433\u043e \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430.
+# Constraint
+cmm.rest_api.constraint_name_null=\u0418\u043c\u044f \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c.
+cmm.rest_api.constraint_create_failure=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435.
+cmm.rest_api.constraint_parameter_name_null=\u0418\u043c\u044f \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c.
+cmm.rest_api.constraint_type_null=\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u043e\u0435 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435 \u0434\u043e\u043b\u0436\u043d\u043e \u0438\u043c\u0435\u0442\u044c \u0430\u0442\u0440\u0438\u0431\u0443\u0442 'type'.
+cmm.rest_api.constraint_ref_not_defined=\u0414\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0439 \u043c\u043e\u0434\u0435\u043b\u0438 \u043d\u0435 \u0437\u0430\u0434\u0430\u043d\u0430 \u0441\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435 ''{0}''.
+cmm.rest_api.regex_constraint_invalid_expression=\u0420\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435 REGEX ''{0}'' \u043d\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e.
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u043c \u0447\u0438\u0441\u043b\u043e\u0432\u044b\u043c \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u043c \u0434\u0432\u043e\u0439\u043d\u043e\u0439 \u0442\u043e\u0447\u043d\u043e\u0441\u0442\u0438 \u0441 \u043f\u043b\u0430\u0432\u0430\u044e\u0449\u0435\u0439 \u0442\u043e\u0447\u043a\u043e\u0439 \u0434\u043b\u044f \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430 MINMAX ''{1}''.
+cmm.rest_api.minmax_constraint_invalid_max_value=\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f MINMAX \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u0431\u043e\u043b\u044c\u0448\u0435 \u043d\u0443\u043b\u044f.
+cmm.rest_api.minmax_constraint_invalid_use=\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435 MINMAX \u043c\u043e\u0436\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0438\u0441\u043a\u043b\u044e\u0447\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0441 \u0447\u0438\u0441\u043b\u043e\u0432\u044b\u043c \u0442\u0438\u043f\u043e\u043c \u0434\u0430\u043d\u043d\u044b\u0445.
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u043c \u0446\u0435\u043b\u044b\u043c \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u043c \u0434\u043b\u044f \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430 LENGTH ''{1}''.
+cmm.rest_api.length_constraint_invalid_use=\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435 LENGTH \u043c\u043e\u0436\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0441 \u0442\u0438\u043f\u0430\u043c\u0438 \u0434\u0430\u043d\u043d\u044b\u0445 TEXT, CONTENT \u0438 MLTEXT.
+# Property
+cmm.rest_api.property_name_null=\u0418\u043c\u044f \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c.
+cmm.rest_api.property_create_update_failure=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043e\u0437\u0434\u0430\u0442\u044c/\u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u043e.
+cmm.rest_api.property_delete_failure=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u043e.
+cmm.rest_api.property_datatype_invalid=''{0}'' \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u043c \u0444\u043e\u0440\u043c\u0430\u0442\u043e\u043c \u0442\u0438\u043f\u0430 \u0434\u0430\u043d\u043d\u044b\u0445. \u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0444\u043e\u0440\u043c\u0430\u0442 \u0434\u043e\u043b\u0436\u0435\u043d \u0441\u043e\u0441\u0442\u043e\u044f\u0442\u044c \u0438\u0437 \u043f\u0440\u0435\u0444\u0438\u043a\u0441\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u0438 \u0438\u043c\u0435\u043d, \u0434\u0432\u043e\u0435\u0442\u043e\u0447\u0438\u044f \u0438 \u0438\u043c\u0435\u043d\u0438. \u041f\u0440\u0438\u043c\u0435\u0440: d:text.
+cmm.rest_api.properties_empty_null=\u0414\u043b\u044f \u0441\u0432\u043e\u0439\u0441\u0442\u0432 \u043d\u0435\u043b\u044c\u0437\u044f \u0443\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u0435 \u0438\u043b\u0438 \u043d\u0443\u043b\u0435\u0432\u044b\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f.
+cmm.rest_api.property_create_name_already_in_use=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u043e: \u0438\u043c\u044f \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430 ''{0}'' \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f.
+cmm.rest_api.property_update_prop_not_found=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u043e, \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0435\u0435 ''{0}''.
+cmm.rest_api.property_change_datatype_err=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0442\u0438\u043f \u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0439 \u043c\u043e\u0434\u0435\u043b\u0438.
+cmm.rest_api.property_change_mandatory_opt_err=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 \u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438 \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0432 \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0439 \u043c\u043e\u0434\u0435\u043b\u0438.
+cmm.rest_api.property_change_mandatory_enforced_opt_err=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 \u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438 (\u043f\u0440\u0438\u043d\u0443\u0434\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439) \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0432 \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0439 \u043c\u043e\u0434\u0435\u043b\u0438.
+cmm.rest_api.property_change_multi_valued_opt_err=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 \u043c\u043d\u043e\u0433\u043e\u0437\u043d\u0430\u0447\u043d\u043e\u0441\u0442\u0438 \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0432 \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0439 \u043c\u043e\u0434\u0435\u043b\u0438.
+# validation
+cmm.rest_api.input_validation_err=''{0}'' \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u043c \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u043c. \u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0442\u043e\u043b\u044c\u043a\u043e \u0447\u0438\u0441\u043b\u0430, \u0431\u0443\u043a\u0432\u044b, \u0434\u0435\u0444\u0438\u0441\u044b (-) \u0438 \u0441\u0438\u043c\u0432\u043e\u043b\u044b \u043f\u043e\u0434\u0447\u0435\u0440\u043a\u0438\u0432\u0430\u043d\u0438\u044f (_).
+cmm.rest_api.prefix_not_registered=\u0414\u043b\u044f URI ''{0}'' \u043d\u0435\u0442 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u043e\u0433\u043e \u043f\u0440\u0435\u0444\u0438\u043a\u0441\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u0438 \u0438\u043c\u0435\u043d. \u0423\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u043c\u043e\u0434\u0435\u043b\u044c \u0430\u043a\u0442\u0438\u0432\u043d\u0430.
+cmm.rest_api.prefixed_qname_invalid=''{0}'' \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u043c \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u043c QName \u0441 \u043f\u0440\u0435\u0444\u0438\u043a\u0441\u043e\u043c. {1}
+cmm.rest_api.circular_dependency_err=\u041e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u0430 \u0446\u0438\u043a\u043b\u0438\u0447\u043d\u0430\u044f \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u043e\u0441\u0442\u044c. \u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0434\u0430\u0442\u044c \u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u044d\u043b\u0435\u043c\u0435\u043d\u0442 ''{0}'', \u043f\u043e\u0441\u043a\u043e\u043b\u044c\u043a\u0443 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0430\u044f \u043c\u043e\u0434\u0435\u043b\u044c \u0443\u0436\u0435 \u0437\u0430\u0432\u0438\u0441\u0438\u0442 \u043e\u0442 ''{1}''.
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u043c \u0444\u043e\u0440\u043c\u0430\u0442\u043e\u043c QName \u0441 \u043f\u0440\u0435\u0444\u0438\u043a\u0441\u043e\u043c. \u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0444\u043e\u0440\u043c\u0430\u0442 \u0434\u043e\u043b\u0436\u0435\u043d \u0441\u043e\u0441\u0442\u043e\u044f\u0442\u044c \u0438\u0437 \u043f\u0440\u0435\u0444\u0438\u043a\u0441\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u0438 \u0438\u043c\u0435\u043d, \u0434\u0432\u043e\u0435\u0442\u043e\u0447\u0438\u044f \u0438 \u0438\u043c\u0435\u043d\u0438. \u041f\u0440\u0438\u043c\u0435\u0440: cm:content.
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=\u0423 \u0441\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u043e\u0439 \u043c\u043e\u0434\u0435\u043b\u0438 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c \u0438\u043c\u0435\u043d. \u041e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u043e: ''{0}''.
+cmm.rest_api.model.import_namespace_undefined=\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u0430\u044f \u043c\u043e\u0434\u0435\u043b\u044c \u0434\u043e\u043b\u0436\u043d\u0430 \u0437\u0430\u0434\u0430\u0432\u0430\u0442\u044c \u043e\u0431\u043b\u0430\u0441\u0442\u044c \u0438\u043c\u0435\u043d.
+cmm.rest_api.model.import_associations_unsupported=\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u0430\u044f \u043c\u043e\u0434\u0435\u043b\u044c \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u044d\u043b\u0435\u043c\u0435\u043d\u0442 'associations'.
+cmm.rest_api.model.import_overrides_unsupported=\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u0430\u044f \u043c\u043e\u0434\u0435\u043b\u044c \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u044d\u043b\u0435\u043c\u0435\u043d\u0442 'overrides'.
+cmm.rest_api.model.import_mandatory_aspects_unsupported=\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u0430\u044f \u043c\u043e\u0434\u0435\u043b\u044c \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u044d\u043b\u0435\u043c\u0435\u043d\u0442 'mandatory-aspects'.
+cmm.rest_api.model.import_archive_unsupported=\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u0430\u044f \u043c\u043e\u0434\u0435\u043b\u044c \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u044d\u043b\u0435\u043c\u0435\u043d\u0442 'archive'.
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u0430\u044f \u043c\u043e\u0434\u0435\u043b\u044c \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u044d\u043b\u0435\u043c\u0435\u043d\u0442 'includedInSuperTypeQuery'.
+cmm.rest_api.model.import_not_multi_part_req=\u0417\u0430\u043f\u0440\u043e\u0441 \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0434\u0430\u043d\u043d\u044b\u043c\u0438 \u0441\u043e\u0441\u0442\u0430\u0432\u043d\u043e\u0439 \u0444\u043e\u0440\u043c\u044b.
+cmm.rest_api.model.import_not_zip_format=''{0}'' \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u043c zip-\u0444\u0430\u0439\u043b\u043e\u043c.
+cmm.rest_api.model.import_process_zip_file_failure=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0430\u0442\u044c zip-\u0444\u0430\u0439\u043b.
+cmm.rest_api.model.import_no_zip_file_uploaded=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0432\u044b\u0433\u0440\u0443\u0437\u0438\u0442\u044c zip-\u0444\u0430\u0439\u043b.
+cmm.rest_api.model.import_invalid_zip_package=zip-\u0444\u0430\u0439\u043b \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u044c \u0431\u043e\u043b\u0435\u0435 \u0434\u0432\u0443\u0445 \u0444\u0430\u0439\u043b\u043e\u0432. \u0414\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u043e\u0434\u0438\u043d \u0444\u0430\u0439\u043b \u043c\u043e\u0434\u0435\u043b\u0438 \u0438 \u043e\u0434\u0438\u043d \u0444\u0430\u0439\u043b \u043c\u043e\u0434\u0443\u043b\u044f \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f.
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0444\u0430\u0439\u043b\u043e\u043c \u043c\u043e\u0434\u0435\u043b\u0438 \u0438\u043b\u0438 \u0444\u0430\u0439\u043b\u043e\u043c \u043c\u043e\u0434\u0443\u043b\u044f \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u043e\u0431\u0449\u0435\u0433\u043e \u0434\u043e\u0441\u0442\u0443\u043f\u0430.
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u043c \u0444\u0430\u0439\u043b\u043e\u043c \u043c\u043e\u0434\u0435\u043b\u0438.
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}'' \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u043c \u0444\u0430\u0439\u043b\u043e\u043c \u043c\u043e\u0434\u0443\u043b\u044f \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u043e\u0431\u0449\u0435\u0433\u043e \u0434\u043e\u0441\u0442\u0443\u043f\u0430.
+cmm.rest_api.model.import_failure=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0438\u043c\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043c\u043e\u0434\u0435\u043b\u044c.
+cmm.rest_api.model.import_process_ext_module_file_failure=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0430\u0442\u044c \u0444\u0430\u0439\u043b \u043c\u043e\u0434\u0443\u043b\u044f \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u043e\u0431\u0449\u0435\u0433\u043e \u0434\u043e\u0441\u0442\u0443\u043f\u0430.
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_sv.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_sv.properties
new file mode 100644
index 00000000000..87f9bee7ad1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_sv.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=Modellnamn kan inte vara noll.
+cmm.rest_api.model_invalid=Ogiltig anpassad modell.
+cmm.rest_api.model_status_null=Modellstatus kan inte vara noll.
+cmm.rest_api.model_name_cannot_update=Du kan inte uppdatera modellnamnet.
+cmm.rest_api.model_update_failure=Vi kunde inte uppdatera modellen.
+cmm.rest_api.model_download_failure=Vi kunde inte skapa en nedladdningsnod.
+cmm.rest_api.model_namespace_uri_null=Modellnamnrymds-URI kan inte vara noll
+cmm.rest_api.model_namespace_uri_invalid=Namnrymds-URI \u00e4r ogiltig. Anv\u00e4nd bara bokst\u00e4ver, siffror och URI-tecken.
+cmm.rest_api.model_namespace_prefix_null=Modellnamnrymdsprefix kan inte vara noll.
+# Type
+cmm.rest_api.type_name_null=Typnamn kan inte vara noll.
+cmm.rest_api.type_create_failure=Vi kunde inte skapa typen.
+cmm.rest_api.type_update_failure=Vi kunde inte uppdatera typeen.
+cmm.rest_api.type_parent_cannot_update=Du kan inte uppdatera typens \u00f6verordnade i en aktiv anpassad modell.
+cmm.rest_api.type_parent_not_exist=Du kan inte st\u00e4lla in typens \u00f6verordnade till ''{0}'', eftersom typen ''{0}'' inte finns.
+cmm.rest_api.type_cannot_delete=Du kan inte radera en typ i en aktiv modell.
+cmm.rest_api.type_delete_failure=Vi kunde inte radera typen.
+# Aspect
+cmm.rest_api.aspect_name_null=Aspektnamn kan inte vara noll.
+cmm.rest_api.aspect_create_failure=Vi kunde inte skapa aspekten
+cmm.rest_api.aspect_update_failure=Vi kunde inte uppdatera aspekten.
+cmm.rest_api.aspect_parent_cannot_update=Du kan inte uppdatera aspektens \u00f6verordnade i en aktiv anpassad modell.
+cmm.rest_api.aspect_parent_not_exist=Du kan inte st\u00e4lla in aspektens \u00f6verordnade till ''{0}'', eftersom aspekten ''{0}'' inte finns.
+cmm.rest_api.aspect_cannot_delete=Du kan inte radera en aspekt i en aktiv modell.
+cmm.rest_api.aspect_delete_failure=Vi kunde inte radera aspekten.
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=Du kan inte radera ''{0}'' eftersom ''{1}'' \u00e4r beroende av den.
+# Constraint
+cmm.rest_api.constraint_name_null=Restriktionsnamn kan inte vara noll.
+cmm.rest_api.constraint_create_failure=Vi kunde inte skapa restriktion.
+cmm.rest_api.constraint_parameter_name_null=Restriktionsparameternamn kan inte vara noll.
+cmm.rest_api.constraint_type_null=Anpassad restriktion m\u00e5ste ha ett 'type' attribut.
+cmm.rest_api.constraint_ref_not_defined=Restriktionsreferens ''{0}'' definieras inte av den h\u00e4r modellen.
+cmm.rest_api.regex_constraint_invalid_expression=REGEX-uttryck ''{0}'' \u00e4r inte giltigt.
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' \u00e4r inte ett giltigt ''double'' v\u00e4rde f\u00f6r MINMAX-parameter ''{1}''.
+cmm.rest_api.minmax_constraint_invalid_max_value=Maximalt v\u00e4rde f\u00f6r MINMAX-restriktionen m\u00e5ste vara st\u00f6rre \u00e4n noll.
+cmm.rest_api.minmax_constraint_invalid_use=MINMAX-restriktion kan bara anv\u00e4ndas med numerisk datatyp.
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' \u00e4r inte ett giltigt ''int'' v\u00e4rde f\u00f6r LENGTH parameter ''{1}''.
+cmm.rest_api.length_constraint_invalid_use=Du kan bara anv\u00e4nda restriktionen LENGTH med datatyperna TEXT, CONTENT och MLTEXT.
+# Property
+cmm.rest_api.property_name_null=Egenskapsnamn kan inte vara noll
+cmm.rest_api.property_create_update_failure=Vi kunde inte skapa/uppdatera egenskap.
+cmm.rest_api.property_delete_failure=Vi kunde inte radera egenskapen.
+cmm.rest_api.property_datatype_invalid=''{0}'' \u00e4r inte ett giltigt datatypformat. Ett giltigt format ska best\u00e5 av ett namnrymdsprefix, ett kolon, och ett namn, till exempel: d:text.
+cmm.rest_api.properties_empty_null=Egenskaper kan inte vara tom eller nolll.
+cmm.rest_api.property_create_name_already_in_use=Vi kunde inte skapa egenskapen eftersom egenskapsnamnet ''{0}'' redan anv\u00e4nds.
+cmm.rest_api.property_update_prop_not_found=Vi kunde inte hitta en egenskap som matchar ''{0}''.
+cmm.rest_api.property_change_datatype_err=Du kan inte \u00e4ndra datatypen f\u00f6r en egenskap i en aktiv modell.
+cmm.rest_api.property_change_mandatory_opt_err=Du kan inte \u00e4ndra det obligatoriska alternativet f\u00f6r en egenskap i en aktiv modell.
+cmm.rest_api.property_change_mandatory_enforced_opt_err=Du kan inte \u00e4ndra det obligatorisk framtvingade alternativet f\u00f6r en egenskap i en aktiv modell.
+cmm.rest_api.property_change_multi_valued_opt_err=Du kan inte \u00e4ndra flerv\u00e4rdesalternativet f\u00f6r en egenskap i en aktiv modell.
+# validation
+cmm.rest_api.input_validation_err=''{0}'' \u00e4r inte ett giltigt v\u00e4rde. Anv\u00e4nd bara siffror, bokst\u00e4ver, bindestreck (-) och understreck (_).
+cmm.rest_api.prefix_not_registered=Det finns inget namnrymdsprefix registrerat f\u00f6r URI ''{0}''. Se till att modellen \u00e4r aktiv.
+cmm.rest_api.prefixed_qname_invalid=''{0}'' \u00e4r inte ett giltigt QName-v\u00e4rde med prefix. {1}
+cmm.rest_api.circular_dependency_err=Ett cirkul\u00e4rt beroende uppt\u00e4cktes. Du kan inte st\u00e4lla in \u00f6verordnad ''{0}'', eftersom dess modell redan beror p\u00e5 ''{1}''.
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' \u00e4r inte ett giltigt QName-format med prefix. Ett giltigt format ska best\u00e5 av en namnrymdsprefix, ett kolon och ett namn, till exempel: d:text.
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=Den anpassade modellen kan bara ha en namnrymd. Vi hittade ''{0}''.
+cmm.rest_api.model.import_namespace_undefined=Den anpassade modellen m\u00e5ste definiera en namnrymd.
+cmm.rest_api.model.import_associations_unsupported=Den anpassade modellen st\u00f6der inte elementet 'associations'.
+cmm.rest_api.model.import_overrides_unsupported=Den anpassade modellen st\u00f6der inte elementet 'overrides'.
+cmm.rest_api.model.import_mandatory_aspects_unsupported=Den anpassade modellen st\u00f6der inte elementet 'mandatory-aspects'.
+cmm.rest_api.model.import_archive_unsupported=Den anpassade modellen st\u00f6der inte elementet 'archive'.
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=Den anpassade modellen st\u00f6der inte elementet 'includedInSuperTypeQuery'.
+cmm.rest_api.model.import_not_multi_part_req=Beg\u00e4ran \u00e4r inte en multipartformul\u00e4rdata.
+cmm.rest_api.model.import_not_zip_format=''{0}'' \u00e4r inte en giltig zip-fil.
+cmm.rest_api.model.import_process_zip_file_failure=Vi kunde inte behandla zip-filen.
+cmm.rest_api.model.import_no_zip_file_uploaded=Vi kunde inte ladda upp zip-filen.
+cmm.rest_api.model.import_invalid_zip_package=Zip-filen kan inte ha fler \u00e4n tv\u00e5 filer. Det ska vara en modellfil och en till\u00e4ggsmodulfil.
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' \u00e4r inte en modell eller en Share till\u00e4ggsmodulfil.
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' \u00e4r inte en giltig modellfil.
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}'' \u00e4r inte en giltig Share-till\u00e4ggsmodulfil.
+cmm.rest_api.model.import_failure=Vi kunde inte importera modellen.
+cmm.rest_api.model.import_process_ext_module_file_failure=Vi kunde inte behandla Share-till\u00e4ggsmodulfilen.
diff --git a/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_zh_CN.properties b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_zh_CN.properties
new file mode 100644
index 00000000000..a84af085f22
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/custommodel-restapi-messages_zh_CN.properties
@@ -0,0 +1,78 @@
+# Messages returned by the CMM Rest API
+
+# Model
+cmm.rest_api.model_name_null=\u6a21\u578b\u540d\u79f0\u4e0d\u80fd\u4e3a\u7a7a\u3002
+cmm.rest_api.model_invalid=\u81ea\u5b9a\u4e49\u6a21\u578b\u65e0\u6548\u3002
+cmm.rest_api.model_status_null=\u6a21\u578b\u72b6\u6001\u4e0d\u80fd\u4e3a\u7a7a\u3002
+cmm.rest_api.model_name_cannot_update=\u60a8\u65e0\u6cd5\u66f4\u65b0\u6a21\u578b\u540d\u79f0\u3002
+cmm.rest_api.model_update_failure=\u6211\u4eec\u65e0\u6cd5\u66f4\u65b0\u6a21\u578b\u3002
+cmm.rest_api.model_download_failure=\u6211\u4eec\u65e0\u6cd5\u521b\u5efa\u4e0b\u8f7d\u8282\u70b9\u3002
+cmm.rest_api.model_namespace_uri_null=\u6a21\u578b\u547d\u540d\u7a7a\u95f4 URI \u4e0d\u80fd\u4e3a\u7a7a\u3002
+cmm.rest_api.model_namespace_uri_invalid=\u547d\u540d\u7a7a\u95f4 URI \u65e0\u6548\u3002 \u4ec5\u53ef\u4f7f\u7528\u5b57\u6bcd\u3001\u6570\u5b57\u548c URI \u5b57\u7b26\u3002
+cmm.rest_api.model_namespace_prefix_null=\u6a21\u578b\u547d\u540d\u7a7a\u95f4\u524d\u7f00\u4e0d\u80fd\u4e3a\u7a7a\u3002
+# Type
+cmm.rest_api.type_name_null=\u7c7b\u578b\u540d\u79f0\u4e0d\u80fd\u4e3a\u7a7a\u3002
+cmm.rest_api.type_create_failure=\u6211\u4eec\u65e0\u6cd5\u521b\u5efa\u7c7b\u578b\u3002
+cmm.rest_api.type_update_failure=\u6211\u4eec\u65e0\u6cd5\u66f4\u65b0\u7c7b\u578b\u3002
+cmm.rest_api.type_parent_cannot_update=\u60a8\u65e0\u6cd5\u5728\u6d3b\u8dc3\u7684\u81ea\u5b9a\u4e49\u6a21\u578b\u4e2d\u66f4\u65b0\u7c7b\u578b\u7684\u7236\u7ea7\u7c7b\u578b\u3002
+cmm.rest_api.type_parent_not_exist=\u60a8\u65e0\u6cd5\u5c06\u7c7b\u578b\u7684\u7236\u7ea7\u7c7b\u578b\u8bbe\u7f6e\u4e3a ''{0}''\uff0c\u56e0\u4e3a\u7c7b\u578b ''{0}'' \u4e0d\u5b58\u5728\u3002
+cmm.rest_api.type_cannot_delete=\u60a8\u65e0\u6cd5\u5220\u9664\u6d3b\u8dc3\u6a21\u578b\u4e2d\u7684\u7c7b\u578b\u3002
+cmm.rest_api.type_delete_failure=\u6211\u4eec\u65e0\u6cd5\u5220\u9664\u7c7b\u578b\u3002
+# Aspect
+cmm.rest_api.aspect_name_null=\u5207\u9762\u540d\u79f0\u4e0d\u80fd\u4e3a\u7a7a\u3002
+cmm.rest_api.aspect_create_failure=\u6211\u4eec\u65e0\u6cd5\u521b\u5efa\u5207\u9762\u3002
+cmm.rest_api.aspect_update_failure=\u6211\u4eec\u65e0\u6cd5\u66f4\u65b0\u5207\u9762\u3002
+cmm.rest_api.aspect_parent_cannot_update=\u60a8\u65e0\u6cd5\u5728\u6d3b\u8dc3\u7684\u81ea\u5b9a\u4e49\u6a21\u578b\u4e2d\u66f4\u65b0\u5207\u9762\u7684\u7236\u7ea7\u5207\u9762\u3002
+cmm.rest_api.aspect_parent_not_exist=\u60a8\u65e0\u6cd5\u5c06\u5207\u9762\u7684\u7236\u7ea7\u5207\u9762\u8bbe\u7f6e\u4e3a ''{0}''\uff0c\u56e0\u4e3a\u5207\u9762 ''{0}'' \u4e0d\u5b58\u5728\u3002
+cmm.rest_api.aspect_cannot_delete=\u60a8\u65e0\u6cd5\u5728\u6d3b\u8dc3\u6a21\u578b\u4e2d\u5220\u9664\u5207\u9762\u3002
+cmm.rest_api.aspect_delete_failure=\u6211\u4eec\u65e0\u6cd5\u5220\u9664\u5207\u9762\u3002
+# TypeAspect
+cmm.rest_api.aspect_type_cannot_delete=\u60a8\u65e0\u6cd5\u5220\u9664 ''{0}''\uff0c\u56e0\u4e3a ''{1}'' \u4f9d\u8d56\u4e8e\u5b83\u3002
+# Constraint
+cmm.rest_api.constraint_name_null=\u7ea6\u675f\u6761\u4ef6\u540d\u79f0\u4e0d\u80fd\u4e3a\u7a7a\u3002
+cmm.rest_api.constraint_create_failure=\u6211\u4eec\u65e0\u6cd5\u521b\u5efa\u7ea6\u675f\u6761\u4ef6\u3002
+cmm.rest_api.constraint_parameter_name_null=\u7ea6\u675f\u6761\u4ef6\u53c2\u6570\u540d\u79f0\u4e0d\u80fd\u4e3a\u7a7a\u3002
+cmm.rest_api.constraint_type_null=\u81ea\u5b9a\u4e49\u7ea6\u675f\u6761\u4ef6\u5fc5\u987b\u6709 '\u7c7b\u578b' \u5c5e\u6027\u3002
+cmm.rest_api.constraint_ref_not_defined=\u6b64\u6a21\u578b\u672a\u5b9a\u4e49\u7ea6\u675f\u6761\u4ef6\u5f15\u7528 ''{0}''\u3002
+cmm.rest_api.regex_constraint_invalid_expression=REGEX \u8868\u8fbe\u5f0f ''{0}'' \u65e0\u6548\u3002
+cmm.rest_api.minmax_constraint_invalid_parameter=''{0}'' \u4e0d\u662f MINMAX \u53c2\u6570 ''{1}'' \u7684\u6709\u6548 ''\u53cc\u7cbe\u5ea6'' \u503c\u3002
+cmm.rest_api.minmax_constraint_invalid_max_value=MINMAX \u7ea6\u675f\u6761\u4ef6\u7684\u6700\u5927\u503c\u5fc5\u987b\u5927\u4e8e\u96f6\u3002
+cmm.rest_api.minmax_constraint_invalid_use=MINMAX \u7ea6\u675f\u6761\u4ef6\u53ea\u80fd\u4e0e\u6570\u5b57\u578b\u6570\u636e\u7ed3\u5408\u4f7f\u7528\u3002
+cmm.rest_api.length_constraint_invalid_parameter=''{0}'' \u4e0d\u662f LENGTH \u53c2\u6570 ''{1}'' \u7684\u6709\u6548 ''\u6574\u6570'' \u503c\u3002
+cmm.rest_api.length_constraint_invalid_use=\u60a8\u53ea\u80fd\u5c06 LENGTH \u7ea6\u675f\u6761\u4ef6\u4e0e TEXT\u3001CONTENT \u548c MLTEXT \u7c7b\u578b\u6570\u636e\u7ed3\u5408\u4f7f\u7528\u3002
+# Property
+cmm.rest_api.property_name_null=\u5c5e\u6027\u540d\u79f0\u4e0d\u80fd\u4e3a\u7a7a\u3002
+cmm.rest_api.property_create_update_failure=\u6211\u4eec\u65e0\u6cd5\u521b\u5efa/\u66f4\u65b0\u5c5e\u6027\u3002
+cmm.rest_api.property_delete_failure=\u6211\u4eec\u65e0\u6cd5\u5220\u9664\u5c5e\u6027\u3002
+cmm.rest_api.property_datatype_invalid=''{0}'' \u4e0d\u662f\u6709\u6548\u7684\u6570\u636e\u7c7b\u578b\u683c\u5f0f\u3002 \u6709\u6548\u7684\u683c\u5f0f\u5e94\u5305\u542b\u547d\u540d\u7a7a\u95f4\u524d\u7f00\u3001\u5192\u53f7\u548c\u540d\u79f0\uff0c\u4f8b\u5982\uff1ad:text\u3002
+cmm.rest_api.properties_empty_null=\u5c5e\u6027\u4e0d\u80fd\u4e3a\u7a7a\u3002
+cmm.rest_api.property_create_name_already_in_use=\u6211\u4eec\u65e0\u6cd5\u521b\u5efa\u5c5e\u6027\uff0c\u56e0\u4e3a\u5c5e\u6027\u540d\u79f0 ''{0}''\u5df2\u5b58\u5728\u3002
+cmm.rest_api.property_update_prop_not_found=\u6211\u4eec\u65e0\u6cd5\u627e\u5230\u4e0e ''{0}'' \u5339\u914d\u7684\u5c5e\u6027\u3002
+cmm.rest_api.property_change_datatype_err=\u60a8\u65e0\u6cd5\u66f4\u6539\u6d3b\u8dc3\u6a21\u578b\u4e2d\u5c5e\u6027\u7684\u6570\u636e\u7c7b\u578b\u3002
+cmm.rest_api.property_change_mandatory_opt_err=\u60a8\u65e0\u6cd5\u66f4\u6539\u6d3b\u8dc3\u6a21\u578b\u4e2d\u5c5e\u6027\u7684\u5f3a\u5236\u9009\u9879\u3002
+cmm.rest_api.property_change_mandatory_enforced_opt_err=\u60a8\u65e0\u6cd5\u66f4\u6539\u6d3b\u8dc3\u6a21\u578b\u4e2d\u5c5e\u6027\u7684\u5f3a\u5236\u6267\u884c\u9009\u9879\u3002
+cmm.rest_api.property_change_multi_valued_opt_err=\u60a8\u65e0\u6cd5\u66f4\u6539\u6d3b\u8dc3\u6a21\u578b\u4e2d\u5c5e\u6027\u7684\u591a\u503c\u9009\u9879\u3002
+# validation
+cmm.rest_api.input_validation_err=''{0}'' \u4e0d\u662f\u6709\u6548\u503c\u3002 \u4ec5\u53ef\u4f7f\u7528\u6570\u5b57\u3001\u5b57\u6bcd\u3001\u8fde\u5b57\u7b26 (-) \u548c\u4e0b\u5212\u7ebf (_)\u3002
+cmm.rest_api.prefix_not_registered=\u6ca1\u6709\u4e3a URI ''{0}'' \u6ce8\u518c\u547d\u540d\u7a7a\u95f4\u524d\u7f00\u3002 \u786e\u4fdd\u6a21\u578b\u4e3a\u6d3b\u8dc3\u3002
+cmm.rest_api.prefixed_qname_invalid=''{0}'' \u4e0d\u662f\u52a0\u524d\u7f00\u7684\u6709\u6548 QName \u503c\u3002 {1}
+cmm.rest_api.circular_dependency_err=\u68c0\u6d4b\u5230\u5faa\u73af\u4f9d\u5b58\u5173\u7cfb\u3002 \u60a8\u65e0\u6cd5\u8bbe\u7f6e\u7236\u7ea7 ''{0}''\uff0c\u56e0\u4e3a\u5b83\u7684\u6a21\u578b\u5df2\u7ecf\u4f9d\u8d56\u4e8e ''{1}''\u3002
+cmm.rest_api.prefixed_qname_invalid_format=''{0}'' \u4e0d\u662f\u52a0\u524d\u7f00\u7684\u6709\u6548 QName \u683c\u5f0f\u3002 \u6709\u6548\u683c\u5f0f\u5e94\u5305\u542b\u547d\u540d\u7a7a\u95f4\u524d\u7f00\u3001\u5192\u53f7\u548c\u540d\u79f0\uff0c\u4f8b\u5982\uff1acm:content\u3002
+# model import
+cmm.rest_api.model.import_namespace_multiple_found=\u81ea\u5b9a\u4e49\u6a21\u578b\u53ea\u80fd\u6709\u4e00\u4e2a\u547d\u540d\u7a7a\u95f4\u3002 \u6211\u4eec\u627e\u5230 ''{0}''\u3002
+cmm.rest_api.model.import_namespace_undefined=\u81ea\u5b9a\u4e49\u6a21\u578b\u5fc5\u987b\u5b9a\u4e49\u4e00\u4e2a\u547d\u540d\u7a7a\u95f4\u3002
+cmm.rest_api.model.import_associations_unsupported=\u81ea\u5b9a\u4e49\u6a21\u578b\u4e0d\u652f\u6301 'associations' \u5143\u7d20\u3002
+cmm.rest_api.model.import_overrides_unsupported=\u81ea\u5b9a\u4e49\u6a21\u578b\u4e0d\u652f\u6301 'overrides' \u5143\u7d20\u3002
+cmm.rest_api.model.import_mandatory_aspects_unsupported=\u81ea\u5b9a\u4e49\u6a21\u578b\u4e0d\u652f\u6301 'mandatory-aspects' \u5143\u7d20\u3002
+cmm.rest_api.model.import_archive_unsupported=\u81ea\u5b9a\u4e49\u6a21\u578b\u4e0d\u652f\u6301 'archive' \u5143\u7d20\u3002
+cmm.rest_api.model.import_includedInSuperTQ_unsupported=\u81ea\u5b9a\u4e49\u6a21\u578b\u4e0d\u652f\u6301 'includedInSuperTypeQuery' \u5143\u7d20\u3002
+cmm.rest_api.model.import_not_multi_part_req=\u8bf7\u6c42\u4e0d\u662f\u591a\u90e8\u5206\u7ec4\u6210\u6570\u636e\u3002
+cmm.rest_api.model.import_not_zip_format=''{0}'' \u4e0d\u662f\u6709\u6548\u7684 zip \u6587\u4ef6\u3002
+cmm.rest_api.model.import_process_zip_file_failure=\u6211\u4eec\u65e0\u6cd5\u5904\u7406 zip \u6587\u4ef6\u3002
+cmm.rest_api.model.import_no_zip_file_uploaded=\u6211\u4eec\u65e0\u6cd5\u4e0a\u4f20 zip \u6587\u4ef6\u3002
+cmm.rest_api.model.import_invalid_zip_package=zip \u6587\u4ef6\u5305\u542b\u7684\u6587\u4ef6\u4e0d\u80fd\u8d85\u8fc7\u4e24\u4e2a\u3002 \u5b83\u4eec\u5e94\u8be5\u4e3a\u4e00\u4e2a\u6a21\u578b\u6587\u4ef6\u548c\u4e00\u4e2a\u6269\u5c55\u6a21\u5757\u6587\u4ef6\u3002
+cmm.rest_api.model.import_invalid_zip_entry_format=''{0}'' \u4e0d\u662f\u6a21\u578b\u6216\u5171\u4eab\u6269\u5c55\u6a21\u5757\u6587\u4ef6\u3002
+cmm.rest_api.model.import_invalid_model_entry=''{0}'' \u4e0d\u662f\u6709\u6548\u7684\u6a21\u578b\u6587\u4ef6\u3002
+cmm.rest_api.model.import_invalid_ext_module_entry=''{0}'' \u4e0d\u662f\u6709\u6548\u7684\u5171\u4eab\u6269\u5c55\u6a21\u5757\u6587\u4ef6\u3002
+cmm.rest_api.model.import_failure=\u6211\u4eec\u65e0\u6cd5\u5bfc\u5165\u6a21\u578b\u3002
+cmm.rest_api.model.import_process_ext_module_file_failure=\u6211\u4eec\u65e0\u6cd5\u5904\u7406\u5171\u4eab\u6269\u5c55\u6a21\u5757\u6587\u4ef6\u3002
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages.properties
new file mode 100644
index 00000000000..08562a979af
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=Unknown error calling the Rest API
+framework.exception.ConstraintViolated=A constraint was violated
+framework.exception.InvalidArgument=An invalid argument was received {0}
+framework.exception.InvalidProperty=The property ''{0}'' with value ''{1}'' isn''t supported for {2} comparison
+framework.exception.InvalidQuery=An invalid WHERE query was received. {0}
+framework.exception.InvalidSelect=An invalid {1} query was received. {0}
+framework.exception.NotFound={0} was not found
+framework.exception.EntityNotFound=The entity with id: {0} was not found
+framework.exception.RelationshipNotFound=The relationship resource was not found for the entity with id: {0} and a relationship id of {1}
+framework.exception.PermissionDenied=Permission was denied
+framework.exception.StaleEntity=Attempt to update a stale entity
+framework.exception.UnsupportedResourceOperation=The operation is unsupported
+framework.exception.DeletedResource=In this version of the REST API resource {0} has been deleted
+framework.exception.RequestEntityTooLarge=The file can't be uploaded because it's larger than the maximum upload size
+framework.exception.InsufficientStorage=The file upload exceeds the content storage allowance
+framework.no.stacktrace=For security reasons the stack trace is no longer displayed, but the property is kept for previous versions
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_cs.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_cs.properties
new file mode 100644
index 00000000000..1f710b6850b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_cs.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=P\u0159i pokusu vyvolat REST API do\u0161lo k\u00a0nezn\u00e1m\u00e9 chyb\u011b
+framework.exception.ConstraintViolated=Omezen\u00ed bylo poru\u0161eno
+framework.exception.InvalidArgument=Byl obdr\u017een neplatn\u00fd argument {0}
+framework.exception.InvalidProperty=Vlastnost ''{0}'' s\u00a0hodnotou ''{1}'' nen\u00ed p\u0159i srovn\u00e1n\u00ed {2} podporov\u00e1na
+framework.exception.InvalidQuery=Byl obdr\u017een neplatn\u00fd dotaz WHERE. {0}
+framework.exception.InvalidSelect=Byl obdr\u017een neplatn\u00fd dotaz {1}. {0}
+framework.exception.NotFound=Nepoda\u0159ilo se naj\u00edt {0}
+framework.exception.EntityNotFound=Entita s\u00a0ID {0} nenalezena
+framework.exception.RelationshipNotFound=Nepoda\u0159ilo se naj\u00edt vztahov\u00e9 prost\u0159edky pro entitu s\u00a0ID {0} a\u00a0vztah s\u00a0ID {1}
+framework.exception.PermissionDenied=Opr\u00e1vn\u011bn\u00ed bylo zam\u00edtnuto
+framework.exception.StaleEntity=Pokus o\u00a0zm\u011bnu zastaral\u00e9 entity
+framework.exception.UnsupportedResourceOperation=Operace nen\u00ed podporov\u00e1na
+framework.exception.DeletedResource=V\u00a0t\u00e9to verzi REST API byly odstran\u011bny prost\u0159edky {0}
+framework.exception.RequestEntityTooLarge=Soubor se nepoda\u0159ilo odeslat, proto\u017ee p\u0159esahuje maxim\u00e1ln\u00ed povolenou velikost odes\u00edlan\u00fdch soubor\u016f
+framework.exception.InsufficientStorage=Odes\u00edlan\u00fd soubor p\u0159esahuje limit pro \u00falo\u017ei\u0161t\u011b obsahu
+framework.no.stacktrace=Z\u00a0bezpe\u010dnostn\u00edch d\u016fvod\u016f ji\u017e trasov\u00e1n\u00ed z\u00e1sobn\u00edku nen\u00ed vid\u011bt, ale je zachov\u00e1no pro pot\u0159eby p\u0159edchoz\u00edch verz\u00ed
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_da.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_da.properties
new file mode 100644
index 00000000000..78145c26e00
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_da.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=Ukendt fejl ved kald til Rest-API'en
+framework.exception.ConstraintViolated=En begr\u00e6nsning blev overtr\u00e5dt
+framework.exception.InvalidArgument=Et ugyldigt argument blev modtaget {0}
+framework.exception.InvalidProperty=Egenskaben ''{0}'' med v\u00e6rdien ''{1}'' underst\u00f8ttes ikke for {2}-sammenligning
+framework.exception.InvalidQuery=En ugyldig WHERE-foresp\u00f8rgsel blev modtaget. {0}
+framework.exception.InvalidSelect=En ugyldig {1}-foresp\u00f8rgsel blev modtaget. {0}
+framework.exception.NotFound={0} blev ikke fundet
+framework.exception.EntityNotFound=Objektet med id''et: {0} blev ikke fundet
+framework.exception.RelationshipNotFound=Relationsressourcen blev ikke fundet for objektet med id''et: {0} og relations-id''et {1}
+framework.exception.PermissionDenied=Tilladelsen blev afvist
+framework.exception.StaleEntity=Fors\u00f8g p\u00e5 at opdatere et for\u00e6ldet objekt
+framework.exception.UnsupportedResourceOperation=Handlingen underst\u00f8ttes ikke
+framework.exception.DeletedResource=I denne version af REST-API''en er ressourcen {0} blevet slettet
+framework.exception.RequestEntityTooLarge=Filen kan ikke uploades, da den er st\u00f8rre end den maksimale uploadst\u00f8rrelse
+framework.exception.InsufficientStorage=St\u00f8rrelsen p\u00e5 den uploadede fil overstiger den tilladte indholdslagerst\u00f8rrelse
+framework.no.stacktrace=Af sikkerheds\u00e5rsager vises staksporing ikke l\u00e6ngere, men egenskaben beholdes for tidligere versioner
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_de.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_de.properties
new file mode 100755
index 00000000000..f397629585a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_de.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=Unbekannter Fehler beim Aufruf der REST-API
+framework.exception.ConstraintViolated=Ein Constraint wurde verletzt
+framework.exception.InvalidArgument=Es ist ein unzul\u00e4ssiges Argument eingegangen: {0}
+framework.exception.InvalidProperty=Die Eigenschaft ''{0}'' mit dem Wert ''{1}'' ist f\u00fcr einen {2}-Vergleich unzul\u00e4ssig
+framework.exception.InvalidQuery=Es ist eine unzul\u00e4ssige WHERE-Anfrage eingegangen: {0}
+framework.exception.InvalidSelect=Es ist eine unzul\u00e4ssige {1}-Anfrage eingegangen. {0}
+framework.exception.NotFound={0} wurde nicht gefunden
+framework.exception.EntityNotFound=Die Entity mit der ID {0} wurde nicht gefunden
+framework.exception.RelationshipNotFound=Die Beziehungsressource wurde nicht gefunden f\u00fcr die Entity mit der ID {0} und einer Beziehungs-ID von {1}
+framework.exception.PermissionDenied=Berechtigung verweigert
+framework.exception.StaleEntity=Versuch, eine gegenstandslose Entity zu aktualisieren
+framework.exception.UnsupportedResourceOperation=Der Vorgang wird nicht unterst\u00fctzt
+framework.exception.DeletedResource=In dieser Version der REST-API wurde die Ressource {0} gel\u00f6scht
+framework.exception.RequestEntityTooLarge=Die Datei kann nicht hochgeladen werden da sie die maximale Upload-Gr\u00f6\u00dfe \u00fcberschreitet
+framework.exception.InsufficientStorage=Der Datei-Upload \u00fcberschreitet das erlaubte Speicherkontingent
+framework.no.stacktrace=Aus Sicherheitsgr\u00fcnden wird die Stapelverfolgung nicht mehr angezeigt. Die Eigenschaft wird jedoch f\u00fcr \u00e4ltere Versionen beibehalten
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_es.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_es.properties
new file mode 100755
index 00000000000..c4b797990ec
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_es.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=Error desconocido al llamar a la API de Rest
+framework.exception.ConstraintViolated=Se ha violado una restricci\u00f3n
+framework.exception.InvalidArgument=Se ha recibido un argumento no v\u00e1lido: {0}
+framework.exception.InvalidProperty=La propiedad ''{0}'' con valor ''{1}'' no es v\u00e1lida para la comparaci\u00f3n {2}
+framework.exception.InvalidQuery=Se ha recibido una consulta WHERE no v\u00e1lida: {0}
+framework.exception.InvalidSelect=Se ha recibido una consulta {1} no v\u00e1lida: {0}
+framework.exception.NotFound=No se ha encontrado {0}
+framework.exception.EntityNotFound=No se ha encontrado la entidad con id: {0}
+framework.exception.RelationshipNotFound=No se ha encontrado el recurso de relaci\u00f3n para la entidad con id: {0} y un id de relaci\u00f3n de {1}
+framework.exception.PermissionDenied=Se ha denegado el permiso
+framework.exception.StaleEntity=Intento de actualizar una entidad obsoleta
+framework.exception.UnsupportedResourceOperation=No se admite la operaci\u00f3n
+framework.exception.DeletedResource=En esta versi\u00f3n de la API REST, se ha eliminado el recurso {0}
+framework.exception.RequestEntityTooLarge=No se puede cargar el fichero porque excede el tama\u00f1o m\u00e1ximo de carga permitido
+framework.exception.InsufficientStorage=El fichero cargado excede la cuota de almacenamiento de contenido
+framework.no.stacktrace=Por motivos de seguridad, ya no se muestra el seguimiento de la pila, pero se guarda la propiedad para versiones anteriores
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_fi.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_fi.properties
new file mode 100644
index 00000000000..5608deaca05
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_fi.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=Tuntematon virhe kutsuttaessa Rest API -ohjelmointirajapintaa
+framework.exception.ConstraintViolated=Rajoitusta rikottiin
+framework.exception.InvalidArgument=Vastaanotettiin virheellinen argumentti {0}
+framework.exception.InvalidProperty=Ominaisuutta {0}, jonka arvo on {1}, ei tueta vertailussa ({2})
+framework.exception.InvalidQuery=Vastaanotettiin virheellinen WHERE-kysely. {0}
+framework.exception.InvalidSelect=Vastaanotettiin virheellinen {1}-kysely. {0}
+framework.exception.NotFound={0}: ei l\u00f6ydy
+framework.exception.EntityNotFound=Entiteetti\u00e4, jonka tunnus on {0}, ei l\u00f6ydy.
+framework.exception.RelationshipNotFound=Suhderesurssia ei l\u00f6ydy entiteetille, jonka tunnus on {0} ja suhdetunnus {1}
+framework.exception.PermissionDenied=K\u00e4ytt\u00f6 estettiin
+framework.exception.StaleEntity=Yritys p\u00e4ivitt\u00e4\u00e4 vanhentunut entiteetti
+framework.exception.UnsupportedResourceOperation=Toimintoa ei tueta
+framework.exception.DeletedResource=Resurssi {0} on poistettu t\u00e4ss\u00e4 REST API -versiossa
+framework.exception.RequestEntityTooLarge=Tiedostoa ei voida ladata, koska se ylitt\u00e4\u00e4 ladattavien tiedostojen kokorajoituksen
+framework.exception.InsufficientStorage=Tiedosto ylitt\u00e4\u00e4 sis\u00e4ll\u00f6n tallennusrajoituksen
+framework.no.stacktrace=Suojaussyist\u00e4 pinon j\u00e4ljitystietoja ei en\u00e4\u00e4 n\u00e4ytet\u00e4, mutta ominaisuus s\u00e4ilytet\u00e4\u00e4n vanhempia versioita varten
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_fr.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_fr.properties
new file mode 100755
index 00000000000..16ab6a6f8b9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_fr.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=Erreur inconnue lors de l'appel de l'API Rest
+framework.exception.ConstraintViolated=Une contrainte n'a pas \u00e9t\u00e9 respect\u00e9e
+framework.exception.InvalidArgument=Un argument non valide a \u00e9t\u00e9 re\u00e7u : {0}
+framework.exception.InvalidProperty=La propri\u00e9t\u00e9 ''{0}'' avec la valeur ''{1}'' n''est pas valide pour la comparaison {2}
+framework.exception.InvalidQuery=Une requ\u00eate WHERE non valide a \u00e9t\u00e9 re\u00e7ue : {0}
+framework.exception.InvalidSelect=Une requ\u00eate {1} non valide a \u00e9t\u00e9 re\u00e7ue. {0}
+framework.exception.NotFound={0} introuvable
+framework.exception.EntityNotFound=L''entit\u00e9 associ\u00e9e \u00e0 l''id : {0} est introuvable
+framework.exception.RelationshipNotFound=La ressource de relation est introuvable pour l''entit\u00e9 associ\u00e9e \u00e0 l''id : {0} et pour un id de relation de {1}
+framework.exception.PermissionDenied=Droit d'acc\u00e8s refus\u00e9
+framework.exception.StaleEntity=Tentative de mise \u00e0 jour d'une entit\u00e9 hors service
+framework.exception.UnsupportedResourceOperation=L'op\u00e9ration n'est pas prise en charge
+framework.exception.DeletedResource=Dans cette version de l''API REST, la ressource {0} a \u00e9t\u00e9 supprim\u00e9e
+framework.exception.RequestEntityTooLarge=Impossible d'importer le fichier car il d\u00e9passe la taille maximale de t\u00e9l\u00e9chargement
+framework.exception.InsufficientStorage=La taille du fichier\u00e0 importer d\u00e9passe la limite de stockage autoris\u00e9e
+framework.no.stacktrace=Pour des raisons de s\u00e9curit\u00e9, le tra\u00e7age de la pile n'est plus affich\u00e9, mais la propri\u00e9t\u00e9 est conserv\u00e9e dans les versions pr\u00e9c\u00e9dente
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_it.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_it.properties
new file mode 100755
index 00000000000..ffd1237d876
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_it.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=Errore sconosciuto durante la chiamata all'API REST
+framework.exception.ConstraintViolated=\u00c8 stato violato un vincolo
+framework.exception.InvalidArgument=\u00c8 stato ricevuto un argomento non valido: {0}
+framework.exception.InvalidProperty=La propriet\u00e0 "{0}" con valore "{1}" non \u00e8 valida per il confronto {2}
+framework.exception.InvalidQuery=\u00c8 stata ricevuta una query WHERE non valida: {0}
+framework.exception.InvalidSelect=\u00c8 stata ricevuta una query {1} non valida. {0}
+framework.exception.NotFound=Impossibile trovare {0}
+framework.exception.EntityNotFound=Impossibile trovare l''entit\u00e0 con ID {0}
+framework.exception.RelationshipNotFound=Impossibile trovare la risorsa di relazione per l''entit\u00e0 con ID {0} e un ID di relazione {1}
+framework.exception.PermissionDenied=Permesso negato
+framework.exception.StaleEntity=Si \u00e8 tentato di aggiornare un'entit\u00e0 obsoleta
+framework.exception.UnsupportedResourceOperation=Questa operazione non \u00e8 supportata
+framework.exception.DeletedResource={0} \u00e8 stato eliminato in questa versione della risorsa REST API
+framework.exception.RequestEntityTooLarge=Impossibile caricare il file perch\u00e9 \u00e8 pi\u00f9 grande della dimensione massima consentita
+framework.exception.InsufficientStorage=Il caricamento del file supera la quota massima di archiviazione
+framework.no.stacktrace=Per motivi di sicurezza l'analisi dello stack non viene pi\u00f9 visualizzata, ma viene mantenuta la propriet\u00e0 per le versioni precedenti
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_ja.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_ja.properties
new file mode 100755
index 00000000000..1dd733b3596
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_ja.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=Rest API \u306e\u547c\u3073\u51fa\u3057\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+framework.exception.ConstraintViolated=\u5236\u7d04\u9055\u53cd\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+framework.exception.InvalidArgument=\u7121\u52b9\u306a\u5f15\u6570\u3092\u53d7\u3051\u53d6\u308a\u307e\u3057\u305f\u3002{0}
+framework.exception.InvalidProperty=\u30d7\u30ed\u30d1\u30c6\u30a3 ''{0}'' \u3068\u305d\u306e\u5024 ''{1}'' \u306f {2} \u306e\u6bd4\u8f03\u306b\u306f\u7121\u52b9\u3067\u3059
+framework.exception.InvalidQuery=\u7121\u52b9\u306a WHERE \u30af\u30a8\u30ea\u3092\u53d7\u3051\u53d6\u308a\u307e\u3057\u305f\u3002 {0}
+framework.exception.InvalidSelect=\u7121\u52b9\u306a {1} \u30af\u30a8\u30ea\u3092\u53d7\u3051\u53d6\u308a\u307e\u3057\u305f\u3002 {0}
+framework.exception.NotFound={0} \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
+framework.exception.EntityNotFound=ID \u304c {0} \u306e\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
+framework.exception.RelationshipNotFound=ID\u304c {0}\u3001\u30ea\u30ec\u30fc\u30b7\u30e7\u30f3\u30b7\u30c3\u30d7 ID \u304c {1} \u306e\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u306e\u30ea\u30ec\u30fc\u30b7\u30e7\u30f3\u30b7\u30c3\u30d7\u30ea\u30bd\u30fc\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
+framework.exception.PermissionDenied=\u6a29\u9650\u304c\u62d2\u5426\u3055\u308c\u307e\u3057\u305f
+framework.exception.StaleEntity=\u53e4\u3044\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u3092\u66f4\u65b0\u3057\u3088\u3046\u3068\u3057\u307e\u3057\u305f
+framework.exception.UnsupportedResourceOperation=\u3053\u306e\u64cd\u4f5c\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+framework.exception.DeletedResource=REST API \u30ea\u30bd\u30fc\u30b9 ''{0}'' \u306e\u3053\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306f\u524a\u9664\u3055\u308c\u3066\u3044\u307e\u3059
+framework.exception.RequestEntityTooLarge=\u30d5\u30a1\u30a4\u30eb\u304c\u6700\u5927\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u30b5\u30a4\u30ba\u3088\u308a\u5927\u304d\u3044\u305f\u3081\u3001\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
+framework.exception.InsufficientStorage=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u304c\u3001\u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u30b9\u30c8\u30ec\u30fc\u30b8\u8a31\u5bb9\u7bc4\u56f2\u3092\u8d85\u3048\u3066\u3044\u307e\u3059
+framework.no.stacktrace=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5bfe\u7b56\u306e\u305f\u3081\u30b9\u30bf\u30c3\u30af\u30c8\u30ec\u30fc\u30b9\u306f\u8868\u793a\u3055\u308c\u306a\u304f\u306a\u308a\u307e\u3057\u305f\u304c\u3001\u30d7\u30ed\u30d1\u30c6\u30a3\u306f\u4ee5\u524d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u305f\u3081\u306b\u6b8b\u3063\u3066\u3044\u307e\u3059
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_nb.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_nb.properties
new file mode 100644
index 00000000000..a0e2fa7b01a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_nb.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=Ukjent feil p\u00e5kaller REST-API
+framework.exception.ConstraintViolated=En restriksjon ble brutt
+framework.exception.InvalidArgument=Ugyldig argument mottatt: {0}
+framework.exception.InvalidProperty=Egenskapen ''{0}'' med verdien ''{1}'' er ugyldig for {2}-sammenligning
+framework.exception.InvalidQuery=Ugyldlig WHERE sp\u00f8rring mottatt: {0}
+framework.exception.InvalidSelect=Ugyldlig {1}-sp\u00f8rring mottatt. {0}
+framework.exception.NotFound=Finner ikke {0}
+framework.exception.EntityNotFound=Finner ikke enheten med ID: {0}
+framework.exception.RelationshipNotFound=Finner ikke relasjonsressursen for enhet med ID: {0} og relasjons-ID {1}
+framework.exception.PermissionDenied=Tillatelse avvist
+framework.exception.StaleEntity=Fors\u00f8ker \u00e5 oppdatere en foreldet enhet
+framework.exception.UnsupportedResourceOperation=Handlingen st\u00f8ttes ikke
+framework.exception.DeletedResource=I denne versjonen av REST har API-ressursen {0} blitt slettet
+framework.exception.RequestEntityTooLarge=Filen kan ikke lastes opp fordi den er st\u00f8rre enn maksimum opplastingsst\u00f8rrelse
+framework.exception.InsufficientStorage=Filopplastingen overskrider tillatt innholdslagring
+framework.no.stacktrace=Av sikkerhetsmessige \u00e5rsaker vises ikke stakksporing lenger, men egenskapen beholdes for tidlige versjoner
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_nl.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_nl.properties
new file mode 100644
index 00000000000..ca35dd6c42e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_nl.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=Onbekende fout bij het aanroepen van de REST-API
+framework.exception.ConstraintViolated=Er is inbreuk gemaakt op een beperking
+framework.exception.InvalidArgument=Er is een ongeldig argument ontvangen: {0}
+framework.exception.InvalidProperty=De eigenschap ''{0}'' met de waarde ''{1}'' is ongeldig voor vergelijking {2}
+framework.exception.InvalidQuery=Er is een ongeldige WHERE-query ontvangen: {0}
+framework.exception.InvalidSelect=Er is een ongeldige {1}-query ontvangen: {0}
+framework.exception.NotFound={0} is niet gevonden
+framework.exception.EntityNotFound=De entiteit met id: {0} is niet gevonden
+framework.exception.RelationshipNotFound=De relatieresource is niet gevonden voor de entiteit met id: {0} en een relatie-id van {1}
+framework.exception.PermissionDenied=Toegang is geweigerd
+framework.exception.StaleEntity=Poging tot het bijwerken van een oude entiteit
+framework.exception.UnsupportedResourceOperation=De bewerking wordt niet ondersteund
+framework.exception.DeletedResource=De resource {0} is verwijderd uit deze versie van de REST API
+framework.exception.RequestEntityTooLarge=Het bestand kan niet worden ge\u00fcpload omdat het groter is dan de maximale grootte voor uploads
+framework.exception.InsufficientStorage=Bij het uploaden van het bestand wordt de toegestane contentopslag overschreden
+framework.no.stacktrace=Om veiligheidsredenen wordt de stacktracering niet meer weergegeven, maar de eigenschap wordt bewaard voor vorige versies
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_pl.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_pl.properties
new file mode 100644
index 00000000000..58931b5383d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_pl.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=Nieznany b\u0142\u0105d wywo\u0142ania interfejsu API Rest
+framework.exception.ConstraintViolated=Ograniczenie zosta\u0142o naruszone
+framework.exception.InvalidArgument=Otrzymano nieprawid\u0142owy argument {0}
+framework.exception.InvalidProperty=W\u0142a\u015bciwo\u015b\u0107 ''{0}'' o warto\u015bci ''{1}'' nie jest obs\u0142ugiwana w por\u00f3wnaniu {2}
+framework.exception.InvalidQuery=Otrzymano nieprawid\u0142owe zapytanie WHERE. {0}
+framework.exception.InvalidSelect=Otrzymano nieprawid\u0142owe zapytanie {1}. {0}
+framework.exception.NotFound=Obiekt {0} nie zosta\u0142 znaleziony
+framework.exception.EntityNotFound=Obiekt o identyfikatorze {0} nie zosta\u0142 znaleziony
+framework.exception.RelationshipNotFound=Nie znaleziono zasobu relacji dla obiektu o identyfikatorze {0} i identyfikatorze relacji {1}
+framework.exception.PermissionDenied=Uprawnienie zosta\u0142o odrzucone
+framework.exception.StaleEntity=Pr\u00f3ba aktualizacji przestarza\u0142ej jednostki
+framework.exception.UnsupportedResourceOperation=Operacja nie jest obs\u0142ugiwana
+framework.exception.DeletedResource=W tej wersji interfejsu API REST zas\u00f3b {0} zosta\u0142 usuni\u0119ty
+framework.exception.RequestEntityTooLarge=Nie mo\u017cna przes\u0142a\u0107 pliku, poniewa\u017c jest wi\u0119kszy ni\u017c maksymalny rozmiar przesy\u0142ania
+framework.exception.InsufficientStorage=Rozmiar przesy\u0142anego pliku przekracza dozwolon\u0105 wielko\u015b\u0107 magazynu zawarto\u015bci
+framework.no.stacktrace=Ze wzgl\u0119d\u00f3w bezpiecze\u0144stwa \u015bledzenie sterty przesta\u0142o by\u0107 wy\u015bwietlane, jednak pozostawiono w\u0142a\u015bciwo\u015b\u0107, aby zapewni\u0107 zgodno\u015b\u0107 z poprzednimi wersjami
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_pt_BR.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_pt_BR.properties
new file mode 100644
index 00000000000..c3381ed3943
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_pt_BR.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=Erro desconhecido chamando a Rest API
+framework.exception.ConstraintViolated=Uma restri\u00e7\u00e3o foi violada
+framework.exception.InvalidArgument=Um argumento inv\u00e1lido foi recebido: {0}
+framework.exception.InvalidProperty=A propriedade ''{0}'' com valor ''{1}'' \u00e9 inv\u00e1lida para a compara\u00e7\u00e3o {2}
+framework.exception.InvalidQuery=Uma consulta WHERE inv\u00e1lida foi recebida: {0}
+framework.exception.InvalidSelect=Uma consulta {1} inv\u00e1lida foi recebida. {0}
+framework.exception.NotFound={0} n\u00e3o foi encontrada
+framework.exception.EntityNotFound=Entidade com ID: {0} n\u00e3o foi encontrada
+framework.exception.RelationshipNotFound=O recurso de relacionamento n\u00e3o foi encontrado para a entidade com ID: {0} e uma rela\u00e7\u00e3o ID de {1}
+framework.exception.PermissionDenied=Permiss\u00e3o negada
+framework.exception.StaleEntity=Tentativa de atualizar uma entidade obsoleta
+framework.exception.UnsupportedResourceOperation=A opera\u00e7\u00e3o n\u00e3o \u00e9 suportada
+framework.exception.DeletedResource=Nesta vers\u00e3o do recurso REST API, {0} foi exclu\u00eddo
+framework.exception.RequestEntityTooLarge=O arquivo n\u00e3o pode ser carregado pois \u00e9 maior do que o tamanho m\u00e1ximo permitido para carregamento
+framework.exception.InsufficientStorage=Cota de conte\u00fado de armazenamento excedida
+framework.no.stacktrace=Por motivos de seguran\u00e7a, o rastreamento de pilha n\u00e3o \u00e9 mais exibido, mas a propriedade foi mantida para as vers\u00f5es anteriores
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_ru.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_ru.properties
new file mode 100644
index 00000000000..96008edb2d4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_ru.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0432\u044b\u0437\u043e\u0432\u0435 Rest API
+framework.exception.ConstraintViolated=\u041d\u0430\u0440\u0443\u0448\u0435\u043d\u043e \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435
+framework.exception.InvalidArgument=\u041f\u043e\u043b\u0443\u0447\u0435\u043d \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0430\u0440\u0433\u0443\u043c\u0435\u043d\u0442 {0}
+framework.exception.InvalidProperty=\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u043e ''{0}'' \u0441\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435\u043c ''{1}'' \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u043e \u0434\u043b\u044f \u0441\u0440\u0430\u0432\u043d\u0435\u043d\u0438\u044f {2}
+framework.exception.InvalidQuery=\u0411\u044b\u043b \u043f\u043e\u043b\u0443\u0447\u0435\u043d \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0437\u0430\u043f\u0440\u043e\u0441 WHERE. {0}
+framework.exception.InvalidSelect=\u0411\u044b\u043b \u043f\u043e\u043b\u0443\u0447\u0435\u043d \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0437\u0430\u043f\u0440\u043e\u0441 {1}. {0}
+framework.exception.NotFound={0} \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430
+framework.exception.EntityNotFound=\u0421\u0443\u0449\u043d\u043e\u0441\u0442\u044c \u0441 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u043e\u043c: {0} \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430
+framework.exception.RelationshipNotFound=\u041d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d \u0440\u0435\u0441\u0443\u0440\u0441 \u043e\u0442\u043d\u043e\u0448\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u0441\u0443\u0449\u043d\u043e\u0441\u0442\u0438 \u0441 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u043e\u043c: {0} \u0438 \u043e\u0442\u043d\u043e\u0448\u0435\u043d\u0438\u044f \u0441 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u043e\u043c {1}
+framework.exception.PermissionDenied=\u0412 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0438 \u043e\u0442\u043a\u0430\u0437\u0430\u043d\u043e
+framework.exception.StaleEntity=\u041f\u043e\u043f\u044b\u0442\u043a\u0430 \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0443\u0441\u0442\u0430\u0440\u0435\u0432\u0448\u0443\u044e \u0441\u0443\u0449\u043d\u043e\u0441\u0442\u044c
+framework.exception.UnsupportedResourceOperation=\u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f
+framework.exception.DeletedResource=\u0412 \u044d\u0442\u043e\u0439 \u0432\u0435\u0440\u0441\u0438\u0438 REST API \u0440\u0435\u0441\u0443\u0440\u0441 {0} \u0443\u0434\u0430\u043b\u0435\u043d
+framework.exception.RequestEntityTooLarge=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0444\u0430\u0439\u043b, \u043f\u043e\u0442\u043e\u043c\u0443 \u0447\u0442\u043e \u043e\u043d \u043f\u0440\u0435\u0432\u044b\u0448\u0430\u0435\u0442 \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e \u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0440\u0430\u0437\u043c\u0435\u0440
+framework.exception.InsufficientStorage=\u0417\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u043c\u044b\u0439 \u0444\u0430\u0439\u043b \u043f\u0440\u0435\u0432\u044b\u0448\u0430\u0435\u0442 \u043a\u0432\u043e\u0442\u0443 \u043d\u0430 \u0440\u0430\u0437\u043c\u0435\u0440 \u043a\u043e\u043d\u0442\u0435\u043d\u0442\u0430
+framework.no.stacktrace=\u0418\u0437 \u0441\u043e\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0439 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 \u0442\u0440\u0430\u0441\u0441\u0438\u0440\u043e\u0432\u043a\u0430 \u043f\u0430\u043a\u0435\u0442\u0430 \u0431\u043e\u043b\u0435\u0435 \u043d\u0435 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u0442\u0441\u044f, \u043d\u043e \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u043e \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u043e \u0434\u043b\u044f \u043f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0438\u0445 \u0432\u0435\u0440\u0441\u0438\u0439
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_sv.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_sv.properties
new file mode 100644
index 00000000000..861eeae1e3a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_sv.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=Ok\u00e4nt fel anropar Rest-API
+framework.exception.ConstraintViolated=En restriktion kr\u00e4nktes
+framework.exception.InvalidArgument=Ett ogiltigt argument togs emot {0}
+framework.exception.InvalidProperty=Egenskapen ''{0}'' med v\u00e4rde ''{1}'' st\u00f6ds inte f\u00f6r {2} j\u00e4mf\u00f6relse
+framework.exception.InvalidQuery=En ogiltig WHERE-fr\u00e5ga togs emot. {0}
+framework.exception.InvalidSelect=En ogiltig {1} fr\u00e5ga togs emot. {0}
+framework.exception.NotFound={0} hittades inte
+framework.exception.EntityNotFound=Enheten med id: {0} hittades inte
+framework.exception.RelationshipNotFound=Relationsresursen hittades inte f\u00f6r enheten med id: {0} och ett relationsid p\u00e5 {1}
+framework.exception.PermissionDenied=Beh\u00f6righet nekades
+framework.exception.StaleEntity=F\u00f6rs\u00f6k att uppdatera en inaktuell enhet
+framework.exception.UnsupportedResourceOperation=Operationen st\u00f6ds inte
+framework.exception.DeletedResource=I den h\u00e4r versionen av REST-API har resurs {0} raderats
+framework.exception.RequestEntityTooLarge=Filen kan inte laddas upp eftersom den \u00e4r st\u00f6rre \u00e4n maximal uppladdningsstorlek
+framework.exception.InsufficientStorage=Filuppladdningen \u00f6verskrider till\u00e5ten inneh\u00e5llslagring
+framework.no.stacktrace=Av s\u00e4kerhetssk\u00e4l visas inte l\u00e4ngre stacksp\u00e5ret, men egenskapen beh\u00e5lls f\u00f6r tidigare versioner
diff --git a/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_zh_CN.properties b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_zh_CN.properties
new file mode 100644
index 00000000000..38c67842066
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/messages/rest-framework-messages_zh_CN.properties
@@ -0,0 +1,17 @@
+# Messages returned by the REST API framework
+framework.exception.ApiDefault=\u8c03\u7528 Rest API \u65f6\u51fa\u73b0\u672a\u77e5\u9519\u8bef
+framework.exception.ConstraintViolated=\u8fdd\u53cd\u4e86\u7ea6\u675f\u6761\u4ef6
+framework.exception.InvalidArgument=\u6536\u5230\u4e86\u65e0\u6548\u53c2\u6570 {0}
+framework.exception.InvalidProperty=\u5e26\u6709\u503c ''{1}'' \u7684\u5c5e\u6027 ''{0}'' \u5bf9 {2} \u6bd4\u8f83\u65e0\u6548
+framework.exception.InvalidQuery=\u6536\u5230\u4e86\u65e0\u6548 WHERE \u67e5\u8be2\u3002 {0}
+framework.exception.InvalidSelect=\u6536\u5230\u4e86\u65e0\u6548 {1} \u67e5\u8be2\u3002 {0}
+framework.exception.NotFound=\u672a\u627e\u5230 {0}
+framework.exception.EntityNotFound=\u672a\u627e\u5230 ID \u4e3a {0} \u7684\u5b9e\u4f53
+framework.exception.RelationshipNotFound=\u672a\u627e\u5230 ID \u4e3a {0}\u3001\u5173\u7cfb ID \u4e3a {1} \u7684\u5b9e\u4f53\u7684\u5173\u7cfb\u8d44\u6e90
+framework.exception.PermissionDenied=\u6743\u9650\u88ab\u62d2\u7edd
+framework.exception.StaleEntity=\u5c1d\u8bd5\u66f4\u65b0\u8fc7\u671f\u7684\u5b9e\u4f53
+framework.exception.UnsupportedResourceOperation=\u4e0d\u652f\u6301\u6b64\u64cd\u4f5c
+framework.exception.DeletedResource=\u5728\u6b64\u7248\u672c\u7684 REST API \u4e2d\uff0c\u5df2\u5220\u9664\u8d44\u6e90 {0}
+framework.exception.RequestEntityTooLarge=\u6587\u4ef6\u65e0\u6cd5\u88ab\u4e0a\u4f20\uff0c\u56e0\u4e3a\u5b83\u8d85\u8fc7\u4e86\u6700\u5927\u53ef\u4e0a\u4f20\u7684\u5927\u5c0f
+framework.exception.InsufficientStorage=\u4e0a\u4f20\u6587\u4ef6\u8d85\u8fc7\u5185\u5bb9\u5b58\u50a8\u9650\u989d
+framework.no.stacktrace=\u51fa\u4e8e\u5b89\u5168\u539f\u56e0\uff0c\u4e0d\u518d\u663e\u793a\u5806\u6808\u8f68\u8ff9\uff0c\u4f46\u4e3a\u5148\u524d\u7248\u672c\u4fdd\u7559\u4e86\u8be5\u5c5e\u6027
diff --git a/remote-api/src/main/resources/alfresco/project-remote-api.properties b/remote-api/src/main/resources/alfresco/project-remote-api.properties
new file mode 100644
index 00000000000..c76b37a1c22
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/project-remote-api.properties
@@ -0,0 +1,26 @@
+################################################################################
+# Remote API property defaults
+# 9th October 2017
+################################################################################
+
+
+# Whether to send a "basic auth" challenge along with a 401 response (not authorized)
+#
+# If set to true, then a header will be sent similar to:
+#
+#   WWW-Authenticate: Basic realm="..."
+#
+# If set to false, then a header will be sent with an AlfTicket challenge:
+#
+#   WWW-Authenticate: AlfTicket realm="..."
+#
+# This latter case is particularly useful when building a web-browser based client
+# that communicates directly with the Alfresco Public API - using the AlfTicket
+# challenge allows the client to completely control the login behaviour, whereas
+# allowing a Basic auth challenge to be sent results in the Basic Authentication
+# browser dialogue being popped-up without the client app being involved.
+#
+# See issue REPO-2575 for details.
+alfresco.restApi.basicAuthScheme=false
+# REPO-4388 allow CORS headers in transaction response
+webscripts.transaction.preserveHeadersPattern=Access-Control-.*
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/public-rest-context.xml b/remote-api/src/main/resources/alfresco/public-rest-context.xml
new file mode 100644
index 00000000000..271c51fbf0a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/public-rest-context.xml
@@ -0,0 +1,1479 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <bean id="publicapi.webscripts.store" parent="webscripts.repoclasspathstore">
+        <property name="mustExist"><value>true</value></property>
+        <property name="classPath"><value>alfresco/templates/publicapi</value></property>
+    </bean>
+
+    <bean id="publicapi.webscripts.searchpath" class="org.springframework.extensions.webscripts.SearchPath">
+        <property name="searchPath">
+            <list>
+                <ref bean="publicapi.webscripts.store" />
+            </list>
+        </property>
+    </bean>
+      
+    <bean id="publicapi.index" class="org.springframework.extensions.webscripts.JaxRSUriIndex"/>
+   
+    <bean id="publicapi.index.prototype" class="org.springframework.extensions.webscripts.JaxRSUriIndex" scope="prototype"/>
+
+    <bean id="publicapi.registry" class="org.alfresco.rest.api.PublicApiDeclarativeRegistry">
+        <property name="container" ref="publicapi.container" />
+        <property name="uriIndex" ref="publicapi.index" />
+        <property name="searchPath" ref="publicapi.webscripts.searchpath" />
+        <property name="defaultWebScript"><value>webscript.default</value></property>
+        <property name="getNetworksWebScript" ref="getNetworksWebScript" />
+        <property name="getNetworkWebScript" ref="getNetworkWebScript" />
+
+        <!-- TODO - experimental (review) -->
+        <property name="locator" ref="apiLookup" />
+
+    </bean>
+   
+    <bean id="publicapi.registry.prototype" parent="publicapi.registry" scope="prototype">
+        <property name="uriIndex" ref="publicapi.index.prototype" />
+    </bean>
+
+    <bean name="publicapi.webScriptsRegistryCache" class="org.alfresco.repo.web.scripts.RegistryAsynchronouslyRefreshedCache" parent="abstractAsynchronouslyRefreshedCache">
+        <property name="registryFactory">
+            <bean class="org.springframework.beans.factory.config.ObjectFactoryCreatingFactoryBean">
+                <property name="targetBeanName"><idref bean="publicapi.registry.prototype"/></property>
+            </bean>
+        </property>
+        <property name="retryingTransactionHelper" ref="retryingTransactionHelper" />
+    </bean>
+
+    <bean id="publicapi.container" class="org.alfresco.rest.api.PublicApiRepositoryContainer" parent="baseAlfrescoRepositoryContainer" init-method="setup">
+        <property name="name"><value>Public Api</value></property>
+        <property name="webScriptsRegistryCache" ref="publicapi.webScriptsRegistryCache" />
+        <!-- Use the time-limited transaction helper to keep request times to an acceptable duration -->
+        <property name="transactionService" ref="transactionService" />
+        <!-- The transaction helper used to generate error responses must be unlimited -->
+        <property name="fallbackTransactionHelper" ref="retryingTransactionHelper" />
+        <property name="authorityService" ref="AuthorityService" />
+        <property name="repository" ref="repositoryHelper" />
+        <property name="repositoryImageResolver" ref="webscripts.repo.imageresolver" />
+        <property name="templateProcessorRegistry" ref="webscripts.repo.registry.templateprocessor" />
+        <property name="scriptProcessorRegistry" ref="webscripts.repo.registry.scriptprocessor" />
+        <property name="descriptorService" ref="DescriptorService" />
+        <property name="tenantAdminService" ref="tenantAdminService" />
+        <property name="encryptTempFiles" value="${webscripts.encryptTempFiles}"/>
+        <property name="tempDirectoryName" value="${webscripts.tempDirectoryName}"/>
+        <property name="memoryThreshold" value="${webscripts.memoryThreshold}"/>
+        <property name="maxContentSize" value="${webscripts.setMaxContentSize}"/>
+        <property name="preserveHeadersPattern" value="${webscripts.transaction.preserveHeadersPattern}"/>
+    </bean>
+   
+    <!--  Public Api Authenticator -->
+
+    <bean id="webScriptAuthenticationListener" class="org.alfresco.repo.web.auth.NoopAuthenticationListener"/>
+   
+    <bean id="publicapi.tenantAuthenticator" class="org.alfresco.rest.api.PublicApiTenantAuthentication">
+        <property name="tenantAdminService" ref="tenantAdminService"/>
+    </bean>
+   
+    <bean id="publicapi.authenticator" class="org.alfresco.rest.api.PublicApiAuthenticatorFactory">
+        <property name="authenticationService" ref="AuthenticationService" />
+        <property name="authenticationListener" ref="webScriptAuthenticationListener"/>
+        <property name="authenticationComponent" ref="authenticationComponent" />
+        <property name="transactionHelper" ref="web.retryingTransactionHelper" />
+        <property name="tenantAuthentication" ref="publicapi.tenantAuthenticator"/>
+        <property name="validAuthentictorKeys">
+            <bean class="org.springframework.util.StringUtils" factory-method="commaDelimitedListToSet">
+                <constructor-arg type="java.lang.String" value="${alfresco.authentication.validAuthenticatorKeys}"/>
+         </bean>   
+        </property>
+        <property name="outboundHeaders">
+            <bean class="org.springframework.util.StringUtils" factory-method="commaDelimitedListToSet">
+                <constructor-arg type="java.lang.String" value="${alfresco.authentication.gateway.outboundHeaders}"/>
+            </bean>
+        </property>
+        <property name="remoteUserMapper">
+            <ref bean="RemoteUserMapper" />
+        </property>
+        <property name="useBasicAuth" value="${alfresco.restApi.basicAuthScheme}"/>
+    </bean>
+
+    <bean id="apiBootstrapBean" class="org.alfresco.rest.framework.core.ApiBootstrap">
+        <property name="apiDictionary" ref="apiLookup" />
+    </bean>
+    <bean id="apiLookup" class="org.alfresco.rest.framework.core.ResourceLookupDictionary">
+    </bean>
+    <bean id="frameworkMessageResourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
+        <property name="resourceBundles">
+            <list>
+                <value>alfresco.messages.rest-framework-messages</value>
+                <value>alfresco.messages.custommodel-restapi-messages</value>
+            </list>
+        </property>
+    </bean>
+   
+    <bean id="restJsonModule" class="org.alfresco.rest.framework.jacksonextensions.RestJsonModule">
+        <property name="jsonSerializers">
+            <list>
+                <bean class="org.alfresco.rest.framework.jacksonextensions.SerializerOfExecutionResult" />
+                <bean class="org.alfresco.rest.framework.jacksonextensions.SerializerOfCollectionWithPaging" />
+                <bean class="org.alfresco.rest.framework.jacksonextensions.NodeRefSerializer" />
+            </list>
+        </property>
+        <property name="jsonDeserializers">
+            <map>
+                <entry key="org.alfresco.service.cmr.repository.NodeRef"><bean class="org.alfresco.rest.framework.jacksonextensions.NodeRefDeserializer" /></entry>
+                <entry key="java.lang.String"><bean class="org.alfresco.rest.framework.jacksonextensions.RestApiStringDeserializer" /></entry>
+                <entry key="org.alfresco.rest.api.model.Target"><bean class="org.alfresco.rest.framework.jacksonextensions.TargetDeserializer" /></entry>
+            </map>
+        </property>
+    </bean>
+    <bean id="jsonHelper" class="org.alfresco.rest.framework.jacksonextensions.JacksonHelper">
+        <property name="module" ref="restJsonModule" />
+    </bean>
+    <bean id="webScriptExceptionResolver" class="org.alfresco.rest.framework.core.exceptions.WebScriptExceptionResolver">
+    </bean>
+    <bean id="simpleMappingExceptionResolverParent" abstract="true" class="org.alfresco.rest.framework.core.exceptions.SimpleMappingExceptionResolver">
+        <property name="exceptionMappings">
+            <map>
+                <entry key="org.alfresco.rest.framework.core.exceptions.ApiException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_INTERNAL_SERVER_ERROR}" />
+                <entry key="java.lang.Throwable" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_INTERNAL_SERVER_ERROR}" />
+                <entry key="java.lang.IllegalArgumentException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_BAD_REQUEST}" />
+                <entry key="org.alfresco.service.cmr.repository.CyclicChildRelationshipException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_BAD_REQUEST}" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.InvalidArgumentException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_BAD_REQUEST}" />
+                <entry key="org.alfresco.service.cmr.version.VersionServiceException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_BAD_REQUEST}" />
+                <entry key="org.alfresco.service.cmr.repository.datatype.TypeConversionException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_BAD_REQUEST}" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.NotFoundException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.EntityNotFoundException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
+                <entry key="org.alfresco.service.cmr.repository.InvalidNodeRefException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
+                <entry key="org.alfresco.service.cmr.version.VersionDoesNotExistException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
+                <entry key="org.alfresco.repo.client.config.ClientAppNotFoundException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.PermissionDeniedException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_FORBIDDEN}" />
+                <entry key="org.alfresco.repo.security.authority.UnknownAuthorityException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
+                <entry key="org.alfresco.repo.security.permissions.AccessDeniedException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_FORBIDDEN}" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_METHOD_NOT_ALLOWED}" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_CONFLICT}" />
+                <entry key="org.alfresco.service.cmr.lock.NodeLockedException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_CONFLICT}" />
+                <entry key="org.alfresco.service.cmr.lock.UnableToAquireLockException" value="422" />
+                <entry key="org.alfresco.service.cmr.lock.UnableToReleaseLockException" value="422" />
+                <entry key="org.alfresco.service.cmr.repository.DuplicateChildNodeNameException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_CONFLICT}" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.StaleEntityException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_CONFLICT}" />
+                <entry key="org.alfresco.repo.content.ContentLimitViolationException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_REQUEST_ENTITY_TOO_LARGE}" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.RequestEntityTooLargeException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_REQUEST_ENTITY_TOO_LARGE}" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.DisabledServiceException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_IMPLEMENTED}" />
+                <entry key="org.alfresco.service.cmr.usage.ContentQuotaException" value="507" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.InsufficientStorageException" value="507" />
+                <entry key="org.alfresco.repo.node.integrity.IntegrityException" value="422" />
+                <entry key="org.alfresco.repo.site.SiteServiceException" value="422" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.UnsupportedMediaTypeException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_UNSUPPORTED_MEDIA_TYPE}" />
+                <entry key="org.alfresco.repo.security.authentication.AuthenticationException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_UNAUTHORIZED}" />
+                <entry key="org.springframework.http.InvalidMediaTypeException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_UNSUPPORTED_MEDIA_TYPE}" />
+                <entry key="org.alfresco.rest.framework.core.exceptions.ServiceUnavailableException" value="503" />
+                <entry key="org.alfresco.service.cmr.dictionary.InvalidTypeException" value="409" />
+            </map>
+        </property>
+    </bean>
+    <bean id="simpleMappingExceptionResolver" parent="simpleMappingExceptionResolverParent" />
+    
+    <bean id="apiAssistant" class="org.alfresco.rest.framework.tools.ApiAssistant">
+        <property name="jsonHelper" ref="jsonHelper" />
+        <property name="resolver" ref="simpleMappingExceptionResolver" />
+        <property name="webScriptExceptionResolver" ref="webScriptExceptionResolver" />
+        <property name="restMetricsReporter" ref="restMetricsReporter"/>
+    </bean>
+    
+	<!-- Using annotation-config=false means AutowiredAnnotationBeanPostProcessor 
+        and CommonAnnotationBeanPostProcessor are both NOT included implicitly -->
+	<!-- context:component-scan base-package="org.alfresco.deleteme" annotation-config="false" 
+		/> <bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor" 
+        /> -->
+
+    <context:component-scan base-package="org.alfresco.rest.api.modules"/>
+
+    <bean id="apiWebScriptParent" abstract="true" parent="webscript" init-method="init">
+        <property name="assistant" ref="apiAssistant" />
+        <property name="encryptTempFiles" value="${webscripts.encryptTempFiles}"/>
+        <property name="tempDirectoryName" value="${webscripts.tempDirectoryName}"/>
+        <property name="memoryThreshold" value="${webscripts.memoryThreshold}"/>
+        <property name="maxContentSize" value="${webscripts.setMaxContentSize}"/>
+        <property name="transactionService" ref="transactionService" />
+    </bean>
+ 
+    <alias name="webscript.org.alfresco.api.ResourceWebScript.get" alias="executorForHttpGet"/>
+    
+    <bean id="webscriptHelper" class="org.alfresco.rest.framework.webscripts.ResourceWebScriptHelper">
+        <property name="locator" ref="apiLookup" />
+        <property name="executor" ref="executorForHttpGet" />
+    </bean>
+
+    <!-- Webscripts -->
+	<bean   id="webscript.org.alfresco.api.ResourceWebScript.get" 
+	        class="org.alfresco.rest.framework.webscripts.ResourceWebScriptGet" parent="apiWebScriptParent">              
+        <property name="helper" ref="webscriptHelper" />
+        <property name="locator" ref="apiLookup" />
+        <property name="streamer" ref="webscript.content.streamer" />   
+    </bean>
+	
+    <bean   id="webscript.org.alfresco.api.ResourceWebScript.post" 
+            class="org.alfresco.rest.framework.webscripts.ResourceWebScriptPost" parent="apiWebScriptParent">
+        <property name="helper" ref="webscriptHelper" />
+        <property name="locator" ref="apiLookup" />        
+        <property name="streamer" ref="webscript.content.streamer" />
+    </bean>
+ 
+    <bean   id="webscript.org.alfresco.api.ResourceWebScript.put" 
+            class="org.alfresco.rest.framework.webscripts.ResourceWebScriptPut" parent="apiWebScriptParent">
+        <property name="helper" ref="webscriptHelper" />
+        <property name="locator" ref="apiLookup" />
+        <property name="streamer" ref="webscript.content.streamer" />
+    </bean>
+    
+    <bean   id="webscript.org.alfresco.api.ResourceWebScript.delete" 
+            class="org.alfresco.rest.framework.webscripts.ResourceWebScriptDelete" parent="apiWebScriptParent">
+        <property name="helper" ref="webscriptHelper" />
+        <property name="locator" ref="apiLookup" />
+        <property name="streamer" ref="webscript.content.streamer" />
+    </bean>
+
+    <bean id="webscript.org.alfresco.api.InfoWebScript.get"
+          class="org.alfresco.rest.framework.webscripts.metadata.InfoWebScriptGet" parent="apiWebScriptParent">
+        <property name="lookupDictionary" ref="apiLookup" />
+    </bean>
+
+    <bean id="webscript.org.alfresco.api.MetaDataWebScript.options"
+          class="org.alfresco.rest.framework.webscripts.metadata.WebScriptOptionsMetaData" parent="apiWebScriptParent">
+        <property name="lookupDictionary" ref="apiLookup" />
+    </bean>  
+
+	<!-- Bean defintions, hopefully later we can replace them with autowired 
+        beans -->
+
+    <bean id="defaultExceptionInterceptor" class="org.alfresco.rest.api.impl.ExceptionInterceptor">
+        <property name="exceptionHandlers">
+            <list>
+                <bean class="org.alfresco.rest.api.impl.DefaultExceptionHandler"/>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="legacyExceptionInterceptor" class="org.alfresco.rest.api.impl.ExceptionInterceptor">
+        <property name="exceptionHandlers">
+            <list>
+                <bean class="org.alfresco.rest.api.impl.LegacyExceptionHandler"/>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="siteMembershipRequestsExceptionInterceptor" class="org.alfresco.rest.api.impl.ExceptionInterceptor">
+        <property name="exceptionHandlers">
+            <list>
+                <bean class="org.alfresco.rest.api.impl.SiteMembershipRequestsExceptionHandler"/>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="activitySummaryProcessorRegistry" class="org.alfresco.util.registry.NamedObjectRegistry">
+        <property name="storageType" value="org.alfresco.rest.api.impl.activities.ActivitySummaryProcessor"/>
+    </bean>
+    
+    <bean id="activitySummaryParser" class="org.alfresco.rest.api.impl.activities.ActivitySummaryParser">
+        <property name="processors" ref="activitySummaryProcessorRegistry" />
+    </bean>
+
+    <bean id="commentsActivitySummaryProcessor" class="org.alfresco.rest.api.impl.activities.BaseActivitySummaryProcessor">
+        <property name="registry" ref="activitySummaryParser" />
+        <property name="eventTypes">
+            <list>
+                <value>org.alfresco.comments.comment-created</value>
+                <value>org.alfresco.comments.comment-updated</value>
+                <value>org.alfresco.comments.comment-deleted</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="documentLibraryActivitySummaryProcessor" class="org.alfresco.rest.api.impl.activities.BaseActivitySummaryProcessor">
+        <property name="registry" ref="activitySummaryParser" />
+        <property name="eventTypes">
+            <list>
+                <value>org.alfresco.documentlibrary.files-added</value>
+                <value>org.alfresco.documentlibrary.files-updated</value>
+                <value>org.alfresco.documentlibrary.files-deleted</value>
+                <value>org.alfresco.documentlibrary.file-added</value>
+                <value>org.alfresco.documentlibrary.file-created</value>
+                <value>org.alfresco.documentlibrary.file-deleted</value>
+                <value>org.alfresco.documentlibrary.file-liked</value>
+                <value>org.alfresco.documentlibrary.file-previewed</value>
+                <value>org.alfresco.documentlibrary.file-downloaded</value>
+                <value>org.alfresco.documentlibrary.inline-edit</value>
+                <value>org.alfresco.documentlibrary.folder-liked</value>
+                <value>org.alfresco.documentlibrary.folder-added</value>
+                <value>org.alfresco.documentlibrary.folder-deleted</value>
+                <value>org.alfresco.documentlibrary.folders-added</value>
+                <value>org.alfresco.documentlibrary.folders-deleted</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="siteActivitySummaryProcessor" class="org.alfresco.rest.api.impl.activities.SiteActivitySummaryProcessor">
+        <property name="registry" ref="activitySummaryParser" />
+        <property name="eventTypes">
+            <list>
+                <value>org.alfresco.site.user-joined</value>
+                <value>org.alfresco.site.user-left</value>
+                <value>org.alfresco.site.user-role-changed</value>
+                <value>org.alfresco.site.group-added</value>
+                <value>org.alfresco.site.group-removed</value>
+                <value>org.alfresco.site.group-role-changed</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="discussionsActivitySummaryProcessor" class="org.alfresco.rest.api.impl.activities.DiscussionsActivitySummaryProcessor">
+        <property name="registry" ref="activitySummaryParser" />
+        <property name="eventTypes">
+            <list>
+                <value>org.alfresco.discussions.reply-created</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="subscriptionsActivitySummaryProcessor" class="org.alfresco.rest.api.impl.activities.SubscriptionsActivitySummaryProcessor">
+        <property name="registry" ref="activitySummaryParser" />
+        <property name="eventTypes">
+            <list>
+                <value>org.alfresco.subscriptions.followed</value>
+                <value>org.alfresco.subscriptions.subscribed</value>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="wikiActivitySummaryProcessor" class="org.alfresco.rest.api.impl.activities.BaseActivitySummaryProcessor">
+        <property name="registry" ref="activitySummaryParser" />
+        <property name="eventTypes">
+            <list>
+                <value>org.alfresco.wiki.page-created</value>
+                <value>org.alfresco.wiki.page-edited</value>
+                <value>org.alfresco.wiki.page-renamed</value>
+                <value>org.alfresco.wiki.page-deleted</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="nodeRatingSchemeRegistry" class="org.alfresco.util.registry.NamedObjectRegistry">
+        <property name="storageType" value="org.alfresco.rest.api.impl.node.ratings.RatingScheme"/>
+    </bean>
+
+    <bean id="apiLikesRatingScheme" class="org.alfresco.rest.api.impl.node.ratings.LikesRatingScheme">
+        <property name="nodeService" ref="NodeService" />
+        <property name="dictionaryService" ref="DictionaryService" />
+        <property name="activityService" ref="activityService" />
+        <property name="siteService" ref="SiteService" />
+        <property name="nodeRatingSchemeRegistry" ref="nodeRatingSchemeRegistry" />
+        <property name="ratingService" ref="RatingService" />
+    </bean>
+
+    <bean id="apiFiveStarRatingScheme" class="org.alfresco.rest.api.impl.node.ratings.FiveStarRatingScheme">
+        <property name="nodeService" ref="NodeService" />
+        <property name="dictionaryService" ref="DictionaryService" />
+        <property name="activityService" ref="activityService" />
+        <property name="siteService" ref="SiteService" />
+        <property name="nodeRatingSchemeRegistry" ref="nodeRatingSchemeRegistry" />
+        <property name="ratingService" ref="RatingService" />
+    </bean>
+
+    <bean id="activities" class="org.alfresco.rest.api.impl.ActivitiesImpl">
+        <property name="people" ref="people" />
+        <property name="activityService" ref="activityService" />
+        <property name="activitySummaryParser" ref="activitySummaryParser" />
+        <property name="tenantService" ref="tenantService" />
+        <property name="sites" ref="sites" />
+    </bean>
+
+    <bean id="Activities" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.Activities</value>
+        </property>
+        <property name="target">
+            <ref bean="activities" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="nodeTypeConstraint" class="org.alfresco.util.TypeConstraint" init-method="init">
+        <property name="nodeService" ref="NodeService" />
+        <property name="dictionaryService" ref="dictionaryService" />
+        <property name="expectedTypes">
+            <list>
+                <value>{http://www.alfresco.org/model/content/1.0}folder</value>
+                <value>{http://www.alfresco.org/model/content/1.0}content</value>
+                <value>{http://www.alfresco.org/model/cmis/custom}*</value>
+            </list>
+        </property>
+        <property name="excludedTypes">
+            <list>
+                <value>{http://www.alfresco.org/model/forum/1.0}forums</value>
+                <value>{http://www.alfresco.org/model/forum/1.0}forum</value>
+                <value>{http://www.alfresco.org/model/forum/1.0}topic</value>
+                <value>{http://www.alfresco.org/model/forum/1.0}post</value>
+                <value>{http://www.alfresco.org/model/content/1.0}category</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="auditApi" class="org.alfresco.rest.api.impl.AuditImpl">
+        <property name="auditService" ref="AuditService" />
+        <property name="personService" ref="PersonService" />
+        <property name="namespaceService" ref="namespaceService"/>
+        <property name="nodes" ref="nodes"/>
+        <property name="nodeService" ref="NodeService" />
+        <property name="people" ref="People" />
+    </bean>
+
+    <bean id="AuditApi" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.Audit</value>
+        </property>
+        <property name="target">
+            <ref bean="auditApi" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="comments" class="org.alfresco.rest.api.impl.CommentsImpl">
+        <property name="nodes" ref="nodes" />
+        <property name="nodeService" ref="NodeService" />
+        <property name="commentService" ref="CommentService" />
+        <property name="contentService" ref="ContentService" />
+        <property name="typeConstraint" ref="nodeTypeConstraint" />
+        <property name="people" ref="people"/>
+    </bean>
+
+    <bean id="Comments" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.Comments</value>
+        </property>
+        <property name="target">
+            <ref bean="comments" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="nodeRatings" class="org.alfresco.rest.api.impl.NodeRatingsImpl">
+        <property name="nodes" ref="nodes" />
+        <property name="ratingService" ref="RatingService" />
+        <property name="nodeRatingSchemeRegistry" ref="nodeRatingSchemeRegistry" />
+        <property name="typeConstraint" ref="nodeTypeConstraint" />
+    </bean>
+
+    <bean id="NodeRatings" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.NodeRatings</value>
+        </property>
+        <property name="target">
+            <ref bean="nodeRatings" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="nodes.ignoreTypes" class="org.springframework.beans.factory.config.SetFactoryBean">
+        <property name="sourceSet">
+            <set>
+                <value>cm:systemfolder</value>
+                <value>fm:forums</value>
+                <value>fm:forum</value>
+                <value>fm:topic</value>
+                <value>fm:post</value>
+            </set>
+        </property>
+    </bean>
+
+    <bean id="nodes.nonAttachContentTypes" class="org.springframework.beans.factory.config.SetFactoryBean">
+        <property name="sourceSet">
+            <set>
+                <value>application/pdf</value>
+                <value>image/jpeg</value>
+                <value>image/gif</value>
+                <value>image/png</value>
+                <value>image/tiff</value>
+                <value>image/bmp</value>
+            </set>
+        </property>
+    </bean>
+
+    <bean id="nodeDefinitionMapper" class="org.alfresco.rest.api.impl.NodeDefinitionMapperImpl"/>
+
+    <bean id="nodes" class="org.alfresco.rest.api.impl.NodesImpl" init-method="init">
+        <property name="serviceRegistry" ref="ServiceRegistry"/>
+        <property name="repositoryHelper" ref="repositoryHelper"/>
+        <property name="quickShareLinks" ref="QuickShareLinks"/>
+        <property name="behaviourFilter" ref="policyBehaviourFilter"/>
+        <property name="ignoreTypes" ref="nodes.ignoreTypes"/>
+        <property name="nonAttachContentTypes" ref="nodes.nonAttachContentTypes"/>
+        <property name="poster" ref="activitiesPoster" />
+        <property name="smartStore" ref="smartStore"/>
+        <property name="nodeDefinitionMapper" ref="nodeDefinitionMapper" />
+    </bean>
+
+    <bean id="Nodes" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.Nodes</value>
+        </property>
+        <property name="target">
+            <ref bean="nodes" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+    <bean id="downloads" class="org.alfresco.rest.api.impl.DownloadsImpl">
+        <property name="downloadService" ref="DownloadService"/>
+        <property name="nodeService" ref="NodeService"/>
+        <property name="nodes" ref="Nodes" />
+        <property name="permissionService" ref="permissionService"/>
+    </bean>
+
+    <bean id="actions" class="org.alfresco.rest.api.impl.ActionsImpl">
+        <property name="actionService" ref="ActionService"/>
+        <property name="dictionaryService" ref="DictionaryService"/>
+        <property name="namespaceService" ref="NamespaceService"/>
+        <property name="nodeService" ref="NodeService"/>
+        <property name="prefixResolver" ref="namespaceService"/>
+    </bean>
+    <bean id="Actions" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces" value="org.alfresco.rest.api.Actions"/>
+        <property name="target" ref="actions" />
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean class="org.alfresco.rest.api.actions.ActionDefinitionsEntityResource">
+        <property name="actions" ref="Actions"/>
+    </bean>
+    <bean class="org.alfresco.rest.api.actions.ActionExecutionsEntityResource">
+        <property name="actions" ref="Actions"/>
+    </bean>
+    
+    <bean id="Downloads" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.Downloads</value>
+        </property>
+        <property name="target">
+            <ref bean="downloads" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+    <bean id="deletedNodes" class="org.alfresco.rest.api.impl.DeletedNodesImpl">
+        <property name="nodes" ref="Nodes" />
+        <property name="nodeService" ref="NodeService" />
+        <property name="nodeArchiveService" ref="nodeArchiveService"/>
+        <property name="personService" ref="PersonService" />
+        <property name="renditions" ref="Renditions" />
+    </bean>
+
+    <bean id="DeletedNodes" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.DeletedNodes</value>
+        </property>
+        <property name="target">
+            <ref bean="deletedNodes" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+
+    <bean id="quickShareLinks" class="org.alfresco.rest.api.impl.QuickShareLinksImpl">
+        <property name="quickShareService" ref="QuickShareService"/>
+        <property name="nodes" ref="nodes"/>
+        <property name="renditions" ref="renditions"/>
+        <property name="serviceRegistry" ref="ServiceRegistry"/>
+        <property name="enabled" value="${system.quickshare.enabled}" />
+    </bean>
+
+    <bean id="QuickShareLinks" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.QuickShareLinks</value>
+        </property>
+        <property name="target">
+            <ref bean="quickShareLinks" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="queries" class="org.alfresco.rest.api.impl.QueriesImpl">
+        <property name="nodes" ref="nodes"/>
+        <property name="people" ref="people"/>
+        <property name="sites" ref="sites"/>
+        <property name="serviceRegistry" ref="ServiceRegistry"/>
+    </bean>
+
+    <bean id="Queries" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.Queries</value>
+        </property>
+        <property name="target">
+            <ref bean="queries" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="favourites" class="org.alfresco.rest.api.impl.FavouritesImpl">
+        <property name="people" ref="People" />
+        <property name="sites" ref="Sites" />
+        <property name="nodes" ref="Nodes" />
+        <property name="siteService" ref="SiteService" />
+        <property name="favouritesService" ref="FavouritesService" />
+        <property name="namespaceService" ref="NamespaceService" />
+    </bean>
+
+    <bean id="Favourites" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.Favourites</value>
+        </property>
+        <property name="target">
+            <ref bean="favourites" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="defaultExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="siteMembershipRequests" class="org.alfresco.rest.api.impl.SiteMembershipRequestsImpl">
+        <property name="people" ref="People" />
+        <property name="sites" ref="Sites" />
+        <property name="nodeService" ref="NodeService" />
+        <property name="siteService" ref="SiteService" />
+        <property name="invitationService" ref="invitationService" />
+        <property name="networksService" ref="networksService" />
+    </bean>
+
+    <bean id="SiteMembershipRequests" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.SiteMembershipRequests</value>
+        </property>
+        <property name="target">
+            <ref bean="siteMembershipRequests" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="siteMembershipRequestsExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="people" class="org.alfresco.rest.api.impl.PeopleImpl">
+        <property name="nodes" ref="Nodes" />
+        <property name="sites" ref="sites" />
+        <property name="renditions" ref="Renditions" />
+        <property name="siteService" ref="SiteService" />
+        <property name="nodeService" ref="NodeService" />
+        <property name="personService" ref="PersonService" />
+        <property name="authenticationService" ref="AuthenticationService" />
+        <property name="authorityService" ref="AuthorityService" />
+        <property name="contentUsageService" ref="contentUsageImpl" />
+        <property name="contentService" ref="ContentService" />
+        <property name="thumbnailService" ref="ThumbnailService" />
+        <property name="resetPasswordService" ref="resetPasswordService" />
+        <property name="userRegistrySynchronizer" ref="userRegistrySynchronizer" />
+    </bean>
+
+    <bean id="People" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.People</value>
+        </property>
+        <property name="target">
+            <ref bean="people" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="preferences" class="org.alfresco.rest.api.impl.PreferencesImpl">
+        <property name="people" ref="people" />
+        <property name="preferenceService" ref="PreferenceService" />
+    </bean>
+    
+    <bean id="Preferences" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.Preferences</value>
+        </property>
+        <property name="target">
+            <ref bean="preferences" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="sites" class="org.alfresco.rest.api.impl.SitesImpl">
+        <property name="dictionaryService" ref="DictionaryService" />
+        <property name="nodes" ref="Nodes" />
+        <property name="people" ref="people" />
+        <property name="nodeService" ref="NodeService" />
+        <property name="siteService" ref="SiteService" />
+        <property name="favouritesService" ref="FavouritesService" />
+        <property name="preferenceService" ref="PreferenceService" />
+        <property name="importerService" ref="importerComponent"/>
+        <property name="siteSurfConfig" ref="siteSurfConfig" />
+        <property name="permissionService" ref="PermissionService" />
+        <property name="siteServiceImpl" ref="siteService" />
+        <property name="authorityService" ref="authorityService" />
+    </bean>
+
+    <bean id="siteSurfConfig" class="org.alfresco.rest.api.impl.SiteSurfConfig">
+        <property name="configPath" value="alfresco/bootstrap/site"/>
+    </bean>
+    
+    <bean id="Sites" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.Sites</value>
+        </property>
+        <property name="target">
+            <ref bean="sites" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="tags" class="org.alfresco.rest.api.impl.TagsImpl">
+        <property name="nodes" ref="nodes" />
+        <property name="taggingService" ref="TaggingService" />
+        <property name="typeConstraint" ref="nodeTypeConstraint" />
+    </bean>
+
+    <bean id="Tags" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.Tags</value>
+        </property>
+        <property name="target">
+            <ref bean="tags" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="networks" class="org.alfresco.rest.api.impl.NetworksImpl">
+        <property name="people" ref="People" />
+        <property name="networksService" ref="networksService" />
+    </bean>
+
+    <bean id="Networks" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.Networks</value>
+        </property>
+        <property name="target">
+            <ref bean="networks" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="publicapi.mimeTypePropertyLookup" class="org.alfresco.rest.api.lookups.MimeTypePropertyLookup">
+        <property name="serviceRegistry" ref="ServiceRegistry"/>
+        <property name="supported">
+            <list>
+                <value>cm:content.mimetype</value>
+                <value>content.mimetype</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="publicapi.personPropertyLookup" class="org.alfresco.rest.api.lookups.PersonPropertyLookup">
+        <property name="serviceRegistry" ref="ServiceRegistry"/>
+        <property name="supported">
+            <list>
+                <value>cm:creator</value>
+                <value>cm:modifier</value>
+                <value>cm:owner</value>
+                <value>creator</value>
+                <value>modifier</value>
+                <value>owner</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="publicapi.propertyLookups" class="org.alfresco.rest.api.lookups.PropertyLookupRegistry">
+        <property name="lookups">
+            <list>
+                <ref bean="publicapi.personPropertyLookup" />
+                <ref bean="publicapi.mimeTypePropertyLookup" />
+            </list>
+        </property>
+    </bean>
+
+    <!-- API webscripts -->
+
+    <bean class="org.alfresco.rest.api.audit.AuditApplicationsEntityResource">
+        <property name="audit" ref="AuditApi" />
+    </bean>
+    
+    <bean class="org.alfresco.rest.api.audit.AuditApplicationsAuditEntriesRelation">
+        <property name="audit" ref="AuditApi" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.downloads.DownloadsEntityResource">
+        <property name="downloads" ref="Downloads" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.sites.SiteEntityResource">
+        <property name="sites" ref="Sites" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.networks.NetworksEntityResource">
+        <property name="networks" ref="Networks" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.sites.SiteMembersRelation">
+        <property name="sites" ref="Sites" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.sites.SiteContainersRelation">
+        <property name="sites" ref="Sites" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.sitesmembershipsrequests.SiteMembershipRequestEntityResource">
+        <property name="siteMembershipRequests" ref="SiteMembershipRequests" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.sites.SiteMembershipRequestsRelation">
+        <property name="siteMembershipRequests" ref="SiteMembershipRequests" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.people.PeopleEntityResource">
+        <property name="people" ref="People" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.people.PersonGroupsRelation">
+        <property name="groups" ref="Groups" />
+    </bean>
+	
+    <bean class="org.alfresco.rest.api.tags.TagsEntityResource">
+        <property name="tags" ref="Tags" />
+    </bean>
+	
+    <bean class="org.alfresco.rest.api.people.PersonSitesRelation">
+        <property name="sites" ref="Sites" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.people.PersonNetworksRelation">
+        <property name="networks" ref="Networks" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.people.PersonActivitiesRelation">
+        <property name="activities" ref="Activities" />
+    </bean>
+    
+    <bean class="org.alfresco.rest.api.people.PersonPreferencesRelation">
+        <property name="preferences" ref="Preferences" />
+    </bean>
+    
+    <bean class="org.alfresco.rest.api.people.PersonFavouriteSitesRelation">
+        <property name="sites" ref="Sites" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.nodes.NodesEntityResource">
+        <property name="nodes" ref="Nodes" />
+    </bean>
+	
+    <bean class="org.alfresco.rest.api.nodes.NodeCommentsRelation">
+        <property name="comments" ref="Comments" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.nodes.NodeRatingsRelation">
+        <property name="nodeRatings" ref="NodeRatings" />
+    </bean>
+    
+    <bean class="org.alfresco.rest.api.nodes.NodeChildrenRelation">
+        <property name="nodes" ref="Nodes" />
+    </bean>
+    
+    <bean class="org.alfresco.rest.api.nodes.NodeAuditEntriesRelation">
+        <property name="audit" ref="AuditApi" />
+    </bean>
+    
+    <bean id="baseNodeRelation" class="org.alfresco.rest.api.nodes.AbstractNodeRelation" abstract="true">
+        <property name="serviceRegistry" ref="ServiceRegistry"/>
+        <property name="nodes" ref="Nodes" />
+    </bean>
+
+    <bean id="nodeVersionsRelation" class="org.alfresco.rest.api.nodes.NodeVersionsRelation" parent="baseNodeRelation">
+        <property name="behaviourFilter" ref="policyBehaviourFilter"/>
+    </bean>
+    
+    <bean class="org.alfresco.rest.api.nodes.NodeSecondaryChildrenRelation" parent="baseNodeRelation"/>
+
+    <bean class="org.alfresco.rest.api.nodes.NodeParentsRelation" parent="baseNodeRelation"/>
+    
+    <bean class="org.alfresco.rest.api.nodes.NodeTargetsRelation" parent="baseNodeRelation"/>
+
+    <bean class="org.alfresco.rest.api.nodes.NodeSourcesRelation" parent="baseNodeRelation"/>
+
+    <bean class="org.alfresco.rest.api.nodes.NodeTagsRelation">
+        <property name="tags" ref="Tags" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.nodes.NodeActionDefinitionsRelation" parent="baseNodeRelation">
+        <property name="actions" ref="Actions"/>
+    </bean>
+
+    <bean class="org.alfresco.rest.api.trashcan.TrashcanEntityResource">
+        <property name="deletedNodes" ref="DeletedNodes" />
+    </bean>
+
+
+    <bean class="org.alfresco.rest.api.quicksharelinks.QuickShareLinkEntityResource">
+        <property name="quickShareLinks" ref="QuickShareLinks" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.queries.QueriesEntityResource">
+        <property name="queries" ref="Queries" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.people.PersonFavouritesRelation">
+        <property name="favourites" ref="Favourites" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.people.PersonSiteMembershipRequestsRelation">
+        <property name="siteMembershipRequests" ref="SiteMembershipRequests" />
+    </bean>
+
+    <bean id="getNetworksWebScript" 
+          class="org.alfresco.rest.api.NetworksWebScriptGet" parent="apiWebScriptParent">
+        <property name="networks" ref="Networks" />
+        <property name="helper" ref="webscriptHelper" />
+    </bean>
+
+    <bean id="getNetworkWebScript" 
+          class="org.alfresco.rest.api.NetworkWebScriptGet" parent="apiWebScriptParent">
+        <property name="networks" ref="Networks" />
+        <property name="helper" ref="webscriptHelper" />
+    </bean>
+
+    <bean id="webscript.org.alfresco.api.SearchApiWebscript.post"
+          class="org.alfresco.rest.api.search.SearchApiWebscript" parent="webscript">
+        <property name="serviceRegistry" ref="ServiceRegistry" />
+        <property name="assistant" ref="apiAssistant" />
+        <property name="helper" ref="webscriptHelper" />
+        <property name="resultMapper" ref="searchapiResultMapper" />
+        <property name="searchMapper" ref="searchapiSearchMapper" />
+    </bean>
+    
+    <bean id="webscript.org.alfresco.api.SearchSQLApiWebscript.post"
+          class="org.alfresco.rest.api.search.SearchSQLApiWebscript" parent="webscript">
+        <property name="serviceRegistry" ref="ServiceRegistry" />
+        <property name="assistant" ref="apiAssistant" />
+        <property name="helper" ref="webscriptHelper" />
+        <property name="resultMapper" ref="searchapiResultMapper" />
+        <property name="searchMapper" ref="searchapiSearchMapper" />
+    </bean>
+
+    <bean id="searchapiStoreMapper" class="org.alfresco.rest.api.search.impl.StoreMapper" />
+
+    <bean id="searchapiSearchMapper" class="org.alfresco.rest.api.search.impl.SearchMapper">
+        <property name="storeMapper" ref="searchapiStoreMapper" />
+    </bean>
+
+    <bean id="searchapiResultMapper" class="org.alfresco.rest.api.search.impl.ResultMapper">
+        <property name="serviceRegistry" ref="ServiceRegistry"/>
+        <property name="storeMapper" ref="searchapiStoreMapper" />
+        <property name="nodeVersions" ref="nodeVersionsRelation" />
+        <property name="nodes" ref="Nodes" />
+        <property name="deletedNodes"  ref="DeletedNodes" />
+        <property name="propertyLookup" ref="publicapi.propertyLookups" />
+    </bean>
+
+    <bean id="webscript.org.alfresco.api.DiscoveryApiWebscript.get"
+          class="org.alfresco.rest.api.discovery.DiscoveryApiWebscript" parent="webscript">
+        <property name="descriptorService" ref="DescriptorService"  />
+        <property name="repoAdminService" ref="repoAdminService" />
+        <property name="auditService" ref="auditService" />
+        <property name="quickShareService" ref="QuickShareService" />
+        <property name="moduleService" ref="ModuleService" />
+        <property name="assistant" ref="apiAssistant" />
+        <property name="enabled" value="${system.api.discovery.enabled}" />
+        <property name="thumbnailService" ref="ThumbnailService" />
+    </bean>
+
+    <bean id="org.alfresco.rest.api.probes.ProbeEntityResource.get" class="org.alfresco.rest.api.probes.ProbeEntityResource">
+        <property name="discovery" ref="webscript.org.alfresco.api.DiscoveryApiWebscript.get" />
+    </bean>
+
+    <!-- OpenCMIS -->
+
+    <bean id="publicApiCMISServiceFactory" class="org.alfresco.opencmis.PublicApiAlfrescoCmisServiceFactory" init-method="init">
+        <property name="memoryThreshold"        value="${opencmis.memoryThresholdKB}" />
+        <property name="maxContentSize"         value="${opencmis.maxContentSizeMB}" />
+        <property name="cmisConnector"          ref="CMISConnector" />
+        <property name="cmisTransactions"       ref="CMISService_Transactions" />
+        <property name="cmisExceptions"         ref="CMISService_Exceptions" />
+        <property name="cmisControl"            ref="CMISService_Control" />
+        <property name="cmisStreams"            ref="CMISService_Streams" />
+        <property name="cmisHolder"             ref="CMISTransactionAwareHolderInterceptor" />
+        <property name="authorityService"       ref="AuthorityService" />
+        <property name="tenantAdminService"     ref="tenantAdminService"/>
+        <property name="networksService"        ref="networksService"/>
+    </bean>
+
+    <bean   id="cmisDispatcherRegistry" class="org.alfresco.opencmis.CMISDispatcherRegistryImpl">
+    </bean>
+
+    <bean   id="cmisAtomPubDispatcher" class="org.alfresco.opencmis.PublicApiAtomPubCMISDispatcher" init-method="init">
+        <property name="descriptorService"  ref="DescriptorService"/>
+        <property name="cmisServiceFactory" ref="publicApiCMISServiceFactory"/>
+        <property name="registry"           ref="cmisDispatcherRegistry" />
+        <property name="serviceName"        value="cmis" />
+        <property name="baseUrlGenerator"   ref="baseUrlGenerator" />
+        <property name="version"            value="1.0"/>
+        <property name="cmisVersion"        value="1.0"/>
+        <property name="tenantAdminService" ref="tenantAdminService"/>
+        <property name="nonAttachContentTypes" ref="nodes.nonAttachContentTypes"/>
+    </bean>
+
+    <bean   id="cmisAtomPubDispatcher1.1" class="org.alfresco.opencmis.PublicApiAtomPubCMISDispatcher" init-method="init">
+        <property name="descriptorService"  ref="DescriptorService"/>
+        <property name="cmisServiceFactory" ref="publicApiCMISServiceFactory"/>
+        <property name="registry"           ref="cmisDispatcherRegistry" />
+        <property name="serviceName"        value="cmis" />
+        <property name="baseUrlGenerator"   ref="baseUrlGenerator" />
+        <property name="version"            value="1.1"/>
+        <property name="cmisVersion"        value="1.1"/>
+        <property name="tenantAdminService" ref="tenantAdminService"/>
+        <property name="nonAttachContentTypes" ref="nodes.nonAttachContentTypes"/>
+    </bean>
+
+    <bean   id="cmisBrowserDispatcher1.1" class="org.alfresco.opencmis.PublicApiBrowserCMISDispatcher" init-method="init">
+        <property name="descriptorService"  ref="DescriptorService"/>
+        <property name="cmisServiceFactory" ref="publicApiCMISServiceFactory"/>
+        <property name="baseUrlGenerator"   ref="baseUrlGenerator"/>
+        <property name="registry"           ref="cmisDispatcherRegistry" />
+        <property name="serviceName"        value="cmis" />
+        <property name="version"            value="1.1"/>
+        <property name="cmisVersion"        value="1.1"/>
+        <property name="tenantAdminService" ref="tenantAdminService"/>
+        <property name="nonAttachContentTypes" ref="nodes.nonAttachContentTypes"/>
+    </bean>
+
+    <bean   id="webscript.org.alfresco.api.opencmis.OpenCMIS.get" 
+            class="org.alfresco.opencmis.CMISWebScript">
+        <property name="registry"           ref="cmisDispatcherRegistry" />
+    </bean>
+
+    <bean   id="webscript.org.alfresco.api.opencmis.OpenCMIS.post" 
+            class="org.alfresco.opencmis.CMISWebScript">
+        <property name="registry"           ref="cmisDispatcherRegistry" />
+    </bean>
+ 
+    <bean   id="webscript.org.alfresco.api.opencmis.OpenCMIS.put" 
+            class="org.alfresco.opencmis.CMISWebScript">
+        <property name="registry"           ref="cmisDispatcherRegistry" />
+    </bean>
+    
+    <bean   id="webscript.org.alfresco.api.opencmis.OpenCMIS.delete" 
+            class="org.alfresco.opencmis.CMISWebScript">
+        <property name="registry"           ref="cmisDispatcherRegistry" />
+    </bean>
+
+    <bean   id="webscript.org.alfresco.api.opencmis.OpenCMIS.options" 
+            class="org.alfresco.opencmis.CMISWebScript">
+        <property name="registry"           ref="cmisDispatcherRegistry" />
+    </bean>
+
+    <bean   id="webscript.org.alfresco.api.opencmis.OpenCMIS.head" 
+            class="org.alfresco.opencmis.CMISWebScript">
+        <property name="registry"           ref="cmisDispatcherRegistry" />
+    </bean>
+
+    <bean id="cmisPathGenerator" class="org.alfresco.opencmis.PublicApiPathGenerator">
+    </bean>
+
+    <bean id="baseUrlGenerator" class="org.alfresco.opencmis.DefaultBaseUrlGenerator">
+        <property name="overrideContext" value="${opencmis.context.override}" />
+        <property name="contextOverride" value="${opencmis.context.value}" />
+        <property name="overrideServletPath" value="${opencmis.servletpath.override}" />
+        <property name="servletPathOverride" value="${opencmis.servletpath.value}" />
+        <property name="overrideServer" value="${opencmis.server.override}" />
+        <property name="serverOverride" value="${opencmis.server.value}" />
+        <property name="pathGenerator" ref="cmisPathGenerator" />
+    </bean>
+    
+    <!-- Workflow REST API -->
+    <bean id="restVariableHelper" class="org.alfresco.rest.workflow.api.impl.RestVariableHelper">
+        <property name="nodeService" ref="nodeService" />
+        <property name="namespaceService" ref="namespaceService" />
+        <property name="dictionaryService" ref="DictionaryService" />
+    </bean>
+   
+    <bean id="baseWorkflowRest" class="org.alfresco.rest.workflow.api.impl.WorkflowRestImpl" abstract="true">
+        <property name="activitiProcessEngine" ref="activitiProcessEngine" />
+        <property name="authorityService" ref="authorityService" />
+        <property name="deployWorkflowsInTenant" value="${system.workflow.deployWorkflowsInTenant}" />
+        <property name="dictionaryService" ref="DictionaryService" />
+        <property name="namespaceService" ref="NamespaceService" />
+        <property name="tenantService" ref="tenantService" />
+        <property name="nodeService" ref="nodeService"/>
+        <property name="activitiWorkflowEngine" ref="activitiWorkflowEngine" />
+    </bean>
+   
+    <bean id="deployments" class="org.alfresco.rest.workflow.api.impl.DeploymentsImpl" parent="baseWorkflowRest">
+    </bean>
+
+    <bean id="Deployments" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.workflow.api.Deployments</value>
+        </property>
+        <property name="target">
+            <ref bean="deployments" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="processDefinitions" class="org.alfresco.rest.workflow.api.impl.ProcessDefinitionsImpl" parent="baseWorkflowRest">
+        <property name="messageService" ref="messageService" />
+        <property name="engineId" value="activiti" />
+        <property name="deployWorkflowsInTenant" value="${system.workflow.deployWorkflowsInTenant}" />
+    </bean>
+
+    <bean id="ProcessDefinitions" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.workflow.api.ProcessDefinitions</value>
+        </property>
+        <property name="target">
+            <ref bean="processDefinitions" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="processes" class="org.alfresco.rest.workflow.api.impl.ProcessesImpl" parent="baseWorkflowRest">
+        <property name="workflowPackageComponent" ref="workflowPackageImpl"/>
+        <property name="serviceRegistry" ref="ServiceRegistry" />
+        <property name="authorityDAO" ref="authorityDAO" />
+        <property name="personService" ref="PersonService" />
+        <property name="messageService" ref="messageService" />
+        <property name="engineId" value="activiti" />
+        <property name="repositoryHelper" ref="repositoryHelper" />
+        <property name="restVariableHelper" ref="restVariableHelper" />
+    </bean>
+
+    <bean id="Processes" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.workflow.api.Processes</value>
+        </property>
+        <property name="target">
+            <ref bean="processes" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="tasks" class="org.alfresco.rest.workflow.api.impl.TasksImpl" parent="baseWorkflowRest">
+        <property name="restVariableHelper" ref="restVariableHelper" />
+        <property name="messageService" ref="messageService" />
+        <property name="personService" ref="PersonService" />
+        <property name="propertyConverter" ref="activitiPropertyConverter" />
+        <property name="taskVariablesLimit" value="${system.workflow.engine.activiti.taskvariableslimit}" />
+    </bean>
+
+    <bean id="Tasks" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.workflow.api.Tasks</value>
+        </property>
+        <property name="target">
+            <ref bean="tasks" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="workflowActivities" class="org.alfresco.rest.workflow.api.impl.ActivitiesImpl" parent="baseWorkflowRest" />
+
+    <bean id="WorkflowActivities" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.workflow.api.Activities</value>
+        </property>
+        <property name="target">
+            <ref bean="workflowActivities" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean class="org.alfresco.rest.workflow.api.deployments.DeploymentsRestEntityResource">
+        <property name="deployments" ref="Deployments"/>
+    </bean>
+    
+    <bean class="org.alfresco.rest.workflow.api.processdefinitions.ProcessDefinitionsRestEntityResource">
+        <property name="processDefinitions" ref="ProcessDefinitions"/>
+    </bean>
+	
+    <bean class="org.alfresco.rest.workflow.api.processdefinitions.StartFormModelRelation">
+        <property name="processDefinitions" ref="ProcessDefinitions"/>
+    </bean>
+    
+    <bean class="org.alfresco.rest.workflow.api.processes.ProcessesRestEntityResource">
+        <property name="processes" ref="Processes"/>
+    </bean>
+	
+    <bean class="org.alfresco.rest.workflow.api.processes.ProcessTasksRelation">
+        <property name="tasks" ref="Tasks"/>
+    </bean>
+    <bean class="org.alfresco.rest.workflow.api.processes.ProcessActivitiesRelation">
+        <property name="activities" ref="WorkflowActivities"/>
+    </bean>
+    <bean class="org.alfresco.rest.workflow.api.processes.ProcessItemsRelation">
+        <property name="processes" ref="Processes"/>
+    </bean>
+    <bean class="org.alfresco.rest.workflow.api.processes.ProcessVariablesRelation">
+        <property name="processes" ref="Processes"/>
+    </bean>
+	
+    <bean class="org.alfresco.rest.workflow.api.tasks.TasksRestEntityResource">
+        <property name="tasks" ref="Tasks"/>
+    </bean>
+	
+    <bean class="org.alfresco.rest.workflow.api.tasks.TaskCandidatesRelation">
+        <property name="tasks" ref="Tasks"/>
+    </bean>
+   
+    <bean class="org.alfresco.rest.workflow.api.tasks.TaskVariablesRelation">
+        <property name="tasks" ref="Tasks"/>
+    </bean>
+   
+    <bean class="org.alfresco.rest.workflow.api.tasks.TaskFormModelRelation">
+        <property name="tasks" ref="Tasks"/>
+    </bean>
+   
+    <bean class="org.alfresco.rest.workflow.api.tasks.TaskItemsRelation">
+        <property name="tasks" ref="Tasks"/>
+    </bean>
+
+    <!--                            -->
+    <!--        CMM REST API        -->
+    <!--                            -->
+    <bean id="customModels" class="org.alfresco.rest.api.impl.CustomModelsImpl">
+        <property name="customModelService" ref="customModelService" />
+        <property name="dictionaryService" ref="dictionaryService"/>
+        <property name="personService" ref="personService"/>
+        <property name="nodeService" ref="nodeService"/>
+        <property name="namespaceService" ref="namespaceService"/>
+        <property name="valueDataTypeValidator" ref="valueDataTypeValidator"/>
+    </bean>
+
+    <bean id="CustomModels" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.CustomModels</value>
+        </property>
+        <property name="target">
+            <ref bean="customModels" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean class="org.alfresco.rest.api.cmm.CustomModelEntityResource">
+        <property name="customModels" ref="CustomModels" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.cmm.CustomModelTypesRelation">
+        <property name="customModels" ref="CustomModels" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.cmm.CustomModelAspectsRelation">
+        <property name="customModels" ref="CustomModels" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.cmm.CustomModelConstraintRelation">
+        <property name="customModels" ref="CustomModels" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.cmm.CustomModelDownloadRelation">
+        <property name="customModels" ref="CustomModels" />
+    </bean>
+
+    <!--                               -->
+    <!--        Rendition REST API     -->
+    <!--                               -->
+    <bean id="renditions" class="org.alfresco.rest.api.impl.RenditionsImpl" init-method="init">
+        <property name="nodes" ref="nodes" />
+        <property name="scriptThumbnailService" ref="thumbnailServiceScript" />
+        <property name="serviceRegistry" ref="ServiceRegistry" />
+        <property name="tenantService" ref="tenantService"/>
+        <property name="renditionService2" ref="RenditionService2"/>
+        <property name="renditionsDataCollector" ref="renditionsDataCollector"/>
+    </bean>
+
+    <bean id="Renditions" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.Renditions</value>
+        </property>
+        <property name="target">
+            <ref bean="renditions" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean class="org.alfresco.rest.api.nodes.NodeRenditionsRelation">
+        <property name="renditions" ref="Renditions" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.nodes.NodeVersionRenditionsRelation">
+        <property name="renditions" ref="Renditions" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.quicksharelinks.QuickShareLinkRenditionsRelation">
+        <property name="quickShareLinks" ref="QuickShareLinks"/>
+    </bean>
+
+    <bean class="org.alfresco.rest.api.trashcan.TrashcanRenditionsRelation">
+        <property name="deletedNodes" ref="DeletedNodes"/>
+    </bean>
+
+    <!-- HeartBeat rest api renditions data collector -->
+    <bean id="renditionsDataCollector" class="org.alfresco.heartbeat.RenditionsDataCollector" parent="hbBaseDataCollector" >
+        <property name="hbJobScheduler" ref="hbNonLockingJobScheduler"/> <!--Schedule a non locking job for this collector, so we gather data from each node -->
+        <constructor-arg name="collectorId"         value="acs.repository.renditions"/>  <!-- Collector ID -->
+        <constructor-arg name="collectorVersion"    value="1.0"/> <!-- Collector version -->
+        <constructor-arg name="cronExpression"      value="0 0 0 ? * *"/> <!-- Daily -->
+        <property name="currentRepoDescriptorDAO"   ref="currentRepoDescriptorDAO"/>
+    </bean>
+
+    <!--                               -->
+    <!--    Authentications REST API   -->
+    <!--                               -->
+    <bean id="authentications" class="org.alfresco.rest.api.impl.AuthenticationsImpl" init-method="init">
+        <property name="authenticationService" ref="AuthenticationService" />
+        <property name="ticketComponent" ref="ticketComponent" />
+        <property name="remoteUserMapper" ref="RemoteUserMapper" />
+    </bean>
+
+    <bean id="Authentications" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.Authentications</value>
+        </property>
+        <property name="target">
+            <ref bean="authentications" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean class="org.alfresco.rest.api.authentications.AuthenticationTicketsEntityResource">
+        <property name="authentications" ref="Authentications" />
+    </bean>
+
+
+    <!--                               -->
+    <!--    Groups REST API   -->
+    <!--                               -->
+    <bean id="groups" class="org.alfresco.rest.api.impl.GroupsImpl">
+        <property name="authorityService" ref="AuthorityService" />
+        <property name="authorityDAO" ref="authorityDAO" />
+        <property name="people" ref="people"/>
+    </bean>
+
+    <bean id="Groups" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.rest.api.Groups</value>
+        </property>
+        <property name="target">
+            <ref bean="groups" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="legacyExceptionInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean class="org.alfresco.rest.api.groups.GroupsEntityResource">
+        <property name="groups" ref="Groups" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.groups.GroupMembersRelation">
+        <property name="groups" ref="Groups" />
+    </bean>
+
+    <bean class="org.alfresco.rest.api.groups.SiteGroupsRelation">
+        <property name="sites" ref="Sites" />
+    </bean>
+</beans>
diff --git a/remote-api/src/main/resources/alfresco/remote-api-context.xml b/remote-api/src/main/resources/alfresco/remote-api-context.xml
new file mode 100644
index 00000000000..3e6d8ec8d18
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/remote-api-context.xml
@@ -0,0 +1,93 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="webdav.initParams" class="org.alfresco.repo.webdav.WebDAVServlet$WebDAVInitParameters">
+        <property name="enabled" value="${system.webdav.servlet.enabled}" />
+        <property name="storeName" value="${system.webdav.storeName}" />
+        <property name="rootPath" value="${system.webdav.rootPath}" />
+    </bean>
+    
+    <bean id="webDAVLockService" class="org.alfresco.repo.webdav.WebDAVLockServiceImpl">
+      <property name="lockService">
+         <ref bean="LockService" />
+      </property>
+      <property name="nodeService">
+         <ref bean="NodeService" />
+      </property>
+      <property name="transactionService">
+         <ref bean="transactionService" />
+      </property>
+      <property name="checkOutCheckInService">
+         <ref bean="CheckoutCheckinService" />
+      </property>
+   </bean>
+   
+   <bean id="baseWebDAVHelper" class="org.alfresco.repo.webdav.WebDAVHelper" abstract="true">
+      <property name="serviceRegistry">
+         <ref bean="ServiceRegistry" />
+      </property>
+      <property name="nodeService">
+         <ref bean="NodeService" />
+      </property>
+      <property name="fileFolderService">
+         <ref bean="FileFolderService" />
+      </property>
+      <property name="searchService">
+         <ref bean="SearchService" />
+      </property>
+      <property name="namespaceService">
+         <ref bean="NamespaceService" />
+      </property>
+      <property name="dictionaryService">
+         <ref bean="DictionaryService" />
+      </property>
+      <property name="mimetypeService">
+         <ref bean="MimetypeService" />
+      </property>
+      <property name="lockService">
+         <ref bean="webDAVLockService" />
+      </property>
+      <property name="actionService">
+         <ref bean="ActionService" />
+      </property>
+      <property name="permissionService">
+         <ref bean="PermissionService" />
+      </property>
+      <property name="hiddenAspect">
+         <ref bean="hiddenAspect" />
+      </property>
+      <property name="authenticationService">
+         <ref bean="authenticationService" />
+      </property>
+      <property name="tenantService">
+         <ref bean="tenantService" />
+      </property>
+      <property name="sizeLimitString">
+         <value>${system.content.maximumFileSizeLimit}</value>
+      </property>
+      <property name="policyBehaviourFilter">
+         <ref bean="policyBehaviourFilter" />
+      </property>
+      <property name="renameShufflePattern">
+         <value>${system.webdav.renameShufflePattern}</value>
+      </property>
+      <property name="urlPathPrefix">
+         <value>${system.webdav.url.path.prefix}</value>
+      </property>
+      <property name="eventPublisher" ref="eventPublisher" />
+    </bean>   
+   
+    <bean id="webDAVHelper" class="org.alfresco.repo.webdav.WebDAVHelper" parent="baseWebDAVHelper" />
+
+   <!--  Content Streamer -->
+   <bean id="webscript.content.streamer" class="org.alfresco.repo.web.scripts.content.ContentStreamer">
+      <property name="nodeService" ref="NodeService" />
+      <property name="mimetypeService" ref="MimetypeService" />
+      <property name="contentService" ref="ContentService" />
+      <property name="eventPublisher" ref="eventPublisher" />
+      <property name="siteService" ref="SiteService" />
+   </bean>
+</beans>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/subsystems/Authentication/external/external-filter-context.xml b/remote-api/src/main/resources/alfresco/subsystems/Authentication/external/external-filter-context.xml
new file mode 100644
index 00000000000..d036677849d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/subsystems/Authentication/external/external-filter-context.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+<beans>
+
+   <!-- Enable cookie-based handling of webscript logins. We must assume cookie based client authentication when external auth is in the chain. -->
+   <bean id="webscriptAuthenticationFilter" class="org.alfresco.web.app.servlet.WebScriptSSOAuthenticationFilter">
+      <property name="active">
+         <value>true</value>
+      </property>
+      <property name="authenticationService">
+         <ref bean="AuthenticationService" />
+      </property>
+      <property name="authenticationComponent">
+         <ref bean="AuthenticationComponent" />
+      </property>
+      <property name="personService">
+         <ref bean="personService" />
+      </property>
+      <property name="nodeService">
+         <ref bean="NodeService" />
+      </property>
+      <property name="transactionService">
+         <ref bean="TransactionService" />
+      </property>
+      <property name="container">
+         <ref bean="webscripts.container" />
+      </property>
+   </bean>
+
+</beans>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter-context.xml b/remote-api/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter-context.xml
new file mode 100644
index 00000000000..51469156601
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter-context.xml
@@ -0,0 +1,154 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+<beans>
+   <!-- NullFilter used for this bean, as we are using the more widely-scoped globalAuthenticationFilter -->
+   <bean id="authenticationFilter" class="org.alfresco.repo.web.filter.beans.NullFilter">
+      <property name="active">
+         <value>${kerberos.authentication.sso.enabled}</value>
+      </property>
+   </bean>
+
+   <bean id="kerberos_SSOFallbackBasicAuthenticationDriver" class="org.alfresco.repo.webdav.auth.SSOFallbackBasicAuthenticationDriver">
+      <property name="authenticationService">
+         <ref bean="AuthenticationService" />
+      </property>
+      <property name="personService">
+         <ref bean="personService" />
+      </property>
+      <property name="nodeService">
+         <ref bean="nodeService"/>
+      </property>
+      <property name="transactionService">
+         <ref bean="transactionService" />
+      </property>
+   </bean>
+
+   <bean id="globalAuthenticationFilter" class="org.alfresco.web.app.servlet.KerberosAuthenticationFilter">
+      <property name="active">
+         <value>${kerberos.authentication.sso.enabled}</value>
+      </property>
+      <property name="ticketLogons">
+         <value>${kerberos.authentication.browser.ticketLogons}</value>
+      </property>
+      <property name="serverConfiguration">
+         <ref bean="fileServerConfiguration" />
+      </property>
+      <property name="authenticationService">
+         <ref bean="AuthenticationService" />
+      </property>
+      <property name="authenticationComponent">
+         <ref bean="AuthenticationComponent" />
+      </property>
+      <property name="authenticationListener">
+         <ref bean="globalAuthenticationListener"/>
+      </property>
+      <property name="personService">
+         <ref bean="personService" />
+      </property>
+      <property name="nodeService">
+         <ref bean="NodeService" />
+      </property>
+      <property name="transactionService">
+         <ref bean="TransactionService" />
+      </property>
+      <property name="realm">
+         <value>${kerberos.authentication.realm}</value>
+      </property>
+      <property name="password">
+         <value>${kerberos.authentication.http.password}</value>
+      </property>
+      <property name="jaasConfigEntryName">
+         <value>${kerberos.authentication.http.configEntryName}</value>
+      </property>
+      <property name="stripKerberosUsernameSuffix">
+         <value>${kerberos.authentication.stripUsernameSuffix}</value>
+      </property>
+      <property name="remoteUserMapper">
+         <ref bean="RemoteUserMapper" />
+      </property>
+      <property name="fallbackEnabled">
+         <value>${kerberos.authentication.sso.fallback.enabled}</value>
+      </property>
+      <property name="fallback">
+         <ref bean="kerberos_SSOFallbackBasicAuthenticationDriver"/>
+      </property>
+   </bean>
+
+   <bean id="webscriptAuthenticationFilter" class="org.alfresco.web.app.servlet.WebScriptSSOAuthenticationFilter">
+      <property name="active">
+         <value>${kerberos.authentication.sso.enabled}</value>
+      </property>
+      <property name="authenticationService">
+         <ref bean="AuthenticationService" />
+      </property>
+      <property name="authenticationComponent">
+         <ref bean="AuthenticationComponent" />
+      </property>
+      <property name="personService">
+         <ref bean="personService" />
+      </property>
+      <property name="nodeService">
+         <ref bean="NodeService" />
+      </property>
+      <property name="transactionService">
+         <ref bean="TransactionService" />
+      </property>
+      <property name="container">
+         <ref bean="webscripts.container" />
+      </property>
+   </bean>
+
+   <bean id="webDavAuthenticationFilter" class="org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter">
+      <property name="active">
+         <value>${kerberos.authentication.sso.enabled}</value>
+      </property>
+      <property name="ticketLogons">
+         <value>true</value>
+      </property>
+      <property name="serverConfiguration">
+         <ref bean="fileServerConfiguration" />
+      </property>
+      <property name="authenticationService">
+         <ref bean="AuthenticationService" />
+      </property>
+      <property name="authenticationComponent">
+         <ref bean="AuthenticationComponent" />
+      </property>
+      <property name="authenticationListener">
+         <ref bean="webDavAuthenticationListener"/>
+      </property>
+      <property name="personService">
+         <ref bean="personService" />
+      </property>
+      <property name="nodeService">
+         <ref bean="NodeService" />
+      </property>
+      <property name="transactionService">
+         <ref bean="TransactionService" />
+      </property>
+      <property name="realm">
+         <value>${kerberos.authentication.realm}</value>
+      </property>
+      <property name="password">
+         <value>${kerberos.authentication.http.password}</value>
+      </property>
+      <property name="jaasConfigEntryName">
+         <value>${kerberos.authentication.http.configEntryName}</value>
+      </property>
+      <property name="stripKerberosUsernameSuffix">
+         <value>${kerberos.authentication.stripUsernameSuffix}</value>
+      </property>
+      <property name="remoteUserMapper">
+         <ref bean="RemoteUserMapper" />
+      </property>
+      <property name="fallbackEnabled">
+         <value>${kerberos.authentication.sso.fallback.enabled}</value>
+      </property>
+      <property name="fallback">
+         <ref bean="kerberos_SSOFallbackBasicAuthenticationDriver"/>
+      </property>
+      <property name="loginPageLink">
+         <value>${kerberos.authentication.sso.login.page.link}</value>
+      </property>
+   </bean>
+</beans>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter.properties b/remote-api/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter.properties
new file mode 100644
index 00000000000..cd69a1b87dc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/subsystems/Authentication/kerberos/kerberos-filter.properties
@@ -0,0 +1,6 @@
+kerberos.authentication.http.configEntryName=AlfrescoHTTP
+kerberos.authentication.http.password=secret
+kerberos.authentication.sso.enabled=true
+kerberos.authentication.browser.ticketLogons=true
+kerberos.authentication.sso.fallback.enabled=true
+kerberos.authentication.sso.login.page.link=/webdav
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/blog/post-created.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/blog/post-created.atomentry.ftl
new file mode 100644
index 00000000000..86fd85a509f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/blog/post-created.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Blog post created: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; blog post created by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/blog/post-deleted.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/blog/post-deleted.atomentry.ftl
new file mode 100644
index 00000000000..81a56348ece
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/blog/post-deleted.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Blog post deleted: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; blog post deleted by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/blog/post-updated.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/blog/post-updated.atomentry.ftl
new file mode 100644
index 00000000000..8c9cc18456e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/blog/post-updated.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Blog post updated: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; blog post updated by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/calendar/event-created.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/calendar/event-created.atomentry.ftl
new file mode 100644
index 00000000000..b21a318f0c3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/calendar/event-created.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Calendar event created: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; calendar event created by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/calendar/event-deleted.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/calendar/event-deleted.atomentry.ftl
new file mode 100644
index 00000000000..260864c85b4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/calendar/event-deleted.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Calendar event deleted: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; calendar event deleted by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/calendar/event-updated.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/calendar/event-updated.atomentry.ftl
new file mode 100644
index 00000000000..bd219198b04
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/calendar/event-updated.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Calendar event updated: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; calendar event updated by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/comments/comment-created.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/comments/comment-created.atomentry.ftl
new file mode 100644
index 00000000000..dbad0f5ecfc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/comments/comment-created.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Comment added to ${(htmlTitle!'')?html?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; commented on by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/comments/comment-deleted.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/comments/comment-deleted.atomentry.ftl
new file mode 100644
index 00000000000..c3a4f82485d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/comments/comment-deleted.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Comment deleted from ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[Comment deleted from &quot;${htmlTitle}&quot; by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/comments/comment-updated.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/comments/comment-updated.atomentry.ftl
new file mode 100644
index 00000000000..dac1835750f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/comments/comment-updated.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Comment updated on ${(htmlTitle!'')?html?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[Comment on &quot;${htmlTitle}&quot; updated by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/datalists/list-created.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/datalists/list-created.atomentry.ftl
new file mode 100644
index 00000000000..97a3be06edf
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/datalists/list-created.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>DataList created: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; data list created by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/datalists/list-deleted.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/datalists/list-deleted.atomentry.ftl
new file mode 100644
index 00000000000..74eb6fa8ca6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/datalists/list-deleted.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>DataList deleted: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; data list deleted by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/datalists/list-updated.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/datalists/list-updated.atomentry.ftl
new file mode 100644
index 00000000000..0acce8ddffa
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/datalists/list-updated.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>DataList details updated: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; data list details updated by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/post-created.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/post-created.atomentry.ftl
new file mode 100644
index 00000000000..b6c45830058
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/post-created.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>New discussion: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; discussion created by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/post-deleted.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/post-deleted.atomentry.ftl
new file mode 100644
index 00000000000..013510cacb2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/post-deleted.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Discussion deleted: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; discussion deleted by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/post-updated.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/post-updated.atomentry.ftl
new file mode 100644
index 00000000000..097dab3bddd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/post-updated.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Discussion updated: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; discussion updated by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/reply-created.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/reply-created.atomentry.ftl
new file mode 100644
index 00000000000..2c062fcdb57
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/reply-created.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Reply added to ${(htmlTitle!'')?html?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; replied to by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/reply-updated.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/reply-updated.atomentry.ftl
new file mode 100644
index 00000000000..25d4c3503c4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/discussions/reply-updated.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Reply to ${(htmlTitle!'')?html?xml} updated</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[Reply to &quot;${htmlTitle}&quot; updated by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-added.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-added.atomentry.ftl
new file mode 100644
index 00000000000..5770061f970
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-added.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>File uploaded: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; document added by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-created.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-created.atomentry.ftl
new file mode 100644
index 00000000000..b97c20e11d1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-created.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>File created: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; document created by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-deleted.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-deleted.atomentry.ftl
new file mode 100644
index 00000000000..5e152809f57
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-deleted.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>File deleted: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; document deleted by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-liked.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-liked.atomentry.ftl
new file mode 100644
index 00000000000..6d4e170d3de
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-liked.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>File liked: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; document liked by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-updated.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-updated.atomentry.ftl
new file mode 100644
index 00000000000..4ef91f5828d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/file-updated.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>File updated: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; document updated by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/files-added.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/files-added.atomentry.ftl
new file mode 100644
index 00000000000..2edf2ce1845
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/files-added.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>${htmlTitle?xml} files uploaded</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[${htmlTitle} documents added by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/files-deleted.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/files-deleted.atomentry.ftl
new file mode 100644
index 00000000000..093ff0751f3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/files-deleted.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>${htmlTitle?xml} files deleted</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[${htmlTitle} documents deleted by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/files-updated.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/files-updated.atomentry.ftl
new file mode 100644
index 00000000000..a4fab573b5c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/files-updated.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>${htmlTitle?xml} files updated</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[${htmlTitle} documents updated by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/folder-liked.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/folder-liked.atomentry.ftl
new file mode 100644
index 00000000000..2fd541981ad
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/folder-liked.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Folder liked: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; folder liked by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/inline-edit.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/inline-edit.atomentry.ftl
new file mode 100644
index 00000000000..8ed39b57485
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/documentlibrary/inline-edit.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Inline Edit on File: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; document edited by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/generic.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/generic.atomentry.ftl
new file mode 100644
index 00000000000..3a919859955
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/generic.atomentry.ftl
@@ -0,0 +1,17 @@
+  <entry xmlns='http://www.w3.org/2005/Atom'>
+    <title>${name!""}</title>
+    <link rel="alternate" type="text/html" 
+        <#if nodeRef?? && nodeRef != "">
+        href="${repoEndPoint}/d/d/${nodeRef?replace("://","/")}/${name!""}"  
+        <#else>
+         href="${repoEndPoint}"
+        </#if>
+    />
+    <icon></icon>
+    <id>http://www.alfresco.org/rss/atom/${id}</id>
+    <updated>${xmldate(date)}</updated>
+    <summary>${userId!""} ${activityType!""} ${displayPath!""} <#if siteNetwork?? && siteNetwork != "">(${siteNetwork} site)</#if></summary>
+    <author>
+      <name>${userId!""}</name>
+    </author>
+  </entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/generic.json.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/generic.json.ftl
new file mode 100644
index 00000000000..46ecb90319c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/generic.json.ftl
@@ -0,0 +1,2 @@
+<#-- default JSON rendering is to pass-through - assumes activityData is posted in JSON format -->
+${activityData!""}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/links/link-created.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/links/link-created.atomentry.ftl
new file mode 100644
index 00000000000..a3067d57087
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/links/link-created.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Link created: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; link created by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/links/link-deleted.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/links/link-deleted.atomentry.ftl
new file mode 100644
index 00000000000..ab86c167b49
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/links/link-deleted.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Link deleted: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; link deleted by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/links/link-updated.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/links/link-updated.atomentry.ftl
new file mode 100644
index 00000000000..49108f8adf9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/links/link-updated.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Link updated: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; link updated by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/group-added.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/group-added.atomentry.ftl
new file mode 100644
index 00000000000..4edc49d401e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/group-added.atomentry.ftl
@@ -0,0 +1,15 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>${groupName?xml} added ${siteNetwork?xml} site</title>
+   <link rel="alternate" type="text/html"/>
+   <icon></icon>
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[${groupName?xml} added to ${siteNetwork?xml} site with role ${role?xml}]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/group-removed.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/group-removed.atomentry.ftl
new file mode 100644
index 00000000000..e9c853f04d8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/group-removed.atomentry.ftl
@@ -0,0 +1,16 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>${groupName?xml} removed ${siteNetwork?xml} site</title>
+   <link rel="alternate" type="text/html"/>
+   <icon></icon>
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[${groupName?xml} with role ${role?xml} removed from ${siteNetwork?xml} site.]]>
+   </summary>
+   <summary></summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/group-role-changed.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/group-role-changed.atomentry.ftl
new file mode 100644
index 00000000000..7f2bae70794
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/group-role-changed.atomentry.ftl
@@ -0,0 +1,15 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>${groupName?xml} role changed for ${siteNetwork?xml} site</title>
+   <link rel="alternate" type="text/html"/>
+   <icon></icon>
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[Group ${groupName?xml} role changed to ${role?xml} in site ${siteNetwork?xml}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/user-joined.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/user-joined.atomentry.ftl
new file mode 100644
index 00000000000..731c89d0ccb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/user-joined.atomentry.ftl
@@ -0,0 +1,16 @@
+<#include "../slingshot-common.lib.ftl">
+<#assign title><#if memberFirstName??>${memberFirstName?xml}</#if><#if memberLastName??> ${memberLastName?xml}</#if> joined ${siteNetwork?xml} site</#assign>
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>${title}</title>
+   <link rel="alternate" type="text/html"/>
+   <icon></icon>
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[${title} (with role ${role}).]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/user-left.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/user-left.atomentry.ftl
new file mode 100644
index 00000000000..5331f0393bb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/user-left.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<#assign title><#if memberFirstName??>${memberFirstName?xml}</#if><#if memberLastName??> ${memberLastName?xml}</#if> left ${siteNetwork?xml} site</#assign>
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>${title}</title>
+   <link rel="alternate" type="text/html"/>
+   <icon></icon>
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary>${title}</summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/user-role-changed.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/user-role-changed.atomentry.ftl
new file mode 100644
index 00000000000..7d83c4f87c8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/site/user-role-changed.atomentry.ftl
@@ -0,0 +1,16 @@
+<#include "../slingshot-common.lib.ftl">
+<#assign title><#if memberFirstName??>${memberFirstName?xml}</#if><#if memberLastName??> ${memberLastName?xml}</#if> role changed for ${siteNetwork?xml} site</#assign>
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>${title}</title>
+   <link rel="alternate" type="text/html"/>
+   <icon></icon>
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[${title}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/slingshot-common.lib.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/slingshot-common.lib.ftl
new file mode 100644
index 00000000000..ea11fa94405
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/slingshot-common.lib.ftl
@@ -0,0 +1,2 @@
+<#assign userName>${firstName!""} ${lastName!""} (${userId!""})</#assign>
+<#assign htmlTitle>${(title!"unknown")?html}</#assign>
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/subscriptions/followed.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/subscriptions/followed.atomentry.ftl
new file mode 100644
index 00000000000..8647fee48fd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/subscriptions/followed.atomentry.ftl
@@ -0,0 +1,15 @@
+<#include "../slingshot-common.lib.ftl">
+<#assign title>${followerUserName?xml} is now following ${userUserName?xml}</#assign>
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>${title}</title>
+   <link rel="alternate" type="text/html"/>
+   <icon></icon>
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[${title}.]]>
+   </summary>
+   <author>
+      <name>${followerUserName?xml}</name>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/subscriptions/subscribed.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/subscriptions/subscribed.atomentry.ftl
new file mode 100644
index 00000000000..fc7423b9898
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/subscriptions/subscribed.atomentry.ftl
@@ -0,0 +1,15 @@
+<#include "../slingshot-common.lib.ftl">
+<#assign title>${subscriberUserName?xml} has subscribed to ${node?xml}</#assign>
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>${title}</title>
+   <link rel="alternate" type="text/html"/>
+   <icon></icon>
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[${title}.]]>
+   </summary>
+   <author>
+      <name>${subscriberUserName?xml}</name>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/wiki/page-created.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/wiki/page-created.atomentry.ftl
new file mode 100644
index 00000000000..f030d3f0807
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/wiki/page-created.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Wiki page created: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; wiki page created by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/wiki/page-deleted.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/wiki/page-deleted.atomentry.ftl
new file mode 100644
index 00000000000..05a476ca393
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/wiki/page-deleted.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Wiki page deleted: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; wiki page deleted by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/wiki/page-edited.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/wiki/page-edited.atomentry.ftl
new file mode 100644
index 00000000000..6a0ba5295a7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/wiki/page-edited.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Wiki page updated: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${htmlTitle}&quot; wiki page updated by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/wiki/page-renamed.atomentry.ftl b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/wiki/page-renamed.atomentry.ftl
new file mode 100644
index 00000000000..cf4967735eb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/activities/org/alfresco/wiki/page-renamed.atomentry.ftl
@@ -0,0 +1,14 @@
+<#include "../slingshot-common.lib.ftl">
+<entry xmlns='http://www.w3.org/2005/Atom'>
+   <title>Wiki page renamed: ${htmlTitle?xml}</title>
+   <link rel="alternate" type="text/html" href="" />
+   <id>http://www.alfresco.org/rss/atom/${id}</id>
+   <updated>${xmldate(date)}</updated>
+   <summary type="html">
+      <![CDATA[&quot;${(oldTitle!"unknown")?html}&quot; wiki page renamed to &quot;${htmlTitle}&quot; by ${userName?html}.]]>
+   </summary>
+   <author>
+      <name>${userName?xml}</name>
+      <uri>${userId?xml}</uri>
+   </author>
+</entry>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/DiscoveryApiWebscript.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/DiscoveryApiWebscript.get.desc.xml
new file mode 100644
index 00000000000..bcadf83ba9f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/DiscoveryApiWebscript.get.desc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+    <shortname>Handles GET for the Discovery api</shortname>
+    <description>Returns repository information</description>
+    <url>/discovery</url>
+    <authentication>user</authentication>
+    <transaction>required</transaction>
+    <format default="json">argument</format>
+    <lifecycle>public_api</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/MetaDataWebScript.options.desc.xml b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/MetaDataWebScript.options.desc.xml
new file mode 100644
index 00000000000..5d4a71d3b2c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/MetaDataWebScript.options.desc.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+  <shortname>Options meta info for a resource</shortname>
+  <description>Shows the options for a particular rest api call</description>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/</url>
+  <authentication>user</authentication>
+  <format default="json">argument</format>
+  <transaction>none</transaction>
+  <lifecycle>public_api</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/NOT_REVIEWED_SO_DISABLED_FOR_NOW_InfoWebScript.get.desc.xml_DISABLED b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/NOT_REVIEWED_SO_DISABLED_FOR_NOW_InfoWebScript.get.desc.xml_DISABLED
new file mode 100644
index 00000000000..cc3a00614e8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/NOT_REVIEWED_SO_DISABLED_FOR_NOW_InfoWebScript.get.desc.xml_DISABLED
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+  <shortname>Handles GET of resource info for api resources</shortname>
+  <description>Returns a json respresentation with metadata describing the resources</description>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}</url>
+  <authentication>user</authentication>
+  <format default="json">argument</format>
+  <transaction allow="readonly">required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.delete.desc.xml
new file mode 100644
index 00000000000..522d20453b8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.delete.desc.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+  <shortname>Handles DELETE of a resource</shortname>
+  <description>Hands back a little bit of JSON</description>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/</url>
+  <!-- bug fix REPO-855 -->
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}/</url>
+  <!-- -->
+  <authentication>user</authentication>
+  <format default="json">argument</format>
+  <!-- Note: the transaction is created in AbstractResourceWebScript -->
+  <transaction>none</transaction>
+  <lifecycle>public_api</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.get.desc.xml
new file mode 100644
index 00000000000..9281827c0d6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.get.desc.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+  <shortname>Handles Get of a resource</shortname>
+  <description>Hands back the JSON response</description>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/</url>
+  <!-- bug fix REPO-855 -->
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}/</url>
+  <!-- -->
+  <authentication>user</authentication>
+  <format default="json">argument</format>
+  <!-- Note: the transaction is created in AbstractResourceWebScript -->
+  <transaction>none</transaction>
+  <lifecycle>public_api</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.post.desc.xml
new file mode 100644
index 00000000000..17cadf12135
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.post.desc.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+  <shortname>Handles POST of a resource</shortname>
+  <description>Hands back a little bit of JSON</description>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/</url>
+  <!-- bug fix REPO-855 -->
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}/</url>
+  <!-- -->
+  <authentication>user</authentication>
+  <format default="json">argument</format>
+  <!-- Note: the transaction is created in AbstractResourceWebScript -->
+  <transaction>none</transaction>
+  <lifecycle>public_api</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.put.desc.xml
new file mode 100644
index 00000000000..d611c14ed71
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/ResourceWebScript.put.desc.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+  <shortname>Handles PUT of a resource</shortname>
+  <description>Hands back a little bit of JSON</description>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/</url>
+  <!-- bug fix REPO-855 -->
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}</url>
+  <url>/{apiScope}/{apiName}/versions/{apiVersion}/{collectionResource}/{entityId}/{relationResource}/{relationshipId}/{property}/{leftover}/</url>
+  <!-- -->
+  <authentication>user</authentication>
+  <format default="json">argument</format>
+  <!-- Note: the transaction is created in AbstractResourceWebScript -->
+  <transaction>none</transaction>
+  <lifecycle>public_api</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/SearchApiWebscript.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/SearchApiWebscript.post.desc.xml
new file mode 100644
index 00000000000..ac2d22de84d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/SearchApiWebscript.post.desc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+  <shortname>Handles POST for the Search api</shortname>
+  <description>Hands back a little bit of JSON</description>
+  <url>/public/search/versions/1/search</url>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <format default="json">argument</format>
+  <lifecycle>public_api</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/SearchSQLApiWebscript.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/SearchSQLApiWebscript.post.desc.xml
new file mode 100644
index 00000000000..3c16165b3d2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/SearchSQLApiWebscript.post.desc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+  <shortname>Handles POST for the Search SQL api</shortname>
+  <description>Hands back a little bit of JSON</description>
+  <url>/public/search/versions/1/sql</url>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <format default="json">argument</format>
+  <lifecycle>public_api</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.delete.desc.xml
new file mode 100644
index 00000000000..efa1e365247
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.delete.desc.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+  <shortname>Handles OpenCMIS DELETE Requests</shortname>
+  <description>Handles OpenCMIS DELETE Requests</description>
+  <url>/cmis/versions/{apiVersion}/{binding}</url>
+  <url>/cmis/versions/{apiVersion}/{binding}/{operation}/{id}</url>
+  <url>/cmis/versions/{apiVersion}/{binding}/{operation}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}/{operation}/{id}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}/{operation}</url>
+  <authentication>user</authentication>
+  <format default="json">argument</format>
+  <!-- Note transactions are handled by the CMISServiceFactory -->
+  <transaction>none</transaction>
+  <lifecycle>public_api</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.get.desc.xml
new file mode 100644
index 00000000000..648c5df66e0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.get.desc.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+  <shortname>Handles OpenCMIS GET Requests</shortname>
+  <description>Handles OpenCMIS GET Requests</description>
+  <url>/cmis/versions/{apiVersion}/{binding}</url>
+  <url>/cmis/versions/{apiVersion}/{binding}/{operation}/{id}</url>
+  <url>/cmis/versions/{apiVersion}/{binding}/{operation}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}/{operation}/{id}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}/{operation}</url>
+  <authentication>user</authentication>
+  <format default="json">argument</format>
+  <!-- Note transactions are handled by the CMISServiceFactory -->
+  <transaction>none</transaction>
+  <lifecycle>public_api</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.head.desc.xml b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.head.desc.xml
new file mode 100644
index 00000000000..26ad5b94831
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.head.desc.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+  <shortname>Handles OpenCMIS HEAD Requests</shortname>
+  <description>Handles OpenCMIS HEAD Requests</description>
+  <url>/cmis/versions/{apiVersion}/{binding}</url>
+  <url>/cmis/versions/{apiVersion}/{binding}/{operation}/{id}</url>
+  <url>/cmis/versions/{apiVersion}/{binding}/{operation}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}/{operation}/{id}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}/{operation}</url>
+  <authentication>user</authentication>
+  <format default="json">argument</format>
+  <!-- Note transactions are handled by the CMISServiceFactory -->
+  <transaction>none</transaction>
+  <lifecycle>public_api</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.options.desc.xml b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.options.desc.xml
new file mode 100644
index 00000000000..43c83798e72
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.options.desc.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+  <shortname>Handles OpenCMIS OPTIONS Requests</shortname>
+  <description>Handles OpenCMIS OPTIONS Requests</description>
+  <url>/cmis/versions/{apiVersion}/{binding}</url>
+  <url>/cmis/versions/{apiVersion}/{binding}/{operation}/{id}</url>
+  <url>/cmis/versions/{apiVersion}/{binding}/{operation}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}/{operation}/{id}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}/{operation}</url>
+  <authentication>user</authentication>
+  <format default="json">argument</format>
+  <!-- Note transactions are handled by the CMISServiceFactory -->
+  <transaction>none</transaction>
+  <lifecycle>public_api</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.post.desc.xml
new file mode 100644
index 00000000000..fbc5c2061bf
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.post.desc.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+  <shortname>Handles OpenCMIS POST Requests</shortname>
+  <description>Handles OpenCMIS POST Requests</description>
+  <url>/cmis/versions/{apiVersion}/{binding}</url>
+  <url>/cmis/versions/{apiVersion}/{binding}/{operation}/{id}</url>
+  <url>/cmis/versions/{apiVersion}/{binding}/{operation}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}/{operation}/{id}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}/{operation}</url>
+  <authentication>user</authentication>
+  <format default="json">argument</format>
+  <!-- Note transactions are handled by the CMISServiceFactory -->
+  <transaction>none</transaction>
+  <formdata multipart-processing="false"/>
+  <lifecycle>public_api</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.put.desc.xml
new file mode 100644
index 00000000000..1a49e82cb9d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/publicapi/org/alfresco/api/opencmis/OpenCMIS.put.desc.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webscript>
+  <shortname>Handles OpenCMIS PUT Requests</shortname>
+  <description>Handles OpenCMIS PUT Requests</description>
+  <url>/cmis/versions/{apiVersion}/{binding}</url>
+  <url>/cmis/versions/{apiVersion}/{binding}/{operation}/{id}</url>
+  <url>/cmis/versions/{apiVersion}/{binding}/{operation}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}/{operation}/{id}</url>
+  <url>/{apiScope}/cmis/versions/{apiVersion}/{binding}/{operation}</url>
+  <authentication>user</authentication>
+  <format default="json">argument</format>
+  <!-- Note transactions are handled by the CMISServiceFactory -->
+  <transaction>none</transaction>
+  <formdata multipart-processing="false"/>
+  <lifecycle>public_api</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/events.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/events.get.desc.xml
new file mode 100644
index 00000000000..153067e8241
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/events.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Event Listing</shortname>
+   <description>List of all upcoming events</description>
+   <url>/calendar/events/{nodeId}</url>
+   <format default="json">extension</format>
+   <authentication>guest</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/events.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/events.get.js
new file mode 100644
index 00000000000..1fb8792e151
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/events.get.js
@@ -0,0 +1,13 @@
+var calendar = search.findNode("workspace://SpacesStore/" + url.extension);
+
+if (calendar !== null)
+{
+  var eventsFolder = calendar.childByNamePath("CalEvents");
+  if (eventsFolder !== null)
+  {
+	model.events = eventsFolder.children.sort(function(a,b) {
+		return a.properties["ia:fromDate"] - b.properties["ia:fromDate"];
+	});
+  }
+}
+
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/events.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/events.get.json.ftl
new file mode 100644
index 00000000000..0e184cbddd8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/events.get.json.ftl
@@ -0,0 +1,20 @@
+{
+<#if events?exists && events?size &gt; 0>
+<#assign prev = "">
+<#list events as event>
+<#assign date = event.properties["ia:fromDate"]?string("MM/dd/yyyy")>
+<#if date != prev>
+<#assign counter = 0>
+<#if event_index &gt; 0>],</#if>
+"${date}" : [
+</#if>
+<#if counter &gt; 0>,</#if>
+{
+  "name" : "${event.properties["ia:whatEvent"]}"
+}
+<#assign counter = counter + 1>
+<#if !event_has_next>]</#if>
+<#assign prev = date>
+</#list>
+</#if>
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/feed.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/feed.get.desc.xml
new file mode 100644
index 00000000000..5fdf6664b10
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/feed.get.desc.xml
@@ -0,0 +1,8 @@
+<webscript>
+   <shortname>Calendar Feed</shortname>
+   <description>Calendar iCalendar feed</description>
+   <url>/calendar/feed/{nodeId}</url>
+   <authentication>guest</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/feed.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/feed.get.html.ftl
new file mode 100644
index 00000000000..c0dcaeead9b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/feed.get.html.ftl
@@ -0,0 +1,17 @@
+<#if events?exists>
+<#assign dateFormat = "yyyyMMdd">
+<#assign timeFormat = "HHmmss">
+BEGIN:VCALENDAR
+VERSION:2.0
+<#list events as event>
+<#assign from = event.properties["ia:fromDate"]>
+<#assign to = event.properties["ia:toDate"]>
+BEGIN:VEVENT
+DTSTART:${from?string(dateFormat)}T${from?string(timeFormat)}Z
+DTEND:${to?string(dateFormat)}T${to?string(timeFormat)}Z
+SUMMARY:${event.properties["ia:whatEvent"]!""}
+DESCRIPTION:${event.properties["ia:descriptionEvent"]!""}
+END:VEVENT
+</#list>
+END:VCALENDAR
+</#if>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/feed.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/feed.get.js
new file mode 100644
index 00000000000..04ae5a4e454
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/calendar/feed.get.js
@@ -0,0 +1,12 @@
+var node = search.findNode("workspace://SpacesStore/" + url.extension);
+
+//TODO: add a privacy check. If a calendar is private then don't display it
+
+if (node !== null)
+{
+  var eventsFolder = node.childByNamePath("CalEvents");
+  if (eventsFolder !== null)
+  {
+     model.events = eventsFolder.children;  
+  }
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/content/content.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/content/content.get.desc.xml
new file mode 100644
index 00000000000..c731856e7bf
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/content/content.get.desc.xml
@@ -0,0 +1,44 @@
+<webscript>
+  <shortname>Get Content (getContent)</shortname>
+  <description>
+  <![CDATA[
+  Gets the content stream for the specified document.
+  ]]>
+  </description>
+  
+  <url>/api/node/content{property}/{store_type}/{store_id}/{id}?a={attach?}</url>
+  <url>/api/path/content{property}/{store_type}/{store_id}/{nodepath}?a={attach?}</url>
+  <url>/api/node/{store_type}/{store_id}/{id}/content{property}?a={attach?}</url>
+  <url>/api/path/{store_type}/{store_id}/{nodepath}/content{property}?a={attach?}</url>
+  
+  <args>
+    <arg>
+        <shortname>store</shortname>
+        <description>the store name</description>
+    </arg>
+    <arg>
+        <shortname>id</shortname>
+        <description>the node id of the object</description>
+    </arg>
+    <arg>
+        <shortname>nodepath</shortname>
+        <description>the path of the object (relative to root of Alfresco store)</description>
+    </arg>
+    <arg>
+        <shortname>property</shortname>
+        <description>the name of the content property to retrieve content from</description>
+        <default>cm:content</default>
+    </arg>
+    <arg>
+        <shortname>attach</shortname>
+        <description>if true, force download of content as attachment</description>
+        <default>false</default>
+    </arg>
+  </args>
+  
+  <format default="">argument</format>
+  
+  <authentication>guest</authentication>
+  <transaction allow="readonly"/>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/content/content.head.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/content/content.head.desc.xml
new file mode 100644
index 00000000000..afa806249e6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/content/content.head.desc.xml
@@ -0,0 +1,30 @@
+<webscript>
+  <shortname>Head Content</shortname>
+  <description>HEAD method for the specified document.</description>
+  
+  <!-- alfresco style -->
+  <!-- maybe need to add many paths, like in content.get.desc.xml -->
+  <url>/api/node/content{property}/{store_type}/{store_id}/{id}?a={attach?}</url>
+  
+  <args>
+    <arg>
+        <shortname>id</shortname>
+        <description>the node id of the object</description>
+    </arg>
+    <arg>
+        <shortname>property</shortname>
+        <description>the name of the content property to retrieve content from</description>
+        <default>cm:content</default>
+    </arg>
+    <arg>
+        <shortname>attach</shortname>
+        <description>if true, force download of content as attachment</description>
+        <default>false</default>
+    </arg>
+  </args>
+  
+  <format default="">argument</format>
+  <authentication>guest</authentication>
+  <transaction allow="readonly"/>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/paging.lib.atom.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/paging.lib.atom.ftl
new file mode 100644
index 00000000000..56afaa41183
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/paging.lib.atom.ftl
@@ -0,0 +1,94 @@
+[#ftl]
+
+[#macro links cursor pageNo="pageNo" pageSize="pageSize" skipCount="skipCount" maxItems="maxItems"] 
+[#if cursor.pageType = "PAGE"]
+[#if cursor.hasFirstPage]
+<link rel="first" href="${absurl(encodeuri(scripturl(argreplace(url.args, pageNo, cursor.firstPage, pageSize, cursor.pageSize))))?xml}" type="${format.type}"/>
+[/#if]  
+[#if cursor.hasLastPage]
+<link rel="last" href="${absurl(encodeuri(scripturl(argreplace(url.args, pageNo, cursor.lastPage, pageSize, cursor.pageSize))))?xml}" type="${format.type}"/>
+[/#if]  
+[#if cursor.hasPrevPage]
+<link rel="prev" href="${absurl(encodeuri(scripturl(argreplace(url.args, pageNo, cursor.prevPage, pageSize, cursor.pageSize))))?xml}" type="${format.type}"/>
+[/#if]  
+[#if cursor.hasNextPage]
+<link rel="next" href="${absurl(encodeuri(scripturl(argreplace(url.args, pageNo, cursor.nextPage, pageSize, cursor.pageSize))))?xml}" type="${format.type}"/>
+[/#if]
+[#else]  
+[#if cursor.hasFirstPage]
+<link rel="first" href="${absurl(encodeuri(scripturl(argreplace(url.args, skipCount, cursor.firstPage, maxItems, cursor.pageSize))))?xml}" type="${format.type}"/>
+[/#if]  
+[#if cursor.hasLastPage]
+<link rel="last" href="${absurl(encodeuri(scripturl(argreplace(url.args, skipCount, cursor.lastPage, maxItems, cursor.pageSize))))?xml}" type="${format.type}"/>
+[/#if]  
+[#if cursor.hasPrevPage]
+<link rel="prev" href="${absurl(encodeuri(scripturl(argreplace(url.args, skipCount, cursor.prevPage, maxItems, cursor.pageSize))))?xml}" type="${format.type}"/>
+[/#if]  
+[#if cursor.hasNextPage]
+<link rel="next" href="${absurl(encodeuri(scripturl(argreplace(url.args, skipCount, cursor.nextPage, maxItems, cursor.pageSize))))?xml}" type="${format.type}"/>
+[/#if]  
+[/#if]
+[/#macro]
+
+[#macro linksredirect cursor serviceUrl urlargs="" type="" pageNo="pageNo" pageSize="pageSize" skipCount="skipCount" maxItems="maxItems"] 
+[#if cursor.pageType = "PAGE"]
+[#if cursor.hasFirstPage]
+<link rel="first" href="${absurl(encodeuri(url.serviceContext + serviceUrl + "?" + argreplace(urlargs, pageNo, cursor.firstPage, pageSize, cursor.pageSize)))?xml}"[#if type != ""] type="${type}"[/#if]/>
+[/#if]  
+[#if cursor.hasLastPage]
+<link rel="last" href="${absurl(encodeuri(url.serviceContext + serviceUrl + "?" + argreplace(urlargs, pageNo, cursor.lastPage, pageSize, cursor.pageSize)))?xml}"[#if type != ""] type="${type}"[/#if]/>
+[/#if]  
+[#if cursor.hasPrevPage]
+<link rel="prev" href="${absurl(encodeuri(url.serviceContext + serviceUrl + "?" + argreplace(urlargs, pageNo, cursor.prevPage, pageSize, cursor.pageSize)))?xml}"[#if type != ""] type="${type}"[/#if]/>
+[/#if]  
+[#if cursor.hasNextPage]
+<link rel="next" href="${absurl(encodeuri(url.serviceContext + serviceUrl + "?" + argreplace(urlargs, pageNo, cursor.nextPage, pageSize, cursor.pageSize)))?xml}"[#if type != ""] type="${type}"[/#if]/>
+[/#if]
+[#else]  
+[#if cursor.hasFirstPage]
+<link rel="first" href="${absurl(encodeuri(url.serviceContext + serviceUrl + "?" + argreplace(urlargs, skipCount, cursor.firstPage, maxItems, cursor.pageSize)))?xml}"[#if type != ""] type="${type}"[/#if]/>
+[/#if]  
+[#if cursor.hasLastPage]
+<link rel="last" href="${absurl(encodeuri(url.serviceContext + serviceUrl + "?" + argreplace(urlargs, skipCount, cursor.lastPage, maxItems, cursor.pageSize)))?xml}"[#if type != ""] type="${type}"[/#if]/>
+[/#if]  
+[#if cursor.hasPrevPage]
+<link rel="prev" href="${absurl(encodeuri(url.serviceContext + serviceUrl + "?" + argreplace(urlargs, skipCount, cursor.prevPage, maxItems, cursor.pageSize)))?xml}"[#if type != ""] type="${type}"[/#if]/>
+[/#if]  
+[#if cursor.hasNextPage]
+<link rel="next" href="${absurl(encodeuri(url.serviceContext + serviceUrl + "?" + argreplace(urlargs, skipCount, cursor.nextPage, maxItems, cursor.pageSize)))?xml}"[#if type != ""] type="${type}"[/#if]/>
+[/#if]  
+[/#if]
+[/#macro]
+
+[#macro opensearch cursor]
+[#-- NOTE: this macro requires the definition of xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" in --]
+[#--       the enclosing document                                                                           --]
+<opensearch:totalResults>${cursor.totalRows?c}</opensearch:totalResults>
+<opensearch:startIndex>${cursor.startRow?c}</opensearch:startIndex>
+<opensearch:itemsPerPage>${cursor.pageSize?c}</opensearch:itemsPerPage>
+[/#macro]
+
+[#macro cmis cursor]
+[#-- NOTE: this macro requires the definition of xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/" in --]
+[#--       the enclosing document                                                                                      --]
+<cmisra:numItems>${cursor.totalRows?c}</cmisra:numItems>
+[/#macro]
+
+[#macro changelinks changeLog] 
+<link rel="first" href="${absurl(encodeuri(scripturl(argreplace(url.args, "changeLogToken", ""))))?xml}" type="${format.type}"/>
+[#if changeLog.lastPageToken??]
+<link rel="last" href="${absurl(encodeuri(scripturl(argreplace(url.args, "changeLogToken", changeLog.lastPageToken))))?xml}" type="${format.type}"/>
+[/#if]  
+[#if changeLog.previousPageToken??]
+<link rel="prev" href="${absurl(encodeuri(scripturl(argreplace(url.args, "changeLogToken", changeLog.previousPageToken))))?xml}" type="${format.type}"/>
+[/#if]  
+[#if changeLog.nextChangeToken??]
+<link rel="next" href="${absurl(encodeuri(scripturl(argreplace(url.args, "changeLogToken", changeLog.nextChangeToken))))?xml}" type="${format.type}"/>
+[/#if]
+[/#macro]
+
+[#macro changeNumItems changeLog]
+[#-- NOTE: this macro requires the definition of xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/" in --]
+[#--       the enclosing document                                                                                      --]
+<cmisra:numItems>${changeLog.eventCount?c}</cmisra:numItems>
+[/#macro]
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-action.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-action.delete.desc.xml
new file mode 100644
index 00000000000..82e5ca9e918
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-action.delete.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Cancel a running action</shortname>
+  <description>Requests the cancellation of a currently running action.</description>
+  <url>/api/running-action/{action_tracking_id}</url>
+  <format default="json"/>
+  <authentication>admin</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-action.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-action.get.desc.xml
new file mode 100644
index 00000000000..3c7715f3072
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-action.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get running action details</shortname>
+  <description>
+  Returns (limited) details on a currently running actions.
+  </description>
+  <url>/api/running-action/{action_tracking_id}</url>
+  <format default="json"/>
+  <authentication>admin</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-action.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-action.get.json.ftl
new file mode 100644
index 00000000000..f35ef976146
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-action.get.json.ftl
@@ -0,0 +1,4 @@
+<#import "running-action.lib.ftl" as actionLib />
+{
+   "data": <@actionLib.runningActionJSON action=runningAction />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-action.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-action.lib.ftl
new file mode 100644
index 00000000000..96a9074b733
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-action.lib.ftl
@@ -0,0 +1,14 @@
+<#-- Renders the details of a running action. -->
+<#macro runningActionJSON action>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "actionId": "${action.id}",
+   "actionType": "${action.type}",
+   "actionInstance": "${action.instance?string}",
+   "actionNodeRef": <#if action.nodeRef??>"${action.nodeRef.nodeRef}"<#else>null</#if>,
+   "startedAt": <#if action.startedAt??>"${action.startedAt}"<#else>null</#if>,
+   "cancelRequested": "${action.cancelRequested?string}",
+   "details": "${"/api/running-action/" + action.key}"
+}
+</#escape>
+</#macro>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-actions.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-actions.get.desc.xml
new file mode 100644
index 00000000000..a733f043a4d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-actions.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>List running actions</shortname>
+  <description>
+  Returns (limited) details on all currently running actions.
+  </description>
+  <url>/api/running-actions?type={type?}&amp;nodeRef={nodeRef?}</url>
+  <format default="json"/>
+  <authentication>admin</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-actions.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-actions.get.json.ftl
new file mode 100644
index 00000000000..f371f36b3e5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-actions.get.json.ftl
@@ -0,0 +1,10 @@
+<#import "running-action.lib.ftl" as actionLib />
+{
+   "data": 
+   [
+      <#list runningActions as action>
+         <@actionLib.runningActionJSON action=action />
+         <#if action_has_next>,</#if>
+      </#list>
+   ]
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-actions.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-actions.post.desc.xml
new file mode 100644
index 00000000000..8c5fa26a7c2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-actions.post.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Start a new action executing</shortname>
+  <description>
+   Starts the execution of a new action, and returns its running details
+  </description>
+  <url>/api/running-actions?nodeRef={nodeRef?}</url>
+  <format default="json"/>
+  <authentication>admin</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-actions.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-actions.post.json.ftl
new file mode 100644
index 00000000000..f35ef976146
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-actions.post.json.ftl
@@ -0,0 +1,4 @@
+<#import "running-action.lib.ftl" as actionLib />
+{
+   "data": <@actionLib.runningActionJSON action=runningAction />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-replication-actions.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-replication-actions.get.desc.xml
new file mode 100644
index 00000000000..65563953105
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-replication-actions.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>List running replication actions</shortname>
+  <description>
+  Returns (limited) details on all currently running replication actions.
+  </description>
+  <url>/api/running-replication-actions?name={name?}</url>
+  <format default="json"/>
+  <authentication>admin</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-replication-actions.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-replication-actions.get.json.ftl
new file mode 100644
index 00000000000..f371f36b3e5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-replication-actions.get.json.ftl
@@ -0,0 +1,10 @@
+<#import "running-action.lib.ftl" as actionLib />
+{
+   "data": 
+   [
+      <#list runningActions as action>
+         <@actionLib.runningActionJSON action=action />
+         <#if action_has_next>,</#if>
+      </#list>
+   ]
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-replication-actions.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-replication-actions.post.desc.xml
new file mode 100644
index 00000000000..0c061c171f8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-replication-actions.post.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Start a new replication action executing</shortname>
+  <description>
+   Starts the execution of a replication action, and returns its running details
+  </description>
+  <url>/api/running-replication-actions?name={name?}</url>
+  <format default="json"/>
+  <authentication>admin</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-replication-actions.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-replication-actions.post.json.ftl
new file mode 100644
index 00000000000..f35ef976146
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/action/running-replication-actions.post.json.ftl
@@ -0,0 +1,4 @@
+<#import "running-action.lib.ftl" as actionLib />
+{
+   "data": <@actionLib.runningActionJSON action=runningAction />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.delete.desc.xml
new file mode 100644
index 00000000000..52d72a9fb14
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.delete.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Unset activity user feed control</shortname>
+  <description>Delete the activity feed control (opt-out) for currently logged in user.</description>
+  <url>/api/activities/feed/control?s={siteId}&amp;a={appToolId}</url>
+  <url>/api/activities/feed/control?s={siteId}&amp;a={appToolId}&amp;format=json</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.delete.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.delete.js
new file mode 100644
index 00000000000..2314fe29b48
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.delete.js
@@ -0,0 +1,20 @@
+function main()
+{
+	// Get the details of the site id (site shortname) and/or appTool id
+	var siteId = args["s"];
+	var appToolId = args["a"];
+	
+	if ((siteId == null || siteId.length == 0) &&
+	    (appToolId == null || appToolId.length == 0))
+	{
+		status.code = 400;
+		status.message = "siteId and appToolId are both missing - must supply one or both.";
+		status.redirect = true;
+		return;
+	}
+	
+	// Unset feed control for current user
+	activities.unsetFeedControl(siteId, appToolId);
+}
+
+main();	
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.delete.json.ftl
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.desc.xml
new file mode 100644
index 00000000000..0849cbabf24
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Set activity user feed control</shortname>
+  <description>Set activity feed control (opt-out) for currently logged in user.</description>
+  <url>/api/activities/feed/control</url>
+  <url>/api/activities/feed/control?format=json</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.json.ftl
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.json.js
new file mode 100644
index 00000000000..6ad20107944
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-control.post.json.js
@@ -0,0 +1,30 @@
+function main()
+{
+	// Get the details of the site id (site shortname) and/or appTool id
+	var siteId = null;
+	var appToolId = null;
+	
+	if (! json.isNull("siteId"))
+	{
+	   siteId = json.get("siteId");
+	}
+	
+	if (! json.isNull("appToolId"))
+    {
+        appToolId = json.get("appToolId");
+    }
+	
+	if ((siteId == null || siteId.length == 0) &&
+	    (appToolId == null || appToolId.length == 0))
+	{
+		status.code = 400;
+		status.message = "siteId and appToolId are both missing - must supply one or both.";
+		status.redirect = true;
+		return;
+	}
+	
+	// Set feed control for current user
+	activities.setFeedControl(siteId, appToolId);
+}
+
+main();	
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-controls.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-controls.get.desc.xml
new file mode 100644
index 00000000000..d9b1ab1835e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-controls.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Get activity user feed controls</shortname>
+  <description>Get the activity feed controls (opt-outs) for currently logged in user.</description>
+  <url>/api/activities/feed/controls</url>
+  <url>/api/activities/feed/controls?format=json</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-controls.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-controls.get.js
new file mode 100644
index 00000000000..0a250e280f7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-controls.get.js
@@ -0,0 +1,5 @@
+// Get the list of feed controls for current user
+var feedControls = activities.getFeedControls();
+
+// Pass the queried feed controls to the template
+model.feedControls = feedControls;
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-controls.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-controls.get.json.ftl
new file mode 100644
index 00000000000..879b270a62a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/control/userfeed-controls.get.json.ftl
@@ -0,0 +1,12 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+[
+<#if feedControls??>
+   <#list feedControls as feedControl>
+   { 
+      "siteId": "${feedControl.siteId}",
+      "appToolId": "${feedControl.appToolId}"
+   }<#if feedControl_has_next>,</#if>
+   </#list>
+</#if>
+]
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/sitefeed.get.atomfeed.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/sitefeed.get.atomfeed.ftl
new file mode 100644
index 00000000000..3ceda2a791d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/sitefeed.get.atomfeed.ftl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+<generator version="0.1">Alfresco (0.1)</generator>
+<link rel="self" href=""/>
+<title>Alfresco Activities Site Feed for ${siteId}</title>
+<#if feedEntries??>
+<#list feedEntries as feedEntry>
${feedEntry.activitySummary}
</#list>
+<#else>
</#if>
+</feed>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/sitefeed.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/sitefeed.get.desc.xml
new file mode 100644
index 00000000000..6e7025967db
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/sitefeed.get.desc.xml
@@ -0,0 +1,12 @@
+<webscript>
+  <shortname>Activities site feed</shortname>
+  <description>Allows the currently logged in user to get the feed for a specified site. If the site specified is private, then user must be a member or an admin user.</description>
+  <url>/api/activities/feed/site/{siteId}</url>
+  <url>/api/activities/feed/site/{siteId}?format=atomfeed</url>
+  <url>/api/activities/feed/site/{siteId}?format=json</url>
+  <url>/api/activities/feed/site/{siteId}?format=rss</url>
+  <format default="atomfeed">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/sitefeed.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/sitefeed.get.json.ftl
new file mode 100644
index 00000000000..3af0b6a7d9f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/sitefeed.get.json.ftl
@@ -0,0 +1,7 @@
+[
+<#if feedEntries??>
+<#list feedEntries as feedEntry>
+    ${feedEntry}<#if feedEntry_has_next>,</#if>
+</#list>
+</#if>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/sitefeed.get.rss.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/sitefeed.get.rss.ftl
new file mode 100644
index 00000000000..da3713b7dd8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/sitefeed.get.rss.ftl
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+   <channel>
+      <title>Alfresco Activities Site Feed for ${siteId}</title>
+      <copyright>Copyright (c) 2008-2010 Alfresco Software, Inc. All rights reserved.</copyright>
+      <link></link>
+      <description>Alfresco Activities Site Feed for ${siteId}</description>
+      <language>en-us</language>
+      <lastBuildDate>${date?string("EEE, dd MMM yyyy HH:mm:ss zzz")}</lastBuildDate>
+      <pubDate>${date?string("EEE, dd MMM yyyy HH:mm:ss zzz")}</pubDate>
+      <ttl>120</ttl>
+      <generator>Alfresco (0.1)</generator>
+<#if feedEntries??>
+   <#list feedEntries as feedEntry>
+      ${feedEntry.activitySummary}
+   </#list>
+</#if>
+   </channel>
+</rss>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed-admin.get.atomfeed.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed-admin.get.atomfeed.ftl
new file mode 100644
index 00000000000..aa716367d71
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed-admin.get.atomfeed.ftl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+<generator version="0.1">Alfresco (0.1)</generator>
+<link rel="self" href=""/>
+<title>Alfresco Activities User Feed for ${feedUserId}</title>
+<#if feedEntries??>
+<#list feedEntries as feedEntry>
${feedEntry.activitySummary}
</#list>
+<#else>
</#if>
+</feed>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed-admin.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed-admin.get.desc.xml
new file mode 100644
index 00000000000..54eb40373be
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed-admin.get.desc.xml
@@ -0,0 +1,17 @@
+<webscript>
+  <shortname>Activities admin user feed</shortname>
+  <description>Allow admin to get the feed for a specified user.</description>
+  <url>/api/activities/feed/user/{userId}</url>
+  <url>/api/activities/feed/user/{userId}?format=atomfeed</url>
+  <url>/api/activities/feed/user/{userId}?format=json</url>
+  <url>/api/activities/feed/user/{userId}?s={siteId}</url>
+  <url>/api/activities/feed/user/{userId}?s={siteId}&amp;format=atomfeed</url>
+  <url>/api/activities/feed/user/{userId}?s={siteId}&amp;format=json</url>
+  <url>/api/activities/feed/user/{userId}?s={siteId?}&amp;exclUser={false?}&amp;exclOthers={false?}</url>
+  <url>/api/activities/feed/user/{userId}?s={siteId?}&amp;exclUser={false?}&amp;exclOthers={false?}&amp;format=atomfeed</url>
+  <url>/api/activities/feed/user/{userId}?s={siteId?}&amp;exclUser={false?}&amp;exclOthers={false?}&amp;format=json</url>
+  <format default="atomfeed">argument</format>
+  <authentication>admin</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed-admin.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed-admin.get.json.ftl
new file mode 100644
index 00000000000..3af0b6a7d9f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed-admin.get.json.ftl
@@ -0,0 +1,7 @@
+[
+<#if feedEntries??>
+<#list feedEntries as feedEntry>
+    ${feedEntry}<#if feedEntry_has_next>,</#if>
+</#list>
+</#if>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed-admin.get.rss.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed-admin.get.rss.ftl
new file mode 100644
index 00000000000..035bae83b56
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed-admin.get.rss.ftl
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0">
+   <channel>
+      <title>Alfresco Activities User Feed for ${feedUserId?xml}</title>
+      <copyright>Copyright (c) 2008-2010 Alfresco Software, Inc. All rights reserved.</copyright>
+      <link></link>
+      <description>Alfresco Activities User Feed for ${feedUserId?xml}</description>
+      <language>en-us</language>
+      <lastBuildDate>${date?string("EEE, dd MMM yyyy HH:mm:ss zzz")}</lastBuildDate>
+      <pubDate>${date?string("EEE, dd MMM yyyy HH:mm:ss zzz")}</pubDate>
+      <ttl>120</ttl>
+      <generator>Alfresco (0.1)</generator>
+<#if feedEntries??>
+   <#list feedEntries as feedEntry>
+      ${feedEntry.activitySummary}
+   </#list>
+</#if>
+   </channel>
+</rss>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed.get.atomfeed.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed.get.atomfeed.ftl
new file mode 100644
index 00000000000..3c2081925ba
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed.get.atomfeed.ftl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+<generator version="0.1">Alfresco (0.1)</generator>
+<link rel="self" href=""/>
+<title>Alfresco Activities User Feed for ${feedUserId?xml}</title>
+<#if feedEntries??>
+<#list feedEntries as feedEntry>
${feedEntry.activitySummary}
</#list>
+<#else>
</#if>
+</feed>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed.get.desc.xml
new file mode 100644
index 00000000000..d64fbdc5c99
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed.get.desc.xml
@@ -0,0 +1,17 @@
+<webscript>
+  <shortname>Activities user feed</shortname>
+  <description>Allow the currently logged in user to get their feed.</description>
+  <url>/api/activities/feed/user</url>
+  <url>/api/activities/feed/user?format=atomfeed</url>
+  <url>/api/activities/feed/user?format=json</url>
+  <url>/api/activities/feed/user?s={siteId?}</url>
+  <url>/api/activities/feed/user?s={siteId?}&amp;format=atomfeed</url>
+  <url>/api/activities/feed/user?s={siteId?}&amp;format=json</url>
+  <url>/api/activities/feed/user?s={siteId?}&amp;exclUser={false?}&amp;exclOthers={false?}&amp;following={false?}&amp;activityFilter={activityFilter}</url>
+  <url>/api/activities/feed/user?s={siteId?}&amp;exclUser={false?}&amp;exclOthers={false?}&amp;following={false?}&amp;activityFilter={activityFilter}&amp;format=atomfeed</url>
+  <url>/api/activities/feed/user?s={siteId?}&amp;exclUser={false?}&amp;exclOthers={false?}&amp;following={false?}&amp;activityFilter={activityFilter}&amp;format=json</url>
+  <format default="atomfeed"></format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed.get.json.ftl
new file mode 100644
index 00000000000..3af0b6a7d9f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed.get.json.ftl
@@ -0,0 +1,7 @@
+[
+<#if feedEntries??>
+<#list feedEntries as feedEntry>
+    ${feedEntry}<#if feedEntry_has_next>,</#if>
+</#list>
+</#if>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed.get.rss.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed.get.rss.ftl
new file mode 100644
index 00000000000..035bae83b56
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/feed/userfeed.get.rss.ftl
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0">
+   <channel>
+      <title>Alfresco Activities User Feed for ${feedUserId?xml}</title>
+      <copyright>Copyright (c) 2008-2010 Alfresco Software, Inc. All rights reserved.</copyright>
+      <link></link>
+      <description>Alfresco Activities User Feed for ${feedUserId?xml}</description>
+      <language>en-us</language>
+      <lastBuildDate>${date?string("EEE, dd MMM yyyy HH:mm:ss zzz")}</lastBuildDate>
+      <pubDate>${date?string("EEE, dd MMM yyyy HH:mm:ss zzz")}</pubDate>
+      <ttl>120</ttl>
+      <generator>Alfresco (0.1)</generator>
+<#if feedEntries??>
+   <#list feedEntries as feedEntry>
+      ${feedEntry.activitySummary}
+   </#list>
+</#if>
+   </channel>
+</rss>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/template.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/template.get.desc.xml
new file mode 100644
index 00000000000..f07d96bac0e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/template.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Activity type template</shortname>
+  <description>Get the activity type template.</description>
+  <url>/api/activities/template/{path}</url>
+  <url>/api/activities/template/{path}?format=text</url>
+  <format default="text">argument</format>
+  <authentication>admin</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/template.get.text.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/template.get.text.ftl
new file mode 100644
index 00000000000..ed575c13dde
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/template.get.text.ftl
@@ -0,0 +1,2 @@
+<#if template??>
+${template}
</#if>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/templates.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/templates.get.desc.xml
new file mode 100644
index 00000000000..f0211155c34
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/templates.get.desc.xml
@@ -0,0 +1,12 @@
+<webscript>
+  <shortname>Activity template paths</shortname>
+  <description>Get a collection of the template paths.</description>
+  <url>/api/activities/templates</url>
+  <url>/api/activities/templates?format=json</url>
+  <url>/api/activities/templates/{path}</url>
+  <url>/api/activities/templates/{path}?format=json</url>
+  <format default="json">argument</format>
+  <authentication>admin</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/templates.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/templates.get.json.ftl
new file mode 100644
index 00000000000..0473d35cac7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/activities/templates.get.json.ftl
@@ -0,0 +1,4 @@
+[
+<#if paths??>
+<#list paths as path>
    "${path}"<#if path_has_next>,</#if>
</#list>
</#if>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-common.lib.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-common.lib.js
new file mode 100644
index 00000000000..c7610cae612
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-common.lib.js
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2005-2015 Alfresco Software, Ltd.  All rights reserved.
+ *
+ * License rights for this program may be obtained from Alfresco Software, Ltd. 
+ * pursuant to a written agreement and any use of this program without such an 
+ * agreement is prohibited. 
+ */
+
+/**
+ * Repository Admin Console
+ * 
+ * Common JavaScript library functions.
+ * 
+ * @author Kevin Roast
+ */
+
+/* Admin JavaScript namespace - public functions exposed through this namespace. */
+var Admin = Admin || {};
+
+(function() {
+
+   /**
+    * Return an indexed array of available Admin console tools.
+    * 
+    * [
+    *    {
+    *       id: <script identifier>,
+    *       label: <display label>,
+    *       group: <group identifier>,
+    *       groupLabel: <group display label>,
+    *       description: <description>,
+    *       selected: <true if currently selected tool>
+    *    }
+    *    ...
+    * ]
+    */
+   Admin.getConsoleTools = function getConsoleTools(currentToolId)
+   {
+      // return an map of group->tool[] information
+      var toolInfo = {};
+      
+      // collect the tools required for the Admin Console
+      var tools = utils.findWebScripts("AdminConsole");
+      
+      // process each tool and generate the data so that a label+link can
+      // be output by the component template for each tool required
+      for (var i = 0; i < tools.length; i++)
+      {
+         var tool = tools[i],
+             id = tool.id,
+             scriptName = id.substring(id.lastIndexOf('/') + 1, id.lastIndexOf('.'));
+         
+         // use the webscript ID to generate message bundle IDs
+         var labelId = "admin-console.tool." + scriptName + ".label",
+             descId = "admin-console.tool." + scriptName + ".description";
+         
+         // identify console tool grouping if any
+         // simple convention is used to resolve group - last element of the webscript package path after 'admin'
+         // for example: org.alfresco.repository.admin.system = system
+         // package paths not matching the convention will be placed in the default root group
+         // the I18N label is named: admin-console.tool.group.<yourgroupid>
+         var group = "",
+             groupLabelId = null,
+             paths = tool.scriptPath.split('/');
+         if (paths[paths.length-2] == "admin")
+         {
+            // found webscript package grouping
+            group = paths[paths.length-1];
+            groupLabelId = "admin-console.tool.group." + group;
+         }
+         
+         var info =
+         {
+            id: scriptName,
+            uri: tool.URIs[0],
+            label: msg.get(labelId) != labelId ? msg.get(labelId) : tool.shortName,
+            group: group,
+            groupLabel: group != "" ? (msg.get(groupLabelId) != groupLabelId ? msg.get(groupLabelId) : String(group).replace(/_/g, " ")) : "",
+            description: msg.get(descId) != descId ? msg.get(descId) : tool.description,
+            selected: (currentToolId == scriptName)
+         };
+         
+         // process family metadata
+         var index = -1,
+             addTool = true,
+             familys = tool.familys.toArray();
+         for (var f=0; f<familys.length; f++)
+         {
+            // find the index if specified
+            if (familys[f].indexOf("AdminConsole:Index:") !== -1)
+            {
+               index = parseInt(familys[f].substring("AdminConsole:Index:".length), 10);
+            }
+            
+            // find community only pages
+            if (familys[f] == "AdminConsole:Edition:Community")
+            {
+               addTool = !Admin.enterprise && (utils.getRestrictions().licenseMode == "UNKNOWN");
+            }
+         }
+         
+         // only add tools if not filtered from the list
+         if (addTool)
+         {
+            // generate the tool info structure
+            if (!toolInfo[group])
+            {
+               toolInfo[group] = [];
+            }
+            
+            // add to group - with specific index if specified in descriptor
+            if (index === -1)
+            {
+               toolInfo[group].push(info);
+            }
+            else
+            {
+               toolInfo[group].splice(index, 0, info);
+            }
+         }
+      }
+      
+      // convert to simple indexed array now we have completed the group processing
+      var toolsArray = [];
+      for each (var g in toolInfo)
+      {
+         toolsArray.push(g);
+      }
+      toolsArray.sort(function(a,b) {
+         return a[0].group > b[0].group ? 1 : -1
+      });
+      
+      return toolsArray;
+   }
+   
+   /**
+    * Return the script ID of the default Admin Console tool (first tool indexed in the list)
+    */
+   Admin.getDefaultTool = function getDefaultTool()
+   {
+      var tools = Admin.getConsoleTools(),
+          tool = tools[0][0];
+      return tool.id;
+   }
+   
+   /**
+    * Return the URI of the default Admin Console tool (first tool indexed in the list)
+    */
+   Admin.getDefaultToolURI = function getDefaultTool()
+   {
+      var tools = Admin.getConsoleTools(),
+          tool = tools[0][0];
+      return tool.uri;
+   }
+   
+   /**
+    * Return an object containing IP metadata about the server instance.
+    */
+   Admin.getServerMetaData = function getServerMetaData()
+   {
+      return {
+         hostname: utils.hostName,
+         hostaddress: utils.hostAddress
+      };
+   }
+   
+   Admin.encodeHtml = function encodeHtml(s)
+   {
+      if (!s)
+      {
+         return "";
+      }
+      s = "" + s;
+      return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+   }
+
+})();
+
+/**
+ * END Repository Admin Console - Common JavaScript library functions.
+ */
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get.desc.xml
new file mode 100644
index 00000000000..55445b39d46
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get.desc.xml
@@ -0,0 +1,13 @@
+<webscript>
+   <shortname>Admin Console - Community Summary</shortname>
+   <description><![CDATA[Admin Console WebScript that displays the Community Summary page.]]></description>
+   <url>/admin/admin-communitysummary</url>
+   <family>AdminConsole</family>
+   <family>AdminConsole:Index:0</family>
+   <!-- COMMUNITY ONLY -->
+   <family>AdminConsole:Edition:Community</family>
+   <format default="html">argument</format>
+   <authentication>admin</authentication>
+   <lifecycle>internal</lifecycle>
+   <transaction allow="readonly">required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get.html.ftl
new file mode 100644
index 00000000000..bd4e5a3fe88
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get.html.ftl
@@ -0,0 +1,31 @@
+<#include "admin-template.ftl" />
+
+<@page title=msg("admin-console.tool.admin-communitysummary.label") readonly=true>
+   
+   <div class="column-full">
+      <@section label=msg("communitysummary.repository") />
+      <@field value=alfrescoAttributes["edition"] label=msg("communitysummary.system-information.alfresco-edition") />
+      <@field value=alfrescoAttributes["version"] label=msg("communitysummary.system-information.alfresco-version") />
+      <@field value=alfrescoAttributes["versionLabel"] label=msg("communitysummary.system-information.version-label") description=msg("communitysummary.system-information.version-label.description") />
+      <@field value=alfrescoAttributes["schema"] label=msg("communitysummary.system-information.schema") description=msg("communitysummary.system-information.schema.description") />
+      <@field value=alfrescoAttributes["id"] label=msg("communitysummary.system-information.id") description=msg("communitysummary.system-information.id.description") />
+   </div>
+   
+   <@section label=msg("communitysummary.system-information") />
+   <div class="column-left">
+      <@field value=sysPropsAttributes["java.home"] label=msg("communitysummary.system-information.java-home") />
+      <@field value=sysPropsAttributes["java.version"] label=msg("communitysummary.system-information.java-version") />
+      <@field value=sysPropsAttributes["java.vm.vendor"] label=msg("communitysummary.system-information.java-vm-vendor") />
+      <@field value=sysPropsAttributes["os.name"] label=msg("communitysummary.system-information.operating-system") />
+      <@field value=sysPropsAttributes["os.version"] label=msg("communitysummary.system-information.version") />
+      <@field value=sysPropsAttributes["os.arch"] label=msg("communitysummary.system-information.architecture") />
+   </div>
+   
+   <div class="column-right">
+      <@field value=memoryAttributes["FreeMemory"] label=msg("communitysummary.system-information.free-memory") />
+      <@field value=memoryAttributes["MaxMemory"] label=msg("communitysummary.system-information.maximum-memory") />
+      <@field value=memoryAttributes["TotalMemory"] label=msg("communitysummary.system-information.total-memory") />
+      <@field value=memoryAttributes["AvailableProcessors"] label=msg("communitysummary.system-information.cpus") />
+   </div>
+   
+</@page>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get.js
new file mode 100644
index 00000000000..3b25841ac9f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get.js
@@ -0,0 +1,35 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/admin/admin-common.lib.js">
+
+/**
+ * Repository Admin Console
+ * 
+ * Community System Summary GET method
+ */
+function main()
+{
+   // Memory and CPUs
+   model.memoryAttributes = {
+      // convert bytes into GB with 2 decimal places
+      "FreeMemory": Math.round(java.lang.Runtime.getRuntime().freeMemory() / 1024 / 1024 / 1024 * 100) / 100,
+      "MaxMemory": Math.round(java.lang.Runtime.getRuntime().maxMemory() / 1024 / 1024 / 1024 * 100) / 100,
+      "TotalMemory": Math.round(java.lang.Runtime.getRuntime().totalMemory() / 1024 / 1024 / 1024 * 100) / 100,
+      "AvailableProcessors": java.lang.Runtime.getRuntime().availableProcessors()
+   };
+   
+   // System properties
+   model.sysPropsAttributes = {};
+   ["java.home", "java.version", "java.vm.vendor", "os.name", "os.version", "os.arch"].forEach(function(p) {
+      model.sysPropsAttributes[p] = java.lang.System.getProperty(p);
+   });
+   
+   // Alfresco properties
+   model.alfrescoAttributes = {};
+   ["edition", "version", "versionLabel", "schema", "id"].forEach(function(p) {
+      model.alfrescoAttributes[p] = server[p];
+   });
+   
+   model.tools = Admin.getConsoleTools("admin-communitysummary");
+   model.metadata = Admin.getServerMetaData();
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get.properties
new file mode 100644
index 00000000000..3ec45b4ca65
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=System Information
+
+communitysummary.system-information.free-memory=Free Memory (GB)
+communitysummary.system-information.maximum-memory=Maximum Memory (GB)
+communitysummary.system-information.total-memory=Total Memory (GB)
+communitysummary.system-information.cpus=CPUs
+
+communitysummary.system-information.java-home=Java Home
+communitysummary.system-information.java-version=Java Version
+communitysummary.system-information.java-vm-vendor=Java VM Vendor
+communitysummary.system-information.operating-system=Operating System
+communitysummary.system-information.version=Version
+communitysummary.system-information.architecture=Architecture
+
+communitysummary.system-information.alfresco-edition=Edition
+communitysummary.system-information.alfresco-version=Version Number
+communitysummary.system-information.version-label=Version Label
+communitysummary.system-information.schema=Schema
+communitysummary.system-information.id=Repository Identifier
+
+communitysummary.system-information.version-label.description=Alfresco Content Services version and build number.
+communitysummary.system-information.schema.description=Alfresco Content Services database schema number.
+communitysummary.system-information.id.description=Unique identifier for this repository instance.
+
+communitysummary.repository=Repository Information
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_cs.properties
new file mode 100644
index 00000000000..069844eeaf9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_cs.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=Syst\u00e9mov\u00e9 informace
+
+communitysummary.system-information.free-memory=Voln\u00e1 pam\u011b\u0165 (GB)
+communitysummary.system-information.maximum-memory=Maxim\u00e1ln\u00ed pam\u011b\u0165 (GB)
+communitysummary.system-information.total-memory=Celkov\u00e1 pam\u011b\u0165 (GB)
+communitysummary.system-information.cpus=Procesory
+
+communitysummary.system-information.java-home=Java Home
+communitysummary.system-information.java-version=Verze Java
+communitysummary.system-information.java-vm-vendor=Dodavatel Java VM
+communitysummary.system-information.operating-system=Opera\u010dn\u00ed syst\u00e9m
+communitysummary.system-information.version=Verze
+communitysummary.system-information.architecture=Architektura
+
+communitysummary.system-information.alfresco-edition=Edice
+communitysummary.system-information.alfresco-version=\u010c\u00edslo verze
+communitysummary.system-information.version-label=Popisek verze
+communitysummary.system-information.schema=Sch\u00e9ma
+communitysummary.system-information.id=Identifik\u00e1tor \u00falo\u017ei\u0161t\u011b
+
+communitysummary.system-information.version-label.description=Verze a\u00a0\u010d\u00edslo buildu Alfresco Content Services.
+communitysummary.system-information.schema.description=\u010c\u00edslo sch\u00e9matu datab\u00e1ze Alfresco Content Services.
+communitysummary.system-information.id.description=Jedine\u010dn\u00fd identifik\u00e1tor t\u00e9to instance \u00falo\u017ei\u0161t\u011b.
+
+communitysummary.repository=Informace o\u00a0\u00falo\u017ei\u0161ti
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_da.properties
new file mode 100644
index 00000000000..3593c054432
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_da.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=Systemoplysninger
+
+communitysummary.system-information.free-memory=Ledig hukommelse (GB)
+communitysummary.system-information.maximum-memory=Maks. hukommelse (GB)
+communitysummary.system-information.total-memory=Hukommelse i alt (GB)
+communitysummary.system-information.cpus=CPU'er
+
+communitysummary.system-information.java-home=Java Home
+communitysummary.system-information.java-version=Java-version
+communitysummary.system-information.java-vm-vendor=Java VM-udbyder
+communitysummary.system-information.operating-system=Operativsystem
+communitysummary.system-information.version=Version
+communitysummary.system-information.architecture=Arkitektur
+
+communitysummary.system-information.alfresco-edition=Udgave
+communitysummary.system-information.alfresco-version=Versionsnummer
+communitysummary.system-information.version-label=Versionsetiket
+communitysummary.system-information.schema=Skema
+communitysummary.system-information.id=Lager-id
+
+communitysummary.system-information.version-label.description=Alfresco Content Services-version og buildnummer.
+communitysummary.system-information.schema.description=Alfresco Content Services-databaseskemanummer.
+communitysummary.system-information.id.description=Entydigt id for denne lagerforekomst.
+
+communitysummary.repository=Lageroplysninger
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_de.properties
new file mode 100644
index 00000000000..f2154c36e07
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_de.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=Systeminformation
+
+communitysummary.system-information.free-memory=Freier Speicher (GB)
+communitysummary.system-information.maximum-memory=Maximaler Speicher (GB)
+communitysummary.system-information.total-memory=Gesamtspeicher (GB)
+communitysummary.system-information.cpus=CPUs
+
+communitysummary.system-information.java-home=Java-Home
+communitysummary.system-information.java-version=Java-Version
+communitysummary.system-information.java-vm-vendor=Java VM-Anbieter
+communitysummary.system-information.operating-system=Betriebssystem
+communitysummary.system-information.version=Version
+communitysummary.system-information.architecture=Architektur
+
+communitysummary.system-information.alfresco-edition=Edition
+communitysummary.system-information.alfresco-version=Versionsnummer
+communitysummary.system-information.version-label=Versionslabel
+communitysummary.system-information.schema=Schema
+communitysummary.system-information.id=Repository-Identifikator
+
+communitysummary.system-information.version-label.description=Versions- und Build-Nummer von Alfresco Content Services.
+communitysummary.system-information.schema.description=Nummer des Datenbankschemas f\u00fcr Alfresco Content Services.
+communitysummary.system-information.id.description=Eindeutige Kennung dieser Repository-Instanz.
+
+communitysummary.repository=Repository-Informationen
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_es.properties
new file mode 100644
index 00000000000..88aef4c2da9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_es.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=Informaci\u00f3n del sistema
+
+communitysummary.system-information.free-memory=Memoria libre (GB)
+communitysummary.system-information.maximum-memory=Memoria m\u00e1xima (GB)
+communitysummary.system-information.total-memory=Memoria total (GB)
+communitysummary.system-information.cpus=UPCs
+
+communitysummary.system-information.java-home=Inicio de Java
+communitysummary.system-information.java-version=Versi\u00f3n de Java
+communitysummary.system-information.java-vm-vendor=Proveedor de Java VM
+communitysummary.system-information.operating-system=Sistema operativo
+communitysummary.system-information.version=Versi\u00f3n
+communitysummary.system-information.architecture=Arquitectura
+
+communitysummary.system-information.alfresco-edition=Edici\u00f3n
+communitysummary.system-information.alfresco-version=N\u00famero de versi\u00f3n
+communitysummary.system-information.version-label=Etiqueta de versi\u00f3n
+communitysummary.system-information.schema=Esquema
+communitysummary.system-information.id=Identificador de repositorio
+
+communitysummary.system-information.version-label.description=Versi\u00f3n de Alfresco Content Services y n\u00famero de compilaci\u00f3n.
+communitysummary.system-information.schema.description=N\u00famero de esquema de base de datos de Alfresco Content Services.
+communitysummary.system-information.id.description=Identificador \u00fanico para esta instancia de repositorio.
+
+communitysummary.repository=Informaci\u00f3n del repositorio
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_fi.properties
new file mode 100644
index 00000000000..6861288d90c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_fi.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=J\u00e4rjestelm\u00e4tiedot
+
+communitysummary.system-information.free-memory=Vapaa muisti (Gt)
+communitysummary.system-information.maximum-memory=Muistin enimm\u00e4ism\u00e4\u00e4r\u00e4 (Gt)
+communitysummary.system-information.total-memory=Muistia yhteens\u00e4 (Gt)
+communitysummary.system-information.cpus=Suorittimet
+
+communitysummary.system-information.java-home=Java-etusivu
+communitysummary.system-information.java-version=Java-versio
+communitysummary.system-information.java-vm-vendor=Java VM -palveluntarjoaja
+communitysummary.system-information.operating-system=K\u00e4ytt\u00f6j\u00e4rjestelm\u00e4
+communitysummary.system-information.version=Versio
+communitysummary.system-information.architecture=Arkkitehtuuri
+
+communitysummary.system-information.alfresco-edition=Versio
+communitysummary.system-information.alfresco-version=Versionumero
+communitysummary.system-information.version-label=Versioselite
+communitysummary.system-information.schema=Rakenne
+communitysummary.system-information.id=S\u00e4il\u00f6tunniste
+
+communitysummary.system-information.version-label.description=T\u00e4m\u00e4 on Alfresco Content Servicesin versio ja koontiversionumero.
+communitysummary.system-information.schema.description=T\u00e4m\u00e4 on Alfresco Content Servicesin tietokantarakennenumero.
+communitysummary.system-information.id.description=T\u00e4m\u00e4 on t\u00e4m\u00e4n s\u00e4il\u00f6esiintym\u00e4n yksil\u00f6llinen tunniste.
+
+communitysummary.repository=S\u00e4il\u00f6tiedot
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_fr.properties
new file mode 100644
index 00000000000..7aa242c4d5f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_fr.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=Informations syst\u00e8me
+
+communitysummary.system-information.free-memory=M\u00e9moire libre (Go)
+communitysummary.system-information.maximum-memory=M\u00e9moire maximum (Go)
+communitysummary.system-information.total-memory=M\u00e9moire totale (Go)
+communitysummary.system-information.cpus=CPUs
+
+communitysummary.system-information.java-home=Page d'accueil Java
+communitysummary.system-information.java-version=Version Java
+communitysummary.system-information.java-vm-vendor=Fournisseur Java VM
+communitysummary.system-information.operating-system=Syst\u00e8me d'exploitation
+communitysummary.system-information.version=Version
+communitysummary.system-information.architecture=Architecture
+
+communitysummary.system-information.alfresco-edition=\u00c9dition
+communitysummary.system-information.alfresco-version=Num\u00e9ro de version
+communitysummary.system-information.version-label=Etiquette de version
+communitysummary.system-information.schema=Sch\u00e9ma
+communitysummary.system-information.id=Identifiant d'entrep\u00f4t
+
+communitysummary.system-information.version-label.description=Version et num\u00e9ro de build Alfresco Content Services.
+communitysummary.system-information.schema.description=Num\u00e9ro de sch\u00e9ma de base de donn\u00e9es Alfresco Content Services.
+communitysummary.system-information.id.description=Identifiant unique pour cette instance d'entrep\u00f4t.
+
+communitysummary.repository=Informations d'entrep\u00f4t
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_it.properties
new file mode 100644
index 00000000000..c974e3b3ee0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_it.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=Informazioni sul sistema
+
+communitysummary.system-information.free-memory=Memoria libera (GB)
+communitysummary.system-information.maximum-memory=Memoria massima (GB)
+communitysummary.system-information.total-memory=Memoria totale (GB)
+communitysummary.system-information.cpus=CPU
+
+communitysummary.system-information.java-home=Home page Java
+communitysummary.system-information.java-version=Versione Java
+communitysummary.system-information.java-vm-vendor=Fornitore Java VM
+communitysummary.system-information.operating-system=Sistema operativo
+communitysummary.system-information.version=Versione
+communitysummary.system-information.architecture=Architettura
+
+communitysummary.system-information.alfresco-edition=Edizione
+communitysummary.system-information.alfresco-version=Numero versione
+communitysummary.system-information.version-label=Etichetta della versione
+communitysummary.system-information.schema=Schema
+communitysummary.system-information.id=Identificativo repository
+
+communitysummary.system-information.version-label.description=Versione Alfresco Content Services e numero build.
+communitysummary.system-information.schema.description=Numero dello schema del database Alfresco Content Services.
+communitysummary.system-information.id.description=Identificatore unico della versione del repository.
+
+communitysummary.repository=Informazioni sul repository
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_ja.properties
new file mode 100644
index 00000000000..f6abb68234d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_ja.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=\u30b7\u30b9\u30c6\u30e0\u60c5\u5831
+
+communitysummary.system-information.free-memory=\u7a7a\u304d\u30e1\u30e2\u30ea \uff08GB\uff09
+communitysummary.system-information.maximum-memory=\u6700\u5927\u30e1\u30e2\u30ea \uff08GB\uff09
+communitysummary.system-information.total-memory=\u5408\u8a08\u30e1\u30e2\u30ea \uff08GB\uff09
+communitysummary.system-information.cpus=CPU
+
+communitysummary.system-information.java-home=Java \u30db\u30fc\u30e0
+communitysummary.system-information.java-version=Java \u306e\u30d0\u30fc\u30b8\u30e7\u30f3
+communitysummary.system-information.java-vm-vendor=Java VM \u306e\u30d9\u30f3\u30c0\u30fc
+communitysummary.system-information.operating-system=\u30aa\u30da\u30ec\u30fc\u30c6\u30a3\u30f3\u30b0\u30b7\u30b9\u30c6\u30e0
+communitysummary.system-information.version=\u30d0\u30fc\u30b8\u30e7\u30f3
+communitysummary.system-information.architecture=\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3
+
+communitysummary.system-information.alfresco-edition=\u7248
+communitysummary.system-information.alfresco-version=\u30d0\u30fc\u30b8\u30e7\u30f3\u756a\u53f7
+communitysummary.system-information.version-label=\u30d0\u30fc\u30b8\u30e7\u30f3\u30e9\u30d9\u30eb
+communitysummary.system-information.schema=\u30b9\u30ad\u30fc\u30de
+communitysummary.system-information.id=\u30ea\u30dd\u30b8\u30c8\u30ea ID
+
+communitysummary.system-information.version-label.description=Alfresco Content Services \u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3068\u30d3\u30eb\u30c9\u756a\u53f7\u3002
+communitysummary.system-information.schema.description=Alfresco Content Services \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30b9\u30ad\u30fc\u30de\u756a\u53f7\u3002
+communitysummary.system-information.id.description=\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u4e00\u610f\u8b58\u5225\u5b50\u3002
+
+communitysummary.repository=\u30ea\u30dd\u30b8\u30c8\u30ea\u60c5\u5831
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_nb.properties
new file mode 100644
index 00000000000..78d036b260f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_nb.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=Systeminformasjon
+
+communitysummary.system-information.free-memory=Ledig minne (GB)
+communitysummary.system-information.maximum-memory=Maks minne (GB)
+communitysummary.system-information.total-memory=Totalt minne (GB)
+communitysummary.system-information.cpus=CPU-er
+
+communitysummary.system-information.java-home=Java Hjem
+communitysummary.system-information.java-version=Java-versjon
+communitysummary.system-information.java-vm-vendor=Leverand\u00f8r Java VM
+communitysummary.system-information.operating-system=Operativsystem
+communitysummary.system-information.version=Versjon
+communitysummary.system-information.architecture=Arkitektur
+
+communitysummary.system-information.alfresco-edition=Utgave
+communitysummary.system-information.alfresco-version=Versjonsnummer
+communitysummary.system-information.version-label=Versjonsetikett
+communitysummary.system-information.schema=Skjema
+communitysummary.system-information.id=Databaseidentifikator
+
+communitysummary.system-information.version-label.description=Alfresco Content Services-versjon og -build-nummer.
+communitysummary.system-information.schema.description=Skjemanummer for Alfresco Content Services-database.
+communitysummary.system-information.id.description=Unik identifikator for dette databasetilfellet.
+
+communitysummary.repository=Datalagerinformasjon
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_nl.properties
new file mode 100644
index 00000000000..594f19bf4e5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_nl.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=Systeeminformatie
+
+communitysummary.system-information.free-memory=Vrij geheugen (GB)
+communitysummary.system-information.maximum-memory=Maximaal geheugen (GB)
+communitysummary.system-information.total-memory=Totaal geheugen (GB)
+communitysummary.system-information.cpus=CPU's
+
+communitysummary.system-information.java-home=Java-startpagina
+communitysummary.system-information.java-version=Java-versie
+communitysummary.system-information.java-vm-vendor=Java VM-leverancier
+communitysummary.system-information.operating-system=Besturingssysteem
+communitysummary.system-information.version=Versie
+communitysummary.system-information.architecture=Architectuur
+
+communitysummary.system-information.alfresco-edition=Editie
+communitysummary.system-information.alfresco-version=Versienummer
+communitysummary.system-information.version-label=Versielabel
+communitysummary.system-information.schema=Schema
+communitysummary.system-information.id=Repository-id
+
+communitysummary.system-information.version-label.description=Alfresco Content Services-versie en -buildnummer.
+communitysummary.system-information.schema.description=Alfresco Content Services-databaseschemanummer.
+communitysummary.system-information.id.description=Unieke identificatie voor deze repository-instance.
+
+communitysummary.repository=Repository-informatie
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_pl.properties
new file mode 100644
index 00000000000..05cec21f023
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_pl.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=Informacje o systemie
+
+communitysummary.system-information.free-memory=Ilo\u015b\u0107 wolnej pami\u0119ci (GB)
+communitysummary.system-information.maximum-memory=Maksymalna pami\u0119\u0107 (GB)
+communitysummary.system-information.total-memory=Ca\u0142kowita pami\u0119\u0107 (GB)
+communitysummary.system-information.cpus=Liczba procesor\u00f3w
+
+communitysummary.system-information.java-home=Katalog Java
+communitysummary.system-information.java-version=Wersja Java
+communitysummary.system-information.java-vm-vendor=Dostawca Java
+communitysummary.system-information.operating-system=System operacyjny
+communitysummary.system-information.version=Wersja
+communitysummary.system-information.architecture=Architektura
+
+communitysummary.system-information.alfresco-edition=Wydanie
+communitysummary.system-information.alfresco-version=Numer wersji
+communitysummary.system-information.version-label=Etykieta wersji
+communitysummary.system-information.schema=Schemat
+communitysummary.system-information.id=Identyfikator repozytorium
+
+communitysummary.system-information.version-label.description=Numer wersji i kompilacji Alfresco Content Services.
+communitysummary.system-information.schema.description=Numer schematu bazy danych Alfresco Content Services.
+communitysummary.system-information.id.description=Unikatowy identyfikator wyst\u0105pienia repozytorium.
+
+communitysummary.repository=Informacje o repozytorium
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_pt_BR.properties
new file mode 100644
index 00000000000..c1ca6e72f41
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_pt_BR.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=Informa\u00e7\u00f5es do sistema
+
+communitysummary.system-information.free-memory=Mem\u00f3ria livre (GB)
+communitysummary.system-information.maximum-memory=Mem\u00f3ria m\u00e1xima (GB)
+communitysummary.system-information.total-memory=Mem\u00f3ria total (GB)
+communitysummary.system-information.cpus=CPUs
+
+communitysummary.system-information.java-home=P\u00e1gina inicial do Java
+communitysummary.system-information.java-version=Vers\u00e3o do Java
+communitysummary.system-information.java-vm-vendor=Fornecedor de m\u00e1quina virtual Java
+communitysummary.system-information.operating-system=Sistema operacional
+communitysummary.system-information.version=Vers\u00e3o
+communitysummary.system-information.architecture=Arquitetura
+
+communitysummary.system-information.alfresco-edition=Edi\u00e7\u00e3o
+communitysummary.system-information.alfresco-version=N\u00famero da vers\u00e3o
+communitysummary.system-information.version-label=R\u00f3tulo de vers\u00e3o
+communitysummary.system-information.schema=Esquema
+communitysummary.system-information.id=Identificador do reposit\u00f3rio
+
+communitysummary.system-information.version-label.description=Vers\u00e3o e n\u00famero de compila\u00e7\u00e3o do Alfresco Content Services.
+communitysummary.system-information.schema.description=N\u00famero do esquema de banco de dados do Alfresco Content Services.
+communitysummary.system-information.id.description=Identificador \u00fanico para essa inst\u00e2ncia de reposit\u00f3rio.
+
+communitysummary.repository=Informa\u00e7\u00f5es de reposit\u00f3rio
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_ru.properties
new file mode 100644
index 00000000000..a87293ef80b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_ru.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u0441\u0438\u0441\u0442\u0435\u043c\u0435
+
+communitysummary.system-information.free-memory=\u0421\u0432\u043e\u0431\u043e\u0434\u043d\u0430\u044f \u043f\u0430\u043c\u044f\u0442\u044c (\u0413\u0411)
+communitysummary.system-information.maximum-memory=\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u044b\u0439 \u043e\u0431\u044a\u0435\u043c \u043f\u0430\u043c\u044f\u0442\u0438 (\u0413\u0411)
+communitysummary.system-information.total-memory=\u041e\u0431\u0449\u0438\u0439 \u043e\u0431\u044a\u0435\u043c \u043f\u0430\u043c\u044f\u0442\u0438 (\u0413\u0411)
+communitysummary.system-information.cpus=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0426\u041f
+
+communitysummary.system-information.java-home=\u0413\u043b\u0430\u0432\u043d\u043e\u0435 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 Java
+communitysummary.system-information.java-version=\u0412\u0435\u0440\u0441\u0438\u044f Java
+communitysummary.system-information.java-vm-vendor=\u041f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a \u0412\u041c Java
+communitysummary.system-information.operating-system=\u041e\u043f\u0435\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u0430\u044f \u0441\u0438\u0441\u0442\u0435\u043c\u0430
+communitysummary.system-information.version=\u0412\u0435\u0440\u0441\u0438\u044f
+communitysummary.system-information.architecture=\u0410\u0440\u0445\u0438\u0442\u0435\u043a\u0442\u0443\u0440\u0430
+
+communitysummary.system-information.alfresco-edition=\u0420\u0435\u0434\u0430\u043a\u0446\u0438\u044f
+communitysummary.system-information.alfresco-version=\u041d\u043e\u043c\u0435\u0440 \u0432\u0435\u0440\u0441\u0438\u0438
+communitysummary.system-information.version-label=\u042f\u0440\u043b\u044b\u043a \u0432\u0435\u0440\u0441\u0438\u0438
+communitysummary.system-information.schema=\u0421\u0445\u0435\u043c\u0430
+communitysummary.system-information.id=\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0440\u0435\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u0438\u044f
+
+communitysummary.system-information.version-label.description=\u041d\u043e\u043c\u0435\u0440 \u0432\u0435\u0440\u0441\u0438\u0438 \u0438 \u0441\u0431\u043e\u0440\u043a\u0438 Alfresco Content Services.
+communitysummary.system-information.schema.description=\u041d\u043e\u043c\u0435\u0440 \u0441\u0445\u0435\u043c\u044b \u0431\u0430\u0437\u044b \u0434\u0430\u043d\u043d\u044b\u0445 Alfresco Content Services.
+communitysummary.system-information.id.description=\u0423\u043d\u0438\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440\u0430 \u0440\u0435\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u0438\u044f.
+
+communitysummary.repository=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u0440\u0435\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u0438\u0438
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_sv.properties
new file mode 100644
index 00000000000..776451ff2db
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_sv.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=Systeminformation
+
+communitysummary.system-information.free-memory=Ledigt minne (GB)
+communitysummary.system-information.maximum-memory=Maximalt mine (GB)
+communitysummary.system-information.total-memory=Totalt minne (GB)
+communitysummary.system-information.cpus=CPUer
+
+communitysummary.system-information.java-home=Java Home
+communitysummary.system-information.java-version=Javaversion
+communitysummary.system-information.java-vm-vendor=Java VM Vendor
+communitysummary.system-information.operating-system=Operativsystem
+communitysummary.system-information.version=Version
+communitysummary.system-information.architecture=Arkitektur
+
+communitysummary.system-information.alfresco-edition=Utg\u00e5va
+communitysummary.system-information.alfresco-version=Versionsnummer
+communitysummary.system-information.version-label=Versionsetikett
+communitysummary.system-information.schema=Schema
+communitysummary.system-information.id=Arkividentifierare
+
+communitysummary.system-information.version-label.description=Alfresco Content Services version och byggnummer.
+communitysummary.system-information.schema.description=Alfresco Content Services databaschemanummer.
+communitysummary.system-information.id.description=Unik identifierare f\u00f6r den h\u00e4r arkivinstansen.
+
+communitysummary.repository=Arkivinformation
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_zh_CN.properties
new file mode 100644
index 00000000000..8c68955fbaf
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-communitysummary.get_zh_CN.properties
@@ -0,0 +1,25 @@
+communitysummary.system-information=\u7cfb\u7edf\u4fe1\u606f
+
+communitysummary.system-information.free-memory=\u53ef\u7528\u5185\u5b58 (GB)
+communitysummary.system-information.maximum-memory=\u6700\u5927\u5185\u5b58 (GB)
+communitysummary.system-information.total-memory=\u5185\u5b58\u603b\u91cf (GB)
+communitysummary.system-information.cpus=CPU
+
+communitysummary.system-information.java-home=Java \u4e3b\u9875
+communitysummary.system-information.java-version=Java \u7248\u672c
+communitysummary.system-information.java-vm-vendor=Java VM \u4f9b\u5e94\u5546
+communitysummary.system-information.operating-system=\u64cd\u4f5c\u7cfb\u7edf
+communitysummary.system-information.version=\u7248\u672c
+communitysummary.system-information.architecture=\u4f53\u7cfb\u7ed3\u6784
+
+communitysummary.system-information.alfresco-edition=\u7248\u672c
+communitysummary.system-information.alfresco-version=\u7248\u672c\u53f7
+communitysummary.system-information.version-label=\u7248\u672c\u6807\u7b7e
+communitysummary.system-information.schema=\u67b6\u6784
+communitysummary.system-information.id=\u5b58\u50a8\u5e93\u6807\u8bc6\u7b26
+
+communitysummary.system-information.version-label.description=Alfresco Content Services \u7248\u672c\u548c\u7248\u672c\u53f7\u3002
+communitysummary.system-information.schema.description=Alfresco Content Services \u6570\u636e\u5e93\u67b6\u6784\u53f7\u3002
+communitysummary.system-information.id.description=\u6b64\u5b58\u50a8\u5e93\u5b9e\u4f8b\u7684\u552f\u4e00\u6807\u8bc6\u7b26\u3002
+
+communitysummary.repository=\u5b58\u50a8\u5e93\u4fe1\u606f
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-root.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-root.get.desc.xml
new file mode 100644
index 00000000000..26816eeb206
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-root.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+   <shortname>Admin Console - root page</shortname>
+   <description><![CDATA[Admin Console WebScript that retrieves available admin console tools and redirects to the first one.]]></description>
+   <url>/admin</url>
+   <url>/admin/</url>
+   <family>AdminConsoleHelper</family>
+   <format default="html">argument</format>
+   <authentication>admin</authentication>
+   <lifecycle>internal</lifecycle>
+   <transaction allow="readonly">required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-root.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-root.get.js
new file mode 100644
index 00000000000..be2d611df8d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-root.get.js
@@ -0,0 +1,15 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/admin/admin-common.lib.js">
+
+/**
+ * Repository Admin Console
+ * 
+ * Root page GET method
+ */
+function main()
+{
+   status.code = 301;
+   status.location = url.serviceContext + Admin.getDefaultToolURI();
+   status.redirect = true;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-root.post.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-root.post.js
new file mode 100644
index 00000000000..b4f16cbee83
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-root.post.js
@@ -0,0 +1,47 @@
+<import resource="classpath:alfresco/enterprise/webscripts/org/alfresco/enterprise/repository/admin/admin-common.lib.js">
+
+/**
+ * Repository Admin Console
+ * 
+ * Root page POST method
+ */
+function main()
+{
+   var returnParams = "m=admin-console.success";
+   try
+   {
+      Admin.persistJMXFormData();
+   }
+   catch (e)
+   {
+      returnParams = "e=" + e.message;
+   }
+   // generate the return URL - using the supplied tool ID or default tool if not specified
+   // redrawing the appropriate tool page will retrieve the updated attribute values
+   status.code = 301;
+   status.location = url.serviceContext + (args.t ? args.t : Admin.getDefaultToolURI()) + "?" + returnParams;
+   status.redirect = true;
+}
+
+function debug()
+{
+   // dump each form field in a name/value pair for easy log output
+   var params = [];
+   for each (field in formdata.fields)
+   {
+      params.push({
+         name: field.name,
+         value: field.value
+      });
+   }
+   model.params = params;
+}
+
+if (!args.debug)
+{
+   main();
+}
+else
+{
+   debug();
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-template.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-template.ftl
new file mode 100644
index 00000000000..8d8900d2eca
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/admin-template.ftl
@@ -0,0 +1,911 @@
+<#--
+   ADMIN TEMPLATE MACROS
+-->
+<#--
+   Template outer "page" macro.
+   
+   @param title - Title msg for the page
+   @param readonly (default:false) - boolean read only flag, if true will not display the Submit buttons.
+   @param controller (default:"/admin") - optionally override the Form controller
+   @param params (default:"") - url encoded params to be added to the HTML form URL
+-->
+<#macro page title readonly=false controller=DEFAULT_CONTROLLER!"/admin" params="" dialog=false>
+<#assign FORM_ID="admin-jmx-form" />
+<#if server.edition == "Community">
+    <#assign docsEdition = "community" />
+<#elseif server.edition == "Enterprise" >
+    <#assign docsEdition = server.getVersionMajor() + "." + server.getVersionMinor() />
+</#if>
+<#if metadata??>
+<#assign HOSTNAME>${msg("admin-console.host")}: ${metadata.hostname}</#assign>
+<#assign HOSTADDR>${msg("admin-console.ipaddress")}: ${metadata.hostaddress}</#assign>
+</#if>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+   <title>Alfresco &raquo; ${title?html}<#if metadata??> [${HOSTNAME} ${HOSTADDR}]</#if></title>
+   <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
+   <link rel="stylesheet" type="text/css" href="${url.context}/css/reset.css" />
+   <link rel="stylesheet" type="text/css" href="${url.context}/css/alfresco.css" />
+   <link rel="stylesheet" type="text/css" href="${url.context}/admin/css/admin.css" />
+   <!--[if IE 8 ]><style type="text/css">.dialog{width:100%}</style><![endif]-->
+   <script type="text/javascript">//<![CDATA[
+
+/* JavaScript global helper methods and event handlers */
+var el = function el(id)
+{
+   return document.getElementById(id);
+}
+
+/* Admin namespace helper methods */
+var Admin = Admin || {};
+(function() {
+   
+   /* private scoped values */
+   _dialog = null;
+   _dialogScrollPosition = null;
+   
+   /* CSRF helpers */
+   
+   <#assign CSRF=(config.scoped["CSRFPolicy"]["filter"].getChildren("rule")?size != 0)!false>
+   Admin.CSRF = {
+      enabled: ${CSRF?c},<#if CSRF>
+      cookie: "${config.scoped["CSRFPolicy"]["client"].getChildValue("cookie")!""}",
+      header: "${config.scoped["CSRFPolicy"]["client"].getChildValue("header")!""}",
+      parameter: "${config.scoped["CSRFPolicy"]["client"].getChildValue("parameter")!""}",</#if>
+      properties: {}
+   };
+<#if config.scoped["CSRFPolicy"]["properties"]??>
+<#assign csrfProperties = (config.scoped["CSRFPolicy"]["properties"].children)![]>
+<#list csrfProperties as p>
+   Admin.CSRF.properties["${p.name?js_string}"] = "${(p.value!"")?js_string}";
+</#list>
+</#if>
+   
+   /* publicly available helper functions */
+   
+   /**
+    * Returns the CSRF token.
+    *
+    * Note! Make sure to use this method just before a request is made against the server since it might have been
+    * updated in another browser tab or window.
+    * 
+    * @method CSRFToken
+    * @return {String} The CSRF token or null if not enable or not defined.
+    */
+   Admin.CSRFToken = function CSRFToken()
+   {
+      var token = null,
+          cookieName = Admin.CSRF.getCookie();
+      if (cookieName)
+      {
+         var matches = document.cookie.match(new RegExp("(?:^|; )" + cookieName + "=([^;]*)"));
+         if (matches)
+         {
+            // remove quotes to support Jetty app-server - bug where it quotes a valid cookie value see ALF-18823
+            token = decodeURIComponent(matches[1]).replace(/"/g, '');
+         }
+      }
+      return token;
+   };
+   Admin.CSRF.getCookie = function getCookie()
+   {
+      return Admin.substitute(Admin.CSRF.cookie, Admin.CSRF.properties || {});
+   };
+   Admin.CSRF.getParameter= function getParameter()
+   {
+      return Admin.substitute(Admin.CSRF.parameter, Admin.CSRF.properties || {});
+   };
+   Admin.CSRF.getHeader = function getHeader()
+   {
+      return Admin.substitute(Admin.CSRF.header, Admin.CSRF.properties || {});
+   };
+   
+   /**
+    * Simple string substitution helper. Replaces simple instances of templated strings {name} within a string from
+    * a property object. Each key in the property object is replaced in the string with it's value if match is found.
+    * 
+    * @param str  String to replace into
+    * @param properties Object of key/value pairs to replace templates values with
+    */
+   Admin.substitute = function substitute(str, properties)
+   {
+      for (var prop in properties)
+      {
+         str = str.replace("{" + prop + "}", properties[prop]);
+      }
+      return str;
+   };
+   
+   /**
+    * String trim helper
+    * 
+    * @param s {string}    String to trim pre and post whitespace from
+    * @return trimmed string value - returns empty string for null or undefined input
+    */
+   Admin.trim = function trim(s)
+   {
+      return s ? s.replace(/^\s+|\s+$/g, "") : "";
+   }
+   
+   /**
+    * String HTML encoding helper
+    * 
+    * @param s {string}    String to HTML encode
+    * @return encoded string value - returns empty string for null or undefined input
+    */
+   Admin.html = function html(s)
+   {
+      if (!s)
+      {
+         return "";
+      }
+      s = "" + s;
+      return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+   }
+   
+   /**
+    * Helper to add a named DOM event listener function to an object
+    * 
+    * @param obj {Element}    DOM object to add the named event listener too
+    * @param event {string}   Event name e.g. "click"
+    * @param fn {function}    Event handler function to invoke
+    */
+   Admin.addEventListener = function addEventListener(obj, event, fn)
+   {
+      if (obj.addEventListener)
+      {
+         obj.addEventListener(event, fn, false);
+      }
+      else
+      {
+         obj.attachEvent("on" + event, fn);
+      }
+   }
+   
+   /**
+    * DIV Section toggle event handler
+    * 
+    * @param a {Element}   Anchor element that fired the toggle event
+    */
+   Admin.sectionToggle = function sectionToggle(a)
+   {
+      <#-- NOTE: dependent on template structure in @tsection macro below -->
+      
+      // walk the DOM nodes to get to the toggle div element
+      var div = a.parentElement.parentElement.getElementsByTagName("div")[0].getElementsByTagName("div")[0];
+      if (Admin.toggleHiddenElement(div))
+      {
+         // will now be open
+         a.innerHTML = "\u25BC";
+      }
+      else
+      {
+         // will now be closed
+         a.innerHTML = "\u25BA";
+      }
+   }
+   
+   /**
+    * Toggle the "hidden" class for a given DOM element
+    * 
+    * @param el {Element}  Element to add/remove the "hidden" class to
+    */
+   Admin.toggleHiddenElement = function toggleHiddenElement(el)
+   {
+      var clazzes = el.className.split(" "),
+          foundHidden = false;
+      for (var i = 0; i < clazzes.length; i++)
+      {
+         // found the toggle el - switch display class
+         if (foundHidden = (clazzes[i] === "hidden"))
+         {
+            clazzes.splice(i, 1);
+            break;
+         }
+      }
+      if (!foundHidden)
+      {
+         clazzes.push("hidden");
+      }
+      
+      // apply new classes to the el
+      el.className = clazzes.join(" ");
+      
+      return foundHidden;
+   }
+   
+   Admin.addClass = function addClass(el, c)
+   {
+      var clazzes = el.className.split(" "), found = false;
+      for (var i = 0; i < clazzes.length; i++)
+      {
+         if (found = (clazzes[i] === c)) break;
+      }
+      if (!found)
+      {
+         el.className += " " + c;
+      }
+   }
+   
+   Admin.removeClass = function removeClass(el, c)
+   {
+      var clazzes = el.className.split(" ");
+      for (var i = 0; i < clazzes.length; i++)
+      {
+         if (clazzes[i] === c)
+         {
+            clazzes.splice(i, 1);
+            break;
+         }
+      }
+      el.className = clazzes.join(" ");
+   }
+   
+   /**
+    * Add a row to an existing table
+    * 
+    * @param table {Element}  The table DOM element
+    * @param row   {Array}    Array of cell data to add
+    * @param index {Integer}  Index to insert at - default is add to end
+    */
+   Admin.addTableRow = function addTableRow(table, row, index)
+   {
+      var tr = table.insertRow(index !== undefined ? index : -1);
+      for (var i=0, td; i<row.length; i++)
+      {
+         td = tr.insertCell(-1);
+         td.innerHTML = row[i];
+      }
+   }
+   
+   /**
+    * Show the contents of a URL in a dialog styled IFrame
+    * 
+    * @param url  {String} URL in the same domain to display in the dialog frame
+    */
+   Admin.showDialog = function showDialog(url, compact)
+   {
+      if (!_dialog)
+      {
+         // generate IFrame for the dialog contents
+         var iframe = document.createElement('iframe');
+         iframe.name = iframe.id = 'admin-dialog';
+         iframe.src = url;
+         iframe.frameBorder = 0;
+         iframe.className = (compact? 'dialog compact' : 'dialog');
+         _dialog = iframe;
+         
+         // generate a shield over the background elements
+         var shield = document.createElement('div');
+         shield.id = "shield";
+         shield.className = 'shield';
+         
+         // display the elements and hide background scrollbars
+         document.body.appendChild(shield);
+         document.body.appendChild(iframe);
+         document.body.style.overflow = 'hidden';
+         
+         // scroll to top and record last Y scroll position
+         _dialogScrollPosition = window.pageYOffset;
+         window.scrollTo(0,0);
+      }
+   }
+   
+   /**
+    * Remove any existing dialog frame and restore background elements
+    */
+   Admin.removeDialog = function removeDialog(state, args)
+   {
+      if (_dialog)
+      {
+         // remove the dialog IFrame and shield from the DOM
+         _dialog.parentNode.removeChild(_dialog);
+         var shield = el("shield");
+         shield.parentNode.removeChild(shield);
+         
+         // restore background scrollbars
+         document.body.style.overflow = "";
+         
+         // scroll back
+         window.scrollTo(0, _dialogScrollPosition);
+         
+         _dialog = null;
+         
+         if (state)
+         {
+            switch (state)
+            {
+               case "saved":
+                  Admin.ondialogFinished(args);
+                  break;
+            }
+         }
+      }
+   }
+   
+   /**
+    * Default ondialogFinished event handler with empty impl.
+    * Dialog templates can override this to add additional processing.
+    */
+   Admin.ondialogFinished = function ondialogFinished(args)
+   {
+   }
+   
+   /**
+    * Ajax request helper
+    * 
+    * @param config  {Object} Of the form:
+    *                {
+    *                   method: "GET|POST|PUT|DELETE",
+    *                   url: "endpointurl",
+    *                   data: {object to be posted},
+    *                   requestContentType: "application/json",
+    *                   responseContentType: "application/json",
+    *                   fnSuccess: successHandler(response),
+    *                   fnFailure: failureHandler(response)
+    *                }
+    */
+   Admin.request = function request(config)
+   {
+      var req = new XMLHttpRequest();
+      var data = config.data || {};
+      if (req.overrideMimeType) req.overrideMimeType((config.responseContentType ? config.responseContentType : "application/json") + "; charset=utf-8");
+      req.open(config.method ? config.method : "GET", config.url);
+      if ((config.method === "POST" || config.method === "PUT") && Admin.CSRF.enabled) {
+         req.setRequestHeader(Admin.CSRF.getHeader(), Admin.CSRFToken());
+      }
+      req.setRequestHeader("Accept", config.requestContentType ? config.requestContentType : "application/json");
+      req.onreadystatechange = function() {
+         if (req.readyState === 4)
+         {
+            if (req.status === 200)
+            {
+               // success - call handler
+               if (config.fnSuccess)
+               {
+                  var json;
+                  try
+                  {
+                     json = !config.responseContentType || config.responseContentType === "application/json" ? JSON.parse(req.responseText) : null;
+                  }
+                  catch (e)
+                  {
+                     // Developer JSON response error (e.g. malformed response text)
+                     alert(e + "\n" + req.status + "\n" + req.responseText);
+                  }
+                  config.fnSuccess.call(this, {
+                     responseText: req.responseText,
+                     responseStatus: req.status,
+                     responseJSON: json
+                  });
+               }
+            }
+            else
+            {
+               // failure - call handler
+               if (config.fnFailure)
+               {
+                  config.fnFailure.call(this, {
+                     responseText: req.responseText,
+                     responseStatus: req.status
+                  });
+               }
+               else
+               {
+                  // default error handler
+                  alert("${msg("admin-console.requesterror")}\n\n" + req.responseText + "\n\n" + req.responseStatus);
+               }
+            }
+         }
+      };
+      if (config.method === "POST" || config.method === "PUT")
+      {
+         // TODO: support form url encoded
+         req.send(JSON.stringify(data));
+      }
+      else
+      {
+         req.send(null);
+      }
+   }
+   
+   /**
+    * Perform binary file upload to a given service URL. Uses hidden iframe technique to give
+    * an Ajax like upload with support for earlier browser APIs.
+    * 
+    * @param fileId  ID of the File element to POST
+    * @param url     URL of the service endpoint
+    * @param successHandler   Success handler function - passed JSON object response as argument
+    * @param failureHandler   Failure handler function - no arguments
+    */
+   Admin.uploadFile = function uploadFile(fileId, url, successHandler, failureHandler)
+   {
+      var file = el(fileId),
+          ownerDocument = file.ownerDocument,
+          pwindow = ownerDocument.defaultView || ownerDocument.parentWindow,
+          iframe = ownerDocument.createElement("iframe");
+      iframe.style.display = "none";
+      iframe.name = "AdminUploadFrame";
+      iframe.id = iframe.name;
+      ownerDocument.body.appendChild(iframe);
+      
+      // target the frame properly in IE
+      pwindow.frames[iframe.name].name = iframe.name;
+      
+      Admin.addEventListener(iframe, 'load', function() {
+         var frame = document.getElementById(iframe.name);
+         if (frame.contentDocument)
+         {
+            content = frame.contentDocument.body.textContent;
+         }
+         else if (frame.contentWindow)
+         {
+            content = frame.contentWindow.document.body.textContent;
+         }
+         try
+         {
+            if (successHandler)
+            {
+               var json = JSON.parse(content);
+               successHandler.call(this, json);
+            }
+         }
+         catch (e)
+         {
+            if (failureHandler)
+            {
+               failureHandler.call(this);
+            }
+         }
+      });
+      
+      var form = ownerDocument.createElement("form");
+      ownerDocument.body.appendChild(form);
+      form.style.display = "none";
+      form.method = "post";
+      form.encoding = "multipart/form-data";
+      form.enctype = "multipart/form-data";
+      form.target = iframe.name;
+      form.action = url;
+      if (Admin.CSRF.enabled) {
+         form.action += "?" + Admin.CSRF.getParameter() + "=" + encodeURIComponent(Admin.CSRFToken());
+      }
+      form.appendChild(file);
+      form.submit();
+   }
+   
+   /**
+    * Switch an input field between test and password to show and hide the text.
+    * 
+    * @param id      {String} ID of the password field
+    * @param button  {Element} The button that was clicked
+    */
+   Admin.togglePassword = function togglePassword(id, button)
+   {
+      var field = el(id);
+      
+      if(field.type === "password")
+      {
+         button.value = "${msg("admin-console.password.hide")?html}";
+         field.type = "text";
+      }
+      else
+      {
+         button.value = "${msg("admin-console.password.show")?html}";
+         field.type = "password";
+      }
+   }
+   
+})();
+
+/* Page load handler */
+Admin.addEventListener(window, 'load', function() {
+   // get the root form element
+   var form = el("${FORM_ID}");
+   
+   // add CSRF token if enabled
+   if (Admin.CSRF.enabled) {
+      var url = form.attributes.action.value;
+      url += (url.lastIndexOf('?') === -1 ? "?" : "&") + Admin.CSRF.getParameter() + "=" + encodeURIComponent(Admin.CSRFToken());
+      form.attributes.action.value = url;
+   }
+   
+   // ensure ENTER press in a Form field doesn't submit the Form
+   Admin.addEventListener(form, 'keypress', function(e) {
+      if (e.keyCode === 13)
+      {
+         e.preventDefault ? e.preventDefault() : event.returnValue = false;
+      }
+      return true;
+   });
+   
+   // highlight first form input field
+   var fields = form.getElementsByTagName("input");
+   for (var i=0; i<fields.length; i++)
+   {
+      if (fields[i].type === "text" || fields[i].type === "textarea")
+      {
+         if (!fields[i].readOnly)
+         {
+            fields[i].focus();
+            break;
+         }
+      }
+   }
+   
+   // escape key handler to close dialog page
+   Admin.addEventListener(document, 'keypress', function(e) {
+      if (e.keyCode === 27)
+      {
+         top.window.Admin.removeDialog();
+      }
+   });
+});
+
+//]]></script>
+</head>
+<#if !dialog>
+<body>
+   <#--
+       Template for a full page view
+   -->
+   <div class="sticky-wrapper">
+      
+      <div class="header">
+         <span><a href="${url.serviceContext}${DEFAULT_CONTROLLER!"/admin"}">${msg("admin-console.header")}</a></span><#if metadata??><span class="meta">${HOSTNAME}</span><span class="meta">${HOSTADDR}</span></#if>
+         <div style="float:right"><a href="${msg("admin-console.help-link", docsEdition)}" target="_blank">${msg("admin-console.help")}</a></div>
+      </div>
+      
+      <div class="navigation-wrapper">
+         
+         <div class="navigation">
+            <#-- A console tool is defined as a member of the 'AdminConsole' WebScript family -->
+<#local tool=""/>
+<#if tools??>
+            <ul>
+   <#list tools as group>
+      <#list group as tool>
+         <#if tool_index = 0 && tool.group != ""></ul><h3>${tool.groupLabel}</h3><ul></#if>
+               <li class="<#if tool.selected><#local tool=tool.uri/>selected</#if>"><a href="${url.serviceContext}${tool.uri}" class="tool-link" title="${tool.description?html}">${tool.label?html}</a></li>
+      </#list>
+   </#list>
+</#if>
+            </ul>
+         </div>
+         
+         <div class="main-wrapper">
+         
+            <div class="title">
+               <span class="logo"><img src="${url.context}/images/logo/logo.png" width="145" height="48" alt="" /></span>
+               <span class="logo-separator">&nbsp;</span>
+               <h1>${title?html}</h1>
+            </div>
+<#-- User information messages -->
+<#if args.m??>
+            <div class="message">
+               ${.now?string("HH:mm:ss")} - ${msg(args.m)?html}
+               <a href="#" onclick="this.parentElement.style.display='none';" title="${msg("admin-console.close")}">[X]</a>
+            </div>
+</#if>
+<#if args.e??>
+            <div class="message error">
+               ${.now?string("HH:mm:ss")} - ${msg(args.e)?html}
+               <a href="#" onclick="this.parentElement.style.display='none';" title="${msg("admin-console.close")}">[X]</a>
+            </div>
+</#if>
+            <div class="main">
+               <form id="${FORM_ID}" action="${url.serviceContext}${controller}?t=${tool?url}<#if params!="">&${params}</#if>" enctype="multipart/form-data" accept-charset="utf-8" method="post">
+<#-- Template-specific markup -->
+<#nested>
+
+<#if !readonly>
+                  <div class="submission buttons">
+                     <input type="submit" value="${msg("admin-console.save")}" />
+                     <input class="cancel" type="button" value="${msg("admin-console.cancel")}" onclick="location.href='${url.service}'" />
+                  </div>
+</#if>
+               </form>
+            </div>
+            
+         </div>
+      
+      </div>
+      
+      <div class="push"></div>
+      
+   </div>
+   
+   <div class="footer">
+      Alfresco Software, Inc. &copy; 2005-${.now?string('yyyy')} All rights reserved.
+   </div>
+   
+<#else>
+<body class="dialog-body">
+   <#--
+       Template for a dialog page view
+   -->
+   <div>
+      
+      <div class="navigation-wrapper">
+         
+         <div>
+         
+            <div class="title">
+               <span class="logo"><img src="${url.context}/images/logo/logo.png" width="145" height="48" alt="" /></span>
+               <span class="logo-separator">&nbsp;</span>
+               <h1>${title?html}</h1>
+            </div>
+            <div class="main">
+               <form id="${FORM_ID}" action="${url.serviceContext}/enterprise/admin/admin-dialog<#if params!="">&${params}</#if>" enctype="multipart/form-data" accept-charset="utf-8" method="post">
+<#-- Template-specific markup -->
+<#nested>
+               </form>
+            </div>
+            
+         </div>
+      
+      </div>
+      
+   </div>
+</#if>
+</body>
+</html>
+</#macro>
+
+<#macro dialogbuttons save=false close=true>
+   <div class="buttons">
+<#-- Template-specific markup -->
+<#nested>
+      <#if save><input type="submit" value="${msg("admin-console.save")}" /></#if>
+      <#if close><input class="cancel" type="button" value="${msg("admin-console.close")}" onclick="top.window.Admin.removeDialog();" /></#if>
+   </div>
+</#macro>
+
+<#--
+   Template section macros.
+-->
+<#macro section label>
+   <h2>${label?html}</h2>
+   <div class="section">
+<#nested>
+   </div>
+</#macro>
+<#macro tsection label closed=true>
+   <div>
+      <h2>${label?html} <a class="action toggler" href="#" onclick="Admin.sectionToggle(this);return false;"><#if closed>&#x25BA;<#else>&#x25BC;</#if></a></h2>
+      <div class="section">
+         <div class="toggle <#if closed>hidden</#if>">
+<#nested>
+         </div>
+      </div>
+   </div>
+</#macro>
+
+<#--
+   Template field macros and value conversion.
+-->
+<#function cvalue type value="">
+   <#switch type>
+      <#case "java.util.Date">
+         <#if value?has_content>
+            <#return value?datetime>
+         <#else>
+            <#return value>
+         </#if>
+         <#break>
+      <#case "boolean">
+         <#return value?string>
+         <#break>
+      <#case "java.lang.Long">
+         <#return value>
+         <#break>
+      <#default>
+         <#return value>
+   </#switch>
+</#function>
+
+<#macro control attribute>
+   <#if attribute.readonly>
+      <@attrfield attribute=attribute />
+   <#else>
+      <#switch attribute.type>
+         <#case "java.util.Date">
+            <@attrtext attribute=attribute />
+            <#break>
+         <#case "boolean">
+            <@attrcheckbox attribute=attribute />
+            <#break>
+         <#case "java.lang.Long">
+            <@attrtext attribute=attribute />
+            <#break>
+         <#default>
+            <@attrtext attribute=attribute />
+      </#switch>
+   </#if>
+</#macro>
+
+<#-- Hidden field -->
+<#macro hidden name value="" id="">
+   <input type="hidden" <#if id?has_content>id="${id?html}"</#if> name="${name?html}" value="${value?html}" />
+</#macro>
+<#macro attrhidden attribute name=attribute.qname id="">
+   <@hidden name=name value=cvalue(attribute.type, attribute.value) id=id />
+</#macro>
+
+<#-- Label and simple read-only field -->
+<#macro field label="" description="" value="" style="">
+   <div class="control field"<#if style?has_content> style="${style?html}"</#if>>
+      <#if label?has_content><span class="label">${label?html}:</span></#if>
+      <#if value?has_content><span class="value">${value?html}</span></#if>
+      <#if description?has_content><span class="description">${description?html}</span></#if>
+      <#nested>
+   </div>
+</#macro>
+<#macro attrfield attribute label=attribute.name description="" style="">
+   <@field label=label description=description value=cvalue(attribute.type, attribute.value) style=style>
+      <#nested>
+   </@field>
+</#macro>
+
+<#-- Label and text input field -->
+<#macro text name label="" description="" value="" maxlength=255 id="" style="" controlStyle="" valueStyle="" placeholder="" escape=true>
+   <div class="control text"<#if style?has_content> style="${style?html}"</#if>>
+      <#if label?has_content><span class="label">${label?html}:</span></#if>
+      <span class="value"<#if valueStyle?has_content> style="${valueStyle?html}"</#if>><input <#if id?has_content>id="${id?html}"</#if> name="${name?html}" value="${value?html}" maxlength="${maxlength?c}" tabindex="0" <#if placeholder?has_content>placeholder="${placeholder?html}"</#if> <#if controlStyle?has_content>style="${controlStyle?html}"</#if>/></span>
+      <#if description?has_content><span class="description"><#if escape>${description?html}<#else>${description}</#if></span></#if>
+   </div>
+</#macro>
+<#macro attrtext attribute label=attribute.name description="" maxlength=255 id="" style="" controlStyle="" valueStyle="" placeholder="" escape=true>
+   <@text name=attribute.qname label=label description=description value=cvalue(attribute.type, attribute.value) maxlength=maxlength id=id style=style controlStyle=controlStyle valueStyle=valueStyle placeholder=placeholder escape=escape />
+</#macro>
+
+<#-- Label and password input field -->
+<#macro password id name label="" description="" value="" maxlength=255 style="" controlStyle="" visibilitytoggle=false>
+   <div class="control text password"<#if style?has_content> style="${style?html}"</#if>>
+      <#if label?has_content><span class="label">${label?html}:</span></#if>
+      <span class="value"><input id="${id?html}" name="${name?html}" value="${value?html}" maxlength="${maxlength?c}" type="password" tabindex="0" <#if controlStyle?has_content>style="${controlStyle?html}"</#if>/></span>
+      <#if visibilitytoggle><@button label=msg("admin-console.password.show")?html onclick="Admin.togglePassword('${id?html}', this);" /></#if>
+      <#if description?has_content><span class="description">${description?html}</span></#if>
+   </div>
+</#macro>
+<#macro attrpassword attribute label=attribute.name id=attribute.qname description="" maxlength=255 style="" controlStyle="" visibilitytoggle=false populatevalue=false>
+   <#if populatevalue>
+   <@password name=attribute.qname label=label id=id description=description value=cvalue(attribute.type, attribute.value) maxlength=maxlength style=style controlStyle=controlStyle visibilitytoggle=visibilitytoggle />
+   <#else>
+   <@password name=attribute.qname label=label id=id description=description maxlength=maxlength style=style controlStyle=controlStyle visibilitytoggle=visibilitytoggle />
+   </#if>
+</#macro>
+
+<#-- Label and text area field -->
+<#macro textarea name label="" description="" value="" maxlength=255 id="" style="" controlStyle="">
+   <div class="control textarea"<#if style?has_content> style="${style?html}"</#if>>
+      <#if label?has_content><span class="label">${label?html}:</span></#if>
+      <span class="value"><textarea <#if id?has_content>id="${id?html}"</#if> name="${name?html}" maxlength="${maxlength?c}" tabindex="0" <#if controlStyle?has_content>style="${controlStyle?html}"</#if>>${value?html}</textarea></span>
+      <#if description?has_content><span class="description">${description?html}</span></#if>
+   </div>
+</#macro>
+<#macro attrtextarea attribute label=attribute.name description="" maxlength=255 id="" style="" controlStyle="">
+   <@textarea name=attribute.qname label=label description=description value=cvalue(attribute.type, attribute.value) maxlength=maxlength id=id style=style controlStyle=controlStyle />
+</#macro>
+
+<#-- Label and checkbox boolean field -->
+<#macro checkbox name label description="" value="false" id="" style="" controlStyle="">
+   <div class="control checkbox"<#if style?has_content> style="${style?html}"</#if>>
+      <span class="label">${label?html}:</span>
+      <span class="value">
+         <input <#if id?has_content>id="${id?html}"</#if> name="" onchange="el('${name?html}').value = (this.checked ? 'true' : 'false');" type="checkbox" <#if value="true">checked="checked"</#if> tabindex="0" <#if controlStyle?has_content>style="${controlStyle?html}"</#if>/>
+         <input id="${name?html}" name="${name?html}" type="hidden" value="<#if value="true">true<#else>false</#if>" />
+      </span>
+      <#if description?has_content><span class="description">${description?html}</span></#if>
+      <#nested>
+   </div>
+</#macro>
+<#macro attrcheckbox attribute label=attribute.name description="" id="" style="" controlStyle="">
+   <@checkbox name=attribute.qname label=label description=description value=cvalue(attribute.type, attribute.value) id=id style=style controlStyle=controlStyle>
+   <#nested>
+   </@checkbox>
+</#macro>
+
+<#-- Status read-only boolean field -->
+<#macro status label description="" value="false" style="">
+   <#if value != "">
+      <#if value="true"><#local tooltip=msg("admin-console.enabled")?html><#else><#local tooltip=msg("admin-console.disabled")?html></#if>
+      <div class="control status"<#if style?has_content> style="${style?html}"</#if>>
+         <span class="label">${label?html}:</span>
+         <span class="value">
+            <img src="${url.context}/admin/images/<#if value="true">enabled<#else>disabled</#if>.gif" width="16" height="16" alt="${tooltip}" title="${tooltip}" />
+            <span>${tooltip}</span>
+         </span>
+         <#if description?has_content><span class="description">${description?html}</span></#if>
+      </div>
+   <#else>
+      <div class="control status"<#if style?has_content> style="${style?html}"</#if>>
+         <span class="label">${label?html}:</span>
+         <span class="value">
+            <span>${msg("admin-console.unavailable")}</span>
+         </span>
+         <#if description?has_content><span class="description">${description?html}</span></#if>
+      </div>
+   </#if>
+</#macro>
+<#macro attrstatus attribute="" label=attribute.name description="" style="">
+   <#-- Special handling for missing attribute - as some JMX objects can be temporarily unavailable -->
+   <#if attribute?has_content>
+      <@status label=label description=description value=cvalue(attribute.type, attribute.value) style=style />
+   <#else>
+      <@status label=label description=description value="" style=style />
+   </#if>
+</#macro>
+
+<#-- Label and Options Drop-Down list -->
+<#macro options name label="" description="" value="" id="" style="" valueStyle="" onchange="" onclick="" escape=true>
+   <div class="control options"<#if style?has_content> style="${style?html}"</#if>>
+      <#if label?has_content><span class="label">${label?html}:</span></#if>
+      <span class="value"<#if valueStyle?has_content> style="${valueStyle?html}"</#if>>
+         <select <#if id?has_content>id="${id?html}"</#if> name="${name?html}" tabindex="0"<#if onchange?has_content> onchange="${onchange?html}"</#if><#if onclick?has_content> onclick="${onclick?html}"</#if>>
+<#assign _value=value>
+<#nested>
+         </select>
+      </span>
+      <#if description?has_content><span class="description"><#if escape>${description?html}<#else>${description}</#if></span></#if>
+   </div>
+</#macro>
+<#macro option label value>
+            <option value="${value?html}" <#if value=_value>selected="selected"</#if>>${label?html}</option>
+</#macro>
+<#macro attroptions attribute label=attribute.name description="" id="" style="" valueStyle="" onchange="" escape=true>
+   <@options name=attribute.qname label=label description=description value=cvalue(attribute.type, attribute.value) id=id style=style valueStyle="" onchange="" escape=escape>
+      <#nested>
+   </@options>
+</#macro>
+
+<#-- Label and Radio Button list -->
+<#macro radios name label="" description="" value="" style="">
+   <div class="control radio"<#if style?has_content> style="${style?html}"</#if>>
+      <#if label?has_content><span class="label">${label?html}:</span></#if>
+      <span class="value">
+<#assign _name=name>
+<#assign _value=value>
+<#nested>
+      </span>
+      <#if description?has_content><span class="description">${description?html}</span></#if>
+   </div>
+</#macro>
+<#macro radio label value id="">
+         <div class="radiovalue">
+            <input <#if id?has_content>id="${id?html}"</#if> type="radio" name="${_name?html}" value="${value?html}" <#if value=_value>checked="checked"</#if> tabindex="0" />
+            <span class="radiolabel">${label?html}</span>
+         </div>
+</#macro>
+
+<#-- Ordered and Unordered list of values -->
+<#macro list listtype label="" description="" value="" style="">
+   <div class="control list"<#if style?has_content> style="${style?html}"</#if>>
+      <#if label?has_content><span class="label">${label?html}:</span></#if>
+      <${listtype?html}>
+   <#list value?split(",") as x>
+         <li>${x?html}</li>
+   </#list>
+      </${listtype?html}>
+      <#if description?has_content><span class="description">${description?html}</span></#if>
+   </div>
+</#macro>
+<#macro ulist label="" description="" value="" style="">
+   <@list listtype="ul" label=label description=description value=value style=style />
+</#macro>
+<#macro olist label="" description="" value="" style="">
+   <@list listtype="ol" label=label description=description value=value style=style />
+</#macro>
+<#macro attrulist attribute label=attribute.name description="" style="">
+   <@ulist label=label description=description value=cvalue(attribute.type, attribute.value) style=style />
+</#macro>
+<#macro attrolist attribute label=attribute.name description="" style="">
+   <@olist label=label description=description value=cvalue(attribute.type, attribute.value) style=style />
+</#macro>
+
+<#-- Simple button with JavaScript event handler -->
+<#macro button label description="" onclick="" style="" id="" class="" disabled="false">
+   <input class="<#if class?has_content>${class?html}<#else>inline</#if>" <#if id?has_content>id="${id?html}"</#if> <#if style?has_content>style="${style?html}"</#if> type="button" value="${label?html}" onclick="${onclick?html}" <#if disabled="true">disabled="true"</#if> />
+   <#if description?has_content><span class="description">${description?html}</span></#if>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get.desc.xml
new file mode 100644
index 00000000000..87dc7901ba7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+   <shortname>Admin Console - Repo Model and Messages Admin Console</shortname>
+   <description><![CDATA[Admin Console WebScript that displays the Repo Model and Messages Console.]]></description>
+   <url>/admin/admin-repoconsole</url>
+   <family>AdminConsole</family>
+   <format default="html">argument</format>
+   <authentication>admin</authentication>
+   <lifecycle>internal</lifecycle>
+   <transaction allow="readonly">required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get.html.ftl
new file mode 100644
index 00000000000..b320c0cd69d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get.html.ftl
@@ -0,0 +1,35 @@
+<#include "../admin-template.ftl" />
+
+<@page title=msg("repoconsole.title") controller="/admin/admin-repoconsole" readonly=true>
+   
+   <div class="column-full">
+      <@section label=msg("repoconsole.command") />
+      <@text id="cmd" name="repo-cmd" label="" description="${cmd.description}" value="" controlStyle="width:55em" escape=false />
+      <@button label=msg("repoconsole.execute") onclick="AdminConsole_execute()" style="" />
+   </div>
+   
+   <div class="column-full">
+      <@section label=msg("repoconsole.result") />
+      <pre>${cmd.output?html}</pre>
+   </div>
+   
+   <script type="text/javascript">//<![CDATA[
+
+/* Page load handler */
+Admin.addEventListener(window, 'load', function() {
+   // bind Enter key press to call the Add button event handler
+   Admin.addEventListener(el("cmd"), 'keypress', function(e) {
+      if (e.keyCode === 13) AdminConsole_execute();
+      return true;
+   });
+});
+
+function AdminConsole_execute()
+{
+   el("${FORM_ID}").submit();
+   return false;
+}
+
+//]]></script>
+
+</@page>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get.js
new file mode 100644
index 00000000000..83b03eb16e6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get.js
@@ -0,0 +1,24 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/admin/admin-common.lib.js">
+
+/**
+ * Repository Admin Console
+ * 
+ * Repo Admin Console GET method
+ */
+
+function main()
+{
+   model.attributes = [];
+   
+   // cmd info
+   model.cmd = {
+      description: "Last command: " + Admin.encodeHtml(repoInterpreter.command) + "<br>" + "Duration: " + repoInterpreter.duration + "ms",
+      output: repoInterpreter.result
+   };
+   
+   // mandatory model values for UI
+   model.tools = Admin.getConsoleTools("admin-repoconsole");
+   model.metadata = Admin.getServerMetaData();
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get.properties
new file mode 100644
index 00000000000..c0d3e0d4dfe
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get.properties
@@ -0,0 +1,4 @@
+repoconsole.title=Model and Messages Console
+repoconsole.command=Command (type 'help' for help)
+repoconsole.execute=Execute
+repoconsole.result=Result
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_cs.properties
new file mode 100644
index 00000000000..8cf37ee5d59
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_cs.properties
@@ -0,0 +1,4 @@
+repoconsole.title=Konzole pro modely a\u00a0zpr\u00e1vy
+repoconsole.command=P\u0159\u00edkaz (p\u0159\u00edkaz \u201ehelp\u201c otev\u0159e n\u00e1pov\u011bdu)
+repoconsole.execute=Prov\u00e9st
+repoconsole.result=V\u00fdsledek
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_da.properties
new file mode 100644
index 00000000000..53f72fb51e3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_da.properties
@@ -0,0 +1,4 @@
+repoconsole.title=Model- og meddelelseskonsol
+repoconsole.command=Kommando (f.eks. 'help' for hj\u00e6lp)
+repoconsole.execute=Udf\u00f8r
+repoconsole.result=Resultater
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_de.properties
new file mode 100644
index 00000000000..9a78364a736
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_de.properties
@@ -0,0 +1,4 @@
+repoconsole.title=Modell- und Nachrichtenkonsole
+repoconsole.command=Befehl (geben Sie 'help' ein, um die Hilfe aufzurufen)
+repoconsole.execute=Ausf\u00fchren
+repoconsole.result=Ergebnis
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_es.properties
new file mode 100644
index 00000000000..ad134127491
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_es.properties
@@ -0,0 +1,4 @@
+repoconsole.title=Consola de mensajes y modelo
+repoconsole.command=Comando (escriba 'help' para obtener ayuda)
+repoconsole.execute=Ejecutar
+repoconsole.result=Resultado
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_fi.properties
new file mode 100644
index 00000000000..f6f66b4ccfc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_fi.properties
@@ -0,0 +1,4 @@
+repoconsole.title=Malli- ja viestikonsoli
+repoconsole.command=Komento (saat ohjeita kirjoittamalla help)
+repoconsole.execute=Suorita
+repoconsole.result=Tulos
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_fr.properties
new file mode 100644
index 00000000000..1da775fc033
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_fr.properties
@@ -0,0 +1,4 @@
+repoconsole.title=Console des mod\u00e8les et messages
+repoconsole.command=Commande (saisissez 'help' pour obtenir de l'aide)
+repoconsole.execute=Ex\u00e9cuter
+repoconsole.result=R\u00e9sultat
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_it.properties
new file mode 100644
index 00000000000..236ffbbfad1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_it.properties
@@ -0,0 +1,4 @@
+repoconsole.title=Console di modelli e messaggi
+repoconsole.command=Comando (digita "help" per la guida)
+repoconsole.execute=Esegui
+repoconsole.result=Risultato
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_ja.properties
new file mode 100644
index 00000000000..2cd4739cdb9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_ja.properties
@@ -0,0 +1,4 @@
+repoconsole.title=\u30e2\u30c7\u30eb\u3068\u30e1\u30c3\u30bb\u30fc\u30b8\u30b3\u30f3\u30bd\u30fc\u30eb
+repoconsole.command=\u30b3\u30de\u30f3\u30c9 (\u30d8\u30eb\u30d7\u3092\u8868\u793a\u3059\u308b\u306b\u306f\u300chelp\u300d\u3068\u5165\u529b\u3057\u307e\u3059)
+repoconsole.execute=\u5b9f\u884c
+repoconsole.result=\u7d50\u679c
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_nb.properties
new file mode 100644
index 00000000000..9e51c02762f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_nb.properties
@@ -0,0 +1,4 @@
+repoconsole.title=Modell- og meldingskonsoll
+repoconsole.command=Kommando (skriv 'help' for hjelp)
+repoconsole.execute=Kj\u00f8r
+repoconsole.result=Resultat
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_nl.properties
new file mode 100644
index 00000000000..1250e8fcea0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_nl.properties
@@ -0,0 +1,4 @@
+repoconsole.title=Model- en berichtenconsole
+repoconsole.command=Opdracht (typ 'help' voor hulp)
+repoconsole.execute=Uitvoeren
+repoconsole.result=Resultaat
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_pl.properties
new file mode 100644
index 00000000000..af86da56858
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_pl.properties
@@ -0,0 +1,4 @@
+repoconsole.title=Konsola modeli i komunikat\u00f3w
+repoconsole.command=Polecenie (wpisz 'help', aby wy\u015bwietli\u0107 pomoc)
+repoconsole.execute=Wykonaj
+repoconsole.result=Wynik
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_pt_BR.properties
new file mode 100644
index 00000000000..e243b5c7ac6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_pt_BR.properties
@@ -0,0 +1,4 @@
+repoconsole.title=Console de Modelo e Mensagens
+repoconsole.command=Comando (digite 'help' para ajuda)
+repoconsole.execute=Executar
+repoconsole.result=Resultado
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_ru.properties
new file mode 100644
index 00000000000..aabec248499
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_ru.properties
@@ -0,0 +1,4 @@
+repoconsole.title=\u041a\u043e\u043d\u0441\u043e\u043b\u044c \u043c\u043e\u0434\u0435\u043b\u0435\u0439 \u0438 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439
+repoconsole.command=\u041a\u043e\u043c\u0430\u043d\u0434\u0430 (\u0432\u0432\u0435\u0434\u0438\u0442\u0435 'help' \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u043f\u043e\u043c\u043e\u0449\u0438)
+repoconsole.execute=\u0412\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435
+repoconsole.result=\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_sv.properties
new file mode 100644
index 00000000000..a3ac55dc80e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_sv.properties
@@ -0,0 +1,4 @@
+repoconsole.title=Modell och meddelandekonsol
+repoconsole.command=Kommando (skriv 'help' f\u00f6r hj\u00e4lp)
+repoconsole.execute=Utf\u00f6r
+repoconsole.result=Resultat
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_zh_CN.properties
new file mode 100644
index 00000000000..198dd5cb0d7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.get_zh_CN.properties
@@ -0,0 +1,4 @@
+repoconsole.title=\u6a21\u578b\u548c\u6d88\u606f\u63a7\u5236\u53f0
+repoconsole.command=\u547d\u4ee4\uff08\u952e\u5165\u201chelp\u201d\u4ee5\u5bfb\u6c42\u5e2e\u52a9\uff09
+repoconsole.execute=\u6267\u884c
+repoconsole.result=\u7ed3\u679c
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.post.desc.xml
new file mode 100644
index 00000000000..142adf1b145
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.post.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+   <shortname>Admin Console - Repo Admin Console</shortname>
+   <description><![CDATA[Repo Admin Console POST method for executing commands.]]></description>
+   <url>/admin/admin-repoconsole</url>
+   <family>AdminConsoleHelper</family>
+   <format default="html">argument</format>
+   <authentication>admin</authentication>
+   <lifecycle>internal</lifecycle>
+   <transaction>required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.post.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.post.js
new file mode 100644
index 00000000000..37ec67e450d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-repoconsole.post.js
@@ -0,0 +1,20 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/admin/admin-common.lib.js">
+
+/**
+ * Repository Admin Console
+ * 
+ * Repo Console POST method
+ */
+function main()
+{
+   // execute supplied command
+   var cmd = args["repo-cmd"];
+   repoInterpreter.executeCmd(cmd);
+   
+   // generate the return URL
+   status.code = 301;
+   status.location = url.service;
+   status.redirect = true;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get.desc.xml
new file mode 100644
index 00000000000..a747d3aa4cd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+   <shortname>Admin Console - Tenant Admin Console</shortname>
+   <description><![CDATA[Admin Console WebScript that displays the Tenant Admin Console.]]></description>
+   <url>/admin/admin-tenantconsole</url>
+   <family>AdminConsole</family>
+   <format default="html">argument</format>
+   <authentication>admin</authentication>
+   <lifecycle>internal</lifecycle>
+   <transaction allow="readonly">required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get.html.ftl
new file mode 100644
index 00000000000..6de941895fb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get.html.ftl
@@ -0,0 +1,35 @@
+<#include "../admin-template.ftl" />
+
+<@page title=msg("tenantconsole.title") controller="/admin/admin-tenantconsole" readonly=true>
+   
+   <div class="column-full">
+      <@section label=msg("tenantconsole.command") />
+      <@text id="cmd" name="tenant-cmd" label="" description="${cmd.description}" value="" controlStyle="width:55em" escape=false />
+      <@button label=msg("tenantconsole.execute") onclick="AdminConsole_execute()" style="" />
+   </div>
+   
+   <div class="column-full">
+      <@section label=msg("tenantconsole.result") />
+      <pre>${cmd.output?html}</pre>
+   </div>
+   
+   <script type="text/javascript">//<![CDATA[
+
+/* Page load handler */
+Admin.addEventListener(window, 'load', function() {
+   // bind Enter key press to call the Add button event handler
+   Admin.addEventListener(el("cmd"), 'keypress', function(e) {
+      if (e.keyCode === 13) AdminConsole_execute();
+      return true;
+   });
+});
+
+function AdminConsole_execute()
+{
+   el("${FORM_ID}").submit();
+   return false;
+}
+
+//]]></script>
+
+</@page>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get.js
new file mode 100644
index 00000000000..0757cb16f27
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get.js
@@ -0,0 +1,24 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/admin/admin-common.lib.js">
+
+/**
+ * Repository Admin Console
+ * 
+ * Tenant Admin Console GET method
+ */
+
+function main()
+{
+   model.attributes = [];
+   
+   // cmd info
+   model.cmd = {
+      description: "Last command: " + Admin.encodeHtml(tenantInterpreter.command) + "<br>" + "Duration: " + tenantInterpreter.duration + "ms",
+      output: tenantInterpreter.result
+   };
+   
+   // mandatory model values for UI
+   model.tools = Admin.getConsoleTools("admin-tenantconsole");
+   model.metadata = Admin.getServerMetaData();
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get.properties
new file mode 100644
index 00000000000..eaa9226599b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=Tenant Admin Console
+tenantconsole.command=Command (type 'help' for help)
+tenantconsole.execute=Execute
+tenantconsole.result=Result
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_cs.properties
new file mode 100644
index 00000000000..3c495c61d52
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_cs.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=Konzole pro spr\u00e1vce tenanta
+tenantconsole.command=P\u0159\u00edkaz (p\u0159\u00edkaz \u201ehelp\u201c otev\u0159e n\u00e1pov\u011bdu)
+tenantconsole.execute=Prov\u00e9st
+tenantconsole.result=V\u00fdsledek
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_da.properties
new file mode 100644
index 00000000000..b20d49a206d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_da.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=Administratorkonsol for tenant
+tenantconsole.command=Kommando (f.eks. 'help' for hj\u00e6lp)
+tenantconsole.execute=Udf\u00f8r
+tenantconsole.result=Resultater
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_de.properties
new file mode 100644
index 00000000000..03b48495261
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_de.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=Mandanten-Administratorkonsole
+tenantconsole.command=Befehl (geben Sie 'help' ein, um die Hilfe aufzurufen)
+tenantconsole.execute=Ausf\u00fchren
+tenantconsole.result=Ergebnis
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_es.properties
new file mode 100644
index 00000000000..aed5798aa84
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_es.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=Consola Admin de Inquilino
+tenantconsole.command=Comando (escriba 'help' para obtener ayuda)
+tenantconsole.execute=Ejecutar
+tenantconsole.result=Resultado
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_fi.properties
new file mode 100644
index 00000000000..042f2c44dac
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_fi.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=Tilaajan hallintakonsoli
+tenantconsole.command=Komento (saat ohjeita kirjoittamalla help)
+tenantconsole.execute=Suorita
+tenantconsole.result=Tulos
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_fr.properties
new file mode 100644
index 00000000000..eedc40826db
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_fr.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=Console d'administration de la gestion des entrep\u00f4ts en colocation
+tenantconsole.command=Commande (saisissez 'help' pour obtenir de l'aide)
+tenantconsole.execute=Ex\u00e9cuter
+tenantconsole.result=R\u00e9sultat
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_it.properties
new file mode 100644
index 00000000000..cf2955cbe1c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_it.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=Console di amministrazione dei tenant
+tenantconsole.command=Comando (digita "help" per la guida)
+tenantconsole.execute=Esegui
+tenantconsole.result=Risultato
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_ja.properties
new file mode 100644
index 00000000000..72fb8a8578d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_ja.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=\u30c6\u30ca\u30f3\u30c8\u7ba1\u7406\u30b3\u30f3\u30bd\u30fc\u30eb
+tenantconsole.command=\u30b3\u30de\u30f3\u30c9 (\u30d8\u30eb\u30d7\u3092\u8868\u793a\u3059\u308b\u306b\u306f\u300chelp\u300d\u3068\u5165\u529b\u3057\u307e\u3059)
+tenantconsole.execute=\u5b9f\u884c
+tenantconsole.result=\u7d50\u679c
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_nb.properties
new file mode 100644
index 00000000000..842bc2ed5ee
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_nb.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=Leietakeradmin-konsoll
+tenantconsole.command=Kommando (skriv 'help' for hjelp)
+tenantconsole.execute=Kj\u00f8r
+tenantconsole.result=Resultat
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_nl.properties
new file mode 100644
index 00000000000..24ffd20b804
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_nl.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=Tenantbeheerconsole
+tenantconsole.command=Opdracht (typ 'help' voor hulp)
+tenantconsole.execute=Uitvoeren
+tenantconsole.result=Resultaat
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_pl.properties
new file mode 100644
index 00000000000..3990d04378a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_pl.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=Konsola administracyjna dzier\u017cawcy
+tenantconsole.command=Polecenie (wpisz 'help', aby wy\u015bwietli\u0107 pomoc)
+tenantconsole.execute=Wykonaj
+tenantconsole.result=Wynik
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_pt_BR.properties
new file mode 100644
index 00000000000..af623698f50
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_pt_BR.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=Console de Administra\u00e7\u00e3o do Tenant
+tenantconsole.command=Comando (digite 'help' para ajuda)
+tenantconsole.execute=Executar
+tenantconsole.result=Resultado
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_ru.properties
new file mode 100644
index 00000000000..8b1a914e9ab
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_ru.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=\u041a\u043e\u043d\u0441\u043e\u043b\u044c \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
+tenantconsole.command=\u041a\u043e\u043c\u0430\u043d\u0434\u0430 (\u0432\u0432\u0435\u0434\u0438\u0442\u0435 'help' \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u043f\u043e\u043c\u043e\u0449\u0438)
+tenantconsole.execute=\u0412\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435
+tenantconsole.result=\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_sv.properties
new file mode 100644
index 00000000000..e4b554e7e1b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_sv.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=Kund admin-konsol
+tenantconsole.command=Kommando (skriv 'help' f\u00f6r hj\u00e4lp)
+tenantconsole.execute=Utf\u00f6r
+tenantconsole.result=Resultat
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_zh_CN.properties
new file mode 100644
index 00000000000..7a45e69cf64
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.get_zh_CN.properties
@@ -0,0 +1,4 @@
+tenantconsole.title=\u79df\u6237\u7ba1\u7406\u63a7\u5236\u53f0
+tenantconsole.command=\u547d\u4ee4\uff08\u952e\u5165\u201chelp\u201d\u4ee5\u5bfb\u6c42\u5e2e\u52a9\uff09
+tenantconsole.execute=\u6267\u884c
+tenantconsole.result=\u7ed3\u679c
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.post.desc.xml
new file mode 100644
index 00000000000..c2606e3f60f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.post.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+   <shortname>Admin Console - Tenant Admin Console</shortname>
+   <description><![CDATA[Tenant Admin Console POST method for executing commands.]]></description>
+   <url>/admin/admin-tenantconsole</url>
+   <family>AdminConsoleHelper</family>
+   <format default="html">argument</format>
+   <authentication>admin</authentication>
+   <lifecycle>internal</lifecycle>
+   <transaction>required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.post.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.post.js
new file mode 100644
index 00000000000..9c050f09009
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-tenantconsole.post.js
@@ -0,0 +1,20 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/admin/admin-common.lib.js">
+
+/**
+ * Repository Admin Console
+ * 
+ * Tenant Console POST method
+ */
+function main()
+{
+   // execute supplied command
+   var cmd = args["tenant-cmd"];
+   tenantInterpreter.executeCmd(cmd);
+   
+   // generate the return URL
+   status.code = 301;
+   status.location = url.service;
+   status.redirect = true;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get.desc.xml
new file mode 100644
index 00000000000..93597d67482
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+   <shortname>Admin Console - Workflow Admin Console</shortname>
+   <description><![CDATA[Admin Console WebScript that displays the Workflow Admin Console.]]></description>
+   <url>/admin/admin-workflowconsole</url>
+   <family>AdminConsole</family>
+   <format default="html">argument</format>
+   <authentication>admin</authentication>
+   <lifecycle>internal</lifecycle>
+   <transaction allow="readonly">required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get.html.ftl
new file mode 100644
index 00000000000..6da258009ba
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get.html.ftl
@@ -0,0 +1,35 @@
+<#include "../admin-template.ftl" />
+
+<@page title=msg("workflowconsole.title") controller="/admin/admin-workflowconsole" readonly=true>
+   
+   <div class="column-full">
+      <@section label=msg("workflowconsole.command") />
+      <@text id="cmd" name="workflow-cmd" label="" description="${cmd.description}" value="" controlStyle="width:55em" escape=false />
+      <@button label=msg("workflowconsole.execute") onclick="AdminConsole_execute()" style="" />
+   </div>
+   
+   <div class="column-full">
+      <@section label=msg("workflowconsole.result") />
+      <pre>${cmd.output?html}</pre>
+   </div>
+   
+   <script type="text/javascript">//<![CDATA[
+
+/* Page load handler */
+Admin.addEventListener(window, 'load', function() {
+   // bind Enter key press to call the Add button event handler
+   Admin.addEventListener(el("cmd"), 'keypress', function(e) {
+      if (e.keyCode === 13) AdminConsole_execute();
+      return true;
+   });
+});
+
+function AdminConsole_execute()
+{
+   el("${FORM_ID}").submit();
+   return false;
+}
+
+//]]></script>
+
+</@page>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get.js
new file mode 100644
index 00000000000..fd6ed8524d7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get.js
@@ -0,0 +1,24 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/admin/admin-common.lib.js">
+
+/**
+ * Repository Admin Console
+ * 
+ * Workflow Admin Console GET method
+ */
+
+function main()
+{
+   model.attributes = [];
+   
+   // cmd info
+   model.cmd = {
+      description: "Last command: " + Admin.encodeHtml(workflowInterpreter.command) + "<br>" + "Duration: " + workflowInterpreter.duration + "ms",
+      output: workflowInterpreter.result
+   };
+   
+   // mandatory model values for UI
+   model.tools = Admin.getConsoleTools("admin-workflowconsole");
+   model.metadata = Admin.getServerMetaData();
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get.properties
new file mode 100644
index 00000000000..526720d1589
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=Workflow Admin Console
+workflowconsole.command=Command (type 'help' for help)
+workflowconsole.execute=Execute
+workflowconsole.result=Result
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_cs.properties
new file mode 100644
index 00000000000..b490fd2dac8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_cs.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=Konzole pro spr\u00e1vce pracovn\u00edch postup\u016f
+workflowconsole.command=P\u0159\u00edkaz (p\u0159\u00edkaz \u201ehelp\u201c otev\u0159e n\u00e1pov\u011bdu)
+workflowconsole.execute=Prov\u00e9st
+workflowconsole.result=V\u00fdsledek
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_da.properties
new file mode 100644
index 00000000000..687031c04e8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_da.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=Administrationskonsol for workflow
+workflowconsole.command=Kommando (f.eks. 'help' for hj\u00e6lp)
+workflowconsole.execute=Udf\u00f8r
+workflowconsole.result=Resultater
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_de.properties
new file mode 100644
index 00000000000..b80cce8da4a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_de.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=Workflow-Administratorkonsole
+workflowconsole.command=Befehl (geben Sie 'help' ein, um die Hilfe aufzurufen)
+workflowconsole.execute=Ausf\u00fchren
+workflowconsole.result=Ergebnis
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_es.properties
new file mode 100644
index 00000000000..73c81e48a2c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_es.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=Consola de administraci\u00f3n de flujos de trabajo
+workflowconsole.command=Comando (escriba 'help' para obtener ayuda)
+workflowconsole.execute=Ejecutar
+workflowconsole.result=Resultado
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_fi.properties
new file mode 100644
index 00000000000..5ee0d93903e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_fi.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=Ty\u00f6nkulkujen hallintakonsoli
+workflowconsole.command=Komento (saat ohjeita kirjoittamalla help)
+workflowconsole.execute=Suorita
+workflowconsole.result=Tulos
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_fr.properties
new file mode 100644
index 00000000000..6ade27dbcc0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_fr.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=Console d'administration du workflow
+workflowconsole.command=Commande (saisissez 'help' pour obtenir de l'aide)
+workflowconsole.execute=Ex\u00e9cuter
+workflowconsole.result=R\u00e9sultat
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_it.properties
new file mode 100644
index 00000000000..211956e57e1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_it.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=Console di amministrazione worflow
+workflowconsole.command=Comando (digita "help" per la guida)
+workflowconsole.execute=Esegui
+workflowconsole.result=Risultato
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_ja.properties
new file mode 100644
index 00000000000..d112c820261
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_ja.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u7ba1\u7406\u30b3\u30f3\u30bd\u30fc\u30eb
+workflowconsole.command=\u30b3\u30de\u30f3\u30c9 (\u30d8\u30eb\u30d7\u3092\u8868\u793a\u3059\u308b\u306b\u306f\u300chelp\u300d\u3068\u5165\u529b\u3057\u307e\u3059)
+workflowconsole.execute=\u5b9f\u884c
+workflowconsole.result=\u7d50\u679c
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_nb.properties
new file mode 100644
index 00000000000..c2b198fcf0d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_nb.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=Arbeidsflyt for admin-konsoll
+workflowconsole.command=Kommando (skriv 'help' for hjelp)
+workflowconsole.execute=Kj\u00f8r
+workflowconsole.result=Resultat
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_nl.properties
new file mode 100644
index 00000000000..dbc7f4f4b5c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_nl.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=Workflowbeheerconsole
+workflowconsole.command=Opdracht (typ 'help' voor hulp)
+workflowconsole.execute=Uitvoeren
+workflowconsole.result=Resultaat
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_pl.properties
new file mode 100644
index 00000000000..8c34a69e271
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_pl.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=Konsola administracyjna przep\u0142ywu roboczego
+workflowconsole.command=Polecenie (wpisz 'help', aby wy\u015bwietli\u0107 pomoc)
+workflowconsole.execute=Wykonaj
+workflowconsole.result=Wynik
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_pt_BR.properties
new file mode 100644
index 00000000000..11f5a9fd78a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_pt_BR.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=Console de Administra\u00e7\u00e3o do Fluxo de Trabalho
+workflowconsole.command=Comando (digite 'help' para ajuda)
+workflowconsole.execute=Executar
+workflowconsole.result=Resultado
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_ru.properties
new file mode 100644
index 00000000000..331eb13c9a6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_ru.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=\u041a\u043e\u043d\u0441\u043e\u043b\u044c \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430 \u043f\u043e\u0442\u043e\u043a\u0430 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439
+workflowconsole.command=\u041a\u043e\u043c\u0430\u043d\u0434\u0430 (\u0432\u0432\u0435\u0434\u0438\u0442\u0435 'help' \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u043f\u043e\u043c\u043e\u0449\u0438)
+workflowconsole.execute=\u0412\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435
+workflowconsole.result=\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_sv.properties
new file mode 100644
index 00000000000..3e55a1bfe73
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_sv.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=Arbetsfl\u00f6de admin-konsol
+workflowconsole.command=Kommando (skriv 'help' f\u00f6r hj\u00e4lp)
+workflowconsole.execute=Utf\u00f6r
+workflowconsole.result=Resultat
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_zh_CN.properties
new file mode 100644
index 00000000000..d96dc55d1eb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.get_zh_CN.properties
@@ -0,0 +1,4 @@
+workflowconsole.title=\u5de5\u4f5c\u6d41\u7a0b\u7ba1\u7406\u63a7\u5236\u53f0
+workflowconsole.command=\u547d\u4ee4\uff08\u952e\u5165\u201chelp\u201d\u4ee5\u5bfb\u6c42\u5e2e\u52a9\uff09
+workflowconsole.execute=\u6267\u884c
+workflowconsole.result=\u7ed3\u679c
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.post.desc.xml
new file mode 100644
index 00000000000..daf99c96f60
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.post.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+   <shortname>Admin Console - Workflow Admin Console</shortname>
+   <description><![CDATA[Workflow Admin Console POST method for executing commands.]]></description>
+   <url>/admin/admin-workflowconsole</url>
+   <family>AdminConsoleHelper</family>
+   <format default="html">argument</format>
+   <authentication>admin</authentication>
+   <lifecycle>internal</lifecycle>
+   <transaction>required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.post.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.post.js
new file mode 100644
index 00000000000..8485015af52
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/consoles/admin-workflowconsole.post.js
@@ -0,0 +1,20 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/admin/admin-common.lib.js">
+
+/**
+ * Repository Admin Console
+ * 
+ * Workflow Console POST method
+ */
+function main()
+{
+   // execute supplied command
+   var cmd = args["workflow-cmd"];
+   workflowInterpreter.executeCmd(cmd);
+   
+   // generate the return URL
+   status.code = 301;
+   status.location = url.service;
+   status.redirect = true;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/jmxdump.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/jmxdump.get.desc.xml
new file mode 100644
index 00000000000..39eceeb8098
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/jmxdump.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+   <shortname>JMX dump</shortname>
+   <description>
+      <![CDATA[Stream the JMX property dump as a .zip content file]]>
+   </description>
+   <url>/api/admin/jmxdump</url>
+   <family>AdminConsoleHelper</family>
+   <authentication>admin</authentication>
+   <transaction allow="readonly"/>
+   <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/restrictions.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/restrictions.get.desc.xml
new file mode 100644
index 00000000000..1bba60df3fb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/restrictions.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Alfresco repo restrictions</shortname>
+  <description>Get repository restrictions</description>
+  <url>/api/admin/restrictions</url>
+  <format default="json" />
+  <authentication>guest</authentication>
+  <transaction allow="readonly">required</transaction>
+  <family>Admin</family>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/restrictions.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/restrictions.get.json.ftl
new file mode 100644
index 00000000000..963be3f7a73
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/restrictions.get.json.ftl
@@ -0,0 +1,2 @@
+<#import "usage.lib.ftl" as usageLib />
+<@usageLib.usageJSON />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get.desc.xml
new file mode 100644
index 00000000000..6f843d85487
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+   <shortname>Admin Console - Node Browser</shortname>
+   <description><![CDATA[Admin Console WebScript that displays the Node Browser.]]></description>
+   <url>/admin/admin-nodebrowser</url>
+   <family>AdminConsole</family>
+   <format default="html">argument</format>
+   <authentication>admin</authentication>
+   <lifecycle>internal</lifecycle>
+   <transaction allow="readonly">required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get.html.ftl
new file mode 100644
index 00000000000..6ef2adfe952
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get.html.ftl
@@ -0,0 +1,315 @@
+<#assign null><span style="color:red">${msg("nodebrowser.null")?html}</span></#assign>
+<#assign none><span style="color:red">${msg("nodebrowser.none")?html}</span></#assign>
+<#assign collection>${msg("nodebrowser.collection")?html}</#assign>
+
+<#macro dateFormat date>${date?string("dd MMM yyyy HH:mm:ss 'GMT'Z '('zzz')'")}</#macro>
+<#macro propValue p>
+<#if p.value??>
+   <#if p.value?is_date>
+      <@dateFormat p.value />
+   <#elseif p.value?is_boolean>
+      ${p.value?string}
+   <#elseif p.value?is_number>
+      ${p.value?c}
+   <#elseif p.value?is_string>
+      ${p.value?html}
+   <#elseif p.value?is_hash>
+      <#assign result = "{"/>
+      <#assign first = true />
+      <#list p.value?keys as key>
+         <#if first = false>
+            <#assign result = result + ", "/>
+         </#if>
+         <#assign result = result + "${key}=${p.value[key]?html}" />
+         <#assign first = false/>
+      </#list>
+      <#assign result = result + "}"/>
+      ${result}
+   </#if>
+<#else>
+   ${null}
+</#if>
+</#macro>
+<#macro contentUrl nodeRef prop>
+${url.serviceContext}/api/node/${nodeRef?replace("://","/")}/content;${prop?url}
+</#macro>
+
+<#include "../admin-template.ftl" />
+
+<@page title=msg("nodebrowser.title") controller="/admin/admin-nodebrowser" readonly=true>
+   
+   <div class="column-full">
+      <@section label=msg("nodebrowser.store") />
+      <@options name="nodebrowser-store" style="display:inline" valueStyle="display:inline" onchange="AdminConsole_action('root')" value="${args.store!'workspace://SpacesStore'}">
+         <#list stores as s>
+            <@option label=s value=s />
+         </#list>
+      </@options>
+      <@button label=msg("nodebrowser.root") onclick="AdminConsole_action('root')" />
+      <#if action??><@button label=msg("nodebrowser.refresh") onclick="AdminConsole_action('${action?js_string?html}')" class="input" style="position:absolute;top:60px;left:1042px" /></#if>
+      
+      <@section label=msg("nodebrowser.query") />
+      <@options name="nodebrowser-search" style="display:inline" valueStyle="display:inline" value="${args.searcher!''}">
+         <@option label="noderef" value="noderef" />
+         <@option label="fts-alfresco" value="fts-alfresco" />
+         <@option label="lucene" value="lucene" />
+         <@option label="xpath" value="xpath" />
+         <@option label="selectnodes" value="selectnodes" />
+         <@option label="cmis-strict" value="cmis-strict" />
+         <@option label="cmis-alfresco" value="cmis-alfresco" />
+         <@option label="db-afts" value="db-afts" />
+         <@option label="db-cmis" value="db-cmis" />
+      </@options>
+      <@text id="query" name="nodebrowser-query" label="" value="${query!''}" style="display:inline" valueStyle="display:inline" controlStyle="width:50em" />
+      <@button label=msg("nodebrowser.execute") onclick="AdminConsole_action('search')" />
+      <@tsection label=msg("nodebrowser.search-settings")>
+         <div class="column-left">
+            <@text name="nodebrowser-query-maxresults" label=msg("nodebrowser.maxresults") value="${args.maxResults!''}" />
+         </div>
+         <div class="column-right">
+            <@text name="nodebrowser-query-skipcount" label=msg("nodebrowser.skipcount") value="${args.skipCount!''}" />
+         </div>
+      </@tsection>
+      
+      <!-- hidden values set by button and key events to provide action ID to the Form POST -->
+      <@hidden name="nodebrowser-action" id="action" />
+      <@hidden name="nodebrowser-action-value" id="action-value" value="${actionValue!''}" />
+      <@hidden name="nodebrowser-execute" id="execute" />
+      <@hidden name="nodebrowser-execute-value" id="execute-value" />
+   </div>
+   
+   <#if result??>
+   
+   <#if result.info??>
+   <div class="column-full">
+      <a name="parent"></a><a name="children"></a>
+      <@section label=msg("nodebrowser.node-info") />
+      <table id="info-table" class="node">
+         <tr><td class="node-info">${msg("nodebrowser.reference")}</td><td>${result.info.nodeRef}</td></tr>
+         <tr><td class="node-info">${msg("nodebrowser.path")}</td><td style="word-break:break-all">${result.info.path!""}</td></tr>
+         <tr><td class="node-info">${msg("nodebrowser.type")}</td><td>${result.info.type}</td></tr>
+         <tr><td class="node-info">${msg("nodebrowser.parent")}</td><td><a href="#" onclick="AdminConsole_parentClick('${result.info.parent}');return false;">${result.info.parent}</a></td></tr>
+      </table>
+   </div>
+   </#if>
+   
+   <#if result.properties??>
+   <div class="column-full">
+      <#assign propsMsg>${msg("nodebrowser.properties")} (<#if result.properties??>${result.properties?size?c}<#else>0</#if>)</#assign>
+      <@section label=propsMsg />
+      <table id="properties-table" class="node grid">
+         <tr>
+            <th>${msg("nodebrowser.name")}</th>
+            <th>${msg("nodebrowser.type")}</th>
+            <th>${msg("nodebrowser.value")}</th>
+            <th>${msg("nodebrowser.residual")}</th>
+            <th>${msg("nodebrowser.actions")}</th>
+         </tr>
+         <#list result.properties as p>
+         <tr>
+            <td>${p.name.prefixedName}</td>
+            <td><#if p.typeName??>${p.typeName.prefixedName}<#else>${none}</#if></td>
+            <td><#if (p.values?size > 1)><span style="color:red">${collection} (${p.values?size?c})</span><br></#if><#list p.values as v><#if v.content><a target="new" href="<@contentUrl result.info.nodeRef p.name.prefixedName/>"></#if><@propValue v/><#if v.content></a></#if><#if v_has_next><br></#if></#list></td>
+            <td>${p.residual?string}</td>
+            <td>
+               <b><a href="#" onclick="AdminConsole_confirmExecute('${result.info.nodeRef}|${p.name}','delete-property');return false;" title="${msg("nodebrowser.delete-property.tip")}">${msg("nodebrowser.delete")}</a></b>
+            </td>
+         </tr>
+         </#list>
+      </table>
+   </div>
+   </#if>
+   
+   <#if result.aspects??>
+   <div class="column-full">
+      <#assign aspectMsg>${msg("nodebrowser.aspects")} (<#if result.aspects??>${result.aspects?size?c}<#else>0</#if>)</#assign>
+      <@section label=aspectMsg />
+      <table id="aspects-table" class="node">
+         <#list result.aspects as a>
+         <tr><td>${a.prefixedName}</td></tr>
+         </#list>
+      </table>
+   </div>
+   </#if>
+   
+   <div class="column-full">
+      <#assign childMsg><#if action?? && action="search">${msg("nodebrowser.results")}<#else>${msg("nodebrowser.children")}</#if> (${result.children?size?c})</#assign>
+      <@section label=childMsg />
+      <table id="child-table" class="node grid">
+         <tr>
+            <th>${msg("nodebrowser.name")}</th>
+            <th>${msg("nodebrowser.child-node")}</th>
+            <th>${msg("nodebrowser.primary")}</th>
+            <th>${msg("nodebrowser.association-type")}</th>
+            <th>${msg("nodebrowser.index")}</th>
+            <th>${msg("nodebrowser.actions")}</th>
+         </tr>
+         <#list result.children as n>
+         <tr>
+            <td><a href="#" onclick="AdminConsole_childClick('${n.childRef}');return false;">${n.QName}</a></td>
+            <td><a href="#" onclick="AdminConsole_childClick('${n.childRef}');return false;">${n.childRef}</a></td>
+            <td>${n.primary?string}</td>
+            <td>${n.typeQName}</td>
+            <td>${n_index}</td>
+            <#assign isarchive=(args.store!"")?starts_with("archive://")>
+            <td>
+               <b><a href="#" onclick="AdminConsole_execute('${n.childRef}','delete');return false;" title="${msg("nodebrowser.delete.tip")}">${msg("nodebrowser.delete")}</a></b>
+               <#if isarchive>| <b><a href="#" onclick="AdminConsole_execute('${n.childRef}','restore');return false;" title="${msg("nodebrowser.restore.tip")}">${msg("nodebrowser.restore")}</a></b>
+               <#else>| <b><a href="#" onclick="AdminConsole_confirmExecute('${n.childRef}','fdelete');return false;" title="${msg("nodebrowser.force-delete.tip")}">${msg("nodebrowser.force-delete")}</a></b>
+               | <b><a href="#" onclick="AdminConsole_execute('${n.childRef}','take-ownership');return false;" title="${msg("nodebrowser.take-ownership.tip")}">${msg("nodebrowser.take-ownership")}</a></b>
+               | <b><a href="#" onclick="AdminConsole_execute('${n.childRef}','delete-permissions');return false;" title="${msg("nodebrowser.delete-permissions.tip")}">${msg("nodebrowser.delete-permissions")}</a></b>
+               <#if n.childLocked>| <b><a href="#" onclick="AdminConsole_execute('${n.childRef}','unlock');return false;" title="${msg("nodebrowser.unlock.tip")}">${msg("nodebrowser.unlock")}</a></b></#if>
+               </#if>
+            </td>
+         </tr>
+         </#list>
+      </table>
+   </div>
+   
+   <#if result.parents??>
+   <div class="column-full">
+      <#assign parentMsg>${msg("nodebrowser.parents")} (<#if result.parents??>${result.parents?size?c}<#else>0</#if>)</#assign>
+      <@section label=parentMsg />
+      <table id="parents-table" class="node grid">
+         <tr>
+            <th>${msg("nodebrowser.name")}</th>
+            <th>${msg("nodebrowser.parent-type")}</th>
+            <th>${msg("nodebrowser.parent-reference")}</th>
+            <th>${msg("nodebrowser.primary")}</th>
+            <th>${msg("nodebrowser.association-type")}</th>
+         </tr>
+         <#list result.parents as p>
+         <tr>
+            <td>${p.name.prefixedName}</td>
+            <td>${p.parentTypeName.prefixedName}</td>
+            <td><a href="#" onclick="AdminConsole_parentClick('${p.parentRef}');return false;">${p.parentRef}</a></td></td>
+            <td>${p.primary?string}</td>
+            <td><#if p.typeName??>${p.typeName.prefixedName}<#else>${none}</#if></td>
+         </tr>
+         </#list>
+      </table>
+   </div>
+   </#if>
+   
+   <#if result.assocs??>
+   <div class="column-full">
+      <#assign assocsMsg>${msg("nodebrowser.associations")} (<#if result.assocs??>${result.assocs?size?c}<#else>0</#if>)</#assign>
+      <@section label=assocsMsg />
+      <table id="assocs-table" class="node grid">
+         <tr>
+            <th>${msg("nodebrowser.type")}</th>
+            <th>${msg("nodebrowser.target-reference")}</th>
+            <th>${msg("nodebrowser.association-type")}</th>
+         </tr>
+         <#list result.assocs as a>
+         <tr>
+            <td>${a.targetTypeName.prefixedName}</td>
+            <td><a href="#" onclick="AdminConsole_parentClick('${a.targetRef}');return false;">${a.targetRef}</a></td></td>
+            <td><#if a.typeName??>${a.typeName.prefixedName}<#else>${none}</#if></td>
+         </tr>
+         </#list>
+      </table>
+   </div>
+   </#if>
+   
+   <#if result.sourceAssocs??>
+   <div class="column-full">
+      <#assign sassocsMsg>${msg("nodebrowser.source-assocs")} (<#if result.sourceAssocs??>${result.sourceAssocs?size?c}<#else>0</#if>)</#assign>
+      <@section label=sassocsMsg />
+      <table id="sourceassocs-table" class="node grid">
+         <tr>
+            <th>${msg("nodebrowser.type")}</th>
+            <th>${msg("nodebrowser.source-reference")}</th>
+            <th>${msg("nodebrowser.association-type")}</th>
+         </tr>
+         <#list result.sourceAssocs as a>
+         <tr>
+            <td>${a.sourceTypeName.prefixedName}</td>
+            <td><a href="#" onclick="AdminConsole_parentClick('${a.sourceRef}');return false;">${a.sourceRef}</a></td></td>
+            <td><#if a.typeName??>${a.typeName.prefixedName}<#else>${none}</#if></td>
+         </tr>
+         </#list>
+      </table>
+   </div>
+   </#if>
+   
+   <#if result.permissions??>
+   <div class="column-full">
+      <@section label=msg("nodebrowser.permissions") />
+      <table id="perminfo-table" class="node">
+         <tr><td>${msg("nodebrowser.inherits")}: ${result.permissions.inherit?string}</td></tr>
+         <tr><td>${msg("nodebrowser.owner")}: ${result.permissions.owner!""}</td></tr>
+      </table>
+      <table id="permissions-table" class="node grid">
+         <tr>
+            <th>${msg("nodebrowser.permission")}</th>
+            <th>${msg("nodebrowser.authority")}</th>
+            <th>${msg("nodebrowser.access")}</th>
+         </tr>
+         <#list result.permissions.entries as p>
+         <tr>
+            <td>${p.permission}</td>
+            <td>${p.authority}</td>
+            <td>${p.accessStatus}</td>
+         </tr>
+         </#list>
+      </table>
+   </div>
+   </#if>
+   
+   </#if>
+   
+   <#if args.in??><br><p>Processed in ${args.in?html}ms</p></#if>
+   
+   <script type="text/javascript">//<![CDATA[
+
+/* Page load handler */
+Admin.addEventListener(window, 'load', function() {
+   // bind Enter key press to call the Execute search button event handler
+   Admin.addEventListener(el("query"), 'keypress', function(e) {
+      if (e.keyCode === 13) AdminConsole_action('search');
+      return true;
+   });
+   
+   <#if args.nodeRef??>
+      AdminConsole_action('search');
+   </#if>
+});
+
+function AdminConsole_action(action)
+{
+   el("action").value = action;
+   el("${FORM_ID}").submit();
+   return false;
+}
+
+function AdminConsole_childClick(ref)
+{
+   el("action-value").value = ref;
+   AdminConsole_action("children");
+}
+
+function AdminConsole_parentClick(ref)
+{
+   el("action-value").value = ref;
+   AdminConsole_action("parent");
+}
+
+function AdminConsole_execute(value, execute)
+{
+   el("execute-value").value = value;
+   el("execute").value = execute;
+   AdminConsole_action('${(action!"")?js_string?html}');
+}
+
+function AdminConsole_confirmExecute(value, execute)
+{
+   if (confirm("${msg("nodebrowser.confirm")}"))
+   {
+      AdminConsole_execute(value, execute);
+   }
+}
+
+//]]></script>
+
+</@page>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get.js
new file mode 100644
index 00000000000..ce316f3b6fe
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get.js
@@ -0,0 +1,38 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/admin/admin-common.lib.js">
+
+/**
+ * Repository Admin Console
+ * 
+ * Node Browser GET method
+ */
+
+function main()
+{
+   // available repository stores
+   model.stores = utils.getStores();
+   
+   // action persisted values
+   model.action = args.action;
+   model.actionValue = args.actionValue;
+   
+   // special case for "nodeRef" argument
+   // support URL driven NodeRef argument to the Node Browser page e.g. /admin-nodebrowser?nodeRef=workspace://SpacesStore/...
+   model.query = args.query;
+   if (args.nodeRef)
+   {
+      model.query = args.nodeRef;
+   }
+   
+   // result info from session
+   if (args.resultId)
+   {
+      model.result = session.getValue(args.resultId);
+   }
+   
+   // mandatory model values for UI
+   model.attributes = [];
+   model.tools = Admin.getConsoleTools("admin-nodebrowser");
+   model.metadata = Admin.getServerMetaData();
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get.properties
new file mode 100644
index 00000000000..1bc467d01f1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=Node Browser
+nodebrowser.query=Query
+nodebrowser.execute=Execute
+nodebrowser.store=Store
+nodebrowser.refresh=Refresh
+nodebrowser.root=Root List
+nodebrowser.search-settings=Search Advanced Settings
+nodebrowser.maxresults=Max Results
+nodebrowser.skipcount=Skip Count
+nodebrowser.null=null
+nodebrowser.none=<none>
+nodebrowser.collection=<collection>
+
+nodebrowser.results=Results
+nodebrowser.children=Children
+nodebrowser.node-info=Node Information
+nodebrowser.child-name=Child Name
+nodebrowser.child-node=Child Reference
+nodebrowser.primary=Primary
+nodebrowser.association-type=Association Type
+nodebrowser.index=Index
+nodebrowser.reference=Reference
+nodebrowser.path=Primary Path
+nodebrowser.name=Name
+nodebrowser.type=Type
+nodebrowser.value=Value
+nodebrowser.residual=Residual
+nodebrowser.parent=Parent
+nodebrowser.parents=Parents
+nodebrowser.parent-type=Parent Type
+nodebrowser.parent-reference=Parent Reference
+nodebrowser.properties=Properties
+nodebrowser.aspects=Aspects
+nodebrowser.associations=Associations
+nodebrowser.source-assocs=Source Associations
+nodebrowser.source-reference=Source Reference
+nodebrowser.target-reference=Target Reference
+nodebrowser.permissions=Permissions
+nodebrowser.permission=Permission
+nodebrowser.authority=Authority
+nodebrowser.access=Access
+nodebrowser.inherits=Inherits
+nodebrowser.owner=Owner
+nodebrowser.actions=Actions
+nodebrowser.delete=Delete
+nodebrowser.delete.tip=Delete the node and any children.
+nodebrowser.force-delete=Force Delete
+nodebrowser.force-delete.tip=Delete the node and any children. The node will not be archived. Rules will not be run.
+nodebrowser.restore=Restore
+nodebrowser.restore.tip=Restore the node and any children to its original location.
+nodebrowser.delete-property.tip=Delete the property from this node.
+nodebrowser.take-ownership=Take Ownership
+nodebrowser.take-ownership.tip=Take owner permission of the node.
+nodebrowser.delete-permissions=Revert Permissions
+nodebrowser.delete-permissions.tip=Delete all permissions that have been explicitly assigned to this node and restore permission inheritance.
+nodebrowser.unlock=Unlock
+nodebrowser.unlock.tip=Remove any locks held by this node. Cancels the checkout for any associated working copy and the working copy is removed. Note that all modifications made to the working copy will be lost.
+nodebrowser.confirm=Are you sure?
+nodebrowser.message.delete=Successfully deleted node.
+nodebrowser.message.restore=Successfully restored node.
+nodebrowser.message.take-ownership=Successfully took ownership.
+nodebrowser.message.delete-permissions=Successfully removed permissions.
+nodebrowser.message.delete-property=Successfully deleted property.
+nodebrowser.message.unlock=Successfully unlocked node.
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_cs.properties
new file mode 100644
index 00000000000..2b58e3ba666
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_cs.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=Prohl\u00ed\u017ee\u010d uzlu
+nodebrowser.query=Dotaz
+nodebrowser.execute=Prov\u00e9st
+nodebrowser.store=Ulo\u017eit
+nodebrowser.refresh=Obnovit
+nodebrowser.root=Ko\u0159enov\u00fd seznam
+nodebrowser.search-settings=Nastaven\u00ed pokro\u010dil\u00e9ho hled\u00e1n\u00ed
+nodebrowser.maxresults=Max. v\u00fdsledk\u016f
+nodebrowser.skipcount=Vynechat po\u010det
+nodebrowser.null=pr\u00e1zdn\u00e9
+nodebrowser.none=<none>
+nodebrowser.collection=<collection>
+
+nodebrowser.results=V\u00fdsledky
+nodebrowser.children=Pod\u0159\u00edzen\u00e9
+nodebrowser.node-info=Informace o\u00a0uzlu
+nodebrowser.child-name=N\u00e1zev pod\u0159\u00edzen\u00e9ho objektu
+nodebrowser.child-node=Reference pod\u0159\u00edzen\u00e9ho objektu
+nodebrowser.primary=Prim\u00e1rn\u00ed
+nodebrowser.association-type=Typ p\u0159id\u011blen\u00ed
+nodebrowser.index=Rejst\u0159\u00edk
+nodebrowser.reference=Reference
+nodebrowser.path=Prim\u00e1rn\u00ed cesta
+nodebrowser.name=N\u00e1zev
+nodebrowser.type=Typ
+nodebrowser.value=Hodnota
+nodebrowser.residual=Rezidu\u00e1ln\u00ed
+nodebrowser.parent=Nad\u0159azen\u00fd
+nodebrowser.parents=Nad\u0159azen\u00e9
+nodebrowser.parent-type=Typ nad\u0159azen\u00e9ho objektu
+nodebrowser.parent-reference=Reference pod\u0159\u00edzen\u00e9ho objektu
+nodebrowser.properties=Vlastnosti
+nodebrowser.aspects=Aspekty
+nodebrowser.associations=P\u0159id\u011blen\u00ed
+nodebrowser.source-assocs=P\u0159id\u011blen\u00ed zdroje
+nodebrowser.source-reference=Reference zdroje
+nodebrowser.target-reference=Reference c\u00edle
+nodebrowser.permissions=Opr\u00e1vn\u011bn\u00ed
+nodebrowser.permission=Opr\u00e1vn\u011bn\u00ed
+nodebrowser.authority=Autorita
+nodebrowser.access=P\u0159\u00edstup
+nodebrowser.inherits=D\u011bdi\u010dnost
+nodebrowser.owner=Vlastn\u00edk
+nodebrowser.actions=Akce
+nodebrowser.delete=Odstranit
+nodebrowser.delete.tip=Odstran\u00ed uzel a\u00a0v\u0161echny pod\u0159\u00edzen\u00e9 objekty.
+nodebrowser.force-delete=Vynutit odstran\u011bn\u00ed
+nodebrowser.force-delete.tip=Odstran\u00ed uzel a\u00a0v\u0161echny pod\u0159\u00edzen\u00e9 objekty. Uzel nebude archivov\u00e1n. Pravidla se nepou\u017eij\u00ed.
+nodebrowser.restore=Obnovit
+nodebrowser.restore.tip=Obnoven\u00ed uzlu a\u00a0v\u0161ech pod\u0159\u00edzen\u00fdch objekt\u016f v\u00a0p\u016fvodn\u00edm um\u00edst\u011bn\u00ed.
+nodebrowser.delete-property.tip=Odstran\u011bn\u00ed vlastnost\u00ed tohoto uzlu.
+nodebrowser.take-ownership=P\u0159evz\u00edt vlastnictv\u00ed
+nodebrowser.take-ownership.tip=P\u0159evzet\u00ed vlastnictv\u00ed uzlu.
+nodebrowser.delete-permissions=Vr\u00e1tit opr\u00e1vn\u011bn\u00ed
+nodebrowser.delete-permissions.tip=Odstran\u00ed v\u0161echna opr\u00e1vn\u011bn\u00ed p\u0159i\u0159azen\u00e1 konkr\u00e9tn\u011b tomuto uzlu a\u00a0obnov\u00ed d\u011bdi\u010dnost opr\u00e1vn\u011bn\u00ed.
+nodebrowser.unlock=Odemknout
+nodebrowser.unlock.tip=Odstran\u00ed ve\u0161ker\u00e1 uzam\u010den\u00ed vyvolan\u00e1 t\u00edmto uzlem. Zru\u0161\u00ed rezervaci v\u0161ech souvisej\u00edc\u00edch pracovn\u00edch kopi\u00ed, kter\u00e9 budou odstran\u011bny. M\u011bjte na pam\u011bti, \u017ee ve\u0161ker\u00e9 \u00fapravy pracovn\u00edch kopi\u00ed budou ztraceny.
+nodebrowser.confirm=Opravdu chcete akci prov\u00e9st?
+nodebrowser.message.delete=Uzel byl \u00fasp\u011b\u0161n\u011b odstran\u011bn.
+nodebrowser.message.restore=Uzel byl \u00fasp\u011b\u0161n\u011b obnoven.
+nodebrowser.message.take-ownership=P\u0159evzet\u00ed vlastnictv\u00ed prob\u011bhlo \u00fasp\u011b\u0161n\u011b.
+nodebrowser.message.delete-permissions=Odebr\u00e1n\u00ed opr\u00e1vn\u011bn\u00ed prob\u011bhlo \u00fasp\u011b\u0161n\u011b.
+nodebrowser.message.delete-property=Odstran\u011bn\u00ed vlastnosti prob\u011bhlo \u00fasp\u011b\u0161n\u011b.
+nodebrowser.message.unlock=Odemknut\u00ed uzlu prob\u011bhlo \u00fasp\u011b\u0161n\u011b.
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_da.properties
new file mode 100644
index 00000000000..7589cf8895e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_da.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=Nodebrowser
+nodebrowser.query=Foresp\u00f8rgsel
+nodebrowser.execute=Udf\u00f8r
+nodebrowser.store=Gem
+nodebrowser.refresh=Opdater
+nodebrowser.root=Rodliste
+nodebrowser.search-settings=Avancerede s\u00f8geindstillinger
+nodebrowser.maxresults=Maks. antal resultater
+nodebrowser.skipcount=Antal sprunget over
+nodebrowser.null=null
+nodebrowser.none=<none>
+nodebrowser.collection=<collection>
+
+nodebrowser.results=Resultater
+nodebrowser.children=Underordnede
+nodebrowser.node-info=Nodeoplysninger
+nodebrowser.child-name=Navn p\u00e5 underordnet
+nodebrowser.child-node=Reference til underordnet
+nodebrowser.primary=Prim\u00e6r
+nodebrowser.association-type=Tilknytningstype
+nodebrowser.index=Indeks
+nodebrowser.reference=Reference
+nodebrowser.path=Prim\u00e6r sti
+nodebrowser.name=Navn
+nodebrowser.type=Type
+nodebrowser.value=V\u00e6rdi
+nodebrowser.residual=Rest
+nodebrowser.parent=Overordnet
+nodebrowser.parents=Overordnede
+nodebrowser.parent-type=Type af overordnet
+nodebrowser.parent-reference=Reference til overordnet
+nodebrowser.properties=Egenskaber
+nodebrowser.aspects=Aspekter
+nodebrowser.associations=Tilknytninger
+nodebrowser.source-assocs=Kildetilknytninger
+nodebrowser.source-reference=Kildereference
+nodebrowser.target-reference=M\u00e5lreference
+nodebrowser.permissions=Tilladelser
+nodebrowser.permission=Tilladelse
+nodebrowser.authority=Autoritet
+nodebrowser.access=Adgang
+nodebrowser.inherits=Nedarver
+nodebrowser.owner=Ejer
+nodebrowser.actions=Handlinger
+nodebrowser.delete=Slet
+nodebrowser.delete.tip=Slet noden og alle underordnede.
+nodebrowser.force-delete=Gennemtving sletning
+nodebrowser.force-delete.tip=Slet noden og alle underordnede. Noden arkiveres ikke. Regler vil ikke blive k\u00f8rt.
+nodebrowser.restore=Gendan
+nodebrowser.restore.tip=Gendan noden og alle underordnede til den oprindelige placering.
+nodebrowser.delete-property.tip=Slet egenskaben fra noden.
+nodebrowser.take-ownership=Tag ejerskab
+nodebrowser.take-ownership.tip=Tag ejerskab over noden.
+nodebrowser.delete-permissions=Gendan tilladelser
+nodebrowser.delete-permissions.tip=Slet alle de tilladelser, som udtrykkeligt er blevet tildelt til denne node, og gendan nedarvning af tilladelser.
+nodebrowser.unlock=L\u00e5s op
+nodebrowser.unlock.tip=Fjern alle de l\u00e5se, som er gemt p\u00e5 noden. Dette annullerer udtjekningen af en eventuelt tilknyttet arbejdskopi, og arbejdskopien fjernes. V\u00e6r opm\u00e6rksom p\u00e5, at alle \u00e6ndringer til arbejdskopien g\u00e5r tabt.
+nodebrowser.confirm=Er du sikker?
+nodebrowser.message.delete=Noden blev slettet.
+nodebrowser.message.restore=Noden blev gendannet.
+nodebrowser.message.take-ownership=Du har nu ejerskab.
+nodebrowser.message.delete-permissions=Tilladelserne blev fjernet.
+nodebrowser.message.delete-property=Egenskaben blev slettet.
+nodebrowser.message.unlock=Noden blev l\u00e5st op.
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_de.properties
new file mode 100644
index 00000000000..0b36712d2fe
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_de.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=Node-Browser
+nodebrowser.query=Anfrage
+nodebrowser.execute=Ausf\u00fchren
+nodebrowser.store=Speichern
+nodebrowser.refresh=Aktualisieren
+nodebrowser.root=Root-Liste
+nodebrowser.search-settings=Erweiterte Sucheinstellungen
+nodebrowser.maxresults=Max. Ergebnisse
+nodebrowser.skipcount=Auslassungsanzahl
+nodebrowser.null=Null
+nodebrowser.none=<keiner>
+nodebrowser.collection=<Sammlung>
+
+nodebrowser.results=Ergebnisse
+nodebrowser.children=Untergeordnete Elemente
+nodebrowser.node-info=Node-Information
+nodebrowser.child-name=Name des untergeordneten Elements
+nodebrowser.child-node=Referenz des untergeordneten Elements
+nodebrowser.primary=Prim\u00e4r
+nodebrowser.association-type=Zuordnungstyp
+nodebrowser.index=Index
+nodebrowser.reference=Referenz
+nodebrowser.path=Prim\u00e4rer Pfad
+nodebrowser.name=Name
+nodebrowser.type=Typ
+nodebrowser.value=Wert
+nodebrowser.residual=Rest
+nodebrowser.parent=\u00dcbergeordnetes Element
+nodebrowser.parents=\u00dcbergeordnete Elemente
+nodebrowser.parent-type=Typ des \u00fcbergeordneten Elements
+nodebrowser.parent-reference=Referenz des \u00fcbergeordneten Elements
+nodebrowser.properties=Eigenschaften
+nodebrowser.aspects=Aspekte
+nodebrowser.associations=Zuordnungen
+nodebrowser.source-assocs=Quellzuordnungen
+nodebrowser.source-reference=Quellreferenz
+nodebrowser.target-reference=Zielreferenz
+nodebrowser.permissions=Berechtigungen
+nodebrowser.permission=Berechtigung
+nodebrowser.authority=Authority
+nodebrowser.access=Zugriff
+nodebrowser.inherits=Erbt
+nodebrowser.owner=Eigent\u00fcmer
+nodebrowser.actions=Aktionen
+nodebrowser.delete=L\u00f6schen
+nodebrowser.delete.tip=L\u00f6schen Sie den Node und alle untergeordneten Elemente.
+nodebrowser.force-delete=L\u00f6schen erzwingen
+nodebrowser.force-delete.tip=L\u00f6schen Sie den Node und alle untergeordneten Elemente. Der Node wird nicht archiviert. Regeln werden nicht ausgef\u00fchrt.
+nodebrowser.restore=Wiederherstellen
+nodebrowser.restore.tip=Stellen Sie den Node und alle untergeordneten Elemente an ihrem urspr\u00fcnglichen Ort wieder her.
+nodebrowser.delete-property.tip=Die Eigenschaft von diesem Node l\u00f6schen.
+nodebrowser.take-ownership=Eigentum \u00fcbernehmen
+nodebrowser.take-ownership.tip=Eigentumsrechte f\u00fcr diesen Node \u00fcbernehmen.
+nodebrowser.delete-permissions=Berechtigungen zur\u00fccksetzen
+nodebrowser.delete-permissions.tip=Alle Berechtigungen, die diesem Node ausdr\u00fccklich zugewiesen wurden, l\u00f6schen und die Rechtevererbung wiederherstellen.
+nodebrowser.unlock=Sperre aufheben
+nodebrowser.unlock.tip=Alle Sperren dieses Nodes entfernen. Storniert den Checkout f\u00fcr etwa verkn\u00fcpfte Arbeitskopien und die Arbeitskopie wird entfernt. Beachten Sie, dass alle an der Arbeitskopie vorgenommenen \u00c4nderungen dabei verloren gehen.
+nodebrowser.confirm=Sind Sie sicher?
+nodebrowser.message.delete=Node erfolgreich gel\u00f6scht.
+nodebrowser.message.restore=Node erfolgreich wiederhergestellt.
+nodebrowser.message.take-ownership=Eigentum erfolgreich \u00fcbernommen.
+nodebrowser.message.delete-permissions=Berechtigungen erfolgreich entfernt.
+nodebrowser.message.delete-property=Eigenschaft erfolgreich gel\u00f6scht.
+nodebrowser.message.unlock=Sperre des Nodes erfolgreich aufgehoben.
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_es.properties
new file mode 100644
index 00000000000..ad3a383ea55
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_es.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=Navegador de nodos
+nodebrowser.query=Consulta
+nodebrowser.execute=Ejecutar
+nodebrowser.store=Almacenar
+nodebrowser.refresh=Actualizar
+nodebrowser.root=Lista ra\u00edz
+nodebrowser.search-settings=Buscar ajustes avanzados
+nodebrowser.maxresults=Resultados m\u00e1x
+nodebrowser.skipcount=Saltar recuento
+nodebrowser.null=nulo
+nodebrowser.none=<ninguno>
+nodebrowser.collection=<colecci\u00f3n>
+
+nodebrowser.results=Resultados
+nodebrowser.children=Subdirectorios
+nodebrowser.node-info=Informaci\u00f3n de nodo
+nodebrowser.child-name=Nombre de subdirectorio
+nodebrowser.child-node=Referencia de subdirectorio
+nodebrowser.primary=Primario
+nodebrowser.association-type=Tipo de asociaci\u00f3n
+nodebrowser.index=\u00cdndice
+nodebrowser.reference=Referencia
+nodebrowser.path=Ruta primaria
+nodebrowser.name=Nombre
+nodebrowser.type=Tipo
+nodebrowser.value=Valor
+nodebrowser.residual=Residual
+nodebrowser.parent=Padre
+nodebrowser.parents=Padres
+nodebrowser.parent-type=Tipo de padre
+nodebrowser.parent-reference=Referencia de padre
+nodebrowser.properties=Propiedades
+nodebrowser.aspects=Aspectos
+nodebrowser.associations=Asociaciones
+nodebrowser.source-assocs=Asociaciones de origen
+nodebrowser.source-reference=Referencia de origen
+nodebrowser.target-reference=Referencia de destino
+nodebrowser.permissions=Permisos
+nodebrowser.permission=Permiso
+nodebrowser.authority=Autoridad
+nodebrowser.access=Acceso
+nodebrowser.inherits=Herencias
+nodebrowser.owner=Propietario
+nodebrowser.actions=Acciones
+nodebrowser.delete=Eliminar
+nodebrowser.delete.tip=Eliminar el nodo y todos los subdirectorios.
+nodebrowser.force-delete=Forzar eliminaci\u00f3n
+nodebrowser.force-delete.tip=Eliminar el nodo y todos los subdirectorios. El nodo no se archivar\u00e1. Las reglas no se ejecutar\u00e1n.
+nodebrowser.restore=Restaurar
+nodebrowser.restore.tip=Restaurar el nodo y los subdirectorios a su ubicaci\u00f3n original.
+nodebrowser.delete-property.tip=Eliminar la propiedad de este nodo.
+nodebrowser.take-ownership=Tomar posesi\u00f3n
+nodebrowser.take-ownership.tip=Tomar permiso de propietario del nodo.
+nodebrowser.delete-permissions=Revertir permisos
+nodebrowser.delete-permissions.tip=Eliminar todos los permisos que se hayan asignado expl\u00edcitamente a este nodo y restaurar la herencia de permisos.
+nodebrowser.unlock=Desbloquear
+nodebrowser.unlock.tip=Eliminar todos los bloqueos de este nodo. Cancela el bloqueo de cualquier copia de trabajo asociada y la copia de trabajo se elimina. Tenga en cuenta que todas las modificaciones que se hayan hecho en la copia de trabajo se perder\u00e1n.
+nodebrowser.confirm=\u00bfEst\u00e1 seguro?
+nodebrowser.message.delete=Nodo eliminado correctamente.
+nodebrowser.message.restore=Nodo restaurado correctamente.
+nodebrowser.message.take-ownership=Posesi\u00f3n tomada correctamente.
+nodebrowser.message.delete-permissions=Se han eliminado los permisos correctamente.
+nodebrowser.message.delete-property=Se ha eliminado la propiedad correctamente.
+nodebrowser.message.unlock=Se ha desbloqueado el nodo correctamente.
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_fi.properties
new file mode 100644
index 00000000000..f5ed74a23aa
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_fi.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=Solmuselain
+nodebrowser.query=Tee kysely
+nodebrowser.execute=Suorita
+nodebrowser.store=Tallenna
+nodebrowser.refresh=P\u00e4ivit\u00e4
+nodebrowser.root=Juuriluettelo
+nodebrowser.search-settings=Haun lis\u00e4asetukset
+nodebrowser.maxresults=Tuloksia enint\u00e4\u00e4n
+nodebrowser.skipcount=Ohita m\u00e4\u00e4r\u00e4
+nodebrowser.null=null
+nodebrowser.none=<ei mit\u00e4\u00e4n>
+nodebrowser.collection=<kokoelma>
+
+nodebrowser.results=Tulokset
+nodebrowser.children=Alataso
+nodebrowser.node-info=Solmutiedot
+nodebrowser.child-name=Alatason nimi
+nodebrowser.child-node=Alatasoviittaus
+nodebrowser.primary=Ensisijainen
+nodebrowser.association-type=Yhdist\u00e4mistyyppi
+nodebrowser.index=Indeksi
+nodebrowser.reference=Viittaus
+nodebrowser.path=Ensisijainen polku
+nodebrowser.name=Nimi
+nodebrowser.type=Tyyppi
+nodebrowser.value=Arvo
+nodebrowser.residual=J\u00e4\u00e4nn\u00f6s
+nodebrowser.parent=Yl\u00e4taso
+nodebrowser.parents=Yl\u00e4tasot
+nodebrowser.parent-type=Yl\u00e4tasotyyppi
+nodebrowser.parent-reference=Yl\u00e4tasoviittaus
+nodebrowser.properties=Ominaisuudet
+nodebrowser.aspects=Ominaisuusjoukot
+nodebrowser.associations=Yhdist\u00e4miset
+nodebrowser.source-assocs=L\u00e4hdeyhdist\u00e4miset
+nodebrowser.source-reference=L\u00e4hdeviittaus
+nodebrowser.target-reference=Kohdeviittaus
+nodebrowser.permissions=Oikeudet
+nodebrowser.permission=Oikeudet
+nodebrowser.authority=Auktoriteetti
+nodebrowser.access=K\u00e4ytt\u00f6oikeus
+nodebrowser.inherits=Perii
+nodebrowser.owner=Omistaja
+nodebrowser.actions=Toiminnot
+nodebrowser.delete=Poista
+nodebrowser.delete.tip=Poista solmu ja kaikki sen alakohteet.
+nodebrowser.force-delete=Pakota poisto
+nodebrowser.force-delete.tip=Poista solmu ja sen kaikki alakohteet. T\u00e4t\u00e4 solmua ei arkistoida. S\u00e4\u00e4nt\u00f6j\u00e4 ei suoriteta.
+nodebrowser.restore=Palauta
+nodebrowser.restore.tip=Palauta solmu ja kaikki sen alakohteet alkuper\u00e4iseen sijaintiin.
+nodebrowser.delete-property.tip=Poista ominaisuus t\u00e4st\u00e4 solmusta.
+nodebrowser.take-ownership=Ota omistukseen
+nodebrowser.take-ownership.tip=Ota solmun omistajan oikeudet.
+nodebrowser.delete-permissions=Palauta oikeudet
+nodebrowser.delete-permissions.tip=Poista kaikki oikeudet, jotka on aiemmin m\u00e4\u00e4ritetty nimenomaisesti t\u00e4lle solmulle, ja palauta oikeuksien periytyminen.
+nodebrowser.unlock=Poista lukitus
+nodebrowser.unlock.tip=Poista kaikki t\u00e4m\u00e4n solmun lukitukset. Peruuttaa mink\u00e4 tahansa ty\u00f6skentelykopion uloskuittauksen. Lis\u00e4ksi ty\u00f6skentelykopio poistetaan. Ota huomioon, ett\u00e4 menet\u00e4t kaikki ty\u00f6skentelykopioon tehdyt muutokset.
+nodebrowser.confirm=Oletko varma?
+nodebrowser.message.delete=Solmu poistettiin.
+nodebrowser.message.restore=Solmu palautettiin.
+nodebrowser.message.take-ownership=Omistajuus otettiin.
+nodebrowser.message.delete-permissions=Oikeudet poistettiin.
+nodebrowser.message.delete-property=Ominaisuus poistettiin.
+nodebrowser.message.unlock=Solmun lukitus poistettiin.
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_fr.properties
new file mode 100644
index 00000000000..f03a5d02523
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_fr.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=Navigateur de n\u0153uds
+nodebrowser.query=Requ\u00eate
+nodebrowser.execute=Ex\u00e9cuter
+nodebrowser.store=Entrep\u00f4t
+nodebrowser.refresh=Rafra\u00eechir
+nodebrowser.root=Liste racine
+nodebrowser.search-settings=Param\u00e8tres avanc\u00e9s de recherche
+nodebrowser.maxresults=R\u00e9sultats max
+nodebrowser.skipcount=Ignorer le nombre
+nodebrowser.null=null
+nodebrowser.none=<none>
+nodebrowser.collection=<collection>
+
+nodebrowser.results=R\u00e9sultats
+nodebrowser.children=Sous-r\u00e9pertoires
+nodebrowser.node-info=Informations de n\u0153ud
+nodebrowser.child-name=Nom du sous-r\u00e9pertoire
+nodebrowser.child-node=R\u00e9f\u00e9rence du sous-r\u00e9pertoire
+nodebrowser.primary=Primaire
+nodebrowser.association-type=Type d'association
+nodebrowser.index=Index
+nodebrowser.reference=R\u00e9f\u00e9rence
+nodebrowser.path=Chemin primaire
+nodebrowser.name=Nom
+nodebrowser.type=Type
+nodebrowser.value=Valeur
+nodebrowser.residual=R\u00e9siduelle
+nodebrowser.parent=Parent
+nodebrowser.parents=Parents
+nodebrowser.parent-type=Type de parent
+nodebrowser.parent-reference=R\u00e9f\u00e9rence du parent
+nodebrowser.properties=Propri\u00e9t\u00e9s
+nodebrowser.aspects=Aspects
+nodebrowser.associations=Associations
+nodebrowser.source-assocs=Associations source
+nodebrowser.source-reference=R\u00e9f\u00e9rence de la source
+nodebrowser.target-reference=R\u00e9f\u00e9rence de la cible
+nodebrowser.permissions=Permissions
+nodebrowser.permission=Droit d'acc\u00e8s
+nodebrowser.authority=Autorit\u00e9s
+nodebrowser.access=Acc\u00e8s
+nodebrowser.inherits=H\u00e9rite
+nodebrowser.owner=Propri\u00e9taire
+nodebrowser.actions=Actions
+nodebrowser.delete=Supprimer
+nodebrowser.delete.tip=Supprime le n\u0153ud et les sous-n\u0153uds \u00e9ventuels.
+nodebrowser.force-delete=Forcer la suppression
+nodebrowser.force-delete.tip=Supprime le n\u0153ud et les sous-n\u0153uds \u00e9ventuels. Le n\u0153ud ne sera pas archiv\u00e9. Aucune r\u00e8gle ne sera ex\u00e9cut\u00e9e.
+nodebrowser.restore=Restaurer
+nodebrowser.restore.tip=Restaure le n\u0153ud et les sous-n\u0153uds \u00e9ventuels \u00e0 leur emplacement d'origine.
+nodebrowser.delete-property.tip=Supprimer la propri\u00e9t\u00e9 de ce n\u0153ud.
+nodebrowser.take-ownership=S'approprier le contenu
+nodebrowser.take-ownership.tip=S'approprier les droits de propri\u00e9taire du n\u0153ud.
+nodebrowser.delete-permissions=R\u00e9tablir les droits d'acc\u00e8s
+nodebrowser.delete-permissions.tip=Supprime tous les droits d'acc\u00e8s directement assign\u00e9s au n\u0153ud et restaure l'h\u00e9ritage des permissions.
+nodebrowser.unlock=D\u00e9verrouillage
+nodebrowser.unlock.tip=Supprime tous les verrous \u00e9ventuels du n\u0153ud. Annule la r\u00e9serve pour toute copie de travail \u00e9ventuelle associ\u00e9e et supprime la copie de travail. Toutes les modifications apport\u00e9es \u00e0 la copie de travail seront perdues.
+nodebrowser.confirm=Etes-vous s\u00fbr ?
+nodebrowser.message.delete=Suppression du n\u0153ud r\u00e9ussie.
+nodebrowser.message.restore=Restauration du n\u0153ud r\u00e9ussie.
+nodebrowser.message.take-ownership=Appropriation r\u00e9ussie.
+nodebrowser.message.delete-permissions=Suppression des droits d'acc\u00e8s r\u00e9ussie.
+nodebrowser.message.delete-property=Suppression de la propri\u00e9t\u00e9 r\u00e9ussie.
+nodebrowser.message.unlock=D\u00e9verrouillage du n\u0153ud r\u00e9ussi.
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_it.properties
new file mode 100644
index 00000000000..bb90bec6fa1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_it.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=Browser nodi
+nodebrowser.query=Query
+nodebrowser.execute=Esegui
+nodebrowser.store=Deposito
+nodebrowser.refresh=Aggiorna
+nodebrowser.root=Elenco principale
+nodebrowser.search-settings=Impostazioni avanzate ricerca
+nodebrowser.maxresults=Risultati max
+nodebrowser.skipcount=Salta conteggio
+nodebrowser.null=nullo
+nodebrowser.none=<nessuno>
+nodebrowser.collection=<raccolta>
+
+nodebrowser.results=Risultati
+nodebrowser.children=Figli
+nodebrowser.node-info=Informazioni nodo
+nodebrowser.child-name=Nome figlio
+nodebrowser.child-node=Riferimento figlio
+nodebrowser.primary=Primario
+nodebrowser.association-type=Tipo di associazione
+nodebrowser.index=Indice
+nodebrowser.reference=Riferimento
+nodebrowser.path=Percorso principale
+nodebrowser.name=Nome
+nodebrowser.type=Tipo
+nodebrowser.value=Valore
+nodebrowser.residual=Residuo
+nodebrowser.parent=Genitore
+nodebrowser.parents=Genitori
+nodebrowser.parent-type=Tipo di genitore
+nodebrowser.parent-reference=Riferimento genitore
+nodebrowser.properties=Propriet\u00e0
+nodebrowser.aspects=Aspetti
+nodebrowser.associations=Associazioni
+nodebrowser.source-assocs=Associazioni fonte
+nodebrowser.source-reference=Riferimento fonte
+nodebrowser.target-reference=Riferimento destinazione
+nodebrowser.permissions=Permessi
+nodebrowser.permission=Permesso
+nodebrowser.authority=Autorit\u00e0
+nodebrowser.access=Accesso
+nodebrowser.inherits=Eredit\u00e0
+nodebrowser.owner=Proprietario
+nodebrowser.actions=Azioni
+nodebrowser.delete=Elimina
+nodebrowser.delete.tip=Elimina il nodo e tutti i figli.
+nodebrowser.force-delete=Forza eliminazione
+nodebrowser.force-delete.tip=Elimina il nodo e tutti i figli. Il nodo non verr\u00e0 archiviato. Le regole non verranno eseguite.
+nodebrowser.restore=Ripristina
+nodebrowser.restore.tip=Ripristina il nodo e tutti i figli nella posizione originale.
+nodebrowser.delete-property.tip=Elimina la propriet\u00e0 da questo nodo.
+nodebrowser.take-ownership=Assumi propriet\u00e0
+nodebrowser.take-ownership.tip=Consente di assumere il permesso di Proprietario del nodo.
+nodebrowser.delete-permissions=Ripristina permessi
+nodebrowser.delete-permissions.tip=Elimina tutti i permessi che sono stati esplicitamente assegnati a questo nodo e ripristina l'ereditariet\u00e0 dei permessi.
+nodebrowser.unlock=Sblocca
+nodebrowser.unlock.tip=Rimuove eventuali blocchi presenti in questo nodo. Annulla il Check Out di ogni copia di lavoro associata e la rimuove. Si noti che tutte le modifiche apportate alla copia di lavoro andranno perse.
+nodebrowser.confirm=Continuare?
+nodebrowser.message.delete=Eliminazione nodi riuscita.
+nodebrowser.message.restore=Ripristino nodi riuscito.
+nodebrowser.message.take-ownership=La propriet\u00e0 dell'oggetto \u00e8 stata assunta.
+nodebrowser.message.delete-permissions=I permessi sono stati rimossi.
+nodebrowser.message.delete-property=La propriet\u00e0 \u00e8 stata eliminata.
+nodebrowser.message.unlock=Il nodo \u00e8 stato sbloccato.
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_ja.properties
new file mode 100644
index 00000000000..42d78505fed
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_ja.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=\u30ce\u30fc\u30c9\u30d6\u30e9\u30a6\u30b6
+nodebrowser.query=\u30af\u30a8\u30ea
+nodebrowser.execute=\u5b9f\u884c
+nodebrowser.store=\u30b9\u30c8\u30a2
+nodebrowser.refresh=\u518d\u8aad\u307f\u8fbc\u307f
+nodebrowser.root=\u30eb\u30fc\u30c8\u30ea\u30b9\u30c8
+nodebrowser.search-settings=\u691c\u7d22\u306e\u8a73\u7d30\u8a2d\u5b9a
+nodebrowser.maxresults=\u7d50\u679c\u306e\u6700\u5927\u8868\u793a\u4ef6\u6570
+nodebrowser.skipcount=\u30ab\u30a6\u30f3\u30c8\u3092\u30b9\u30ad\u30c3\u30d7
+nodebrowser.null=\u30cc\u30eb
+nodebrowser.none=<\u306a\u3057>
+nodebrowser.collection=<\u30b3\u30ec\u30af\u30b7\u30e7\u30f3>
+
+nodebrowser.results=\u7d50\u679c
+nodebrowser.children=\u5b50
+nodebrowser.node-info=\u30ce\u30fc\u30c9\u60c5\u5831
+nodebrowser.child-name=\u5b50\u306e\u540d\u524d
+nodebrowser.child-node=\u5b50\u306e\u53c2\u7167
+nodebrowser.primary=\u30d7\u30e9\u30a4\u30de\u30ea
+nodebrowser.association-type=\u95a2\u9023\u4ed8\u3051\u306e\u30bf\u30a4\u30d7
+nodebrowser.index=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9
+nodebrowser.reference=\u53c2\u7167
+nodebrowser.path=\u30d7\u30e9\u30a4\u30de\u30ea\u30d1\u30b9
+nodebrowser.name=\u540d\u524d
+nodebrowser.type=\u30bf\u30a4\u30d7
+nodebrowser.value=\u5024
+nodebrowser.residual=\u672a\u51e6\u7406
+nodebrowser.parent=\u89aa
+nodebrowser.parents=\u89aa
+nodebrowser.parent-type=\u89aa\u30bf\u30a4\u30d7
+nodebrowser.parent-reference=\u89aa\u306e\u53c2\u7167
+nodebrowser.properties=\u30d7\u30ed\u30d1\u30c6\u30a3
+nodebrowser.aspects=\u30a2\u30b9\u30da\u30af\u30c8
+nodebrowser.associations=\u95a2\u9023\u4ed8\u3051
+nodebrowser.source-assocs=\u30bd\u30fc\u30b9\u306e\u95a2\u9023\u4ed8\u3051
+nodebrowser.source-reference=\u30bd\u30fc\u30b9\u306e\u53c2\u7167
+nodebrowser.target-reference=\u30bf\u30fc\u30b2\u30c3\u30c8\u306e\u53c2\u7167
+nodebrowser.permissions=\u6a29\u9650
+nodebrowser.permission=\u6a29\u9650
+nodebrowser.authority=\u627f\u8a8d\u8005
+nodebrowser.access=\u30a2\u30af\u30bb\u30b9
+nodebrowser.inherits=\u7d99\u627f
+nodebrowser.owner=\u6240\u6709\u8005
+nodebrowser.actions=\u51e6\u7406
+nodebrowser.delete=\u524a\u9664
+nodebrowser.delete.tip=\u30ce\u30fc\u30c9\u3068\u305d\u306e\u3059\u3079\u3066\u306e\u5b50\u30ce\u30fc\u30c9\u3092\u524a\u9664\u3057\u307e\u3059\u3002
+nodebrowser.force-delete=\u5f37\u5236\u524a\u9664
+nodebrowser.force-delete.tip=\u30ce\u30fc\u30c9\u3068\u305d\u306e\u3059\u3079\u3066\u306e\u5b50\u30ce\u30fc\u30c9\u3092\u524a\u9664\u3057\u307e\u3059\u3002\u30ce\u30fc\u30c9\u306f\u30a2\u30fc\u30ab\u30a4\u30d6\u3055\u308c\u307e\u305b\u3093\u3002\u30eb\u30fc\u30eb\u306f\u5b9f\u884c\u3055\u308c\u307e\u305b\u3093\u3002
+nodebrowser.restore=\u5fa9\u5143
+nodebrowser.restore.tip=\u30ce\u30fc\u30c9\u3068\u305d\u306e\u3059\u3079\u3066\u306e\u5b50\u30ce\u30fc\u30c9\u3092\u5fa9\u5143\u3057\u3066\u3001\u5143\u306e\u5834\u6240\u306b\u623b\u3057\u307e\u3059\u3002
+nodebrowser.delete-property.tip=\u3053\u306e\u30ce\u30fc\u30c9\u304b\u3089\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u524a\u9664\u3057\u307e\u3059\u3002
+nodebrowser.take-ownership=\u6240\u6709\u6a29\u306e\u53d6\u5f97
+nodebrowser.take-ownership.tip=\u30ce\u30fc\u30c9\u306e\u6240\u6709\u8005\u6a29\u9650\u3092\u53d6\u5f97\u3057\u307e\u3059\u3002
+nodebrowser.delete-permissions=\u6a29\u9650\u3092\u623b\u3059
+nodebrowser.delete-permissions.tip=\u3053\u306e\u30ce\u30fc\u30c9\u306b\u5272\u308a\u5f53\u3066\u3089\u308c\u3066\u3044\u308b\u3059\u3079\u3066\u306e\u6a29\u9650\u3092\u524a\u9664\u3057\u3001\u6a29\u9650\u306e\u7d99\u627f\u3092\u5fa9\u5143\u3057\u307e\u3059\u3002
+nodebrowser.unlock=\u30ed\u30c3\u30af\u89e3\u9664
+nodebrowser.unlock.tip=\u3053\u306e\u30ce\u30fc\u30c9\u306e\u30ed\u30c3\u30af\u3092\u3059\u3079\u3066\u524a\u9664\u3057\u307e\u3059\u3002\u95a2\u9023\u4ed8\u3051\u3089\u308c\u3066\u3044\u308b\u4f5c\u696d\u7528\u30b3\u30d4\u30fc\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u304c\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u3001\u4f5c\u696d\u7528\u30b3\u30d4\u30fc\u304c\u524a\u9664\u3055\u308c\u307e\u3059\u3002\u4f5c\u696d\u7528\u30b3\u30d4\u30fc\u306b\u52a0\u3048\u305f\u5909\u66f4\u306f\u3059\u3079\u3066\u5931\u308f\u308c\u308b\u306e\u3067\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+nodebrowser.confirm=\u3053\u306e\u51e6\u7406\u3092\u884c\u3044\u307e\u3059\u304b?
+nodebrowser.message.delete=\u30ce\u30fc\u30c9\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002
+nodebrowser.message.restore=\u30ce\u30fc\u30c9\u304c\u5fa9\u5143\u3055\u308c\u307e\u3057\u305f\u3002
+nodebrowser.message.take-ownership=\u6240\u6709\u6a29\u304c\u53d6\u5f97\u3055\u308c\u307e\u3057\u305f\u3002
+nodebrowser.message.delete-permissions=\u6a29\u9650\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002
+nodebrowser.message.delete-property=\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002
+nodebrowser.message.unlock=\u30ce\u30fc\u30c9\u306e\u30ed\u30c3\u30af\u304c\u89e3\u9664\u3055\u308c\u307e\u3057\u305f\u3002
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_nb.properties
new file mode 100644
index 00000000000..e895f465610
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_nb.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=Nodeleser
+nodebrowser.query=Sp\u00f8rring
+nodebrowser.execute=Kj\u00f8r
+nodebrowser.store=Lager
+nodebrowser.refresh=Oppdater
+nodebrowser.root=Rotliste
+nodebrowser.search-settings=S\u00f8k avanserte innstillinger
+nodebrowser.maxresults=Maks antall resultater
+nodebrowser.skipcount=Hopp over telling
+nodebrowser.null=null
+nodebrowser.none=<none>
+nodebrowser.collection=<collection>
+
+nodebrowser.results=Resultater
+nodebrowser.children=Underordnede
+nodebrowser.node-info=Nodeinformasjon
+nodebrowser.child-name=Underordnedes navn
+nodebrowser.child-node=Referanse for underordnet
+nodebrowser.primary=Prim\u00e6r
+nodebrowser.association-type=Type tilknytning
+nodebrowser.index=Indeks
+nodebrowser.reference=Referanse
+nodebrowser.path=Prim\u00e6rbane
+nodebrowser.name=Navn
+nodebrowser.type=Type
+nodebrowser.value=Verdi
+nodebrowser.residual=Rest
+nodebrowser.parent=Overordnet
+nodebrowser.parents=Overordnede
+nodebrowser.parent-type=Type overordnet
+nodebrowser.parent-reference=Referanse for overordnet
+nodebrowser.properties=Egenskaper
+nodebrowser.aspects=Aspekter
+nodebrowser.associations=Tilknytninger
+nodebrowser.source-assocs=Kildetilknytninger
+nodebrowser.source-reference=Referanse for kilde
+nodebrowser.target-reference=Referanse for m\u00e5l
+nodebrowser.permissions=Tillatelser
+nodebrowser.permission=Tillatelse
+nodebrowser.authority=Autoritet
+nodebrowser.access=Tilgang
+nodebrowser.inherits=Arver
+nodebrowser.owner=Eier
+nodebrowser.actions=Handlinger
+nodebrowser.delete=Slett
+nodebrowser.delete.tip=Slett noden og alle underordnede.
+nodebrowser.force-delete=Tving sletting
+nodebrowser.force-delete.tip=Slett noden og eventuelle underordnede. Noden arkiveres ikke. Reglene kj\u00f8res ikke.
+nodebrowser.restore=Gjenopprett
+nodebrowser.restore.tip=Gjenopprett noden og eventuelle underordnede p\u00e5 det opprinnelige stedet.
+nodebrowser.delete-property.tip=Slett egenskapen fra denne noden.
+nodebrowser.take-ownership=Ta eierskap
+nodebrowser.take-ownership.tip=Overta nodetillatelsen.
+nodebrowser.delete-permissions=Tilbakestill tillatelsene
+nodebrowser.delete-permissions.tip=Slett alle tillatelser som er uttrykkelig tilordnet denne noden, og gjenopprett tillatelsesarv.
+nodebrowser.unlock=L\u00e5s opp
+nodebrowser.unlock.tip=Fjern alle l\u00e5ser som holdes av denne noden. Opphever avkrysningsboksen til alle tilh\u00f8rende arbeidskopier, og arbeidskopien fjernes. V\u00e6r oppmerksom p\u00e5 at alle endringer som gj\u00f8res i arbeidskopien, g\u00e5r tapt.
+nodebrowser.confirm=Er du sikker?
+nodebrowser.message.delete=Noden er n\u00e5 slettet.
+nodebrowser.message.restore=Noden er n\u00e5 gjenopprettet.
+nodebrowser.message.take-ownership=Eierskap er n\u00e5 tatt.
+nodebrowser.message.delete-permissions=Tillatelser er n\u00e5 fjernet.
+nodebrowser.message.delete-property=Egenskapen er n\u00e5 slettet.
+nodebrowser.message.unlock=Noden er n\u00e5 lastet opp.
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_nl.properties
new file mode 100644
index 00000000000..320b043ca95
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_nl.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=Nodebrowser
+nodebrowser.query=Query
+nodebrowser.execute=Uitvoeren
+nodebrowser.store=Opslag
+nodebrowser.refresh=Vernieuwen
+nodebrowser.root=Hoofdlijst
+nodebrowser.search-settings=Geavanceerde zoekinstellingen
+nodebrowser.maxresults=Max. aantal resultaten
+nodebrowser.skipcount=Aantal overgeslagen
+nodebrowser.null=null
+nodebrowser.none=<geen>
+nodebrowser.collection=<verzameling>
+
+nodebrowser.results=Resultaten
+nodebrowser.children=Onderliggende elementen
+nodebrowser.node-info=Node-informatie
+nodebrowser.child-name=Naam onderliggend element
+nodebrowser.child-node=Verwijzing naar onderliggend element
+nodebrowser.primary=Primair
+nodebrowser.association-type=Type koppeling
+nodebrowser.index=Index
+nodebrowser.reference=Verwijzing
+nodebrowser.path=Primair pad
+nodebrowser.name=Naam
+nodebrowser.type=Type
+nodebrowser.value=Waarde
+nodebrowser.residual=Restwaarde
+nodebrowser.parent=Bovenliggend element
+nodebrowser.parents=Bovenliggende elementen
+nodebrowser.parent-type=Bovenliggend type
+nodebrowser.parent-reference=Verwijzing naar bovenliggend element
+nodebrowser.properties=Eigenschappen
+nodebrowser.aspects=Aspecten
+nodebrowser.associations=Koppelingen
+nodebrowser.source-assocs=Koppelingen naar bron
+nodebrowser.source-reference=Verwijzing naar bron
+nodebrowser.target-reference=Verwijzing naar bestemming
+nodebrowser.permissions=Rechten
+nodebrowser.permission=Recht
+nodebrowser.authority=Autoriteit
+nodebrowser.access=Toegang
+nodebrowser.inherits=Neemt over
+nodebrowser.owner=Eigenaar
+nodebrowser.actions=Acties
+nodebrowser.delete=Verwijderen
+nodebrowser.delete.tip=Verwijder de node en alle onderliggende elementen.
+nodebrowser.force-delete=Verwijderen afdwingen
+nodebrowser.force-delete.tip=Verwijder de node en alle onderliggende elementen. De node wordt niet gearchiveerd. Regels worden niet uitgevoerd.
+nodebrowser.restore=Herstellen
+nodebrowser.restore.tip=Herstel de node en alle onderliggende elementen naar de oorspronkelijke locatie.
+nodebrowser.delete-property.tip=Verwijder de eigenschap uit deze node.
+nodebrowser.take-ownership=Eigenaar worden
+nodebrowser.take-ownership.tip=Krijg eigenaarsrechten van de node.
+nodebrowser.delete-permissions=Rechten terugzetten
+nodebrowser.delete-permissions.tip=Verwijder alle rechten die expliciet zijn toegewezen aan deze node en herstel rechtenovername.
+nodebrowser.unlock=Ontgrendelen
+nodebrowser.unlock.tip=Verwijder alle vergrendelingen die in gebruik zijn door deze node. Hiermee annuleert u het uitchecken voor alle gekoppelde werkkopie\u00ebn; de werkkopie wordt vervolgens verwijderd. Alle wijzigingen die in de werkkopie zijn aangebracht, gaan verloren.
+nodebrowser.confirm=Weet u het zeker?
+nodebrowser.message.delete=Node is verwijderd.
+nodebrowser.message.restore=Node is hersteld.
+nodebrowser.message.take-ownership=Eigenaar worden is gelukt.
+nodebrowser.message.delete-permissions=Rechten zijn verwijderd.
+nodebrowser.message.delete-property=Eigenschap is verwijderd.
+nodebrowser.message.unlock=Node is ontgrendeld.
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_pl.properties
new file mode 100644
index 00000000000..ab1c9e630be
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_pl.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=Przegl\u0105darka w\u0119z\u0142\u00f3w
+nodebrowser.query=Zapytanie
+nodebrowser.execute=Wykonaj
+nodebrowser.store=Magazyn
+nodebrowser.refresh=Od\u015bwie\u017c
+nodebrowser.root=Lista g\u0142\u00f3wna
+nodebrowser.search-settings=Ustawienia wyszukiwania zaawansowanego
+nodebrowser.maxresults=Maksymalna liczba wynik\u00f3w
+nodebrowser.skipcount=Przeskocz o
+nodebrowser.null=warto\u015b\u0107 NULL
+nodebrowser.none=<brak>
+nodebrowser.collection=<kolekcja>
+
+nodebrowser.results=Wyniki
+nodebrowser.children=Elementy podrz\u0119dne
+nodebrowser.node-info=Informacja o w\u0119\u017ale
+nodebrowser.child-name=Nazwa elementu podrz\u0119dnego
+nodebrowser.child-node=Odniesienie podrz\u0119dne
+nodebrowser.primary=Podstawowy
+nodebrowser.association-type=Typ skojarzenia
+nodebrowser.index=Indeks
+nodebrowser.reference=Odniesienie
+nodebrowser.path=\u015acie\u017cka podstawowa
+nodebrowser.name=Nazwa
+nodebrowser.type=Typ
+nodebrowser.value=Warto\u015b\u0107
+nodebrowser.residual=Pozosta\u0142y
+nodebrowser.parent=Nadrz\u0119dny
+nodebrowser.parents=Nadrz\u0119dne
+nodebrowser.parent-type=Typ nadrz\u0119dny
+nodebrowser.parent-reference=Odniesienie nadrz\u0119dne
+nodebrowser.properties=W\u0142a\u015bciwo\u015bci
+nodebrowser.aspects=Aspekty
+nodebrowser.associations=Skojarzenia
+nodebrowser.source-assocs=\u0179r\u00f3d\u0142o skojarze\u0144
+nodebrowser.source-reference=\u0179r\u00f3d\u0142o odniesienia
+nodebrowser.target-reference=Miejsce docelowe odniesienia
+nodebrowser.permissions=Uprawnienia
+nodebrowser.permission=Uprawnienie
+nodebrowser.authority=Autoryzacja
+nodebrowser.access=Dost\u0119p
+nodebrowser.inherits=Dziedziczy
+nodebrowser.owner=W\u0142a\u015bciciel
+nodebrowser.actions=Czynno\u015bci
+nodebrowser.delete=Usu\u0144
+nodebrowser.delete.tip=Usuwa w\u0119ze\u0142 i jego podw\u0119z\u0142y.
+nodebrowser.force-delete=Wymu\u015b usuni\u0119cie
+nodebrowser.force-delete.tip=Usuwa w\u0119ze\u0142 i jego podw\u0119z\u0142y. W\u0119ze\u0142 nie zostanie zarchiwizowany. Zasady nie b\u0119d\u0105 dzia\u0142a\u0107.
+nodebrowser.restore=Przywr\u00f3\u0107
+nodebrowser.restore.tip=Przywraca w\u0119ze\u0142 i jego podw\u0119z\u0142y do oryginalnej lokalizacji.
+nodebrowser.delete-property.tip=Usuwa w\u0142a\u015bciwo\u015b\u0107 z tego w\u0119z\u0142a.
+nodebrowser.take-ownership=Przejmij na w\u0142asno\u015b\u0107
+nodebrowser.take-ownership.tip=Pobiera uprawnienia w\u0142a\u015bciciela w\u0119z\u0142a.
+nodebrowser.delete-permissions=Przywr\u00f3\u0107 uprawnienia
+nodebrowser.delete-permissions.tip=Usuwa wszystkie uprawnienia, kt\u00f3re zosta\u0142y jawnie przypisane do tego w\u0119z\u0142a, i przywraca dziedziczenie uprawnie\u0144.
+nodebrowser.unlock=Odblokuj
+nodebrowser.unlock.tip=Usuwa wszystkie blokady utrzymywane przez ten w\u0119ze\u0142. Anuluje wyewidencjonowanie wszelkich skojarzonych kopii roboczych i usuwa je. Nale\u017cy zauwa\u017cy\u0107, \u017ce wszystkie modyfikacje kopii roboczych zostan\u0105 utracone.
+nodebrowser.confirm=Czy na pewno?
+nodebrowser.message.delete=Pomy\u015blnie usuni\u0119to w\u0119ze\u0142.
+nodebrowser.message.restore=Pomy\u015blnie przywr\u00f3cono w\u0119ze\u0142.
+nodebrowser.message.take-ownership=Pomy\u015blnie przej\u0119to na w\u0142asno\u015b\u0107.
+nodebrowser.message.delete-permissions=Pomy\u015blnie usuni\u0119to uprawnienia.
+nodebrowser.message.delete-property=Pomy\u015blnie usuni\u0119to w\u0142a\u015bciwo\u015b\u0107.
+nodebrowser.message.unlock=Pomy\u015blnie odblokowano w\u0119ze\u0142.
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_pt_BR.properties
new file mode 100644
index 00000000000..cab6de85f2b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_pt_BR.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=Navegador de n\u00f3s
+nodebrowser.query=Consulta
+nodebrowser.execute=Executar
+nodebrowser.store=Armazenar
+nodebrowser.refresh=Atualizar
+nodebrowser.root=Lista de Raiz
+nodebrowser.search-settings=Configura\u00e7\u00f5es de pesquisa avan\u00e7ada
+nodebrowser.maxresults=Max. resultados
+nodebrowser.skipcount=Ignorar contagem
+nodebrowser.null=nulo
+nodebrowser.none=<nenhum>
+nodebrowser.collection=<cole\u00e7\u00e3o>
+
+nodebrowser.results=Resultados
+nodebrowser.children=Secund\u00e1rios
+nodebrowser.node-info=Informa\u00e7\u00f5es de n\u00f3
+nodebrowser.child-name=Nome do secund\u00e1rio
+nodebrowser.child-node=Refer\u00eancia do secund\u00e1rio
+nodebrowser.primary=Prim\u00e1rio
+nodebrowser.association-type=Tipo de associa\u00e7\u00e3o
+nodebrowser.index=\u00cdndice
+nodebrowser.reference=Refer\u00eancia
+nodebrowser.path=Caminho prim\u00e1rio
+nodebrowser.name=Nome
+nodebrowser.type=Tipo
+nodebrowser.value=Valor
+nodebrowser.residual=Residual
+nodebrowser.parent=Prim\u00e1rio
+nodebrowser.parents=Prim\u00e1rios
+nodebrowser.parent-type=Tipo de prim\u00e1rio
+nodebrowser.parent-reference=Refer\u00eancia de prim\u00e1rio
+nodebrowser.properties=Propriedades
+nodebrowser.aspects=Aspectos
+nodebrowser.associations=Associa\u00e7\u00f5es
+nodebrowser.source-assocs=Associa\u00e7\u00f5es de origem
+nodebrowser.source-reference=Refer\u00eancia de origem
+nodebrowser.target-reference=Refer\u00eancia de destino
+nodebrowser.permissions=Permiss\u00f5es
+nodebrowser.permission=Permiss\u00e3o
+nodebrowser.authority=Autoridade
+nodebrowser.access=Acessar
+nodebrowser.inherits=Herda
+nodebrowser.owner=Propriet\u00e1rio
+nodebrowser.actions=A\u00e7\u00f5es
+nodebrowser.delete=Excluir
+nodebrowser.delete.tip=Exclua o n\u00f3 e quaisquer secund\u00e1rios.
+nodebrowser.force-delete=For\u00e7ar exclus\u00e3o
+nodebrowser.force-delete.tip=Exclua o n\u00f3 e quaisquer secund\u00e1rios. O n\u00f3 n\u00e3o ser\u00e1 arquivado. As regras n\u00e3o ser\u00e3o executadas.
+nodebrowser.restore=Restaurar
+nodebrowser.restore.tip=Restaure o n\u00f3 e quaisquer secund\u00e1rios para seu local original.
+nodebrowser.delete-property.tip=Exclua a propriedade deste n\u00f3.
+nodebrowser.take-ownership=Assumir permiss\u00e3o
+nodebrowser.take-ownership.tip=Assuma a permiss\u00e3o de propriet\u00e1rio do n\u00f3.
+nodebrowser.delete-permissions=Reverter permiss\u00f5es
+nodebrowser.delete-permissions.tip=Exclua todas as permiss\u00f5es que foram explicitamente atribu\u00eddas a este n\u00f3 e restaure a heran\u00e7a de permiss\u00f5es.
+nodebrowser.unlock=Desbloquear
+nodebrowser.unlock.tip=Remova quaisquer bloqueios mantidos por este n\u00f3. Cancela o check-out para qualquer c\u00f3pia de trabalho associada, e a c\u00f3pia de trabalho \u00e9 removida. Observe que todas as modifica\u00e7\u00f5es feitas \u00e0 c\u00f3pia de trabalho ser\u00e3o perdidas.
+nodebrowser.confirm=Tem certeza?
+nodebrowser.message.delete=N\u00f3 exclu\u00eddo com sucesso.
+nodebrowser.message.restore=N\u00f3 restaurado com sucesso.
+nodebrowser.message.take-ownership=Apropria\u00e7\u00e3o feita com sucesso.
+nodebrowser.message.delete-permissions=Permiss\u00f5es removidas com sucesso.
+nodebrowser.message.delete-property=Propriedade exclu\u00edda com sucesso.
+nodebrowser.message.unlock=N\u00f3 desbloqueado com sucesso.
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_ru.properties
new file mode 100644
index 00000000000..3ad479017a5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_ru.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432
+nodebrowser.query=\u0417\u0430\u043f\u0440\u043e\u0441
+nodebrowser.execute=\u0412\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435
+nodebrowser.store=\u0425\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435
+nodebrowser.refresh=\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c
+nodebrowser.root=\u041f\u0435\u0440\u0435\u0447\u0435\u043d\u044c \u043a\u043e\u0440\u043d\u0435\u0432\u044b\u0445 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u043e\u0432
+nodebrowser.search-settings=\u041f\u043e\u0438\u0441\u043a \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0445 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a
+nodebrowser.maxresults=\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u0447\u0438\u0441\u043b\u043e \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432
+nodebrowser.skipcount=\u041f\u0440\u043e\u043f\u0443\u0441\u043a \u043f\u043e\u0434\u0441\u0447\u0435\u0442\u0430
+nodebrowser.null=\u043f\u0443\u0441\u0442\u043e
+nodebrowser.none=<\u043d\u0435\u0442>
+nodebrowser.collection=<c\u0431\u043e\u0440>
+
+nodebrowser.results=\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u044b
+nodebrowser.children=\u0414\u043e\u0447\u0435\u0440\u043d\u0438\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u044b
+nodebrowser.node-info=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e\u0431 \u0443\u0437\u043b\u0435
+nodebrowser.child-name=\u0418\u043c\u044f \u0434\u043e\u0447\u0435\u0440\u043d\u0435\u0433\u043e \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430
+nodebrowser.child-node=\u0421\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 \u0434\u043e\u0447\u0435\u0440\u043d\u0438\u0439 \u044d\u043b\u0435\u043c\u0435\u043d\u0442
+nodebrowser.primary=\u041e\u0441\u043d\u043e\u0432\u043d\u043e\u0439
+nodebrowser.association-type=\u0422\u0438\u043f \u0430\u0441\u0441\u043e\u0446\u0438\u0430\u0446\u0438\u0438
+nodebrowser.index=\u0418\u043d\u0434\u0435\u043a\u0441
+nodebrowser.reference=\u0421\u0441\u044b\u043b\u043a\u0430
+nodebrowser.path=\u041e\u0441\u043d\u043e\u0432\u043d\u043e\u0439 \u043f\u0443\u0442\u044c
+nodebrowser.name=\u0418\u043c\u044f
+nodebrowser.type=\u0422\u0438\u043f
+nodebrowser.value=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435
+nodebrowser.residual=\u041e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u044b\u0439
+nodebrowser.parent=\u0420\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u044d\u043b\u0435\u043c\u0435\u043d\u0442
+nodebrowser.parents=\u0420\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u044b
+nodebrowser.parent-type=\u0422\u0438\u043f \u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0433\u043e \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430
+nodebrowser.parent-reference=\u0421\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 \u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u044d\u043b\u0435\u043c\u0435\u043d\u0442
+nodebrowser.properties=\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430
+nodebrowser.aspects=\u0410\u0441\u043f\u0435\u043a\u0442\u044b
+nodebrowser.associations=\u0410\u0441\u0441\u043e\u0446\u0438\u0430\u0446\u0438\u0438
+nodebrowser.source-assocs=\u0410\u0441\u0441\u043e\u0446\u0438\u0430\u0446\u0438\u0438 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430
+nodebrowser.source-reference=\u0421\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a
+nodebrowser.target-reference=\u0421\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 \u0446\u0435\u043b\u044c
+nodebrowser.permissions=\u041f\u0440\u0430\u0432\u0430
+nodebrowser.permission=\u041f\u0440\u0430\u0432\u043e
+nodebrowser.authority=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
+nodebrowser.access=\u0414\u043e\u0441\u0442\u0443\u043f
+nodebrowser.inherits=\u041d\u0430\u0441\u043b\u0435\u0434\u0443\u0435\u0442
+nodebrowser.owner=\u0412\u043b\u0430\u0434\u0435\u043b\u0435\u0446
+nodebrowser.actions=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044f
+nodebrowser.delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
+nodebrowser.delete.tip=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0443\u0437\u043b\u0430 \u0438 \u0432\u0441\u0435\u0445 \u0434\u043e\u0447\u0435\u0440\u043d\u0438\u0445.
+nodebrowser.force-delete=\u041f\u0440\u0438\u043d\u0443\u0434\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435
+nodebrowser.force-delete.tip=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0443\u0437\u043b\u0430 \u0438 \u0432\u0441\u0435\u0445 \u0434\u043e\u0447\u0435\u0440\u043d\u0438\u0445 \u0443\u0437\u043b\u043e\u0432. \u0410\u0440\u0445\u0438\u0432\u0430\u0446\u0438\u044f \u0443\u0437\u043b\u0430 \u043d\u0435 \u0431\u0443\u0434\u0435\u0442 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u041f\u0440\u0430\u0432\u0438\u043b\u0430 \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u043f\u0440\u0438\u043c\u0435\u043d\u0435\u043d\u044b.
+nodebrowser.restore=\u0412\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435
+nodebrowser.restore.tip=\u0412\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0443\u0437\u043b\u043e\u0432 \u0438 \u0432\u0441\u0435\u0445 \u0434\u043e\u0447\u0435\u0440\u043d\u0438\u0445 \u0443\u0437\u043b\u043e\u0432 \u0432 \u0438\u0441\u0445\u043e\u0434\u043d\u043e\u0435 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435.
+nodebrowser.delete-property.tip=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u0443\u0437\u043b\u0430.
+nodebrowser.take-ownership=\u0421\u0442\u0430\u0442\u044c \u0432\u043b\u0430\u0434\u0435\u043b\u044c\u0446\u0435\u043c
+nodebrowser.take-ownership.tip=\u041f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u0432\u043b\u0430\u0434\u0435\u043b\u044c\u0446\u0430 \u0443\u0437\u043b\u0430.
+nodebrowser.delete-permissions=\u041e\u0431\u0440\u0430\u0449\u0435\u043d\u0438\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0439
+nodebrowser.delete-permissions.tip=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0432\u0441\u0435\u0445 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u044f\u0432\u043d\u044b\u043c \u043e\u0431\u0440\u0430\u0437\u043e\u043c \u0431\u044b\u043b\u0438 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u044b \u0434\u0430\u043d\u043d\u043e\u043c\u0443 \u0443\u0437\u043b\u0443, \u0438 \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0443\u043d\u0430\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u043d\u043d\u044b\u0445 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0439.
+nodebrowser.unlock=\u0420\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c
+nodebrowser.unlock.tip=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0432\u0441\u0435\u0445 \u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u043e\u043a \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u0443\u0437\u043b\u0430. \u041e\u0442\u043c\u0435\u043d\u044f\u0435\u0442 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0443 \u0432\u0441\u0435\u0445 \u0441\u0432\u044f\u0437\u0430\u043d\u043d\u044b\u0445 \u0440\u0430\u0431\u043e\u0447\u0438\u0445 \u043a\u043e\u043f\u0438\u0439 \u0438 \u0443\u0434\u0430\u043b\u044f\u0435\u0442 \u0440\u0430\u0431\u043e\u0447\u0443\u044e \u043a\u043e\u043f\u0438\u044e. \u0421\u043b\u0435\u0434\u0443\u0435\u0442 \u0443\u0447\u0438\u0442\u044b\u0432\u0430\u0442\u044c, \u0447\u0442\u043e \u0432\u0441\u0435 \u043c\u043e\u0434\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438, \u0432\u043d\u0435\u0441\u0435\u043d\u043d\u044b\u0435 \u0432 \u0440\u0430\u0431\u043e\u0447\u0443\u044e \u043a\u043e\u043f\u0438\u044e, \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b.
+nodebrowser.confirm=\u0412\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435?
+nodebrowser.message.delete=\u0423\u0437\u0435\u043b \u0443\u0434\u0430\u043b\u0435\u043d.
+nodebrowser.message.restore=\u0423\u0437\u0435\u043b \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d.
+nodebrowser.message.take-ownership=\u041f\u0440\u0430\u0432\u0430 \u0432\u043b\u0430\u0434\u0435\u043d\u0438\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u044b.
+nodebrowser.message.delete-permissions=\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u0443\u0434\u0430\u043b\u0435\u043d\u044b.
+nodebrowser.message.delete-property=\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0434\u0430\u043b\u0435\u043d\u043e.
+nodebrowser.message.unlock=\u0423\u0437\u0435\u043b \u0440\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d.
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_sv.properties
new file mode 100644
index 00000000000..268381e406d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_sv.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=Nodnavigator
+nodebrowser.query=Fr\u00e5ga
+nodebrowser.execute=Utf\u00f6r
+nodebrowser.store=Lager
+nodebrowser.refresh=Uppdatera sk\u00e4rm
+nodebrowser.root=Rotf\u00f6rteckning
+nodebrowser.search-settings=S\u00f6k avancerade inst\u00e4llningar
+nodebrowser.maxresults=Max resultat
+nodebrowser.skipcount=Hoppa \u00f6ver antal
+nodebrowser.null=noll
+nodebrowser.none=<none>
+nodebrowser.collection=<collection>
+
+nodebrowser.results=Resultat
+nodebrowser.children=Underordnad
+nodebrowser.node-info=Nodinformation
+nodebrowser.child-name=Underordnat namn
+nodebrowser.child-node=Underordnad referens
+nodebrowser.primary=Prim\u00e4r
+nodebrowser.association-type=Associationstyp
+nodebrowser.index=Index
+nodebrowser.reference=Referens
+nodebrowser.path=Prim\u00e4r s\u00f6kv\u00e4g
+nodebrowser.name=Namn
+nodebrowser.type=Typ
+nodebrowser.value=V\u00e4rde
+nodebrowser.residual=Kvarvarande
+nodebrowser.parent=\u00d6verordnad
+nodebrowser.parents=\u00d6verordnade
+nodebrowser.parent-type=\u00d6verordnad typ
+nodebrowser.parent-reference=\u00d6verordnad referens
+nodebrowser.properties=Egenskaper
+nodebrowser.aspects=Aspekter
+nodebrowser.associations=Associationer
+nodebrowser.source-assocs=K\u00e4llassocationer
+nodebrowser.source-reference=K\u00e4llreferens
+nodebrowser.target-reference=M\u00e5lreferens
+nodebrowser.permissions=Beh\u00f6righeter
+nodebrowser.permission=Beh\u00f6righet
+nodebrowser.authority=Befogenhet
+nodebrowser.access=\u00c5tkomst
+nodebrowser.inherits=\u00c4rver
+nodebrowser.owner=\u00c4gare
+nodebrowser.actions=\u00c5tg\u00e4rder
+nodebrowser.delete=Radera
+nodebrowser.delete.tip=Radera noden och eventuella underordnade.
+nodebrowser.force-delete=Tv\u00e5ngsradera
+nodebrowser.force-delete.tip=Radera noden och eventuella underordnade. Noden kommer inte att arkiveras. Regler kommer inte att k\u00f6ras.
+nodebrowser.restore=\u00c5terst\u00e4ll
+nodebrowser.restore.tip=\u00c5terst\u00e4ll noden och eventuella barn till ursprunglig plats.
+nodebrowser.delete-property.tip=Radera egenskapen fr\u00e5n den h\u00e4r noden.
+nodebrowser.take-ownership=Ta \u00e4garskap
+nodebrowser.take-ownership.tip=Ta \u00e4garbeh\u00f6righet f\u00f6r noden.
+nodebrowser.delete-permissions=\u00c5terst\u00e4ll beh\u00f6righeter
+nodebrowser.delete-permissions.tip=Radera alla beh\u00f6righeter som uttryckligen har tilldelats till den h\u00e4r noden och \u00e5terst\u00e4ll beh\u00f6righetsarv.
+nodebrowser.unlock=L\u00e5s upp
+nodebrowser.unlock.tip=Ta bort eventuella l\u00e5s som begr\u00e4nsas av den h\u00e4r noden. Avbryter utcheckningen f\u00f6r associerad arbetskopia och arbetskopian tas bort. Observera att alla modifikationer som gjorts av arbetskopian kommer att g\u00e5 f\u00f6rlorade.
+nodebrowser.confirm=\u00c4r du s\u00e4ker?
+nodebrowser.message.delete=Radering av nod lyckades
+nodebrowser.message.restore=\u00c5terst\u00e4llning av nod lyckades.
+nodebrowser.message.take-ownership=Tog \u00e4gandeskap.
+nodebrowser.message.delete-permissions=Borttagning av beh\u00f6righeter lyckades.
+nodebrowser.message.delete-property=Radering av egenskap lyckades.
+nodebrowser.message.unlock=Uppl\u00e5sning av nod lyckades.
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_zh_CN.properties
new file mode 100644
index 00000000000..db1bf605333
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get_zh_CN.properties
@@ -0,0 +1,64 @@
+nodebrowser.title=\u8282\u70b9\u6d4f\u89c8\u5668
+nodebrowser.query=\u67e5\u8be2
+nodebrowser.execute=\u6267\u884c
+nodebrowser.store=\u5e93
+nodebrowser.refresh=\u5237\u65b0
+nodebrowser.root=\u6839\u5217\u8868
+nodebrowser.search-settings=\u641c\u7d22\u9ad8\u7ea7\u8bbe\u7f6e
+nodebrowser.maxresults=\u6700\u5927\u641c\u7d22\u7ed3\u679c\u6570
+nodebrowser.skipcount=\u8df3\u8fc7\u8ba1\u6570
+nodebrowser.null=\u7a7a
+nodebrowser.none=<none>
+nodebrowser.collection=<collection>
+
+nodebrowser.results=\u7ed3\u679c
+nodebrowser.children=\u5b50\u7ea7
+nodebrowser.node-info=\u4ee3\u7801\u4fe1\u606f
+nodebrowser.child-name=\u5b50\u540d\u79f0
+nodebrowser.child-node=\u5b50\u5f15\u7528
+nodebrowser.primary=\u4e3b
+nodebrowser.association-type=\u5173\u8054\u7c7b\u578b
+nodebrowser.index=\u7d22\u5f15
+nodebrowser.reference=\u5f15\u7528
+nodebrowser.path=\u4e3b\u8def\u5f84
+nodebrowser.name=\u540d\u79f0
+nodebrowser.type=\u7c7b\u578b
+nodebrowser.value=\u503c
+nodebrowser.residual=\u6b8b\u7559
+nodebrowser.parent=\u7236\u7ea7
+nodebrowser.parents=\u7236\u7ea7
+nodebrowser.parent-type=\u7236\u7c7b\u578b
+nodebrowser.parent-reference=\u7236\u5f15\u7528
+nodebrowser.properties=\u5c5e\u6027
+nodebrowser.aspects=\u5207\u9762
+nodebrowser.associations=\u5173\u8054
+nodebrowser.source-assocs=\u6e90\u5173\u8054
+nodebrowser.source-reference=\u6e90\u5f15\u7528
+nodebrowser.target-reference=\u76ee\u6807\u5f15\u7528
+nodebrowser.permissions=\u6743\u9650
+nodebrowser.permission=\u6743\u9650
+nodebrowser.authority=\u6388\u6743
+nodebrowser.access=\u8bbf\u95ee
+nodebrowser.inherits=\u7ee7\u627f
+nodebrowser.owner=\u6240\u6709\u8005
+nodebrowser.actions=\u64cd\u4f5c
+nodebrowser.delete=\u5220\u9664
+nodebrowser.delete.tip=\u5220\u9664\u8282\u70b9\u548c\u4efb\u4f55\u5b50\u8282\u70b9\u3002
+nodebrowser.force-delete=\u5f3a\u5236\u5220\u9664
+nodebrowser.force-delete.tip=\u5220\u9664\u8282\u70b9\u548c\u4efb\u4f55\u5b50\u8282\u70b9\u3002\u6b64\u8282\u70b9\u4e0d\u4f1a\u88ab\u5b58\u6863\u3002\u89c4\u5219\u4e0d\u4f1a\u8fd0\u884c\u3002
+nodebrowser.restore=\u8fd8\u539f
+nodebrowser.restore.tip=\u5c06\u8282\u70b9\u548c\u4efb\u4f55\u5b50\u8282\u70b9\u8fd8\u539f\u5230\u539f\u59cb\u4f4d\u7f6e\u3002
+nodebrowser.delete-property.tip=\u5220\u9664\u6b64\u8282\u70b9\u4e2d\u7684\u5c5e\u6027\u3002
+nodebrowser.take-ownership=\u83b7\u53d6\u6240\u6709\u6743
+nodebrowser.take-ownership.tip=\u83b7\u53d6\u8282\u70b9\u7684\u6240\u6709\u8005\u6743\u9650\u3002
+nodebrowser.delete-permissions=\u6062\u590d\u6743\u9650
+nodebrowser.delete-permissions.tip=\u5220\u9664\u6240\u6709\u5feb\u901f\u6307\u6d3e\u5f97\u5230\u6b64\u8282\u70b9\u7684\u6743\u9650\u5e76\u8fd8\u539f\u6743\u9650\u7ee7\u627f\u3002
+nodebrowser.unlock=\u89e3\u9501
+nodebrowser.unlock.tip=\u5220\u9664\u6b64\u8282\u70b9\u4fdd\u7559\u7684\u4efb\u4f55\u9501\u3002\u53d6\u6d88\u4efb\u4f55\u76f8\u5173\u8054\u5de5\u4f5c\u526f\u672c\u7684\u68c0\u51fa\uff0c\u5de5\u4f5c\u526f\u672c\u88ab\u5220\u9664\u3002\u8bf7\u6ce8\u610f\uff0c\u5bf9\u5de5\u4f5c\u526f\u672c\u6240\u505a\u7684\u5168\u90e8\u4fee\u6539\u5c06\u4e22\u5931\u3002
+nodebrowser.confirm=\u786e\u5b9a\u5417\uff1f?
+nodebrowser.message.delete=\u5df2\u6210\u529f\u5220\u9664\u8282\u70b9\u3002
+nodebrowser.message.restore=\u5df2\u6210\u529f\u8fd8\u539f\u8282\u70b9\u3002
+nodebrowser.message.take-ownership=\u5df2\u6210\u529f\u83b7\u53d6\u6240\u6709\u6743\u3002
+nodebrowser.message.delete-permissions=\u5df2\u6210\u529f\u5220\u9664\u6743\u9650\u3002
+nodebrowser.message.delete-property=\u5df2\u6210\u529f\u5220\u9664\u5c5e\u6027\u3002
+nodebrowser.message.unlock=\u5df2\u6210\u529f\u89e3\u9501\u8282\u70b9\u3002
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.post.desc.xml
new file mode 100644
index 00000000000..a16588d58a1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.post.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+   <shortname>Admin Console - Node Browser</shortname>
+   <description><![CDATA[Admin Console POST method for the Node Browser.]]></description>
+   <url>/admin/admin-nodebrowser</url>
+   <family>AdminConsoleHelper</family>
+   <format default="html">argument</format>
+   <authentication>admin</authentication>
+   <lifecycle>internal</lifecycle>
+   <transaction allow="readonly">required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.get.desc.xml
new file mode 100644
index 00000000000..69c34f3d093
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Alfresco repo usage</shortname>
+  <description>Get repository usage.</description>
+  <url>/api/admin/usage</url>
+  <format default="json" />
+  <authentication>guest</authentication>
+  <transaction allow="readonly">required</transaction>
+  <family>Admin</family>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.get.json.ftl
new file mode 100644
index 00000000000..963be3f7a73
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.get.json.ftl
@@ -0,0 +1,2 @@
+<#import "usage.lib.ftl" as usageLib />
+<@usageLib.usageJSON />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.lib.ftl
new file mode 100644
index 00000000000..f222abfc7e9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.lib.ftl
@@ -0,0 +1,17 @@
+<#macro usageJSON>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "lastUpdate" : <#if lastUpdate??>${lastUpdate?c}<#else>null</#if>,
+   "users" : <#if users??>${users?c}<#else>null</#if>,
+   "documents" : <#if documents??>${documents?c}<#else>null</#if>,
+   "licenseMode" : "${licenseMode}",
+   "readOnly" : ${readOnly?string("true","false")},
+   "updated" : ${updated?string("true","false")},
+   "licenseValidUntil" : <#if licenseValidUntil??>${licenseValidUntil?c}<#else>null</#if>,
+   "licenseHolder" : "<#if licenseHolder??>${licenseHolder}</#if>",
+   "level" : ${level?c},
+   "warnings": [<#list warnings as x>"${x}"<#if x_has_next>, </#if></#list>],
+   "errors": [<#list errors as x>"${x}"<#if x_has_next>, </#if></#list>]
+}
+</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.post.desc.xml
new file mode 100644
index 00000000000..e852951f6c8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.post.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Alfresco repo usage update</shortname>
+  <description>Update and retrieve repository usage</description>
+  <url>/api/admin/usage</url>
+  <format default="json" />
+  <authentication>admin</authentication>
+  <transaction>required</transaction>
+  <family>Admin</family>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.post.json.ftl
new file mode 100644
index 00000000000..963be3f7a73
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/usage.post.json.ftl
@@ -0,0 +1,2 @@
+<#import "usage.lib.ftl" as usageLib />
+<@usageLib.usageJSON />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednode.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednode.put.desc.xml
new file mode 100644
index 00000000000..a4240530d33
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednode.put.desc.xml
@@ -0,0 +1,31 @@
+<webscript>
+   <shortname>PUT a restore request to an archived NodeRef</shortname>
+   <description><![CDATA[
+   Puts a request to restore the specified archived node.<br/>
+   The body of the post should be in the form, e.g.<br/>
+   {<br/>
+   &nbsp;&nbsp;&nbsp;"restoreLocation": ""<br/>
+   }<br/>
+   The restoreLocation parameter is not currently used, but may in future support restoration to somewhere other than the node's original location.<br/>
+   <br/>
+   The response will be of the form, e.g.<br/>
+   {<br/>
+   &nbsp;&nbsp;&nbsp;"data":<br/>
+   &nbsp;&nbsp;&nbsp;{<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"restoredNode":<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"archivedNodeRef": "archive://SpacesStore/74aed939-acce-4cb1-8067-4e912eb0b4f7",<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"status": "SUCCESS",<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"restoredNodeRef": "workspace://SpacesStore/74aed939-acce-4cb1-8067-4e912eb0b4f7",<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"success": true<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br/>
+   &nbsp;&nbsp;&nbsp;}<br/>
+   }<br/>
+   ]]>
+   </description>
+   <url>/api/archive/{store_type}/{store_id}/{id}</url>
+   <format default="json" />
+   <authentication runas="admin">user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednode.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednode.put.json.ftl
new file mode 100644
index 00000000000..44c75078a70
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednode.put.json.ftl
@@ -0,0 +1,14 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "data":
+   {
+      "restoredNode":
+      {
+         "archivedNodeRef": "${restoreNodeReport.archivedNodeRef!""}",
+         "restoredNodeRef": "${restoreNodeReport.restoredNodeRef!""}",
+         "status": "${restoreNodeReport.status!""}",
+         "success": ${restoreNodeReport.status.isSuccess()?string("true", "false")}
+      }
+   }
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednodes.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednodes.delete.desc.xml
new file mode 100644
index 00000000000..5ff95e46bbe
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednodes.delete.desc.xml
@@ -0,0 +1,17 @@
+<webscript>
+   <shortname>DELETE permanently (purge) a node or nodes from the archive</shortname>
+   <description>
+   <![CDATA[
+   DELETE /api/archive/{store_type}/{store_id} purges all items from the archive store which were<br/>
+   originally located in the specified Store. e.g. workspace://SpacesStore<br/>
+   DELETE /api/archive/{store_type}/{store_id}/{id} purges the specified item from the archive store.<br/>
+   For this call, the URL should identify the Node's current NodeRef e.g. archive://SpacesStore/1234-5678-90<br/>
+   ]]>
+   </description>
+   <url>/api/archive/{store_type}/{store_id}</url>
+   <url>/api/archive/{store_type}/{store_id}/{id}</url>
+   <format default="json" />
+   <authentication runas="admin">user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednodes.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednodes.delete.json.ftl
new file mode 100644
index 00000000000..49773ad81bf
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednodes.delete.json.ftl
@@ -0,0 +1,15 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "data":
+   {
+      "purgedNodes":
+      [
+         <#list purgedNodes as purgedNode>
+         {
+            "nodeRef": "${purgedNode}"
+         }<#if purgedNode_has_next>,</#if>
+         </#list>
+      ]
+   }
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednodes.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednodes.get.desc.xml
new file mode 100644
index 00000000000..09d623d6656
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednodes.get.desc.xml
@@ -0,0 +1,52 @@
+<webscript>
+   <shortname>GET archived (deleted) items</shortname>
+   <description>
+      Gets all nodes that have been deleted by the current user and remain in the archive store.
+      If the user is an Administrator, then all the deleted nodes are fetched (regardless of who deleted the nodes).
+      The URL template includes a store_type and a store_id and only nodes which were
+      originally contained within the specified store will be included in the result set.
+   </description>
+   <url>/api/archive/{store_type}/{store_id}?maxItems={maxItems?}&amp;skipCount={skipCount?}&amp;nf={namefilter?}</url>
+   <format default="json" />
+   <authentication runas="admin">user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>internal</lifecycle>
+   <args>
+      <arg>
+         <shortname>maxItems</shortname>
+         <description>Specifies the maximum number of results to return.</description>
+      </arg>
+      <arg>
+         <shortname>skipCount</shortname>
+         <description>Specifies the position in the results to start, used for paging results.</description>
+      </arg>
+   </args>
+   <responses>
+      <response>
+         <format>json</format>
+         <type>
+            <![CDATA[
+            {
+               "data":
+               {
+                  "deletedNodes":
+                  [
+                     {
+                        "nodeRef": string (NodeRef within the Archive Store),
+                        "name": string (cm:name of the deleted node),
+                        "title": string (cm:title of the deleted node),
+                        "description": string (cm:description of the deleted node),
+                        "displayPath": string (path of the node before it was deleted),
+                        "archivedBy": string (username of the user who deleted the node),
+                        "firstName": string (first name of the user who deleted the node),
+                        "lastName": string (last name of the user who deleted the node),
+                        "archivedDate": string (datetime when the node was deleted)
+                     }
+                  ]
+               }
+            }
+            ]]>
+         </type>
+      </response>
+   </responses>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednodes.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednodes.get.json.ftl
new file mode 100644
index 00000000000..bdb9d500825
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/archive/archivednodes.get.json.ftl
@@ -0,0 +1,28 @@
+<#import "../generic-paged-results.lib.ftl" as genericPaging />
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "data":
+   {
+      "deletedNodes":
+      [
+         <#list deletedNodes as deletedNode>
+         {
+            "nodeRef": "${deletedNode.nodeRef}",
+            "archivedBy": "${deletedNode.archivedBy!""}",
+            "archivedDate": "${xmldate(deletedNode.archivedDate)}",
+            "name": "${deletedNode.name!""}",
+            "title": "${deletedNode.title!""}",
+            "description": "${deletedNode.description!""}",
+            "displayPath": "${deletedNode.displayPath!""}",
+            "firstName": "${deletedNode.firstName!""}",
+            "lastName": "${deletedNode.lastName!""}",
+            "nodeType": "${deletedNode.nodeType!""}",
+            "isContentType": ${deletedNode.isContentType?string}
+         }<#if deletedNode_has_next>,</#if>
+         </#list>
+      ]
+   }
+
+   <@genericPaging.pagingJSON />
+}
+</#escape>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/application.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/application.lib.ftl
new file mode 100644
index 00000000000..97f15acfc01
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/application.lib.ftl
@@ -0,0 +1,8 @@
+<#-- Renders an Audit Application. -->
+<#macro auditApplicationJSON auditApplication>
+      {
+         "name": "${auditApplication.name}",
+         "path" : "${auditApplication.key}",
+         "enabled" : ${auditApplication.enabled?string("true","false")}
+      }
+</#macro>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/clear.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/clear.post.desc.xml
new file mode 100644
index 00000000000..6e7b22e72bf
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/clear.post.desc.xml
@@ -0,0 +1,28 @@
+<webscript>
+  <shortname>Alfresco audit service clear</shortname>
+  <description>Delete audit entries for a given application and time range</description>
+  <url>/api/audit/clear/{application}?fromTime={fromTime}&amp;toTime={toTime}</url>
+  <format default="json" />
+  <authentication>admin</authentication>
+  <transaction>required</transaction>
+  <family>Audit</family>
+  <lifecycle>internal</lifecycle>
+  <args>
+    <arg>
+      <name>application</name>
+      <description>Name of the audit application (mandatory)</description>
+    </arg> 
+    <arg>
+      <name>fromTime</name>
+      <description>Time, in milliseconds, of the oldest audit entry to delete (omit to assume oldest)</description>
+    </arg> 
+    <arg>
+      <name>toTime</name>
+      <description>Time, in milleseconds, of the youngest audit entry to delete (omit to assume current time)</description>
+    </arg>
+ </args>
+  
+  <!--  turn off the multipart formdata processing -->
+  <formdata multipart-processing="false" />
+
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/clear.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/clear.post.json.ftl
new file mode 100644
index 00000000000..4c7551007a2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/clear.post.json.ftl
@@ -0,0 +1,3 @@
+{
+   "cleared" : ${cleared?c}
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.get.desc.xml
new file mode 100644
index 00000000000..1e4e2be6ebf
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.get.desc.xml
@@ -0,0 +1,25 @@
+<webscript>
+  <shortname>Get audit status</shortname>
+  <description>Get audit status for a given application and path</description>
+  <url>/api/audit/control</url>
+  <url>/api/audit/control/{application}/{path}</url>
+  <format default="json" />
+  <authentication>admin</authentication>
+  <transaction allow="readonly">required</transaction>
+  <family>Audit</family>
+  <lifecycle>internal</lifecycle>
+  <args>
+    <arg>
+      <name>application</name>
+      <description>Name of the audit application (omit to assume all applications)</description>
+    </arg> 
+    <arg>
+      <name>path</name>
+      <description>Path within the application (the root key of the application at least)</description>
+    </arg> 
+ </args>
+  
+  <!--  turn off the multipart formdata processing -->
+  <formdata multipart-processing="false" />
+
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.get.json.ftl
new file mode 100644
index 00000000000..0ae8a76a82c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.get.json.ftl
@@ -0,0 +1,13 @@
+<#import "application.lib.ftl" as auditApplicationLib />
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "enabled" : ${enabled?string("true","false")},
+   "applications": 
+   [
+      <#list applications as application>
+         <@auditApplicationLib.auditApplicationJSON auditApplication=application />
+         <#if application_has_next>,</#if>
+      </#list>
+   ]
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.post.desc.xml
new file mode 100644
index 00000000000..c3692c5dab3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.post.desc.xml
@@ -0,0 +1,29 @@
+<webscript>
+  <shortname>Change the audit status</shortname>
+  <description>Change the audit status for a given application and path</description>
+  <url>/api/audit/control?enable={enable}</url>
+  <url>/api/audit/control/{application}/{path}?enable={enable}</url>
+  <format default="json" />
+  <authentication>admin</authentication>
+  <transaction>required</transaction>
+  <family>Audit</family>
+  <lifecycle>internal</lifecycle>
+  <args>
+    <arg>
+      <name>application</name>
+      <description>Name of the audit application (omit to assume all applications)</description>
+    </arg> 
+    <arg>
+      <name>path</name>
+      <description>Path within the application (the root key of the application at least)</description>
+    </arg> 
+    <arg>
+      <name>enable</name>
+      <description>'true' or 'false' to change the audit state</description>
+    </arg> 
+ </args>
+  
+  <!--  turn off the multipart formdata processing -->
+  <formdata multipart-processing="false" />
+
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.post.json.ftl
new file mode 100644
index 00000000000..f5fd0a83ace
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.post.json.ftl
@@ -0,0 +1,3 @@
+{
+   "enabled" : ${enabled?string("true","false")}
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.properties
new file mode 100644
index 00000000000..f5e03920ae1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/control.properties
@@ -0,0 +1,7 @@
+# Audit Control Web Script I18N
+audit.err.app.notProvided=Application name not supplied.
+audit.err.app.notFound=Application not found: {0}
+audit.err.path.notProvided=No path was supplied after the application name.
+audit.err.action.invalid=Parameter 'action' must be either 'enable' or 'disable'
+audit.err.value.classNotFound=''valueType'' not recognised: {0}
+audit.err.value.convertFailed=Unable to convert ''{0}'' to type ''{1}''
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry.delete.desc.xml
new file mode 100644
index 00000000000..579cc641c22
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry.delete.desc.xml
@@ -0,0 +1,19 @@
+<webscript>
+  <shortname>Alfresco audit service entry delete</shortname>
+  <description>Delete audit entry with the specified id</description>
+  <url>/api/audit/entries/{id}</url>
+  <format default="json" />
+  <authentication>admin</authentication>
+  <transaction>required</transaction>
+  <family>Audit</family>
+  <lifecycle>internal</lifecycle>
+  <args>
+    <arg>
+      <name>id</name>
+      <description>The audit entry id</description>
+    </arg> 
+  </args>
+  <!--  turn off the multipart formdata processing -->
+  <formdata multipart-processing="false" />
+
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry.delete.json.ftl
new file mode 100644
index 00000000000..89bdd9248db
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry.delete.json.ftl
@@ -0,0 +1,3 @@
+{
+   "deleted" : ${deleted}
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry.properties
new file mode 100644
index 00000000000..17e0edd0032
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=Audit Entry id not provided
+audit.err.entry.id.notfound=Audit Entry id {1} not found
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_cs.properties
new file mode 100644
index 00000000000..468665c05dc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_cs.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=Neuvedeno ID z\u00e1znamu auditu
+audit.err.entry.id.notfound=Nenalezen z\u00e1znam auditu s\u00a0ID {1}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_da.properties
new file mode 100644
index 00000000000..e79a4df9e9c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_da.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=Overv\u00e5gningspost-id'et blev ikke angivet
+audit.err.entry.id.notfound=Overv\u00e5gningspost-id''et {1} blev ikke fundet
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_de.properties
new file mode 100644
index 00000000000..98ba0078cb5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_de.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=ID f\u00fcr Audit-Eintrag nicht angegeben
+audit.err.entry.id.notfound=ID f\u00fcr Audit-Eintrag {1} nicht gefunden
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_es.properties
new file mode 100644
index 00000000000..25d41afa5b6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_es.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=Id. de entrada de auditoria no suministrado
+audit.err.entry.id.notfound=Id. de entrada de auditoria {1} no suministrado
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_fi.properties
new file mode 100644
index 00000000000..4ed595d7e8c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_fi.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=Tarkastusmerkint\u00e4tunnusta ei annettu
+audit.err.entry.id.notfound=Tarkastusmerkint\u00e4tunnusta {1} ei l\u00f6ydy
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_fr.properties
new file mode 100644
index 00000000000..d0b122a33b4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_fr.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=L'ID de l'entr\u00e9e d'audit n'est pas fourni
+audit.err.entry.id.notfound=ID de l''entr\u00e9e d''audit {1} introuvable
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_it.properties
new file mode 100644
index 00000000000..3d4b5a2f11b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_it.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=ID voce di controllo non fornito
+audit.err.entry.id.notfound=ID voce di controllo {1} non trovato
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_ja.properties
new file mode 100644
index 00000000000..0aa3818826e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_ja.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=\u76e3\u67fb\u30a8\u30f3\u30c8\u30eaid\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+audit.err.entry.id.notfound=\u76e3\u67fb\u30a8\u30f3\u30c8\u30eaid{1}\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_nb.properties
new file mode 100644
index 00000000000..fbd6f8613c2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_nb.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=Revisjonsoppf\u00f8ring id ikke angitt
+audit.err.entry.id.notfound=Revisjonsoppf\u00f8ring id {1} ikke funnet
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_nl.properties
new file mode 100644
index 00000000000..11cd845805b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_nl.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=Audit-entry is niet verstrekt
+audit.err.entry.id.notfound=Audit-entry-id {1} niet gevonden
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_pl.properties
new file mode 100644
index 00000000000..ba9e2207300
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_pl.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=Identyfikator wpisu inspekcji jest niedost\u0119pny
+audit.err.entry.id.notfound=Identyfikator wpisu inspekcji {1} nie zosta\u0142 znaleziony
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_pt_BR.properties
new file mode 100644
index 00000000000..4429f3bb74a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_pt_BR.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=ID de entrada de auditoria n\u00e3o fornecida
+audit.err.entry.id.notfound=ID de entrada de auditoria {1} n\u00e3o encontrada
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_ru.properties
new file mode 100644
index 00000000000..04dd5e32794
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_ru.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0437\u0430\u043f\u0438\u0441\u0438 \u0430\u0443\u0434\u0438\u0442\u0430 \u043d\u0435 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d
+audit.err.entry.id.notfound=\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0437\u0430\u043f\u0438\u0441\u0438 \u0430\u0443\u0434\u0438\u0442\u0430 {1} \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_sv.properties
new file mode 100644
index 00000000000..7f3ada3a2ae
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_sv.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=Revisionspost-ID angavs inte
+audit.err.entry.id.notfound=Revisionspost-ID {1} hittades inte
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_zh_CN.properties
new file mode 100644
index 00000000000..74a3f5fc3fa
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/entry_zh_CN.properties
@@ -0,0 +1,2 @@
+audit.err.entry.id.notProvided=\u5ba1\u8ba1\u6761\u76ee id \u672a\u63d0\u4f9b
+audit.err.entry.id.notfound=\u5ba1\u8ba1\u6761\u76ee id {1} \u672a\u627e\u5230
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/query.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/query.get.desc.xml
new file mode 100644
index 00000000000..515bde4bb33
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/query.get.desc.xml
@@ -0,0 +1,112 @@
+<webscript>
+  <shortname>Alfresco audit service query</shortname>
+  <description>
+    <![CDATA[
+    Query to retrieve audit events.
+    
+    JSON returned:
+    {
+       "count":2,
+       "entries": 
+       [
+          {
+             "id":49,
+             "application":AlfrescoRepository,
+             "user":testAuditAuthenticationService,
+             "time":"2010-09-01T14:02:08.454+01:00",
+             "values":
+             {
+                         "\/repository\/login\/error\/user":"testAuditAuthenticationService"
+             }
+             
+          },
+          {
+             "id":51,
+             "application":AlfrescoRepository,
+             "user":null,
+             "time":"2010-09-01T15:26:07.571+01:00",
+             "values":
+             {
+                         "\/repository\/login\/error\/user":"banana"
+             }
+          }
+       ]
+    }
+       
+    To get the last entry ID:
+       /api/audit/query/{application}?forward=false&limit=1&verbose=false
+    
+    Note: It is not possible to get a total result count without executing the query.
+    ]]>
+  </description>
+  <url>/api/audit/query/{application}?fromId={fromId}&amp;toId={toId}&amp;fromTime={fromTime}&amp;toTime={toTime}&amp;user={user}&amp;forward={forward}&amp;limit={limit}&amp;verbose={verbose}</url>
+  <url>/api/audit/query/{application}/{path}?value={value}&amp;valueType={valueType}&amp;fromId={fromId}&amp;toId={toId}&amp;fromTime={fromTime}&amp;toTime={toTime}&amp;user={user}&amp;forward={forward}&amp;limit={limit}&amp;verbose={verbose}</url>
+  <format default="json" />
+  <authentication>admin</authentication>
+  <transaction allow="readonly">required</transaction>
+  <family>Audit</family>
+  <lifecycle>internal</lifecycle>
+  <args>
+    <arg>
+      <name>application</name>
+      <description>
+        <![CDATA[
+        Name of the audit application (mandatory).
+        e.g. /api/audit/query/AlfrescoRepository : AlfrescoRepository
+        ]]>
+      </description>
+    </arg> 
+    <arg>
+      <name>path</name>
+      <description>
+        <![CDATA[
+        Full value path to search against.
+        e.g. /api/audit/query/AlfrescoRepository/repository/login/error/user : /repository/login/error/user
+        ]]>
+      </description>
+    </arg> 
+    <arg>
+      <name>value</name>
+      <description>
+        <![CDATA[
+        Optional value to search for.  If no 'valueType' is specified, then the value will be treated as a String. 
+        ]]>
+      </description>
+    </arg> 
+    <arg>
+      <name>valueType</name>
+      <description>
+        <![CDATA[
+        Optional class name to convert the 'value' parameter.
+        e.g. valueType=java.lang.Long 
+        ]]>
+      </description>
+    </arg> 
+    <arg>
+      <name>limit</name>
+      <description>
+        <![CDATA[
+        Optionally limit the number of entries retrieved.
+        e.g. limit=100
+        The default, when unspecified, is 100.  Using extreme values will result in memory issues
+        during the FreeMarker template conversion.  It is possible to use the lower bound ID-based
+        queries ('fromId'), in conjunction with the 'limit' parameter, to page through results.
+        ]]>
+      </description>
+    </arg> 
+    <arg>
+      <name>verbose</name>
+      <description>
+        <![CDATA[
+        Determine if entry 'values' should be returned.
+        e.g. verbose=true  : pull back all entry values
+        e.g. verbose=false : ignore all entry values 
+        ]]>
+      </description>
+    </arg> 
+ </args>
+  
+  <!--  turn off the multipart formdata processing -->
+  <formdata multipart-processing="false" />
+
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/query.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/query.get.json.ftl
new file mode 100644
index 00000000000..043d7f6d040
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/audit/query.get.json.ftl
@@ -0,0 +1,27 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "count":${count?c},
+   "entries": 
+   [
+      <#list entries as entry>
+      {
+         "id":${entry.id?c},
+         "application":"${entry.application}",
+         "user":<#if entry.user??>"${entry.user}"<#else>null</#if>,
+         "time":"${xmldate(entry.time)}",
+         "values":
+         <#if entry.values??>
+         {
+             <#assign first=true>
+             <#list entry.values?keys as k>
+                 <#if entry.values[k]??>
+                     <#if !first>,<#else><#assign first=false></#if>"${k}":<#assign value = entry.values[k]>"${value}"
+                 </#if>
+             </#list>
+         }
+         <#else>null</#if>
+      }<#if entry_has_next>,</#if>
+      </#list>
+   ]
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/authentication.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/authentication.get.desc.xml
new file mode 100644
index 00000000000..5e3fa5188f7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/authentication.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Authentication</shortname>
+  <description>Authentication stack information</description>
+  <url>/api/authentication</url>
+  <format default="json"/>
+  <authentication>none</authentication>
+  <transaction>none</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/authentication.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/authentication.get.json.ftl
new file mode 100644
index 00000000000..e698f1ed001
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/authentication.get.json.ftl
@@ -0,0 +1,6 @@
+{
+	"data":
+	{
+		"creationAllowed": ${creationAllowed?string}
+	}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog.lib.ftl
new file mode 100644
index 00000000000..f5e782617cc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog.lib.ftl
@@ -0,0 +1,31 @@
+<#--
+   This template renders the blog data object.
+-->
+<#macro blogJSON item>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "qnamePath": "${item.qnamePath}",
+   "detailsUrl": "blog/node/${item.nodeRef?replace('://', '/')}",
+   "blogPostsUrl": "blog/node/${item.nodeRef?replace('://', '/')}/posts",
+   "type": "${item.properties["blg:blogImplementation"]!''}",
+   "id": "${item.properties["blg:id"]!'0'}",
+   "name": "${item.properties["blg:name"]!''}",
+   "description": "${item.properties["blg:description"]!''}",
+   "url": "${item.properties["blg:url"]!''}",
+   "username": "${item.properties["blg:userName"]!''}",
+   "password": "${item.properties["blg:password"]!''}",
+   "permissions":
+   {
+      <#if item.getParent()?? && item.getTypeShort() != "st:site" >
+        "create": ${(item.getParent()).hasPermission("CreateChildren")?string},
+        "edit": ${(item.getParent()).hasPermission("Write")?string},
+        "delete": ${(item.getParent()).hasPermission("Delete")?string}
+      <#else>
+        "create": ${item.hasPermission("CreateChildren")?string},
+        "edit": ${item.hasPermission("Write")?string},
+        "delete": ${item.hasPermission("Delete")?string}
+      </#if>
+   }
+}
+</#escape>
+</#macro>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog.lib.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog.lib.js
new file mode 100644
index 00000000000..56f265d812b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog.lib.js
@@ -0,0 +1,49 @@
+
+/** Name of the blog details aspect. */
+const BLOG_DETAILS_ASPECT = "blg:blogDetails";
+
+/**
+ * Fetches the blog properties from the json object and adds them to an array
+ * using the correct property names as indexes.
+ */
+function getBlogPropertiesArray()
+{
+   var arr = new Array();
+   if (json.has("blogType"))
+   {
+      arr["blg:blogImplementation"] = json.get("blogType");
+   }
+   if (json.has("blogId"))
+   {
+      arr["blg:id"] = json.get("blogId");
+   }
+   if (json.has("blogName"))
+   {
+      arr["blg:name"] = json.get("blogName");
+   }
+   if (json.has("blogDescription"))
+   {
+      arr["blg:description"] = json.get("blogDescription");
+   }
+   if (json.has("blogUrl"))
+   {
+      arr["blg:url"] = json.get("blogUrl");
+   }
+   if (json.has("username"))
+   {
+      arr["blg:userName"] = json.get("username");
+   }
+   if (json.has("password"))
+   {
+      arr["blg:password"] = json.get("password");
+   }
+   return arr;
+}
+
+/**
+ * Returns the data object of a blog node.
+ */
+function getBlogData(node)
+{
+   return node;
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.get.desc.xml
new file mode 100644
index 00000000000..318ccfff7d1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get blog</shortname>
+  <description>Get the blog information.</description>
+  <url>/api/blog/site/{site}/{container}/{path}</url>
+  <url>/api/blog/site/{site}/{container}</url>
+  <url>/api/blog/node/{store_type}/{store_id}/{id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.get.json.ftl
new file mode 100644
index 00000000000..cc1616611b6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.get.json.ftl
@@ -0,0 +1,4 @@
+<#import "../blog.lib.ftl" as blogLib/>
+{
+	"item" : <@blogLib.blogJSON item=item />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.put.desc.xml
new file mode 100644
index 00000000000..c77db3c4d30
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.put.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Put blog</shortname>
+  <description>Updates a blog.</description>
+  <url>/api/blog/site/{site}/{container}/{path}</url>
+  <url>/api/blog/site/{site}/{container}</url>
+  <url>/api/blog/node/{store_type}/{store_id}/{id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.put.json.ftl
new file mode 100644
index 00000000000..cc1616611b6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blog/blog.put.json.ftl
@@ -0,0 +1,4 @@
+<#import "../blog.lib.ftl" as blogLib/>
+{
+	"item" : <@blogLib.blogJSON item=item />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blogpost.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blogpost.lib.ftl
new file mode 100644
index 00000000000..e56121b7623
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blogpost.lib.ftl
@@ -0,0 +1,116 @@
+<#import "../generic-paged-results.lib.ftl" as gen/>
+
+<#-- Renders a person object. -->
+<#macro renderPerson person fieldName>
+<#escape x as jsonUtils.encodeJSONString(x)>
+	"${fieldName}":
+	{
+		<#if person.assocs["cm:avatar"]??>
+		"avatarRef": "${person.assocs["cm:avatar"][0].nodeRef?string}",
+		</#if>
+		"username": "${person.properties["cm:userName"]}",
+		"firstName": "${person.properties["cm:firstName"]!""}",
+		"lastName": "${person.properties["cm:lastName"]!""}"
+	},
+</#escape>
+</#macro>
+
+
+<#macro addContent item>
+<#escape x as jsonUtils.encodeJSONString(x)>
+   <#assign safecontent=stringUtils.stripUnsafeHTML(item.node.content)>
+	<#if (contentLength?? && contentLength > -1 && (safecontent?length > contentLength))>
+		"content": "${safecontent?substring(0, contentLength)}",
+	<#else>
+		"content": "${safecontent}",
+	</#if>
+</#escape>
+</#macro>
+
+<#--
+	This template renders a blog post.
+-->
+<#macro blogpostJSON item>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+	"url": "blog/post/node/${item.node.nodeRef?replace('://','/')}",
+	"commentsUrl": "/node/${item.node.nodeRef?replace('://','/')}/comments",
+	"nodeRef": "${item.node.nodeRef}",
+	"name": "${item.node.properties.name!''}",
+	"title": "${item.node.properties.title!''}",
+	<@addContent item=item />
+	<#if item.author??>
+	<@renderPerson person=item.author fieldName="author" />
+	<#else>
+	"author":
+	{
+		"username": "${item.node.properties.creator}"
+	},
+	</#if>
+	"createdOn": "${formatDateRFC822(item.createdDate)}", 
+	"modifiedOn": "${formatDateRFC822(item.modifiedDate)}", 
+	"permissions":
+	{
+		"edit": ${item.node.hasPermission("Write")?string},
+		"delete": ${item.node.hasPermission("Delete")?string}
+	},
+	"commentCount": ${item.commentCount?c},
+	"tags": [<#list item.tags as x>"${x}"<#if x_has_next>, </#if></#list>],
+	<#-- draft vs internal published -->
+	"isDraft": ${item.isDraft?string},
+	<#if (! item.isDraft)>
+		"releasedOn": "${formatDateRFC822(item.releasedDate)}",
+	</#if>
+	<#-- true if the post has been updated -->
+	"isUpdated": ${item.isUpdated?string},
+	<#if (item.isUpdated)>
+		"updatedOn": "${formatDateRFC822(item.updatedDate)}",
+	</#if>
+	<#if (item.node.properties["blg:published"]?? && item.node.properties["blg:published"] == true)>
+	"publishedOn": "${formatDateRFC822(item.node.properties["blg:posted"])}",
+	"updatedOn": "${formatDateRFC822(item.node.properties["blg:lastUpdate"])}",
+	"postId": "${item.node.properties["blg:postId"]!''}",
+	"postLink": "${item.node.properties["blg:link"]!''}",
+	"outOfDate": ${item.outOfDate?string},
+	</#if>
+	<#-- external publishing - last to make sure that we correctly end the response without a comma -->
+	"isPublished": ${(item.node.properties["blg:published"]!'false')?string}
+}
+</#escape>
+</#macro>
+
+<#macro renderPostList>
+{
+	"metadata":
+	{
+		"blogPermissions":
+		{
+			"create": ${blog.hasPermission("CreateChildren")?string},
+			"edit": ${blog.hasPermission("Write")?string},
+			"delete": ${blog.hasPermission("Delete")?string}
+		},
+		"externalBlogConfig": ${externalBlogConfig?string}
+	},
+	"totalRecordsUpper": ${data.totalRecordsUpper?string("true","false")},
+<@gen.pagedResults data=data ; item>
+	<@blogpostJSON item=item />
+</@gen.pagedResults>
+}
+</#macro>
+
+<#macro renderPost>
+{
+	"metadata":
+	{
+		"externalBlogConfig": ${externalBlogConfig?string}
+	},
+	"item": <@blogpostJSON item=item />
+}
+</#macro>
+
+<#function formatDateRFC822 dateItem> 
+    <# local temp=${.locale}  --> 
+    <#setting locale="en_US"> 
+    <#return dateItem?datetime?string("EEE, d MMM yyyy HH:mm:ss Z")> 
+    <# setting locale=temp --> 
+</#function> 
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blogpost.lib.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blogpost.lib.js
new file mode 100644
index 00000000000..3fd174e74dd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/blogpost.lib.js
@@ -0,0 +1,130 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/comments/comments.lib.js">
+
+const ASPECT_SYNDICATION = "cm:syndication";
+const PROP_PUBLISHED = "cm:published";
+const PROP_UPDATED = "cm:updated";
+
+function setOrUpdateReleasedAndUpdatedDates(node)
+{
+   // make sure the syndication aspect has been added
+   if (!node.hasAspect(ASPECT_SYNDICATION))
+   {
+      node.addAspect(ASPECT_SYNDICATION, []);
+   }
+   
+   // (re-)enable permission inheritance which got disable for draft posts
+   // only set if was previously draft - as only the owner/admin can do this
+   if (!node.inheritsPermissions())
+   {
+      // MNT-12082
+      node.removePermission("All", node.getOwner());
+      node.setInheritsPermissions(true);
+   }
+   
+   // check whether the published date has been set
+   if (!node.properties[PROP_PUBLISHED])
+   {
+      // set the published date
+      node.properties[PROP_PUBLISHED] = new Date();
+      node.save();
+   }
+   else
+   {
+      // set/update the updated date
+      node.properties[PROP_UPDATED] = new Date();
+      node.save();
+   }
+}
+
+/**
+ * Returns the data of a blog post.
+ */
+function getBlogPostData(node)
+{
+   var data = {};
+   data.node = node;
+   data.author = people.getPerson(node.properties["cm:creator"]);
+   data.commentCount = getCommentsCount(node);
+   
+   // is the post published
+   var isPublished = (node.properties[PROP_PUBLISHED] !== null);
+   if (isPublished)
+   {
+      data.releasedDate = node.properties[PROP_PUBLISHED];
+   }
+   
+   // draft
+   data.isDraft = ! isPublished;
+   
+   // set the isUpdated flag
+   var isUpdated = (node.properties[PROP_UPDATED] !== null);
+   data.isUpdated = isUpdated;
+   if (isUpdated)
+   {
+      data.updatedDate = node.properties[PROP_UPDATED];
+   }
+   
+   // fetch standard created/modified dates
+   data.createdDate = node.properties["cm:created"];
+   data.modifiedDate = node.properties["cm:modified"];
+   
+   // does the external post require an update?
+   if (isPublished && (node.properties["blg:lastUpdate"] !== null))
+   {
+      // we either use the release or updated date
+      var modifiedDate = data.releasedDate;
+      if (isUpdated)
+      {
+         modifiedDate = data.updatedDate;
+      }
+       
+      if ((modifiedDate - node.properties["blg:lastUpdate"]) > 5000)
+      {
+         data.outOfDate = true;
+      }
+      else
+      {
+         data.outOfDate = false;
+      }
+   }
+   else
+   {
+      data.outOfDate = false;
+   }
+   
+   // tags
+   if (node.tags !== null)
+   {
+       data.tags = node.tags;
+   }
+   else
+   {
+       data.tags = [];
+   }
+   
+   return data;
+}
+
+/**
+ * Checks whether a blog configuration is available
+ * This should at some point also check whether the configuration is enabled.
+ * 
+ * @param node the node that should be checked. Will check all parents if
+ *        the node itself doesn't contain a configuration.
+ * @return {boolean} whether a configuration could be found.
+ */
+function hasExternalBlogConfiguration(node)
+{
+   if (node === null || !node.hasPermission("ReadProperties"))
+   {
+      return false;
+   }
+   else if (node.hasAspect("blg:blogDetails"))
+   {
+      return true;
+   }
+   else
+   {
+      return hasExternalBlogConfiguration(node.parent);
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete.desc.xml
new file mode 100644
index 00000000000..2b6aeb36f70
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Delete blog post</shortname>
+  <description>Deletes a blog post.</description>
+  <url>/api/blog/post/site/{site}/{container}/{path}</url>
+  <url>/api/blog/post/node/{store_type}/{store_id}/{id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete.json.ftl
new file mode 100644
index 00000000000..9a228685155
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete.json.ftl
@@ -0,0 +1,3 @@
+{
+    "message" : "${message}"
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete.properties
new file mode 100644
index 00000000000..474e1470543
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=Blog {0} deleted
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_cs.properties
new file mode 100644
index 00000000000..1db101ebccd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_cs.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=Odstran\u011bn blog {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_da.properties
new file mode 100644
index 00000000000..f070ceebf15
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_da.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=Bloggen {0} blev slettet
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_de.properties
new file mode 100755
index 00000000000..7ac89a6a3aa
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_de.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=Blog {0} gel\u00f6scht
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_es.properties
new file mode 100755
index 00000000000..5aadf015152
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_es.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=Blog {0} eliminado
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_fi.properties
new file mode 100644
index 00000000000..1d006b6f793
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_fi.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=Blogi {0} poistettu
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_fr.properties
new file mode 100755
index 00000000000..a9cc3794ee2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_fr.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=Blog {0} supprim\u00e9
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_it.properties
new file mode 100755
index 00000000000..528bb1f41e0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_it.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=Blog {0} eliminato
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_ja.properties
new file mode 100755
index 00000000000..29448bdd3e1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_ja.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=\u30d6\u30ed\u30b0 "{0}" \u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_nb.properties
new file mode 100755
index 00000000000..61ea5282e38
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_nb.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=Bloggen {0} ble slettet
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_nl.properties
new file mode 100755
index 00000000000..e391da04454
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_nl.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=Blog {0} verwijderd
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_pl.properties
new file mode 100644
index 00000000000..6ab5590be08
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_pl.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=Blog {0} zosta\u0142 usuni\u0119ty
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_pt_BR.properties
new file mode 100644
index 00000000000..764ef851376
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_pt_BR.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=Blog {0} exclu\u00eddo
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_ru.properties
new file mode 100755
index 00000000000..d42a016a30b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_ru.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=\u0411\u043b\u043e\u0433 {0} \u0443\u0434\u0430\u043b\u0435\u043d
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_sv.properties
new file mode 100644
index 00000000000..d3ec7797858
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_sv.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=Blogg {0} raderad
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_zh_CN.properties
new file mode 100755
index 00000000000..6cd3c84da70
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.delete_zh_CN.properties
@@ -0,0 +1 @@
+blog-post.msg.deleted=\u5df2\u5220\u9664\u535a\u5ba2 {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.get.desc.xml
new file mode 100644
index 00000000000..1f957007783
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Get all blogs</shortname>
+  <description>Gets all blogs.</description>
+  <url>/api/blog/post/site/{site}/{container}/{path}</url>
+  <url>/api/blog/post/node/{store_type}/{store_id}/{id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.get.json.ftl
new file mode 100644
index 00000000000..709882b67f6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.get.json.ftl
@@ -0,0 +1,2 @@
+<#import "../blogpost.lib.ftl" as blogpostLib/>
+<@blogpostLib.renderPost />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.desc.xml
new file mode 100644
index 00000000000..d5e377c7679
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Update blog post</shortname>
+  <description>Updates a blog post.</description>
+  <url>/api/blog/post/site/{site}/{container}/{path}</url>
+  <url>/api/blog/post/node/{store_type}/{store_id}/{id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.json.ftl
new file mode 100644
index 00000000000..709882b67f6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.json.ftl
@@ -0,0 +1,2 @@
+<#import "../blogpost.lib.ftl" as blogpostLib/>
+<@blogpostLib.renderPost />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.json.js
new file mode 100644
index 00000000000..4c52114aba4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/post/blog-post.put.json.js
@@ -0,0 +1,91 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/requestutils.lib.js">
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/blogs/blogpost.lib.js">
+
+/**
+ * Updates the draft mode part of the post
+ */
+function updateBlogPostDraftMode(postNode)
+{
+   // make sure the user doesn't try to put a non-draft
+   // post back into draft node
+   var currentDraft = (postNode.properties[PROP_PUBLISHED] == undefined);
+   var isDraft = json.has("draft") && json.get("draft").toString() == "true";
+   
+   // requested draft, previously non-draft: throw an exception
+   if (isDraft && !currentDraft)
+   {
+       // set an error
+      status.setCode(status.STATUS_BAD_REQUEST, "Cannot put a published post back into draft mode");
+      return null;
+   }
+   
+   if (!isDraft)
+   {
+      setOrUpdateReleasedAndUpdatedDates(postNode);
+   }
+}
+
+/**
+ * Updates a blog post node
+ */
+function updateBlogPost(postNode)
+{
+   // fetch the new data
+   var title = "";
+   if (json.has("title"))
+   {
+      title = json.get("title");
+   }
+   var content = "";
+   if (json.has("content"))
+   {
+      content = json.get("content");
+   }
+   var tags = [];
+   if (json.has("tags"))
+   {
+      // get the tags JSONArray and copy it into a real javascript array object
+      var tmp = json.get("tags");
+      for (var x=0; x < tmp.length(); x++)
+      {
+          tags.push(tmp.get(x));
+      }
+   }
+   
+   // update the node
+   postNode.properties["cm:title"] = title;
+   postNode.mimetype = "text/html";
+   postNode.content = content
+   postNode.tags = tags;
+   postNode.save();
+   
+   updateBlogPostDraftMode(postNode);
+}
+
+function main()
+{
+   // get requested node
+   var node = getRequestNode();
+   if (status.getCode() != status.STATUS_OK)
+   {
+      return;
+   }
+
+   // update blog post
+   updateBlogPost(node);
+   
+   model.item = getBlogPostData(node);
+   model.externalBlogConfig = hasExternalBlogConfiguration(node);
+   
+   if (json.has("site") && json.has("container") && json.has("page") && !model.item.isDraft)
+   {
+      var data =
+      {
+         title: model.item.node.properties.title,
+         page: json.get("page") + "?postId=" + model.item.node.properties.name
+      }
+      activities.postActivity("org.alfresco.blog.post-updated", json.get("site"), "blog", jsonUtils.toJSONString(data));
+   }
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mydrafts.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mydrafts.get.desc.xml
new file mode 100644
index 00000000000..592b003de7c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mydrafts.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get blog posts (draft)</shortname>
+  <description>Gets all draft posts for a blog.</description>
+  <url>/api/blog/site/{site}/{container}/{path}/posts/mydrafts</url>
+  <url>/api/blog/site/{site}/{container}/posts/mydrafts</url>
+  <url>/api/blog/node/{store_type}/{store_id}/{id}/posts/mydrafts</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mydrafts.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mydrafts.get.json.ftl
new file mode 100644
index 00000000000..8c931b77a30
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mydrafts.get.json.ftl
@@ -0,0 +1,2 @@
+<#import "../blogpost.lib.ftl" as blogpostLib/>
+<@blogpostLib.renderPostList />
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mypublished.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mypublished.get.desc.xml
new file mode 100644
index 00000000000..34a4911d092
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mypublished.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get blog posts (published)</shortname>
+  <description>Gets all published posts for a blog.</description>
+  <url>/api/blog/site/{site}/{container}/{path}/posts/mypublished</url>
+  <url>/api/blog/site/{site}/{container}/posts/mypublished</url>
+  <url>/api/blog/node/{store_type}/{store_id}/{id}/posts/mypublished</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mypublished.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mypublished.get.json.ftl
new file mode 100644
index 00000000000..b955ab5451b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-mypublished.get.json.ftl
@@ -0,0 +1,2 @@
+<#import "../blogpost.lib.ftl" as blogpostLib/>
+<@blogpostLib.renderPostList />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-new.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-new.get.desc.xml
new file mode 100644
index 00000000000..e113d6cd6be
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-new.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get blog posts for a number of days</shortname>
+  <description>Get all posts for a blog that were created within the specified number of days.</description>
+  <url>/api/blog/site/{site}/{container}/{path}/posts/new?numdays={numdays}</url>
+  <url>/api/blog/site/{site}/{container}/posts/new?numdays={numdays}</url>
+  <url>/api/blog/node/{store_type}/{store_id}/{id}/posts/new?numdays={numdays}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-new.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-new.get.json.ftl
new file mode 100644
index 00000000000..b955ab5451b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-new.get.json.ftl
@@ -0,0 +1,2 @@
+<#import "../blogpost.lib.ftl" as blogpostLib/>
+<@blogpostLib.renderPostList />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-per-month.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-per-month.get.desc.xml
new file mode 100644
index 00000000000..78989e4b9fb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-per-month.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get blog posts per month</shortname>
+  <description>Gets all months for which there are blog posts plus the number of posts in each.</description>
+  <url>/api/blog/site/{site}/{container}/{path}/postspermonth</url>
+  <url>/api/blog/site/{site}/{container}/postspermonth</url>
+  <url>/api/blog/node/{store_type}/{store_id}/{id}/postspermonth</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-per-month.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-per-month.get.json.ftl
new file mode 100644
index 00000000000..decf31b8ddf
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts-per-month.get.json.ftl
@@ -0,0 +1,17 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+	"items" : [	
+		<#list data as item>
+			{
+				"firstPostInMonth" : "${item.firstPostInMonth?string("MMM dd yyyy HH:mm:ss 'GMT'Z '('zzz')'")}",
+				"beginOfMonth" : "${item.beginOfMonth?string("MMM dd yyyy HH:mm:ss 'GMT'Z '('zzz')'")}",
+				"endOfMonth" : "${item.endOfMonth?string("MMM dd yyyy HH:mm:ss 'GMT'Z '('zzz')'")}",
+				"year" : ${item.year?c},
+				"month" : ${item.month?c},  <#-- Note: January -->
+				"postCount" : ${item.count?c}
+			}
+			<#if item_has_next>,</#if>
+		</#list>
+	]
+}
+</#escape>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.get.desc.xml
new file mode 100644
index 00000000000..66475883aee
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get blog posts</shortname>
+  <description>Gets all posts for a blog.</description>
+  <url>/api/blog/site/{site}/{container}/{path}/posts</url>
+  <url>/api/blog/site/{site}/{container}/posts</url>
+  <url>/api/blog/node/{store_type}/{store_id}/{id}/posts</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.get.json.ftl
new file mode 100644
index 00000000000..b955ab5451b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.get.json.ftl
@@ -0,0 +1,2 @@
+<#import "../blogpost.lib.ftl" as blogpostLib/>
+<@blogpostLib.renderPostList />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.desc.xml
new file mode 100644
index 00000000000..f29672a29f9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Create blog post</shortname>
+  <description>Creates a new blog post.</description>
+  <url>/api/blog/site/{site}/{container}/{path}/posts</url>
+  <url>/api/blog/site/{site}/{container}/posts</url>
+  <url>/api/blog/node/{store_type}/{store_id}/{id}/posts</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.json.ftl
new file mode 100644
index 00000000000..709882b67f6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/blogs/posts/blog-posts.post.json.ftl
@@ -0,0 +1,2 @@
+<#import "../blogpost.lib.ftl" as blogpostLib/>
+<@blogpostLib.renderPost />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ajaxspace.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ajaxspace.get.desc.xml
new file mode 100644
index 00000000000..426054e2a60
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ajaxspace.get.desc.xml
@@ -0,0 +1,12 @@
+<webscript>
+  <shortname>Bulk Filesystem Import - AJAX Auto Suggest for Space Names</shortname>
+  <description>Web Script that returns a list of spaces for the AJAX auto-suggest control in the bulk import initiation form.</description>
+  <url>/bulkfsimport/ajax/suggest/spaces?query={query}</url>
+  <authentication>admin</authentication>
+  <format default="json">any</format>
+  <family>Bulk Filesystem Import</family>
+  <lifecycle>internal</lifecycle>
+  <cache>
+    <never>true</never>
+  </cache>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ajaxspace.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ajaxspace.get.json.ftl
new file mode 100644
index 00000000000..97d2acafcd2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ajaxspace.get.json.ftl
@@ -0,0 +1,24 @@
+[#ftl]
+[#-- TODO: Filter out Data Dictionary and all sub-folders --]
+[#macro fullPath node]
+  [@compress single_line=true]
+    [#if node == companyhome]
+/Company Home
+    [#else]
+[@fullPath node=node.parent/]/${node.properties.name}
+    [/#if]
+  [/@compress]
+[/#macro]
+[#assign luceneQuery = "@cm\\:name:\"" + args.query + "*\" AND TYPE:\\{http\\://www.alfresco.org/model/content/1.0\\}folder AND NOT TYPE:\\{http\\://www.alfresco.org/model/wcmappmodel/1.0\\}webfolder AND PATH:\"app\\:company_home//*\""]
+[#assign matches     = companyhome.childrenByLuceneSearch[luceneQuery]]
+{
+  "data" :
+  [
+[#list matches as match]
+    {
+      "path"    : "[@fullPath node=match/]",
+      "nodeRef" : "${match.nodeRef}"
+    }[#if match != matches?last],[/#if]
+[/#list]
+  ]
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ajaxspace.get.text.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ajaxspace.get.text.ftl
new file mode 100644
index 00000000000..f564320820a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ajaxspace.get.text.ftl
@@ -0,0 +1,8 @@
+[#ftl]
+[#-- TODO: Filter out Data Dictionary and all sub-folders --]
+[#macro fullPath node][#if node == companyhome]/Company Home[#else][@fullPath node=node.parent/]/${node.properties.name}[/#if][/#macro]
+[#assign luceneQuery = "@cm\\:name:\"" + args.query + "*\" AND TYPE:\\{http\\://www.alfresco.org/model/content/1.0\\}folder AND NOT TYPE:\\{http\\://www.alfresco.org/model/wcmappmodel/1.0\\}webfolder"]
+[#assign matches     = companyhome.childrenByLuceneSearch[luceneQuery]]
+[#list matches as match]
+[@fullPath node=match/],${match.nodeRef}
+[/#list]
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/initiate.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/initiate.post.desc.xml
new file mode 100644
index 00000000000..1f06e72518e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/initiate.post.desc.xml
@@ -0,0 +1,12 @@
+<webscript>
+  <shortname>Bulk Filesystem Import</shortname>
+  <description>Web Script that initiates a bulk filesystem import.</description>
+  <url>/bulkfsimport/initiate</url>
+  <authentication>admin</authentication>
+  <transaction>none</transaction>
+  <family>Bulk Filesystem Import</family>
+  <lifecycle>internal</lifecycle>
+  <cache>
+    <never>true</never>
+  </cache>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/initiate.post.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/initiate.post.html.ftl
new file mode 100644
index 00000000000..f56029e3ac8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/initiate.post.html.ftl
@@ -0,0 +1 @@
+<b>${importInProgress}</b>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.desc.xml
new file mode 100644
index 00000000000..b5dca9cb288
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Bulk Filesystem Import Status</shortname>
+  <description>Web Script that provides a simple UI for monitoring the status of a bulk filesystem import.</description>
+  <url>/bulkfsimport/status</url>
+  <format default="html"/>
+  <authentication>admin</authentication>
+  <family>Bulk Filesystem Import</family>
+  <cache>
+    <never>true</never>
+  </cache>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.html.ftl
new file mode 100644
index 00000000000..2572379c305
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.html.ftl
@@ -0,0 +1,317 @@
+[#ftl]
+[#macro formatDuration durationInNs]
+  [@compress single_line=true]
+    [#assign days         = (durationInNs / (1000 * 1000 * 1000 * 60 * 60 * 24))?floor]
+    [#assign hours        = (durationInNs / (1000 * 1000 * 1000 * 60 * 60))?floor % 24]
+    [#assign minutes      = (durationInNs / (1000 * 1000 * 1000 * 60))?floor % 60]
+    [#assign seconds      = (durationInNs / (1000 * 1000 * 1000))?floor % 60]
+    [#assign milliseconds = (durationInNs / (1000 * 1000)) % 1000]
+    [#assign microseconds = (durationInNs / (1000)) % 1000]
+    ${days}d ${hours}h ${minutes}m ${seconds}s ${milliseconds}.${microseconds}ms
+  [/@compress]
+[/#macro]
+[#macro formatBytes bytes]
+  [@compress single_line=true]
+    [#if bytes   > 1000000000]${(bytes / 1000000000)?string("#,##0.00")}GB
+    [#elseif bytes > 1000000]${(bytes / 1000000)?string("#,##0.00")}MB
+    [#elseif bytes > 1000]${(bytes / 1000)?string("#,##0.00")}kB
+    [#else]${bytes?string("#,##0")}B
+    [/#if]
+  [/@compress]
+[/#macro]
+[#assign refreshIntervalInSeconds = 5]
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bulk Filesystem Import Status</title>
+  <link rel="stylesheet" href="${url.context}/css/main.css" type="text/css"/>
+[#if importStatus.inProgress()]
+  <meta http-equiv="refresh" content="${refreshIntervalInSeconds}" />
+[/#if]
+</head>
+<body>
+  <table>
+    <tr>
+      <td><img src="${url.context}/images/logo/AlfrescoLogo32.png" alt="Alfresco" /></td>
+      <td><nobr>Bulk Filesystem Import Tool Status</nobr></td>
+    </tr>
+    <tr><td><td>Alfresco ${server.edition} v${server.version}
+  </table>
+  <blockquote>
+    <p>
+    <table border="1" cellspacing="0" cellpadding="1" width="80%">
+      <tr>
+        <td colspan="2"><strong>General Statistics</strong></td>
+      </tr>
+      <tr>
+        <td width="25%">Current status:</td>
+        <td width="75%">
+[#if importStatus.inProgress()]
+          <span style="color:red">In progress</span>
+[#else]
+          <span style="color:green">Idle</span>
+[/#if]
+        </td>
+      </tr>
+      <tr>
+        <td>Successful:</td>
+[#if importStatus.inProgress() || !importStatus.endDate??]
+        <td>n/a</td>
+[#elseif importStatus.lastExceptionAsString??]
+        <td style="color:red">No</td>
+[#else]
+        <td style="color:green">Yes</td>
+[/#if]
+      </tr>
+      <tr>
+        <td>Batch Size:</td>
+        <td>${importStatus.batchSize}</td>      
+      </tr>
+      <tr>
+        <td>Number of threads:</td>
+        <td>${importStatus.numThreads}</td>      
+      </tr>
+      <tr>
+        <td>Source Directory:</td>
+        <td>
+[#if importStatus.sourceDirectory??]
+          ${importStatus.sourceDirectory}
+[#else]
+          n/a
+[/#if]
+        </td>
+      </tr>
+      <tr>
+        <td>Target Space:</td>
+        <td>
+[#if importStatus.targetSpace??]
+          ${importStatus.targetSpace}
+[#else]
+          n/a
+[/#if]
+        </td>
+      </tr>
+      <tr>
+        <td>Start Date:</td>
+        <td>
+[#if importStatus.startDate??]
+          ${importStatus.startDate?datetime?string("yyyy-MM-dd hh:mm:ss.SSSaa")}
+[#else]
+          n/a
+[/#if]
+        </td>
+      </tr>
+      <tr>
+        <td>End Date:</td>
+        <td>
+[#if importStatus.endDate??]
+          ${importStatus.endDate?datetime?string("yyyy-MM-dd hh:mm:ss.SSSaa")}</td>
+[#else]
+          n/a
+[/#if]
+        </td>
+      </tr>
+      <tr>
+        <td>
+[#if importStatus.inProgress()]
+          Elapsed Time:
+[#else]
+          Duration:
+[/#if]
+        </td>
+        <td>
+[#if importStatus.durationInNs??]
+          [@formatDuration durationInNs = importStatus.durationInNs/]
+[#else]
+          n/a
+[/#if]
+        </td>
+      </tr>
+      <tr>
+        <td>Number of Completed Batches:</td>
+        <td>${importStatus.numberOfBatchesCompleted}</td>
+      </tr>
+      <tr>
+        <td colspan="2"><strong>Source (read) Statistics</strong></td>
+      </tr>
+<!--
+      <tr>
+        <td>Last folder or file processed:</td>
+        <td>${importStatus.currentFileBeingProcessed!"n/a"}</td>
+      </tr>
+-->
+      <tr>
+        <td>Scanned:</td>
+        <td>
+          <table border="1" cellspacing="0" cellpadding="1">
+            <tr>
+              <td>Folders</td>
+              <td>Files</td>
+              <td>Unreadable</td>
+            </tr>
+            <tr>
+              <td>${importStatus.numberOfFoldersScanned}</td>
+              <td>${importStatus.numberOfFilesScanned}</td>
+              <td>${importStatus.numberOfUnreadableEntries}</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td>Read:</td>
+        <td>
+          <table border="1" cellspacing="0" cellpadding="1">
+            <tr>
+              <td>Content</td>
+              <td>Metadata</td>
+              <td>Content Versions</td>
+              <td>Metadata Versions</td>
+            </tr>
+            <tr>
+              <td>${importStatus.numberOfContentFilesRead} ([@formatBytes importStatus.numberOfContentBytesRead/])</td>
+              <td>${importStatus.numberOfMetadataFilesRead} ([@formatBytes importStatus.numberOfMetadataBytesRead/])</td>
+              <td>${importStatus.numberOfContentVersionFilesRead} ([@formatBytes importStatus.numberOfContentVersionBytesRead/])</td>
+              <td>${importStatus.numberOfMetadataVersionFilesRead} ([@formatBytes importStatus.numberOfMetadataVersionBytesRead/])</td>
+            </tr>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td>Throughput:</td>
+        <td>
+          [#if importStatus.durationInNs?? && importStatus.durationInNs > 0]
+          [#if importStatus.entriesScannedPerSecond??]
+          ${importStatus.entriesScannedPerSecond} entries scanned / sec<br/>
+          [/#if]
+          [#if importStatus.filesReadPerSecond??]
+          ${importStatus.filesReadPerSecond} files read / sec<br/>
+          [/#if]
+          [#if importStatus.bytesReadPerSecond??]
+          [@formatBytes importStatus.bytesReadPerSecond /] / sec
+          [/#if]
+          [#else]
+          n/a
+          [/#if]
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2"><strong>Target (write) Statistics</strong></td>
+      </tr>
+      <tr>
+        <td>Space Nodes:</td>
+        <td>
+          <table border="1" cellspacing="0" cellpadding="1">
+            <tr>
+              <td># Created</td>
+              <td># Replaced</td>
+              <td># Skipped</td>
+              <td># Properties</td>
+            </tr>
+            <tr>
+              <td>${importStatus.numberOfSpaceNodesCreated}</td>
+              <td>${importStatus.numberOfSpaceNodesReplaced}</td>
+              <td>${importStatus.numberOfSpaceNodesSkipped}</td>
+              <td>${importStatus.numberOfSpacePropertiesWritten}</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td>Content Nodes:</td>
+        <td>
+          <table border="1" cellspacing="0" cellpadding="1">
+            <tr>
+              <td># Created</td>
+              <td># Replaced</td>
+              <td># Skipped</td>
+              <td>Data Written</td>
+              <td># Properties</td>
+            </tr>
+            <tr>
+              <td>${importStatus.numberOfContentNodesCreated}</td>
+              <td>${importStatus.numberOfContentNodesReplaced}</td>
+              <td>${importStatus.numberOfContentNodesSkipped}</td>
+              <td>[@formatBytes importStatus.numberOfContentBytesWritten/]</td>
+              <td>${importStatus.numberOfContentPropertiesWritten}</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td>Content Versions:</td>
+        <td>
+          <table border="1" cellspacing="0" cellpadding="1">
+            <tr>
+              <td># Created</td>
+              <td>Data Written</td>
+              <td># Properties</td>
+            </tr>
+            </tr>
+              <td>${importStatus.numberOfContentVersionsCreated}</td>
+              <td>[@formatBytes importStatus.numberOfContentVersionBytesWritten/]</td>
+              <td>${importStatus.numberOfContentVersionPropertiesWritten}</td>
+            </tr>
+          </table>
+        </td>
+      <tr>
+      <tr>
+        <td>Throughput (write):</td>
+        <td>
+          [#if importStatus.durationInNs?? && importStatus.durationInNs > 0]
+          [#if importStatus.nodesCreatedPerSecond??]
+          ${importStatus.nodesCreatedPerSecond?string("#0")} nodes / sec<br/>
+          [/#if]
+          [#if importStatus.bytesWrittenPerSecond??]
+          [@formatBytes importStatus.bytesWrittenPerSecond /] / sec
+          [/#if]
+          [#else]
+          n/a
+          [/#if]
+        </td>
+      </tr>
+[#if importStatus.lastExceptionAsString??]
+      <tr>
+        <td colspan="2"><strong>Error Information From Last Run</strong></td>
+      </tr>
+      <tr>
+        <td>File that failed:</td>
+        <td>${importStatus.currentFileBeingProcessed!"n/a"}</td>
+      </tr>
+      <tr>
+        <td>Exception:</td>
+        <td><pre>${importStatus.lastExceptionAsString}</pre></td>
+      </tr>
+[/#if]
+    </table>
+    </p>
+    <p>
+[#if importStatus.inProgress()]
+    This page will automatically refresh in <span id="countdownTimer">${refreshIntervalInSeconds}</span> seconds.
+[#else]
+    <a href="${url.serviceContext}/bulkfsimport">Initiate another import</a><br><br>
+    [#if isEnterprise]
+        <a href="${url.serviceContext}/bulkfsimport/inplace">Initiate another in-place import</a>
+    [/#if]
+[/#if]
+    </p>
+  </blockquote>
+  <script type="text/javascript">
+    var seconds = ${refreshIntervalInSeconds} + 1;
+
+    function display()
+    {
+      seconds -= 1;
+
+      var countdownTimerElement = document.getElementById("countdownTimer");
+      if(countdownTimerElement)
+      {
+         countdownTimerElement.textContent = seconds;
+      }
+      setTimeout("display()", 1000);
+    }
+
+    display()
+  </script>
+</body>
+</html>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.xml.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.xml.ftl
new file mode 100644
index 00000000000..97f84625099
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.xml.ftl
@@ -0,0 +1,70 @@
+[#ftl]
+<?xml version='1.0' encoding='UTF-8'?>
+<BulkFilesystemImportStatus>
+  <CurrentStatus>[@compress single_line=true]
+[#if importStatus.inProgress()]
+    In progress
+[#else]
+    Idle
+[/#if]
+[/@compress]</CurrentStatus>
+  <ResultOfLastExecution>[@compress single_line=true]
+[#if importStatus.lastExceptionAsString??]
+    Failed
+[#else]
+    Succeeded
+[/#if]
+[/@compress]</ResultOfLastExecution>
+[#if importStatus.sourceDirectory??]
+  <SourceDirectory>${importStatus.sourceDirectory}</SourceDirectory>
+[/#if]
+[#if importStatus.targetSpace??]
+  <TargetSpace>${importStatus.targetSpace}</TargetSpace>
+[/#if]
+[#if importStatus.startDate??]
+  <StartDate>${importStatus.startDate?datetime?string("yyyy-MM-dd'T'HH:mm:ss.SSS")}</StartDate>
+[/#if]
+[#if importStatus.endDate??]
+  <EndDate>${importStatus.endDate?datetime?string("yyyy-MM-dd'T'HH:mm:ss.SSS")}</EndDate>
+[/#if]
+[#if importStatus.durationInNs??]
+  <DurationInNS>${importStatus.durationInNs?c}</DurationInNS>
+[/#if]
+  <CompletedBatches>${importStatus.numberOfBatchesCompleted}</CompletedBatches>
+[#if !importStatus.inProgress() && importStatus.endDate??]
+[/#if]
+  <SourceStatistics>
+    <LastFileOrFolderProcessed>${importStatus.currentFileBeingProcessed!"n/a"}</LastFileOrFolderProcessed>
+    <FilesScanned>${importStatus.numberOfFilesScanned?c}</FilesScanned>
+    <FoldersScanned>${importStatus.numberOfFoldersScanned?c}</FoldersScanned>
+    <UnreadableEntries>${importStatus.numberOfUnreadableEntries?c}</UnreadableEntries>
+    <ContentFilesRead>${importStatus.numberOfContentFilesRead?c}</ContentFilesRead>
+    <ContentBytesRead>${importStatus.numberOfContentBytesRead?c}</ContentBytesRead>
+    <MetadataFilesRead>${importStatus.numberOfMetadataFilesRead?c}</MetadataFilesRead>
+    <MetadataBytesRead>${importStatus.numberOfMetadataBytesRead?c}</MetadataBytesRead>
+    <ContentVersionFilesRead>${importStatus.numberOfContentVersionFilesRead?c}</ContentVersionFilesRead>
+    <ContentVersionBytesRead>${importStatus.numberOfContentVersionBytesRead?c}</ContentVersionBytesRead>
+    <MetadataVersionFilesRead>${importStatus.numberOfMetadataVersionFilesRead?c}</MetadataVersionFilesRead>
+    <MetadataVersionBytesRead>${importStatus.numberOfMetadataVersionBytesRead?c}</MetadataVersionBytesRead>
+  </SourceStatistics>
+  <TargetStatistics>
+    <SpaceNodesCreated>${importStatus.numberOfSpaceNodesCreated?c}</SpaceNodesCreated>
+    <SpaceNodesReplaced>${importStatus.numberOfSpaceNodesReplaced?c}</SpaceNodesReplaced>
+    <SpaceNodesSkipped>${importStatus.numberOfSpaceNodesSkipped?c}</SpaceNodesSkipped>
+    <SpacePropertiesWritten>${importStatus.numberOfSpacePropertiesWritten?c}</SpacePropertiesWritten>
+    <ContentNodesCreated>${importStatus.numberOfContentNodesCreated?c}</ContentNodesCreated>
+    <ContentNodesReplaced>${importStatus.numberOfContentNodesReplaced?c}</ContentNodesReplaced>
+    <ContentNodesSkipped>${importStatus.numberOfContentNodesSkipped?c}</ContentNodesSkipped>
+    <ContentBytesWritten>${importStatus.numberOfContentBytesWritten?c}</ContentBytesWritten>
+    <ContentPropertiesWritten>${importStatus.numberOfContentPropertiesWritten?c}</ContentPropertiesWritten>
+    <ContentVersionsCreated>${importStatus.numberOfContentVersionsCreated?c}</ContentVersionsCreated>
+    <ContentVersionsBytesWritten>${importStatus.numberOfContentVersionBytesWritten?c}</ContentVersionsBytesWritten>
+    <ContentVersionsPropertiesWritten>${importStatus.numberOfContentVersionPropertiesWritten?c}</ContentVersionsPropertiesWritten>
+  </TargetStatistics>
+[#if importStatus.lastExceptionAsString??]
+  <ErrorInformation>
+    <FileThatFailed>${importStatus.currentFileBeingProcessed!"n/a"}</FileThatFailed>
+    <Exception>${importStatus.lastExceptionAsString}</Exception>
+  </ErrorInformation>
+[/#if]
+</BulkFilesystemImportStatus>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ui.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ui.get.desc.xml
new file mode 100644
index 00000000000..e1b44d9cb0e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ui.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Bulk Filesystem Import</shortname>
+  <description>Web Script that provides a simple UI for initiating a bulk filesystem import.</description>
+  <url>/bulkfsimport</url>
+  <format default="html"/>
+  <authentication>admin</authentication>
+  <family>Bulk Filesystem Import</family>
+  <cache>
+    <never>true</never>
+  </cache>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ui.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ui.get.html.ftl
new file mode 100644
index 00000000000..a021027aa02
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ui.get.html.ftl
@@ -0,0 +1,127 @@
+[#ftl]
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <title>Bulk Filesystem Import Tool</title>
+    <link rel="stylesheet" href="${url.context}/css/main.css" TYPE="text/css">
+
+    <!-- YUI 3.x -->
+    <link rel="stylesheet" type="text/css" href="${url.context}/css/yui-3.3.0-dependencies.css">
+    <style type="text/css">
+      .yui3-aclist-content {
+        background-color   : white;
+        border             : 1px solid darkgrey;
+        box-shadow         : 3px 3px 4px lightgrey;
+        -webkit-box-shadow : 3px 3px 4px lightgrey; /* Safari and Chrome */
+
+       }
+    </style>
+
+    <script type="text/javascript" src="${url.context}/scripts/yui-3.3.0-dependencies.js"></script>
+
+    <!-- Validation functions -->
+    <script type="text/javascript">
+      function validateRequired(field, errorMessageElement, errorMessage)
+      {
+        var result = true;
+
+        if (field.value == null || field.value == "")
+        {
+          errorMessageElement.textContent = errorMessage;
+          result = false;
+        }
+        else
+        {
+          errorMessageElement.textContent = "";
+        }
+
+        return result;
+      }
+
+
+      function validateForm(form)
+      {
+        var result = true;
+
+        result = validateRequired(form.sourceDirectory, document.getElementById("sourceDirectoryMessage"), "Source directory is mandatory.");
+
+        if (result)
+        {
+          result = ( (validateRequired(form.targetPath, document.getElementById("targetSpaceMessage"), "Target space or noderef is mandatory.")) ||
+                     (validateRequired(form.targetNodeRef, document.getElementById("targetSpaceMessage"), "Target space or noderef is mandatory."))
+                   ) ;
+        }
+
+        return result;
+      }
+    </script>
+  </head>
+  <body class="yui-skin-sam">
+    <table>
+      <tr>
+        <td><img src="${url.context}/images/logo/AlfrescoLogo32.png" alt="Alfresco" /></td>
+        <td><nobr>Bulk Filesystem Import Tool</nobr></td>
+      </tr>
+      <tr><td><td>Alfresco ${server.edition} v${server.version}
+    </table>
+    <form action="${url.service}/initiate" method="post" enctype="multipart/form-data" charset="utf-8" onsubmit="return validateForm(this);">
+      <table>
+        <tr>
+          <td>Import directory:</td><td><input type="text" name="sourceDirectory" size="128" /></td><td id="sourceDirectoryMessage" style="color:red"></td>
+        </tr>
+
+        <tr>
+          <td><br/><label for="targetPath">Target space :</label></td>
+          <td id="targetSpaceMessage" style="color:red"></td>
+        </tr>
+
+        <tr>
+        <!-- TODO i18n for this string -->
+          <td><label for="targetPath">Path:</label></td><td><input id="targetPath" type="text" name="targetPath" size="128" /></td>
+        </tr>
+
+        <tr>
+        <!-- TODO i18n for this string -->
+          <td><br/><label for="targetNodeRef">or NodeRef:</label></td>
+          <td>
+              <input id="targetNodeRef" type="text" name="targetNodeRef" size="128" />
+          </td>
+        </tr>
+
+        <tr>
+          <td colspan="3">&nbsp;</td>
+        </tr>
+        <tr>
+          <td><label for="disableRules">Disable rules:</label></td><td><input type="checkbox" id="disableRules" name="disableRules" value="disableRules" unchecked/> (unchecked means rules are enabled during the import)</td><td></td>
+        </tr>
+        <tr>
+          <td><label>Existing file mode:</label></td>
+          <td>
+              <br /><br />
+              When a file being imported already exists in the repository<br />
+              <label><input type="radio" name="existingFileMode" value="SKIP" checked/> skip (don't import) the file</label><br />
+              <label><input type="radio" name="existingFileMode" value="REPLACE" unchecked/> replace the file in the repository with the imported file</label><br />
+              <label><input type="radio" name="existingFileMode" value="ADD_VERSION" unchecked/> create a new version of the file with the imported content</label><br />
+              <br />
+          </td>
+          <td></td>
+        </tr>
+        <tr>
+          <td>Batch Size:</td>
+          <td colspan="2"><input type="text" name="batchSize" size="5"></td>
+        </tr>
+        <tr>
+          <td>Number of Threads:</td>
+          <td colspan="2"><input type="text" name="numThreads" size="5"></td>
+        </tr>
+        <tr>
+          <td colspan="3">&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="3"><input type="submit" name="submit" value="Initiate Bulk Import"></td>
+        </tr>
+      </table>
+      <br/>
+    </form>
+  </body>
+</html>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.delete.desc.xml
new file mode 100644
index 00000000000..3cd618dbcb8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.delete.desc.xml
@@ -0,0 +1,26 @@
+<webscript>
+   <shortname>Delete category</shortname>
+   <description><![CDATA[
+   Deletes the specified category. 
+   ]]></description>
+   <description></description>
+   <url>/api/category/{store_protocol}/{store_id}/{node_id}</url>
+   <format default="json">argument</format>
+   <authentication>admin</authentication>
+   <transaction allow="readwrite" buffersize="0">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <args>
+      <arg>
+         <shortname>store_protocol</shortname>
+         <description>The protocol of the store in which the category lives.</description>
+      </arg>
+      <arg>
+         <shortname>store_id</shortname>
+         <description>The identifier of the store in which the category lives.</description>
+      </arg>
+      <arg>
+         <shortname>node_id</shortname>
+         <description>The identifier of the node that represents the category.</description>
+      </arg>
+   </args>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.delete.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.delete.js
new file mode 100644
index 00000000000..c8a29cd2355
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.delete.js
@@ -0,0 +1,53 @@
+/**
+ * Deletes a given category.
+ */
+
+function main()
+{
+   // Extract template args and build the node reference
+   var nodeRef = url.templateArgs.store_protocol + "://" + url.templateArgs.store_id + "/" + url.templateArgs.node_id;
+   
+   // Log information
+   if (logger.isLoggingEnabled() == true)
+   {
+      logger.log("Attempting to remove category (nodeRef=" + nodeRef + ")");
+   }
+   
+   // Try and find the category node
+   var category = classification.getCategory(nodeRef);
+   
+   // Return 404 if category is not found
+   if (category == null)
+   {
+      // Log information
+      if (logger.isLoggingEnabled() == true)
+      {
+         logger.log("Category being removed could not be found. (nodeRef=" + nodeRef + ")");
+      }
+      
+      // Set status code
+      status.setCode(status.STATUS_NOT_FOUND, "Category could not be found. (nodeRef=" + nodeRef + ")");
+      return;
+   }
+   
+   // Remove the category
+   category.removeCategory();
+   
+   // Log information
+   if (logger.isLoggingEnabled() == true)
+   {
+      logger.log("Category successfully removed. (nodeRef=" + nodeRef + ")");
+   }
+   
+   // The message depends on the search service in use
+   var messageKey = "message.removeCategory.success";
+   if (search.searchSubsystem == "solr" || search.searchSubsystem == "solr4")
+   {
+      messageKey = "message.removeCategory.solr.success";
+   }
+
+   // Set model properties
+   model.messageKey = messageKey;
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.delete.json.ftl
new file mode 100644
index 00000000000..989ad8343d3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.delete.json.ftl
@@ -0,0 +1,6 @@
+{
+    <#if redirect??>"redirect": "${redirect}",</#if>
+    <#if persistedObject??>"persistedObject": "${persistedObject?replace("\t", "")?string}",</#if>
+    <#if name??>"name": "${name}",</#if>
+    "message": "${msg(messageKey)}"
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.post.desc.xml
new file mode 100644
index 00000000000..3c488dfa48a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.post.desc.xml
@@ -0,0 +1,26 @@
+<webscript>
+   <shortname>Create category</shortname>
+   <description><![CDATA[
+   Create new category in specified category or as a root category.
+   ]]></description>
+   <url>/api/category/{store_protocol}/{store_id}/{node_id}</url>
+   <url>/api/category</url>
+   <format default="json">argument</format>
+   <authentication>admin</authentication>
+   <transaction allow="readwrite" buffersize="0">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <args>
+      <arg>
+         <shortname>store_protocol</shortname>
+         <description>The protocol of the store in which the category lives.</description>
+      </arg>
+      <arg>
+         <shortname>store_id</shortname>
+         <description>The identifier of the store in which the category lives.</description>
+      </arg>
+      <arg>
+         <shortname>node_id</shortname>
+         <description>The identifier of the node that represents the category.</description>
+      </arg>
+   </args>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.post.json.ftl
new file mode 100644
index 00000000000..4bcca57ef5e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.post.json.ftl
@@ -0,0 +1,6 @@
+{
+    <#if redirect??>"redirect": "${redirect}",</#if>
+    <#if persistedObject??>"persistedObject": "${persistedObject.nodeRef?replace("\t", "")?string}",</#if>
+    "message": "${msg(messageKey)}",
+    "name": "${name}"
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.post.json.js
new file mode 100644
index 00000000000..ff46fb68ca5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.post.json.js
@@ -0,0 +1,95 @@
+/**
+ * Example JSON:
+ * {
+ *    "name" : "myCategory",
+ *    "aspect" : "{http://www.alfresco.org/model/content/1.0}generalclassifiable"
+ * }
+ * 
+ * where "name" is the name of the new category
+ *       "aspect" is an optional field used if creating a root category, it defaults to "{http://www.alfresco.org/model/content/1.0}generalclassifiable" 
+ *       if none specified 
+ */
+
+// JSON property values
+var PROP_NAME = "name";
+var PROP_ASPECT = "aspect";
+
+// Default property values
+var DEFAULT_ASPECT = "{http://www.alfresco.org/model/content/1.0}generalclassifiable";
+
+function main()
+{
+   // Check we have a json request
+   if (typeof json === "undefined")
+   {
+      if (logger.isWarnLoggingEnabled() == true)
+      {
+         logger.warn("Could not create category, because json object was undefined.");
+      }
+      
+      status.setCode(501, "Could not create category, because json object was undefined.");
+      return;
+   }
+   
+   // Try and retrieve the name of the new category
+   var name = json.get(PROP_NAME);
+   if (name == null || name.length === 0)
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "Could not create category, because 'prop_cm_name' parameter is missing from json request.");
+      return;
+   }
+    
+   // Build the node reference string
+   var nodeRef = null;
+   var aspect = null;
+   if (url.templateArgs.length != 0)
+   {       
+      nodeRef = url.templateArgs.store_protocol + "://" + url.templateArgs.store_id + "/" + url.templateArgs.node_id;
+      
+      // Log message
+      if (logger.isLoggingEnabled() == true)
+      {
+         logger.log("Attempting to create new category. (nodeRef=" + nodeRef + ", name=" + name + ")");
+      }
+   }
+   else
+   {
+      // See if an aspect has been specified
+      var aspect = DEFAULT_ASPECT;
+      if (json.has(PROP_ASPECT) == true)
+      {
+         aspect = json.get(PROP_ASPECT);
+      }
+   }
+    
+   if (nodeRef != null)
+   {
+      var category = classification.getCategory(nodeRef);
+      if (category !== null)
+      {
+         model.persistedObject = category.createSubCategory(name);
+      }
+      else
+      {
+         status.setCode(status.STATUS_BAD_REQUEST, "Unable to create category, because category node was found or is not a category.  (nodeRef=" + nodeRef + ", name=" + name + ")");
+         return;
+      }
+   }
+   else
+   {
+      model.persistedObject = classification.createRootCategory(aspect, name);
+   }
+
+   // The message depends on the search service in use
+   var messageKey = "message.addCategory.success";
+   if (search.searchSubsystem == "solr" || search.searchSubsystem == "solr4")
+   {
+      messageKey = "message.addCategory.solr.success";
+   }
+   
+   // Build the rest of the model 
+   model.messageKey = messageKey;
+   model.name = name;
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.put.desc.xml
new file mode 100644
index 00000000000..a59ad7fefae
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.put.desc.xml
@@ -0,0 +1,25 @@
+<webscript>
+   <shortname>Update category</shortname>
+   <description><![CDATA[
+   Update the details of the specified category.
+   ]]></description>
+   <url>/api/category/{store_protocol}/{store_id}/{node_id}</url>
+   <format default="json">argument</format>
+   <authentication>admin</authentication>
+   <transaction allow="readwrite" buffersize="0">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <args>
+      <arg>
+         <shortname>store_protocol</shortname>
+         <description>The protocol of the store in which the category lives.</description>
+      </arg>
+      <arg>
+         <shortname>store_id</shortname>
+         <description>The identifier of the store in which the category lives.</description>
+      </arg>
+      <arg>
+         <shortname>node_id</shortname>
+         <description>The identifier of the node that represents the category.</description>
+      </arg>
+   </args>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.put.json.ftl
new file mode 100644
index 00000000000..1bd7b22c2e8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.put.json.ftl
@@ -0,0 +1,6 @@
+{
+    <#if redirect??>"redirect": "${redirect}",</#if>
+    <#if persistedObject??>"persistedObject": "${persistedObject?replace("\t", "")?string}",</#if>
+    "message": "${msg(messageKey)}",
+    "name": "${name}"
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.put.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.put.json.js
new file mode 100644
index 00000000000..977f1e24086
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/category/category.put.json.js
@@ -0,0 +1,63 @@
+/**
+ * Example JSON:
+ * {
+ *    "name" : "myCategory"
+ * }
+ * 
+ * where "name" is the name of the new category
+ */
+
+// JSON property values
+var PROP_NAME = "name";
+
+function main()
+{
+   // Check we have a json request
+   if (typeof json === "undefined")
+   {
+      if (logger.isWarnLoggingEnabled() == true)
+      {
+         logger.warn("Could not update category, because json object was undefined.");
+      }
+      
+      status.setCode(501, "Could not update category, because json object was undefined.");
+      return;
+   }
+   
+   // Try and retrieve the name of the new category
+   var name = json.get(PROP_NAME);       
+   if (name == null || name.length === 0)
+   {
+      tatus.setCode(status.STATUS_BAD_REQUEST, "Could not update category, because 'name' parameter is missing from json request.");
+      return;
+   }
+   
+   // Get the node reference
+   var nodeRef = url.templateArgs.store_protocol + "://" + url.templateArgs.store_id + "/" + url.templateArgs.node_id;
+   
+   // Get the category
+   var category = classification.getCategory(nodeRef);
+   if (category !== null)
+   {
+      category.rename(name);
+   }
+   else
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "Unable to update category, because category node was found or is not a category.  (nodeRef=" + nodeRef + ", name=" + name + ")");
+      return;
+   }
+   
+   // The message depends on the search service in use
+   var messageKey = "message.changeCategoryName.success";
+   if (search.searchSubsystem == "solr" || search.searchSubsystem == "solr4")
+   {
+      messageKey = "message.changeCategoryName.solr.success";
+   }
+   
+   // Build the rest of the model 
+   model.persistedObject = category.toString();
+   model.messageKey = messageKey;
+   model.name = name;
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.delete.desc.xml
new file mode 100644
index 00000000000..b907e400fa1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.delete.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Delete comment</shortname>
+  <description>Delete a comment</description>
+  <url>/api/comment/node/{store_type}/{store_id}/{id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.delete.json.ftl
new file mode 100644
index 00000000000..9a228685155
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.delete.json.ftl
@@ -0,0 +1,3 @@
+{
+    "message" : "${message}"
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.get.desc.xml
new file mode 100644
index 00000000000..0ff348c6683
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get comment</shortname>
+  <description>Get the data for a comment</description>
+  <url>/api/comment/node/{store_type}/{store_id}/{id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.get.js
new file mode 100644
index 00000000000..0218f785a61
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.get.js
@@ -0,0 +1,17 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/requestutils.lib.js">
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/comments/comments.lib.js">
+
+function main()
+{
+   // get requested node
+   var node = getRequestNode();
+   if (status.getCode() != status.STATUS_OK)
+   {
+      return;
+   }
+
+   model.item = getCommentData(node);
+   model.node = node;
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.get.json.ftl
new file mode 100644
index 00000000000..59cdc5358dc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.get.json.ftl
@@ -0,0 +1,4 @@
+<#import "comment.lib.ftl" as commentLib/>
+{
+   "item": <@commentLib.commentJSON item=item parent=node />
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.lib.ftl
new file mode 100644
index 00000000000..4532285dbf8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.lib.ftl
@@ -0,0 +1,52 @@
+<#-- Renders a person object. -->
+<#macro renderPerson person fieldName>
+<#escape x as jsonUtils.encodeJSONString(x)>
+   "${fieldName}":
+   {
+   <#if person.assocs["cm:avatar"]??>
+      "avatarRef": "${person.assocs["cm:avatar"][0].nodeRef?string}",
+   </#if>
+      "username": "${person.properties["cm:userName"]}",
+      "firstName": "${person.properties["cm:firstName"]!""}",
+      "lastName": "${person.properties["cm:lastName"]!""}"
+   },
+</#escape>
+</#macro>
+
+<#--
+   This template renders a comment.
+-->
+<#macro commentJSON item parent>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "url": "api/comment/node/${item.node.nodeRef?replace('://','/')}",
+   "nodeRef": "${item.node.nodeRef}",
+   "name": "${item.node.properties.name!''}",
+   "title": "${item.node.properties.title!''}",
+   "content": "${stringUtils.stripUnsafeHTML(item.node.content)}",
+   <#if item.author??>
+   <@renderPerson person=item.author fieldName="author" />
+   <#else>
+   "author":
+   {
+      "username": "${item.node.properties.creator}"
+   },
+   </#if>
+   "createdOn": "${item.node.properties.created?string("MMM dd yyyy HH:mm:ss 'GMT'Z '('zzz')'")}",
+   "modifiedOn": "${item.node.properties.modified?string("MMM dd yyyy HH:mm:ss 'GMT'Z '('zzz')'")}",
+   "createdOnISO": "${xmldate(item.node.properties.created)}",
+   "modifiedOnISO": "${xmldate(item.node.properties.modified)}",
+   "isUpdated": ${item.isUpdated?string},
+   "permissions":
+   {
+   <#if parent?? && (parent.isLocked || parent.hasAspect("cm:workingcopy"))>
+      "edit": false,
+      "delete": false
+   <#else>
+      "edit": ${item.canEditComment?string},
+      "delete": ${item.node.hasPermission("Delete")?string}
+   </#if>
+   }
+}
+</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.desc.xml
new file mode 100644
index 00000000000..e2837da4738
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Update comment</shortname>
+  <description>Updates a comment</description>
+  <url>/api/comment/node/{store_type}/{store_id}/{id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.json.ftl
new file mode 100644
index 00000000000..c957e54a538
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.json.ftl
@@ -0,0 +1,4 @@
+<#import "comment.lib.ftl" as commentLib/>
+{
+   "item": <@commentLib.commentJSON item=item parent=node />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.json.js
new file mode 100644
index 00000000000..2861250cdb1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comment.put.json.js
@@ -0,0 +1,66 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/requestutils.lib.js">
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/comments/comments.lib.js">
+
+/**
+ * Update a comment
+ */
+function updateComment(node)
+{
+   var title = "";
+   if (json.has("title"))
+   {
+      title = json.get("title");
+   }
+   var content = json.get("content");
+   
+   // update the topic title
+   node.properties.title = title;
+   node.mimetype = "text/html";
+   node.content = content;
+   node.save();
+}
+
+function main()
+{
+   // get requested node
+   var node = getRequestNode();
+   if (status.getCode() != status.STATUS_OK)
+   {
+      return;
+   }
+   
+   // MNT-16446 (pending future ACE-5437)
+   // TODO: commentedOn node is locked or pwc
+   var commentData = getCommentData(node);
+   var canEdit = commentData.canEditComment;
+   if (! canEdit)
+   {
+      status.setCode(status.STATUS_FORBIDDEN, "Cannot edit comment");
+      return null;
+   }
+
+   // update comment
+   updateComment(node);   
+   model.item = getCommentData(node);
+   model.node = node;
+   
+   // post an activity item, but only if we got a site
+   if (json.has("site") && json.has("itemTitle") && json.has("page"))
+   {
+      var params = jsonUtils.toObject(json.get("pageParams")), strParams = "";
+      for (param in params)
+      {
+         strParams += param + "=" + encodeURIComponent(params[param]) + "&";
+      }
+      var data =
+      {
+         title: json.get("itemTitle"),
+         page: json.get("page") + (strParams != "" ? "?" + strParams.substring(0, strParams.length - 1) : ""),
+         nodeRef: node.getNodeRef()
+      }
+
+      activities.postActivity("org.alfresco.comments.comment-updated", json.get("site"), "comments", jsonUtils.toJSONString(data));
+   }
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.get.desc.xml
new file mode 100644
index 00000000000..a03954e2bad
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get all comments</shortname>
+  <description>Get all comments for a node</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/comments?reverse={reverse?}&amp;startIndex={startIndex?}&amp;pageSize={pageSize?}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.get.js
new file mode 100644
index 00000000000..46988e6b1d4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.get.js
@@ -0,0 +1,46 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/requestutils.lib.js">
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/generic-paged-results.lib.js">
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/comments/comments.lib.js">
+
+/**
+ * Get all comments for a node
+ */
+function getCommentsList(node, index, count, reverse)
+{
+   // Get all the comments on the node. These should be in date order,
+   //  oldest to newest, as they're in repo order
+   var nodes = getComments(node);
+
+   // If they want newest first, sort that before we page it
+   if (reverse == "true" && nodes.length > 0)
+   {
+      // Don't want to mutate the result.items array. Therefore we use slice(0) to get a (shallow) copy of it.
+      nodes = nodes.slice(0).reverse();
+   }
+
+   // Now do any paging that's required
+   var result = getPagedResultsData(nodes, index, count, getCommentData);
+
+   // All done!
+   return result;
+}
+
+function main()
+{
+   // get requested node
+   var node = getRequestNode();
+   if (status.getCode() != status.STATUS_OK)
+   {
+      return;
+   }
+
+   // process additional parameters
+   var reverse = args["reverse"] != undefined ? args["reverse"] : "false";
+   var index = args["startIndex"] != undefined ? parseInt(args["startIndex"]) : 0;
+   var count = args["pageSize"] != undefined ? parseInt(args["pageSize"]) : 10;
+
+   model.data = getCommentsList(node, index, count, reverse);
+   model.node = node;
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.get.json.ftl
new file mode 100644
index 00000000000..ec993bea1b6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.get.json.ftl
@@ -0,0 +1,19 @@
+<#import "comment.lib.ftl" as commentLib>
+<#import "../generic-paged-results.lib.ftl" as gen>
+{
+   "nodePermissions":
+   {
+   <#if node.isLocked || node.hasAspect("cm:workingcopy")>
+      "create": false,
+      "edit": false,
+      "delete": false
+   <#else>
+      "create": ${node.hasPermission("CreateChildren")?string},
+      "edit": ${node.hasPermission("Write")?string},
+      "delete": ${node.hasPermission("Delete")?string}
+   </#if>
+   },
+<@gen.pagedResults data=data ; item>
+   <@commentLib.commentJSON item=item parent=node />
+</@gen.pagedResults>
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.lib.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.lib.js
new file mode 100644
index 00000000000..cf54fa8a536
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.lib.js
@@ -0,0 +1,77 @@
+
+/** Name used for the topic that contains all comments. */
+const COMMENTS_TOPIC_NAME = "Comments";
+
+/**
+ * Returns all comment nodes for a given node.
+ * @return an array of comments.
+ */
+function getComments(node)
+{
+   var commentsFolder = getCommentsFolder(node);
+   if (commentsFolder !== null)
+   {
+      var elems = commentsFolder.childAssocs["cm:contains"];
+      if (elems !== null)
+      {
+         return elems;
+      }
+   }
+   // no comments found, return an empty array
+   return [];
+}
+
+/**
+ * Returns the folder that contains all the comments.
+ * 
+ * We currently use the fm:discussable aspect where we
+ * add a "Comments" topic to it.
+ */
+function getCommentsFolder(node)
+{
+   if (node.hasAspect("fm:discussable"))
+   {
+      var forumFolder = node.childAssocs["fm:discussion"][0];
+      var topicFolder = forumFolder.childByNamePath(COMMENTS_TOPIC_NAME);
+      return topicFolder;
+   }
+   else
+   {
+      return null;
+   }
+}
+
+/**
+ * Creates the comments folder if it doesn't yet exist for the given node.
+ */
+function getOrCreateCommentsFolder(node)
+{
+   var commentsFolder = getCommentsFolder(node);
+   if (commentsFolder == null)
+   {    
+      commentsFolder = commentService.createCommentsFolder(node); 
+   }
+   return commentsFolder;
+}
+
+/**
+ * Returns the data object for a comment node
+ */
+function getCommentData(node)
+{
+   var data = {};
+   data.node = node;
+   data.author = people.getPerson(node.properties["cm:creator"]);
+   data.isUpdated = (node.properties["cm:modified"] - node.properties["cm:created"]) > 5000;
+   data.canEditComment = (person == data.owner) || (person == data.author) ||
+                         node.hasPermission("SiteManager") || node.hasPermission("Coordinator");
+   return data;
+}
+
+/**
+ * Returns the count of comments for a node.
+ */
+function getCommentsCount(node)
+{
+   return getComments(node).length;
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.desc.xml
new file mode 100644
index 00000000000..cbc853901ed
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Add comment</shortname>
+  <description>Add a new comment to a node</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/comments</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.json.ftl
new file mode 100644
index 00000000000..c957e54a538
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/comments/comments.post.json.ftl
@@ -0,0 +1,4 @@
+<#import "comment.lib.ftl" as commentLib/>
+{
+   "item": <@commentLib.commentJSON item=item parent=node />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/content/mimetype-descriptions.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/content/mimetype-descriptions.get.desc.xml
new file mode 100644
index 00000000000..679590556d2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/content/mimetype-descriptions.get.desc.xml
@@ -0,0 +1,15 @@
+<webscript>
+  <shortname>Return descriptions of all known mime types</shortname>
+  <description>
+  Returns a list of all mime types, along with their descriptions, such as
+  "MS Project" for "application/vnd.ms-project", and their normal file
+  extensions.
+  This information is retrieved from the Mimetype Service, based on the
+  mimetype map(s) defined for the repository.
+  </description>
+  <url>/api/mimetypes/descriptions</url>
+  <format default="json"/>
+  <authentication>none</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/content/mimetype-descriptions.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/content/mimetype-descriptions.get.json.ftl
new file mode 100644
index 00000000000..947da8b24f4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/content/mimetype-descriptions.get.json.ftl
@@ -0,0 +1,21 @@
+{
+  "data": {
+<#escape x as jsonUtils.encodeJSONString(x)>
+   <#list mimetypes?keys as mimetype>
+      "${mimetype}": {
+         "description": "${mimetypes[mimetype]}",
+         "extensions": {
+            "default": "${defaultExtensions[mimetype]}",
+            "additional": [
+               <#if (otherExtensions[mimetype])?has_content>
+                  <#list otherExtensions[mimetype] as ext>
+                     "${ext}"<#if ext_has_next>,</#if>
+                  </#list>
+               </#if>
+            ]
+         }
+      }<#if mimetype_has_next>,</#if>
+   </#list>
+</#escape>
+  }
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/content/mimetypes.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/content/mimetypes.get.desc.xml
new file mode 100644
index 00000000000..49915b487a7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/content/mimetypes.get.desc.xml
@@ -0,0 +1,12 @@
+<webscript>
+  <shortname>List registered Mime Types, along with the details</shortname>
+  <description>
+  Returns a list of all mime types, along with their details. If requested,
+  can also drill down to one mime type and return information on the
+  metadata extractor used for it, and any transformations to and from it.
+  </description>
+  <url>/mimetypes?mimetype={mimetype?}</url>
+  <format default="html"/>
+  <authentication>admin</authentication>
+  <transaction allow="readonly">required</transaction>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/content/mimetypes.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/content/mimetypes.get.html.ftl
new file mode 100644
index 00000000000..4d61877ad75
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/content/mimetypes.get.html.ftl
@@ -0,0 +1,59 @@
+<html>
+<head>
+  <title>Registered Mimetypes</title>
+</head>
+<body>
+ <h1>Registered Mimetypes</h1>
+
+ <#list mimetypes as mimetype>
+   <a name="${mimetype}"></a>
+   <h3 style="margin-bottom: 0em;">${mimetype} <#if extensions[mimetype]??>- ${extensions[mimetype]}</#if></h3>
+   <#if details[mimetype]??>
+    <div style="margin-left: 2em">
+     <#if details[mimetype]["extractors"]?has_content>
+        <div>
+           <b>Extractors:</b>
+           <#list details[mimetype]["extractors"] as ext>
+              ${ext}<br />
+           </#list>
+        </div>
+     <#else>
+        <div><i>No extractors</i></div>
+     </#if>
+
+     <div>
+       <b>Transformable To:</b>
+       <#if details[mimetype]["transformFrom"]?has_content>
+         <ul>
+         <#list details[mimetype]["transformFrom"] as det>
+             <li>${det}</li>
+          </#list>
+         </ul>
+       <#else>
+         <i>Cannot be transformed into anything else</i>
+       </#if>
+     </div>
+
+     <div>
+       <b>Transformable From:</b>
+       <#if details[mimetype]["transformTo"]?has_content>
+         <ul>
+         <#list details[mimetype]["transformTo"] as det>
+             <li>${det}</li>
+          </#list>
+         </ul>
+       <#else>
+         <i>Cannot be generated from anything else</i>
+       </#if>
+     </div>
+    </div>
+   <#else>
+     <div style="font-size: 75%">
+       <a href="?mimetype=${mimetype}#${mimetype}">(details for ${mimetype})</a>
+     </div>
+   </#if>
+ </#list>
+
+ <h4><a href="?mimetype=*">(details for all types)</a></h4>
+</body>
+</html>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/custommodel/cmm-upload.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/custommodel/cmm-upload.post.desc.xml
new file mode 100644
index 00000000000..41e1990f279
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/custommodel/cmm-upload.post.desc.xml
@@ -0,0 +1,20 @@
+<webscript>
+   <shortname>Custom Model Upload</shortname>
+   <description>
+   <![CDATA[
+   Upload custom model and its associated share extension module as a zip file
+
+   http://<host>:<port>/alfresco/service/api/cmm/upload
+
+   <br />
+   Notes:
+   - user must be an Admin or a member of the ALFRESCO_MODEL_ADMINISTRATORS group
+
+   ]]>
+   </description>
+   <url>/api/cmm/upload</url>
+   <format default="json"/>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/custommodel/cmm-upload.post.html.status.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/custommodel/cmm-upload.post.html.status.ftl
new file mode 100644
index 00000000000..5cb1b2c1258
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/custommodel/cmm-upload.post.html.status.ftl
@@ -0,0 +1,19 @@
+<html>
+<head>
+   <title>Upload Custom Model Failure</title>
+</head>
+<body>
+<#if (args.failure!"")?matches("^[\\w\\d\\._]+$")>
+   <script type="text/javascript">
+      ${args.failure?js_string}({
+         status: {
+            "code" : ${status.code?html},
+            "name" : "${status.codeName?json_string}",
+            "description" : "${status.codeDescription?json_string}"
+         },
+         message: "${status.message?json_string}"
+      });
+   </script>
+</#if>
+</body>
+</html>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/custommodel/cmm-upload.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/custommodel/cmm-upload.post.json.ftl
new file mode 100644
index 00000000000..b505cc606d2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/custommodel/cmm-upload.post.json.ftl
@@ -0,0 +1,16 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   <#if importedModelName??>
+    "modelName": "${importedModelName}",
+   </#if>
+   <#if shareExtXMLFragment??>
+    "shareExtModule": "${shareExtXMLFragment}",
+   </#if>
+    "status":
+    {
+      "code": 200,
+      "name": "OK",
+      "description": "Model uploaded successfully"
+    }
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/assocdefinition.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/assocdefinition.lib.ftl
new file mode 100644
index 00000000000..24737bf71ac
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/assocdefinition.lib.ftl
@@ -0,0 +1,60 @@
+<#macro assocDefJSON assocdefs>
+<#escape x as jsonUtils.encodeJSONString(x)>
+  {
+   <#if assocdefs.name?exists>
+    "name" : "${assocdefs.name.toPrefixString()}",
+   </#if>
+   <#if assocdefs.getTitle(messages)?has_content>
+    "title" : "${assocdefs.getTitle(messages)}",
+   <#else>
+    "title" : "",
+   </#if>
+   <#if assocdefs.getDescription(messages)?has_content>
+    "description" : "${assocdefs.getDescription(messages)}",
+   <#else>
+    "description" : "",
+   </#if>
+   <#if assocdefs.isChild() == true>
+    "isChildAssociation" : true,
+   <#else>   
+    "isChildAssociation" : false,
+   </#if>	
+   <#if assocdefs.isProtected() == true>
+    "protected" : true,
+   <#else>
+    "protected" : false,
+   </#if>
+    "source" : {
+	<#if assocdefs.getSourceClass().name?exists>
+	"class" : "${assocdefs.getSourceClass().name.toPrefixString()}",
+	</#if>
+	<#if assocdefs.getSourceRoleName()?exists>
+	"role" : "${assocdefs.getSourceRoleName().toPrefixString()}",
+	</#if>
+	"mandatory" : ${assocdefs.isSourceMandatory()?string},
+	"many" : ${assocdefs.isSourceMany()?string}
+     },		
+    "target" : {
+    <#if assocdefs.getTargetClass().name?exists>
+	"class" : "${assocdefs.getTargetClass().name.toPrefixString()}",
+	</#if>
+	<#if assocdefs.getTargetRoleName()?exists>
+	"role" : "${assocdefs.getTargetRoleName().toPrefixString()}",
+	</#if>
+	"mandatory" : ${assocdefs.isTargetMandatory()?string},
+	"many" : ${assocdefs.isTargetMany()?string}
+     },
+   <#if assocdefs.isChild() == true>
+    <#if assocdefs.getRequiredChildName()?exists>
+    "requiredChildName" : "${assocdefs.getRequiredChildName()}",
+    </#if>
+    <#if assocdefs.getDuplicateChildNamesAllowed() == true>
+	"duplicateChildNameAllowed" : true,
+	    <#else>
+	"duplicateChildNameAllowed" : false,
+	</#if>
+   </#if>
+    "url" : "${"/api/classes/" + url.templateArgs.classname + "/association/" + assocdefs.name.toPrefixString()?replace(":","_")}"
+  }
+</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/association.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/association.get.desc.xml
new file mode 100644
index 00000000000..79f6679afd4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/association.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get association definitions</shortname>
+   <description>Get the collection of association definitions.</description>
+   <url>/api/classes/{classname}/association/{assocname}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/association.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/association.get.json.ftl
new file mode 100644
index 00000000000..186f9fb1821
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/association.get.json.ftl
@@ -0,0 +1,6 @@
+<#import "assocdefinition.lib.ftl" as assocDefLib/>
+<#if assocdefs?exists>
+<@assocDefLib.assocDefJSON assocdefs=assocdefs/>
+<#else>
+{}
+</#if>		
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/associations.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/associations.get.desc.xml
new file mode 100644
index 00000000000..d29ee7049c4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/associations.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get association definitions for classname</shortname>
+   <description>Gets the collection of association definitions for a given classname.</description>
+   <url>/api/classes/{classname}/associations?af={associationFilter?}&amp;nsp={namespacePrefix?}&amp;n={name?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/associations.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/associations.get.json.ftl
new file mode 100644
index 00000000000..c188eb0ac85
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/associations.get.json.ftl
@@ -0,0 +1,14 @@
+<#import "assocdefinition.lib.ftl" as assocDefLib/>
+[
+	<#list assocdefs as assocdefs>
+		<#if individualproperty?exists>
+			<#if assocdefs.name == individualproperty.name>
+				<@assocDefLib.assocDefJSON assocdefs=assocdefs/>
+				<#break>
+			</#if>	
+			<#else>
+				<@assocDefLib.assocDefJSON assocdefs=assocdefs/>
+				<#if assocdefs_has_next>,</#if>
+			</#if>
+	</#list>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/class.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/class.get.desc.xml
new file mode 100644
index 00000000000..4b8504fa7e6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/class.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get class definitions for classname</shortname>
+   <description>Gets the collection of class definitions for a given classname.</description>
+   <url>/api/classes/{className}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/class.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/class.get.json.ftl
new file mode 100644
index 00000000000..9ce7d992a0d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/class.get.json.ftl
@@ -0,0 +1,4 @@
+<#import "classdetails.lib.ftl" as classdetailsDefLib/>
+<#list classdefs as classdef>
+<@classdetailsDefLib.classDefJSON classdef=classdef key=classdef_index/><#if classdef_has_next>,</#if>
+</#list>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classdetails.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classdetails.lib.ftl
new file mode 100644
index 00000000000..dccbf959acd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classdetails.lib.ftl
@@ -0,0 +1,111 @@
+<#macro classDefJSON classdef key>
+<#local classdefprefix=classdef.name.toPrefixString()?replace(":","_")>
+<#escape x as jsonUtils.encodeJSONString(x)>
+   {
+      <#if classdef.name??>"name": "${classdef.name.toPrefixString()}",</#if>
+      "isAspect": ${classdef.isAspect()?string},
+      "isContainer": ${classdef.isContainer()?string},
+      "title": "${classdef.getTitle(messages)!""}",
+      "description": "${classdef.getDescription(messages)!""}",
+      "parent":
+      {
+         <#if classdef.parentName??>
+         "name": "${classdef.parentName.toPrefixString()}",
+         "title": "${classdef.parentName.getLocalName()}",
+         "url": "/api/classes/${classdef.parentName.toPrefixString()?replace(":","_")}"
+         </#if>
+      },
+      "defaultAspects":
+      {
+         <#if classdef.defaultAspects??>
+         <#list classdef.defaultAspects as aspectdef>
+         "${aspectdef.name.toPrefixString()}":
+         {
+            "name": "${aspectdef.name.toPrefixString()}",
+            "title": "${aspectdef.getTitle(messages)!""}",
+            "url": "/api/classes/${classdefprefix}/property/${aspectdef.name.toPrefixString()?replace(":","_")}"
+         }<#if aspectdef_has_next>,</#if>
+         </#list>
+         </#if>
+      },
+      "properties":
+      {
+         <#list propertydefs[key] as propertydef>
+         "${propertydef.name.toPrefixString()}":
+         {
+            "name": "${propertydef.name.toPrefixString()}",
+            "title": "${propertydef.getTitle(messages)!""}",
+            "description": "${propertydef.getDescription(messages)!""}",
+            "dataType": <#if propertydef.dataType??>"${propertydef.dataType.name.toPrefixString()}"<#else>"<unknown>"</#if>,
+            "defaultValue": <#if propertydef.defaultValue??>"${propertydef.defaultValue}"<#else>null</#if>,
+            "multiValued": ${propertydef.multiValued?string},
+            "mandatory": ${propertydef.mandatory?string},
+            "enforced": ${propertydef.mandatoryEnforced?string},
+            "protected": ${propertydef.protected?string},
+            "indexed": ${propertydef.indexed?string},
+            "url": "/api/classes/${classdefprefix}/property/${propertydef.name.toPrefixString()?replace(":","_")}"
+         }<#if propertydef_has_next>,</#if>
+         </#list>
+      },
+      "associations":
+      {
+         <#assign isfirst=true>
+         <#list assocdefs[key] as assocdef>
+         <#if !isfirst && !assocdef.isChild()>,</#if>
+         <#if !assocdef.isChild()>
+         <#assign isfirst=false>
+         "${assocdef.name.toPrefixString()}":
+         {
+            "name": "${assocdef.name.toPrefixString()}",
+            "title": "${assocdef.getTitle(messages)!""}",
+            "url": "/api/classes/${classdefprefix}/association/${assocdef.name.toPrefixString()?replace(":","_")}",
+            "source":
+            {
+               <#if assocdef.getSourceClass().name??>"class": "${assocdef.getSourceClass().name.toPrefixString()}",</#if>
+               <#if assocdef.getSourceRoleName()??>"role": "${assocdef.getSourceRoleName().toPrefixString()}",</#if>
+               "mandatory": ${assocdef.isSourceMandatory()?string},
+               "many": ${assocdef.isSourceMany()?string}
+            },
+            "target":
+            {
+               <#if assocdef.getTargetClass().name??>"class": "${assocdef.getTargetClass().name.toPrefixString()}",</#if>
+               <#if assocdef.getTargetRoleName()??>"role": "${assocdef.getTargetRoleName().toPrefixString()}",</#if>
+               "mandatory": ${assocdef.isTargetMandatory()?string},
+               "many": ${assocdef.isTargetMany()?string}
+            }
+         }
+         </#if>
+         </#list>
+      },
+      "childassociations":
+      {
+         <#assign isfirst=true>
+         <#list assocdefs[key] as assocdef>
+         <#if !isfirst && assocdef.isChild()>,</#if>
+         <#if assocdef.isChild()>
+         <#assign isfirst=false>
+         "${assocdef.name.toPrefixString()}":
+         {
+            <#if assocdef.name??>"name": "${assocdef.name.toPrefixString()}",</#if>
+            "title": "${assocdef.getTitle(messages)!""}",
+            "url": "/api/classes/${classdefprefix}/association/${assocdef.name.toPrefixString()?replace(":","_")}",
+            "source":
+            {
+               <#if assocdef.getSourceClass().name??>"class": "${assocdef.getSourceClass().name.toPrefixString()}",</#if>
+               "mandatory": ${assocdef.isSourceMandatory()?string},
+               "many": ${assocdef.isSourceMany()?string}
+            },
+            "target":
+            {
+               <#if assocdef.getTargetClass().name??>"class": "${assocdef.getTargetClass().name.toPrefixString()}",</#if>
+               "mandatory": ${assocdef.isTargetMandatory()?string},
+               "many": ${assocdef.isTargetMany()?string}
+            }
+         }
+         </#if>
+         </#list>
+      },
+      "url": "/api/classes/${classdefprefix}"
+   }
+</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classes.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classes.get.desc.xml
new file mode 100644
index 00000000000..a5b78ef2c2d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classes.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get class definitions</shortname>
+   <description>Gets the collection of class definitions - parameters classfilter , namespaceprefix and name.</description>
+   <url>/api/classes?cf={classFilter?}&amp;nsp={namespacePrefix?}&amp;n={name?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classes.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classes.get.json.ftl
new file mode 100644
index 00000000000..c502a9fe75f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/classes.get.json.ftl
@@ -0,0 +1,6 @@
+<#import "classdetails.lib.ftl" as classdetailsDefLib/>
+[
+<#list classdefs as classdef>
+<@classdetailsDefLib.classDefJSON classdef=classdef key=classdef_index/><#if classdef_has_next>,</#if>
+</#list>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/dictionary.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/dictionary.get.desc.xml
new file mode 100644
index 00000000000..8404e72ab61
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/dictionary.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get remote dictionary definitions</shortname>
+   <description>Gets all aspect and class definitions that form the dictionary - to enable a lightweight remote dictionary.</description>
+   <url>/api/dictionary</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/dictionary.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/dictionary.get.json.ftl
new file mode 100644
index 00000000000..65849f86d22
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/dictionary.get.json.ftl
@@ -0,0 +1,6 @@
+<#import "classdetails.lib.ftl" as classdetailsDefLib/>
+[
+<#list classdefs as classdef>
+<@classdetailsDefLib.classDefJSON classdef=classdef key=classdef_index /><#if classdef_has_next>,</#if>
+</#list>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/assocdefinition.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/assocdefinition.lib.ftl
new file mode 100644
index 00000000000..a452a6ad3fe
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/assocdefinition.lib.ftl
@@ -0,0 +1,60 @@
+<#macro assocDefJSON assocdefs>
+<#escape x as jsonUtils.encodeJSONString(x)>
+  {
+   <#if assocdefs.name?exists>
+    "name" : "${assocdefs.name.toPrefixString()}",
+   </#if>
+   <#if assocdefs.getTitle(messages)?has_content>
+    "title" : "${assocdefs.getTitle(messages)}",
+   <#else>
+    "title" : "",
+   </#if>
+   <#if assocdefs.getDescription(messages)?has_content>
+    "description" : "${assocdefs.getDescription(messages)}",
+   <#else>
+    "description" : "",
+   </#if>
+   <#if assocdefs.isChild() == true>
+    "isChildAssociation" : true,
+   <#else>   
+    "isChildAssociation" : false,
+   </#if>	
+   <#if assocdefs.isProtected() == true>
+    "protected" : true,
+   <#else>
+    "protected" : false,
+   </#if>
+    "source" : {
+	<#if assocdefs.getSourceClass().name?exists>
+	"class" : "${assocdefs.getSourceClass().name.toPrefixString()}",
+	</#if>
+	<#if assocdefs.getSourceRoleName()?exists>
+	"role" : "${assocdefs.getSourceRoleName().toPrefixString()}",
+	</#if>
+	"mandatory" : ${assocdefs.isSourceMandatory()?string},
+	"many" : ${assocdefs.isSourceMany()?string}
+     },		
+    "target" : {
+    <#if assocdefs.getTargetClass().name?exists>
+	"class" : "${assocdefs.getTargetClass().name.toPrefixString()}",
+	</#if>
+	<#if assocdefs.getTargetRoleName()?exists>
+	"role" : "${assocdefs.getTargetRoleName().toPrefixString()}",
+	</#if>
+	"mandatory" : ${assocdefs.isTargetMandatory()?string},
+	"many" : ${assocdefs.isTargetMany()?string}
+     },
+   <#if assocdefs.isChild() == true>
+    <#if assocdefs.getRequiredChildName()?exists>
+    "requiredChildName" : "${assocdefs.getRequiredChildName()}",
+    </#if>
+    <#if assocdefs.getDuplicateChildNamesAllowed() == true>
+	"duplicateChildNameAllowed" : true,
+	    <#else>
+	"duplicateChildNameAllowed" : false,
+	</#if>
+   </#if>
+    "url" : "${"/api/defclasses/" + url.templateArgs.prefix + "/" + url.templateArgs.shortClassName + "/association/" + assocdefs.name.toPrefixString()?replace(":","/")}"
+  }
+</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/association.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/association.get.desc.xml
new file mode 100644
index 00000000000..78f02612da8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/association.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get association definitions</shortname>
+   <description>Get the collection of association definitions.</description>
+   <url>/api/defclasses/{prefix}/{shortClassName}/association/{assocprefix}/{assocname}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/association.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/association.get.json.ftl
new file mode 100644
index 00000000000..186f9fb1821
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/association.get.json.ftl
@@ -0,0 +1,6 @@
+<#import "assocdefinition.lib.ftl" as assocDefLib/>
+<#if assocdefs?exists>
+<@assocDefLib.assocDefJSON assocdefs=assocdefs/>
+<#else>
+{}
+</#if>		
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/associations.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/associations.get.desc.xml
new file mode 100644
index 00000000000..80e7f783136
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/associations.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get association definitions for classname</shortname>
+   <description>Gets the collection of association definitions for a given classname.</description>
+   <url>/api/defclasses/{prefix}/{shortClassName}/associations?af={associationFilter?}&amp;nsp={namespacePrefix?}&amp;n={name?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/associations.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/associations.get.json.ftl
new file mode 100644
index 00000000000..c188eb0ac85
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/associations.get.json.ftl
@@ -0,0 +1,14 @@
+<#import "assocdefinition.lib.ftl" as assocDefLib/>
+[
+	<#list assocdefs as assocdefs>
+		<#if individualproperty?exists>
+			<#if assocdefs.name == individualproperty.name>
+				<@assocDefLib.assocDefJSON assocdefs=assocdefs/>
+				<#break>
+			</#if>	
+			<#else>
+				<@assocDefLib.assocDefJSON assocdefs=assocdefs/>
+				<#if assocdefs_has_next>,</#if>
+			</#if>
+	</#list>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/class.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/class.get.desc.xml
new file mode 100644
index 00000000000..670addedc38
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/class.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get class definitions for classname</shortname>
+   <description>Gets the collection of class definitions for a given classname.</description>
+   <url>/api/defclasses/{prefix}/{shortClassName}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/class.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/class.get.json.ftl
new file mode 100644
index 00000000000..9ce7d992a0d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/class.get.json.ftl
@@ -0,0 +1,4 @@
+<#import "classdetails.lib.ftl" as classdetailsDefLib/>
+<#list classdefs as classdef>
+<@classdetailsDefLib.classDefJSON classdef=classdef key=classdef_index/><#if classdef_has_next>,</#if>
+</#list>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/classdetails.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/classdetails.lib.ftl
new file mode 100644
index 00000000000..c580614f908
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/classdetails.lib.ftl
@@ -0,0 +1,111 @@
+<#macro classDefJSON classdef key>
+<#local classdefprefix=classdef.name.toPrefixString()?replace(":","/")>
+<#escape x as jsonUtils.encodeJSONString(x)>
+   {
+      <#if classdef.name??>"name": "${classdef.name.toPrefixString()}",</#if>
+      "isAspect": ${classdef.isAspect()?string},
+      "isContainer": ${classdef.isContainer()?string},
+      "title": "${classdef.getTitle(messages)!""}",
+      "description": "${classdef.getDescription(messages)!""}",
+      "parent":
+      {
+         <#if classdef.parentName??>
+         "name": "${classdef.parentName.toPrefixString()}",
+         "title": "${classdef.parentName.getLocalName()}",
+         "url": "/api/defclasses/${classdef.parentName.toPrefixString()?replace(":","/")}"
+         </#if>
+      },
+      "defaultAspects":
+      {
+         <#if classdef.defaultAspects??>
+         <#list classdef.defaultAspects as aspectdef>
+         "${aspectdef.name.toPrefixString()}":
+         {
+            "name": "${aspectdef.name.toPrefixString()}",
+            "title": "${aspectdef.getTitle(messages)!""}",
+            "url": "/api/defclasses/${classdefprefix}/property/${aspectdef.name.toPrefixString()?replace(":","/")}"
+         }<#if aspectdef_has_next>,</#if>
+         </#list>
+         </#if>
+      },
+      "properties":
+      {
+         <#list propertydefs[key] as propertydef>
+         "${propertydef.name.toPrefixString()}":
+         {
+            "name": "${propertydef.name.toPrefixString()}",
+            "title": "${propertydef.getTitle(messages)!""}",
+            "description": "${propertydef.getDescription(messages)!""}",
+            "dataType": <#if propertydef.dataType??>"${propertydef.dataType.name.toPrefixString()}"<#else>"<unknown>"</#if>,
+            "defaultValue": <#if propertydef.defaultValue??>"${propertydef.defaultValue}"<#else>null</#if>,
+            "multiValued": ${propertydef.multiValued?string},
+            "mandatory": ${propertydef.mandatory?string},
+            "enforced": ${propertydef.mandatoryEnforced?string},
+            "protected": ${propertydef.protected?string},
+            "indexed": ${propertydef.indexed?string},
+            "url": "/api/defclasses/${classdefprefix}/property/${propertydef.name.toPrefixString()?replace(":","/")}"
+         }<#if propertydef_has_next>,</#if>
+         </#list>
+      },
+      "associations":
+      {
+         <#assign isfirst=true>
+         <#list assocdefs[key] as assocdef>
+         <#if !isfirst && !assocdef.isChild()>,</#if>
+         <#if !assocdef.isChild()>
+         <#assign isfirst=false>
+         "${assocdef.name.toPrefixString()}":
+         {
+            "name": "${assocdef.name.toPrefixString()}",
+            "title": "${assocdef.getTitle(messages)!""}",
+            "url": "/api/defclasses/${classdefprefix}/association/${assocdef.name.toPrefixString()?replace(":","/")}",
+            "source":
+            {
+               <#if assocdef.getSourceClass().name??>"class": "${assocdef.getSourceClass().name.toPrefixString()}",</#if>
+               <#if assocdef.getSourceRoleName()??>"role": "${assocdef.getSourceRoleName().toPrefixString()}",</#if>
+               "mandatory": ${assocdef.isSourceMandatory()?string},
+               "many": ${assocdef.isSourceMany()?string}
+            },
+            "target":
+            {
+               <#if assocdef.getTargetClass().name??>"class": "${assocdef.getTargetClass().name.toPrefixString()}",</#if>
+               <#if assocdef.getTargetRoleName()??>"role": "${assocdef.getTargetRoleName().toPrefixString()}",</#if>
+               "mandatory": ${assocdef.isTargetMandatory()?string},
+               "many": ${assocdef.isTargetMany()?string}
+            }
+         }
+         </#if>
+         </#list>
+      },
+      "childassociations":
+      {
+         <#assign isfirst=true>
+         <#list assocdefs[key] as assocdef>
+         <#if !isfirst && assocdef.isChild()>,</#if>
+         <#if assocdef.isChild()>
+         <#assign isfirst=false>
+         "${assocdef.name.toPrefixString()}":
+         {
+            <#if assocdef.name??>"name": "${assocdef.name.toPrefixString()}",</#if>
+            "title": "${assocdef.getTitle(messages)!""}",
+            "url": "/api/defclasses/${classdefprefix}/association/${assocdef.name.toPrefixString()?replace(":","/")}",
+            "source":
+            {
+               <#if assocdef.getSourceClass().name??>"class": "${assocdef.getSourceClass().name.toPrefixString()}",</#if>
+               "mandatory": ${assocdef.isSourceMandatory()?string},
+               "many": ${assocdef.isSourceMany()?string}
+            },
+            "target":
+            {
+               <#if assocdef.getTargetClass().name??>"class": "${assocdef.getTargetClass().name.toPrefixString()}",</#if>
+               "mandatory": ${assocdef.isTargetMandatory()?string},
+               "many": ${assocdef.isTargetMany()?string}
+            }
+         }
+         </#if>
+         </#list>
+      },
+      "url": "/api/defclasses/${classdefprefix}"
+   }
+</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/classes.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/classes.get.desc.xml
new file mode 100644
index 00000000000..1ea6280e808
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/classes.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get class definitions</shortname>
+   <description>Gets the collection of class definitions - parameters classfilter , namespaceprefix and name.</description>
+   <url>/api/defclasses?cf={classFilter?}&amp;nsp={namespacePrefix?}&amp;n={name?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/classes.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/classes.get.json.ftl
new file mode 100644
index 00000000000..c502a9fe75f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/classes.get.json.ftl
@@ -0,0 +1,6 @@
+<#import "classdetails.lib.ftl" as classdetailsDefLib/>
+[
+<#list classdefs as classdef>
+<@classdetailsDefLib.classDefJSON classdef=classdef key=classdef_index/><#if classdef_has_next>,</#if>
+</#list>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/properties.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/properties.get.desc.xml
new file mode 100644
index 00000000000..07392099fc8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/properties.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+   <shortname>Get property definitions</shortname>
+   <description>Gets the collection of property definitions.</description>
+   <url>/api/defclasses/{prefix}/{shortClassName}/properties?nsp={namespacePrefix?}&amp;n={name?}</url>
+   <url>/api/defproperties?nsp={namespacePrefix?}&amp;n={name?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/properties.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/properties.get.json.ftl
new file mode 100644
index 00000000000..cec1d3023dc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/properties.get.json.ftl
@@ -0,0 +1,8 @@
+<#import "propertydefinition.lib.ftl" as propertyDefLib/>
+[
+   <#list propertydefs as propertydefinitions>
+      <@propertyDefLib.propertyDefJSON propertydefs=propertydefinitions/>
+      <#if propertydefinitions_has_next>,</#if>
+   </#list>
+]
+ 
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/property.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/property.get.desc.xml
new file mode 100644
index 00000000000..0698b81ee29
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/property.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get property definitions for classname</shortname>
+   <description>Gets the collection of property definitions for a given classname and property name.</description>
+   <url>/api/defclasses/{prefix}/{shortClassName}/property/{proppref}/{propname}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/property.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/property.get.json.ftl
new file mode 100644
index 00000000000..6870ea1ed91
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/property.get.json.ftl
@@ -0,0 +1,6 @@
+<#import "propertydefinition.lib.ftl" as propertyDefLib/>
+<#if propertydefs?exists>
+	<@propertyDefLib.propertyDefJSON propertydefs=propertydefs/>
+<#else>
+	{}
+</#if>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/propertydefinition.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/propertydefinition.lib.ftl
new file mode 100644
index 00000000000..0fd492da41c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/propertydefinition.lib.ftl
@@ -0,0 +1,50 @@
+<#macro propertyDefJSON propertydefs>
+	<#escape x as jsonUtils.encodeJSONString(x)>
+	{
+		<#if propertydefs.name?exists>
+		"name" : "${propertydefs.name.toPrefixString()}",
+		</#if>
+		<#if propertydefs.getTitle(messages)?has_content>
+		"title" : "${propertydefs.getTitle(messages)}",
+		</#if>
+		<#if propertydefs.getDescription(messages)?has_content>
+		"description" : "${propertydefs.getDescription(messages)}",
+		</#if>
+		<#if propertydefs.defaultValues?exists>
+		"defaultValues" : "${propertydefs.defaultValues}",
+		<#else>
+		"defaultValues" : "",
+		</#if>
+		<#if propertydefs.dataType?exists>
+		"dataType" : "${propertydefs.dataType.name.toPrefixString()}",
+		</#if>
+		"multiValued" : ${propertydefs.multiValued?string},
+		"mandatory" : ${propertydefs.mandatory?string},
+		"enforced" : ${propertydefs.mandatoryEnforced?string},
+		"protected" : ${propertydefs.protected?string},
+		"indexed" : ${propertydefs.indexed?string},
+		"indexedAtomically" : ${propertydefs.indexedAtomically?string},
+		"constraints" :
+		[
+			<#list propertydefs.constraints as constraintdefs>
+		{ 
+			"type" : "${constraintdefs.getConstraint().getType()}",
+			"parameters" : 
+			[
+				<#assign params = constraintdefs.getConstraint().getParameters()>
+				<#assign keys = params?keys>
+				<#list keys as key>
+				{
+					"${key}" : <#rt><#if params[key]?is_enumerable>[<#list params[key] as mlist>"${mlist}"<#if mlist_has_next>,</#if></#list>]
+								<#t><#else><#if params[key]?is_boolean>${params[key]?string}<#else>"${params[key]?string}"</#if></#if>
+				}
+					<#if key_has_next>,</#if>
+				</#list> 
+			]
+		}<#if constraintdefs_has_next>,</#if>
+			</#list>
+		],
+		"url" : "${"/api/property/" + propertydefs.name.toPrefixString()?replace(":","/")}"
+	}
+	</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/subclasses.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/subclasses.get.desc.xml
new file mode 100644
index 00000000000..f4b0aeb5d24
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/subclasses.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get subclasses definitions</shortname>
+   <description>Get the collection of subclasses definitions - parameters r=> recursive, classfilter , namespaceprefix and name.</description>
+   <url>/api/defclasses/{prefix}/{shortClassName}/subclasses?r={recursive?}&amp;nsp={namespacePrefix?}&amp;n={name?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/subclasses.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/subclasses.get.json.ftl
new file mode 100644
index 00000000000..a6717a80a6e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/prefixed/subclasses.get.json.ftl
@@ -0,0 +1,7 @@
+<#import "classdetails.lib.ftl" as classdetailsDefLib/>
+[
+<#list classdefs as classdef>
+<@classdetailsDefLib.classDefJSON classdef=classdef key=classdef_index/>
+<#if classdef_has_next>,</#if>
+</#list>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/properties.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/properties.get.desc.xml
new file mode 100644
index 00000000000..9a9e7418aed
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/properties.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+   <shortname>Get property definitions</shortname>
+   <description>Gets the collection of property definitions.</description>
+   <url>/api/classes/{classname}/properties?nsp={namespacePrefix?}&amp;n={name?}&amp;type={allowedType?}</url>
+   <url>/api/properties?nsp={namespacePrefix?}&amp;n={name?}&amp;type={allowedType?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/properties.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/properties.get.json.ftl
new file mode 100644
index 00000000000..cec1d3023dc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/properties.get.json.ftl
@@ -0,0 +1,8 @@
+<#import "propertydefinition.lib.ftl" as propertyDefLib/>
+[
+   <#list propertydefs as propertydefinitions>
+      <@propertyDefLib.propertyDefJSON propertydefs=propertydefinitions/>
+      <#if propertydefinitions_has_next>,</#if>
+   </#list>
+]
+ 
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/property.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/property.get.desc.xml
new file mode 100644
index 00000000000..d7f06d693bf
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/property.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get property definitions for classname</shortname>
+   <description>Gets the collection of property definitions for a given classname and property name.</description>
+   <url>/api/classes/{classname}/property/{propname}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/property.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/property.get.json.ftl
new file mode 100644
index 00000000000..6870ea1ed91
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/property.get.json.ftl
@@ -0,0 +1,6 @@
+<#import "propertydefinition.lib.ftl" as propertyDefLib/>
+<#if propertydefs?exists>
+	<@propertyDefLib.propertyDefJSON propertydefs=propertydefs/>
+<#else>
+	{}
+</#if>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/propertydefinition.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/propertydefinition.lib.ftl
new file mode 100644
index 00000000000..1052a2aa374
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/propertydefinition.lib.ftl
@@ -0,0 +1,50 @@
+<#macro propertyDefJSON propertydefs>
+	<#escape x as jsonUtils.encodeJSONString(x)>
+	{
+		<#if propertydefs.name?exists>
+		"name" : "${propertydefs.name.toPrefixString()}",
+		</#if>
+		<#if propertydefs.getTitle(messages)?has_content>
+		"title" : "${propertydefs.getTitle(messages)}",
+		</#if>
+		<#if propertydefs.getDescription(messages)?has_content>
+		"description" : "${propertydefs.getDescription(messages)}",
+		</#if>
+		<#if propertydefs.defaultValues?exists>
+		"defaultValues" : "${propertydefs.defaultValues}",
+		<#else>
+		"defaultValues" : "",
+		</#if>
+		<#if propertydefs.dataType?exists>
+		"dataType" : "${propertydefs.dataType.name.toPrefixString()}",
+		</#if>
+		"multiValued" : ${propertydefs.multiValued?string},
+		"mandatory" : ${propertydefs.mandatory?string},
+		"enforced" : ${propertydefs.mandatoryEnforced?string},
+		"protected" : ${propertydefs.protected?string},
+		"indexed" : ${propertydefs.indexed?string},
+		"indexedAtomically" : ${propertydefs.indexedAtomically?string},
+		"constraints" :
+		[
+			<#list propertydefs.constraints as constraintdefs>
+		{ 
+			"type" : "${constraintdefs.getConstraint().getType()}",
+			"parameters" : 
+			[
+				<#assign params = constraintdefs.getConstraint().getParameters()>
+				<#assign keys = params?keys>
+				<#list keys as key>
+				{
+					"${key}" : <#rt><#if params[key]?is_enumerable>[<#list params[key] as mlist>"${mlist}"<#if mlist_has_next>,</#if></#list>]
+								<#t><#else><#if params[key]?is_boolean>${params[key]?string}<#else>"${params[key]?string}"</#if></#if>
+				}
+					<#if key_has_next>,</#if>
+				</#list> 
+			]
+		}<#if constraintdefs_has_next>,</#if>
+			</#list>
+		],
+		"url" : "${"/api/property/" + propertydefs.name.toPrefixString()?replace(":","_")}"
+	}
+	</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/subclasses.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/subclasses.get.desc.xml
new file mode 100644
index 00000000000..d43bd58c089
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/subclasses.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get subclasses definitions</shortname>
+   <description>Get the collection of subclasses definitions - parameters r=> recursive, classfilter , namespaceprefix and name.</description>
+   <url>/api/classes/{classname}/subclasses?r={recursive?}&amp;nsp={namespacePrefix?}&amp;n={name?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/subclasses.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/subclasses.get.json.ftl
new file mode 100644
index 00000000000..a6717a80a6e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/dictionary/subclasses.get.json.ftl
@@ -0,0 +1,7 @@
+<#import "classdetails.lib.ftl" as classdetailsDefLib/>
+[
+<#list classdefs as classdef>
+<@classdetailsDefLib.classDefJSON classdef=classdef key=classdef_index/>
+<#if classdef_has_next>,</#if>
+</#list>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-filtered.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-filtered.get.desc.xml
new file mode 100644
index 00000000000..ea7bd1ff068
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-filtered.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Get filtered forum posts</shortname>
+  <description>Get the discussion topics that match the filters.</description>
+  <url>/api/forum/site/{site}/discussions/posts/filtered</url>
+  <url>/api/forum/discussions/posts/filtered</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-filtered.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-filtered.get.json.ftl
new file mode 100644
index 00000000000..f338b40df2c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-filtered.get.json.ftl
@@ -0,0 +1,19 @@
+<#import "../post.lib.ftl" as postLib/>
+<#import "../../generic-paged-results.lib.ftl" as gen/>
+{
+   "forumPermissions":
+   {
+      <#if forum??>
+         "create": ${forum.hasPermission("CreateChildren")?string},
+         "edit": ${forum.hasPermission("Write")?string},
+         "delete": ${forum.hasPermission("Delete")?string}
+      <#else>
+         "create": false,
+         "edit": false,
+         "delete": false
+      </#if>      
+   },
+<@gen.pagedResults data=data ; item>
+	<@postLib.postJSON postData=item />
+</@gen.pagedResults>
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-hot.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-hot.get.desc.xml
new file mode 100644
index 00000000000..910f5fe0387
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-hot.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get hot forum posts</shortname>
+  <description>Get the hot topics in the forum.</description>
+  <url>/api/forum/site/{site}/{container}/{path}/posts/hot</url>
+  <url>/api/forum/site/{site}/{container}/posts/hot</url>
+  <url>/api/forum/node/{store_type}/{store_id}/{id}/posts/hot</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-hot.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-hot.get.json.ftl
new file mode 100644
index 00000000000..d60a684a3e8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-hot.get.json.ftl
@@ -0,0 +1,13 @@
+<#import "../post.lib.ftl" as postLib/>
+<#import "../../generic-paged-results.lib.ftl" as gen/>
+{
+   "forumPermissions":
+   {
+      "create": ${forum.hasPermission("CreateChildren")?string},
+      "edit": ${forum.hasPermission("Write")?string},
+      "delete": ${forum.hasPermission("Delete")?string}
+   },
+<@gen.pagedResults data=data ; item>
+	<@postLib.postJSON postData=item />
+</@gen.pagedResults>
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-mine.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-mine.get.desc.xml
new file mode 100644
index 00000000000..ef849922f04
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-mine.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get my forum posts</shortname>
+  <description>Gets the forum posts created by the current user.</description>
+  <url>/api/forum/site/{site}/{container}/{path}/posts/myposts</url>
+  <url>/api/forum/site/{site}/{container}/posts/myposts</url>
+  <url>/api/forum/node/{store_type}/{store_id}/{id}/posts/myposts</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-mine.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-mine.get.json.ftl
new file mode 100644
index 00000000000..d60a684a3e8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-mine.get.json.ftl
@@ -0,0 +1,13 @@
+<#import "../post.lib.ftl" as postLib/>
+<#import "../../generic-paged-results.lib.ftl" as gen/>
+{
+   "forumPermissions":
+   {
+      "create": ${forum.hasPermission("CreateChildren")?string},
+      "edit": ${forum.hasPermission("Write")?string},
+      "delete": ${forum.hasPermission("Delete")?string}
+   },
+<@gen.pagedResults data=data ; item>
+	<@postLib.postJSON postData=item />
+</@gen.pagedResults>
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-new.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-new.get.desc.xml
new file mode 100644
index 00000000000..629218eb726
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-new.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get new forum posts</shortname>
+  <description>Gets the forum posts for the last specified number of days.</description>
+  <url>/api/forum/site/{site}/{container}/{path}/posts/new?numdays={numdays}</url>
+  <url>/api/forum/site/{site}/{container}/posts/new?numdays={numdays}</url>
+  <url>/api/forum/node/{store_type}/{store_id}/{id}/posts/new?numdays={numdays}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-new.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-new.get.json.ftl
new file mode 100644
index 00000000000..d60a684a3e8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts-new.get.json.ftl
@@ -0,0 +1,13 @@
+<#import "../post.lib.ftl" as postLib/>
+<#import "../../generic-paged-results.lib.ftl" as gen/>
+{
+   "forumPermissions":
+   {
+      "create": ${forum.hasPermission("CreateChildren")?string},
+      "edit": ${forum.hasPermission("Write")?string},
+      "delete": ${forum.hasPermission("Delete")?string}
+   },
+<@gen.pagedResults data=data ; item>
+	<@postLib.postJSON postData=item />
+</@gen.pagedResults>
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.get.desc.xml
new file mode 100644
index 00000000000..272aa32e828
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get forum posts</shortname>
+  <description>Gets the forum posts.</description>
+  <url>/api/forum/site/{site}/{container}/{path}/posts</url>
+  <url>/api/forum/site/{site}/{container}/posts</url>
+  <url>/api/forum/node/{store_type}/{store_id}/{id}/posts</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.get.json.ftl
new file mode 100644
index 00000000000..6ba3e8ae02d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.get.json.ftl
@@ -0,0 +1,19 @@
+<#import "../post.lib.ftl" as postLib/>
+<#import "../../generic-paged-results.lib.ftl" as gen/>
+{
+   "forumPermissions":
+   {
+      <#if forum.getParent()?? && forum.getTypeShort() != "st:site" >
+        "create": ${(forum.getParent()).hasPermission("CreateChildren")?string},
+        "edit": ${(forum.getParent()).hasPermission("Write")?string},
+        "delete": ${(forum.getParent()).hasPermission("Delete")?string}
+      <#else>
+        "create": ${forum.hasPermission("CreateChildren")?string},
+        "edit": ${forum.hasPermission("Write")?string},
+        "delete": ${forum.hasPermission("Delete")?string}
+      </#if>
+   },
+<@gen.pagedResults data=data ; item>
+	<@postLib.postJSON postData=item />
+</@gen.pagedResults>
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.desc.xml
new file mode 100644
index 00000000000..94aed0bf272
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Add forum post</shortname>
+  <description>Adds a post to a forum.</description>
+  <url>/api/forum/site/{site}/{container}/{path}/posts</url>
+  <url>/api/forum/site/{site}/{container}/posts</url>
+  <url>/api/forum/node/{store_type}/{store_id}/{id}/posts</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.json.ftl
new file mode 100644
index 00000000000..a3cd1be869d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/forum/forum-posts.post.json.ftl
@@ -0,0 +1,4 @@
+<#import "../post.lib.ftl" as postLib />
+{
+   "item": <@postLib.postJSON postData=postData />
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/post.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/post.lib.ftl
new file mode 100644
index 00000000000..b48ca0a66da
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/post.lib.ftl
@@ -0,0 +1,124 @@
+<#-- Renders a person object. -->
+<#macro renderPerson person fieldName>
+<#escape x as jsonUtils.encodeJSONString(x)>
+	"${fieldName}":
+	{
+	<#if person?has_content>
+		<#if person.assocs["cm:avatar"]??>
+		"avatarRef": "${person.assocs["cm:avatar"][0].nodeRef?string}",
+		</#if>
+		"username": "${person.properties["cm:userName"]}",
+		"firstName": "${person.properties["cm:firstName"]!""}",
+		"lastName": "${person.properties["cm:lastName"]!""}"
+	</#if>
+	},
+</#escape>
+</#macro>
+
+
+<#macro addContent post>
+<#escape x as jsonUtils.encodeJSONString(x)>
+   <#assign safecontent=stringUtils.stripUnsafeHTML(post.content)>
+	<#if (contentLength?? && contentLength > -1 && (safecontent?length > contentLength))>
+		"content": "${safecontent?substring(0, contentLength)}",
+	<#else>
+		"content": "${safecontent}",
+	</#if>
+</#escape>
+</#macro>
+
+
+<#macro postJSON postData>
+{
+	<@postDataJSON postData=postData />
+}
+</#macro>
+
+<#macro postDataJSON postData>
+<#escape x as jsonUtils.encodeJSONString(x)>
+	<#-- which node should be used for urls? which for the post data? -->
+	<#if postData.isTopicPost>
+		<#assign refNode=postData.topic />
+	<#else>
+		<#assign refNode=postData.post />
+	</#if>
+	
+	<#assign post=postData.post />
+
+	<#-- render topic post only data first -->
+	<#if postData.isTopicPost>
+		"name": "${postData.topic.name}",
+		"totalReplyCount": ${postData.totalReplyCount?c},
+		<#if postData.lastReply??>
+			"lastReplyOn": "${xmldate(postData.lastReply.properties.created)}",
+			<#if postData.lastReplyBy??>
+			<@renderPerson person=postData.lastReplyBy fieldName="lastReplyBy" />
+         <#else>
+         "lastReplyBy":
+         {
+            "username": ""
+         },
+         </#if>
+		</#if>
+		"tags": [<#list postData.tags as x>"${x}"<#if x_has_next>, </#if></#list>],
+		"site": "${postData.site!""}",
+   <#else>
+		"name": "${post.name}",
+	</#if>
+
+	<#-- data using refNode which might be the topic or the post node -->
+	"url": "/forum/post/node/${refNode.nodeRef.storeRef.protocol}/${refNode.nodeRef.storeRef.identifier}/${refNode.nodeRef.id}",
+	"repliesUrl": "/forum/post/node/${refNode.nodeRef.storeRef.protocol}/${refNode.nodeRef.storeRef.identifier}/${refNode.nodeRef.id}/replies",
+	"nodeRef": "${refNode.nodeRef}",
+	
+	<#-- data coming from the post node -->
+	"title": "${(post.properties.title!"")}",
+	"createdOn": "${xmldate(post.properties.created)}",
+	"modifiedOn": "${xmldate(post.properties.modified)}",
+	<#if (post.properties["cm:updated"]??)>
+	"isUpdated": true,
+	"updatedOn": "${xmldate(post.properties["cm:updated"])}",
+	<#else>
+	"isUpdated": false,   
+	</#if>
+	<#if postData.author?? && postData.author?has_content>
+		<@renderPerson person=postData.author fieldName="author" />
+	<#else>
+		"author":
+		{
+			"username": "${post.properties["cm:creator"]}"
+		},
+	</#if>
+	<@addContent post=post />
+	"replyCount": <#if post.sourceAssocs["cm:references"]??>${post.sourceAssocs["cm:references"]?size?c}<#else>0</#if>,
+	"permissions":
+	{
+		"edit": ${postData.canEdit?string},
+		"reply": ${post.parent.hasPermission("CreateChildren")?string},
+		"delete": ${post.hasPermission("Delete")?string}
+	}
+</#escape>
+</#macro>
+
+
+<#-- Renders replies.
+	The difference is to a normal post is that the children might be
+	added inline in the returned JSON.
+-->
+<#macro repliesJSON data>
+{
+	<@postDataJSON postData=data />
+	<#if data.children?exists>
+		, "children": <@repliesRootJSON children=data.children />
+	</#if>
+}
+</#macro>
+
+<#macro repliesRootJSON children>
+[
+	<#list children as child>
+		<@repliesJSON data=child/>
+		<#if child_has_next>,</#if>
+	</#list>
+]
+</#macro>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.get.desc.xml
new file mode 100644
index 00000000000..29b9fbdbce8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Get forum post replies</shortname>
+  <description>Get the forum post replies.</description>
+  <url>/api/forum/post/site/{site}/{container}/{path}/replies</url>
+  <url>/api/forum/post/node/{store_type}/{store_id}/{id}/replies</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.get.json.ftl
new file mode 100644
index 00000000000..2c4163b0d74
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.get.json.ftl
@@ -0,0 +1,4 @@
+<#import "../post.lib.ftl" as postLib />
+{
+	"items": <@postLib.repliesRootJSON children=data />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.desc.xml
new file mode 100644
index 00000000000..68fabdd7130
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Add forum post reply</shortname>
+  <description>Adds a reply to a post.</description>
+  <url>/api/forum/post/node/{store_type}/{store_id}/{id}/replies</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.json.ftl
new file mode 100644
index 00000000000..a3cd1be869d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post-replies.post.json.ftl
@@ -0,0 +1,4 @@
+<#import "../post.lib.ftl" as postLib />
+{
+   "item": <@postLib.postJSON postData=postData />
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete.desc.xml
new file mode 100644
index 00000000000..b179fc4052c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Delete topic</shortname>
+  <description>Deletes a topic.</description>
+  <url>/api/forum/post/site/{site}/{container}/{path}</url>
+  <url>/api/forum/post/node/{store_type}/{store_id}/{id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete.json.ftl
new file mode 100644
index 00000000000..9a228685155
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete.json.ftl
@@ -0,0 +1,3 @@
+{
+    "message" : "${message}"
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete.properties
new file mode 100644
index 00000000000..062cb99eb99
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=Node {0} deleted
+forum-post.msg.marked.removed=Node {0} marked as removed
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_cs.properties
new file mode 100644
index 00000000000..0c4f5e58eb3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_cs.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=Odstran\u011bn uzel {0}
+forum-post.msg.marked.removed=Uzel {0} byl ozna\u010den jako odstran\u011bn\u00fd
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_da.properties
new file mode 100644
index 00000000000..f89002b224b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_da.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=Noden {0} blev slettet
+forum-post.msg.marked.removed=Noden {0} blev markeret som fjernet
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_de.properties
new file mode 100755
index 00000000000..33122da30dc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_de.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=Node {0} gel\u00f6scht
+forum-post.msg.marked.removed=Node {0} als entfernt gekennzeichnet
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_es.properties
new file mode 100755
index 00000000000..b954e60984d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_es.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=Nodo {0} eliminado
+forum-post.msg.marked.removed=Nodo {0} marcado como eliminado
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_fi.properties
new file mode 100644
index 00000000000..0b42bd5e385
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_fi.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=Solmu {0} poistettu
+forum-post.msg.marked.removed=Solmu {0} merkitty poistetuksi
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_fr.properties
new file mode 100755
index 00000000000..d97d6c2b19d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_fr.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=N\u0153ud {0} supprim\u00e9
+forum-post.msg.marked.removed=N\u0153ud {0} marqu\u00e9 comme supprim\u00e9
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_it.properties
new file mode 100755
index 00000000000..693eb2f438e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_it.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=Nodo {0} eliminato
+forum-post.msg.marked.removed=Nodo {0} contrassegnato come rimosso
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_ja.properties
new file mode 100755
index 00000000000..d2182141160
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_ja.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=\u30ce\u30fc\u30c9 ''{0}'' \u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f
+forum-post.msg.marked.removed=\u30ce\u30fc\u30c9 "{0}" \u304c\u524a\u9664\u6e08\u307f\u3068\u3057\u3066\u30de\u30fc\u30af\u3055\u308c\u307e\u3057\u305f
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_nb.properties
new file mode 100755
index 00000000000..ea419fe8e48
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_nb.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=Slettet node {0}
+forum-post.msg.marked.removed=Node {0} er merket som slettet
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_nl.properties
new file mode 100755
index 00000000000..8a0d1d645fc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_nl.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=Node {0} verwijderd
+forum-post.msg.marked.removed=Node {0} gemarkeerd als verwijderd
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_pl.properties
new file mode 100644
index 00000000000..ba8af3c5a19
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_pl.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=W\u0119ze\u0142 {0} zosta\u0142 usuni\u0119ty
+forum-post.msg.marked.removed=W\u0119ze\u0142 {0} zosta\u0142 zaznaczony jako usuni\u0119ty
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_pt_BR.properties
new file mode 100644
index 00000000000..c1d8e916ff5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_pt_BR.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=N\u00f3 {0} exclu\u00eddo
+forum-post.msg.marked.removed=N\u00f3 {0} marcado como removido
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_ru.properties
new file mode 100755
index 00000000000..4d6b2555540
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_ru.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=\u0423\u0437\u0435\u043b {0} \u0443\u0434\u0430\u043b\u0435\u043d
+forum-post.msg.marked.removed=\u0423\u0437\u0435\u043b {0} \u043e\u0442\u043c\u0435\u0447\u0435\u043d \u043a\u0430\u043a \u0443\u0434\u0430\u043b\u0435\u043d\u043d\u044b\u0439
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_sv.properties
new file mode 100644
index 00000000000..d7b778cc97f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_sv.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=Nod {0} raderad
+forum-post.msg.marked.removed=Nod {0} markerad som borttagen
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_zh_CN.properties
new file mode 100755
index 00000000000..39bebedffd0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.delete_zh_CN.properties
@@ -0,0 +1,2 @@
+forum-post.msg.deleted=\u5df2\u5220\u9664\u8282\u70b9 {0}
+forum-post.msg.marked.removed=\u8282\u70b9 {0} \u6807\u8bb0\u4e3a\u5df2\u79fb\u9664
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.get.desc.xml
new file mode 100644
index 00000000000..f011745e9d4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Get topic details</shortname>
+  <description>Gets the details for a topic.</description>
+  <url>/api/forum/post/site/{site}/{container}/{path}</url>
+  <url>/api/forum/post/node/{store_type}/{store_id}/{id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.get.json.ftl
new file mode 100644
index 00000000000..a3cd1be869d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.get.json.ftl
@@ -0,0 +1,4 @@
+<#import "../post.lib.ftl" as postLib />
+{
+   "item": <@postLib.postJSON postData=postData />
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.desc.xml
new file mode 100644
index 00000000000..c04df8dfa7b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Update topic</shortname>
+  <description>Updates a topic.</description>
+  <url>/api/forum/post/site/{site}/{container}/{path}</url>
+  <url>/api/forum/post/node/{store_type}/{store_id}/{id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.json.ftl
new file mode 100644
index 00000000000..a3cd1be869d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/discussions/posts/forum-post.put.json.ftl
@@ -0,0 +1,4 @@
+<#import "../post.lib.ftl" as postLib />
+{
+   "item": <@postLib.postJSON postData=postData />
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/doclink/doclink.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/doclink/doclink.post.desc.xml
new file mode 100644
index 00000000000..1f9f6aea3e2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/doclink/doclink.post.desc.xml
@@ -0,0 +1,64 @@
+<webscript>
+  <shortname>Create document link</shortname>
+  <description>Creates a link to a document in a given folder</description>
+  <url>/api/node/doclink/{store_type}/{store_id}/{id}</url>
+  <url>/api/site/doclink/{site}/{container}/{path}</url>
+  <url>/api/site/doclink/{site}/{container}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <args>
+    <arg>
+      <shortname>store_type</shortname>
+      <description>Protocol for the source store, e.g. workspace or versionstore.</description>
+    </arg>
+    <arg>
+      <shortname>store_id</shortname>
+      <description>The source identifier, which may be specific to the protocol, e.g. spacesstore.</description>
+    </arg>
+    <arg>
+      <shortname>id</shortname>
+      <description>The identifier of the source node.</description>
+    </arg>
+    <arg>
+      <shortname>site</shortname>
+      <description>The site ID of the source.</description>
+    </arg>
+    <arg>
+      <shortname>container</shortname>
+      <description>The container folder for the site.</description>
+    </arg>
+    <arg>
+      <shortname>path</shortname>
+      <description>The path to the source node in the site's container.</description>
+    </arg>
+   </args>
+   <requests>
+     	<request>
+     		<format>json</format>
+     		<type>
+     			<![CDATA[{ "destinationNodeRef" : string }]]>
+     		</type>
+     	</request>
+     	<request>
+        	<format>json</format>
+      		<type>
+        	<![CDATA[
+        	{
+          		"destinationNodeRef": string,
+          		"multipleFiles": string
+        	}
+        	]]>
+      		</type>
+    	</request>
+   </requests>
+   <responses>
+     	<response>
+     		<format>json</format>
+     		<type>
+     			<![CDATA[{ "result" : string }]]>
+     		</type>
+     	</response>
+   </responses>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/doclink/doclink.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/doclink/doclink.post.json.ftl
new file mode 100644
index 00000000000..e69a986e8ab
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/doclink/doclink.post.json.ftl
@@ -0,0 +1,16 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+ "linkNodes" : 
+ [
+	<#list results as result>
+	{
+	   "nodeRef" : "${result}"
+	}
+        <#if result_has_next>,</#if>
+	</#list>
+ ],
+ "successCount": "${successCount}",
+ "failureCount": "${failureCount}",
+ "overallSuccess": "${overallSuccess?c}"
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/doclink/doclinks.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/doclink/doclinks.delete.desc.xml
new file mode 100644
index 00000000000..2cc6e97e5b1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/doclink/doclinks.delete.desc.xml
@@ -0,0 +1,58 @@
+<webscript>
+  <shortname>Delete links of a document</shortname>
+  <description>Delete all links having as given destination</description>
+  <url>/api/node/doclink/{store_type}/{store_id}/{id}/delete</url>
+  <url>/api/site/doclink/{site}/{container}/{path}/delete</url>
+  <url>/api/site/doclink/{site}/{container}/delete</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <args>
+    <arg>
+      <shortname>store_type</shortname>
+      <description>Protocol for the destination store, e.g. workspace or versionstore.</description>
+    </arg>
+    <arg>
+      <shortname>store_id</shortname>
+      <description>The destination identifier, which may be specific to the protocol, e.g. spacesstore.</description>
+    </arg>
+    <arg>
+      <shortname>id</shortname>
+      <description>The identifier of the destination node.</description>
+    </arg>
+    <arg>
+      <shortname>site</shortname>
+      <description>The site ID of the destination.</description>
+    </arg>
+    <arg>
+      <shortname>container</shortname>
+      <description>The container folder for the site.</description>
+    </arg>
+    <arg>
+      <shortname>path</shortname>
+      <description>The path to the destination node in the site's container.</description>
+    </arg>
+   </args>
+   <requests>
+   </requests>
+   <responses>
+    <response>
+        <format>json</format>
+        <type>
+            <![CDATA[
+   <pre>
+   {
+      "total": "3",
+      "deleted": "1",
+      "error details": [
+          "workspace://SpacesStore/48afc4b7-d91a-4167-8b9e-db14961b8fed 04290001 Access Denied.  You do not have the appropriate permissions to perform this operation.",
+          "workspace://SpacesStore/10b18342-8e70-4dc0-ba73-4b0a6fdf5a9b 04290002 Access Denied.  You do not have the appropriate permissions to perform this operation."
+      ]
+   }
+   </pre>
+            ]]>
+        </type>
+    </response>
+   </responses>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/doclink/doclinks.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/doclink/doclinks.delete.json.ftl
new file mode 100644
index 00000000000..9e6087fbcbe
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/doclink/doclinks.delete.json.ftl
@@ -0,0 +1,13 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+	"found": "${total_count}",
+	"deleted": "${deleted_count}",
+	"error details" : 
+   [
+      <#list error_details?keys as key>
+           "${key} - ${error_details[key]}" 
+		   <#if key_has_next>,</#if>
+      </#list>
+   ]
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/download.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/download.delete.desc.xml
new file mode 100644
index 00000000000..87c008713aa
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/download.delete.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Cancel a download</shortname>
+   <description>Cancel a download</description>
+   <url>/api/internal/downloads/{store_type}/{store_id}/{node_id}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readwrite"/>
+   <lifecycle>internal</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/download.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/download.delete.json.ftl
new file mode 100644
index 00000000000..e1d73e7ac2b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/download.delete.json.ftl
@@ -0,0 +1,5 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+   {
+      "status": "CANCELLED",
+   }
+</#escape>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/downloadStatus.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/downloadStatus.get.desc.xml
new file mode 100644
index 00000000000..d76d32ef4f1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/downloadStatus.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get download status</shortname>
+   <description>Get download status</description>
+   <url>/api/internal/downloads/{store_type}/{store_id}/{node_id}/status</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly"/>
+   <lifecycle>internal</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/downloadStatus.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/downloadStatus.get.json.ftl
new file mode 100644
index 00000000000..1712cce4c81
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/downloadStatus.get.json.ftl
@@ -0,0 +1,9 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+   {
+      "status": "${downloadStatus.status?string}",
+      "done": "${downloadStatus.done?c}",
+      "total": "${downloadStatus.total?c}",
+      "filesAdded": "${downloadStatus.filesAdded?c}",
+      "totalFiles": "${downloadStatus.totalFiles?c}"
+   }
+</#escape>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/downloads.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/downloads.post.desc.xml
new file mode 100644
index 00000000000..b0b0893a9fd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/downloads.post.desc.xml
@@ -0,0 +1,8 @@
+<webscript>
+   <shortname>Create download</shortname>
+   <description>Create download</description>
+   <url>/api/internal/downloads</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/downloads.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/downloads.post.json.ftl
new file mode 100644
index 00000000000..5a3a8bbf097
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/download/downloads.post.json.ftl
@@ -0,0 +1,6 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+   {
+      "status": "success",
+      "nodeRef": "${downloadNodeRef.nodeRef?string}" 
+   }
+</#escape>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.desc.xml
new file mode 100644
index 00000000000..791224afa32
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.desc.xml
@@ -0,0 +1,43 @@
+<webscript>
+   <shortname>GET facetable properties defined within the repository</shortname>
+   <description>
+   <![CDATA[
+   Get limited property definition data for properties deemed to be facetable.
+   
+   http://<host>:<port>/alfresco/api/facet/facetable-properties[?nsp=eg&skipCount=50&maxItems=10]
+   http://<host>:<port>/alfresco/api/facet/classes/eg:aspectOrType/facetable-properties[?skipCount=50&maxItems=10]
+   
+   Example response from this web script:
+   
+   {
+      "data" : {
+        "properties" : [
+          {
+            "name" : "eg:propName1",
+            "longqname" : "{http://www.alfresco.org/model/example/1.0}propName1",
+            "displayName" : "eg:propName1",
+            "containerClassType" : "eg:aspectName",
+            "dataType" : "d:text",
+            "modelQName" : "eg:examplemodel"
+          },
+          {
+            "name" : "eg:propName2",
+            "longqname" : "{http://www.alfresco.org/model/example/1.0}propName2",
+            "title" : "Useful Metadata",
+            "displayName" : "eg:propName2 (Useful Metadata)",
+            "containerClassType" : "eg:className",
+            "dataType" : "d:text",
+            "modelQName" : "eg:examplemodel"
+          }
+        ]
+     }
+   }
+   ]]>
+   </description>
+   <url>/api/facet/classes/{classname}/facetable-properties?nsp={namespacePrefix?}&amp;skipCount={skipCount?}&amp;maxItems={maxItems?}&amp;locale={locale?}</url>
+   <url>/api/facet/facetable-properties?nsp={namespacePrefix?}&amp;skipCount={skipCount?}&amp;maxItems={maxItems?}&amp;locale={locale?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.json.ftl
new file mode 100644
index 00000000000..66402022f41
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.json.ftl
@@ -0,0 +1,34 @@
+<#import "../generic-paged-results.lib.ftl" as genericPaging />
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+    "data" : {
+        "properties" : [
+            <#list properties as property>
+            {
+                "name" : "${property.shortQname}"
+                <#if property.qname??>
+               ,"longqname" : "${property.qname?string}"
+                <#else>
+               ,"longqname" : "${property.shortQname}"
+                </#if>
+                <#if property.title??>
+               ,"title" : "${property.title}"
+                </#if>
+               ,"displayName" : "${property.displayName}"
+                <#if property.containerClassType??>
+               ,"containerClassType" : "${property.containerClassType.prefixString}"
+                </#if>
+                <#if property.dataType??>
+               ,"dataType" : "${property.dataType.prefixString}"
+                </#if>
+                <#if property.modelQname??>
+               ,"modelQName" : "${property.modelQname.prefixString}"
+                </#if>
+            }<#if property_has_next>,</#if>
+            </#list>
+        ]
+    }
+    
+   <@genericPaging.pagingJSON />
+}
+</#escape>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.delete.desc.xml
new file mode 100644
index 00000000000..ce614344235
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.delete.desc.xml
@@ -0,0 +1,24 @@
+<webscript>
+   <shortname>Delete Faceted-Search Config</shortname>
+   <description>
+   <![CDATA[
+   Delete faceted-search config, if configured
+   
+   http://<host>:<port>/alfresco/api/facet/facet-config
+   
+   Example response from this web script:
+   
+      {
+         "success" : true | false
+      }
+      
+   Notes:
+   - user must be an Admin, member of Alfresco_Search_Administrators group or a Network Admin for given network/tenant
+   ]]>
+   </description>
+   <url>/api/facet/facet-config/{filterID}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.delete.json.ftl
new file mode 100644
index 00000000000..097efa3f7e4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.delete.json.ftl
@@ -0,0 +1,5 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "success" : ${success?string}
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.get.desc.xml
new file mode 100644
index 00000000000..d7ce84c2d38
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.get.desc.xml
@@ -0,0 +1,54 @@
+<webscript>
+   <shortname>GET Faceted-Search Config</shortname>
+   <description>
+   <![CDATA[
+   Get faceted-search config, if configured
+   
+   http://<host>:<port>/alfresco/api/facet/facet-config
+   Or
+   http://<host>:<port>/alfresco/api/facet/facet-config/{filterId}
+   
+   Example response from this web script:
+   
+   {
+    "facets": [
+          {
+             "filterID" : "filter_content_size",
+             "facetQName" : "{http://www.alfresco.org/model/content/1.0}content.size",
+             "displayName" : "faceted-search.facet-menu.facet.size",
+             "displayControl" : "alfresco\/search\/FacetFilters",
+             "maxFilters" : 5,
+             "hitThreshold" : 1,
+             "minFilterValueLength" : 5,
+             "sortBy" : "ALPHABETICALLY",
+             "scope" : "SCOPED_SITES",
+             "scopedSites" : [
+                     "site3",
+                     "site2",
+                     "site1"
+              ],
+             "customProperties" :
+             {
+                "blockIncludeFacetRequest":
+                {
+                    "name" : "{http:\/\/www.alfresco.org\/model\/solrfacetcustomproperty\/1.0}blockIncludeFacetRequest",
+                    "value" : "true"
+                }
+             }
+             "isEnabled" : true,
+             "isDefault" : true
+          }
+      ]
+   }
+   
+   Notes:
+   - user must be an Admin, member of Alfresco_Search_Administrators group or a Network Admin for given network/tenant
+   ]]>
+   </description>
+   <url>/api/facet/facet-config</url>
+   <url>/api/facet/facet-config/{filterID}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.get.json.ftl
new file mode 100644
index 00000000000..f3c58b9ca50
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.get.json.ftl
@@ -0,0 +1,58 @@
+<#macro stripEmptyNamespace qnameString>${qnameString?replace("{}", "")}</#macro>
+<#macro facetJSON facet>
+<#escape x as jsonUtils.encodeJSONString(x)>
+             "filterID" : "${facet.filterID}",
+             "facetQName" : "<@stripEmptyNamespace qnameString=facet.facetQName?string/>",
+             "displayName" : "${facet.displayName}",
+             "displayControl" : "${facet.displayControl}",
+             "maxFilters" : ${facet.maxFilters?c},
+             "hitThreshold" : ${facet.hitThreshold?c},
+             "minFilterValueLength" : ${facet.minFilterValueLength?c},
+             "sortBy" : "${facet.sortBy}",
+             "scope" : "${facet.scope}",
+             <#if facet.scopedSites?size != 0>
+             "scopedSites" : [
+                  <#list facet.scopedSites as site>
+                     "${site}"<#if site_has_next>,</#if>
+                  </#list>
+             ],
+             </#if>
+             <#if facet.customProperties?? && facet.customProperties?size != 0>
+             "customProperties" : 
+             {
+                <#list facet.customProperties as propDetails>
+                "${propDetails.name.localName?string}":
+                {
+                    "name" : "${propDetails.name?string}",
+                    <#if propDetails.value?is_enumerable>
+                    "value" : [
+                    <#list propDetails.value as v>
+                    "${v?string}"<#if v_has_next>,</#if>
+                    </#list>
+                    ]
+                    <#else>
+                    "value" : "${propDetails.value?string}"
+                    </#if>
+                }<#if propDetails_has_next>,</#if>
+                </#list>
+             },
+             </#if>
+             "isEnabled" : ${facet.isEnabled()?c},
+             "isDefault" : ${facet.default?c}
+</#escape>
+</#macro>
+
+{
+   <#if filters??>
+    "facets" : [
+           <#list filters as facet>
+           {
+               <@facetJSON facet=facet />
+           }<#if facet_has_next>,</#if>
+           </#list>
+          ]
+
+   <#else>
+    <@facetJSON facet=filter />
+   </#if>
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.post.desc.xml
new file mode 100644
index 00000000000..84c1c903bd8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.post.desc.xml
@@ -0,0 +1,44 @@
+<webscript>
+   <shortname>POST Faceted-Search Config</shortname>
+   <description>
+   <![CDATA[
+   Post faceted-search config
+   
+   http://<host>:<port>/alfresco/api/facet/facet-config
+   
+   Example body to this web script:
+   
+   {
+             "filterID" : "filter_content_size",
+             "facetQName" : "{http://www.alfresco.org/model/content/1.0}content.size",
+             "displayName" : "faceted-search.facet-menu.facet.size",
+             "displayControl" : "alfresco/search/FacetFilters",
+             "maxFilters" : 5,
+             "hitThreshold" : 1,
+             "minFilterValueLength" : 5,
+             "sortBy" : "ALPHABETICALLY",
+             "scope" : "SCOPED_SITES", // if not provided, default value is "ALL"
+             "scopedSites" : [
+                     "site3",
+                     "site2",
+                     "site1"
+              ],
+             "customProperties" : {
+                "blockIncludeFacetRequest": {
+                    "name" : "{http://www.alfresco.org/model/solrfacetcustomproperty/1.0}blockIncludeFacetRequest",
+                    "value" : "true"
+                }
+             }
+             "isEnabled" : true  // if not provided, default value is false
+   }
+   
+   Notes:
+   - user must be an Admin, member of Alfresco_Search_Administrators group or a Network Admin for given network/tenant
+   ]]>
+   </description>
+   <url>/api/facet/facet-config</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.post.json.ftl
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.put.desc.xml
new file mode 100644
index 00000000000..c912a57713f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.put.desc.xml
@@ -0,0 +1,52 @@
+<webscript>
+   <shortname>PUT Faceted-Search Config</shortname>
+   <description>
+   <![CDATA[
+   Put (update) faceted-search config<br/>
+   This REST endpoint supports two forms of resource updates:<br/>
+   <br/>
+   http://<host>:<port>/alfresco/api/facet/facet-config<br/>
+   <br/>
+   This will perform an update of the Facet properties. Example body to this web script:<br/>
+   <br/>
+   <pre>
+   {
+             "filterID" : "filter_content_size",
+             "facetQName" : "{http://www.alfresco.org/model/content/1.0}content.size",
+             "displayName" : "faceted-search.facet-menu.facet.size",
+             "displayControl" : "alfresco/search/FacetFilters",
+             "maxFilters" : 5,
+             "hitThreshold" : 1,
+             "minFilterValueLength" : 5,
+             "sortBy" : "ALPHABETICALLY",
+             "scope" : "SCOPED_SITES",  // if not provided, default value is "ALL"
+             "scopedSites" : [
+                     "site3",
+                     "site2",
+                     "site1"
+              ],
+             "customProperties" : {
+                "blockIncludeFacetRequest": {
+                    "name" : "{http://www.alfresco.org/model/solrfacetcustomproperty/1.0}blockIncludeFacetRequest",
+                    "value" : "true"
+                }
+             }
+             "isEnabled" : true  // if not provided, default value is false
+   }</pre><br/>
+   
+   Notes:
+   - user must be an Admin, member of Alfresco_Search_Administrators group or a Network Admin for given network/tenant
+   <br/>
+   Alternatively, you can omit the request body as shown above and include a query parameter, relativePos, which
+   will not update the facet properties but will move the facet in the ordered list by the specified distance.<br/>
+   +2 means 'down two places'. -1 means 'up one place'. An attempt to move a facet beyond the end of the sequence will
+   simply move it to the end.
+   ]]>
+   </description>
+   <url>/api/facet/facet-config</url>
+   <url>/api/facet/facet-config/{filterID}?relativePos={relativePos?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.put.json.ftl
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.desc.xml
new file mode 100644
index 00000000000..b14cc254f7b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Form Persistence</shortname>
+  <description>Handles the submission of a form, data can be POSTed as JSON, multipart/form-data or x-www-form-urlencoded.</description>
+  <url>/api/{item_kind}/{item_id}/formprocessor</url>
+  <format default="json" />
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.js
new file mode 100644
index 00000000000..8d37d17839b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.js
@@ -0,0 +1,100 @@
+function main()
+{
+    // Extract template args
+    var itemKind = decodeURIComponent(url.templateArgs["item_kind"]);
+    var itemId = decodeURIComponent(url.templateArgs["item_id"]);
+
+    if (logger.isLoggingEnabled())
+    {
+        logger.log("multipart form submission for item:");
+        logger.log("\tkind = " + itemKind);
+        logger.log("\tid = " + itemId);
+    }
+
+    // potential redirect URL
+    var redirect = null;
+    var persistedObject = null;
+    
+    try
+    {
+        // persist the submitted data using the most appropriate data set
+        if (typeof formdata !== "undefined")
+        {
+            // N.B. This repoFormData is a different FormData class to that used above.
+            var repoFormData = new Packages.org.alfresco.repo.forms.FormData();
+            for (var i = 0; i < formdata.fields.length; i++)
+            {
+                if (formdata.fields[i].name == "alf_redirect")
+                {
+                   // store redirect url
+                   redirect = formdata.fields[i].value;
+                }
+                else
+                {
+                   if (formdata.fields[i].isFile)
+                   {
+                      repoFormData.addFieldData(formdata.fields[i]);
+                   }
+                   else
+                   {
+                      // add field to form data
+                      repoFormData.addFieldData(formdata.fields[i].name, formdata.fields[i].value);
+                   }
+                }
+            }
+
+            persistedObject = formService.saveForm(itemKind, itemId, repoFormData);
+        }
+        else
+        {
+            if (logger.isLoggingEnabled())
+            {
+                logger.log("Saving form with args = " + args);
+            }
+
+            persistedObject = formService.saveForm(itemKind, itemId, args);
+        }
+    }
+    catch (error)
+    {
+        var msg = error.message;
+       
+        if (logger.isLoggingEnabled())
+            logger.log(msg);
+       
+        // determine if the exception was a FormNotFoundException, if so return
+        // 404 status code otherwise return 500
+        if (msg.indexOf("FormNotFoundException") != -1)
+        {
+            status.setCode(404, msg);
+          
+            if (logger.isLoggingEnabled())
+                logger.log("Returning 404 status code");
+        }
+        else
+        {
+            status.setCode(500, msg);
+          
+            if (logger.isLoggingEnabled())
+                logger.log("Returning 500 status code");
+        }
+       
+        return;
+    }
+
+    // if a redirect URL was provided send a redirect response
+    if (redirect !== null)
+    {
+       if (logger.isLoggingEnabled())
+          logger.log("Returning 301 status code to redirect to: " + redirect);
+       
+       status.redirect = true;
+       status.code = 301;
+       status.location = redirect;
+    }
+    
+    model.persistedObject = persistedObject.toString();
+    model.message = "Successfully persisted form for item [" + itemKind + "]" + itemId;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.json.ftl
new file mode 100644
index 00000000000..301d9e1e349
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.json.ftl
@@ -0,0 +1,5 @@
+{
+    <#if redirect??>"redirect": "${redirect}",</#if>
+    <#if persistedObject??>"persistedObject": "${persistedObject?string}",</#if>
+    "message": "${message}"
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.json.js
new file mode 100644
index 00000000000..755e8872694
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.json.js
@@ -0,0 +1,91 @@
+function main()
+{
+    // Extract template args
+    var itemKind = decodeURIComponent(url.templateArgs["item_kind"]);
+    var itemId = decodeURIComponent(url.templateArgs["item_id"]);
+
+    if (logger.isLoggingEnabled())
+    {
+        logger.log("json form submission for item:");
+        logger.log("\tkind = " + itemKind);
+        logger.log("\tid = " + itemId);
+    }
+   
+    if (typeof json !== "undefined")
+    {
+        // At this point the field names are e.g. prop_cm_name
+        // and there are some extra values - hidden fields? These are fields from YUI's datepicker(s)
+        // e.g. "template_x002e_form-ui_x002e_form-test_prop_my_date-entry":"2/19/2009"
+    }
+    else
+    {
+        if (logger.isWarnLoggingEnabled())
+        {
+            logger.warn("json object was undefined.");
+        }
+        
+        status.setCode(501, message);
+        return;
+    }
+   
+    var repoFormData = new Packages.org.alfresco.repo.forms.FormData();
+    var jsonKeys = json.keys();
+    for ( ; jsonKeys.hasNext(); )
+    {
+        var nextKey = jsonKeys.next();
+        
+        if (nextKey == "alf_redirect")
+        {
+           // store redirect url in model
+           model.redirect = json.get(nextKey);
+           
+           if (logger.isLoggingEnabled())
+           {
+               logger.log("found redirect: " + model.redirect);
+           }
+        }
+        else
+        {
+           // add field to form data
+           repoFormData.addFieldData(nextKey, json.get(nextKey));
+        }
+    }
+
+    var persistedObject = null;
+    try
+    {
+        persistedObject = formService.saveForm(itemKind, itemId, repoFormData);
+    }
+    catch (error)
+    {
+        var msg = error.message;
+       
+        if (logger.isLoggingEnabled())
+            logger.log(msg);
+       
+        // determine if the exception was a FormNotFoundException, if so return
+        // 404 status code otherwise return 500
+        if (msg.indexOf("FormNotFoundException") != -1 ||
+            msg.indexOf("PropertyValueSizeIsMoreMaxLengthException") != -1)
+        {
+            status.setCode(404, msg);
+          
+            if (logger.isLoggingEnabled())
+                logger.log("Returning 404 status code");
+        }
+        else
+        {
+            status.setCode(500, msg);
+          
+            if (logger.isLoggingEnabled())
+                logger.log("Returning 500 status code");
+        }
+       
+        return;
+    }
+    
+    model.persistedObject = persistedObject.toString();
+    model.message = "Successfully persisted form for item [" + itemKind + "]" + itemId;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.xwwwformurlencoded.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.xwwwformurlencoded.js
new file mode 100644
index 00000000000..b45bbf52c7a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.xwwwformurlencoded.js
@@ -0,0 +1,14 @@
+function main()
+{
+   // FIXME URL-encoded post of forms data is not yet working.
+   if (logger.isLoggingEnabled())
+   {
+	   logger.log("x-www-form-urlencoded request received");
+
+	   logger.log("decodedparams: " + decodedparams);
+   }
+
+   model.message = "Not implemented yet";
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.lib.ftl
new file mode 100644
index 00000000000..96ff2f3f46f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.lib.ftl
@@ -0,0 +1,85 @@
+<#-- This function is used below to detect numerical property values of Infinity, -Infinity and NaN -->
+<#function isNonFiniteNumber value>
+    <#if value?is_number>
+        <#if value?c == '\xfffd'><#return true>
+        <#elseif value?c == '\x221e'><#return true>
+        <#elseif value?c == '-\x221e'><#return true>
+        <#else><#return false>
+        </#if>
+    <#else><#return false>
+    </#if>
+</#function>
+
+<#macro formDefJSON form>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+    "data":
+    {
+        "item": "${form.item}",
+        "submissionUrl": "${form.submissionUrl}",
+        "type": "${form.type}",
+        "definition":
+        {
+            "fields":
+            [
+                <#list form.fields as field>
+                {
+                    "name": "${field.name}",
+                    "label": "${field.label!""}",
+                    <#if field.description??>"description": "${field.description?js_string?html}",</#if>
+                    <#if field.indexTokenisationMode??>"indexTokenisationMode": "${field.indexTokenisationMode}",</#if>
+                    "protectedField": ${field.protectedField?string},
+                    <#if field.defaultValue??>"defaultValue": "${field.defaultValue}",</#if>
+                    <#if field.group??>"group": "${field.group.id}",</#if>
+                    <#if field.binding??>"binding": "${field.binding}",</#if>
+                    "dataKeyName": "${field.dataKeyName}",
+                    <#if field.dataType??>
+                    "type": "property",
+                    "dataType": "${field.dataType}",
+                    <#if field.dataTypeParameters??>"dataTypeParameters": 
+                    ${field.dataTypeParameters.asJSON},</#if>
+                    <#if field.constraints??>"constraints": 
+                    [
+                    <#list field.constraints as cnstrnt>
+                       {
+                          "type": "${cnstrnt.type}"<#if cnstrnt.parametersAsJSON??>,
+                          "parameters": 
+                          ${cnstrnt.parametersAsJSON}
+                          </#if>
+                       }<#if cnstrnt_has_next>,</#if>
+                    </#list>
+                    ],</#if>
+                    "mandatory": ${field.mandatory?string},
+                    "repeating": ${field.repeating?string}
+                    <#else>
+                    "type": "association",
+                    "endpointType": "${field.endpointType}",
+                    "endpointDirection": "${field.endpointDirection}",
+                    "endpointMandatory": ${field.endpointMandatory?string},
+                    "endpointMany": ${field.endpointMany?string}
+                    </#if>
+                }<#if field_has_next>,</#if>
+                </#list>
+            ]
+        },
+        "formData":
+        {
+            <#list form.formData?keys as k>
+            <#if form.formData[k]?is_boolean>
+            <#-- Render boolean data without the surrounding inverted commas -->
+            "${k}": ${form.formData[k]?string}<#if k_has_next>,</#if>
+            <#-- For now, do not render non-finite numbers (Infinity, NaN) - see ALF-16606 -->
+            <#elseif isNonFiniteNumber(form.formData[k]) == true>
+            <#-- Render (finite) number data without the surrounding inverted commas and no formatting -->
+            <#elseif form.formData[k]?is_number>
+            "${k}": ${form.formData[k]?c}<#if k_has_next>,</#if>
+            <#else>
+            <#-- All other data rendered with inverted commas -->
+            "${k}": "${form.formData[k]}"<#if k_has_next>,</#if>
+            </#if>
+            </#list>
+        }
+    }
+}
+</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.post.desc.xml
new file mode 100644
index 00000000000..041b1ebf8f1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.post.desc.xml
@@ -0,0 +1,22 @@
+<webscript>
+  <shortname>Form Definitions</shortname>
+  <description><![CDATA[
+  Returns a form definition for the requested item.
+  The body of the post should be in the following form:-
+  <pre>
+  {
+     "itemKind" : item kind,
+     "itemId" : item id,
+     "fields" : [fields],
+     "force" : [force]
+  }
+  </pre>
+  Returns the form model.
+  ]]>
+  </description>
+  <url>/api/formdefinitions</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.post.json.ftl
new file mode 100644
index 00000000000..87b9aea80a3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.post.json.ftl
@@ -0,0 +1,2 @@
+<#import "formdefinition.lib.ftl" as formDefLib/>
+<@formDefLib.formDefJSON form=form/>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.post.json.js
new file mode 100644
index 00000000000..73b852d1006
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/formdefinition.post.json.js
@@ -0,0 +1,137 @@
+function main()
+{
+    // check that required data is present in request body
+    if (json.has("itemKind") === false)
+    {
+        status.setCode(status.STATUS_BAD_REQUEST, "itemKind parameter is not present");
+        return;
+    }
+    
+    if (json.has("itemId") === false)
+    {
+        status.setCode(status.STATUS_BAD_REQUEST, "itemId parameter is not present");
+        return;
+    }
+
+    // extract required data from request body
+    var itemKind = json.get("itemKind");
+    var itemId = json.get("itemId");
+       
+    if (logger.isLoggingEnabled())
+    {
+        logger.log("Generating form for item:");
+        logger.log("\tkind = " + itemKind);
+        logger.log("\tid = " + itemId);
+    }
+    
+    // extract optional data from request body (if present)
+    var count = 0;
+    var fields = null; 
+    if (json.has("fields"))
+    {
+       // convert the JSONArray object into a native JavaScript array
+       fields = [];
+       var jsonFields = json.get("fields");
+       var numFields = jsonFields.length();
+       for (count = 0; count < numFields; count++)
+       {
+          fields.push(jsonFields.get(count));
+       }
+       
+       if (logger.isLoggingEnabled())
+           logger.log("fields = " + fields);
+    }
+    
+    var forcedFields = null;
+    if (json.has("force"))
+    {
+        // convert the JSONArray object into a native JavaScript array
+        forcedFields = [];
+        var jsonForcedFields = json.get("force");
+        var numForcedFields = jsonForcedFields.length();
+        for (count = 0; count < numForcedFields; count++)
+        {
+           forcedFields.push(jsonForcedFields.get(count));
+        }
+        
+        if (logger.isLoggingEnabled())
+            logger.log("forcedFields = " + forcedFields);
+    }
+    
+    var formScriptObj = null;
+    
+    try
+    {
+        // attempt to get the form for the item
+        formScriptObj = formService.getForm(itemKind, itemId, fields, forcedFields);
+    }
+    catch (error)
+    {
+        var msg = error.message;
+        
+        if (logger.isLoggingEnabled())
+            logger.log(msg);
+        
+        // determine if the exception was a FormNotFoundException, if so return
+        // 404 status code otherwise return 500
+        if (msg.indexOf("FormNotFoundException") != -1)
+        {
+            status.setCode(404, msg);
+           
+            if (logger.isLoggingEnabled())
+                logger.log("Returning 404 status code");
+        }
+        else
+        {
+            status.setCode(500, msg);
+           
+            if (logger.isLoggingEnabled())
+                logger.log("Returning 500 status code");
+        }
+        
+        return;
+    }
+    
+    // ensure there is a submission url
+    var submissionUrl = formScriptObj.submissionUrl;
+    if (submissionUrl === null)
+    {
+        // encode the item id and item kind using URI encoding scheme, however, the encoded / character
+        // causes problems when posting back to Apache so change these back
+        submissionUrl = '/api/' + encodeURIComponent(itemKind) + '/' + encodeURIComponent(itemId).replace(/%2F/g, "/") + '/formprocessor';
+    }
+    
+    // create form model
+    var formModel = 
+    {
+        item : formScriptObj.itemUrl,
+        submissionUrl: submissionUrl,
+        type : formScriptObj.itemType,
+        fields : formScriptObj.fieldDefinitions,
+        formData : {}
+    };
+
+    // populate the form data model
+    for (var k in formScriptObj.formData.data)
+    {
+        var value = formScriptObj.formData.data[k].value;
+
+        if (value instanceof java.util.Date)
+        {
+            formModel.formData[k] = utils.toISO8601(value);
+        }
+        // There is no need to handle java.util.List instances here as they are
+        // returned from ScriptFormData.java as Strings
+        else
+        {
+            formModel.formData[k] = value;
+        }
+    }
+    
+    if (logger.isLoggingEnabled())
+        logger.log("formModel = " + jsonUtils.toJSONString(formModel));
+
+    model.form = formModel;
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.desc.xml
new file mode 100644
index 00000000000..ee75614c24d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.desc.xml
@@ -0,0 +1,13 @@
+<webscript>
+  <shortname>PickerList</shortname>
+  <description>Service to return metadata of child items in a parent space to display in the object finder.</description>
+  <url>/api/forms/picker/{type}/{store_type}/{store_id}/{id}/children</url>
+  <url>/api/forms/picker/{type}/children</url>
+  <!-- The following 2 URLs are deprectated as of 4.0, the nodelocator service is now used by the picker -->
+  <url>/api/forms/picker/{type}/{store_type}/{store_id}/{id}/siblings</url>
+  <url>/api/forms/picker/{type}/{store_type}/{store_id}/{id}/doclib</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.js
new file mode 100644
index 00000000000..577f0245305
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.js
@@ -0,0 +1,422 @@
+<import resource="classpath:/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.js">
+
+function main()
+{
+   var argsFilterType = args['filterType'],
+      argsSelectableType = args['selectableType'],
+      argsSearchTerm = args['searchTerm'],
+      argsMaxResults = args['size'],
+      argsXPath = args['xpath'],
+      argsRootNode = args['rootNode'],
+      argsSelectableMimeType = args['selectableMimeType'],
+      pathElements = url.service.split("/"),
+      parent = null,
+      rootNode = companyhome,
+      results = [],
+      categoryResults = null,
+      resultObj = null,
+      lastPathElement = null;
+   
+   if (logger.isLoggingEnabled())
+   {
+      logger.log("children type = " + url.templateArgs.type);
+      logger.log("argsSelectableType = " + argsSelectableType);
+      logger.log("argsFilterType = " + argsFilterType);
+      logger.log("argsSearchTerm = " + argsSearchTerm);
+      logger.log("argsMaxResults = " + argsMaxResults);
+      logger.log("argsXPath = " + argsXPath);
+      logger.log("argsSelectableMimeType = " + argsSelectableMimeType);
+   }
+   try
+   {
+      // construct the NodeRef from the URL
+      var nodeRef = url.templateArgs.store_type + "://" + url.templateArgs.store_id + "/" + url.templateArgs.id;
+      
+      // determine if we need to resolve the parent NodeRef
+      
+      if (argsXPath != null)
+      {
+         // resolve the provided XPath to a NodeRef
+         var nodes = search.xpathSearch(argsXPath);
+         if (nodes.length > 0)
+         {
+            nodeRef = String(nodes[0].nodeRef);
+         }
+      }
+
+      // default to max of 100 results
+      var maxResults = 100;
+      if (argsMaxResults != null)
+      {
+         // force the argsMaxResults var to be treated as a number
+         maxResults = parseInt(argsMaxResults, 10) || maxResults;
+      }
+      
+      //consider argsSearchTerm null if empty string
+      argsSearchTerm = (argsSearchTerm != null && argsSearchTerm.length == 0) ? null : argsSearchTerm ;
+
+      // if the last path element is 'doclib' or 'siblings' find parent node
+      if (pathElements.length > 0)
+      {
+         lastPathElement = pathElements[pathElements.length-1];
+         
+         if (logger.isLoggingEnabled())
+            logger.log("lastPathElement = " + lastPathElement);
+         
+         if (lastPathElement == "siblings")
+         {
+            // the provided nodeRef is the node we want the siblings of so get it's parent
+            var node = search.findNode(nodeRef);
+            if (node !== null)
+            {
+               nodeRef = node.parent.nodeRef;
+            }
+            else
+            {
+               // if the provided node was not found default to companyhome
+               nodeRef = "alfresco://company/home";
+            }
+         }
+         else if (lastPathElement == "doclib")
+         {
+            // we want to find the document library for the nodeRef provided
+            nodeRef = findDoclib(nodeRef);
+         }
+      }
+
+      if (url.templateArgs.type == "node")
+      {
+         parent = resolveNode(nodeRef);
+         if (parent === null)
+         {
+            status.setCode(status.STATUS_NOT_FOUND, "Not a valid nodeRef: '" + nodeRef + "'");
+            return null;
+         }
+         
+         if (argsRootNode != null)
+         {
+            rootNode = resolveNode(argsRootNode) || companyhome;
+         }
+
+         var ignoreTypes = null;
+         if (argsFilterType != null)
+         {
+            if (logger.isLoggingEnabled())
+               logger.log("ignoring types = " + argsFilterType);
+            
+            ignoreTypes = argsFilterType.split(',');
+         }
+
+         // retrieve the children of this node
+         var childNodes = parent.childFileFolders(true, true, ignoreTypes, -1, maxResults, 0, "cm:name", true, null).getPage();
+
+         // Ensure folders and folderlinks appear at the top of the list
+         var containerResults = new Array(),
+            contentResults = new Array();
+
+         for each (var result in childNodes)
+         {
+            if (result.isContainer || result.type == "{http://www.alfresco.org/model/application/1.0}folderlink")
+            {
+               // wrap result and determine if it is selectable in the UI
+               resultObj = 
+               { 
+                  item: result
+               };
+               if(argsSelectableMimeType)
+               {
+                  resultObj.selectable = isItemSelectableByMimeType(result, argsSelectableType, argsSelectableMimeType);
+               }
+               else
+               {
+                  resultObj.selectable = isItemSelectable(result, argsSelectableType);
+               }
+               containerResults.push(resultObj);
+            }
+            else
+            {
+               var qnamePaths = result.qnamePath.split("/"), container;
+               if ((qnamePaths.length > 4) && (qnamePaths[2] == "st:sites"))
+               {
+                  container = qnamePaths[4].substr(3);
+               }
+               // wrap result and determine if it is selectable in the UI
+               resultObj = 
+               { 
+                  item: result
+               };
+               if(argsSelectableMimeType)
+               {
+                  resultObj.selectable = isItemSelectableByMimeType(result, argsSelectableType, argsSelectableMimeType);
+               }
+               else
+               {
+                  resultObj.selectable = isItemSelectable(result, argsSelectableType);
+               }
+               resultObj.container = container;
+               contentResults.push(resultObj);
+            }
+         }
+         results = containerResults.concat(contentResults);
+      }
+      else if (url.templateArgs.type == "category")
+      {
+         var catAspect = (args["aspect"] != null) ? args["aspect"] : "cm:generalclassifiable";
+         
+         if (nodeRef == "workspace://SpacesStore/tag:tag-root")
+         {
+            categoryResults = classification.getRootCategories(catAspect, argsSearchTerm, maxResults, 0);
+            parent = resolveNode(nodeRef);
+         }
+         else
+         {
+            var rootCategories = classification.getRootCategories(catAspect);
+            if (rootCategories != null && rootCategories.length > 0)
+            {
+               if (argsRootNode)
+               {
+                  rootNode = resolveNode(argsRootNode);
+                  if (rootNode == null)
+                  {
+                     rootNode = rootCategories[0].parent;
+                  }
+               }
+               else
+               {
+                  rootNode = rootCategories[0].parent;
+               }
+               
+               if (nodeRef == "alfresco://category/root")
+               {
+                  parent = rootNode;
+                  categoryResults = classification.getRootCategories(catAspect, argsSearchTerm, maxResults, 0);
+               }
+               else
+               {
+                  parent = resolveNode(nodeRef);
+                  categoryResults = parent.children;
+                  if (argsSearchTerm != null)
+                  {
+                     var filteredResults = [];
+                     for each (result in categoryResults)
+                     {
+                        if (result.properties.name.indexOf(argsSearchTerm) == 0)
+                        {
+                           filteredResults.push(result);
+                        }
+                     }
+                     categoryResults = filteredResults.slice(0);
+                  }
+                  categoryResults.sort(sortByName);
+                  categoryResults = categoryResults.slice(0, maxResults);
+               }
+            }
+         }
+         
+         // make each result an object and indicate it is selectable in the UI
+         if (categoryResults)
+         {
+            for each (var result in categoryResults)
+            {
+               results.push(
+               { 
+                  item: result, 
+                  selectable: true 
+               });
+            }
+         }
+      }
+      else if (url.templateArgs.type == "authority")
+      {
+         if (argsSelectableType == "cm:person")
+         {
+            findUsers(argsSearchTerm, maxResults, results);
+         }
+         else if (argsSelectableType == "cm:authorityContainer")
+         {
+            findGroups(argsSearchTerm, maxResults, results);
+         }
+         else
+         {
+            // combine groups and users
+            findGroups(argsSearchTerm, maxResults, results);
+            findUsers(argsSearchTerm, maxResults, results);
+         }
+      }
+      
+      if (logger.isLoggingEnabled())
+         logger.log("Found " + results.length + " results");
+   }
+   catch (e)
+   {
+      var msg = e.message;
+      
+      if (logger.isLoggingEnabled())
+         logger.log(msg);
+      
+      status.setCode(500, msg);
+      
+      return;
+   }
+
+   model.parent = parent;
+   model.rootNode = rootNode;
+   model.results = results;
+}
+
+function isItemSelectable(node, selectableType)
+{
+   var selectable = true;
+   
+   if (selectableType !== null && selectableType !== "")
+   {
+      selectable = node.isSubType(selectableType);
+      
+      if (!selectable)
+      {
+         // the selectableType could also be an aspect,
+         // if the node has that aspect it is selectable
+         selectable = node.hasAspect(selectableType);
+      }
+   }
+   
+   return selectable;
+}
+
+/**
+ * Identifies if the node can be selected. The node can be selected if it is of specified type and has specified mime type.
+ * 
+ * @param node
+ * @param selectableType
+ * @param argsSelectableMimeType
+ * @returns <code>true<code> if the node can be selected, or false otherwise.
+ */
+function isItemSelectableByMimeType(node, selectableType, argsSelectableMimeType)
+{
+   var selectable = isItemSelectable(node, selectableType);
+   if(selectable && argsSelectableMimeType != null && argsSelectableMimeType != "")
+   {
+      selectable = node.properties.content.mimetype.equals(argsSelectableMimeType);
+   }
+   return selectable;
+}
+
+/* Sort the results by case-insensitive name */
+function sortByName(a, b)
+{
+   return (b.properties.name.toLowerCase() > a.properties.name.toLowerCase() ? -1 : 1);
+}
+
+function findUsers(searchTerm, maxResults, results)
+{
+   var personRefs = people.getPeople(searchTerm, maxResults, "lastName", true);
+   
+   // create person object for each result
+   for each(var personRef in personRefs)
+   {
+      if (logger.isLoggingEnabled())
+         logger.log("found personRefs = " + personRefs);
+      
+      //filter out  the disabled users
+      var daname = (search.findNode(personRef)).properties.userName;
+ 
+      if(people.isAccountEnabled(daname)){
+          results.push(
+          {
+              item: createPersonResult(search.findNode(personRef)),
+              selectable: true
+          });
+      }
+      else{
+          results.push(
+	      {
+	          item: createPersonResult(search.findNode(personRef)),
+	          selectable: false
+	      });   
+          if (logger.isLoggingEnabled())
+              logger.log("User not added to results not enabled" + daname);
+      }
+   }
+}
+
+function findGroups(searchTerm, maxResults, results)
+{
+   if (logger.isLoggingEnabled())
+      logger.log("Finding groups matching pattern: " + searchTerm);
+   
+   var paging = utils.createPaging(maxResults, 0);
+   var searchResults = groups.getGroupsInZone(searchTerm, "APP.DEFAULT", paging, "displayName");
+   for each(var group in searchResults)
+   {
+      if (logger.isLoggingEnabled())
+         logger.log("found group = " + group.fullName);
+         
+      // add to results
+      results.push(
+      {
+         item: createGroupResult(group.groupNode),
+         selectable: true 
+      });
+   }
+   
+   // sort the groups by name alphabetically
+   if (results.length > 0)
+   {
+      results.sort(function(a, b)
+      {
+         return (a.item.properties.name < b.item.properties.name) ? -1 : (a.item.properties.name > b.item.properties.name) ? 1 : 0;
+      });
+   }
+}
+
+/**
+ * Returns the nodeRef of the document library of the site the
+ * given nodeRef is located within. If the nodeRef provided does
+ * not live within a site "alfresco://company/home" is returned.
+ * 
+ * @param nodeRef The node to find the document library for
+ * @return The nodeRef of the doclib or "alfresco://company/home" if the node
+ *         is not located within a site
+ */
+function findDoclib(nodeRef)
+{
+   var resultNodeRef = "alfresco://company/home";
+   
+   // find the given node
+   var node = search.findNode(nodeRef);
+   if (node !== null)
+   {
+      // get the name of the site
+      var siteName = node.siteShortName;
+      
+      if (logger.isLoggingEnabled())
+         logger.log("siteName = " + siteName);
+      
+      // if the node is in a site find the document library node using an XPath search
+      if (siteName !== null)
+      {
+         var nodes = search.xpathSearch("/app:company_home/st:sites/cm:" + search.ISO9075Encode(siteName) + "/cm:documentLibrary");
+         if (nodes.length > 0)
+         {
+            // there should only be 1 result, get the first one
+            resultNodeRef = String(nodes[0].nodeRef);
+         }
+      }
+   }
+   
+   return resultNodeRef;
+}
+
+/**
+ * Resolve "virtual" nodeRefs, nodeRefs and xpath expressions into nodes
+ *
+ * @method resolveNode
+ * @param reference {string} "virtual" nodeRef, nodeRef or xpath expressions
+ * @return {ScriptNode|null} Node corresponding to supplied expression. Returns null if node cannot be resolved.
+ */
+function resolveNode(reference)
+{
+   return utils.resolveNodeReference(reference);
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.json.ftl
new file mode 100644
index 00000000000..723a0328f91
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.json.ftl
@@ -0,0 +1,2 @@
+<#import "pickerresults.lib.ftl" as pickerResultsLib />
+<@pickerResultsLib.pickerResultsJSON results=results />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.desc.xml
new file mode 100644
index 00000000000..64e136c280d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>PickerItems</shortname>
+  <description>Service to return metadata of multiple items to display in the object finder.</description>
+  <url>/api/forms/picker/items</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.json.ftl
new file mode 100644
index 00000000000..723a0328f91
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.json.ftl
@@ -0,0 +1,2 @@
+<#import "pickerresults.lib.ftl" as pickerResultsLib />
+<@pickerResultsLib.pickerResultsJSON results=results />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.json.js
new file mode 100644
index 00000000000..e080de2d48c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.json.js
@@ -0,0 +1,81 @@
+<import resource="classpath:/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.js">
+
+function main()
+{
+   var count = 0,
+      items = [],
+      results = [];
+
+   // extract mandatory data from request body
+   if (!json.has("items"))
+   {
+       status.setCode(status.STATUS_BAD_REQUEST, "items parameter is not present");
+       return;
+   }
+   
+   // convert the JSONArray object into a native JavaScript array
+   var jsonItems = json.get("items"),
+      itemValueType = "nodeRef",
+      itemValueTypeHint = "",
+      numItems = jsonItems.length(),
+      item, result;
+   
+   if (json.has("itemValueType"))
+   {
+      var jsonValueTypes = json.get("itemValueType").split(";");
+      itemValueType = jsonValueTypes[0];
+      itemValueTypeHint = (jsonValueTypes.length > 1) ? jsonValueTypes[1] : "";
+   }
+   
+   for (count = 0; count < numItems; count++)
+   {
+      item = jsonItems.get(count);
+      var container = null;
+      if (item != "")
+      {
+         result = null;
+         if (itemValueType == "nodeRef")
+         {
+            result = search.findNode(item);
+            if (result)
+            {
+               var qnamePaths = result.qnamePath.split("/");
+               if ((qnamePaths.length > 4) && (qnamePaths[2] == "st:sites"))
+               {
+                  container = qnamePaths[4].substr(3);
+               }
+            }
+         }
+         else if (itemValueType == "xpath")
+         {
+            result = search.xpathSearch(itemValueTypeHint.replace("%VALUE%", search.ISO9075Encode(item)))[0];
+         }
+         
+         if (result != null)
+         {
+            // create a separate object if the node represents a user or group
+            if (result.isSubType("cm:person"))
+            {
+               result = createPersonResult(result);
+            }
+            else if (result.isSubType("cm:authorityContainer"))
+            {
+               result = createGroupResult(result);
+            }
+            
+            results.push(
+            {
+               item: result,
+               container: container
+            });
+         }
+      }
+   }
+
+   if (logger.isLoggingEnabled())
+       logger.log("#items = " + count + ", #results = " + results.length);
+
+   model.results = results;
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.ftl
new file mode 100644
index 00000000000..d8b195dcd6f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.ftl
@@ -0,0 +1,83 @@
+<#macro renderParent node indent="   ">
+	<#escape x as jsonUtils.encodeJSONString(x)>
+	${indent}"parent":
+	${indent}{
+	<#if (node != rootNode) && node.parent??>
+		<@renderParent node.parent indent+"   " />
+	</#if>
+		${indent}"type": "${node.typeShort}",
+		${indent}"isContainer": ${node.isContainer?string},
+		${indent}"name": "${node.properties.name!""}",
+		${indent}"title": "${node.properties.title!""}",
+		${indent}"description": "${node.properties.description!""}",
+		<#if node.properties.modified??>${indent}"modified": "${xmldate(node.properties.modified)}",</#if>
+		<#if node.properties.modifier??>${indent}"modifier": "${node.properties.modifier}",</#if>
+		${indent}"displayPath": "${node.displayPath!""}",
+		${indent}"qnamePath": "${node.qnamePath!""}",
+		<#if node.aspects??>
+        ${indent}"aspects": 
+        ${indent}[
+           <#list node.aspects as aspect>
+                 "${shortQName(aspect)}"
+              <#if aspect_has_next>,</#if>
+           </#list>
+        
+           ${indent}],
+       </#if>
+		${indent}"nodeRef": "${node.nodeRef}"
+	${indent}},
+	</#escape>
+</#macro>
+
+<#macro pickerResultsJSON results>
+	<#escape x as jsonUtils.encodeJSONString(x)>
+{
+	"data":
+	{
+<#if parent??>
+	<@renderParent parent />
+</#if>
+		"items":
+		[
+		<#list results as row>
+			{
+				"type": "${row.item.typeShort}",
+				"parentType": "${row.item.parentTypeShort!""}",
+				"isContainer": ${row.item.isContainer?string},
+				<#if row.container??>"container": "${row.container!""}",</#if>
+				"name": "${row.item.properties.name!""}",
+				<#if row.item.aspects??>
+                 "aspects": [
+                   <#list row.item.aspects as aspect>
+                     "${shortQName(aspect)}"
+                      <#if aspect_has_next>,</#if>
+                   </#list>
+                   ],
+                 </#if>
+				"title":<#if row.item.properties["lnk:title"]??>"${row.item.properties["lnk:title"]}",
+						<#elseif row.item.properties["ia:whatEvent"]??>"${row.item.properties["ia:whatEvent"]}",
+						<#else>"${row.item.properties.title!""}",</#if>
+				"description": "${row.item.properties.description!""}",
+				<#if row.item.properties.modified??>"modified": "${xmldate(row.item.properties.modified)}",</#if>
+				<#if row.item.properties.modifier??>"modifier": "${row.item.properties.modifier}",</#if>
+				<#if row.item.siteShortName??>"site": "${row.item.siteShortName}",</#if>
+				<#if row.item.properties["ia:fromDate"]??>"fromDate": "${xmldate(row.item.properties["ia:fromDate"])}",</#if>
+				"displayPath": "${row.item.displayPath!""}",
+				"qnamePath": "${row.item.qnamePath!""}",
+				<#if row.item.typeShort != "cm:person" && row.item.typeShort != "cm:authorityContainer">
+					"userAccess":
+					{
+						"create": ${row.item.hasPermission("CreateChildren")?string},
+						"edit": ${row.item.hasPermission("Write")?string},
+						"delete": ${row.item.hasPermission("Delete")?string}
+					},
+				</#if>
+				"nodeRef": "${row.item.nodeRef}"<#if row.selectable?exists>,
+				"selectable" : ${row.selectable?string}</#if>
+			}<#if row_has_next>,</#if>
+		</#list>
+		]
+	}
+}
+	</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.js
new file mode 100644
index 00000000000..692c77d6a9b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerresults.lib.js
@@ -0,0 +1,70 @@
+/**
+ * Creates an Object representing the given person node.
+ * 
+ * @method createPersonResult
+ * @param node
+ * @return Object representing the person
+ */
+function createPersonResult(node)
+{
+   var personObject = 
+   {
+      typeShort: node.typeShort,
+      isContainer: false,
+      properties: {},
+      displayPath: node.displayPath,
+      nodeRef: "" + node.nodeRef
+   }
+   
+   // define properties for person
+   personObject.properties.userName = node.properties.userName;
+   personObject.properties.name = (node.properties.firstName ? node.properties.firstName + " " : "") + 
+      (node.properties.lastName ? node.properties.lastName : "") +
+         " (" + node.properties.userName + ")";
+   personObject.properties.jobtitle = (node.properties.jobtitle ? node.properties.jobtitle  : "");
+   
+   return personObject;
+}
+
+/**
+ * Creates an Object representing the given group node.
+ * 
+ * @method createGroupResult
+ * @param node
+ * @return Object representing the group
+ */
+function createGroupResult(node)
+{
+   var groupObject = 
+   {
+      typeShort: node.typeShort,
+      isContainer: false,
+      properties: {},
+      displayPath: node.displayPath,
+      nodeRef: "" + node.nodeRef
+   }
+   
+   // find most appropriate name for the group
+   var name = node.properties.name;
+   if (node.properties.authorityDisplayName != null && node.properties.authorityDisplayName.length > 0)
+   {
+      name = node.properties.authorityDisplayName;
+   }
+   else if (node.properties.authorityName != null && node.properties.authorityName.length > 0)
+   {
+      var authName = node.properties.authorityName;
+      if (authName.indexOf("GROUP_") == 0)
+      {
+         name = authName.substring(6);
+      }
+      else
+      {
+         name = authName;
+      }
+   }
+   
+   // set the name
+   groupObject.properties.name = name;
+   
+   return groupObject;
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/generic-paged-results.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/generic-paged-results.lib.ftl
new file mode 100644
index 00000000000..4765b2f667c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/generic-paged-results.lib.ftl
@@ -0,0 +1,89 @@
+<#--
+   Renders paged results information.
+   The passed in data object should contain following attributes:
+   pageSize: the number of elements requested to be returned (forms part of the request)
+   startIndex: the index of the first element to be returned (forms part of the request)
+   total: the total number of elements in the result set
+   itemCount: the actual number of elements returned
+   items: the result elements
+   
+Usage:
+   <#import "generic-paged-results.lib.ftl" as gen/>
+   {
+   <@gen.pagedResults data=data ; item>
+      output of the individual item, for example by calling another macro:
+      <@yourLib.itemJSON item=item />
+   </@gen.pagedResults>
+   }
+-->
+<#macro pagedResults data>
+   "total": ${data.total?c},
+   "pageSize": ${data.pageSize?c},
+   "startIndex": ${data.startIndex?c},
+   "itemCount": ${data.itemCount?c},
+   "items":
+   [
+   <#list data.items as item>
+      <#nested item>
+      <#if item_has_next>,</#if>
+   </#list>
+   ]
+</#macro>
+
+<#--
+   Renders information on the paging of results.
+   This version is paging information only, without the data.
+-->
+<#macro pagingJSON pagingVar="paging">
+<#escape x as jsonUtils.encodeJSONString(x)>
+  <#if .vars[pagingVar]??>,
+    "paging": 
+    {
+      "maxItems": ${.vars[pagingVar].maxItems?c},
+      "skipCount": ${.vars[pagingVar].skipCount?c},
+      "totalItems": ${.vars[pagingVar].totalItems?c},
+      "totalItemsRangeEnd": <#if .vars[pagingVar].confidence == "RANGE">${.vars[pagingVar].totalItemsRangeMax?c}<#else>null</#if>,
+      "confidence": "${.vars[pagingVar].confidence?lower_case}"
+    }
+  </#if>
+</#escape>
+</#macro>
+
+<#--
+   Renders paged results information to conforms to the RESTful APIs standards.
+   The passed in data object should contain following attributes:
+   count: The actual number of elements returned
+   hasMoreItems: True if more items on next page
+   totalItems: The total result count
+   skipCount: The number of elements to skip before retrieving the page
+   maxItems: The number of elements requested to be returned 
+   
+Usage:
+   <#import "generic-paged-results.lib.ftl" as gen/>
+   {
+   <@gen.standardRestfulPagedResults data=data ; item>
+      output of the individual item, for example by calling another macro:
+      <@yourLib.itemJSON item=item />
+   </@gen.standardRestfulPagedResults>
+   }
+-->
+<#macro standardRestfulPagedResults data>
+	"list" : {
+		"pagination" : {
+			"count" : ${data.count?c},
+			"hasMoreItems" : ${data.hasMoreItems?c},
+			"totalItems" : ${data.totalItems?c},
+			"skipCount" :${data.skipCount?c},
+			"maxItems" : ${data.maxItems?c}
+		},
+	    "entries" : [
+	<#list data.items as item>
+	        {
+	            "entry" : {
+                    <#nested item>
+	            }    
+		    }<#if item_has_next>,</#if>
+	</#list>
+        ]
+	}
+</#macro>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/generic-paged-results.lib.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/generic-paged-results.lib.js
new file mode 100644
index 00000000000..1eefe7c76b2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/generic-paged-results.lib.js
@@ -0,0 +1,52 @@
+/**
+ * Returns a data object that can be passed to the paged results template
+ * for rendering.
+ *
+ * @param nodes: The complete result set nodes
+ * @param index: the start index from which results should be returned
+ * @param count: the number of elements that should be returned
+ * @param extractDataFn: The function that extracts the data to be returned
+ *                       for each node in the final data set.
+ *                       The functions signature is name(index, node).
+ * 
+ * Returns an array containing all topics found in the passed array.
+ * Filters out non-fm:topic nodes.
+ */
+function getPagedResultsData(nodes, index, count, extractDataFn)
+{
+   var items = new Array();
+   var i;
+   var added = 0;
+   for (i = index; i < nodes.length && added < count; i++) 
+   {
+      items.push(extractDataFn(nodes[i]));
+      added++;
+   }
+   
+   return (
+   {
+      "total" : nodes.length,
+      "pageSize" : count,
+      "startIndex" : index,
+      "itemCount" : items.length,
+      "items": items
+   });
+}
+
+/**
+ * Returns a list of topics, as returned by the lucene query
+ */
+function getPagedResultsDataByLuceneQuery(node, luceneQuery, sortAttribute, ascending, index, count, extractDataFn)
+{
+   var nodes = null;
+   if (sortAttribute != null)
+   {
+      nodes = search.luceneSearch(node.nodeRef.storeRef.toString(), luceneQuery, sortAttribute, ascending);
+   }
+   else
+   {
+      nodes = search.luceneSearch(luceneQuery);
+   }
+   return getPagedResultsData(nodes, index, count, extractDataFn);
+}
+
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/authority.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/authority.lib.ftl
new file mode 100644
index 00000000000..76c2cf010c4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/authority.lib.ftl
@@ -0,0 +1,28 @@
+<#-- renders an authority object which can be either a GROUP or USER (and possibly ROLE in future)-->
+<#macro authorityJSON authority>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+		   "authorityType": "${authority.authorityType}",
+		   "shortName": "${authority.shortName}",
+		   "fullName": "${authority.fullName}",
+		   "displayName": "${authority.displayName}",
+		   <#if authority.authorityType = "GROUP">
+		   "url": "api/groups/${authority.shortName?url}"
+		   </#if>
+		   <#if authority.authorityType = "USER">
+		   "url": "api/people/${authority.shortName?url}"
+		   </#if>
+           <#if authority.zones?exists>
+           ,"zones":
+           [
+           <#list authority.zones as zone>
+              "${zone}"<#if zone_has_next>,</#if>
+           </#list>
+           ]
+           </#if>
+}
+</#escape>
+</#macro>
+
+<#-- Renders paging objects. -->
+<#import "../generic-paged-results.lib.ftl" as genericPaging />
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.desc.xml
new file mode 100644
index 00000000000..c18fffe86a0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.desc.xml
@@ -0,0 +1,15 @@
+<webscript>
+   <shortname>Remove an authority from a group</shortname>
+   <description><![CDATA[
+      Remove an authority (USER or GROUP) from a group.  A user will not be deleted by this method.
+      <br />
+      You must have "administrator" privileges to alter a group.
+      <br /> 
+   ]]>
+   </description>
+   <url>/api/groups/{shortGroupName}/children/{fullAuthorityName}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.js
new file mode 100644
index 00000000000..9ab85c10cb4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.js
@@ -0,0 +1,22 @@
+/**
+ * Remove authority from group
+ */
+
+function main ()
+{
+   var urlElements = url.extension.split("/");
+   var shortName = urlElements[0];
+   var fullAuthorityName = urlElements[2];
+   
+   var group = groups.getGroup(shortName);
+   if (group == null)
+   {
+      // Group cannot be found
+      status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
+      return;
+   }
+   
+   group.removeAuthority(fullAuthorityName);
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.json.ftl
new file mode 100644
index 00000000000..ff8aa9e65a0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.delete.json.ftl
@@ -0,0 +1,6 @@
+<#-- Remove Group -->
+
+<#import "authority.lib.ftl" as authorityLib/>
+{
+	
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.get.desc.xml
new file mode 100644
index 00000000000..b13fc04158a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.get.desc.xml
@@ -0,0 +1,17 @@
+<webscript>
+   <shortname>Get the list of child authorities for a group.</shortname>
+   <description><![CDATA[
+   Get a list of the child authorities of a group. The list contains both people and groups.
+   <br />
+   The authorityType parameter is used to specify return authorities of the given type. Valid values are GROUP and USER.
+   The optional maxItems parameter sets the maximum number of items to be returned. If no value is set then all items are returned.
+   The optional skipCount parameter determines how many items to skip before returning the first result. If no skipCount value is set then no items are skipped.
+    If the optional sortBy parameter is given, then the results may be sorted. Possible values are "authorityName" (default), "shortName" and "displayName"
+   ]]>
+   </description>
+   <url>/api/groups/{shortName}/children?authorityType={authorityType?}&amp;maxItems={maxItems?}&amp;skipCount={skipCount?}&amp;sortBy={sortBy?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.get.js
new file mode 100644
index 00000000000..809f1f4dc27
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.get.js
@@ -0,0 +1,54 @@
+/**
+ * Get children
+ */
+
+function main()
+{
+   var urlElements = url.extension.split("/");
+   var shortName = urlElements[0];
+   
+   var authorityType = args["authorityType"];
+   var sortBy = args["sortBy"];
+   var paging = utils.createPaging(args);
+
+   if(sortBy == null)
+   {
+      sortBy = "authorityName";
+   }
+
+   var group = groups.getGroup(shortName);
+   if (group == null)
+   {
+      // Group cannot be found
+      status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
+      return;
+   }
+   
+   model.group = group;
+   
+   if (authorityType != null)
+   {
+      if (!authorityType.match("[GROUP|USER]"))
+      {
+         status.setCode(status.STATUS_BAD_REQUEST, "The authorityType argument has does not have a correct value.");
+         return;
+      }
+      if (authorityType == "GROUP")
+      {
+         model.children = group.getChildGroups(paging, sortBy);
+         model.paging = paging;
+      }
+      if (authorityType == "USER")
+      {
+         model.children = group.getChildUsers(paging, sortBy);
+         model.paging = paging;
+      }
+   }
+   else
+   {
+      model.children = group.getChildAuthorities(paging, sortBy);
+      model.paging = paging;
+   }
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.get.json.ftl
new file mode 100644
index 00000000000..56c748df97d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.get.json.ftl
@@ -0,0 +1,14 @@
+<#-- get children -->
+
+<#import "authority.lib.ftl" as authorityLib/>
+<#import "../generic-paged-results.lib.ftl" as genericPaging />
+{
+	"data": [
+		<#list children as c>
+			<@authorityLib.authorityJSON authority=c />
+				<#if c_has_next>,</#if>
+		</#list>
+	]
+
+   <@genericPaging.pagingJSON />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.post.desc.xml
new file mode 100644
index 00000000000..d7de4ccf714
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.post.desc.xml
@@ -0,0 +1,17 @@
+<webscript>
+   <shortname>Add group or user to a group</shortname>
+   <description><![CDATA[
+      Adds a group or user to a group. The webscript will create a sub group if one does not already exist, with the fullAuthorityName.
+      
+      <br />You must have "administrator" privileges to modify groups.
+      <br />If the authority is for a group and doe not exist then it is created.
+      <br />The webscript returns Status_Created if a new group is created, otherwise it returns Status_OK.
+      If Status_Created returns the new sub group, otherwise returns the group.  
+   ]]>
+   </description>
+   <url>/api/groups/{shortName}/children/{fullAuthorityName}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.post.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.post.js
new file mode 100644
index 00000000000..34ad5d2a69b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.post.js
@@ -0,0 +1,61 @@
+/** 
+ * Link groups or users to group.
+ * 
+ * Will create sub-groups if they don't already exist.
+ */  
+
+function main()
+{
+   // Check that post is submitted as application/json
+   if (headers["Content-Type"].indexOf("application/json") != 0)
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "Request must be submitted as application/json");
+      return;
+   }
+
+   var urlElements = url.extension.split("/");
+   var shortName = urlElements[0];
+   var fullAuthorityName = urlElements[2];
+   
+   var group = groups.getGroup(shortName);
+   var GROUP_PREFIX = "GROUP_";
+    
+   if (group == null)
+   {
+      // Parent Group cannot be found
+      status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
+      return;
+   }
+   
+   if (fullAuthorityName.match("^" + GROUP_PREFIX + "*"))
+   {
+      var subGroupName = fullAuthorityName.substr(GROUP_PREFIX.length);
+      var child = groups.getGroup(subGroupName);
+      
+      // This is a group authority
+      if(child == null)
+      {
+         // child does not exist
+         child = group.createGroup(subGroupName, subGroupName);
+         status.code = status.STATUS_CREATED;
+         model.group = child;
+         return;
+      }
+   }
+   
+   // Link an existing group or user
+   try
+   {
+       group.addAuthority(fullAuthorityName);
+   }
+   catch(e)
+   {
+       status.code = status.STATUS_INTERNAL_SERVER_ERROR;
+       return;
+   }
+
+   status.code = status.STATUS_OK;
+   model.group 
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.post.json.ftl
new file mode 100644
index 00000000000..ae4cb7ee1e5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/children.post.json.ftl
@@ -0,0 +1,10 @@
+<#-- post children - add group or user to a group -->
+
+<#import "authority.lib.ftl" as authorityLib/>
+{
+	<#if group??>
+	"data": <@authorityLib.authorityJSON authority=group />
+	<#else>
+	"data":  { }
+	</#if>	
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.get.desc.xml
new file mode 100644
index 00000000000..b24a4db4e4a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.get.desc.xml
@@ -0,0 +1,12 @@
+<webscript>
+   <shortname>Get the details of a group</shortname>
+   <description><![CDATA[
+      Gets the details of a group.
+    ]]>
+   </description>
+   <url>/api/groups/{shortName}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.get.js
new file mode 100644
index 00000000000..39c19f5712d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.get.js
@@ -0,0 +1,21 @@
+/**
+ * Get group
+ */ 
+
+function main()
+{
+   var urlElements = url.extension.split("/");
+   var shortName = urlElements[0];
+   
+   var group = groups.getGroup(shortName);
+   if (group == null)
+   {
+      // Group cannot be found
+      status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
+      return;
+   }
+   
+   model.group = group;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.get.json.ftl
new file mode 100644
index 00000000000..8d896efb40b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.get.json.ftl
@@ -0,0 +1,6 @@
+<#-- Get Group -->
+
+<#import "authority.lib.ftl" as authorityLib/>
+{
+	"data":<@authorityLib.authorityJSON authority=group />
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.put.desc.xml
new file mode 100644
index 00000000000..1b28da1ac81
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.put.desc.xml
@@ -0,0 +1,19 @@
+<webscript>
+   <shortname>Update the details of a group</shortname>
+   <description><![CDATA[
+      Updates the details of a group.
+      <br />
+      You must have "administrator" privileges to change the name of a group.
+      </br /> 
+      The following properties may be updated:-
+      <dl>
+      <dt>displayName</dt><dd>The display name</dd>
+      </dl>
+   ]]>
+   </description>
+   <url>/api/groups/{shortName}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.put.json.ftl
new file mode 100644
index 00000000000..95294f17824
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.put.json.ftl
@@ -0,0 +1,6 @@
+<#-- Update Group -->
+
+<#import "authority.lib.ftl" as authorityLib/>
+{
+	"data":<@authorityLib.authorityJSON authority=group />
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.put.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.put.json.js
new file mode 100644
index 00000000000..ade540c2986
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/group.put.json.js
@@ -0,0 +1,26 @@
+/**
+ * Update group
+ */
+
+function main()
+{
+   var urlElements = url.extension.split("/");
+   var shortName = urlElements[0];
+   
+   var group = groups.getGroup(shortName);
+   if (group == null)
+   {
+      // Group cannot be found
+      status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
+      return;
+   }
+   
+   if (json.has("displayName") == true)
+   {
+      group.setDisplayName(json.get("displayName"));
+   }
+   
+   model.group = group;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.desc.xml
new file mode 100644
index 00000000000..a799d865eaa
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.desc.xml
@@ -0,0 +1,15 @@
+<webscript>
+   <shortname>Delete a group</shortname>
+   <description><![CDATA[
+      Deletes a group and all its dependents.
+      <br />
+      You must have "administrator" privileges to delete a group.
+      <br /> 
+   ]]>
+   </description>
+   <url>/api/groups/{shortName}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.js
new file mode 100644
index 00000000000..cb6effd4dd7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.js
@@ -0,0 +1,21 @@
+/**
+ * Delete group
+ */
+
+function main()
+{
+   var urlElements = url.extension.split("/");
+   var shortName = urlElements[0];
+   
+   var group = groups.getGroup(shortName);
+   if (group == null)
+   {
+      // Group cannot be found
+      status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
+      return;
+   }
+   
+   group.deleteGroup();
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.json.ftl
new file mode 100644
index 00000000000..725b6ba8042
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.delete.json.ftl
@@ -0,0 +1,6 @@
+<#-- Delete  Group -->
+
+<#import "authority.lib.ftl" as authorityLib/>
+{
+	
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.get.desc.xml
new file mode 100644
index 00000000000..b5455903fb3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.get.desc.xml
@@ -0,0 +1,21 @@
+<webscript>
+   <shortname>List groups</shortname>
+   <description><![CDATA[
+      Searches for groups. 
+      <br />
+      The following optional parameters are available:-
+      <ul>
+      <li>shortNameFilter - returns those groups with a partial match on shortName.  You can use the pattern matching characters * to match zero or more characters or ? to match one character.</li>
+      <li>zone - returns only groups that are in the specified zone, otherwise it returns groups from all zones.</li>
+      <li>If the optional sortBy parameter is given, then the results may be sorted. Possible values are "authorityName" (default), "shortName" and "displayName"</li>
+      </ul>
+      <br />
+      Returns an Array of groups in JSON format.
+   ]]>
+   </description>
+   <url>/api/groups?shortNameFilter={shortNameFilter?}&amp;zone={zone?}&amp;maxItems={maxItems?}&amp;skipCount={skipCount?}&amp;sortBy={sortBy?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.get.js
new file mode 100644
index 00000000000..681748e5b22
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.get.js
@@ -0,0 +1,29 @@
+/**
+ * List/Search groups
+ */
+
+function main ()
+{
+	// Get the args
+	var shortNameFilter = args["shortNameFilter"];
+	var zone = args["zone"];
+   var sortBy = args["sortBy"];
+   var sortAsc = args["dir"] != "desc";
+   var paging = utils.createPaging(args);
+	
+	if (shortNameFilter == null)
+	{
+		shortNameFilter = "";
+	}
+
+   if (sortBy == null)
+   {
+      sortBy = "displayName";
+   }
+	
+   // Get the groups
+   model.groups = groups.getGroupsInZone(shortNameFilter, zone, paging, sortBy, sortAsc);
+   model.paging = paging;
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.get.json.ftl
new file mode 100644
index 00000000000..328e2c83999
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/groups.get.json.ftl
@@ -0,0 +1,14 @@
+<#-- list / search / groups -->
+
+<#import "authority.lib.ftl" as authorityLib/>
+<#import "../generic-paged-results.lib.ftl" as genericPaging />
+{
+	"data": [
+		<#list groups as group>
+			<@authorityLib.authorityJSON authority=group />
+			<#if group_has_next>,</#if>
+		</#list>
+	]
+
+   <@genericPaging.pagingJSON />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/parent.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/parent.get.desc.xml
new file mode 100644
index 00000000000..1cd8b87ea39
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/parent.get.desc.xml
@@ -0,0 +1,17 @@
+<webscript>
+   <shortname>Get the list of parent authorities for a group.</shortname>
+   <description><![CDATA[
+   Gets a list of the parent authorities of a group.    
+   <BR />
+   The optional level attribute can be ALL, in which case all parents are returned.
+   The optional maxItems parameter sets the maximum number of items to be returned. If no value is set then all items are returned.
+   The optional skipCount parameter determines how many items to skip before returning the first result. If no skipCount value is set then no items are skipped.
+    If the optional sortBy parameter is given, then the results may be sorted. Possible values are "authorityName" (default), "shortName" and "displayName"
+   ]]>
+   </description>
+   <url>/api/groups/{shortName}/parents?level={level?}&amp;maxItems={maxItems?}&amp;skipCount={skipCount?}&amp;sortBy={sortBy?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/parent.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/parent.get.js
new file mode 100644
index 00000000000..3c91827eac6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/parent.get.js
@@ -0,0 +1,46 @@
+/**
+ * Get parent groups
+ */
+
+function main ()
+{
+   var urlElements = url.extension.split("/");
+   var shortName = urlElements[0];
+   
+   var level = args["level"];
+   var sortBy = args["sortBy"];
+   var paging = utils.createPaging(args);
+   
+   var group = groups.getGroup(shortName);
+   if (group == null)
+   {
+      // Group cannot be found
+      status.setCode(status.STATUS_NOT_FOUND, "The group: " + shortName + " does not exist.");
+      return;
+   }
+   
+   model.group = group;
+
+   if(sortBy == null)
+   {
+      sortBy = "authorityName";
+   }
+   
+   if (level != null)
+   {
+      if (!level.match("[ALL]"))
+      {
+         status.setCode(status.STATUS_BAD_REQUEST, "The level argument has does not have a correct value.");
+         return;
+      }
+      model.parents = group.getAllParentGroups(paging, sortBy);
+      model.paging = paging;
+   }
+   else
+   {
+      model.parents = group.getParentGroups(paging, sortBy);
+      model.paging = paging;
+   }
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/parent.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/parent.get.json.ftl
new file mode 100644
index 00000000000..2aac10d77d4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/parent.get.json.ftl
@@ -0,0 +1,14 @@
+<#-- get parents -->
+
+<#import "authority.lib.ftl" as authorityLib/>
+<#import "../generic-paged-results.lib.ftl" as genericPaging />
+{
+	"data": [
+    	<#list parents as thegroup>	
+    		<@authorityLib.authorityJSON authority=thegroup />	 	   
+	   	<#if thegroup_has_next>,</#if>
+    	</#list>
+  	]
+
+   <@genericPaging.pagingJSON />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.desc.xml
new file mode 100644
index 00000000000..dfde5405f83
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.desc.xml
@@ -0,0 +1,15 @@
+<webscript>
+   <shortname>Delete a root group</shortname>
+   <description><![CDATA[
+      Deletes a root group and all its dependents.
+      <br />
+      You must have "administrator" privileges to delete a group.
+      <br /> 
+   ]]>
+   </description>
+   <url>/api/rootgroups/{shortName}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.js
new file mode 100644
index 00000000000..dc763204fc5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.js
@@ -0,0 +1,21 @@
+/** 
+ * Delete group
+ */ 
+
+function main()
+{
+   var urlElements = url.extension.split("/");
+   var shortName = urlElements[0];
+   
+   var group = groups.getGroup(shortName);
+   if (group == null)
+   {
+      // Group cannot be found
+      status.setCode(status.STATUS_NOT_FOUND, "The group :" + shortName + ", does not exist.");
+      return;
+   }
+   
+   group.deleteGroup();
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.json.ftl
new file mode 100644
index 00000000000..725b6ba8042
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.delete.json.ftl
@@ -0,0 +1,6 @@
+<#-- Delete  Group -->
+
+<#import "authority.lib.ftl" as authorityLib/>
+{
+	
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.get.desc.xml
new file mode 100644
index 00000000000..e76f2e1f943
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.get.desc.xml
@@ -0,0 +1,21 @@
+<webscript>
+   <shortname>List all root groups</shortname>
+   <description><![CDATA[
+      List all root groups.
+      <br />
+      If the optional zone parameter is set to 'true' then returns root groups from the specified zone.   
+      If not specified will return groups from all zones.
+      <br />
+      If the optional shortNameFilter parameter is set then returns those root groups with a partial match on shortName.    
+      The shortname filter can contain the wild card characters * and ? but these must be url encoded for this script.
+      The optional maxItems parameter sets the maximum number of items to be returned. If no value is set then all items are returned.
+      The optional skipCount parameter determines how many items to skip before returning the first result. If no skipCount value is set then no items are skipped.
+      If the optional sortBy parameter is given, then the results may be sorted. Possible values are "authorityName" (default), "shortName" and "displayName"
+   ]]>
+   </description>
+   <url>/api/rootgroups?shortNameFilter={shortNameFilter?}&amp;zone={zone?}&amp;maxItems={maxItems?}&amp;skipCount={skipCount?}&amp;sortBy={sortBy?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.get.js
new file mode 100644
index 00000000000..b973655d40a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.get.js
@@ -0,0 +1,31 @@
+/**
+ * List/Search root groups
+ */ 
+
+function main ()
+{
+   // Get the args
+   var shortNameFilter = args["shortNameFilter"];
+   var zone = args["zone"];
+   var sortBy = args["sortBy"];
+   var paging = utils.createPaging(args);
+     
+   if(sortBy == null)
+   {
+      sortBy = "authorityName";
+   }
+	
+   if(shortNameFilter == null)
+   {
+      model.groups = groups.getAllRootGroupsInZone(zone, paging, sortBy);
+      model.paging = paging;
+   }
+   else
+   {
+      // Do the search
+      model.groups = groups.searchRootGroupsInZone(shortNameFilter, zone, paging, sortBy);
+      model.paging = paging;
+   }
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.get.json.ftl
new file mode 100644
index 00000000000..679d33fbde1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.get.json.ftl
@@ -0,0 +1,14 @@
+<#-- list / search / rootgroups -->
+
+<#import "authority.lib.ftl" as authorityLib/>
+<#import "../generic-paged-results.lib.ftl" as genericPaging />
+{
+	"data": [
+    	<#list groups as group>	
+    		<@authorityLib.authorityJSON authority=group />	 	   
+	   	<#if group_has_next>,</#if>
+    	</#list>
+  	]
+
+   <@genericPaging.pagingJSON />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.post.desc.xml
new file mode 100644
index 00000000000..e0b7c02969f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.post.desc.xml
@@ -0,0 +1,20 @@
+<webscript>
+   <shortname>Add a root group</shortname>
+   <description><![CDATA[
+      Adds a root group.
+      <br />You must have "administrator" privileges to add a root group.
+      <br />Returns STATUS_CREATED if a new group is created.
+      <br />If the group already exists returns BAD_REQUEST.
+      
+      The following properties may be specified for the new root group:-
+      <dl>
+      <dt>displayName</dt><dd>The display name</dd>
+      </dl>
+   ]]>
+   </description>
+   <url>/api/rootgroups/{shortName}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.post.json.ftl
new file mode 100644
index 00000000000..caa0ae10539
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.post.json.ftl
@@ -0,0 +1,6 @@
+<#-- create root group -->
+
+<#import "authority.lib.ftl" as authorityLib/>
+{
+	"data":<@authorityLib.authorityJSON authority=group />
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.post.json.js
new file mode 100644
index 00000000000..20505e8271f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/groups/rootgroups.post.json.js
@@ -0,0 +1,29 @@
+/**
+ * Create new root group.
+ */
+
+function main()
+{
+   var urlElements = url.extension.split("/");
+   var shortName = urlElements[0];
+   
+   var group = groups.getGroup(shortName);
+   if (group != null)
+   {
+      // Group already exists
+      status.setCode(status.STATUS_BAD_REQUEST, "The root group :" + shortName + ", already exists.");
+      return;
+   }
+   
+   var displayName = shortName;
+   
+   if (json.has("displayName") == true)
+   {
+      displayName = json.get("displayName");
+   }
+   
+   model.group = groups.createRootGroup(shortName, displayName);
+   status.code = status.STATUS_CREATED;   
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/attachments.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/attachments.get.desc.xml
new file mode 100644
index 00000000000..ea961bfd001
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/attachments.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Node attachments info</shortname>
+  <description>Node attachments info</description>
+  <url>/api/attachments?nodeRef={noderef}</url>
+  <format default="json" />
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/attachments.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/attachments.get.js
new file mode 100644
index 00000000000..705a9b35423
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/attachments.get.js
@@ -0,0 +1,37 @@
+function main()
+{
+   var attachmentsAssocs = [];
+
+   if (args["nodeRef"] != null)
+   {
+      var nodeRef = args["nodeRef"],
+         node = search.findNode(nodeRef);	
+
+      if (node != null)
+      {
+         var assocs = node.associations;
+         for (var assocName in assocs)
+         {
+            if(assocName.equalsIgnoreCase("{http://www.alfresco.org/model/imap/1.0}attachment"))
+            {
+               var associations = assocs[assocName];
+               for (var j = 0, jj = associations.length; j < jj; j++)
+               {
+             
+                  attachmentsAssocs.push(
+                  {
+                     nodeRef: associations[j].nodeRef.toString(),
+                     name: associations[j].name,
+                     assocname: assocName
+                  }
+                  );
+               }
+            }
+         } 
+       }
+    }
+    
+    model.attachmentsAssocs = attachmentsAssocs;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/attachments.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/attachments.get.json.ftl
new file mode 100644
index 00000000000..a9a7a460a73
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/attachments.get.json.ftl
@@ -0,0 +1,11 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+[
+<#list attachmentsAssocs as a>
+	{
+		"nodeRef": "${a.nodeRef}",
+		"name": "${a.name}",
+		"assocname": "${a.assocname}"
+	}<#if (a_has_next)>,</#if>
+</#list>
+]
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/imap-enabled.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/imap-enabled.get.desc.xml
new file mode 100644
index 00000000000..195a81b45cb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/imap-enabled.get.desc.xml
@@ -0,0 +1,12 @@
+<webscript>
+   <shortname>IMAP Server Status</shortname>
+   <description>
+      This script returns the status of the IMAP server (enabled/disabled)
+   </description>
+   <url>/imap/servstatus</url>
+   <format default="html">extension</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <family>IMAP</family>
+   <lifecycle>internal</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.desc.xml
new file mode 100644
index 00000000000..3745286837f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.desc.xml
@@ -0,0 +1,14 @@
+<webscript>
+   <shortname>IMAP Workflow Handler</shortname>
+   <description>
+      This webscript starts a different workflow. It is used in the IMAP email body links. The workflowType should be a fully-qualified worklfow-definition name, with 
+      engine-name included. eg: activiti$activitiAdhoc. If engine-name is left out, Activiti is used as engine-name for the process.
+      (The optional feature is the reply email with a report.)
+   </description>
+   <url>/imap/start-workflow?alfTicket={ticket}&amp;nodeRefId={id}&amp;workflowType={wt}&amp;assignTo={at}&amp;workflowDueDateDay={ddd}&amp;workflowDueDateMonth={ddm}&amp;workflowDueDateYear={ddy}&amp;description={desc}&amp;workflowPriority={wp?}</url>
+   <format default="html">extension</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <family>IMAP</family>
+   <lifecycle>internal</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.html.ftl
new file mode 100644
index 00000000000..3b2b45b1694
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.html.ftl
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">   
+   <meta name="Generator" content="Alfresco Repository">
+
+   <style type="text/css">
+      body {
+         background-color:#FFFFFF;
+         color:#000000;
+      }
+      * {
+         font-family:Verdana,Arial,sans-serif;
+         font-size:11px;
+      }
+      h1 {
+         text-align:left;
+         font-size:15px;
+      }
+      h2 {
+         text-align:left;
+         font-size:13px;
+      }
+      .links {
+         border:0;
+         border-collapse:collapse;
+         width:99%;
+      }
+      .links td {
+         border:0;
+         padding:5px;
+      }
+      .description {
+         border:0;
+         border-collapse:collapse;
+         width:99%;
+      }
+      .description td {
+         border:1px dotted #555555;
+         padding:5px;
+      }
+   </style>
+</head>
+<body>
+   <h1>Workflow has started successfully.</h1>
+   <table class="description">
+      <tr>
+         <td>Ticket:</td><td>${args.alfTicket}</td>
+      </tr>
+      <tr>
+         <td>NodeRef id:</td><td>${args.nodeRefId}</td>
+      </tr>
+      <tr>
+         <td>Workflow type:</td><td>${args.workflowType}</td>
+      </tr>
+      <tr>
+         <td>Asign to:</td><td>${args.assignTo}</td>
+      </tr>
+      <tr>
+         <td>Due date:</td><td>${args.workflowDueDateDay}/${args.workflowDueDateMonth}/${args.workflowDueDateYear}</td>
+      </tr>
+      <tr>
+         <td>Description:</td><td>${args.description}</td>
+      </tr>
+      <tr>
+         <td>Result:</td><td> --- </td>
+      </tr>
+   </table>
+</body>
+</html>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.js
new file mode 100644
index 00000000000..b56c04fa914
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.js
@@ -0,0 +1,53 @@
+function main()
+{
+   logger.log("Start workflow form 'Start workflow' webscript");
+   var docNode = search.findNode("workspace://SpacesStore/" + args.nodeRefId);
+   if (docNode == undefined)
+   {
+      status.code = 404;
+      status.message = "Content with NodeRef id '" + args.nodeRefId + "' not found.";
+      status.redirect = true;
+      return;
+   }      
+   
+    // ALF-13898: accept FULL workflow-definition name if provided, otherwise revert to prefixing behavior
+    var workflowType = args.workflowType;
+    if(workflowType.indexOf('$') < 0) {
+       workflowType = "activiti$" + workflowType;
+    }
+    
+    var assignTo = people.getPerson(args.assignTo);
+    if (assignTo == undefined)
+    {
+       status.code = 404;
+       status.message = "Person with username '" + args.assignTo + "' not found.";
+       status.redirect = true;
+       return;
+    }
+    var day = args.workflowDueDateDay;
+    var month = args.workflowDueDateMonth;
+    var year = args.workflowDueDateYear;
+    if (year != null && year.length == 2)
+    {
+       year = "20" + year;
+    }
+    var dueDate = new Date(year, month - 1, day);
+    var description = args.description;
+
+    var workflow = actions.create("start-workflow");
+    workflow.parameters.workflowName = workflowType;
+    workflow.parameters["bpm:workflowDescription"] = description;
+    workflow.parameters["bpm:assignee"] = assignTo;
+    
+    if (args.workflowPriority != null)
+    {
+       workflow.parameters["bpm:workflowPriority"] = args.workflowPriority;
+    }
+    
+    if (dueDate != null)
+    {
+       workflow.parameters["bpm:workflowDueDate"] = dueDate;
+    } 
+    workflow.execute(docNode);
+}
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitation.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitation.lib.ftl
new file mode 100644
index 00000000000..39545d78ff7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitation.lib.ftl
@@ -0,0 +1,36 @@
+<#-- renders an invitation object which can be either a MODERATED or NOMINATED invitation-->
+<#macro invitationJSON invitation avatars={"" : ""} outputTicket=false >
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "inviteId": "${invitation.inviteId}",
+   "inviteeUserName": "${invitation.inviteeUserName}",
+   "invitee":
+   {
+      <#if invitation.inviteeFirstName??>"firstName": "${invitation.inviteeFirstName}",</#if>
+      <#if invitation.inviteeLastName??>"lastName": "${invitation.inviteeLastName}",</#if>
+      <#if invitation.inviteeEmail??>"email": "${invitation.inviteeEmail}",</#if>
+      <#assign userName = invitation.inviteeUserName>
+      <#if avatars[userName]??>"avatar" : "${avatars[userName]}",</#if>
+      "userName": "${invitation.inviteeUserName}"
+   },
+   <#-- Moderated invitation properties -->
+   <#if invitation.inviteeComments??>"inviteeComments": "${invitation.inviteeComments}",</#if>   
+   <#if invitation.roleName??>"roleName": "${invitation.roleName}",</#if>      
+   <#-- Nominated invitation properties -->
+   <#if invitation.acceptURL??>"acceptURL": "${invitation.acceptURL}",</#if>
+   <#if invitation.rejectURL??>"rejectURL": "${invitation.rejectURL}",</#if>
+   <#if outputTicket && invitation.inviteTicket??>"inviteTicket": "${invitation.inviteTicket}",</#if>
+   <#if invitation.sentInviteDateAsISO8601??>
+   "sentInviteDate" : 
+   {
+       "iso8601" : "${invitation.sentInviteDateAsISO8601}" 
+    }, 
+    </#if>
+   <#if invitation.inviterUserName??>"inviterUserName": "${invitation.inviterUserName}",</#if>
+   <#-- put a mandatory property at the end to deal cleanly with training commas -->
+   "resourceType": "${invitation.resourceType}",
+   "resourceName": "${invitation.resourceName}",
+   "invitationType": "${invitation.invitationType}"
+}
+</#escape>
+</#macro>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitations.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitations.get.desc.xml
new file mode 100644
index 00000000000..9dee017a1bb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitations.get.desc.xml
@@ -0,0 +1,25 @@
+<webscript>
+  <shortname>List Invitations</shortname>
+  <description><![CDATA[
+  Gets a collecton of invitations.
+  <br />
+  With no parameters, returns all open invitations (which could be a large number). 
+  <br />
+  With inviteeUserName, returns all open invitations for this invitee.
+  <br />
+  With invitationType, returns invitations of the specified type (Either NOMINATED or MODERATED).
+  <br />
+  With resourceType, returns invitations of the specified type (WEB_SITE only at the moment).  
+  <br />
+  
+  Returns a JSON array of Invitations. 
+  
+  <br />
+  ]]>
+  </description>
+  <url>/api/invitations?inviteeUserName={inviteeUserName?}&amp;invitationType={invitationType?}&amp;resourceType={resourceType?}</url>
+  <format default="json"/>
+  <lifecycle>limited_support</lifecycle>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitations.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitations.get.js
new file mode 100644
index 00000000000..c94d4e598eb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitations.get.js
@@ -0,0 +1,66 @@
+/**
+ * List/Search invitations implementation
+ */ 
+function main()
+{
+   // Get the site id
+   var urlElements = url.extension.split("/");
+   var shortName = urlElements[0];
+   
+   // Get the args
+   var inviteeUserName = args["inviteeUserName"];
+   var invitationType = args["invitationType"];
+   var resourceType = args["resourceType"];
+   var resourceName = args["resourceName"];
+   var resultsLimit = args["resultsLimit"];
+   
+   var props = {};
+   
+   if (inviteeUserName != null)
+   {
+      props.inviteeUserName = inviteeUserName
+   }
+   if (invitationType != null)
+   {
+      props.invitationType = invitationType
+   }
+   if (resourceType != null)
+   {
+      props.resourceType = resourceType
+   }
+   if (resourceName != null)
+   {
+      props.resourceName = resourceName
+   }
+   if (resultsLimit != null)
+   {
+      props.resultsLimit = resultsLimit
+   }
+   
+   var invites = invitations.listInvitations(props);
+   
+   //Get the avatars for the invitees.
+   var avatars = new Object();
+   for (var i = 0; i<invites.length; i++)
+   {
+      var invite = invites[i];
+      var userName = invite.inviteeUserName;
+      var person = people.getPerson(userName);
+      if (person != undefined && person !=null)
+      {
+         var assocs = person.assocs['{http://www.alfresco.org/model/content/1.0}avatar'];
+         if (assocs !=null && assocs.length>0)
+         {
+            var avatar = 'api/node/';
+            avatar = avatar + assocs[0].nodeRef.toString();
+            avatar = avatar + '/content/thumbnails/avatar';
+            avatars[userName] = avatar;
+         }
+      }
+   }
+   // Pass the information to the template
+   model.invitations = invites;
+   model.avatars = avatars;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitations.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitations.get.json.ftl
new file mode 100644
index 00000000000..213e99e3edc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitations.get.json.ftl
@@ -0,0 +1,11 @@
+<#-- list / search / invitations -->
+
+<#import "invitation.lib.ftl" as invitationLib/>
+{
+	"data": [
+    	<#list invitations as invitation>	
+    		<@invitationLib.invitationJSON invitation=invitation avatars=avatars/>	 	   
+	   	<#if invitation_has_next>,</#if>
+    	</#list>
+  	]
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invite-by-ticket.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invite-by-ticket.get.desc.xml
new file mode 100644
index 00000000000..94aadf16d5a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invite-by-ticket.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+   <shortname>Get invite by ticket</shortname>
+   <description>Returns invite information for a given inviteId and inviteTicket. No authentication is required</description>
+   <url>/api/invite/{inviteId}/{inviteTicket}</url>
+   <url>/api/invite/{inviteId}/{inviteTicket}?inviteeUserName={inviteeUserName?}</url>
+   <format default="json">argument</format>
+   <authentication>none</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invite-by-ticket.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invite-by-ticket.get.json.ftl
new file mode 100644
index 00000000000..2e926408720
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invite-by-ticket.get.json.ftl
@@ -0,0 +1,4 @@
+<#import "invite.lib.ftl" as inviteLib/>
+{
+   "invite" : <@inviteLib.inviteJSON invite=invite/>
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.lib.ftl
new file mode 100644
index 00000000000..8b9307312c9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.lib.ftl
@@ -0,0 +1,49 @@
+<#-- Renders a person object. -->
+<#macro renderPerson person fieldName>
+<#escape x as jsonUtils.encodeJSONString(x)>
+   "${fieldName}":
+   {
+      <#if person.assocs["cm:avatar"]??>
+      "avatar": "${"api/node/" + person.assocs["cm:avatar"][0].nodeRef?string?replace('://','/') + "/content/thumbnails/avatar"}",
+      </#if>
+      "userName": "${person.properties["cm:userName"]}",
+      "firstName": "${person.properties["cm:firstName"]!""}",
+      "lastName": "${person.properties["cm:lastName"]!""}"
+   },
+</#escape>
+</#macro>
+
+<#-- renders an invite information object -->
+<#macro inviteJSON invite>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "inviteId": "${invite.inviteId!''}",
+   <#if invite.inviterPerson??>
+      <@renderPerson person=invite.inviterPerson fieldName="inviter" />
+   <#else>
+   "inviter":
+   {
+      "userName": "${invite.inviterUserName}"
+   },
+   </#if>
+   <#if invite.inviteePerson??>
+      <@renderPerson person=invite.inviteePerson fieldName="invitee" />
+   <#else>
+   "invitee":
+   {
+      "userName": "${invite.inviteeUserName}"
+   },
+   </#if>
+   "role": "${invite.role}",
+   "site":
+   {
+      "shortName": "${invite.siteShortName!''}"
+      <#if invite.siteInfo??>
+      , "title": "${invite.siteInfo.title}"
+      </#if>
+   },
+   "invitationStatus": "${invite.invitationStatus}",
+   "sentInviteDate": "${invite.sentInviteDate?string("MMM dd yyyy HH:mm:ss 'GMT'Z '('zzz')'")}"
+}
+</#escape>
+</#macro>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/inviteresponse.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/inviteresponse.put.desc.xml
new file mode 100644
index 00000000000..e4253b3ce8e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/inviteresponse.put.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Accept invite</shortname>
+   <description>Accepts an invite.</description>
+   <url>/api/invite/{inviteId}/{inviteTicket}/{action}</url>
+   <format default="json">argument</format>
+   <authentication>none</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/inviteresponse.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/inviteresponse.put.json.ftl
new file mode 100644
index 00000000000..c0adf83a3a4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/inviteresponse.put.json.ftl
@@ -0,0 +1,4 @@
+{
+   "response" : "${response}",
+   "siteShortName" : "${siteShortName}"
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invites.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invites.get.desc.xml
new file mode 100644
index 00000000000..9beba491393
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invites.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+   <shortname>Get invites</shortname>
+   <description>Returns pending invites filtered by Inviter user name, Invitee user name &amp; Site short name</description>
+   <url>/api/invites?inviterUserName={inviterUserName?}&amp;inviteeUserName={inviteeUserName?}&amp;siteShortName={siteShortName?}</url>
+   <url>/api/invites?inviteId={inviteId}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>deprecated</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invites.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invites.get.json.ftl
new file mode 100644
index 00000000000..a1aea7b53a9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/invite/invites.get.json.ftl
@@ -0,0 +1,9 @@
+<#import "invite.lib.ftl" as inviteLib/>
+{
+   "invites" : [
+      <#list invites as invite>
+         <@inviteLib.inviteJSON invite=invite/>
+         <#if invite_has_next>,</#if>
+      </#list>
+   ]
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/link/link.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/link/link.delete.desc.xml
new file mode 100644
index 00000000000..ee17cfe81ce
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/link/link.delete.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Delete link</shortname>
+  <description>Deletes a link.</description>
+  <url>/api/links/link/site/{site}/{container}/{path}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/link/link.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/link/link.delete.json.ftl
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/link/link.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/link/link.get.desc.xml
new file mode 100644
index 00000000000..57af490b02f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/link/link.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get all links</shortname>
+  <description>Gets all links.</description>
+  <url>/api/links/link/site/{site}/{container}/{path}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/link/link.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/link/link.get.json.ftl
new file mode 100644
index 00000000000..4536c5f2a60
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/link/link.get.json.ftl
@@ -0,0 +1,2 @@
+<#import "../links.lib.ftl" as linksLib/>
+<@linksLib.renderLink />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post.desc.xml
new file mode 100644
index 00000000000..2bc909d82ad
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Delete link</shortname>
+  <description>Deletes a link.</description>
+  <url>/api/links/delete/site/{site}/{container}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post.json.ftl
new file mode 100644
index 00000000000..ce5a7d48f22
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post.json.ftl
@@ -0,0 +1,5 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+	"message":"${message}" 
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post.properties
new file mode 100644
index 00000000000..72445f16774
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=No valid link names supplied
+links-delete.access.denied=You don''t have permission to delete the link with name ''{0}''
+links-delete.msg.deleted=Node {0} deleted
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_cs.properties
new file mode 100644
index 00000000000..11014ecd7f7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_cs.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=Neuveden \u017e\u00e1dn\u00fd platn\u00fd n\u00e1zev propojen\u00ed
+links-delete.access.denied=Nejste opr\u00e1vn\u011bn\u00ed odstranit propojen\u00ed s\u00a0n\u00e1zvem ''{0}''
+links-delete.msg.deleted=Odstran\u011bn uzel {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_da.properties
new file mode 100644
index 00000000000..e879d76bb4f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_da.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=Der blev ikke angivet nogen gyldige linknavne
+links-delete.access.denied=Du har ikke tilladelse til at slette linket med navnet ''{0}''
+links-delete.msg.deleted=Noden {0} blev slettet
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_de.properties
new file mode 100755
index 00000000000..a60f96be48e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_de.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=Keine g\u00fcltigen Link-Namen angegeben
+links-delete.access.denied=Sie sind nicht berechtigt, den Link mit dem Namen ''{0}'' zu l\u00f6schen
+links-delete.msg.deleted=Node {0} gel\u00f6scht
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_es.properties
new file mode 100755
index 00000000000..7316d6fd973
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_es.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=No se han proporcionado nombres de enlaces v\u00e1lidos
+links-delete.access.denied=No tiene permisos para eliminar el enlace con el nombre ''{0}''
+links-delete.msg.deleted=Nodo {0} eliminado
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_fi.properties
new file mode 100644
index 00000000000..60fb0fc94e3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_fi.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=Kelvollisia linkkinimi\u00e4 ei ole annettu
+links-delete.access.denied=Sinulla ei ole oikeutta poistaa linkki\u00e4, jonka nimi on {0}
+links-delete.msg.deleted=Solmu {0} poistettu
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_fr.properties
new file mode 100755
index 00000000000..375c91bba22
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_fr.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=Aucun nom de lien valide n'a \u00e9t\u00e9 fourni
+links-delete.access.denied=Vous n''avez pas les droits d''acc\u00e8s pour supprimer le lien nomm\u00e9 ''{0}''
+links-delete.msg.deleted=N\u0153ud {0} supprim\u00e9
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_it.properties
new file mode 100755
index 00000000000..d8af041abca
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_it.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=Non \u00e8 stato specificato alcun nome di link valido
+links-delete.access.denied=Non si dispone del permesso di eliminare il link con nome ''{0}''
+links-delete.msg.deleted=Nodo {0} eliminato
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_ja.properties
new file mode 100755
index 00000000000..232db2a1c09
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_ja.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=\u6709\u52b9\u306a\u30ea\u30f3\u30af\u540d\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+links-delete.access.denied=''{0}'' \u3068\u3044\u3046\u540d\u524d\u306e\u30ea\u30f3\u30af\u3092\u524a\u9664\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093
+links-delete.msg.deleted=\u30ce\u30fc\u30c9 ''{0}'' \u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_nb.properties
new file mode 100755
index 00000000000..caeb8168165
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_nb.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=Ingen gyldige koblingsnavn ble angitt
+links-delete.access.denied=Du har ikke tillatelse til \u00e5 slette koblingen med navnet ''{0}''
+links-delete.msg.deleted=Slettet node {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_nl.properties
new file mode 100755
index 00000000000..9b3034708e4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_nl.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=Geen geldige koppelingsnamen opgegeven
+links-delete.access.denied=U hebt geen toestemming om de koppeling met de naam ''{0}'' te verwijderen
+links-delete.msg.deleted=Node {0} verwijderd
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_pl.properties
new file mode 100644
index 00000000000..0038abe72dc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_pl.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=Nie podano \u017cadnego linku o poprawnej nazwie
+links-delete.access.denied=Nie masz odpowiednich uprawnie\u0144, aby usun\u0105\u0107 link o nazwie ''{0}''
+links-delete.msg.deleted=W\u0119ze\u0142 {0} zosta\u0142 usuni\u0119ty
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_pt_BR.properties
new file mode 100644
index 00000000000..170823f2ed7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_pt_BR.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=N\u00e3o foram fornecidos nomes de link v\u00e1lidos
+links-delete.access.denied=Voc\u00ea n\u00e3o tem permiss\u00e3o para excluir o link com o nome ''{0}''
+links-delete.msg.deleted=N\u00f3 {0} exclu\u00eddo
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_ru.properties
new file mode 100755
index 00000000000..110096e5893
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_ru.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=\u041d\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0438\u043c\u0435\u043d\u0430 \u0441\u0441\u044b\u043b\u043e\u043a
+links-delete.access.denied=\u041d\u0435\u0442 \u043f\u0440\u0430\u0432 \u043d\u0430 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0441\u0441\u044b\u043b\u043a\u0438 \u0441 \u0438\u043c\u0435\u043d\u0435\u043c ''{0}''
+links-delete.msg.deleted=\u0423\u0437\u0435\u043b {0} \u0443\u0434\u0430\u043b\u0435\u043d
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_sv.properties
new file mode 100644
index 00000000000..b8a1dcb98f7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_sv.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=Inga giltiga l\u00e4nknamn gavs
+links-delete.access.denied=Du har inte beh\u00f6righet att radera l\u00e4nken med namn ''{0}''
+links-delete.msg.deleted=Nod {0} raderad
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_zh_CN.properties
new file mode 100755
index 00000000000..313c7ba29f6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links-delete.post_zh_CN.properties
@@ -0,0 +1,3 @@
+links-delete.err.not.found=\u672a\u63d0\u4f9b\u6709\u6548\u7684\u94fe\u63a5\u540d\u79f0
+links-delete.access.denied=\u60a8\u65e0\u6743\u5220\u9664\u540d\u79f0\u4e3a''{0}''\u7684\u94fe\u63a5
+links-delete.msg.deleted=\u5df2\u5220\u9664\u8282\u70b9 {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.get.desc.xml
new file mode 100644
index 00000000000..62d9460c027
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get all links</shortname>
+  <description>Gets all links.</description>
+  <url>/api/links/site/{site}/{container}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.get.json.ftl
new file mode 100644
index 00000000000..932f8346ef2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.get.json.ftl
@@ -0,0 +1,4 @@
+<#import "links.lib.ftl" as linksLib/>
+<#if data??>
+<@linksLib.renderLinkList />
+</#if>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.lib.ftl
new file mode 100644
index 00000000000..86824225871
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.lib.ftl
@@ -0,0 +1,81 @@
+<#import "../generic-paged-results.lib.ftl" as gen>
+
+<#macro renderPerson person fieldName>
+<#escape x as jsonUtils.encodeJSONString(x)>
+   "${fieldName}":
+   {
+   <#if person.assocs["cm:avatar"]??>
+      "avatarRef": "${person.assocs["cm:avatar"][0].nodeRef?string}",
+   </#if>
+      "username": "${person.properties["cm:userName"]}",
+      "firstName": "${person.properties["cm:firstName"]!""}",
+      "lastName": "${person.properties["cm:lastName"]!""}"
+   },
+</#escape>
+</#macro>
+
+<#--
+   This template renders a link.
+-->
+<#macro linkJSON item>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "url": "${item.url!''}",
+   "commentsUrl": "/node/${item.node.nodeRef?replace('://','/')}/comments",
+   "description": "${item.description!''}",
+   "nodeRef": "${item.node.nodeRef}",
+   "name": "${item.name!''}",
+   "title": "${item.title!''}",
+   "internal": ${(item.internal!false)?string},
+   "createdOn": "${xmldate(item.createdOn)}",
+   "createdOnDate": {
+        "iso8601": "${xmldate(item.createdOn)}",
+        "legacyDate": "${xmldate(item.createdOn)}"
+   },
+   <#if item.creator?has_content>
+   <@renderPerson person=item.creator fieldName="author" />
+   <#else>
+   "author":
+   {
+      "username": "${item.node.properties.creator}"
+   },
+   </#if>
+   "permissions":
+   {
+      "edit": ${item.node.hasPermission("Write")?string},
+      "delete": ${item.node.hasPermission("Delete")?string}
+   },
+   "tags": [<#list item.tags as x>"${x}"<#if x_has_next>, </#if></#list>]
+}
+</#escape>
+</#macro>
+
+<#macro renderLinkList>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "metadata":
+   {
+      "linkPermissions":
+      {
+         <#if links.getParent()?? && links.getTypeShort() != "st:site" >
+            "create": "${(links.getParent()).hasPermission("CreateChildren")?string}"
+         <#else>
+            "create": "${links.hasPermission("CreateChildren")?string}"
+         </#if>
+      }
+   },
+   "totalRecordsUpper": ${data.totalRecordsUpper?string("true","false")},
+   <@gen.pagedResults data=data ; item>
+      <@linkJSON item=item />
+   </@gen.pagedResults>
+}
+</#escape>
+</#macro>
+
+<#macro renderLink>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "item": <@linkJSON item=item />
+}
+</#escape>
+</#macro>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post.desc.xml
new file mode 100644
index 00000000000..681ed47d049
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>post</shortname>
+  <description>post</description>
+  <url>/api/links/site/{site}/{container}/posts</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post.json.ftl
new file mode 100644
index 00000000000..91d4bf17870
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post.json.ftl
@@ -0,0 +1,7 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "message": "${message}"<#if item??>,
+   "name": "${item.name?string}"
+</#if>
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post.properties
new file mode 100644
index 00000000000..463ce253598
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=You don't have permission to create a link
+links.err.not.found=No link found with that name
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_cs.properties
new file mode 100644
index 00000000000..bc3f29212b3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_cs.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Nejste opr\u00e1vn\u011bni vytvo\u0159it propojen\u00ed
+links.err.not.found=Nenalezeno \u017e\u00e1dn\u00e9 propojen\u00ed s\u00a0dan\u00fdm n\u00e1zvem
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_da.properties
new file mode 100644
index 00000000000..2f499a24c75
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_da.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Du har ikke tilladelse til at oprette et link
+links.err.not.found=Der blev ikke fundet noget link med det navn
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_de.properties
new file mode 100755
index 00000000000..47d3c2b5e9a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_de.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Sie sind nicht berechtigt, einen Link zu erstellen
+links.err.not.found=Es wurde kein Link mit diesem Namen gefunden
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_es.properties
new file mode 100755
index 00000000000..792ff2882e3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_es.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=No tiene permisos para crear un enlace
+links.err.not.found=No se ha encontrado ning\u00fan enlace con ese nombre
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_fi.properties
new file mode 100644
index 00000000000..5c4326677de
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_fi.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Sinulla ei ole oikeutta luoda linkki\u00e4
+links.err.not.found=Linkki\u00e4 ei l\u00f6ydy t\u00e4ll\u00e4 nimell\u00e4
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_fr.properties
new file mode 100755
index 00000000000..464906eb6ca
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_fr.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Vous ne disposez pas des droits d'acc\u00e8s pour cr\u00e9er un lien
+links.err.not.found=Aucun lien portant ce nom n'a \u00e9t\u00e9 trouv\u00e9
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_it.properties
new file mode 100755
index 00000000000..64756543346
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_it.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Non si dispone del permesso di creare un link
+links.err.not.found=Nessun link trovato con il nome specificato
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_ja.properties
new file mode 100755
index 00000000000..8afc7637991
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_ja.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=\u30ea\u30f3\u30af\u3092\u4f5c\u6210\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093
+links.err.not.found=\u305d\u306e\u540d\u524d\u306e\u30ea\u30f3\u30af\u306f\u3042\u308a\u307e\u305b\u3093
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_nb.properties
new file mode 100755
index 00000000000..5d41c802214
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_nb.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Du har ikke tillatelse til \u00e5 opprette en kobling
+links.err.not.found=Fant ingen kobling med det navnet
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_nl.properties
new file mode 100755
index 00000000000..0ca423577fd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_nl.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=U hebt geen toestemming om een koppeling te maken
+links.err.not.found=Geen koppeling gevonden met die naam
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_pl.properties
new file mode 100644
index 00000000000..a7f0a33dd4e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_pl.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Nie masz uprawnie\u0144 do utworzenia linku
+links.err.not.found=Nie znaleziono linku o tej nazwie
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_pt_BR.properties
new file mode 100644
index 00000000000..24bbf11a86e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_pt_BR.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Voc\u00ea n\u00e3o tem permiss\u00e3o para criar um link
+links.err.not.found=Nenhum link com esse nome encontrado
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_ru.properties
new file mode 100755
index 00000000000..6082ff90f65
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_ru.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=\u0423 \u0432\u0430\u0441 \u043d\u0435\u0442 \u043f\u0440\u0430\u0432 \u043d\u0430 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0441\u0441\u044b\u043b\u043a\u0438
+links.err.not.found=\u0421\u0441\u044b\u043b\u043a\u0430 \u0441 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u043c \u0438\u043c\u0435\u043d\u0435\u043c \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_sv.properties
new file mode 100644
index 00000000000..d0421af1b45
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_sv.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Du har inte beh\u00f6righet att skapa en l\u00e4nk
+links.err.not.found=Ingen l\u00e4nk med det namnet hittades
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_zh_CN.properties
new file mode 100755
index 00000000000..a9dcbbec97b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.post_zh_CN.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=\u60a8\u65e0\u6743\u521b\u5efa\u94fe\u63a5
+links.err.not.found=\u672a\u627e\u5230\u5177\u6709\u6b64\u540d\u79f0\u7684\u94fe\u63a5
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put.desc.xml
new file mode 100644
index 00000000000..054bda3d442
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Update link</shortname>
+  <description>Updates a link.</description>
+  <url>/api/links/site/{site}/{container}/{path}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put.json.ftl
new file mode 100644
index 00000000000..64c991a1771
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put.json.ftl
@@ -0,0 +1,5 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+	"message": "${message}"
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put.properties
new file mode 100644
index 00000000000..463ce253598
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=You don't have permission to create a link
+links.err.not.found=No link found with that name
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_cs.properties
new file mode 100644
index 00000000000..bc3f29212b3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_cs.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Nejste opr\u00e1vn\u011bni vytvo\u0159it propojen\u00ed
+links.err.not.found=Nenalezeno \u017e\u00e1dn\u00e9 propojen\u00ed s\u00a0dan\u00fdm n\u00e1zvem
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_da.properties
new file mode 100644
index 00000000000..2f499a24c75
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_da.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Du har ikke tilladelse til at oprette et link
+links.err.not.found=Der blev ikke fundet noget link med det navn
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_de.properties
new file mode 100755
index 00000000000..47d3c2b5e9a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_de.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Sie sind nicht berechtigt, einen Link zu erstellen
+links.err.not.found=Es wurde kein Link mit diesem Namen gefunden
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_es.properties
new file mode 100755
index 00000000000..792ff2882e3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_es.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=No tiene permisos para crear un enlace
+links.err.not.found=No se ha encontrado ning\u00fan enlace con ese nombre
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_fi.properties
new file mode 100644
index 00000000000..5c4326677de
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_fi.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Sinulla ei ole oikeutta luoda linkki\u00e4
+links.err.not.found=Linkki\u00e4 ei l\u00f6ydy t\u00e4ll\u00e4 nimell\u00e4
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_fr.properties
new file mode 100755
index 00000000000..464906eb6ca
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_fr.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Vous ne disposez pas des droits d'acc\u00e8s pour cr\u00e9er un lien
+links.err.not.found=Aucun lien portant ce nom n'a \u00e9t\u00e9 trouv\u00e9
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_it.properties
new file mode 100755
index 00000000000..64756543346
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_it.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Non si dispone del permesso di creare un link
+links.err.not.found=Nessun link trovato con il nome specificato
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_ja.properties
new file mode 100755
index 00000000000..8afc7637991
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_ja.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=\u30ea\u30f3\u30af\u3092\u4f5c\u6210\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093
+links.err.not.found=\u305d\u306e\u540d\u524d\u306e\u30ea\u30f3\u30af\u306f\u3042\u308a\u307e\u305b\u3093
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_nb.properties
new file mode 100755
index 00000000000..5d41c802214
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_nb.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Du har ikke tillatelse til \u00e5 opprette en kobling
+links.err.not.found=Fant ingen kobling med det navnet
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_nl.properties
new file mode 100755
index 00000000000..0ca423577fd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_nl.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=U hebt geen toestemming om een koppeling te maken
+links.err.not.found=Geen koppeling gevonden met die naam
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_pl.properties
new file mode 100644
index 00000000000..a7f0a33dd4e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_pl.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Nie masz uprawnie\u0144 do utworzenia linku
+links.err.not.found=Nie znaleziono linku o tej nazwie
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_pt_BR.properties
new file mode 100644
index 00000000000..24bbf11a86e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_pt_BR.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Voc\u00ea n\u00e3o tem permiss\u00e3o para criar um link
+links.err.not.found=Nenhum link com esse nome encontrado
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_ru.properties
new file mode 100755
index 00000000000..6082ff90f65
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_ru.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=\u0423 \u0432\u0430\u0441 \u043d\u0435\u0442 \u043f\u0440\u0430\u0432 \u043d\u0430 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0441\u0441\u044b\u043b\u043a\u0438
+links.err.not.found=\u0421\u0441\u044b\u043b\u043a\u0430 \u0441 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u043c \u0438\u043c\u0435\u043d\u0435\u043c \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_sv.properties
new file mode 100644
index 00000000000..d0421af1b45
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_sv.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=Du har inte beh\u00f6righet att skapa en l\u00e4nk
+links.err.not.found=Ingen l\u00e4nk med det namnet hittades
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_zh_CN.properties
new file mode 100755
index 00000000000..a9dcbbec97b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/links/links.put_zh_CN.properties
@@ -0,0 +1,2 @@
+links.err.access.denied=\u60a8\u65e0\u6743\u521b\u5efa\u94fe\u63a5
+links.err.not.found=\u672a\u627e\u5230\u5177\u6709\u6b64\u540d\u79f0\u7684\u94fe\u63a5
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.get.desc.xml
new file mode 100644
index 00000000000..9498fd80367
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.get.desc.xml
@@ -0,0 +1,53 @@
+<webscript>
+  <shortname>Log in</shortname>
+  <description>  
+  <![CDATA[
+  Log in and establish a ticket.
+  <BR>
+  Input
+  <dl>
+  <dt>u</dt><dd>cleartext user name (must be URL encoded)</dd>
+  <dt>pw</dt><dd>cleartext password (must be URL encoded)</dd>
+  </dl>
+  <BR>
+  Returns the new authentication ticket.
+  <BR>
+  The user name and password are provided as URL arguments which may be<br>
+  logged by proxies or the Alfresco server. The alternative POST method<br>
+  of log in is recommended instead of GET.
+  ]]>
+  </description>
+  <url>/api/login?u={username}&amp;pw={password?}</url>
+  <format default="xml"/>
+  <authentication>none</authentication>
+  <transaction allow="readwrite">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <family>Authentication</family>
+  <args>
+    <arg>
+      <shortname>username</shortname>
+      <description>Cleartext username (must be URL encoded).</description>
+    </arg>
+    <arg>
+      <shortname>password</shortname>
+      <description>Cleartext password (must be URL encoded).</description>
+    </arg>
+  </args>
+  <responses>
+    <response>
+      <format>json</format>
+      <type>
+        <![CDATA[
+        {
+          "data":
+          [
+            {
+              "ticket": string
+            }
+          ]
+        }
+        ]]>
+      </type>
+    </response>
+  </responses>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.get.json.ftl
new file mode 100644
index 00000000000..67dcaf61c6f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.get.json.ftl
@@ -0,0 +1,6 @@
+{
+   "data":
+   {
+	"ticket":"${jsonUtils.encodeJSONString(ticket)}"
+   }
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.get.xml.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.get.xml.ftl
new file mode 100644
index 00000000000..d311e170fd4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.get.xml.ftl
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ticket>${ticket}</ticket>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.post.desc.xml
new file mode 100644
index 00000000000..31aad53af73
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.post.desc.xml
@@ -0,0 +1,54 @@
+<webscript>
+  <shortname>Log in (POST)</shortname>
+  <description>  
+  <![CDATA[
+  Log in and establish a ticket.
+  <BR />
+  Input
+  <BR />
+  JSON Data Object.
+  <dl>
+  <dt>username</dt><dd>cleartext user name</dd>
+  <dt>password</dt><dd>cleartext password</dd>
+  </dl>
+  <BR>
+  Returns the new authentication ticket.
+  ]]>
+  </description>
+  <url>/api/login</url>
+  <format default="json"/>
+  <authentication>none</authentication>
+  <transaction allow="readwrite">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <family>Authentication</family>
+  <requests>
+    <request>
+      <format>json</format>
+      <type>
+        <![CDATA[
+        {
+          "username": string,
+          "password": string
+        }
+        ]]>
+      </type>
+    </request>
+  </requests>
+  <responses>
+    <response>
+      <format>json</format>
+      <type>
+        <![CDATA[
+        {
+          "data":
+          [
+            {
+              "ticket": string
+            }
+          ]
+        }
+        ]]>
+      </type>
+    </response>
+  </responses>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.post.json.ftl
new file mode 100644
index 00000000000..77b6b496435
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.post.json.ftl
@@ -0,0 +1,6 @@
+{
+	"data":
+	{
+		"ticket":"${jsonUtils.encodeJSONString(ticket)}"
+	}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.post.xml.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.post.xml.ftl
new file mode 100644
index 00000000000..d311e170fd4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/login.post.xml.ftl
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ticket>${ticket}</ticket>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/loginticket.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/loginticket.delete.desc.xml
new file mode 100644
index 00000000000..43ae02ef6c2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/loginticket.delete.desc.xml
@@ -0,0 +1,20 @@
+<webscript>
+  <shortname>Log out</shortname>
+  <description><![CDATA[
+  Log out, delete log in ticket.
+  <BR>After the user has logged out the ticket is no longer valid and subsequent attempts to use it will fail.
+  ]]>
+  </description>
+  <url>/api/login/ticket/{ticket}</url>
+  <format default="xml"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <family>Authentication</family>
+  <args>
+    <arg>
+      <shortname>ticket</shortname>
+      <description>The login ticket to invalidate.</description>
+    </arg>
+  </args>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/loginticket.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/loginticket.get.desc.xml
new file mode 100644
index 00000000000..d1aed98f2fe
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/loginticket.get.desc.xml
@@ -0,0 +1,29 @@
+<webscript>
+  <shortname>Validate log in ticket</shortname>
+  <description><![CDATA[
+  Validates the specified ticket is still valid.
+  <BR>
+  The ticket may be invalid, or expired, or the user may have been locked out. 
+  <BR>
+  For security reasons this script will not validate the ticket of another user.  
+  <BR>
+  <ul>
+  <li>If the ticket is valid retuns, STATUS_SUCCESS (200)</li>
+  <li>If the ticket is not valid return, STATUS_NOT_FOUND (404)</li>
+  <li>If the ticket does not belong to the current user, STATUS_NOT_FOUND (404)</li>
+  </ul>
+  ]]>
+  </description>
+  <url>/api/login/ticket/{ticket}</url>
+  <format default="xml"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <family>Authentication</family>
+  <args>
+    <arg>
+      <shortname>ticket</shortname>
+      <description>The login ticket to invalidate.</description>
+    </arg>
+  </args>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/loginticket.get.xml.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/loginticket.get.xml.ftl
new file mode 100644
index 00000000000..d311e170fd4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/loginticket.get.xml.ftl
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ticket>${ticket}</ticket>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/bulkmetadata.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/bulkmetadata.post.desc.xml
new file mode 100644
index 00000000000..290d1699242
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/bulkmetadata.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Node metadata bulk retrieval service</shortname>
+  <description>Node metadata bulk retrieval service.</description>
+  <url>/api/bulkmetadata</url>
+  <format default="json" />
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.get.desc.xml
new file mode 100644
index 00000000000..4c19df9c500
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Node metadata retrieval service</shortname>
+  <description>Node metadata retrieval service.</description>
+  <url>/api/metadata</url>
+  <format default="json" />
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.get.js
new file mode 100644
index 00000000000..d625ea0b30d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.get.js
@@ -0,0 +1,32 @@
+/**
+ * Node Metadata Retrieval Service GET method
+ */
+function main()
+{
+   var json = "{}";
+   
+   // allow for content to be loaded from id
+   if (args["nodeRef"] != null)
+   {
+   	var nodeRef = args["nodeRef"];
+   	node = search.findNode(nodeRef);
+   	
+   	if (node != null)
+   	{
+   	   // if the node was found get JSON representation
+   		if (args["shortQNames"] != null)
+   		{
+   			json = node.toJSON(true);
+   		}
+   		else
+   		{
+   			json = node.toJSON();
+   		}
+   	}
+   }
+   
+   // store node onto model
+   model.json = json;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.get.json.ftl
new file mode 100644
index 00000000000..72273129120
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.get.json.ftl
@@ -0,0 +1 @@
+${json}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.desc.xml
new file mode 100644
index 00000000000..ff2aab2fa10
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.desc.xml
@@ -0,0 +1,8 @@
+<webscript>
+  <shortname>Node metadata storage service</shortname>
+  <description>Node metadata storage service.</description>
+  <url>/api/metadata/node/{store_type}/{store_id}/{id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.json.ftl
new file mode 100644
index 00000000000..e37684e04d1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.json.ftl
@@ -0,0 +1,3 @@
+{
+   "success": true
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.json.js
new file mode 100644
index 00000000000..ce6a05c073f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/metadata/metadata.post.json.js
@@ -0,0 +1,86 @@
+main();
+
+function main()
+{
+   if (url.templateArgs.store_type === null)
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "NodeRef missing");
+      return;
+   }
+
+   // nodeRef input
+   var storeType = url.templateArgs.store_type;
+   var storeId = url.templateArgs.store_id;
+   var id = url.templateArgs.id;
+   var nodeRef = storeType + "://" + storeId + "/" + id;
+   var node = search.findNode(nodeRef);
+   if (node === null)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "Not a valid nodeRef: '" + nodeRef + "'");
+      return null;
+   }
+
+   // Set passed-in properties
+   if (json.has("properties"))
+   {
+      var properties = jsonToObject("properties");
+      for (property in properties)
+      {
+         node.properties[property] = properties[property];
+      }
+   }
+
+   // Set passed-in mimetype
+   if (json.has("mimetype"))
+   {
+      node.mimetype = json.get("mimetype");
+   }
+   
+   // Set passed-in tags
+   if (json.has("tags"))
+   {
+      // Get the tags JSONArray and copy it to a native JavaScript array
+      var jsonTags = json.get("tags"),
+         tags = [];
+      
+      for (var t = 0; t < jsonTags.length(); t++)
+      {
+         tags.push(jsonTags.get(t));
+      }
+
+      if (tags.length > 0)
+      {
+         node.tags = tags;
+      }
+      else
+      {
+         node.clearTags();
+      }
+   }
+   node.save();
+}
+
+function jsonToObject(p_name)
+{
+   var object = {};
+   var jsonObj = json.get(p_name);
+   var names = jsonObj.names();
+   var name;
+   for (var i = 0, j = names.length(); i < j; i++)
+   {
+      name = names.get(i);
+      object[name] = jsonObj.get(name);
+   }
+   return object;
+}
+
+function jsonToArray(p_name)
+{
+   var array = [];
+   var jsonArray = json.get(p_name);
+   for (var i = 0, j = jsonArray.length(); i < j; i++)
+   {
+      array.push(jsonArray.get(i));
+   }
+   return array;
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/model/filefolder/load.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/model/filefolder/load.post.desc.xml
new file mode 100644
index 00000000000..5afd0aa828a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/model/filefolder/load.post.desc.xml
@@ -0,0 +1,25 @@
+<webscript>
+  <shortname>Load files into a folder</shortname>
+  <description>  <![CDATA[
+  Create text documents in a folder.
+  <br />
+  The following properties may be set.
+  
+  <dl>
+  <dt>folderPath</dt><dd>path of the folder to use (default:---)</dd>
+  <dt>fileCount</dt><dd>the number of files to create (default:100)</dd>
+  <dt>filesPerTxn</dt><dd>the number of files committed at a time (default:100)</dd>
+  <dt>minFileSize</dt><dd>the smallest file size (standard deviation lower limit) (default:80K)</dd>
+  <dt>maxFileSize</dt><dd>the largest file size (standard deviation upper limit) (default:120K)</dd>
+  <dt>maxUniqueDocuments</dt><dd>total number of random unique text combinations from which to choose (default:Long.MAX_VALUE)</dd>
+  <dt>forceBinaryStorage</dt><dd>force the text to be written to permanent storage, otherwise it is spoofed (default:false)</dd>
+  <dt>descriptionCount</dt><dd>the number of cm:description properties to create (default:1)</dd>
+  <dt>descriptionSize</dt><dd>the size (bytes) of each cm:description property (default:128)</dd>
+  </dl>
+  ]]></description>
+  <url>/api/model/filefolder/load</url>
+  <format default="json" />
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/node/folder.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/node/folder.post.desc.xml
new file mode 100644
index 00000000000..ac38733d776
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/node/folder.post.desc.xml
@@ -0,0 +1,116 @@
+<webscript>
+  <shortname>Create child folder</shortname>
+  <description><![CDATA[
+  Creates a child folder in the specified site container or existing folder.
+  <BR>
+  By default the new folder will be of type cm:folder, but subtypes of cm:folder
+  may be specified instead.
+  <BR>
+  The new NodeRef will be returned if the folder can be created.
+  <BR>
+  The minimum request is of the form:
+   <pre>
+     { "name": "NewNodeName" }
+   </pre>
+  <BR>
+  The full set of parameters accepted in the request is of the form:
+   <pre>
+    {  
+       "name": "NewNodeName",
+       "title": "New Node Title",
+       "description": "A shiny new node",
+       "type": "cm:folder"
+    }
+   </pre>
+  <BR>
+  <ul>
+  <li>If the folder is created, STATUS_SUCCESS (200)</li>
+  <li>If the parent for the folder is not found, STATUS_NOT_FOUND (404)</li>
+  <li>If the user lacks permission to create the folder, STATUS_FORBIDDEN (403)</li>
+  <li>If the request JSON is invalid in some way, STATUS_BAD_REQUEST (400)</li>
+  </ul>
+  ]]>
+  </description>
+  <url>/api/node/folder/{store_type}/{store_id}/{id}</url>
+  <url>/api/site/folder/{site}/{container}/{path}</url>
+  <url>/api/site/folder/{site}/{container}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <args>
+    <arg>
+      <shortname>store_type</shortname>
+      <description>Protocol for the store, e.g. workspace or versionstore.</description>
+    </arg>
+    <arg>
+      <shortname>store_id</shortname>
+      <description>The identifier, which may be specific to the protocol, e.g. spacesstore.</description>
+    </arg>
+    <arg>
+      <shortname>id</shortname>
+      <description>The identifier of the node.</description>
+    </arg>
+    <arg>
+      <shortname>site</shortname>
+      <description>The site ID.</description>
+    </arg>
+    <arg>
+      <shortname>container</shortname>
+      <description>The container folder for the site.</description>
+    </arg>
+    <arg>
+      <shortname>path</shortname>
+      <description>The path to the node in the site's container.</description>
+    </arg>
+  </args>
+  <requests>
+    <request>
+      <format>json</format>
+      <type>
+      <![CDATA[
+        {
+          "name": string
+        }
+        ]]>
+      </type>
+    </request>
+    <request>
+      <format>json</format>
+      <type>
+        <![CDATA[
+        {
+          "name": string,
+          "title": string,
+          "description": string,
+          "type": string
+        }
+        ]]>
+      </type>
+    </request>
+  </requests>
+  <responses>
+    <response>
+      <format>json</format>
+      <type>
+        <![CDATA[
+        {
+          "nodeRef": string
+        }
+        ]]>
+      </type>
+    </response>
+    <response>
+      <format>json</format>
+      <type>
+        <![CDATA[
+        {
+          "nodeRef": string,
+          "site": string,
+          "container": string
+        }
+        ]]>
+      </type>
+    </response>
+  </responses>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/node/folder.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/node/folder.post.json.ftl
new file mode 100644
index 00000000000..e07a675f7d5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/node/folder.post.json.ftl
@@ -0,0 +1,10 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+  {
+     "nodeRef": "${nodeRef.nodeRef}"
+     <#if site??>
+        ,
+        "site": "${site.shortName}",
+        "container": "${container}",
+     </#if>
+  }
+</#escape>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/nodelocator/node-locator.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/nodelocator/node-locator.get.desc.xml
new file mode 100644
index 00000000000..88ad5687047
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/nodelocator/node-locator.get.desc.xml
@@ -0,0 +1,12 @@
+<webscript>
+   <shortname>Node Locator</shortname>
+   <description>
+      Locates a Node in the repository using the specified Node Location strategy.
+   </description>
+   <url>/api/{store_type}/{store_id}/{node_id}/nodelocator/{node_locator_name}</url>
+   <url>/api/nodelocator/{node_locator_name}</url>
+   <format default="json"/>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/nodelocator/node-locator.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/nodelocator/node-locator.get.json.ftl
new file mode 100644
index 00000000000..696037bb783
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/nodelocator/node-locator.get.json.ftl
@@ -0,0 +1,11 @@
+{
+   "data":
+   {
+   <#if nodeRef?? >
+      "nodeRef": "${nodeRef}"
+   <#else >
+      "nodeRef": null
+   </#if>
+   }
+}
+
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/nodenameutils.lib.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/nodenameutils.lib.js
new file mode 100644
index 00000000000..8c775d5493b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/nodenameutils.lib.js
@@ -0,0 +1,49 @@
+/**
+ * Returns a two digit string if it is a one-digit number
+ */
+function getTwoDigitNum(num)
+{
+   if (num < 10)
+   {
+      return "0" + num;
+   }
+   return num;
+}
+
+/**
+ * Returns a unique name that can be used to create a
+ * child of the given parentNode.
+ *
+ * The name will be of form prefix_yyyy-mm-dd_hh-mm["","_x"],
+ * where x represents a number > 1 and is only added if a node
+ * with the base name already exists
+ * 
+ * The date parameter is for testing and needn't be used.
+ */
+function getUniqueChildName(parentNode, prefix, date)
+{
+   // we create a name looking like prefix-datetimestamp 
+   if (typeof date === 'undefined')
+   {
+     date = new Date();
+   }
+   name = prefix + "-" + date.getTime();
+
+   // check that no child for the given name exists
+   if (parentNode.childByNamePath(name) === null)
+   {
+      return name;
+   }
+   
+   // if there is already a prefix-datetimestamp node then start looking for a unique
+   // name by appending random numbers - try a maximum of 100 times.
+   var finalName = name + "_" + Math.floor(Math.random() * 1000);
+   var count = 0;
+   while (parentNode.childByNamePath(finalName) !== null && count < 100)
+   {
+      finalName = name + "_" + Math.floor(Math.random() * 1000);
+      ++count;
+   }
+   return finalName;
+}
+
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/changepassword.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/changepassword.post.desc.xml
new file mode 100644
index 00000000000..0b3b08d3cd6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/changepassword.post.desc.xml
@@ -0,0 +1,37 @@
+<webscript>
+   <shortname>Update user password</shortname>
+   <description><![CDATA[
+   Update the password of a current user. It can only be executed for the current user or by an administrator to update any user.
+
+   <br />
+   HTML form data
+   <ul>
+      <li>newpw, (mandatory) new password</li>
+      <li>oldpw, an Admin user can update without knowing the original pass</li>
+   </ul>
+   ]]>
+   </description>
+   <url>/api/person/changepassword/{userName}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <args>
+      <arg>
+         <shortname>userName</shortname>
+         <description>The user to update the password of.</description>
+      </arg>
+   </args>
+   <responses>
+      <response>
+         <format>json</format>
+         <type>
+         <![CDATA[
+         {
+            "success" : string
+         }
+         ]]>
+         </type>
+      </response>
+   </responses>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/changepassword.post.json.401.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/changepassword.post.json.401.ftl
new file mode 100644
index 00000000000..cfa0d487f6f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/changepassword.post.json.401.ftl
@@ -0,0 +1,4 @@
+{
+   "success" : false,
+   "message" : "${status.message}"
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/changepassword.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/changepassword.post.json.ftl
new file mode 100644
index 00000000000..b906c8adc4a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/changepassword.post.json.ftl
@@ -0,0 +1,3 @@
+{
+   "success" :    ${success?string("true", "false")}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.get.desc.xml
new file mode 100644
index 00000000000..b5de6d48ca2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.get.desc.xml
@@ -0,0 +1,12 @@
+<webscript>
+   <shortname>Get People</shortname>
+   <description>
+      Get a collection of people stored in the repository. This can optionally be
+      filtered according to a given filter query string
+   </description>
+   <url>/api/people?filter={filterQuery?}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.get.js
new file mode 100644
index 00000000000..0dda4e52f7b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.get.js
@@ -0,0 +1,27 @@
+function main()
+{
+
+// Get the args
+var filter = args["filter"];
+var maxResults = args["maxResults"];
+var skipCountStr = args["skipCount"];
+var skipCount = skipCountStr != null ? parseInt(skipCountStr) : -1;
+var sortBy = args["sortBy"];
+var sortAsc = args["dir"] != "desc";
+
+// Get the collection of people
+var paging = utils.createPaging(maxResults != null ? parseInt(maxResults) : 0, skipCount);
+var peopleCollection = people.getPeoplePaging(filter, paging, sortBy, sortAsc);
+
+var startIndex = args["startIndex"] != null ? parseInt(args["startIndex"]) : 0;
+var pageSize = args["pageSize"] != null ? parseInt(args["pageSize"]) : peopleCollection.length
+
+// Pass the queried sites to the template
+model.maxItems = pageSize;
+model.totalItems = peopleCollection.length;
+model.skipCount = skipCount > 0 ? (skipCount + startIndex) : startIndex;
+
+model.peoplelist = peopleCollection.slice(startIndex, startIndex + pageSize);
+
+}
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.get.json.ftl
new file mode 100644
index 00000000000..8b97f26d6b8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.get.json.ftl
@@ -0,0 +1,15 @@
+<#import "person.lib.ftl" as personLib/>
+{
+"people" : [
+	<#list peoplelist as person>
+		<@personLib.personJSON person=person/>
+		<#if person_has_next>,</#if>
+	</#list>
+],
+"paging": 
+ {
+      "maxItems": ${maxItems?c},
+      "totalItems": ${totalItems?c},
+      "skipCount":${skipCount?c}
+ }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.desc.xml
new file mode 100644
index 00000000000..521237ddbc7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.desc.xml
@@ -0,0 +1,27 @@
+<webscript>
+   <shortname>Add Person</shortname>
+   <description><![CDATA[
+   Adds a new person based on the details provided.
+   
+   <br />
+   <dl>
+   <dt>userName </dt><dd>mandatory - the user name for the new user</dd>
+   <dt>firstName</dt> <dd>mandatory - the given Name</dd>
+   <dt>lastName</dt> <dd>mandatory - the family name</dd>
+   <dt>email</dt> <dd>mandatory - the email address  </dd>
+   <dt>password</dt> <dd>optional - the new user's password.  If not specified then a value of "password" is used which should be changed as soon as possible.</dd>
+   <dt>disableAccount</dt> <dd>optional - If present and set to "true" the user is created but their account will be disabled.</dd>
+   <dt>quota</dt> <dd>optional - Sets the quota size for the new user, in bytes.</dd>
+   <dt>groups</dt> <dd>optional - Array of group names to assign the new user to.</dd>
+   <dt>title</dt> <dd>optional - the title for the new user.</dd>
+   <dt>organisation</dt> <dd>optional - the organisation the new user belongs to.</dd>
+   <dt>jobtitle</dt> <dd>optional - the job title of the new user.</dd>
+   </dl>
+   
+   ]]></description>
+   <url>/api/people</url>
+   <format default="json">argument</format>
+   <authentication>admin</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.ftl
new file mode 100644
index 00000000000..f717672ded4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.ftl
@@ -0,0 +1,2 @@
+<#import "person.lib.ftl" as personLib/>
+<@personLib.personJSON person=person/>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.js
new file mode 100644
index 00000000000..9a2ff551741
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.js
@@ -0,0 +1,81 @@
+function main()
+{
+   //
+   // Get the person details
+   //
+   
+   if ((json.isNull("userName")) || (json.get("userName").length() == 0)) 
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "User name missing when creating person");
+      return;
+   }
+   
+   if ((json.isNull("firstName")) || (json.get("firstName").length() == 0))
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "First name missing when creating person");
+      return;
+   }
+   
+   if ((json.isNull("email")) || (json.get("email").length() == 0))
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "Email missing when creating person");
+      return;
+   }
+   
+   var password = "password";
+   if (json.has("password"))
+   {
+      password = json.get("password");
+   }
+   
+   // Create the person with the supplied user name
+   var userName = json.get("userName");
+   var enableAccount = ((json.has("disableAccount") && json.get("disableAccount")) == false);
+   var person = people.createPerson(userName, json.get("firstName"), json.get("lastName"), json.get("email"), password, enableAccount);
+   
+   // return error message if a person with that user name could not be created
+   if (person === null)
+   {
+      status.setCode(status.STATUS_CONFLICT, "User name already exists: " + userName);
+      return;
+   }
+   
+   // assign values to the person's properties
+   if (json.has("title"))
+   {
+      person.properties["title"] = json.get("title");
+   }
+   if (json.has("organisation"))
+   {
+      person.properties["organization"] = json.get("organisation");
+   }
+   if (json.has("jobtitle"))
+   {
+      person.properties["jobtitle"] = json.get("jobtitle");
+   }
+   person.save();
+   
+   // set quota if any - note that only Admin can set this and will be ignored otherwise
+   var quota = (json.has("quota") ? json.get("quota") : -1);
+   people.setQuota(person, quota.toString());
+   
+   // apply groups if supplied - note that only Admin can successfully do this
+   if (json.has("groups"))
+   {
+      var groups = json.get("groups");
+      for (var index=0; index<groups.length(); index++)
+      {
+         var groupId = groups.getString(index);
+         var group = people.getGroup(groupId);
+         if (group != null)
+         {
+            people.addAuthority(group, person);
+         }
+      }
+   }
+   
+   // Put the created person into the model
+   model.person = person;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.delete.desc.xml
new file mode 100644
index 00000000000..26bf56aa530
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.delete.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Delete Person</shortname>
+   <description>Delete a person.</description>
+   <url>/api/people/{userName}</url>
+   <format default="json">argument</format>
+   <authentication>admin</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.delete.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.delete.js
new file mode 100644
index 00000000000..45bb6e5d2b0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.delete.js
@@ -0,0 +1,26 @@
+function main()
+{
+   // Extract the person's user name from the URL
+   var userName = url.extension;
+   
+   // Get the person we wish to delete
+   var person = people.getPerson(userName);
+
+   // if person is found matching the given user name
+   // then delete that person
+   if (person != null)
+   {
+      // delete the person
+      people.deletePerson(userName);
+   }
+   // else if no person was found matching the given user name,
+   // then return HTTP error status "not found"
+   else
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "Person " + userName
+            + " does not exist and thus can't be deleted");
+      return;
+   }
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.delete.json.ftl
new file mode 100644
index 00000000000..9e26dfeeb6e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.delete.json.ftl
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.get.desc.xml
new file mode 100644
index 00000000000..3ed05e4813f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Get Person</shortname>
+   <description>Get the details of a person.</description>
+   <url>/api/people/{userName}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.get.js
new file mode 100644
index 00000000000..856d16ce6a3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.get.js
@@ -0,0 +1,24 @@
+function main()
+{
+   // Get the user name of the person to get
+   var userName = url.extension;
+   
+   // Do we want to return containing groups?
+   var groups = (args["groups"] == "true");
+   
+   // Get the person who has that user name
+   var person = people.getPerson(userName);
+   if (person != null) 
+   {
+      model.person = person;
+      model.capabilities = people.getCapabilities(person);
+      model.groups = groups ? people.getContainerGroups(person) : null;
+      model.immutability = groups ? people.getImmutableProperties(userName) : null;
+   }
+   else 
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "Person " + userName + " does not exist");
+   }
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.get.json.ftl
new file mode 100644
index 00000000000..471c6556443
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.get.json.ftl
@@ -0,0 +1,6 @@
+<#import "person.lib.ftl" as personLib/>
+<#if groups??>
+	<@personLib.personGroupsJSON person=person groups=groups capabilities=capabilities immutability=immutability />
+<#else>
+	<@personLib.personCapJSON person=person capabilities=capabilities />
+</#if>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl
new file mode 100644
index 00000000000..60ef32ff981
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl
@@ -0,0 +1,110 @@
+<#macro personJSONinner person>
+<#local p=person.properties>
+<#escape x as jsonUtils.encodeJSONString(x)>
+	"url": "${url.serviceContext + "/api/people/" + p.userName}",
+	"userName": "${p.userName}",
+	"enabled": ${people.isAccountEnabled(person)?string("true","false")},
+	<#if person.assocs["cm:avatar"]??>
+	"avatar": "${"api/node/" + person.assocs["cm:avatar"][0].nodeRef?string?replace('://','/') + "/content/thumbnails/avatar"}",
+	</#if>
+	"firstName": <#if p.firstName??>"${p.firstName}"<#else>null</#if>,
+	"lastName": <#if p.lastName??>"${p.lastName}"<#else>null</#if>,
+	"jobtitle": <#if p.jobtitle??>"${p.jobtitle}"<#else>null</#if>,
+	"organization": <#if p.organization??>"${p.organization}"<#else>null</#if>,
+	"organizationId": <#if p.organizationId??>"${p.organizationId}"<#else>null</#if>, 
+	"location": <#if p.location??>"${p.location}"<#else>null</#if>,
+	"telephone": <#if p.telephone??>"${p.telephone}"<#else>null</#if>,
+	"mobile": <#if p.mobile??>"${p.mobile}"<#else>null</#if>,
+	"email": <#if p.email??>"${p.email}"<#else>null</#if>,
+	"companyaddress1": <#if p.companyaddress1??>"${p.companyaddress1}"<#else>null</#if>,
+	"companyaddress2": <#if p.companyaddress2??>"${p.companyaddress2}"<#else>null</#if>,
+	"companyaddress3": <#if p.companyaddress3??>"${p.companyaddress3}"<#else>null</#if>,
+	"companypostcode": <#if p.companypostcode??>"${p.companypostcode}"<#else>null</#if>,
+	"companytelephone": <#if p.companytelephone??>"${p.companytelephone}"<#else>null</#if>,
+	"companyfax": <#if p.companyfax??>"${p.companyfax}"<#else>null</#if>,
+	"companyemail": <#if p.companyemail??>"${p.companyemail}"<#else>null</#if>,
+	"skype": <#if p.skype??>"${p.skype}"<#else>null</#if>,
+	"instantmsg": <#if p.instantmsg??>"${p.instantmsg}"<#else>null</#if>,
+	"userStatus": <#if p.userStatus??>"${p.userStatus}"<#else>null</#if>,
+	"userStatusTime": <#if p.userStatusTime??>{ "iso8601": "${xmldate(p.userStatusTime)}"}<#else>null</#if>,
+	"googleusername": <#if p.googleusername??>"${p.googleusername}"<#else>null</#if>,
+	"quota": <#if p.sizeQuota??>${p.sizeQuota?c}<#else>-1</#if>,
+	"sizeCurrent": <#if p.sizeCurrent??>${p.sizeCurrent?c}<#else>0</#if>,
+	"emailFeedDisabled": <#if p.emailFeedDisabled??>${p.emailFeedDisabled?string("true","false")}<#else>false</#if>,
+	"persondescription": <#if p.persondescription??>"${stringUtils.stripUnsafeHTML(p.persondescription.content)}"<#else>null</#if>,
+	"authorizationStatus": <#if p.authorizationStatus??>"${p.authorizationStatus}"<#else>null</#if>,
+	"isDeleted": <#if p.isDeleted??>"${p.isDeleted?string("true","false")}"<#else>false</#if>,
+	"isAdminAuthority": ${people.isAdmin(person)?string("true","false")}
+</#escape>
+</#macro>
+
+<#macro personJSON person>
+{
+<@personJSONinner person=person/>
+}
+</#macro>
+
+<#macro personCapJSON person capabilities>
+{
+<@personJSONinner person=person/>,
+	"capabilities":
+	{
+		<@serializeHash hash=capabilities/>
+	}
+}
+</#macro>
+
+<#macro personGroupsJSON person groups capabilities immutability>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+<@personJSONinner person=person/>,
+	"capabilities":
+	{
+		<@serializeHash hash=capabilities/>
+	},
+	"groups": [
+	<#list groups as g>
+		<#assign authName = g.properties["cm:authorityName"]>
+		<#if authName?starts_with("GROUP_site")><#assign displayName = authName?substring(6)><#else><#assign displayName = g.properties["cm:authorityDisplayName"]!authName?substring(6)></#if>
+	{
+		"itemName": "${authName}",
+		"displayName": "${displayName}"
+	}<#if g_has_next>,</#if></#list>],
+	"immutability":
+	{
+	   <@serializeHash hash=immutability/>
+	}
+}
+</#escape>
+</#macro>
+
+<#macro personSummaryJSON person>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+	"url": "${url.serviceContext + "/api/people/" + person.properties.userName}",
+	"userName": "${person.properties.userName}",
+	"firstName": "${person.properties.firstName!""}",
+	"lastName": "${person.properties.lastName!""}",
+	"jobtitle": "${person.properties.jobtitle!""}",
+	"location": "${person.properties.location!""}"
+}
+</#escape>
+</#macro>
+
+<#macro serializeHash hash>
+<#escape x as jsonUtils.encodeJSONString(x)>
+<#local first = true>
+<#list hash?keys as key>
+	<#if hash[key]??>
+		<#local val = hash[key]>
+		<#if !first>,<#else><#local first = false></#if>"${key}":
+		<#if person.isTemplateContent(val)>"${val.content}"
+		<#elseif person.isTemplateNodeRef(val)>"${val.nodeRef}"
+		<#elseif val?is_date>"${val?datetime}"
+		<#elseif val?is_boolean>${val?string}
+		<#else>"${val}"
+		</#if>
+	</#if>
+</#list>
+</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.put.desc.xml
new file mode 100644
index 00000000000..8667fc521b1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.put.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Update Person</shortname>
+   <description>Update the details of a person.</description>
+   <url>/api/people/{userName}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.put.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.put.js
new file mode 100644
index 00000000000..4de857da720
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.put.js
@@ -0,0 +1 @@
+throw "Content type is incorrect";
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.put.json.ftl
new file mode 100644
index 00000000000..f717672ded4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.put.json.ftl
@@ -0,0 +1,2 @@
+<#import "person.lib.ftl" as personLib/>
+<@personLib.personJSON person=person/>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.put.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.put.json.js
new file mode 100644
index 00000000000..562a108061f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.put.json.js
@@ -0,0 +1,93 @@
+function main()
+{
+   // Get the person details and ensure they exist for update
+   var userName = url.extension;
+   var person = people.getPerson(userName);
+   if (person == null)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "Person " + userName + " does not exist");
+      return;
+   }
+
+   // MNT-21150 LDAP synced attributes can be changed using REST API
+   var qname = "{http://www.alfresco.org/model/content/1.0}";
+   var immutableProperties = people.getImmutableProperties(userName);
+
+   var personProperties = ["firstName", "lastName", "email", "title", "jobtitle", "location", "telephone",
+       "mobile", "companyaddress1", "companyaddress2", "companyaddress3", "companypostcode", "companytelephone", "companyfax",
+       "companyemail", "skype", "instantmsg", "persondescription"]
+
+   // assign new values to the person's properties
+   for (var index=0; index<personProperties.length; index++)
+   {
+     if ((!json.isNull(personProperties[index])) && (!immutableProperties.hasOwnProperty((qname + personProperties[index]).toString())))
+     {
+       person.properties[personProperties[index]] = json.get(personProperties[index]);
+     }
+   }
+   // Special case for organisation vs organization
+   // Expected organisation in Json but property saved in person model as organization
+   if ((!json.isNull("organisation")) && (!immutableProperties.hasOwnProperty((qname + "organization").toString())))
+   {
+     person.properties["organization"] = json.get("organisation");
+   }
+
+   // Update the person node with the modified details
+   person.save();
+   
+   // Enable or disable account? - note that only Admin can set this
+   if (json.has("disableAccount"))
+   {
+      var disableAccount = (json.get("disableAccount") == true);
+      if (disableAccount && people.isAccountEnabled(userName))
+      {
+         people.disableAccount(userName);
+      }
+      else if (!disableAccount && !people.isAccountEnabled(userName))
+      {
+         people.enableAccount(userName);
+      }
+   }
+   
+   // set quota if supplied - note that only Admin can set this and will be ignored otherwise
+   if (json.has("quota"))
+   {
+      var quota = json.get("quota");
+      people.setQuota(person, quota.toString());
+   }
+   
+   // remove from groups if supplied - note that only Admin can do this
+   if (json.has("removeGroups"))
+   {
+      var groups = json.get("removeGroups");
+      for (var index=0; index<groups.length(); index++)
+      {
+         var groupId = groups.getString(index);
+         var group = people.getGroup(groupId);
+         if (group != null)
+         {
+            people.removeAuthority(group, person);
+         }
+      }
+   }
+   
+   // app to groups if supplied - note that only Admin can do this
+   if (json.has("addGroups"))
+   {
+      var groups = json.get("addGroups");
+      for (var index=0; index<groups.length(); index++)
+      {
+         var groupId = groups.getString(index);
+         var group = people.getGroup(groupId);
+         if (group != null)
+         {
+            people.addAuthority(group, person);
+         }
+      }
+   }
+   
+   // Put the created person into the model
+   model.person = person;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.sites.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.sites.get.desc.xml
new file mode 100644
index 00000000000..4afc985c8a1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.sites.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Get sites</shortname>
+  <description>Get a collection of the sites of which a a person is an explicit member.</description>
+  <url>/api/people/{userid}/sites?size={pagesize?}&amp;pos={position?}&amp;roles={roles?}</url>
+  <url>/api/people/{userid}/sites/{filter}?size={pagesize?}&amp;pos={position?}&amp;roles={roles?}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.sites.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.sites.get.js
new file mode 100644
index 00000000000..0bc652c46de
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.sites.get.js
@@ -0,0 +1,119 @@
+function main()
+{
+   // Get the user name of the person to get
+   var userName = url.templateArgs.userid;
+    
+   // Get the person who has that user name
+   var person = people.getPerson(userName);
+    
+   if (person === null)
+   {
+      // Return 404 - Not Found
+      status.setCode(status.STATUS_NOT_FOUND, "Person " + userName + " does not exist");
+      return;
+   }
+
+   // Get the filter param
+   var filter = url.templateArgs.filter
+
+   if (filter)
+   {
+      if (filter !== "recent" && filter !== "favourites")
+      {
+         // Return 404 - Not Found
+         status.setCode(status.STATUS_NOT_FOUND, "Filter " + filter + " is not recognised");
+         return;
+      }
+   }
+
+   // Get the list of sites
+   var size = 0,
+      sizeString = args["size"];
+   if (sizeString != null)
+   {
+      size = parseInt(sizeString);
+   }
+
+   if (filter)
+   {
+      var sites = siteService.listUserSites(userName);
+      var filterObj = {},
+         filteredSites = [];
+
+      if (filter == "recent")
+      {
+         var recentSites = preferenceService.getPreferences(userName, "org.alfresco.share.sites.recent");
+         if (recentSites['org'] != null)
+         {
+            filterObj = recentSites.org.alfresco.share.sites.recent;
+         }
+      }
+      else if (filter == "favourites")
+      {
+         var favouriteSites = preferenceService.getPreferences(userName, "org.alfresco.share.sites.favourites");
+         if(favouriteSites['org'] != null)
+         {
+            filterObj = favouriteSites.org.alfresco.share.sites.favourites;
+         }
+      }
+
+      var i = 0;
+      while (i < sites.length)
+      {
+         var filterObjIndex = 0;
+         for (var key in filterObj)
+         {
+            if (filterObj[key] == sites[i].shortName || key == sites[i].shortName)
+            {
+               if (filter != "favourites" )
+               {
+                  // ACE-379 fix. Fill filteredSites array according to the position of elements in the array 'filterObj'
+                  filteredSites[filterObjIndex] = sites[i];
+
+                  // If the caller of this webscript has requested a specific result size (non-zero) then do not return
+                  // more than they asked for
+                  if (size > 0 && filteredSites.length == size)
+                  {
+                     break;
+                  }
+               }
+               // if filter equals to "favourites" and site is favourite.
+               else
+               {
+                  if (filterObj[key] == true)
+                  {
+                      filteredSites.push(sites[i]);
+                  }
+
+                  // If the caller of this webscript has requested a specific result size (non-zero) then do not return
+                  // more than they asked for
+                  if (size > 0 && filteredSites.length == size)
+                  {
+                      break;
+                  }
+               }
+            }
+            filterObjIndex++;
+         }
+         i++;
+      }
+
+      model.sites = filteredSites;
+   }
+   else
+   {
+      var sites = siteService.listUserSites(userName, size);
+
+      // Sort sites alphabetically by title, ignoring case.
+      sites.sort(function(a,b)
+      {
+         if(a.title.toLowerCase() < b.title.toLowerCase()) return -1;
+         if(a.title.toLowerCase() > b.title.toLowerCase()) return 1;
+      })
+      model.sites = sites;
+   }
+
+   model.roles = (args["roles"] !== null ? args["roles"] : "managers");
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.sites.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.sites.get.json.ftl
new file mode 100644
index 00000000000..2c6eea63aae
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/person.sites.get.json.ftl
@@ -0,0 +1,8 @@
+<#import "../site/site.lib.ftl" as siteLib/>
+
+[
+	<#list sites as site>
+		<@siteLib.siteJSONManagers site=site roles=roles/>
+		<#if site_has_next>,</#if>
+	</#list>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.csv.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.csv.ftl
new file mode 100644
index 00000000000..d398085824b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.csv.ftl
@@ -0,0 +1 @@
+<#-- Could be done with just '${csv}' but we do this so we can get the download box to show up properly -->${writeExcel.write()}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.desc.xml
new file mode 100644
index 00000000000..f416241ef4a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.desc.xml
@@ -0,0 +1,12 @@
+<webscript>
+   <shortname>Information on Creating Users by using CSV</shortname>
+   <description>
+      Gives information on creating users by using CSV upload, and provides
+      the form through which to upload.
+   </description>
+   <url>/api/people/upload</url>
+   <format default="html">argument</format>
+   <authentication>admin</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.html.ftl
new file mode 100644
index 00000000000..bf26be79d36
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.html.ftl
@@ -0,0 +1,21 @@
+<html>
+<head>
+ <title>User CSV Uploader</title>
+</head>
+<body>
+ <h1>User CSV Uploader</h1>
+ <form method="post" enctype="multipart/form-data" action="upload">
+  <p>Please upload a CSV containing the details of your users to be created.</p>
+  <p><input type="file" name="csv" /></p>
+  <p><input type="submit" value="Upload" /></p>
+ </form>
+ 
+ <hr />
+
+ <ul>
+  <li><a href="?format=csv">Download template CSV</a></li>
+  <li><a href="?format=xls">Download template XLS (Excel)</a></li>
+  <li><a href="?format=xlsx">Download template XLSX (Excel 2007/2010)</a></li>
+ </ul>
+</body>
+</html>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.xls.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.xls.ftl
new file mode 100644
index 00000000000..87cc72dbdb1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.xls.ftl
@@ -0,0 +1 @@
+<#-- Must not have a newline or any other contents! -->${writeExcel.write()}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.xlsx.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.xlsx.ftl
new file mode 100644
index 00000000000..87cc72dbdb1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.get.xlsx.ftl
@@ -0,0 +1 @@
+<#-- Must not have a newline or any other contents! -->${writeExcel.write()}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.desc.xml
new file mode 100644
index 00000000000..a9b59278074
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.desc.xml
@@ -0,0 +1,18 @@
+<webscript>
+   <shortname>Create Users by using uploading of a CSV</shortname>
+   <description>
+      Allows an administrator to upload a CSV describing new users,
+      who will then have accounts created for them.
+
+      Note - if the CSV is uploaded OK, but there was a problem with
+      the contents or creating the users, you will receive a 200 status
+      code along with details of the problem.
+   </description>
+   <url>/api/people/upload</url>
+   <format default="json"></format>
+   <authentication>admin</authentication>
+   <lifecycle>internal</lifecycle>
+   <!-- Transactions are handled inside the webscript itself -->
+   <transaction>none</transaction>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.html.ftl
new file mode 100644
index 00000000000..bdb8334a6c5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.html.ftl
@@ -0,0 +1,28 @@
+<html>
+<head>
+   <title>Upload success</title>
+</head>
+<body>
+<#if (args.success!"")?matches("^[\\w\\d\\._]+$")>
+   <script type="text/javascript">
+      ${args.success}({
+          data: 
+          {
+              "totalUsers": ${totalUsers?c},
+              "addedUsers": ${addedUsers?c},
+              "users": 
+              [
+                   <#list users?keys as username>
+                       {
+                           "username": "${username}",
+                           "uploadStatus": "${users[username]}"
+                       }
+                       <#if username_has_next>,</#if>
+                   </#list>
+              ]
+          }
+      });
+   </script>
+</#if>
+</body>
+</html>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.html.status.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.html.status.ftl
new file mode 100644
index 00000000000..4bb6d3e27ea
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.html.status.ftl
@@ -0,0 +1,34 @@
+<html>
+<head>
+   <title></title>
+</head>
+<body>
+<#if status.code == 200>
+   <#if (args.success!"")?matches("^[\\w\\d\\._]+$")>
+       <script type="text/javascript">
+          ${args.success}({
+             status: {
+                "code" : ${status.code},
+                "name" : "${status.codeName}",
+                "description" : "${status.codeDescription}"
+             },
+             message: "${jsonUtils.encodeJSONString(status.message)}"
+          });
+       </script>
+    </#if>
+<#else>
+   <#if (args.failure!"")?matches("^[\\w\\d\\._]+$")>
+       <script type="text/javascript">
+          ${args.failure}({
+             status: {
+                "code" : ${status.code},
+                "name" : "${status.codeName}",
+                "description" : "${status.codeDescription}"
+             },
+             message: "${jsonUtils.encodeJSONString(status.message)}"
+          });
+       </script>
+    </#if>
+</#if>
+</body>
+</html>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.json.ftl
new file mode 100644
index 00000000000..b7cfa4a9913
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.json.ftl
@@ -0,0 +1,19 @@
+{
+  "data": 
+  {
+<#escape x as jsonUtils.encodeJSONString(x)>
+    "totalUsers": ${totalUsers?c},
+    "addedUsers": ${addedUsers?c},
+    "users": 
+    [
+      <#list users?keys as username>
+         {
+             "username": "${username}",
+             "uploadStatus": "${users[username]}"
+         }
+         <#if username_has_next>,</#if>
+      </#list>
+    ]
+</#escape>
+  }
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.properties
new file mode 100644
index 00000000000..eaf0749b2e1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=The form wasn't uploaded as multipart
+person.err.userCSV.noFile=No file was uploaded
+person.err.userCSV.corruptFile=The file was corrupted or truncated
+
+person.err.userCSV.general=There was a problem with creating the users
+person.err.userCSV.generalArgs=There was a problem with creating the users: {0}
+person.err.userCSV.blankColumn=Column {0} (column number {1}) must not be blank, but was on line {2}
+
+person.msg.userCSV.created=Created for {0}
+person.msg.userCSV.existing=Already exists
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_cs.properties
new file mode 100644
index 00000000000..7aa70f6ea86
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_cs.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=Formul\u00e1\u0159 nebyl odesl\u00e1n jako v\u00edced\u00edln\u00fd
+person.err.userCSV.noFile=\u017d\u00e1dn\u00fd soubor nebyl odesl\u00e1n
+person.err.userCSV.corruptFile=Soubor byl po\u0161kozen nebo je zkr\u00e1cen\u00fd
+
+person.err.userCSV.general=P\u0159i pokusu o\u00a0vytvo\u0159en\u00ed u\u017eivatel\u016f do\u0161lo k\u00a0pot\u00ed\u017e\u00edm
+person.err.userCSV.generalArgs=P\u0159i pokusu o\u00a0vytvo\u0159en\u00ed u\u017eivatel\u016f do\u0161lo k\u00a0pot\u00ed\u017e\u00edm: {0}
+person.err.userCSV.blankColumn=Sloupec {0} (\u010d\u00edslo sloupce: {1}) nesm\u00ed z\u016fstat pr\u00e1zdn\u00fd, nach\u00e1zel se na \u0159\u00e1dku {2}
+
+person.msg.userCSV.created=Vytvo\u0159eno pro: {0}
+person.msg.userCSV.existing=Ji\u017e existuje
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_da.properties
new file mode 100644
index 00000000000..9187d5737be
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_da.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=Formularen blev ikke uploadet i flere dele
+person.err.userCSV.noFile=Der blev ikke uploadet nogen fil
+person.err.userCSV.corruptFile=Filen var fejlbeh\u00e6ftet eller afkortet
+
+person.err.userCSV.general=Der opstod et problem under oprettelse af brugerne
+person.err.userCSV.generalArgs=Der opstod et problem under oprettelsen af brugerne: {0}
+person.err.userCSV.blankColumn=Kolonnen {0} (kolonnenummer {1}) m\u00e5 ikke v\u00e6re tom, men det var den p\u00e5 r\u00e6kke {2}
+
+person.msg.userCSV.created=Oprettet for {0}
+person.msg.userCSV.existing=Findes allerede
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_de.properties
new file mode 100644
index 00000000000..cb7f0a29ea4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_de.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=Das Formular wurde nicht als Multipart hochgeladen
+person.err.userCSV.noFile=Es wurde keine Datei hochgeladen
+person.err.userCSV.corruptFile=Die Datei war besch\u00e4digt oder unvollst\u00e4ndig
+
+person.err.userCSV.general=Es gab ein Problem beim Erstellen der Benutzer
+person.err.userCSV.generalArgs=Es gab ein Problem beim Erstellen der Benutzer: {0}
+person.err.userCSV.blankColumn=Spalte {0} (Spalte Nummer\u00a0{1}) darf nicht leer sein, aber war es in Zeile {2}
+
+person.msg.userCSV.created=Erstellt f\u00fcr {0}
+person.msg.userCSV.existing=Bereits vorhanden
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_es.properties
new file mode 100644
index 00000000000..aaa7874d00e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_es.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=El formulario no se ha cargado como varias partes
+person.err.userCSV.noFile=No se ha cargado ning\u00fan fichero
+person.err.userCSV.corruptFile=El fichero estaba da\u00f1ado o truncado
+
+person.err.userCSV.general=Se ha producido un problema al crear los usuarios
+person.err.userCSV.generalArgs=Se ha producido un problema al crear los usuarios: {0}
+person.err.userCSV.blankColumn=La columna {0} (n\u00famero de columna {1}) no debe estar en blanco, pero lo estaba en la l\u00ednea {2}
+
+person.msg.userCSV.created=Creado por {0}
+person.msg.userCSV.existing=Ya existe
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_fi.properties
new file mode 100644
index 00000000000..dd1d8e29bdf
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_fi.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=Lomaketta ei ladattu moniosaisena
+person.err.userCSV.noFile=Tiedostoa ei ladattu
+person.err.userCSV.corruptFile=Tiedosto oli vioittunut tai katkaistu
+
+person.err.userCSV.general=K\u00e4ytt\u00e4jien luomisessa ilmeni ongelma
+person.err.userCSV.generalArgs=K\u00e4ytt\u00e4jien luomisessa ilmeni ongelma: {0}
+person.err.userCSV.blankColumn=Sarake {0} (sarakenumero {1}) ei saa olla tyhj\u00e4, mutta se oli rivill\u00e4 {2}
+
+person.msg.userCSV.created=Luotu k\u00e4ytt\u00e4j\u00e4lle {0}
+person.msg.userCSV.existing=On jo olemassa
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_fr.properties
new file mode 100644
index 00000000000..6956941b1b2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_fr.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=Le formulaire n'a pas \u00e9t\u00e9 t\u00e9l\u00e9charg\u00e9 en tant que multipart
+person.err.userCSV.noFile=Aucun fichier n'a \u00e9t\u00e9 t\u00e9l\u00e9charg\u00e9
+person.err.userCSV.corruptFile=Le fichier \u00e9tait corrompu ou tronqu\u00e9
+
+person.err.userCSV.general=Un probl\u00e8me est survenu lors de la cr\u00e9ation des utilisateurs
+person.err.userCSV.generalArgs=Un probl\u00e8me est survenu lors de la cr\u00e9ation des utilisateurs : {0}
+person.err.userCSV.blankColumn=La colonne {0} (num\u00e9ro de colonne : {1}) ne doit pas \u00eatre vide, or elle est vide \u00e0 la ligne {2}
+
+person.msg.userCSV.created=Cr\u00e9\u00e9 pour {0}
+person.msg.userCSV.existing=Existe d\u00e9j\u00e0
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_it.properties
new file mode 100644
index 00000000000..244c285a614
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_it.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=Il modulo non \u00e8 stato caricato come multiparte
+person.err.userCSV.noFile=Nessun file caricato
+person.err.userCSV.corruptFile=Il file \u00e8 stato danneggiato o troncato
+
+person.err.userCSV.general=Si \u00e8 verificato un problema durante la creazione degli utenti
+person.err.userCSV.generalArgs=Si \u00e8 verificato un problema durante la creazione degli utenti: {0}
+person.err.userCSV.blankColumn=La colonna {0} (numero colonna {1}) non deve essere vuota, ma era alla riga {2}
+
+person.msg.userCSV.created=Creato per {0}
+person.msg.userCSV.existing=Esiste gi\u00e0
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_ja.properties
new file mode 100644
index 00000000000..965a0962dcc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_ja.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=\u3053\u306e\u5f62\u5f0f\u306fmultipart\u3068\u3057\u3066\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f
+person.err.userCSV.noFile=\u30d5\u30a1\u30a4\u30eb\u306f\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f
+person.err.userCSV.corruptFile=\u30d5\u30a1\u30a4\u30eb\u304c\u58ca\u308c\u3066\u3044\u308b\u304b\u3001\u5207\u308a\u6368\u3066\u3089\u308c\u307e\u3057\u305f
+
+person.err.userCSV.general=\u30e6\u30fc\u30b6\u30fc\u306e\u4f5c\u6210\u4e2d\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+person.err.userCSV.generalArgs=\u30e6\u30fc\u30b6\u30fc\u306e\u4f5c\u6210\u4e2d\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f: {0}
+person.err.userCSV.blankColumn=\u5217 {0} (\u5217\u756a\u53f7{1})\u3092\u7a7a\u767d\u306b\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u304c\u3001\u884c{2}\u306b\u3042\u308a\u307e\u3059
+
+person.msg.userCSV.created={0}\u7528\u306b\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f
+person.msg.userCSV.existing=\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_nb.properties
new file mode 100755
index 00000000000..f04e0bd510d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_nb.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=Skjemaet ble ikke lastet opp som flerdelt
+person.err.userCSV.noFile=Ingen fil ble lastet opp
+person.err.userCSV.corruptFile=Filen var skadet eller avkortet
+
+person.err.userCSV.general=Det oppstod et problem med oppretting av brukerne
+person.err.userCSV.generalArgs=Det oppstod et problem med oppretting av brukerne: {0}
+person.err.userCSV.blankColumn=Kolonne {0} (kolonne nummer {1}) kan ikke v\u00e6re tom, men var det i linje {2}
+
+person.msg.userCSV.created=Opprettet for {0}
+person.msg.userCSV.existing=Finnes allerede
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_nl.properties
new file mode 100755
index 00000000000..b1d3d756997
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_nl.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=Het formulier is niet ge\u00fcpload met meerdere onderdelen
+person.err.userCSV.noFile=Er is geen bestand ge\u00fcpload
+person.err.userCSV.corruptFile=Het bestand is beschadigd of afgekapt
+
+person.err.userCSV.general=Er is een probleem met het maken van de gebruikers
+person.err.userCSV.generalArgs=Er is een probleem met het maken van de gebruikers: {0}
+person.err.userCSV.blankColumn=Kolom {0} (kolomnummer {1}) mag niet leeg zijn, maar bevindt zich op regel {2}
+
+person.msg.userCSV.created=Gemaakt voor {0}
+person.msg.userCSV.existing=Bestaat al
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_pl.properties
new file mode 100644
index 00000000000..19323b89375
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_pl.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=Formularz nie zosta\u0142 przes\u0142any jako wielocz\u0119\u015bciowy
+person.err.userCSV.noFile=Plik nie zosta\u0142 przes\u0142any
+person.err.userCSV.corruptFile=Plik zosta\u0142 uszkodzony lub obci\u0119ty
+
+person.err.userCSV.general=Wyst\u0105pi\u0142 problem z tworzeniem u\u017cytkownik\u00f3w
+person.err.userCSV.generalArgs=Wyst\u0105pi\u0142 problem z tworzeniem u\u017cytkownik\u00f3w: {0}
+person.err.userCSV.blankColumn=Kolumna {0} (kolumna numer {1}) nie mo\u017ce by\u0107 pusta, a by\u0142a w wierszu {2}
+
+person.msg.userCSV.created=Utworzony przez {0}
+person.msg.userCSV.existing=Ju\u017c istnieje
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_pt_BR.properties
new file mode 100644
index 00000000000..95551391430
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_pt_BR.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=O formul\u00e1rio n\u00e3o foi carregado como multipartes
+person.err.userCSV.noFile=Nenhum arquivo foi carregado
+person.err.userCSV.corruptFile=O arquivo foi corrompido ou truncado
+
+person.err.userCSV.general=Houve um problema com a cria\u00e7\u00e3o de usu\u00e1rios
+person.err.userCSV.generalArgs=Houve um problema com a cria\u00e7\u00e3o de usu\u00e1rios: {0}
+person.err.userCSV.blankColumn=Coluna {0} (coluna n\u00famero {1}) n\u00e3o pode estar em branco, mas estava na linha {2}
+
+person.msg.userCSV.created=Criado por {0}
+person.msg.userCSV.existing=J\u00e1 existe
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_ru.properties
new file mode 100755
index 00000000000..23495e29562
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_ru.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=\u0414\u0430\u043d\u043d\u0430\u044f \u0444\u043e\u0440\u043c\u0430 \u043d\u0435 \u0431\u044b\u043b\u0430 \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u0430 \u043a\u0430\u043a \u0441\u043e\u0441\u0442\u0430\u0432\u043d\u0430\u044f
+person.err.userCSV.noFile=\u0424\u0430\u0439\u043b\u044b \u043d\u0435 \u0431\u044b\u043b\u0438 \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u044b
+person.err.userCSV.corruptFile=\u0414\u0430\u043d\u043d\u044b\u0439 \u0444\u0430\u0439\u043b \u0431\u044b\u043b \u043f\u043e\u0432\u0440\u0435\u0436\u0434\u0435\u043d \u0438\u043b\u0438 \u0443\u0441\u0435\u0447\u0435\u043d
+
+person.err.userCSV.general=\u041f\u0440\u0438 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0432\u043e\u0437\u043d\u0438\u043a\u043b\u0430 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u0430
+person.err.userCSV.generalArgs=\u041f\u0440\u0438 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0432\u043e\u0437\u043d\u0438\u043a\u043b\u0430 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u0430: {0}
+person.err.userCSV.blankColumn=\u0421\u0442\u043e\u043b\u0431\u0435\u0446 {0} (\u043d\u043e\u043c\u0435\u0440 \u0441\u0442\u043e\u043b\u0431\u0446\u0430 {1}) \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c, \u043d\u043e \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0442\u0430\u043a\u043e\u0432\u044b\u043c \u0432 \u0441\u0442\u0440\u043e\u043a\u0435 {2}
+
+person.msg.userCSV.created=\u0421\u043e\u0437\u0434\u0430\u043d \u0434\u043b\u044f {0}
+person.msg.userCSV.existing=\u0423\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_sv.properties
new file mode 100644
index 00000000000..3c586f8ff16
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_sv.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=Formul\u00e4ret laddades inte upp som multipart
+person.err.userCSV.noFile=Ingen fil laddades upp
+person.err.userCSV.corruptFile=Filen var f\u00f6rst\u00f6rd eller trunkerad
+
+person.err.userCSV.general=Det uppstod ett problem med att skapa anv\u00e4ndarna
+person.err.userCSV.generalArgs=Det uppstod ett problem med att skapa anv\u00e4ndarna: {0}
+person.err.userCSV.blankColumn=Kolumn {0} (kolumnnummer {1}) f\u00e5r inte vara tom, men var det p\u00e5 rad {2}
+
+person.msg.userCSV.created=Skapad f\u00f6r {0}
+person.msg.userCSV.existing=Finns redan
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_zh_CN.properties
new file mode 100755
index 00000000000..9ff1a3ab4cb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/user-csv-upload.post_zh_CN.properties
@@ -0,0 +1,11 @@
+# User CSV Upload Web Script I18N
+person.err.userCSV.invalidForm=\u7a97\u4f53\u672a\u4ee5\u591a\u90e8\u5206\u7684\u5f62\u5f0f\u4e0a\u4f20
+person.err.userCSV.noFile=\u672a\u4e0a\u4f20\u4efb\u4f55\u6587\u4ef6
+person.err.userCSV.corruptFile=\u6587\u4ef6\u5df2\u635f\u574f\u6216\u88ab\u622a\u65ad
+
+person.err.userCSV.general=\u521b\u5efa\u7528\u6237\u65f6\u51fa\u73b0\u95ee\u9898
+person.err.userCSV.generalArgs=\u521b\u5efa\u7528\u6237\u65f6\u51fa\u73b0\u95ee\u9898\uff1a{0}
+person.err.userCSV.blankColumn=\u5217 {0}\uff08\u5217\u53f7\u4e3a {1}\uff09\u4e0d\u5f97\u4e3a\u7a7a\uff0c\u4f46\u662f\u4f4d\u4e8e\u884c {2} \u4e0a
+
+person.msg.userCSV.created=\u5df2\u4e3a {0} \u521b\u5efa
+person.msg.userCSV.existing=\u5df2\u5b58\u5728
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.delete.desc.xml
new file mode 100644
index 00000000000..db21dcad008
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.delete.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Delete preferences</shortname>
+  <description>Delete a users preferences</description>
+  <url>/api/people/{userid}/preferences?pf={preferencefilter?}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.delete.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.delete.js
new file mode 100644
index 00000000000..06742db7f4e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.delete.js
@@ -0,0 +1,47 @@
+function main()
+{
+   // Try and get the person
+   var userid = url.templateArgs.userid;
+   var person = people.getPerson(userid);
+   if (person == null)
+   {
+      // 404 since person resource could not be found
+      status.setCode(status.STATUS_NOT_FOUND, "The user " + userid
+            + " could not be found");
+      return;
+   }
+
+   try
+   {
+      preferenceService.clearPreferences(userid, args["pf"]);
+   }
+   catch (error)
+   {
+      var msg = error.message;
+
+      if (logger.isLoggingEnabled())
+      {
+         logger.log(msg);
+      }
+
+      // determine if the exception was UnauthorizedAccessException, if so
+      // return 401 status code
+      if (msg.indexOf("AccessDeniedException") != -1)
+      {
+         status.setCode(status.STATUS_UNAUTHORIZED, msg);
+
+         if (logger.isLoggingEnabled()) 
+            logger.log("Returning 401 status code");
+      }
+      else
+      {
+         status.setCode(status.STATUS_INTERNAL_SERVER_ERROR, msg);
+
+         if (logger.isLoggingEnabled()) 
+            logger.log("Returning 500 status code");
+      }
+      return;
+   }
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.delete.json.ftl
new file mode 100644
index 00000000000..9e26dfeeb6e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.delete.json.ftl
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.get.desc.xml
new file mode 100644
index 00000000000..7c6cb826225
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get preferences</shortname>
+  <description>Get the preferences for a user</description>
+  <url>/api/people/{userid}/preferences?pf={preferencefilter?}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.get.js
new file mode 100644
index 00000000000..ef0391a4f39
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.get.js
@@ -0,0 +1,51 @@
+function main()
+{
+   // Try and get the person
+   var userid = url.templateArgs.userid;
+   var person = people.getPerson(userid);
+   if (person == null)
+   {
+      // 404 since person resource could not be found
+      status.setCode(status.STATUS_NOT_FOUND, "The user " + userid
+            + " could not be found");
+      return;
+   }
+  
+   try
+   {
+      // Get the preferences for the person
+      var preferences = preferenceService.getPreferences(userid, args["pf"]);
+
+      // Convert the preferences to JSON and place in the model
+      model.preferences = jsonUtils.toJSONString(preferences);
+   }
+   catch (error)
+   {
+      var msg = error.message;
+
+      if (logger.isLoggingEnabled())
+      {
+         logger.log(msg);
+      }
+
+      // determine if the exception was UnauthorizedAccessException, if so
+      // return 401 status code
+      if (msg.indexOf("AccessDeniedException") != -1)
+      {
+         status.setCode(status.STATUS_UNAUTHORIZED, msg);
+
+         if (logger.isLoggingEnabled()) 
+            logger.log("Returning 401 status code");
+      }
+      else
+      {
+         status.setCode(status.STATUS_INTERNAL_SERVER_ERROR, msg);
+
+         if (logger.isLoggingEnabled()) 
+            logger.log("Returning 500 status code");
+      }
+      return;
+   }
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.get.json.ftl
new file mode 100644
index 00000000000..07645b9abb3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.get.json.ftl
@@ -0,0 +1 @@
+${preferences}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.desc.xml
new file mode 100644
index 00000000000..9d7c543e6d7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Set preferences</shortname>
+  <description>Set a users preferences</description>
+  <url>/api/people/{userid}/preferences</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.json.ftl
new file mode 100644
index 00000000000..9e26dfeeb6e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.json.ftl
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.json.js
new file mode 100644
index 00000000000..9bafacf1c25
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/preference/preferences.post.json.js
@@ -0,0 +1,41 @@
+function main()
+{
+   // Try and get the person
+   var userid = url.templateArgs.userid;
+   var person = people.getPerson(userid);
+   if (person == null)
+   {
+      // 404 since person resource could not be found
+      status.setCode(status.STATUS_NOT_FOUND, "The user " + userid + " could not be found");
+      return;
+   }
+
+   // Convert the passed json into a native JS object
+   var preferences = jsonUtils.toObject(json);
+
+   try
+   {
+      // Set the preferences
+      if (preferenceService.getAllowWrite())
+      {
+         preferenceService.setPreferences(userid, preferences);
+      }
+   }
+   catch (error)
+   {
+      var msg = error.message;
+
+      if (logger.isLoggingEnabled())
+         logger.log(msg);
+
+      // determine if the exception was UnauthorizedAccessException, if so
+      // return 401 status code
+      if (msg.indexOf("AccessDeniedException") != -1)
+      {
+         status.setCode(status.STATUS_UNAUTHORIZED, msg);
+      }
+      else throw error;
+   }
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/content-noauth.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/content-noauth.get.desc.xml
new file mode 100644
index 00000000000..a985c5cea12
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/content-noauth.get.desc.xml
@@ -0,0 +1,14 @@
+<webscript>
+  <shortname>QuickShare - get some "shared" content</shortname>
+  <description>
+  <![CDATA[
+  If QuickShare exists, the content stream is retrieved for the specified document.
+  ]]>
+  </description>
+  <url>/api/internal/shared/node/content{property}/{shared_id}?a={attach?}</url>
+  <url>/api/internal/shared/node/{shared_id}/content{property}?a={attach?}</url>
+  <format default="">argument</format>
+  <authentication>none</authentication>
+  <transaction allow="readonly"/>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/content-thumbnail-noauth.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/content-thumbnail-noauth.get.desc.xml
new file mode 100644
index 00000000000..c57011c7cc5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/content-thumbnail-noauth.get.desc.xml
@@ -0,0 +1,15 @@
+<webscript>
+  <shortname>QuickShare - get some "shared" thumbnail content</shortname>
+  <description>
+  <![CDATA[
+  Unauthenticated: if QuickShare exists then gets the content stream for the specified document thumbnail/rendition.
+  ]]>
+  </description>
+  
+  <url>/api/internal/shared/node/{shared_id}/content{property}/thumbnails/{thumbnailname}?a={attach?}</url>
+  
+  <format default="">argument</format>
+  <authentication>none</authentication>
+  <transaction allow="readonly"/>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/enabled-noauth.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/enabled-noauth.get.desc.xml
new file mode 100644
index 00000000000..12c713d5c97
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/enabled-noauth.get.desc.xml
@@ -0,0 +1,12 @@
+<webscript>
+<shortname>QuickShare - indicates is enabled</shortname>
+  <description>
+  <![CDATA[
+  Unauthenticated: indicates if QuickShare enabled.
+  ]]>
+  </description>
+  <url>/quickshare/enabled</url>
+  <format default="json" />
+  <authentication>none</authentication>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/enabled-noauth.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/enabled-noauth.get.json.ftl
new file mode 100644
index 00000000000..ae4f0e55012
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/enabled-noauth.get.json.ftl
@@ -0,0 +1,3 @@
+{
+   "enabled" : ${enabled?string}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata-noauth.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata-noauth.get.desc.xml
new file mode 100644
index 00000000000..57ec7ae8c6e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata-noauth.get.desc.xml
@@ -0,0 +1,13 @@
+<webscript>
+<shortname>QuickShare - get some limited metadata for "shared" content (including thumbnail defs)</shortname>
+  <description>
+  <![CDATA[
+  Unauthenticated: if QuickShare exists then gets the limited metadata for the specified document.
+  ]]>
+  </description>
+  <url>/api/internal/shared/node/{shared_id}/metadata</url>
+  <format default="json" />
+  <authentication>none</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata-noauth.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata-noauth.get.json.ftl
new file mode 100644
index 00000000000..99c80e2628e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata-noauth.get.json.ftl
@@ -0,0 +1,2 @@
+<#import "metadata.lib.ftl" as metadataLib />
+<@metadataLib.resultsJSON item=item />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata.get.desc.xml
new file mode 100644
index 00000000000..f95a636d8e6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata.get.desc.xml
@@ -0,0 +1,13 @@
+<webscript>
+<shortname>Get some limited metadata for content (including thumbnail defs)</shortname>
+  <description>
+  <![CDATA[
+  Authenticated version of the metadata script
+  ]]>
+  </description>
+  <url>/api/node/{store_protocol}/{store_id}/{node_id}/metadata</url>
+  <format default="json" />
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata.get.json.ftl
new file mode 100644
index 00000000000..99c80e2628e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata.get.json.ftl
@@ -0,0 +1,2 @@
+<#import "metadata.lib.ftl" as metadataLib />
+<@metadataLib.resultsJSON item=item />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata.lib.ftl
new file mode 100644
index 00000000000..280eee4eecb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/metadata.lib.ftl
@@ -0,0 +1,44 @@
+<#macro resultsJSON item>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+    "nodeRef": "${item.nodeRef}",
+    "name": "${item.name}",
+    "title": "${item.title!""}",
+    "mimetype": "${item.mimetype!""}",
+    "size": ${item.size?c},
+    "modifiedOn": "${xmldate(item.modified)}",
+    "modifier":
+    {
+        "firstName": "${item.modifierFirstName!""}",
+        "lastName": "${item.modifierLastName!""}"
+    },
+    "thumbnailDefinitions":
+    [
+    <#if item.thumbnailDefinitions??>
+    <#list item.thumbnailDefinitions as thumbnailDefinition>
+       "${thumbnailDefinition}"
+       <#if thumbnailDefinition_has_next>,</#if>
+    </#list>
+    </#if>
+    ],
+    "thumbnails":
+    [
+    <#if item.thumbnailNames??>
+    <#list item.thumbnailNames as thumbnailName>
+       "${thumbnailName}"
+       <#if thumbnailName_has_next>,</#if>
+    </#list>
+    </#if>
+    ],
+    "lastThumbnailModificationData":
+    [
+    <#if item.lastThumbnailModificationData??>
+    <#list item.lastThumbnailModificationData as lastThumbnailMod>
+       "${lastThumbnailMod}"
+       <#if lastThumbnailMod_has_next>,</#if>
+    </#list>
+    </#if>
+    ]
+}
+</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/read.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/read.get.desc.xml
new file mode 100644
index 00000000000..93443356905
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/read.get.desc.xml
@@ -0,0 +1,13 @@
+<webscript>
+<shortname>QuickShare - get some limited metadata for "shared" content (including thumbnail defs)</shortname>
+  <description>
+  <![CDATA[
+  Unauthenticated: if QuickShare exists then gets the limited metadata for the specified document.
+  ]]>
+  </description>
+  <url>/api/internal/shared/node/{shared_id}/read</url>
+  <format default="json" />
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/read.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/read.get.json.ftl
new file mode 100644
index 00000000000..7d6e2edd6c7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/read.get.json.ftl
@@ -0,0 +1,5 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "canRead": ${canRead?string}
+}
+</#escape>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/share.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/share.get.desc.xml
new file mode 100644
index 00000000000..d5bcfbdc967
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/share.get.desc.xml
@@ -0,0 +1,13 @@
+<webscript>
+<shortname>Get some node context (nodeRef, tenantDomain, siteId) for given shared_id</shortname>
+  <description>
+  <![CDATA[
+  Authenticated script.
+  ]]>
+  </description>
+  <url>/api/internal/shared/share/{shared_id}</url>
+  <format default="json" />
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/share.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/share.get.json.ftl
new file mode 100644
index 00000000000..bd15f333ffb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/share.get.json.ftl
@@ -0,0 +1,8 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "sharedId" : "${sharedId}",
+   "nodeRef" : "${nodeRef}",
+   "tenantDomain" : "${tenantDomain}",
+   "siteId" : "${siteId!""}"
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/share.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/share.post.desc.xml
new file mode 100644
index 00000000000..bc9a13905c5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/share.post.desc.xml
@@ -0,0 +1,17 @@
+<webscript>
+  <shortname>QuickShare - "share" some content => enable public/unauthenticated access</shortname>
+  <description>
+  <![CDATA[
+  Authenticated - you must have read access to the content in order to "share" it.
+  
+  Returns {shared_id}
+  
+  ]]>
+  </description>
+  
+  <url>/api/internal/shared/share/{store_protocol}/{store_id}/{node_id}</url>
+  
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/share.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/share.post.json.ftl
new file mode 100644
index 00000000000..ef2a60242e5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/share.post.json.ftl
@@ -0,0 +1,5 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "sharedId": "${sharedDTO.id}"
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/unshare.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/unshare.delete.desc.xml
new file mode 100644
index 00000000000..66aeaa14c02
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/unshare.delete.desc.xml
@@ -0,0 +1,14 @@
+<webscript>
+  <shortname>QuickShare - "unshare" some content => disable public/unauthenticated access</shortname>
+  <description>
+  <![CDATA[
+  Authenticated - you must have read access to the content in order to "unshare" it.
+  ]]>
+  </description>
+  
+  <url>/api/internal/shared/unshare/{shared_id}</url>
+  
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/unshare.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/unshare.delete.json.ftl
new file mode 100644
index 00000000000..99e4ef07c62
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/quickshare/unshare.delete.json.ftl
@@ -0,0 +1,5 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "success" : ${success?string}
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/rating.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/rating.delete.desc.xml
new file mode 100644
index 00000000000..1abac142ed2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/rating.delete.desc.xml
@@ -0,0 +1,14 @@
+<webscript>
+   <shortname>DELETE rating</shortname>
+   <description><![CDATA[
+   Deletes the specified rating from the specified NodeRef.<br/>
+   The rated node is identified by the {store_type}/{store_id}/{id} part of the URL.<br/>
+   The rating scheme name in which to delete the rating is indicated by {scheme}.<br/>
+   ]]>
+   </description>
+   <url>/api/node/{store_type}/{store_id}/{id}/ratings/{scheme}</url>
+   <format default="json" />
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/rating.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/rating.delete.json.ftl
new file mode 100644
index 00000000000..3b584ad1d21
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/rating.delete.json.ftl
@@ -0,0 +1,11 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "data":
+   {
+      "nodeRef": "${nodeRef}",
+      "averageRating": ${averageRating?c},
+      "ratingsTotal": ${ratingsTotal?c},
+      "ratingsCount": ${ratingsCount?c}
+   }
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/rating.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/rating.post.desc.xml
new file mode 100644
index 00000000000..33b333d5a89
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/rating.post.desc.xml
@@ -0,0 +1,35 @@
+<webscript>
+   <shortname>POST a rating to a NodeRef</shortname>
+   <description><![CDATA[
+   Posts a user rating to the specified NodeRef.<br/>
+   The rating consists of a score and a rating scheme name. The rating scheme will
+   define a minimum and a maximum allowed score and it is the responsibility of the
+   caller of this webscript to ensure that the scheme name is valid and that the posted
+   score is within the allowed range.<br/>
+   The rating will be applied using the fully authenticated user who makes the POST call.<br/>
+   The body of the post should be in the form, e.g.<br/>
+   {<br/>
+   &nbsp;&nbsp;&nbsp;"rating": 4.5,<br/>
+   &nbsp;&nbsp;&nbsp;"ratingScheme": "fiveStarRatingScheme"<br/>
+   }<br/>
+   <br/>
+   The response will be of the form, e.g.<br/>
+   {<br/>
+   &nbsp;&nbsp;&nbsp;"data":<br/>
+   &nbsp;&nbsp;&nbsp;{<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"ratedNodeUrl": "\/api\/node\/workspace\/SpacesStore\/eb25f870-2e58-487a-aba1-fa5f8ae04c52\/ratings",<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"rating": 4.5,<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"ratingScheme": "fiveStarRatingScheme",<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"averageRating": 3,<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"ratingsTotal": 55.5,<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"ratingsCount": 9<br/>
+   &nbsp;&nbsp;&nbsp;}<br/>
+   }<br/>
+   ]]>
+   </description>
+   <url>/api/node/{store_type}/{store_id}/{id}/ratings</url>
+   <format default="json" />
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/rating.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/rating.post.json.ftl
new file mode 100644
index 00000000000..99a0f9b3050
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/rating.post.json.ftl
@@ -0,0 +1,13 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "data":
+   {
+      "ratedNodeUrl": "${ratedNode!""}",
+      "rating": ${rating?c},
+      "ratingScheme": "${ratingScheme!""}",
+      "averageRating": ${averageRating?c},
+      "ratingsTotal": ${ratingsTotal?c},
+      "ratingsCount": ${ratingsCount?c}
+   }
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/ratingdefinitions.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/ratingdefinitions.get.desc.xml
new file mode 100644
index 00000000000..0b5d4e805af
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/ratingdefinitions.get.desc.xml
@@ -0,0 +1,28 @@
+<webscript>
+   <shortname>GET rating scheme definitions</shortname>
+   <description><![CDATA[
+   Gets the list of rating scheme definitions e.g.<br/>
+   {<br/>
+   &nbsp;&nbsp;&nbsp;"data": {<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"ratingSchemes": [<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"maxRating": 1,<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"name": "likesRatingScheme",<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"minRating": 1<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;},<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"maxRating": 5,<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"name": "fiveStarRatingScheme",<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"minRating": 1<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;]<br/>
+   &nbsp;&nbsp;&nbsp;}<br/>
+   }<br/>
+   ]]>
+   </description>
+   <url>/api/rating/schemedefinitions</url>
+   <format default="json" />
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>internal</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/ratingdefinitions.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/ratingdefinitions.get.json.ftl
new file mode 100644
index 00000000000..29ffdd6b7d3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/ratingdefinitions.get.json.ftl
@@ -0,0 +1,18 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "data":
+   {
+      "ratingSchemes":
+      [
+         <#list schemeDefs?keys as key>
+         {
+            "name": "${schemeDefs[key].name!""}",
+            "minRating": ${schemeDefs[key].minRating?c},
+            "maxRating": ${schemeDefs[key].maxRating?c},
+            "selfRatingAllowed": ${schemeDefs[key].selfRatingAllowed?string}
+         }<#if key_has_next>,</#if>
+         </#list>
+      ]
+   }
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/ratings.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/ratings.get.desc.xml
new file mode 100644
index 00000000000..106c17a3d51
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/ratings.get.desc.xml
@@ -0,0 +1,46 @@
+<webscript>
+   <shortname>GET rating</shortname>
+   <description><![CDATA[
+   Gets the list of ratings for the specified NodeRef (if there are any) as well as some
+   general statistics on ratings for the specified node.<br/>
+   The ratings returned will only include those applied by the currently authenticated user. There
+   will be one for each rating scheme in which the user has submitted a rating.<br/>
+   The returned data will be of the form:<br/>
+   {<br/>
+   &nbsp;&nbsp;"nodeRef": "workspace:\/\/SpacesStore\/d0b163fe-050d-43f5-88e4-db1794a3e5cd",<br/>
+   &nbsp;&nbsp;"ratings":<br/>
+   &nbsp;&nbsp;{<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;"fiveStarRatingScheme":<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;{<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"rating": 5,<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"appliedAt": "12 Jul 2010 16:38:05 GMT+0100 (BST)",<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"appliedBy": "UserOne"<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;}<br/>
+   &nbsp;&nbsp;},<br/>
+   &nbsp;&nbsp;"nodeStatistics":<br/>
+   &nbsp;&nbsp;{<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;"likesRatingScheme":<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;{<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"averageRating": 3,<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"ratingsTotal": 3,<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"ratingsCount": 1<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;}<br/>
+   &nbsp;&nbsp;}<br/>
+   }<br/>
+   with the following meanings:<br/>
+   nodeRef: the nodeRef whose ratings are requested.<br/>
+   ratings/ratingScheme: the rating scheme name<br/>
+   ratings/rating: the rating applied to the named noderef in the scheme by the current user<br/>
+   ratings/appliedAt: the datetime when the rating was applied<br/>
+   ratings/appliedBy: the user who applied the rating (the current user)<br/>
+   nodeStatistics/averageRating: the average (mean) rating on this node in the named rating scheme for all users<br/>
+   nodeStatistics/ratingsTotal: the total score (sum) of all ratings on this node in the named rating scheme<br/>
+   nodeStatistics/ratingsCount: the total number of applied ratings on this node in the named rating scheme.<br/>
+   ]]>
+   </description>
+   <url>/api/node/{store_type}/{store_id}/{id}/ratings</url>
+   <format default="json" />
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/ratings.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/ratings.get.json.ftl
new file mode 100644
index 00000000000..b3b9f17aca6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rating/ratings.get.json.ftl
@@ -0,0 +1,30 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "data":
+   {
+      "nodeRef": "${nodeRef}",
+      "ratings":
+      {
+         <#list ratings as rating>
+         "${rating.scheme.name!""}":
+         {
+            "rating": ${rating.score?c},
+            "appliedAt": "${xmldate(rating.appliedAt)}",
+            "appliedBy": "${rating.appliedBy!""}"
+         }<#if rating_has_next>,</#if>
+         </#list>
+      },
+      "nodeStatistics":
+      {
+         <#list averageRatings?keys as schemeName>
+         "${schemeName!""}":
+         {
+            "averageRating": ${averageRatings[schemeName]?c},
+            "ratingsTotal": ${ratingsTotals[schemeName]?c},
+            "ratingsCount": ${ratingsCounts[schemeName]?c}
+         }<#if schemeName_has_next>,</#if>
+         </#list>
+      }
+   }
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rendition/patchthumbnailsasrenditions.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rendition/patchthumbnailsasrenditions.get.desc.xml
new file mode 100644
index 00000000000..02322a9080f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rendition/patchthumbnailsasrenditions.get.desc.xml
@@ -0,0 +1,15 @@
+<webscript>
+   <shortname>Thumbnail to Rendition Service optional patch.</shortname>
+   <description><![CDATA[This webscript applies a patch which brings pre-3.3 thumbnail content up to date
+   with the RenditionService in Alfresco 3.3. It searches for all nodes of type cm:thumbnail and
+   applies the appropriate rendition aspect (rn:hiddenRendition or rn:visibleRendition) if not already there.
+   If this patch is not applied, thumbnails should continue to work as before but searches
+   for nodes which are subclasses of rn:rendition will not return thumbnails created against
+   a 3.2 server.
+  ]]></description>
+   <url>/renditions/patchthumbnailsasrenditions</url>
+   <format default="json">argument</format>
+   <authentication>admin</authentication>
+   <transaction>required</transaction>
+   <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rendition/patchthumbnailsasrenditions.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rendition/patchthumbnailsasrenditions.get.json.ftl
new file mode 100644
index 00000000000..0b71a02abe1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rendition/patchthumbnailsasrenditions.get.json.ftl
@@ -0,0 +1,7 @@
+<#escape	x as jsonUtils.encodeJSONString(x)>
+{
+   "data" : {
+      "thumbnailNodesPatched" : ${patchedNodeCount?string}
+   }
+}
+</#escape>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.delete.desc.xml
new file mode 100644
index 00000000000..daf79ceb324
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.delete.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Delete a persisted replication definition</shortname>
+  <description>Deletes a previously persisted replication defintion with the supplied name.</description>
+  <url>/api/replication-definition/{replication_definition_name}</url>
+  <format default="json">argument</format>
+  <authentication>admin</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.get.desc.xml
new file mode 100644
index 00000000000..cb35ceb49ca
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get replication definition</shortname>
+  <description>Gets the details of a persisted replication definition.</description>
+  <url>/api/replication-definition/{replication_definition_name}</url>
+  <format default="json">argument</format>
+  <authentication>admin</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.get.json.ftl
new file mode 100644
index 00000000000..2b41e9a775d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.get.json.ftl
@@ -0,0 +1,4 @@
+<#import "replication-definition.lib.ftl" as replicationDefLib />
+{
+   "data": <@replicationDefLib.replicationDefinitionJSON replicationDefinition=replicationDefinition />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.lib.ftl
new file mode 100644
index 00000000000..72362ee8b52
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.lib.ftl
@@ -0,0 +1,50 @@
+<#-- Renders a simple replication definition. -->
+<#macro simpleReplicationDefinitionJSON replicationDefinition>
+<#escape x as jsonUtils.encodeJSONString(x)>
+   {
+      "name": "${replicationDefinition.name}",
+      "status": "${replicationDefinition.status}",
+      "startedAt": <#if replicationDefinition.startedAt??>{ "iso8601": "${replicationDefinition.startedAt}" }<#else>null</#if>,
+      "enabled": ${replicationDefinition.enabled?string},
+      "details": "${"/api/replication-definition/" + replicationDefinition.name}"
+   }
+</#escape>
+</#macro>
+
+<#-- Renders the details of a replication definition. -->
+<#macro replicationDefinitionJSON replicationDefinition>
+<#escape x as jsonUtils.encodeJSONString(x)>
+   {
+      "name": "${replicationDefinition.name}",
+      "description": "${replicationDefinition.description}",
+      "status": "${replicationDefinition.status}",
+      "startedAt": <#if replicationDefinition.startedAt??>{ "iso8601": "${replicationDefinition.startedAt}" }<#else>null</#if>,
+      "endedAt": <#if replicationDefinition.endedAt??>{ "iso8601": "${replicationDefinition.endedAt}" }<#else>null</#if>,
+      "failureMessage": <#if replicationDefinition.failureMessage??>"${replicationDefinition.failureMessage}"<#else>null</#if>,
+      "executionDetails": <#if replicationDefinition.runningActionId??>"/api/running-action/${replicationDefinition.runningActionId}"<#else>null</#if>,
+      "payload": [
+      <#list replicationDefinition.payload as node>
+         {
+            "nodeRef": "${node.nodeRef}",
+            "isFolder": ${node.isContainer?string},
+            "name": "${node.name}",
+            "path": "${node.displayPath}/${node.name}"
+         }<#if node_has_next>,</#if>
+      </#list>
+      ],
+      "transferLocalReport": <#if replicationDefinition.transferLocalReport??>"${replicationDefinition.transferLocalReport.nodeRef}"<#else>null</#if>,
+      "transferRemoteReport": <#if replicationDefinition.transferRemoteReport??>"${replicationDefinition.transferRemoteReport.nodeRef}"<#else>null</#if>,
+      "enabled": ${replicationDefinition.enabled?string},
+      "targetName": <#if replicationDefinition.targetName??>"${replicationDefinition.targetName}"<#else>null</#if>,
+      "targetExists": <#if replicationDefinition.targetName??>true<#else>false</#if>,
+      "schedule": <#if replicationDefinition.scheduleEnabled>
+          {
+            "start": { 
+                "iso8601": "${replicationDefinition.scheduleStart}"
+            },
+            "intervalPeriod": <#if replicationDefinition.scheduleIntervalPeriod??>"${replicationDefinition.scheduleIntervalPeriod}"<#else>null</#if>,
+            "intervalCount": <#if replicationDefinition.scheduleIntervalCount??>${replicationDefinition.scheduleIntervalCount?c}<#else>null</#if>
+          }<#else>null</#if>
+   }
+</#escape>
+</#macro>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.put.desc.xml
new file mode 100644
index 00000000000..bdab3c91063
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.put.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Update a persisted replication definition</shortname>
+  <description>Updates a previously persisted replication defintion with the supplied details.</description>
+  <url>/api/replication-definition/{replication_definition_name}</url>
+  <format default="json">argument</format>
+  <authentication>admin</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.put.json.ftl
new file mode 100644
index 00000000000..2b41e9a775d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definition.put.json.ftl
@@ -0,0 +1,4 @@
+<#import "replication-definition.lib.ftl" as replicationDefLib />
+{
+   "data": <@replicationDefLib.replicationDefinitionJSON replicationDefinition=replicationDefinition />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definitions.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definitions.get.desc.xml
new file mode 100644
index 00000000000..19a89aab4f5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definitions.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>List persisted replication definitions</shortname>
+  <description>
+  Returns a simple representation of all persisted replication definitions.
+  </description>
+  <url>/api/replication-definitions?sort={sort?}</url>
+  <format default="json"/>
+  <authentication>admin</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definitions.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definitions.get.json.ftl
new file mode 100644
index 00000000000..e935ebd4ef9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definitions.get.json.ftl
@@ -0,0 +1,10 @@
+<#import "replication-definition.lib.ftl" as replicationDefLib />
+{
+   "data":
+   [
+   <#list replicationDefinitions as replicationDefinition>
+      <@replicationDefLib.simpleReplicationDefinitionJSON replicationDefinition=replicationDefinition />
+      <#if replicationDefinition_has_next>,</#if>
+   </#list>
+   ]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definitions.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definitions.post.desc.xml
new file mode 100644
index 00000000000..33f5b6512c8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definitions.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Create a new persisted replication definition</shortname>
+  <description>Creates a new replication definition with the supplied details.</description>
+  <url>/api/replication-definitions</url>
+  <format default="json"/>
+  <authentication>admin</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definitions.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definitions.post.json.ftl
new file mode 100644
index 00000000000..2b41e9a775d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-definitions.post.json.ftl
@@ -0,0 +1,4 @@
+<#import "replication-definition.lib.ftl" as replicationDefLib />
+{
+   "data": <@replicationDefLib.replicationDefinitionJSON replicationDefinition=replicationDefinition />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-service-status.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-service-status.get.desc.xml
new file mode 100644
index 00000000000..860e8ebde0d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-service-status.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Gets status information on the Replication Service</shortname>
+  <description>
+  Returns high-level information on the Replication Service status.
+  </description>
+  <url>/api/replication-service-status</url>
+  <format default="json"/>
+  <authentication>admin</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-service-status.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-service-status.get.json.ftl
new file mode 100644
index 00000000000..e04863ab145
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/replication/replication-service-status.get.json.ftl
@@ -0,0 +1,8 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "data":
+   {
+      "enabled": ${enabled?string}
+   }
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/requestutils.lib.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/requestutils.lib.js
new file mode 100644
index 00000000000..2c2f72bb32f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/requestutils.lib.js
@@ -0,0 +1,92 @@
+/*
+ * Site related utility functions
+ */
+
+/**
+ * Returns the node as specified by the given arguments.
+ *
+ * @param siteId the site for which a node is requested
+ * @param containerId the component to look in for the node.
+ * @param path a path to the node. Returns the root node in case path is null or ''
+ *        return null in case no node can be found for the given path
+ * @return the node or a json error in case the node could not be fetched. Check with .
+ */
+function findNodeInSite()
+{
+   var siteId = url.templateArgs.site;
+   var containerId = url.templateArgs.container;
+   var path = (url.templateArgs.path !== null) ? url.templateArgs.path : "";
+
+   // fetch site
+   var site = siteService.getSite(siteId);
+   if (site === null)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "Site not found: '" + siteId + "'");
+      return null;
+   }
+
+   // fetch container
+   var node = site.getContainer(containerId);
+   if (node === null)
+   {
+      node = site.aquireContainer(containerId);
+      if (node === null)
+      {
+      	status.setCode(status.STATUS_NOT_FOUND, "Unable to fetch container '" + containerId + "' of site '" + siteId + "'. (No write permission?)");
+     	   return null;
+      }
+   }
+   
+   // try to fetch the the path is there is any
+   if ((path !== null) && (path.length > 0))
+   {
+      node = node.childByNamePath(path);
+      if (node === null)
+      {
+         status.setCode(status.STATUS_NOT_FOUND, "No node found for the given path: \"" + path + "\" in container " + containerId + " of site " + siteId);
+         return null;
+      }
+   }
+
+   return node;
+}
+
+function findFromReference()
+{
+   var nodeRef = url.templateArgs.store_type + "://" + url.templateArgs.store_id + "/" + url.templateArgs.id;
+   var node = utils.resolveNodeReference(nodeRef);
+   
+   if (node === null)
+   { 
+      status.setCode(status.STATUS_NOT_FOUND, "Node " + nodeRef + " does not exist");
+   }
+   return node;
+}
+
+/**
+ * Returns the node referenced by the request url .
+ * Currently two different types of urls are supported (site/container or nodeRef),
+ * this method takes care to hide those differences from the rest of the code.
+ *
+ * @return the node or null & error status set if not found.
+ */
+function getRequestNode()
+{
+   // check whether we got a node reference or a site related uri
+   var node = null;
+   if (url.templateArgs.store_type !== null)
+   {
+       node = findFromReference();
+   }
+   // site related uri
+   else if (url.templateArgs.site !== null)
+   {
+      node = findNodeInSite();
+   }
+   else
+   {
+      // unknown request params
+      status.setCode(status.STATUS_INTERNAL_SERVER_ERROR, "Unknown request parameters (webscript incorrectly configured?)");
+   }
+   return node;
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionConstraint.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionConstraint.get.desc.xml
new file mode 100644
index 00000000000..6b482d51579
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionConstraint.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get action constraint</shortname>
+  <description>Gets an action constraint resource.,</description>
+  <url>/api/actionConstraints/{name}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionConstraint.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionConstraint.get.json.ftl
new file mode 100644
index 00000000000..b77cd9a87b9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionConstraint.get.json.ftl
@@ -0,0 +1,6 @@
+<#import "rule.lib.ftl" as ruleLib/>
+
+{
+	"data" : 	
+	<@ruleLib.actionConstraintJSON actionConstraint=actionConstraint />	
+}  
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionConstraints.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionConstraints.get.desc.xml
new file mode 100644
index 00000000000..0e9013e3069
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionConstraints.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get action constraint collection</shortname>
+  <description>Gets an action constraints collection.</description>
+  <url>/api/actionConstraints?name={name?}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionConstraints.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionConstraints.get.json.ftl
new file mode 100644
index 00000000000..3756174cc15
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionConstraints.get.json.ftl
@@ -0,0 +1,11 @@
+<#import "rule.lib.ftl" as ruleLib/>
+
+{
+	"data" : 
+	[
+	<#list actionConstraints as actionConstraint>		
+		<@ruleLib.actionConstraintJSON actionConstraint=actionConstraint />
+		<#if actionConstraint_has_next>,</#if>
+	</#list>
+	]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionQueue.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionQueue.post.desc.xml
new file mode 100644
index 00000000000..8fe8e97815e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionQueue.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Post action queue</shortname>
+  <description>Adds a new action to the execution queue.</description>
+  <url>/api/actionQueue?async={async?}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionQueue.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionQueue.post.json.ftl
new file mode 100644
index 00000000000..b5ac5e60a55
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionQueue.post.json.ftl
@@ -0,0 +1,22 @@
+
+{
+	"data" : 
+	{
+		"status" : "${actionExecStatus}",
+		"actionedUponNode" : "${actionedUponNode?string}",
+		<#if exception??>
+		"exception" : 
+		{
+			"message" : "${exception.message}",
+			"stackTrace" : 			
+			[
+			<#list exception.stackTrace as stackTraceElement>
+			"${stackTraceElement?string}"<#if stackTraceElement_has_next>,</#if>
+			</#list>
+			]			
+		},
+		</#if>
+		"action" : 
+		${action?string}
+	}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionconditiondefinitions.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionconditiondefinitions.get.desc.xml
new file mode 100644
index 00000000000..e4d2c6bfbf0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionconditiondefinitions.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get action condition definition collection</shortname>
+  <description>Gets a collection of action conditions available.</description>
+  <url>/api/actionconditiondefinitions</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionconditiondefinitions.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionconditiondefinitions.get.json.ftl
new file mode 100644
index 00000000000..15129b11863
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actionconditiondefinitions.get.json.ftl
@@ -0,0 +1,30 @@
+{
+	"data":
+	[
+<#list actionconditiondefinitions as actionconditiondefinition>
+	   {
+	      "name" : "${jsonUtils.encodeJSONString(actionconditiondefinition.name)}",
+          "displayLabel" : <#if actionconditiondefinition.title??>"${jsonUtils.encodeJSONString(actionconditiondefinition.title)}"<#else>null</#if>,
+          "description" : <#if actionconditiondefinition.description??>"${jsonUtils.encodeJSONString(actionconditiondefinition.description)}"<#else>null</#if>,
+          "adHocPropertiesAllowed" : ${actionconditiondefinition.adhocPropertiesAllowed?string},
+          "parameterDefinitions" :
+          [
+          <#if actionconditiondefinition.parameterDefinitions??>
+          <#list actionconditiondefinition.parameterDefinitions as parameterDefinition>
+	          {
+	             "name" : "${jsonUtils.encodeJSONString(parameterDefinition.name)}",
+	         	 "displayLabel" : <#if parameterDefinition.displayLabel??>"${jsonUtils.encodeJSONString(parameterDefinition.displayLabel)}"<#else>null</#if>,
+	        	 "type" : "${shortQName(parameterDefinition.type)}",
+	        	 <#if parameterDefinition.parameterConstraintName??>
+	        	 "constraint" : "${jsonUtils.encodeJSONString(parameterDefinition.parameterConstraintName)}",
+	        	 </#if>
+	        	 "isMultiValued" : ${parameterDefinition.multiValued?string},
+	        	 "isMandatory" : ${parameterDefinition.mandatory?string}
+	          }<#if (parameterDefinition_has_next)>,</#if>
+		  </#list>
+		  </#if>
+          ]        
+	   }<#if (actionconditiondefinition_has_next)>,</#if>
+	</#list>
+	]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actiondefinitions.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actiondefinitions.get.desc.xml
new file mode 100644
index 00000000000..4394760cead
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actiondefinitions.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get action definition collection</shortname>
+  <description>Gets a collection of the available actions.</description>
+  <url>/api/actiondefinitions</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actiondefinitions.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actiondefinitions.get.json.ftl
new file mode 100644
index 00000000000..23662f9a4b7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/actiondefinitions.get.json.ftl
@@ -0,0 +1,39 @@
+{
+	"data":
+	[
+<#list actiondefinitions as actiondefinition>
+	   {
+	      "name" : "${jsonUtils.encodeJSONString(actiondefinition.name)}",
+          "displayLabel" : <#if actiondefinition.title??>"${jsonUtils.encodeJSONString(actiondefinition.title)}"<#else>null</#if>,
+          "description" : <#if actiondefinition.description??>"${jsonUtils.encodeJSONString(actiondefinition.description)}"<#else>null</#if>,
+          "adHocPropertiesAllowed" : ${actiondefinition.adhocPropertiesAllowed?string},          
+          "parameterDefinitions" :
+          [
+          <#if actiondefinition.parameterDefinitions??>
+          <#list actiondefinition.parameterDefinitions as parameterDefinition>
+	          {
+	             "name" : "${jsonUtils.encodeJSONString(parameterDefinition.name)}",
+	         	 "displayLabel" : <#if parameterDefinition.displayLabel??>"${jsonUtils.encodeJSONString(parameterDefinition.displayLabel)}"<#else>null</#if>,
+	        	 "type" : "${shortQName(parameterDefinition.type)}",
+	        	 <#if parameterDefinition.parameterConstraintName??>
+	        	 "constraint" : "${jsonUtils.encodeJSONString(parameterDefinition.parameterConstraintName)}",
+	        	 </#if>
+	        	 "isMultiValued" : ${parameterDefinition.multiValued?string},
+	        	 "isMandatory" : ${parameterDefinition.mandatory?string}
+	          }<#if (parameterDefinition_has_next)>,</#if>
+		  </#list>
+		  </#if>
+          ],
+          "applicableTypes" : 
+          [
+          <#if actiondefinition.applicableTypes??>
+          <#list actiondefinition.applicableTypes as applicableType>          
+              "${shortQName(applicableType)}"         	 
+          <#if (applicableType_has_next)>,</#if>
+		  </#list>
+		  </#if>
+          ]        
+	   }<#if (actiondefinition_has_next)>,</#if>
+	</#list>
+	]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritedrules.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritedrules.get.desc.xml
new file mode 100644
index 00000000000..891462272f8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritedrules.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get inherited rules collection</shortname>
+  <description>Gets a list of all inherited rules for a given node. The node can be specified either using a node reference or a query path.</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/ruleset/inheritedrules?ruleType={rule_type?}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritedrules.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritedrules.get.json.ftl
new file mode 100644
index 00000000000..c2639941396
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritedrules.get.json.ftl
@@ -0,0 +1,10 @@
+<#import "rule.lib.ftl" as ruleLib/>
+{
+	"data" : 
+	[
+	<#list inheritedRuleRefs as inheritedRuleRef>
+		<@ruleLib.ruleRefOwningSummaryJSON ruleRef=inheritedRuleRef />
+		<#if inheritedRuleRef_has_next>,</#if> 
+	</#list>
+	]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestate.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestate.get.desc.xml
new file mode 100644
index 00000000000..6c6eb4608fc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestate.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get state of inherited rules</shortname>
+  <description>Returns the state of inherited rule flag</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/ruleset/inheritrules/state</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestate.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestate.get.js
new file mode 100644
index 00000000000..05310782701
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestate.get.js
@@ -0,0 +1,19 @@
+function main ()
+{
+   var nodeRef = url.templateArgs.store_type + "://" + url.templateArgs.store_id + "/" + url.templateArgs.id,
+      node = search.findNode(nodeRef),
+      ASPECT_IGNORE_INHERITED_RULES = "rule:ignoreInheritedRules";
+
+   model.nodeRef = nodeRef;
+
+   // Aspect indicates that rules are ignored.
+   if (node.hasAspect(ASPECT_IGNORE_INHERITED_RULES) == true)
+   {
+      model.inheritRules = false;
+   } else
+   {
+      model.inheritRules = true;
+   }
+};
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestate.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestate.get.json.ftl
new file mode 100644
index 00000000000..774057819aa
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestate.get.json.ftl
@@ -0,0 +1,7 @@
+{
+   "data" :
+   {
+      "nodeRef": "${nodeRef?string}",
+      "inheritRules": "${inheritRules?string}"
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestoggle.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestoggle.post.desc.xml
new file mode 100644
index 00000000000..010a729b92b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestoggle.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Toggles the inherit rule state</shortname>
+  <description>Toggles the state of the inherit rules flag</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/ruleset/inheritrules/toggle</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestoggle.post.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestoggle.post.js
new file mode 100644
index 00000000000..8eaad19d637
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestoggle.post.js
@@ -0,0 +1,20 @@
+function main ()
+{
+   var nodeRef = url.templateArgs.store_type + "://" + url.templateArgs.store_id + "/" + url.templateArgs.id,
+      node = search.findNode(nodeRef),
+      ASPECT_IGNORE_INHERITED_RULES = "rule:ignoreInheritedRules";
+
+   model.nodeRef = nodeRef;
+
+   if (node.hasAspect(ASPECT_IGNORE_INHERITED_RULES) == true)
+   {
+      node.removeAspect(ASPECT_IGNORE_INHERITED_RULES);
+      model.inheritRules = true;
+   } else
+   {
+      node.addAspect(ASPECT_IGNORE_INHERITED_RULES);
+      model.inheritRules = false;
+   }
+};
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestoggle.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestoggle.post.json.ftl
new file mode 100644
index 00000000000..774057819aa
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/inheritrulestoggle.post.json.ftl
@@ -0,0 +1,7 @@
+{
+   "data" :
+   {
+      "nodeRef": "${nodeRef?string}",
+      "inheritRules": "${inheritRules?string}"
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.delete.desc.xml
new file mode 100644
index 00000000000..752895e95de
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.delete.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Delete rule</shortname>
+  <description>Deletes a rule.</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/ruleset/rules/{rule_id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.delete.json.ftl
new file mode 100644
index 00000000000..05b949647c5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.delete.json.ftl
@@ -0,0 +1,3 @@
+{	
+   "success": true
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.get.desc.xml
new file mode 100644
index 00000000000..3d63a2af5d6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get rule</shortname>
+  <description>Get the details of a rule. The details returned are fully expanded, including child actions (if composite action), conditions and compensating actions.</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/ruleset/rules/{rule_id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.get.json.ftl
new file mode 100644
index 00000000000..cf3c0b68268
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.get.json.ftl
@@ -0,0 +1,3 @@
+<#import "rule.lib.ftl" as ruleLib/>
+
+<@ruleLib.ruleRefJSON ruleRef=ruleRef />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.lib.ftl
new file mode 100644
index 00000000000..9bee96ef5af
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.lib.ftl
@@ -0,0 +1,164 @@
+<#-- renders a rule action object -->
+
+<#macro actionJSON action>
+<#escape x as jsonUtils.encodeJSONString(x)>
+	{
+		"id" : "${action.id}",
+		"actionDefinitionName" : "${action.actionDefinitionName}",
+		<#if action.description??>"description" : "${action.description}",</#if>
+		<#if action.title??>"title" : "${action.title}",</#if>
+		<#if action.parameterValues?? && action.parameterValues?size &gt; 0>
+		"parameterValues" :		
+		{
+		<@parameterValuesJSON parameterValues=action.parameterValues />
+		}, 
+		</#if>
+		"executeAsync" : ${action.executeAsychronously?string},
+		<#if action.runAsUser??>
+		"runAsUser" : "${action.runAsUser}",
+		</#if>
+		<#if action.actions?? && action.actions?size &gt; 0>
+		"actions" :
+		[
+		<#list action.actions as innerAction>
+			<@actionJSON action=innerAction />
+		<#if innerAction_has_next>,</#if>
+		</#list>
+		],
+		</#if>
+		<#if action.actionConditions?? && action.actionConditions?size &gt; 0>
+		"conditions" : 
+		[
+		<#list action.actionConditions as actionCondition>
+			{
+				"id" : "${actionCondition.id}",
+				"conditionDefinitionName" : "${actionCondition.actionConditionDefinitionName}",
+				"invertCondition" : ${actionCondition.invertCondition?string},
+				<#if actionCondition.parameterValues?? && actionCondition.parameterValues?size &gt; 0>
+				"parameterValues" : 
+				{			
+				<@parameterValuesJSON parameterValues=actionCondition.parameterValues />					
+				},
+				</#if>
+				"url" : "${"/api/node/" + ruleRef.owningFileInfo.nodeRef.storeRef.protocol + "/" + ruleRef.owningFileInfo.nodeRef.storeRef.identifier + "/" + ruleRef.owningFileInfo.nodeRef.id + "/ruleset/rules/" + ruleRef.rule.nodeRef.id + "/action/conditions/" + actionCondition.id}"
+			}<#if (actionCondition_has_next)>,</#if>
+		</#list>
+		],
+		</#if>
+		<#if action.compensatingAction??>
+		"compensatingAction" : <@actionJSON action=action.compensatingAction />,
+		</#if>
+		"url" : "${"/api/node/" + ruleRef.owningFileInfo.nodeRef.storeRef.protocol + "/" + ruleRef.owningFileInfo.nodeRef.storeRef.identifier + "/" + ruleRef.owningFileInfo.nodeRef.id + "/ruleset/rules/" + ruleRef.rule.nodeRef.id + "/action/actions/" + action.id}"
+	}
+</#escape>
+</#macro>
+
+<#-- renders a complete rule object -->
+<#macro ruleRefJSON ruleRef>
+<#escape x as jsonUtils.encodeJSONString(x)>
+	{
+		"id" : "${ruleRef.rule.nodeRef.id}",
+	    "title" : "${ruleRef.rule.title}",
+	    <#if ruleRef.rule.description??>
+	    "description" : "${ruleRef.rule.description}",
+	    </#if>
+	    "ruleType" : [<#list ruleRef.rule.ruleTypes as ruleType>"${ruleType}"<#if (ruleType_has_next)>, </#if></#list>],
+	    "applyToChildren" : ${ruleRef.rule.appliedToChildren?string},
+	    "executeAsynchronously" : ${ruleRef.rule.executeAsynchronously?string},
+	    "disabled" : ${ruleRef.rule.ruleDisabled?string},
+	    "action" : <@actionJSON action=ruleRef.rule.action />,   
+	    "owningNode" :
+	    {
+	    	"nodeRef" : "${ruleRef.owningFileInfo.nodeRef}",
+	    	"name" : "${ruleRef.owningFileInfo.name}"
+	    },
+	    "url" : "${"/api/node/" + ruleRef.owningFileInfo.nodeRef.storeRef.protocol + "/" + ruleRef.owningFileInfo.nodeRef.storeRef.identifier + "/" + ruleRef.owningFileInfo.nodeRef.id + "/ruleset/rules/" + ruleRef.rule.nodeRef.id}"
+	}
+</#escape>
+</#macro>
+
+<#-- renders a summary rule object with owning nodeRef -->
+<#macro ruleRefOwningSummaryJSON ruleRef>
+<#escape x as jsonUtils.encodeJSONString(x)>
+	{
+		"id" : "${ruleRef.rule.nodeRef.id}",
+	    "title" : "${ruleRef.rule.title}",
+	    <#if ruleRef.rule.description??>
+	    "description" : "${ruleRef.rule.description}",
+	    </#if>
+	    "ruleType" : [<#list ruleRef.rule.ruleTypes as ruleType>"${ruleType}"<#if (ruleType_has_next)>, </#if></#list>],    
+	    "disabled" : ${ruleRef.rule.ruleDisabled?string},
+	    "owningNode" :
+	    {
+	    	"nodeRef" : "${ruleRef.owningFileInfo.nodeRef}",
+	    	"name" : "${ruleRef.owningFileInfo.name}"
+	    },    
+	    "url" : "${"/api/node/" + ruleRef.owningFileInfo.nodeRef.storeRef.protocol + "/" + ruleRef.owningFileInfo.nodeRef.storeRef.identifier + "/" + ruleRef.owningFileInfo.nodeRef.id + "/ruleset/rules/" + ruleRef.rule.nodeRef.id}"
+	}
+</#escape>
+</#macro>
+
+<#-- renders a summary rule object without owning nodeRef -->
+<#macro ruleRefSummaryJSON ruleRef>
+<#escape x as jsonUtils.encodeJSONString(x)>
+	{
+		"id" : "${ruleRef.rule.nodeRef.id}",
+	    "title" : "${ruleRef.rule.title}",
+	    <#if ruleRef.rule.description??>
+	    "description" : "${ruleRef.rule.description}",
+	    </#if>
+	    "ruleType" : [<#list ruleRef.rule.ruleTypes as ruleType>"${ruleType}"<#if (ruleType_has_next)>, </#if></#list>],    
+	    "disabled" : ${ruleRef.rule.ruleDisabled?string},
+	    "url" : "${"/api/node/" + ruleRef.owningFileInfo.nodeRef.storeRef.protocol + "/" + ruleRef.owningFileInfo.nodeRef.storeRef.identifier + "/" + ruleRef.owningFileInfo.nodeRef.id + "/ruleset/rules/" + ruleRef.rule.nodeRef.id}"
+	}
+</#escape>
+</#macro>
+
+<#-- renders parameters values map -->
+<#macro parameterValuesJSON parameterValues>	
+	<#list parameterValues?keys as parameterValue>	
+		<#assign val = parameterValues[parameterValue]>				
+		"${parameterValue}" : 
+		<#if val?is_boolean == true>
+		${val?string}
+		<#elseif val?is_number == true>
+		${val?c}
+		<#elseif val?is_date == true>
+		"${val?string("EEE MMM dd HH:mm:ss zzz yyyy")}"		
+		<#elseif val?is_sequence>
+		[
+			<#list val as element>
+			"${jsonUtils.encodeJSONString(element?string)}"<#if (element_has_next)>,</#if>
+			</#list>
+		]		
+		<#else>
+		"${jsonUtils.encodeJSONString(shortQName(val?string))}"
+		</#if>
+		<#if (parameterValue_has_next)>,</#if>				
+	</#list>	
+</#macro>
+
+<#-- renders a action constraint object -->
+<#macro actionConstraintJSON actionConstraint>
+<#escape x as jsonUtils.encodeJSONString(x)>
+	{
+		"name" : "${actionConstraint.name}",		
+		"values" : 
+		[
+		<#if actionConstraint.allowableValues??>
+		   <#assign allowableValues = actionConstraint.allowableValues>
+		   
+		   <#if allowableValues?size &gt; 0>
+			<#list allowableValues?keys as allowableValue>	
+			<#assign val = allowableValues[allowableValue]>				
+			{
+				"value" : "${allowableValue}",
+				"displayLabel" : "${val}"
+			}<#if allowableValue_has_next>,</#if>				
+			</#list>
+			</#if>
+		</#if>
+		]
+	}
+</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.post.desc.xml
new file mode 100644
index 00000000000..218620c0eda
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Create rule</shortname>
+  <description>Creates a new rule.</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/ruleset/rules</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.post.json.ftl
new file mode 100644
index 00000000000..6e19e24eb29
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.post.json.ftl
@@ -0,0 +1,6 @@
+<#import "rule.lib.ftl" as ruleLib/>
+
+{
+	"data" :
+	<@ruleLib.ruleRefSummaryJSON ruleRef=ruleRef />
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.put.desc.xml
new file mode 100644
index 00000000000..cf61e951885
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.put.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Update rule</shortname>
+  <description>Update the details of a rule.</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/ruleset/rules/{rule_id}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.put.json.ftl
new file mode 100644
index 00000000000..cf3c0b68268
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rule.put.json.ftl
@@ -0,0 +1,3 @@
+<#import "rule.lib.ftl" as ruleLib/>
+
+<@ruleLib.ruleRefJSON ruleRef=ruleRef />
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rules.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rules.get.desc.xml
new file mode 100644
index 00000000000..e1d65beff5f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rules.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get rules collection</shortname>
+  <description>Gets a list of all owned rules for a given node. The node can be specified either using a node reference or a query path.</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/ruleset/rules?ruleType={rule_type?}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rules.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rules.get.json.ftl
new file mode 100644
index 00000000000..13c851019bd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/rules.get.json.ftl
@@ -0,0 +1,10 @@
+<#import "rule.lib.ftl" as ruleLib/>
+{
+	"data" : 
+	[
+	<#list ruleRefs as ruleRef>
+		<@ruleLib.ruleRefOwningSummaryJSON ruleRef=ruleRef />
+		<#if ruleRef_has_next>,</#if> 
+	</#list>
+	]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/ruleset.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/ruleset.get.desc.xml
new file mode 100644
index 00000000000..d7bb63f5ef9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/ruleset.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get rule set</shortname>
+  <description>Gets the rule set for a node.</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/ruleset?ruleType={rule_type?}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/ruleset.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/ruleset.get.json.ftl
new file mode 100644
index 00000000000..66d732d4da2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/ruleset.get.json.ftl
@@ -0,0 +1,37 @@
+<#import "rule.lib.ftl" as ruleLib/>
+
+{
+	"data" :
+	{
+		<#if ruleset.rules?? && ruleset.rules?size &gt; 0>
+		"rules" : 
+		[
+		<#list ruleset.rules as ruleRef>
+			<@ruleLib.ruleRefOwningSummaryJSON ruleRef=ruleRef />
+			<#if ruleRef_has_next>,</#if> 
+		</#list>
+		],
+		</#if>
+		<#if ruleset.inheritedRules?? && ruleset.inheritedRules?size &gt; 0>
+		"inheritedRules" : 
+		[
+		<#list ruleset.inheritedRules as inheritedRuleRef>
+			<@ruleLib.ruleRefOwningSummaryJSON ruleRef=inheritedRuleRef />
+			<#if inheritedRuleRef_has_next>,</#if> 
+		</#list>
+		],
+		</#if>
+		<#if ruleset.linkedToRuleSet??>
+		"linkedToRuleSet" : "${"/api/node/" + ruleset.linkedToRuleSet.storeRef.protocol + "/" + ruleset.linkedToRuleSet.storeRef.identifier + "/" + ruleset.linkedToRuleSet.id + "/ruleset"}",		
+		</#if>
+		<#if ruleset.linkedFromRuleSets?? && ruleset.linkedFromRuleSets?size &gt; 0>
+		"linkedFromRuleSets" : 
+		[
+		<#list ruleset.linkedFromRuleSets as linkedFromRuleSet>
+			"${"/api/node/" + linkedFromRuleSet.storeRef.protocol + "/" + linkedFromRuleSet.storeRef.identifier + "/" + linkedFromRuleSet.id + "/ruleset"}"<#if linkedFromRuleSet_has_next>,</#if>
+		</#list>
+		],
+		</#if>
+		"url" : "${"/api/node/" + ruleset.rulesetNodeRef.storeRef.protocol + "/" + ruleset.rulesetNodeRef.storeRef.identifier + "/" + ruleset.rulesetNodeRef.id + "/ruleset"}"
+	}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/ruletypes.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/ruletypes.get.desc.xml
new file mode 100644
index 00000000000..6f6290a32b5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/ruletypes.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get rule type collection</shortname>
+  <description>Gets all Rule Types defined by the system.</description>
+  <url>/api/ruletypes</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/ruletypes.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/ruletypes.get.json.ftl
new file mode 100644
index 00000000000..35bfd1acbd8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/rule/ruletypes.get.json.ftl
@@ -0,0 +1,12 @@
+{
+	"data":
+	[
+<#list ruletypes as ruletype>
+	   {
+	      "name" : "${jsonUtils.encodeJSONString(ruletype.name)}",
+	      "displayLabel" : "${jsonUtils.encodeJSONString(ruletype.displayLabel)}",
+	      "url" : "${"/api/ruletypes/" + jsonUtils.encodeJSONString(ruletype.name)}"
+	   }<#if (ruletype_has_next)>,</#if>
+	</#list>
+	]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.atom.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.atom.ftl
new file mode 100644
index 00000000000..305eb6d2c0e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.atom.ftl
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:relevance="http://a9.com/-/opensearch/extensions/relevance/1.0/" xmlns:alf="http://www.alfresco.org/opensearch/1.0/">
+  <generator version="${server.version}">Alfresco (${server.edition})</generator>
+  <title>Alfresco Keyword Search: ${search.searchTerms?xml}</title> 
+  <updated>${xmldate(date)}</updated>
+  <icon>${absurl(url.context)}/images/logo/AlfrescoLogo16.ico</icon>
+  <author> 
+    <name><#if person??>${person.properties.userName}<#else>unknown</#if></name>
+  </author> 
+  <id>urn:uuid:${search.id}</id>
+  <opensearch:totalResults>${search.totalResults}</opensearch:totalResults>
+  <opensearch:startIndex>${search.startIndex}</opensearch:startIndex>
+  <opensearch:itemsPerPage>${search.itemsPerPage}</opensearch:itemsPerPage>
+  <opensearch:Query role="request" searchTerms="${search.searchTerms?xml}" startPage="${search.startPage}" count="${search.itemsPerPage}" language="${search.localeId}"/>
+  <link rel="alternate" href="${absurl(scripturl("?q=${search.searchTerms?url?xml}&p=${search.startPage}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="text/html"/>
+  <link rel="self" href="${absurl(scripturl("?q=${search.searchTerms?url?xml}&p=${search.startPage}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/>
+<#if search.startPage &gt; 1>
+  <link rel="first" href="${absurl(scripturl("?q=${search.searchTerms?url?xml}&p=1&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/>
+  <link rel="previous" href="${absurl(scripturl("?q=${search.searchTerms?url?xml}&p=${search.startPage - 1}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/>
+</#if>
+<#if search.startPage &lt; search.totalPages>
+  <link rel="next" href="${absurl(scripturl("?q=${search.searchTerms?url?xml}&p=${search.startPage + 1}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/> 
+  <link rel="last" href="${absurl(scripturl("?q=${search.searchTerms?url?xml}&p=${search.totalPages}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/>
+</#if>
+  <link rel="search" type="application/opensearchdescription+xml" href="${absurl(url.serviceContext)}/api/search/keyword/description.xml"/>
+<#list search.results as row>
+  <entry>
+    <title>${row.name?xml}</title>
+    <link rel="alternate" href="${absurl(url.serviceContext)}${row.url}"/>
+    <icon>${absurl(url.context)}${row.icon16}</icon>       <#comment>TODO: What's the standard for entry icons?</#comment>
+    <id>urn:uuid:${row.id}</id>
+    <alf:noderef>${row.nodeRef}</alf:noderef>
+    <updated>${xmldate(row.properties.modified)}</updated>
+    <summary>${(row.properties.description!"")?html}</summary>
+    <author> 
+      <name>${row.properties.creator}</name>
+    </author>
+    <relevance:score>${row.score}</relevance:score>
+  </entry>
+</#list>
+</feed>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.desc.xml
new file mode 100644
index 00000000000..f6340291458
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.desc.xml
@@ -0,0 +1,13 @@
+<webscript>
+  <shortname>Alfresco keyword search (OpenSearch enabled)</shortname>
+  <description>Executes a keyword search against the Alfresco repository (Company Home and below).</description>
+  <url>/api/search/keyword.html?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}</url>
+  <url>/search/keyword.html?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}</url>
+  <url>/api/search/keyword.atom?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}</url>
+  <url>/search/keyword.atom?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}</url>
+  <url>/api/search/keyword.rss?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}</url>
+  <url>/search/keyword.rss?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}</url>
+  <authentication>guest</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.html.ftl
new file mode 100644
index 00000000000..d45af825ab3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.html.ftl
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head profile="http://a9.com/-/spec/opensearch/1.1/"> 
+    <title>Alfresco Keyword Search: ${search.searchTerms?html}</title> 
+    <link rel="stylesheet" href="${url.context}/css/main.css" TYPE="text/css">
+    <link rel="search" type="application/opensearchdescription+xml" href="${url.serviceContext}/api/search/keyword/description.xml" title="Alfresco Keyword Search"/>
+    <meta name="totalResults" content="${search.totalResults}"/>
+    <meta name="startIndex" content="${search.startIndex}"/>
+    <meta name="itemsPerPage" content="${search.itemsPerPage}"/>
+  </head>
+  <body>
+    <table>
+      <tr>
+        <td><img src="${url.context}/images/logo/AlfrescoLogo32.png" alt="Alfresco" /></td>
+        <td><nobr><span class="mainTitle">Alfresco Keyword Search</span></nobr></td>
+     </tr>
+    </table>
+    <br>
+    <table>
+      <tr>
+        <td>Results <b>${search.startIndex}</b> - <b><#if search.startIndex == 0>0<#else>${search.startIndex + search.totalPageItems - 1}</#if></b> of <b>${search.totalResults}</b> for <b>${search.searchTerms?html}</b> visible to user <b><#if person??>${person.properties.userName}<#else>unknown</#if>.</b></td>
+     </tr>
+    </table>
+    <br>
+    <table>
+<#list search.results as row>            
+      <tr>
+      <td><img src="${url.context}${row.icon16}"/></td><td><a href="${url.serviceContext}${row.url}">${row.name}</a></td>
+      </tr>
+      <#if row.properties.description?? == true>
+      <tr>
+      <td></td>
+      <td>${row.properties.description?html}</td>
+      </tr>
+      </#if>
+</#list>
+    </table>
+    <br>
+    <table>
+      <tr>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=1&c=${search.itemsPerPage}&l=${search.localeId?url}")}">first</a></td>
+<#if search.startPage &gt; 1>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.startPage - 1}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">previous</a></td>
+</#if>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.startPage}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">${search.startPage}</a></td>
+<#if search.startPage &lt; search.totalPages>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.startPage + 1}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">next</a></td>
+</#if>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.totalPages}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">last</a></td>
+      </tr>
+    </table>
+  </body>
+</html>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.portlet.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.portlet.ftl
new file mode 100644
index 00000000000..9457fd24227
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.portlet.ftl
@@ -0,0 +1,33 @@
+    <table>
+      <tr>
+        <td>Results <b>${search.startIndex}</b> - <b>${search.startIndex + search.totalPageItems - 1}</b> of <b>${search.totalResults}</b> for <b>${search.searchTerms?html}</b> visible to user <b><#if person??>${person.properties.userName}<#else>unknown</#if>.</b></td>
+     </tr>
+    </table>
+    <br>
+    <table>
+<#list search.results as row>            
+      <tr>
+      <td><img src="${url.context}${row.icon16}"/></td><td><a href="${url.serviceContext}${row.url}">${row.name?html}</a></td>
+      </tr>
+      <#if row.properties.description?? == true>
+      <tr>
+      <td></td>
+      <td>${row.properties.description?html}</td>
+      </tr>
+      </#if>
+</#list>
+    </table>
+    <br>
+    <table>
+      <tr>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=1&c=${search.itemsPerPage}&l=${search.localeId?url}")}">first</a></td>
+<#if search.startPage &gt; 1>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.startPage - 1}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">previous</a></td>
+</#if>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.startPage}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">${search.startPage}</a></td>
+<#if search.startPage &lt; search.totalPages>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.startPage + 1}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">next</a></td>
+</#if>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.totalPages}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">last</a></td>
+      </tr>
+    </table>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.query_.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.query_.ftl
new file mode 100644
index 00000000000..b9c6b87c637
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.query_.ftl
@@ -0,0 +1,11 @@
+(
+  TYPE:"{http://www.alfresco.org/model/content/1.0}content" AND 
+  (
+<#list 1..terms?size as i>
+      @\{http\://www.alfresco.org/model/content/1.0\}name:"${terms[i - 1]}"
+</#list>
+<#list 1..terms?size as i>
+      TEXT:"${terms[i - 1]}"
+</#list>
+  )
+)
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.rss.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.rss.ftl
new file mode 100644
index 00000000000..a99161c096e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearch.get.rss.ftl
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">
+<channel>
+  <title>Alfresco Keyword Search: ${search.searchTerms?xml}</title>
+  <link>${absurl(scripturl("?q=${search.searchTerms?url}&p=${search.startPage}&c=${search.itemsPerPage}&l=${search.localeId?url}")?xml)}"</link>
+  <description>Alfresco Keyword Search: ${search.searchTerms?xml}</description>
+  <language>${search.localeId?xml}</language>
+  <lastBuildDate>${xmldate(date)}</lastBuildDate>
+  <pubDate>${xmldate(date)}</pubDate>
+  <generator>Alfresco ${server.edition} v${server.version}</generator>
+  <image>
+    <title>Alfresco Search: ${search.searchTerms?xml}</title>
+    <width>16</width>
+    <height>16</height>
+    <url>${absurl(url.context)}/images/logo/AlfrescoLogo16.ico)}</url>
+  </image>
+  <opensearch:totalResults>${search.totalResults}</opensearch:totalResults>
+  <opensearch:startIndex>${search.startIndex}</opensearch:startIndex>
+  <opensearch:itemsPerPage>${search.itemsPerPage}</opensearch:itemsPerPage>
+  <opensearch:Query role="request" searchTerms="${search.searchTerms?xml}" startPage="${search.startPage}" count="${search.itemsPerPage}" language="${search.localeId?xml}"/>
+  <atom:link rel="self" href="${absurl(scripturl("?q=${search.searchTerms?url}&p=${search.startPage}&c=${search.itemsPerPage}&l=${search.localeId?url}")?xml)}" type="application/atom+xml"/>
+<#if search.startPage &gt; 1>
+  <atom:link rel="first" href="${absurl(scripturl("?q=${search.searchTerms?url}&p=1&c=${search.itemsPerPage}&l=${search.localeId?url}")?xml)}" type="application/atom+xml"/>
+  <atom:link rel="previous" href="${absurl(scripturl("?q=${search.searchTerms?url}&p=${search.startPage - 1}&c=${search.itemsPerPage}&l=${search.localeId?url}")?xml)}" type="application/atom+xml"/>
+</#if>
+<#if search.startPage &lt; search.totalPages>
+  <atom:link rel="next" href="${absurl(scripturl("?q=${search.searchTerms?url}&p=${search.startPage + 1}&c=${search.itemsPerPage}&l=${search.localeId?url}")?xml)}" type="application/atom+xml"/> 
+  <atom:link rel="last" href="${absurl(scripturl("?q=${search.searchTerms?url}&p=${search.totalPages}&c=${search.itemsPerPage}&l=${search.localeId?url}")?xml)}" type="application/atom+xml"/>
+</#if>
+  <atom:link rel="search" type="application/opensearchdescription+xml" href="${absurl(url.serviceContext)}/api/search/keyword/description.xml"/>
+<#list search.results as row>            
+  <item>
+    <title>${row.name?xml}</title>
+    <link>${absurl(url.serviceContext)}${row.url}</link>
+    <description>${(row.properties.description!"")?html}</description>
+    <pubDate>${xmldate(row.properties.modified)}</pubDate>
+    <guid isPermaLink="false">${row.id}</guid>
+  </item>
+</#list>
+</channel>
+</rss>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearchdescription.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearchdescription.get.desc.xml
new file mode 100644
index 00000000000..bd209d145b2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearchdescription.get.desc.xml
@@ -0,0 +1,8 @@
+<webscript>
+  <shortname>Get keyword search description</shortname>
+  <description>Gets an OpenSearch description document for an Alfresco repository keyword search.</description>
+  <url>/api/search/keyword/description.xml</url>
+  <url>/search/keyword/description.xml</url>
+  <format default="opensearchdescription">argument</format>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearchdescription.get.opensearchdescription.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearchdescription.get.opensearchdescription.ftl
new file mode 100644
index 00000000000..6033f249a81
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/keywordsearchdescription.get.opensearchdescription.ftl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:alf="http://www.alfresco.org">
+  <ShortName>Alfresco Keyword Search</ShortName>
+  <LongName>Alfresco ${server.edition} Keyword Search ${server.version}</LongName>
+  <Description>Search Alfresco "company home" using keywords</Description>
+  <#comment>IE takes first template from list, thus html response is listed first</#comment>
+  <Url type="text/html" template="${absurl(url.serviceContext)}/api/search/keyword?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}"/>
+  <Url type="application/atom+xml" template="${absurl(url.serviceContext)}/api/search/keyword.atom?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}"/>
+  <Url type="application/rss+xml" template="${absurl(url.serviceContext)}/api/search/keyword.rss?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}"/>
+  <Image height="16" width="16" type="image/x-icon">${absurl(url.context)}/images/logo/AlfrescoLogo16.ico</Image>
+</OpenSearchDescription>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.atom.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.atom.ftl
new file mode 100644
index 00000000000..a5084f31ab0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.atom.ftl
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:relevance="http://a9.com/-/opensearch/extensions/relevance/1.0/" xmlns:alf="http://www.alfresco.org/opensearch/1.0/">
+  <generator version="${server.version}">Alfresco (${server.edition})</generator>
+  <title>Alfresco Person Search: ${search.searchTerms?xml}</title>
+  <updated>${xmldate(date)}</updated>
+  <icon>${absurl(url.context)}/images/logo/AlfrescoLogo16.ico</icon>
+  <author> 
+    <name><#if person??>${person.properties.userName}<#else>unknown</#if></name>
+  </author> 
+  <id>urn:uuid:${search.id}</id>
+  <opensearch:totalResults>${search.totalResults}</opensearch:totalResults>
+  <opensearch:startIndex>${search.startIndex}</opensearch:startIndex>
+  <opensearch:itemsPerPage>${search.itemsPerPage}</opensearch:itemsPerPage>
+  <opensearch:Query role="request" searchTerms="${search.searchTerms?xml}" startPage="${search.startPage}" count="${search.itemsPerPage}" language="${search.localeId}"/>
+  <link rel="alternate" href="${absurl(scripturl("?q=${search.searchTerms?url?xml}&p=${search.startPage}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="text/html"/>
+  <link rel="self" href="${absurl(scripturl("?q=${search.searchTerms?url?xml}&p=${search.startPage}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/>
+<#if search.startPage &gt; 1>
+  <link rel="first" href="${absurl(scripturl("?q=${search.searchTerms?url?xml}&p=1&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/>
+  <link rel="previous" href="${absurl(scripturl("?q=${search.searchTerms?url?xml}&p=${search.startPage - 1}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/>
+</#if>
+<#if search.startPage &lt; search.totalPages>
+  <link rel="next" href="${absurl(scripturl("?q=${search.searchTerms?url?xml}&p=${search.startPage + 1}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/>
+  <link rel="last" href="${absurl(scripturl("?q=${search.searchTerms?url?xml}&p=${search.totalPages}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/>
+</#if>
+  <link rel="search" type="application/opensearchdescription+xml" href="${absurl(url.serviceContext)}/api/search/person/description.xml"/>
+<#list search.results as row>
+  <entry>
+    <title><#if row.properties.firstName??>${row.properties.firstName?xml}</#if> <#if row.properties.lastName??>${row.properties.lastName?xml}</#if></title>
+    <link rel="alternate" href="${absurl(url.context)}/c/ui/userprofile?id=${row.id}"/>
+<#if row.assocs["cm:avatar"]?exists>
+    <icon>${absurl(url.context)}${row.assocs["cm:avatar"][0].url}</icon>
+<#else>
+    <icon>${absurl(url.context)}/images/icons/user_large.gif</icon>
+</#if>
+    <id>urn:uuid:${row.id}</id>
+    <updated>${xmldate(row.properties.modified)}</updated>
+    <summary>
+       <#if row.properties.jobtitle??>${row.properties.jobtitle?xml},</#if>
+       <#if row.properties.organization??>${row.properties.organization?xml},</#if>
+       <#if row.properties.location??>${row.properties.location?xml},</#if>
+       <#if row.properties.persondescription??>${row.properties.persondescription.content?xml}</#if>
+    </summary>
+    <relevance:score>${row.score}</relevance:score>
+  </entry>
+</#list>
+</feed>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.desc.xml
new file mode 100644
index 00000000000..a5d4b0f88ee
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.desc.xml
@@ -0,0 +1,13 @@
+<webscript>
+  <shortname>Alfresco person search (OpenSearch enabled)</shortname>
+  <description>Execute a person Search against the Alfresco repository.</description>
+  <url>/api/search/person.html?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}</url>
+  <url>/search/person.html?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}</url>
+  <url>/api/search/person.atom?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}</url>
+  <url>/search/person.atom?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}</url>
+  <url>/api/search/person.rss?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}</url>
+  <url>/search/person.rss?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}</url>
+  <authentication>guest</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.html.ftl
new file mode 100644
index 00000000000..5f10018abfb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.html.ftl
@@ -0,0 +1,61 @@
+<html>
+  <head profile="http://a9.com/-/spec/opensearch/1.1/"> 
+    <title>Alfresco Person Search: ${search.searchTerms?html}</title>
+    <link rel="stylesheet" href="${url.context}/css/main.css" TYPE="text/css">
+    <link rel="search" type="application/opensearchdescription+xml" href="${url.serviceContext}/api/search/person/description.xml" title="Alfresco Person Search"/>
+    <meta name="totalResults" content="${search.totalResults}"/>
+    <meta name="startIndex" content="${search.startIndex}"/>
+    <meta name="itemsPerPage" content="${search.itemsPerPage}"/>
+  </head>
+  <body>
+    <table>
+      <tr>
+        <td><img src="${url.context}/images/logo/AlfrescoLogo32.png" alt="Alfresco" /></td>
+        <td><nobr><span class="mainTitle">Alfresco Person Search</span></nobr></td>
+     </tr>
+    </table>
+    <br>
+    <table>
+      <tr>
+        <td>Results <b>${search.startIndex}</b> - <b><#if search.startIndex == 0>0<#else>${search.startIndex + search.totalPageItems - 1}</#if></b> of <b>${search.totalResults}</b> for <b>${search.searchTerms?html}</b> visible to user <b><#if person??>${person.properties.userName}<#else>unknown</#if>.</b></td>
+     </tr>
+    </table>
+    <br>
+    <table>
+<#list search.results as row>            
+      <tr>
+      <#if (row.assocs["cm:avatar"]?exists)>
+      		<#assign avatarURL = row.assocs["cm:avatar"][0].url>
+   	  <#else>
+      		<#assign avatarURL = "/images/icons/default_avatar.png">
+   	  </#if>
+      <td><img src="${absurl(url.context)}${avatarURL}"/></td>
+      <td><a href="${absurl(url.context)}/c/ui/userprofile?id=${row.id}"><#if row.properties.firstName??>${row.properties.firstName?html}</#if><#if row.properties.lastName??> ${row.properties.lastName?html}</#if></a></td>
+      </tr>
+      <tr>
+      <td></td>
+      <td>
+         <#if row.properties.jobtitle??>${row.properties.jobtitle?html},</#if>
+         <#if row.properties.organization??>${row.properties.organization?html},</#if>
+         <#if row.properties.location??>${row.properties.location?html},</#if>
+         <#if row.properties.persondescription??>${row.properties.persondescription.content?html}</#if>
+      </td>
+      </tr>
+</#list>
+    </table>
+    <br>
+    <table>
+      <tr>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=1&c=${search.itemsPerPage}&l=${search.localeId?url}")}">first</a></td>
+<#if search.startPage &gt; 1>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.startPage - 1}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">previous</a></td>
+</#if>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.startPage}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">${search.startPage}</a></td>
+<#if search.startPage &lt; search.totalPages>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.startPage + 1}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">next</a></td>
+</#if>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.totalPages}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">last</a></td>
+      </tr>
+    </table>
+  </body>
+</html>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.portlet.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.portlet.ftl
new file mode 100644
index 00000000000..9af76d06a7a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.portlet.ftl
@@ -0,0 +1,43 @@
+    <table>
+      <tr>
+        <td>Results <b>${search.startIndex}</b> - <b>${search.startIndex + search.totalPageItems - 1}</b> of <b>${search.totalResults}</b> for <b>${search.searchTerms?html}</b> visible to user <b><#if person??>${person.properties.userName}<#else>unknown</#if>.</b></td>
+     </tr>
+    </table>
+    <br>
+    <table>
+<#list search.results as row>  
+
+      <#if (row.assocs["cm:avatar"]?exists)>
+      		<#assign avatarURL = row.assocs["cm:avatar"][0].url>
+   	  <#else>
+      		<#assign avatarURL = "/images/icons/default_avatar.png">
+   	  </#if>
+      <tr>
+      <td><img src="${absurl(url.context)}${avatarURL}"/></td>
+      <td><a href="${absurl(url.context)}/c/ui/userprofile?id=${row.id}"><#if row.properties.firstName??>${row.properties.firstName}</#if><#if row.properties.lastName??> ${row.properties.lastName} </#if></a></td>
+      </tr>
+      <tr>
+      <td></td>
+      <td>
+         <#if row.properties.jobtitle??>${row.properties.jobtitle},</#if>
+         <#if row.properties.organization??>${row.properties.organization},</#if>
+         <#if row.properties.location??>${row.properties.location},</#if>
+         <#if row.properties.persondescription??>${row.properties.persondescription.content}</#if>
+      </td>
+      </tr>
+</#list>
+    </table>
+    <br>
+    <table>
+      <tr>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=1&c=${search.itemsPerPage}&l=${search.localeId?url}")}">first</a></td>
+<#if search.startPage &gt; 1>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.startPage - 1}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">previous</a></td>
+</#if>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.startPage}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">${search.startPage}</a></td>
+<#if search.startPage &lt; search.totalPages>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.startPage + 1}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">next</a></td>
+</#if>
+        <td><a href="${scripturl("?q=${search.searchTerms?url}&p=${search.totalPages}&c=${search.itemsPerPage}&l=${search.localeId?url}")}">last</a></td>
+      </tr>
+    </table>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.query_.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.query_.ftl
new file mode 100644
index 00000000000..05bc84f3adb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.query_.ftl
@@ -0,0 +1,11 @@
+(
+  TYPE:"{http://www.alfresco.org/model/content/1.0}person" AND
+  (
+<#list 1..terms?size as i>
+      d\:content:"${terms[i - 1]}"
+</#list>
+<#list 1..terms?size as i>
+      d\:text:"${terms[i - 1]}*"
+</#list>
+  )
+)
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.rss.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.rss.ftl
new file mode 100644
index 00000000000..729c7aa9b53
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.rss.ftl
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">
+<channel>
+  <title>Alfresco Person Search: ${search.searchTerms}</title>
+  <link>${absurl(scripturl("?q=${search.searchTerms?url}&p=${search.startPage}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}"</link>
+  <description>Alfresco Person Search: ${search.searchTerms}</description>
+  <language>${search.localeId}</language>
+  <lastBuildDate>${xmldate(date)}</lastBuildDate>
+  <pubDate>${xmldate(date)}</pubDate>
+  <generator>Alfresco ${server.edition} v${server.version}</generator>
+  <image>
+    <title>Alfresco Search: ${search.searchTerms}</title>
+    <width>16</width>
+    <height>16</height>
+    <url>${absurl(url.context)}/images/logo/AlfrescoLogo16.ico)}</url>
+  </image>
+  <opensearch:totalResults>${search.totalResults}</opensearch:totalResults>
+  <opensearch:startIndex>${search.startIndex}</opensearch:startIndex>
+  <opensearch:itemsPerPage>${search.itemsPerPage}</opensearch:itemsPerPage>
+  <opensearch:Query role="request" searchTerms="${search.searchTerms}" startPage="${search.startPage}" count="${search.itemsPerPage}" language="${search.localeId}"/>
+  <atom:link rel="self" href="${absurl(scripturl("?q=${search.searchTerms?url}&p=${search.startPage}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/>
+<#if search.startPage &gt; 1>
+  <atom:link rel="first" href="${absurl(scripturl("?q=${search.searchTerms?url}&p=1&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/>
+  <atom:link rel="previous" href="${absurl(scripturl("?q=${search.searchTerms?url}&p=${search.startPage - 1}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/>
+</#if>
+<#if search.startPage &lt; search.totalPages>
+  <atom:link rel="next" href="${absurl(scripturl("?q=${search.searchTerms?url}&p=${search.startPage + 1}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/> 
+  <atom:link rel="last" href="${absurl(scripturl("?q=${search.searchTerms?url}&p=${search.totalPages}&c=${search.itemsPerPage}&l=${search.localeId}")?xml)}" type="application/atom+xml"/>
+</#if>
+  <atom:link rel="search" type="application/opensearchdescription+xml" href="${absurl(url.serviceContext)}/api/search/person/description.xml"/>
+<#list search.results as row>            
+  <item>
+    <title>${row.firstName} ${row.lastName}</title>
+    <link>${absurl(url.context)}/c/ui/userprofile?id=${row.id}</link>
+    <description>
+      <#if row.properties.jobtitle??>${row.properties.jobtitle},</#if>
+      <#if row.properties.organization??>${row.properties.organization},</#if>
+      <#if row.properties.location??>${row.properties.location},</#if>
+      <#if row.properties.persondescription??>${row.properties.persondescription.content}</#if>
+    </description>
+    <pubDate>${xmldate(row.properties.modified)}</pubDate>
+    <guid isPermaLink="false">${row.id}</guid>
+  </item>
+</#list>
+</channel>
+</rss>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearchdescription.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearchdescription.get.desc.xml
new file mode 100644
index 00000000000..c6df05c0936
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearchdescription.get.desc.xml
@@ -0,0 +1,8 @@
+<webscript>
+  <shortname>Get person search description</shortname>
+  <description>Gets an OpenSearch description document for an Alfresco repository person search.</description>
+  <url>/api/search/person/description.xml</url>
+  <url>/search/person/description.xml</url>
+  <format default="opensearchdescription">argument</format>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearchdescription.get.opensearchdescription.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearchdescription.get.opensearchdescription.ftl
new file mode 100644
index 00000000000..68da921b5af
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/personsearchdescription.get.opensearchdescription.ftl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:alf="http://www.alfresco.org">
+  <ShortName>Alfresco Person Search</ShortName>
+  <LongName>Alfresco ${server.edition} Person Search ${server.version}</LongName>
+  <Description>Search Alfresco People using keywords</Description>
+  <#comment>IE takes first template from list, thus html response is listed first</#comment>
+  <Url type="text/html" template="${absurl(url.serviceContext)}/api/search/person?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}"/>
+  <Url type="application/atom+xml" template="${absurl(url.serviceContext)}/api/search/person.atom?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}"/>
+  <Url type="application/rss+xml" template="${absurl(url.serviceContext)}/api/search/person.rss?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}"/>
+  <Image height="16" width="16" type="image/x-icon">${absurl(url.context)}/images/logo/AlfrescoLogo16.ico</Image>
+</OpenSearchDescription>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/searchengines.get.atom.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/searchengines.get.atom.ftl
new file mode 100644
index 00000000000..b5844d80d6f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/searchengines.get.atom.ftl
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/">
+  <generator version="${server.version}">Alfresco (${server.edition})</generator>
+  <title>Registered Search Engines</title> 
+  <updated>${xmldate(date)}</updated>
+  <icon>${absurl(url.context)}/images/logo/AlfrescoLogo16.ico</icon>
+  <author> 
+    <name><#if person??>${person.properties.userName}<#else>unknown</#if></name>
+  </author> 
+  <id>${absurl(url.full)?xml}</id>
+<#list engines as engine>
+  <entry>
+    <title>${engine.label}</title>
+    <link rel="alternate" type="${engine.type}" href="${absurl(url.serviceContext)}${engine.url?xml}" title="${engine.label}"/>
+    <summary><#if engine.urlType == "description">OpenSearch Description<#else>Template URL</#if> - ${engine.type}</summary>
+    <id>${absurl(url.serviceContext)}${engine.url?xml}</id>
+    <updated>${xmldate(date)}</updated>
+  </entry>
+</#list>
+</feed>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/searchengines.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/searchengines.get.desc.xml
new file mode 100644
index 00000000000..67981744f6c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/searchengines.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>List search engines</shortname>
+  <description>Lists the "search engines" registered with this Alfresco repository.</description>
+  <url>/api/search/engines?type={type?}</url>
+  <url>/search/engines?type={type?}</url>
+  <url>/api/search/engines.atom?type={type?}</url>
+  <url>/search/engines.atom?type={type?}</url>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/searchengines.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/searchengines.get.html.ftl
new file mode 100644
index 00000000000..63b6cf435d9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/searchengines.get.html.ftl
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head profile="http://a9.com/-/spec/opensearch/1.1/"> 
+    <link rel="stylesheet" href="${url.context}/css/main.css" TYPE="text/css">
+    <title>Alfresco Registered Search Engines</title>
+<#list engines as engine>
+<#if engine.urlType == "description">
+    <link rel="search" type="${engine.type}" href="${url.serviceContext}${engine.url}" title="${engine.label?html}">
+</#if>
+</#list>
+  </head>
+  <body>
+    <table>
+      <tr>
+        <td><img src="${url.context}/images/logo/AlfrescoLogo32.png" alt="Alfresco" /></td>
+        <td><nobr><span class="mainTitle">Alfresco Registered Search Engines</span></nobr></td>
+     </tr>
+    </table>
+    <br>
+    <table border="0" cellpadding="4">
+      <tr align="left"><td><b>Engine<td><b>URL Type<td><b>Response Format</tr>
+<#list engines as engine>
+      <tr align="left">
+        <td><a href="${url.serviceContext}${engine.url}">${engine.label?html}</a>
+        <td><#if engine.urlType == "description">OpenSearch Description<#else>Template URL</#if>
+        <td>${engine.type}
+      </tr>
+</#list>
+    </table>
+  </body>
+</html>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/searchproxy.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/searchproxy.get.desc.xml
new file mode 100644
index 00000000000..86e6ff49895
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/search/searchproxy.get.desc.xml
@@ -0,0 +1,8 @@
+<webscript>
+  <shortname>Proxied (OpenSearch) Search</shortname>
+  <description>Search engine proxy for issuing a search against a remote search engine</description>
+  <url>/api/search/engine/{engine}/{format}</url>
+  <url>/search/engine/{engine}/{format}</url>
+  <format default=""/>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/searchutils.lib.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/searchutils.lib.js
new file mode 100644
index 00000000000..bd3283b5cf2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/searchutils.lib.js
@@ -0,0 +1,64 @@
+/*
+ * Search related utility functions
+ */
+
+const FUTURE_DATE = "3000\\-12\\-31T00:00:00";
+const ZERO_DATE = "1970\\-01\\-01T00:00:00";
+
+/**
+ * Returns the date object for the date "numdays" ago
+ */
+function getTodayMinusXDays(numdays)
+{
+   var date = new Date();
+   var dateMillis = new Date().getTime();
+   dateMillis -= 1000 * 60 * 60 * 24 * numdays;
+   date.setTime(dateMillis);
+   
+   // PENDING: should it be from the beginning of the date or exactly x days back?
+   
+   return date;
+}
+
+
+/**
+ * Returns the date string as required by Lucene,
+ * thus in the format "1970\\-01\\-01T00:00:00"
+ *
+ * Note: hours/minutes/seconds are currently NOT taken into account
+ */
+function getLuceneDateString(date)
+{
+   var temp = new Date();
+   temp.setTime(Date.parse(date));
+   return temp.getFullYear() + "-" + (temp.getMonth() + 1) + "\\-" +
+     (temp.getDate() < 10 ? "0" + temp.getDate() : temp.getDate()) + "T00:00:00";
+}
+
+/**
+ * Returns the creation date range query for the given dates.
+ */
+function getCreationDateRangeQuery(fromDate, toDate)
+{
+   var luceneQuery = " +@cm\\:created:[";
+   if (fromDate !== null && ! isNaN(fromDate.getTime()))
+   {
+      luceneQuery += getLuceneDateString(fromDate);
+   }
+   else
+   {
+      luceneQuery += ZERO_DATE;
+   }
+   luceneQuery += " TO ";
+   if (toDate !== null && ! isNaN(toDate.getTime()))
+   {
+      luceneQuery += getLuceneDateString(toDate);
+   }
+   else
+   {
+      luceneQuery += FUTURE_DATE;
+   }
+   luceneQuery += "] ";
+   return luceneQuery;
+}
+
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/server.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/server.get.desc.xml
new file mode 100644
index 00000000000..d3cdf0d84d7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/server.get.desc.xml
@@ -0,0 +1,8 @@
+<webscript>
+   <shortname>Server version metadata</shortname>
+   <description>Provides information on the version and schema of the server.</description>
+   <url>/api/server</url>
+   <format default="json"/>
+   <authentication>none</authentication>
+   <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/server.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/server.get.json.ftl
new file mode 100644
index 00000000000..85b30dd0db2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/server.get.json.ftl
@@ -0,0 +1,8 @@
+{
+   "data":
+   {
+      "edition": "${server.edition?js_string}",
+      "version": "${server.version?js_string}",
+      "schema": "${server.schema?c}"
+   }
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.delete.desc.xml
new file mode 100644
index 00000000000..df72ead0aa6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.delete.desc.xml
@@ -0,0 +1,22 @@
+<webscript>
+  <shortname>Cancel invitation</shortname>
+  <description><![CDATA[
+  Cancel an open invitation.
+  <BR>
+  Canceling an invitation immediatly stops the invitation. This is different to rejecting an 
+  invitation, which will result in the invitation workflow continuing to a normal but rejected conclusion.   
+  In particular, the approver or invitee are not notified if an invitation is canceled. 
+  <BR>
+  Only a site manager may cancel an nominated invitation.
+  <BR>
+  A site manager or the invitee may cancel a moderated invitation. 			
+  <BR>
+  Returns 200, STATUS_OK on success.
+  ]]>
+  </description>
+  <url>/api/sites/{shortname}/invitations/{invitationId}</url>
+  <format default="json"/>
+  <lifecycle>limited_support</lifecycle>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.delete.json.ftl
new file mode 100644
index 00000000000..9e26dfeeb6e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.delete.json.ftl
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.get.desc.xml
new file mode 100644
index 00000000000..960c72d3ca3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.get.desc.xml
@@ -0,0 +1,12 @@
+<webscript>
+  <shortname>Get invitation</shortname>
+  <description><![CDATA[
+  Get a single web site invitation.
+  ]]>
+  </description>
+  <url>/api/sites/{shortname}/invitations/{inviteId}</url>
+  <format default="json"/>
+  <lifecycle>limited_support</lifecycle>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.get.js
new file mode 100644
index 00000000000..1bcb4549226
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.get.js
@@ -0,0 +1,49 @@
+/**
+ * Get Invitation web script
+ */
+function main()
+{
+   // Get the site id
+   var urlElements = url.extension.split("/");
+   var shortName = urlElements[0];
+   var inviteId = urlElements[2];
+   
+   var site = siteService.getSite(shortName);
+   if (site == null)
+   {
+      // Site cannot be found
+      status.setCode(status.STATUS_NOT_FOUND, "The site " + shortName + " does not exist.");
+      return;
+   }
+   
+   var invitation = site.getInvitation(inviteId);
+   if (invitation == null)
+   {
+      // Site cannot be found
+      status.setCode(status.STATUS_NOT_FOUND, "The invitation :" + inviteId + " for web site :" + shortName + ", does not exist.");
+      return;
+   }
+   
+   var avatars = new Object();
+   // Get the avatar. 
+   var userName = invitation.inviteeUserName;
+   var person = people.getPerson(userName);
+   if (person != undefined && person !=null)
+   {
+      var assocs = person.assocs['{http://www.alfresco.org/model/content/1.0}avatar'];
+      if (assocs !=null && assocs.length>0)
+      {
+         var avatar = 'api/node/';
+         avatar = avatar + assocs[0].nodeRef.toString();
+         avatar = avatar + '/content/thumbnails/avatar';
+         avatars[userName] = avatar;
+      }
+   }
+   
+   // Pass the model to the template
+   model.invitation = invitation;
+   model.site = site;
+   model.avatars=avatars;
+}
+   
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.get.json.ftl
new file mode 100644
index 00000000000..1dee5928b72
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.get.json.ftl
@@ -0,0 +1,5 @@
+<#-- Get Invitation -->
+<#import "../../invitation/invitation.lib.ftl" as invitationLib/>
+{
+	"data":<@invitationLib.invitationJSON invitation=invitation  avatars=avatars />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.post.desc.xml
new file mode 100644
index 00000000000..ebdf9e0ebb1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.post.desc.xml
@@ -0,0 +1,44 @@
+<webscript>
+  <shortname>Create invitation for web site</shortname>
+  <description><![CDATA[
+  Create a new invitation for this web site.
+  <br />
+  For a Nominated Invitation, where an existing site member nominates someone else who is possibly not yet an alfresco user to become a member of this web site.
+  
+  <br />
+  For an existing user, the invitee is identified by inviteeUserName.   
+  For a user who does not have a userName a new account will be generated based upon 
+  	inviteeFirstName, inviteeLastName and inviteeEmail  
+  <br /> if inviteeUserName is specified then inviteeFirstName, inviteeLastName and inviteeEmail are ignored.
+  
+  <dl>
+   <dt>invitationType</dt><dd>mandatory - "NOMINATED"</dd>
+   <dt>inviteeFirstName</dt> <dd> optional </dd>
+   <dt>inviteeLastName</dt> <dd> optional </dd>
+   <dt>inviteeEmail</dt> <dd> optional </dd>
+   <dt>inviteeUserName</dt> <dd> optional </dd>
+   <dt>serverPath</dt><dd></dd>
+   <dt>acceptURL</dt><dd></dd>
+   <dt>rejectURL</dt><dd></dd>
+   <dt>inviteeRoleName</dt> <dd> mandatory what role to be given on this web site </dd>
+  </dl>
+
+  <br />
+  For a Moderated Invitation, where an existing user wants to be made a member of a moderated web site.
+  <dl> 
+  <dt>invitationType</dt><dd>mandatory - "MODERATED"</dd>
+  <dt>inviteeUserName</dt><dd>optional who wants to be invited to this web site? </dd>
+  <dt>inviteeComments</dt> <dd>mandatory (but can be blank) why do they want membership to this site ? </dd>
+  <dt>inviteeRoleName</dt> <dd>mandatory what role to be given on this web site </dd>
+  </dl>
+  <br /> 
+  
+  Returns HTTPStatus.Created (201) if an invitation is created. 
+    
+  ]]></description>
+  <url>/api/sites/{shortname}/invitations</url>
+  <format default="json"/>
+  <lifecycle>limited_support</lifecycle>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.post.json.ftl
new file mode 100644
index 00000000000..0abf2e916fe
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.post.json.ftl
@@ -0,0 +1,5 @@
+<#-- Create / Post / Invitation -->
+<#import "../../invitation/invitation.lib.ftl" as invitationLib/>
+{
+	"data":<@invitationLib.invitationJSON invitation=invitation outputTicket=true/>
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.post.json.js
new file mode 100644
index 00000000000..53f164aae28
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitation.post.json.js
@@ -0,0 +1,137 @@
+/**
+ * Create / Post / Invitation
+ */
+function main()
+{
+    var invitation = null;
+   
+   // Get the web site site 
+    var shortName = url.extension.split("/")[0];
+    var site = siteService.getSite(shortName);
+    if (site == null)
+    {
+        // Site cannot be found
+        status.setCode(status.STATUS_NOT_FOUND, "The site " + shortName + " does not exist.");
+        return;
+    }
+   
+    if (!json.has("invitationType"))
+    {
+        status.setCode(status.STATUS_BAD_REQUEST, "The invitationType has not been set.");
+        return;
+    }
+   
+   // Get the role 
+    var invitationType = json.get("invitationType");
+    if (invitationType == null || invitationType.length == 0)
+    {
+        status.setCode(status.STATUS_BAD_REQUEST, "The invitationType is null or empty.");
+        return;
+    }
+   
+    if (!invitationType.match("[MODERATED]|[NOMINATED]"))
+    {
+        status.setCode(status.STATUS_BAD_REQUEST, "The invitationType has does not have a correct value.");
+        return;
+    }
+
+    try
+    {
+        if (invitationType == "MODERATED")
+        {
+            // Check mandatory parameters and values
+            if (isNotDefinedOrEmpty(json, "inviteeRoleName"))
+            {
+                status.setCode(status.STATUS_BAD_REQUEST, "The inviteeRoleName has not been set.");
+                return;
+            }
+            if (isNotDefinedOrEmpty(json, "inviteeUserName"))
+            {
+                status.setCode(status.STATUS_BAD_REQUEST, "The inviteeUserName has not been set.");
+                return;
+            }
+            var inviteeComments = json.get("inviteeComments");
+            if (inviteeComments == null)
+            {
+                status.setCode(status.STATUS_BAD_REQUEST, "The inviteeComments has not been set.");
+                return;
+            }
+
+            var inviteeRoleName = json.get("inviteeRoleName");
+            var inviteeUserName = json.get("inviteeUserName");
+            var inviteeComments = json.get("inviteeComments");
+
+            invitation = site.inviteModerated(inviteeComments, inviteeUserName, inviteeRoleName);
+        }
+
+        if (invitationType == "NOMINATED")
+        {
+            // Check mandatory parameters and values
+            if (isNotDefinedOrEmpty(json, "inviteeRoleName"))
+            {
+                status.setCode(status.STATUS_BAD_REQUEST, "The inviteeRoleName has not been set.");
+                return;
+            }
+            var inviteeRoleName = json.get("inviteeRoleName");
+            var acceptUrl = json.get("acceptURL");
+            var rejectUrl = json.get("rejectURL");
+
+            // Get the optional properties
+            if (json.has("inviteeUserName") && json.get("inviteeUserName") && json.get("inviteeUserName").trim() != "")
+            {
+                invitation = site.inviteNominated(json.get("inviteeUserName"), inviteeRoleName, acceptUrl, rejectUrl);
+            } else
+            {
+                // Get mandatory properties
+                if (isNotDefinedOrEmpty(json, "inviteeFirstName"))
+                {
+                    status.setCode(status.STATUS_BAD_REQUEST, "The inviteeFirstName has not been set.");
+                    return;
+                }
+                if (isNotDefinedOrEmpty(json, "inviteeLastName"))
+                {
+                    status.setCode(status.STATUS_BAD_REQUEST, "The inviteeLastName has not been set.");
+                    return;
+                }
+                if (isNotDefinedOrEmpty(json, "inviteeEmail"))
+                {
+                    status.setCode(status.STATUS_BAD_REQUEST, "The inviteeEmail has not been set.");
+                    return;
+                }
+
+                var inviteeFirstName = json.get("inviteeFirstName");
+                var inviteeLastName = json.get("inviteeLastName");
+                var inviteeEmail = json.get("inviteeEmail");
+                invitation = site.inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, inviteeRoleName, acceptUrl,
+                        rejectUrl);
+            }
+        }
+   
+        // Pass the model to the results template
+        model.site = site;
+        model.invitation = invitation;
+
+        status.code = status.STATUS_CREATED;
+    } catch (e)
+    {
+        if (e.message && e.message.indexOf("org.alfresco.service.cmr.invitation.InvitationExceptionUserError") == 0)
+        {
+            e.code = status.STATUS_CONFLICT;
+        } else if (e.message && e.message.indexOf("org.alfresco.service.cmr.invitation.InvitationExceptionForbidden") == 0)
+        {
+            e.code = status.STATUS_FORBIDDEN;
+        } else
+        {
+            e.code = 500;
+            e.message = e.message + "Unexpected error occurred during starting invitation";
+        }
+        throw e;
+    }
+}
+
+function isNotDefinedOrEmpty(json, key)
+{
+    return (!json.has(key) || (json.get(key) == null || json.get(key).trim().length() == 0))
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitations.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitations.get.desc.xml
new file mode 100644
index 00000000000..078367f09f3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitations.get.desc.xml
@@ -0,0 +1,24 @@
+<webscript>
+  <shortname>List invitations</shortname>
+  <description><![CDATA[
+  Get a collecton of a site web invitations.
+  <br />
+  With no parameters, returns all open invitations for this web site. 
+  <br />
+  With inviteeUserName, returns all open invitations for this web site and invitee.
+  <br />
+  With invitationType, returns all open invitations of the specified type (Either NOMINATED or MODERATED).
+  
+  <br />
+  
+  Returns a JSON element 
+  
+  <br />
+  ]]>
+  </description>
+  <url>/api/sites/{shortname}/invitations?inviteeUserName={inviteeUserName?}&amp;invitationType={invitationType?}</url>
+  <format default="json"/>
+  <lifecycle>limited_support</lifecycle>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitations.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitations.get.js
new file mode 100644
index 00000000000..55189acd1d0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitations.get.js
@@ -0,0 +1,61 @@
+/**
+ * List invitations implementation
+ */
+function main ()
+{
+   // Get the site id
+   var urlElements = url.extension.split("/");
+   var shortName = urlElements[0];
+   
+   // Get the args
+   var inviteeUserName = args["inviteeUserName"];
+   var invitationType = args["invitationType"];
+   
+   var site = siteService.getSite(shortName);
+   if (site == null)
+   {
+      // Site cannot be found
+      status.setCode(status.STATUS_NOT_FOUND, "The site " + shortName + " does not exist.");
+      return;
+   }
+   
+   var props = {};
+   
+   if (inviteeUserName != null)
+   {
+      props.inviteeUserName = inviteeUserName
+   }
+   if (invitationType != null)
+   {
+      props.invitationType = invitationType
+   }
+   
+   var invites = site.listInvitations(props);
+   
+   //Get the avatars for the invitees.
+   var avatars = new Object();
+   for (var i = 0; i<invites.length; i++)
+   {
+      var invite = invites[i];
+      var userName = invite.inviteeUserName;
+      var person = people.getPerson(userName);
+      if (person != undefined && person !=null)
+      {
+         var assocs = person.assocs['{http://www.alfresco.org/model/content/1.0}avatar'];
+         if (assocs !=null && assocs.length>0)
+         {
+            var avatar = 'api/node/';
+            avatar = avatar + assocs[0].nodeRef.toString();
+            avatar = avatar + '/content/thumbnails/avatar';
+            avatars[userName] = avatar;
+         }
+      }
+   }
+
+   
+   // Pass the information to the template
+   model.invitations = invites;
+   model.avatars = avatars;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitations.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitations.get.json.ftl
new file mode 100644
index 00000000000..8108aa1ac79
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/invitation/invitations.get.json.ftl
@@ -0,0 +1,11 @@
+<#-- list / search / invitations -->
+
+<#import "../../invitation/invitation.lib.ftl" as invitationLib/>
+{
+	"data": [
+    	<#list invitations as invitation>	
+    		<@invitationLib.invitationJSON invitation=invitation avatars=avatars />
+	   	<#if invitation_has_next>,</#if>
+    	</#list>
+  	]
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.delete.desc.xml
new file mode 100644
index 00000000000..6e58f05b6d0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.delete.desc.xml
@@ -0,0 +1,13 @@
+<webscript>
+  <shortname>Delete Web site membership</shortname>
+  <description> <![CDATA[
+  Delete membership from a Web site.
+  <br />
+  'shortname' is the shortname of the Web site,  'authorityname' is the full authority name for the membership.
+  ]]></description>
+  <url>/api/sites/{shortname}/memberships/{authorityname}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.delete.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.delete.js
new file mode 100644
index 00000000000..b0f035bb9d7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.delete.js
@@ -0,0 +1,34 @@
+function main()
+{
+	// Get the url values
+	var urlElements = url.extension.split("/");
+	var shortName = urlElements[0];
+	var userName = urlElements[2];
+	
+	// Get the site
+	var site = siteService.getSite(shortName);
+	if (site == null)
+	{
+		// Site cannot be found
+		status.setCode(status.STATUS_NOT_FOUND, "The site " + shortName + " does not exist.");
+		return;
+	}
+	
+	// Remove the user from the site
+	try
+	{
+	   site.removeMembership(userName);
+	}
+	catch (e)
+	{
+	   // for a SiteServiceException - ensure it is not wrapped further
+	   var msg = e.message;
+	   if (msg.indexOf("SiteServiceException") != -1)
+      {
+         status.setCode(status.STATUS_INTERNAL_SERVER_ERROR, msg);
+      }
+      else throw e;
+	}
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.delete.json.ftl
new file mode 100644
index 00000000000..9e26dfeeb6e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.delete.json.ftl
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.get.desc.xml
new file mode 100644
index 00000000000..fb790fbb3d0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.get.desc.xml
@@ -0,0 +1,16 @@
+<webscript>
+  <shortname>Get Web site membership</shortname>
+  <description> <![CDATA[
+  Get the membership details for a user or group.
+  <br />
+  'shortname' is the shortname of the Web site,  'authorityname' is the full authority name for the membership.
+  <br />
+  Returns a membership or Status.NOT_FOUND(404)
+  
+  ]]></description>
+  <url>/api/sites/{shortname}/memberships/{authorityname}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.get.js
new file mode 100644
index 00000000000..bd0af0980fd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.get.js
@@ -0,0 +1,54 @@
+function main()
+{
+   // Get the url values
+   var urlElements = url.extension.split("/");
+   var shortName = urlElements[0];
+   var userName = urlElements[2];
+   
+   // Get the site
+   var site = siteService.getSite(shortName);
+   if (site == null)
+   {
+      // Site cannot be found
+      status.setCode(status.STATUS_NOT_FOUND, "The site " + shortName + " does not exist.");
+      return;
+   }
+   
+   var authority;
+   if (userName.match("^GROUP_"))
+   {   
+      authority = groups.getGroupForFullAuthorityName(userName);
+      if (authority == null)
+      {
+         // Person cannot be found
+         status.setCode(status.STATUS_NOT_FOUND, "The group with full  name " + userName + " does not exist.");
+         return;
+      }
+   }
+   else
+   {
+      authority = people.getPerson(userName);
+      if (authority == null)
+      {
+         // Person cannot be found
+         status.setCode(status.STATUS_NOT_FOUND, "The person with user name " + userName + " does not exist.");
+         return;
+      }
+   }
+   
+   // Get the role info for the user
+   var role = site.getMembersRoleInfo(userName);
+   if (role == null)
+   {
+      // Person is not a member of the site
+      status.setCode(status.STATUS_NOT_FOUND, "The person with user name " + userName + " is not a member of the site " + shortName);
+      return;
+   }
+   
+   // Pass the values to the template
+   model.site = site;
+   model.authority = authority;
+   model.role = role;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.get.json.ftl
new file mode 100644
index 00000000000..9a417aa9b50
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.get.json.ftl
@@ -0,0 +1,4 @@
+<#import "membership.lib.ftl" as membershipLib/>
+<@membershipLib.membershipJSON site=site role=role.memberRole authority=authority>
+	"isMemberOfGroup": ${role.memberOfGroup?string},
+</@membershipLib.membershipJSON>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.lib.ftl
new file mode 100644
index 00000000000..3a734c61eae
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.lib.ftl
@@ -0,0 +1,49 @@
+<#-- Web Site Membership renders an authority object which can be either a Java Script person or a Java Script group -->
+<#macro membershipJSON site role authority>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+	"role": "${role}",
+<#if authority.authorityType?? && authority.authorityType = "GROUP">
+<#-- this is a group authority type -->
+	"authority":
+	{
+		"authorityType": "${authority.authorityType}",
+		"shortName": "${authority.shortName}",
+		"fullName": "${authority.fullName!""}",
+		"displayName": "${authority.displayName}",
+		"url": "${url.serviceContext + "/api/groups/" + authority.shortName}"
+	},
+	"url": "${url.serviceContext + "/api/sites/" + site.shortName + "/memberships/" + authority.fullName!""}"
+<#else>
+<#-- this is a person authority type -->
+<#-- nested directive is used to add custom info about a person.e.g. if he belongs to a group? -->
+   <#nested>
+	"authority":
+	{
+		"authorityType": "USER",
+		"fullName": "${authority.properties.userName}",
+		"userName": "${authority.properties.userName}",
+		"firstName": "${authority.properties.firstName!""}",
+		"lastName": "${authority.properties.lastName!""}",
+	<#if authority.assocs["cm:avatar"]??>
+	   <#assign avatarNodeRef=authority.assocs["cm:avatar"][0].nodeRef?string/>
+		"avatar": "api/node/${avatarNodeRef?replace('://','/')}/content/thumbnails/avatar",
+		"avatarNode": "${avatarNodeRef}",
+	</#if>
+	<#if authority.properties.jobtitle??>
+		"jobtitle": "${authority.properties.jobtitle}",
+	</#if>
+	<#if authority.properties.organization??>
+		"organization": "${authority.properties.organization}",
+	</#if>
+	<#if authority.properties.userStatus??>
+		"userStatus": "${authority.properties.userStatus}",
+		"userStatusTime": { "iso8601": "${xmldate(authority.properties.userStatusTime)}"},
+	</#if>
+		"url": "${url.serviceContext + "/api/people/" + authority.properties.userName}"
+	},
+	"url": "${url.serviceContext + "/api/sites/" + site.shortName + "/memberships/" + authority.properties.userName}"
+</#if>
+}
+</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.desc.xml
new file mode 100644
index 00000000000..04e6d196876
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.desc.xml
@@ -0,0 +1,31 @@
+<webscript>
+  <shortname>Update Web site membership</shortname>
+  <description> <![CDATA[
+  Update the membership role for a user or group.
+  
+  <br />
+  'shortname' is the shortname of the web site
+  <br />
+  Required parameters,
+  <br />
+        role, mandatory String,  the new role name for this membership.
+  <br />
+        person object, with userName property
+  <br>
+  		OR      
+        group object, with fullName property
+  <br />
+    	OR      
+        authority object, with fullName property
+  <br />
+  
+  Returns: The new authority.
+  
+  ]]>
+  </description>
+  <url>/api/sites/{shortname}/memberships</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.json.ftl
new file mode 100644
index 00000000000..fc6c8305e4c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.json.ftl
@@ -0,0 +1,2 @@
+<#import "membership.lib.ftl" as membershipLib/>
+<@membershipLib.membershipJSON site=site role=role authority=authority/>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.json.js
new file mode 100644
index 00000000000..15144de0e30
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/membership.put.json.js
@@ -0,0 +1,123 @@
+function main()
+{
+   // Get the site 
+   var shortName = url.extension.split("/")[0];
+   var site = siteService.getSite(shortName);
+   if (site == null)
+   {
+      // Site cannot be found
+      status.setCode(status.STATUS_NOT_FOUND, "The site " + shortName + " does not exist.");
+      return;
+   }
+   
+   // Get the role 
+   var role = json.get("role");
+   if (role == null)
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "The role has not been set.");
+      return;
+   }
+   
+   // Are we adding a person?
+   if (json.has("person"))
+   {
+      // Get the user name
+      var userName = json.getJSONObject("person").get("userName");
+      if (userName == null)
+      {
+         status.setCode(status.STATUS_BAD_REQUEST, "The user name has not been set.");
+         return;
+      }
+      var person = people.getPerson(userName);
+      if (person == null)
+      {
+         status.setCode(status.STATUS_BAD_REQUEST, "The person with user name " + userName + " could not be found.");
+         return;
+      }
+   
+      // Set the membership details
+      site.setMembership(userName, role);
+      // Pass the details to the template
+      model.site = site;
+      model.role = role;
+      model.authority = person;
+      return;
+   }
+   
+   // Are we adding a group ?
+   if (json.has("group"))
+   {
+      // Get the user name
+      var groupName = json.getJSONObject("group").get("fullName");
+      if (groupName == null)
+      {
+         status.setCode(status.STATUS_BAD_REQUEST, "The fullName for the group has not been set.");
+         return;
+      }
+      
+      if (groupName.match("^GROUP_") == null)
+      {
+         status.setCode(status.STATUS_BAD_REQUEST, "Group Authority names should begin with 'GROUP_'.");
+         return;  
+      }
+         
+      var group = groups.getGroupForFullAuthorityName(groupName);
+      if (group == null)
+      {
+         status.setCode(status.STATUS_BAD_REQUEST, "The group with group name " + groupName + " could not be found.");
+         return;
+      }
+   
+      // Set the membership details
+      site.setMembership(groupName, role);
+      // Pass the details to the template
+      model.site = site;
+      model.role = role;
+      model.authority = group;
+      return;
+   }
+   
+   if (json.has("authority"))
+   {
+      // Get the user name
+      var authorityName = json.getJSONObject("authority").get("fullName");
+      if (authorityName == null)
+      {
+         status.setCode(status.STATUS_BAD_REQUEST, "The fullName for the authority has not been set.");
+         return;
+      }
+      
+      var authority;
+      if (authorityName.match("^GROUP_") != null)
+      {
+         // authority is a group
+         authority = groups.getGroupForFullAuthorityName(authorityName);
+      }
+      else
+      {
+         // assume a person
+         authority = people.getPerson(authorityName);
+      }
+      
+      if (authority == null)
+      {
+         status.setCode(status.STATUS_BAD_REQUEST, "The authority with name " + authorityName + " could not be found.");
+         return;
+      }
+      
+      // Set the membership details
+      site.setMembership(authorityName, role);
+      // Pass the details to the template
+      model.site = site;
+      model.role = role;
+      model.authority = authority;
+      
+      return;
+   }
+   
+   // Neither person or group specified.
+   status.setCode(status.STATUS_BAD_REQUEST, "person or group has not been set.");
+   return;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.get.desc.xml
new file mode 100644
index 00000000000..80c3a7bb13f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.get.desc.xml
@@ -0,0 +1,21 @@
+<webscript>
+  <shortname>List Web site memberships</shortname>
+  <description> <![CDATA[
+  Get a colleciton of a Web site memberships.
+   <br />
+  'shortname' is the shortname of the Web site
+  <br />
+  Parameters:
+  <ul>
+  <li>nf, Optional, namefilter</li>
+  <li>rf, Optional, rolefilter</li>
+  <li>size, Optional,  page size</li>
+  <li>authorityType, Optional, returns either GROUP or USER authorities.  If not specified returns all authorities.</li> 
+  </ul>
+  ]]></description>
+  <url>/api/sites/{shortname}/memberships?nf={namefilter?}&amp;rf={rolefilter?}&amp;size={pagesize?}&amp;pos={position?}&amp;authorityType={authorityType?}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.get.json.ftl
new file mode 100644
index 00000000000..6ab0aa3b4e7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.get.json.ftl
@@ -0,0 +1,12 @@
+<#-- List memberships Implementation-->
+<#import "membership.lib.ftl" as membershipLib />
+
+<#assign userNames = memberInfo?keys />
+[
+<#list userNames as userName>		 	   
+	<@membershipLib.membershipJSON site=site role=memberInfo[userName].memberRole authority=authorities[userName]>
+	"isMemberOfGroup": ${memberInfo[userName].memberOfGroup?string},
+	</@membershipLib.membershipJSON>
+	<#if userName_has_next>,</#if>
+</#list>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.desc.xml
new file mode 100644
index 00000000000..c6ef9cfc68f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.desc.xml
@@ -0,0 +1,25 @@
+<webscript>
+  <shortname>Add Web site membership</shortname>
+  <description> <![CDATA[
+  Adds a new membership to the Web site.
+  <br />
+  'shortname' is the shortname of the web site,  'authorityname' is the full authority name for the membership.
+    Required parameters,
+  <br />
+        role, mandatory String,  the new role name for this membership.
+  <br />
+        person object, with userName property
+  <br>
+  		OR      
+        group object, with fullName property
+  <br />
+    	OR      
+        authority object, with fullName property
+  <br />
+  ]]></description>
+  <url>/api/sites/{shortname}/memberships</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.json.ftl
new file mode 100644
index 00000000000..fc6c8305e4c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.json.ftl
@@ -0,0 +1,2 @@
+<#import "membership.lib.ftl" as membershipLib/>
+<@membershipLib.membershipJSON site=site role=role authority=authority/>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.json.js
new file mode 100644
index 00000000000..3ba5932765d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/memberships.post.json.js
@@ -0,0 +1,86 @@
+function main()
+{
+	// Get the site 
+	var shortName = url.extension.split("/")[0];
+	var site = siteService.getSite(shortName);
+	if (site == null)
+	{
+		// Site cannot be found
+		status.setCode(status.STATUS_NOT_FOUND, "The site " + shortName + " does not exist.");
+		return;
+	}
+	
+	// Get the role 
+	var role = json.get("role");
+	if (role == null)
+	{
+		status.setCode(status.STATUS_BAD_REQUEST, "The role has not been set.");
+		return;
+	}
+	
+	// Are we adding a person ?
+	if (json.has("person"))
+	{
+		// Get the user name
+		var userName = json.getJSONObject("person").get("userName");
+		if (userName == null)
+		{
+			status.setCode(status.STATUS_BAD_REQUEST, "The user name has not been set.");
+			return;
+		}
+		var person = people.getPerson(userName);
+		if (person == null)
+		{
+			status.setCode(status.STATUS_BAD_REQUEST, "The person with user name " + userName + " could not be found.");
+			return;
+		}
+	
+		// Set the membership details
+		site.setMembership(userName, role);
+		// Pass the details to the template
+		model.site = site;
+		model.role = role;
+		model.authority = person;
+		return;
+	}
+	
+	// Are we adding a group ?
+	if (json.has("group"))
+	{
+		// Get the user name
+		var groupName = json.getJSONObject("group").get("fullName");
+		if (groupName == null)
+		{
+			status.setCode(status.STATUS_BAD_REQUEST, "The fullName for the group has not been set.");
+			return;
+		}
+		
+		if(groupName.match("^GROUP_") == null)
+		{
+			status.setCode(status.STATUS_BAD_REQUEST, "Group Authority names should begin with 'GROUP_'.");
+			return;	
+		}
+			
+		var group = groups.getGroupForFullAuthorityName(groupName);
+		if (group == null)
+		{
+			status.setCode(status.STATUS_BAD_REQUEST, "The group with group name " + groupName + " could not be found.");
+			return;
+		}
+	
+		// Set the membership details
+		site.setMembership(groupName, role);
+		// Pass the details to the template
+		model.site = site;
+		model.role = role;
+		model.authority = group;
+		return;
+	}
+	
+	// Neither person or group specified.
+	status.setCode(status.STATUS_BAD_REQUEST, "person or group has not been set.");
+	return;
+
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.desc.xml
new file mode 100644
index 00000000000..7d69e36c799
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.desc.xml
@@ -0,0 +1,21 @@
+<webscript>
+  <shortname>List potential Web site members</shortname>
+  <description> <![CDATA[
+  Get a colleciton of People and/or Groups who are not yet Site members.
+   <br />
+  'shortname' is the shortname of the web site
+  <br />
+  Parameters:
+  <ul>
+  <li>filter, Optional, filter</li>
+  <li>maxResults, Optional, maximum resultset to return</li>
+  <li>authorityType, Optional, returns either GROUP or USER authorities.  If not specified returns all authorities.</li> 
+  <li>zone, Optional, specifies group zone if including groups in query.</li> 
+  </ul>
+  ]]></description>
+  <url>/api/sites/{shortname}/potentialmembers?filter={filter?}&amp;maxResults={maxResults?}&amp;authorityType={authorityType?}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.js
new file mode 100644
index 00000000000..daa253a7d72
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.js
@@ -0,0 +1,99 @@
+function main()
+{
+   // Get the args
+   var siteShortName = url.templateArgs.shortname,
+      site = siteService.getSite(siteShortName),
+      filter = (args.filter != null) ? args.filter : (args.shortNameFilter != null) ? args.shortNameFilter : "",
+      maxResults = (args.maxResults == null) ? 10 : parseInt(args.maxResults, 10),
+      authorityType = args.authorityType,
+      zone = args.zone,
+      sortBy = args.sortBy,
+      sortAsc = args.dir != "desc";
+
+
+   if (authorityType != null)
+   {
+      if (authorityType.match("USER|GROUP") == null)
+      {
+         status.setCode(status.STATUS_BAD_REQUEST, "The 'authorityType' argument must be either USER or GROUP.");
+         return;
+      }
+   }
+
+   var peopleFound = [],
+      groupsFound = [],
+      notAllowed = [],
+      i, ii, name, paging,
+      siteInvitations = [];
+
+   if (authorityType == null || authorityType == "USER")
+   {
+      // Get the collection of people
+      peopleFound = sortBy != null ? people.getPeople(filter, maxResults, sortBy, sortAsc) : people.getPeople(filter, maxResults);
+
+      var criteria = {
+              resourceName: siteShortName
+           };
+      siteInvitations = invitations.listInvitations(criteria);
+
+      // Filter this collection for site membership
+      for (i = 0, ii = peopleFound.length; i < ii; i++)
+      {
+         name = search.findNode(peopleFound[i]).properties.userName;
+
+         if (!people.isAccountEnabled(name))
+         {
+            //user is disabled 
+            notAllowed.push(name);
+         }
+
+         if (site.getMembersRole(name) != null)
+         {
+            // User is already a member
+            notAllowed.push(name);
+         }
+         else
+         {
+            if (contains(siteInvitations, name))
+            {
+               // User has already got an invitation
+               notAllowed.push(name);
+            }
+         }
+      }
+
+      model.peopleFound = peopleFound;
+   }
+
+   if (authorityType == null || authorityType == "GROUP")
+   {
+      // Get the collection of groups
+      paging = utils.createPaging(maxResults, -1);
+      groupsFound = groups.getGroupsInZone(filter, zone, paging, "displayName");
+
+      // Filter this collection for site membership
+      for (i = 0, ii = groupsFound.length; i < ii; i++)
+      {
+         name = groupsFound[i].fullName;
+         if (site.getMembersRole(name) != null)
+         {
+            // Group is already a member
+            notAllowed.push(name);
+         }
+      }
+
+      model.groupsFound = groupsFound;
+   }
+   
+   model.notAllowed = notAllowed;
+}
+
+function contains(arr, value) {
+    var i = arr.length;
+    while (i--) {
+    	if (arr[i].inviteeUserName == value) return true;
+    }
+    return false;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.json.ftl
new file mode 100644
index 00000000000..612a8ca63b8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.json.ftl
@@ -0,0 +1,30 @@
+<#import "../../person/person.lib.ftl" as personLib/>
+<#import "../../groups/authority.lib.ftl" as authorityLib/>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "people":
+   [
+   <#if peopleFound??>
+      <#list peopleFound as person>
+         <@personLib.personJSON person=person/><#if person_has_next>,</#if>
+      </#list>
+   </#if>
+   ],
+   "data":
+   [
+   <#if groupsFound??>
+      <#list groupsFound as group>   
+         <@authorityLib.authorityJSON authority=group /><#if group_has_next>,</#if>
+      </#list>
+   </#if>
+     ],
+   "notAllowed":
+   [
+   <#if notAllowed??>
+      <#list notAllowed as na>   
+         "${na}"<#if na_has_next>,</#if>
+      </#list>
+   </#if>
+   ]
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/roles/roles.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/roles/roles.get.desc.xml
new file mode 100644
index 00000000000..a687b2e1142
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/roles/roles.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get roles</shortname>
+  <description>Get the authority roles of a site.</description>
+  <url>/api/sites/{shortname}/roles</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/roles/roles.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/roles/roles.get.html.ftl
new file mode 100644
index 00000000000..18533877f06
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/roles/roles.get.html.ftl
@@ -0,0 +1 @@
+<#include "roles.get.json.ftl">
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/roles/roles.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/roles/roles.get.js
new file mode 100644
index 00000000000..b8e8f18f647
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/roles/roles.get.js
@@ -0,0 +1,30 @@
+function main()
+{
+   var shortName = url.templateArgs.shortname;
+   
+   var site = siteService.getSite(shortName);
+   if (site === null)
+   {
+      // Return 404
+      status.setCode(404, "Site " + shortName + " does not exist");
+      return;
+   }
+   
+   // calculate the available "roles" and permissions groups for this site
+   var siteRoles = [];
+   var rolesList = siteService.listSiteRoles();
+   for (var i in rolesList)
+   {
+       siteRoles.push(rolesList[i]);
+   }
+   // add the "None" pseudo role 
+   siteRoles.push("None");
+   
+   var sitePermissionGroups = site.sitePermissionGroups;
+   sitePermissionGroups["everyone"] = "GROUP_EVERYONE";
+   
+   model.siteRoles = siteRoles;
+   model.sitePermissionGroups = sitePermissionGroups;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/roles/roles.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/roles/roles.get.json.ftl
new file mode 100644
index 00000000000..c0cfdd889bb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/roles/roles.get.json.ftl
@@ -0,0 +1,12 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+	"siteRoles":
+	[
+	   <#list siteRoles as siteRole>"${siteRole}"<#if siteRole_has_next>,</#if></#list>
+	],
+	"permissionGroups":
+	[
+	   <#list sitePermissionGroups?keys?sort?reverse as role>"${sitePermissionGroups[role]}"<#if role_has_next>,</#if></#list>
+	]
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site-admin-sites.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site-admin-sites.get.desc.xml
new file mode 100644
index 00000000000..ac4dc62f49a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site-admin-sites.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get sites</shortname>
+  <description>Get a collection of the sites in the repository accessible to site administrators. The collection can be filtered by name.</description>
+  <url>/api/admin-sites?nf={namefilter?}&amp;maxItems={maxItems?}&amp;skipCount={skipCount?}&amp;roles={roles?}&amp;</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site-admin-sites.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site-admin-sites.get.json.ftl
new file mode 100644
index 00000000000..6fbbcb88dad
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site-admin-sites.get.json.ftl
@@ -0,0 +1,33 @@
+<#import "../generic-paged-results.lib.ftl" as gen/>
+
+<#macro siteJSON item>
+<#escape x as jsonUtils.encodeJSONString(x)>
+	                "url" : "${url.serviceContext + "/api/sites/" + item.siteInfo.shortName}",
+	                "sitePreset" : "${item.siteInfo.sitePreset}",
+	                "shortName" : "${item.siteInfo.shortName}",
+	                "title" : "${item.siteInfo.title}",
+	                "description" : "${item.siteInfo.description}",
+	                "createdDate" : "${xmldate(item.siteInfo.createdDate)}",
+	                "lastModifiedDate" : "${xmldate(item.siteInfo.lastModifiedDate)}",
+	                "visibility" : "${item.siteInfo.visibility}",
+	                "userIsSiteManager" : "${item.currentUserSiteManager?c}",
+	                "siteManagers" : [
+	                     <#list item.members as manager>
+	                    {
+	                        "entry" : {
+	                            "userName" : "${manager.userName!""}",
+	                            "firstName" : "${manager.firstName!""}",
+	                            "lastName" : "${manager.lastName!""}"
+	                        }
+	                    }<#if manager_has_next>,</#if>
+	                     </#list>
+	                ]    
+</#escape>
+</#macro>
+
+{
+   <@gen.standardRestfulPagedResults data=data ; item>
+          <@siteJSON item=item /> 
+   </@gen.standardRestfulPagedResults>
+}
+
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site-export.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site-export.get.desc.xml
new file mode 100644
index 00000000000..72fc49683a0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site-export.get.desc.xml
@@ -0,0 +1,15 @@
+<webscript>
+  <shortname>Export Web Site</shortname>
+  <description>
+  <![CDATA[
+  Exports the details and contents of a site.
+
+  Returns a single zip file containing ACP exports of
+  the various parts of the site.
+  ]]></description>
+  <url>/api/sites/{shortname}/export</url>
+  <format default="html">argument</format>
+  <authentication>admin</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.desc.xml
new file mode 100644
index 00000000000..ef58bad05b6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Delete site</shortname>
+  <description>Delete the details of a site.</description>
+  <url>/api/sites/{shortname}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.js
new file mode 100644
index 00000000000..6bec6dafbc2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.js
@@ -0,0 +1,39 @@
+function main()
+{
+	// Get the shortname
+	var shortName = url.extension;
+	
+	// Get the site
+	var site = siteService.getSite(shortName);
+	if (site == null)
+	{
+		// Return 404
+		status.setCode(404, "The site " + shortName + " does not exist");
+		return;
+	}
+	try
+	{
+		// Delete the site
+		site.deleteSite();
+	}
+    catch (error)
+    {
+        var msg = error.message;
+        
+        // determine if the exception was AlfrescoRuntimeException, if so
+        // return 409 status code
+        if (msg.indexOf("NodeLockedException") != -1)
+        {
+            status.setCode(status.STATUS_CONFLICT, msg);
+        }
+        else
+        {
+            // We don't need to check for SiteServiceException thrown as a result of
+            // not existing site, because this is handled above.
+            status.setCode(status.STATUS_INTERNAL_SERVER_ERROR, msg); //return 500
+        }
+        return;
+    }
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.json.ftl
new file mode 100644
index 00000000000..f81dc51f8d6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.delete.json.ftl
@@ -0,0 +1,3 @@
+{
+   "success": true
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.get.desc.xml
new file mode 100644
index 00000000000..edba1349a03
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.get.desc.xml
@@ -0,0 +1,14 @@
+<webscript>
+  <shortname>Get Web site</shortname>
+  <description>
+  <![CDATA[
+  Get the details of a Web site.
+
+  Returns 200, STATUS_OK on success.
+  ]]></description>
+  <url>/api/sites/{shortname}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.get.js
new file mode 100644
index 00000000000..e3cd4fb59af
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.get.js
@@ -0,0 +1,22 @@
+function main()
+{
+   // Get the shortname
+   var shortName = url.extension;
+   
+   // Get the site
+   var site = siteService.getSite(shortName);
+   
+   if (site != null)
+   {
+      // Pass the site to the template
+      model.site = site;
+   }
+   else
+   {
+      // Return 404
+      status.setCode(404, "Site " + shortName + " does not exist");
+      return;
+   }
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.get.json.ftl
new file mode 100644
index 00000000000..c385c7431a7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.get.json.ftl
@@ -0,0 +1,2 @@
+<#import "site.lib.ftl" as siteLib/>
+<@siteLib.siteJSON site=site/>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl
new file mode 100644
index 00000000000..3e74d71bcbe
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl
@@ -0,0 +1,59 @@
+<#macro siteJSON site>
+<@siteJSONManagers site=site roles="managers"/>
+</#macro>
+
+<#macro siteJSONManagers site roles>
+<#local userid=person.properties.userName>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+	"url": "${url.serviceContext + "/api/sites/" + site.shortName}",
+	"sitePreset": "${site.sitePreset}",
+	"shortName": "${site.shortName}",
+	"title": "${site.title}",
+	"description": "${site.description}",
+	<#if site.node?exists>
+	"node": "${url.serviceContext + "/api/node/" + site.node.storeType + "/" + site.node.storeId + "/" + site.node.id}",
+	"tagScope": "${url.serviceContext + "/api/tagscopes/" + site.node.storeType + "/" + site.node.storeId + "/" + site.node.id}",
+	</#if>
+	<#if site.customProperties?size != 0>
+	"customProperties":
+	{
+		<#list site.customProperties?keys as prop>
+		<#assign propDetails = site.customProperties[prop]>
+		"${prop}":
+		{
+			"name": "${prop}",
+			"value":
+			<#if propDetails.value?is_enumerable>
+			[
+			<#list propDetails.value as v>
+			"${v?string}"<#if v_has_next>,</#if>
+			</#list>
+			]
+			<#else>
+			"${propDetails.value?string}"
+			</#if>,
+			"type": <#if propDetails.type??>"${propDetails.type}"<#else>null</#if>, 
+			"title": <#if propDetails.title??>"${propDetails.title}"<#else>null</#if>
+		}
+		<#if prop_has_next>,</#if>
+		</#list>
+	},
+	</#if>
+	<#if roles = "user">
+	"siteRole": "${site.getMembersRole(userid)!""}",
+	<#elseif roles = "managers">
+	"siteManagers":
+	[
+		<#assign managers = site.listMembers("", "SiteManager", 0, true)?keys />
+		<#list managers as manager>
+			"${manager}"<#if manager_has_next>,</#if>
+		</#list>
+	],
+	</#if>
+	<#nested>
+	"isPublic": ${site.isPublic?string("true", "false")},
+	"visibility": "${site.visibility}"
+}
+</#escape>
+</#macro>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.desc.xml
new file mode 100644
index 00000000000..8c8f37dd82b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.desc.xml
@@ -0,0 +1,20 @@
+<webscript>
+  <shortname>Update Web site</shortname>
+  <description>  <![CDATA[
+  Update the details of a Web site.
+  
+  The following properties may be updated.
+  
+  <dl>
+  <dt>title</dt><dd>the title of the web site</dd>
+  <dt>description</dt><dd>the description for the web site</dd>
+  <dt>visibility</dt><dd>the site visibility, one of (PUBLIC,MODERATED,PRIVATE)</dd>
+  </dl>
+  
+  ]]></description>
+  <url>/api/sites/{shortname}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.json.ftl
new file mode 100644
index 00000000000..c385c7431a7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.json.ftl
@@ -0,0 +1,2 @@
+<#import "site.lib.ftl" as siteLib/>
+<@siteLib.siteJSON site=site/>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.json.js
new file mode 100644
index 00000000000..f2f840c9677
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/site.put.json.js
@@ -0,0 +1,52 @@
+function main()
+{
+	// Get the site
+	var shortName = url.extension;
+	var site = siteService.getSite(shortName);
+	
+	if (site != null)
+	{	
+		// Updafte the sites details
+		if (json.has("title") == true)
+		{
+		   site.title = json.get("title");
+		}
+		if (json.has("description") == true)
+		{
+		   site.description = json.get("description");
+		}
+		
+		// Use the visibility flag before the isPublic flag
+		if (json.has("visibility") == true)
+		{
+		   site.visibility = json.get("visibility");
+		}
+		else if (json.has("isPublic") == true)
+		{
+		   // Deal with deprecated isPublic flag accordingly
+		   var isPublic = json.getBoolean("isPublic");
+		   if (isPublic == true)
+		   {
+		      site.visibility = siteService.PUBLIC_SITE;
+		   }
+		   else
+		   {
+		      site.visibility = siteService.PRIVATE_SITE;
+		   }
+	    }
+		
+		// Save the site
+		site.save();
+		
+		// Pass the model to the template
+		model.site = site;
+	}
+	else
+	{
+		// Return 404
+		status.setCode(status.STATUS_NOT_FOUND, "Site " + shortName + " does not exist");
+		return;
+	}
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.desc.xml
new file mode 100644
index 00000000000..63091a94bde
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get sites</shortname>
+  <description>Get a collection of the sites in the repository.  The collection can be filtered by name and/or site preset.</description>
+  <url>/api/sites?nf={namefilter?}&amp;spf={sitepresetfilter?}&amp;size={pagesize?}&amp;roles={roles?}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.js
new file mode 100644
index 00000000000..32457b936a6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.js
@@ -0,0 +1,14 @@
+function main()
+{
+    // Get the filter parameters
+    var nameFilter = args["nf"];
+    var sitePreset = args["spf"];
+    var sizeString = args["size"];
+    
+    // Get the list of sites
+    var sites = siteService.findSites(nameFilter, sizeString != null ? parseInt(sizeString) : -1);
+    model.sites = sites;
+    model.roles = (args["roles"] !== null ? args["roles"] : "managers");
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.json.ftl
new file mode 100644
index 00000000000..e5f59200770
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.json.ftl
@@ -0,0 +1,10 @@
+<#import "site.lib.ftl" as siteLib/>
+
+[
+	<#list sites?sort_by("shortName") as site>
+		<@siteLib.siteJSONManagers site=site roles=roles>
+		"isMemberOfGroup": <#if site.getMembersRoleInfo(person.properties.userName)?has_content>${site.getMembersRoleInfo(person.properties.userName).isMemberOfGroup()?string}<#else>false</#if>,
+		</@siteLib.siteJSONManagers>
+		<#if site_has_next>,</#if>
+	</#list>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.desc.xml
new file mode 100644
index 00000000000..dc0b0d555ce
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.desc.xml
@@ -0,0 +1,29 @@
+<webscript>
+  <shortname>Create Web site</shortname>
+  <description>  <![CDATA[
+  Creates a new Web site based on the site preset and details provided.
+  <br />
+  Note: this method only creates a site at the repository level, it does not create a fully functional site.
+  It should be considered for internal use only at the moment.
+  Currently, creating a site programmatically needs to be done in the Share context, using the create-site module.
+  Further information can be found at the address http://your_domain:8080/share/page/index/uri/modules/create-site.post
+  within your Alfresco installation.
+  
+  <br />
+  The following properties may be set.
+  
+  <dl>
+  <dt>shortName</dt><dd>the shortName of the web site, mandatory, must be unique</dd>
+  <dt>sitePreset</dt><dd>the sitePreset</dd>
+  <dt>title</dt><dd>the title of the web site</dd>
+  <dt>description</dt><dd>the description for the web site</dd>
+  <dt>visibility</dt><dd>the site visibility, one of (PUBLIC,MODERATED,PRIVATE), defaults to PUBLIC</dd>
+  <dt>type</dt><dd>the type of site to create, optional</dd>
+  </dl>
+  ]]></description>
+  <url>/api/sites</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.json.ftl
new file mode 100644
index 00000000000..c385c7431a7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.json.ftl
@@ -0,0 +1,2 @@
+<#import "site.lib.ftl" as siteLib/>
+<@siteLib.siteJSON site=site/>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.json.js
new file mode 100644
index 00000000000..c65a94eb0d7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.post.json.js
@@ -0,0 +1,90 @@
+function main()
+{
+   // Ensure the user has Create Site capability
+   if (!siteService.hasCreateSitePermissions())
+   {
+      status.setCode(status.STATUS_FORBIDDEN, "error.noPermissions");
+      return;
+   }
+   
+   // Get the details of the site
+   if (json.has("shortName") == false || json.get("shortName").length == 0)
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "Short name missing when creating site");
+      return;
+   }
+   var shortName = json.get("shortName");
+   
+   // See if the shortName is available
+   if (siteService.hasSite(shortName))
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "error.duplicateShortName");
+      return;
+   }
+   
+   if (groups.getGroupForFullAuthorityName("GROUP_site_" + shortName) != null)
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "error.unableToCreate");
+      return;
+   }
+   
+   if (json.has("sitePreset") == false || json.get("sitePreset").length == 0)
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "Site preset missing when creating site");
+      return;
+   }
+   var sitePreset = json.get("sitePreset");
+   
+   var title = null;
+   if (json.has("title"))
+   {
+      title = json.get("title");
+   }
+      
+   var description = null;
+   if (json.has("description"))
+   {
+      description = json.get("description");
+   }
+   
+   var sitetype = null;
+   if (json.has("type") == true)
+   {
+      sitetype = json.get("type");
+   }
+   
+   // Use the visibility flag before the isPublic flag
+   var visibility = siteService.PUBLIC_SITE;
+   if (json.has("visibility"))
+   {
+      visibility = json.get("visibility");
+   }
+   else if (json.has("isPublic"))
+   {
+      var isPublic = json.getBoolean("isPublic");
+      if (isPublic == true)
+      {
+         visibility = siteService.PUBLIC_SITE;
+      }
+      else
+      {
+         visibility = siteService.PRIVATE_SITE;
+      }
+   }
+   
+   // Create the site 
+   var site = null;
+   if (sitetype == null)
+   {
+      site = siteService.createSite(sitePreset, shortName, title, description, visibility);
+   }
+   else
+   {
+      site = siteService.createSite(sitePreset, shortName, title, description, visibility, sitetype);
+   }
+   
+   // Put the created site into the model
+   model.site = site;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.query.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.query.post.desc.xml
new file mode 100644
index 00000000000..6ebb927c607
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.query.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Query site collection</shortname>
+  <description>Queries the collection of sites.</description>
+  <url>/api/sites/query</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.query.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.query.post.json.ftl
new file mode 100644
index 00000000000..77ddc5bc6f5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.query.post.json.ftl
@@ -0,0 +1,12 @@
+<#import "site.lib.ftl" as siteLib/>
+
+[
+   <#list sites?sort_by("shortName") as site>
+      <#if isShortNameMode>
+         <@siteLib.siteJSONManagers site=site roles="user"/>
+      <#else>
+         <@siteLib.siteJSON site=site/>
+      </#if>
+      <#if site_has_next>,</#if>
+   </#list>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.query.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.query.post.json.js
new file mode 100644
index 00000000000..5d164812436
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/sites.query.post.json.js
@@ -0,0 +1,52 @@
+function main()
+{
+    var sites = null;
+    
+    // NOTE:
+    // This implementation is sufficient for the 3.1 requirement, but when site query is expanded
+    // it should be formalised in the underlying JS and JAVA API's.  Currently it is very simplistic
+    // as the current use case is very limited.    
+    if (json.has("shortName") == true)
+    {
+        var shortNameQuery = json.getJSONObject("shortName");
+        
+        // Get the matching mode required (default is "exact")
+        var matchMode = shortNameQuery.get("match")
+        var isMembershipMode = (matchMode == "exact-membership");
+
+        // The purpose of the "shortname" mode is to just make sure that the shortname is valid
+        // but additionally it adds an additional attribute that indicates whether or not the current
+        // user is a member of the site.
+        var isShortNameMode = (matchMode == "shortname");
+        
+        // Get each short name and put the associated site in the list
+        if (shortNameQuery.has("values") == true)
+        {
+            var values = shortNameQuery.getJSONArray("values");
+            var len = values.length();
+            var username = person.properties.userName;
+            sites = new Array(len);
+            for (var index=0; index<len; index++)
+            {
+               var shortName = values.getString(index);
+               var site = siteService.getSite(shortName);
+               if (site != null)
+               {
+                  if (!isMembershipMode || site.isMember(username))
+                  {
+                     sites.push(site);
+                  }
+               }
+            }
+        }
+        // If the query has no values just continue as there will be no matches
+    }
+    
+    // This will switch rendering to use the "siteJSONManagers" macro and pass roles as "user"...
+    model.isShortNameMode = isShortNameMode;
+
+    // Set the sites collection in the model
+    model.sites = sites != null ? sites : new Array(0);
+}
+
+main();  
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/aclChangeSets.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/aclChangeSets.get.desc.xml
new file mode 100644
index 00000000000..431747c199b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/aclChangeSets.get.desc.xml
@@ -0,0 +1,25 @@
+<webscript>
+  <shortname>Get ACL ChangeSets</shortname>
+  <description>Get the ACL ChangeSets from the given commit time.</description>
+  <url>/api/solr/aclchangesets?fromId={fromId?}&amp;fromTime={fromTime?}&amp;maxResults={maxResults?}</url>
+  <format default="json">argument</format>
+  <!-- Solr api is protected by a solr-specific authentication mechanism -->
+  <authentication>none</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+  <family>SOLR</family>
+  <args>
+    <arg>
+      <name>fromId</name>
+      <description>Smallest changset ID (inclusive)</description>
+    </arg> 
+    <arg>
+      <name>fromTime</name>
+      <description>Smallest commit time (inclusive)</description>
+    </arg> 
+    <arg>
+      <name>maxResults</name>
+      <description>Maximum number of results (optional: default 1024)</description>
+    </arg> 
+ </args>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/aclChangeSets.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/aclChangeSets.get.json.ftl
new file mode 100644
index 00000000000..ed3d7c5a55b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/aclChangeSets.get.json.ftl
@@ -0,0 +1,17 @@
+<#import "solr.lib.ftl" as solrLib/>
+{ 
+   "aclChangeSets" :
+   [
+      <#list aclChangeSets as aclChangeSet>
+         <@solrLib.aclChangeSetJSON aclChangeSet=aclChangeSet/>
+         <#if aclChangeSet_has_next>,</#if>
+      </#list>
+   ]
+   <#if maxChangeSetCommitTime??>
+    ,"maxChangeSetCommitTime": ${maxChangeSetCommitTime?c}
+   </#if>
+   <#if maxChangeSetId??>
+    ,"maxChangeSetId": ${maxChangeSetId?c}
+   </#if>
+   
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/acls.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/acls.post.desc.xml
new file mode 100644
index 00000000000..2194c0d6b56
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/acls.post.desc.xml
@@ -0,0 +1,27 @@
+<webscript>
+  <shortname>Get ACLs</shortname>
+  <description>Get the ACLs for given ChangeSets.</description>
+  <url>/api/solr/acls?fromId={fromId?}&amp;maxResults={maxResults?}</url>
+  <format default="json">argument</format>
+  <!-- Solr api is protected by a solr-specific authentication mechanism -->
+  <authentication>none</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+  <family>SOLR</family>
+  <args>
+    <arg>
+      <name>fromId</name>
+      <description>Minimum ACL ID that can be specified when exactly one ACL ChangeSet ID is given</description>
+    </arg> 
+    <arg>
+      <name>maxResults</name>
+      <description>Maximum number of results (optional: default 1024)</description>
+    </arg> 
+    <arg>
+      <name>POST content</name>
+      <description>
+      { aclChangeSetIds : [ 1, 2, ..., n] }
+      </description>
+    </arg> 
+ </args>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/acls.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/acls.post.json.ftl
new file mode 100644
index 00000000000..abe52028cdc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/acls.post.json.ftl
@@ -0,0 +1,10 @@
+<#import "solr.lib.ftl" as solrLib/>
+{ 
+   "acls" :
+   [
+      <#list acls as acl>
+         <@solrLib.aclJSON acl=acl/>
+         <#if acl_has_next>,</#if>
+      </#list>
+   ]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/aclsReaders.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/aclsReaders.post.desc.xml
new file mode 100644
index 00000000000..c74890818bc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/aclsReaders.post.desc.xml
@@ -0,0 +1,19 @@
+<webscript>
+  <shortname>Get ACLs readers</shortname>
+  <description>Get the readers for given ACLs.</description>
+  <url>/api/solr/aclsReaders</url>
+  <format default="json">argument</format>
+  <!-- Solr api is protected by a solr-specific authentication mechanism -->
+  <authentication>none</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+  <family>SOLR</family>
+  <args>
+    <arg>
+      <name>POST content</name>
+      <description>
+      { aclIds: [1, 2, 3, ..., N] }
+      </description>
+    </arg> 
+ </args>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/aclsReaders.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/aclsReaders.post.json.ftl
new file mode 100644
index 00000000000..4669dec5577
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/aclsReaders.post.json.ftl
@@ -0,0 +1,10 @@
+<#import "solr.lib.ftl" as solrLib/>
+{ 
+   "aclsReaders" :
+   [
+      <#list aclsReaders as aclReaders>
+         <@solrLib.aclReadersJSON aclReaders=aclReaders/>
+         <#if aclReaders_has_next>,</#if>
+      </#list>
+   ]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/model.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/model.get.desc.xml
new file mode 100644
index 00000000000..bddaf66b4c1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/model.get.desc.xml
@@ -0,0 +1,13 @@
+<webscript>
+  <shortname>Get Model</shortname>
+  <description>Get the model for given model name.</description>
+  <url>/api/solr/model</url>
+  <format default="json">argument</format>
+  <!-- Solr api is protected by a solr-specific authentication mechanism -->
+  <authentication>none</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+  <family>SOLR</family>
+  <args>
+ </args>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/modelsdiff.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/modelsdiff.post.desc.xml
new file mode 100644
index 00000000000..0a1a76541da
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/modelsdiff.post.desc.xml
@@ -0,0 +1,13 @@
+<webscript>
+  <shortname>Get Model Diffs</shortname>
+  <description>Get a diff of models given parameters passed in.</description>
+  <url>/api/solr/modelsdiff</url>
+  <format default="json">argument</format>
+  <!-- Solr api is protected by a solr-specific authentication mechanism -->
+  <authentication>none</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+  <family>SOLR</family>
+  <args>
+ </args>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/modelsdiff.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/modelsdiff.post.json.ftl
new file mode 100644
index 00000000000..5ffc0c2c2cb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/modelsdiff.post.json.ftl
@@ -0,0 +1,14 @@
+<#import "solr.lib.ftl" as solrLib/>
+{
+   "diffs" :
+   [
+      <#list diffs as diff>
+          {
+             "name": "${diff.modelName}",
+             "type" : "${diff.type}",
+             "oldChecksum": <#if diff.oldChecksum??>${diff.oldChecksum?c}<#else>null</#if>,
+             "newChecksum": <#if diff.newChecksum??>${diff.newChecksum?c}<#else>null</#if>
+          }<#if diff_has_next>,</#if>
+      </#list>
+   ]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nextTransactionCommitTime.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nextTransactionCommitTime.get.desc.xml
new file mode 100644
index 00000000000..c8b2c3ccaf6
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nextTransactionCommitTime.get.desc.xml
@@ -0,0 +1,14 @@
+<webscript>
+	<shortname>Get the next transaction commit time from a given transaction commit time</shortname>
+	<description>
+	    Get the next transaction commit time from a given transaction commit time [fromCommitTime]
+	    If no new transaction exists, -1 is returned.
+	</description>
+	<url>/api/solr/nextTransaction?fromCommitTime={fromCommitTime}</url>
+	<format default="json">argument</format>
+	<!-- Solr api is protected by a solr-specific authentication mechanism -->
+	<authentication>none</authentication>
+	<transaction allow="readonly">required</transaction>
+	<lifecycle>internal</lifecycle>
+	<family>SOLR</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nextTransactionCommitTime.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nextTransactionCommitTime.get.json.ftl
new file mode 100644
index 00000000000..b7e7b2d3926
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nextTransactionCommitTime.get.json.ftl
@@ -0,0 +1,3 @@
+{
+    "nextTransactionCommitTimeMs": <#if nextTransactionCommitTimeMs??>${nextTransactionCommitTimeMs?c}<#else>-1</#if>
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodeContent.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodeContent.get.desc.xml
new file mode 100644
index 00000000000..6b7d9c84b1a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodeContent.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get node property content as text</shortname>
+  <description>Get the content for the node property as text.</description>
+  <url>/api/solr/textContent?nodeId={nodeId}&amp;propertyQName={propertyQName?}</url>
+  <format default="json">argument</format>
+  <!-- Solr api is protected by a solr-specific authentication mechanism -->
+  <authentication>none</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+  <family>SOLR</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodes.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodes.post.desc.xml
new file mode 100644
index 00000000000..7ef7fe32465
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodes.post.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get the nodes in the given transactions</shortname>
+  <description>Get the nodes updated/deleted in the given transactions.</description>
+  <url>/api/solr/nodes</url>
+  <format default="json">argument</format>
+  <!-- Solr api is protected by a solr-specific authentication mechanism -->
+  <authentication>none</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+  <family>SOLR</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodes.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodes.post.json.ftl
new file mode 100644
index 00000000000..683e1195427
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodes.post.json.ftl
@@ -0,0 +1,10 @@
+<#import "solr.lib.ftl" as solrLib/>
+{
+   "nodes" :
+   [
+      <#list nodes as node>
+         <@solrLib.nodeJSON node=node/>
+         <#if node_has_next>,</#if>
+      </#list>
+   ]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodesMetaData.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodesMetaData.post.desc.xml
new file mode 100644
index 00000000000..0e6b506f1fe
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodesMetaData.post.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get the metadata for the specified nodes</shortname>
+  <description>Get the metadata for the specified nodes.</description>
+  <url>/api/solr/metadata</url>
+  <format default="json">argument</format>
+  <!-- Solr api is protected by a solr-specific authentication mechanism -->
+  <authentication>none</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+  <family>SOLR</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodesMetaData.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodesMetaData.post.json.ftl
new file mode 100644
index 00000000000..f80aba74787
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/nodesMetaData.post.json.ftl
@@ -0,0 +1,9 @@
+<#import "solr.lib.ftl" as solrLib/>
+{
+   "nodes" :
+   [
+      <#list nodes as nodeMetaData>
+         <@solrLib.nodeMetaDataJSON nodeMetaData=nodeMetaData filter=filter/><#if nodeMetaData_has_next>,</#if>
+      </#list>
+   ]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/solr.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/solr.lib.ftl
new file mode 100644
index 00000000000..11a6325be03
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/solr.lib.ftl
@@ -0,0 +1,178 @@
+<#macro aclChangeSetJSON aclChangeSet>
+      {
+         "id": ${aclChangeSet.id?c},
+         "commitTimeMs": ${aclChangeSet.commitTimeMs?c},
+         "aclCount": ${aclChangeSet.aclCount?c}
+      }
+</#macro>
+
+<#macro aclJSON acl>
+      {
+         "id": ${acl.id?c},
+         "aclChangeSetId": ${acl.aclChangeSetId?c}
+      }
+</#macro>
+
+<#macro aclReadersJSON aclReaders>
+      {
+         "aclId": ${aclReaders.aclId?c},
+         "aclChangeSetId": ${aclReaders.aclChangeSetId?c},
+         "tenantDomain" : "${aclReaders.tenantDomain}",
+         "readers" :
+         [
+            <#list aclReaders.readers as reader>
+               "${reader?json_string}"
+               <#if reader_has_next>,</#if>
+            </#list>
+         ],
+         "denied" :
+         [
+            <#list aclReaders.denied as denied>
+               "${denied?json_string}"
+               <#if denied_has_next>,</#if>
+            </#list>
+         ]
+      }
+</#macro>
+
+<#macro transactionJSON txn>
+      {
+         "id": ${txn.id?c},
+         "commitTimeMs": ${txn.commitTimeMs?c},
+         "updates": ${txn.updates?c},
+         "deletes": ${txn.deletes?c}
+      }
+</#macro>
+
+<#macro nodeJSON node>
+      {
+         "id": ${node.id?c},
+         "nodeRef": "${node.nodeRef}",
+         "txnId": ${node.txnId?c},
+         "status": "<#if node.deleted>d<#else>u</#if>",
+         <#if node.aclId??>"aclId": ${node.aclId?c},</#if>
+         <#if node.shardPropertyValue??>"shardPropertyValue": "${node.shardPropertyValue?json_string}",</#if>
+         <#if node.explicitShardId??>"explicitShardId": "${node.explicitShardId?c}",</#if>
+         "tenant": "${node.tenant}"
+      }
+</#macro>
+
+<#macro nodeMetaDataJSON nodeMetaData filter>
+      {
+         "id": ${nodeMetaData.nodeId?c}
+         <#if nodeMetaData.tenantDomain??>, "tenantDomain": "${nodeMetaData.tenantDomain}"</#if>
+         <#if filter.includeNodeRef??><#if nodeMetaData.nodeRef??>, "nodeRef": "${nodeMetaData.nodeRef.toString()}"</#if></#if>
+         <#if filter.includeType??><#if nodeMetaData.nodeType??>, "type": <@qNameJSON qName=nodeMetaData.nodeType/></#if></#if>
+         <#if filter.includeAclId??><#if nodeMetaData.aclId??>, "aclId": ${nodeMetaData.aclId?c}</#if></#if>
+         <#if filter.includeTxnId??><#if nodeMetaData.txnId??>, "txnId": ${nodeMetaData.txnId?c}</#if></#if>
+         <#if filter.includeProperties??>
+         <#if nodeMetaData.properties??>
+         , "properties": {
+           <#list nodeMetaData.properties?keys as propName>
+               "${propName}": ${nodeMetaData.properties[propName]}<#if propName_has_next>,</#if>
+           </#list>
+         }
+         </#if>
+         </#if>
+         <#if filter.includeAspects??>
+         <#if nodeMetaData.aspects??>
+         , "aspects": [
+           <#list nodeMetaData.aspects as aspectQName>
+               <@nodeAspectJSON aspectQName=aspectQName indent=""/><#if aspectQName_has_next>,</#if>
+           </#list>
+         ]
+         </#if>
+         </#if>
+         <#if filter.includePaths??>
+         <#if nodeMetaData.paths??>
+         , "paths": [
+           <#list nodeMetaData.paths as path>
+           ${path}<#if path_has_next>,</#if>
+           </#list>
+         ]
+         </#if>
+         </#if>
+         <#if filter.includePaths??>
+         <#if nodeMetaData.ancestors??>
+         <#if (nodeMetaData.ancestors?size > 0)>
+         , "ancestors": [
+           <#list nodeMetaData.ancestors as ancestor>
+           "${ancestor}"<#if ancestor_has_next>,</#if>
+           </#list>
+         ]
+         </#if>
+         </#if>
+         </#if>
+         <#if filter.includePaths??>
+         <#if nodeMetaData.namePaths??>
+         , "namePaths": [
+           <#list nodeMetaData.namePaths as namePath>
+           ${namePath}<#if namePath_has_next>,</#if>
+           </#list>
+         ]
+         </#if>
+         </#if>
+         <#if filter.includeParentAssociations??>
+         <#if nodeMetaData.parentAssocs??>
+         <#if (nodeMetaData.parentAssocs?size > 0)>
+         , "parentAssocs": [
+           <#list nodeMetaData.parentAssocs as pa>
+           ${pa}<#if pa_has_next>,</#if>
+           </#list>
+         ]
+         ,"parentAssocsCrc": <#if nodeMetaData.parentAssocsCrc??>${nodeMetaData.parentAssocsCrc?c}<#else>null</#if>
+         </#if>
+         </#if>
+         </#if>
+         <#if filter.includeChildAssociations??>
+         <#if nodeMetaData.childAssocs??>
+         <#if (nodeMetaData.childAssocs?size > 0)>
+         , "childAssocs": [
+           <#list nodeMetaData.childAssocs as ca>
+           ${ca}<#if ca_has_next>,</#if>
+           </#list>
+         ]
+         </#if>
+         </#if>
+         </#if>
+         <#if filter.includeChildIds??>
+         <#if nodeMetaData.childIds??>
+         <#if (nodeMetaData.childIds?size > 0)>
+         , "childIds": [
+           <#list nodeMetaData.childIds as ci>
+           ${ci?c}<#if ci_has_next>,</#if>
+           </#list>
+         ]
+         </#if>
+         </#if>
+         </#if>
+         <#if filter.includeOwner??>
+         <#if nodeMetaData.owner??>
+         , "owner": "${nodeMetaData.owner?json_string}"
+         </#if>
+         </#if>
+      }
+</#macro>
+
+<#macro pathJSON path indent="">
+${indent}[
+<#list path as element>
+${indent}${element}<#if element_has_next>,</#if>
+</#list>
+${indent}]
+</#macro>
+
+<#macro qNameJSON qName indent="">
+${indent}"${jsonUtils.encodeJSONString(shortQName(qName))}"
+</#macro>
+
+
+<#macro nodePropertyJSON propQName propValue>
+<@qNameJSON qName=propQName/>: <#if propValue??>"propValue"<#else>null</#if>
+</#macro>
+
+<#macro nodeAspectJSON aspectQName indent="">
+${indent}<@qNameJSON qName=aspectQName/>
+</#macro>
+
+
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/stats.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/stats.get.desc.xml
new file mode 100644
index 00000000000..d0830fdaf85
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/stats.get.desc.xml
@@ -0,0 +1,13 @@
+<webscript>
+  <shortname>Get solr statistics</shortname>
+  <description>Retrieves statistics using solr.  For a list of potential facets call it with /api/solrstats?listFacets=true
+  You can pass one of these facets in eg. facet=content.creator .  The facet name can be used as a I18n resource bundle key,
+  it also has a predefined structure: group.property[.type] eg. content.created.datetime. The [.type] is optional, the default is String.</description>
+  <url>/api/solrstats/site/{siteId}</url>
+  <url>/api/solrstats</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <family>SOLR</family>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/stats.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/stats.get.json.ftl
new file mode 100644
index 00000000000..dd03688586c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/stats.get.json.ftl
@@ -0,0 +1,57 @@
+<#if facets??>
+[
+   <#list facets as facet>
+      "${facet}"<#if facet_has_next>,</#if>
+   </#list>
+]
+<#else>
+{
+    "resultset": [
+      <#list result.stats as item>
+         ["${jsonUtils.encodeJSONString(item.name)}",${item.sum?c}, ${item.count?c}, ${item.min?c}, ${item.max?c}, ${item.mean?c}]
+         <#if item_has_next>,</#if>
+      </#list>   
+    ],
+    "queryInfo": {
+      "numberFound": "${result.numberFound?c}"
+      ,"totalRows": "${resultSize?c}"
+      <#if result.sum??>
+         ,"sum": "${result.sum?c}"
+         ,"max": "${result.max?c}"
+         ,"mean": "${result.mean?c}"
+      </#if>    
+    },
+    "metadata": [
+        {
+            "colIndex": 0,
+            "colType": "String",
+            "colName": "name"
+        },
+        {
+            "colIndex": 1,
+            "colType": "Numeric",
+            "colName": "sum"
+        },
+        {
+            "colIndex": 2,
+            "colType": "Numeric",
+            "colName": "count"
+        },
+        {
+            "colIndex": 3,
+            "colType": "Numeric",
+            "colName": "min"
+        },
+        {
+            "colIndex": 4,
+            "colType": "Numeric",
+            "colName": "max"
+        },
+        {
+            "colIndex": 5,
+            "colType": "Numeric",
+            "colName": "mean"
+        }
+    ]
+}
+</#if>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/transactionInterval.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/transactionInterval.get.desc.xml
new file mode 100644
index 00000000000..2005bf06fbf
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/transactionInterval.get.desc.xml
@@ -0,0 +1,14 @@
+<webscript>
+	<shortname>Get the minimum and the maximum commit times for transactions in a range of node ids</shortname>
+	<description>
+	    Get the minimum and the maximum commit times for transactions in a range of node ids: [fromNodeId TO toNodeId]
+	    If the nodes don't exist in the repository, -1 is returned in both fields.
+	</description>
+	<url>/api/solr/transactionInterval?fromNodeId={fromNodeId}&amp;toNodeId={toNodeId}</url>
+	<format default="json">argument</format>
+	<!-- Solr api is protected by a solr-specific authentication mechanism -->
+	<authentication>none</authentication>
+	<transaction allow="readonly">required</transaction>
+	<lifecycle>internal</lifecycle>
+	<family>SOLR</family>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/transactionInterval.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/transactionInterval.get.json.ftl
new file mode 100644
index 00000000000..2e8a8667fb7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/transactionInterval.get.json.ftl
@@ -0,0 +1,4 @@
+{
+    "minTransactionCommitTimeMs": <#if minTransactionCommitTimeMs??>${minTransactionCommitTimeMs?c}<#else>-1</#if>,
+    "maxTransactionCommitTimeMs": <#if maxTransactionCommitTimeMs??>${maxTransactionCommitTimeMs?c}<#else>-1</#if>
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/transactions.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/transactions.get.desc.xml
new file mode 100644
index 00000000000..7d1444f83a1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/transactions.get.desc.xml
@@ -0,0 +1,12 @@
+<webscript>
+  <shortname>Get transactions</shortname>
+  <description>Get the transactions from the given commit time.</description>
+  <url>/api/solr/transactions?fromTxnId={fromTxnId?}&amp;fromCommitTime={fromCommitTime?}&amp;maxResults={maxResults?}</url>
+  <format default="json">argument</format>
+  <!-- Solr api is protected by a solr-specific authentication mechanism -->
+  <authentication>none</authentication>
+  <!-- Must be readwrite as it updates shard state -->
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+  <family>SOLR</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/transactions.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/transactions.get.json.ftl
new file mode 100644
index 00000000000..2813ebcbb5d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/solr/transactions.get.json.ftl
@@ -0,0 +1,17 @@
+<#import "solr.lib.ftl" as solrLib/>
+{ 
+   "transactions" :
+   [
+      <#list transactions as txn>
+         <@solrLib.transactionJSON txn=txn/>
+         <#if txn_has_next>,</#if>
+      </#list>
+   ]
+   <#if maxTxnCommitTime??>
+    ,"maxTxnCommitTime": ${maxTxnCommitTime?c}
+   </#if>
+   <#if maxTxnId??>
+    ,"maxTxnId": ${maxTxnId?c}
+   </#if>
+   
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/store/remoteadm.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/store/remoteadm.delete.desc.xml
new file mode 100644
index 00000000000..6421993af40
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/store/remoteadm.delete.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Remote ADM Store</shortname>
+  <description>Remote service mirroring the Store interface - to an ADM store</description>
+  <url>/remoteadm/{method}/{path}</url>
+  <authentication>user</authentication>
+  <transaction buffersize="0">required</transaction>
+  <format default="">argument</format>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/store/remoteadm.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/store/remoteadm.get.desc.xml
new file mode 100644
index 00000000000..e2172b5029f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/store/remoteadm.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Remote ADM Store</shortname>
+  <description>Remote service mirroring the Store interface - to an ADM store</description>
+  <url>/remoteadm/{method}</url>
+  <url>/remoteadm/{method}/{path}</url>
+  <authentication>none</authentication>
+  <transaction allow="readonly">required</transaction>
+  <format default="">argument</format>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/store/remoteadm.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/store/remoteadm.post.desc.xml
new file mode 100644
index 00000000000..6deeae37a7d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/store/remoteadm.post.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Remote ADM Store</shortname>
+  <description>Remote service mirroring the Store interface - to an ADM store</description>
+  <url>/remoteadm/{method}</url>
+  <url>/remoteadm/{method}/{path}</url>
+  <authentication>user</authentication>
+  <transaction buffersize="0">required</transaction>
+  <format default="">argument</format>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/follow.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/follow.post.desc.xml
new file mode 100644
index 00000000000..5757a583a3c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/follow.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Follow</shortname>
+  <description>Follow a user</description>
+  <url>/api/subscriptions/{userid}/follow</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/followers.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/followers.get.desc.xml
new file mode 100644
index 00000000000..b1582737e38
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/followers.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Followers</shortname>
+  <description>Returns followers</description>
+  <url>/api/subscriptions/{userid}/followers</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/followerscount.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/followerscount.get.desc.xml
new file mode 100644
index 00000000000..5bcea963e3e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/followerscount.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Followers Count</shortname>
+  <description>Returns the size of followers list</description>
+  <url>/api/subscriptions/{userid}/followers/count</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/following.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/following.get.desc.xml
new file mode 100644
index 00000000000..3e74ae79782
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/following.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Following</shortname>
+  <description>Returns the following list</description>
+  <url>/api/subscriptions/{userid}/following</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/followingcount.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/followingcount.get.desc.xml
new file mode 100644
index 00000000000..71b27c7952f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/followingcount.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Following Count</shortname>
+  <description>Returns size of the following list</description>
+  <url>/api/subscriptions/{userid}/following/count</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/follows.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/follows.post.desc.xml
new file mode 100644
index 00000000000..962db80fe43
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/follows.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Follows</shortname>
+  <description>Returns if people follow a person</description>
+  <url>/api/subscriptions/{userid}/follows</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/private.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/private.get.desc.xml
new file mode 100644
index 00000000000..91353f65aaf
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/private.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Private Following List</shortname>
+  <description>Returns (or sets) if a following list is private</description>
+  <url>/api/subscriptions/{userid}/private</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/private.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/private.put.desc.xml
new file mode 100644
index 00000000000..4ea950fcc86
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/private.put.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Private Following List</shortname>
+  <description>Sets if a following list is private</description>
+  <url>/api/subscriptions/{userid}/private</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/unfollow.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/unfollow.post.desc.xml
new file mode 100644
index 00000000000..7a4121864ef
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/subscriptions/unfollow.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Unfollow</shortname>
+  <description>Unfollow a user</description>
+  <url>/api/subscriptions/{userid}/unfollow</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.get.desc.xml
new file mode 100644
index 00000000000..f3bd6e81c8f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.get.desc.xml
@@ -0,0 +1,15 @@
+<webscript>
+  <shortname>Get node tags</shortname>
+  <description><![CDATA[
+  Get all the tags for a node.
+  <br> Returns STATUS_OK (200)
+  ]]>
+  </description>
+  <url>/api/node/{store_type}/{store_id}/{id}/tags</url>
+  <url>/api/path/{store_type}/{store_id}/{id}/tags</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <family>Tagging</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.get.js
new file mode 100644
index 00000000000..d5261788a6f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.get.js
@@ -0,0 +1,19 @@
+function main()
+{
+   // Get the node from the URL
+   var pathSegments = url.match.split("/");
+   var reference = [ url.templateArgs.store_type, url.templateArgs.store_id ].concat(url.templateArgs.id.split("/"));
+   var node = search.findNode(pathSegments[2], reference);
+   
+   // 404 if the node is not found
+   if (node == null)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "The node could not be found");
+      return;
+   }
+   
+   // Get the tags of the node
+   model.tags = node.tags;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.get.json.ftl
new file mode 100644
index 00000000000..8ac9a57c027
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.get.json.ftl
@@ -0,0 +1,5 @@
+[
+	<#list tags as tag>
+		"${jsonUtils.encodeJSONString(tag)}"<#if tag_has_next>,</#if>
+	</#list>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.desc.xml
new file mode 100644
index 00000000000..ed6b38e3f51
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.desc.xml
@@ -0,0 +1,20 @@
+<webscript>
+  <shortname>Add tag</shortname>
+  <description>  <![CDATA[
+  Add one or more tags to the node.
+  <br />Input: 
+  <br />(mandatory) array of String
+  
+  <br />Returns the array of tags
+  
+  <br />Return STATUS_OK (200).
+  
+  ]]></description>
+  <url>/api/node/{store_type}/{store_id}/{id}/tags</url>
+  <url>/api/path/{store_type}/{store_id}/{id}/tags</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+    <family>Tagging</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.json.ftl
new file mode 100644
index 00000000000..8ac9a57c027
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.json.ftl
@@ -0,0 +1,5 @@
+[
+	<#list tags as tag>
+		"${jsonUtils.encodeJSONString(tag)}"<#if tag_has_next>,</#if>
+	</#list>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.json.js
new file mode 100644
index 00000000000..08ad332f6c9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/node.tags.post.json.js
@@ -0,0 +1,28 @@
+function main()
+{
+   // Get the node from the URL
+   var pathSegments = url.match.split("/");
+   var reference = [ url.templateArgs.store_type, url.templateArgs.store_id ].concat(url.templateArgs.id.split("/"));
+   var node = search.findNode(pathSegments[2], reference);
+   
+   // 404 if the node is not found
+   if (node == null)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "The node could not be found");
+      return;
+   }
+   
+   // Get the array of posted tags
+   for (var index = 0; index < json.length(); index++)
+   {
+      node.addTag(json.getString(index));
+   }
+   
+   // save the node
+   node.save();
+   
+   // Get the tags of the node
+   model.tags = node.tags;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.delete.desc.xml
new file mode 100644
index 00000000000..c24e92d0fe1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.delete.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Delete existing tag</shortname>
+  <description>Delete the given tag</description>
+  <url>/api/tags/{store_type}/{store_id}/{tagName}</url>
+  <url>/api/tags/{tagName}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readwrite">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <family>Tagging</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.delete.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.delete.js
new file mode 100644
index 00000000000..a0ed89eadfd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.delete.js
@@ -0,0 +1,49 @@
+function main()
+{
+   // Get the store from the template args
+   var store = "workspace://SpacesStore";
+   if (url.templateArgs.store_type != null && url.templateArgs.store_id != null)
+   {
+      store = url.templateArgs.store_type + "://" + url.templateArgs.store_id;
+   }
+   
+   // Get the tagName
+   var tagName = url.templateArgs.tagName;
+   if (tagName == null || tagName.length == 0)
+   {
+      // TagName missing
+      model.msg = "manage-tags.tag-name-missing";
+      model.result = false;
+   }
+   else
+   {
+      // Search the tag
+      var tag = taggingService.getTag(store, url.templateArgs.tagName);
+      if (tag == null)
+      {
+         // Tag not found
+         model.msg = "manage-tags.tag-not-found";
+         model.result = false;
+      }
+      else
+      {
+         try
+         {
+            // Remove the tag node
+            taggingService.deleteTag(store,tagName);
+            // Successfully removing tag
+            model.msg = "manage-tags.delete-success";
+            model.result = true;
+         }
+         catch(e)
+         {
+            // Unable to remove Tag
+            model.msg = "manage-tags.delete-failure";
+            model.result = false;
+            logger.warn("tag.delete.js: " + e);
+         }
+      }
+   }
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.delete.json.ftl
new file mode 100644
index 00000000000..7134e442925
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.delete.json.ftl
@@ -0,0 +1,4 @@
+{
+   "msg": "${msg}",
+   "result": ${result?string}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.post.desc.xml
new file mode 100644
index 00000000000..647ecf68202
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.post.desc.xml
@@ -0,0 +1,18 @@
+<webscript>
+  <shortname>Create new tag</shortname>
+  <description><![CDATA[
+  Create a new tag in the specified store.
+  <br />
+  The following properties need be set in the POST body.
+  <dl>
+  <dt>name</dt><dd>Name of the tag to create. Note tags are created in lowercase.</dd>
+  </dl>
+  ]]></description>
+  <url>/api/tags/{store_type}/{store_id}</url>  
+  <url>/api/tag/{store_type}/{store_id}</url>  <!--  Keep for backwards compatibility -->
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readwrite">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <family>Tagging</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.post.json.ftl
new file mode 100644
index 00000000000..e004a7b6126
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.post.json.ftl
@@ -0,0 +1,9 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "name": "${tag.name}",
+   "nodeRef": "${tag.nodeRef}",
+   "displayPath": "${tag.displayPath}",
+   "qnamePath": "${tag.qnamePath}",
+   "itemExists": ${tagExists?string}
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.post.json.js
new file mode 100644
index 00000000000..10f6e6fd26e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.post.json.js
@@ -0,0 +1,33 @@
+function main()
+{
+   // Get the store reference
+   var store = url.templateArgs.store_type + "://" + url.templateArgs.store_id;
+
+   // Get the details of the tag
+   if (json.has("name") == false || json.get("name").length == 0)
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "Name missing when creating tag");
+      return;
+   }
+   var tagName = json.get("name");
+   
+   // See if the tag already exists
+   var tag = taggingService.getTag(store, tagName),
+      tagExists = (tag != null);
+   
+   if (!tagExists)
+   {
+      tag = taggingService.createTag(store, tagName);
+      if (tag == null)
+      {
+         status.setCode(status.STATUS_INTERNAL_SERVER_ERROR, "error.cannotCreateTag");
+         return;
+      }
+   }
+   
+   // Put the created tag into the model
+   model.tag = tag;
+   model.tagExists = tagExists;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.put.desc.xml
new file mode 100644
index 00000000000..7aa018668cc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.put.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>edit tag</shortname>
+  <description>Edit existing tag in the specified store.</description>
+  <url>/api/tags/{store_type}/{store_id}/{tagName}</url>
+  <url>/api/tags/{tagName}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readwrite">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <family>Tagging</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.put.json.400.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.put.json.400.ftl
new file mode 100644
index 00000000000..e842e6e5c21
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.put.json.400.ftl
@@ -0,0 +1,4 @@
+{
+   "msg": "${status.message}",
+   "result": false
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.put.json.ftl
new file mode 100644
index 00000000000..7134e442925
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.put.json.ftl
@@ -0,0 +1,4 @@
+{
+   "msg": "${msg}",
+   "result": ${result?string}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.put.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.put.json.js
new file mode 100644
index 00000000000..867b887fc8a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tag.put.json.js
@@ -0,0 +1,85 @@
+function main()
+{
+   // Get the store from the template args
+   var store = "workspace://SpacesStore";
+   if (url.templateArgs.store_type != null && url.templateArgs.store_id != null) 
+   {
+      store = url.templateArgs.store_type + "://" + url.templateArgs.store_id;
+   }
+   
+   // Get the tagName
+   var tagName = url.templateArgs.tagName;
+   if (tagName == null || tagName == "") 
+   {
+      // TagName missing
+      model.msg = "manage-tags.tag-name-missing";
+      model.result = false;
+   } 
+   else 
+   {
+      tagName = tagName.toLowerCase();
+      
+      // Search the tag
+      var tag = taggingService.getTag(store, url.templateArgs.tagName);
+      if (tag == null) 
+      {
+         // Tag not found
+         model.msg = "manage-tags.tag-not-found";
+         model.result = false;
+      } 
+      else 
+      {
+         // Get the new name for the tag
+         var newTagName;
+         if (json.has("name") == false || json.get("name").length() == 0)
+         {
+            // Empty new name
+            status.code = 400;
+            status.redirect = true;
+            status.message = "manage-tags.empty-name";
+         } 
+         else 
+         {
+            newTagName = json.get("name").toLowerCase();
+            if (newTagName == tagName) 
+            {
+               // Duplciate name
+               status.code = 400;
+               status.redirect = true;
+               status.message = "manage-tags.duplicate-name";
+            } 
+            else 
+            {
+               try
+               {
+                  // Get list of tagged node
+                  var taggedNodes = search.tagSearch(store,tagName); 
+                  for (var i=0; i < taggedNodes.length; i++)
+                  {
+                     // Remove tag from the node
+                     taggedNodes[i].removeTag(tagName);
+                     // Add new tag
+                     taggedNodes[i].addTag(newTagName);
+                  }
+                  
+                  // Remove the tag node
+                  taggingService.deleteTag(store,tagName);
+                  
+                  // Successfully removing tag
+                  model.msg = "manage-tags.edit-success";
+                  model.result = true;
+               } 
+               catch(e)
+               {
+                  // Unable to remove Tag
+                  model.msg = "manage-tags.edit-failure";
+                  model.result = false;
+                  logger.warn("tag.put.json.js: " + e);
+               }
+            }
+         }
+      }
+   }
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagging.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagging.lib.ftl
new file mode 100644
index 00000000000..e53c9d5be6c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagging.lib.ftl
@@ -0,0 +1,23 @@
+<#macro tagJSON item>
+{
+   "name" : "${jsonUtils.encodeJSONString(item.name)}",
+   "count" : ${item.count?c}
+}
+</#macro>
+
+<#macro tagJSONDetails item>
+{
+   "type": "${item.typeShort}",
+	"isContainer": ${item.isContainer?string},
+	"name": "${item.properties.name!""}",
+	"title": "${item.properties.title!""}",
+	"description": "${item.properties.description!""}",
+	<#if item.properties.modified??>"modified": "${xmldate(item.properties.modified)}",</#if>
+	<#if item.properties.modifier??>"modifier": "${item.properties.modifier}",</#if>
+	<#if item.siteShortName??>"site": "${item.siteShortName}",</#if>
+	"displayPath": "${item.displayPath!""}",
+	"qnamePath": "${item.qnamePath}",
+	"nodeRef": "${item.nodeRef}",
+	"selectable" : true
+}
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.get.desc.xml
new file mode 100644
index 00000000000..767963ff448
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.get.desc.xml
@@ -0,0 +1,17 @@
+<webscript>
+  <shortname>List all tags</shortname>
+  <description><![CDATA[
+  Get the currently available tags for the specified store.
+  <br />
+  <dl>
+  <dt>tag_filter</dt><dd>The optional tag filter limits the returned tags to those containing the filter. </dd>
+  <dt>details</dt><dd>The optional boolean parameter indicates whether the details of the tag should be provided in the resulting JSON, otherwise just the tag name is returned.</dd>
+  </dl>
+  ]]></description>
+  <url>/api/tags/{store_type}/{store_id}?tf={tag_filter?}&amp;details={details?}&amp;from={from?}&amp;size={size?}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <family>Tagging</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.get.js
new file mode 100644
index 00000000000..268a66fa8f3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.get.js
@@ -0,0 +1,74 @@
+function main()
+{
+   // Get the store reference
+   var store = url.templateArgs.store_type + "://" + url.templateArgs.store_id;
+   
+   var tagNames;
+   var tags = [];
+   
+   var filter = args["tf"];
+   var details = args["details"];
+   var from = args["from"];
+   var size = args["size"];
+   
+   if (filter === null)
+   {
+      if(from === null || size === null)
+      {
+          // Get all the tags
+          tagNames = taggingService.getTags(store);
+          model.totalRecords = tagNames.length;
+      }
+      else
+      {
+          // Get page of the tags
+          var pagedTagsWrapper = taggingService.getPagedTags(store, from, size);
+          tagNames = pagedTagsWrapper.getTagNames();
+          model.totalRecords = pagedTagsWrapper.getTotal();
+      }
+   }
+   else
+   {
+      if(from === null || size === null)
+      {
+          // Get a list of filtered tags
+          tagNames = taggingService.getTags(store, filter);
+          model.totalRecords = tagNames.length;
+      }
+      else
+      {
+          // Get a page of filtered tags
+          var pagedTagsWrapper = taggingService.getPagedTags(store, filter, from, size);
+          tagNames = pagedTagsWrapper.getTagNames();
+          model.totalRecords = pagedTagsWrapper.getTotal();
+      }
+   }
+   
+   // Sort by tag name
+   tagNames.sort(sortByName);
+   
+   if (details === "true")
+   {
+      model.details = true;         
+      for each (var tagName in tagNames)
+      { 
+         var tag = taggingService.getTag(store, tagName);
+         tags.push(tag);
+      }     
+   }
+   else
+   {
+      model.details = false;
+      tags = tagNames;
+   }
+   
+   model.tags = tags;
+}
+
+/* Sort the results by case-insensitive name */
+function sortByName(a, b)
+{
+   return a.localeCompare(b);
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.get.json.ftl
new file mode 100644
index 00000000000..6a1fce2fe25
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.get.json.ftl
@@ -0,0 +1,25 @@
+<#import "tagging.lib.ftl" as taggingLib/>
+<#escape x as jsonUtils.encodeJSONString(x)>
+
+<#if details == true>
+{
+	"data":
+	{
+		"items":
+		[
+		   <#list tags as tag>
+              <@taggingLib.tagJSONDetails item=tag/><#if tag_has_next>,</#if>
+           </#list>
+        ],
+        "totalRecords": ${totalRecords}
+    }
+}
+<#else>	
+[
+   <#list tags as tag>
+      "${tag}"<#if tag_has_next>,</#if>
+   </#list>
+]
+</#if>
+	
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.nodes.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.nodes.get.desc.xml
new file mode 100644
index 00000000000..fe1f8f459ab
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.nodes.get.desc.xml
@@ -0,0 +1,24 @@
+<webscript>
+  <shortname>Get nodes for tag</shortname>
+  <description><![CDATA[
+  Get the nodes which have a given tag.
+  <br />
+  Return content
+  <br />
+  Array of
+  <ul>
+  <li>nodeRef</li>
+  <li>url</li>
+  </ul>
+       
+  <br />
+  Return status: STATUS_OK, 200
+  
+  ]]></description>
+  <url>/api/tags/{store_type}/{store_id}/{tag}/nodes</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <family>Tagging</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.nodes.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.nodes.get.js
new file mode 100644
index 00000000000..190e94b3237
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.nodes.get.js
@@ -0,0 +1,19 @@
+function main()
+{
+   // Get the store reference
+   var store = url.templateArgs.store_type + "://" + url.templateArgs.store_id;
+   
+   // Get the tag
+   var tag = url.templateArgs.tag;
+   if (tag == null)
+   {
+      // Error since no tag specified on the URL
+      status.setCode(404, "No tag specified");
+      return;
+   }
+   
+   // do the search
+   model.nodes = search.tagSearch(store, tag);
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.nodes.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.nodes.get.json.ftl
new file mode 100644
index 00000000000..c090f9ebe18
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tags.nodes.get.json.ftl
@@ -0,0 +1,10 @@
+[
+<#escape x as jsonUtils.encodeJSONString(x)>
+	<#list nodes as node>
+		{
+			"nodeRef" : "${node.storeType + "://" + node.storeId + "/" + node.id}",
+			"url" : "${url.serviceContext + "/api/node/" + node.storeType + "/" + node.storeId + "/" + node.id}"
+		}<#if node_has_next>,</#if>
+	</#list>
+</#escape>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagscope-tags.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagscope-tags.get.desc.xml
new file mode 100644
index 00000000000..a459e62971d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagscope-tags.get.desc.xml
@@ -0,0 +1,14 @@
+<webscript>
+  <shortname>Get tagscope tags</shortname>
+  <description><![CDATA[
+  Get all tags of the nearest available tagscope.
+  ]]></description>
+  <url>/api/tagscopes/node/{store_type}/{store_id}/{id}/tags</url>
+  <url>/api/tagscopes/site/{site}/tags</url>
+  <url>/api/tagscopes/site/{site}/{container}/tags</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <family>Tagging</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagscope-tags.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagscope-tags.get.js
new file mode 100644
index 00000000000..2677b1619af
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagscope-tags.get.js
@@ -0,0 +1,90 @@
+<import resource="classpath:alfresco/templates/webscripts/org/alfresco/repository/requestutils.lib.js">
+
+function findTargetNode()
+{
+   if (url.templateArgs.site != undefined)
+   {
+      var siteId = url.templateArgs.site;
+      var containerId = url.templateArgs.container;
+      var path = url.templateArgs.path;
+
+      // fetch site
+      var site = siteService.getSite(siteId);
+      if (site && site.visibility != "PUBLIC" && !site.isMember(person.properties.userName) && !people.isAdmin(person))
+      {
+         status.setCode(status.STATUS_FORBIDDEN, "User is not a member of the " + siteId + " site");
+         return null;
+      }
+
+      if (site === null)
+      {
+         status.setCode(status.STATUS_NOT_FOUND, "Site " + siteId + " does not exist");
+         return null;
+      }
+      else if (containerId == undefined)
+      {
+         // get site node
+         return site.node;
+      }
+      
+      // fetch container
+      var node = null;
+      if (site.hasContainer(containerId))
+      {
+         node = site.getContainer(containerId);
+      }
+      if (node == null)
+      {
+         // Container might not be there as it hasn't been created yet!
+         //status.setCode(status.STATUS_NOT_FOUND, "Unable to fetch container '" + containerId + "' of site '" + siteId + "'. (No write permission?)");
+         return null;
+      }
+      else if (path == undefined)
+      {
+         return node;
+      }
+      
+      node = node.childByNamePath(path);
+      return node;
+   }
+   else
+   {
+      return findFromReference();
+   }
+}
+
+function main()
+{
+   var node = findTargetNode();
+   if (node == null)
+   {
+      model.noscopefound=true;
+      return;
+   }
+   
+   // fetch the nearest available tagscope
+   var scope = node.tagScope;
+   if (scope == null)
+   {
+      //status.setCode(status.STATUS_BAD_REQUEST, "No tag scope could be found for the given resource");
+      //return null;
+      model.noscopefound=true;
+   }
+   else
+   {
+      var topN = args["topN"] != undefined ? parseInt(args["topN"]) : -1;
+      if (topN > -1)
+      {
+         // PENDING:
+         // getTopTags currently throws an AIOOB exception if topN > tags.length() :-/
+         if (scope.tags.length < topN) topN = scope.tags.length;
+         model.tags = scope.getTopTags(topN);
+      }
+      else
+      {
+         model.tags = scope.tags;
+      }
+   }
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagscope-tags.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagscope-tags.get.json.ftl
new file mode 100644
index 00000000000..0f5127a7cf4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tagging/tagscope-tags.get.json.ftl
@@ -0,0 +1,15 @@
+<#if (noscopefound?? && noscopefound)>
+{
+   "tags" : []
+}
+<#else>
+   {
+      "tags" : [
+         <#import "tagging.lib.ftl" as taggingLib/>
+         <#list tags as item>
+            <@taggingLib.tagJSON item=item />
+            <#if item_has_next>,</#if>
+         </#list>
+      ]
+   }
+</#if>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenant.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenant.lib.ftl
new file mode 100644
index 00000000000..3b18ffb51e9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenant.lib.ftl
@@ -0,0 +1,7 @@
+<#macro tenantJSON tenant>
+      {
+         "tenantDomain": "${tenant.tenantDomain}",
+         "enabled": "${tenant.enabled?string}",
+         "contentRoot": "${tenant.rootContentStoreDir!""}"
+      }
+</#macro>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.delete.desc.xml
new file mode 100644
index 00000000000..8dcb97b4405
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.delete.desc.xml
@@ -0,0 +1,18 @@
+<webscript>
+   <shortname>Delete tenant</shortname>
+   <description><![CDATA[
+      Delete a tenant.
+      
+      <br />The repository must be configured such that Multi-Tenancy is enabled.
+      <br />You must have "administrator" privileges to delete a tenant.
+      
+      <br />WARNING: This operation cannot be recovered !!!
+   ]]>
+   </description>
+   <url>/api/tenants/{tenantDomain}</url>
+   <format default="json">argument</format>
+   <authentication>admin</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <family>MultiTenantAdmin</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.delete.json.ftl
new file mode 100644
index 00000000000..124ee87b860
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.delete.json.ftl
@@ -0,0 +1 @@
+<#import "tenant.lib.ftl" as tenantLib/>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.get.desc.xml
new file mode 100644
index 00000000000..547a9fe5a11
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.get.desc.xml
@@ -0,0 +1,16 @@
+<webscript>
+  <shortname>Get tenants</shortname>
+  <description><![CDATA[
+      Get list of tenants.
+      
+      <br />The repository must be in Multi-Tenant mode (1st tenant created).
+      <br />You must have "administrator" privileges to get list of tenants.
+   ]]>
+   </description>
+  <url>/api/tenants</url>
+  <format default="json">argument</format>
+  <authentication>admin</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <family>MultiTenantAdmin</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.get.json.ftl
new file mode 100644
index 00000000000..d753794629d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.get.json.ftl
@@ -0,0 +1,10 @@
+<#import "tenant.lib.ftl" as tenantLib/>
+{ 
+   "tenants" :
+   [
+      <#list tenants as tenant>
+         <@tenantLib.tenantJSON tenant=tenant/>
+         <#if tenant_has_next>,</#if>
+      </#list>
+   ]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.post.desc.xml
new file mode 100644
index 00000000000..cb7256bfb61
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.post.desc.xml
@@ -0,0 +1,22 @@
+<webscript>
+   <shortname>Create tenant</shortname>
+   <description><![CDATA[
+      Create a tenant.
+      
+      <br />The repository must be in Multi-Tenant mode (1st tenant created).
+      <br />You must have "administrator" privileges to create a tenant.
+      
+      <dl>
+      <dt>tenantDomain</dt> <dd> mandatory </dd>
+      <dt>tenantAdminPassword</dt> <dd> mandatory </dd>
+      <dt>tenantContentStoreRoot</dt> <dd> optional </dd>
+      </dl>
+   ]]>
+   </description>
+   <url>/api/tenants</url>
+   <format default="json">argument</format>
+   <authentication>admin</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <family>MultiTenantAdmin</family>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.post.json.ftl
new file mode 100644
index 00000000000..124ee87b860
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/tenant/tenants.post.json.ftl
@@ -0,0 +1 @@
+<#import "tenant.lib.ftl" as tenantLib/>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.delete.desc.xml
new file mode 100644
index 00000000000..76430cf13f0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.delete.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Delete thumbnail</shortname>
+  <description>Deletes a thumbnail for a content resource.</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}</url>  
+  <url>/api/path/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.delete.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.delete.js
new file mode 100644
index 00000000000..c9811fef630
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.delete.js
@@ -0,0 +1,48 @@
+function main()
+{
+   // Get the node from the URL
+   var pathSegments = url.match.split("/");
+   var reference = [ url.templateArgs.store_type, url.templateArgs.store_id ].concat(url.templateArgs.id.split("/"));
+   var node = search.findNode(pathSegments[2], reference);
+   
+   // 404 if the node to thumbnail is not found
+   if (node == null)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "The thumbnail source node could not be found");
+      return;
+   }
+
+   // 400 if the node is not a subtype of cm:content
+   if (!node.isSubType("cm:content"))
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "The thumbnail source node is not a subtype of cm:content");
+      return;
+   }
+   
+   // Get the thumbnail name from the JSON content 
+   var thumbnailName = url.templateArgs.thumbnailname; 
+   
+   // 404 if no thumbnail name found
+   if (thumbnailName == null)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "Thumbnail name was not provided");
+      return;
+   }
+   
+   // Get the thumbnail
+   var thumbnail = node.getThumbnail(thumbnailName);
+   if (thumbnail == null || thumbnail.size == 0)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "Thumbnail was not found");
+      return;
+   }
+
+   // Delete the asset
+   if (!thumbnail.remove())
+   {
+      status.setCode(status.STATUS_INTERNAL_SERVER_ERROR, "Could not delete");
+      return;
+   }
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.delete.json.ftl
new file mode 100644
index 00000000000..d6e29726bd5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.delete.json.ftl
@@ -0,0 +1,3 @@
+{
+   "result"": "success",
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.desc.xml
new file mode 100644
index 00000000000..381d7b03778
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.desc.xml
@@ -0,0 +1,20 @@
+<webscript kind="org.alfresco.repository.content.stream">
+  <shortname>Thumbnails</shortname>
+  <description>
+  Get a named thumbnail for a content resource.<br/>
+  The two URL templates which support a 'filename' template-arg are made available in order to
+  support scenarios (e.g. with third party libraries) where the repo URL being called includes an explicit filename suffix.<br/>
+  Note that Alfresco does not currently use the filename template-arg and that it will be ignored.
+  Therefore a GET to these URLs will return the same resource as to the equivalent URLs without it.
+  </description>
+  <url>/api/node/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}?c={queueforcecreate?}&amp;ph={placeholder?}&amp;lastModified={modified?}</url>
+  <url>/api/node/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}?c={queueforcecreate?}&amp;ph={placeholder?}</url>  
+  <url>/api/path/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}?c={queueforcecreate?}&amp;ph={placeholder?}</url>
+  <url>/api/node/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}/{filename}?c={queueforcecreate?}&amp;ph={placeholder?}</url>  
+  <url>/api/path/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}/{filename}?c={queueforcecreate?}&amp;ph={placeholder?}</url>
+  <transaction allow="readonly">required</transaction>
+  <format default="">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.js
new file mode 100644
index 00000000000..535a3d6741d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.js
@@ -0,0 +1,115 @@
+function main()
+{
+   // Indicate whether or not the thumbnail can be cached by the browser. Caching is allowed if the lastModified
+   // argument is provided as this is an indication of request uniqueness and therefore the browser will have
+   // the latest thumbnail image.
+   if (args.lastModified != null)
+   {
+      model.allowBrowserToCache = "true";
+   }
+   else
+   {
+      model.allowBrowserToCache = "false";
+   }
+   
+   // Get the node from the URL
+   var pathSegments = url.match.split("/");
+   var reference = [ url.templateArgs.store_type, url.templateArgs.store_id ].concat(url.templateArgs.id.split("/"));
+   var node = search.findNode(pathSegments[2], reference);
+   
+   // 404 if the node to thumbnail is not found
+   if (node == null)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "The thumbnail source node could not be found");
+      return;
+   }
+
+   // 400 if the node is not a subtype of cm:content
+   if (!node.isSubType("cm:content"))
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "The thumbnail source node is not a subtype of cm:content");
+      return;
+   }
+   
+   // Get the thumbnail name from the JSON content 
+   var thumbnailName = url.templateArgs.thumbnailname; 
+   
+   // 404 if no thumbnail name found
+   if (thumbnailName == null)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "Thumbnail name was not provided");
+      return;
+   }
+   
+   // Get the queue/force create setting
+   var qc = false;
+   var fc = false;
+   if (args.c != null)
+   {
+      if (args.c == "queue")
+      {
+         qc = true;
+      }
+      else if (args.c == "force")
+      {
+         fc = true;
+      }
+   }
+   
+   // Get the place holder flag
+   var ph = false;
+   var phString = args.ph;
+   if (phString != null)
+   {
+      ph = utils.toBoolean(phString);
+   }
+   
+   // Get the thumbnail
+   var thumbnail = node.getThumbnail(thumbnailName);
+   if (thumbnail == null || thumbnail.size == 0)
+   {
+      // Queue the creation of the thumbnail if appropriate
+      if (fc)
+      {
+        model.contentNode = node.createThumbnail(thumbnailName, false, true);
+      }
+      else
+      {
+         if (qc)
+         {
+            node.createThumbnail(thumbnailName, true);
+         }
+         
+         if (ph == true)
+         {
+            // Try and get the place holder resource. We use a method in the thumbnail service
+            // that by default gives us a resource based on the content's mime type.
+            var phPath = thumbnailService.getMimeAwarePlaceHolderResourcePath(thumbnailName, node.mimetype);
+            if (phPath == null)
+            {
+               // 404 since no thumbnail was found
+               status.setCode(status.STATUS_NOT_FOUND, "Thumbnail was not found and no place holder resource set for '" + thumbnailName + "'");
+               return;
+            }
+            else
+            {
+               // Set the resouce path in the model ready for the content stream to send back to the client
+               model.contentPath = phPath;
+            }
+         }
+         else
+         {
+            // 404 since no thumbnail was found
+            status.setCode(status.STATUS_NOT_FOUND, "Thumbnail was not found");
+            return;
+         }
+      }
+   }
+   else
+   {
+      // Place the details of the thumbnail into the model, this will be used to stream the content to the client
+      model.contentNode = thumbnail;
+   } 
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.lib.ftl
new file mode 100644
index 00000000000..1c8be144340
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.lib.ftl
@@ -0,0 +1,8 @@
+<#macro thumbnailJSON node thumbnailName>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "thumbnailName" : "${thumbnailName}",
+   "url" : "${url.serviceContext + "/api/node/" + node.storeType + "/" + node.storeId+ "/" + node.id + "/content/thumbnails/" + thumbnailName}"
+}
+</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.put.desc.xml
new file mode 100644
index 00000000000..99582109878
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.put.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Update thumbnail</shortname>
+  <description>Updates a thumbnail for a content resource.</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}</url>  
+  <url>/api/path/{store_type}/{store_id}/{id}/content{property}/thumbnails/{thumbnailname}</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.put.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.put.js
new file mode 100644
index 00000000000..9a9326e5541
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.put.js
@@ -0,0 +1,45 @@
+function main()
+{
+   // Get the node from the URL
+   var pathSegments = url.match.split("/");
+   var reference = [ url.templateArgs.store_type, url.templateArgs.store_id ].concat(url.templateArgs.id.split("/"));
+   var node = search.findNode(pathSegments[2], reference);
+   
+   // 404 if the node to thumbnail is not found
+   if (node == null)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "The thumbnail source node could not be found");
+      return;
+   }
+
+   // 400 if the node is not a subtype of cm:content
+   if (!node.isSubType("cm:content"))
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "The thumbnail source node is not a subtype of cm:content");
+      return;
+   }
+   
+   // Get the thumbnail name from the JSON content 
+   var thumbnailName = url.templateArgs.thumbnailname; 
+   
+   // 404 if no thumbnail name found
+   if (thumbnailName == null)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "Thumbnail name was not provided");
+      return;
+   }
+   
+   // Get the thumbnail
+   var thumbnail = node.getThumbnail(thumbnailName);
+   
+   if (thumbnail != null)
+   {
+      thumbnail.update();
+   }
+   else
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "Thumbnail with name '" + thumbnailName + "' not found");
+   } 
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.put.json.ftl
new file mode 100644
index 00000000000..294abc0699a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.put.json.ftl
@@ -0,0 +1,3 @@
+{
+   "Status Code":  ${status.code}
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnaildefinitions.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnaildefinitions.get.desc.xml
new file mode 100644
index 00000000000..6ffb30c103e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnaildefinitions.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Get thumbnail definitions</shortname>
+  <description>Get the thumbnail definitions for a content resource.</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/content{property}/thumbnaildefinitions</url>  
+  <url>/api/path/{store_type}/{store_id}/{id}/content{property}/thumbnaildefinitions</url>  
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnaildefinitions.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnaildefinitions.get.js
new file mode 100644
index 00000000000..74e171fb35d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnaildefinitions.get.js
@@ -0,0 +1,23 @@
+function main()
+{
+   // Get the node from the URL
+   var pathSegments = url.match.split("/");
+   var reference = [ url.templateArgs.store_type, url.templateArgs.store_id ].concat(url.templateArgs.id.split("/"));
+   var node = search.findNode(pathSegments[2], reference);
+ 
+   // 404 if the node to thumbnail is not found
+   if (node == null)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "The node could not be found");
+	  return;
+   }
+   
+   // Get the thumbnail definitions
+   var thumbnailDefinitions = node.getThumbnailDefinitions();
+   
+   // Add them to the model
+   model.node = node;
+   model.thumbnailDefinitions = thumbnailDefinitions; 
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnaildefinitions.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnaildefinitions.get.json.ftl
new file mode 100644
index 00000000000..705e7d0483b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnaildefinitions.get.json.ftl
@@ -0,0 +1,8 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+[
+	<#list thumbnailDefinitions as def>
+		"${def}"
+		<#if def_has_next>,</#if>
+	</#list>
+]
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.get.desc.xml
new file mode 100644
index 00000000000..ad44de0b920
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Get thumbnails</shortname>
+  <description>Gets the thumbnails for a content resource.</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/content{property}/thumbnails</url>  
+  <url>/api/path/{store_type}/{store_id}/{id}/content{property}/thumbnails</url>  
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.get.js
new file mode 100644
index 00000000000..d9576b2c583
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.get.js
@@ -0,0 +1,30 @@
+function main()
+{
+   // Get the node from the URL
+   var pathSegments = url.match.split("/");
+   var reference = [ url.templateArgs.store_type, url.templateArgs.store_id ].concat(url.templateArgs.id.split("/"));
+   var node = search.findNode(pathSegments[2], reference);
+ 
+   // 404 if the node to thumbnail is not found
+   if (node == null)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "The thumbnail source node could not be found");
+      return;
+   }
+
+   // 400 if the node is not a subtype of cm:content
+   if (!node.isSubType("cm:content"))
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "The thumbnail source node is not a subtype of cm:content");
+      return;
+   }
+   
+   // Get the thumbnails
+   var thumbnails = node.getThumbnails();
+   
+   // Add them to the model
+   model.node = node;
+   model.thumbnails = thumbnails; 
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.get.json.ftl
new file mode 100644
index 00000000000..fe8ec7126a5
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.get.json.ftl
@@ -0,0 +1,8 @@
+<#import "thumbnail.lib.ftl" as thumbnailLib/>
+
+[
+	<#list thumbnails as thumbnail>
+		<@thumbnailLib.thumbnailJSON node=node thumbnailName=thumbnail.properties.thumbnailName/>
+		<#if thumbnail_has_next>,</#if>
+	</#list>
+]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.desc.xml
new file mode 100644
index 00000000000..d0d4d7428ba
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+  <shortname>Create thumbnail</shortname>
+  <description>Creates a new thumbnail for a content resource.</description>
+  <url>/api/node/{store_type}/{store_id}/{id}/content{property}/thumbnails?as={async?}</url>  
+  <url>/api/path/{store_type}/{store_id}/{id}/content{property}/thumbnails?as={async?}</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.json.ftl
new file mode 100644
index 00000000000..38a1892120b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.json.ftl
@@ -0,0 +1,5 @@
+<#import "thumbnail.lib.ftl" as thumbnailLib/>
+
+<#if node?exists>
+   <@thumbnailLib.thumbnailJSON node=node thumbnailName=thumbnailName/>
+</#if>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.json.js
new file mode 100644
index 00000000000..11fc1e22e89
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnails.post.json.js
@@ -0,0 +1,63 @@
+function main()
+{
+   // Get the node from the URL
+   var pathSegments = url.match.split("/");
+   var reference = [ url.templateArgs.store_type, url.templateArgs.store_id ].concat(url.templateArgs.id.split("/"));
+   var node = search.findNode(pathSegments[2], reference);
+ 
+   // 404 if the node to thumbnail is not found
+   if (node == null)
+   {
+      status.setCode(status.STATUS_NOT_FOUND, "The thumbnail source node could not be found");
+      return;
+   }
+
+   // 400 if the node is not a subtype of cm:content
+   if (!node.isSubType("cm:content"))
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "The thumbnail source node is not a subtype of cm:content");
+      return;
+   }
+   
+   // Get the thumbnail name from the JSON content 
+   var thumbnailName = null;
+   if (json.isNull("thumbnailName") == false)
+   {
+      thumbnailName = json.get("thumbnailName");
+   }
+   
+   // 400 if no thumbnail name found
+   if (thumbnailName == null)
+   {
+      status.setCode(status.STATUS_BAD_REQUEST, "Thumbnail name was not provided");
+      return;
+   }  
+   
+   // TODO double check that the thumbnail name is valid
+   
+   // Get the flag indicating whether to create the thumbnail asynchronously or not
+   var async = false;
+   var asyncString = args.as;
+   if (asyncString != null)
+   {
+      async = utils.toBoolean(asyncString);
+   }
+   
+   if (async == false)
+   {
+	   // Create the thumbnail
+	   var thumbnail = node.createThumbnail(thumbnailName);
+	   
+	   // Prep the model
+	   model.node = node;
+	   model.thumbnailName = thumbnailName;
+	   model.thumbnail = thumbnail;
+   }
+   else
+   {
+	   // Create the the thumbnail asyncronously
+	   node.createThumbnail(thumbnailName, true);
+   }    
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/touch.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/touch.get.desc.xml
new file mode 100644
index 00000000000..333db9afd75
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/touch.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Touch</shortname>
+  <description>SSO authentication touch point - return a simple 200 OK status</description>
+  <url>/touch</url>
+  <format default="">argument</format>
+  <authentication>guest</authentication>
+  <transaction>none</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/transfer/transfer.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/transfer/transfer.post.desc.xml
new file mode 100644
index 00000000000..6717bfe3566
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/transfer/transfer.post.desc.xml
@@ -0,0 +1,13 @@
+<webscript>
+  <shortname>Alfresco transfer service</shortname>
+  <description>Invoke commands on the Alfresco transfer service</description>
+  <url>/api/transfer/{command}</url>
+  <format default="json" />
+  <authentication>admin</authentication>
+  <transaction>required</transaction>
+  <lifecycle>internal</lifecycle>
+  
+  <!--  turn off the multipart formdata processing -->
+  <formdata multipart-processing="false" />
+
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.get.html.status.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.get.html.status.ftl
new file mode 100644
index 00000000000..4ed0c8e9d94
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.get.html.status.ftl
@@ -0,0 +1,12 @@
+<html>
+<head>
+   <title>Upload failure</title>
+</head>
+<body>
+<#if (args.failure!"")?matches("^[\\w\\d\\._]+$")>
+   <script type="text/javascript">
+      ${args.failure}({});
+   </script>
+</#if>
+</body>
+</html>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.config.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.config.xml
new file mode 100644
index 00000000000..da8d23ee833
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.config.xml
@@ -0,0 +1,5 @@
+<upload>
+<!-- modify this configuration to change the versioning behaviour for this API - remove the section to apply content model default behaviour -->
+  <!--  autoVersion>true</autoVersion-->
+  <!--  autoVersionProps>false</autoVersionProps-->
+</upload>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.desc.xml
new file mode 100644
index 00000000000..c68f24fce02
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.desc.xml
@@ -0,0 +1,57 @@
+<webscript>
+  <shortname>File upload</shortname>
+  <description><![CDATA[
+  Upload file content and meta-data into repository.
+  
+  <br />
+  HTML form data
+  <ul>
+    <li>filedata, (mandatory) HTML type file</li>
+    <li>You must specify one of:
+       <br>&nbsp;destination (the folder NodeRef where the node will be created)
+       <br>&nbsp;updateNodeRef (the NodeRef of an existing node that will be updated)
+       <br>&nbsp;siteid and containerid (the Site name and the container in that site where the document will be created)
+    </li>
+    <li>uploaddirectory - name of the folder (either in the site container or the destination) where the document will be uploaded. This folder must already exist</li>
+    <li>description - Description for a version update (versionDescription)</li>
+    <li>contenttype - The content type that this document should be specialised to</li>
+    <li>majorversion</li>
+    <li>overwrite</li>
+    <li>thumbnails</li>
+  </ul> 
+  
+  <br />
+  Return content
+  <ul>
+  <li>nodeRef</li>
+  </ul>
+
+  <br />
+  Return status: STATUS_OK (200)
+  ]]>
+  </description>
+  <url>/api/upload</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>limited_support</lifecycle>
+  <responses>
+    <response>
+      <format>json</format>
+      <type>
+      <![CDATA[
+      {
+        "nodeRef": string,
+        "fileName": string,
+        "status":
+        {
+          "code": 200,
+          "name": "OK",
+          "description": "File uploaded successfully"
+        }
+      }
+      ]]>
+      </type>
+    </response>
+  </responses>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.html.ftl
new file mode 100644
index 00000000000..83ab0439578
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.html.ftl
@@ -0,0 +1,15 @@
+<html>
+<head>
+   <title>Upload Success</title>
+</head>
+<body>
+<#if (args.success!"")?matches("^[\\w\\d\\._]+$")>
+   <script type="text/javascript">
+      ${args.success}({
+         nodeRef: "${document.nodeRef}",
+         fileName: "${document.name}"
+      });
+   </script>
+</#if>
+</body>
+</html>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.html.status.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.html.status.ftl
new file mode 100644
index 00000000000..5c40729ef4e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.html.status.ftl
@@ -0,0 +1,19 @@
+<html>
+<head>
+   <title>Upload Failure</title>
+</head>
+<body>
+<#if (args.failure!"")?matches("^[\\w\\d\\._]+$")>
+   <script type="text/javascript">
+      ${args.failure}({
+         status: {
+            "code" : ${status.code},
+            "name" : "${status.codeName}",
+            "description" : "${status.codeDescription}"
+         },
+         message: "${jsonUtils.encodeJSONString(status.message)}"
+      });
+   </script>
+</#if>
+</body>
+</html>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
new file mode 100644
index 00000000000..31d1b112a20
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
@@ -0,0 +1,523 @@
+function extractMetadata(file)
+{
+   // Extract metadata - via repository action for now.
+   // This should use the MetadataExtracter API to fetch properties, allowing for possible failures.
+   var emAction = actions.create("extract-metadata");
+   if (emAction != null)
+   {
+      // Call using readOnly = false, newTransaction = false
+      emAction.execute(file, false, false);
+   }
+}
+
+function exitUpload(statusCode, statusMsg)
+{
+   status.code = statusCode;
+   status.message = statusMsg;
+   status.redirect = true;
+}
+
+/**
+ * Creates an new filename by adding a suffix to existing one in order to avoid duplicates in folder
+ * The check that folder already contains the filename should be done before calling this function
+ * @param filename - existing filename
+ * @param destNode - folder node
+ * @returns
+ */
+function createUniqueNameInFolder(filename, destNode)
+{
+   var counter = 1,
+   tmpFilename,
+   dotIndex,
+   existingFile;
+   do
+   {
+      dotIndex = filename.lastIndexOf(".");
+      if (dotIndex == 0)
+      {
+         // File didn't have a proper 'name' instead it had just a suffix and started with a ".", create "1.txt"
+         tmpFilename = counter + filename;
+      }
+      else if (dotIndex > 0)
+      {
+         // Filename contained ".", create "filename-1.txt"
+         tmpFilename = filename.substring(0, dotIndex) + "-" + counter + filename.substring(dotIndex);
+      }
+      else
+      {
+         // Filename didn't contain a dot at all, create "filename-1"
+         tmpFilename = filename + "-" + counter;
+      }
+      existingFile = destNode.childByNamePath(tmpFilename);
+      counter++;
+   } while (existingFile !== null);
+   return tmpFilename;
+}
+
+/**
+ * Determines if new filename looks like it was renamed as a result of the user's OS's duplicate file name avoidance.
+ * This is particularly a problem for "Edit Offline" functionality where the user's workflow may require multiple
+ * download, modification and upload cycles. See MNT-18018 for details.
+ *
+ * The de-duplication marker manifests itself as a " (1)" appended after the filename, before the extension.
+ * @param fileName {string}
+ * @param originalFileName {string}
+ * @return {boolean}
+ *
+ * NOTE: duplicated in slingshot/source/web/components/upload/dnd-upload.js to allow client side detection too.
+ */
+function containsOSDeDupeMarkers(fileName, originalFileName) {
+   // Components of RegEx:
+   var deDupeMarker = "\\s\\([\\d]+\\)", // single space followed by one or more digits in literal brackets; e.g." (1)", " (2)", " (13)"
+      fileExtension = "\\.[A-z\\d]+$"; // a single dot followed by one or more letters or numbers at end of string.  e.g. ".jpg", ".mp3", ".docx"
+
+   // Extract file extension from originalFileName if it exists & remove from original file name.
+   var regExMatch = new RegExp(fileExtension).exec(originalFileName),
+      originalFileExtension = (regExMatch)? regExMatch[0] : "",
+      originalFileNameWithoutExtension = (regExMatch) ? originalFileName.substr(0, regExMatch["index"]) : "";
+
+   var combinedRegEx = new RegExp("^" + escapeRegExp(originalFileNameWithoutExtension) + deDupeMarker + escapeRegExp(originalFileExtension) + "$");
+
+   return combinedRegEx.test(fileName);
+}
+
+/**
+ * Make user input safe to pass into a RegEx
+ *
+ * @param string {string}
+ * @return {string}
+ */
+function escapeRegExp(string) {
+   return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function main()
+{
+   try
+   {
+      var filename = null,
+         content = null,
+         mimetype = null,
+         siteId = null, site = null,
+         containerId = null, container = null,
+         destination = null,
+         destNode = null,
+         thumbnailNames = null,
+         i;
+
+      // Upload specific
+      var uploadDirectory = null,
+         createDirectory = false,
+         contentType = null,
+         aspects = [],
+         overwrite = true; // If a filename clashes for a versionable file
+
+      // Update specific
+      var updateNodeRef = null,
+         majorVersion = false,
+         updateNameAndMimetype = false,
+         description = "";
+      
+      // Prevents Flash- and IE8-sourced "null" values being set for those parameters where they are invalid.
+      // Note: DON'T use a "!==" comparison for "null" here.
+      var fnFieldValue = function(p_field)
+      {
+         return p_field.value.length() > 0 && p_field.value != "null" ? p_field.value : null;
+      };
+
+      // allow the locale to be set via an argument
+      if (args["lang"] != null)
+      {
+         utils.setLocale(args["lang"]);
+      }
+
+      var uploadConfig = new XML(config.script),
+          autoVersion = uploadConfig.autoVersion.toString() == "" ? null : uploadConfig.autoVersion.toString() == "true",
+          autoVersionProps = uploadConfig.autoVersionProps.toString() == "" ? null : uploadConfig.autoVersionProps.toString() == "true";
+
+      // Parse file attributes
+      for each (field in formdata.fields)
+      {
+         switch (String(field.name).toLowerCase())
+         {
+            case "filename":
+               filename = fnFieldValue(field);
+               break;
+            
+            case "filedata":
+               if (field.isFile)
+               {
+                  filename = filename ? filename : field.filename;
+                  content = field.content;
+                  mimetype = field.mimetype;
+               }
+               break;
+
+            case "siteid":
+               siteId = fnFieldValue(field);
+               break;
+
+            case "containerid":
+               containerId = fnFieldValue(field);
+               break;
+
+            case "destination":
+               destination = fnFieldValue(field);
+               break;
+
+            case "uploaddirectory":
+               uploadDirectory = fnFieldValue(field);
+               if ((uploadDirectory !== null) && (uploadDirectory.length() > 0))
+               {
+                  if (uploadDirectory.charAt(uploadDirectory.length() - 1) != "/")
+                  {
+                     uploadDirectory = uploadDirectory + "/";
+                  }
+                  // Remove any leading "/" from the uploadDirectory
+                  if (uploadDirectory.charAt(0) == "/")
+                  {
+                     uploadDirectory = uploadDirectory.substr(1);
+                  }
+               }
+               break;
+
+            case "updatenoderef":
+               updateNodeRef = fnFieldValue(field);
+               break;
+
+            case "description":
+               description = field.value;
+               break;
+
+            case "contenttype":
+               contentType = field.value;
+               break;
+
+            case "aspects":
+               aspects = field.value != "-" ? field.value.split(",") : [];
+               break;
+
+            case "majorversion":
+               majorVersion = field.value == "true";
+               break;
+
+            case "overwrite":
+               overwrite = field.value == "true";
+               break;
+
+            case "thumbnails":
+               thumbnailNames = field.value;
+               break;
+               
+            case "updatenameandmimetype":
+               updateNameAndMimetype = field.value == "true";
+               break;
+            
+            case "createdirectory":
+               createDirectory = field.value == "true";
+               break;
+         }
+      }
+
+      // MNT-7213 When alf_data runs out of disk space, Share uploads result in a success message, but the files do not appear
+      if (formdata.fields.length == 0)
+      {
+         exitUpload(404, " No disk space available");
+         return;
+      }
+	  
+      // Ensure mandatory file attributes have been located. Need either destination, or site + container or updateNodeRef
+      if ((filename === null || content === null) || (destination === null && (siteId === null || containerId === null) && updateNodeRef === null))
+      {
+         exitUpload(400, "Required parameters are missing");
+         return;
+      }
+
+      /**
+       * Site or Non-site?
+       */
+      if (siteId !== null && siteId.length() > 0)
+      {
+         /**
+          * Site mode.
+          * Need valid site and container. Try to create container if it doesn't exist.
+          */
+         site = siteService.getSiteInfo(siteId);
+         if (site === null)
+         {
+            exitUpload(404, "Site (" + siteId + ") not found.");
+            return;
+         }
+
+         container = site.getContainer(containerId);
+         if (container === null)
+         {
+            try
+            {
+               // Create container since it didn't exist
+               container = site.createContainer(containerId);
+            }
+            catch(e)
+            {
+               // Error could be that it already exists (was created exactly after our previous check) but also something else
+               container = site.getContainer(containerId);
+               if (container === null)
+               {
+                  // Container still doesn't exist, then re-throw error
+                  throw e;
+               }
+               // Since the container now exists we can proceed as usual
+            }
+         }
+
+         if (container === null)
+         {
+            exitUpload(404, "Component container (" + containerId + ") not found.");
+            return;
+         }
+         
+         destNode = container;
+      }
+      else if (destination !== null)
+      {
+         /**
+          * Non-Site mode.
+          * Need valid destination nodeRef.
+          */
+         destNode = search.findNode(destination);
+         if (destNode === null)
+         {
+            exitUpload(404, "Destination (" + destination + ") not found.");
+            return;
+         }
+      }
+
+      /**
+       * Update existing or Upload new?
+       */
+      if (updateNodeRef !== null)
+      {
+         /**
+          * Update existing file specified in updateNodeRef
+          */
+         var updateNode = search.findNode(updateNodeRef);
+         var workingcopy = updateNode.hasAspect("cm:workingcopy");
+
+         if (updateNode === null)
+         {
+            exitUpload(404, "Node specified by updateNodeRef (" + updateNodeRef + ") not found.");
+            return;
+         }
+
+         var newFilename = filename;
+         if (updateNameAndMimetype)
+         {
+             //check to see if name is already used in folder
+             var existingFile = updateNode.getParent().childByNamePath(filename);
+             var existingFileNodeRef = (existingFile !== null) ? String(existingFile.nodeRef) : '',
+            	 updateFileNodeRef = String(updateNodeRef);
+             if (existingFile !== null && existingFileNodeRef !== updateFileNodeRef)
+             {
+                 //name it's already used for other than node to update; create a new one
+                 newFilename = createUniqueNameInFolder(filename, updateNode.getParent());
+             }
+            // MNT-18018: Avoid getting stuck in a loop of renamed files when using the Edit Offline functionality
+            // Only rename the file if it is not a working copy and it does not contain any OS de-duplication markers
+            if (!(workingcopy && containsOSDeDupeMarkers(filename, updateNode.name)))
+            {
+               //update node name
+               updateNode.setName(newFilename);
+            }
+         }
+
+         if (!workingcopy && updateNode.isLocked)
+         {
+            // We cannot update a locked document (except working copy as per MNT-8736)
+            exitUpload(404, "Cannot update locked document '" + updateNodeRef + "', supply a reference to its working copy instead.");
+            return;
+         }
+
+         if (!workingcopy)
+         {
+            // Ensure the file is versionable (autoVersion and autoVersionProps read from config)
+            if (autoVersion != null && autoVersionProps != null)
+            {
+                updateNode.ensureVersioningEnabled(autoVersion, autoVersionProps);
+            }
+            else
+            {
+                updateNode.ensureVersioningEnabled();
+            }
+
+            // It's not a working copy, do a check out to get the actual working copy
+            updateNode = updateNode.checkoutForUpload();
+         }
+
+         // Update the working copy content
+         updateNode.properties.content.write(content, updateNameAndMimetype, true, newFilename);
+         // check it in again, with supplied version history note
+         
+         // Extract the metadata
+         // (The overwrite policy controls which if any parts of
+         //  the document's properties are updated from this)
+         extractMetadata(updateNode);
+         
+         updateNode = updateNode.checkin(description, majorVersion);
+         if (aspects.length != 0)
+         {
+            for (i = 0; i < aspects.length; i++)
+            {
+               if (!updateNode.hasAspect(aspects[i]))
+               {
+                  updateNode.addAspect(aspects[i]);
+               }
+            }
+         }
+
+         // Record the file details ready for generating the response
+         model.document = updateNode;
+      }
+      else
+      {
+         /**
+          * Upload new file to destNode (calculated earlier) + optional subdirectory
+          */
+         if (uploadDirectory !== null && uploadDirectory.length > 0)
+         {
+            var child = destNode.childByNamePath(uploadDirectory);
+            if (child === null)
+            {
+               if (createDirectory)
+               {
+                  child = destNode.createFolderPath(uploadDirectory);
+               }
+               else
+               {
+                  exitUpload(404, "Cannot upload file since upload directory '" + uploadDirectory + "' does not exist.");
+                  return;
+               }
+            }
+
+            // MNT-12565
+            while (child.isDocument)
+            {
+               if (child.parent === null)
+               {
+                  exitUpload(404, "Cannot upload file. You do not have permissions to access the parent folder for the document.");
+                  return;
+               }
+               child = child.parent;
+            }
+
+            destNode = child;
+         }
+
+         /**
+          * Existing file handling.
+          */
+         var existingFile = destNode.childByNamePath(filename);
+         if (existingFile !== null)
+         {
+            // File already exists, decide what to do
+            if (existingFile.hasAspect("cm:versionable") && overwrite)
+            {
+               // Upload component was configured to overwrite files if name clashes
+               existingFile.properties.content.write(content, false, true);
+
+               // Extract the metadata
+               // (The overwrite policy controls which if any parts of
+               //  the document's properties are updated from this)
+               extractMetadata(existingFile);
+
+               // Record the file details ready for generating the response
+               model.document = existingFile;
+
+               // MNT-8745 fix: Do not clean formdata temp files to allow for retries. Temp files will be deleted later when GC call DiskFileItem#finalize() method or by temp file cleaner.
+               return;
+            }
+            else
+            {
+               // Upload component was configured to find a new unique name for clashing filenames
+               filename = createUniqueNameInFolder(filename, destNode);
+            }
+         }
+
+         /**
+          * Create a new file.
+          */
+         var newFile;
+         if (contentType !== null)
+         {
+            newFile = destNode.createFile(filename, contentType);
+         }
+         else
+         {
+            newFile = destNode.createFile(filename);
+         }
+         // Use the appropriate write() method so that the mimetype already guessed from the original filename is
+         // maintained - as upload may have been via Flash - which always sends binary mimetype and would overwrite it.
+         // Also perform the encoding guess step in the write() method to save an additional Writer operation.
+         newFile.properties.content.write(content, false, true);
+         newFile.save();
+         
+
+         // NOTE: Removal of first request for thumbnails to improve upload performance
+         //       Thumbnails are still requested by Share on first render of the doclist image.
+
+         // Additional aspects?
+         if (aspects.length > 0)
+         {
+            for (i = 0; i < aspects.length; i++)
+            {
+               newFile.addAspect(aspects[i]);
+            }
+         }
+
+         // Extract the metadata
+         extractMetadata(newFile);
+
+         // TODO (THOR-175) - review
+         // Ensure the file is versionable (autoVersion and autoVersionProps read from config)
+         if (autoVersion != null && autoVersionProps != null)
+         {
+             newFile.ensureVersioningEnabled(autoVersion, autoVersionProps);
+         }
+         else
+         {
+             newFile.ensureVersioningEnabled();
+         }
+
+         // Record the file details ready for generating the response
+         model.document = newFile;
+      }
+      // MNT-8745 fix: Do not clean formdata temp files to allow for retries. Temp files will be deleted later when GC call DiskFileItem#finalize() method or by temp file cleaner.
+   }
+   catch (e)
+   {
+      // NOTE: Do not clean formdata temp files to allow for retries. It's possible for a temp file
+      //       to remain if max retry attempts are made, but this is rare, so leave to usual temp
+      //       file cleanup.
+      
+      // capture exception, annotate it accordingly and re-throw
+      if (e.message && e.message.indexOf("AccessDeniedException") != -1)
+      {
+         e.code = 403;
+      }
+      else if (e.message && e.message.indexOf("org.alfresco.service.cmr.usage.ContentQuotaException") == 0)
+      {
+         e.code = 413;
+      }
+      else if (e.message && e.message.indexOf("org.alfresco.repo.content.ContentLimitViolationException") == 0)
+      {
+         e.code = 409;
+      }
+      else
+      {
+         e.code = 500;
+         e.message = "Unexpected error occurred during upload of new content.";      
+      }
+      throw e;
+   }
+}
+
+main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.json.ftl
new file mode 100644
index 00000000000..a114e14a578
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.json.ftl
@@ -0,0 +1,12 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "nodeRef": "${document.nodeRef}",
+   "fileName": "${document.name}",
+   "status":
+   {
+      "code": 200,
+      "name": "OK",
+      "description": "File uploaded successfully"
+   }
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.desc.xml
new file mode 100644
index 00000000000..1172c469d04
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.desc.xml
@@ -0,0 +1,8 @@
+<webscript>
+  <shortname>Revert Version Info</shortname>
+  <description>Revert Version Info</description>
+  <url>/api/revert</url>
+  <format default="json" />
+  <authentication>user</authentication>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.json.ftl
new file mode 100644
index 00000000000..fe29fffb3c1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.json.ftl
@@ -0,0 +1,3 @@
+{
+   "success": true 
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.json.js
new file mode 100644
index 00000000000..484fa6b7007
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/revert.post.json.js
@@ -0,0 +1,64 @@
+// todo
+// check if previous version was minor or major if no version was submitted
+// autognerate comment if none was submitted
+
+function main()
+{
+
+   var nodeRef = json.get("nodeRef");
+   var version = json.get("version");
+   var majorVersion = json.get("majorVersion") == "true";
+   var description = json.get("description");
+
+   // allow for content to be loaded from id
+   if (nodeRef != null && version != null)
+   {
+      var workingCopy = search.findNode(nodeRef);
+      if (workingCopy != null)
+      {
+         if (workingCopy.isLocked)
+         {
+            // We cannot revert a locked document
+            status.code = 404;
+            status.message = "error.nodeLocked";
+            status.redirect = true;
+            return;
+         }
+
+         // Ensure the original file is versionable - may have been uploaded via different route
+         if (!workingCopy.hasAspect("cm:versionable"))
+         {
+            // We cannot revert a non versionable document
+        	status.code = 404;
+            status.message = "error.nodeNotVersionable";
+            status.redirect = true;
+            return;
+         }
+
+         // Revert the node
+    	 workingCopy = workingCopy.revert(description, majorVersion, version);
+         if (workingCopy == null)
+         {
+             // Could not find the version
+        	 status.code = 404;
+             status.message = "error.versionNotFound";
+             status.redirect = true;
+             return;
+         }
+         
+    	 model.document = workingCopy;
+         return;
+      }
+      else
+      {
+         // Could not find a document for the nodeRef
+     	 status.code = 404;
+         status.message = "error.nodeNotFound";
+         status.redirect = true;
+         return;
+      }
+   }
+}
+
+main();
+
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/version.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/version.get.desc.xml
new file mode 100644
index 00000000000..3e6480114bf
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/version.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Node Version Info</shortname>
+  <description>Node Version Info</description>
+  <url>/api/version</url>
+  <format default="json" />
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/version.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/version.get.js
new file mode 100644
index 00000000000..da98e7582ea
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/version.get.js
@@ -0,0 +1,117 @@
+var PeopleCache = {};
+
+/**
+ * Gets / caches a person object
+ * @method getPerson
+ * @param username {string} User name
+ */
+function getPerson(username)
+{
+   if (typeof PeopleCache[username] == "undefined")
+   {
+      var person = people.getPerson(username);
+      if (person == null)
+      {
+         if (username == "System" || username.match("^System@") == "System@")
+         {
+            // special case for the System users
+            person =
+            {
+               properties:
+               {
+                  userName: "System",
+                  firstName: "System",
+                  lastName: "User"
+               },
+               assocs: {}
+            };
+         }
+         else
+         {
+            // missing person - may have been deleted from the database
+            person =
+            {
+               properties:
+               {
+                  userName: username,
+                  firstName: "",
+                  lastName: ""
+               },
+               assocs: {}
+            };
+         }
+      }
+      PeopleCache[username] =
+      {
+         userName: person.properties.userName,
+         firstName: person.properties.firstName,
+         lastName: person.properties.lastName,
+         displayName: (person.properties.firstName + " " + person.properties.lastName).replace(/^\s+|\s+$/g, "")
+      };
+   }
+   return PeopleCache[username];
+}
+
+function main()
+{
+   var json = "",
+      versions = [];
+
+   // allow for content to be loaded from id
+   if (args["nodeRef"] != null)
+   {
+      var nodeRef = args["nodeRef"],
+         node = search.findNode(nodeRef),
+         versionHistory, version, p;
+
+      if (node != null)
+      {
+         var versionHistory = node.versionHistory;
+         if (versionHistory != null)
+         {
+            for (i = 0; i < versionHistory.length; i++)
+            {
+               version = versionHistory[i];
+               p = getPerson(version.creator);
+               versions[versions.length] =
+               {
+                  nodeRef: version.node.nodeRef.toString(),
+                  name: version.node.name,
+                  label: version.label,
+                  description: version.description,
+                  createdDate: version.createdDate,
+                  creator:
+                  {
+                     userName: p.userName,
+                     firstName: p.firstName,
+                     lastName: p.lastName
+                  }
+               };
+            }
+         }
+         else
+         {
+            p = getPerson(node.properties.creator);
+            versions[0] =
+            {
+               nodeRef: node.nodeRef.toString(),
+               name: node.name,
+               label: "1.0",
+               description: "",
+               createdDate: node.properties.created,
+               creator:
+               {
+                  userName: p.userName,
+                  firstName: p.firstName,
+                  lastName: p.lastName
+               }
+            };
+         }
+      }
+   }
+
+   // store node onto model
+   model.versions = versions;
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/version.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/version.get.json.ftl
new file mode 100644
index 00000000000..e72738549cc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/version/version.get.json.ftl
@@ -0,0 +1,20 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+[
+<#list versions as v>
+   {
+      "nodeRef": "${v.nodeRef}",
+      "name": "${v.name}",
+      "label": "${v.label}",
+      "description": "${v.description}",
+      "createdDate": "${v.createdDate?string("dd MMM yyyy HH:mm:ss 'GMT'Z '('zzz')'")}",
+      "createdDateISO": "${xmldate(v.createdDate)}",
+      "creator":
+      {
+         "userName": "${v.creator.userName}",
+         "firstName": "${v.creator.firstName!""}",
+         "lastName": "${v.creator.lastName!""}"
+      }
+   }<#if (v_has_next)>,</#if>
+</#list>
+]
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/end-task.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/end-task.post.desc.xml
new file mode 100644
index 00000000000..92e9b5dcfb0
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/end-task.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>End workflow task</shortname>
+  <description>Ends a task for an in-flight workflow with the passed-in transition or the default</description>
+  <url>/api/workflow/task/end/{taskId}/{transitionId}</url>
+  <url>/api/workflow/task/end/{taskId}</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/end-task.post.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/end-task.post.js
new file mode 100644
index 00000000000..a9dc492ee24
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/end-task.post.js
@@ -0,0 +1,40 @@
+function main()
+{
+   // Task ID
+   var taskId = url.templateArgs.taskId;
+   if (taskId === undefined || taskId == null )
+   {
+		status.setCode(status.STATUS_BAD_REQUEST, "TaskID missing when ending task.");
+		return;
+   }
+
+   var separatorIndex = taskId.indexOf('$');
+   if(separatorIndex == -1)
+   {
+       status.setCode(status.STATUS_BAD_REQUEST, "TaskID missing when ending task.");
+       return;
+   }
+   
+   // Check TaskId is valid
+   var task = workflow.getTask(taskId);
+   if (task === null)
+   {
+	   status.setCode(status.STATUS_BAD_REQUEST, "Invalid TaskID when ending task.");
+	   return;
+   }
+   
+   model.taskId = taskId;
+   
+   // Optional Transition ID
+   var transitionId = url.templateArgs.transitionId;
+   if (transitionId === undefined)
+   {
+      transitionId = null;
+   }
+   
+   model.transitionId = transitionId;
+   
+   task.endTask(transitionId);
+}
+
+main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/end-task.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/end-task.post.json.ftl
new file mode 100644
index 00000000000..72027161e56
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/end-task.post.json.ftl
@@ -0,0 +1,6 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "id": "${taskId}",
+   "transition": "${transitionId!"default"}"
+}
+</#escape>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instance.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instance.get.desc.xml
new file mode 100644
index 00000000000..3304a2474a8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instance.get.desc.xml
@@ -0,0 +1,106 @@
+<webscript>
+   <shortname>Gets workflow task instance</shortname>
+   <description>Gets the details of a task.</description>
+   <url>/api/task-instances/{task_instance_id}</url>
+   <format default="json"/>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <args>
+      <arg>
+         <shortname>task_instance_id</shortname>
+         <description>The id of the task to retrieve details for.</description>
+      </arg>
+   </args>
+   <responses>
+      <response>
+         <format>json</format>
+         <type>
+            <![CDATA[
+            {
+               "data": 
+               {
+                  "id": string,
+                  "url": string,
+                  "name": string,
+                  "title": string,
+                  "description": string,
+                  "state": string (IN_PROGRESS|COMPLETE),
+                  "path": string,
+                  "isPooled": boolean,
+                  "isEditable": boolean,
+                  "isReassignable": boolean,
+                  "isClaimable": boolean,
+                  "isReleasable": boolean,
+                  "outcome": string,
+                  "owner":
+                  {
+                     "userName": string,
+                     "firstName": string,
+                     "lastName": string
+                  },
+                  "properties":
+                  {
+                     "key": string, boolean, number, array or map,
+                     ...
+                  },
+                  "workflowInstance":
+                  {
+                     "id": string,
+                     "url": string,
+                     "name": string,
+                     "title": string,
+                     "description": string,
+                     "isActive": boolean,
+                     "startDate": string,
+                     "priority": number,
+                     "message": string,
+                     "endDate": string,
+                     "dueDate": string,
+                     "context": string,
+                     "package": string,
+                     "initiator":
+                     {
+                        "userName": string,
+                        "firstName": string,
+                        "lastName": string
+                     },
+                     "definitionUrl": string
+                  }
+                  "definition":
+                  {
+                     "id": string,
+                     "url": string,
+                     "type":
+                     {
+                        "name": string,
+                        "title": string,
+                        "description": string,
+                        "url": string
+                     },
+                     "node":
+                     {
+                        "name": string,
+                        "title": string,
+                        "description": string,
+                        "isTaskNode": boolean,
+                        "transitions":
+                        [
+                           {
+                              "id": string,
+                              "title": string,
+                              "description": string,
+                              "isDefault": boolean,
+                              "isHidden": boolean
+                           },
+                           ...
+                        ]
+                     }
+                  }
+               }
+            }
+            ]]>
+         </type>
+      </response>
+   </responses>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instance.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instance.get.json.ftl
new file mode 100644
index 00000000000..62ee2c8d374
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instance.get.json.ftl
@@ -0,0 +1,7 @@
+<#-- Workflow Task Instance in details -->
+
+<#import "workflow.lib.ftl" as workflowLib />
+{
+   "data": 
+   <@workflowLib.taskJSON task=workflowTask detailed=true/>
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instance.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instance.put.desc.xml
new file mode 100644
index 00000000000..2861fc115f1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instance.put.desc.xml
@@ -0,0 +1,119 @@
+<webscript>
+   <shortname>Updates workflow task instance</shortname>
+   <description>Updates the properties of a specific task and returns a detailed representation of the updated task instance.</description>
+   <url>/api/task-instances/{task_instance_id}</url>
+   <format default="json"/>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <args>
+      <arg>
+         <shortname>task_instance_id</shortname>
+         <description>The id of the task to update details for.</description>
+      </arg>
+   </args>
+   <requests>
+      <request>
+         <format>json</format>
+         <type>
+            <![CDATA[
+            {
+               "key": string, boolean, number, array or map,
+               ...
+            }
+            ]]>
+         </type>
+      </request>
+   </requests>
+   <responses>
+      <response>
+         <format>json</format>
+         <type>
+            <![CDATA[
+            {
+               "data": 
+               {
+                  "id": string,
+                  "url": string,
+                  "name": string,
+                  "title": string,
+                  "description": string,
+                  "state": string (IN_PROGRESS|COMPLETE),
+                  "path": string,
+                  "isPooled": boolean,
+                  "isEditable": boolean,
+                  "isReassignable": boolean,
+                  "isClaimable": boolean,
+                  "isReleasable": boolean,
+                  "outcome": string,
+                  "owner":
+                  {
+                     "userName": string,
+                     "firstName": string,
+                     "lastName": string
+                  },
+                  "properties":
+                  {
+                     "key": string, boolean, number, array or map,
+                     ...
+                  },
+                  "workflowInstance":
+                  {
+                     "id": string,
+                     "url": string,
+                     "name": string,
+                     "title": string,
+                     "description": string,
+                     "isActive": boolean,
+                     "startDate": string,
+                     "priority": number,
+                     "message": string,
+                     "endDate": string,
+                     "dueDate": string,
+                     "context": string,
+                     "package": string,
+                     "initiator":
+                     {
+                        "userName": string,
+                        "firstName": string,
+                        "lastName": string
+                     },
+                     "definitionUrl": string
+                  }
+                  "definition":
+                  {
+                     "id": string,
+                     "url": string,
+                     "type":
+                     {
+                        "name": string,
+                        "title": string,
+                        "description": string,
+                        "url": string
+                     },
+                     "node":
+                     {
+                        "name": string,
+                        "title": string,
+                        "description": string,
+                        "isTaskNode": boolean,
+                        "transitions":
+                        [
+                           {
+                              "id": string,
+                              "title": string,
+                              "description": string,
+                              "isDefault": boolean,
+                              "isHidden": boolean
+                           },
+                           ...
+                        ]
+                     }
+                  }
+               }
+            }
+            ]]>
+         </type>
+      </response>
+   </responses>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instance.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instance.put.json.ftl
new file mode 100644
index 00000000000..a12a867b48d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instance.put.json.ftl
@@ -0,0 +1,6 @@
+<#-- Workflow Task Instance in details -->
+
+<#import "workflow.lib.ftl" as workflowLib />
+{
+   "data": <@workflowLib.taskJSON task=workflowTask detailed=true />
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instances.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instances.get.desc.xml
new file mode 100644
index 00000000000..3c633a713a8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instances.get.desc.xml
@@ -0,0 +1,133 @@
+<webscript>
+   <shortname>List workflow tasks</shortname>
+   <description>
+      Lists all Workflow Task Instances associated with an authority and of a given State.
+      The list of returned tasks also includes pooled tasks which the specified authority is eligible to claim.
+   </description>
+   <url>/api/task-instances?authority={authority?}&amp;state={state?}&amp;priority={priority?}&amp;pooledTasks={pooledTasks?}&amp;dueBefore={dueBefore?}&amp;dueAfter={dueAfter?}&amp;properties={properties?}&amp;maxItems={maxItems?}&amp;skipCount={skipCount?}&amp;exclude={exclude?}&amp;property={propQName/propValue?}</url>
+   <url>/api/workflow-instances/{workflow_instance_id}/task-instances?authority={authority?}&amp;state={state?}&amp;priority={priority?}&amp;dueBefore={isoDate?}&amp;dueAfter={isoDate?}&amp;properties={prop1, prop2, prop3...?}&amp;maxItems={maxItems?}&amp;skipCount={skipCount?}&amp;exclude={exclude?}</url>
+   <format default="json"/>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <args>
+      <arg>
+         <shortname>authority</shortname>
+         <description>The username of the authority to retrieve the tasks for. If this argument is omitted the tasks for the current user are returned.</description>
+      </arg>
+      <arg>
+         <shortname>state</shortname>
+         <description>Filters the returned tasks by state, IN_PROGRESS or COMPLETED (lower case is also acceptable). If this argument is omitted tasks in progress are returned.</description>
+      </arg>
+      <arg>
+         <shortname>priority</shortname>
+         <description>Filters the returned tasks by priority, a numerical value is expected, either 1, 2 or 3.</description>
+      </arg>
+      <arg>
+         <shortname>pooledTasks</shortname>
+         <description>Determines whether pooled tasks for the user are included in the results. To omit pooled tasks set this argument to false.</description>
+      </arg>
+      <arg>
+         <shortname>dueBefore</shortname>
+         <description>Restricts the returned tasks to only those that are due before the provided date (the date must be in ISO8601 format)</description>
+      </arg>
+      <arg>
+         <shortname>dueAfter</shortname>
+         <description>Restricts the returned tasks to only those that are due after the provided date (the date must be in ISO8601 format)</description>
+      </arg>
+      <arg>
+         <shortname>properties</shortname>
+         <description>Comma separated list of property names to include in the results. If this argument is omitted all properties are returned.</description>
+      </arg>
+      <arg>
+         <shortname>maxItems</shortname>
+         <description>Specifies the maximum number of results to return.</description>
+      </arg>
+      <arg>
+         <shortname>skipCount</shortname>
+         <description>Specifies the position in the results to start, used for paging results.</description>
+      </arg>
+      <arg>
+         <shortname>exclude</shortname>
+         <description>Comma separated list of task types to exclude from the the results.</description>
+      </arg>
+      <arg>
+         <shortname>workflow_instance_id</shortname>
+         <description>Restricts the returned tasks to those that belong to the given workflow process instance id.</description>
+      </arg>
+       <arg>
+           <shortname>property</shortname>
+           <description>Restricts the returned tasks to only those that match the given property. The property name should be a valid QName format followed by '/' then the property value. E.g. bpm:description/myDescription</description>
+       </arg>
+   </args>
+   <responses>
+      <response>
+         <format>json</format>
+         <type>
+            <![CDATA[
+            {
+               "data":
+               [
+                  {
+                     "id": string,
+                     "url": string,
+                     "name": string,
+                     "title": string,
+                     "description": string,
+                     "state": string (IN_PROGRESS|COMPLETE),
+                     "path": string,
+                     "isPooled": boolean,
+                     "isEditable": boolean,
+                     "isReassignable": boolean,
+                     "isClaimable": boolean,
+                     "isReleasable": boolean,
+                     "outcome": string,
+                     "owner":
+                     {
+                        "userName": string,
+                        "firstName": string,
+                        "lastName": string
+                     },
+                     "properties":
+                     {
+                        "key": string, boolean, number, array or map,
+                        ...
+                     },
+                     "workflowInstance":
+                     {
+                        "id": string,
+                        "url": string,
+                        "name": string,
+                        "title": string,
+                        "description": string,
+                        "isActive": boolean,
+                        "startDate": string,
+                        "priority": number,
+                        "message": string,
+                        "endDate": string,
+                        "dueDate": string,
+                        "context": string,
+                        "package": string,
+                        "initiator":
+                        {
+                           "userName": string,
+                           "firstName": string,
+                           "lastName": string
+                        },
+                        "definitionUrl": string
+                     }
+                  },
+                  ...
+               ],
+               "paging": 
+               {
+                  "totalItems": number,
+                  "maxItems": number,
+                  "skipCount": number
+               }
+            }
+            ]]>
+         </type>
+      </response>
+   </responses>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instances.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instances.get.json.ftl
new file mode 100644
index 00000000000..110962c3a6b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/task-instances.get.json.ftl
@@ -0,0 +1,14 @@
+<#-- List Workflow Task Instances -->
+<#import "workflow.lib.ftl" as workflowLib />
+<#import "../generic-paged-results.lib.ftl" as genericPaging />
+{
+   "data": 
+   [
+      <#list taskInstances as task>
+      <@workflowLib.taskJSON task=task />
+      <#if task_has_next>,</#if>
+      </#list>
+   ]
+
+   <@genericPaging.pagingJSON pagingVar="paging" />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-definition.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-definition.get.desc.xml
new file mode 100644
index 00000000000..7508b6aec31
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-definition.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get workflow definition</shortname>
+  <description>
+  Returns a detailed representation of the workflow definitions.
+  </description>
+  <url>/api/workflow-definitions/{workflowDefinitionId}</url>
+  <format default="json"/>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>limited_support</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-definition.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-definition.get.json.ftl
new file mode 100644
index 00000000000..5b52ce0a052
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-definition.get.json.ftl
@@ -0,0 +1,5 @@
+<#import "workflow.lib.ftl" as workflowLib />
+{
+   "data": 
+       <@workflowLib.workflowDefinitionJSON workflowDefinition=workflowDefinition detailed=true />
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-definitions.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-definitions.get.desc.xml
new file mode 100644
index 00000000000..b6174e6bfc8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-definitions.get.desc.xml
@@ -0,0 +1,40 @@
+<webscript>
+   <shortname>List deployed workflow definitions</shortname>
+   <description>
+      Returns a simple representation of all deployed workflow definitions.
+   </description>
+   <url>/api/workflow-definitions?exclude={exclude?}</url>
+   <format default="json"/>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <args>
+      <arg>
+         <shortname>exclude</shortname>
+         <description>Comma separated list of workflow definitions to exclude from the the results.</description>
+      </arg>
+   </args>
+   <responses>
+      <response>
+         <format>json</format>
+         <type>
+            <![CDATA[
+            {
+               "data":
+               [
+                  {
+                     "id": string,
+                     "url": string,
+                     "name": string,
+                     "title": string,
+                     "description": string,
+                     "version": string
+                  },
+                  ...
+               ]
+            }
+            ]]>
+         </type>
+      </response>
+   </responses>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-definitions.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-definitions.get.json.ftl
new file mode 100644
index 00000000000..850b53b9fca
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-definitions.get.json.ftl
@@ -0,0 +1,10 @@
+<#import "workflow.lib.ftl" as workflowLib />
+{
+   "data": 
+   [
+      <#list workflowDefinitions as workflowDefinition>
+         <@workflowLib.workflowDefinitionJSON workflowDefinition=workflowDefinition />
+         <#if workflowDefinition_has_next>,</#if>
+      </#list>
+   ]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance-diagram.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance-diagram.get.desc.xml
new file mode 100644
index 00000000000..034ba7f162d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance-diagram.get.desc.xml
@@ -0,0 +1,15 @@
+<webscript>
+   <shortname>Get workflow instance diagram</shortname>
+   <description>Streams an image representing the current state of a workflow instance, if one is present</description>
+   <url>/api/workflow-instances/{workflow_instance_id}/diagram</url>
+   <format default="">argument</format>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <args>
+      <arg>
+         <shortname>workflow_instance_id</shortname>
+         <description>The id of workflow process instance to retrieve a diagram for.</description>
+      </arg>
+   </args>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance.delete.desc.xml
new file mode 100644
index 00000000000..8e9d10c4295
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance.delete.desc.xml
@@ -0,0 +1,19 @@
+<webscript>
+   <shortname>Delete or cancel workflow instance</shortname>
+   <description>Either cancels or deletes the specified workflow instance. To cancel call with no arguments, to delete set the forced argument to true.</description>
+   <url>/api/workflow-instances/{workflow_instance_id}?forced={forced?}</url>
+   <format default="json"/>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <args>
+      <arg>
+         <shortname>workflow_instance_id</shortname>
+         <description>The id of workflow process instance to delete or cancel.</description>
+      </arg>
+      <arg>
+         <shortname>forced</shortname>
+         <description>Setting this argument to true will delete the workflow instance, if it is false or omitted the workflow instance will be cancelled.</description>
+      </arg>
+   </args>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance.delete.json.ftl
new file mode 100644
index 00000000000..e37684e04d1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance.delete.json.ftl
@@ -0,0 +1,3 @@
+{
+   "success": true
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance.get.desc.xml
new file mode 100644
index 00000000000..98f21e3c060
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance.get.desc.xml
@@ -0,0 +1,127 @@
+<webscript>
+   <shortname>Get workflow instance</shortname>
+   <description>Retrieves a specific workflow instance, optionally with all the tasks.</description>
+   <url>/api/workflow-instances/{workflow_instance_id}?includeTasks={includeTasks?}</url>
+   <format default="json"/>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <args>
+      <arg>
+         <shortname>workflow_instance_id</shortname>
+         <description>The id of workflow process instance to retrieve.</description>
+      </arg>
+      <arg>
+         <shortname>includeTasks</shortname>
+         <description>Determines whether the response contains all the tasks that belong to the workflow instance. If this argument is omitted no tasks will be returned.</description>
+      </arg>
+   </args>
+   <responses>
+      <response>
+         <format>json</format>
+         <type>
+            <![CDATA[
+            {
+               "data": 
+               {
+                  "id": string,
+                  "url": string,
+                  "name": string,
+                  "title": string,
+                  "description": string,
+                  "isActive": boolean,
+                  "startDate": string,
+                  "endDate": string,
+                  "dueDate": string,
+                  "priority": number,
+                  "message": string,
+                  "context": string,
+                  "package": string,
+                  "initiator":
+                  {
+                     "userName": string,
+                     "firstName": string,
+                     "lastName": string
+                  },
+                  "definitionUrl": string,
+                  "diagramUrl": string,
+                  "startTaskInstanceId": string,
+                  "definition":
+                  {
+                     "id": string,
+                     "url": string,
+                     "name": string,
+                     "title": string,
+                     "description": string,
+                     "version": string
+                     "startTaskDefinitionUrl": string,
+                     "startTaskDefinitionType": string,
+                     "taskDefinitions":
+                     [
+                        {
+                           "url": string,
+                           "type": string
+                        },
+                        ...
+                     ]
+                  },
+                  "tasks":
+                  [
+                     {
+                        "id": string,
+                        "url": string,
+                        "name": string,
+                        "title": string,
+                        "description": string,
+                        "state": string (IN_PROGRESS|COMPLETE),
+                        "path": string,
+                        "isPooled": boolean,
+                        "isEditable": boolean,
+                        "isReassignable": boolean,
+                        "isClaimable": boolean,
+                        "isReleasable": boolean,
+                        "outcome": string,
+                        "owner":
+                        {
+                           "userName": string,
+                           "firstName": string,
+                           "lastName": string
+                        },
+                        "properties":
+                        {
+                           "key": string, boolean, number, array or map,
+                           ...
+                        },
+                        "workflowInstance":
+                        {
+                           "id": string,
+                           "url": string,
+                           "name": string,
+                           "title": string,
+                           "description": string,
+                           "isActive": boolean,
+                           "startDate": string,
+                           "priority": number,
+                           "message": string,
+                           "endDate": string,
+                           "dueDate": string,
+                           "context": string,
+                           "package": string,
+                           "initiator":
+                           {
+                              "userName": string,
+                              "firstName": string,
+                              "lastName": string
+                           },
+                           "definitionUrl": string
+                        }
+                     },
+                     ...
+                  ]
+               }
+            }
+            ]]>
+         </type>
+      </response>
+   </responses>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance.get.json.ftl
new file mode 100644
index 00000000000..d82c734cc4b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instance.get.json.ftl
@@ -0,0 +1,7 @@
+<#-- Workflow Instance in details -->
+
+<#import "workflow.lib.ftl" as workflowLib />
+{
+   "data": 
+   <@workflowLib.workflowInstanceJSON workflowInstance=workflowInstance detailed=true />
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instances-for-node.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instances-for-node.get.desc.xml
new file mode 100644
index 00000000000..ed5b1faaff7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instances-for-node.get.desc.xml
@@ -0,0 +1,60 @@
+<webscript>
+   <shortname>Get workflow instance collection for nodeRef</shortname>
+   <description>Retrieves all active workflow instances that the given node is part of.</description>
+   <url>/api/node/{store_type}/{store_id}/{id}/workflow-instances</url>
+   <format default="json"/>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <args>
+      <arg>
+         <shortname>store_type</shortname>
+         <description>The store type of the node</description>
+      </arg>
+      <arg>
+         <shortname>store_id</shortname>
+         <description>The store id of the node</description>
+      </arg>
+      <arg>
+         <shortname>id</shortname>
+         <description>The id of the node</description>
+      </arg>
+   </args>
+   <responses>
+      <response>
+         <format>json</format>
+         <type>
+            <![CDATA[
+            {
+               "data":
+               [
+                  {
+                     "id": string,
+                     "url": string,
+                     "name": string,
+                     "title": string,
+                     "description": string,
+                     "isActive": boolean,
+                     "startDate": string,
+                     "endDate": string,
+                     "dueDate": string,
+                     "priority": number,
+                     "message": string,
+                     "context": string,
+                     "package": string,
+                     "initiator":
+                     {
+                        "userName": string,
+                        "firstName": string,
+                        "lastName": string
+                     },
+                     "definitionUrl": string
+                  },
+                  ...
+               ]
+            }
+            ]]>
+         </type>
+      </response>
+   </responses>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instances-for-node.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instances-for-node.get.json.ftl
new file mode 100644
index 00000000000..7cc7b37a0ec
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instances-for-node.get.json.ftl
@@ -0,0 +1,12 @@
+<#-- Workflow Instances collection for NodeRef-->
+
+<#import "workflow.lib.ftl" as workflowLib />
+{
+   "data": 
+   [
+      <#list workflowInstances as workflowInstance>
+      <@workflowLib.workflowInstanceJSON workflowInstance=workflowInstance />
+      <#if workflowInstance_has_next>,</#if>
+      </#list>
+   ]
+}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instances.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instances.get.desc.xml
new file mode 100644
index 00000000000..0f73d91e10c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instances.get.desc.xml
@@ -0,0 +1,115 @@
+<webscript>
+   <shortname>Get workflow instance collection</shortname>
+   <description>Retrieves all workflow instances, the returned list can also be optionally filtered.</description>
+   <url>/api/workflow-instances?state={state?}&amp;initiator={initiator?}&amp;priority={priority?}&amp;dueBefore={dueBefore?}&amp;dueAfter={dueAfter?}&amp;definitionId={definitionId?}&amp;definitionName={definitionName?}&amp;startedBefore={startedBefore?}&amp;startedAfter={startedAfter?}&amp;completedBefore={completedBefore?}&amp;completedAfter={completedAfter?}&amp;maxItems={maxItems?}&amp;skipCount={skipCount?}&amp;exclude={exclude?}</url>
+   <url>/api/workflow-definitions/{workflow_definition_id}/workflow-instances?state={state?}&amp;initiator={initiator?}&amp;priority={priority?}&amp;dueBefore={dueBefore?}&amp;dueAfter={dueAfter?}&amp;startedBefore={startedBefore?}&amp;startedAfter={startedAfter?}&amp;completedBefore={completedBefore?}&amp;completedAfter={completedAfter?}&amp;maxItems={maxItems?}&amp;skipCount={skipCount?}&amp;exclude={exclude?}</url>
+   <format default="json"/>
+   <authentication>user</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>limited_support</lifecycle>
+   <args>
+      <arg>
+         <shortname>state</shortname>
+         <description>Filters the returned workflow instances by state, ACTIVE or COMPLETED (lower case is also acceptable). If this argument is omitted only active workflow instances are returned.</description>
+      </arg>
+      <arg>
+         <shortname>initiator</shortname>
+         <description>Filter the list of workflow instances by the authority that initiated the workflow instance.</description>
+      </arg>
+      <arg>
+         <shortname>priority</shortname>
+         <description>Filters the returned workflow instances by priority, a numerical value is expected, either 1, 2 or 3.</description>
+      </arg>
+      <arg>
+         <shortname>dueBefore</shortname>
+         <description>Restricts the returned workflow instances to only those that are due before the provided date (the date must be in ISO8601 format)</description>
+      </arg>
+      <arg>
+         <shortname>dueAfter</shortname>
+         <description>Restricts the returned workflow instances to only those that are due after the provided date (the date must be in ISO8601 format)</description>
+      </arg>
+      <arg>
+         <shortname>startedBefore</shortname>
+         <description>Restricts the returned workflow instances to only those that were started before the provided date (the date must be in ISO8601 format)</description>
+      </arg>
+      <arg>
+         <shortname>startedAfter</shortname>
+         <description>Restricts the returned workflow instances to only those that were started after the provided date (the date must be in ISO8601 format)</description>
+      </arg>
+      <arg>
+         <shortname>completedBefore</shortname>
+         <description>Restricts the returned workflow instances to only those that were completed before the provided date (the date must be in ISO8601 format)</description>
+      </arg>
+      <arg>
+         <shortname>completedAfter</shortname>
+         <description>Restricts the returned workflow instances to only those that were completed after the provided date (the date must be in ISO8601 format)</description>
+      </arg>
+      <arg>
+         <shortname>definitionId</shortname>
+         <description>Restricts the list of workflow instances returned to those started by the given workflow definition id.</description>
+      </arg>
+      <arg>
+         <shortname>workflow_definition_id</shortname>
+         <description>Restricts the list of workflow instances returned to those started by the given workflow definition id.</description>
+      </arg>
+      <arg>
+         <shortname>definitionName</shortname>
+         <description>Restricts the list of workflow instances returned to those started by the given workflow definition name i.e. any deployed version of that definition.</description>
+      </arg>
+      <arg>
+         <shortname>maxItems</shortname>
+         <description>Specifies the maximum number of results to return.</description>
+      </arg>
+      <arg>
+         <shortname>skipCount</shortname>
+         <description>Specifies the position in the results to start, used for paging results.</description>
+      </arg>
+      <arg>
+         <shortname>exclude</shortname>
+         <description>Comma separated list of workflow definitions to exclude from the the results.</description>
+      </arg>
+   </args>
+   <responses>
+      <response>
+         <format>json</format>
+         <type>
+            <![CDATA[
+            {
+               "data":
+               [
+                  {
+                     "id": string,
+                     "url": string,
+                     "name": string,
+                     "title": string,
+                     "description": string,
+                     "isActive": boolean,
+                     "startDate": string,
+                     "endDate": string,
+                     "dueDate": string,
+                     "priority": number,
+                     "message": string,
+                     "context": string,
+                     "package": string,
+                     "initiator":
+                     {
+                        "userName": string,
+                        "firstName": string,
+                        "lastName": string
+                     },
+                     "definitionUrl": string
+                  },
+                  ...
+               ],
+               "paging": 
+               {
+                  "totalItems": number,
+                  "maxItems": number,
+                  "skipCount": number
+               }
+            }
+            ]]>
+         </type>
+      </response>
+   </responses>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instances.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instances.get.json.ftl
new file mode 100644
index 00000000000..7b47e6282bb
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow-instances.get.json.ftl
@@ -0,0 +1,15 @@
+<#-- Workflow Instances collection -->
+
+<#import "workflow.lib.ftl" as workflowLib />
+<#import "../generic-paged-results.lib.ftl" as genericPaging />
+{
+   "data": 
+   [
+      <#list workflowInstances as workflowInstance>
+      <@workflowLib.workflowInstanceJSON workflowInstance=workflowInstance />
+      <#if workflowInstance_has_next>,</#if>
+      </#list>
+   ]
+
+   <@genericPaging.pagingJSON pagingVar="paging" />
+}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow.lib.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow.lib.ftl
new file mode 100644
index 00000000000..10c5ecd9e12
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow.lib.ftl
@@ -0,0 +1,201 @@
+<#-- Renders a task instance. -->
+<#macro taskJSON task detailed=false>
+<#escape x as jsonUtils.encodeJSONString(x)>
+      {
+         "id": "${task.id}",
+         "url": "${task.url}",
+         "name": "${task.name!""}",
+         "title": "${task.title!""}",
+         "description": "${task.description!""}",
+         "state": "${task.state}",
+         "path": "${task.path}",
+         "isPooled": ${task.isPooled?string},
+         "isEditable": ${task.isEditable?string},
+         "isReassignable": ${task.isReassignable?string},
+         "isClaimable": ${task.isClaimable?string},
+         "isReleasable": ${task.isReleasable?string},
+         "outcome": <#if task.outcome??>"${task.outcome}"<#else>null</#if>,
+         "owner":
+         <#if task.owner??>
+         {
+            "userName": "${task.owner.userName}"<#if task.owner.firstName??>,
+            "firstName": "${task.owner.firstName}"</#if><#if task.owner.lastName??>,
+            "lastName": "${task.owner.lastName}"</#if><#if task.owner.avatar??>,
+            "avatar": "${task.owner.avatar}"</#if>
+         },
+         <#else>
+         null,
+         </#if>
+         "creator":
+         <#if task.creator??>
+         {
+            "userName": "${task.creator.userName}"<#if task.creator.firstName??>,
+            "firstName": "${task.creator.firstName}"</#if><#if task.creator.lastName??>,
+            "lastName": "${task.creator.lastName}"</#if><#if task.creator.avatar??>,
+            "avatar": "${task.creator.avatar}"</#if>
+         },
+         <#else>
+         null,
+         </#if>
+         "properties":
+         <@propertiesJSON properties=task.properties />,
+         "propertyLabels":
+         <@propertyLabelsJSON propertyLabels=task.propertyLabels  />,
+         "workflowInstance": 
+         <@workflowInstanceJSON workflowInstance=task.workflowInstance/><#if detailed>,
+         "definition":
+         {
+            "id": "${task.definition.id}",
+            "url": "${task.definition.url}",
+            "type": 
+            {
+               "name": "${shortQName(task.definition.type.name?string)}",
+               "title": "${task.definition.type.title!""}",
+               "description": "${task.definition.type.description!""}",
+               "url": "${task.definition.type.url}"
+            },
+            "node": 
+            {
+               "name": "${task.definition.node.name}",
+               "title": "${task.definition.node.title!""}",
+               "description": "${task.definition.node.description!""}",
+               "isTaskNode": ${task.definition.node.isTaskNode?string},
+               "transitions": 
+               [
+                  <#list task.definition.node.transitions as transition>
+                  {
+                     "id": "${transition.id}",
+                     "title": "${transition.title!""}",
+                     "description": "${transition.description!""}",
+                     "isDefault": ${transition.isDefault?string},
+                     "isHidden": ${transition.isHidden?string}
+                  }
+                  <#if transition_has_next>,</#if>
+                  </#list>
+               ]
+            }
+         }
+         </#if>
+      }
+</#escape>
+</#macro>
+
+<#-- Renders a map of properties -->
+<#macro propertiesJSON properties>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+<#list properties?keys as key>
+   "${key}":
+   <#if properties[key]??>
+      <#assign val=properties[key]>
+      <#if val?is_boolean == true>
+         ${val?string}
+      <#elseif val?is_number == true>
+         ${val?c}
+      <#elseif val?is_sequence>
+         [
+         <#list val as element>
+            "${element?string}"<#if (element_has_next)>,</#if>
+         </#list>
+         ]
+      <#else>
+         "${shortQName(val?string)}"
+      </#if>
+   <#else>
+      null
+   </#if><#if (key_has_next)>,</#if>
+</#list>
+}
+</#escape>
+</#macro>
+
+<#-- Renders a map of property labels -->
+<#macro propertyLabelsJSON propertyLabels>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+<#list propertyLabels?keys as key>
+   "${key}":
+   <#if propertyLabels[key]??>
+      "${propertyLabels[key]}"
+   <#else>
+      null
+   </#if><#if (key_has_next)>,</#if>
+</#list>
+}
+</#escape>
+</#macro>
+
+<#-- Renders a workflow instance. -->
+<#macro workflowInstanceJSON workflowInstance detailed=false>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "id": "${workflowInstance.id}",
+   "url": "${workflowInstance.url}",
+   "name": "${workflowInstance.name}",
+   "title": "${workflowInstance.title!""}",
+   "description": "${workflowInstance.description!""}",
+   "isActive": ${workflowInstance.isActive?string},
+   "startDate": "${workflowInstance.startDate}",
+   "priority": <#if workflowInstance.priority??>${workflowInstance.priority?c}<#else>2</#if>,
+   "message": <#if workflowInstance.message?? && workflowInstance.message?length &gt; 0>"${workflowInstance.message}"<#else>null</#if>,
+   "endDate": <#if workflowInstance.endDate??>"${workflowInstance.endDate}"<#else>null</#if>,
+   "dueDate": <#if workflowInstance.dueDate??>"${workflowInstance.dueDate}"<#else>null</#if>,
+   "context": <#if workflowInstance.context??>"${workflowInstance.context}"<#else>null</#if>,
+   "package": <#if workflowInstance.package??>"${workflowInstance.package}"<#else>null</#if>,
+   "initiator": 
+   <#if workflowInstance.initiator??>
+   {
+      "userName": "${workflowInstance.initiator.userName}"<#if workflowInstance.initiator.firstName??>,
+      "firstName": "${workflowInstance.initiator.firstName}"</#if><#if workflowInstance.initiator.lastName??>,
+      "lastName": "${workflowInstance.initiator.lastName}"</#if><#if workflowInstance.initiator.avatarUrl??>,
+      "avatarUrl": "${workflowInstance.initiator.avatarUrl}"</#if>
+   },
+   <#else>
+   null,
+   </#if>
+   "definitionUrl": "${workflowInstance.definitionUrl}"<#if detailed>,
+   "diagramUrl": <#if workflowInstance.diagramUrl??>"${workflowInstance.diagramUrl}"<#else>null</#if>,
+   "startTaskInstanceId": <#if workflowInstance.startTaskInstanceId??>"${workflowInstance.startTaskInstanceId}"<#else>null</#if>,
+   "definition": 
+   <@workflowDefinitionJSON workflowDefinition=workflowInstance.definition detailed=true/>
+   <#if workflowInstance.tasks??>,
+   "tasks": 
+   [
+      <#list workflowInstance.tasks as task> 
+      <@taskJSON task=task/>
+      <#if task_has_next>,</#if>
+      </#list>
+   ]
+   </#if>
+   </#if>
+}
+</#escape>
+</#macro>
+
+<#-- Renders a workflow definition. -->
+<#macro workflowDefinitionJSON workflowDefinition detailed=false>
+<#escape x as jsonUtils.encodeJSONString(x)>
+      {
+         "id" : "${workflowDefinition.id}",
+         "url": "${workflowDefinition.url}",
+         "name": "${workflowDefinition.name}",
+         "title": "${workflowDefinition.title!""}",
+         "description": "${workflowDefinition.description!""}",
+         "version": "${workflowDefinition.version}"
+         <#if detailed>,
+         "startTaskDefinitionUrl": "${workflowDefinition.startTaskDefinitionUrl}",
+         "startTaskDefinitionType": "${shortQName(workflowDefinition.startTaskDefinitionType)}",
+         "taskDefinitions": 
+         [
+            <#list workflowDefinition.taskDefinitions as taskDefinition>
+            {
+               "url": "${taskDefinition.url}",
+               "type": "${shortQName(taskDefinition.type)}"
+            }
+            <#if taskDefinition_has_next>,</#if>
+            </#list>
+         ]
+         </#if>
+      }
+</#escape>
+</#macro>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.delete.desc.xml
new file mode 100644
index 00000000000..40687eed40a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.delete.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>deleteevent</shortname>
+  <description>Event Action - Delete event</description>
+  <url>/calendar/event/{siteid}/{eventname}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.delete.json.ftl
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.desc.xml
new file mode 100644
index 00000000000..4e6b3464ee4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>eventdetails</shortname>
+  <description>Event Action - Display event details</description>
+  <url>/calendar/event/{siteid}/{eventname}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl
new file mode 100644
index 00000000000..4fbc946c07a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl
@@ -0,0 +1,34 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+<#if result.error?exists>
+   "error": "${result.error}"
+<#else>
+   "name": "${result.name}",
+   "what": "${result.what}",
+   "description": "${result.description}",
+   "location": "${result.location}",
+   "tags": [<#list result.tags as tag>"${tag}"<#if tag_has_next>,</#if></#list>],
+   "startAt": {
+       "iso8601": "${result.from}",
+       "legacyDate": "${result.legacyDateFrom}",
+       "legacyTime": "${result.legacyTimeFrom}"
+   },
+   "endAt": {
+       "iso8601": "${result.to}",
+       "legacyDate": "${result.legacyDateTo}",
+       "legacyTime": "${result.legacyTimeTo}"
+   },
+   "allday": "${result.allday?string}",
+
+   "docfolder": "${result.docfolder}",
+   "recurrence": "${result.recurrence}",
+   "isoutlook": "${result.isoutlook?string}",
+
+   "permissions":
+   {
+       "edit": ${result.canEdit?string},
+       "delete": ${result.canDelete?string}
+   }
+</#if>
+}
+</#escape>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.properties
new file mode 100644
index 00000000000..0dc5ceff353
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Could not find event: {0}
+calendar.err.invalid.json=Invalid JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_cs.properties
new file mode 100644
index 00000000000..57a0ca445ad
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_cs.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Nepoda\u0159ilo se naj\u00edt ud\u00e1lost: {0}
+calendar.err.invalid.json=Neplatn\u00fd prvek JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_da.properties
new file mode 100644
index 00000000000..3696c6e4981
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_da.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=H\u00e6ndelsen blev ikke fundet: {0}
+calendar.err.invalid.json=Ugyldig JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_de.properties
new file mode 100755
index 00000000000..b038837fe3f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_de.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Ereignis nicht gefunden: {0}
+calendar.err.invalid.json=JSON ung\u00fcltig: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_es.properties
new file mode 100755
index 00000000000..15c9a25a873
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_es.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=No se ha podido encontrar evento: {0}
+calendar.err.invalid.json=JSON no v\u00e1lido: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_fi.properties
new file mode 100644
index 00000000000..a6d17b9c4cc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_fi.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Tapahtumaa ei l\u00f6ydy: {0}
+calendar.err.invalid.json=Virheellinen JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_fr.properties
new file mode 100755
index 00000000000..e9a6d28b2cd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_fr.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Ev\u00e9nement introuvable : {0}
+calendar.err.invalid.json=JSON non valide : {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_it.properties
new file mode 100755
index 00000000000..cd460585558
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_it.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Impossibile trovare l''evento: {0}
+calendar.err.invalid.json=JSON non valido: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_ja.properties
new file mode 100755
index 00000000000..086c454ef06
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_ja.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=\u6b21\u306e\u30a4\u30d9\u30f3\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093: {0}
+calendar.err.invalid.json=\u7121\u52b9\u306a JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_nb.properties
new file mode 100755
index 00000000000..f027118b459
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_nb.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Kan ikke finne hendelse: {0}
+calendar.err.invalid.json=Ugyldig JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_nl.properties
new file mode 100755
index 00000000000..3d315b7b347
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_nl.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Kan gebeurtenis niet vinden: {0}
+calendar.err.invalid.json=Ongeldige JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_pl.properties
new file mode 100644
index 00000000000..e7669b6b758
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_pl.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Nie znaleziono zdarzenia: {0}
+calendar.err.invalid.json=Nieprawid\u0142owy JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_pt_BR.properties
new file mode 100644
index 00000000000..b11402bf34c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_pt_BR.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=N\u00e3o foi poss\u00edvel localizar o evento: {0}
+calendar.err.invalid.json=JSON inv\u00e1lido: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_ru.properties
new file mode 100755
index 00000000000..edd360d0264
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_ru.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435: {0}
+calendar.err.invalid.json=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0444\u043e\u0440\u043c\u0430\u0442 JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_sv.properties
new file mode 100644
index 00000000000..f06b26e8114
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_sv.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Kunde inte hitta h\u00e4ndelse: {0}
+calendar.err.invalid.json=Ogiltig JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_zh_CN.properties
new file mode 100755
index 00000000000..8a6cffec6f7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get_zh_CN.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=\u65e0\u6cd5\u627e\u5230\u4e8b\u4ef6\uff1a{0}
+calendar.err.invalid.json=JSON \u65e0\u6548\uff1a{0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.desc.xml
new file mode 100644
index 00000000000..3fcd56bfb0a
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Create Calendar Event</shortname> 
+   <description>Creates a Calendar Event</description> 
+   <url>/calendar/create</url> 
+   <format default="html">extension</format> 
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.html.ftl
new file mode 100644
index 00000000000..ab62e3727c1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.html.ftl
@@ -0,0 +1,32 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+<#if result.error?exists>
+  "error" : "${result.error}"
+<#else>
+  "event":
+  {
+    "name": "${result.name?html}",
+    "uri": "${result.uri}",
+    "desc": "${result.desc?html}",
+    "where": "${result.where?html}",
+    "startAt": {
+        "iso8601": "${result.from}",
+        "legacyDate": "${result.legacyDateFrom}",
+        "legacyTime": "${result.legacyTimeFrom}"
+    },
+    "endAt": {
+        "iso8601": "${result.to}",
+        "legacyDate": "${result.legacyDateTo}",
+        "legacyTime": "${result.legacyTimeTo}"
+    },
+    "allday": "${result.allday?string}",
+
+    <#assign tags><#list result.tags as tag>"${tag}"<#if tag_has_next>,</#if></#list></#assign>
+    "tags": <#noescape>[${tags}]</#noescape>,
+    "docfolder": "${result.docfolder?html}"
+  }
+</#if>
+}
+</#escape>
+
+
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.properties
new file mode 100644
index 00000000000..0dc5ceff353
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Could not find event: {0}
+calendar.err.invalid.json=Invalid JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_cs.properties
new file mode 100644
index 00000000000..57a0ca445ad
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_cs.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Nepoda\u0159ilo se naj\u00edt ud\u00e1lost: {0}
+calendar.err.invalid.json=Neplatn\u00fd prvek JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_da.properties
new file mode 100644
index 00000000000..3696c6e4981
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_da.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=H\u00e6ndelsen blev ikke fundet: {0}
+calendar.err.invalid.json=Ugyldig JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_de.properties
new file mode 100755
index 00000000000..b038837fe3f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_de.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Ereignis nicht gefunden: {0}
+calendar.err.invalid.json=JSON ung\u00fcltig: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_es.properties
new file mode 100755
index 00000000000..15c9a25a873
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_es.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=No se ha podido encontrar evento: {0}
+calendar.err.invalid.json=JSON no v\u00e1lido: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_fi.properties
new file mode 100644
index 00000000000..a6d17b9c4cc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_fi.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Tapahtumaa ei l\u00f6ydy: {0}
+calendar.err.invalid.json=Virheellinen JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_fr.properties
new file mode 100755
index 00000000000..e9a6d28b2cd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_fr.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Ev\u00e9nement introuvable : {0}
+calendar.err.invalid.json=JSON non valide : {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_it.properties
new file mode 100755
index 00000000000..cd460585558
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_it.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Impossibile trovare l''evento: {0}
+calendar.err.invalid.json=JSON non valido: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_ja.properties
new file mode 100755
index 00000000000..086c454ef06
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_ja.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=\u6b21\u306e\u30a4\u30d9\u30f3\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093: {0}
+calendar.err.invalid.json=\u7121\u52b9\u306a JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_nb.properties
new file mode 100755
index 00000000000..f027118b459
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_nb.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Kan ikke finne hendelse: {0}
+calendar.err.invalid.json=Ugyldig JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_nl.properties
new file mode 100755
index 00000000000..3d315b7b347
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_nl.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Kan gebeurtenis niet vinden: {0}
+calendar.err.invalid.json=Ongeldige JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_pl.properties
new file mode 100644
index 00000000000..e7669b6b758
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_pl.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Nie znaleziono zdarzenia: {0}
+calendar.err.invalid.json=Nieprawid\u0142owy JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_pt_BR.properties
new file mode 100644
index 00000000000..b11402bf34c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_pt_BR.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=N\u00e3o foi poss\u00edvel localizar o evento: {0}
+calendar.err.invalid.json=JSON inv\u00e1lido: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_ru.properties
new file mode 100755
index 00000000000..edd360d0264
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_ru.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435: {0}
+calendar.err.invalid.json=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0444\u043e\u0440\u043c\u0430\u0442 JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_sv.properties
new file mode 100644
index 00000000000..f06b26e8114
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_sv.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Kunde inte hitta h\u00e4ndelse: {0}
+calendar.err.invalid.json=Ogiltig JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_zh_CN.properties
new file mode 100755
index 00000000000..8a6cffec6f7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post_zh_CN.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=\u65e0\u6cd5\u627e\u5230\u4e8b\u4ef6\uff1a{0}
+calendar.err.invalid.json=JSON \u65e0\u6548\uff1a{0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.desc.xml
new file mode 100644
index 00000000000..5e63797de55
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+   <shortname>Update Calendar Event</shortname>
+   <description>Updates an existing Calendar Event</description>
+   <url>/calendar/event/{siteid}/{eventname}</url>
+   <format default="json">argument</format>
+   <authentication>user</authentication>
+   <transaction>required</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.json.ftl
new file mode 100644
index 00000000000..d2bb7c254c8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.json.ftl
@@ -0,0 +1,33 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+<#if result.error??>
+   "error": "${result.error}"
+<#else>
+   "data":
+   {
+       "summary" : "${result.summary?js_string}",
+       "location" : "${result.location?js_string}",
+       "description" : "${result.description?js_string}",
+       "startAt":
+      {
+           "iso8601": "${result.dtstart}",
+           "legacyDateTime": "${result.legacyDateFrom}T${result.legacyTimeFrom}",
+           "legacyDate": "${result.legacyDateFrom}",
+           "legacyTime": "${result.legacyTimeFrom}"
+      },
+       "endAt":
+      {
+           "iso8601": "${result.dtend}",
+           "legacyDateTime": "${result.legacyDateTo}T${result.legacyTimeTo}",
+           "legacyDate": "${result.legacyDateTo}",
+           "legacyTime": "${result.legacyTimeTo}"
+      },
+      "uri" : "${result.uri}",
+      "allday" : "${result.allday?string}",
+      "tags" : [<#list result.tags as tag>"${tag}"<#if tag_has_next>,</#if></#list>],
+      "docfolder": "${result.docfolder}"
+   }
+   
+</#if>
+}
+</#escape>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.properties
new file mode 100644
index 00000000000..0dc5ceff353
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Could not find event: {0}
+calendar.err.invalid.json=Invalid JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_cs.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_cs.properties
new file mode 100644
index 00000000000..57a0ca445ad
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_cs.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Nepoda\u0159ilo se naj\u00edt ud\u00e1lost: {0}
+calendar.err.invalid.json=Neplatn\u00fd prvek JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_da.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_da.properties
new file mode 100644
index 00000000000..3696c6e4981
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_da.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=H\u00e6ndelsen blev ikke fundet: {0}
+calendar.err.invalid.json=Ugyldig JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_de.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_de.properties
new file mode 100755
index 00000000000..b038837fe3f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_de.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Ereignis nicht gefunden: {0}
+calendar.err.invalid.json=JSON ung\u00fcltig: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_es.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_es.properties
new file mode 100755
index 00000000000..15c9a25a873
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_es.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=No se ha podido encontrar evento: {0}
+calendar.err.invalid.json=JSON no v\u00e1lido: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_fi.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_fi.properties
new file mode 100644
index 00000000000..a6d17b9c4cc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_fi.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Tapahtumaa ei l\u00f6ydy: {0}
+calendar.err.invalid.json=Virheellinen JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_fr.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_fr.properties
new file mode 100755
index 00000000000..e9a6d28b2cd
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_fr.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Ev\u00e9nement introuvable : {0}
+calendar.err.invalid.json=JSON non valide : {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_it.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_it.properties
new file mode 100755
index 00000000000..cd460585558
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_it.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Impossibile trovare l''evento: {0}
+calendar.err.invalid.json=JSON non valido: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_ja.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_ja.properties
new file mode 100755
index 00000000000..086c454ef06
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_ja.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=\u6b21\u306e\u30a4\u30d9\u30f3\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093: {0}
+calendar.err.invalid.json=\u7121\u52b9\u306a JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_nb.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_nb.properties
new file mode 100755
index 00000000000..f027118b459
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_nb.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Kan ikke finne hendelse: {0}
+calendar.err.invalid.json=Ugyldig JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_nl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_nl.properties
new file mode 100755
index 00000000000..3d315b7b347
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_nl.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Kan gebeurtenis niet vinden: {0}
+calendar.err.invalid.json=Ongeldige JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_pl.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_pl.properties
new file mode 100644
index 00000000000..e7669b6b758
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_pl.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Nie znaleziono zdarzenia: {0}
+calendar.err.invalid.json=Nieprawid\u0142owy JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_pt_BR.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_pt_BR.properties
new file mode 100644
index 00000000000..b11402bf34c
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_pt_BR.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=N\u00e3o foi poss\u00edvel localizar o evento: {0}
+calendar.err.invalid.json=JSON inv\u00e1lido: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_ru.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_ru.properties
new file mode 100755
index 00000000000..edd360d0264
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_ru.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435: {0}
+calendar.err.invalid.json=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0444\u043e\u0440\u043c\u0430\u0442 JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_sv.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_sv.properties
new file mode 100644
index 00000000000..f06b26e8114
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_sv.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=Kunde inte hitta h\u00e4ndelse: {0}
+calendar.err.invalid.json=Ogiltig JSON: {0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_zh_CN.properties b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_zh_CN.properties
new file mode 100755
index 00000000000..8a6cffec6f7
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put_zh_CN.properties
@@ -0,0 +1,2 @@
+calendar.err.event.not.found=\u65e0\u6cd5\u627e\u5230\u4e8b\u4ef6\uff1a{0}
+calendar.err.invalid.json=JSON \u65e0\u6548\uff1a{0}
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.calendar.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.calendar.ftl
new file mode 100644
index 00000000000..c84ac0cd6f1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.calendar.ftl
@@ -0,0 +1,38 @@
+<#if events?exists>
+<#setting time_zone="GMT">
+<#assign dateFormat = "yyyyMMdd">
+<#assign timeFormat = "HHmmss">
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Alfresco Software//Calendar 1.1//EN
+<#list events as item>
+<#assign event = item.event>
+<#assign from = event.start>
+<#assign to = event.end>
+<#assign created = event.createdAt>
+BEGIN:VEVENT
+UID:${event.nodeRef.id}
+<#if item.allDayEnd?exists>
+DTSTART;VALUE=DATE:${from?string(dateFormat)}
+DTEND;VALUE=DATE:${item.allDayEnd?string(dateFormat)}
+<#else>
+DTSTART:${from?string(dateFormat)}T${from?string(timeFormat)}Z
+DTEND:${to?string(dateFormat)}T${to?string(timeFormat)}Z
+</#if>
+SUMMARY:${event.title!""}
+DTSTAMP:${created?string(dateFormat)}T${created?string(timeFormat)}Z
+<#if event.recurrenceRule??>
+RRULE:${event.recurrenceRule}
+</#if>
+<#if event.description?exists>
+DESCRIPTION:${event.description?replace("\\", "\\\\")?replace(",", "\\,")?replace(";", "\\;")?replace("\r?\n", "\\n", "r")}
+</#if>
+<#if event.location?exists>
+LOCATION:${event.location}
+</#if>
+END:VEVENT
+</#list>
+END:VCALENDAR
+<#else>
+No events
+</#if>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.desc.xml
new file mode 100644
index 00000000000..829273936e1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.desc.xml
@@ -0,0 +1,10 @@
+<webscript>
+   <shortname>Event Listing</shortname>
+   <description>List of all upcoming events for a site</description>
+   <url>/calendar/eventList</url>
+   <url>/calendar/eventList-{site}.ics</url>
+   <format default="json">argument</format>
+   <authentication>guest</authentication>
+   <transaction>required</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.json.ftl
new file mode 100644
index 00000000000..22cc8bbbae2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/eventList.get.json.ftl
@@ -0,0 +1,47 @@
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+<#if error?exists>
+   "error": "${error}"
+<#elseif events?exists && events?size &gt; 0>
+   <#assign prev = "">
+   <#list events as item>
+      <#-- Note - use item not event start for repeating events expansion -->
+      <#assign date = item.legacyDateFrom>
+      <#assign event = item.event>
+      <#if date != prev>
+         <#assign counter = 0>
+         <#if item_index &gt; 0>],</#if>
+   "${date}": [
+      </#if>
+      <#if counter &gt; 0>,</#if>
+   {
+      "name": "${item.title}",
+      "location": "${event.location}",
+      "uri": "calendar/event/${siteId}/${event.systemName}",
+      "startAt": {
+          "iso8601": "${item.start}",
+          "legacyDate": "${item.legacyDateFrom}",
+          "legacyTime": "${item.legacyTimeFrom}"
+      },
+      "endAt": {
+          "iso8601": "${item.end}",
+          "legacyDate": "${item.legacyDateTo}",
+          "legacyTime": "${item.legacyTimeTo}"
+      },
+
+      "tags": [<#list item.tags as tag>"${tag}"<#if tag_has_next>,</#if></#list>],
+   <#if event.recurrenceRule??>
+      "recurrenceRule": "${event.recurrenceRule}",
+   </#if>
+   <#if event.lastRecurrence??>
+      "recurrenceLastMeeting": "${event.lastRecurrence?string("M/d/yyyy")}",
+   </#if>
+      "ignoreEvents": [<#list item.ignoreEvents as ignoreEvent>"${ignoreEvent}"<#if ignoreEvent_has_next>,</#if></#list>]
+   }
+      <#assign counter = counter + 1>
+      <#if !item_has_next>]</#if>
+      <#assign prev = date>
+   </#list>
+</#if>
+}
+</#escape>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.desc.xml
new file mode 100644
index 00000000000..0524721278e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.desc.xml
@@ -0,0 +1,27 @@
+<webscript>
+  <shortname>User Events</shortname>
+  <description><![CDATA[
+  Lists all of the events for a user, either on one site, or across all the
+  sites that they belong to.
+  ]]></description>
+  <url>/calendar/events/user?from={from}&amp;to={to?}&amp;repeating={repeating?}</url>
+  <url>/calendar/events/{site}/user?from={from}&amp;to={to?}&amp;repeating={repeating?}</url>
+  <format default="json">argument</format>
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+  <args>
+    <arg>
+      <shortname>from</shortname>
+      <description>The date to find events from (inclusive), in the format YYYY-MM-DD</description>
+    </arg>
+    <arg>
+      <shortname>to</shortname>
+      <description>The date to find events until (inclusive), in the format YYYY-MM-DD. If this isn't given, all events into the future will be returned.</description>
+    </arg>
+    <arg>
+      <shortname>repeating</shortname>
+      <description>Should only the first instance of a repeating event be returned, or should all repeating instances in the date range be supplied? Default is only the first instance. (If no "to date" is supplied, past repeating events with no end date will not show up. When working with repeating events, it is strongly recommended that a to date is given).</description>
+    </arg>
+  </args>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.json.ftl
new file mode 100644
index 00000000000..4d786b57e7f
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/userevents.get.json.ftl
@@ -0,0 +1,41 @@
+<#if !limit?exists><#assign limit = -1></#if>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   <#if events?exists>
+      "events": [
+      <#list events as event>
+         <#if event_index?string == limit?string><#break></#if>
+         {
+            "name": "${event.name}",
+            "title": "${event.title}",
+            "where": "${event.where}",
+            "description": "${event.description}",
+            "url": "page/site/${event.siteName}/calendar?date=${event.legacyDateFrom}",
+
+            "startAt": {
+                "iso8601": "${event.start}",
+                "legacyTime": "${event.legacyTimeFrom}"
+            },
+            "endAt": {
+                "iso8601": "${event.end}",
+                "legacyTime": "${event.legacyTimeTo}"
+            },
+
+            "site": "${event.siteName}",
+            "siteTitle": "${event.siteTitle}",
+            "allday": "${event.allday?string}",
+            "tags": [<#list event.tags as tag>"${tag}"<#if tag_has_next>,</#if></#list>],
+            "duration": "${event.duration}",
+            "isoutlook": "${event.isoutlook?string}",
+			
+            "permissions":
+            {
+                "isEdit": ${event.canEdit?string},
+                "isDelete": ${event.canDelete?string}
+            }
+         }<#if event_has_next>,</#if>
+      </#list>
+      ]
+   </#if>
+}
+</#escape>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.delete.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.delete.desc.xml
new file mode 100644
index 00000000000..f4be6b9e74b
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.delete.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Deletes a QuADDS Item</shortname>
+  <description>Deletes an item from a QuADDS(Quick And Dirty Data Structure)</description>
+  <family>QuADDS</family>
+  <url>/aikau/quadds/{name}/item/{item_name}</url>
+  <format default="json"></format>
+  <authentication>user</authentication>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.delete.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.delete.js
new file mode 100644
index 00000000000..e353e1a77e4
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.delete.js
@@ -0,0 +1,45 @@
+function main() {
+   var results = [];
+   if (url.templateArgs.name == null)
+   {
+      // Can't create a QuADDS item without knowing where to place the item...
+      status.code = 500;
+      model.errorMessage = "No QuADDS name provided";
+      return false;
+   }
+   else if (url.templateArgs.item_name == null)
+   {
+      // Can't create a QuADDS item without knowing where to place the item...
+      status.code = 500;
+      model.errorMessage = "No QuADDS item name provided";
+      return false;
+   }
+   else
+   {
+      // Gets the items for a specific QuADDS...
+      var QuADDS_Items = search.selectNodes('/app:company_home/app:dictionary/cm:QuADDS/cm:' + search.ISO9075Encode(url.templateArgs.name) + '/cm:' + search.ISO9075Encode(url.templateArgs.item_name));
+      if (QuADDS_Items.length > 0)
+      {
+         var node = QuADDS_Items[0];
+         var isDeleted = node.remove();
+         if (!isDeleted)
+         {
+            status.code = 500;
+            model.errorMessage = "No could not delete QuADDS item";
+            return false;
+         }
+         else
+         {
+            return true;
+         }
+      }
+      else
+      {
+         status.code = 500;
+         model.errorMessage = "Culd not find QuADDS item";
+         return false;
+      }
+   }
+}
+
+model.success = main();
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.delete.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.delete.json.ftl
new file mode 100644
index 00000000000..260a719bbf9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.delete.json.ftl
@@ -0,0 +1,11 @@
+<#if success!false == true>
+{
+   "success": "true",
+   "nodeRef": "${nodeRef!""}"
+}
+<#else>
+{
+   "success": "false",
+   "error": "${errorMessage!""?html}"
+}
+</#if>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.get.desc.xml
new file mode 100644
index 00000000000..ba022466b10
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.get.desc.xml
@@ -0,0 +1,11 @@
+<webscript>
+  <shortname>Get QuADDS items</shortname>
+  <description>Gets an the items or a specific item from a QuADDS (Quick And Dirty Data Structure)</description>
+  <family>QuADDS</family>
+  <url>/aikau/quadds/{name}/item/{item_name}</url>
+  <url>/aikau/quadds/{name}</url>
+  <url>/aikau/quadds</url>
+  <format default="json"></format>
+  <authentication>user</authentication>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.get.js
new file mode 100644
index 00000000000..692984952d1
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.get.js
@@ -0,0 +1,54 @@
+var results = [];
+
+var alfQuery;
+if (url.templateArgs.item_name != null)
+{
+   // Gets the items for a specific QuADDS...
+   var QuADDS_Items = search.selectNodes('/app:company_home/app:dictionary/cm:QuADDS/cm:' + search.ISO9075Encode(url.templateArgs.name) + '/cm:' + search.ISO9075Encode(url.templateArgs.item_name));
+   if (QuADDS_Items.length > 0)
+   {
+      var node = QuADDS_Items[0];
+      var item = 
+      {
+         nodeRef: node.nodeRef.toString(),
+         name: node.name,
+         data: node.content
+      };
+      results.push(item);
+   }
+}
+else if (url.templateArgs.name != null)
+{
+   // Gets the items for a specific QuADDS...
+   var QuADDS_Items = search.selectNodes('/app:company_home/app:dictionary/cm:QuADDS/cm:' + search.ISO9075Encode(url.templateArgs.name) + '/*[subtypeOf("cm:content")]');
+   for (var i = 0, j = QuADDS_Items.length; i < j; i++)
+   {
+      // Create core object
+      var node = QuADDS_Items[i];
+      var item = 
+      {
+         nodeRef: node.nodeRef.toString(),
+         name: node.name,
+         data: node.content
+      };
+      results.push(item);
+   }
+}
+else
+{
+   // Gets all the QuADDS...
+   var QuADDS = search.selectNodes('/app:company_home/app:dictionary/cm:QuADDS/*[subtypeOf("cm:folder")]');
+
+   for (var i = 0, j = QuADDS.length; i < j; i++)
+   {
+      // Create core object
+      var node = QuADDS[i];
+      var item =
+      {
+         nodeRef: node.nodeRef.toString(),
+         name: node.name
+      };
+      results.push(item);
+   }
+}
+model.data = results;
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.get.json.ftl
new file mode 100644
index 00000000000..1a510b5e9f2
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.get.json.ftl
@@ -0,0 +1,19 @@
+<#macro renderItem item>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "nodeRef": "${item.nodeRef}",
+   "name": "${item.name!''}",
+   "data": "${item.data!''}"
+}
+</#escape>
+</#macro>
+<#escape x as jsonUtils.encodeJSONString(x)>
+{
+   "items": 
+      [
+      <#list data as item>
+         <@renderItem item /><#if item_has_next>,</#if>
+      </#list>
+      ]
+}
+</#escape>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.post.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.post.desc.xml
new file mode 100644
index 00000000000..a8b74ea66f8
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.post.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Get all QuADDs</shortname>
+  <description>Returns all the created QuADDS (Quick And Dirty Data Structures)</description>
+  <family>QuADDS</family>
+  <url>/aikau/quadds/{name}</url>
+  <format default="json"></format>
+  <authentication>user</authentication>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.post.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.post.json.ftl
new file mode 100644
index 00000000000..260a719bbf9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.post.json.ftl
@@ -0,0 +1,11 @@
+<#if success!false == true>
+{
+   "success": "true",
+   "nodeRef": "${nodeRef!""}"
+}
+<#else>
+{
+   "success": "false",
+   "error": "${errorMessage!""?html}"
+}
+</#if>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.post.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.post.json.js
new file mode 100644
index 00000000000..d9d09401c48
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.post.json.js
@@ -0,0 +1,103 @@
+function main() {
+   // Get the name and data for the QuADDS item...
+   var name = json.get("name");
+   var data = json.get("data");
+
+   if (url.templateArgs.name == null)
+   {
+      // Can't create a QuADDS item without knowing where to place the item...
+      status.code = 500;
+      model.errorMessage = "No QuADDS name provided";
+      return false;
+   }
+   else if (name == null)
+   {
+      // Can't create a QuADDS item without knowing what to call it
+      // TODO: Could we just use a timestamp here if nothing is provided?
+      status.code = 500;
+      model.errorMessage = "No QuADDS name provided for item to create";
+      return false;
+   }
+   else if (data == null)
+   {
+      status.code = 500;
+      model.errorMessage = "No QuADDS data provided for item to create";
+      return false;
+   }
+   else
+   {
+      try
+      {
+         // Try to parse the data to check that it's valid JSON...
+         var validJson = JSON.parse(data);
+      }
+      catch(e)
+      {
+         status.code = 500;
+         model.errorMessage = "Invalid QuADDS data provided - must be JSON";
+         return false;
+      }
+
+      // Construct query to find the requested QuADDS...
+      var QuADDS_Folder;
+          // nodes = search.query(queryDef);
+      var nodes = search.selectNodes('/app:company_home/app:dictionary/cm:QuADDS/cm:' + search.ISO9075Encode(url.templateArgs.name));
+      if (nodes.length == 0)
+      {
+         // Need to create the QuADDS Folder...
+         // Get the root folder...
+         nodes = search.selectNodes('/app:company_home/app:dictionary/cm:QuADDS');
+         if (nodes.length == 0)
+         {
+            // TODO: Create the QuADDS folder
+            status.code = 500;
+            model.errorMessage = "'QuADDS' folder has not been created";
+            return false;
+         }
+         else
+         {
+            // Create the folder...
+            QuADDS_Folder = nodes[0].createNode(url.templateArgs.name, "cm:folder");
+         }
+      }
+      else
+      {
+         // Found the QuADDS folder... save a reference to it so we can create the item in it...
+         QuADDS_Folder = nodes[0];
+      }
+
+      // Create the file...
+      try
+      {
+         var item = QuADDS_Folder.createNode(json.get("name"), "cm:content");
+         if (item == null)
+         {
+            // Couldn't create the item for some reason...
+            status.code = 500;
+            model.errorMessage = "Could not create QuADDS item";
+            return false;
+         }
+         else
+         {
+            item.addAspect("cm:versionable");
+            item.content = data;
+            item.mimetype = "application/json";
+            model.nodeRef = item.nodeRef.toString();
+            return true;
+         }
+      }
+      catch (e)
+      {
+         status.code = 500;
+         model.errorMessage = "Could not create QuADDS item";
+         return false;
+      }
+      
+      // Shouldn't get to here - there should be a return at every code path...
+      model.errorMessage = "Unexpected error occurred";
+      status.code = 500;
+      return false;
+   }
+}
+
+model.success = main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.put.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.put.desc.xml
new file mode 100644
index 00000000000..d10fc29ebf3
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.put.desc.xml
@@ -0,0 +1,9 @@
+<webscript>
+  <shortname>Update an item in a QuADDS</shortname>
+  <description>Updates the data for a specific item in QuADDS (Quick And Dirty Data Structure)</description>
+  <family>QuADDS</family>
+  <url>/aikau/quadds/{name}/item/{item_name}</url>
+  <format default="json"></format>
+  <authentication>user</authentication>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.put.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.put.json.ftl
new file mode 100644
index 00000000000..260a719bbf9
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.put.json.ftl
@@ -0,0 +1,11 @@
+<#if success!false == true>
+{
+   "success": "true",
+   "nodeRef": "${nodeRef!""}"
+}
+<#else>
+{
+   "success": "false",
+   "error": "${errorMessage!""?html}"
+}
+</#if>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.put.json.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.put.json.js
new file mode 100644
index 00000000000..d9660c881cc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/quadds/quadds-item.put.json.js
@@ -0,0 +1,66 @@
+function main() {
+   // Get the name and data for the QuADDS item...
+   var name = json.get("name");
+   var data = json.get("data");
+
+   if (url.templateArgs.name == null)
+   {
+      // Can't create a QuADDS item without knowing where to place the item...
+      status.code = 500;
+      model.errorMessage = "No QuADDS name provided";
+      return false;
+   }
+   else if (name == null)
+   {
+      // Can't create a QuADDS item without knowing what to call it
+      // TODO: Could we just use a timestamp here if nothing is provided?
+      status.code = 500;
+      model.errorMessage = "No QuADDS name provided for item to create";
+      return false;
+   }
+   else if (data == null)
+   {
+      status.code = 500;
+      model.errorMessage = "No QuADDS data provided for item to create";
+      return false;
+   }
+   else
+   {
+      try
+      {
+         // Try to parse the data to check that it's valid JSON...
+         var validJson = JSON.parse(data);
+      }
+      catch(e)
+      {
+         status.code = 500;
+         model.errorMessage = "Invalid QuADDS data provided - must be JSON";
+         return false;
+      }
+
+      // Construct query to find the requested QuADDS...
+      var QuADDS_Items = search.selectNodes('/app:company_home/app:dictionary/cm:QuADDS/cm:' + search.ISO9075Encode(url.templateArgs.name) + '/cm:' + search.ISO9075Encode(url.templateArgs.item_name));
+      if (QuADDS_Items.length > 0)
+      {
+         var node = QuADDS_Items[0];
+         var workingCopy = node.checkout();
+         workingCopy.content = data;
+         node = workingCopy.checkin();
+         model.nodeRef = node.nodeRef.toString();
+         return true;
+      }
+      else
+      {
+         status.code = 500;
+         model.errorMessage = "Could not find QuADDS item";
+         return false;
+      }
+
+      // Shouldn't get to here - there should be a return at every code path...
+      model.errorMessage = "Unexpected error occurred";
+      status.code = 500;
+      return false;
+   }
+}
+
+model.success = main();
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/vti/vti.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/vti/vti.get.desc.xml
new file mode 100644
index 00000000000..6ae93f6c820
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/vti/vti.get.desc.xml
@@ -0,0 +1,12 @@
+<webscript>
+   <shortname>Vti WebScript placeholder</shortname>
+   <description>
+      This script is a placeholder so the Share DocLib can query the Vti Server parameters without throwing an HTTP 404 error.
+   </description>
+   <url>/api/vti/{dummy}</url>
+   <url>/api/vti</url>
+   <format default="json">argument</format>
+   <authentication>none</authentication>
+   <transaction allow="readonly">required</transaction>
+   <lifecycle>internal</lifecycle>
+</webscript>
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/vti/vti.get.json.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/vti/vti.get.json.ftl
new file mode 100644
index 00000000000..9e26dfeeb6e
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/vti/vti.get.json.ftl
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.desc.xml b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.desc.xml
new file mode 100644
index 00000000000..08cdb73e06d
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.desc.xml
@@ -0,0 +1,13 @@
+<webscript>
+  <shortname>Content Metadata Retrieval Service</shortname>
+  <description>Content Metadata Retrieval Service</description>
+  <url>/webframework/content/metadata</url>
+
+  <!-- This webscript really returns JSON, but for backwards compatibility -->
+  <!--  and to match existing documentation, we have to pretend we're HTML -->
+  <format default="html">argument</format>
+
+  <authentication>user</authentication>
+  <transaction allow="readonly">required</transaction>
+  <lifecycle>internal</lifecycle>
+</webscript>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl
new file mode 100644
index 00000000000..5d4eda89a67
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl
@@ -0,0 +1,134 @@
+{
+	"code": "${code}"
+
+<#if object?exists>
+	,
+	"data": {
+		<@serialize object=object includeChildren=includeChildren includeContent=includeContent/>
+	}
+</#if>
+}
+
+<#macro serialize object includeChildren includeContent>
+<#escape x as jsonUtils.encodeJSONString(x)>
+	"isContainer": ${object.isContainer?string}
+	,
+	"isDocument": ${object.isDocument?string}
+	,
+	"url": "${object.url}"
+	,
+	"downloadUrl": "${object.downloadUrl}"
+<#if object.mimetype?exists>
+	,
+	"mimetype": "${object.mimetype}"
+</#if>
+	,
+	"size": "${object.size}"
+	,
+	"displayPath": "${object.displayPath}"
+	,
+	"qnamePath": "${object.qnamePath}"
+	,
+	"icon16": "${object.icon16}"
+	,
+	"icon32": "${object.icon32}"
+	,
+	"isLocked": ${object.isLocked?string}
+	,
+	"id": "${object.id}"
+	,
+	"nodeRef": "${object.nodeRef}"
+	,
+	"name": "${object.name}"
+	,
+	"type": "${object.type}"
+	,
+	"isCategory": ${object.isCategory?string}
+<#if object.properties?exists>
+	,
+	"properties":
+	{
+	   <@serializeHash hash=object.properties/>
+	}
+</#if>
+
+<#if includeChildren && object.children?exists>
+	,
+	"children":
+	[
+		<#assign first = true>
+		<#list object.children as child>
+		<#if first == false>
+		,
+		</#if>
+		{
+			<@serialize object=child includeChildren=false includeContent=includeContent/>
+		}
+		<#assign first = false>
+		</#list>
+	]
+<#else>
+	,
+	"children": []
+</#if>
+
+<#if isUser && object.associations["cm:avatar"]?exists>
+	,
+	"associations":
+	{
+		"{http://www.alfresco.org/model/content/1.0}avatar": ["${object.associations["cm:avatar"][0].nodeRef}"]
+	}
+</#if>
+
+<#if isUser>
+	,
+	"capabilities":
+	{
+		<@serializeHash hash=capabilities/>
+	}
+	,
+	"immutableProperties":
+	{
+		<@serializeHash hash=immutableProperties/>
+	}
+</#if>
+</#escape>
+</#macro>
+
+<#macro serializeSequence sequence>
+<#escape x as jsonUtils.encodeJSONString(x)>
+[
+<#local first = true>
+<#list sequence as e>
+   <#if !first>,<#else><#local first = false></#if>
+   <#if isUser && object.isTemplateContent(e)>"${e.content}"
+   <#elseif object.isTemplateNodeRef(e)>"${e.nodeRef}"
+   <#elseif e?is_date>"${xmldate(e)}"
+   <#elseif e?is_boolean>${e?string}
+   <#elseif e?is_number>${e?c}
+   <#else>"${e}"
+   </#if>
+</#list>
+]
+</#escape>
+</#macro>
+
+<#macro serializeHash hash>
+<#escape x as jsonUtils.encodeJSONString(x)>
+<#local first = true>
+<#list hash?keys as key>
+	<#if hash[key]??>
+		<#local val = hash[key]>
+		<#if !first>,<#else><#local first = false></#if>"${key}":
+		<#if isUser && object.isTemplateContent(val)>"${val.content}"
+		<#elseif object.isTemplateNodeRef(val)>"${val.nodeRef}"
+		<#elseif val?is_date>"${xmldate(val)}"
+		<#elseif val?is_boolean>${val?string}
+		<#elseif val?is_number>${val?c}
+		<#elseif val?is_sequence><@serializeSequence sequence=val/>
+		<#else>"${val}"
+		</#if>
+	</#if>
+</#list>
+</#escape>
+</#macro>
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.js
new file mode 100644
index 00000000000..3f5830a2f55
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.js
@@ -0,0 +1,45 @@
+model.includeChildren = true;
+model.includeContent = false;
+model.isUser = false;
+
+model.code = "ERROR";
+
+var object = null;
+
+// allow for content to be loaded from id
+if (args["id"] != null)
+{
+	var id = args["id"];
+	object = search.findNode(id);
+}
+
+// if not by id, then allow for user id
+else if (args["user"] != null)
+{
+   var userId = args["user"];
+   object = people.getPerson(userId);
+   model.isUser = true; 
+   model.includeChildren = false;
+   model.capabilities = people.getCapabilities(object);
+   model.immutableProperties = people.getImmutableProperties(userId);
+}
+
+// load content by relative path
+else
+{
+	var path = args["path"];
+	if (path == null || path == "" || path == "/")
+	{
+		path = "/Company Home";
+	}
+	
+	// look up the content by path
+	object = roothome.childByNamePath(path);
+}
+
+if (object != null)
+{
+	model.code = "OK";
+}
+
+model.object = object;
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/webscripts.lib.html.ftl b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/webscripts.lib.html.ftl
new file mode 100644
index 00000000000..60cf23c7895
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/webscripts.lib.html.ftl
@@ -0,0 +1,47 @@
+[#ftl]
+
+[#macro head]
+<head>
+   <title>[#nested]</title> 
+   <link rel="stylesheet" href="${url.context}/css/main.css" type="text/css" />
+</head>
+[/#macro]
+
+[#macro header]
+<table>
+   <tr>
+      <td><img src="${url.context}/images/logo/AlfrescoLogo32.png" alt="Alfresco" /></td>
+      <td><span class="title">[#nested]</span></td></tr>
+</table>
+<table>
+      <tr><td colspan="2">Alfresco ${server.edition?html} v${server.version?html}</td></tr>
+</table>
+[/#macro]
+
+[#macro indexheader size=-1]
+[@header][#nested][/@header]
+<table>
+   <tr><td>[#if size == -1]${webscripts?size}[#else]${size}[/#if] Web Scripts</td></tr>
+</table>
+[/#macro]
+
+[#macro onlinedoc]
+<table>
+    <tr><td><a href="http://wiki.alfresco.com/wiki/HTTP_API">Online documentation</a>.</td></tr>
+</table>
+[/#macro]
+
+[#macro home]
+<table>
+   <tr><td><a href="${url.serviceContext}/index">Back to Web Scripts Home</a></td></tr>
+</table>
+[/#macro]
+
+[#macro parent path pathname]
+[#if path.parent?exists]
+   <br>
+   <table>
+      <tr><td><a href="${url.serviceContext}/index/${pathname}${path.parent.path}">Up to ${pathname} ${path.parent.path}</a>
+   </table>
+[/#if]
+[/#macro]
\ No newline at end of file
diff --git a/remote-api/src/main/resources/alfresco/web-client-application-context.xml b/remote-api/src/main/resources/alfresco/web-client-application-context.xml
new file mode 100644
index 00000000000..557e7a69dbc
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/web-client-application-context.xml
@@ -0,0 +1,133 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+   
+   <!-- ===================================== -->
+   <!-- Web Script Beans                      -->
+   <!-- ===================================== -->
+   
+   <bean id="globalAuthenticationListener" class="org.alfresco.repo.web.auth.NoopAuthenticationListener"/>
+    
+   <bean id="GlobalAuthenticationFilter" class="org.alfresco.repo.management.subsystems.ChainingSubsystemProxyFactory">
+      <property name="applicationContextManager">
+         <ref bean="Authentication" />
+      </property>
+      <property name="interfaces">
+         <list>
+            <value>org.alfresco.repo.web.filter.beans.DependencyInjectedFilter</value>
+         </list>
+      </property>
+      <property name="sourceBeanName">
+         <value>globalAuthenticationFilter</value>
+      </property>
+      <!-- Fall back to a benign default implementation -->
+      <property name="defaultTarget">
+         <bean class="org.alfresco.repo.web.filter.beans.NullFilter" />
+      </property>
+   </bean>
+   
+   <bean id="WebscriptCookieAuthenticationFilter" class="org.alfresco.repo.management.subsystems.ChainingSubsystemProxyFactory">
+      <property name="applicationContextManager">
+         <ref bean="Authentication" />
+      </property>
+      <property name="interfaces">
+         <list>
+            <value>org.alfresco.repo.web.filter.beans.DependencyInjectedFilter</value>
+         </list>
+      </property>
+      <property name="sourceBeanName">
+         <value>cookieBasedAuthenticationFilter</value>
+      </property>
+      <!-- Uses this implementation -->
+      <property name="defaultTarget">
+         <bean class="org.alfresco.web.app.servlet.WebscriptCookieAuthenticationFilter">
+            <property name="authenticationService">
+               <ref bean="AuthenticationService" />
+            </property>
+            <property name="personService">
+               <ref bean="PersonService" />
+            </property>
+            <property name="nodeService">
+               <ref bean="NodeService" />
+            </property>
+            <property name="transactionService">
+               <ref bean="TransactionService" />
+            </property>
+            <property name="authenticationComponent">
+               <ref bean="AuthenticationComponent" />
+            </property>
+            <property name="remoteUserMapper">
+               <ref bean="RemoteUserMapper" />
+            </property>
+         </bean>
+      </property>
+   </bean> 
+   
+   <bean id="SOLRAuthenticationFilter" class="org.alfresco.repo.web.scripts.solr.SOLRAuthenticationFilter">
+      <property name="secureComms" value="${solr.secureComms}"/>
+   </bean>
+   
+   <bean id="WebscriptAuthenticationFilter" class="org.alfresco.repo.management.subsystems.ChainingSubsystemProxyFactory">
+      <property name="applicationContextManager">
+         <ref bean="Authentication" />
+      </property>
+      <property name="interfaces">
+         <list>
+            <value>org.alfresco.repo.web.filter.beans.DependencyInjectedFilter</value>
+         </list>
+      </property>
+      <property name="sourceBeanName">
+         <value>webscriptAuthenticationFilter</value>
+      </property>
+      <!-- Fall back to a benign default implementation -->
+      <property name="defaultTarget">
+         <bean class="org.alfresco.repo.web.filter.beans.NullFilter" />
+      </property>
+   </bean>
+   
+   <bean id="webDavAuthenticationListener" class="org.alfresco.repo.web.auth.NoopAuthenticationListener"/>
+
+   <bean id="WebDavAuthenticationFilter" class="org.alfresco.repo.management.subsystems.ChainingSubsystemProxyFactory">
+      <property name="applicationContextManager">
+         <ref bean="Authentication" />
+      </property>
+      <property name="interfaces">
+         <list>
+            <value>org.alfresco.repo.web.filter.beans.DependencyInjectedFilter</value>
+         </list>
+      </property>
+      <property name="sourceBeanName">
+         <value>webDavAuthenticationFilter</value>
+      </property>
+      <!-- Fall back to the default alfresco implementation -->
+      <property name="defaultTarget">
+         <bean class="org.alfresco.repo.webdav.auth.AuthenticationFilter">
+            <property name="authenticationListener">
+               <ref bean="webDavAuthenticationListener"/>
+            </property>
+            <property name="authenticationService">
+               <ref bean="AuthenticationService" />
+            </property>
+            <property name="personService">
+               <ref bean="PersonService" />
+            </property>
+            <property name="nodeService">
+               <ref bean="NodeService" />
+            </property>
+            <property name="transactionService">
+               <ref bean="TransactionService" />
+            </property>
+            <property name="authenticationComponent">
+               <ref bean="AuthenticationComponent" />
+            </property>
+            <property name="remoteUserMapper">
+               <ref bean="RemoteUserMapper" />
+            </property>
+         </bean>
+      </property>
+   </bean>
+   
+   <bean id="PublicAPIAuthenticationFilter" class="org.alfresco.repo.web.filter.beans.NullFilter" />
+   
+</beans>
diff --git a/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml b/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml
new file mode 100644
index 00000000000..8273942fc78
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/web-scripts-application-context.xml
@@ -0,0 +1,1800 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+   <!--                           -->
+   <!--  Web Script Configuration -->
+   <!--                           -->
+
+   <bean id="webscripts.configsource" class="org.springframework.extensions.config.source.UrlConfigSource">
+      <constructor-arg>
+         <list>
+            <value>classpath:alfresco/web-scripts-config.xml</value>
+            <value>classpath:alfresco/extension/web-scripts-config-custom.xml</value>
+         </list>
+      </constructor-arg>
+   </bean>
+
+   <bean id="webscripts.config" class="org.springframework.extensions.config.xml.XMLConfigService" init-method="init">
+      <constructor-arg>
+         <ref bean="webscripts.configsource" />
+      </constructor-arg>
+   </bean>
+ 
+ 
+   <!--                     -->
+   <!--  Web Script Storage -->
+   <!--                     -->
+
+   <!-- Get bulk node metadata -->
+   <bean id="webscript.org.alfresco.repository.metadata.bulkmetadata.post"
+         class="org.alfresco.repo.web.scripts.metadata.BulkMetadataGet"
+         parent="webscript">
+       <property name="serviceRegistry" ref="ServiceRegistry"/>
+   </bean>
+
+   <bean id="webscripts.repostore" class="org.alfresco.repo.web.scripts.RepoStore" abstract="true" init-method="init">
+      <property name="transactionHelper" ref="retryingTransactionHelper" />
+      <property name="nodeService" ref="nodeService" />
+      <property name="namespaceService" ref="namespaceService" />
+      <property name="contentService" ref="contentService" />
+      <property name="fileFolderService" ref="fileFolderService" />
+      <property name="searchService" ref="SearchService" />
+      <property name="permissionService" ref="PermissionService" />
+      <property name="tenantAdminService" ref="tenantAdminService" />
+   </bean>
+
+   <bean name="webscripts.store.repo.extension" parent="webscripts.repostore">
+      <property name="store"><value>workspace://SpacesStore</value></property>
+      <property name="path"><value>/${spaces.company_home.childname}/${spaces.dictionary.childname}/cm:extensionwebscripts</value></property>
+   </bean>
+
+   <bean name="webscripts.store.repo" parent="webscripts.repostore">
+      <property name="mustExist"><value>true</value></property>
+      <property name="store"><value>workspace://SpacesStore</value></property>
+      <property name="path"><value>/${spaces.company_home.childname}/${spaces.dictionary.childname}/cm:webscripts</value></property>
+   </bean>
+   
+   <bean id="webscripts.repoclasspathstore" class="org.alfresco.repo.web.scripts.RepoClassPathStore" abstract="true" />
+
+   <bean id="webscripts.store" parent="webscripts.repoclasspathstore">
+      <property name="mustExist"><value>false</value></property>
+      <property name="classPath"><value>webscripts</value></property>
+   </bean>
+   
+   <bean id="webscripts.store.alfresco" parent="webscripts.repoclasspathstore">
+      <property name="mustExist"><value>false</value></property>
+      <property name="classPath"><value>alfresco/webscripts</value></property>
+   </bean>
+
+   <bean id="webscripts.store.client" parent="webscripts.repoclasspathstore">
+      <property name="mustExist"><value>true</value></property>
+      <property name="classPath"><value>alfresco/templates/webscripts</value></property>
+   </bean>
+   
+   <bean id="webscripts.store.client.extension" parent="webscripts.classpathstore">
+      <property name="classPath"><value>alfresco/extension/templates/webscripts</value></property>
+   </bean>
+   
+   <bean id="webscripts.searchpath" class="org.springframework.extensions.webscripts.SearchPath">
+      <property name="searchPath">
+          <list>
+             <ref bean="webscripts.store.repo.extension" />
+             <ref bean="webscripts.store.repo" />
+             <ref bean="webscripts.store.client.extension" />
+             <ref bean="webscripts.store.client" />
+             <ref bean="webscripts.store.alfresco" />
+             <ref bean="webscripts.store" />
+          </list>
+      </property>
+   </bean>
+
+
+   <!--                                                -->
+   <!--  Web Script Repository (Server-Tier) Container -->
+   <!--                                                -->
+
+   <bean id="webscripts.repo.imageresolver" class="org.alfresco.repo.web.scripts.RepositoryImageResolver" />
+   
+   <bean id="webscripts.repo.registry.templateprocessor" class="org.springframework.extensions.webscripts.TemplateProcessorRegistry" />      
+
+   <bean id="webscripts.repo.registry.scriptprocessor" class="org.springframework.extensions.webscripts.ScriptProcessorRegistry" />
+   
+   <bean id="webscripts.repo.templateprocessor.factory" class="org.alfresco.repo.web.scripts.RepositoryTemplateProcessorFactory">
+      <property name="templateProcessor" ref="webscripts.repo.templateprocessor"/>
+   </bean>
+
+   <bean id="webscripts.repo.templateprocessor" class="org.alfresco.repo.web.scripts.RepositoryTemplateProcessor">
+      <property name="serviceRegistry" ref="ServiceRegistry" />
+      <property name="freeMarkerProcessor" ref="freeMarkerProcessor" /> 
+      <property name="searchPath" ref="webscripts.searchpath" />
+   </bean>
+   
+   <bean id="webscripts.repo.scriptprocessor.factory" class="org.alfresco.repo.web.scripts.RepositoryScriptProcessorFactory">
+      <property name="scriptProcessor" ref="webscripts.repo.scriptprocessor"/>
+   </bean>
+
+   <bean id="webscripts.repo.scriptprocessor" class="org.alfresco.repo.web.scripts.RepositoryScriptProcessor">
+      <property name="scriptService" ref="scriptService" />
+      <property name="searchPath" ref="webscripts.searchpath" />
+   </bean>
+
+   <bean class="org.springframework.extensions.webscripts.TemplateProcessorRegistrar" init-method="init">
+      <property name="registry" ref="webscripts.repo.registry.templateprocessor" />
+      <property name="factory" ref="webscripts.repo.templateprocessor.factory" />
+      <property name="name"><value>Repository Template Processor</value></property>
+      <property name="extension"><value>ftl</value></property>
+   </bean>
+
+   <bean class="org.springframework.extensions.webscripts.ScriptProcessorRegistrar" init-method="init">
+      <property name="registry" ref="webscripts.repo.registry.scriptprocessor" />
+      <property name="factory" ref="webscripts.repo.scriptprocessor.factory" />
+      <property name="name"><value>Repository Script Processor</value></property>
+      <property name="extension"><value>js</value></property>
+   </bean>
+
+   <bean id="baseAlfrescoRepositoryContainer" parent="webscripts.abstractcontainer" abstract="true">
+      <property name="notPublicExceptions">
+         <list>
+            <value>java.sql.SQLException</value>
+            <value>org.alfresco.service.cmr.repository.ContentIOException</value>
+         </list>
+      </property>
+      <property name="publicExceptions">
+         <list>
+            <value>org.alfresco.repo.content.ContentLimitViolationException</value>
+         </list>
+      </property>
+   </bean>
+
+   <bean id="webscripts.container" class="org.alfresco.repo.web.scripts.TenantRepositoryContainer" parent="baseAlfrescoRepositoryContainer" init-method="setup">
+      <property name="configService" ref="webscripts.config" />
+      <property name="name"><value>Repository</value></property>
+      <property name="scriptObjects">
+         <map merge="true">
+           <entry key="paging">
+              <ref bean="webscripts.js.paging"/>
+           </entry>
+         </map>
+      </property>
+      <property name="webScriptsRegistryCache" ref="webScriptsRegistryCache"/>
+      <!-- Use the time-limited transaction helper to keep request times to an acceptable duration -->
+      <property name="transactionService" ref="transactionService" />
+      <!-- The transaction helper used to generate error responses must be unlimited -->
+      <property name="fallbackTransactionHelper" ref="retryingTransactionHelper" />
+      <property name="authorityService" ref="AuthorityService" />
+      <property name="repository" ref="repositoryHelper" />
+      <property name="repositoryImageResolver" ref="webscripts.repo.imageresolver" />
+      <property name="templateProcessorRegistry" ref="webscripts.repo.registry.templateprocessor" />
+      <property name="scriptProcessorRegistry" ref="webscripts.repo.registry.scriptprocessor" />
+      <property name="descriptorService" ref="DescriptorService" />
+      <property name="tenantAdminService" ref="tenantAdminService" />
+      <property name="encryptTempFiles" value="${webscripts.encryptTempFiles}"/>
+      <property name="tempDirectoryName" value="${webscripts.tempDirectoryName}"/>
+      <property name="memoryThreshold" value="${webscripts.memoryThreshold}"/>
+      <property name="maxContentSize" value="${webscripts.setMaxContentSize}"/>
+      <property name="preserveHeadersPattern" value="${webscripts.transaction.preserveHeadersPattern}"/>
+   </bean>
+
+   <bean id="webscripts.index.prototype" class="org.springframework.extensions.webscripts.JaxRSUriIndex" scope="prototype"/>
+   
+   <bean id="webscripts.registry.prototype" parent="webscripts.registry" scope="prototype">
+      <property name="uriIndex" ref="webscripts.index.prototype" />
+   </bean>
+
+   <bean name="webScriptsRegistryCache" class="org.alfresco.repo.web.scripts.RegistryAsynchronouslyRefreshedCache" parent="abstractAsynchronouslyRefreshedCache">
+      <property name="registryFactory">
+          <bean class="org.springframework.beans.factory.config.ObjectFactoryCreatingFactoryBean">
+             <property name="targetBeanName"><idref bean="webscripts.registry.prototype"/></property>
+          </bean>
+      </property>
+      <property name="retryingTransactionHelper" ref="retryingTransactionHelper" />
+   </bean>
+   
+   <bean id="webscripts.js.paging" class="org.alfresco.repo.web.util.paging.Paging" />
+
+   <!--                            -->
+   <!--  Web Script Authenticators -->
+   <!--                            -->
+
+   <!--  HTTP Basic Authenticator (Servlet based - stateless) -->
+   <bean id="webscripts.authenticator.basic" class="org.alfresco.repo.web.scripts.servlet.BasicHttpAuthenticatorFactory">
+      <property name="authenticationService" ref="AuthenticationService" />
+      <property name="authorityService" ref="AuthorityService" />
+      <property name="authenticationListener" ref="webScriptAuthenticationListener"/>
+   </bean>
+
+   <!--  HTTP Remote User Authenticator (Servlet based - stateless) -->
+   <bean id="webscripts.authenticator.remoteuser" class="org.alfresco.repo.web.scripts.servlet.RemoteUserAuthenticatorFactory">
+      <property name="authenticationService" ref="AuthenticationService" />
+      <property name="authorityService" ref="AuthorityService" />
+      <property name="authenticationComponent" ref="authenticationComponent" />
+      <property name="authenticationListener" ref="webScriptAuthenticationListener"/>
+      <property name="remoteUserMapper" ref="RemoteUserMapper" />
+      <property name="alwaysAllowBasicAuthForAdminConsole">
+         <value>${authentication.alwaysAllowBasicAuthForAdminConsole.enabled}</value>
+      </property>
+      <property name="getRemoteUserTimeoutMilliseconds">
+         <value>${authentication.getRemoteUserTimeoutMilliseconds}</value>
+      </property>
+      <property name="adminConsoleScriptFamilies">
+         <list>
+            <value>AdminConsole</value>
+            <value>AdminConsoleHelper</value>
+         </list>
+      </property>
+   </bean>
+
+   <!--  HTTP Basic Authenticator (Servlet based - stateless) for MT -->
+   <bean id="webscripts.authenticator.basic.tenant" class="org.alfresco.repo.web.scripts.servlet.BasicHttpAuthenticatorFactory">
+      <property name="authenticationService" ref="AuthenticationService" />
+      <property name="authorityService" ref="AuthorityService" />
+      <property name="authenticationListener" ref="webScriptAuthenticationListener"/>
+   </bean>
+
+
+   <!--            -->
+   <!--  API Beans -->
+   <!--            -->
+   
+   <!--  Content Retrieval -->
+   <bean id="webscript.org.alfresco.content.content.get" class="org.alfresco.repo.web.scripts.content.ContentGet" parent="webscript">
+      <property name="namespaceService" ref="NamespaceService" />
+      <property name="permissionService" ref="PermissionService" />
+      <property name="nodeService" ref="NodeService" />
+      <property name="dictionaryService" ref="DictionaryService" />
+      <property name="mimetypeService" ref="MimetypeService" />
+      <property name="delegate" ref="webscript.content.streamer" />
+      <property name="contentService" ref="contentService" />
+      <property name="repository" ref="repositoryHelper" />
+   </bean>
+   
+   <!--  Content Info -->
+   <bean id="webscript.org.alfresco.content.content.head" class="org.alfresco.repo.web.scripts.content.ContentInfo" parent="webscript">
+      <property name="permissionService" ref="PermissionService" />
+      <property name="nodeService" ref="NodeService" />
+      <property name="mimetypeService" ref="MimetypeService" />
+      <property name="delegate" ref="webscript.content.streamer" />
+      <property name="repository" ref="repositoryHelper" />
+   </bean>
+
+   <!--  Javascript APIs -->
+   <bean id="webscript.org.alfresco.jsdebugger.get" class="org.springframework.extensions.webscripts.bean.JavascriptDebugger" parent="webscript">
+      <property name="debugger" ref="rhinoScriptDebugger" />
+   </bean>
+   <bean id="webscript.org.alfresco.jsdebugger.post" class="org.springframework.extensions.webscripts.bean.JavascriptDebuggerPost" parent="webscript">
+      <property name="debugger" ref="rhinoScriptDebugger" />
+   </bean>
+
+   <!--  Authentication APIs -->
+   <bean id="webscript.org.alfresco.repository.login.get" class="org.alfresco.repo.web.scripts.bean.Login" parent="webscript">
+      <property name="authenticationService" ref="AuthenticationService" />
+      <property name="eventPublisher" ref="eventPublisher" />
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.login.post" class="org.alfresco.repo.web.scripts.bean.LoginPost" parent="webscript">
+      <property name="authenticationService" ref="AuthenticationService" />
+      <property name="eventPublisher" ref="eventPublisher" />
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.loginticket.get" class="org.alfresco.repo.web.scripts.bean.LoginTicket" parent="webscript">
+      <property name="ticketComponent" ref="ticketComponent" />
+   </bean>
+   <bean id="webscript.org.alfresco.repository.loginticket.delete" class="org.alfresco.repo.web.scripts.bean.LoginTicketDelete" parent="webscript">
+      <property name="authenticationService" ref="authenticationService" />
+      <property name="ticketComponent" ref="ticketComponent" />
+   </bean>
+   
+   <!--  List of registered (OpenSearch) search engines -->
+   <bean id="webscript.org.alfresco.repository.search.searchengines.get" class="org.alfresco.repo.web.scripts.bean.SearchEngines" parent="webscript">
+      <property name="configService" ref="webscripts.config" />
+      <property name="searchProxy" ref="webscript.org.alfresco.repository.search.searchproxy.get" />
+   </bean>
+
+   <!--  Alfresco Web Client Keyword Search (OpenSearch) -->
+   <bean id="webscript.org.alfresco.repository.search.keywordsearch.get" class="org.alfresco.repo.web.scripts.bean.KeywordSearch" parent="webscript">
+      <property name="searchService" ref="SearchService" />
+      <property name="nodeService" ref="nodeService" />
+      <property name="serviceRegistry" ref="ServiceRegistry" />
+      <property name="repositoryImageResolver" ref="webscripts.repo.imageresolver" />
+   </bean>
+
+   <!--  Alfresco Web Client Person Search (OpenSearch) -->
+   <bean id="webscript.org.alfresco.repository.search.personsearch.get" parent="webscript.org.alfresco.repository.search.keywordsearch.get" />
+
+   <!--  Alfresco (OpenSearch) Proxy -->
+   <bean id="webscript.org.alfresco.repository.search.searchproxy.get" class="org.alfresco.repo.web.scripts.bean.SearchProxy" parent="webscript">
+      <property name="configService" ref="webscripts.config" />
+      <property name="formatRegistry" ref="webscripts.formatregistry" />
+   </bean>
+
+   <!--  Abstract Content Streaming Web Script -->
+   <bean id="webscript.org.alfresco.repository.content.stream" class="org.alfresco.repo.web.scripts.content.StreamContent" parent="webscript" scope="prototype">
+      <property name="permissionService" ref="PermissionService" />
+      <property name="nodeService" ref="NodeService" />
+      <property name="mimetypeService" ref="MimetypeService" />
+      <property name="delegate" ref="webscript.content.streamer" />
+   </bean>
+   
+   <!--  Remote Store service - ADM -->
+   <bean id="baseADMRemoteStore" abstract="true" class="org.alfresco.repo.web.scripts.bean.ADMRemoteStore" parent="webscript" >
+      <property name="nodeService" ref="NodeService" />
+      <property name="unprotectedNodeService" ref="nodeService" />
+      <property name="mimetypeService" ref="MimetypeService" />
+      <property name="fileFolderService" ref="FileFolderService"/>
+      <property name="contentService" ref="ContentService"/>
+      <property name="siteService" ref="SiteService" />
+      <property name="hiddenAspect" ref="hiddenAspect" />
+      <property name="behaviourFilter" ref="policyBehaviourFilter" />
+      <property name="permissionService" ref="permissionService" />
+      <property name="ownableService" ref="OwnableService" />
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.store.remoteadm.get"  parent="baseADMRemoteStore" />
+   
+   <bean id="surfConfigCleaner" parent="baseADMRemoteStore" class="org.alfresco.repo.surf.policy.SurfConfigCleaner" init-method="init">
+      <property name="fileFolderService" ref="fileFolderService" />
+      <property name="nodeService" ref="nodeService" />
+      <property name="policyComponent" ref="policyComponent" />
+      <property name="siteService" ref="siteService" />
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.store.remoteadm.post" parent="baseADMRemoteStore" />
+   
+   <bean id="webscript.org.alfresco.repository.store.remoteadm.delete"  parent="baseADMRemoteStore" />
+   
+   <!-- Web-tier SSO authentication touch point -->
+   <bean id="webscript.org.alfresco.repository.touch.get" class="org.alfresco.repo.web.scripts.bean.Touch" parent="webscript" />
+   
+   <!-- Authentication information service -->
+   <bean id="webscript.org.alfresco.repository.authentication.get" class="org.alfresco.repo.web.scripts.bean.Authentication" parent="webscript">
+      <property name="authenticationService" ref="authenticationService"/>
+   </bean>
+
+   <!-- Mimetype descriptions -->
+   <bean id="webscript.org.alfresco.repository.content.mimetype-descriptions.get" class="org.alfresco.repo.web.scripts.content.MimetypeDescriptionsGet" parent="webscript">
+      <property name="mimetypeService" ref="mimetypeService" />
+   </bean>
+
+   <!-- Mimetype information details -->
+   <bean id="webscript.org.alfresco.repository.content.mimetypes.get" class="org.alfresco.repo.web.scripts.content.MimetypesGet" parent="webscript">
+      <property name="mimetypeService" ref="mimetypeService" />
+      <property name="metadataExtracterRegistry" ref="metadataExtracterRegistry" />
+      <property name="localTransformServiceRegistry" ref="localTransformServiceRegistry" />
+   </bean>
+   
+   <!-- Patch webscript for RenditionService -->
+   <bean id="webscript.org.alfresco.repository.rendition.patchthumbnailsasrenditions.get"
+         class="org.alfresco.repo.web.scripts.rendition.patch.PatchThumbnailsAsRenditionsGet" parent="webscript">
+      <property name="nodeService" ref="NodeService" />
+      <property name="renditionService" ref="RenditionService" />
+      <property name="searchService" ref="SearchService" />
+   </bean>
+   
+   
+   <!--                            -->
+   <!-- Activity Feed Web Scripts  -->
+   <!--                            -->
+
+   <!-- Activity User Feed - to get activities feed for logged in user -->
+   <bean id="webscript.org.alfresco.repository.activities.feed.userfeed.get" class="org.alfresco.repo.web.scripts.activities.feed.UserFeedRetrieverWebScript" parent="webscript">
+      <property name="activityService" ref="activityService"/>
+      <property name="subscriptionService" ref="SubscriptionService"/>
+   <property name="userNamesAreCaseSensitive" value="${user.name.caseSensitive}"/>
+   </bean>
+  
+   <!-- Activity Admin Feed - to get activities feed for specified user -->
+   <bean id="webscript.org.alfresco.repository.activities.feed.userfeed-admin.get" class="org.alfresco.repo.web.scripts.activities.feed.UserFeedRetrieverWebScript" parent="webscript">
+      <property name="activityService" ref="activityService"/>
+      <property name="subscriptionService" ref="SubscriptionService"/>
+   </bean>
+   
+   <!-- Activity Site Feed - to get activities feed for given site, if private site then need to be a member or admin -->
+   <bean id="webscript.org.alfresco.repository.activities.feed.sitefeed.get" class="org.alfresco.repo.web.scripts.activities.feed.SiteFeedRetrieverWebScript" parent="webscript">
+      <property name="activityService" ref="activityService"/>
+   </bean>
+   
+   <!--                            -->
+   <!-- Activity Templates Storage -->
+   <!--                            -->
+   
+   <bean id="webscript.org.alfresco.repository.activities.templates.get" class="org.alfresco.repo.web.scripts.activities.TemplatesWebScript" parent="webscript">
+      <property name="searchPath" ref="activity.template.searchpath"/>
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.activities.template.get" class="org.alfresco.repo.web.scripts.activities.TemplateWebScript" parent="webscript">
+      <property name="searchPath" ref="activity.template.searchpath"/>
+   </bean>
+   
+   <bean id="templates.classpathstore" class="org.springframework.extensions.webscripts.ClassPathStore" abstract="true" />
+   
+   <bean id="activity.template.store.client.extension" parent="templates.classpathstore">
+      <property name="classPath"><value>alfresco/extension/templates/activities</value></property>
+   </bean>
+
+   <bean id="activity.template.store.client" parent="templates.classpathstore">
+      <property name="mustExist"><value>true</value></property>
+      <property name="classPath"><value>alfresco/templates/activities</value></property>
+   </bean>
+   
+   <bean id="activity.template.searchpath" class="org.springframework.extensions.webscripts.SearchPath">
+      <property name="searchPath">
+          <list>
+             <ref bean="activity.template.store.client.extension" />
+             <ref bean="activity.template.store.client" />
+          </list>
+      </property>
+   </bean>
+
+   <!--                            -->
+   <!-- Subscriptions Web Scripts  -->
+   <!--                            -->
+
+   <bean id="webscript.org.alfresco.repository.subscriptions.followers.get" class="org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceFollowersGet" parent="webscript">
+      <property name="subscriptionService" ref="SubscriptionService"/>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="personService" ref="PersonService"/>
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.subscriptions.followerscount.get" class="org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceFollowersCountGet" parent="webscript">
+      <property name="subscriptionService" ref="SubscriptionService"/>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="personService" ref="PersonService"/>
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.subscriptions.follows.post" class="org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceFollowsPost" parent="webscript">
+      <property name="subscriptionService" ref="SubscriptionService"/>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="personService" ref="PersonService"/>
+   </bean>
+
+   <bean id="webscript.org.alfresco.repository.subscriptions.following.get" class="org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceFollowingGet" parent="webscript">
+      <property name="subscriptionService" ref="SubscriptionService"/>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="personService" ref="PersonService"/>
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.subscriptions.followingcount.get" class="org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceFollowingCountGet" parent="webscript">
+      <property name="subscriptionService" ref="SubscriptionService"/>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="personService" ref="PersonService"/>
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.subscriptions.follow.post" class="org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceFollowPost" parent="webscript">
+      <property name="subscriptionService" ref="SubscriptionService"/>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="personService" ref="PersonService"/>
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.subscriptions.unfollow.post" class="org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceUnfollowPost" parent="webscript">
+      <property name="subscriptionService" ref="SubscriptionService"/>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="personService" ref="PersonService"/>
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.subscriptions.private.get" class="org.alfresco.repo.web.scripts.subscriptions.SubscriptionServicePrivateListGet" parent="webscript">
+      <property name="subscriptionService" ref="SubscriptionService"/>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="personService" ref="PersonService"/>
+   </bean>
+
+   <bean id="webscript.org.alfresco.repository.subscriptions.private.put" class="org.alfresco.repo.web.scripts.subscriptions.SubscriptionServicePrivateListPut" parent="webscript">
+      <property name="subscriptionService" ref="SubscriptionService"/>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="personService" ref="PersonService"/>
+   </bean>
+
+
+	   <!--                         -->
+	   <!-- Import public REST API -->
+	   <!--                         -->
+   <import resource="classpath:alfresco/public-rest-context.xml"/>
+   
+   <!--                         -->
+   <!-- Invite Service REST API -->
+   <!--                         -->
+   
+   <!--                                                                                                       -->
+   <!-- Invite Accept/Reject Web Script - accepts or rejects a pending invite                                 -->
+   <!--                                                                                                       -->
+   
+   <bean id="webscript.org.alfresco.repository.invite.inviteresponse.put"
+         class="org.alfresco.repo.web.scripts.invite.InviteResponse"
+         parent="webscript">
+      <property name="tenantService" ref="tenantService"/>
+      <property name="invitationService" ref="InvitationService"/>
+   </bean>
+   
+   <!--                                                                                                       -->
+   <!-- Invites Web Script (pending invites) - returns pending invites matching the given                     -->
+   <!-- inviter user name, invitee user name, site short name, or invite ID URL request parameters            -->
+   <!-- (at least one of the above parameters must be provided)                                               -->
+   <!--                                                                                                       -->
+   
+   <bean id="webscript.org.alfresco.repository.invite.invites.get"
+         class="org.alfresco.repo.web.scripts.invite.Invites"
+         parent="webscript">
+      <property name="workflowService" ref="WorkflowService"/>
+      <property name="serviceRegistry" ref="ServiceRegistry"/>
+      <property name="siteService" ref="SiteService"/>
+      <property name="invitationService" ref="InvitationService"/>
+   </bean>
+
+   <!--                                                                                                       -->
+   <!-- Returns invite information when for a given inviteId and inviteTicket                                 -->
+   <!-- This webscript is accessible without authentication                                                   -->
+   <!--                                                                                                       -->
+   
+   <bean id="webscript.org.alfresco.repository.invite.invite-by-ticket.get"
+         class="org.alfresco.repo.web.scripts.invite.InviteByTicket"
+         parent="webscript">
+      <property name="serviceRegistry" ref="ServiceRegistry"/>
+      <property name="siteService" ref="SiteService"/>
+      <property name="invitationService" ref="InvitationService"/>
+      <property name="tenantService" ref="tenantService"/>
+   </bean>
+
+   <!--                                                                                                       -->
+   <!--  Controller for the org.alfresco.repository.site.invitation.invitation.delete webscript               -->
+   <!--  Used to cancel invitations                                                                           -->
+   <!--                                                                                                       -->
+   <bean id="webscript.org.alfresco.repository.site.invitation.invitation.delete"
+         class="org.alfresco.repo.web.scripts.invitation.InvitationDelete"
+         parent="webscript">
+      <property name="invitationService" ref="InvitationService"/>
+      <property name="siteService" ref="SiteService"/>
+   </bean>
+
+   <!--                         -->
+   <!-- Site Service REST API -->
+   <!--                         -->
+   
+   <!-- abstract site web script -->
+   <bean id="abstractSiteWebScript" parent="webscript" abstract="true">
+      <property name="siteService" ref="SiteService"/>
+      <property name="authorityService" ref="AuthorityService"/>
+   </bean>
+
+   <!-- Lists the membership of a site -->
+   <bean id="webscript.org.alfresco.repository.site.membership.memberships.get" class="org.alfresco.repo.web.scripts.site.SiteMembershipsGet" parent="abstractSiteWebScript">
+      <property name="personService" ref="PersonService"/>
+      <property name="scriptAuthorityService" ref="authorityServiceScript"/>
+   </bean>
+
+   <!-- Exports a site's contents as ACP dumps -->
+   <bean id="webscript.org.alfresco.repository.site.site-export.get" class="org.alfresco.repo.web.scripts.site.SiteExportGet" parent="webscript">
+      <property name="siteService" ref="SiteService"/>
+      <property name="mimetypeService" ref="MimetypeService"/>
+      <property name="exporterService" ref="ExporterService"/>
+      <property name="authorityService" ref="AuthorityService"/>
+      <property name="authenticationContextManager" ref="Authentication"/>
+   </bean>
+
+   
+   <!-- SiteAdmin only: Lists the sites (paged) -->
+   <bean id="webscript.org.alfresco.repository.site.site-admin-sites.get" class="org.alfresco.repo.web.scripts.site.SiteAdminSitesGet" parent="webscript">
+      <property name="siteService" ref="SiteService"/>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="personService" ref="PersonService"/>
+   </bean>
+
+
+   <!--                                 -->
+   <!-- Node/Document Library REST APIs -->
+   <!--                                 -->
+   
+   <bean id="webscript.org.alfresco.repository.node.folder.post" class="org.alfresco.repo.web.scripts.node.NodeFolderPost" parent="webscript">
+      <property name="nodeService" ref="NodeService"/>
+      <property name="siteService" ref="SiteService"/>
+      <property name="namespaceService" ref="NamespaceService"/>
+      <property name="dictionaryService" ref="DictionaryService"/>
+   </bean>
+
+
+   <!--                         -->
+   <!-- Person Service REST API -->
+   <!--                         -->
+
+   <bean id="webscript.org.alfresco.repository.person.user-csv-upload.get"
+	class="org.alfresco.repo.web.scripts.person.UserCSVUploadGet" parent="declarativeSpreadsheetWebScript">
+      <property name="dictionaryService" ref="DictionaryService"/>
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.person.user-csv-upload.post"
+         class="org.alfresco.repo.web.scripts.person.UserCSVUploadPost"
+         parent="webscript">
+      <property name="authenticationService" ref="AuthenticationService" />
+      <property name="authorityService" ref="AuthorityService" />
+      <property name="personService" ref="PersonService" />
+      <property name="tenantService" ref="tenantService" />
+      <property name="dictionaryService" ref="DictionaryService"/>
+      <property name="transactionHelper" ref="web.retryingTransactionHelper" />
+   </bean>
+   
+   <!--                                                                                                       -->
+   <!-- changepassword.post Web Script - updates a user password                                              -->
+   <!--                                                                                                       -->
+   
+   <bean id="webscript.org.alfresco.repository.person.changepassword.post"
+         class="org.alfresco.repo.web.scripts.person.ChangePasswordPost"
+         parent="webscript">
+      <property name="authenticationService" ref="AuthenticationService" />
+      <property name="authorityService" ref="AuthorityService" />
+   </bean>
+
+
+   <!--  Switch on debugger by setting log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger to DEBUG -->
+   <bean id="rhinoScriptDebugger" class="org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger" init-method="start"/>
+   
+   
+   <!-- JMX Admin Dump - as ZIP file content -->
+   <bean id="webscript.org.alfresco.repository.admin.jmxdump.get" class="org.alfresco.repo.web.scripts.content.StreamJMXDump" parent="webscript">
+      <property name="MBeanServer" ref="alfrescoMBeanServer" />
+   </bean>
+   
+   
+   <!--                             -->
+   <!-- DICTIONARY Service REST API -->
+   <!--                             -->
+   
+   <bean id="webscript.dictionary" abstract="true" parent="webscript">
+      <property name="dictionaryService" ref="DictionaryService"/>
+      <property name="namespaceService" ref="NamespaceService"/>
+   </bean>
+   
+   <!-- api with separated prefixes and names -->
+   <bean id="webscript.org.alfresco.repository.dictionary.prefixed.classes.get" class="org.alfresco.repo.web.scripts.dictionary.prefixed.ClassesGet" parent="webscript.dictionary"/>
+   <bean id="webscript.org.alfresco.repository.dictionary.prefixed.class.get" class="org.alfresco.repo.web.scripts.dictionary.prefixed.ClassGet" parent="webscript.dictionary"/>
+   <bean id="webscript.org.alfresco.repository.dictionary.prefixed.subclasses.get" class="org.alfresco.repo.web.scripts.dictionary.prefixed.SubClassesGet" parent="webscript.dictionary"/>
+   <bean id="webscript.org.alfresco.repository.dictionary.prefixed.property.get" class="org.alfresco.repo.web.scripts.dictionary.prefixed.PropertyGet" parent="webscript.dictionary"/>
+   <bean id="webscript.org.alfresco.repository.dictionary.prefixed.properties.get" class="org.alfresco.repo.web.scripts.dictionary.prefixed.PropertiesGet" parent="webscript.dictionary"/>
+   <bean id="webscript.org.alfresco.repository.dictionary.prefixed.association.get" class="org.alfresco.repo.web.scripts.dictionary.prefixed.AssociationGet" parent="webscript.dictionary"/>
+   <bean id="webscript.org.alfresco.repository.dictionary.prefixed.associations.get" class="org.alfresco.repo.web.scripts.dictionary.prefixed.AssociationsGet" parent="webscript.dictionary"/>
+   
+   <bean id="webscript.org.alfresco.repository.dictionary.classes.get" class="org.alfresco.repo.web.scripts.dictionary.ClassesGet" parent="webscript.dictionary"/>
+   <bean id="webscript.org.alfresco.repository.dictionary.class.get" class="org.alfresco.repo.web.scripts.dictionary.ClassGet" parent="webscript.dictionary"/>
+   <bean id="webscript.org.alfresco.repository.dictionary.subclasses.get" class="org.alfresco.repo.web.scripts.dictionary.SubClassesGet" parent="webscript.dictionary"/>
+   <bean id="webscript.org.alfresco.repository.dictionary.property.get" class="org.alfresco.repo.web.scripts.dictionary.PropertyGet" parent="webscript.dictionary"/>
+   <bean id="webscript.org.alfresco.repository.dictionary.properties.get" class="org.alfresco.repo.web.scripts.dictionary.PropertiesGet" parent="webscript.dictionary"/>
+   <bean id="webscript.org.alfresco.repository.dictionary.association.get" class="org.alfresco.repo.web.scripts.dictionary.AssociationGet" parent="webscript.dictionary"/>
+   <bean id="webscript.org.alfresco.repository.dictionary.associations.get" class="org.alfresco.repo.web.scripts.dictionary.AssociationsGet" parent="webscript.dictionary"/>
+   
+   <bean id="webscript.org.alfresco.repository.dictionary.dictionary.get" class="org.alfresco.repo.web.scripts.dictionary.DictionaryGet" parent="webscript.dictionary">
+      <property name="ignoreNamespaces">
+         <set>
+            <value>http://www.alfresco.org/model/dictionary/1.0</value>
+            <value>http://www.alfresco.org/model/rendition/1.0</value>
+            <value>http://www.alfresco.org/model/versionstore/1.0</value>
+            <value>http://www.alfresco.org/model/versionstore/2.0</value>
+            <value>http://www.jcp.org/jcr/1.0</value>
+         </set>
+      </property>
+   </bean>
+    
+    
+    <!-- GET IMAP SERVER STATUS -->
+    <bean id="webscript.org.alfresco.repository.imap.imap-enabled.get" class="org.alfresco.repo.imap.scripts.ServerStatusWebScript" parent="webscript"/>
+    
+    <!--  Comment API supporting bean -->
+    <bean id="commentServiceScript" parent="baseJavaScriptExtension" class="org.alfresco.repo.web.scripts.comment.ScriptCommentService">
+        <property name="extensionName">
+            <value>commentService</value>
+        </property>
+        <property name="serviceRegistry" ref="ServiceRegistry" />
+        <property name="behaviourFilter" ref="policyBehaviourFilter" />
+    </bean>
+    
+
+    <!--                                   -->
+    <!--      Rule Service REST API        -->
+    <!--                                   -->
+    
+    <!-- abstract rule web script -->
+    <bean id="abstractRuleWebScript" class="org.alfresco.repo.web.scripts.rule.AbstractRuleWebScript" parent="webscript" abstract="true">
+        <property name="nodeService" ref="NodeService"/>
+        <property name="ruleService" ref="RuleService"/>      
+        <property name="actionService" ref="ActionService"/>
+        <property name="dictionaryService" ref="DictionaryService"/>
+        <property name="fileFolderService" ref="FileFolderService"/>
+        <property name="namespaceService" ref="NamespaceService" />
+    </bean>
+   
+    <!-- Basic web scripts -->
+    <bean id="webscript.org.alfresco.repository.rule.ruletypes.get" class="org.alfresco.repo.web.scripts.rule.RuleTypesGet" parent="abstractRuleWebScript">              
+    </bean>
+   
+    <bean id="webscript.org.alfresco.repository.rule.actiondefinitions.get" class="org.alfresco.repo.web.scripts.rule.ActionDefinitionsGet" parent="abstractRuleWebScript">              
+    </bean>
+    
+    <bean id="webscript.org.alfresco.repository.rule.actionconditiondefinitions.get" class="org.alfresco.repo.web.scripts.rule.ActionConditionDefinitionsGet" parent="abstractRuleWebScript">              
+    </bean>
+   
+    <!-- delete rule web script -->
+    <bean id="webscript.org.alfresco.repository.rule.rule.delete" class="org.alfresco.repo.web.scripts.rule.RuleDelete" parent="abstractRuleWebScript">              
+    </bean>
+    
+    <!-- get rule details web script -->
+    <bean id="webscript.org.alfresco.repository.rule.rule.get" class="org.alfresco.repo.web.scripts.rule.RuleGet" parent="abstractRuleWebScript">              
+    </bean>
+    
+    <!-- create rule web script -->
+    <bean id="webscript.org.alfresco.repository.rule.rule.post" class="org.alfresco.repo.web.scripts.rule.RulePost" parent="abstractRuleWebScript">              
+    </bean>
+    
+    <!-- update rule web script -->
+    <bean id="webscript.org.alfresco.repository.rule.rule.put" class="org.alfresco.repo.web.scripts.rule.RulePut" parent="abstractRuleWebScript">              
+    </bean>
+   
+    <!-- get all owned rules for node web script -->
+    <bean id="webscript.org.alfresco.repository.rule.rules.get" class="org.alfresco.repo.web.scripts.rule.RulesGet" parent="abstractRuleWebScript">              
+    </bean>
+
+    <!-- get all inherited rules for node web script -->
+    <bean id="webscript.org.alfresco.repository.rule.inheritedrules.get" class="org.alfresco.repo.web.scripts.rule.InheritedRulesGet" parent="abstractRuleWebScript">              
+    </bean>
+    
+    <!-- get ruleset for node web script -->
+    <bean id="webscript.org.alfresco.repository.rule.ruleset.get" class="org.alfresco.repo.web.scripts.rule.RulesetGet" parent="abstractRuleWebScript">              
+    </bean>
+    
+    <!-- get action constraints collection -->
+    <bean id="webscript.org.alfresco.repository.rule.actionConstraints.get" class="org.alfresco.repo.web.scripts.rule.ActionConstraintsGet" parent="abstractRuleWebScript">              
+    </bean>
+    
+    <!-- get specified action constraint -->
+    <bean id="webscript.org.alfresco.repository.rule.actionConstraint.get" class="org.alfresco.repo.web.scripts.rule.ActionConstraintGet" parent="abstractRuleWebScript">              
+    </bean>
+    
+    <!-- adds a new action to the execution queue. -->
+    <bean id="webscript.org.alfresco.repository.rule.actionQueue.post" class="org.alfresco.repo.web.scripts.rule.ActionQueuePost" parent="abstractRuleWebScript">
+    </bean>
+    
+    <!--                                   -->
+    <!--      Transfer Service REST API    -->
+    <!--                                   -->
+    
+    <bean id="webscript.org.alfresco.repository.transfer.transfer.post" class="org.alfresco.repo.web.scripts.transfer.TransferWebScript" parent="webscript" >
+        <property name="enabled"><value>${transferservice.receiver.enabled}</value></property>
+        <property name="commandProcessors">
+            <map>
+                <entry key="test">
+                    <bean class="org.alfresco.repo.web.scripts.transfer.TestCredentialsCommandProcessor" />
+                </entry>
+                <entry key="begin">
+                    <bean class="org.alfresco.repo.web.scripts.transfer.BeginTransferCommandProcessor">
+                        <property name="receiver" ref="transferReceiver" />
+                    </bean>
+                </entry>
+                <entry key="post-snapshot">
+                    <bean class="org.alfresco.repo.web.scripts.transfer.PostSnapshotCommandProcessor">
+                        <property name="receiver" ref="transferReceiver" />
+                    </bean>
+                </entry>
+                <entry key="post-content">
+                    <bean class="org.alfresco.repo.web.scripts.transfer.PostContentCommandProcessor">
+                        <property name="receiver" ref="transferReceiver" />
+                    </bean>
+                </entry>
+                <entry key="prepare">
+                   <bean class="org.alfresco.repo.web.scripts.transfer.PrepareTransferCommandProcessor">
+                      <property name="receiver" ref="transferReceiver" />
+                   </bean>
+                </entry>
+                <entry key="commit">
+                   <bean class="org.alfresco.repo.web.scripts.transfer.CommitTransferCommandProcessor">
+                      <property name="receiver" ref="transferReceiver" />
+                   </bean>
+                </entry>
+                <entry key="abort">
+                   <bean class="org.alfresco.repo.web.scripts.transfer.AbortTransferCommandProcessor">
+                      <property name="receiver" ref="transferReceiver" />
+                   </bean>
+                </entry>
+               <entry key="messages">
+                   <bean class="org.alfresco.repo.web.scripts.transfer.MessagesTransferCommandProcessor">
+                      <property name="receiver" ref="transferReceiver" />
+                   </bean>
+                </entry>
+               <entry key="status">
+                   <bean class="org.alfresco.repo.web.scripts.transfer.StatusCommandProcessor">
+                      <property name="receiver" ref="transferReceiver" />
+                   </bean>
+                </entry>
+                <entry key="report">
+                    <bean class="org.alfresco.repo.web.scripts.transfer.ReportCommandProcessor">
+                        <property name="receiver" ref="transferReceiver" />
+                    </bean>
+                </entry>
+            </map>
+        </property>
+    </bean>
+
+    <!--                                     -->
+    <!--      Rating Service REST API        -->
+    <!--                                     -->
+    
+    <!-- abstract rating web script -->
+    <bean id="abstractRatingWebScript"
+          class="org.alfresco.repo.web.scripts.rating.AbstractRatingWebScript"
+          parent="webscript" abstract="true">
+        <property name="nodeService" ref="NodeService"/>
+        <property name="ratingService" ref="RatingService"/>
+    </bean>
+   
+    <!-- Basic web scripts -->
+    <bean id="webscript.org.alfresco.repository.rating.ratings.get"
+          class="org.alfresco.repo.web.scripts.rating.RatingsGet"
+          parent="abstractRatingWebScript">
+    </bean>
+
+    <bean id="webscript.org.alfresco.repository.rating.rating.post"
+          class="org.alfresco.repo.web.scripts.rating.RatingPost"
+          parent="abstractRatingWebScript">
+    </bean>
+    
+    <bean id="webscript.org.alfresco.repository.rating.rating.delete"
+          class="org.alfresco.repo.web.scripts.rating.RatingDelete"
+          parent="abstractRatingWebScript">
+    </bean>
+    
+    <bean id="webscript.org.alfresco.repository.rating.ratingdefinitions.get"
+          class="org.alfresco.repo.web.scripts.rating.RatingDefinitionsGet"
+          parent="abstractRatingWebScript">
+    </bean>
+    
+    <!--                                     -->
+    <!--    Node Archive Service REST API    -->
+    <!--  (for management of deleted items)  -->
+    <!--                                     -->
+    
+    <!-- abstract node archive web script -->
+    <bean id="baseArchivedNodeWebScript"
+          class="org.alfresco.repo.web.scripts.archive.AbstractArchivedNodeWebScript"
+          parent="webscript" abstract="true">
+        <property name="serviceRegistry" ref="ServiceRegistry"/>
+        <!-- The nodeArchiveService (small 'n') wraps the NodeService (big 'N') and adds
+             archive/deletion-related services. There is no NodeArchiveService (big 'N'). -->
+        <property name="nodeArchiveService" ref="nodeArchiveService"/>
+        <property name="maxSizeView"><value>${trashcan.MaxSize}</value></property>
+    </bean>
+   
+    <bean id="webscript.org.alfresco.repository.archive.archivednodes.get"
+          class="org.alfresco.repo.web.scripts.archive.ArchivedNodesGet"
+          parent="baseArchivedNodeWebScript">
+          
+          <!-- For Swift, we might add a filter that selects archivednodes based on the user that deleted them -->
+          <!-- Follow the pattern below, replacing this code. -->
+          <!--
+          <property name="archivedNodeFilters">
+              <list>
+                  <bean class="org.alfresco.repo.web.scripts.archive.NodeTypeFilter">
+                      <property name="namespaceService" ref="namespaceService"/>
+                      <property name="nodeService" ref="nodeService"/>
+                      <property name="excludedTypes">
+                          <list><value>cm:thumbnail</value></list>
+                      </property>
+                  </bean>
+              </list>
+          </property>
+          -->
+    </bean>
+    
+    <bean id="webscript.org.alfresco.repository.archive.archivednode.put"
+          class="org.alfresco.repo.web.scripts.archive.ArchivedNodePut"
+          parent="baseArchivedNodeWebScript">
+    </bean>
+    
+    <bean id="webscript.org.alfresco.repository.archive.archivednodes.delete"
+          class="org.alfresco.repo.web.scripts.archive.ArchivedNodesDelete"
+          parent="baseArchivedNodeWebScript">
+    </bean>
+    
+    
+    <!--                              -->
+    <!--      BlogService REST API    -->
+    <!--                              -->
+    <import resource="blogs/web-scripts-blog-context.xml"/>
+    
+    
+    <!--                                   -->
+    <!--      Workflow Service REST API    -->
+    <!--                                   -->
+
+    <!-- abstract workflow web script -->
+    <bean id="abstractWorkflowWebScript"
+          class="org.alfresco.repo.web.scripts.workflow.AbstractWorkflowWebscript"
+          parent="webscript" abstract="true">
+        <property name="namespaceService" ref="NamespaceService" />
+        <property name="nodeService" ref="NodeService" />
+        <property name="personService" ref="PersonService" />
+        <property name="dictionaryService" ref="DictionaryService" />
+        <property name="authenticationService" ref="AuthenticationService" />
+        <property name="authorityService" ref="AuthorityService" />
+        <property name="workflowService" ref="WorkflowService" />
+    </bean>
+
+    <!-- Lists the task instances, filtered by task owner and state. -->
+    <bean id="webscript.org.alfresco.repository.workflow.task-instances.get"
+          class="org.alfresco.repo.web.scripts.workflow.TaskInstancesGet"
+          parent="abstractWorkflowWebScript">
+    </bean>
+
+    <!-- Gets the details of a task -->
+    <bean id="webscript.org.alfresco.repository.workflow.task-instance.get"
+          class="org.alfresco.repo.web.scripts.workflow.TaskInstanceGet"
+          parent="abstractWorkflowWebScript"></bean>
+
+    <!-- Updates the details of a task -->
+    <bean id="webscript.org.alfresco.repository.workflow.task-instance.put"
+          class="org.alfresco.repo.web.scripts.workflow.TaskInstancePut"
+          parent="abstractWorkflowWebScript"></bean>
+
+    <!-- Lists all workflow definitions -->
+    <bean id="webscript.org.alfresco.repository.workflow.workflow-definitions.get"
+          class="org.alfresco.repo.web.scripts.workflow.WorkflowDefinitionsGet"
+          parent="abstractWorkflowWebScript"></bean>
+          
+    <!-- Retrieves a specific workflow definition -->
+    <bean id="webscript.org.alfresco.repository.workflow.workflow-definition.get"
+          class="org.alfresco.repo.web.scripts.workflow.WorkflowDefinitionGet"
+          parent="abstractWorkflowWebScript"></bean>
+
+    <!-- Retrieves a specific workflow instance, optionally with all the tasks. -->
+    <bean id="webscript.org.alfresco.repository.workflow.workflow-instance.get"
+          class="org.alfresco.repo.web.scripts.workflow.WorkflowInstanceGet"
+          parent="abstractWorkflowWebScript"></bean>
+          
+    <!-- Retrieves the diagram for a specific workflow instance -->
+    <bean id="webscript.org.alfresco.repository.workflow.workflow-instance-diagram.get"
+          class="org.alfresco.repo.web.scripts.workflow.WorkflowInstanceDiagramGet"
+          parent="webscript">
+       <property name="mimetypeService" ref="MimetypeService" />
+       <property name="workflowService" ref="WorkflowService" />
+       <property name="delegate" ref="webscript.content.streamer" />
+    </bean>
+
+    <!-- Retrieves all workflow instances. -->
+    <bean id="webscript.org.alfresco.repository.workflow.workflow-instances.get"
+          class="org.alfresco.repo.web.scripts.workflow.WorkflowInstancesGet"
+          parent="abstractWorkflowWebScript"></bean>
+
+    <!-- Retrieves all active workflow instances that the given node is part of. -->
+    <bean id="webscript.org.alfresco.repository.workflow.workflow-instances-for-node.get"
+          class="org.alfresco.repo.web.scripts.workflow.WorkflowInstancesForNodeGet"
+          parent="abstractWorkflowWebScript"></bean>
+          
+    <!-- Either cancels or deletes the specified workflow instance. -->
+    <bean id="webscript.org.alfresco.repository.workflow.workflow-instance.delete"
+          class="org.alfresco.repo.web.scripts.workflow.WorkflowInstanceDelete"
+          parent="abstractWorkflowWebScript"></bean>
+
+    <!--                                   -->
+    <!--      Audit Service REST API    -->
+    <!--                                   -->
+
+    <!-- abstract audit web script -->
+    <bean id="abstractAuditWebScript" parent="webscript" abstract="true">
+        <property name="auditService" ref="AuditService" />
+    </bean>
+
+    <!-- Gets the current audit state (enabled/disabled) for an application and path -->
+    <bean id="webscript.org.alfresco.repository.audit.control.get"
+          class="org.alfresco.repo.web.scripts.audit.AuditControlGet"
+          parent="abstractAuditWebScript">
+    </bean>
+
+    <!-- Change audit state (enabled/disabled) for an application and path -->
+    <bean id="webscript.org.alfresco.repository.audit.control.post"
+          class="org.alfresco.repo.web.scripts.audit.AuditControlPost"
+          parent="abstractAuditWebScript">
+    </bean>
+
+    <!-- Clear audit entries for an application (between from and to times) -->
+    <bean id="webscript.org.alfresco.repository.audit.clear.post"
+          class="org.alfresco.repo.web.scripts.audit.AuditClearPost"
+          parent="abstractAuditWebScript">
+    </bean>
+    
+    <!-- Delete audit entries -->
+    <bean id="webscript.org.alfresco.repository.audit.entry.delete"
+          class="org.alfresco.repo.web.scripts.audit.AuditEntryDelete"
+          parent="abstractAuditWebScript">
+    </bean>
+
+    <!-- Query for audit entries for an application (time ranges, id ranges, user, forward/reverse, limit) -->
+    <bean id="webscript.org.alfresco.repository.audit.query.get"
+          class="org.alfresco.repo.web.scripts.audit.AuditQueryGet"
+          parent="abstractAuditWebScript">
+    </bean>
+
+    <!--                                   -->
+    <!--      Admin Service REST API    -->
+    <!--                                   -->
+
+    <!-- abstract admin web script -->
+    <bean id="abstractAdminWebScript" parent="webscript" abstract="true">
+        <property name="repoAdminService" ref="RepoAdminService" />
+        <property name="descriptorService" ref="DescriptorService" />
+    </bean>
+
+    <!-- Gets the current usage restrictions -->
+    <bean id="webscript.org.alfresco.repository.admin.restrictions.get"
+          class="org.alfresco.repo.web.scripts.admin.RepoRestrictionsGet"
+          parent="abstractAdminWebScript">
+    </bean>
+
+    <!-- Gets the current usage -->
+    <bean id="webscript.org.alfresco.repository.admin.usage.get"
+          class="org.alfresco.repo.web.scripts.admin.RepoUsageGet"
+          parent="abstractAdminWebScript">
+    </bean>
+
+    <!-- Gets the current usage -->
+    <bean id="webscript.org.alfresco.repository.admin.usage.post"
+          class="org.alfresco.repo.web.scripts.admin.RepoUsagePost"
+          parent="abstractAdminWebScript">
+    </bean>
+
+    <!--                                      -->
+    <!--      Replication Service REST API    -->
+    <!--                                      -->
+
+    <!-- Gets high-level status information about the replication service -->
+    <bean id="webscript.org.alfresco.repository.replication.replication-service-status.get"
+          class="org.alfresco.repo.web.scripts.replication.ReplicationServiceStatusGet"
+          parent="webscript">
+        <property name="replicationService" ref="ReplicationService" />
+    </bean>
+
+    <!-- abstract replication web script -->
+    <bean id="abstractReplicationWebScript"
+          class="org.alfresco.repo.web.scripts.replication.AbstractReplicationWebscript"
+          parent="webscript" abstract="true">
+        <property name="nodeService" ref="NodeService"/>
+        <property name="replicationService" ref="ReplicationService" />
+        <property name="actionTrackingService" ref="actionTrackingService" />
+    </bean>
+
+    <!-- Lists the replication definitions -->
+    <bean id="webscript.org.alfresco.repository.replication.replication-definitions.get"
+          class="org.alfresco.repo.web.scripts.replication.ReplicationDefinitionsGet"
+          parent="abstractReplicationWebScript">
+    </bean>
+
+    <!-- Creates a new replication definition -->
+    <bean id="webscript.org.alfresco.repository.replication.replication-definitions.post"
+          class="org.alfresco.repo.web.scripts.replication.ReplicationDefinitionsPost"
+          parent="abstractReplicationWebScript">
+    </bean>
+
+    <!-- Get the details of a replication definition -->
+    <bean id="webscript.org.alfresco.repository.replication.replication-definition.get"
+          class="org.alfresco.repo.web.scripts.replication.ReplicationDefinitionGet"
+          parent="abstractReplicationWebScript">
+    </bean>
+
+    <!-- Updates a replication definition -->
+    <bean id="webscript.org.alfresco.repository.replication.replication-definition.put"
+          class="org.alfresco.repo.web.scripts.replication.ReplicationDefinitionPut"
+          parent="abstractReplicationWebScript">
+    </bean>
+
+    <!-- Deletes a replication definition -->
+    <bean id="webscript.org.alfresco.repository.replication.replication-definition.delete"
+          class="org.alfresco.repo.web.scripts.replication.ReplicationDefinitionDelete"
+          parent="abstractReplicationWebScript">
+    </bean>
+
+
+    <!--                                    -->
+    <!--      Running Actions REST API      -->
+    <!--                                    -->
+
+    <!-- abstract action web script -->
+    <bean id="abstractActionWebScript"
+          class="org.alfresco.repo.web.scripts.action.AbstractActionWebscript"
+          parent="webscript" abstract="true">
+        <property name="nodeService" ref="NodeService"/>
+        <property name="actionService" ref="ActionService"/>
+        <property name="runtimeActionService" ref="actionService"/>
+        <property name="actionTrackingService" ref="actionTrackingService" />
+    </bean>
+
+    <!-- abstract start execution action web script -->
+    <bean id="abstractExecuteActionWebScript"
+          class="org.alfresco.repo.web.scripts.action.AbstractExecuteActionWebscript"
+          parent="abstractActionWebScript" abstract="true">
+    </bean>
+
+    <!-- Gets the details of a running action -->
+    <bean id="webscript.org.alfresco.repository.action.running-action.get"
+          class="org.alfresco.repo.web.scripts.action.RunningActionGet"
+          parent="abstractActionWebScript">
+    </bean>
+
+    <!-- Cancels a running action -->
+    <bean id="webscript.org.alfresco.repository.action.running-action.delete"
+          class="org.alfresco.repo.web.scripts.action.RunningActionDelete"
+          parent="abstractActionWebScript">
+    </bean>
+
+    <!-- Lists the running actions -->
+    <bean id="webscript.org.alfresco.repository.action.running-actions.get"
+          class="org.alfresco.repo.web.scripts.action.RunningActionsGet"
+          parent="abstractActionWebScript">
+    </bean>
+
+    <!-- Lists the running replication actions -->
+    <bean id="webscript.org.alfresco.repository.action.running-replication-actions.get"
+          class="org.alfresco.repo.web.scripts.action.RunningReplicationActionsGet"
+          parent="abstractActionWebScript">
+        <property name="replicationService" ref="ReplicationService" />
+    </bean>
+
+    <!-- Starts a new action running -->
+    <bean id="webscript.org.alfresco.repository.action.running-actions.post"
+          class="org.alfresco.repo.web.scripts.action.RunningActionsPost"
+          parent="abstractExecuteActionWebScript">
+    </bean>
+
+    <!-- Starts a new replication action running -->
+    <bean id="webscript.org.alfresco.repository.action.running-replication-actions.post"
+          class="org.alfresco.repo.web.scripts.action.RunningReplicationActionsPost"
+          parent="abstractExecuteActionWebScript">
+        <property name="replicationService" ref="ReplicationService" />
+    </bean>
+
+   <!--                                                                                                       -->
+   <!-- SOLR                                                                                                  -->
+   <!--                                                                                                       -->
+   <!--                                                                                                       -->
+   
+   <bean id="solrSerializer" class="org.alfresco.repo.web.scripts.solr.SOLRSerializer" init-method="init">
+      <property name="dictionaryService" ref="dictionaryService"/>
+      <property name="namespaceService" ref="namespaceService"/>
+   </bean>
+
+   <bean id="webscript.org.alfresco.repository.solr.aclChangeSets.get"
+         class="org.alfresco.repo.web.scripts.solr.AclChangeSetsGet"
+         parent="webscript">
+      <property name="solrTrackingComponent" ref="solrTrackingComponent"/>
+   </bean>
+
+   <bean id="webscript.org.alfresco.repository.solr.acls.post"
+         class="org.alfresco.repo.web.scripts.solr.AclsGet"
+         parent="webscript">
+      <property name="solrTrackingComponent" ref="solrTrackingComponent"/>
+   </bean>
+
+   <bean id="webscript.org.alfresco.repository.solr.acls.get"
+         parent="webscript.org.alfresco.repository.solr.acls.post" />
+
+   <bean id="webscript.org.alfresco.repository.solr.aclsReaders.post"
+         class="org.alfresco.repo.web.scripts.solr.AclsReadersGet"
+         parent="webscript">
+      <property name="solrTrackingComponent" ref="solrTrackingComponent"/>
+   </bean>
+
+   <bean id="webscript.org.alfresco.repository.solr.aclsReaders.get" 
+         parent="webscript.org.alfresco.repository.solr.aclsReaders.post" />
+
+   <bean id="webscript.org.alfresco.repository.solr.transactions.get"
+         class="org.alfresco.repo.web.scripts.solr.TransactionsGet"
+         parent="webscript">
+      <property name="solrTrackingComponent" ref="solrTrackingComponent"/>
+   </bean>
+
+   <bean id="webscript.org.alfresco.repository.solr.stats.get"
+         class="org.alfresco.repo.web.scripts.solr.StatsGet" parent="webscript">
+      <property name="stats" ref="statsService"/>
+      <property name="siteService" ref="SiteService" />
+      <property name="statsField">
+         <value>content.size</value>
+      </property>
+      <property name="facets">
+          <map>
+            <entry key="content.mimetype" value="{http://www.alfresco.org/model/content/1.0}content.mimetype" />
+            <entry key="content.creator" value="{http://www.alfresco.org/model/content/1.0}creator.__" />
+            <entry key="content.modifier" value="{http://www.alfresco.org/model/content/1.0}modifier.__" />
+            <entry key="content.created.datetime" value="{http://www.alfresco.org/model/content/1.0}created" />
+            <entry key="content.modified.datetime" value="{http://www.alfresco.org/model/content/1.0}modified" />     
+            <entry key="content.encoding" value="{http://www.alfresco.org/model/content/1.0}content.encoding" />
+            <entry key="content.locale" value="{http://www.alfresco.org/model/content/1.0}content.locale" />
+            <entry key="content.versionLabel" value="{http://www.alfresco.org/model/content/1.0}versionLabel.__" />
+            
+            <entry key="exif.model" value="{http://www.alfresco.org/model/exif/1.0}model.__" />
+            <entry key="exif.manufacturer" value="{http://www.alfresco.org/model/exif/1.0}manufacturer.__" />
+            <entry key="exif.iso" value="{http://www.alfresco.org/model/exif/1.0}isoSpeedRatings.__" />
+            <entry key="exif.focalLength" value="{http://www.alfresco.org/model/exif/1.0}focalLength" />
+            <entry key="exif.software" value="{http://www.alfresco.org/model/exif/1.0}software.__" />
+          </map>
+      </property>     
+      <property name="postProcessors">
+         <map>
+           <entry key="content.mimetype">
+              <bean class="org.alfresco.service.cmr.search.StatsProcessorUsingMap">
+                 <constructor-arg value="#{MimetypeService.getDisplaysByMimetype()}" />
+              </bean>
+           </entry>
+        </map>
+      </property>  
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.solr.nodes.post"
+         class="org.alfresco.repo.web.scripts.solr.NodesGet"
+         parent="webscript">
+      <property name="solrTrackingComponent" ref="solrTrackingComponent"/>
+      <property name="tenantService" ref="tenantService"/>
+      <property name="qnameDAO" ref="qnameDAO"/>
+   </bean>
+
+   <bean id="webscript.org.alfresco.repository.solr.nodesMetaData.post"
+         class="org.alfresco.repo.web.scripts.solr.NodesMetaDataGet"
+         parent="webscript">
+      <property name="solrTrackingComponent" ref="solrTrackingComponent"/>
+      <property name="solrSerializer" ref="solrSerializer"/>
+   </bean>
+
+   <bean id="webscript.org.alfresco.repository.solr.nodeContent.get"
+         class="org.alfresco.repo.web.scripts.solr.NodeContentGet"
+         parent="webscript">
+      <property name="contentService" ref="contentService"/>
+      <property name="synchronousTransformClient" ref="synchronousTransformClient" />
+      <property name="nodeService" ref="nodeService"/>
+      <property name="nodeDAO" ref="nodeDAO"/>
+      <property name="delegate" ref="webscript.content.streamer" />
+   </bean>
+
+   <bean id="webscript.org.alfresco.repository.solr.model.get"
+         class="org.alfresco.repo.web.scripts.solr.AlfrescoModelGet"
+         parent="webscript">
+      <property name="solrTrackingComponent" ref="solrTrackingComponent"/>
+      <property name="namespaceService" ref="namespaceService"/>
+   </bean>
+
+   <bean id="webscript.org.alfresco.repository.solr.modelsdiff.post"
+         class="org.alfresco.repo.web.scripts.solr.AlfrescoModelsDiff"
+         parent="webscript">
+      <property name="solrTrackingComponent" ref="solrTrackingComponent"/>
+   </bean>
+   
+	<!-- /api/solr webscript returning the min txId and the max TxId in a nodeId range -->
+	<bean id="webscript.org.alfresco.repository.solr.transactionInterval.get"
+		class="org.alfresco.repo.web.scripts.solr.TransactionIntervalGet"
+		parent="webscript">
+		<property name="nodeDAO" ref="nodeDAO" />
+	</bean>
+	
+	<!-- /api/solr webscript returning the min txId in a nodeId range -->
+	<bean id="webscript.org.alfresco.repository.solr.nextTransactionCommitTime.get"
+		class="org.alfresco.repo.web.scripts.solr.NextTransactionGet"
+		parent="webscript">
+		<property name="nodeDAO" ref="nodeDAO" />
+	</bean>	
+   
+   <!--                                                                                                       -->
+   <!-- Node Locator                                                                                          -->
+   <!--                                                                                                       -->
+   <!--                                                                                                       -->
+   
+   <bean id="webscript.org.alfresco.repository.nodelocator.node-locator.get"
+         class="org.alfresco.repo.web.scripts.nodelocator.NodeLocatorGet"
+         parent="webscript">
+      <property name="nodeLocatorService" ref="nodeLocatorService"/>
+   </bean>
+
+
+   <!--                                        -->
+   <!--          Links REST API                -->
+   <!--                                        -->
+   
+   <!-- abstract links web script -->
+   <bean id="abstractLinksWebScript" parent="webscript" abstract="true">
+        <property name="nodeService" ref="NodeService"/>
+        <property name="siteService" ref="SiteService"/>
+        <property name="linksService" ref="LinksService"/>
+        <property name="personService" ref="PersonService"/>
+        <property name="activityService" ref="activityService"/>
+       <property name="protocolsWhiteList"><value>${links.protocosl.white.list}</value></property>
+       <property name="xssRegexp">
+           <list>
+               <value>.*s((\\*)|(\\[0]*)*)c((\\*)|(\\[0]*)*)r((\\*)|(\\[0]*)*)i((\\*)|(\\[0]*)*)p((\\*)|(\\[0]*)*)t((\\*)|(\\[0]*)*):.*</value>
+               <value>.*on.*\(.*\).*=.*</value>
+               <value>&lt;#{'$'}</value>
+               <value>^&lt;.*</value>
+           </list>
+       </property>
+   </bean>
+
+    <!-- Fetches the details of one link -->
+    <bean id="webscript.org.alfresco.repository.links.link.link.get"
+    class="org.alfresco.repo.web.scripts.links.LinkGet"
+    parent="abstractLinksWebScript">
+   </bean>
+
+    <!-- Creates a new link in the site -->
+    <bean id="webscript.org.alfresco.repository.links.links.post"
+    class="org.alfresco.repo.web.scripts.links.LinksPost"
+    parent="abstractLinksWebScript">
+   </bean>
+
+    <!-- Updates the details of one link -->
+    <bean id="webscript.org.alfresco.repository.links.links.put"
+    class="org.alfresco.repo.web.scripts.links.LinkPut"
+    parent="abstractLinksWebScript">
+   </bean>
+   
+   <!-- Deletes a single link -->
+   <bean id="webscript.org.alfresco.repository.links.link.link.delete"
+         class="org.alfresco.repo.web.scripts.links.LinkDelete"
+         parent="abstractLinksWebScript">
+   </bean>
+   
+   <!-- Lists the Links for a site -->
+   <bean id="webscript.org.alfresco.repository.links.links.get"
+         class="org.alfresco.repo.web.scripts.links.LinksListGet"
+         parent="abstractLinksWebScript">
+   </bean>
+
+   <!-- Deletes multiple links  in a site -->
+   <bean id="webscript.org.alfresco.repository.links.links-delete.post"
+         class="org.alfresco.repo.web.scripts.links.LinksDeletePost"
+         parent="abstractLinksWebScript">
+   </bean>
+   
+   <!--                                        -->
+   <!--      Discussions Pages REST API        -->
+   <!--                                        -->
+   
+   <!-- abstract discussions web script -->
+   <bean id="abstractDiscussionWebScript" parent="webscript" abstract="true">
+        <property name="nodeService" ref="NodeService"/>
+        <property name="siteService" ref="SiteService"/>
+        <property name="personService" ref="PersonService"/>
+        <property name="activityService" ref="activityService"/>
+        <property name="discussionService" ref="DiscussionService"/>
+        <property name="permissionService" ref="PermissionService" />
+   </bean>
+
+   <!-- Fetches the details of one discussions post or topic -->
+   <bean id="webscript.org.alfresco.repository.discussions.posts.forum-post.get"
+         class="org.alfresco.repo.web.scripts.discussion.ForumPostGet"
+         parent="abstractDiscussionWebScript">
+   </bean>
+   
+   <!-- Updates a discussions post or topic -->
+   <bean id="webscript.org.alfresco.repository.discussions.posts.forum-post.put"
+         class="org.alfresco.repo.web.scripts.discussion.ForumPostPut"
+         parent="abstractDiscussionWebScript">
+   </bean>
+   
+   <!-- Deletes a discussion post or topic -->
+   <bean id="webscript.org.alfresco.repository.discussions.posts.forum-post.delete"
+         class="org.alfresco.repo.web.scripts.discussion.ForumPostDelete"
+         parent="abstractDiscussionWebScript">
+   </bean>
+   
+   <!-- Creates a new discussions reply post for a topic -->
+   <bean id="webscript.org.alfresco.repository.discussions.posts.forum-post-replies.post"
+         class="org.alfresco.repo.web.scripts.discussion.ForumPostRepliesPost"
+         parent="abstractDiscussionWebScript">
+   </bean>
+   
+   <!-- Lists the discussions replies for a topic or post -->
+   <bean id="webscript.org.alfresco.repository.discussions.posts.forum-post-replies.get"
+         class="org.alfresco.repo.web.scripts.discussion.ForumPostRepliesGet"
+         parent="abstractDiscussionWebScript">
+   </bean>
+
+   <!-- Creates a new discussions topic and primary post -->
+   <bean id="webscript.org.alfresco.repository.discussions.forum.forum-posts.post"
+         class="org.alfresco.repo.web.scripts.discussion.ForumTopicPost"
+         parent="abstractDiscussionWebScript">
+   </bean>
+   
+   
+   <!-- Lists the discussion topics for a site -->
+   <bean id="webscript.org.alfresco.repository.discussions.forum.forum-posts.get"
+         class="org.alfresco.repo.web.scripts.discussion.ForumTopicsGet"
+         parent="abstractDiscussionWebScript">
+   </bean>
+   
+   <!-- Lists the discussion topics for the user of a site -->
+   <bean id="webscript.org.alfresco.repository.discussions.forum.forum-posts-mine.get"
+         class="org.alfresco.repo.web.scripts.discussion.ForumTopicsMineGet"
+         parent="abstractDiscussionWebScript">
+   </bean>
+   
+   <!-- Lists the recent discussion topics for a site -->
+   <bean id="webscript.org.alfresco.repository.discussions.forum.forum-posts-new.get"
+         class="org.alfresco.repo.web.scripts.discussion.ForumTopicsRecentGet"
+         parent="abstractDiscussionWebScript">
+   </bean>
+   
+   <!-- Lists the discussion topics with recent replies for a site -->
+   <bean id="webscript.org.alfresco.repository.discussions.forum.forum-posts-hot.get"
+         class="org.alfresco.repo.web.scripts.discussion.ForumTopicsHotGet"
+         parent="abstractDiscussionWebScript">
+   </bean>
+   
+   <!-- Lists the discussion topics matching filters -->
+   <bean id="webscript.org.alfresco.repository.discussions.forum.forum-posts-filtered.get"
+         class="org.alfresco.repo.web.scripts.discussion.ForumTopicsFilteredGet"
+         parent="abstractDiscussionWebScript">
+      <property name="nodeService" ref="NodeService" />
+      <property name="searchService" ref="SearchService" />
+   </bean>
+   
+   <!--                                        -->
+   <!--      Slingshot Calendar REST API       -->
+   <!--                                        -->
+   
+   <!-- abstract calendar web script -->
+   <bean id="abstractCalendarWebScript" parent="webscript" abstract="true">
+        <property name="nodeService" ref="NodeService"/>
+        <property name="siteService" ref="SiteService"/>
+        <property name="activityService" ref="activityService"/>
+        <property name="calendarService" ref="CalendarService"/>
+   </bean>
+
+   <!-- Fetches the details of one Calendar Event -->
+   <bean id="webscript.org.alfresco.slingshot.calendar.event.get"
+         class="org.alfresco.repo.web.scripts.calendar.CalendarEntryGet"
+         parent="abstractCalendarWebScript">
+      <property name="permissionService" ref="PermissionService" />
+   </bean>
+
+   <!-- Creates a new Calendar Event from the site calendar -->
+   <bean id="webscript.org.alfresco.slingshot.calendar.event.post"
+         class="org.alfresco.repo.web.scripts.calendar.CalendarEntryPost"
+         parent="abstractCalendarWebScript">
+   </bean>
+
+   <!-- Edits an existing Calendar Event from the site calendar -->
+   <bean id="webscript.org.alfresco.slingshot.calendar.event.put"
+         class="org.alfresco.repo.web.scripts.calendar.CalendarEntryPut"
+         parent="abstractCalendarWebScript">
+   </bean>
+
+   <!-- Removes a Calendar Event from the site calendar -->
+   <bean id="webscript.org.alfresco.slingshot.calendar.event.delete"
+         class="org.alfresco.repo.web.scripts.calendar.CalendarEntryDelete"
+         parent="abstractCalendarWebScript">
+   </bean>
+   
+   <!-- Lists the Calendar Events for a site calendar -->
+   <bean id="webscript.org.alfresco.slingshot.calendar.eventList.get"
+         class="org.alfresco.repo.web.scripts.calendar.CalendarEntriesListGet"
+         parent="abstractCalendarWebScript">
+   </bean>
+   
+   <!-- Lists the Calendar Events for a user -->
+   <bean id="webscript.org.alfresco.slingshot.calendar.userevents.get"
+         class="org.alfresco.repo.web.scripts.calendar.UserCalendarEntriesGet"
+         parent="abstractCalendarWebScript">
+       <property name="permissionService" ref="PermissionService" />
+   </bean>
+
+  <!-- Java-backed Web Scripts for the bulk filesystem importer -->
+  
+  <!-- work only with the default contentStore. -->
+  <bean id="streamingStoreMapProvider" class="org.alfresco.repo.bulkimport.impl.stores.DefaultContentStoreMapProvider">
+    <property name="contentStore">
+      <ref bean="fileContentStore" />
+    </property>
+    <property name="defaultStoreName"  value="default" />
+  </bean>
+
+  <!-- Custom javascript root object that interfaces to batch import. -->  
+  <bean id="bfsiScript" parent="baseJavaScriptExtension" class="org.alfresco.repo.bulkimport.script.BulkImport">
+       <property name="extensionName"    value="bulkFSImport" />
+       <property name="storeMapProvider" ref="streamingStoreMapProvider" />
+  </bean>
+  
+  <bean id="bfsiAbstractImportWebscript"
+        class="org.alfresco.repo.web.scripts.bulkimport.AbstractBulkFileSystemImportWebScript"
+        parent="webscript" abstract="true">
+       <property name="fileFolderService" ref="fileFolderService" />
+       <property name="repository"        ref="repositoryHelper" />
+  </bean>
+
+  <!-- content streaming -->
+  <bean id="webscript.org.alfresco.repository.bulkfilesystemimport.initiate.post"
+        class="org.alfresco.repo.web.scripts.bulkimport.copy.BulkFilesystemImportWebScript"
+        parent="bfsiAbstractImportWebscript">
+       <property name="bulkImporter"         ref="bulkFilesystemImporter" />
+       <property name="nodeImporterFactory"  ref="streamingNodeImporterFactory" />
+  </bean>
+
+  <!-- status -->
+  <bean id="webscript.org.alfresco.repository.bulkfilesystemimport.status.get"
+        class="org.alfresco.repo.web.scripts.bulkimport.BulkFilesystemImportStatusWebScript"
+        parent="webscript">
+       <property name="bulkImporter" ref="bulkFilesystemImporter" />
+       <property name="descriptorService" ref="descriptorComponent" />
+  </bean>
+
+  <!-- i18n bundles for the templates -->
+  <bean id="bfsi.i18n.bundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
+    <property name="resourceBundles">
+      <list>
+        <value>alfresco.messages.ui-inplace</value>
+        <value>alfresco.messages.initiate-inplace</value>
+      </list>
+    </property>
+  </bean>
+
+    <!--                              -->
+    <!--      CommentService REST API    -->
+    <!--                              -->
+    <!-- abstract comment web script -->
+    <!-- class="org.alfresco.repo.web.scripts.comments.AbstractCommentsWebScript" -->
+    <bean id="abstractCommentsWebScript" parent="webscript" abstract="true">
+        <property name="serviceRegistry" ref="ServiceRegistry"/>
+        <property name="behaviourFilter" ref="policyBehaviourFilter" />
+        <property name="activityService" ref="activityService"/>
+    </bean>
+
+    <bean id="webscript.org.alfresco.repository.comments.comment.delete"
+        class="org.alfresco.repo.web.scripts.comments.CommentDelete"
+        parent="abstractCommentsWebScript">
+    </bean>
+
+    <bean id="webscript.org.alfresco.repository.comments.comments.post"
+        class="org.alfresco.repo.web.scripts.comments.CommentsPost"
+        parent="abstractCommentsWebScript">
+    </bean>
+
+   <!--                                                                                                       -->
+   <!-- Multi-Tenant Admin                                                                                    -->
+   <!--                                                                                                       -->
+   <!--                                                                                                       -->
+   
+   <bean id="abstractTenantAdminWebScript" parent="webscript" abstract="true">
+        <property name="tenantAdminService" ref="tenantAdminService"/>
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.tenant.tenants.get"
+         class="org.alfresco.repo.web.scripts.tenant.TenantsGet"
+         parent="abstractTenantAdminWebScript">
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.tenant.tenants.post"
+         class="org.alfresco.repo.web.scripts.tenant.TenantPost"
+         parent="abstractTenantAdminWebScript">
+   </bean>
+   
+   <bean id="webscript.org.alfresco.repository.tenant.tenants.delete"
+         class="org.alfresco.repo.web.scripts.tenant.TenantDelete"
+         parent="abstractTenantAdminWebScript">
+   </bean>
+
+    <!-- BEGIN: QuickShare (aka PublicView) -->
+    
+    <!-- unauthenticated (note: equivalent to authenticated "content.get") -->
+    <bean id="webscript.org.alfresco.repository.quickshare.content-noauth.get" class="org.alfresco.repo.web.scripts.quickshare.QuickShareContentGet" parent="webscript">
+        <property name="namespaceService" ref="NamespaceService" />
+        <property name="permissionService" ref="PermissionService" />
+        <property name="nodeService" ref="NodeService" />
+        <property name="mimetypeService" ref="MimetypeService" />
+        <property name="quickShareService" ref="QuickShareService"/>
+        <property name="enabled" value="${system.quickshare.enabled}" />
+        <property name="delegate" ref="webscript.content.streamer" />
+        <property name="contentService" ref="ContentService" />
+    </bean>
+    
+    <!-- unauthenticated (note: equivalent to authenticated "thumbnail.get") -->
+    <bean id="webscript.org.alfresco.repository.quickshare.content-thumbnail-noauth.get" class="org.alfresco.repo.web.scripts.quickshare.QuickShareThumbnailContentGet" parent="webscript.org.alfresco.repository.quickshare.content-noauth.get">
+        <property name="thumbnailService" ref="ThumbnailService" />
+        <property name="scriptThumbnailService" ref="thumbnailServiceScript" />
+        <property name="serviceRegistry" ref="ServiceRegistry"/>
+        <property name="delegate" ref="webscript.content.streamer" />
+    </bean>
+    
+    <bean id="org.alfresco.repository.quickshare.abstract" class="org.alfresco.repo.web.scripts.quickshare.AbstractQuickShareContent" abstract="true">
+        <property name="quickShareService" ref="QuickShareService" />
+        <property name="enabled" value="${system.quickshare.enabled}" />
+    </bean>
+    
+    <bean id="webscript.org.alfresco.repository.quickshare.enabled-noauth.get" class="org.alfresco.repo.web.scripts.quickshare.QuickShareEnabledGet" parent="org.alfresco.repository.quickshare.abstract">
+    </bean>
+    
+    <!-- unauthenticated (note: equivalent to authenticated "metadata.get" (limited version with thumbnail data - see below) -->
+    <bean id="webscript.org.alfresco.repository.quickshare.metadata-noauth.get" class="org.alfresco.repo.web.scripts.quickshare.QuickShareMetaDataGet" parent="org.alfresco.repository.quickshare.abstract">
+    </bean>
+    
+    <!-- authenticated -->
+    <bean id="webscript.org.alfresco.repository.quickshare.metadata.get" class="org.alfresco.repo.web.scripts.quickshare.MetaDataGet" parent="org.alfresco.repository.quickshare.abstract">
+    </bean>
+    
+    <!-- authenticated -->
+    <bean id="webscript.org.alfresco.repository.quickshare.share.post" class="org.alfresco.repo.web.scripts.quickshare.ShareContentPost" parent="org.alfresco.repository.quickshare.abstract">
+    </bean>
+    
+    <!-- authenticated -->
+    <bean id="webscript.org.alfresco.repository.quickshare.share.get" class="org.alfresco.repo.web.scripts.quickshare.ShareContentGet" parent="org.alfresco.repository.quickshare.abstract">
+        <property name="siteService" ref="SiteService" />
+    </bean>
+    
+    <!-- authenticated -->
+    <bean id="webscript.org.alfresco.repository.quickshare.unshare.delete" class="org.alfresco.repo.web.scripts.quickshare.UnshareContentDelete" parent="org.alfresco.repository.quickshare.abstract">
+        <property name="nodeService" ref="NodeService"/>
+    </bean>
+    
+    <!-- authenticated -->
+    <bean id="webscript.org.alfresco.repository.quickshare.read.get" class="org.alfresco.repo.web.scripts.quickshare.ReadGet" parent="org.alfresco.repository.quickshare.abstract">
+    </bean>
+
+    <!-- END: QuickShare (aka PublicView) -->
+
+    <!-- BEGIN: Download -->
+
+    <bean id="org.alfresco.repository.download.abstract" class="org.alfresco.repo.web.scripts.download.AbstractDownloadWebscript" abstract="true">
+        <property name="downloadService" ref="DownloadService"/>   
+    </bean>
+
+    <!-- authenticated -->
+    <bean id="webscript.org.alfresco.repository.download.downloads.post" 
+          class="org.alfresco.repo.web.scripts.download.DownloadPost"
+          parent="org.alfresco.repository.download.abstract"> 
+    </bean>
+    
+    <bean id="webscript.org.alfresco.repository.download.download.delete" 
+          class="org.alfresco.repo.web.scripts.download.DownloadDelete"
+          parent="org.alfresco.repository.download.abstract"> 
+        <property name="nodeService" ref="NodeService"/>   
+    </bean>
+
+    <bean id="webscript.org.alfresco.repository.download.downloadStatus.get" 
+          class="org.alfresco.repo.web.scripts.download.DownloadStatusGet"
+          parent="org.alfresco.repository.download.abstract"> 
+        <property name="nodeService" ref="NodeService"/>   
+    </bean>
+    <!-- END: Download -->
+    
+    <!-- IE Specific set of API Formats -->
+    <bean id="webscripts.formats.IE" parent="webscripts.formatmap">
+       <property name="agent"><value>MSIE</value></property>
+       <property name="formats">
+          <props>
+             <prop key="atom">text/xml</prop>
+             <prop key="atomentry">text/xml</prop>
+             <prop key="atomfeed">text/xml</prop>
+             <prop key="rss">application/rss+xml</prop>
+             <prop key="opensearchdescription">text/xml</prop>
+          </props>
+       </property>
+    </bean>
+
+	<bean id="declarativeSpreadsheetWebScript" class="org.alfresco.repo.web.scripts.DeclarativeSpreadsheetWebScript" abstract="true" parent="webscript">
+	</bean>
+
+    <!-- Get/Post/Put/Delete Solr FacetConfig -->
+   <bean id="baseSolrFacetConfigAdminWebscript" abstract="true" parent="webscript">
+      <property name="facetService" ref="solrFacetService"/>
+      <property name="namespaceService" ref="namespaceService"/>
+   </bean>
+   <bean
+      id="webscript.org.alfresco.repository.facet.facetable-properties.get"
+      class="org.alfresco.repo.web.scripts.facet.FacetablePropertiesGet"
+      parent="baseSolrFacetConfigAdminWebscript">
+      <property name="namespaceService" ref="namespaceService" />
+   </bean>
+   <bean
+      id="webscript.org.alfresco.repository.facet.solr-facet-config-admin.get"
+      class="org.alfresco.repo.web.scripts.facet.SolrFacetConfigAdminGet"
+      parent="baseSolrFacetConfigAdminWebscript">
+   </bean>
+   <bean
+      id="webscript.org.alfresco.repository.facet.solr-facet-config-admin.delete"
+      class="org.alfresco.repo.web.scripts.facet.SolrFacetConfigAdminDelete"
+      parent="baseSolrFacetConfigAdminWebscript">
+   </bean>
+   <bean
+      id="webscript.org.alfresco.repository.facet.solr-facet-config-admin.post"
+      class="org.alfresco.repo.web.scripts.facet.SolrFacetConfigAdminPost"
+      parent="baseSolrFacetConfigAdminWebscript">
+   </bean>
+   <bean
+      id="webscript.org.alfresco.repository.facet.solr-facet-config-admin.put"
+      class="org.alfresco.repo.web.scripts.facet.SolrFacetConfigAdminPut"
+      parent="baseSolrFacetConfigAdminWebscript">
+   </bean>
+
+    <!-- FileFolderLoader API -->
+    <bean id="webscript.org.alfresco.repository.model.filefolder.load.post" class="org.alfresco.repo.web.scripts.model.filefolder.FileFolderLoaderPost" parent="webscript"/>
+    
+   <!-- JavaScript extensions -->
+   <!-- Extend the utils class to provide additional Remote APIs -->
+   <bean id="utilsScript" parent="baseJavaScriptExtension" class="org.alfresco.web.scripts.WebScriptUtils">
+      <property name="extensionName">
+         <value>utils</value>
+      </property>
+      <property name="serviceRegistry">
+         <ref bean="ServiceRegistry" />
+      </property>
+      <property name="nodeService" ref="nodeService"/>
+      <property name="repositoryContainer">
+         <ref bean="webscripts.container" />
+      </property>
+   </bean>
+   
+   <!-- Repository Admin Console messages -->
+   <bean id="communityAdminConsoleResourceBundle" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
+      <property name="resourceBundles">
+         <list>
+            <value>alfresco.messages.admin-console</value>
+         </list>
+      </property>
+   </bean>
+   
+   <!-- Repository Admin Console Node Browser -->
+   <bean id="webscript.org.alfresco.repository.admin.support-tools.admin-nodebrowser.post"
+         class="org.alfresco.repo.web.scripts.admin.NodeBrowserPost"
+         parent="webscript">
+      <property name="nodeService" ref="NodeService" />
+      <property name="dictionaryService" ref="DictionaryService" />
+      <property name="searchService" ref="SearchService" />
+      <property name="namespaceService" ref="NamespaceService" />
+      <property name="permissionService" ref="PermissionService" />
+      <property name="ownableService" ref="OwnableService" />
+      <property name="transactionService" ref="transactionService" />
+      <property name="lockService" ref="LockService" />
+      <property name="checkOutCheckInService" ref="CheckoutCheckinService" />
+   </bean>
+   
+   <!-- Repository Admin Console script extensions -->
+   <bean id="scriptRepoInterpreter" parent="baseJavaScriptExtension" class="org.alfresco.repo.web.scripts.admin.DynamicInterpreterExtension">
+      <property name="extensionName">
+         <value>repoInterpreter</value>
+      </property>
+      <property name="interpreter">
+         <ref bean="repoAdminInterpreter" />
+      </property>
+   </bean>
+   <bean id="scriptTenantInterpreter" parent="baseJavaScriptExtension" class="org.alfresco.repo.web.scripts.admin.DynamicInterpreterExtension">
+      <property name="extensionName">
+         <value>tenantInterpreter</value>
+      </property>
+      <property name="interpreter">
+         <ref bean="tenantInterpreter" />
+      </property>
+   </bean>
+   <bean id="scriptWorkflowInterpreter" parent="baseJavaScriptExtension" class="org.alfresco.repo.web.scripts.admin.DynamicInterpreterExtension">
+      <property name="extensionName">
+         <value>workflowInterpreter</value>
+      </property>
+      <property name="interpreter">
+         <ref bean="workflowInterpreter" />
+      </property>
+   </bean>
+
+   <bean id="webscript.org.alfresco.repository.doclink.doclink.post"
+          class="org.alfresco.repo.web.scripts.doclink.DocLinkPost"
+          parent="webscript">
+        <property name="nodeService" ref="NodeService" />
+        <property name="siteService" ref="SiteService" />
+        <property name="documentLinkService" ref="DocumentLinkService" />
+        <property name="activityService" ref="activityService"/>
+        <property name="serviceRegistry" ref="ServiceRegistry"/>
+   </bean>
+
+   <bean id="webscript.org.alfresco.repository.doclink.doclinks.delete"
+          class="org.alfresco.repo.web.scripts.doclink.DocLinksDelete"
+          parent="webscript">
+        <property name="nodeService" ref="NodeService" />
+        <property name="siteService" ref="SiteService" />
+        <property name="documentLinkService" ref="DocumentLinkService" />
+        <property name="activityService" ref="activityService"/>
+   </bean>
+
+   <!-- CMM - Custom model import API -->
+   <bean id="webscript.org.alfresco.repository.custommodel.cmm-upload.post"
+         class="org.alfresco.repo.web.scripts.custommodel.CustomModelUploadPost"
+         parent="webscript">
+        <property name="customModels" ref="CustomModels" />
+        <property name="customModelService" ref="customModelService" />
+   </bean>
+</beans>
diff --git a/remote-api/src/main/resources/alfresco/web-scripts-config.xml b/remote-api/src/main/resources/alfresco/web-scripts-config.xml
new file mode 100644
index 00000000000..2697bfddb03
--- /dev/null
+++ b/remote-api/src/main/resources/alfresco/web-scripts-config.xml
@@ -0,0 +1,67 @@
+<!--                        -->
+<!--  Web API Configuration -->
+<!--                        -->
+
+<alfresco-config>
+
+   <plug-ins>
+      <element-readers>
+         <element-reader element-name="opensearch" class="org.alfresco.repo.web.scripts.config.OpenSearchElementReader"/>
+      </element-readers>
+   </plug-ins>
+   
+
+   <!--                                   -->
+   <!--  Configuration of Open Search API -->
+   <!--                                   -->
+
+   <config evaluator="string-compare" condition="OpenSearch">
+      <opensearch>
+      
+         <engines>
+         
+            <!--                            -->
+            <!--  Local Alfresco Repository -->
+            <!--                            -->
+         
+            <engine label-id="current_repo" label="Alfresco Keyword Search">
+               <url type="application/opensearchdescription+xml">
+                  /api/search/keyword/description.xml
+               </url>
+               <url type="application/atom+xml">
+                  /api/search/keyword.atom?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
+               </url>
+               <url type="application/rss+xml">
+                  /api/search/keyword.rss?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
+               </url>
+               <url type="text/html">
+                  /api/search/keyword?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
+               </url>
+            </engine>
+
+            <engine label-id="current_repo_people" label="Alfresco Person Search">
+               <url type="application/opensearchdescription+xml">
+                  /api/search/person/description.xml
+               </url>
+               <url type="application/atom+xml">
+                  /api/search/person.atom?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
+               </url>
+               <url type="application/rss+xml">
+                  /api/search/person.rss?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
+               </url>
+               <url type="text/html">
+                  /api/search/person?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
+               </url>
+            </engine>
+
+         </engines>
+         
+         <proxy>
+            <!--  URL of Search Engine proxy -->
+            <url>/api/search/engine</url>
+         </proxy>
+         
+      </opensearch>
+   </config>
+   
+</alfresco-config>
diff --git a/remote-api/src/main/wsdl/Alfresco-CMISWS-Service.wsdl b/remote-api/src/main/wsdl/Alfresco-CMISWS-Service.wsdl
new file mode 100644
index 00000000000..b74037d0cef
--- /dev/null
+++ b/remote-api/src/main/wsdl/Alfresco-CMISWS-Service.wsdl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns:alf="http://www.alfresco.org" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://schemas.xmlsoap.org/soap/encoding/" targetNamespace="http://www.alfresco.org"
+    name="AlfrescoCMISWebServices">
+
+    <import namespace="http://docs.oasis-open.org/ns/cmis/ws/200908/" location="CMISWS-Service.wsdl" />
+    <import namespace="http://www.alfresco.org" location="Alfresco-Core.xsd" />
+
+</definitions>
\ No newline at end of file
diff --git a/remote-api/src/main/wsdl/Alfresco-Core.xsd b/remote-api/src/main/wsdl/Alfresco-Core.xsd
new file mode 100644
index 00000000000..de4be27d6d4
--- /dev/null
+++ b/remote-api/src/main/wsdl/Alfresco-Core.xsd
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.alfresco.org"
+    xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+    xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" jaxb:extensionBindingPrefixes="xjc" jaxb:version="2.1"
+    xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/" version="1.0">
+
+    <xs:import schemaLocation="CMIS-Core.xsd" namespace="http://docs.oasis-open.org/ns/cmis/core/200908/" />
+
+    <xs:element name="setAspects">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="aspectsToAdd" type="xs:string" />
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="aspectsToRemove" type="xs:string" />
+                <xs:element name="properties" type="cmis:cmisPropertiesType" minOccurs="0" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="aspects">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="appliedAspects" type="xs:string" />
+                <xs:element name="properties" type="cmis:cmisPropertiesType" minOccurs="0" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+</xs:schema>
\ No newline at end of file
diff --git a/remote-api/src/main/wsdl/CMIS-RestAtom.xsd b/remote-api/src/main/wsdl/CMIS-RestAtom.xsd
new file mode 100644
index 00000000000..a4c3b292406
--- /dev/null
+++ b/remote-api/src/main/wsdl/CMIS-RestAtom.xsd
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	<!--
+		$Revision: 135 $ $Date: 2009-10-19 10:59:00 -0700 (Mon, 19 Oct 2009) $
+		$Author: albertcbrown $ $HeadURL:
+		http://tools.oasis-open.org/version-control/svn/cmis/trunk/SchemaProject/schema/CMIS-RestAtom.xsd
+		$
+	-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified"
+	targetNamespace="http://docs.oasis-open.org/ns/cmis/restatom/200908/"
+	xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+	jaxb:extensionBindingPrefixes="xjc" jaxb:version="2.1"
+	xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/"
+	xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/"
+	version="1.0">
+	
+	<xs:import namespace="http://docs.oasis-open.org/ns/cmis/core/200908/"
+		schemaLocation="CMIS-Core.xsd" />
+	<xs:import namespace="http://www.w3.org/2005/Atom"
+		schemaLocation="ATOM.xsd" />
+
+
+	<xs:attribute name="id" type="xs:string">
+		<xs:annotation>
+			<xs:documentation>
+				This attribute MAY be used on XML elements that refer to a CMIS resources.  Examples are:
+				- atom:link
+				- cmis:type
+			</xs:documentation>
+		</xs:annotation>
+	</xs:attribute>
+	
+	<xs:attribute name="renditionKind" type="xs:string">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension attribute that will
+				be
+				used to specify the rendition kind of a link with relation
+				alternate if it is a CMIS Rendition.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:attribute>
+
+	<xs:element name="repositoryInfo" type="cmis:cmisRepositoryInfoType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to contain CMIS repository information
+				inside an AtomPub
+				workspace element inside an AtomPub Service document
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="collectionType" type="xs:string">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to express the CMIS collection type.
+				This is only valid inside
+				an app:collection element.
+				Valid values are in
+				enumCollectionType. If
+				the value is not in enumCollectionType, then
+				it denotes a
+				repository-specific relationship.
+				
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="type" type="cmis:cmisTypeDefinitionType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the Atom extension element that will be
+				used to contain a type definition (document, folder, relationship,
+				or policy) inside an atom entry element.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+
+	<xs:element name="children" type="atom:feedType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the Atom extension element that will be
+				used to contain a feed inside an atom entry element.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="numItems" type="xs:integer">
+		<xs:annotation>
+			<xs:documentation>
+				This is the Atom extension element that will be
+				used to express the number of items in a feed if known.
+
+				This may only
+				be used as an extension to the Feed.
+
+				Reference - numItems from Part
+				I.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:simpleType name="enumCollectionType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="root" />
+			<xs:enumeration value="unfiled" />
+			<xs:enumeration value="checkedout" />
+			<xs:enumeration value="types" />
+			<xs:enumeration value="query" />
+			<xs:enumeration value="changes" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="enumUriTemplateType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="objectbyid" />
+			<xs:enumeration value="objectbypath" />
+			<xs:enumeration value="query" />
+			<xs:enumeration value="typebyid" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="cmisUriTemplateType">
+		<xs:sequence>
+			<xs:element name="template" type="xs:string" />
+			<xs:element name="type" type="xs:string" />
+			<xs:element name="mediatype" type="xs:string" />
+			<xs:any processContents="lax" namespace="##other" minOccurs="0"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:element name="uritemplate" type="cmisra:cmisUriTemplateType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to contain CMIS URI Templates inside an AtomPub
+				workspace
+				element inside an AtomPub Service document</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+	<xs:element name="object" type="cmis:cmisObjectType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to contain a CMIS object instance inside an Atom entry element.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="pathSegment" type="xs:string">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to contain the path segment for this object in a particular
+				folder. This element MAY only be specified in an atom:entry inside
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="relativePathSegment" type="xs:string">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to contain the path segment for this object for the particular
+				folder returned in the Object Parents feed.
+				Unlike pathSegment which
+				is set on the atom entry when contained in a feed for a folder, this
+				is set on an atom entry representing a folder for a parents feed on
+				the object.
+
+				This element MAY only be specified in an atom:entry
+				representing a folder
+				inside an object parents feed.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:complexType name="cmisContentType">
+		<xs:sequence>
+			<xs:element name="mediatype" type="xs:string" />
+			<xs:element name="base64" type="xs:string" />
+			<xs:any processContents="lax" namespace="##other" minOccurs="0"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:element name="content" type="cmisra:cmisContentType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to contain the base64 content inside an atom entry.
+
+				This is used
+				to convey the content on creation or update via AtomPub as
+				an
+				alternate mechanism.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:simpleType name="enumReturnVersion">
+		<xs:annotation>
+			<xs:documentation>
+				This is an enumeration used for specifying the
+				version to return on a GET of an atom entry via URI argument.
+			</xs:documentation>
+		</xs:annotation>
+
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="this">
+				<xs:annotation>
+					<xs:documentation>
+						This is getObject service for the version specified
+			</xs:documentation>
+				</xs:annotation>
+
+			</xs:enumeration>
+			<xs:enumeration value="latest">
+				<xs:annotation>
+					<xs:documentation>
+						This is the same as major==false on
+						getObjectOfLatestVersion
+					</xs:documentation>
+				</xs:annotation>
+
+			</xs:enumeration>
+			<xs:enumeration value="latestmajor">
+				<xs:annotation>
+					<xs:documentation>
+						This is the same as major==true on
+						getObjectOfLatestVersion
+					</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+
+
+	<xs:simpleType name="enumLinkRelations">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="self" />
+			<xs:enumeration value="edit" />
+			<xs:enumeration value="edit-media" />
+			<xs:enumeration value="via" />
+			<xs:enumeration value="up" />
+			<xs:enumeration value="down" />
+			<xs:enumeration value="alternate" />
+			<xs:enumeration value="version-history" />
+			<xs:enumeration value="current-version" />
+			<xs:enumeration value="working-copy" />
+			<xs:enumeration value="service" />
+			<xs:enumeration value="describedby" />
+
+			<!--  paging -->
+			<xs:enumeration value="first" />
+			<xs:enumeration value="last" />
+			<xs:enumeration value="next" />
+			<xs:enumeration value="previous" />
+
+
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/allowableactions">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_ALLOWABLEACTIONS" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/relationships">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_RELATIONSHIPS" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/source">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_SOURCE" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/target">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_TARGET" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/policies">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_POLICIES" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+			<xs:enumeration value="http://docs.oasis-open.org/ns/cmis/link/200908/acl">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_ACL" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+
+			<!--  changes -->
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/changes">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_CHANGES" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+
+			<!--  folder tree -->
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/foldertree">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_FOLDERTREE" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+
+
+			<!--  types descendants -->
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/typedescendants">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_TYPEDESCENDANTS" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/rootdescendants">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_ROOTDESCENDANTS" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!--  CMIS Rest Arguments -->
+	<xs:simpleType name="enumArguments">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="childTypes" />
+			<xs:enumeration value="continueOnFailure" />
+			<xs:enumeration value="checkin" />
+			<xs:enumeration value="checkinComment" />
+			<xs:enumeration value="depth" />
+			<xs:enumeration value="direction" />
+			<xs:enumeration value="filter" />
+			<xs:enumeration value="folderId" />
+			<xs:enumeration value="includeACL" />
+			<xs:enumeration value="includeAllowableActions" />
+			<xs:enumeration value="includeProperties" />
+			<xs:enumeration value="includePathSegment" />
+			<xs:enumeration value="includeRelativePathSegment" />
+			<xs:enumeration value="includePropertyDefinitions" />
+			<xs:enumeration value="includePolicyIds" />
+			<xs:enumeration value="includeRelationships" />
+			<xs:enumeration value="includeSubRelationshipTypes" />
+			<xs:enumeration value="length" />
+			<xs:enumeration value="major" />
+			<xs:enumeration value="maxItems" />
+      		<xs:enumeration value="overwriteFlag" />
+			<xs:enumeration value="removeFrom" />
+			<xs:enumeration value="relationshipDirection" />
+			<xs:enumeration value="relationshipType" />
+			<xs:enumeration value="repositoryId" />
+			<xs:enumeration value="returnVersion" />
+			<xs:enumeration value="skipCount" />
+			<xs:enumeration value="thisVersion" />
+			<xs:enumeration value="typeId" />
+			<xs:enumeration value="types" />
+			<xs:enumeration value="unfileObject" />
+			<xs:enumeration value="versioningState" />
+		</xs:restriction>
+	</xs:simpleType>
+
+
+
+</xs:schema>
+	<!-- EOF -->
\ No newline at end of file
diff --git a/remote-api/src/main/wsdl/cml.xsd b/remote-api/src/main/wsdl/cml.xsd
new file mode 100644
index 00000000000..0677acf398e
--- /dev/null
+++ b/remote-api/src/main/wsdl/cml.xsd
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://www.alfresco.org/ws/cml/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cml="http://www.alfresco.org/ws/cml/1.0" xmlns:cms="http://www.alfresco.org/ws/model/content/1.0" elementFormDefault="qualified" version="0.1">
+
+    <xsd:annotation>
+    	<xsd:documentation>
+    		Alfresco Web Services for Content Management. CML - Content Manipulation Language - Draft.
+    	</xsd:documentation>
+    </xsd:annotation>
+
+	<xsd:import namespace="http://www.alfresco.org/ws/model/content/1.0" schemaLocation="types.xsd"></xsd:import>
+
+   <xsd:complexType name="CML">
+		<xsd:sequence>
+             <xsd:annotation>
+             	<xsd:documentation>The CML statements.</xsd:documentation>
+             </xsd:annotation>
+             
+             <xsd:element name="create" maxOccurs="unbounded" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+					    <xsd:element name="id" type="xsd:string" maxOccurs="1" minOccurs="0"></xsd:element>
+						<xsd:element name="parent" type="cms:ParentReference" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+						<xsd:element name="parent_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+				        <xsd:group ref="cms:ChildAssociation" maxOccurs="1" minOccurs="0"></xsd:group>
+						<xsd:element name="type" type="cms:Name" maxOccurs="1" minOccurs="0"></xsd:element>
+						<xsd:element name="property" type="cms:NamedValue" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:element name="addAspect" maxOccurs="unbounded" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="aspect" type="cms:Name"></xsd:element>
+						<xsd:element name="property" type="cms:NamedValue" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+						<xsd:group ref="cml:Where"></xsd:group>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:element name="removeAspect" maxOccurs="unbounded" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="aspect" type="cms:Name"></xsd:element>
+						<xsd:group ref="cml:Where"></xsd:group>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:element name="update" maxOccurs="unbounded" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="property" type="cms:NamedValue" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+						<xsd:group ref="cml:Where"></xsd:group>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:element name="writeContent" maxOccurs="unbounded" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+	                  <xsd:element name="property" type="xsd:string"/>
+	                  <xsd:element name="content" type="xsd:base64Binary"/>
+	                  <xsd:element name="format" type="cms:ContentFormat"/>
+					  <xsd:group ref="cml:Where"></xsd:group>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>				
+			
+			<xsd:element name="delete" maxOccurs="unbounded" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="where" type="cms:Predicate"></xsd:element>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:element name="move" maxOccurs="unbounded" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:group ref="cml:ToParent"></xsd:group>
+						<xsd:group ref="cml:Where"></xsd:group>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:element name="copy" maxOccurs="unbounded" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:group ref="cml:ToParent"></xsd:group>
+						<xsd:group ref="cml:Where"></xsd:group>
+						<xsd:element name="children" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0"></xsd:element>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:element name="addChild" maxOccurs="unbounded" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:group ref="cml:ToParent"></xsd:group>
+						<xsd:group ref="cml:Where"></xsd:group>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:element name="removeChild" maxOccurs="unbounded" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:choice>
+							<xsd:element name="from" type="cms:Reference" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+							<xsd:element name="from_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+						</xsd:choice>
+						<xsd:group ref="cml:Where"></xsd:group>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:element name="createAssociation" maxOccurs="unbounded" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:group ref="cml:From"></xsd:group>
+						<xsd:group ref="cml:To"></xsd:group>
+						<xsd:element name="association" type="cms:Name"></xsd:element>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			
+			<xsd:element name="removeAssociation" maxOccurs="unbounded" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:group ref="cml:From"></xsd:group>
+						<xsd:group ref="cml:To"></xsd:group>
+						<xsd:element name="association" type="cms:Name"></xsd:element>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			
+		</xsd:sequence>
+	</xsd:complexType>
+		
+	<xsd:element name="cml" type="cml:CML">
+		
+		<!-- -->
+		<!-- Constraints  -->
+		<!-- -->
+
+		<xsd:unique name="NodeKey">
+			<xsd:selector xpath="create"/>
+			<xsd:field xpath="id"/> 
+		</xsd:unique>
+
+		<xsd:keyref name="WhereReference" refer="cml:NodeKey">
+			<xsd:selector xpath="*/."/>
+			<xsd:field xpath="where_id"/>
+		</xsd:keyref>
+
+		<xsd:keyref name="ToReference" refer="cml:NodeKey">
+			<xsd:selector xpath="*/."/>
+			<xsd:field xpath="to_id"/>
+		</xsd:keyref>
+
+		<xsd:keyref name="FromReference" refer="cml:NodeKey">
+			<xsd:selector xpath="*/."/>
+			<xsd:field xpath="from_id"/>
+		</xsd:keyref>
+		
+	</xsd:element>
+
+	<!-- -->
+	<!-- Common groupings for 'within-document' or 'within-repository' references -->
+	<!-- -->
+	
+	<xsd:group name="Where">
+		<xsd:choice>
+			<xsd:element name="where" type="cms:Predicate" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+			<xsd:element name="where_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+		</xsd:choice>
+	</xsd:group>
+	
+	<xsd:group name="From">
+		<xsd:choice>
+			<xsd:element name="from" type="cms:Predicate" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+			<xsd:element name="from_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+		</xsd:choice>
+	</xsd:group>
+
+	<xsd:group name="To">
+		<xsd:choice>
+			<xsd:element name="to" type="cms:Predicate" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+			<xsd:element name="to_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+		</xsd:choice>
+	</xsd:group>
+
+	<xsd:group name="ToParent">
+		<xsd:choice>
+			<xsd:element name="to" type="cms:ParentReference" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+			<xsd:sequence>
+				<xsd:element name="to_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+				<xsd:group ref="cms:ChildAssociation" maxOccurs="1" minOccurs="0"></xsd:group>
+			</xsd:sequence>
+		</xsd:choice>
+	</xsd:group>							
+
+</xsd:schema>
diff --git a/remote-api/src/main/wsdl/headers.xsd b/remote-api/src/main/wsdl/headers.xsd
new file mode 100644
index 00000000000..cb758f3a911
--- /dev/null
+++ b/remote-api/src/main/wsdl/headers.xsd
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.alfresco.org/ws/headers/1.0" xmlns:headers="http://www.alfresco.org/ws/headers/1.0" elementFormDefault="qualified" version="0.1">
+
+	<complexType name="QueryConfiguration">
+		<sequence>
+			<element name="fetchSize" type="int" default="500"></element>
+		</sequence>
+	</complexType>
+
+	<complexType name="LocaleConfiguration">
+		<sequence>
+			<element name="locale" type="string" maxOccurs="1" minOccurs="0"></element>
+		</sequence>
+	</complexType>
+	
+	<complexType name="NamespaceConfiguration">
+		<sequence>
+			<element name="mapping" maxOccurs="unbounded" minOccurs="0" type="headers:NamespaceConfigurationInner"></element>
+		</sequence>
+	</complexType>
+	
+	<complexType name="NamespaceConfigurationInner">
+	  <sequence>
+	     <element name="prefix" type="NCName"></element>
+	     <element name="uri" type="string"></element>
+     </sequence>
+	</complexType>
+
+</schema>
\ No newline at end of file
diff --git a/remote-api/src/main/wsdl/types.xsd b/remote-api/src/main/wsdl/types.xsd
new file mode 100644
index 00000000000..c43da23d0ec
--- /dev/null
+++ b/remote-api/src/main/wsdl/types.xsd
@@ -0,0 +1,303 @@
+<xsd:schema xmlns:cms="http://www.alfresco.org/ws/model/content/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.alfresco.org/ws/model/content/1.0" elementFormDefault="qualified" version="0.1">
+    <xsd:annotation>
+    	<xsd:documentation>Alfresco Web Services for Content Management. Type Definitions - Draft.</xsd:documentation>
+    </xsd:annotation>
+    
+	<!-- -->    
+	<!-- Identifier Definitions -->
+	<!-- -->
+
+	<xsd:simpleType name="Name">
+        <xsd:annotation>
+        	<xsd:documentation>TODO: Define constraints</xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+ 			<xsd:minLength value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	
+	<xsd:simpleType name="UUID">
+		<xsd:restriction base="xsd:string">
+		    <xsd:pattern value="[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="Path">
+        <xsd:annotation>
+        	<xsd:documentation>TODO: Define constraints</xsd:documentation>
+        </xsd:annotation>
+		<xsd:restriction base="xsd:string">
+			<xsd:minLength value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+    
+    <xsd:complexType name="Store">
+    	<xsd:sequence>
+    		<xsd:element name="scheme" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"/>
+    		<xsd:element name="address" type="xsd:string"  maxOccurs="1" minOccurs="0" nillable="true"/>
+    	</xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="Reference">
+    	<xsd:sequence>
+    		<xsd:element name="store" type="cms:Store"  maxOccurs="1" minOccurs="0" nillable="true" />
+    		<xsd:element maxOccurs="1" minOccurs="0" name="uuid" type="cms:UUID" nillable="true"/>
+    		<xsd:element default="/" maxOccurs="1" minOccurs="0" name="path" type="cms:Path" nillable="true"/>
+    	</xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="ParentReference">
+    	<xsd:complexContent>
+    		<xsd:extension base="cms:Reference">
+    			<xsd:group ref="cms:ChildAssociation"></xsd:group>
+   			</xsd:extension>
+    	</xsd:complexContent>
+    </xsd:complexType>
+
+	<xsd:group name="ChildAssociation">
+		<xsd:sequence>
+			<xsd:element maxOccurs="1" minOccurs="0" nillable="true" name="associationType" type="cms:Name"/>
+ 			<xsd:element maxOccurs="1" minOccurs="0" nillable="true" name="childName" type="cms:Name"/>
+		</xsd:sequence>
+	</xsd:group>
+
+	<!-- -->
+	<!-- Meta Data Definitions -->
+	<!-- -->
+	
+	<xsd:complexType name="ClassDefinition">
+		<xsd:sequence>
+			<xsd:element name="name" type="cms:Name"></xsd:element>
+			<xsd:group ref="cms:TextualDescription"></xsd:group>
+			<xsd:element name="superClass" type="cms:Name" maxOccurs="1" minOccurs="0"></xsd:element>
+			<xsd:element name="isAspect" type="xsd:boolean"></xsd:element>
+			<xsd:element name="properties" type="cms:PropertyDefinition" minOccurs="0" maxOccurs="unbounded" nillable="true"></xsd:element>
+			<xsd:element name="associations" type="cms:AssociationDefinition" minOccurs="0" maxOccurs="unbounded" nillable="true"></xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="ValueDefinition">
+		<xsd:sequence>
+			<xsd:element name="name" type="cms:Name"></xsd:element>
+			<xsd:group ref="cms:TextualDescription"></xsd:group>
+			<xsd:element name="dataType" type="cms:Name"></xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="PropertyDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="cms:ValueDefinition">
+				<xsd:sequence>
+					<xsd:element name="mandatory" type="xsd:boolean" default="false"></xsd:element>
+					<xsd:element name="readOnly" type="xsd:boolean" default="false"></xsd:element>
+					<xsd:element name="defaultValue" maxOccurs="1" minOccurs="0" type="xsd:string"></xsd:element>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:complexType name="AssociationDefinition">
+		<xsd:sequence>
+			<xsd:element name="name" type="cms:Name"></xsd:element>
+			<xsd:group ref="cms:TextualDescription"></xsd:group>
+			<xsd:element name="isChild" type="xsd:boolean" default="true"></xsd:element>
+			<xsd:element name="sourceRole" type="cms:RoleDefinition" maxOccurs="1" minOccurs="0"></xsd:element>			
+			<xsd:element name="targetRole" type="cms:RoleDefinition" maxOccurs="1" minOccurs="0"></xsd:element>
+			<xsd:element name="targetClass" type="cms:Name"></xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="RoleDefinition">
+		<xsd:sequence>
+			<xsd:element name="name" type="cms:Name" maxOccurs="1" minOccurs="0"></xsd:element>
+			<xsd:element name="cardinality" type="cms:Cardinality" default="*" maxOccurs="1" minOccurs="0"></xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="NodeDefinition">
+		<xsd:sequence>
+			<xsd:element name="type" type="cms:ClassDefinition"></xsd:element>
+			<xsd:element name="aspects" type="cms:ClassDefinition" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:group name="TextualDescription">
+		<xsd:sequence>
+			<xsd:element name="title" type="xsd:string" maxOccurs="1" minOccurs="0"/>
+			<xsd:element name="description" type="xsd:string" maxOccurs="1" minOccurs="0"/>
+		</xsd:sequence>
+	</xsd:group>
+
+	<xsd:simpleType name="Cardinality">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="0..1"></xsd:enumeration>
+			<xsd:enumeration value="1"></xsd:enumeration>
+			<xsd:enumeration value="*"></xsd:enumeration>
+			<xsd:enumeration value="1..*"></xsd:enumeration>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:group name="AnonymousType">
+		<xsd:sequence>
+			<xsd:element name="type" type="cms:Name"></xsd:element>
+			<xsd:element name="aspects" type="cms:Name" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+		</xsd:sequence>
+	</xsd:group>
+
+	<!-- -->	
+	<!-- Generic Content Definitions -->
+	<!-- -->
+	
+    <xsd:complexType name="Node">
+    	<xsd:sequence>
+    		<xsd:element name="reference" type="cms:Reference"></xsd:element>
+    		<xsd:group ref="cms:AnonymousType"/>
+    		<xsd:element name="properties" type="cms:NamedValue" minOccurs="0" maxOccurs="unbounded"></xsd:element>
+    	</xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="ContentFormat">
+    	<xsd:sequence>
+    		<xsd:element name="mimetype">
+    			<xsd:annotation>
+    				<xsd:documentation>
+    					TODO: MinOccurs = 0?
+    					TODO: Define Constraints
+    				</xsd:documentation>
+    			</xsd:annotation>
+    			<xsd:simpleType>
+			        <xsd:restriction base="xsd:string">
+			 			<xsd:minLength value="1"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+    		</xsd:element>
+    		<xsd:element name="encoding" minOccurs="0">
+    			<xsd:annotation>
+    				<xsd:documentation>
+    					TODO: MinOccurs = 0?
+    					TODO: Define Constraints
+    				</xsd:documentation>
+    			</xsd:annotation>
+    			<xsd:simpleType>
+			        <xsd:restriction base="xsd:string">
+			 			<xsd:minLength value="1"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+    		</xsd:element>
+    	</xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="NamedValue">
+    	<xsd:sequence>
+    		<xsd:element name="name" type="cms:Name"></xsd:element>
+    		<xsd:element name="isMultiValue" type="xsd:boolean" default="false"></xsd:element>
+    		<xsd:element name="value" type="xsd:string" nillable="true"></xsd:element>
+    		<xsd:element name="values" type="xsd:string" nillable="true" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+    	</xsd:sequence>
+    </xsd:complexType>
+
+	<!-- -->
+	<!-- Query Definitions -->
+	<!-- -->
+
+    <xsd:complexType name="Query">
+    	<xsd:sequence>
+    		<xsd:element name="language" type="xsd:string"/>
+    		<xsd:element name="statement" type="xsd:string"/>
+    	</xsd:sequence>
+    </xsd:complexType>
+    
+	<xsd:complexType name="ResultSet">
+		<xsd:sequence>
+			<xsd:element name="rows" type="cms:ResultSetRow" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+			<xsd:element name="totalRowCount" type="xsd:long"></xsd:element>
+			<xsd:element name="metaData" type="cms:ResultSetMetaData" maxOccurs="1" minOccurs="0"></xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="ResultSetRow">
+		<xsd:sequence>
+			<xsd:element name="rowIndex" type="xsd:long"></xsd:element>
+			<xsd:element name="columns" type="cms:NamedValue" maxOccurs="unbounded" minOccurs="0"/>
+			<xsd:element name="score" type="xsd:float" maxOccurs="1" minOccurs="0"></xsd:element>
+			<xsd:element name="node" maxOccurs="1" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="id" type="cms:UUID"></xsd:element>
+						<xsd:group ref="cms:AnonymousType"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="ResultSetMetaData">
+		<xsd:sequence>
+			<xsd:element name="valueDefs" type="cms:ValueDefinition" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+			<xsd:element name="classDefs" type="cms:ClassDefinition" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="Predicate">
+		<xsd:choice>
+			<xsd:element name="nodes" type="cms:Reference" maxOccurs="unbounded" minOccurs="0" nillable="true">
+			</xsd:element>
+			<xsd:sequence>
+				<xsd:element name="store" type="cms:Store" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+				<xsd:element name="query" type="cms:Query" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
+			</xsd:sequence>
+		</xsd:choice>
+	</xsd:complexType>
+
+	<!-- -->
+	<!-- Version Definitions -->
+	<!-- -->
+	
+	<xsd:complexType name="Version">
+		<xsd:sequence>
+			<xsd:element name="id" type="cms:Reference"></xsd:element>
+			<xsd:element name="created" type="xsd:dateTime" maxOccurs="1" minOccurs="0"></xsd:element>
+			<xsd:element name="creator" type="xsd:string" maxOccurs="1" minOccurs="0"></xsd:element>
+			<xsd:element name="label" type="xsd:string" maxOccurs="1" minOccurs="0"></xsd:element>
+			<xsd:element name="major" type="xsd:boolean" default="true"></xsd:element>
+			<xsd:element name="commentaries" type="cms:NamedValue" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="VersionHistory">
+		<xsd:sequence>
+		    <xsd:element name="marker" type="xsd:string" nillable="true"/>
+			<xsd:element name="versions" type="cms:Version" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<!-- -->
+	<!-- Classification Definitions -->
+	<!-- -->
+	
+	<xsd:complexType name="Category">
+		<xsd:sequence>
+			<xsd:element name="id" type="cms:Reference"></xsd:element>
+			<xsd:group ref="cms:TextualDescription"></xsd:group>
+		</xsd:sequence>
+	</xsd:complexType>
+	
+	<xsd:complexType name="Classification">
+		<xsd:sequence>
+		    <xsd:element name="classification" type="cms:Name"></xsd:element>
+			<xsd:element name="rootCategory" type="cms:Category"></xsd:element>
+		    <xsd:group ref="cms:TextualDescription"></xsd:group>
+		</xsd:sequence>
+	</xsd:complexType> 
+
+	<!-- <xsd:complexType name="Classification">
+		<xsd:complexContent>
+			<xsd:extension base="cms:Category">
+				<xsd:sequence>
+					<xsd:element name="rootCategory" type="cms:Category"></xsd:element>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType> -->
+
+</xsd:schema>
diff --git a/remote-api/src/main/wsdl/xml.xsd b/remote-api/src/main/wsdl/xml.xsd
new file mode 100644
index 00000000000..0f43dd4d548
--- /dev/null
+++ b/remote-api/src/main/wsdl/xml.xsd
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+	<!--
+		$Revision: 34 $
+		$Date: 2009-08-07 15:20:47 -0700 (Fri, 07 Aug 2009) $
+		$Author: albertcbrown $
+		$HeadURL: http://tools.oasis-open.org/version-control/svn/cmis/trunk/SchemaProject/schema/xml.xsd $
+	-->
+<xsd:schema 
+targetNamespace="http://www.w3.org/XML/1998/namespace" 
+xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+xml:lang="en">
+ <xsd:attribute name="lang">
+  <xsd:simpleType>
+   <xsd:union memberTypes="xsd:language">
+    <xsd:simpleType>    
+     <xsd:restriction base="xsd:string">
+      <xsd:enumeration value=""/>
+     </xsd:restriction>
+    </xsd:simpleType>
+   </xsd:union>
+  </xsd:simpleType>
+ </xsd:attribute>
+
+ <xsd:attribute name="space">
+  <xsd:simpleType>
+   <xsd:restriction base="xsd:NCName">
+    <xsd:enumeration value="default"/>
+    <xsd:enumeration value="preserve"/>
+   </xsd:restriction>
+  </xsd:simpleType>
+ </xsd:attribute>
+
+ <xsd:attribute name="base" type="xsd:anyURI">
+  <xsd:annotation>
+   <xsd:documentation>See http://www.w3.org/TR/xmlbase/ for
+                     information about this attribute.</xsd:documentation>
+  </xsd:annotation>
+ </xsd:attribute>
+ 
+ <xsd:attribute name="id" type="xsd:ID">
+  <xsd:annotation>
+   <xsd:documentation>See http://www.w3.org/TR/xml-id/ for
+                     information about this attribute.</xsd:documentation>
+  </xsd:annotation>
+ </xsd:attribute>
+
+ <xsd:attributeGroup name="specialAttrs">
+  <xsd:attribute ref="xml:base"/>
+  <xsd:attribute ref="xml:lang"/>
+  <xsd:attribute ref="xml:space"/>
+  <xsd:attribute ref="xml:id"/>
+ </xsd:attributeGroup>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/AppContext01TestSuite.java b/remote-api/src/test/java/org/alfresco/AppContext01TestSuite.java
new file mode 100644
index 00000000000..699b999070b
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/AppContext01TestSuite.java
@@ -0,0 +1,48 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco;
+
+import org.alfresco.util.testing.category.DBTests;
+import org.alfresco.util.testing.category.NonBuildTests;
+import org.junit.experimental.categories.Categories;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Categories.class)
+@Categories.ExcludeCategory({DBTests.class, NonBuildTests.class})
+@Suite.SuiteClasses({
+
+    // [classpath*:/publicapi/lucene/, classpath:alfresco/application-context.xml,
+    // classpath:alfresco/web-scripts-application-context-test.xml,
+    // classpath:alfresco/web-scripts-application-context.xml, rest-api-test-context.xml, testcmis-model-context.xml]
+    org.alfresco.rest.api.tests.TestEnterpriseAtomPubTCK.class,
+    org.alfresco.rest.api.tests.TestPublicApiAtomPub10TCK.class,
+    org.alfresco.rest.api.tests.TestPublicApiAtomPub11TCK.class,
+    org.alfresco.rest.api.tests.TestPublicApiBrowser11TCK.class,
+})
+public class AppContext01TestSuite
+{
+}
diff --git a/remote-api/src/test/java/org/alfresco/AppContext02TestSuite.java b/remote-api/src/test/java/org/alfresco/AppContext02TestSuite.java
new file mode 100644
index 00000000000..9d18221209c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/AppContext02TestSuite.java
@@ -0,0 +1,78 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco;
+
+import org.alfresco.util.testing.category.DBTests;
+import org.alfresco.util.testing.category.NonBuildTests;
+import org.junit.experimental.categories.Categories;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Categories.class)
+@Categories.ExcludeCategory({DBTests.class, NonBuildTests.class})
+@Suite.SuiteClasses({
+    // [classpath*:/publicapi/lucene/, classpath:alfresco/application-context.xml,
+    // classpath:alfresco/web-scripts-application-context-test.xml,
+    // classpath:alfresco/web-scripts-application-context.xml, rest-api-test-context.xml, testcmis-model-context.xml]
+
+    // this need to be run first
+    org.alfresco.rest.api.tests.TestCMIS.class,
+
+    org.alfresco.rest.api.tests.TestCustomModelExport.class,
+    org.alfresco.rest.DeletedNodesTest.class,
+    org.alfresco.rest.api.search.BasicSearchApiIntegrationTest.class,
+    org.alfresco.rest.api.tests.ActivitiesPostingTest.class,
+    org.alfresco.rest.api.tests.AuthenticationsTest.class,
+    org.alfresco.rest.api.tests.DiscoveryApiTest.class,
+    org.alfresco.rest.api.tests.GroupsTest.class,
+    org.alfresco.rest.api.tests.ModulePackagesApiTest.class,
+    org.alfresco.rest.api.tests.NodeApiTest.class,
+    org.alfresco.rest.api.tests.NodeAssociationsApiTest.class,
+    org.alfresco.rest.api.tests.NodeVersionsApiTest.class,
+    org.alfresco.rest.api.tests.QueriesNodesApiTest.class,
+    org.alfresco.rest.api.tests.QueriesPeopleApiTest.class,
+    org.alfresco.rest.api.tests.QueriesSitesApiTest.class,
+    org.alfresco.rest.api.tests.TestActivities.class,
+    org.alfresco.rest.api.tests.TestDownloads.class,
+    org.alfresco.rest.api.tests.TestFavouriteSites.class,
+    org.alfresco.rest.api.tests.TestFavourites.class,
+    org.alfresco.rest.api.tests.TestNetworks.class,
+    org.alfresco.rest.api.tests.TestNodeComments.class,
+    org.alfresco.rest.api.tests.TestNodeRatings.class,
+    org.alfresco.rest.api.tests.TestPersonSites.class,
+    org.alfresco.rest.api.tests.TestPublicApi128.class,
+    org.alfresco.rest.api.tests.TestPublicApiCaching.class,
+    org.alfresco.rest.api.tests.TestUserPreferences.class,
+    org.alfresco.rest.api.tests.WherePredicateApiTest.class,
+    org.alfresco.rest.api.tests.TestRemovePermissions.class, 
+    org.alfresco.rest.api.tests.TempOutputStreamTest.class,
+    org.alfresco.rest.api.tests.BufferedResponseTest.class,
+    org.alfresco.rest.workflow.api.tests.DeploymentWorkflowApiTest.class,
+    org.alfresco.rest.workflow.api.tests.ProcessDefinitionWorkflowApiTest.class,
+})
+public class AppContext02TestSuite
+{
+}
diff --git a/remote-api/src/test/java/org/alfresco/AppContext03TestSuite.java b/remote-api/src/test/java/org/alfresco/AppContext03TestSuite.java
new file mode 100644
index 00000000000..9e5088e7b25
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/AppContext03TestSuite.java
@@ -0,0 +1,59 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco;
+
+import org.alfresco.util.testing.category.DBTests;
+import org.alfresco.util.testing.category.NonBuildTests;
+import org.junit.experimental.categories.Categories;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Categories.class)
+@Categories.ExcludeCategory({DBTests.class, NonBuildTests.class})
+@Suite.SuiteClasses({
+    // [classpath*:/publicapi/lucene/, classpath:alfresco/application-context.xml,
+    // classpath:alfresco/web-scripts-application-context-test.xml,
+    // classpath:alfresco/web-scripts-application-context.xml, rest-api-test-context.xml, testcmis-model-context.xml]
+    org.alfresco.rest.workflow.api.tests.ProcessWorkflowApiTest.class,
+    org.alfresco.rest.workflow.api.tests.TaskWorkflowApiTest.class,
+    org.alfresco.rest.api.tests.TestCustomConstraint.class,
+    org.alfresco.rest.api.tests.TestCustomModel.class,
+    org.alfresco.rest.api.tests.TestCustomProperty.class,
+    org.alfresco.rest.api.tests.TestCustomTypeAspect.class,
+    org.alfresco.rest.api.tests.TestSiteContainers.class,
+    org.alfresco.rest.api.tests.TestSiteMembers.class,
+    org.alfresco.rest.api.tests.TestSiteMembershipRequests.class,
+    org.alfresco.rest.api.tests.TestSites.class,
+    org.alfresco.rest.api.tests.TestTags.class,
+    org.alfresco.rest.api.tests.SharedLinkApiTest.class,
+    org.alfresco.rest.api.tests.RenditionsTest.class,
+    org.alfresco.heatbeat.RenditionsDataCollectorTest.class,
+    org.alfresco.rest.api.tests.TestPeople.class,
+    org.alfresco.rest.api.tests.ProbeApiTest.class,
+})
+public class AppContext03TestSuite
+{
+}
diff --git a/remote-api/src/test/java/org/alfresco/AppContext04TestSuite.java b/remote-api/src/test/java/org/alfresco/AppContext04TestSuite.java
new file mode 100644
index 00000000000..9545280e769
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/AppContext04TestSuite.java
@@ -0,0 +1,87 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco;
+
+import org.alfresco.repo.web.scripts.TestWebScriptRepoServer;
+import org.alfresco.util.testing.category.DBTests;
+import org.alfresco.util.testing.category.NonBuildTests;
+import org.junit.experimental.categories.Categories;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Categories.class)
+@Categories.ExcludeCategory({DBTests.class, NonBuildTests.class})
+@Suite.SuiteClasses({
+    // [classpath:alfresco/application-context.xml, classpath:alfresco/web-scripts-application-context-test.xml,
+    // classpath:alfresco/web-scripts-application-context.xml]
+    org.alfresco.repo.web.scripts.quickshare.QuickShareRestApiTest.class,
+    org.alfresco.repo.web.scripts.admin.AdminWebScriptTest.class,
+    org.alfresco.repo.web.scripts.audit.AuditWebScriptTest.class,
+    org.alfresco.repo.web.scripts.blogs.BlogServiceTest.class,
+    org.alfresco.repo.web.scripts.dictionary.DictionaryRestApiTest.class,
+    org.alfresco.repo.web.scripts.discussion.DiscussionRestApiTest.class,
+    org.alfresco.repo.web.scripts.activities.feed.control.FeedControlTest.class,
+    org.alfresco.repo.web.scripts.forms.FormRestApiGet_Test.class,
+    org.alfresco.repo.web.scripts.forms.FormRestApiJsonPost_Test.class,
+    org.alfresco.repo.web.scripts.groups.GroupsTest.class,
+    org.alfresco.repo.web.scripts.invitation.InvitationWebScriptTest.class,
+    org.alfresco.repo.web.scripts.invite.InviteServiceTest.class,
+    org.alfresco.repo.web.scripts.LoginTest.class,
+    org.alfresco.repo.web.scripts.search.PersonSearchTest.class,
+    org.alfresco.repo.web.scripts.person.PersonServiceTest.class,
+    org.alfresco.repo.web.scripts.preference.PreferenceServiceTest.class,
+    org.alfresco.repo.web.scripts.rating.RatingRestApiTest.class,
+    org.alfresco.repo.web.scripts.replication.ReplicationRestApiTest.class,
+    org.alfresco.repo.web.scripts.RepositoryContainerTest.class,
+    org.alfresco.repo.web.scripts.rule.RuleServiceTest.class,
+    org.alfresco.repo.web.scripts.action.RunningActionRestApiTest.class,
+    org.alfresco.repo.web.scripts.site.SiteServiceTest.class,
+    org.alfresco.repo.web.scripts.tagging.TaggingServiceTest.class,
+    org.alfresco.repo.web.scripts.thumbnail.ThumbnailServiceTest.class,
+    org.alfresco.repo.web.scripts.transfer.TransferWebScriptTest.class,
+    org.alfresco.repo.web.scripts.workflow.ActivitiWorkflowRestApiTest.class,
+    org.alfresco.repo.web.scripts.solr.SOLRWebScriptTest.class,
+    org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceRestApiTest.class,
+    org.alfresco.repo.web.scripts.facet.FacetRestApiTest.class,
+    org.alfresco.repo.web.scripts.comment.CommentsApiTest.class,
+    org.alfresco.repo.web.scripts.content.ContentGetTest.class,
+    org.alfresco.repo.web.scripts.XssVulnerabilityTest.class,
+    org.alfresco.repo.web.scripts.links.LinksRestApiTest.class,
+    org.alfresco.repo.model.filefolder.RemoteFileFolderLoaderTest.class,
+    org.alfresco.repo.web.scripts.ReadOnlyTransactionInGetRestApiTest.class,
+    org.alfresco.repo.web.scripts.custommodel.CustomModelImportTest.class,
+    org.alfresco.repo.web.scripts.site.SurfConfigTest.class,
+    org.alfresco.repo.web.scripts.node.NodeWebScripTest.class,
+    org.alfresco.rest.api.impl.CommentsImplUnitTest.class,
+})
+public class AppContext04TestSuite
+{
+    public AppContext04TestSuite()
+    {
+        // Ensure that a suitable context is available
+        TestWebScriptRepoServer.getTestServer();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/AppContextExtraTestSuite.java b/remote-api/src/test/java/org/alfresco/AppContextExtraTestSuite.java
new file mode 100644
index 00000000000..b541224cca3
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/AppContextExtraTestSuite.java
@@ -0,0 +1,106 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco;
+
+import org.alfresco.util.testing.category.DBTests;
+import org.alfresco.util.testing.category.NonBuildTests;
+import org.junit.experimental.categories.Categories;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Categories.class)
+@Categories.ExcludeCategory({DBTests.class, NonBuildTests.class})
+@Suite.SuiteClasses({
+
+    // very fast - no context tests - true jUnit tests
+    org.alfresco.repo.web.scripts.workflow.WorkflowModelBuilderTest.class,
+    org.alfresco.repo.web.scripts.solr.StatsGetTest.class,
+    org.alfresco.repo.web.scripts.solr.SOLRSerializerTest.class,
+    org.alfresco.repo.web.util.PagingCursorTest.class,
+    org.alfresco.repo.web.util.paging.PagingTest.class,
+    org.alfresco.repo.webdav.GetMethodTest.class,
+    org.alfresco.repo.webdav.LockInfoImplTest.class,
+    org.alfresco.repo.webdav.RenameShuffleDetectionTest.class,
+    org.alfresco.repo.webdav.WebDAVHelperTest.class,
+    org.alfresco.repo.webdav.WebDAVLockServiceImplTest.class,
+    org.alfresco.rest.api.search.ResultMapperTests.class,
+    org.alfresco.rest.api.search.SearchApiWebscriptTests.class,
+    org.alfresco.rest.api.search.SearchMapperTests.class,
+    org.alfresco.rest.api.search.SearchQuerySerializerTests.class,
+    org.alfresco.rest.api.search.StoreMapperTests.class,
+    org.alfresco.rest.api.tests.ModulePackageTest.class,
+    org.alfresco.rest.framework.tests.core.InspectorTests.class,
+    org.alfresco.rest.framework.tests.core.JsonJacksonTests.class,
+    org.alfresco.rest.framework.tests.core.ParamsExtractorTests.class,
+    org.alfresco.rest.framework.tests.core.WhereTests.class,
+    org.alfresco.rest.framework.tests.core.WithResponseTest.class,
+    org.alfresco.rest.framework.tools.RecognizedParamsExtractorTest.class,
+        // add applicationContext_02_part2 as it is compatible with the rest of the tests in this test suite
+        // and because it balances the load of the build jobs
+    
+    // [classpath:alfresco/application-context.xml, classpath:alfresco/web-scripts-application-context-test.xml,
+    // classpath:alfresco/web-scripts-application-context.xml]
+    // this uses the same context set as applicationContext_02
+    // this does not want to run at the beginning or the end of the applicationContext_02
+    // these tests run very fast once the context is up
+    org.alfresco.repo.remoteticket.RemoteAlfrescoTicketServiceTest.class,
+    org.alfresco.repo.web.scripts.servlet.RemoteAuthenticatorFactoryTest.class,
+    org.alfresco.repo.web.scripts.servlet.RemoteAuthenticatorFactoryAdminConsoleAccessTest.class,
+
+    // [classpath:alfresco/application-context.xml]
+    org.alfresco.repo.webdav.GetMethodRegressionTest.class,
+    org.alfresco.repo.webdav.WebDAVHelperIntegrationTest.class,
+    org.alfresco.repo.web.scripts.person.UserCSVUploadTest.class,
+
+    // [classpath:alfresco/application-context.xml, classpath:alfresco/web-scripts-application-context.xml,
+    // classpath:alfresco/web-scripts-application-context-test.xml,
+    // classpath:alfresco/declarative-spreadsheet-webscript-application-context.xml]
+    org.alfresco.repo.web.scripts.DeclarativeSpreadsheetWebScriptTest.class,
+
+    // [classpath:alfresco/application-context.xml, classpath:alfresco/public-rest-context.xml,
+    // classpath:alfresco/web-scripts-application-context.xml]
+    org.alfresco.rest.test.workflow.api.impl.ProcessesImplTest.class,
+
+    // [classpath:alfresco/application-context.xml, classpath:alfresco/web-scripts-application-context.xml,
+    // classpath:alfresco/remote-api-context.xml]
+    org.alfresco.repo.webdav.DeleteMethodTest.class,
+    org.alfresco.repo.webdav.LockMethodTest.class,
+    org.alfresco.repo.webdav.MoveMethodTest.class,
+    org.alfresco.repo.webdav.UnlockMethodTest.class,
+    org.alfresco.repo.webdav.WebDAVMethodTest.class,
+    org.alfresco.repo.webdav.PutMethodTest.class,
+    org.alfresco.repo.webdav.WebDAVonContentUpdateTest.class,
+
+    // [classpath:test-rest-context.xml]
+    org.alfresco.rest.framework.tests.core.ExceptionResolverTests.class,
+    org.alfresco.rest.framework.tests.core.ExecutionTests.class,
+    org.alfresco.rest.framework.tests.core.ResourceLocatorTests.class,
+    org.alfresco.rest.framework.tests.core.SerializeTests.class,
+    org.alfresco.rest.framework.tests.metadata.WriterTests.class,
+})
+public class AppContextExtraTestSuite
+{
+}
diff --git a/remote-api/src/test/java/org/alfresco/heatbeat/RenditionsDataCollectorTest.java b/remote-api/src/test/java/org/alfresco/heatbeat/RenditionsDataCollectorTest.java
new file mode 100644
index 00000000000..27262419550
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/heatbeat/RenditionsDataCollectorTest.java
@@ -0,0 +1,201 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.heatbeat;
+
+import com.sun.management.OperatingSystemMXBean;
+import com.sun.management.UnixOperatingSystemMXBean;
+import org.alfresco.heartbeat.RenditionsDataCollector;
+import org.alfresco.heartbeat.datasender.HBData;
+import org.alfresco.heartbeat.jobs.HeartBeatJobScheduler;
+import org.alfresco.repo.descriptor.DescriptorDAO;
+import org.alfresco.repo.thumbnail.ThumbnailDefinition;
+import org.alfresco.service.cmr.repository.HBDataCollectorService;
+import org.alfresco.service.cmr.repository.TransformationOptions;
+import org.alfresco.service.descriptor.Descriptor;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+
+import java.lang.management.ManagementFactory;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * Test the RenditionsDataCollector collects the correct data.
+ */
+public class RenditionsDataCollectorTest
+{
+    private RenditionsDataCollector renditionsDataCollector;
+    private HBDataCollectorService mockCollectorService;
+    private DescriptorDAO mockDescriptorDAO;
+    private List<HBData> collectedData;
+    private HeartBeatJobScheduler mockScheduler;
+
+    private TransformationOptions options = new TransformationOptions();
+    private ThumbnailDefinition doclib = new ThumbnailDefinition("png", options, "doclib");
+    private ThumbnailDefinition preview = new ThumbnailDefinition("pdf", options, "preview");
+
+    @Before
+    public void setUp()
+    {
+        mockDescriptorDAO = mock(DescriptorDAO.class);
+        mockCollectorService = mock(HBDataCollectorService.class);
+        mockScheduler = mock(HeartBeatJobScheduler.class);
+
+        Descriptor mockDescriptor = mock(Descriptor.class);
+        when(mockDescriptor.getId()).thenReturn("mock_id");
+        when(mockDescriptorDAO.getDescriptor()).thenReturn(mockDescriptor);
+
+        renditionsDataCollector = new RenditionsDataCollector("acs.repository.renditions","1.0","0 0 0 ? * *", mockScheduler);
+        renditionsDataCollector.setHbDataCollectorService(mockCollectorService);
+        renditionsDataCollector.setCurrentRepoDescriptorDAO(mockDescriptorDAO);
+    }
+
+    @Test
+    public void testHBDataFields()
+    {
+        // record 2 renditions
+        renditionsDataCollector.recordRenditionRequest(preview, "docx");
+        renditionsDataCollector.recordRenditionRequest(doclib, "docx");
+        collectedData = renditionsDataCollector.collectData();
+
+        for (HBData data : this.collectedData)
+        {
+            assertNotNull(data.getCollectorId());
+            assertNotNull(data.getCollectorVersion());
+            assertNotNull(data.getSchemaVersion());
+            assertNotNull(data.getSystemId());
+            assertNotNull(data.getTimestamp());
+        }
+    }
+
+    @Test
+    public void testCollectedDataInDetail()
+    {
+        // Record an initial batch of 4 renditions
+        renditionsDataCollector.recordRenditionRequest(doclib, "xls");
+        renditionsDataCollector.recordRenditionRequest(doclib, "xls");
+        renditionsDataCollector.recordRenditionRequest(preview, "docx");
+        renditionsDataCollector.recordRenditionRequest(doclib, "docx");
+        collectedData = renditionsDataCollector.collectData();
+
+        assertEquals("There should have been 3 data elements", 3, collectedData.size());
+
+        Date firstTimestamp = null;
+        for (HBData data : collectedData)
+        {
+            if (firstTimestamp == null)
+            {
+                firstTimestamp = data.getTimestamp();
+            }
+            else
+            {
+                assertEquals("All data in a batch should have the same timestamp", firstTimestamp, data.getTimestamp());
+            }
+
+            Map<String, Object> values = data.getData();
+            assertEquals("There should have been 4 mapped values", 4, values.size());
+
+            String rendition = (String)values.get("rendition");
+            String sourceMimetype = (String)values.get("sourceMimetype");
+            String targetMimetype = (String)values.get("targetMimetype");
+            Integer count = (Integer)values.get("count");
+
+            assertNotNull(rendition);
+            assertNotNull(sourceMimetype);
+            assertNotNull(targetMimetype);
+            assertNotNull(count);
+        }
+
+        assertHBDataContains("doclib", "xls", "png", 2);
+        assertHBDataContains("doclib", "docx", "png", 1);
+        assertHBDataContains("preview", "docx", "pdf", 1);
+    }
+
+    @Test
+    public void testMultipleCollections() throws InterruptedException
+    {
+        // A batch of 0 renditions
+        collectedData = renditionsDataCollector.collectData();
+        assertEquals("There should have been 0 data elements", 0, collectedData.size());
+
+        // Record a batch of 4 renditions
+        renditionsDataCollector.recordRenditionRequest(doclib, "xls");
+        renditionsDataCollector.recordRenditionRequest(doclib, "xls");
+        renditionsDataCollector.recordRenditionRequest(preview, "docx");
+        renditionsDataCollector.recordRenditionRequest(doclib, "docx");
+        collectedData = renditionsDataCollector.collectData();
+        assertEquals("There should have been 3 data elements", 3, collectedData.size());
+        assertHBDataContains("doclib", "xls", "png", 2);
+        assertHBDataContains("doclib", "docx", "png", 1);
+        assertHBDataContains("preview", "docx", "pdf", 1);
+        Date prevTimestamp = collectedData.get(0).getTimestamp();
+        Thread.sleep(10);
+
+        // A batch of 3 renditions
+        renditionsDataCollector.recordRenditionRequest(doclib, "jpg");
+        renditionsDataCollector.recordRenditionRequest(doclib, "jpg");
+        renditionsDataCollector.recordRenditionRequest(doclib, "jpg");
+        collectedData = renditionsDataCollector.collectData();
+        assertEquals("There should have been 1 data element", 1, collectedData.size());
+        assertHBDataContains("doclib", "jpg", "png", 3);
+        assertNotEquals("The timestamp should have changed", prevTimestamp, collectedData.get(0).getTimestamp());
+
+        // A batch of 0 renditions
+        collectedData = renditionsDataCollector.collectData();
+        assertEquals("There should have been 0 data elements", 0, collectedData.size());
+        
+        // A batch of 1 rendition
+        renditionsDataCollector.recordRenditionRequest(doclib, "xls");
+        collectedData = renditionsDataCollector.collectData();
+        assertEquals("There should have been 1 data element", 1, collectedData.size());
+        assertHBDataContains("doclib", "xls", "png", 1);
+    }
+
+    private boolean assertHBDataContains(String rendition, String sourceMimetype, String targetMimetype, int count)
+    {
+        boolean found = false;
+        for (HBData data : collectedData)
+        {
+            Map<String, Object> values = data.getData();
+
+            if (rendition.equals(values.get("rendition")) &&
+                sourceMimetype.equals(values.get("sourceMimetype")) &&
+                targetMimetype.equals(values.get("targetMimetype")) &&
+                 count == ((Integer)values.get("count")).intValue())
+            {
+                found = true;
+                break;
+            }
+        }
+        return found;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/opencmis/OpenCMISClientContext.java b/remote-api/src/test/java/org/alfresco/opencmis/OpenCMISClientContext.java
new file mode 100644
index 00000000000..fa760c5b711
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/opencmis/OpenCMISClientContext.java
@@ -0,0 +1,102 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.opencmis;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.chemistry.opencmis.commons.SessionParameter;
+import org.apache.chemistry.opencmis.commons.enums.BindingType;
+import org.apache.chemistry.opencmis.tck.impl.JUnitHelper;
+import org.springframework.context.ApplicationContext;
+
+/**
+ * Encapsulates Chemistry OpenCMIS client connection details and creates a parameters file for running the
+ * TCK tests.
+ * 
+ * @author steveglover
+ *
+ */
+public class OpenCMISClientContext
+{
+	private Map<String, String> cmisParameters;
+	
+	public OpenCMISClientContext(BindingType bindingType, String url, String username, String password, Map<String, String> parameters, ApplicationContext ctx) throws IOException
+	{
+    	cmisParameters = new HashMap<String, String>();
+    	cmisParameters.putAll(parameters);
+    	cmisParameters.put(SessionParameter.BINDING_TYPE, bindingType.value());
+    	if(bindingType.equals(BindingType.ATOMPUB))
+    	{
+    		cmisParameters.put(SessionParameter.ATOMPUB_URL, url);
+    	}
+    	else if(bindingType.equals(BindingType.BROWSER))
+    	{
+    		cmisParameters.put(SessionParameter.BROWSER_URL, url);
+    	}
+    	cmisParameters.put(SessionParameter.USER, username);
+    	cmisParameters.put(SessionParameter.PASSWORD, password);
+    	
+    	if (ctx != null)
+    	{
+    		Properties properties =  (Properties)ctx.getBean("global-properties");
+        	cmisParameters.put(SessionParameter.CONNECT_TIMEOUT, properties.getProperty("opencmis.tck.connecttimeout"));
+        	cmisParameters.put(SessionParameter.READ_TIMEOUT, properties.getProperty("opencmis.tck.readtimeout"));
+    	}
+    	createCMISParametersFile();
+	}
+	
+	public OpenCMISClientContext(BindingType bindingType, String url, String username, String password, Map<String, String> parameters) throws IOException
+	{
+    	this(bindingType, url, username, password, parameters, null);
+	}
+
+	protected void createCMISParametersFile() throws IOException
+	{
+    	File f = File.createTempFile("OpenCMISTCKContext", "" + System.currentTimeMillis(), new File(System.getProperty("java.io.tmpdir")));
+    	f.deleteOnExit();
+    	FileWriter fw = new FileWriter(f);
+    	for(String key : cmisParameters.keySet())
+    	{
+    		fw.append(key);
+    		fw.append("=");
+    		fw.append(cmisParameters.get(key));
+    		fw.append("\n");
+    	}
+    	fw.close();
+    	System.setProperty(JUnitHelper.JUNIT_PARAMETERS, f.getAbsolutePath());
+    	System.out.println("CMIS client parameters file: " + f.getAbsolutePath());
+	}
+
+	public Map<String, String> getCMISParameters()
+	{
+		return cmisParameters;
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/opencmis/tck/tests/query/QueryForObjectCustom.java b/remote-api/src/test/java/org/alfresco/opencmis/tck/tests/query/QueryForObjectCustom.java
new file mode 100644
index 00000000000..200302fad5e
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/opencmis/tck/tests/query/QueryForObjectCustom.java
@@ -0,0 +1,44 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.opencmis.tck.tests.query;
+
+import org.apache.chemistry.opencmis.tck.tests.query.QueryForObject;
+
+/**
+ * Fix for MNT-14432 - skip deletion of test data
+ * 
+ * @author Andreea Dragoi
+ * @since 4.2.5
+ */
+
+public class QueryForObjectCustom extends QueryForObject
+{
+    protected void deleteTestFolder()
+    {
+        // do nothing - skip deletion of test folder
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/opencmis/tck/tests/query/QueryInFolderTestCustom.java b/remote-api/src/test/java/org/alfresco/opencmis/tck/tests/query/QueryInFolderTestCustom.java
new file mode 100644
index 00000000000..bc2e1953c85
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/opencmis/tck/tests/query/QueryInFolderTestCustom.java
@@ -0,0 +1,44 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.opencmis.tck.tests.query;
+
+import org.apache.chemistry.opencmis.tck.tests.query.QueryInFolderTest;
+
+/**
+ * Fix for MNT-14432 - skip deletion of test data
+ * 
+ * @author Andreea Dragoi
+ * @since 4.2.5
+ */
+
+public class QueryInFolderTestCustom extends QueryInFolderTest
+{
+    protected void deleteTestFolder()
+    {
+        // do nothing - skip deletion of test folder
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/opencmis/tck/tests/query/QueryLikeTestCustom.java b/remote-api/src/test/java/org/alfresco/opencmis/tck/tests/query/QueryLikeTestCustom.java
new file mode 100644
index 00000000000..3be7d1ba436
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/opencmis/tck/tests/query/QueryLikeTestCustom.java
@@ -0,0 +1,44 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.opencmis.tck.tests.query;
+
+import org.apache.chemistry.opencmis.tck.tests.query.QueryLikeTest;
+
+/**
+ * Fix for MNT-14432 - skip deletion of test data
+ * 
+ * @author Andreea Dragoi
+ * @since 4.2.5
+ */
+
+public class QueryLikeTestCustom extends QueryLikeTest
+{
+    protected void deleteTestFolder()
+    {
+        // do nothing - skip deletion of test folder
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/model/filefolder/RemoteFileFolderLoaderTest.java b/remote-api/src/test/java/org/alfresco/repo/model/filefolder/RemoteFileFolderLoaderTest.java
new file mode 100644
index 00000000000..e94c38092e3
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/model/filefolder/RemoteFileFolderLoaderTest.java
@@ -0,0 +1,259 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.model.filefolder;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.UUID;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.filestore.FileContentStore;
+import org.alfresco.repo.content.filestore.SpoofedTextContentReader;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.repo.web.scripts.model.filefolder.FileFolderLoaderPost;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.transaction.TransactionService;
+import org.json.simple.JSONObject;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Remote FileFolderLoader testing
+ * 
+ * @author Derek Hulley
+ * @since 5.1
+ */
+public class RemoteFileFolderLoaderTest  extends BaseWebScriptTest
+{
+    public static final String URL = "/api/model/filefolder/load";
+
+    private Repository repositoryHelper;
+    private NodeService nodeService;
+    private TransactionService transactionService;
+    private FileFolderService fileFolderService;
+    private String sharedHomePath;
+    private NodeRef loadHomeNodeRef;
+    private String loadHomePath;
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        this.repositoryHelper = (Repository)getServer().getApplicationContext().getBean("repositoryHelper");
+        this.nodeService = (NodeService)getServer().getApplicationContext().getBean("nodeService");
+        this.transactionService = (TransactionService) getServer().getApplicationContext().getBean("TransactionService");
+        this.fileFolderService = (FileFolderService) getServer().getApplicationContext().getBean("FileFolderService");
+
+        // Get the path of the shared folder home
+        final NodeRef companyHomeNodeRef = repositoryHelper.getCompanyHome();
+        final NodeRef sharedHomeNodeRef = repositoryHelper.getSharedHome();
+        RetryingTransactionCallback<NodeRef> createFolderWork = new RetryingTransactionCallback<NodeRef>()
+        {
+            @Override
+            public NodeRef execute() throws Throwable
+            {
+                List<FileInfo> sharedHomeFileInfos = fileFolderService.getNamePath(companyHomeNodeRef, sharedHomeNodeRef);
+                sharedHomePath = "/" + sharedHomeFileInfos.get(0).getName();
+
+                String folderName = UUID.randomUUID().toString();
+                // Create a folder
+                FileInfo folderInfo = fileFolderService.create(sharedHomeNodeRef, folderName, ContentModel.TYPE_FOLDER);
+                loadHomePath = sharedHomePath + "/" + folderName;
+                // Done
+                return folderInfo.getNodeRef();
+            }
+        };
+        AuthenticationUtil.pushAuthentication();            // Will be cleared later
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+
+        loadHomeNodeRef = transactionService.getRetryingTransactionHelper().doInTransaction(createFolderWork);
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        RetryingTransactionCallback<Void> deleteFolderWork = new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                fileFolderService.delete(loadHomeNodeRef);
+                // Done
+                return null;
+            }
+        };
+        try
+        {
+            transactionService.getRetryingTransactionHelper().doInTransaction(deleteFolderWork);
+        }
+        finally
+        {
+            AuthenticationUtil.popAuthentication();
+        }
+    }
+    
+    /**
+     * Load with no folder path
+     */
+    public void testLoad_noFolderPath() throws Exception
+    {
+        JSONObject body = new JSONObject();
+        
+        sendRequest(
+                new PostRequest(URL,  body.toString(), "application/json"),
+                Status.STATUS_BAD_REQUEST,
+                "bmarley");
+    }
+    
+    /**
+     * Load with defaults
+     */
+    @SuppressWarnings("unchecked")
+    public void testLoad_default_default() throws Exception
+    {
+        JSONObject body = new JSONObject();
+        body.put(FileFolderLoaderPost.KEY_FOLDER_PATH, loadHomePath);
+        
+        Response response = sendRequest(
+                new PostRequest(URL,  body.toString(), "application/json"),
+                Status.STATUS_OK,
+                "bmarley");
+        assertEquals("{\"count\":100}", response.getContentAsString());
+        
+        // Check file(s)
+        assertEquals(100, nodeService.countChildAssocs(loadHomeNodeRef, true));
+    }
+    
+    /**
+     * Load 15 files with default sizes
+     */
+    @SuppressWarnings("unchecked")
+    public void testLoad_15_default() throws Exception
+    {
+        JSONObject body = new JSONObject();
+        body.put(FileFolderLoaderPost.KEY_FOLDER_PATH, loadHomePath);
+        body.put(FileFolderLoaderPost.KEY_FILE_COUNT, 15);
+        body.put(FileFolderLoaderPost.KEY_FILES_PER_TXN, 10);
+        
+        Response response = null;
+        try
+        {
+            AuthenticationUtil.pushAuthentication();
+            AuthenticationUtil.setFullyAuthenticatedUser("hhoudini");
+            response = sendRequest(
+                    new PostRequest(URL,  body.toString(), "application/json"),
+                    Status.STATUS_OK,
+                    "hhoudini");
+        }
+        finally
+        {
+            AuthenticationUtil.popAuthentication();
+        }
+        assertEquals("{\"count\":15}", response.getContentAsString());
+        
+        // Check file(s)
+        assertEquals(15, nodeService.countChildAssocs(loadHomeNodeRef, true));
+        // Size should be default
+        List<FileInfo> fileInfos = fileFolderService.list(loadHomeNodeRef);
+        for (FileInfo fileInfo : fileInfos)
+        {
+            NodeRef fileNodeRef = fileInfo.getNodeRef();
+            ContentReader reader = fileFolderService.getReader(fileNodeRef);
+            // Expect spoofing by default
+            assertTrue(reader.getContentUrl().startsWith(FileContentStore.SPOOF_PROTOCOL));
+            assertTrue(
+                    "Default file size not correct: " + reader,
+                    FileFolderLoaderPost.DEFAULT_MIN_FILE_SIZE < reader.getSize() &&
+                        reader.getSize() < FileFolderLoaderPost.DEFAULT_MAX_FILE_SIZE);
+            // Check creator
+            assertEquals("hhoudini", nodeService.getProperty(fileNodeRef, ContentModel.PROP_CREATOR));
+            // We also expect the default language description to be present
+            String description = (String) nodeService.getProperty(fileNodeRef, ContentModel.PROP_DESCRIPTION);
+            assertNotNull("No description", description);
+            assertEquals("Description length incorrect: \"" + description + "\"", 128L, description.getBytes("UTF-8").length);
+        }
+    }
+
+    /**
+     * Load 15 files; 1K size; 1 document sample; force binary storage
+     */
+    @SuppressWarnings("unchecked")
+    public void testLoad_15_16bytes() throws Exception
+    {
+        JSONObject body = new JSONObject();
+        body.put(FileFolderLoaderPost.KEY_FOLDER_PATH, loadHomePath);
+        body.put(FileFolderLoaderPost.KEY_MIN_FILE_SIZE, 16L);
+        body.put(FileFolderLoaderPost.KEY_MAX_FILE_SIZE, 16L);
+        body.put(FileFolderLoaderPost.KEY_MAX_UNIQUE_DOCUMENTS, 1L);
+        body.put(FileFolderLoaderPost.KEY_FORCE_BINARY_STORAGE, Boolean.TRUE);
+        
+        Response response = null;
+        try
+        {
+            AuthenticationUtil.pushAuthentication();
+            AuthenticationUtil.setFullyAuthenticatedUser("maggi");
+            response = sendRequest(
+                    new PostRequest(URL,  body.toString(), "application/json"),
+                    Status.STATUS_OK,
+                    "maggi");
+        }
+        finally
+        {
+            AuthenticationUtil.popAuthentication();
+        }
+        assertEquals("{\"count\":100}", response.getContentAsString());
+        
+        // Check file(s)
+        assertEquals(100, nodeService.countChildAssocs(loadHomeNodeRef, true));
+        
+        // Consistent binary text
+        String contentUrlCheck = SpoofedTextContentReader.createContentUrl(Locale.ENGLISH, 0L, 16L);
+        ContentReader readerCheck = new SpoofedTextContentReader(contentUrlCheck);
+        String textCheck = readerCheck.getContentString();
+        
+        // Size should be default
+        List<FileInfo> fileInfos = fileFolderService.list(loadHomeNodeRef);
+        for (FileInfo fileInfo : fileInfos)
+        {
+            NodeRef fileNodeRef = fileInfo.getNodeRef();
+            ContentReader reader = fileFolderService.getReader(fileNodeRef);
+            // Expect storage in store
+            assertTrue(reader.getContentUrl().startsWith(FileContentStore.STORE_PROTOCOL));
+            // Check text
+            String text = reader.getContentString();
+            assertEquals("Text not the same.", textCheck, text);
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/remoteconnector/LocalWebScriptConnectorServiceImpl.java b/remote-api/src/test/java/org/alfresco/repo/remoteconnector/LocalWebScriptConnectorServiceImpl.java
new file mode 100644
index 00000000000..a6235c22317
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/remoteconnector/LocalWebScriptConnectorServiceImpl.java
@@ -0,0 +1,324 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.remoteconnector;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.sf.acegisecurity.Authentication;
+
+import org.alfresco.service.cmr.remoteconnector.RemoteConnectorClientException;
+import org.alfresco.service.cmr.remoteconnector.RemoteConnectorRequest;
+import org.alfresco.service.cmr.remoteconnector.RemoteConnectorResponse;
+import org.alfresco.service.cmr.remoteconnector.RemoteConnectorServerException;
+import org.alfresco.service.cmr.remoteconnector.RemoteConnectorService;
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.repo.web.scripts.servlet.BasicHttpAuthenticatorFactory;
+import org.alfresco.repo.web.scripts.servlet.LocalTestRunAsAuthenticatorFactory.LocalTestRunAsAuthenticator;
+import org.alfresco.repo.web.scripts.servlet.BasicHttpAuthenticatorFactory.BasicHttpAuthenticator;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.ParseException;
+import org.springframework.extensions.webscripts.Authenticator;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Request;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+import org.springframework.extensions.webscripts.servlet.ServletAuthenticatorFactory;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletResponse;
+
+/**
+ * Testing implementation of {@link RemoteConnectorService} which talks to
+ *  the local webscripts only
+ *  
+ * @author Nick Burch
+ * @since 4.0.2
+ */
+public class LocalWebScriptConnectorServiceImpl implements RemoteConnectorService
+{
+    /**
+     * The logger
+     */
+    private static Log logger = LogFactory.getLog(LocalWebScriptConnectorServiceImpl.class);
+    
+    public static final String LOCAL_BASE_URL = "http://localhost:8080/alfresco/";
+    private static final String SERVICE_URL = "/service/";
+    public static final String LOCAL_SERVICE_URL = LOCAL_BASE_URL + "service/";
+    
+    private WebScriptHelper helper;
+    private LocalAndRemoteAuthenticator auth;
+    
+    public LocalWebScriptConnectorServiceImpl(BaseWebScriptTest webScriptTest) throws Exception
+    {
+        this.helper = new WebScriptHelper(webScriptTest);
+        this.auth = new LocalAndRemoteAuthenticator(webScriptTest);
+    }
+    
+    /**
+     * Builds a new Request object
+     */
+    public RemoteConnectorRequest buildRequest(String url, String method)
+    {
+        // Ensure we accept this URL
+        if (url.startsWith(LOCAL_BASE_URL))
+        {
+            // Good, that's probably us, make it a relative url
+            url = url.substring(LOCAL_BASE_URL.length()-1);
+            
+            // Make sure it's a service one
+            if (url.startsWith(SERVICE_URL))
+            {
+                // Strip off and use
+                url = url.substring(SERVICE_URL.length()-1);
+            }
+            else
+            {
+                throw new IllegalArgumentException("Only /service/ local URLs are supported, can't handle " + url);
+            }
+        }
+        else
+        {
+            throw new IllegalArgumentException("Not a local URL: " + url);
+        }
+        
+        // Build and return
+        return new RemoteConnectorRequestImpl(url, method);
+    }
+
+    /**
+     * Builds a new Request object, using HttpClient method descriptions
+     */
+    public RemoteConnectorRequest buildRequest(String url, Class<? extends HttpMethodBase> method)
+    {
+        // Get the method name
+        String methodName;
+        try
+        {
+            HttpMethodBase httpMethod = method.getConstructor(String.class).newInstance(url);
+            methodName = httpMethod.getName();
+        }
+        catch(Exception e)
+        {
+            throw new AlfrescoRuntimeException("Error identifying method name", e);
+        }
+        
+        // Build and return
+        return buildRequest(url, methodName);
+    }
+    
+    /**
+     * Executes the specified request, and return the response
+     */
+    public RemoteConnectorResponse executeRequest(RemoteConnectorRequest request) 
+            throws IOException, AuthenticationException, RemoteConnectorClientException, RemoteConnectorServerException
+    {
+        // Convert the request object
+        RemoteConnectorRequestImpl requestImpl = (RemoteConnectorRequestImpl)request;
+        Request req = new Request(request.getMethod(), request.getURL());
+        req.setType(request.getContentType());
+        
+        if (request.getRequestBody() != null)
+        {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            requestImpl.getRequestBody().writeRequest(baos);
+            req.setBody(baos.toByteArray());
+        }
+        
+        // Log
+        if (logger.isInfoEnabled())
+            logger.info("Performing local " + request.getMethod() + " request to " + request.getURL()); 
+
+        // Capture the user details, as they may be changed during the request processing
+        Authentication fullAuth = AuthenticationUtil.getFullAuthentication();
+        String runAsUser = AuthenticationUtil.getRunAsUser();
+        
+        // If they've specified Authentication details in the request, clear our security context
+        //  and switch to that user, to avoid our context confusing the real request
+        Header authHeader = null;
+        Map<String,String> headers = new HashMap<String, String>();
+        for (Header header : request.getRequestHeaders())
+        {
+            if (header.getName().equals("Authorization"))
+            {
+                authHeader = header;
+            }
+            headers.put(header.getName(), header.getValue());
+        }
+        if (authHeader != null)
+        {
+            AuthenticationUtil.clearCurrentSecurityContext();
+            if (logger.isDebugEnabled())
+                logger.debug("HTTP Authorization found for the request, clearing security context, Auth is " + authHeader);
+        }
+        req.setHeaders(headers);
+        
+        // Execute the request against the WebScript Test Framework
+        Response resp;
+        try
+        {
+            resp = helper.sendRequest(req, -1);
+        }
+        catch (Exception e)
+        {
+            throw new AlfrescoRuntimeException("Problem requesting", e);
+        }
+        
+        // Reset the user details, now we're done performing the request
+        AuthenticationUtil.setFullAuthentication(fullAuth);
+        if (runAsUser != null && !runAsUser.equals(fullAuth.getName()))
+        {
+            AuthenticationUtil.setRunAsUser(runAsUser);
+        }
+        
+        // Log
+        if (logger.isInfoEnabled())
+            logger.info("Response to request was " + resp.getStatus() + " - " + resp);
+        
+        // Check the status for specific typed exceptions
+        if (resp.getStatus() == Status.STATUS_UNAUTHORIZED)
+        {
+            throw new AuthenticationException("Not Authorized to access this resource");
+        }
+        if (resp.getStatus() == Status.STATUS_FORBIDDEN)
+        {
+            throw new AuthenticationException("Forbidden to access this resource");
+        }
+        
+        // Check for failures where we don't care about the response body
+        if (resp.getStatus() >= 500 && resp.getStatus() <= 599)
+        {
+            throw new RemoteConnectorServerException(resp.getStatus(), "(not available)");
+        }
+        
+        // Convert the response into our required format
+        String charset = null;
+        String contentType = resp.getContentType();
+        if (contentType != null && contentType.contains("charset="))
+        {
+            int splitAt = contentType.indexOf("charset=") + "charset=".length();
+            charset = contentType.substring(splitAt);
+        }
+        
+        InputStream body = new ByteArrayInputStream(resp.getContentAsByteArray());
+        Header[] respHeaders = new Header[0]; // TODO Can't easily get the list...
+        
+        RemoteConnectorResponse response = new RemoteConnectorResponseImpl(
+                request, contentType, charset, resp.getStatus(), respHeaders, body);
+        
+        // If it's a client error, let them know what went wrong
+        if (resp.getStatus() >= 400 && resp.getStatus() <= 499)
+        {
+            throw new RemoteConnectorClientException(resp.getStatus(), "(not available)", response);
+        }
+        
+        // Otherwise return the response for processing
+        return response;
+    }
+    
+    /**
+     * Executes the given request, requesting a JSON response, and
+     *  returns the parsed JSON received back
+     *  
+     * @throws ParseException If the response is not valid JSON
+     */
+    public JSONObject executeJSONRequest(RemoteConnectorRequest request) throws ParseException, IOException, AuthenticationException
+    {
+        return RemoteConnectorServiceImpl.doExecuteJSONRequest(request, this);
+    }
+    
+    private static class WebScriptHelper
+    {
+        private BaseWebScriptTest test;
+        private Method sendRequest;
+        
+        private WebScriptHelper(BaseWebScriptTest test) throws Exception
+        {
+            this.test = test;
+            
+            sendRequest = BaseWebScriptTest.class.getDeclaredMethod("sendRequest", Request.class, Integer.TYPE);
+            sendRequest.setAccessible(true);
+        }
+        
+        private Response sendRequest(Request request, int expectedStatus) throws Exception
+        {
+            return (Response)sendRequest.invoke(test, request, expectedStatus);
+        }
+    }
+    
+    /**
+     * A wrapper around {@link BasicHttpAuthenticator}, which uses the
+     *  Authentication Context if present, otherwise HTTP Auth
+     */
+    private static class LocalAndRemoteAuthenticator implements ServletAuthenticatorFactory
+    {
+        private BasicHttpAuthenticatorFactory httpAuthFactory;
+        
+        private LocalAndRemoteAuthenticator(BaseWebScriptTest test) throws Exception
+        {
+            // Get the test server
+            Method getServer = BaseWebScriptTest.class.getDeclaredMethod("getServer");
+            getServer.setAccessible(true);
+            TestWebScriptServer server = (TestWebScriptServer)getServer.invoke(test);
+            
+            // Grab the real auth factory from the context
+            httpAuthFactory = (BasicHttpAuthenticatorFactory)server.getApplicationContext().getBean("webscripts.authenticator.basic");
+            
+            // Wire us into the test
+            test.setCustomAuthenticatorFactory(this);
+            server.setServletAuthenticatorFactory(this);
+        }
+
+        @Override
+        public Authenticator create(WebScriptServletRequest req, WebScriptServletResponse res)
+        {
+            // Do we have current details?
+            if (AuthenticationUtil.getFullyAuthenticatedUser() != null)
+            {
+                // There are already details existing
+                // Allow these to be kept and used
+                String fullUser = AuthenticationUtil.getFullyAuthenticatedUser();
+                logger.debug("Existing Authentication found, remaining as " + fullUser);
+                return new LocalTestRunAsAuthenticator(fullUser);
+            }
+            
+            // Fall back to the http auth one
+            logger.debug("No existing Authentication found, using regular HTTP Auth");
+            return httpAuthFactory.create(req, res);
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceTest.java b/remote-api/src/test/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceTest.java
new file mode 100644
index 00000000000..195c2543a2c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceTest.java
@@ -0,0 +1,419 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.remoteticket;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.cache.SimpleCache;
+import org.alfresco.repo.remoteconnector.LocalWebScriptConnectorServiceImpl;
+import org.alfresco.repo.remotecredentials.PasswordCredentialsInfoImpl;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.remotecredentials.BaseCredentialsInfo;
+import org.alfresco.service.cmr.remotecredentials.RemoteCredentialsService;
+import org.alfresco.service.cmr.remoteticket.NoCredentialsFoundException;
+import org.alfresco.service.cmr.remoteticket.NoSuchSystemException;
+import org.alfresco.service.cmr.remoteticket.RemoteAlfrescoTicketInfo;
+import org.alfresco.service.cmr.remoteticket.RemoteAlfrescoTicketService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.util.PropertyMap;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.junit.experimental.categories.Category;
+
+/**
+ * Tests for {@link RemoteAlfrescoTicketServiceImpl}, which work by
+ *  looping back to the local repo. Because this tests talks to local
+ *  webscripts, it needs to be run in the Remote API package
+ *  
+ * TODO Test OAuth support, once added
+ * 
+ * @author Nick Burch
+ * @since 4.0.2
+ */
+@Category(LuceneTests.class)
+public class RemoteAlfrescoTicketServiceTest extends BaseWebScriptTest
+{
+    private static final String TEST_REMOTE_SYSTEM_ID = "testingRemoteSystem";
+    private static final String INVALID_REMOTE_SYSTEM_ID = "testingInvalidRemoteSystem";
+    
+    private MutableAuthenticationService authenticationService;
+    private RetryingTransactionHelper retryingTransactionHelper;
+    private PersonService personService;
+    
+    private RemoteAlfrescoTicketService remoteAlfrescoTicketService;
+    private RemoteCredentialsService remoteCredentialsService;
+    private SimpleCache<String, String> ticketsCache;
+    
+    private static final String USER_ONE = "UserOneSecondToo";
+    private static final String USER_TWO = "UserTwoSecondToo";
+    private static final String PASSWORD = "passwordTEST";
+    
+    // General methods
+
+    @Override
+    @SuppressWarnings("unchecked")
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        this.retryingTransactionHelper = (RetryingTransactionHelper)getServer().getApplicationContext().getBean("retryingTransactionHelper");
+        this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
+        this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+        
+        this.remoteAlfrescoTicketService = (RemoteAlfrescoTicketService)getServer().getApplicationContext().getBean("remoteAlfrescoTicketService");
+        this.remoteCredentialsService = (RemoteCredentialsService)getServer().getApplicationContext().getBean("RemoteCredentialsService");
+        this.ticketsCache = (SimpleCache<String, String>)getServer().getApplicationContext().getBean("remoteAlfrescoTicketService.ticketsCache");
+        
+        // Do the setup as admin
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        
+        // Add our local system as a remote service
+        remoteAlfrescoTicketService.registerRemoteSystem(TEST_REMOTE_SYSTEM_ID, "http://localhost:8080/alfresco/service/", null);
+        
+        // Wire up the loop-back connector
+        ((RemoteAlfrescoTicketServiceImpl)remoteAlfrescoTicketService).setRemoteConnectorService(
+                new LocalWebScriptConnectorServiceImpl(this));
+        
+        // Ensure the invalid one isn't registered
+        remoteAlfrescoTicketService.registerRemoteSystem(INVALID_REMOTE_SYSTEM_ID, null, null);
+        
+        // Create users
+        createUser(USER_ONE);
+        createUser(USER_TWO);
+
+        // Do tests as first user
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        
+        // Admin user required to delete user
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        
+        // Delete the users, which also zaps their credentials
+        if(personService.personExists(USER_ONE))
+        {
+           personService.deletePerson(USER_ONE);
+        }
+        if(this.authenticationService.authenticationExists(USER_ONE))
+        {
+           this.authenticationService.deleteAuthentication(USER_ONE);
+        }
+        
+        if(personService.personExists(USER_TWO))
+        {
+           personService.deletePerson(USER_TWO);
+        }
+        if(this.authenticationService.authenticationExists(USER_TWO))
+        {
+           this.authenticationService.deleteAuthentication(USER_TWO);
+        }
+        
+        // Unregister the system
+        remoteAlfrescoTicketService.registerRemoteSystem(TEST_REMOTE_SYSTEM_ID, null, null);
+    }
+    
+    private void createUser(String userName)
+    {
+        // if user with given user name doesn't already exist then create user
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            // create user
+            this.authenticationService.createAuthentication(userName, PASSWORD.toCharArray());
+            
+            // create person properties
+            PropertyMap personProps = new PropertyMap();
+            personProps.put(ContentModel.PROP_USERNAME, userName);
+            personProps.put(ContentModel.PROP_FIRSTNAME, "First");
+            personProps.put(ContentModel.PROP_LASTNAME, "Last");
+            personProps.put(ContentModel.PROP_EMAIL, "FirstName123.LastName123@email.com");
+            personProps.put(ContentModel.PROP_JOBTITLE, "JobTitle123");
+            personProps.put(ContentModel.PROP_JOBTITLE, "Organisation123");
+            
+            // create person node for user
+            this.personService.createPerson(personProps);
+        }
+    }
+    
+    /**
+     * Getting, storing and fetching credentials
+     */
+    public void testGetStoreGetCredentials() throws Exception
+    {
+        // Run this test initially as the first user
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+
+        
+        // First, try an invalid system
+        try
+        {
+            remoteAlfrescoTicketService.getRemoteCredentials(INVALID_REMOTE_SYSTEM_ID);
+            fail("Shouldn't work for an invalid system");
+        }
+        catch(NoSuchSystemException e) {}
+        try
+        {
+            remoteAlfrescoTicketService.storeRemoteCredentials(INVALID_REMOTE_SYSTEM_ID, null, null);
+            fail("Shouldn't work for an invalid system");
+        }
+        catch(NoSuchSystemException e) {}
+        
+        
+        // Our user starts out without credentials
+        BaseCredentialsInfo credentials = 
+            remoteAlfrescoTicketService.getRemoteCredentials(TEST_REMOTE_SYSTEM_ID);
+        assertEquals(null, credentials);
+        
+        
+        // Try to store some invalid credentials (real user, but password wrong)
+        try
+        {
+            remoteAlfrescoTicketService.storeRemoteCredentials(TEST_REMOTE_SYSTEM_ID, USER_ONE, "invalid");
+            fail("Credentials invalid, shouldn't be allowed");
+        }
+        catch (AuthenticationException e) {}
+        
+        // And an invalid user
+        try
+        {
+            remoteAlfrescoTicketService.storeRemoteCredentials(TEST_REMOTE_SYSTEM_ID, "thisUSERdoesNOTexist", "invalid");
+            fail("Credentials invalid, shouldn't be allowed");
+        }
+        catch (AuthenticationException e) {}
+
+        
+        // Still none there
+        credentials = remoteAlfrescoTicketService.getRemoteCredentials(TEST_REMOTE_SYSTEM_ID);
+        assertEquals(null, credentials);
+        
+        
+        // Store some valid ones
+        credentials = remoteAlfrescoTicketService.storeRemoteCredentials(TEST_REMOTE_SYSTEM_ID, USER_ONE, PASSWORD);
+        assertNotNull(credentials);
+        assertEquals(TEST_REMOTE_SYSTEM_ID, credentials.getRemoteSystemName());
+        assertEquals(USER_ONE, credentials.getRemoteUsername());
+        
+        // Check we can find them
+        credentials = remoteAlfrescoTicketService.getRemoteCredentials(TEST_REMOTE_SYSTEM_ID);
+        assertNotNull(credentials);
+        assertEquals(TEST_REMOTE_SYSTEM_ID, credentials.getRemoteSystemName());
+        assertEquals(USER_ONE, credentials.getRemoteUsername());
+        
+        
+        // Store some different, valid credentials for the user
+        credentials = remoteAlfrescoTicketService.storeRemoteCredentials(TEST_REMOTE_SYSTEM_ID, USER_TWO, PASSWORD);
+        assertNotNull(credentials);
+        assertEquals(TEST_REMOTE_SYSTEM_ID, credentials.getRemoteSystemName());
+        assertEquals(USER_TWO, credentials.getRemoteUsername());
+        
+        // Check we see the change
+        credentials = remoteAlfrescoTicketService.getRemoteCredentials(TEST_REMOTE_SYSTEM_ID);
+        assertNotNull(credentials);
+        assertEquals(TEST_REMOTE_SYSTEM_ID, credentials.getRemoteSystemName());
+        assertEquals(USER_TWO, credentials.getRemoteUsername());
+        
+        
+        // Switch to the other user, no credentials there
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_TWO);
+        credentials = remoteAlfrescoTicketService.getRemoteCredentials(TEST_REMOTE_SYSTEM_ID);
+        assertEquals(null, credentials);
+        
+        
+        // Switch back, and delete
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+        credentials = remoteAlfrescoTicketService.getRemoteCredentials(TEST_REMOTE_SYSTEM_ID);
+        assertNotNull(credentials);
+        
+        boolean deleted = remoteAlfrescoTicketService.deleteRemoteCredentials(TEST_REMOTE_SYSTEM_ID);
+        assertEquals(true, deleted);
+        
+        // Will have gone
+        credentials = remoteAlfrescoTicketService.getRemoteCredentials(TEST_REMOTE_SYSTEM_ID);
+        assertEquals(null, credentials);
+        
+        // Double delete is reported
+        deleted = remoteAlfrescoTicketService.deleteRemoteCredentials(TEST_REMOTE_SYSTEM_ID);
+        assertEquals(false, deleted);
+    }
+    
+    /**
+     * Getting cached and non-cached credentials
+     */
+    public void testGetTicket() throws Exception
+    {
+        // Run this test initially as the first user
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+
+        
+        // First, try an invalid system
+        try
+        {
+            remoteAlfrescoTicketService.getAlfrescoTicket(INVALID_REMOTE_SYSTEM_ID);
+            fail("Shouldn't work for an invalid system");
+        }
+        catch(NoSuchSystemException e) {}
+        try
+        {
+            remoteAlfrescoTicketService.refetchAlfrescoTicket(INVALID_REMOTE_SYSTEM_ID);
+            fail("Shouldn't work for an invalid system");
+        }
+        catch(NoSuchSystemException e) {}
+        
+        
+        // Can't get or refresh if no credentials exist 
+        try
+        {
+            remoteAlfrescoTicketService.getAlfrescoTicket(TEST_REMOTE_SYSTEM_ID);
+            fail("Shouldn't work when no credentials");
+        }
+        catch(NoCredentialsFoundException e) {}
+        try
+        {
+            remoteAlfrescoTicketService.refetchAlfrescoTicket(TEST_REMOTE_SYSTEM_ID);
+            fail("Shouldn't work when no credentials");
+        }
+        catch(NoCredentialsFoundException e) {}
+
+        
+        // Have some stored
+        remoteAlfrescoTicketService.storeRemoteCredentials(TEST_REMOTE_SYSTEM_ID, USER_ONE, PASSWORD);
+
+        
+        // A ticket will now exist
+        RemoteAlfrescoTicketInfo ticket = remoteAlfrescoTicketService.getAlfrescoTicket(TEST_REMOTE_SYSTEM_ID);
+        assertNotNull(ticket);
+        assertNotNull(ticket.getAsUrlParameters());
+        
+        
+        // Ask again, will get the same one
+        RemoteAlfrescoTicketInfo ticket2 = remoteAlfrescoTicketService.getAlfrescoTicket(TEST_REMOTE_SYSTEM_ID);
+        assertNotNull(ticket2);
+        assertEquals(ticket.getAsUrlParameters(), ticket2.getAsUrlParameters());
+        
+        
+        // Force a re-fetch, will get another
+        RemoteAlfrescoTicketInfo ticket3 = remoteAlfrescoTicketService.refetchAlfrescoTicket(TEST_REMOTE_SYSTEM_ID);
+        assertNotNull(ticket3);
+        assertNotSame(ticket.getAsUrlParameters(), ticket3.getAsUrlParameters());
+        
+        // Ask for the ticket again, get the 2nd one again
+        RemoteAlfrescoTicketInfo ticket4 = remoteAlfrescoTicketService.getAlfrescoTicket(TEST_REMOTE_SYSTEM_ID);
+        assertNotNull(ticket4);
+        assertEquals(ticket3.getAsUrlParameters(), ticket4.getAsUrlParameters());
+        
+        
+        // Zap from the cache, will trigger another to be fetched
+        ticketsCache.clear();
+        
+        RemoteAlfrescoTicketInfo ticket5 = remoteAlfrescoTicketService.getAlfrescoTicket(TEST_REMOTE_SYSTEM_ID);
+        assertNotNull(ticket5);
+        assertNotSame(ticket.getAsUrlParameters(), ticket5.getAsUrlParameters());
+        assertNotSame(ticket3.getAsUrlParameters(), ticket5.getAsUrlParameters());
+        
+        
+        // Change the password so it's no longer valid
+        PasswordCredentialsInfoImpl creds = (PasswordCredentialsInfoImpl)remoteCredentialsService.getPersonCredentials(TEST_REMOTE_SYSTEM_ID);
+        assertNotNull(creds);
+        creds.setRemotePassword("INVALID");
+        remoteCredentialsService.updateCredentials(creds);
+        
+        // Currently will be marked as still working
+        assertEquals(true, creds.getLastAuthenticationSucceeded());
+        
+        
+        // Get will work, as ticket was previously cached
+        RemoteAlfrescoTicketInfo ticket6 = remoteAlfrescoTicketService.getAlfrescoTicket(TEST_REMOTE_SYSTEM_ID);
+        assertNotNull(ticket6);
+        assertEquals(ticket5.getAsUrlParameters(), ticket6.getAsUrlParameters());
+        
+        // Re-fetch will fail with authentication error
+        try
+        {
+            remoteAlfrescoTicketService.refetchAlfrescoTicket(TEST_REMOTE_SYSTEM_ID);
+            fail("Shouldn't be able to refetch with wrong details");
+        }
+        catch(AuthenticationException e) {}
+        
+        // Now a get will fail too, as the cache will be invalidated
+        try
+        {
+            remoteAlfrescoTicketService.getAlfrescoTicket(TEST_REMOTE_SYSTEM_ID);
+            fail("Shouldn't be able to get after refresh with wrong details");
+        }
+        catch(AuthenticationException e) {}
+        
+        
+        // If we check the credentials, will now be marked as failing
+        creds = (PasswordCredentialsInfoImpl)remoteCredentialsService.getPersonCredentials(TEST_REMOTE_SYSTEM_ID);
+        assertEquals(false, creds.getLastAuthenticationSucceeded());
+        
+        
+        // Change the password back to what it should be, and re-get
+        creds.setRemotePassword(PASSWORD);
+        remoteCredentialsService.updateCredentials(creds);
+        
+        RemoteAlfrescoTicketInfo ticket7 = remoteAlfrescoTicketService.getAlfrescoTicket(TEST_REMOTE_SYSTEM_ID);
+        assertNotNull(ticket7);
+        assertNotSame(ticket.getAsUrlParameters(),  ticket7.getAsUrlParameters());
+        assertNotSame(ticket3.getAsUrlParameters(), ticket7.getAsUrlParameters());
+        assertNotSame(ticket5.getAsUrlParameters(), ticket7.getAsUrlParameters());
+        
+        // Should now be marked as working again
+        creds = (PasswordCredentialsInfoImpl)remoteCredentialsService.getPersonCredentials(TEST_REMOTE_SYSTEM_ID);
+        assertEquals(true, creds.getLastAuthenticationSucceeded());
+        
+        
+        // Check that failure can be marked in a read only transaction
+        creds.setRemotePassword("INVALID");
+        remoteCredentialsService.updateCredentials(creds);
+
+        retryingTransactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+        {
+            public Void execute()
+
+            {
+                try
+                {
+                    remoteAlfrescoTicketService.refetchAlfrescoTicket(TEST_REMOTE_SYSTEM_ID);
+                    fail("Shouldn't be able to refetch with wrong details");
+                }
+                catch (AuthenticationException e)
+                {
+                }
+                return null;
+            }
+        }, false, true); // after MNT-13871, POST api/login webscript now requires read-write transaction
+
+        // Check it was still marked as invalid, despite a read only transaction
+        creds = (PasswordCredentialsInfoImpl)remoteCredentialsService.getPersonCredentials(TEST_REMOTE_SYSTEM_ID);
+        assertEquals(false, creds.getLastAuthenticationSucceeded());
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/DeclarativeSpreadsheetWebScriptTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/DeclarativeSpreadsheetWebScriptTest.java
new file mode 100644
index 00000000000..c099c8e105d
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/DeclarativeSpreadsheetWebScriptTest.java
@@ -0,0 +1,96 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.junit.experimental.categories.Category;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Test for DeclarativeSpreadsheetWebScript class
+ * 
+ * @author alex.mukha
+ * @since 4.2.4
+ */
+@Category(LuceneTests.class)
+public class DeclarativeSpreadsheetWebScriptTest extends BaseWebScriptTest
+{
+    private String admin;
+    private static String URL = "/api/test/getcsv";
+    protected static final QName[] COLUMNS = new QName[]
+            {
+                ContentModel.PROP_USERNAME,
+                ContentModel.PROP_FIRSTNAME, 
+                ContentModel.PROP_LASTNAME
+            };
+    
+    /** The context locations, in reverse priority order. */
+    private static final String CONFIG_LOCATION = "classpath:alfresco/declarative-spreadsheet-webscript-application-context.xml";
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setCustomContext(CONFIG_LOCATION);
+        super.setUp();
+        getServer().getApplicationContext();
+        admin = AuthenticationUtil.getAdminUserName();
+        AuthenticationUtil.setFullyAuthenticatedUser(admin);
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        AuthenticationUtil.clearCurrentSecurityContext();
+    };
+    
+    public void testCSVFormat() throws Exception
+    {
+        TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(URL);
+        Response response = sendRequest(req, Status.STATUS_OK, admin);
+        // default excel, delimiter is a comma ","
+        assertEquals("The response CSV body was not correct.", "User Name,First Name,Last Name\n", response.getContentAsString());
+        
+        req = new TestWebScriptServer.GetRequest(URL + "?" + DeclarativeSpreadsheetWebScript.PARAM_REQ_DELIMITER + "=%2C");
+        response = sendRequest(req, Status.STATUS_OK, admin);
+        // delimiter is a comma ","
+        assertEquals("The response CSV body was not correct.", "User Name,First Name,Last Name\n", response.getContentAsString());
+        
+        req = new TestWebScriptServer.GetRequest(URL + "?" + DeclarativeSpreadsheetWebScript.PARAM_REQ_DELIMITER + "=%09");
+        response = sendRequest(req, Status.STATUS_OK, admin);
+        // delimiter is a tab space "\t"
+        assertEquals("The response CSV body was not correct.", "User Name\tFirst Name\tLast Name\n", response.getContentAsString());
+        
+        req = new TestWebScriptServer.GetRequest(URL + "?" + DeclarativeSpreadsheetWebScript.PARAM_REQ_DELIMITER + "=%3B");
+        response = sendRequest(req, Status.STATUS_OK, admin);
+        // delimiter is a semicolon ";"
+        assertEquals("The response CSV body was not correct.", "User Name;First Name;Last Name\n", response.getContentAsString());
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/LoginTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/LoginTest.java
new file mode 100644
index 00000000000..75c49ac4fb7
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/LoginTest.java
@@ -0,0 +1,255 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.util.PropertyMap;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Junit test for login / logout and validate web scripts
+ * 
+ * testing uri /api/login
+ */
+public class LoginTest extends BaseWebScriptTest 
+{
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private PersonService personService;
+    
+    private static final String USER_ONE = "AuthenticationTestOne";
+    
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
+        this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+    	createUser(USER_ONE, USER_ONE);
+    }
+    
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+    
+    private void createUser(String userName, String password)
+    {
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            this.authenticationService.createAuthentication(userName, password.toCharArray());
+            
+            PropertyMap ppOne = new PropertyMap(4);
+            ppOne.put(ContentModel.PROP_USERNAME, userName);
+            ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+            ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+            ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+            
+            this.personService.createPerson(ppOne);
+        }        
+    }
+    
+    private String parseTicket(String ticketResult)
+    {
+       int startTag = ticketResult.indexOf("<ticket>");
+       int endTag = ticketResult.indexOf("</ticket>");
+       if ((startTag != -1) && (endTag != -1))
+       {
+              return ticketResult.substring(startTag+("<ticket>".length()), endTag);
+       }
+       return "";
+    }
+    
+	/**
+	 * Positive test - login and retrieve a ticket via get - return xml,
+	 * - via get method 
+	 * validate ticket
+	 * logout
+	 * fail to validate ticket
+	 * fail to get ticket
+	 */
+    public void testAuthentication() throws Exception
+    {	
+    	/**
+    	 * Login via get method to return xml
+    	 */
+        String loginURL = "/api/login?u=" + USER_ONE + "&pw=" + USER_ONE;
+    	Response resp = sendRequest(new GetRequest(loginURL), Status.STATUS_OK);
+    	String xmlFragment = resp.getContentAsString();
+    	
+    	assertNotNull("xmlFragment");
+    	assertTrue("xmlFragment contains ticket", xmlFragment.contains("<ticket>"));
+    	String ticket = parseTicket(xmlFragment);
+ 
+    	String ticketURL = "/api/login/ticket/"+ticket;
+    	
+    	/**
+    	 * Negative test - validate as AuthenticationUtil.getAdminUserName() - should fail with a 404
+    	 */
+      	setDefaultRunAs(AuthenticationUtil.getAdminUserName());
+    	sendRequest(new GetRequest(ticketURL), Status.STATUS_NOT_FOUND);
+      	
+    	/**
+    	 * Validate the ticket - should succeed
+    	 */
+    	setDefaultRunAs(USER_ONE);
+
+    	sendRequest(new GetRequest(ticketURL), Status.STATUS_OK);
+    	
+    	/**
+    	 * Logout
+    	 */
+    	sendRequest(new DeleteRequest(ticketURL), Status.STATUS_OK);
+
+    	/**
+    	 * Validate the ticket - should fail now
+    	 */
+    	sendRequest(new GetRequest(ticketURL), Status.STATUS_NOT_FOUND);	
+    	
+    }
+    
+	/**
+	 * Positive test - login and retrieve a ticket,
+	 * - via json method 
+	 */
+    public void testAuthenticationGetJSON() throws Exception
+    {
+     	/**
+    	 * Login via get method to return json
+    	 */
+        String loginURL = "/api/login.json?u=" + USER_ONE + "&pw=" + USER_ONE ;
+    	Response resp = sendRequest(new GetRequest(loginURL), Status.STATUS_OK);
+    	JSONObject result = new JSONObject(resp.getContentAsString());
+    	JSONObject data = result.getJSONObject("data");
+    	String ticket = data.getString("ticket");
+    	assertNotNull("ticket is null", ticket);
+    	
+    	/**
+    	 * This is now testing the framework ... With a different format.
+    	 */
+        String login2URL = "/api/login?u=" + USER_ONE + "&pw=" + USER_ONE + "&format=json";
+    	Response resp2 = sendRequest(new GetRequest(login2URL), Status.STATUS_OK);
+    	JSONObject result2 = new JSONObject(resp2.getContentAsString());
+    	JSONObject data2 = result2.getJSONObject("data");
+    	String ticket2 = data2.getString("ticket");
+    	assertNotNull("ticket is null", ticket2);
+    	
+    }
+    
+    /**
+     * Authenticate via a POST
+     * @throws Exception
+     */
+    public void testPostLogin() throws Exception
+    {
+        String loginURL = "/api/login";
+        /**
+         * logon via POST and JSON
+         */
+        {
+        JSONObject req = new JSONObject();
+        req.put("username", USER_ONE);
+        req.put("password", USER_ONE);
+        Response response = sendRequest(new PostRequest(loginURL, req.toString(), "application/json"), Status.STATUS_OK); 
+        
+        JSONObject result = new JSONObject(response.getContentAsString());
+        JSONObject data = result.getJSONObject("data");
+        String ticket = data.getString("ticket");
+        assertNotNull("ticket null", ticket);	
+        }     
+        
+        /**
+         * Negative test - wrong password
+         */
+        {
+            JSONObject req = new JSONObject();
+            req.put("username", USER_ONE);
+            req.put("password", "blurb");
+            sendRequest(new PostRequest(loginURL, req.toString(), "application/json"), Status.STATUS_FORBIDDEN); 
+        }
+        /**
+         * Negative test - missing username
+         */
+        {
+            JSONObject req = new JSONObject();
+            req.put("password", USER_ONE);
+            sendRequest(new PostRequest(loginURL, req.toString(), "application/json"), Status.STATUS_BAD_REQUEST); 
+        }
+        
+        /**
+         * Negative test - missing password
+         */
+        {
+            JSONObject req = new JSONObject();
+            req.put("username", USER_ONE);
+            sendRequest(new PostRequest(loginURL, req.toString(), "application/json"), Status.STATUS_BAD_REQUEST); 
+        }
+    }
+    
+	
+	/**
+	 * Negative tests - wrong password
+	 */
+    public void testWrongPassword() throws Exception
+    {
+    	/**
+    	 * Login via get method and wrong password, should get FORBIDDEN
+    	 */
+        String loginURL = "/api/login?u=" + USER_ONE + "&pw=" + "crap";
+    	sendRequest(new GetRequest(loginURL), Status.STATUS_FORBIDDEN);
+    }
+	
+	/**
+	 * Negative test - missing parameters
+	 */
+    public void testMissingParameters() throws Exception
+    {
+    	/**
+    	 * Login via get method missing pw
+    	 */
+        String loginURL = "/api/login?u=" + USER_ONE;
+    	sendRequest(new GetRequest(loginURL), Status.STATUS_BAD_REQUEST);
+    	
+    	/**
+    	 * Login via get method missing u
+    	 */
+        String login2URL = "/api/login?&pw=" + USER_ONE;
+    	sendRequest(new GetRequest(login2URL), Status.STATUS_BAD_REQUEST);
+    	
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/ReadOnlyTransactionInGetRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/ReadOnlyTransactionInGetRestApiTest.java
new file mode 100644
index 00000000000..ebd98336ffa
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/ReadOnlyTransactionInGetRestApiTest.java
@@ -0,0 +1,188 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import java.util.List;
+
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.transaction.TransactionService;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Set of tests that ensure GET REST APIs are run successfully in a read-only
+ * transaction (ALF-10179).
+ * 
+ * Some webscripts have a side effect of creating a "container" these tests
+ * are to ensure this is handled gracefully in a way that allows the main 
+ * transaction to be declared as readonly for performance reasons.
+ * 
+ * @author Gavin Cornwell
+ * @since 4.0
+ */
+public class ReadOnlyTransactionInGetRestApiTest extends BaseWebScriptTest
+{
+    private static final String TEST_SITE_NAME = "readOnlyTestSite";
+    
+
+    private static final String URL_GET_SITE_FORUM_POSTS = "/api/forum/site/" + TEST_SITE_NAME + "/discussions/posts";
+    private static final String URL_GET_SITE_BLOG = "/api/blog/site/" + TEST_SITE_NAME + "/blog";
+    private static final String URL_GET_SITE_LINKS = "/api/links/site/" + TEST_SITE_NAME + "/links?page=1&pageSize=10";
+    private static final String URL_GET_SITE_LINK = "/api/links/link/site/" + TEST_SITE_NAME + "/links/123456789";
+    private static final String URL_GET_SITE_TAGS = "/api/tagscopes/site/" + TEST_SITE_NAME + "/tags";
+
+    private SiteService siteService;
+    private NodeService nodeService;
+    private TransactionService transactionService;
+    private NodeArchiveService nodeArchiveService;
+    
+    private NodeRef testSiteNodeRef;
+    private String testSiteNodeRefString;
+    
+    private boolean logEnabled = false;
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        ApplicationContext appContext = getServer().getApplicationContext();
+
+        this.siteService = (SiteService)appContext.getBean("SiteService");
+        this.nodeService = (NodeService)appContext.getBean("NodeService");
+        this.transactionService = (TransactionService)appContext.getBean("TransactionService");
+        this.nodeArchiveService = (NodeArchiveService)getServer().getApplicationContext().getBean("nodeArchiveService");
+        
+        // set admin as current user
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+        // delete the test site if it's still hanging around from previous runs
+        SiteInfo site = siteService.getSite(TEST_SITE_NAME);
+        if (site != null)
+        {
+            siteService.deleteSite(TEST_SITE_NAME);
+            nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(site.getNodeRef()));
+        }
+        
+        // create the test site, this should create a site but it won't have any containers created
+        SiteInfo siteInfo = this.siteService.createSite("collaboration", TEST_SITE_NAME, "Read Only Test Site", 
+                    "Test site for ReadOnlyTransactionRestApiTest", SiteVisibility.PUBLIC);
+        this.testSiteNodeRef = siteInfo.getNodeRef();
+        this.testSiteNodeRefString = this.testSiteNodeRef.toString().replace("://", "/");
+        
+        // ensure there are no containers present at the start of the test
+        List<ChildAssociationRef> children = nodeService.getChildAssocs(this.testSiteNodeRef);
+        assertTrue("The test site should not have any containers", children.isEmpty());
+    }
+
+    /* (non-Javadoc)
+     * @see junit.framework.TestCase#tearDown()
+     */
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        
+        SiteInfo site = siteService.getSite(TEST_SITE_NAME);
+        // use retrying transaction to delete the site
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                // delete the test site
+                siteService.deleteSite(TEST_SITE_NAME);
+                
+                return null;
+            }
+        });
+        nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(site.getNodeRef()));
+        
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+       
+    public void testGetSiteForumPosts() throws Exception
+    {
+        Response response = sendRequest(new GetRequest(URL_GET_SITE_FORUM_POSTS), 200);
+        logResponse(response);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+    }
+    
+    public void testGetSiteBlog() throws Exception
+    {
+        // TODO: Fixme - This REST API still requires a readwrite transaction to be successful
+        //       Also add tests for all other blog GET REST APIs
+        
+        Response response = sendRequest(new GetRequest(URL_GET_SITE_BLOG), 200);
+        logResponse(response);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+    }
+    
+    public void testGetSiteLinks() throws Exception
+    {
+        Response response = sendRequest(new GetRequest(URL_GET_SITE_LINKS), 200);
+        logResponse(response);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+    }
+    
+    public void testGetSiteLink() throws Exception
+    {
+        Response response = sendRequest(new GetRequest(URL_GET_SITE_LINK), 404);
+        logResponse(response);
+        assertEquals(Status.STATUS_NOT_FOUND, response.getStatus());
+    }
+    
+    public void testGetSiteTags() throws Exception
+    {
+        Response response = sendRequest(new GetRequest(URL_GET_SITE_TAGS), 200);
+        logResponse(response);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+    }
+    
+    private void logResponse(Response response)
+    {
+        if (this.logEnabled)
+        {
+            try
+            {
+                System.out.println(response.getContentAsString());
+            }
+            catch (Exception e)
+            {
+                System.err.println("Unable to log response: " + e.toString());
+            }
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/RepositoryContainerTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/RepositoryContainerTest.java
new file mode 100644
index 00000000000..e3a8b59a265
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/RepositoryContainerTest.java
@@ -0,0 +1,446 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.error.ExceptionStackUtil;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.forms.FormException;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.repository.ContentIOException;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.util.PropertyMap;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.quartz.CronTrigger;
+import org.quartz.Scheduler;
+import org.springframework.extensions.webscripts.Authenticator;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.any;
+import static org.springframework.extensions.webscripts.Status.STATUS_OK;
+
+/**
+ * Unit test to test runas function
+ * 
+ * @author David Ward
+ */
+public class RepositoryContainerTest extends BaseWebScriptTest
+{
+    private static final Pattern HIDDEN_EXCEPTION_PATTERN = Pattern.compile("Server error \\(\\d{8}\\)\\.  Details can be found in the server logs\\.");
+
+    private MutableAuthenticationService authenticationService;
+    private PersonService personService;
+    private AuthenticationComponent authenticationComponent;
+    
+    private static final String USER_ONE = "RunAsOne";
+    private static final String USER_TWO = "RunAsTwo";
+    private static final String SUCCESS = "success";
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        this.authenticationService = (MutableAuthenticationService) getServer().getApplicationContext().getBean("AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
+        this.personService = (PersonService) getServer().getApplicationContext().getBean("PersonService");
+
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
+        
+        // Create users
+        createUser(USER_ONE);
+        createUser(USER_TWO);
+    }
+
+    private void createUser(String userName)
+    {
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            this.authenticationService.createAuthentication(userName, "PWD".toCharArray());
+
+            PropertyMap ppOne = new PropertyMap(5);
+            ppOne.put(ContentModel.PROP_USERNAME, userName);
+            ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+            ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+            ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+
+            this.personService.createPerson(ppOne);
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        AuthenticationUtil.clearCurrentSecurityContext();
+        super.tearDown();
+    }
+    
+    
+    /**
+     * Person should be current user irrespective of runas user.
+     */
+    public void testRunAsAdmin() throws Exception
+    {
+        authenticationComponent.setCurrentUser(USER_ONE);
+        
+        // No runas specified within our webscript descriptor
+        Response response = sendRequest(new GetRequest("/test/runas"), STATUS_OK);
+        assertEquals(USER_ONE, response.getContentAsString());
+
+        authenticationComponent.setCurrentUser(USER_TWO);
+        
+        // runas "Admin" specified within our webscript descriptor
+        response = sendRequest(new GetRequest("/test/runasadmin"), STATUS_OK);
+        assertEquals(USER_TWO, response.getContentAsString());
+        
+        authenticationComponent.setSystemUserAsCurrentUser();
+    }
+
+    
+    public void testReset() throws Exception
+    {
+        RepositoryContainer repoContainer = (RepositoryContainer) getServer().getApplicationContext().getBean("webscripts.container");
+        repoContainer.reset();
+    }
+    
+    /*
+     * Test for MNT-11237 : CMIS uploading file larger the 4mb fails
+     * 
+     * Tests that requests with content larger than 4mb (default memoryThreshold value) can be successfully handled by repository container 
+     */
+    public void testLargeContentRequest() throws Exception
+    {
+        authenticationComponent.setCurrentUser(USER_ONE);
+        
+        // create the 5 mb size buffer of zero bytes
+        byte[] content = new byte[5 * 1024 * 1024];
+        Arrays.fill(content, (byte)0);
+        
+        // chek that we can upload file larger than 4 mb
+        Response response = sendRequest(new PutRequest("/test/largecontenttest", content, "text/plain"), STATUS_OK);
+        assertEquals(SUCCESS, response.getContentAsString());
+        
+        // trigger the webscript temp folder cleaner job
+        CronTrigger webscriptsTempFileCleanerJobTrigger = (CronTrigger) getServer().getApplicationContext().getBean("webscripts.tempFileCleanerTrigger");
+
+        Scheduler scheduler = (Scheduler) getServer().getApplicationContext().getBean("schedulerFactory");
+
+        scheduler.triggerJob(webscriptsTempFileCleanerJobTrigger.getJobKey());
+
+        // check that we still can upload file larger than 4 mb, i.e. ensure that cleaner has not deleted temp folder
+        response = sendRequest(new PutRequest("/test/largecontenttest", content, "text/plain"), STATUS_OK);
+        assertEquals(SUCCESS, response.getContentAsString());
+    }
+
+    public void testHideExceptions() throws Exception
+    {
+        final String messageFormException = "Failed to persist field 'prop_cm_name'";
+        final String messageAuthenticationException = "Authentication failed for Web Script";
+
+        RepositoryContainer repoContainer = (RepositoryContainer) getServer().getApplicationContext().getBean("webscripts.container");
+        RepositoryContainer repoContainerMock = Mockito.spy(repoContainer);
+
+        Class<?>[] defaultConfiguration = repoContainerMock.getNotPublicExceptions();
+
+        try
+        {
+            List<Class<?>> testExceptoins = new LinkedList<Class<?>>();
+            testExceptoins.add(SQLException.class);
+            repoContainerMock.setNotPublicExceptions(testExceptoins);
+
+            // case: AlfrescoRuntimeException with SQLException cause
+            Mockito.doAnswer(new Answer<Object>()
+            {
+                public Object answer(InvocationOnMock invocation)
+                {
+                    throw new AlfrescoRuntimeException("AlfrescoRuntimeException", new SQLException("SQLException"));
+                }
+            }).when(repoContainerMock).executeScriptInternal(nullable(WebScriptRequest.class), nullable(WebScriptResponse.class), nullable(Authenticator.class));
+            try
+            {
+                repoContainerMock.executeScript(null, null, null);
+            }
+            catch (Exception e)
+            {
+                assertNull("SQLException cause should be hidden for client", ExceptionStackUtil.getCause(e, new Class[] { SQLException.class }));
+                assertTrue("Details should be in the server logs.", HIDDEN_EXCEPTION_PATTERN.matcher(e.getMessage()).matches());
+            }
+
+            // case: AlfrescoRuntimeException with NOT SQLException cause
+            Mockito.doAnswer(new Answer<Object>()
+            {
+                public Object answer(InvocationOnMock invocation)
+                {
+                    throw new AlfrescoRuntimeException("AlfrescoRuntimeException", new NullPointerException());
+                }
+            }).when(repoContainerMock).executeScriptInternal(nullable(WebScriptRequest.class), nullable(WebScriptResponse.class), nullable(Authenticator.class));
+            try
+            {
+                repoContainerMock.executeScript(null, null, null);
+            }
+            catch (Exception e)
+            {
+                assertNotNull("NullPointerException cause should be visible for client", ExceptionStackUtil.getCause(e, new Class[] { NullPointerException.class }));
+                assertFalse("Details should be available for client", HIDDEN_EXCEPTION_PATTERN.matcher(e.getMessage()).matches());
+            }
+
+            // case: RuntimeException with SQLException cause
+            Mockito.doAnswer(new Answer<Object>()
+            {
+                public Object answer(InvocationOnMock invocation)
+                {
+                    throw new RuntimeException("AlfrescoRuntimeException", new SQLException("SQLException"));
+                }
+            }).when(repoContainerMock).executeScriptInternal(nullable(WebScriptRequest.class), nullable(WebScriptResponse.class), nullable(Authenticator.class));
+            try
+            {
+                repoContainerMock.executeScript(null, null, null);
+            }
+            catch (Exception e)
+            {
+                assertNull("SQLException cause should be hidden for client", ExceptionStackUtil.getCause(e, new Class[] { SQLException.class }));
+                assertTrue("Details should be in the server logs.", HIDDEN_EXCEPTION_PATTERN.matcher(e.getMessage()).matches());
+            }
+
+            // case: FormException
+            Mockito.doAnswer(new Answer<Object>()
+            {
+                public Object answer(InvocationOnMock invocation)
+                {
+                    throw new FormException(messageFormException);
+                }
+            }).when(repoContainerMock).executeScriptInternal(nullable(WebScriptRequest.class), nullable(WebScriptResponse.class), nullable(Authenticator.class));
+            try
+            {
+                repoContainerMock.executeScript(null, null, null);
+            }
+            catch (Exception e)
+            {
+                assertTrue("FormException should be visible for client", e instanceof FormException);
+                assertFalse("Details should be available for client", HIDDEN_EXCEPTION_PATTERN.matcher(e.getMessage()).matches());
+                assertTrue("Actual message should be available for client", e.getMessage().contains(messageFormException));
+            }
+
+            // case: WebScriptException
+            Mockito.doAnswer(new Answer<Object>()
+            {
+                public Object answer(InvocationOnMock invocation)
+                {
+                    throw new WebScriptException(HttpServletResponse.SC_UNAUTHORIZED, messageAuthenticationException);
+                }
+            }).when(repoContainerMock).executeScriptInternal(nullable(WebScriptRequest.class), nullable(WebScriptResponse.class), nullable(Authenticator.class));
+            try
+            {
+                repoContainerMock.executeScript(null, null, null);
+            }
+            catch (Exception e)
+            {
+                assertTrue("WebScriptException should be visible for client", e instanceof WebScriptException);
+                assertFalse("Details should be available for client", HIDDEN_EXCEPTION_PATTERN.matcher(e.getMessage()).matches());
+                assertTrue("Actual message should be available for client", e.getMessage().contains(messageAuthenticationException));
+            }
+        }
+        finally
+        {
+            repoContainerMock.setNotPublicExceptions(Arrays.asList(defaultConfiguration));
+        }
+    }
+
+    public void testHideExceptionsConfiguration() throws Exception
+    {
+        final StringBuilder commandExecutionResult = new StringBuilder(128);
+        commandExecutionResult.append("Execution result: \n").append("   os:         ").append(System.getProperty("os.name")).append("\n").append("   command:    <TEST_COMMAND>")
+                .append("   succeeded:  ").append(false).append("\n").append("   exit code:  ").append(1).append("\n").append("   out:        ").append("<EMPTY>").append("\n")
+                .append("   err:        ").append("ERROR");
+
+        RepositoryContainer repoContainer = (RepositoryContainer) getServer().getApplicationContext().getBean("webscripts.container");
+        RepositoryContainer repoContainerMock = Mockito.spy(repoContainer);
+
+        Class<?>[] notPublicExceptions = repoContainerMock.getNotPublicExceptions();
+        List<Class<?>> defaultConfiguration = Arrays.asList(notPublicExceptions);
+
+        List<Class<?>> testExceptions = new LinkedList<Class<?>>();
+        testExceptions.add(SQLException.class);
+        testExceptions.add(ContentIOException.class);
+        repoContainerMock.setNotPublicExceptions(testExceptions);
+
+        try
+        {
+            // Case: MNT-12794 - test default configuration
+            Mockito.doAnswer(new Answer<Object>()
+            {
+                public Object answer(InvocationOnMock invocation)
+                {
+                    throw new ContentIOException(commandExecutionResult.toString());
+                }
+            }).when(repoContainerMock).executeScriptInternal(nullable(WebScriptRequest.class), nullable(WebScriptResponse.class), nullable(Authenticator.class));
+
+            try
+            {
+                repoContainerMock.executeScript(null, null, null);
+            }
+            catch (Exception e)
+            {
+                assertNull("'ContentIOException' cause should be hidden for client", ExceptionStackUtil.getCause(e, new Class[] { ContentIOException.class }));
+                assertTrue("Details should be in the server logs.", HIDDEN_EXCEPTION_PATTERN.matcher(e.getMessage()).matches());
+            }
+
+            // Case: MNT-12794 - ContentIOException in AlfrescoRuntimeException and default configuration
+            Mockito.doAnswer(new Answer<Object>()
+            {
+                public Object answer(InvocationOnMock invocation)
+                {
+
+                    throw new AlfrescoRuntimeException("AlfrescoRuntimeException", new ContentIOException(commandExecutionResult.toString()));
+                }
+            }).when(repoContainerMock).executeScriptInternal(nullable(WebScriptRequest.class), nullable(WebScriptResponse.class), nullable(Authenticator.class));
+
+            try
+            {
+                repoContainerMock.executeScript(null, null, null);
+            }
+            catch (Exception e)
+            {
+                assertNull("'ContentIOException' cause should be hidden for client", ExceptionStackUtil.getCause(e, new Class[] { ContentIOException.class }));
+                assertTrue("Details should be in the server logs.", HIDDEN_EXCEPTION_PATTERN.matcher(e.getMessage()).matches());
+            }
+
+            // case: AlfrescoRuntimeException without ContentIOException
+            Mockito.doAnswer(new Answer<Object>()
+            {
+                public Object answer(InvocationOnMock invocation)
+                {
+                    throw new AlfrescoRuntimeException("AlfrescoRuntimeException", new NullPointerException("NullPointerException"));
+                }
+            }).when(repoContainerMock).executeScriptInternal(nullable(WebScriptRequest.class), nullable(WebScriptResponse.class), nullable(Authenticator.class));
+
+            try
+            {
+                repoContainerMock.executeScript(null, null, null);
+            }
+            catch (Exception e)
+            {
+                assertNotNull("'NullPointerException' cause should be visible for client", ExceptionStackUtil.getCause(e, new Class[] { NullPointerException.class }));
+                assertFalse("Details should be available for client", HIDDEN_EXCEPTION_PATTERN.matcher(e.getMessage()).matches());
+            }
+
+            // case: RuntimeException with several different exceptions which should be shown
+            List<Class<?>> updatedNotPublicExceptions = new LinkedList<Class<?>>(defaultConfiguration);
+            updatedNotPublicExceptions.add(NullPointerException.class);
+            repoContainerMock.setNotPublicExceptions(updatedNotPublicExceptions);
+
+            Mockito.doAnswer(new Answer<Object>()
+            {
+                public Object answer(InvocationOnMock invocation)
+                {
+                    throw new AlfrescoRuntimeException("AlfrescoRuntimeException", new NullPointerException("NullPointerException"));
+                }
+            }).when(repoContainerMock).executeScriptInternal(nullable(WebScriptRequest.class), nullable(WebScriptResponse.class), nullable(Authenticator.class));
+
+            try
+            {
+                repoContainerMock.executeScript(null, null, null);
+            }
+            catch (Exception e)
+            {
+                assertNull("'NullPointerException' cause should be hidden for client", ExceptionStackUtil.getCause(e, new Class[] { NullPointerException.class }));
+                assertTrue("Details should be in the server logs.", HIDDEN_EXCEPTION_PATTERN.matcher(e.getMessage()).matches());
+            }
+
+            // case: all exceptions must be shown
+            repoContainerMock.setNotPublicExceptions(null);
+
+            Mockito.doAnswer(new Answer<Object>()
+            {
+                public Object answer(InvocationOnMock invocation)
+                {
+                    throw new AlfrescoRuntimeException("AlfrescoRuntimeException", new ContentIOException(commandExecutionResult.toString(), new NullPointerException(
+                            "NullPointerException")));
+                }
+            }).when(repoContainerMock).executeScriptInternal(nullable(WebScriptRequest.class), nullable(WebScriptResponse.class), nullable(Authenticator.class));
+
+            try
+            {
+                repoContainerMock.executeScript(null, null, null);
+            }
+            catch (Exception e)
+            {
+                assertTrue("'AlfrescoRuntimeException' cause should not be hidden for client. Exception class: " + e.getClass().getName(), e instanceof AlfrescoRuntimeException);
+                assertNotNull("'ContentIOException' cause should not be hidden for client", ExceptionStackUtil.getCause(e, new Class[] { ContentIOException.class }));
+                assertNotNull("'NullPointerException' cause should not be hidden for client", ExceptionStackUtil.getCause(e, new Class[] { NullPointerException.class }));
+                assertFalse("Details should be available for client", HIDDEN_EXCEPTION_PATTERN.matcher(e.getMessage()).matches());
+            }
+
+            // case: all exceptions must be shown
+            repoContainerMock.setNotPublicExceptions(defaultConfiguration);
+            repoContainerMock.setNotPublicExceptions(new LinkedList<Class<?>>());
+
+            Mockito.doAnswer(new Answer<Object>()
+            {
+                public Object answer(InvocationOnMock invocation)
+                {
+                    throw new AlfrescoRuntimeException("AlfrescoRuntimeException", new ContentIOException(commandExecutionResult.toString(), new NullPointerException(
+                            "NullPointerException")));
+                }
+            }).when(repoContainerMock).executeScriptInternal(nullable(WebScriptRequest.class), nullable(WebScriptResponse.class), nullable(Authenticator.class));
+
+            try
+            {
+                repoContainerMock.executeScript(null, null, null);
+            }
+            catch (Exception e)
+            {
+                assertTrue("'AlfrescoRuntimeException' cause should not be hidden for client. Exception class: " + e.getClass().getName(), e instanceof AlfrescoRuntimeException);
+                assertNotNull("'ContentIOException' cause should not be hidden for client", ExceptionStackUtil.getCause(e, new Class[] { ContentIOException.class }));
+                assertNotNull("'NullPointerException' cause should not be hidden for client", ExceptionStackUtil.getCause(e, new Class[] { NullPointerException.class }));
+                assertFalse("Details should be available for client", HIDDEN_EXCEPTION_PATTERN.matcher(e.getMessage()).matches());
+            }
+        }
+        finally
+        {
+            repoContainerMock.setNotPublicExceptions(defaultConfiguration);
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/TestDeclarativeSpreadsheetWebScriptGet.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/TestDeclarativeSpreadsheetWebScriptGet.java
new file mode 100644
index 00000000000..6893362d587
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/TestDeclarativeSpreadsheetWebScriptGet.java
@@ -0,0 +1,91 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.apache.commons.csv.CSVPrinter;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Test class for DeclarativeSpreadsheetWebScriptTest class
+ * @author alex.mukha
+ * @since 4.2.4
+ */
+public class TestDeclarativeSpreadsheetWebScriptGet extends DeclarativeSpreadsheetWebScript
+{
+    @Override
+    protected Object identifyResource(String format, WebScriptRequest req)
+    {
+        return null;
+    }
+
+    @Override
+    protected boolean allowHtmlFallback()
+    {
+        return false;
+    }
+
+    @Override
+    protected List<Pair<QName, Boolean>> buildPropertiesForHeader(Object resource, String format, WebScriptRequest req)
+    {
+        List<Pair<QName,Boolean>> properties = 
+                new ArrayList<Pair<QName,Boolean>>(DeclarativeSpreadsheetWebScriptTest.COLUMNS.length);
+            boolean required = true;
+            for(QName qname : DeclarativeSpreadsheetWebScriptTest.COLUMNS) 
+            {
+                Pair<QName,Boolean> p = null;
+                if(qname != null)
+                {
+                    p = new Pair<QName, Boolean>(qname, required);
+                }
+                else
+                {
+                    required = false;
+                }
+                properties.add(p);
+            }
+            return properties;
+    }
+
+    @Override
+    protected void populateBody(Object resource, Workbook workbook, Sheet sheet, List<QName> properties) throws IOException
+    {
+        // Set the sheet name
+        workbook.setSheetName(0, "test");
+    }
+
+    @Override
+    protected void populateBody(Object resource, CSVPrinter csv, List<QName> properties) throws IOException
+    {
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java
new file mode 100644
index 00000000000..a74d4d4a572
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java
@@ -0,0 +1,127 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.alfresco.repo.model.filefolder.RemoteFileFolderLoaderTest;
+import org.alfresco.repo.web.scripts.action.RunningActionRestApiTest;
+import org.alfresco.repo.web.scripts.activities.feed.control.FeedControlTest;
+import org.alfresco.repo.web.scripts.admin.AdminWebScriptTest;
+import org.alfresco.repo.web.scripts.audit.AuditWebScriptTest;
+import org.alfresco.repo.web.scripts.blogs.BlogServiceTest;
+import org.alfresco.repo.web.scripts.comment.CommentsApiTest;
+import org.alfresco.repo.web.scripts.custommodel.CustomModelImportTest;
+import org.alfresco.repo.web.scripts.dictionary.DictionaryRestApiTest;
+import org.alfresco.repo.web.scripts.discussion.DiscussionRestApiTest;
+import org.alfresco.repo.web.scripts.facet.FacetRestApiTest;
+import org.alfresco.repo.web.scripts.forms.FormRestApiGet_Test;
+import org.alfresco.repo.web.scripts.forms.FormRestApiJsonPost_Test;
+import org.alfresco.repo.web.scripts.groups.GroupsTest;
+import org.alfresco.repo.web.scripts.invitation.InvitationWebScriptTest;
+import org.alfresco.repo.web.scripts.invite.InviteServiceTest;
+import org.alfresco.repo.web.scripts.links.LinksRestApiTest;
+import org.alfresco.repo.web.scripts.node.NodeWebScripTest;
+import org.alfresco.repo.web.scripts.person.PersonServiceTest;
+import org.alfresco.repo.web.scripts.preference.PreferenceServiceTest;
+import org.alfresco.repo.web.scripts.quickshare.QuickShareRestApiTest;
+import org.alfresco.repo.web.scripts.rating.RatingRestApiTest;
+import org.alfresco.repo.web.scripts.replication.ReplicationRestApiTest;
+import org.alfresco.repo.web.scripts.rule.RuleServiceTest;
+import org.alfresco.repo.web.scripts.search.PersonSearchTest;
+import org.alfresco.repo.web.scripts.site.SiteServiceTest;
+import org.alfresco.repo.web.scripts.site.SurfConfigTest;
+import org.alfresco.repo.web.scripts.solr.SOLRWebScriptTest;
+import org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceRestApiTest;
+import org.alfresco.repo.web.scripts.tagging.TaggingServiceTest;
+import org.alfresco.repo.web.scripts.thumbnail.ThumbnailServiceTest;
+import org.alfresco.repo.web.scripts.transfer.TransferWebScriptTest;
+import org.alfresco.repo.web.scripts.workflow.ActivitiWorkflowRestApiTest;
+import org.alfresco.repo.web.scripts.workflow.WorkflowModelBuilderTest;
+import org.alfresco.repo.web.scripts.content.ContentGetTest;
+
+/**
+ * Web Scripts test suite
+ */
+public class WebScriptTestSuite extends TestSuite
+{
+    public static Test suite()
+    {
+        TestSuite suite = new TestSuite();
+        
+        // Ensure that a suitable context is available
+        TestWebScriptRepoServer.getTestServer();
+        
+        // Add the tests
+        suite.addTestSuite( QuickShareRestApiTest.class );
+        suite.addTestSuite( AdminWebScriptTest.class );
+        suite.addTestSuite( AuditWebScriptTest.class );
+        suite.addTestSuite( BlogServiceTest.class );
+        suite.addTestSuite( DictionaryRestApiTest.class );
+        suite.addTestSuite( DiscussionRestApiTest.class );
+        suite.addTestSuite( FeedControlTest.class );
+        suite.addTestSuite( FormRestApiGet_Test.class );
+        suite.addTestSuite( FormRestApiJsonPost_Test.class );
+        suite.addTestSuite( GroupsTest.class );
+        suite.addTestSuite( InvitationWebScriptTest.class );
+        suite.addTestSuite( InviteServiceTest.class );
+        suite.addTestSuite( LoginTest.class );
+        suite.addTestSuite( PersonSearchTest.class );
+        suite.addTestSuite( PersonServiceTest.class );
+        suite.addTestSuite( PreferenceServiceTest.class );
+        suite.addTestSuite( RatingRestApiTest.class );
+        suite.addTestSuite( ReplicationRestApiTest.class );
+        suite.addTestSuite( RepositoryContainerTest.class );
+        suite.addTestSuite( RuleServiceTest.class );
+        suite.addTestSuite( RunningActionRestApiTest.class );
+        suite.addTestSuite( SiteServiceTest.class );
+        suite.addTestSuite( TaggingServiceTest.class );
+        suite.addTestSuite( ThumbnailServiceTest.class );
+        suite.addTestSuite( TransferWebScriptTest.class );
+        suite.addTestSuite( WorkflowModelBuilderTest.class );
+        suite.addTestSuite( ActivitiWorkflowRestApiTest.class );
+        suite.addTestSuite( SOLRWebScriptTest.class );
+        suite.addTestSuite( SubscriptionServiceRestApiTest.class );
+        suite.addTestSuite( FacetRestApiTest.class );
+        suite.addTestSuite( CommentsApiTest.class );
+        suite.addTestSuite( DeclarativeSpreadsheetWebScriptTest.class );
+        suite.addTestSuite( ContentGetTest.class);
+        suite.addTestSuite( XssVulnerabilityTest.class );
+        suite.addTestSuite( LinksRestApiTest.class );
+        suite.addTestSuite( RemoteFileFolderLoaderTest.class );
+        suite.addTestSuite( ReadOnlyTransactionInGetRestApiTest.class );
+        suite.addTestSuite( CustomModelImportTest.class );
+        suite.addTestSuite( SurfConfigTest.class );
+        suite.addTestSuite( NodeWebScripTest.class );
+        // This uses a slightly different context
+        // As such, we can't run it in the same suite as the others,
+        //  due to finalisers closing caches when we're not looking
+        //suite.addTestSuite( AssetTest.class );
+        
+        return suite;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/XssVulnerabilityTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/XssVulnerabilityTest.java
new file mode 100755
index 00000000000..7fe9c75964a
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/XssVulnerabilityTest.java
@@ -0,0 +1,274 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts;
+
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.experimental.categories.Category;
+import org.springframework.extensions.webscripts.DeclarativeRegistry;
+import org.springframework.extensions.webscripts.Description;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Request;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+import org.springframework.extensions.webscripts.WebScript;
+import org.springframework.extensions.webscripts.WebScriptException;
+
+/**
+ * https://issues.alfresco.com/jira/browse/MNT-13180
+ * 
+ * Customer would like to be sure that we protect ourselves against unsanitized user inputs that can lead to XSS vulnerabilities.
+ * This probably means (at least) implementing a Unit Test framework that injects into each webscript listed at:
+ * http://localhost:8080/alfresco/wcservice/index/uri/
+ * and for each documented parameter malicious input such as those used by our customer to detect the ones he found
+ * 
+ * @author Viachaslau Tsikhanovich
+ */
+@Category(LuceneTests.class)
+public class XssVulnerabilityTest extends BaseWebScriptTest 
+{
+    private Log logger = LogFactory.getLog(XssVulnerabilityTest.class);
+
+    private DeclarativeRegistry webscriptsRegistry;
+
+    static final String START_ARG = "{";
+    static final String END_ARG = "}";
+
+    static final String[] METHODS_TO_CHECK_ARRAY = { "GET", "DELETE", "POST", "PUT" };
+    static final Set<String> METHODS_TO_CHECK_SET = new HashSet<String>(Arrays.asList(METHODS_TO_CHECK_ARRAY));
+    static final String[] FORMATS_TO_CHECK_ARRAY = { "html" };
+    static final Set<String> FORMATS_TO_CHECK_SET = new HashSet<String>(Arrays.asList(FORMATS_TO_CHECK_ARRAY));
+    static final String[] URI_TO_SKIP_ARRAY = { ".rss", ".atom" }; // javascript is not executed for feeds
+
+    static final String MALARG1 = "<script>alert('XSS')</script>";
+    static final String MALARG2 = "</script><script>alert('XSS')</script>";
+    static final String MALARG3 = "\"</script><script>alert('XSS')</script>";
+    static final String MALARG4 = "'\"</style></script><script>alert('XSS')</script>";
+    static final String[] MALICIOUS_ARGS = { MALARG1, MALARG2, MALARG3, MALARG4 };
+    static final String[] SKIP_WEBSCRIPT_CHECK_ARRAY =  {
+           "org/alfresco/cmis/client/cmisbrowser/federatedquery.get",  /** argument is put into form's textarea but javascript is not executed **/
+           "org/alfresco/cmis/test.post.desc.xml"
+        };
+    static final Set<String> SKIP_WEBSCRIPT_CHECK_ID_SET = new HashSet<String>(Arrays.asList(SKIP_WEBSCRIPT_CHECK_ARRAY));
+    
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        this.webscriptsRegistry = (DeclarativeRegistry)getServer().getApplicationContext().getBean("webscripts.registry.prototype");
+
+        setDefaultRunAs(AuthenticationUtil.getAdminUserName());
+    }
+
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+
+    protected Log getLogger()
+    {
+        return logger;
+    }
+
+    public void testXssVulnerability() throws Throwable
+    {
+        webscriptsRegistry.reset();
+        final int scriptsSize = webscriptsRegistry.getWebScripts().size();
+        int i = 0, successCount = 0, wserrcount = 0, vulnCount = 0;
+        LinkedList<String> vulnerabileURLS = new LinkedList<String>();
+        for(WebScript ws : webscriptsRegistry.getWebScripts())
+        {
+            if (getLogger().isDebugEnabled())
+            {
+                getLogger().debug("progress: " + ++i + "/" + scriptsSize);
+            }
+
+            Description wsDesc = ws.getDescription();
+            if (SKIP_WEBSCRIPT_CHECK_ID_SET.contains(wsDesc.getId()))
+            {
+                // skip
+                continue;
+            }
+
+            boolean isMethodCheck = METHODS_TO_CHECK_SET.contains(wsDesc.getMethod());
+            boolean isFormatCheck = FORMATS_TO_CHECK_SET.contains(wsDesc.getDefaultFormat());
+            if (isMethodCheck && isFormatCheck)
+            {
+                for (String malArg : MALICIOUS_ARGS)
+                {
+                    String[] uris = wsDesc.getURIs();
+                    for (String uri : uris)
+                    {
+                        if (isUriSkip(uri))
+                        {
+                            continue;
+                        }
+
+                        // always parse url because we cannot rely on getArguments():
+                        // - sometimes getArguments() returns null although URI has arguments
+                        // - sometimes getArguments() returns set of args that does not contain args from url
+                        List<String> parsedArgs = parseArgsFromURI(uri);
+                        if (0 == parsedArgs.size())
+                        {
+                            // no arguments in uri, skip
+                            continue;
+                        }
+
+                        String url = substituteMaliciousArgInURI(uri, parsedArgs, malArg);
+                        Response resp;
+                        try
+                        {
+                            resp = sendRequest(createRequest(wsDesc.getMethod(), url), -1);
+                        }
+                        catch (WebScriptException e)
+                        {
+                            // skip webscript errors
+                            ++ wserrcount;
+                            continue;
+                        }
+                        
+                        String respString = resp.getContentAsString();
+                        if (resp.getStatus() == Status.STATUS_OK)
+                        {
+                            ++successCount;
+                        }
+
+                        // do case insensitive check because argument can be converted to lowercase on page
+                        if (respString.toLowerCase().contains(malArg.toLowerCase()))
+                        {
+                            vulnerabileURLS.add(wsDesc.getMethod() + " " + url);
+                            vulnCount++;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (getLogger().isDebugEnabled())
+        {
+            getLogger().debug("OK html responses count: " + successCount);
+            getLogger().debug("Webscript errors count: " + wserrcount);
+            getLogger().debug("Vulnerabile URLs count: " + vulnCount);
+        }
+
+        for (String url : vulnerabileURLS)
+        {
+            getLogger().warn("Vulnerabile URL: " + url);
+        }
+        assertTrue("Vulnerabile URLs found: " + vulnerabileURLS, vulnerabileURLS.size() == 0);
+    }
+
+    private boolean isUriSkip(String uri)
+    {
+        for (String uriPart : URI_TO_SKIP_ARRAY)
+        {
+            if (uri.contains(uriPart))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private List<String> parseArgsFromURI(String uri)
+    {
+        List<String> args = new LinkedList<String>();
+        int startBracketInd = uri.indexOf(START_ARG, 0);
+        while (startBracketInd != -1)
+        {
+            int endBracketInd = uri.indexOf(END_ARG, startBracketInd);
+            if (endBracketInd != -1)
+            {
+                String arg = uri.substring(startBracketInd + 1, endBracketInd);
+                if (arg.endsWith("?"))
+                {
+                 // optional argument
+                    arg = arg.substring(0, arg.length() - 1);
+                }
+                args.add(arg);
+                // search next argument
+                startBracketInd = uri.indexOf(START_ARG, endBracketInd);
+            }
+            else
+            {
+                // no ending bracket
+                throw new AlfrescoRuntimeException("Invalid webscript URI : " + uri);
+            }
+        }
+        return args;
+    }
+
+    private Request createRequest(String method, String url) throws Exception
+    {
+        switch (method)
+        {
+        case "DELETE":
+            return new DeleteRequest(url);
+        case "GET":
+            return new GetRequest(url);
+        case "PUT":
+            return new PutRequest(url, "{}", "application/json");
+        case "POST":
+            return new PostRequest(url, "{}", "application/json");
+        default:
+            throw new InvalidArgumentException("HTTP method not supported");
+        }
+    }
+
+    private String substituteMaliciousArgInURI(String uri, List<String> urlArgs, String malArg)
+    {
+        String url = uri;
+
+        // substitute malicious arguments
+        for (String arg : urlArgs)
+        {
+            url = url.replace(START_ARG + arg + END_ARG, "a" + malArg);
+            url = url.replace(START_ARG + arg + "?" + END_ARG, "a" + malArg);
+        }
+
+        if (url.contains(START_ARG) || url.contains(END_ARG))
+        {
+            throw new AlfrescoRuntimeException("Arguments were not properly substituted: " + url);
+        }
+
+        return url;
+    }
+
+}
+
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java
new file mode 100644
index 00000000000..f94d537fee5
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java
@@ -0,0 +1,1086 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.action;
+
+import java.util.List;
+
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.ActionImpl;
+import org.alfresco.repo.cache.SimpleCache;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.replication.ReplicationDefinitionImpl;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.person.TestPersonManager;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.action.ActionStatus;
+import org.alfresco.service.cmr.action.ActionTrackingService;
+import org.alfresco.service.cmr.action.ExecutionDetails;
+import org.alfresco.service.cmr.action.ExecutionSummary;
+import org.alfresco.service.cmr.replication.ReplicationDefinition;
+import org.alfresco.service.cmr.replication.ReplicationService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.GUID;
+import org.alfresco.util.ISO8601DateFormat;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Tests for the Running Action Webscripts
+ * @author Nick Burch
+ */
+public class RunningActionRestApiTest extends BaseWebScriptTest
+{
+    private static final String URL_RUNNING_ACTION = "api/running-action/";
+    private static final String URL_RUNNING_ACTIONS = "api/running-actions";
+    private static final String URL_RUNNING_REPLICATION_ACTIONS = "api/running-replication-actions";
+    
+    private static final String JSON = "application/json";
+    
+    private static final String USER_NORMAL = "Normal" + GUID.generate();
+    
+    private NodeService nodeService;
+    private TestPersonManager personManager;
+    private ReplicationService replicationService;
+    private TransactionService transactionService;
+    private ActionTrackingService actionTrackingService;
+    private SimpleCache<String, ExecutionDetails> executingActionsCache;
+    
+    private Repository repositoryHelper;
+    @SuppressWarnings("unused")
+    private NodeRef dataDictionary;
+    
+    /**
+     * When we're run from a suite, check the previous
+     *  test's work has finished before we run. If other
+     *  things end up on the work queue with us, we'll
+     *  get confused...
+     */
+    public void testEnsureAllQuiet() throws Exception
+    {
+        // Wait up to 2 seconds
+        for(int i=0; i<200; i++)
+        {
+            List<ExecutionSummary> actions = actionTrackingService.getAllExecutingActions();
+            if(actions.size() == 0)
+            {
+                // Good, nothing running
+                break;
+            }
+            else
+            {
+                // Wait for the previous test's stuff to finish
+                System.out.println("Waiting on " + actions.size() + " actions to finish, top is " + actions.get(0));
+                Thread.sleep(10);
+            }
+        }
+    }
+    
+    public void testRunningActionsGet() throws Exception
+    {
+        Response response;
+        
+        
+        // Not allowed if you're not an admin
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getGuestUserName());
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTIONS), Status.STATUS_UNAUTHORIZED);
+        assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+        
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_NORMAL);
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTIONS), Status.STATUS_UNAUTHORIZED);
+        assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+        
+       
+        // If nothing running, you don't get anything back
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTIONS), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        JSONArray results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(0, results.length());
+
+        
+        // Add a running action, it should show up
+        ReplicationDefinition rd = replicationService.createReplicationDefinition("Test1", "Testing");
+        replicationService.saveReplicationDefinition(rd);
+        actionTrackingService.recordActionExecuting(rd);
+        String id = rd.getId();
+        String instance = Integer.toString( ((ActionImpl)rd).getExecutionInstance() );
+        String startedAt = ISO8601DateFormat.format(rd.getExecutionStartDate()); 
+        
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTIONS), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(1, results.length());
+        
+        JSONObject jsonRD = (JSONObject)results.get(0);
+        assertNotNull(jsonRD);
+        assertEquals(id, jsonRD.get("actionId"));
+        assertEquals(ReplicationDefinitionImpl.EXECUTOR_NAME, jsonRD.get("actionType"));
+        assertEquals(instance, jsonRD.get("actionInstance"));
+        assertEquals(rd.getNodeRef().toString(), jsonRD.get("actionNodeRef"));
+        assertEquals(startedAt, jsonRD.get("startedAt"));
+        assertEquals(false, jsonRD.getBoolean("cancelRequested"));
+        assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor=" +
+              id + "=" + instance, jsonRD.get("details"));
+        
+        
+        // Ensure we didn't get any unexpected data back,
+        //  only the keys we should have done
+        JSONArray keys = jsonRD.names();
+        for(int i=0; i<keys.length(); i++) {
+           String key = keys.getString(0);
+           if(key.equals("actionId") || key.equals("actionType") ||
+               key.equals("actionInstance") || key.equals("actionNodeRef") ||
+               key.equals("startedAt") || key.equals("cancelRequested") ||
+               key.equals("details")) {
+              // All good
+           } else {
+              fail("Unexpected key '"+key+"' found in json, raw json is\n" + jsonStr);
+           }
+        }
+        
+        
+        // Change the status to pending cancel, and re-check
+        actionTrackingService.requestActionCancellation(rd);
+        
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTIONS), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(1, results.length());
+        
+        jsonRD = (JSONObject)results.get(0);
+        assertNotNull(jsonRD);
+        assertEquals(id, jsonRD.get("actionId"));
+        assertEquals(ReplicationDefinitionImpl.EXECUTOR_NAME, jsonRD.get("actionType"));
+        assertEquals(instance, jsonRD.get("actionInstance"));
+        assertEquals(rd.getNodeRef().toString(), jsonRD.get("actionNodeRef"));
+        assertEquals(startedAt, jsonRD.get("startedAt"));
+        assertEquals(true, jsonRD.getBoolean("cancelRequested"));
+        assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor=" +
+              id + "=" + instance, jsonRD.get("details"));
+        
+       
+        // Add a 2nd and 3rd - one pending, one running
+        rd = replicationService.createReplicationDefinition("Test2", "2nd Testing");
+        replicationService.saveReplicationDefinition(rd);
+        actionTrackingService.recordActionExecuting(rd);
+        String id2 = rd.getId();
+        String instance2 = Integer.toString( ((ActionImpl)rd).getExecutionInstance() );
+        String startedAt2 = ISO8601DateFormat.format(rd.getExecutionStartDate()); 
+        
+        rd = replicationService.createReplicationDefinition("AnotherTest", "3rd Testing");
+        replicationService.saveReplicationDefinition(rd);
+        actionTrackingService.recordActionPending(rd);
+        String id3 = rd.getId();
+
+        
+        // Check we got all 3
+        boolean has1 = false;
+        boolean has2 = false;
+        boolean has3 = false;
+
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTIONS), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(3, results.length());
+        
+        for(int i=0; i<3; i++) {
+           jsonRD = (JSONObject)results.get(i);
+           if(jsonRD.get("actionId").equals(id)) {
+              has1 = true;
+           }
+           if(jsonRD.get("actionId").equals(id2)) {
+              has2 = true;
+           }
+           if(jsonRD.get("actionId").equals(id3)) {
+              has3 = true;
+           }
+        }
+        assertTrue(has1);
+        assertTrue(has2);
+        assertTrue(has3);
+        
+        
+        // Remove one, check it goes
+        UserTransaction txn = transactionService.getUserTransaction();
+        txn.begin();
+        actionTrackingService.recordActionComplete(rd);
+        txn.commit();
+        has1 = false;
+        has2 = false;
+        has3 = false;
+        
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTIONS), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(2, results.length());
+        
+        for(int i=0; i<2; i++) {
+           jsonRD = (JSONObject)results.get(i);
+           if(jsonRD.get("actionId").equals(id)) {
+              has1 = true;
+           }
+           if(jsonRD.get("actionId").equals(id2)) {
+              has2 = true;
+           }
+           if(jsonRD.get("actionId").equals(id3)) {
+              has3 = true;
+           }
+        }
+        assertTrue(has1);
+        assertTrue(has2);
+        assertFalse(has3);
+
+        
+        // Check we correctly filter by node ID
+        rd = replicationService.loadReplicationDefinition("Test1");
+        
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTIONS + "?nodeRef=" +
+              rd.getNodeRef().toString()), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(1, results.length());
+        
+        jsonRD = (JSONObject)results.get(0);
+        assertNotNull(jsonRD);
+        assertEquals(id, jsonRD.get("actionId"));
+        assertEquals(ReplicationDefinitionImpl.EXECUTOR_NAME, jsonRD.get("actionType"));
+        assertEquals(instance, jsonRD.get("actionInstance"));
+        assertEquals(rd.getNodeRef().toString(), jsonRD.get("actionNodeRef"));
+        assertEquals(startedAt, jsonRD.get("startedAt"));
+        assertEquals(true, jsonRD.getBoolean("cancelRequested"));
+        assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor=" +
+              id + "=" + instance, jsonRD.get("details"));
+        
+        
+        // Check the other one
+        rd = replicationService.loadReplicationDefinition("Test2");
+        
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTIONS + "?nodeRef=" +
+              rd.getNodeRef().toString()), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(1, results.length());
+        
+        jsonRD = (JSONObject)results.get(0);
+        assertNotNull(jsonRD);
+        assertEquals(id2, jsonRD.get("actionId"));
+        assertEquals(ReplicationDefinitionImpl.EXECUTOR_NAME, jsonRD.get("actionType"));
+        assertEquals(instance2, jsonRD.get("actionInstance"));
+        assertEquals(rd.getNodeRef().toString(), jsonRD.get("actionNodeRef"));
+        assertEquals(startedAt2, jsonRD.get("startedAt"));
+        assertEquals(false, jsonRD.getBoolean("cancelRequested"));
+        assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor=" +
+              id2 + "=" + instance2, jsonRD.get("details"));
+
+        
+        // Check we correctly filter by type
+        ActionImpl alt1 = new ActionImpl(null, "12345", "MadeUp1");
+        ActionImpl alt2 = new ActionImpl(null, "54321", "MadeUp2");
+        actionTrackingService.recordActionExecuting(alt1);
+        actionTrackingService.recordActionExecuting(alt2);
+        String startAtAlt2 = ISO8601DateFormat.format( alt2.getExecutionStartDate() );
+        String instanceAlt2 = Integer.toString( alt2.getExecutionInstance() );
+        
+        // Goes up to 4 not by type
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTIONS), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(4, results.length());
+        
+        // 2 replication actions
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTIONS +
+              "?type=replicationActionExecutor"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(2, results.length());
+        
+        // 0 if doesn't exist
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTIONS +
+              "?type=MadeUp4"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(0, results.length());
+        
+        // 1 each of the made up ones
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTIONS +
+              "?type=MadeUp1"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(1, results.length());
+        
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTIONS +
+              "?type=MadeUp2"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(1, results.length());
+        
+        // Check the details of one of these
+        jsonRD = (JSONObject)results.get(0);
+        assertNotNull(jsonRD);
+        assertEquals("54321", jsonRD.get("actionId"));
+        assertEquals("MadeUp2", jsonRD.get("actionType"));
+        assertEquals(instanceAlt2, jsonRD.get("actionInstance"));
+        assertEquals(JSONObject.NULL, jsonRD.get("actionNodeRef"));
+        assertEquals(startAtAlt2, jsonRD.get("startedAt"));
+        assertEquals(false, jsonRD.getBoolean("cancelRequested"));
+        assertEquals("/" + URL_RUNNING_ACTION + "MadeUp2=54321=" +
+              instanceAlt2, jsonRD.get("details"));
+    }
+    
+    
+    public void testRunningReplicationActionsGet() throws Exception
+    {
+       Response response;
+       
+       
+       // Not allowed if you're not an admin
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getGuestUserName());
+       response = sendRequest(new GetRequest(URL_RUNNING_REPLICATION_ACTIONS), Status.STATUS_UNAUTHORIZED);
+       assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+       
+       AuthenticationUtil.setFullyAuthenticatedUser(USER_NORMAL);
+       response = sendRequest(new GetRequest(URL_RUNNING_REPLICATION_ACTIONS), Status.STATUS_UNAUTHORIZED);
+       assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+       
+      
+       // If nothing running, you don't get anything back
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+       response = sendRequest(new GetRequest(URL_RUNNING_REPLICATION_ACTIONS), 200);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       String jsonStr = response.getContentAsString();
+       JSONObject json = new JSONObject(jsonStr);
+       JSONArray results = json.getJSONArray("data");
+       assertNotNull(results);
+       assertEquals(0, results.length());
+
+       
+       // Add a running action, it should show up
+       ReplicationDefinition rd = replicationService.createReplicationDefinition("Test1", "Testing");
+       replicationService.saveReplicationDefinition(rd);
+       actionTrackingService.recordActionExecuting(rd);
+       String id = rd.getId();
+       String instance = Integer.toString( ((ActionImpl)rd).getExecutionInstance() );
+       String startedAt = ISO8601DateFormat.format(rd.getExecutionStartDate()); 
+       
+       response = sendRequest(new GetRequest(URL_RUNNING_REPLICATION_ACTIONS), 200);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr);
+       results = json.getJSONArray("data");
+       assertNotNull(results);
+       assertEquals(1, results.length());
+       
+       JSONObject jsonRD = (JSONObject)results.get(0);
+       assertNotNull(jsonRD);
+       assertEquals(id, jsonRD.get("actionId"));
+       assertEquals(ReplicationDefinitionImpl.EXECUTOR_NAME, jsonRD.get("actionType"));
+       assertEquals(instance, jsonRD.get("actionInstance"));
+       assertEquals(rd.getNodeRef().toString(), jsonRD.get("actionNodeRef"));
+       assertEquals(startedAt, jsonRD.get("startedAt"));
+       assertEquals(false, jsonRD.getBoolean("cancelRequested"));
+       assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor=" +
+             id + "=" + instance, jsonRD.get("details"));
+       
+       
+       // Ensure we didn't get any unexpected data back,
+       //  only the keys we should have done
+       JSONArray keys = jsonRD.names();
+       for(int i=0; i<keys.length(); i++) {
+          String key = keys.getString(0);
+          if(key.equals("actionId") || key.equals("actionType") ||
+              key.equals("actionInstance") || key.equals("actionNodeRef") ||
+              key.equals("startedAt") || key.equals("cancelRequested") ||
+              key.equals("details")) {
+             // All good
+          } else {
+             fail("Unexpected key '"+key+"' found in json, raw json is\n" + jsonStr);
+          }
+       }
+       
+       
+       // Change the status to pending cancel, and re-check
+       actionTrackingService.requestActionCancellation(rd);
+       
+       response = sendRequest(new GetRequest(URL_RUNNING_REPLICATION_ACTIONS), 200);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr);
+       results = json.getJSONArray("data");
+       assertNotNull(results);
+       assertEquals(1, results.length());
+       
+       jsonRD = (JSONObject)results.get(0);
+       assertNotNull(jsonRD);
+       assertEquals(id, jsonRD.get("actionId"));
+       assertEquals(ReplicationDefinitionImpl.EXECUTOR_NAME, jsonRD.get("actionType"));
+       assertEquals(instance, jsonRD.get("actionInstance"));
+       assertEquals(rd.getNodeRef().toString(), jsonRD.get("actionNodeRef"));
+       assertEquals(startedAt, jsonRD.get("startedAt"));
+       assertEquals(true, jsonRD.getBoolean("cancelRequested"));
+       assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor=" +
+             id + "=" + instance, jsonRD.get("details"));
+       
+      
+       // Add a 2nd and 3rd, one running and one pending
+       rd = replicationService.createReplicationDefinition("Test2", "2nd Testing");
+       replicationService.saveReplicationDefinition(rd);
+       actionTrackingService.recordActionExecuting(rd);
+       String id2 = rd.getId();
+       @SuppressWarnings("unused")
+       String instance2 = Integer.toString( ((ActionImpl)rd).getExecutionInstance() );
+       @SuppressWarnings("unused")
+       String startedAt2 = ISO8601DateFormat.format(rd.getExecutionStartDate()); 
+       
+       rd = replicationService.createReplicationDefinition("AnotherTest", "3rd Testing");
+       replicationService.saveReplicationDefinition(rd);
+       actionTrackingService.recordActionPending(rd);
+       String id3 = rd.getId();
+
+       
+       // Check we got all 3
+       boolean has1 = false;
+       boolean has2 = false;
+       boolean has3 = false;
+
+       response = sendRequest(new GetRequest(URL_RUNNING_REPLICATION_ACTIONS), 200);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr);
+       results = json.getJSONArray("data");
+       assertNotNull(results);
+       assertEquals(3, results.length());
+       
+       for(int i=0; i<3; i++) {
+          jsonRD = (JSONObject)results.get(i);
+          if(jsonRD.get("actionId").equals(id)) {
+             has1 = true;
+          }
+          if(jsonRD.get("actionId").equals(id2)) {
+             has2 = true;
+          }
+          if(jsonRD.get("actionId").equals(id3)) {
+             has3 = true;
+          }
+       }
+       assertTrue(has1);
+       assertTrue(has2);
+       assertTrue(has3);
+       
+       
+       // Remove one, check it goes
+       UserTransaction txn = transactionService.getUserTransaction();
+       txn.begin();
+       actionTrackingService.recordActionComplete(rd);
+       txn.commit();
+       has1 = false;
+       has2 = false;
+       has3 = false;
+       
+       response = sendRequest(new GetRequest(URL_RUNNING_REPLICATION_ACTIONS), 200);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr);
+       results = json.getJSONArray("data");
+       assertNotNull(results);
+       assertEquals(2, results.length());
+       
+       for(int i=0; i<2; i++) {
+          jsonRD = (JSONObject)results.get(i);
+          if(jsonRD.get("actionId").equals(id)) {
+             has1 = true;
+          }
+          if(jsonRD.get("actionId").equals(id2)) {
+             has2 = true;
+          }
+          if(jsonRD.get("actionId").equals(id3)) {
+             has3 = true;
+          }
+       }
+       assertTrue(has1);
+       assertTrue(has2);
+       assertFalse(has3);
+
+       
+       // Check we correctly filter by name
+       rd = replicationService.loadReplicationDefinition("Test1");
+       
+       response = sendRequest(new GetRequest(URL_RUNNING_REPLICATION_ACTIONS + "?name=Test1"), 200);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr);
+       results = json.getJSONArray("data");
+       assertNotNull(results);
+       assertEquals(1, results.length());
+       
+       jsonRD = (JSONObject)results.get(0);
+       assertNotNull(jsonRD);
+       assertEquals(id, jsonRD.get("actionId"));
+       assertEquals(ReplicationDefinitionImpl.EXECUTOR_NAME, jsonRD.get("actionType"));
+       assertEquals(instance, jsonRD.get("actionInstance"));
+       assertEquals(rd.getNodeRef().toString(), jsonRD.get("actionNodeRef"));
+       assertEquals(startedAt, jsonRD.get("startedAt"));
+       assertEquals(true, jsonRD.getBoolean("cancelRequested"));
+       assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor=" +
+             id + "=" + instance, jsonRD.get("details"));
+       
+
+       // Check we correctly filter by type
+       ActionImpl alt1 = new ActionImpl(null, "12345", "MadeUp1");
+       ActionImpl alt2 = new ActionImpl(null, "54321", "MadeUp2");
+       actionTrackingService.recordActionExecuting(alt1);
+       actionTrackingService.recordActionExecuting(alt2);
+       @SuppressWarnings("unused")
+       String startAtAlt2 = ISO8601DateFormat.format( alt2.getExecutionStartDate() );
+       @SuppressWarnings("unused")
+       String instanceAlt2 = Integer.toString( alt2.getExecutionInstance() );
+       
+       // 2 replication actions
+       response = sendRequest(new GetRequest(URL_RUNNING_REPLICATION_ACTIONS), 200);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr);
+       results = json.getJSONArray("data");
+       assertNotNull(results);
+       assertEquals(2, results.length());
+    }
+    
+    
+    public void testRunningActionGet() throws Exception
+    {
+        Response response;
+        
+        
+        // Not allowed if you're not an admin
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getGuestUserName());
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTION + "MadeUp"), Status.STATUS_UNAUTHORIZED);
+        assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+        
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_NORMAL);
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTION + "MadeUp"), Status.STATUS_UNAUTHORIZED);
+        assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+        
+       
+        // If not found, you get a 404
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTION + "MadeUp"), Status.STATUS_NOT_FOUND);
+        assertEquals(Status.STATUS_NOT_FOUND, response.getStatus());
+
+        
+        // Create one
+        ReplicationDefinition rd = replicationService.createReplicationDefinition("Test1", "Testing");
+        replicationService.saveReplicationDefinition(rd);
+        actionTrackingService.recordActionExecuting(rd);
+        String id = rd.getId();
+        String instance = Integer.toString( ((ActionImpl)rd).getExecutionInstance() );
+        String startedAt = ISO8601DateFormat.format(rd.getExecutionStartDate());
+        String key1 = "replicationActionExecutor=" + id + "=" + instance; 
+        
+        
+        // Fetch the details of it
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTION + key1), Status.STATUS_OK);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        String jsonStr = response.getContentAsString();
+        JSONObject jsonRD = new JSONObject(jsonStr).getJSONObject("data");
+        assertNotNull(jsonRD);
+        assertEquals(id, jsonRD.get("actionId"));
+        assertEquals(ReplicationDefinitionImpl.EXECUTOR_NAME, jsonRD.get("actionType"));
+        assertEquals(instance, jsonRD.get("actionInstance"));
+        assertEquals(rd.getNodeRef().toString(), jsonRD.get("actionNodeRef"));
+        assertEquals(startedAt, jsonRD.get("startedAt"));
+        assertEquals(false, jsonRD.getBoolean("cancelRequested"));
+        assertEquals("/" + URL_RUNNING_ACTION + key1, jsonRD.get("details"));
+        
+        
+        // Ensure we didn't get any unexpected data back,
+        //  only the keys we should have done
+        JSONArray keys = jsonRD.names();
+        for(int i=0; i<keys.length(); i++) {
+           String key = keys.getString(0);
+           if(key.equals("actionId") || key.equals("actionType") ||
+               key.equals("actionInstance") || key.equals("actionNodeRef") ||
+               key.equals("startedAt") || key.equals("cancelRequested") ||
+               key.equals("details")) {
+              // All good
+           } else {
+              fail("Unexpected key '"+key+"' found in json, raw json is\n" + jsonStr);
+           }
+        }
+        
+        
+        // Add another which is cancelled, check that
+        //  we get the correct, different details for it
+        rd = replicationService.createReplicationDefinition("Test2", "Testing");
+        replicationService.saveReplicationDefinition(rd);
+        actionTrackingService.recordActionExecuting(rd);
+        actionTrackingService.requestActionCancellation(rd);
+        String id2 = rd.getId();
+        String instance2 = Integer.toString( ((ActionImpl)rd).getExecutionInstance() );
+        String startedAt2 = ISO8601DateFormat.format(rd.getExecutionStartDate());
+        String key2 = "replicationActionExecutor=" + id2 + "=" + instance2; 
+        
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTION + key2), Status.STATUS_OK);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        jsonRD = new JSONObject(jsonStr).getJSONObject("data");
+        assertNotNull(jsonRD);
+        assertEquals(id2, jsonRD.get("actionId"));
+        assertEquals(ReplicationDefinitionImpl.EXECUTOR_NAME, jsonRD.get("actionType"));
+        assertEquals(instance2, jsonRD.get("actionInstance"));
+        assertEquals(rd.getNodeRef().toString(), jsonRD.get("actionNodeRef"));
+        assertEquals(startedAt2, jsonRD.get("startedAt"));
+        assertEquals(true, jsonRD.getBoolean("cancelRequested"));
+        assertEquals("/" + URL_RUNNING_ACTION + key2, jsonRD.get("details"));
+        
+        
+        // Check that the original is unchanged
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTION + key1), Status.STATUS_OK);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        rd = replicationService.loadReplicationDefinition("Test1");
+        jsonStr = response.getContentAsString();
+        jsonRD = new JSONObject(jsonStr).getJSONObject("data");
+        assertNotNull(jsonRD);
+        assertEquals(id, jsonRD.get("actionId"));
+        assertEquals(ReplicationDefinitionImpl.EXECUTOR_NAME, jsonRD.get("actionType"));
+        assertEquals(instance, jsonRD.get("actionInstance"));
+        assertEquals(rd.getNodeRef().toString(), jsonRD.get("actionNodeRef"));
+        assertEquals(startedAt, jsonRD.get("startedAt"));
+        assertEquals(false, jsonRD.getBoolean("cancelRequested"));
+        assertEquals("/" + URL_RUNNING_ACTION + key1, jsonRD.get("details"));
+        
+        
+        // Add one that is pending - has everything except start date
+        rd = replicationService.createReplicationDefinition("Test3", "Testing");
+        replicationService.saveReplicationDefinition(rd);
+        actionTrackingService.recordActionPending(rd);
+        String id3 = rd.getId();
+        String instance3 = Integer.toString( ((ActionImpl)rd).getExecutionInstance() );
+        String key3 = "replicationActionExecutor=" + id3 + "=" + instance3; 
+        
+        response = sendRequest(new GetRequest(URL_RUNNING_ACTION + key3), Status.STATUS_OK);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        jsonRD = new JSONObject(jsonStr).getJSONObject("data");
+        assertNotNull(jsonRD);
+        assertEquals(id3, jsonRD.get("actionId"));
+        assertEquals(ReplicationDefinitionImpl.EXECUTOR_NAME, jsonRD.get("actionType"));
+        assertEquals(instance3, jsonRD.get("actionInstance"));
+        assertEquals(rd.getNodeRef().toString(), jsonRD.get("actionNodeRef"));
+        assertEquals(JSONObject.NULL, jsonRD.get("startedAt"));
+        assertEquals(false, jsonRD.getBoolean("cancelRequested"));
+        assertEquals("/" + URL_RUNNING_ACTION + key3, jsonRD.get("details"));
+    }
+    
+    public void testRunningActionCancel() throws Exception 
+    {
+       Response response;
+       
+       
+       // Not allowed if you're not an admin
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getGuestUserName());
+       response = sendRequest(new DeleteRequest(URL_RUNNING_ACTION + "MadeUp"), Status.STATUS_UNAUTHORIZED);
+       assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+       
+       AuthenticationUtil.setFullyAuthenticatedUser(USER_NORMAL);
+       response = sendRequest(new DeleteRequest(URL_RUNNING_ACTION + "MadeUp"), Status.STATUS_UNAUTHORIZED);
+       assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+       
+      
+       // If not found, you get a 404
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+       response = sendRequest(new DeleteRequest(URL_RUNNING_ACTION + "MadeUp"), Status.STATUS_NOT_FOUND);
+       assertEquals(Status.STATUS_NOT_FOUND, response.getStatus());
+
+       
+       // Create one
+       ReplicationDefinition rd = replicationService.createReplicationDefinition("Test1", "Testing");
+       replicationService.saveReplicationDefinition(rd);
+       actionTrackingService.recordActionExecuting(rd);
+       String id = rd.getId();
+       String instance = Integer.toString( ((ActionImpl)rd).getExecutionInstance() );
+       String key = "replicationActionExecutor=" + id + "=" + instance;
+       
+       assertEquals(false, actionTrackingService.isCancellationRequested(rd));
+
+       
+       // Request it to cancel
+       response = sendRequest(new DeleteRequest(URL_RUNNING_ACTION + key), Status.STATUS_NO_CONTENT);
+       assertEquals(Status.STATUS_NO_CONTENT, response.getStatus());
+       
+       
+       // Check it was cancelled
+       assertEquals(true, actionTrackingService.isCancellationRequested(rd));
+       
+       
+       // Request again - no change
+       response = sendRequest(new DeleteRequest(URL_RUNNING_ACTION + key), Status.STATUS_NO_CONTENT);
+       assertEquals(Status.STATUS_NO_CONTENT, response.getStatus());
+       
+       assertEquals(true, actionTrackingService.isCancellationRequested(rd));
+       
+       
+       // You can ask a pending action to cancel
+       // At this time, it will remain in the queue though
+       rd = replicationService.createReplicationDefinition("Test2", "Testing");
+       replicationService.saveReplicationDefinition(rd);
+       actionTrackingService.recordActionPending(rd);
+       String id2 = rd.getId();
+       String instance2 = Integer.toString( ((ActionImpl)rd).getExecutionInstance() );
+       String key2 = "replicationActionExecutor=" + id2 + "=" + instance2;
+       
+       
+       // Should be in the cache, but not not running and not cancelled
+       assertEquals(false, actionTrackingService.isCancellationRequested(rd));
+       assertEquals(null, rd.getExecutionStartDate());
+       
+       assertNotNull(executingActionsCache.get(key2));
+       assertFalse(executingActionsCache.get(key2).isCancelRequested());
+
+       
+       // Ask for it to be cancelled via the webscript
+       response = sendRequest(new DeleteRequest(URL_RUNNING_ACTION + key2), Status.STATUS_NO_CONTENT);
+       assertEquals(Status.STATUS_NO_CONTENT, response.getStatus());
+       
+       
+       // Should still be in the cache, not running but cancelled
+       assertNotNull(executingActionsCache.get(key2));
+       assertTrue(executingActionsCache.get(key2).isCancelRequested());
+       
+       assertEquals(true, actionTrackingService.isCancellationRequested(rd));
+       assertEquals(null, rd.getExecutionStartDate());
+    }
+    
+    public void testRunningActionsPost() throws Exception
+    {
+       Response response;
+       
+       
+       // Not allowed if you're not an admin
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getGuestUserName());
+       response = sendRequest(new PostRequest(URL_RUNNING_ACTIONS, "{}", JSON), Status.STATUS_UNAUTHORIZED);
+       assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+       
+       AuthenticationUtil.setFullyAuthenticatedUser(USER_NORMAL);
+       response = sendRequest(new PostRequest(URL_RUNNING_ACTIONS, "{}", JSON), Status.STATUS_UNAUTHORIZED);
+       assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+       
+      
+       // If no noderef supplied, will get an error
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+       response = sendRequest(new PostRequest(URL_RUNNING_ACTIONS, "{}", JSON), Status.STATUS_BAD_REQUEST);
+       assertEquals(Status.STATUS_BAD_REQUEST, response.getStatus());
+       
+       
+       // Add a running action
+       UserTransaction txn = transactionService.getUserTransaction();
+       txn.begin();
+       
+       ReplicationDefinition rd = replicationService.createReplicationDefinition("Test1", "Testing");
+       replicationService.saveReplicationDefinition(rd);
+       String id = rd.getId();
+       
+       txn.commit();
+       
+       
+       // Ask for it to be started
+       // (It should start but fail due to missing definition parts)
+       JSONObject json = new JSONObject();
+       json.put("nodeRef", rd.getNodeRef().toString());
+
+       response = sendRequest(new PostRequest(URL_RUNNING_ACTIONS, json.toString(), JSON), Status.STATUS_OK);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       // Check we got back some details on it
+       String jsonStr = response.getContentAsString();
+       JSONObject jsonRD = new JSONObject(jsonStr).getJSONObject("data");
+       assertNotNull(jsonRD);
+       
+       assertEquals(id, jsonRD.get("actionId"));
+       assertEquals(ReplicationDefinitionImpl.EXECUTOR_NAME, jsonRD.get("actionType"));
+       assertEquals(rd.getNodeRef().toString(), jsonRD.get("actionNodeRef"));
+       assertEquals(false, jsonRD.getBoolean("cancelRequested"));
+       
+       // Should be pending 
+       // Wait for it to fail (we didn't
+       //  specify enough options for a valid transfer)
+       for(int i=0; i<50; i++)
+       {
+          txn = transactionService.getUserTransaction();
+          txn.begin();
+          rd = replicationService.loadReplicationDefinition("Test1");
+          txn.commit();
+             
+          if(rd.getExecutionStatus() == ActionStatus.New)
+          {
+             // Still pending, or maybe running
+             try
+             {
+                Thread.sleep(100);
+             } catch(InterruptedException e) {}
+          }
+          else if (rd.getExecutionStatus() == ActionStatus.Failed)
+          {
+             // We're done
+             break;
+          }
+          else
+          {
+             fail("Unexpected status in repo of " + rd.getExecutionStatus());
+          }
+       }
+       assertEquals(ActionStatus.Failed, rd.getExecutionStatus());
+       
+       
+       // Ensure you can't start with an invalid nodeRef
+       json = new JSONObject();
+       json.put("nodeRef", "XX"+rd.getNodeRef().toString()+"ZZ");
+
+       response = sendRequest(new PostRequest(URL_RUNNING_ACTIONS, json.toString(), JSON), Status.STATUS_NOT_FOUND);
+       assertEquals(Status.STATUS_NOT_FOUND, response.getStatus());
+    }
+    
+    public void testRunningReplicationsActionsPost() throws Exception
+    {
+       Response response;
+       
+       
+       // Not allowed if you're not an admin
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getGuestUserName());
+       response = sendRequest(new PostRequest(URL_RUNNING_REPLICATION_ACTIONS, "{}", JSON), Status.STATUS_UNAUTHORIZED);
+       assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+       
+       AuthenticationUtil.setFullyAuthenticatedUser(USER_NORMAL);
+       response = sendRequest(new PostRequest(URL_RUNNING_REPLICATION_ACTIONS, "{}", JSON), Status.STATUS_UNAUTHORIZED);
+       assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+       
+      
+       // If no noderef supplied, will get an error
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+       response = sendRequest(new PostRequest(URL_RUNNING_REPLICATION_ACTIONS, "{}", JSON), Status.STATUS_BAD_REQUEST);
+       assertEquals(Status.STATUS_BAD_REQUEST, response.getStatus());
+       
+       
+       // Add a running action
+       UserTransaction txn = transactionService.getUserTransaction();
+       txn.begin();
+       
+       ReplicationDefinition rd = replicationService.createReplicationDefinition("Test1", "Testing");
+       replicationService.saveReplicationDefinition(rd);
+       String id = rd.getId();
+       
+       txn.commit();
+       
+       
+       // Ask for it to be started
+       // (It should start but fail due to missing definition parts)
+       JSONObject json = new JSONObject();
+       json.put("name", "Test1");
+
+       response = sendRequest(new PostRequest(URL_RUNNING_REPLICATION_ACTIONS, json.toString(), JSON), Status.STATUS_OK);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       // Check we got back some details on it
+       String jsonStr = response.getContentAsString();
+       JSONObject jsonRD = new JSONObject(jsonStr).getJSONObject("data");
+       assertNotNull(jsonRD);
+       
+       assertEquals(id, jsonRD.get("actionId"));
+       assertEquals(ReplicationDefinitionImpl.EXECUTOR_NAME, jsonRD.get("actionType"));
+       assertEquals(rd.getNodeRef().toString(), jsonRD.get("actionNodeRef"));
+       assertEquals(false, jsonRD.getBoolean("cancelRequested"));
+       
+       // Should be pending 
+       // Wait for it to fail (we didn't
+       //  specify enough options for a valid transfer)
+       for(int i=0; i<50; i++)
+       {
+          txn = transactionService.getUserTransaction();
+          txn.begin();
+          rd = replicationService.loadReplicationDefinition("Test1");
+          txn.commit();
+             
+          if(rd.getExecutionStatus() == ActionStatus.New)
+          {
+             // Still pending, or maybe running
+             try
+             {
+                Thread.sleep(100);
+             } catch(InterruptedException e) {}
+          } else if (rd.getExecutionStatus() == ActionStatus.Failed)
+          {
+             // We're done
+             break;
+          } else
+          {
+             fail("Unexpected status in repo of " + rd.getExecutionStatus());
+          }
+       }
+       assertEquals(ActionStatus.Failed, rd.getExecutionStatus());
+       
+       
+       // Ensure you can't start with an invalid name
+       json = new JSONObject();
+       json.put("name", "MadeUpName");
+
+       response = sendRequest(new PostRequest(URL_RUNNING_REPLICATION_ACTIONS, json.toString(), JSON), Status.STATUS_NOT_FOUND);
+       assertEquals(Status.STATUS_NOT_FOUND, response.getStatus());
+    }
+    
+        
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        ApplicationContext appContext = getServer().getApplicationContext();
+
+        nodeService = (NodeService)appContext.getBean("NodeService");
+        replicationService = (ReplicationService)appContext.getBean("ReplicationService");
+        actionTrackingService = (ActionTrackingService)appContext.getBean("actionTrackingService");
+        repositoryHelper = (Repository)appContext.getBean("repositoryHelper");
+        transactionService = (TransactionService)appContext.getBean("transactionService");
+        executingActionsCache = (SimpleCache<String, ExecutionDetails>)appContext.getBean("executingActionsCache");
+        
+        MutableAuthenticationService authenticationService = (MutableAuthenticationService)appContext.getBean("AuthenticationService");
+        PersonService personService = (PersonService)appContext.getBean("PersonService");
+        personManager = new TestPersonManager(authenticationService, personService, nodeService);
+
+        UserTransaction txn = transactionService.getUserTransaction();
+        txn.begin();
+        
+        personManager.createPerson(USER_NORMAL);
+        
+        // Ensure we start with no replication definitions
+        // (eg another test left them behind)
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        for(ReplicationDefinition rd : replicationService.loadReplicationDefinitions())
+        {
+           replicationService.deleteReplicationDefinition(rd);
+        }
+        txn.commit();
+        
+        // Grab a reference to the data dictionary
+        dataDictionary = nodeService.getChildByName(
+                 repositoryHelper.getCompanyHome(),
+                 ContentModel.ASSOC_CONTAINS,
+                 "Data Dictionary"
+        );
+        
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        
+        UserTransaction txn = transactionService.getUserTransaction();
+        txn.begin();
+        
+        personManager.clearPeople();
+        
+        // Zap any replication definitions we created
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        for(ReplicationDefinition rd : replicationService.loadReplicationDefinitions()) {
+           replicationService.deleteReplicationDefinition(rd);
+        }
+        AuthenticationUtil.clearCurrentSecurityContext();
+        
+        // Clear out the running actions
+        for(ExecutionSummary es : actionTrackingService.getAllExecutingActions())
+        {
+           executingActionsCache.remove(
+                 AbstractActionWebscript.getRunningId(es)
+           );
+        }
+        
+        txn.commit();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java
new file mode 100644
index 00000000000..3ca66477a89
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java
@@ -0,0 +1,878 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.activities;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.web.scripts.activities.feed.UserFeedRetrieverWebScript;
+import org.springframework.extensions.surf.util.Base64;
+import org.springframework.extensions.surf.util.ISO8601DateFormat;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+
+/**
+ * Simple Activity Service system test (requires remote repo to be running) using site (membership) activities
+ * 
+ * @author janv
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class SiteActivitySystemTest extends TestCase
+{
+    private static Log logger = LogFactory.getLog(SiteActivitySystemTest.class);
+    
+    // TODO - use test property file
+    private static final String REPO = "http://localhost:8080/alfresco";
+    
+    // web script (REST)
+    private static final String WEBSCRIPT_ENDPOINT  = REPO + "/service";
+    
+    // Site Service part-URLs
+    private static final String URL_SITES = "/api/sites";
+    private static final String URL_MEMBERSHIPS = "/memberships";
+    
+    // Person Service part-URLs
+    private static final String URL_PEOPLE = "/api/people";
+    
+    // Activity Service part-URLs
+    private static final String URL_ACTIVITIES = "/api/activities";
+    private static final String URL_SITE_FEED = "/feed/site";
+    private static final String URL_USER_FEED = "/feed/user";
+    private static final String URL_USER_FEED_CTRL = "/feed/control";
+    
+    // Test users & passwords
+    private static final String ADMIN_USER = "admin";
+    private static final String ADMIN_PW = "admin";
+    
+    private static String user1 = null;
+    private static String user2 = null;
+    private static String user3 = null;
+    private static String user4 = null;
+    
+    private static final String USER_PW = "password";
+    
+    // Test sites
+    private static String site1 = null;
+    private static String site2 = null;
+    private static String site3 = null;
+    
+    // AppToolId for site membership activities
+    private static String appToolId = "siteService"; // refer to SiteService
+    
+    private static int DELAY_MSECS = 120000; // 2 mins
+    
+    private static boolean setup = false;
+    private static boolean sitesCreated = false;
+    private static boolean membersAddedUpdated = false;
+    private static boolean membersRemoved = false;
+    private static boolean controlsCreated = false;
+    
+    
+    public SiteActivitySystemTest()
+    {
+    }
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        if (! setup)
+        {
+            String testid = ""+System.currentTimeMillis();
+            
+            site1 = "test_site1_" + testid;
+            site2 = "test_site2_" + testid;
+            site3 = "test_site3_" + testid;
+            
+            user1 = "test_user1_" + testid;
+            user2 = "test_user2_" + testid;
+            user3 = "test_user3_" + testid;
+            user4 = "test_user4_" + testid;
+            
+            // pre-create users
+            
+            String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+            assertNotNull(ticket);
+            
+            createUser(ticket, user1, USER_PW);
+            createUser(ticket, user2, USER_PW);
+            createUser(ticket, user3, USER_PW);
+            createUser(ticket, user4, USER_PW);
+            
+            setup = true;
+        }
+       
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+    
+    public void test01Login() throws Exception
+    {
+        String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+        assertNotNull(ticket);
+    }
+    
+    public void test02CreateSites() throws Exception
+    {
+        if (! sitesCreated)
+        {
+            String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+            
+            // create public site
+            createSite(site1, true, ticket);
+            
+            // create private sites
+            createSite(site2, false, ticket);
+            createSite(site3, false, ticket);
+            
+            sitesCreated = true;
+        }
+    }
+    
+    protected void createSite(String siteId, boolean isPublic, String ticket) throws Exception
+    {
+        JSONObject site = new JSONObject();
+        site.put("sitePreset", "myPreset");
+        site.put("shortName", siteId);
+        site.put("title", "myTitle");
+        site.put("description", "myDescription");
+        site.put("isPublic", isPublic);
+        
+        String url = WEBSCRIPT_ENDPOINT + URL_SITES;
+        String response = callPostWebScript(url, ticket, site.toString());
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("createSite: " + siteId);
+            logger.debug("----------");
+            logger.debug(url);
+            logger.debug(response);
+        }
+    }
+    
+    public void test03GetSites() throws Exception
+    {
+        test02CreateSites();
+        
+        String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+        
+        getSite(site1, ticket);
+        getSite(site2, ticket);
+        getSite(site3, ticket);
+    }
+    
+    protected void getSite(String siteId, String ticket) throws Exception
+    {
+        String url = WEBSCRIPT_ENDPOINT + URL_SITES + "/" + siteId;
+        String response = callGetWebScript(url, ticket);
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("getSite:" + siteId);
+            logger.debug("-------");
+            logger.debug(url);
+            logger.debug(response);
+        }
+    }
+    
+    public void test04GetSiteFeedsBefore() throws Exception
+    {
+        test02CreateSites();
+        
+        String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+        
+        getSiteFeed(site1, ticket, 0);
+        getSiteFeed(site2, ticket, 0); // site 2 is private, but accessible to admins
+        getSiteFeed(site3, ticket, 0); // site 3 is private, but accessible to admins
+        
+        ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, user4, USER_PW);
+        
+        getSiteFeed(site1, ticket, 0); // site 1 is public, hence site feed is accessible to any user of the system
+        
+        try
+        {
+            getSiteFeed(site2, ticket, 0); // site 2 is private, hence only accessible to members or admins
+            
+            fail("Site feed for private site should not be accessible to non-admin / non-member");
+        }
+        catch (IOException ioe)
+        {
+            assertTrue(ioe.getMessage().contains("HTTP response code: 401"));
+        }
+        
+        try
+        {
+            getSiteFeed(site3, ticket, 0); // site 3 is private, hence only accessible to members or admins
+            
+            fail("Site feed for private site should not be accessible to non-admin / non-member");
+        }
+        catch (IOException ioe)
+        {
+            assertTrue(ioe.getMessage().contains("HTTP response code: 401"));
+        }
+    }
+    
+    protected void getSiteFeed(String siteId, String ticket, int expectedCount) throws Exception
+    {
+        String url = WEBSCRIPT_ENDPOINT + URL_ACTIVITIES + URL_SITE_FEED + "/" + siteId + "?format=json";
+        String jsonArrayResult = callGetWebScript(url, ticket);
+        
+        if (jsonArrayResult != null)
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("getSiteFeed:" + siteId);
+                logger.debug("-----------");
+                logger.debug(url);
+                logger.debug(jsonArrayResult);
+            }
+            
+            JSONArray ja = new JSONArray(jsonArrayResult);
+            assertEquals(expectedCount, ja.length());
+        }
+        else
+        {
+            fail("Error getting site feed");
+        }
+    }
+    
+    public void test05GetUserFeedsBefore() throws Exception
+    {
+        test02CreateSites();
+        
+        // as admin
+        
+        String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+        
+        getUserFeed(user1, ticket, true, 0);
+        getUserFeed(user2, ticket, true, 0);
+        getUserFeed(user3, ticket, true, 0);
+        getUserFeed(user4, ticket, true, 0);
+        
+        // as user1
+        
+        ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, user1, USER_PW);
+        
+        getUserFeed(user1, ticket, false, 0);
+        
+        // as user2
+        
+        ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, user2, USER_PW);
+        
+        try
+        {
+            getUserFeed(user1, ticket, true, 0);
+            
+            fail("User feed should only be accessible to user or an admin");
+        }
+        catch (IOException ioe)
+        {
+            assertTrue(ioe.getMessage().contains("HTTP response code: 401"));
+        }
+        
+        
+        // as user1 - with filter args ...
+        
+        ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, user1, USER_PW);
+        
+        getUserFeed(null, site1, ticket, false, false, false, 0);
+        getUserFeed(null, site2, ticket, false, false, false, 0);
+        getUserFeed(null, site3, ticket, false, false, false, 0);
+        
+        getUserFeed(null, null, ticket, false, true, false, 0);
+        getUserFeed(null, null, ticket, false, false, true, 0);
+        getUserFeed(null, null, ticket, false, true, true, 0);
+    }
+    
+    protected void getUserFeed(String userId, String ticket, boolean isAdmin, int expectedCount) throws Exception
+    {
+        getUserFeed(userId, null, ticket, isAdmin, false, false, expectedCount);
+    }
+    
+    protected void getUserFeed(String userId, String siteId, String ticket, boolean isAdmin, boolean excludeThisUser, boolean excludeOtherUsers, int expectedCount) throws Exception
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append(WEBSCRIPT_ENDPOINT).
+           append(URL_ACTIVITIES).
+           append(URL_USER_FEED).
+           append(isAdmin ? "/" + userId : ""). // optional
+           append("?").
+           append((siteId != null) ? UserFeedRetrieverWebScript.PARAM_SITE_ID + "=" + siteId + "&": "").     // optional
+           append(excludeThisUser ? UserFeedRetrieverWebScript.PARAM_EXCLUDE_THIS_USER + "=true&" : "").     // optional
+           append(excludeOtherUsers ? UserFeedRetrieverWebScript.PARAM_EXCLUDE_OTHER_USERS + "=true&" : ""). // optional
+           append("format=json");
+        
+        String url = sb.toString();
+        String jsonArrayResult = callGetWebScript(url, ticket);
+        
+        if (jsonArrayResult != null)
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("getUserFeed:" + userId + (isAdmin ? "(as admin)" : ""));
+                logger.debug("-----------");
+                logger.debug(url);
+                logger.debug(jsonArrayResult);
+            }
+            
+            JSONArray ja = new JSONArray(jsonArrayResult);
+            assertEquals(expectedCount, ja.length());
+        }
+        else
+        {
+            fail("Error getting user feed");
+        }
+    }
+    
+    public void test06UserFeedControls() throws Exception
+    {
+        if (! controlsCreated)
+        {
+            // user 1 opts out of all activities for site 1
+            String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, user1, USER_PW);
+            addFeedControl(user1, site1, null, ticket);
+            
+            // user 2 opts out of site membership activities (across all sites)
+            ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, user2, USER_PW);
+            addFeedControl(user2, null, appToolId, ticket);
+            
+            // user 3 opts out of site membership activities for site 1 only
+            ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, user3, USER_PW);
+            addFeedControl(user3, site1, appToolId, ticket);
+            
+            // TODO add more here, once we have more appToolIds
+            
+            controlsCreated = true;
+        }
+    }
+    
+    public void test07AddAndUpdateMembershipsWithPause() throws Exception
+    {
+        if (! membersAddedUpdated)
+        {
+            test02CreateSites();
+            
+            String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+           
+            addAndUpdateMemberships(site1, ticket, true);  // public site, include all users
+            addAndUpdateMemberships(site2, ticket, true);  // private site, include all users
+            addAndUpdateMemberships(site3, ticket, false); // private site, do not include user 4
+            
+            // add pause - otherwise, activity service will not generate feed entries (since they will have already left the site)
+            Thread.sleep(DELAY_MSECS);
+            
+            membersAddedUpdated = true;
+        }
+    }
+    
+    public void test08GetSiteFeedsAfterAddAndUpdateMemberships() throws Exception
+    {
+        test02CreateSites();
+        test07AddAndUpdateMembershipsWithPause();
+        
+        String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+        
+        getSiteFeed(site1, ticket, 8); // 8 = 4 users, each with 1 join, 1 role change
+        getSiteFeed(site2, ticket, 8); // 8 = 4 users, each with 1 join, 1 role change
+        getSiteFeed(site3, ticket, 6); // 6 = 3 users, each with 1 join, 1 role change (not user 4)
+        
+        ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, user4, USER_PW);
+        
+        getSiteFeed(site1, ticket, 8);
+        getSiteFeed(site2, ticket, 8); // site 2 is private, user 4 is a member
+        
+        try
+        {
+            getSiteFeed(site3, ticket, 0); // site 3 is private, user 4 is not a member
+            
+            fail("Site feed for private site should not be accessible to non-admin / non-member");
+        }
+        catch (IOException ioe)
+        {
+            assertTrue(ioe.getMessage().contains("HTTP response code: 401"));
+        }
+    }
+    public void test09RemoveMembershipsWithPause() throws Exception
+    {
+        if (! membersRemoved)
+        {
+            test02CreateSites();
+            test07AddAndUpdateMembershipsWithPause();
+            
+            String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+            
+            removeMemberships(site1, ticket, true);
+            removeMemberships(site2, ticket, true);
+            removeMemberships(site3, ticket, false);
+            
+            // add pause
+            Thread.sleep(DELAY_MSECS);
+            
+            membersRemoved = true;
+        }
+    }
+    
+    protected void addAndUpdateMemberships(String siteId, String ticket, boolean includeUser4) throws Exception
+    {
+        // add member -> join site
+        addMembership(siteId, user1, ticket, SiteModel.SITE_CONSUMER);
+        addMembership(siteId, user2, ticket, SiteModel.SITE_MANAGER);
+        addMembership(siteId, user3, ticket, SiteModel.SITE_COLLABORATOR);
+        
+        if (includeUser4) { addMembership(siteId, user4, ticket, SiteModel.SITE_CONSUMER); }
+        
+        // update member -> change role
+        updateMembership(siteId, user1, ticket, SiteModel.SITE_MANAGER);
+        updateMembership(siteId, user2, ticket, SiteModel.SITE_COLLABORATOR);
+        updateMembership(siteId, user3, ticket, SiteModel.SITE_CONSUMER);
+        
+        if (includeUser4) { updateMembership(siteId, user4, ticket, SiteModel.SITE_COLLABORATOR); }
+    }
+    
+    protected void removeMemberships(String siteId, String ticket, boolean includeUser4) throws Exception
+    {
+        // remove member -> leave site
+        removeMembership(siteId, user1, ticket);
+        removeMembership(siteId, user2, ticket);
+        removeMembership(siteId, user3, ticket);
+        
+        if (includeUser4) { removeMembership(siteId, user4, ticket); }
+    }
+    
+    public void test10GetSiteFeedsAfterRemoveMemberships() throws Exception
+    {
+        test02CreateSites();
+        test07AddAndUpdateMembershipsWithPause();
+        test09RemoveMembershipsWithPause();
+        
+        String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+        
+        getSiteFeed(site1, ticket, 12); // 12 = 4 users, each with 1 join, 1 role change, 1 leave
+        getSiteFeed(site2, ticket, 12); // 12 = 4 users, each with 1 join, 1 role change, 1 leave
+        getSiteFeed(site3, ticket, 9);  //  9 = 3 users, each with 1 join, 1 role change, 1 leave (not user 4)
+        
+        ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, user4, USER_PW);
+        
+        getSiteFeed(site1, ticket, 12);
+        
+        try
+        {
+            getSiteFeed(site2, ticket, 0); // site 2 is private, user 4 is no longer a member
+            
+            fail("Site feed for private site should not be accessible to non-admin / non-member");
+        }
+        catch (IOException ioe)
+        {
+            assertTrue(ioe.getMessage().contains("HTTP response code: 401"));
+        }
+        
+        try
+        {
+            getSiteFeed(site3, ticket, 0); // site 3 is private, user 4 was never a member
+            
+            fail("Site feed for private site should not be accessible to non-admin / non-member");
+        }
+        catch (IOException ioe)
+        {
+            assertTrue(ioe.getMessage().contains("HTTP response code: 401"));
+        }
+    }
+    
+    public void test11GetUserFeedsAfter() throws Exception
+    {
+        test02CreateSites();
+        test07AddAndUpdateMembershipsWithPause();
+        test09RemoveMembershipsWithPause();
+        test06UserFeedControls();
+        
+        // as admin
+        
+        String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+        
+        // site 1, with 4 users, each with 1 join, 1 role change = 4x2 = 8
+        // site 2, with 4 users, each with 1 join, 1 role change = 4x2 = 8
+        // site 3, with 3 users, each with 1 join, 1 role change = 3x2 = 6
+        
+        // user 1 belongs to 3 sites = (2x9)+(1x7) = 25
+        // user 2 belongs to 3 sites = (2x9)+(1x7) = 25
+        // user 3 belongs to 3 sites = (2x9)+(1x7) = 25
+        // user 4 belongs to 2 sites = (2x9) = 18
+        
+        getUserFeed(user1, ticket, true, 16);  // 16 = (25 - 9) due to feed control - exclude site 1
+        getUserFeed(user2, ticket, true, 0);   // 0 = due to feed control - exclude site membership activities (across all sites)
+        getUserFeed(user3, ticket, true, 16);  // 16 = (25 - 9) due to feed control - exclude site membership activities for site 1
+        getUserFeed(user4, ticket, true, 18);  // 18 = no feed control
+        
+        // as user1
+        
+        ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, user1, USER_PW);
+        
+        getUserFeed(user1, ticket, false, 16);
+        
+        // as user2
+        
+        ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, user2, USER_PW);
+        
+        try
+        {
+            getUserFeed(user1, ticket, true, 16);
+            
+            fail("User feed should only be accessible to user or an admin");
+        }
+        catch (IOException ioe)
+        {
+            assertTrue(ioe.getMessage().contains("HTTP response code: 401"));
+        }
+        
+        // as user1 - with filter args ...
+        
+        ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, user1, USER_PW);
+        
+        getUserFeed(null, site1, ticket, false, false, false, 0);
+        getUserFeed(null, site2, ticket, false, false, false, 9);
+        getUserFeed(null, site3, ticket, false, false, false, 7);
+        
+        getUserFeed(null, null, ticket, false, false, false, 16); // no filter
+        getUserFeed(null, null, ticket, false, true, false, 12);  // exclude any from user1
+        getUserFeed(null, null, ticket, false, false, true, 4);   // exclude all except user1
+        getUserFeed(null, null, ticket, false, true, true, 0);    // exclude all (NOOP)
+        
+        // TODO - add more (eg. other non-admin user activities)
+    }
+    
+    public void testMNT13234() throws Exception
+    {
+        // as admin
+        String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+        assertNotNull(ticket);
+        
+        // create users (should contain uppercase letter)
+        String testid = ""+System.currentTimeMillis();
+        String user1 = "User1_" + testid;
+        String user2 = "User2_" + testid;
+        createUser(ticket, user1, USER_PW);
+        createUser(ticket, user2, USER_PW);
+        
+        addFollower(user1, user2, ticket);
+        
+        // create site and add memberships
+        String site1 = "test_site1_" + testid;
+        createSite(site1, true, ticket);
+        addMembership(site1, user1, ticket, SiteModel.SITE_CONSUMER);
+        addMembership(site1, user2, ticket, SiteModel.SITE_CONSUMER);
+        
+        Thread.sleep(DELAY_MSECS);
+        addFeedControl(user1, site1, null, ticket);
+        getUserFeed(user1, ticket, true, 2);
+    }
+    
+    private void addFollower(String follower, String user, String ticket) throws Exception
+    {
+        // Build the JSON follow request data
+        JSONArray jsonArray = new JSONArray();
+        jsonArray.put(user);
+        
+        String url = WEBSCRIPT_ENDPOINT + "/api/subscriptions/" + follower + "/follow";
+        String response = callPostWebScript(url, ticket, jsonArray.toString());
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("follow: " + follower + " - " + user);
+            logger.debug("--------------");
+            logger.debug(url);
+            logger.debug(response);
+        }
+    }
+    
+    private void addMembership(String siteId, String userName, String ticket, String role) throws Exception
+    {  
+        // Build the JSON membership object
+        JSONObject membership = new JSONObject();
+        membership.put("role", role);
+        JSONObject person = new JSONObject();
+        person.put("userName", userName);
+        membership.put("person", person);
+        
+        String url = WEBSCRIPT_ENDPOINT + URL_SITES + "/" + siteId + URL_MEMBERSHIPS;
+        String response = callPostWebScript(url, ticket, membership.toString());
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("addMembership: " + siteId + " - " + userName);
+            logger.debug("--------------");
+            logger.debug(url);
+            logger.debug(response);
+        }
+    }
+    
+    private void updateMembership(String siteId, String userName, String ticket, String role) throws Exception
+    {  
+        // Build the JSON membership object
+        JSONObject membership = new JSONObject();
+        membership.put("role", role);
+        JSONObject person = new JSONObject();
+        person.put("userName", userName);
+        membership.put("person", person);
+        
+        String url = WEBSCRIPT_ENDPOINT + URL_SITES + "/" + siteId + URL_MEMBERSHIPS;
+        String response = callPutWebScript(url, ticket, membership.toString());
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("updateMembership: " + siteId + " - " + userName);
+            logger.debug("-----------------");
+            logger.debug(url);
+            logger.debug(response);
+        }
+    }
+    
+    private void removeMembership(String siteId, String userName, String ticket) throws Exception
+    {  
+        String url = WEBSCRIPT_ENDPOINT + URL_SITES + "/" + siteId + URL_MEMBERSHIPS + "/" + userName;
+        String response = callDeleteWebScript(url, ticket);
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("removeMembership: " + siteId + " - " + userName);
+            logger.debug("-----------------");
+            logger.debug(url);
+            logger.debug(response);
+        }
+    }
+    
+    private void addFeedControl(String userName, String siteId, String appToolId, String ticket) throws Exception
+    {  
+        // Build the JSON feedControl object
+        JSONObject feedControl = new JSONObject();
+        feedControl.put("siteId", siteId);
+        feedControl.put("appToolId", appToolId);
+        
+        String url = WEBSCRIPT_ENDPOINT + URL_ACTIVITIES + URL_USER_FEED_CTRL;
+        String response = callPostWebScript(url, ticket, feedControl.toString());
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("addFeedControl: " + userName);
+            logger.debug("--------------");
+            logger.debug(url);
+            logger.debug(response);
+        }
+    }
+    
+    protected String callGetWebScript(String urlString, String ticket) throws MalformedURLException, URISyntaxException, IOException
+    {
+        return callOutWebScript(urlString, "GET", ticket);
+    }
+    
+    protected String callDeleteWebScript(String urlString, String ticket) throws MalformedURLException, URISyntaxException, IOException
+    {
+        return callOutWebScript(urlString, "DELETE", ticket);
+    }
+    
+    protected String callPostWebScript(String urlString, String ticket, String data) throws MalformedURLException, URISyntaxException, IOException
+    {
+        return callInOutWebScript(urlString, "POST", ticket, data);
+    }
+    
+    protected String callPutWebScript(String urlString, String ticket, String data) throws MalformedURLException, URISyntaxException, IOException
+    {
+        return callInOutWebScript(urlString, "PUT", ticket, data);
+    }
+    
+    private String callOutWebScript(String urlString, String method, String ticket) throws MalformedURLException, URISyntaxException, IOException
+    {
+        URL url = new URL(urlString);
+        
+        HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+        conn.setRequestMethod(method);
+        
+        if (ticket != null)
+        {
+            // add Base64 encoded authorization header
+            // refer to: http://wiki.alfresco.com/wiki/Web_Scripts_Framework#HTTP_Basic_Authentication
+            conn.addRequestProperty("Authorization", "Basic " + Base64.encodeBytes(ticket.getBytes()));
+        }
+        
+        String result = null;
+        InputStream is = null;
+        BufferedReader br = null;
+        
+        try
+        {
+            is = conn.getInputStream();
+            br = new BufferedReader(new InputStreamReader(is));
+            
+            String line = null;
+            StringBuffer sb = new StringBuffer();
+            while(((line = br.readLine()) !=null))  {
+                sb.append(line);
+            }
+            
+            result = sb.toString();
+        }
+        finally
+        {
+            if (br != null) { br.close(); };
+            if (is != null) { is.close(); };
+        }
+        
+        return result;
+    }
+    
+    private String callInOutWebScript(String urlString, String method, String ticket, String data) throws MalformedURLException, URISyntaxException, IOException
+    {
+        return callInOutWeb(urlString, method, ticket, data, "application/json", null);
+    }
+    
+    private String callInOutWeb(String urlString, String method, String ticket, String data, String contentType, String soapAction) throws MalformedURLException, URISyntaxException, IOException
+    {
+        URL url = new URL(urlString);
+        
+        HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+        conn.setRequestMethod(method);
+        
+        conn.setRequestProperty("Content-type", contentType);
+        
+        conn.setDoOutput(true);
+        conn.setDoInput(true);
+        conn.setUseCaches (false);
+        
+        if (soapAction != null)
+        {
+            conn.setRequestProperty("SOAPAction", soapAction);
+        }
+        
+        if (ticket != null)
+        {
+            // add Base64 encoded authorization header
+            // refer to: http://wiki.alfresco.com/wiki/Web_Scripts_Framework#HTTP_Basic_Authentication
+            conn.addRequestProperty("Authorization", "Basic " + Base64.encodeBytes(ticket.getBytes()));
+        }
+        
+        String result = null;
+        BufferedReader br = null;
+        DataOutputStream wr = null;
+        OutputStream os = null;
+        InputStream is = null;
+        
+        try
+        {
+            os = conn.getOutputStream();
+            wr = new DataOutputStream(os);
+            wr.write(data.getBytes());
+            wr.flush();
+        }
+        finally
+        {
+            if (wr != null) { wr.close(); };
+            if (os != null) { os.close(); };
+        }
+        
+        try
+        {
+            is = conn.getInputStream();
+            br = new BufferedReader(new InputStreamReader(is));
+            
+            String line = null;
+            StringBuffer sb = new StringBuffer();
+            while(((line = br.readLine()) !=null)) 
+            {
+                sb.append(line);
+            }
+            
+            result = sb.toString();
+        }
+        finally
+        {
+            if (br != null) { br.close(); };
+            if (is != null) { is.close(); };
+        }
+        
+        return result;
+    }
+    
+    protected String callLoginWebScript(String serviceUrl, String username, String password) throws MalformedURLException, URISyntaxException, IOException
+    {
+        // Refer to: http://wiki.alfresco.com/wiki/Web_Scripts_Framework#HTTP_Basic_Authentication  
+        String ticketResult = callGetWebScript(serviceUrl+"/api/login?u="+username+"&pw="+password, null);
+        
+        if (ticketResult != null)
+        {
+            int startTag = ticketResult.indexOf("<ticket>");
+            int endTag = ticketResult.indexOf("</ticket>");
+            if ((startTag != -1) && (endTag != -1))
+            {
+                ticketResult = ticketResult.substring(startTag+("<ticket>".length()), endTag);
+            }
+        }
+        
+        return ticketResult;
+    }
+    
+    protected void createUser(String ticket, String username, String password) throws JSONException, IOException, URISyntaxException
+    {
+        // Build the JSON person object
+        JSONObject person = new JSONObject();
+        person.put("userName", username);
+        person.put("firstName", "first");
+        person.put("lastName", "last");
+        person.put("email", "email@email.com");
+        person.put("password", password);
+        
+        String url = WEBSCRIPT_ENDPOINT + URL_PEOPLE;
+        String response = callPostWebScript(url, ticket, person.toString());
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("addPerson: " + username);
+            logger.debug("--------------");
+            logger.debug(url);
+            logger.debug(response);
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/activities/feed/control/FeedControlTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/activities/feed/control/FeedControlTest.java
new file mode 100644
index 00000000000..e66ece22d20
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/activities/feed/control/FeedControlTest.java
@@ -0,0 +1,166 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.activities.feed.control;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.util.PropertyMap;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+/**
+ * Unit test the Activity Service's User Feed Control Web Script API
+ * 
+ * @author janv
+ */
+public class FeedControlTest extends BaseWebScriptTest
+{    
+    private static Log logger = LogFactory.getLog(FeedControlTest.class);
+    
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private PersonService personService;
+    
+    private static final String TEST_USER = "my user";
+    
+    private static final String TEST_SITE_ID = "my site";
+    private static final String TEST_APP_TOOL_ID = "my app tool";
+    
+    private static final String URL_CONTROLS = "/api/activities/feed/controls";
+    private static final String URL_CONTROL = "/api/activities/feed/control";
+
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
+        this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+    
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        // Create users
+        createUser(TEST_USER);
+        
+        // Do tests as user one
+        this.authenticationComponent.setCurrentUser(TEST_USER);
+    }
+    
+    private void createUser(String userName)
+    {
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            this.authenticationService.createAuthentication(userName, "PWD".toCharArray());
+            
+            PropertyMap ppOne = new PropertyMap(4);
+            ppOne.put(ContentModel.PROP_USERNAME, userName);
+            ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+            ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+            ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+            
+            this.personService.createPerson(ppOne);
+        }        
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        
+        this.authenticationComponent.clearCurrentSecurityContext();
+    }
+    
+    public void testCreateFeedControls() throws Exception
+    {
+        createFeedControl(TEST_SITE_ID, null);
+        createFeedControl(null, TEST_APP_TOOL_ID);
+        createFeedControl(TEST_SITE_ID, TEST_APP_TOOL_ID);
+    }
+    
+    protected void createFeedControl(String siteId, String appToolId) throws Exception
+    {
+        // Set (create) feed control
+        JSONObject feedControl = new JSONObject();
+        feedControl.put("siteId", siteId);
+        feedControl.put("appToolId", appToolId);
+        
+        int expectedStatus = 200;
+        Response response = sendRequest(new PostRequest(URL_CONTROL, feedControl.toString(), "application/json"), expectedStatus); 
+    
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(response);
+        }
+    }
+    
+    public void testRetrieveFeedControls() throws Exception
+    {
+        // Get (retrieve) feed controls
+        int expectedStatus = 200;
+        Response response = sendRequest(new GetRequest(URL_CONTROLS), expectedStatus);        
+        JSONArray result = new JSONArray(response.getContentAsString());
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(result);
+        }
+        
+        assertNotNull(result);
+        assertEquals(3, result.length());
+    }
+    
+    public void testDeleteFeedControls() throws Exception
+    {
+        deleteFeedControl(TEST_SITE_ID, null);
+        deleteFeedControl(null, TEST_APP_TOOL_ID);
+        deleteFeedControl(TEST_SITE_ID, TEST_APP_TOOL_ID);
+    }
+    
+    protected void deleteFeedControl(String siteId, String appToolId) throws Exception
+    {
+        // Unset (delete) feed control
+        int expectedStatus = 200;
+        Response response = sendRequest(new DeleteRequest(URL_CONTROL + "?s=" + TEST_SITE_ID + "&a=" + TEST_APP_TOOL_ID), expectedStatus);
+    
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(response);
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/admin/AdminWebScriptTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/admin/AdminWebScriptTest.java
new file mode 100644
index 00000000000..37748f91590
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/admin/AdminWebScriptTest.java
@@ -0,0 +1,368 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.admin;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.dictionary.Facetable;
+import org.alfresco.repo.dictionary.IndexTokenisationMode;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.admin.RepoAdminService;
+import org.alfresco.service.cmr.admin.RepoUsage;
+import org.alfresco.service.cmr.admin.RepoUsage.UsageType;
+import org.alfresco.service.cmr.admin.RepoUsageStatus;
+import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.ModelDefinition;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.i18n.MessageLookup;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.descriptor.DescriptorService;
+import org.alfresco.service.license.LicenseDescriptor;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * Test the admin web scripts
+ * 
+ * @author Derek Hulley
+ * @since 3.4
+ */
+@Category(OwnJVMTestsCategory.class)
+public class AdminWebScriptTest extends BaseWebScriptTest
+{
+    private ApplicationContext ctx;
+    private RepoAdminService repoAdminService;
+    private DescriptorService descriptorService;
+    private String admin;
+    private String guest;
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        ctx = getServer().getApplicationContext();
+        repoAdminService = (RepoAdminService) ctx.getBean("RepoAdminService");
+        descriptorService = (DescriptorService) ctx.getBean("DescriptorService");
+        admin = AuthenticationUtil.getAdminUserName();
+        guest = AuthenticationUtil.getGuestUserName();
+
+        AuthenticationUtil.setFullyAuthenticatedUser(admin);
+    }
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+    
+    public void testGetRestrictions() throws Exception
+    {
+        RepoUsage restrictions = repoAdminService.getRestrictions();
+        
+        String url = "/api/admin/restrictions";
+        TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url);
+        
+        Response response = sendRequest(req, Status.STATUS_OK, guest);
+        JSONObject json = new JSONObject(response.getContentAsString());
+        Long maxUsers = json.isNull(AbstractAdminWebScript.JSON_KEY_USERS) ? null : json.getLong(AbstractAdminWebScript.JSON_KEY_USERS);
+        assertEquals("Mismatched max users", restrictions.getUsers(), maxUsers);
+        Long maxDocuments = json.isNull(AbstractAdminWebScript.JSON_KEY_DOCUMENTS) ? null : json.getLong(AbstractAdminWebScript.JSON_KEY_DOCUMENTS);
+        assertEquals("Mismatched max documents", restrictions.getDocuments(), maxDocuments);
+    }
+    
+    public void testGetUsage() throws Exception
+    {
+        RepoUsageStatus usageStatus = repoAdminService.getUsageStatus();
+        RepoUsage usage = usageStatus.getUsage();
+        LicenseDescriptor licenseDescriptor = descriptorService.getLicenseDescriptor();
+        Date validUntil = (licenseDescriptor == null) ? null : licenseDescriptor.getValidUntil(); // might be null
+        Integer checkLevel = new Integer(usageStatus.getLevel().ordinal());
+        
+        String url = "/api/admin/usage";
+        TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url);
+        
+        Response response = sendRequest(req, Status.STATUS_OK, guest);
+        System.out.println(response.getContentAsString());
+        JSONObject json = new JSONObject(response.getContentAsString());
+        Long users = json.isNull(AbstractAdminWebScript.JSON_KEY_USERS) ? null : json.getLong(AbstractAdminWebScript.JSON_KEY_USERS);
+        assertEquals("Mismatched users", usage.getUsers(), users);
+        Long documents = json.isNull(AbstractAdminWebScript.JSON_KEY_DOCUMENTS) ? null : json.getLong(AbstractAdminWebScript.JSON_KEY_DOCUMENTS);
+        assertEquals("Mismatched documents", usage.getDocuments(), documents);
+        String licenseMode = json.isNull(AbstractAdminWebScript.JSON_KEY_LICENSE_MODE) ? null : json.getString(AbstractAdminWebScript.JSON_KEY_LICENSE_MODE);
+        assertEquals("Mismatched licenseMode", usage.getLicenseMode().toString(), licenseMode);
+        boolean readOnly = json.getBoolean(AbstractAdminWebScript.JSON_KEY_READ_ONLY);
+        assertEquals("Mismatched readOnly", usage.isReadOnly(), readOnly);
+        boolean updated = json.getBoolean(AbstractAdminWebScript.JSON_KEY_UPDATED);
+        assertEquals("Mismatched updated", false, updated);
+        Long licenseValidUntil = json.isNull(AbstractAdminWebScript.JSON_KEY_LICENSE_VALID_UNTIL) ? null : json.getLong(AbstractAdminWebScript.JSON_KEY_LICENSE_VALID_UNTIL);
+        assertEquals("Mismatched licenseValidUntil",
+                (validUntil == null) ? null : validUntil.getTime(),
+                licenseValidUntil);
+        Integer level = json.isNull(AbstractAdminWebScript.JSON_KEY_LEVEL) ? null : json.getInt(AbstractAdminWebScript.JSON_KEY_LEVEL);
+        assertEquals("Mismatched level", checkLevel, level);
+        json.getJSONArray(AbstractAdminWebScript.JSON_KEY_WARNINGS);
+        json.getJSONArray(AbstractAdminWebScript.JSON_KEY_ERRORS);
+    }
+    
+    public void testUpdateUsageWithoutPermissions() throws Exception
+    {
+        String url = "/api/admin/usage";
+        TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
+        sendRequest(req, 401, AuthenticationUtil.getGuestRoleName());
+    }
+    
+    public void testUpdateUsage() throws Exception
+    {
+        repoAdminService.updateUsage(UsageType.USAGE_ALL);
+        RepoUsage usage = repoAdminService.getUsage();
+        
+        String url = "/api/admin/usage";
+        TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
+        
+        Response response = sendRequest(req, Status.STATUS_OK, admin);
+        System.out.println(response.getContentAsString());
+        JSONObject json = new JSONObject(response.getContentAsString());
+        Long users = json.isNull(AbstractAdminWebScript.JSON_KEY_USERS) ? null : json.getLong(AbstractAdminWebScript.JSON_KEY_USERS);
+        assertEquals("Mismatched users", usage.getUsers(), users);
+        Long documents = json.isNull(AbstractAdminWebScript.JSON_KEY_DOCUMENTS) ? null : json.getLong(AbstractAdminWebScript.JSON_KEY_DOCUMENTS);
+        assertEquals("Mismatched documents", usage.getDocuments(), documents);
+        String licenseMode = json.isNull(AbstractAdminWebScript.JSON_KEY_LICENSE_MODE) ? null : json.getString(AbstractAdminWebScript.JSON_KEY_LICENSE_MODE);
+        assertEquals("Mismatched licenseMode", usage.getLicenseMode().toString(), licenseMode);
+        boolean readOnly = json.getBoolean(AbstractAdminWebScript.JSON_KEY_READ_ONLY);
+        assertEquals("Mismatched readOnly", usage.isReadOnly(), readOnly);
+        boolean updated = json.getBoolean(AbstractAdminWebScript.JSON_KEY_UPDATED);
+        assertEquals("Mismatched updated", true, updated);
+    }
+
+    @Test
+    // ALF-21950 We check now if the property belongs to the type of the node
+    public void testResidualProperties() throws Exception
+    {
+        NodeBrowserPost nodeBrowserPost = new NodeBrowserPost();
+        DictionaryService dictionaryService = mock(DictionaryService.class);
+        NodeService nodeService = mock(NodeService.class);
+        nodeBrowserPost.setDictionaryService(dictionaryService);
+        nodeBrowserPost.setNodeService(nodeService);
+
+        // make own class definition from origin type
+        ClassDefinition classDefinition = mock(ClassDefinition.class);
+        when(dictionaryService.getClass(any())).thenReturn(classDefinition);
+
+        QName qnameResidualFalse1 = QName.createQName("testResidualProperties", "residualFalse1");
+        QName qnameResidualFalse2 = QName.createQName("testResidualProperties", "residualFalse2");
+        QName qnameResidualTrue1 = QName.createQName("testResidualProperties", "residualTrue1");
+        QName qnameResidualTrue2 = QName.createQName("testResidualProperties", "residualTrue2");
+
+        // Define residual False properties inside of class definition
+        // That simulates the belonging of the properties to a given type of a node
+        Map<QName, PropertyDefinition> properties = new HashMap<>();
+        properties.put(qnameResidualFalse1, new SimplePropertyDefinition(false));
+        properties.put(qnameResidualFalse2, new SimplePropertyDefinition(true));
+        when(classDefinition.getProperties()).thenReturn(properties);
+
+        when(dictionaryService.getProperty(eq(qnameResidualFalse1))).thenReturn(new SimplePropertyDefinition(false));
+        when(dictionaryService.getProperty(eq(qnameResidualFalse2))).thenReturn(new SimplePropertyDefinition(true));
+        when(dictionaryService.getProperty(eq(qnameResidualTrue1))).thenReturn(new SimplePropertyDefinition(true));
+        when(dictionaryService.getProperty(eq(qnameResidualTrue2))).thenReturn(new SimplePropertyDefinition(false));
+
+        // property found in definition so it is not residual
+        String value = "abc";
+        NodeBrowserPost.Property property = nodeBrowserPost.new Property(qnameResidualFalse1, value, null);
+        assertFalse(property.getResidual());
+
+        // property belongs to an aspect so it is not residual
+        property = nodeBrowserPost.new Property(qnameResidualFalse2, value, null);
+        assertFalse(property.getResidual());
+
+        // property not found in definition but it is an aspect so it is not residual
+        property = nodeBrowserPost.new Property(qnameResidualTrue1, value, null);
+        assertFalse(property.getResidual());
+
+        // property not found in definition so it is residual
+        property = nodeBrowserPost.new Property(qnameResidualTrue2, value, null);
+        assertTrue(property.getResidual());
+    }
+
+    private class SimplePropertyDefinition implements PropertyDefinition
+    {
+        private boolean isAspect;
+        public SimplePropertyDefinition(boolean isAspect)
+        {
+            super();
+            this.isAspect = isAspect;
+        }
+
+        public ModelDefinition getModel()
+        {
+            return null;
+        }
+
+        public QName getName()
+        {
+            return null;
+        }
+
+        public String getTitle()
+        {
+            return null;
+        }
+
+        public String getDescription()
+        {
+            return null;
+        }
+
+        public String getTitle(MessageLookup messageLookup)
+        {
+            return null;
+        }
+
+        public String getTitle(MessageLookup messageLookup, Locale locale)
+        {
+            return null;
+        }
+
+        public String getDescription(MessageLookup messageLookup)
+        {
+            return null;
+        }
+
+        public String getDescription(MessageLookup messageLookup, Locale locale)
+        {
+            return null;
+        }
+
+        public String getDefaultValue()
+        {
+            return null;
+        }
+
+        public DataTypeDefinition getDataType()
+        {
+            DataTypeDefinition dataTypeDefinition = mock(DataTypeDefinition.class);
+            when(dataTypeDefinition.getName()).thenReturn(QName.createQName("notImportant"));
+            return dataTypeDefinition;
+        }
+
+        public ClassDefinition getContainerClass()
+        {
+            ClassDefinition classDefinition = mock(ClassDefinition.class);
+            when(classDefinition.isAspect()).thenReturn(isAspect);
+            return classDefinition;
+        }
+
+        public boolean isOverride()
+        {
+            return false;
+        }
+
+        public boolean isMultiValued()
+        {
+            return false;
+        }
+
+        public boolean isMandatory()
+        {
+            return false;
+        }
+
+        public boolean isMandatoryEnforced()
+        {
+            return false;
+        }
+
+        public boolean isProtected()
+        {
+            return false;
+        }
+
+        public boolean isIndexed()
+        {
+            return false;
+        }
+
+        public boolean isStoredInIndex()
+        {
+            return false;
+        }
+
+        public IndexTokenisationMode getIndexTokenisationMode()
+        {
+            return null;
+        }
+
+        public Facetable getFacetable()
+        {
+            return null;
+        }
+
+        public boolean isIndexedAtomically()
+        {
+            return false;
+        }
+
+        public List<ConstraintDefinition> getConstraints()
+        {
+            return null;
+        }
+
+        public String getAnalyserResourceBundleName()
+        {
+            return null;
+        }
+
+        public String resolveAnalyserClassName(Locale locale)
+        {
+            return null;
+        }
+
+        public String resolveAnalyserClassName()
+        {
+            return null;
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/archive/AllNodeArchiveTests.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/archive/AllNodeArchiveTests.java
new file mode 100644
index 00000000000..52699cef150
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/archive/AllNodeArchiveTests.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.archive;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * This class is a holder for the various test classes associated with the Node Archive Service.
+ * It is not (at the time of writing) intended to be incorporated into the automatic build
+ * which will find the various test classes and run them individually.
+ * 
+ * @author Neil McErlean
+ * @since 3.5
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    NodeArchiveServiceRestApiTest.class
+})
+public class AllNodeArchiveTests
+{
+    // Intentionally empty
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/archive/NodeArchiveServiceRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/archive/NodeArchiveServiceRestApiTest.java
new file mode 100644
index 00000000000..17d70e19823
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/archive/NodeArchiveServiceRestApiTest.java
@@ -0,0 +1,640 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.archive;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.node.StoreArchiveMap;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.PropertyMap;
+import org.joda.time.DateTime;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONStringer;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * This class tests the ReST API of the {@link NodeArchiveService}.
+ * 
+ * @author Neil McErlean
+ * @since 3.5
+ */
+public class NodeArchiveServiceRestApiTest extends BaseWebScriptTest
+{
+    // Miscellaneous constants used throughout this test class.
+    private static final String DATA = "data";
+    private static final String ARCHIVE_URL_FORMAT = "/api/archive/{0}/{1}";
+    
+    private static final String TEST_TITLE = "FooBarTitle";
+    private static final String TEST_DESCRIPTION = "This is a FooBar description";
+    
+    private static final String USER_ONE = "UserOne";
+    private static final String USER_TWO = "UserTwo";    
+
+    private NodeRef adminUndeletedTestNode;
+    private NodeRef adminDeletedTestNode;
+    private NodeRef user1_DeletedTestNode;
+    private NodeRef user2_DeletedTestNode;
+    private NodeRef workStoreRootNodeRef;
+    
+    // Injected services
+    private NodeService nodeService;
+    private NodeArchiveService nodeArchiveService;
+    private RetryingTransactionHelper transactionHelper;
+    private PersonService personService;
+    private MutableAuthenticationService authenticationService;
+    private StoreArchiveMap archiveMap; 
+
+    private StoreRef nodesOriginalStoreRef;
+    
+    private List<StoreRef> createdStores = new ArrayList<StoreRef>();
+    private List<NodeRef> createdNodes = new ArrayList<NodeRef>();
+    private List<String> createdPeople = new ArrayList<String>(2);
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        // Initialise the required services.
+        nodeService = (NodeService) getServer().getApplicationContext().getBean("NodeService");
+        nodeArchiveService = (NodeArchiveService) getServer().getApplicationContext().getBean("nodeArchiveService"); // Intentionally small 'n'.
+        transactionHelper = (RetryingTransactionHelper) getServer().getApplicationContext().getBean("retryingTransactionHelper");
+        personService = (PersonService) getServer().getApplicationContext().getBean("PersonService");
+        authenticationService = (MutableAuthenticationService) getServer().getApplicationContext().getBean("AuthenticationService");
+        archiveMap = (StoreArchiveMap) getServer().getApplicationContext().getBean("storeArchiveMap");
+
+        // Create Root node for the tests
+        workStoreRootNodeRef = createTestStoreAndGetRootNode();
+
+        // Create users
+        createUser(USER_ONE);
+        createUser(USER_TWO);
+
+        // Create some nodes which we will delete as part of later test methods.
+        adminUndeletedTestNode = createTestNode(AuthenticationUtil.getAdminUserName(), createNodeName(), false);
+        createdNodes.add(adminUndeletedTestNode);
+        // We need to remember the StoreRef where this node originally lived. i.e. workspace://SpacesStore
+        nodesOriginalStoreRef = adminUndeletedTestNode.getStoreRef();
+        // This will ensure that there is always at least some NodeRefs in the 'trash' i.e. the archive store.
+        adminDeletedTestNode = createTestNode(AuthenticationUtil.getAdminUserName(), createNodeName(), true);
+        createdNodes.add(adminDeletedTestNode);
+
+        // User_1 creates and deletes a node
+        user1_DeletedTestNode = createTestNode(USER_ONE, createNodeName(), true);
+        createdNodes.add(user1_DeletedTestNode);
+
+        // User_2 creates and deletes a node
+        user2_DeletedTestNode = createTestNode(USER_TWO, createNodeName(), true);
+        createdNodes.add(user2_DeletedTestNode);
+    }
+    
+    @Override
+    public void tearDown() throws Exception
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        super.tearDown();
+
+        // Tidy up any test nodes that are hanging around.
+        transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+                    {
+                        public Void execute() throws Throwable
+                        {
+                            AuthenticationUtil.runAs(new RunAsWork<Void>()
+                            {
+                                public Void doWork() throws Exception
+                                {
+                                    for (NodeRef nodeRef : createdNodes)
+                                    {
+                                        if (nodeRef != null && nodeService.exists(nodeRef))
+                                        {
+                                            nodeService.deleteNode(nodeRef);
+                                        }
+                                    }
+
+                                    for (StoreRef store : createdStores)
+                                    {
+                                        if (store != null && nodeService.exists(store))
+                                        {
+                                            nodeService.deleteStore(store);
+                                        }
+                                    }
+                                    return null;
+                                }
+                            }, AuthenticationUtil.getSystemUserName());
+
+                            return null;
+                        }
+                    });
+
+        // Delete users
+        for (String userName : this.createdPeople)
+        {
+            personService.deletePerson(userName);
+        }
+        // Clear the lists
+        this.createdPeople.clear();
+        this.createdNodes.clear();
+        this.createdStores.clear();
+
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+
+    /**
+     * This test calls the GET REST API to read some deleted items from the archive store
+     * and checks the various JSON data fields.
+     */
+    public void testGetDeletedItems() throws Exception
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        
+        JSONObject jsonRsp = getArchivedNodes();
+        
+        JSONObject dataObj = (JSONObject)jsonRsp.get(DATA);
+        assertNotNull("JSON 'data' object was null", dataObj);
+        
+        JSONArray deletedNodesArray = (JSONArray)dataObj.get(AbstractArchivedNodeWebScript.DELETED_NODES);
+        assertNotNull("JSON 'deletedNodesArray' object was null", deletedNodesArray);
+        assertTrue("Unexpectedly found 0 items in archive store", 0 != deletedNodesArray.length());
+        
+        // We'll identify a deleted item that we put in the archive during setUp().
+        //Admin can retrieve all the users' deleted nodes
+        for (int i = 0; i < deletedNodesArray.length(); i++)
+        {
+            JSONObject nextJSONObj = (JSONObject)deletedNodesArray.get(i);
+            String nodeRefString = nextJSONObj.getString(AbstractArchivedNodeWebScript.NODEREF);
+            if (nodeRefString.equals(adminDeletedTestNode.toString()))
+            {
+                doTest(nextJSONObj, AuthenticationUtil.getAdminUserName());  
+            }
+            else if (nodeRefString.equals(user1_DeletedTestNode.toString()))
+            {
+                doTest(nextJSONObj, USER_ONE);
+            }
+            else if (nodeRefString.equals(user2_DeletedTestNode.toString()))
+            {
+                doTest(nextJSONObj, USER_TWO); 
+            }
+        }        
+        // Check that the results come back sorted by archivedDate (most recent first).
+        Date previousDate = null;
+        for (int i = 0; i < deletedNodesArray.length(); i++)
+        {
+            JSONObject nextJSONObj = deletedNodesArray.getJSONObject(i);
+            String nextArchivedDateString = nextJSONObj.getString(AbstractArchivedNodeWebScript.ARCHIVED_DATE);           
+            
+            //org.joda.time.DateTime default Chronology is ISOChronology (ISO8601 standard).
+            Date nextArchivedDate = new DateTime(nextArchivedDateString).toDate();
+            
+            // Each date should be 'older' than the previous one.
+            if (previousDate != null)
+            {
+                assertTrue("Archived Dates were not reverse-sorted.", nextArchivedDate.before(previousDate));
+            }
+            previousDate = nextArchivedDate;
+        }       
+    }
+    
+    private void doTest(JSONObject deletedNodeToTest, String archivedBy) throws Exception
+    {
+        assertNotNull("Failed to find an expected NodeRef within the archive store.", deletedNodeToTest);
+
+        assertEquals(archivedBy, deletedNodeToTest.getString(AbstractArchivedNodeWebScript.ARCHIVED_BY));
+        assertEquals(TEST_TITLE, deletedNodeToTest.getString(AbstractArchivedNodeWebScript.TITLE));
+        assertEquals(TEST_DESCRIPTION, deletedNodeToTest.getString(AbstractArchivedNodeWebScript.DESCRIPTION));
+        assertNotNull(deletedNodeToTest.getString(AbstractArchivedNodeWebScript.NAME));
+        assertNotNull(deletedNodeToTest.getString(AbstractArchivedNodeWebScript.NODEREF));
+        assertNotNull(deletedNodeToTest.getString(AbstractArchivedNodeWebScript.DISPLAY_PATH));
+        assertNotNull(deletedNodeToTest.getString(AbstractArchivedNodeWebScript.ARCHIVED_DATE));
+        assertNotNull(deletedNodeToTest.getString(AbstractArchivedNodeWebScript.FIRST_NAME));
+        assertNotNull(deletedNodeToTest.getString(AbstractArchivedNodeWebScript.LAST_NAME));
+        assertNotNull(deletedNodeToTest.getString(AbstractArchivedNodeWebScript.NODE_TYPE));        
+    }
+
+    /**
+     * This test calls the GET REST API to read some deleted items for the current user from the archive store
+     */
+    public void testGetDeletedItemsAsNonAdminUser() throws Exception
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+
+        JSONObject jsonRsp = getArchivedNodes();
+        JSONObject dataObj = (JSONObject) jsonRsp.get(DATA);
+        assertNotNull("JSON 'data' object was null", dataObj);
+
+        JSONArray deletedNodesArray = (JSONArray) dataObj.get(AbstractArchivedNodeWebScript.DELETED_NODES);
+        assertNotNull("JSON 'deletedNodesArray' object was null", deletedNodesArray);
+        // User_One deleted only 1 node and he doesn't have permission to see other users' archived data.
+        assertTrue("Unexpectedly found more than 1 item in the archive store.", 1 == deletedNodesArray.length());
+
+        JSONObject archivedNode = (JSONObject) deletedNodesArray.get(0);
+        assertEquals(USER_ONE, archivedNode.getString(AbstractArchivedNodeWebScript.ARCHIVED_BY));
+
+        // Now test, User_Two archived data
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_TWO);
+
+        jsonRsp = getArchivedNodes();
+        dataObj = (JSONObject) jsonRsp.get(DATA);
+        assertNotNull("JSON 'data' object was null", dataObj);
+
+        deletedNodesArray = (JSONArray) dataObj.get(AbstractArchivedNodeWebScript.DELETED_NODES);
+        assertNotNull("JSON 'deletedNodesArray' object was null", deletedNodesArray);
+        // User_Two deleted only 1 node and he doesn't have permission to see other users' archived data.
+        assertTrue("Unexpectedly found more than 1 item in the archive store.",1 == deletedNodesArray.length());
+
+        archivedNode = (JSONObject) deletedNodesArray.get(0);
+        assertEquals(USER_TWO, archivedNode.getString(AbstractArchivedNodeWebScript.ARCHIVED_BY));
+    }
+    
+    
+    /**
+     * This method makes a REST call to get all the nodes currently in the archive store.
+     */
+    private JSONObject getArchivedNodes() throws IOException, JSONException,
+            UnsupportedEncodingException
+    {
+        String url = this.getArchiveUrl(nodesOriginalStoreRef);
+        Response rsp = sendRequest(new GetRequest(url), 200);
+
+        JSONObject jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+        return jsonRsp;
+    }
+    
+    /**
+     * This test method purges some deleted nodes from the archive store.
+     */
+    public void testPurgeDeletedItems() throws Exception
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        
+        JSONObject archivedNodesJson = getArchivedNodes();
+        JSONObject dataJsonObj = archivedNodesJson.getJSONObject("data");
+        JSONArray archivedNodesArray = dataJsonObj.getJSONArray(AbstractArchivedNodeWebScript.DELETED_NODES);
+        
+        int archivedNodesLength = archivedNodesArray.length();
+        assertTrue("Insufficient archived nodes for test to run.", archivedNodesLength > 1);
+        
+        // Take a specific archived node and purge it.
+        JSONObject requiredNodeInArchive = null;
+        for (int i = 0; i < archivedNodesLength; i++)
+        {
+            JSONObject archivedNode = archivedNodesArray.getJSONObject(i);
+            // We ensure in #setUp() that this NodeRef will be in the archive store.
+            if (archivedNode.getString(AbstractArchivedNodeWebScript.NODEREF).equals(adminDeletedTestNode.toString()))
+            {
+                requiredNodeInArchive = archivedNode;
+                break;
+            }
+            else if (archivedNode.getString(AbstractArchivedNodeWebScript.NODEREF).equals(user1_DeletedTestNode.toString()))
+            {
+                requiredNodeInArchive = archivedNode;
+                break;
+            }
+            else if (archivedNode.getString(AbstractArchivedNodeWebScript.NODEREF).equals(user2_DeletedTestNode.toString()))
+            {
+                requiredNodeInArchive = archivedNode;
+                break;
+            }
+        }
+        assertNotNull("Expected node not found in archive", requiredNodeInArchive);
+        
+        // So we have identified a specific Node in the archive that we want to delete permanently (purge).
+        String nodeRefString = requiredNodeInArchive.getString(AbstractArchivedNodeWebScript.NODEREF);
+        assertTrue("nodeRef string is invalid", NodeRef.isNodeRef(nodeRefString));
+        NodeRef nodeRef = new NodeRef(nodeRefString);
+        
+        // This is not the StoreRef where the node originally lived e.g. workspace://SpacesStore
+        // This is its current StoreRef i.e. archive://SpacesStore
+        final StoreRef currentStoreRef = nodeRef.getStoreRef();
+        
+        String deleteUrl = getArchiveUrl(currentStoreRef) + "/" + nodeRef.getId();
+        
+        // Send the DELETE REST call.
+        Response rsp = sendRequest(new DeleteRequest(deleteUrl), 200);
+        
+        JSONObject jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+        JSONObject dataObj = jsonRsp.getJSONObject("data");
+        JSONArray purgedNodesArray = dataObj.getJSONArray(ArchivedNodesDelete.PURGED_NODES);
+        assertEquals("Only expected one NodeRef to have been purged.", 1, purgedNodesArray.length());
+        
+        
+        // Now we'll purge all the other nodes in the archive that came from the same StoreRef.
+        String deleteAllUrl = getArchiveUrl(this.nodesOriginalStoreRef);
+        
+        rsp = sendRequest(new DeleteRequest(deleteAllUrl), 200);
+        jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+        
+        dataObj = jsonRsp.getJSONObject("data");
+        purgedNodesArray = dataObj.getJSONArray(ArchivedNodesDelete.PURGED_NODES);
+        
+        // Now retrieve all items from the archive store. There should be none.
+        assertEquals("Archive store was unexpectedly not empty", 0, getArchivedNodesCount());
+    }
+    
+    /**
+     * This test method purges some deleted nodes from the archive store for the current user.
+     */
+    public void testPurgeDeletedItemsAsNonAdminUser() throws Exception
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+
+        String deleteUrl = getArchiveUrl(user2_DeletedTestNode.getStoreRef()) + "/" + user2_DeletedTestNode.getId();
+
+        // User_One has the nodeRef of the node deleted by User_Two. User_One is
+        // not an Admin, so he must not be allowed to purge a node which he doesn’t own.
+        Response rsp = sendRequest(new DeleteRequest(deleteUrl), 403);
+        assertEquals(403, rsp.getStatus());
+
+        // Now User_One gets his own archived node and tries to purge it
+        JSONObject jsonRsp = getArchivedNodes();
+        JSONObject dataObj = (JSONObject) jsonRsp.get(DATA);
+        JSONArray deletedNodesArray = (JSONArray) dataObj.get(AbstractArchivedNodeWebScript.DELETED_NODES);
+
+        // User_One deleted only 1 node and he doesn't have permission to see other users' archived data.
+        assertEquals("Unexpectedly found more than 1 item in the archive store.", 1, deletedNodesArray.length());
+        JSONObject archivedNode = (JSONObject) deletedNodesArray.get(0);
+
+        // So we have identified a specific Node in the archive that we want to delete permanently (purge).
+        String nodeRefString = archivedNode.getString(AbstractArchivedNodeWebScript.NODEREF);
+        assertTrue("nodeRef string is invalid", NodeRef.isNodeRef(nodeRefString));
+
+        NodeRef nodeRef = new NodeRef(nodeRefString);
+
+        // This is its current StoreRef i.e. archive://SpacesStore
+        deleteUrl = getArchiveUrl(nodeRef.getStoreRef()) + "/" + nodeRef.getId();
+
+        // Send the DELETE REST call.
+        rsp = sendRequest(new DeleteRequest(deleteUrl), 200);
+
+        jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+        dataObj = jsonRsp.getJSONObject("data");
+        JSONArray purgedNodesArray = dataObj.getJSONArray(ArchivedNodesDelete.PURGED_NODES);
+
+        assertEquals("Only expected one NodeRef to have been purged.", 1, purgedNodesArray.length());
+
+        // User_Two is authenticated
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_TWO);
+
+        // Now we'll purge all the nodes in the archive that User_Two owns.
+        // This should only purge USER_TWO's archived nodes.
+        String deleteAllUrl = getArchiveUrl(this.nodesOriginalStoreRef);
+
+        rsp = sendRequest(new DeleteRequest(deleteAllUrl), 200);
+        jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+
+        dataObj = jsonRsp.getJSONObject("data");
+        purgedNodesArray = dataObj.getJSONArray(ArchivedNodesDelete.PURGED_NODES);
+        // User_Two deleted only 1 node.
+        assertEquals("Only expected one NodeRef to have been purged.", 1, purgedNodesArray.length());
+
+        // Test no other nodes have been deleted by User_Two 'Delete all archived nodes operation'.
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+        jsonRsp = getArchivedNodes();
+        dataObj = (JSONObject) jsonRsp.get(DATA);
+        assertNotNull("JSON 'data' object was null", dataObj);
+
+        deletedNodesArray = (JSONArray) dataObj.get(AbstractArchivedNodeWebScript.DELETED_NODES);
+        assertNotNull("JSON 'deletedNodesArray' object was null", deletedNodesArray);
+        assertEquals("There is 1 item in the archive store which was deleted by the Admin.", 1, deletedNodesArray.length());
+    }
+
+    /**
+     * This method makes a REST call to retrieve the contents of the archive store, returning
+     * the number of individual nodes contained in it.
+     */
+    private int getArchivedNodesCount() throws IOException, JSONException,
+            UnsupportedEncodingException
+    {
+        JSONObject archiveContents = getArchivedNodes();
+        JSONObject datatObject = archiveContents.getJSONObject(DATA);
+        JSONArray deletedNodesArray = datatObject.getJSONArray(AbstractArchivedNodeWebScript.DELETED_NODES);
+        return deletedNodesArray.length();
+    }
+    
+    /**
+     * This test method restores some deleted nodes from the archive store.
+     */
+    public void testRestoreDeletedItems() throws Exception
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        
+        JSONObject archivedNodesJson = getArchivedNodes();
+        JSONObject dataJsonObj = archivedNodesJson.getJSONObject("data");
+        JSONArray archivedNodesArray = dataJsonObj.getJSONArray(AbstractArchivedNodeWebScript.DELETED_NODES);
+        
+        int archivedNodesLength = archivedNodesArray.length();
+        assertTrue("Insufficient archived nodes for test to run.", archivedNodesLength > 1);
+        
+        // Take a specific archived node and restore it.
+        JSONObject firstArchivedNode = archivedNodesArray.getJSONObject(0);
+        
+        // So we have identified a specific Node in the archive that we want to restore.
+        String nodeRefString = firstArchivedNode.getString(AbstractArchivedNodeWebScript.NODEREF);
+        assertTrue("nodeRef string is invalid", NodeRef.isNodeRef(nodeRefString));
+        NodeRef nodeRef = new NodeRef(nodeRefString);
+        
+        // This is not the StoreRef where the node originally lived e.g. workspace://SpacesStore
+        // This is its current StoreRef i.e. archive://SpacesStore
+        final StoreRef currentStoreRef = nodeRef.getStoreRef();
+        
+        String restoreUrl = getArchiveUrl(currentStoreRef) + "/" + nodeRef.getId();
+        
+        
+        int archivedNodesCountBeforeRestore = getArchivedNodesCount();
+
+        // Send the PUT REST call.
+        String jsonString = new JSONStringer().object()
+            .key("restoreLocation").value("")
+            .endObject()
+        .toString();
+        Response rsp = sendRequest(new PutRequest(restoreUrl, jsonString, "application/json"), 200);
+        
+        assertEquals("Expected archive to shrink by one", archivedNodesCountBeforeRestore - 1, getArchivedNodesCount());
+    }
+    
+    /**
+     * This test method restores some deleted nodes from the archive store for the current user.
+     */
+    public void testRestoreDeletedItemsAsNonAdminUser() throws Exception
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+
+        String restoreUrl = getArchiveUrl(user2_DeletedTestNode.getStoreRef()) + "/" + user2_DeletedTestNode.getId();
+
+        String jsonString = new JSONStringer().object().key("restoreLocation").value("").endObject().toString();
+        
+        // User_One has the nodeRef of the node deleted by User_Two. User_One is
+        // not an Admin, so he must not be allowed to restore a node which he doesn’t own.
+        Response rsp = sendRequest(new PutRequest(restoreUrl, jsonString, "application/json"), 403);
+        assertEquals(403, rsp.getStatus());
+        
+        // Now User_One gets his own archived node and tries to restore it
+        JSONObject jsonRsp = getArchivedNodes();
+        JSONObject dataObj = (JSONObject) jsonRsp.get(DATA);
+        JSONArray deletedNodesArray = (JSONArray) dataObj.get(AbstractArchivedNodeWebScript.DELETED_NODES);
+
+        // User_One deleted only 1 node and he doesn't have permission to see other users' archived data.
+        assertEquals("Unexpectedly found more than 1 item in the archive store.", 1, deletedNodesArray.length());
+        JSONObject archivedNode = (JSONObject) deletedNodesArray.get(0);
+
+        // So we have identified a specific Node in the archive that we want to restore.
+        String nodeRefString = archivedNode.getString(AbstractArchivedNodeWebScript.NODEREF);
+        assertTrue("nodeRef string is invalid", NodeRef.isNodeRef(nodeRefString));
+
+        NodeRef nodeRef = new NodeRef(nodeRefString);
+
+        // This is its current StoreRef i.e. archive://SpacesStore
+        restoreUrl = getArchiveUrl(nodeRef.getStoreRef()) + "/" + nodeRef.getId();
+        
+        int archivedNodesCountBeforeRestore = getArchivedNodesCount();
+
+        // Send the PUT REST call.
+        jsonString = new JSONStringer().object().key("restoreLocation").value("").endObject().toString();
+        rsp = sendRequest(new PutRequest(restoreUrl, jsonString, "application/json"), 200);
+        
+        assertEquals("Expected archive to shrink by one", archivedNodesCountBeforeRestore - 1, getArchivedNodesCount());        
+    }
+
+    /**
+     * This method gives the 'archive' REST URL for the specified StoreRef.
+     */
+    private String getArchiveUrl(StoreRef storeRef)
+    {
+        String result = MessageFormat.format(ARCHIVE_URL_FORMAT, storeRef.getProtocol(), storeRef.getIdentifier());
+        return result;
+    }
+    
+    private NodeRef createTestStoreAndGetRootNode()
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        
+        StoreRef workStoreRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, getName() + System.currentTimeMillis());
+        workStoreRootNodeRef = nodeService.getRootNode(workStoreRef);
+        StoreRef archiveStoreRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "archive" + getName() + System.currentTimeMillis());
+        archiveMap.put(workStoreRef, archiveStoreRef);
+        
+        createdStores.add(workStoreRef);
+        createdStores.add(archiveStoreRef);
+        
+        return workStoreRootNodeRef;
+    }
+    
+    private void createUser(String userName)
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            this.authenticationService.createAuthentication(userName, "password".toCharArray());
+
+            PropertyMap map = new PropertyMap(5);
+            map.put(ContentModel.PROP_USERNAME, userName);
+            map.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            map.put(ContentModel.PROP_LASTNAME, "lastName");
+            map.put(ContentModel.PROP_EMAIL, "email@email.com");
+            map.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+
+            this.personService.createPerson(map);
+            this.createdPeople.add(userName);
+        }
+    }
+    
+    private NodeRef createTestNode(final String authenticatedUser, final String cmName, final boolean deleteNode)
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(authenticatedUser);
+        
+        return transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<NodeRef>()
+                    {           
+                        public NodeRef execute() throws Throwable
+                        { 
+                            return AuthenticationUtil.runAs(new RunAsWork<NodeRef>()
+                            {
+                                public NodeRef doWork() throws Exception
+                                {
+
+                                    // Create the test node.
+                                    Map<QName, Serializable> props = new HashMap<QName, Serializable>();
+                                    props.put(ContentModel.PROP_NAME, cmName);
+                                    props.put(ContentModel.PROP_TITLE, TEST_TITLE);
+                                    props.put(ContentModel.PROP_DESCRIPTION, TEST_DESCRIPTION);
+                                    NodeRef nodeRef = nodeService.createNode(
+                                                workStoreRootNodeRef,
+                                                ContentModel.ASSOC_CHILDREN, 
+                                                ContentModel.ASSOC_CHILDREN,
+                                                ContentModel.TYPE_CONTENT, props).getChildRef();
+
+                                    if (deleteNode)
+                                    {
+                                        // And intentionally delete it again.
+                                        // This will move it to the archive store.
+                                        nodeService.deleteNode(nodeRef);
+
+                                        // At his point the chAssRef.getChildRef  NodeRef will point to the 
+                                        // location of the node before it got deleted. We need to store 
+                                        // it's NodeRef *after* deletion, which will point to the archive store.
+                                        NodeRef archivedNode = nodeArchiveService.getArchivedNode(nodeRef);
+
+                                        return archivedNode;
+                                    }
+
+                                    return nodeRef;
+
+                                }
+                            }, AuthenticationUtil.getSystemUserName());
+                        }
+                    });
+
+    }
+    
+    private String createNodeName()
+    {
+        return getClass().getSimpleName() + "_" + System.currentTimeMillis();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/audit/AuditWebScriptTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/audit/AuditWebScriptTest.java
new file mode 100644
index 00000000000..4a90f35f988
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/audit/AuditWebScriptTest.java
@@ -0,0 +1,555 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.audit;
+
+import java.net.URL;
+import java.util.Date;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.audit.AuditComponent;
+import org.alfresco.repo.audit.AuditServiceImpl;
+import org.alfresco.repo.audit.UserAuditFilter;
+import org.alfresco.repo.audit.model.AuditModelRegistryImpl;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.audit.AuditService;
+import org.alfresco.service.cmr.audit.AuditService.AuditApplication;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.util.GUID;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.experimental.categories.Category;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.surf.util.ISO8601DateFormat;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+import org.springframework.util.ResourceUtils;
+
+/**
+ * Test the audit web scripts
+ * 
+ * @author Derek Hulley
+ * @since 3.4
+ */
+@Category({OwnJVMTestsCategory.class, LuceneTests.class})
+public class AuditWebScriptTest extends BaseWebScriptTest
+{
+    private static final String APP_REPOTEST_NAME = "AlfrescoRepositoryTest";
+    private static final String APP_REPOTEST_PATH = "/repositorytest";
+    private static final String APP_SEARCHTEST_NAME = "SearchAudit";
+    private static final String APP_SEARCHTEST_PATH = "/searchaudit";
+
+    private ApplicationContext ctx;
+    private AuditService auditService;
+    private SearchService searchService;
+    private AuthenticationService authenticationService;
+    private FileFolderService fileFolderService;
+    private Repository repositoryHelper;
+    
+    private String admin;
+    private boolean wasGloballyEnabled;
+    boolean wasRepoEnabled;
+    private boolean wasSearchEnabled;
+    
+    private NodeRef testRoot;
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        ctx = getServer().getApplicationContext();
+        //MNT-10807 : Auditing does not take into account audit.filter.alfresco-access.transaction.user
+        UserAuditFilter userAuditFilter = new UserAuditFilter();
+        userAuditFilter.setUserFilterPattern("System;.*");
+        userAuditFilter.afterPropertiesSet();
+        AuditComponent auditComponent = (AuditComponent) ctx.getBean("auditComponent");
+        auditComponent.setUserAuditFilter(userAuditFilter);
+        AuditServiceImpl auditServiceImpl = (AuditServiceImpl) ctx.getBean("auditService");
+        auditServiceImpl.setAuditComponent(auditComponent);
+        authenticationService = (AuthenticationService) ctx.getBean("AuthenticationService");
+        auditService = (AuditService) ctx.getBean("AuditService");
+        searchService = (SearchService) ctx.getBean("SearchService");
+        repositoryHelper = (Repository)getServer().getApplicationContext().getBean("repositoryHelper");
+        fileFolderService = (FileFolderService)getServer().getApplicationContext().getBean("FileFolderService");
+        admin = AuthenticationUtil.getAdminUserName();
+
+        // Register the test models
+        AuditModelRegistryImpl auditModelRegistry = (AuditModelRegistryImpl) ctx.getBean("auditModel.modelRegistry");
+        URL testModelUrl = ResourceUtils.getURL("classpath:alfresco/testaudit/alfresco-audit-test-repository.xml");
+        URL testModelUrl1 = ResourceUtils.getURL("classpath:alfresco/testaudit/alfresco-audit-test-mnt-16748.xml");
+        auditModelRegistry.registerModel(testModelUrl);
+        auditModelRegistry.registerModel(testModelUrl1);
+        auditModelRegistry.loadAuditModels();
+        
+        AuthenticationUtil.setFullyAuthenticatedUser(admin);
+        
+        wasGloballyEnabled = auditService.isAuditEnabled();
+        wasRepoEnabled = auditService.isAuditEnabled(APP_REPOTEST_NAME, APP_REPOTEST_PATH);
+        wasSearchEnabled = auditService.isAuditEnabled(APP_SEARCHTEST_NAME, APP_SEARCHTEST_PATH);
+        // Only enable if required
+        if (!wasGloballyEnabled)
+        {
+            auditService.setAuditEnabled(true);
+            wasGloballyEnabled = auditService.isAuditEnabled();
+            if (!wasGloballyEnabled)
+            {
+                fail("Failed to enable global audit for test");
+            }
+        }
+        if (!wasRepoEnabled)
+        {
+            auditService.enableAudit(APP_REPOTEST_NAME, APP_REPOTEST_PATH);
+            wasRepoEnabled = auditService.isAuditEnabled(APP_REPOTEST_NAME, APP_REPOTEST_PATH);
+            if (!wasRepoEnabled)
+            {
+                fail("Failed to enable repo audit for test");
+            }
+        }
+        if (!wasSearchEnabled)
+        {
+            auditService.enableAudit(APP_SEARCHTEST_NAME, APP_SEARCHTEST_PATH);
+            wasSearchEnabled = auditService.isAuditEnabled(APP_SEARCHTEST_NAME, APP_SEARCHTEST_PATH);
+            if (!wasSearchEnabled)
+            {
+                fail("Failed to enable search audit for test");
+            }
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        // Leave audit in correct state
+        try
+        {
+            if (!wasGloballyEnabled)
+            {
+                auditService.setAuditEnabled(false);
+            }
+        }
+        catch (Throwable e)
+        {
+            throw new RuntimeException("Failed to set audit back to globally enabled/disabled state", e);
+        }
+        try
+        {
+            if (wasRepoEnabled)
+            {
+                auditService.enableAudit(APP_REPOTEST_NAME, APP_REPOTEST_PATH);
+            }
+            else
+            {
+                auditService.disableAudit(APP_REPOTEST_NAME, APP_REPOTEST_PATH);
+            }
+        }
+        catch (Throwable e)
+        {
+            throw new RuntimeException("Failed to set repo audit back to enabled/disabled state", e);
+        }
+        try
+        {
+            if (wasSearchEnabled)
+            {
+                auditService.enableAudit(APP_SEARCHTEST_NAME, APP_SEARCHTEST_PATH);
+            }
+            else
+            {
+                auditService.disableAudit(APP_SEARCHTEST_NAME, APP_SEARCHTEST_PATH);
+            }
+        }
+        catch (Throwable e)
+        {
+            throw new RuntimeException("Failed to set search audit back to enabled/disabled state", e);
+        }
+    }
+    
+    public void testGetWithoutPermissions() throws Exception
+    {
+        String url = "/api/audit/control";
+        TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url);
+        sendRequest(req, 401, AuthenticationUtil.getGuestRoleName());
+    }
+    
+    public void testGetIsAuditEnabledGlobally() throws Exception
+    {
+        boolean wasEnabled = auditService.isAuditEnabled();
+        Map<String, AuditApplication> checkApps = auditService.getAuditApplications();
+
+        String url = "/api/audit/control";
+        TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url);
+        
+        Response response = sendRequest(req, Status.STATUS_OK, admin);
+        JSONObject json = new JSONObject(response.getContentAsString());
+        boolean enabled = json.getBoolean(AbstractAuditWebScript.JSON_KEY_ENABLED);
+        assertEquals("Mismatched global audit enabled", wasEnabled, enabled);
+        JSONArray apps = json.getJSONArray(AbstractAuditWebScript.JSON_KEY_APPLICATIONS);
+        assertEquals("Incorrect number of applications reported", checkApps.size(), apps.length());
+    }
+    
+    public void testGetIsAuditEnabledMissingApp() throws Exception
+    {
+        String url = "/api/audit/control/xxx";
+        TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url);
+        
+        sendRequest(req, 404, admin);
+    }
+    
+    public void testSetAuditEnabledGlobally() throws Exception
+    {
+        boolean wasEnabled = auditService.isAuditEnabled();
+
+        if (wasEnabled)
+        {
+            String url = "/api/audit/control?enable=false";
+            TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
+            sendRequest(req, Status.STATUS_OK, admin);
+        }
+        else
+        {
+            String url = "/api/audit/control?enable=true";
+            TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
+            sendRequest(req, Status.STATUS_OK, admin);
+        }
+        
+        // Check that it worked
+        testGetIsAuditEnabledGlobally();
+    }
+    
+    public void testGetIsAuditEnabledRepo() throws Exception
+    {
+        boolean wasEnabled = auditService.isAuditEnabled(APP_REPOTEST_NAME, null);
+
+        String url = "/api/audit/control/" + APP_REPOTEST_NAME + APP_REPOTEST_PATH;
+        TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url);
+
+        if (wasEnabled)
+        {
+            Response response = sendRequest(req, Status.STATUS_OK, admin);
+            JSONObject json = new JSONObject(response.getContentAsString());
+            JSONArray apps = json.getJSONArray(AbstractAuditWebScript.JSON_KEY_APPLICATIONS);
+            assertEquals("Incorrect number of applications reported", 1, apps.length());
+            JSONObject app = apps.getJSONObject(0);
+            String appName = app.getString(AbstractAuditWebScript.JSON_KEY_NAME);
+            String appPath = app.getString(AbstractAuditWebScript.JSON_KEY_PATH);
+            boolean appEnabled = app.getBoolean(AbstractAuditWebScript.JSON_KEY_ENABLED);
+            assertEquals("Mismatched application audit enabled", wasEnabled, appEnabled);
+            assertEquals("Mismatched application audit name", APP_REPOTEST_NAME, appName);
+            assertEquals("Mismatched application audit path", APP_REPOTEST_PATH, appPath);
+        }
+    }
+
+    public void testGetAuditSearchService() throws Exception
+    {
+        // Delete search audit entries (if any)
+        String url = "/api/audit/clear/" + APP_SEARCHTEST_NAME;
+        TestWebScriptServer.PostRequest postReq = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
+        Response response = sendRequest(postReq, Status.STATUS_OK, admin);
+        JSONObject json = new JSONObject(response.getContentAsString());
+        assertTrue(json.getInt(AbstractAuditWebScript.JSON_KEY_CLEARED) >= 0);
+
+        // create a file
+        this.testRoot = this.repositoryHelper.getCompanyHome();
+        String filename = "test_doc" + GUID.generate() + ".txt";
+        NodeRef testFile = this.fileFolderService.create(this.testRoot, filename, ContentModel.TYPE_CONTENT).getNodeRef();
+
+        // search the newly created file
+        SearchParameters sp = new SearchParameters();
+        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+        sp.setQuery("=cm:name:" + filename);
+        sp.addStore(testFile.getStoreRef());
+        searchService.query(sp);
+
+        // construct the get audit request
+        url = "/api/audit/query/" + APP_SEARCHTEST_NAME + "/searchaudit/queryX/searchParametersX?verbose=true";
+        TestWebScriptServer.GetRequest getReq = new TestWebScriptServer.GetRequest(url);
+
+        response = sendRequest(getReq, Status.STATUS_OK, admin);
+        json = new JSONObject(response.getContentAsString());
+
+        JSONArray jsonEntries = json.getJSONArray(AbstractAuditWebScript.JSON_KEY_ENTRIES);
+        assertEquals("Incorrect number of entries reported", 1, jsonEntries.length());
+
+        JSONObject values = (JSONObject) ((JSONObject) jsonEntries.get(0)).get(AbstractAuditWebScript.JSON_KEY_ENTRY_VALUES);
+        assertTrue("Audit entry was not found", values.toString(0).contains("query==cm:name:" + filename));
+
+        // clear audit entries for the application
+        auditService.clearAudit(APP_SEARCHTEST_NAME, null, null);
+    }
+
+    public void testSetAuditEnabledRepo() throws Exception
+    {
+        boolean wasEnabled = auditService.isAuditEnabled(APP_REPOTEST_NAME, APP_REPOTEST_PATH);
+
+        if (wasEnabled)
+        {
+            String url = "/api/audit/control/" + APP_REPOTEST_NAME + APP_REPOTEST_PATH + "?enable=false";
+            TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
+            sendRequest(req, Status.STATUS_OK, admin);
+        }
+        else
+        {
+            String url = "/api/audit/control/" + APP_REPOTEST_NAME + APP_REPOTEST_PATH + "?enable=true";
+            TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
+            sendRequest(req, Status.STATUS_OK, admin);
+        }
+        
+        // Check that it worked
+        testGetIsAuditEnabledRepo();
+    }
+    
+    /**
+     * Perform a failed login attempt
+     */
+    private void loginWithFailure(final String username) throws Exception
+    {
+        // Force a failed login
+        RunAsWork<Void> failureWork = new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                try
+                {
+                    authenticationService.authenticate(username, "crud".toCharArray());
+                    fail("Failed to force authentication failure");
+                }
+                catch (AuthenticationException e)
+                {
+                    // Expected
+                }
+                return null;
+            }
+        };
+        AuthenticationUtil.runAs(failureWork, AuthenticationUtil.getSystemUserName());
+    }
+    
+    public synchronized void testClearAuditRepo() throws Exception
+    {
+        long now = System.currentTimeMillis() - 10L;        // Accuracy can be a problem
+        long future = Long.MAX_VALUE;
+        
+        loginWithFailure(getName());
+        
+        // Wait for the background thread to run
+        try
+        {
+            this.wait(100);
+        }
+        catch (Throwable e)
+        {
+        }
+        
+        // Delete audit entries that could not have happened
+        String url = "/api/audit/clear/" + APP_REPOTEST_NAME + "?fromTime=" + future;
+        TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
+        Response response = sendRequest(req, Status.STATUS_OK, admin);
+        JSONObject json = new JSONObject(response.getContentAsString());
+        int cleared = json.getInt(AbstractAuditWebScript.JSON_KEY_CLEARED);
+        assertEquals("Could not have cleared more than 0", 0, cleared);
+        
+        // ALF-3055 : auditing of failures is now asynchronous, so loop 60 times with a
+        // 1 second sleep to ensure that the audit is processed
+        for(int i = 0; i < 60; i++)
+        {
+            // Delete the entry (at least)
+            url = "/api/audit/clear/" + APP_REPOTEST_NAME + "?fromTime=" + now + "&toTime=" + future;
+            req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
+            response = sendRequest(req, Status.STATUS_OK, admin);
+            json = new JSONObject(response.getContentAsString());
+            cleared = json.getInt(AbstractAuditWebScript.JSON_KEY_CLEARED);
+            if (cleared > 0)
+            {
+                break;
+            }
+            
+            Thread.sleep(1000);
+        }
+        assertTrue("Should have cleared at least 1 entry", cleared > 0);
+
+        // Delete all entries
+        url = "/api/audit/clear/" + APP_REPOTEST_NAME;;
+        req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
+        response = sendRequest(req, Status.STATUS_OK, admin);
+        json = new JSONObject(response.getContentAsString());
+        cleared = json.getInt(AbstractAuditWebScript.JSON_KEY_CLEARED);
+    }
+    
+    @SuppressWarnings("unused")
+    public void testQueryAuditRepo() throws Exception
+    {
+        long now = System.currentTimeMillis();
+        long future = Long.MAX_VALUE;
+        
+        auditService.setAuditEnabled(true);
+        auditService.enableAudit(APP_REPOTEST_NAME, APP_REPOTEST_PATH);
+
+        loginWithFailure(getName());
+        
+        // Query for audit entries that could not have happened
+        String url = "/api/audit/query/" + APP_REPOTEST_NAME + "?fromTime=" + now + "&verbose=true";
+        JSONArray jsonEntries = null;
+        TestWebScriptServer.GetRequest req = null;
+        Response response = null;
+        JSONObject json = null;
+        Long entryCount = null;
+        // ALF-3055 : auditing of failures is now asynchronous, so loop 60 times with a
+        // 1 second sleep to ensure that the audit is processed
+        for(int i = 0; i < 60; i++)
+        {
+	        req = new TestWebScriptServer.GetRequest(url);
+	        response = sendRequest(req, Status.STATUS_OK, admin);
+	        json = new JSONObject(response.getContentAsString());
+	        entryCount = json.getLong(AbstractAuditWebScript.JSON_KEY_ENTRY_COUNT);
+	        jsonEntries = json.getJSONArray(AbstractAuditWebScript.JSON_KEY_ENTRIES);
+
+	        if(jsonEntries.length() > 0)
+	        {
+	        	break;
+	        }
+        	Thread.sleep(1000);
+        }
+        assertTrue("Expected at least one entry", jsonEntries.length() > 0);
+        assertEquals("Entry count and physical count don't match", new Long(jsonEntries.length()), entryCount);
+        JSONObject jsonEntry = jsonEntries.getJSONObject(0);
+        Long entryId = jsonEntry.getLong(AbstractAuditWebScript.JSON_KEY_ENTRY_ID);
+        assertNotNull("No entry ID", entryId);
+        String entryTimeStr = jsonEntry.getString(AbstractAuditWebScript.JSON_KEY_ENTRY_TIME);
+        assertNotNull("No entry time String", entryTimeStr);
+        Date entryTime = ISO8601DateFormat.parse((String)entryTimeStr); // Check conversion
+        JSONObject jsonValues = jsonEntry.getJSONObject(AbstractAuditWebScript.JSON_KEY_ENTRY_VALUES);
+        String entryUsername = jsonValues.getString("/repositorytest/login/error/user");
+        assertEquals("Didn't find the login-failure-user", getName(), entryUsername);
+        
+        // Query using well-known ID
+        Long fromEntryId = entryId;                 // Search is inclusive on the 'from' side
+        Long toEntryId = entryId.longValue() + 1L;  // Search is exclusive on the 'to' side
+        url = "/api/audit/query/" + APP_REPOTEST_NAME + "?fromId=" + fromEntryId + "&toId=" + toEntryId;
+        req = new TestWebScriptServer.GetRequest(url);
+        response = sendRequest(req, Status.STATUS_OK, admin);
+        json = new JSONObject(response.getContentAsString());
+        jsonEntries = json.getJSONArray(AbstractAuditWebScript.JSON_KEY_ENTRIES);
+        assertEquals("Incorrect number of search results", 1, jsonEntries.length());
+        
+        // Query using a non-existent entry path
+        url = "/api/audit/query/" + APP_REPOTEST_NAME + "/repositorytest/login/error/userXXX" + "?verbose=true";
+        req = new TestWebScriptServer.GetRequest(url);
+        response = sendRequest(req, Status.STATUS_OK, admin);
+        json = new JSONObject(response.getContentAsString());
+        jsonEntries = json.getJSONArray(AbstractAuditWebScript.JSON_KEY_ENTRIES);
+        assertTrue("Should not have found anything", jsonEntries.length() == 0);
+        
+        // Query using a good entry path
+        url = "/api/audit/query/" + APP_REPOTEST_NAME + "/repositorytest/login/error/user" + "?verbose=true";
+        req = new TestWebScriptServer.GetRequest(url);
+        response = sendRequest(req, Status.STATUS_OK, admin);
+        json = new JSONObject(response.getContentAsString());
+        jsonEntries = json.getJSONArray(AbstractAuditWebScript.JSON_KEY_ENTRIES);
+        assertTrue("Should have found entries", jsonEntries.length() > 0);
+        
+        // Now login with failure using a GUID and ensure that we can find it
+        String missingUser = new Long(System.currentTimeMillis()).toString();
+
+        // Query for event that has not happened
+        url = "/api/audit/query/" + APP_REPOTEST_NAME + "/repositorytest/login/error/user" + "?value=" + missingUser;
+        req = new TestWebScriptServer.GetRequest(url);
+        response = sendRequest(req, Status.STATUS_OK, admin);
+        json = new JSONObject(response.getContentAsString());
+        jsonEntries = json.getJSONArray(AbstractAuditWebScript.JSON_KEY_ENTRIES);
+        assertEquals("Incorrect number of search results", 0, jsonEntries.length());
+        
+        loginWithFailure(missingUser);
+        
+        // Query for event that has happened once
+        url = "/api/audit/query/" + APP_REPOTEST_NAME + "/repositorytest/login/error/user" + "?value=" + missingUser;
+        // ALF-3055 : auditing of failures is now asynchronous, so loop 60 times with a
+        // 1 second sleep to ensure that the audit is processed
+        for(int i = 0; i < 60; i++)
+        {
+	        req = new TestWebScriptServer.GetRequest(url);
+	        response = sendRequest(req, Status.STATUS_OK, admin);
+	        json = new JSONObject(response.getContentAsString());
+	        jsonEntries = json.getJSONArray(AbstractAuditWebScript.JSON_KEY_ENTRIES);
+	        if(jsonEntries.length() == 1)
+	        {
+	        	break;
+	        }
+        	Thread.sleep(1000);
+        }
+        assertEquals("Incorrect number of search results", 1, jsonEntries.length());
+        
+        // Query for event, but casting the value to the incorrect type
+        url = "/api/audit/query/" + APP_REPOTEST_NAME + "/repositorytest/login/error/user" + "?value=" + missingUser + "&valueType=java.lang.Long";
+        req = new TestWebScriptServer.GetRequest(url);
+        response = sendRequest(req, Status.STATUS_OK, admin);
+        json = new JSONObject(response.getContentAsString());
+        jsonEntries = json.getJSONArray(AbstractAuditWebScript.JSON_KEY_ENTRIES);
+        assertEquals("Incorrect number of search results", 0, jsonEntries.length());
+        
+        // Test what happens when the target data needs encoding
+        now = System.currentTimeMillis();
+        
+        String oddUser = "%$£\\\"\'";
+        loginWithFailure(oddUser);
+        
+        // Query for the event limiting to one by count and descending (i.e. get last)
+        url = "/api/audit/query/" + APP_REPOTEST_NAME + "?forward=false&limit=1&verbose=true&fromTime=" + now;
+        // ALF-3055 : auditing of failures is now asynchronous, so loop 60 times with a
+        // 1 second sleep to ensure that the audit is processed
+        for(int i = 0; i < 60; i++)
+        {
+            req = new TestWebScriptServer.GetRequest(url);
+            response = sendRequest(req, Status.STATUS_OK, admin);
+            json = new JSONObject(response.getContentAsString());
+            jsonEntries = json.getJSONArray(AbstractAuditWebScript.JSON_KEY_ENTRIES);
+	        if(jsonEntries.length() == 1)
+	        {
+	        	break;
+	        }
+        	Thread.sleep(1000);
+        }
+        assertEquals("Incorrect number of search results", 1, jsonEntries.length());
+
+        jsonEntry = jsonEntries.getJSONObject(0);
+        entryId = jsonEntry.getLong(AbstractAuditWebScript.JSON_KEY_ENTRY_ID);
+        assertNotNull("No entry ID", entryId);
+        jsonValues = jsonEntry.getJSONObject(AbstractAuditWebScript.JSON_KEY_ENTRY_VALUES);
+        entryUsername = jsonValues.getString("/repositorytest/login/error/user");
+        assertEquals("Didn't find the login-failure-user", oddUser, entryUsername);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/blogs/AllBlogTests.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/blogs/AllBlogTests.java
new file mode 100644
index 00000000000..a6d725a5ec7
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/blogs/AllBlogTests.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs;
+
+import org.alfresco.repo.blog.BlogServiceImplTest;
+import org.alfresco.service.cmr.blog.BlogService;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * This class is a holder for the various test classes associated with the {@link BlogService}.
+ * It is not (at the time of writing) intended to be incorporated into the automatic build
+ * which will find the various test classes and run them individually.
+ * 
+ * @author Neil Mc Erlean
+ * @since 4.0
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    BlogServiceImplTest.class,
+    BlogServiceTest.class
+})
+public class AllBlogTests
+{
+    // Intentionally empty
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/blogs/BlogServiceTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/blogs/BlogServiceTest.java
new file mode 100644
index 00000000000..0bbc1f00802
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/blogs/BlogServiceTest.java
@@ -0,0 +1,998 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.blogs;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.activities.feed.FeedGenerator;
+import org.alfresco.repo.activities.post.lookup.PostLookup;
+import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.alfresco.util.PropertyMap;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.alfresco.util.testing.category.RedundantTests;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.json.JSONStringer;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Unit Test to test Blog Web Script API
+ * 
+ * @author mruflin
+ */
+@Category(LuceneTests.class)
+public class BlogServiceTest extends BaseWebScriptTest
+{
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(BlogServiceTest.class);
+
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private PersonService personService;
+    private SiteService siteService;
+    private NodeArchiveService nodeArchiveService;
+    private ActivityService activityService;
+    private FeedGenerator feedGenerator;
+    private PostLookup postLookup;
+
+    private static final String USER_ONE = "UserOneSecondToo";
+    private static final String USER_TWO = "UserTwoSecondToo";
+    private static final String SITE_SHORT_NAME_BLOG = "BlogSiteShortNameTest";
+    private static final String COMPONENT_BLOG = "blog";
+
+    private static final String URL_BLOG_POST = "/api/blog/post/site/" + SITE_SHORT_NAME_BLOG + "/" + COMPONENT_BLOG + "/";
+    private static final String URL_BLOG_CORE = "/api/blog/site/" + SITE_SHORT_NAME_BLOG + "/" + COMPONENT_BLOG;
+    private static final String URL_BLOG_POSTS = URL_BLOG_CORE + "/posts";
+    private static final String URL_MY_DRAFT_BLOG_POSTS = "/api/blog/site/" + SITE_SHORT_NAME_BLOG +
+                                                          "/" + COMPONENT_BLOG + "/posts/mydrafts";
+    private static final String URL_MY_PUBLISHED_BLOG_POSTS = "/api/blog/site/" + SITE_SHORT_NAME_BLOG +
+                                                          "/" + COMPONENT_BLOG + "/posts/mypublished";
+
+    private static final String URL_DELETE_COMMENT = "api/comment/node/{0}/{1}/{2}?site={3}&itemtitle={4}&page={5}";
+
+    private List<String> posts;
+    private List<String> drafts;
+
+    
+    // General methods
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
+        this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+        this.siteService = (SiteService)getServer().getApplicationContext().getBean("SiteService");
+        this.nodeArchiveService = (NodeArchiveService)getServer().getApplicationContext().getBean("nodeArchiveService");
+        this.activityService = (ActivityService)getServer().getApplicationContext().getBean("activityService");
+        ChildApplicationContextFactory activitiesFeed = (ChildApplicationContextFactory)getServer().getApplicationContext().getBean("ActivitiesFeed");
+        ApplicationContext activitiesFeedCtx = activitiesFeed.getApplicationContext();
+        this.feedGenerator = (FeedGenerator)activitiesFeedCtx.getBean("feedGenerator");
+        this.postLookup = (PostLookup)activitiesFeedCtx.getBean("postLookup");
+
+        // Authenticate as user
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        // Create test site
+        // - only create the site if it doesn't already exist
+        SiteInfo siteInfo = this.siteService.getSite(SITE_SHORT_NAME_BLOG);
+        if (siteInfo == null)
+        {
+            this.siteService.createSite("BlogSitePreset", SITE_SHORT_NAME_BLOG, "BlogSiteTitle", "BlogSiteDescription", SiteVisibility.PUBLIC);
+        }
+        
+        // Create users
+        createUser(USER_ONE, SiteModel.SITE_COLLABORATOR, SITE_SHORT_NAME_BLOG);
+        createUser(USER_TWO, SiteModel.SITE_COLLABORATOR, SITE_SHORT_NAME_BLOG);
+
+        // Blank our lists used to track things the test creates
+        posts = new ArrayList<String>(5);
+        drafts = new ArrayList<String>(5);
+        
+        // Do tests as inviter user
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        
+        // admin user required to delete things
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        SiteInfo siteInfo = this.siteService.getSite(SITE_SHORT_NAME_BLOG);
+        if (siteInfo != null)
+        {
+            // delete invite site
+            siteService.deleteSite(SITE_SHORT_NAME_BLOG);
+            nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
+        }
+
+        
+        // delete the users
+        personService.deletePerson(USER_ONE);
+        if (this.authenticationService.authenticationExists(USER_ONE))
+        {
+           this.authenticationService.deleteAuthentication(USER_ONE);
+        }
+        
+        personService.deletePerson(USER_TWO);
+        if (this.authenticationService.authenticationExists(USER_TWO))
+        {
+           this.authenticationService.deleteAuthentication(USER_TWO);
+        }
+    }
+    
+    private void createUser(String userName, String role, String siteMembership)
+    {
+        // if user with given user name doesn't already exist then create user
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            // create user
+            this.authenticationService.createAuthentication(userName, "password".toCharArray());
+            
+            // create person properties
+            PropertyMap personProps = new PropertyMap();
+            personProps.put(ContentModel.PROP_USERNAME, userName);
+            personProps.put(ContentModel.PROP_FIRSTNAME, "FirstName123");
+            personProps.put(ContentModel.PROP_LASTNAME, "LastName123");
+            personProps.put(ContentModel.PROP_EMAIL, "FirstName123.LastName123@email.com");
+            personProps.put(ContentModel.PROP_JOBTITLE, "JobTitle123");
+            personProps.put(ContentModel.PROP_JOBTITLE, "Organisation123");
+            
+            // create person node for user
+            this.personService.createPerson(personProps);
+        }
+        
+        // add the user as a member with the given role
+        this.siteService.setMembership(siteMembership, userName, role);
+    }
+    
+    
+    // Test helper methods 
+    
+    private JSONObject getRequestObject(String title, String content, String[] tags, boolean isDraft)
+    throws Exception
+    {
+        JSONObject post = new JSONObject();
+        if (title != null)
+        {
+            post.put("title", title);
+        }
+        if (content != null)
+        {
+            post.put("content", content);
+        }
+        if (tags != null)
+        {
+            JSONArray arr = new JSONArray();
+            for (String s : tags)
+            {
+                arr.put(s);
+            }
+            post.put("tags", arr);
+        }
+        post.put("draft", isDraft);
+        return post;
+    }
+    
+    private JSONObject createPost(String title, String content, String[] tags, boolean isDraft, int expectedStatus)
+    throws Exception
+    {
+        JSONObject post = getRequestObject(title, content, tags, isDraft);
+        Response response = sendRequest(new PostRequest(URL_BLOG_POSTS, post.toString(), "application/json"), expectedStatus);
+
+        if (expectedStatus != 200)
+        {
+            return null;
+        }
+        
+        //logger.debug(response.getContentAsString());
+        JSONObject result = new JSONObject(response.getContentAsString());
+        JSONObject item = result.getJSONObject("item");
+        if (isDraft)
+        {
+            this.drafts.add(item.getString("name"));
+        }
+        else
+        {
+            this.posts.add(item.getString("name"));
+        }
+        return item;
+    }
+    
+    private JSONObject updatePost(String name, String title, String content, String[] tags, boolean isDraft, int expectedStatus)
+    throws Exception
+    {
+        JSONObject post = getRequestObject(title, content, tags, isDraft);
+        Response response = sendRequest(new PutRequest(URL_BLOG_POST + name, post.toString(), "application/json"), expectedStatus);
+        
+        if (expectedStatus != 200)
+        {
+            return null;
+        }
+
+        JSONObject result = new JSONObject(response.getContentAsString());
+        return result.getJSONObject("item");
+    }
+    
+    private JSONObject getPost(String name, int expectedStatus)
+    throws Exception
+    {
+        Response response = sendRequest(new GetRequest(URL_BLOG_POST + name), expectedStatus);
+        if (expectedStatus == 200)
+        {
+            JSONObject result = new JSONObject(response.getContentAsString());
+            return result.getJSONObject("item");
+        }
+        else
+        {
+            return null;
+        }
+    }
+    
+    private String getCommentsUrl(String nodeRef)
+    {
+        return "/api/node/" + nodeRef.replace("://", "/") + "/comments";
+    }
+    
+    private String getCommentUrl(String nodeRef)
+    {
+        return "/api/comment/node/" + nodeRef.replace("://", "/");
+    }
+
+    private String getDeleteCommentUrl(NodeRef commentNodeRef)
+    {
+        String itemTitle = "Test Title";
+        String page = "document-details";
+
+        String URL = MessageFormat.format(URL_DELETE_COMMENT, new Object[] { commentNodeRef.getStoreRef().getProtocol(),
+                commentNodeRef.getStoreRef().getIdentifier(), commentNodeRef.getId(), SITE_SHORT_NAME_BLOG, itemTitle, page});
+        return URL;
+    }
+
+    private JSONObject createComment(String nodeRef, String title, String content, int expectedStatus)
+    throws Exception
+    {
+        JSONObject comment = new JSONObject();
+        comment.put("title", title);
+        comment.put("content", content);
+        comment.put("site", SITE_SHORT_NAME_BLOG);
+        Response response = sendRequest(new PostRequest(getCommentsUrl(nodeRef), comment.toString(), "application/json"), expectedStatus);
+
+        if (expectedStatus != 200)
+        {
+            return null;
+        }
+
+        //logger.debug("Comment created: " + response.getContentAsString());
+        JSONObject result = new JSONObject(response.getContentAsString());
+        return result.getJSONObject("item");
+    }
+    
+    private JSONObject updateComment(String nodeRef, String title, String content, int expectedStatus)
+    throws Exception
+    {
+        JSONObject comment = new JSONObject();
+        comment.put("title", title);
+        comment.put("content", content);
+        Response response = sendRequest(new PutRequest(getCommentUrl(nodeRef), comment.toString(), "application/json"), expectedStatus);
+
+        if (expectedStatus != 200)
+        {
+            return null;
+        }
+
+        //logger.debug("Comment updated: " + response.getContentAsString());
+        JSONObject result = new JSONObject(response.getContentAsString());
+        return result.getJSONObject("item");
+    }
+    
+    
+    // Tests
+    
+    public void testCreateDraftPost() throws Exception
+    {
+        String title = "test";
+        String content = "test";
+        JSONObject item = createPost(title, content, null, true, 200);
+        
+        // check that the values
+        assertEquals(title, item.get("title"));
+        assertEquals(content, item.get("content"));
+        assertEquals(true, item.get("isDraft"));
+        
+        // check that other user doesn't have access to the draft
+        this.authenticationComponent.setCurrentUser(USER_TWO);
+        getPost(item.getString("name"), 404);
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+        
+        // Now we'll GET my-drafts to ensure that the post is there.
+        Response response = sendRequest(new GetRequest(URL_MY_DRAFT_BLOG_POSTS), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        assertTrue("Wrong number of posts", result.length() > 0);
+    }
+    
+    /**
+     * @since 4.0
+     */
+    @Test
+    @Category({LuceneTests.class, RedundantTests.class})
+    public void testCreateDraftPostWithTagsAndComment() throws Exception
+    {
+        String[] tags = new String[]{"foo", "bar"};
+        String title = "test";
+        String content = "test";
+        JSONObject item = createPost(title, content, tags, true, 200);
+        
+        // check that the values
+        assertEquals(title, item.get("title"));
+        assertEquals(content, item.get("content"));
+        assertEquals(true, item.get("isDraft"));
+        JSONArray reportedTags = (JSONArray)item.get("tags");
+        assertEquals("Tags size was wrong.", 2, reportedTags.length());
+        List<String> recoveredTagsList = Arrays.asList(new String[]{reportedTags.getString(0), reportedTags.getString(1)});
+        assertEquals("Tags were wrong.", Arrays.asList(tags), recoveredTagsList);
+        
+        // comment on the blog post.
+        NodeRef blogPostNode = new NodeRef(item.getString("nodeRef"));
+        // Currently (mid-Swift dev) there is no Java CommentService, so we have to post a comment via the REST API.
+        String commentsPostUrl = "/api/node/" + blogPostNode.getStoreRef().getProtocol() +
+                                 "/" + blogPostNode.getStoreRef().getIdentifier() + "/" +
+                                 blogPostNode.getId() + "/comments";
+        
+        String jsonToPost = new JSONStringer().object()
+                                                  .key("title").value("Commented blog title")
+                                                  .key("content").value("Some content.")
+                                              .endObject().toString();
+                          
+        Response response = sendRequest(new PostRequest(commentsPostUrl, jsonToPost, "application/json"), 200);
+        
+        // check that other user doesn't have access to the draft
+        this.authenticationComponent.setCurrentUser(USER_TWO);
+        getPost(item.getString("name"), 404);
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+        
+        // Now we'll GET my-drafts to ensure that the post is there.
+        response = sendRequest(new GetRequest(URL_MY_DRAFT_BLOG_POSTS), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        
+        // Ensure it reports the tag correctly on GET.
+        JSONArray items = result.getJSONArray("items");
+        JSONArray tagsArray = items.getJSONObject(0).getJSONArray("tags");
+        assertEquals("Wrong number of tags", 2, tagsArray.length());
+        assertEquals("Tag wrong", tags[0], tagsArray.getString(0));
+        assertEquals("Tag wrong", tags[1], tagsArray.getString(1));
+        
+        // Ensure the comment count is accurate
+        assertEquals("Wrong comment count", 1, items.getJSONObject(0).getInt("commentCount"));
+        
+        // and that there is content at the commentsURL.
+        String commentsUrl = "/api" + items.getJSONObject(0).getString("commentsUrl");
+        response = sendRequest(new GetRequest(commentsUrl), 200);
+        
+        
+        // Now get blog-post by tag.
+        // 1. No such tag
+        response = sendRequest(new GetRequest(URL_BLOG_POSTS + "?tag=NOSUCHTAG"), 200);
+        result = new JSONObject(response.getContentAsString());
+        
+        assertEquals(0, result.getInt("total"));
+        
+        // tag created above
+        response = sendRequest(new GetRequest(URL_BLOG_POSTS + "?tag=foo"), 200);
+        result = new JSONObject(response.getContentAsString());
+        
+        assertEquals(1, result.getInt("total"));
+        
+        //TODO More assertions on recovered node.
+    }
+    
+    public void testCreatePublishedPost() throws Exception
+    {
+        String title = "published";
+        String content = "content";
+        
+        JSONObject item = createPost(title, content, null, false, 200);
+        final String postName = item.getString("name");
+        
+        // check the values
+        assertEquals(title, item.get("title"));
+        assertEquals(content, item.get("content"));
+        assertEquals(false, item.get("isDraft"));
+        
+        // check that user two has access to it as well
+        this.authenticationComponent.setCurrentUser(USER_TWO);
+        getPost(item.getString("name"), 200);
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+
+        // Now we'll GET my-published to ensure that the post is there.
+        Response response = sendRequest(new GetRequest(URL_MY_PUBLISHED_BLOG_POSTS), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        
+        // we should have posts.size + drafts.size together
+        assertEquals(this.posts.size() + this.drafts.size(), result.getInt("total"));
+        
+        // Finally, we'll delete the blog-post to test the REST DELETE call.
+        response = sendRequest(new DeleteRequest(URL_BLOG_POST + postName), 200);
+
+    }
+    
+    public void testCreateEmptyPost() throws Exception
+    {
+        JSONObject item = createPost(null, null, null, false, 200);
+        
+        // check the values
+        assertEquals("", item.get("title"));
+        assertEquals("", item.get("content"));
+        assertEquals(false, item.get("isDraft"));
+        
+        // check that user two has access to it as well
+        this.authenticationComponent.setCurrentUser(USER_TWO);
+        getPost(item.getString("name"), 200);
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+    }
+    
+    public void testUpdated() throws Exception
+    {
+        JSONObject item = createPost("test", "test", null, false, 200);
+        String name = item.getString("name");
+        assertEquals(false, item.getBoolean("isUpdated"));
+        
+        item = updatePost(name, "new title", "new content", null, false, 200);
+        assertEquals(true, item.getBoolean("isUpdated"));
+        assertEquals("new title", item.getString("title"));
+        assertEquals("new content", item.getString("content"));
+    }
+    
+    public void testUpdateWithEmptyValues() throws Exception
+    {
+        JSONObject item = createPost("test", "test", null, false, 200);
+        String name = item.getString("name");
+        assertEquals(false, item.getBoolean("isUpdated"));
+        
+        item = updatePost(item.getString("name"), null, null, null, false, 200);
+        assertEquals("", item.getString("title"));
+        assertEquals("", item.getString("content"));
+    }
+    
+    public void testPublishThroughUpdate() throws Exception
+    {
+        JSONObject item = createPost("test", "test", null, true, 200);
+        String name = item.getString("name");
+        assertEquals(true, item.getBoolean("isDraft"));
+        
+        // check that user two does not have access
+        this.authenticationComponent.setCurrentUser(USER_TWO);
+        getPost(name, 404);
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+        
+        item = updatePost(name, "new title", "new content", null, false, 200);
+        assertEquals("new title", item.getString("title"));
+        assertEquals("new content", item.getString("content"));
+        assertEquals(false, item.getBoolean("isDraft"));
+        
+        // check that user two does have access
+        this.authenticationComponent.setCurrentUser(USER_TWO);
+        getPost(name, 200);
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+    }
+
+    public void testCannotDoUnpublish() throws Exception
+    {
+        JSONObject item = createPost("test", "test", null, false, 200);
+        String name = item.getString("name");
+        assertEquals(false, item.getBoolean("isDraft"));
+        
+        item = updatePost(name, "new title", "new content", null, true, 400); // should return bad request
+    }
+    
+    public void testGetAll() throws Exception
+    {
+        String url = URL_BLOG_POSTS;
+        Response response = sendRequest(new GetRequest(url), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        JSONObject blog;
+        
+        // We shouldn't have any posts at this point
+        assertEquals(0, this.posts.size());
+        assertEquals(0, this.drafts.size());
+        
+        assertEquals(0, result.getInt("total"));
+        assertEquals(0, result.getInt("startIndex"));
+        assertEquals(0, result.getInt("itemCount"));
+        assertEquals(0, result.getJSONArray("items").length());
+        
+        // Check that the permissions are correct
+        JSONObject metadata = result.getJSONObject("metadata");
+        JSONObject perms = metadata.getJSONObject("blogPermissions");
+        assertEquals(false, metadata.getBoolean("externalBlogConfig"));
+        assertEquals(false, perms.getBoolean("delete")); // No container yet
+        assertEquals(true, perms.getBoolean("edit"));
+        assertEquals(true, perms.getBoolean("create"));
+        
+
+        // Create a draft and a full post
+        String TITLE_1 = "Published";
+        String TITLE_2 = "Draft";
+        String TITLE_3 = "Another Published";
+        createPost(TITLE_1, "Stuff", null, false, Status.STATUS_OK);
+        createPost(TITLE_2, "Draft Stuff", null, true, Status.STATUS_OK);
+        
+        // Check now
+        response = sendRequest(new GetRequest(url), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(2, result.getInt("total"));
+        assertEquals(0, result.getInt("startIndex"));
+        assertEquals(2, result.getInt("itemCount"));
+        assertEquals(2, result.getJSONArray("items").length());
+
+        // Check the core permissions
+        metadata = result.getJSONObject("metadata");
+        perms = metadata.getJSONObject("blogPermissions");
+        assertEquals(false, metadata.getBoolean("externalBlogConfig"));
+        assertEquals(true, perms.getBoolean("delete")); // On the container itself
+        assertEquals(true, perms.getBoolean("edit"));
+        assertEquals(true, perms.getBoolean("create"));
+        
+        // Check each one in detail, they'll come back Published
+        //  then draft (newest first within that)
+        blog = result.getJSONArray("items").getJSONObject(0);
+        assertEquals(TITLE_1, blog.get("title"));
+        assertEquals(false, blog.getBoolean("isDraft"));
+        perms = blog.getJSONObject("permissions");
+        assertEquals(true, perms.getBoolean("delete"));
+        assertEquals(true, perms.getBoolean("edit"));
+        
+        blog = result.getJSONArray("items").getJSONObject(1);
+        assertEquals(TITLE_2, blog.get("title"));
+        assertEquals(true, blog.getBoolean("isDraft"));
+        perms = blog.getJSONObject("permissions");
+        assertEquals(true, perms.getBoolean("delete"));
+        assertEquals(true, perms.getBoolean("edit"));
+        
+        
+        // Add a third post
+        createPost(TITLE_3, "Still Stuff", null, false, Status.STATUS_OK);
+        
+        response = sendRequest(new GetRequest(url), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(3, result.getInt("total"));
+        assertEquals(0, result.getInt("startIndex"));
+        assertEquals(3, result.getInt("itemCount"));
+        assertEquals(3, result.getJSONArray("items").length());
+
+        // Published then draft, newest first
+        blog = result.getJSONArray("items").getJSONObject(0);
+        assertEquals(TITLE_3, blog.get("title"));
+        blog = result.getJSONArray("items").getJSONObject(1);
+        assertEquals(TITLE_1, blog.get("title"));
+        blog = result.getJSONArray("items").getJSONObject(2);
+        assertEquals(TITLE_2, blog.get("title"));
+
+        
+        // Ensure that paging behaves properly
+        response = sendRequest(new GetRequest(url + "?pageSize=2&startIndex=0"), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(3, result.getInt("total"));
+        assertEquals(0, result.getInt("startIndex"));
+        assertEquals(2, result.getInt("itemCount"));
+        assertEquals(2, result.getJSONArray("items").length());
+
+        assertEquals(TITLE_3, result.getJSONArray("items").getJSONObject(0).get("title"));
+        assertEquals(TITLE_1, result.getJSONArray("items").getJSONObject(1).get("title"));
+        
+        
+        response = sendRequest(new GetRequest(url + "?pageSize=2&startIndex=1"), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(3, result.getInt("total"));
+        assertEquals(1, result.getInt("startIndex"));
+        assertEquals(2, result.getInt("itemCount"));
+        assertEquals(2, result.getJSONArray("items").length());
+
+        assertEquals(TITLE_1, result.getJSONArray("items").getJSONObject(0).get("title"));
+        assertEquals(TITLE_2, result.getJSONArray("items").getJSONObject(1).get("title"));
+        
+        
+        response = sendRequest(new GetRequest(url + "?pageSize=2&startIndex=2"), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(3, result.getInt("total"));
+        assertEquals(2, result.getInt("startIndex"));
+        assertEquals(1, result.getInt("itemCount"));
+        assertEquals(1, result.getJSONArray("items").length());
+
+        assertEquals(TITLE_2, result.getJSONArray("items").getJSONObject(0).get("title"));
+
+        
+        // Switch user, check that permissions are correct
+        // (Drafts won't be seen)
+        this.authenticationComponent.setCurrentUser(USER_TWO);
+        
+        response = sendRequest(new GetRequest(url), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(2, result.getInt("total"));
+        assertEquals(0, result.getInt("startIndex"));
+        assertEquals(2, result.getInt("itemCount"));
+        
+        assertEquals(2, result.getJSONArray("items").length());
+        blog = result.getJSONArray("items").getJSONObject(0);
+        assertEquals(TITLE_3, blog.get("title"));
+        assertEquals(false, blog.getBoolean("isDraft"));
+        perms = blog.getJSONObject("permissions");
+        assertEquals(false, perms.getBoolean("delete"));
+        assertEquals(true, perms.getBoolean("edit"));
+        
+        blog = result.getJSONArray("items").getJSONObject(1);
+        assertEquals(TITLE_1, blog.get("title"));
+        assertEquals(false, blog.getBoolean("isDraft"));
+        perms = blog.getJSONObject("permissions");
+        assertEquals(false, perms.getBoolean("delete"));
+        assertEquals(true, perms.getBoolean("edit"));
+    }
+    
+    public void testGetNew() throws Exception
+    {
+        String url = URL_BLOG_POSTS + "/new";
+        Response response = sendRequest(new GetRequest(url), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        
+        // we should have posts.size
+        assertEquals(this.posts.size(), result.getInt("total"));
+    }
+    
+    public void testGetDrafts() throws Exception
+    {
+        String url = URL_BLOG_POSTS + "/mydrafts";
+        Response response = sendRequest(new GetRequest(URL_BLOG_POSTS), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        
+        // we should have drafts.size resultss
+        assertEquals(this.drafts.size(), result.getInt("total"));
+        
+        // the second user should have zero
+        this.authenticationComponent.setCurrentUser(USER_TWO);
+        response = sendRequest(new GetRequest(url), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(0, result.getInt("total"));
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+
+    }
+    
+    public void testMyPublished() throws Exception
+    {
+        String url = URL_BLOG_POSTS + "/mypublished";
+        Response response = sendRequest(new GetRequest(url), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        
+        // we should have posts.size results
+        assertEquals(this.drafts.size(), result.getInt("total"));
+        
+        // the second user should have zero
+        this.authenticationComponent.setCurrentUser(USER_TWO);
+        response = sendRequest(new GetRequest(url), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(0, result.getInt("total"));
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+    }
+
+    public void testComments() throws Exception
+    {
+        JSONObject item = createPost("test", "test", null, false, 200);
+        String name = item.getString("name");
+        String nodeRef = item.getString("nodeRef");
+        
+        JSONObject commentOne = createComment(nodeRef, "comment", "content", 200);
+        JSONObject commentTwo = createComment(nodeRef, "comment", "content", 200);
+        
+        // fetch the comments
+        Response response = sendRequest(new GetRequest(getCommentsUrl(nodeRef)), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        assertEquals(2, result.getInt("total"));
+        
+        // add another one
+        JSONObject commentThree = createComment(nodeRef, "comment", "content", 200);
+        
+        response = sendRequest(new GetRequest(getCommentsUrl(nodeRef)), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(3, result.getInt("total"));
+        
+        // delete the last comment
+        response = sendRequest(new DeleteRequest(getCommentUrl(commentThree.getString("nodeRef"))), 200);
+        
+        response = sendRequest(new GetRequest(getCommentsUrl(nodeRef)), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(2, result.getInt("total"));
+        
+        JSONObject commentTwoUpdated = updateComment(commentTwo.getString("nodeRef"), "new title", "new content", 200);
+        assertEquals("new title", commentTwoUpdated.getString("title"));
+        assertEquals("new content", commentTwoUpdated.getString("content"));
+    }
+
+    /**
+     * REPO-828 (MNT-16401)
+     * @throws Exception
+     */
+    public void testDeleteCommentPostActivity() throws Exception
+    {
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+        JSONObject item = createPost("testActivity", "test", null, false, 200);
+        assertNotNull(item);
+        postLookup.execute();
+        feedGenerator.execute();
+        int activityNumStart = activityService.getSiteFeedEntries(SITE_SHORT_NAME_BLOG).size();
+        String nodeRef = item.getString("nodeRef");
+        JSONObject commentOne = createComment(nodeRef, "comment", "content", 200);
+        assertNotNull(item);
+        postLookup.execute();
+        feedGenerator.execute();
+        int activityNumNext = activityService.getSiteFeedEntries(SITE_SHORT_NAME_BLOG).size();
+        assertEquals("The activity feeds were not generated after adding a comment", activityNumStart + 1, activityNumNext);
+        activityNumStart = activityNumNext;
+        NodeRef commentNodeRef = new NodeRef(commentOne.getString("nodeRef"));
+        Response resp = sendRequest(new DeleteRequest(getDeleteCommentUrl(commentNodeRef)), 200);
+        assertTrue(resp.getStatus() == 200);
+        postLookup.execute();
+        feedGenerator.execute();
+        activityNumNext = activityService.getSiteFeedEntries(SITE_SHORT_NAME_BLOG).size();
+        assertEquals("The activity feeds were not generated after deleting a comment", activityNumStart + 1, activityNumNext);
+    }
+
+    /**
+     * You can attach information to the blog container relating
+     *  to integration with external blogs.
+     * This tests that feature
+     */
+    public void testBlogIntegration() throws Exception
+    {
+       // Try to fetch the details on a new site
+       Response response = sendRequest(new GetRequest(URL_BLOG_CORE), 200);
+       String json = response.getContentAsString();
+       JSONObject result = new JSONObject(json);
+       
+       assertEquals("No item in:\n"+json, true, result.has("item"));
+       JSONObject item = result.getJSONObject("item");
+       
+       assertEquals("Missing key in: " + item, true, item.has("qnamePath"));
+       assertEquals("Missing key in: " + item, true, item.has("detailsUrl"));
+       assertEquals("Missing key in: " + item, true, item.has("blogPostsUrl"));
+       
+       // Blog properties are empty to start
+       assertEquals("", item.getString("type"));
+       assertEquals("", item.getString("name"));
+       assertEquals("", item.getString("description"));
+       assertEquals("", item.getString("url"));
+       assertEquals("", item.getString("username"));
+       assertEquals("", item.getString("password"));
+       
+       
+       // Have it updated
+       JSONObject blog = new JSONObject();
+       blog.put("blogType", "wordpress");
+       blog.put("blogName", "A Blog!");
+       blog.put("username", "guest");
+       sendRequest(new PutRequest(URL_BLOG_CORE, blog.toString(), "application/json"), Status.STATUS_OK);
+       
+       // Check again now
+       response = sendRequest(new GetRequest(URL_BLOG_CORE), 200);
+       json = response.getContentAsString();
+       result = new JSONObject(json);
+       
+       assertEquals("No item in:\n"+json, true, result.has("item"));
+       item = result.getJSONObject("item");
+       
+       assertEquals("Missing key in: " + item, true, item.has("qnamePath"));
+       assertEquals("Missing key in: " + item, true, item.has("detailsUrl"));
+       assertEquals("Missing key in: " + item, true, item.has("blogPostsUrl"));
+       
+       // Blog properties should now be set
+       assertEquals("wordpress", item.getString("type"));
+       assertEquals("A Blog!", item.getString("name"));
+       assertEquals("", item.getString("description"));
+       assertEquals("", item.getString("url"));
+       assertEquals("guest", item.getString("username"));
+       assertEquals("", item.getString("password"));
+    }
+ 
+    /**
+     * Does some stress tests.
+     * 
+     * Currently observed errors:
+     * 1. [repo.action.AsynchronousActionExecutionQueueImpl] Failed to execute asynchronous action: Action[ id=485211db-f117-4976-9530-ab861a19f563, node=null ]
+     * org.alfresco.repo.security.permissions.AccessDeniedException: Access Denied.  You do not have the appropriate permissions to perform this operation. 
+     * 
+     * 2. JSONException, but with root cause being
+     *   get(assocs) failed on instance of org.alfresco.repo.template.TemplateNode
+     *   The problematic instruction:
+     *   ----------
+     *   ==> if person.assocs["cm:avatar"]?? [on line 4, column 7 in org/alfresco/repository/blogs/blogpost.lib.ftl]
+     *   
+     * @throws Exception
+     */
+    public void _testTagsStressTest() throws Exception
+    {
+        final List<Exception> exceptions = Collections.synchronizedList(new ArrayList<Exception>());
+        List<Thread> threads = new ArrayList<Thread>();
+
+        System.err.println("Creating and starting threads...");
+        for (int x=0; x < 3; x++)
+        {
+            Thread t = new Thread(new Runnable() 
+            {
+                public void run() 
+                {
+                    // set the correct user
+                    authenticationComponent.setCurrentUser(USER_ONE);
+
+                    // now do some requests
+                    try 
+                    {
+                        for (int y=0; y < 3; y++)
+                        {
+                            off_testPostTags();
+                            off_testClearTags();
+                        }
+                        System.err.println("------------- SUCCEEDED ---------------");
+                    } catch (Exception e)
+                    {
+                        System.err.println("------------- ERROR ---------------");
+                        exceptions.add(e);
+                        e.printStackTrace();
+                        return;
+                    }
+            }});
+            
+            threads.add(t);
+            t.start();
+        } 
+        /*for (Thread t : threads)
+        {
+            t.start();
+        }*/
+        
+        for (Thread t : threads)
+        {
+            t.join();
+        }
+        
+        System.err.println("------------- STACK TRACES ---------------");
+        for (Exception e : exceptions)
+        {
+            e.printStackTrace();
+        }
+        System.err.println("------------- STACK TRACES END ---------------");
+        if (exceptions.size() > 0)
+        {
+            throw exceptions.get(0);
+        }
+    }
+    
+    public void off_testPostTags() throws Exception
+    {
+        String[] tags = { "first", "test" };
+        JSONObject item = createPost("tagtest", "tagtest", tags, false, 200);
+        assertEquals(2, item.getJSONArray("tags").length());
+        assertEquals("first", item.getJSONArray("tags").get(0));
+        assertEquals("test", item.getJSONArray("tags").get(1));
+        
+        item = updatePost(item.getString("name"), null, null, new String[] { "First", "Test", "Second" }, false, 200);
+        assertEquals(3, item.getJSONArray("tags").length());
+        assertEquals("first", item.getJSONArray("tags").get(0));
+        assertEquals("test", item.getJSONArray("tags").get(1));
+        assertEquals("second", item.getJSONArray("tags").get(2));
+    }
+    
+    public void off_testClearTags() throws Exception
+    {
+        String[] tags = { "abc", "def"};
+        JSONObject item = createPost("tagtest", "tagtest", tags, false, 200);
+        assertEquals(2, item.getJSONArray("tags").length());
+        
+        item = updatePost(item.getString("name"), null, null, new String[0], false, 200);
+        assertEquals(0, item.getJSONArray("tags").length());
+    }
+
+    /**
+     * Test for <a href=https://issues.alfresco.com/jira/browse/MNT-11964>MNT-11964</a>
+     * @throws Exception 
+     */
+    public void testBlogPermission() throws Exception
+    {
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        String siteName = SITE_SHORT_NAME_BLOG + GUID.generate();
+        this.siteService.createSite("BlogSitePreset", siteName, "BlogSiteTitle", "BlogSiteDescription", SiteVisibility.PUBLIC);
+        
+        String userName = USER_ONE + GUID.generate();
+        createUser(userName, SiteModel.SITE_COLLABORATOR, siteName);
+
+        // Check permissions for admin
+        checkBlogPermissions(siteName);
+        
+        // Check permissions for user
+        this.authenticationComponent.setCurrentUser(userName);
+        checkBlogPermissions(siteName);
+
+        // Cleanup
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        this.siteService.deleteSite(siteName);
+        
+        // Create a new site as user
+        this.authenticationComponent.setCurrentUser(userName);
+        siteName = SITE_SHORT_NAME_BLOG + GUID.generate();
+        this.siteService.createSite("BlogSitePreset", siteName, "BlogSiteTitle", "BlogSiteDescription", SiteVisibility.PUBLIC);
+        
+        // Check permissions for user
+        checkBlogPermissions(siteName);
+        
+        // Check permissions for admin
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        checkBlogPermissions(siteName);
+        
+        // Cleanup
+        this.siteService.deleteSite(siteName);
+        this.personService.deletePerson(userName);
+    }
+    
+    private void checkBlogPermissions(String siteName) throws Exception
+    {
+        String url = "/api/blog/site/" + siteName + "/" + COMPONENT_BLOG;
+        Response response = sendRequest(new GetRequest(url), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        
+        assertTrue("The user sould have permission to create a new blog.", result.getJSONObject("item").getJSONObject("permissions").getBoolean("create"));
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/calendar/AllCalendarTests.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/calendar/AllCalendarTests.java
new file mode 100644
index 00000000000..caa5369e2e6
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/calendar/AllCalendarTests.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.calendar;
+
+import org.alfresco.repo.calendar.CalendarHelpersTest;
+import org.alfresco.repo.calendar.CalendarServiceImplTest;
+import org.alfresco.service.cmr.calendar.CalendarService;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * This class is a holder for the various test classes associated with the {@link CalendarService}.
+ * It is not (at the time of writing) intended to be incorporated into the automatic build
+ * which will find the various test classes and run them individually.
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    CalendarServiceImplTest.class,
+    CalendarHelpersTest.class,
+    CalendarRestApiTest.class
+})
+public class AllCalendarTests
+{
+    // Intentionally empty
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/calendar/CalendarRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/calendar/CalendarRestApiTest.java
new file mode 100644
index 00000000000..ec71468b2a8
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/calendar/CalendarRestApiTest.java
@@ -0,0 +1,1384 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.calendar;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.calendar.CalendarServiceImpl;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.alfresco.util.PropertyMap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Unit Test to test the Calendaring Web Script API
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class CalendarRestApiTest extends BaseWebScriptTest
+{
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(CalendarRestApiTest.class);
+
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private PermissionService permissionService;
+    private PersonService personService;
+    private NodeService nodeService;
+    private SiteService siteService;
+    private NodeArchiveService nodeArchiveService;
+    
+    private static final String USER_ONE = "UserOneSecondToo";
+    private static final String USER_TWO = "UserTwoSecondToo";
+    private static final String USER_THREE = "UserThreeSecondToo";
+    private static final String USER_FOUR = "UserFourSecondToo";
+    private static final String SITE_SHORT_NAME_CALENDAR = "CalendarSiteShortNameTest";
+    
+    private static final String EVENT_TITLE_ONE = "TestEventOne";
+    private static final String EVENT_TITLE_TWO = "TestEventTwo";
+    private static final String EVENT_TITLE_THREE = "TestEventThree";
+
+    private static final String URL_EVENT_BASE = "/calendar/event/" + SITE_SHORT_NAME_CALENDAR + "/"; 
+    private static final String URL_EVENTS_LIST = "/calendar/eventList"; 
+    private static final String URL_EVENTS_LIST_ICS = "/calendar/eventList-" + SITE_SHORT_NAME_CALENDAR + ".ics?format=calendar"; 
+    private static final String URL_EVENT_CREATE = "/calendar/create"; 
+    
+    private static final String URL_USER_EVENTS_LIST = "/calendar/events/user"; 
+    private static final String URL_USER_SITE_EVENTS_LIST = "/calendar/events/" + SITE_SHORT_NAME_CALENDAR + "/user"; 
+
+    
+    // General methods
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
+        this.permissionService = (PermissionService)getServer().getApplicationContext().getBean("PermissionService");
+        this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+        this.nodeService = (NodeService)getServer().getApplicationContext().getBean("NodeService");
+        this.siteService = (SiteService)getServer().getApplicationContext().getBean("SiteService");
+        this.nodeArchiveService = (NodeArchiveService)getServer().getApplicationContext().getBean("nodeArchiveService");
+        
+        // Authenticate as user
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        // Create test site
+        // - only create the site if it doesn't already exist
+        SiteInfo siteInfo = this.siteService.getSite(SITE_SHORT_NAME_CALENDAR);
+        if (siteInfo == null)
+        {
+            this.siteService.createSite("CalendarSitePreset", SITE_SHORT_NAME_CALENDAR, "CalendarSiteTitle", "BlogSiteDescription", SiteVisibility.PUBLIC);
+        }
+        
+        // Ensure the calendar container is there
+        if (!siteService.hasContainer(SITE_SHORT_NAME_CALENDAR, CalendarServiceImpl.CALENDAR_COMPONENT))
+        {
+            siteService.createContainer(SITE_SHORT_NAME_CALENDAR, CalendarServiceImpl.CALENDAR_COMPONENT, null, null);
+        }
+        
+        // Create users
+        createUser(USER_ONE, SiteModel.SITE_COLLABORATOR);
+        createUser(USER_TWO, SiteModel.SITE_COLLABORATOR);
+        createUser(USER_THREE, SiteModel.SITE_CONTRIBUTOR);
+        createUser(USER_FOUR, SiteModel.SITE_CONSUMER);
+
+        // Do tests as inviter user
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        
+        // admin user required to delete user
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        SiteInfo siteInfo = this.siteService.getSite(SITE_SHORT_NAME_CALENDAR);
+        if (siteInfo != null)
+        {
+            // delete invite site
+            siteService.deleteSite(SITE_SHORT_NAME_CALENDAR);
+            nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
+        }
+        
+        // delete the users
+        deleteUser(USER_ONE);
+        deleteUser(USER_TWO);
+        deleteUser(USER_THREE);
+        deleteUser(USER_FOUR);
+    }
+    
+    private void createUser(String userName, String role)
+    {
+        // if user with given user name doesn't already exist then create user
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            // create user
+            this.authenticationService.createAuthentication(userName, "password".toCharArray());
+            
+            // create person properties
+            PropertyMap personProps = new PropertyMap();
+            personProps.put(ContentModel.PROP_USERNAME, userName);
+            personProps.put(ContentModel.PROP_FIRSTNAME, "FirstName123");
+            personProps.put(ContentModel.PROP_LASTNAME, "LastName123");
+            personProps.put(ContentModel.PROP_EMAIL, "FirstName123.LastName123@email.com");
+            personProps.put(ContentModel.PROP_JOBTITLE, "JobTitle123");
+            personProps.put(ContentModel.PROP_JOBTITLE, "Organisation123");
+            
+            // create person node for user
+            this.personService.createPerson(personProps);
+        }
+        
+        // add the user as a member with the given role
+        this.siteService.setMembership(SITE_SHORT_NAME_CALENDAR, userName, role);
+    }
+    private void deleteUser(String userName)
+    {
+       personService.deletePerson(userName);
+       if (this.authenticationService.authenticationExists(userName))
+       {
+          this.authenticationService.deleteAuthentication(userName);
+       }
+    }
+    
+    
+    // Test helper methods
+    
+    private JSONObject validateAndParseJSON(String json) throws Exception
+    {
+       // TODO Do full validation, rather than just the basic bits
+       //  that the JSONObject constructor provides
+       return new JSONObject(json);
+    }
+    
+    private JSONObject getEntries(String username, String from) throws Exception
+    {
+       String url = URL_EVENTS_LIST + "?site=" + SITE_SHORT_NAME_CALENDAR;
+       if (username != null)
+       {
+          url = URL_USER_SITE_EVENTS_LIST;
+       }
+       if (from != null)
+       {
+          if (url.indexOf('?') > 0)
+          {
+             url += "&";
+          }
+          else
+          {
+             url += "?";
+          }
+          url += "from=" + from;
+       }
+       
+       Response response = sendRequest(new GetRequest(url), 200);
+       JSONObject result = validateAndParseJSON(response.getContentAsString());
+       return result;
+    }
+    
+    private JSONObject getEntry(String name, int expectedStatus) throws Exception
+    {
+       Response response = sendRequest(new GetRequest(URL_EVENT_BASE + name), expectedStatus);
+       if (expectedStatus == Status.STATUS_OK)
+       {
+          JSONObject result = validateAndParseJSON(response.getContentAsString());
+          return result;
+       }
+       else
+       {
+          return null;
+       }
+    }
+    
+    /**
+     * Creates a 1 hour, non-all day event on the 29th of June
+     */
+    private JSONObject createEntry(String name, String where, String description, 
+          int expectedStatus) throws Exception
+    {
+       String date = "2011-06-29"; // A wednesday
+       String start = "12:00";
+       String end = "13:00";
+       
+       // Old style is:
+       //   "from": "2011/06/29",
+       //   "to":   "2011/06/29",
+       //   "start": "12:00",
+       //   "end":   "13:00",
+       
+       JSONObject json = new JSONObject();
+       json.put("startAt", date + "T" + start + ":00+01:00");
+       json.put("endAt",   date + "T" + end + ":00+01:00");
+       
+       return createEntry(name, where, description, json, expectedStatus);
+    }
+    
+    /**
+     * Creates an all day event for the 29th in a +1hr time zone
+     */
+    private JSONObject createAllDayEntryDifferentTimeZone(String name, String where, String description, 
+          int expectedStatus) throws Exception
+    {
+       String date = "2011-06-29"; // A wednesday
+       String start = "00:00";
+       String end = "00:00";
+       
+       JSONObject json = new JSONObject();
+       json.put("startAt", date + "T" + start + ":00+04:00");
+       json.put("endAt",   date + "T" + end + ":00+04:00");
+       json.put("allday", Boolean.TRUE);
+       return createEntry(name, where, description, json, expectedStatus);
+    }
+    
+    /**
+     * Creates an all day event for the 29th
+     */
+    private JSONObject createAllDayEntry(String name, String where, String description, 
+          int expectedStatus) throws Exception
+    {
+       String date = "2011-06-29"; // A wednesday
+       String start = "00:00";
+       String end = "00:00";
+       
+       JSONObject json = new JSONObject();
+       json.put("startAt", date + "T" + start + ":00+01:00");
+       json.put("endAt",   date + "T" + end + ":00+01:00");
+       json.put("allday", Boolean.TRUE);
+       return createEntry(name, where, description, json, expectedStatus);
+    }
+    
+    /**
+     * Creates an all day event that starts on the 27th and ends on the 29th
+     */
+    private JSONObject createMultiAllDayEntry(String name, String where, String description, 
+          int expectedStatus) throws Exception
+    {
+       String startDate = "2011-06-27"; // A wednesday
+       String endDate = "2011-06-29"; 
+       String time = "00:00";
+       
+       JSONObject json = new JSONObject();
+       json.put("startAt", startDate + "T" + time + ":00+00:00");
+       json.put("endAt",   endDate + "T" + time + ":00+00:00");
+       json.put("allday", Boolean.TRUE);
+       return createEntry(name, where, description, json, expectedStatus);
+    }
+    
+    /**
+     * Creates an event, with the date properties manually set
+     */
+    private JSONObject createEntry(String name, String where, String description, 
+          JSONObject datesJSON, int expectedStatus) throws Exception
+    {
+       JSONObject json = new JSONObject();
+       
+       json.put("site", SITE_SHORT_NAME_CALENDAR);
+       json.put("what", name);
+       json.put("where", where);
+       json.put("desc", description);
+       json.put("tags", "");
+       json.put("docfolder", "");
+       json.put("page", "calendar");
+       
+       // Copy in the date properties
+       for (String key : getKeys(datesJSON, false))
+       {
+          json.put(key, datesJSON.get(key));
+       }
+       
+       Response response = sendRequest(new PostRequest(URL_EVENT_CREATE, json.toString(), "application/json"), expectedStatus);
+       if (expectedStatus == Status.STATUS_OK)
+       {
+          JSONObject result = validateAndParseJSON(response.getContentAsString());
+          if (result.has("event"))
+          {
+             return result.getJSONObject("event");
+          }
+          return result;
+       }
+       else
+       {
+          return null;
+       }
+    }
+    
+    /**
+     * Updates the event to be a 2 hour, non-all day event on the 28th of June
+     */
+    private JSONObject updateEntry(String name, String what, String where, String description, 
+          boolean withRecurrence, int expectedStatus) throws Exception
+    {
+       String date = "2011/06/28"; // A Tuesday
+       String start = "11:30";
+       String end = "13:30";
+       
+       JSONObject json = new JSONObject();
+       json.put("what", what);
+       json.put("where", where);
+       json.put("desc", description);
+       json.put("from", date);
+       json.put("to", date);
+//       json.put("fromdate", "Tuesday, 30 June 2011"); // Not needed
+//       json.put("todate", "Tuesday, 30 June 2011"); // Not needed
+       json.put("start", start);
+       json.put("end", end);
+       json.put("tags", "");
+       json.put("docfolder", "");
+       json.put("page", "calendar");
+       
+       if (withRecurrence)
+       {
+          json.put("recurrenceRule", "FREQ=WEEKLY;INTERVAL=2;BYDAY=WE,FR");
+          json.put("recurrenceLastMeeting", "2011-09-11");
+       }
+       
+       Response response = sendRequest(new PutRequest(URL_EVENT_BASE + name, json.toString(), "application/json"), expectedStatus);
+       if (expectedStatus == Status.STATUS_OK)
+       {
+          JSONObject result = validateAndParseJSON(response.getContentAsString());
+          if (result.has("event"))
+          {
+             return result.getJSONObject("event");
+          }
+          if (result.has("data"))
+          {
+             return result.getJSONObject("data");
+          }
+          return result;
+       }
+       else
+       {
+          return null;
+       }
+    }
+    
+    /**
+     * Gets the event name (ics timestamp based) from an entry
+     */
+    private String getNameFromEntry(JSONObject entry) throws Exception
+    {
+       if (! entry.has("uri"))
+       {
+          throw new IllegalArgumentException("No uri in " + entry.toString());
+       }
+    
+       String uri = entry.getString("uri");
+       String name = uri.substring( 
+             uri.indexOf(SITE_SHORT_NAME_CALENDAR) + SITE_SHORT_NAME_CALENDAR.length() + 1);
+       
+       if (name.indexOf('?') > 0)
+       {
+          return name.substring(0, name.indexOf('?'));
+       }
+       else
+       {
+          return name;
+       }
+    }
+    
+    private String getEntriesICAL() throws Exception
+    {
+       Response response = sendRequest(new GetRequest(URL_EVENTS_LIST_ICS), 200);
+       return response.getContentAsString();
+    }
+    
+    /**
+     * Returns the Keys of a JSON Object, optionally sorted
+     */
+    private String[] getKeys(JSONObject json, boolean sorted)
+    {
+       @SuppressWarnings("unchecked")
+       Iterator<String> ki = json.keys();
+       
+       List<String> keys = new ArrayList<String>(json.length());
+       while (ki.hasNext())
+       {
+          keys.add(ki.next());
+       }
+       
+       if(sorted) { Collections.sort(keys); }
+       
+       return keys.toArray(new String[keys.size()]);
+    }
+    
+    
+    // Tests
+    
+    /**
+     * Creating, editing, fetching and deleting an entry
+     */
+    public void testCreateEditDeleteEntry() throws Exception
+    {
+       JSONObject entry;
+       String name;
+       
+       
+       // Won't be there to start with
+       entry = getEntry(EVENT_TITLE_ONE, Status.STATUS_OK);
+       assertEquals(true, entry.has("error"));
+       
+       
+       // Create
+       entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", Status.STATUS_OK);
+       name = getNameFromEntry(entry);
+       
+       assertEquals(EVENT_TITLE_ONE, entry.getString("name"));
+       assertEquals("Where", entry.getString("where"));
+       assertEquals("Thing", entry.getString("desc"));
+       assertEquals("2011-06-29", entry.getJSONObject("startAt").getString("legacyDate")); // Different format!
+       assertEquals("2011-06-29", entry.getJSONObject("endAt").getString("legacyDate")); // Different format!
+       assertEquals("12:00", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("13:00", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("false", entry.getString("allday"));
+       // No isoutlook on create/edit
+       
+       
+       // Fetch
+       entry = getEntry(name, Status.STATUS_OK);
+       
+       assertEquals("Error found " + entry.toString(), false, entry.has("error"));
+       assertEquals(EVENT_TITLE_ONE, entry.getString("what"));
+       assertEquals(name, entry.getString("name"));
+       assertEquals("Where", entry.getString("location")); // Not where...
+       assertEquals("Thing", entry.getString("description")); // Not desc...
+       
+       assertEquals("false", entry.getString("isoutlook"));
+       assertEquals("6/29/2011", entry.getJSONObject("startAt").getString("legacyDate"));
+       assertEquals("6/29/2011", entry.getJSONObject("endAt").getString("legacyDate"));
+       assertEquals("12:00", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("13:00", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("false", entry.getString("allday"));
+       
+       // Check the new style dates too
+       assertEquals("2011-06-29T12:00:00.000+01:00", entry.getJSONObject("startAt").get("iso8601"));
+       assertEquals("6/29/2011", entry.getJSONObject("startAt").get("legacyDate"));
+       assertEquals("12:00", entry.getJSONObject("startAt").get("legacyTime"));
+       assertEquals("2011-06-29T13:00:00.000+01:00", entry.getJSONObject("endAt").get("iso8601"));
+       assertEquals("6/29/2011", entry.getJSONObject("endAt").get("legacyDate"));
+       assertEquals("13:00", entry.getJSONObject("endAt").get("legacyTime"));
+       
+       // Check the permissions on it
+       assertEquals(true, entry.has("permissions"));
+       JSONObject permissions = entry.getJSONObject("permissions");
+       assertEquals(true, permissions.getBoolean("edit"));
+       assertEquals(true, permissions.getBoolean("delete"));
+       
+       
+       // Switch users to consumer, check we can still see it
+       this.authenticationComponent.setCurrentUser(USER_FOUR);
+       entry = getEntry(name, Status.STATUS_OK);
+       
+       assertEquals("Error found " + entry.toString(), false, entry.has("error"));
+       assertEquals(EVENT_TITLE_ONE, entry.getString("what"));
+       assertEquals(name, entry.getString("name"));
+       
+       assertEquals("2011-06-29T12:00:00.000+01:00", entry.getJSONObject("startAt").get("iso8601"));
+       assertEquals("6/29/2011", entry.getJSONObject("startAt").get("legacyDate"));
+       assertEquals("12:00", entry.getJSONObject("startAt").get("legacyTime"));
+       assertEquals("2011-06-29T13:00:00.000+01:00", entry.getJSONObject("endAt").get("iso8601"));
+       assertEquals("6/29/2011", entry.getJSONObject("endAt").get("legacyDate"));
+       assertEquals("13:00", entry.getJSONObject("endAt").get("legacyTime"));
+       
+       // Check the other user sees different permissions
+       assertEquals(true, entry.has("permissions"));
+       permissions = entry.getJSONObject("permissions");
+       assertEquals(false, permissions.getBoolean("edit"));
+       assertEquals(false, permissions.getBoolean("delete"));
+       
+       // Back to the main user for more tests
+       this.authenticationComponent.setCurrentUser(USER_ONE);
+       
+       
+       // Edit
+       entry = updateEntry(name, EVENT_TITLE_ONE, "More Where", "More Thing", false, Status.STATUS_OK);
+       assertEquals("Error found " + entry.toString(), false, entry.has("error"));
+       assertEquals(EVENT_TITLE_ONE, entry.getString("summary"));
+       assertEquals("More Where", entry.getString("location"));
+       assertEquals("More Thing", entry.getString("description"));
+       
+       // Now uses new style dates
+       assertEquals("2011-06-28T11:30", entry.getJSONObject("startAt").getString("legacyDateTime"));
+       assertEquals("2011-06-28T13:30", entry.getJSONObject("endAt").getString("legacyDateTime"));
+       assertEquals("false", entry.getString("allday"));
+       // No isoutlook on create/edit
+       
+       
+       // Fetch
+       entry = getEntry(name, Status.STATUS_OK);
+       
+       assertEquals("Error found " + entry.toString(), false, entry.has("error"));
+       assertEquals(EVENT_TITLE_ONE, entry.getString("what"));
+       assertEquals(name, entry.getString("name"));
+       assertEquals("More Where", entry.getString("location")); // Not where...
+       assertEquals("More Thing", entry.getString("description"));
+       
+       assertEquals("false", entry.getString("isoutlook"));
+       assertEquals("6/28/2011", entry.getJSONObject("startAt").getString("legacyDate"));
+       assertEquals("6/28/2011", entry.getJSONObject("endAt").getString("legacyDate"));
+       assertEquals("11:30", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("13:30", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("false", entry.getString("allday"));
+
+       
+       // TODO Make it a whole day event and check that
+       
+       
+       // Make it recurring
+       entry = updateEntry(name, EVENT_TITLE_ONE, "More Where", "More Thing", true, Status.STATUS_OK);       
+       
+       // Fetch
+       entry = getEntry(name, Status.STATUS_OK);
+       
+       assertEquals("Error found " + entry.toString(), false, entry.has("error"));
+       assertEquals(EVENT_TITLE_ONE, entry.getString("what"));
+       assertEquals(name, entry.getString("name"));
+       assertEquals("More Where", entry.getString("location")); // Not where...
+       assertEquals("More Thing", entry.getString("description"));
+       
+       assertEquals("false", entry.getString("isoutlook"));
+       assertEquals("6/28/2011", entry.getJSONObject("startAt").getString("legacyDate"));
+       assertEquals("6/28/2011", entry.getJSONObject("endAt").getString("legacyDate"));
+       assertEquals("11:30", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("13:30", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("false", entry.getString("allday"));
+       assertEquals(
+             "Occurs every 2 weeks on Wednesday, Friday, effective " +
+             "28-Jun-2011 until 11-Sep-2011 from 11:30 to 13:30 (BST)", 
+             entry.getString("recurrence"));
+       
+       // Delete
+       sendRequest(new DeleteRequest(URL_EVENT_BASE + name), Status.STATUS_NO_CONTENT);
+       
+       
+       // Fetch, will have gone
+       entry = getEntry(EVENT_TITLE_ONE, Status.STATUS_OK);
+       assertEquals(true, entry.has("error"));
+       
+       
+       // Can't delete again
+       sendRequest(new DeleteRequest(URL_EVENT_BASE + name), Status.STATUS_NOT_FOUND);
+       
+       // Can't edit it when it's deleted
+       sendRequest(new PutRequest(URL_EVENT_BASE + name, "{}", "application/json"), Status.STATUS_OK);
+       assertEquals(true, entry.has("error"));
+    }
+    
+    
+    /**
+     * Creating, editing, fetching and deleting an entry
+     */
+    public void testCreateAllDayEntry() throws Exception
+    {
+       JSONObject entry;
+       String name;
+       
+       
+       // Won't be there to start with
+       entry = getEntry(EVENT_TITLE_ONE, Status.STATUS_OK);
+       assertEquals(true, entry.has("error"));
+       
+       
+       // Create all day event
+       entry = createAllDayEntry(EVENT_TITLE_ONE, "Where", "Thing", Status.STATUS_OK);
+       name = getNameFromEntry(entry);
+       
+       assertEquals(EVENT_TITLE_ONE, entry.getString("name"));
+       assertEquals("Where", entry.getString("where"));
+       assertEquals("Thing", entry.getString("desc"));
+       assertEquals("2011-06-29", entry.getJSONObject("startAt").getString("legacyDate")); // Different format!
+       assertEquals("2011-06-29", entry.getJSONObject("endAt").getString("legacyDate")); // Different format!
+       assertEquals("00:00", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("00:00", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("true", entry.getString("allday"));
+       // No isoutlook on create/edit
+       
+       
+       // Fetch
+       entry = getEntry(name, Status.STATUS_OK);
+       
+       assertEquals("Error found " + entry.toString(), false, entry.has("error"));
+       assertEquals(EVENT_TITLE_ONE, entry.getString("what"));
+       assertEquals(name, entry.getString("name"));
+       assertEquals("Where", entry.getString("location")); // Not where...
+       assertEquals("Thing", entry.getString("description")); // Not desc...
+       
+       assertEquals("false", entry.getString("isoutlook"));
+       assertEquals("6/29/2011", entry.getJSONObject("startAt").getString("legacyDate"));
+       assertEquals("6/29/2011", entry.getJSONObject("endAt").getString("legacyDate"));
+       assertEquals("00:00", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("00:00", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("true", entry.getString("allday"));
+       
+       // Check the new style dates too,
+       assertEquals("2011-06-29T00:00:00.000", entry.getJSONObject("startAt").get("iso8601"));
+       assertEquals("2011-06-29T00:00:00.000", entry.getJSONObject("endAt").get("iso8601"));
+
+       
+       
+       
+       // Create all day event in different time zone
+       entry = createAllDayEntryDifferentTimeZone(EVENT_TITLE_ONE, "Where", "Thing", Status.STATUS_OK);
+       name = getNameFromEntry(entry);
+       
+       assertEquals(EVENT_TITLE_ONE, entry.getString("name"));
+       assertEquals("Where", entry.getString("where"));
+       assertEquals("Thing", entry.getString("desc"));
+       assertEquals("2011-06-29", entry.getJSONObject("startAt").getString("legacyDate")); // Different format!
+       assertEquals("2011-06-29", entry.getJSONObject("endAt").getString("legacyDate")); // Different format!
+       assertEquals("00:00", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("00:00", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("true", entry.getString("allday"));
+       // No isoutlook on create/edit
+       
+       
+       // Fetch
+       entry = getEntry(name, Status.STATUS_OK);
+       
+       assertEquals("Error found " + entry.toString(), false, entry.has("error"));
+       assertEquals(EVENT_TITLE_ONE, entry.getString("what"));
+       assertEquals(name, entry.getString("name"));
+       assertEquals("Where", entry.getString("location")); // Not where...
+       assertEquals("Thing", entry.getString("description")); // Not desc...
+       
+       assertEquals("false", entry.getString("isoutlook"));
+       assertEquals("6/29/2011", entry.getJSONObject("startAt").getString("legacyDate"));
+       assertEquals("6/29/2011", entry.getJSONObject("endAt").getString("legacyDate"));
+       assertEquals("00:00", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("00:00", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("true", entry.getString("allday"));
+       
+       // Check the new style dates too
+       assertEquals("2011-06-29T00:00:00.000", entry.getJSONObject("startAt").get("iso8601"));
+       assertEquals("2011-06-29T00:00:00.000", entry.getJSONObject("endAt").get("iso8601"));
+
+       
+       
+       // Create Multi all day event
+       entry = createMultiAllDayEntry(EVENT_TITLE_ONE, "Where", "Thing", Status.STATUS_OK);
+       name = getNameFromEntry(entry);
+       
+       assertEquals(EVENT_TITLE_ONE, entry.getString("name"));
+       assertEquals("Where", entry.getString("where"));
+       assertEquals("Thing", entry.getString("desc"));
+       assertEquals("2011-06-27", entry.getJSONObject("startAt").getString("legacyDate")); // Different format!
+       assertEquals("2011-06-29", entry.getJSONObject("endAt").getString("legacyDate")); // Different format!
+       assertEquals("00:00", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("00:00", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("true", entry.getString("allday"));
+       // No isoutlook on create/edit
+       
+       
+       // Fetch
+       entry = getEntry(name, Status.STATUS_OK);
+       
+       assertEquals("Error found " + entry.toString(), false, entry.has("error"));
+       assertEquals(EVENT_TITLE_ONE, entry.getString("what"));
+       assertEquals(name, entry.getString("name"));
+       assertEquals("Where", entry.getString("location")); // Not where...
+       assertEquals("Thing", entry.getString("description")); // Not desc...
+       
+       assertEquals("false", entry.getString("isoutlook"));
+       assertEquals("6/27/2011", entry.getJSONObject("startAt").getString("legacyDate"));
+       assertEquals("6/29/2011", entry.getJSONObject("endAt").getString("legacyDate"));
+       assertEquals("00:00", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("00:00", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("true", entry.getString("allday"));
+       
+       // Check the new style dates too
+       assertEquals("2011-06-27T00:00:00.000", entry.getJSONObject("startAt").get("iso8601"));
+       assertEquals("2011-06-29T00:00:00.000", entry.getJSONObject("endAt").get("iso8601"));
+       
+    }
+    
+    
+    
+    /**
+     * When fetching an event, we get permission details.
+     * This test ensures they are correct
+     */
+    public void testPermissions() throws Exception
+    {
+       JSONObject entry;
+       JSONObject permissions;
+       String name;
+       
+       
+       // Run through our different users, checking their permissions
+       NodeRef calendarNodeRef = siteService.getContainer(SITE_SHORT_NAME_CALENDAR, CalendarServiceImpl.CALENDAR_COMPONENT);
+
+       // Users One and Two are Collaborators, allowed to add new Calendar Entries
+       this.authenticationComponent.setCurrentUser(USER_ONE);
+       assertEquals(
+             SiteModel.SITE_COLLABORATOR, 
+             siteService.getMembersRole(SITE_SHORT_NAME_CALENDAR, authenticationComponent.getCurrentUserName())
+       );
+       assertEquals(
+             AccessStatus.ALLOWED,
+             permissionService.hasPermission(calendarNodeRef, PermissionService.ADD_CHILDREN)
+       );
+       
+       this.authenticationComponent.setCurrentUser(USER_TWO);
+       assertEquals(
+             SiteModel.SITE_COLLABORATOR, 
+             siteService.getMembersRole(SITE_SHORT_NAME_CALENDAR, authenticationComponent.getCurrentUserName())
+       );
+       assertEquals(
+             AccessStatus.ALLOWED,
+             permissionService.hasPermission(calendarNodeRef, PermissionService.ADD_CHILDREN)
+       );
+
+       this.authenticationComponent.setCurrentUser(USER_THREE);
+       assertEquals(
+             SiteModel.SITE_CONTRIBUTOR, 
+             siteService.getMembersRole(SITE_SHORT_NAME_CALENDAR, authenticationComponent.getCurrentUserName())
+       );
+       assertEquals(
+             AccessStatus.ALLOWED,
+             permissionService.hasPermission(calendarNodeRef, PermissionService.ADD_CHILDREN)
+       );
+
+       this.authenticationComponent.setCurrentUser(USER_FOUR);
+       assertEquals(
+             SiteModel.SITE_CONSUMER, 
+             siteService.getMembersRole(SITE_SHORT_NAME_CALENDAR, authenticationComponent.getCurrentUserName())
+       );
+       assertEquals(
+             AccessStatus.DENIED,
+             permissionService.hasPermission(calendarNodeRef, PermissionService.ADD_CHILDREN)
+       );
+
+       
+       // To user One, and Create
+       this.authenticationComponent.setCurrentUser(USER_ONE);
+       entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", Status.STATUS_OK);
+       name = getNameFromEntry(entry);
+       
+       // Fetch as the creator user
+       entry = getEntry(name, Status.STATUS_OK);
+       
+       assertEquals("Error found " + entry.toString(), false, entry.has("error"));
+       assertEquals(EVENT_TITLE_ONE, entry.getString("what"));
+       assertEquals(name, entry.getString("name"));
+       assertEquals("2011-06-29T12:00:00.000+01:00", entry.getJSONObject("startAt").get("iso8601"));
+       assertEquals("2011-06-29T13:00:00.000+01:00", entry.getJSONObject("endAt").get("iso8601"));
+       
+       // Check the permissions on it
+       assertEquals(true, entry.has("permissions"));
+       permissions = entry.getJSONObject("permissions");
+       assertEquals(true, permissions.getBoolean("edit"));
+       assertEquals(true, permissions.getBoolean("delete"));
+       
+       
+       // Different User, also Collaborator, allowed to Edit but not Delete
+       this.authenticationComponent.setCurrentUser(USER_TWO);
+       entry = getEntry(name, Status.STATUS_OK);
+       
+       assertEquals("Error found " + entry.toString(), false, entry.has("error"));
+       assertEquals(EVENT_TITLE_ONE, entry.getString("what"));
+       assertEquals(name, entry.getString("name"));
+       assertEquals("2011-06-29T12:00:00.000+01:00", entry.getJSONObject("startAt").get("iso8601"));
+       assertEquals("2011-06-29T13:00:00.000+01:00", entry.getJSONObject("endAt").get("iso8601"));
+       
+       // Check the other user sees different permissions
+       assertEquals(true, entry.has("permissions"));
+       permissions = entry.getJSONObject("permissions");
+       assertEquals(true, permissions.getBoolean("edit"));
+       assertEquals(false, permissions.getBoolean("delete"));
+       
+       
+       // Switch from Collaborator to Contributor, loose delete
+       this.authenticationComponent.setCurrentUser(USER_THREE);
+       entry = getEntry(name, Status.STATUS_OK);
+       
+       assertEquals("Error found " + entry.toString(), false, entry.has("error"));
+       assertEquals(EVENT_TITLE_ONE, entry.getString("what"));
+       assertEquals(name, entry.getString("name"));
+       assertEquals("2011-06-29T12:00:00.000+01:00", entry.getJSONObject("startAt").get("iso8601"));
+       assertEquals("2011-06-29T13:00:00.000+01:00", entry.getJSONObject("endAt").get("iso8601"));
+       
+       // Check the other user sees different permissions
+       assertEquals(true, entry.has("permissions"));
+       permissions = entry.getJSONObject("permissions");
+       assertEquals(false, permissions.getBoolean("edit"));
+       assertEquals(false, permissions.getBoolean("delete"));
+       
+       
+       // Switch users to consumer, still see but not edit
+       this.authenticationComponent.setCurrentUser(USER_FOUR);
+       entry = getEntry(name, Status.STATUS_OK);
+       
+       assertEquals("Error found " + entry.toString(), false, entry.has("error"));
+       assertEquals(EVENT_TITLE_ONE, entry.getString("what"));
+       assertEquals(name, entry.getString("name"));
+       assertEquals("2011-06-29T12:00:00.000+01:00", entry.getJSONObject("startAt").get("iso8601"));
+       assertEquals("2011-06-29T13:00:00.000+01:00", entry.getJSONObject("endAt").get("iso8601"));
+       
+       // Check the other user sees different permissions
+       assertEquals(true, entry.has("permissions"));
+       permissions = entry.getJSONObject("permissions");
+       assertEquals(false, permissions.getBoolean("edit"));
+       assertEquals(false, permissions.getBoolean("delete"));
+       
+       
+       // Note - create permissions not checked here, done via 
+       //  permissions checking at the start of this method
+       
+       // Back to the main user for more tests
+       this.authenticationComponent.setCurrentUser(USER_ONE);
+    }
+    
+    /**
+     * Checks that we can work with old style two part date times,
+     *  ISO8601 datetimes with offsets, and ISO8601 datetimes with an
+     *  explicit timezone. 
+     */
+    public void testDifferentDateStyles() throws Exception
+    {
+       JSONObject json;
+       JSONObject entry;
+       JSONObject startAt;
+       JSONObject endAt;
+       
+       
+       // From+Start, To+End with slashes
+       json = new JSONObject();
+       json.put("from", "2011/06/21");
+       json.put("to",   "2011/06/21");
+       json.put("start", "11:00");
+       json.put("end",   "12:00");
+       entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
+       
+       assertEquals("2011-06-21", entry.getJSONObject("startAt").getString("legacyDate"));
+       assertEquals("2011-06-21", entry.getJSONObject("endAt").getString("legacyDate"));
+       assertEquals("11:00", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("12:00", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("false", entry.getString("allday"));
+       // Can't check iso8601 form as we don't know the TZ
+       
+       
+       // From+Start, To+End with dashes
+       json = new JSONObject();
+       json.put("from", "2011-06-22");
+       json.put("to",   "2011-06-22");
+       json.put("start", "10:00");
+       json.put("end",   "12:00");
+       entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
+       
+       assertEquals("2011-06-22", entry.getJSONObject("startAt").getString("legacyDate"));
+       assertEquals("2011-06-22", entry.getJSONObject("endAt").getString("legacyDate"));
+       assertEquals("10:00", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("12:00", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("false", entry.getString("allday"));
+       // Can't check iso8601 form as we don't know the TZ
+       
+       
+       // ISO8601 with offset
+       json = new JSONObject();
+       json.put("startAt", "2011-06-21T11:30:05+01:00");
+       json.put("endAt",   "2011-06-21T12:45:25+01:00");
+       entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
+       
+       // Check old style dates and times
+       assertEquals("2011-06-21", entry.getJSONObject("startAt").getString("legacyDate"));
+       assertEquals("2011-06-21", entry.getJSONObject("endAt").getString("legacyDate"));
+       assertEquals("11:30", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("12:45", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("false", entry.getString("allday"));
+       
+       // Check new style dates and times
+       assertEquals("2011-06-21T11:30:05.000+01:00", entry.getJSONObject("startAt").getString("iso8601"));
+       assertEquals("2011-06-21T12:45:25.000+01:00", entry.getJSONObject("endAt").getString("iso8601"));
+       
+       
+       // ISO8601 with timezone
+       json = new JSONObject();
+       json.put("startAt", "2011-06-22T11:30:05");
+       json.put("endAt",   "2011-06-22T12:45:25");
+       json.put("timeZone", "Europe/London");
+       entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
+       
+       // Check old style dates and times
+       assertEquals("2011-06-22", entry.getJSONObject("startAt").getString("legacyDate"));
+       assertEquals("2011-06-22", entry.getJSONObject("endAt").getString("legacyDate"));
+       assertEquals("11:30", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("12:45", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("false", entry.getString("allday"));
+       
+       // Check new style dates and times
+       assertEquals("2011-06-22T11:30:05.000+01:00", entry.getJSONObject("startAt").getString("iso8601"));
+       assertEquals("2011-06-22T12:45:25.000+01:00", entry.getJSONObject("endAt").getString("iso8601"));
+       
+       
+       // ISO8601 in get style, with offset
+       json = new JSONObject();
+       startAt = new JSONObject();
+       endAt = new JSONObject();
+       startAt.put("iso8601",  "2011-06-20T09:35:05+01:00");
+       endAt.put("iso8601",  "2011-06-20T10:35:25+01:00");
+       json.put("startAt", startAt);
+       json.put("endAt",   endAt);
+       entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
+       
+       // Check old style dates and times
+       assertEquals("2011-06-20", entry.getJSONObject("startAt").getString("legacyDate"));
+       assertEquals("2011-06-20", entry.getJSONObject("endAt").getString("legacyDate"));
+       assertEquals("09:35", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("10:35", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("false", entry.getString("allday"));
+       
+       // Check new style dates and times
+       assertEquals("2011-06-20T09:35:05.000+01:00", entry.getJSONObject("startAt").getString("iso8601"));
+       assertEquals("2011-06-20T10:35:25.000+01:00", entry.getJSONObject("endAt").getString("iso8601"));
+       
+       
+       // ISO8601 in get style, with timezone
+       json = new JSONObject();
+       startAt = new JSONObject();
+       endAt = new JSONObject();
+       startAt.put("iso8601",  "2011-06-24T09:30:05");
+       startAt.put("timeZone", "Europe/London");
+       endAt.put("iso8601",  "2011-06-24T10:45:25");
+       endAt.put("timeZone", "Europe/London");
+       json.put("startAt", startAt);
+       json.put("endAt",   endAt);
+       entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
+       
+       // Check old style dates and times
+       assertEquals("2011-06-24", entry.getJSONObject("startAt").getString("legacyDate"));
+       assertEquals("2011-06-24", entry.getJSONObject("endAt").getString("legacyDate"));
+       assertEquals("09:30", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("10:45", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("false", entry.getString("allday"));
+       
+       // Check new style dates and times
+       assertEquals("2011-06-24T09:30:05.000+01:00", entry.getJSONObject("startAt").getString("iso8601"));
+       assertEquals("2011-06-24T10:45:25.000+01:00", entry.getJSONObject("endAt").getString("iso8601"));
+       
+       
+       // All-day old-style
+       json = new JSONObject();
+       json.put("from", "2011/06/21");
+       json.put("to",   "2011/06/21");
+       json.put("allday", Boolean.TRUE);
+       entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
+
+       assertEquals("2011-06-21", entry.getJSONObject("startAt").getString("legacyDate"));
+       assertEquals("2011-06-21", entry.getJSONObject("endAt").getString("legacyDate"));
+       assertEquals("00:00", entry.getJSONObject("startAt").getString("legacyTime"));
+       assertEquals("00:00", entry.getJSONObject("endAt").getString("legacyTime"));
+       assertEquals("true", entry.getString("allday"));
+       
+       // All-day ISO8601 with timezone
+       json = new JSONObject();
+       json.put("startAt", "2011-06-22T00:00:00");
+       json.put("endAt",   "2011-06-22T00:00:00");
+       json.put("timeZone", "Europe/London");
+       json.put("allday", Boolean.TRUE);
+       entry = createEntry(EVENT_TITLE_ONE, "Where", "Thing", json, Status.STATUS_OK);
+       
+       assertEquals("2011-06-22", entry.getJSONObject("startAt").getString("legacyDate"));
+       assertEquals("2011-06-22", entry.getJSONObject("endAt").getString("legacyDate"));
+       assertEquals("true", entry.getString("allday"));
+    }
+    
+    /**
+     * Listing
+     */
+    public void testOverallListing() throws Exception
+    {
+       JSONObject dates;
+       JSONArray entries;
+       
+       // Initially, there are no events
+       dates = getEntries(null, null);
+       assertEquals(0, dates.length());
+       
+       
+       // Add two events in the past
+       createEntry(EVENT_TITLE_ONE, "Somewhere", "Thing 1", Status.STATUS_OK);
+       createEntry(EVENT_TITLE_TWO, "Somewhere", "Thing 2", Status.STATUS_OK);
+       
+       // Check again
+       dates = getEntries(null, null);
+       
+       // Should have two entries on the one day
+       assertEquals(1, dates.length());
+       assertEquals("6/29/2011", dates.names().getString(0));
+     
+       entries = dates.getJSONArray("6/29/2011");
+       assertEquals(2, entries.length());
+       assertEquals(EVENT_TITLE_ONE, entries.getJSONObject(0).getString("name"));
+       assertEquals(EVENT_TITLE_TWO, entries.getJSONObject(1).getString("name"));
+       
+       //Check the dates
+       assertEquals("2011-06-29T12:00:00.000+01:00", entries.getJSONObject(0).getJSONObject("startAt").getString("iso8601"));
+       assertEquals("2011-06-29T13:00:00.000+01:00", entries.getJSONObject(0).getJSONObject("endAt").getString("iso8601"));
+       
+       // Add a third, on the next day
+       JSONObject entry = createEntry(EVENT_TITLE_THREE, "Where3", "Thing 3", Status.STATUS_OK);
+       String name3 = getNameFromEntry(entry);
+       updateEntry(name3, EVENT_TITLE_THREE, "More Where 3", "More Thing 3", false, Status.STATUS_OK);
+       
+       
+       // Check now, should have two days
+       dates = getEntries(null, null);
+       assertEquals(2, dates.length());
+       assertEquals("6/29/2011", dates.names().getString(0));
+       assertEquals("6/28/2011", dates.names().getString(1));
+       
+       entries = dates.getJSONArray("6/29/2011");
+       assertEquals(2, entries.length());
+       assertEquals(EVENT_TITLE_ONE, entries.getJSONObject(0).getString("name"));
+       assertEquals(EVENT_TITLE_TWO, entries.getJSONObject(1).getString("name"));
+       
+       entries = dates.getJSONArray("6/28/2011");
+       assertEquals(1, entries.length());
+       assertEquals(EVENT_TITLE_THREE, entries.getJSONObject(0).getString("name"));
+       
+       
+       // Now check the ICS
+       String ical = getEntriesICAL();
+       assertTrue("Invalid ICAL:\n" + ical, ical.contains("BEGIN:VCALENDAR"));
+       assertTrue("Invalid ICAL:\n" + ical, ical.contains("END:VCALENDAR"));
+       
+       // Should have the three entries
+       assertEquals(3+1, ical.split("BEGIN:VEVENT").length);
+       
+       assertTrue("Title not found:\n" + ical, ical.contains("SUMMARY:"+EVENT_TITLE_ONE));
+       assertTrue("Title not found:\n" + ical, ical.contains("SUMMARY:"+EVENT_TITLE_TWO));
+       assertTrue("Title not found:\n" + ical, ical.contains("SUMMARY:"+EVENT_TITLE_THREE));
+    }
+    
+    /**
+     * Listing for a user
+     */
+    public void testUserListing() throws Exception
+    {
+       JSONObject result;
+       JSONArray events;
+       
+       // Initially, there are no events
+       result = getEntries(null, null);
+       assertEquals(0, result.length());
+       
+       result = getEntries("admin", null);
+       events = result.getJSONArray("events");
+       assertEquals(0, events.length());
+       
+       // Add two events in the past
+       createEntry(EVENT_TITLE_ONE, "Somewhere", "Thing 1", Status.STATUS_OK);
+       createEntry(EVENT_TITLE_TWO, "Somewhere", "Thing 2", Status.STATUS_OK);
+       
+       // Check again
+       result = getEntries(null, null);
+       assertEquals(1, result.length());
+       
+       result = getEntries("admin", "2000/01/01"); // With a from date
+       events = result.getJSONArray("events");
+       assertEquals(2, events.length());
+       assertEquals(EVENT_TITLE_ONE, events.getJSONObject(0).getString("title"));
+       assertEquals(EVENT_TITLE_TWO, events.getJSONObject(1).getString("title"));
+       
+       result = getEntries("admin", null); // Without a from date
+       events = result.getJSONArray("events");
+       assertEquals(2, events.length());
+       assertEquals(EVENT_TITLE_ONE, events.getJSONObject(0).getString("title"));
+       assertEquals(EVENT_TITLE_TWO, events.getJSONObject(1).getString("title"));
+       
+       
+       // Add a third, on the next day
+       JSONObject entry = createEntry(EVENT_TITLE_THREE, "Where3", "Thing 3", Status.STATUS_OK);
+       String name3 = getNameFromEntry(entry);
+       updateEntry(name3, EVENT_TITLE_THREE, "More Where 3", "More Thing 3", false, Status.STATUS_OK);
+       
+       
+       // Check getting all of them
+       result = getEntries("admin", null);
+       events = result.getJSONArray("events");
+       assertEquals(3, events.length());
+       assertEquals(EVENT_TITLE_THREE, events.getJSONObject(0).getString("title"));
+       assertEquals(EVENT_TITLE_ONE, events.getJSONObject(1).getString("title"));
+       assertEquals(EVENT_TITLE_TWO, events.getJSONObject(2).getString("title"));
+       assertEquals(SITE_SHORT_NAME_CALENDAR, events.getJSONObject(0).getString("site"));
+       assertEquals(SITE_SHORT_NAME_CALENDAR, events.getJSONObject(1).getString("site"));
+       assertEquals(SITE_SHORT_NAME_CALENDAR, events.getJSONObject(2).getString("site"));
+       
+
+       // Now set a date filter to constrain
+       result = getEntries("admin", "2011/06/29");
+       events = result.getJSONArray("events");
+       assertEquals(2, events.length());
+       assertEquals(EVENT_TITLE_ONE, events.getJSONObject(0).getString("title"));
+       assertEquals(EVENT_TITLE_TWO, events.getJSONObject(1).getString("title"));
+       
+       result = getEntries("admin", "2011/07/01");
+       events = result.getJSONArray("events");
+       assertEquals(0, events.length());
+       
+       
+       // Make it not site specific
+       Response response = sendRequest(new GetRequest(URL_USER_EVENTS_LIST + "?from=2000/01/01"), 200);
+       result = new JSONObject(response.getContentAsString());
+       events = result.getJSONArray("events");
+       assertEquals(3, events.length());
+       
+       
+       // Now hide the site, and remove the user from it, events will go
+       this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+       SiteInfo site = siteService.getSite(SITE_SHORT_NAME_CALENDAR);
+       site.setVisibility(SiteVisibility.PRIVATE);
+       siteService.updateSite(site);
+       siteService.removeMembership(SITE_SHORT_NAME_CALENDAR, USER_ONE);
+       this.authenticationComponent.setCurrentUser(USER_ONE);
+       
+       response = sendRequest(new GetRequest(URL_USER_EVENTS_LIST + "?from=2000/01/01"), 200);
+       result = new JSONObject(response.getContentAsString());
+       events = result.getJSONArray("events");
+       assertEquals(0, events.length());
+    }
+    
+    /**
+     * Listing for a user
+     */
+    public void testMNT_3053() throws Exception
+    {
+        String siteName = null; 
+        do
+        {
+            siteName = GUID.generate();
+        }
+        while (siteService.getSite(siteName) != null);
+        sendRequest(new GetRequest("/calendar/events/" + siteName + "/user"), 404);
+    }
+
+    /**
+     * Repeating events support, across both the site
+     *  specific and user wide listings.
+     */
+    public void testRepeatingEventsInListings() throws Exception 
+    {
+       JSONObject result;
+       JSONArray events;
+       
+       // Initially, there are no events
+       result = getEntries(null, null);
+       assertEquals(0, result.length());
+       
+       result = getEntries("admin", null);
+       events = result.getJSONArray("events");
+       assertEquals(0, events.length());
+       
+       // Add two events in the past, one of which repeats 
+       JSONObject entry1 = createEntry(EVENT_TITLE_ONE, "Somewhere", "Thing 1", Status.STATUS_OK);
+       JSONObject entry2 = createEntry(EVENT_TITLE_TWO, "Somewhere", "Thing 2", Status.STATUS_OK);
+       String entryName1 = getNameFromEntry(entry1); 
+       String entryName2 = getNameFromEntry(entry2);
+       // Have it repeat on wednesdays and fridays every two weeks
+       updateEntry(entryName2, EVENT_TITLE_TWO, "Somewhere", "Thing 2", true, Status.STATUS_OK);
+
+       
+       // Get all the entries, without repeats expanded
+       // ---------------------------------------------
+       
+       // For the user
+       result = getEntries("admin", "2011-06-27&repeating=first");
+       events = result.getJSONArray("events");
+       assertEquals(2, events.length());
+       assertEquals(entryName2, events.getJSONObject(0).getString("name"));
+       assertEquals(entryName1, events.getJSONObject(1).getString("name"));
+       assertEquals(EVENT_TITLE_TWO + " (Repeating)", events.getJSONObject(0).getString("title"));
+       assertEquals(EVENT_TITLE_ONE, events.getJSONObject(1).getString("title"));
+       
+       
+       // For the site (JSON format is different)
+       result = getEntries(null, "2011-06-27&repeating=first");
+       assertEquals(2, result.length());
+       assertEquals("6/28/2011", getKeys(result, true)[0]);
+       assertEquals("6/29/2011", getKeys(result, true)[1]);
+       
+       events = result.getJSONArray("6/28/2011");
+       assertEquals(1, events.length());
+       assertEquals(EVENT_TITLE_TWO + " (Repeating)", events.getJSONObject(0).getString("name"));
+       
+       events = result.getJSONArray("6/29/2011");
+       assertEquals(1, events.length());
+       assertEquals(EVENT_TITLE_ONE, events.getJSONObject(0).getString("name"));
+       
+       
+       // Get all the entries, with repeats expanded
+       // ------------------------------------------
+       
+       // For the user
+       result = getEntries("admin", "2011/06/27");
+       events = result.getJSONArray("events");
+       assertEquals(7, Math.min(events.length(),7)); // At least
+       assertEquals(entryName2, events.getJSONObject(0).getString("name"));
+       assertEquals(entryName2, events.getJSONObject(1).getString("name")); // 11:30 ->
+       assertEquals(entryName1, events.getJSONObject(2).getString("name")); // 12:00 ->
+       assertEquals(entryName2, events.getJSONObject(3).getString("name"));
+       assertEquals(entryName2, events.getJSONObject(4).getString("name"));
+       assertEquals(entryName2, events.getJSONObject(5).getString("name"));
+       assertEquals(entryName2, events.getJSONObject(6).getString("name"));
+       assertEquals(entryName2, events.getJSONObject(7).getString("name"));
+       assertEquals(EVENT_TITLE_TWO, events.getJSONObject(0).getString("title"));
+       assertEquals(EVENT_TITLE_TWO, events.getJSONObject(1).getString("title"));
+       assertEquals(EVENT_TITLE_ONE, events.getJSONObject(2).getString("title"));
+       assertEquals(EVENT_TITLE_TWO, events.getJSONObject(3).getString("title"));
+       assertEquals(EVENT_TITLE_TWO, events.getJSONObject(4).getString("title"));
+       assertEquals(EVENT_TITLE_TWO, events.getJSONObject(5).getString("title"));
+       assertEquals(EVENT_TITLE_TWO, events.getJSONObject(6).getString("title"));
+       assertEquals(EVENT_TITLE_TWO, events.getJSONObject(7).getString("title"));
+       
+       // Check the dates on these:
+       // Repeating original
+       assertEquals("2011-06-28T", events.getJSONObject(0).getJSONObject("startAt").getString("iso8601").substring(0,11));
+       // 1st repeat Wednesday
+       assertEquals("2011-06-29T", events.getJSONObject(1).getJSONObject("startAt").getString("iso8601").substring(0,11));
+       // Non-repeating original
+       assertEquals("2011-06-29T", events.getJSONObject(2).getJSONObject("startAt").getString("iso8601").substring(0,11));
+       // 1st repeat Friday
+       assertEquals("2011-07-01T", events.getJSONObject(3).getJSONObject("startAt").getString("iso8601").substring(0,11));
+       // 2nd repeat Wednesday
+       assertEquals("2011-07-13T", events.getJSONObject(4).getJSONObject("startAt").getString("iso8601").substring(0,11));
+       // 2nd repeat Friday
+       assertEquals("2011-07-15T", events.getJSONObject(5).getJSONObject("startAt").getString("iso8601").substring(0,11));
+       // 3rd repeat Wednesday
+       assertEquals("2011-07-27T", events.getJSONObject(6).getJSONObject("startAt").getString("iso8601").substring(0,11));
+       // 3rd repeat Friday
+       assertEquals("2011-07-29T", events.getJSONObject(7).getJSONObject("startAt").getString("iso8601").substring(0,11));
+
+       
+       // For the site
+       result = getEntries(null, "2011-06-28&repeating=all");
+       assertEquals(7, Math.min(result.length(),7)); // At least
+       
+       // Repeating original
+       assertEquals("6/28/2011", getKeys(result, true)[0]);
+       assertEquals(1, result.getJSONArray("6/28/2011").length());
+       assertEquals(EVENT_TITLE_TWO, result.getJSONArray("6/28/2011").getJSONObject(0).get("name"));
+       // 1st repeat Wednesday, then Non-repeating original
+       assertEquals("6/29/2011", getKeys(result, true)[1]);
+       assertEquals(2, result.getJSONArray("6/29/2011").length());
+       assertEquals(EVENT_TITLE_TWO, result.getJSONArray("6/29/2011").getJSONObject(0).get("name"));
+       assertEquals(EVENT_TITLE_ONE, result.getJSONArray("6/29/2011").getJSONObject(1).get("name"));
+       // 1st repeat Friday
+       assertEquals("7/1/2011", getKeys(result, true)[2]);
+       assertEquals(1, result.getJSONArray("7/1/2011").length());
+       assertEquals(EVENT_TITLE_TWO, result.getJSONArray("7/1/2011").getJSONObject(0).get("name"));
+       // 2nd repeat Wednesday
+       assertEquals("7/13/2011", getKeys(result, true)[3]);
+       assertEquals(1, result.getJSONArray("7/13/2011").length());
+       assertEquals(EVENT_TITLE_TWO, result.getJSONArray("7/13/2011").getJSONObject(0).get("name"));
+       // 2nd repeat Friday
+       assertEquals("7/15/2011", getKeys(result, true)[4]);
+       assertEquals(1, result.getJSONArray("7/15/2011").length());
+       assertEquals(EVENT_TITLE_TWO, result.getJSONArray("7/15/2011").getJSONObject(0).get("name"));
+       // 3rd repeat Wednesday
+       assertEquals("7/27/2011", getKeys(result, true)[5]);
+       assertEquals(1, result.getJSONArray("7/27/2011").length());
+       assertEquals(EVENT_TITLE_TWO, result.getJSONArray("7/27/2011").getJSONObject(0).get("name"));
+       // 3rd repeat Friday
+       assertEquals("7/29/2011", getKeys(result, true)[6]);
+       assertEquals(1, result.getJSONArray("7/29/2011").length());
+       assertEquals(EVENT_TITLE_TWO, result.getJSONArray("7/29/2011").getJSONObject(0).get("name"));
+
+       
+       
+       // Ask for events from a date in the future
+       // We shouldn't get either of the original events, but we 
+       //  should get the repeating instances of the 2nd one
+       result = getEntries("admin", "2011/08/20");
+       events = result.getJSONArray("events");
+       assertEquals(4, events.length());
+       
+       // The repeating event runs until 2011-09-11, a Sunday
+       assertEquals(entryName2, events.getJSONObject(0).getString("name"));
+       assertEquals(entryName2, events.getJSONObject(1).getString("name"));
+       assertEquals(entryName2, events.getJSONObject(2).getString("name"));
+       assertEquals(entryName2, events.getJSONObject(3).getString("name"));
+       
+       // First Wednesday after the start date
+       assertEquals("2011-08-24T", events.getJSONObject(0).getJSONObject("startAt").getString("iso8601").substring(0,11));
+       // Friday
+       assertEquals("2011-08-26T", events.getJSONObject(1).getJSONObject("startAt").getString("iso8601").substring(0,11));
+       // Wednesday, 2 weeks later
+       assertEquals("2011-09-07T", events.getJSONObject(2).getJSONObject("startAt").getString("iso8601").substring(0,11));
+       // Friday, final repeating instance date
+       assertEquals("2011-09-09T", events.getJSONObject(3).getJSONObject("startAt").getString("iso8601").substring(0,11));
+       
+       
+       // Check by site, should see the same
+       result = getEntries(null, "2011-08-20&repeating=all");
+       assertEquals(4, result.length());
+       
+       assertEquals("8/24/2011", getKeys(result, true)[0]);
+       assertEquals(1, result.getJSONArray("8/24/2011").length());
+       assertEquals(EVENT_TITLE_TWO, result.getJSONArray("8/24/2011").getJSONObject(0).get("name"));
+       
+       assertEquals("8/26/2011", getKeys(result, true)[1]);
+       assertEquals(1, result.getJSONArray("8/26/2011").length());
+       assertEquals(EVENT_TITLE_TWO, result.getJSONArray("8/26/2011").getJSONObject(0).get("name"));
+       
+       assertEquals("9/7/2011", getKeys(result, true)[2]);
+       assertEquals(1, result.getJSONArray("9/7/2011").length());
+       assertEquals(EVENT_TITLE_TWO, result.getJSONArray("9/7/2011").getJSONObject(0).get("name"));
+       
+       assertEquals("9/9/2011", getKeys(result, true)[3]);
+       assertEquals(1, result.getJSONArray("9/9/2011").length());
+       assertEquals(EVENT_TITLE_TWO, result.getJSONArray("9/9/2011").getJSONObject(0).get("name"));
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/comment/CommentsApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/comment/CommentsApiTest.java
new file mode 100644
index 00000000000..31fcbdd8b5e
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/comment/CommentsApiTest.java
@@ -0,0 +1,772 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.comment;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.Date;
+import java.util.List;
+
+import javax.transaction.UserTransaction;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.activities.feed.FeedGenerator;
+import org.alfresco.repo.activities.post.lookup.PostLookup;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.permissions.PermissionReference;
+import org.alfresco.repo.security.permissions.PermissionServiceSPI;
+import org.alfresco.repo.security.permissions.impl.ModelDAO;
+import org.alfresco.repo.security.permissions.impl.SimplePermissionEntry;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.cmr.version.VersionService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.PropertyMap;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+import org.springframework.extensions.webscripts.WebScriptException;
+
+/**
+ * TODO: Fix the loose transaction handling.
+ * TODO: Rationalise with other v0 Comment REST API tests (eg. see BlogServiceTest ... etc). See also ACE-5437.
+ */
+public class CommentsApiTest extends BaseWebScriptTest
+{
+    // V0 Comments REST API
+    private static final String URL_POST_COMMENT = "api/node/{0}/{1}/{2}/comments";
+    private static final String URL_DELETE_COMMENT = "api/comment/node/{0}/{1}/{2}?site={3}&itemtitle={4}&page={5}&pageParams={6}";
+    private static final String URL_PUT_COMMENT = "api/comment/node/{0}/{1}/{2}";
+    
+    private static final String JSON = "application/json";
+    private static final String SITE_SHORT_NAME = "SomeTestSiteShortName-"+System.currentTimeMillis();
+    
+    private static final String USER_ONE = "SomeTestUserOne";
+    private static final String USER_TWO = "SomeTestUserTwo";
+    private static final String USER_THREE = "SomeTestUserThree";
+    private static final String USER_FOUR = "SomeTestUserFour";
+    
+    private static final String JSON_KEY_NODEREF = "nodeRef";
+    private static final String JSON_KEY_ITEM = "item";
+    
+    private String requestBodyJson = "{\"title\" : \"Test Title\", \"content\" : \"Test Comment\"}";
+    
+    private FileFolderService fileFolderService;
+    private TransactionService transactionService;
+    private SearchService searchService;
+    private NodeService nodeService;
+    private NamespaceService namespaceService;
+    private VersionService versionService;
+    private PersonService personService;
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    protected PermissionServiceSPI permissionService;
+    protected ModelDAO permissionModelDAO;
+    private ActivityService activityService;
+    private FeedGenerator feedGenerator;
+    private PostLookup postLookup;
+
+    private NodeRef rootNodeRef;
+    private NodeRef companyHomeNodeRef;
+    private NodeRef sharedHomeNodeRef;
+    private NodeRef nodeRef;
+    private NodeRef sitePage;
+
+    private static final String USER_TEST = "UserTest";
+
+    private static final String DOCLIB_CONTAINER = "documentLibrary";
+    
+    private UserTransaction txn;
+
+    private String USER2 = "user2";
+    private SiteService siteService;
+    private NodeArchiveService nodeArchiveService; 
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        ApplicationContext appContext = getServer().getApplicationContext();
+
+        fileFolderService = (FileFolderService)appContext.getBean("fileFolderService");
+        transactionService = (TransactionService)appContext.getBean("transactionService");
+        searchService = (SearchService)appContext.getBean("SearchService");
+        nodeService = (NodeService)appContext.getBean("nodeService");
+        namespaceService = (NamespaceService)appContext.getBean("namespaceService");
+        versionService = (VersionService)appContext.getBean("versionService");
+        personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+        authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
+        authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
+        permissionService =  (PermissionServiceSPI) getServer().getApplicationContext().getBean("permissionService");
+        permissionModelDAO = (ModelDAO) getServer().getApplicationContext().getBean("permissionsModelDAO");
+        siteService = (SiteService)getServer().getApplicationContext().getBean("SiteService");
+        personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+        nodeArchiveService = (NodeArchiveService)getServer().getApplicationContext().getBean("nodeArchiveService");
+        activityService = (ActivityService)getServer().getApplicationContext().getBean("activityService");
+        ChildApplicationContextFactory activitiesFeed = (ChildApplicationContextFactory)getServer().getApplicationContext().getBean("ActivitiesFeed");
+        ApplicationContext activitiesFeedCtx = activitiesFeed.getApplicationContext();
+        feedGenerator = (FeedGenerator)activitiesFeedCtx.getBean("feedGenerator");
+        postLookup = (PostLookup)activitiesFeedCtx.getBean("postLookup");
+
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+
+        // Get Company Home
+        rootNodeRef = nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+        List<NodeRef> results = searchService.selectNodes(rootNodeRef, "/app:company_home", null, namespaceService, false);
+        if (results.size() == 0)
+        {
+            throw new AlfrescoRuntimeException("Can't find /app:company_home");
+        }
+        companyHomeNodeRef = results.get(0);
+        
+        // Get Shared
+        results = searchService.selectNodes(rootNodeRef, "/app:company_home/app:shared", null, namespaceService, false);
+        if (results.size() == 0)
+        {
+            throw new AlfrescoRuntimeException("Can't find /app:company_home/app:shared");
+        }
+
+        sharedHomeNodeRef = results.get(0);
+        
+        results = searchService.selectNodes(rootNodeRef, "/app:company_home/cm:Commenty", null, namespaceService, false);
+        if (results.size() > 0)
+        {
+        	fileFolderService.delete(results.get(0));
+        }
+
+        nodeRef = fileFolderService.create(companyHomeNodeRef, "Commenty", ContentModel.TYPE_CONTENT).getNodeRef();
+        versionService.ensureVersioningEnabled(nodeRef, null);
+        nodeService.setProperty(nodeRef, ContentModel.PROP_AUTO_VERSION_PROPS, true);
+        
+        createUser(USER2);
+        createUser(USER_TEST);
+        
+        txn.commit();
+
+        AuthenticationUtil.clearCurrentSecurityContext();
+        
+        // MNT-12082
+        // Authenticate as admin
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        
+        // Create test site
+        // - only create the site if it doesn't already exist
+        SiteInfo siteInfo = siteService.getSite(SITE_SHORT_NAME);
+        if (siteInfo == null)
+        {
+            siteInfo = siteService.createSite("SomeTestSite", SITE_SHORT_NAME, "SiteTitle", "SiteDescription", SiteVisibility.PUBLIC);
+        }
+
+        NodeRef docLibContainer = siteService.getContainer(SITE_SHORT_NAME, DOCLIB_CONTAINER);
+        if (docLibContainer == null)
+        {
+            siteService.createContainer(SITE_SHORT_NAME, DOCLIB_CONTAINER, ContentModel.TYPE_FOLDER, null);
+        }
+
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+
+        // Create users
+        
+        createUser(USER_ONE, SiteModel.SITE_CONSUMER);
+        createUser(USER_TWO, SiteModel.SITE_CONTRIBUTOR);
+
+        createUser(USER_THREE, SiteModel.SITE_COLLABORATOR);
+        createUser(USER_FOUR, SiteModel.SITE_COLLABORATOR);
+
+        // Create site page
+        sitePage = nodeService.createNode(siteInfo.getNodeRef(),
+                ContentModel.ASSOC_CONTAINS,
+                QName.createQName(NamespaceService.CONTENT_MODEL_PREFIX, "test"),
+                ContentModel.TYPE_CONTENT).getChildRef();
+        
+        txn.commit();
+        
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        
+        // admin user required to delete user
+        authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        // delete the discussions users
+        if(personService.personExists(USER_TEST))
+        {
+            // delete invite site
+           personService.deletePerson(USER_TEST);
+
+        // delete the users
+        }
+        if (authenticationService.authenticationExists(USER_TEST))
+        {
+           authenticationService.deleteAuthentication(USER_TEST);
+        }
+        
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        
+        SiteInfo siteInfo = this.siteService.getSite(SITE_SHORT_NAME);
+        if (siteInfo != null)
+        {
+            // delete invite site
+            siteService.deleteSite(SITE_SHORT_NAME);
+            nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
+        }
+
+        // delete the users
+        deleteUser(USER_ONE);
+        deleteUser(USER_TWO);
+        deleteUser(USER_THREE);
+        deleteUser(USER_FOUR);
+    }
+
+    /**
+     * add a comment to given node ref
+     *
+     * @param nodeRef
+     * @param user
+     * @param status
+     * @return
+     * @throws Exception
+     */
+    private Response addComment(NodeRef nodeRef, String user, int status) throws Exception
+    {
+        Response response = null;
+
+        UserTransaction txn = transactionService.getUserTransaction();
+        txn.begin();
+
+        // Not allowed if you're not an admin
+        AuthenticationUtil.setFullyAuthenticatedUser(user);
+
+        // add comment and save response (comment nodeRef)
+
+        StringBuilder body = new StringBuilder("{");
+        body.append("\"itemTitle\" : \"Test Title\", ");
+        body.append("\"content\" : \"Test Comment\", ");
+        body.append("\"pageParams\" : \"{\\\"nodeRef\\\" : \\\"");
+        body.append(nodeRef.getStoreRef().getProtocol());
+        body.append(":\\/\\/");
+        body.append(nodeRef.getStoreRef().getIdentifier());
+        body.append("\\/");
+        body.append(nodeRef.getId());
+        body.append("\\\"}");
+        if (nodeRef.equals(sitePage))
+        {
+            body.append("\",\"site\" : \"");
+            body.append(SITE_SHORT_NAME);
+        }
+        body.append("\"}");
+        response = sendRequest(
+                new PostRequest(MessageFormat.format(URL_POST_COMMENT, new Object[] { nodeRef.getStoreRef().getProtocol(),
+                        nodeRef.getStoreRef().getIdentifier(), nodeRef.getId() }), body.toString(), JSON), status);
+
+        assertEquals(status, response.getStatus());
+
+        // Normally, webscripts are in their own transaction.  The test infrastructure here forces us to have a transaction
+        // around the calls.  if the WebScript fails, then we should rollback.
+        if (response.getStatus() == 500)
+        {
+            txn.rollback();
+        }
+        else
+        {
+            txn.commit();
+        }
+
+        return response;
+    }
+
+
+    /**
+     * delete comment
+     *
+     * @param commentNodeRef
+     * @param parentNodeRef
+     * @param user
+     * @param status
+     * @throws Exception
+     */
+    private void deleteComment(NodeRef commentNodeRef, NodeRef parentNodeRef, String user, int status) throws Exception
+    {
+        Response response = null;
+
+        UserTransaction txn = transactionService.getUserTransaction();
+        txn.begin();
+
+        // Not allowed if you're not an admin
+        AuthenticationUtil.setFullyAuthenticatedUser(user);
+
+        String itemTitle = "Test Title";
+        String page = "document-details";
+
+        StringBuilder pageParamsBuilder = new StringBuilder("{");
+        pageParamsBuilder.append("\"nodeRef\" : \"");
+        pageParamsBuilder.append(parentNodeRef.toString());
+        pageParamsBuilder.append("\", ");
+        pageParamsBuilder.append("}");
+        String pageParams = pageParamsBuilder.toString();
+
+        String URL = MessageFormat.format(URL_DELETE_COMMENT, new Object[] { commentNodeRef.getStoreRef().getProtocol(),
+                commentNodeRef.getStoreRef().getIdentifier(), commentNodeRef.getId(), SITE_SHORT_NAME, itemTitle, page, pageParams });
+        response = sendRequest(new DeleteRequest(URL), status);
+        assertEquals(status, response.getStatus());
+
+        // Normally, webscripts are in their own transaction. The test
+        // infrastructure here forces us to have a transaction
+        // around the calls. if the WebScript fails, then we should rollback.
+        if (response.getStatus() == 500)
+        {
+            txn.rollback();
+        }
+        else
+        {
+            txn.commit();
+        }
+    }
+    
+    /**
+     * 
+     * @param nodeRef
+     * @param user
+     * @param expectedStatus
+     * @return
+     * @throws Exception
+     */
+    private Response updateComment(NodeRef nodeRef, String user, int expectedStatus) throws Exception
+    {
+        Response response = null;
+        UserTransaction txn = transactionService.getUserTransaction();
+        txn.begin();
+        AuthenticationUtil.setFullyAuthenticatedUser(user);
+
+        String now = System.currentTimeMillis()+"";
+
+        JSONObject comment = new JSONObject();
+        comment.put("title", "Test title updated "+now);
+        comment.put("content", "Test comment updated "+now);
+
+        response = sendRequest(new PutRequest(MessageFormat.format(URL_PUT_COMMENT,
+                new Object[] {nodeRef.getStoreRef().getProtocol(), nodeRef.getStoreRef().getIdentifier(), nodeRef.getId()}), comment.toString(), JSON), expectedStatus);
+
+        assertEquals(expectedStatus, response.getStatus());
+
+        // Normally, webscripts are in their own transaction.  The test infrastructure here forces us to have a transaction
+        // around the calls.  if the WebScript fails, then we should rollback.
+        if (response.getStatus() == 500)
+        {
+            txn.rollback();
+        }
+        else
+        {
+            txn.commit();
+        }
+        
+        return response;
+    }
+    
+    private String getCurrentVersion(NodeRef nodeRef) throws Exception
+    {
+    	String version = versionService.getCurrentVersion(nodeRef).getVersionLabel();
+        return version;
+    }
+    
+    public void testCommentDoesNotVersion() throws Exception
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+        String versionBefore = getCurrentVersion(nodeRef);
+        addComment(nodeRef, AuthenticationUtil.getAdminUserName(), 200);
+        String versionAfter = getCurrentVersion(nodeRef);
+        assertEquals(versionBefore, versionAfter);
+    }
+    
+    /**
+     * MNT-9771
+     * @throws Exception
+     */
+    public void testCommentPermissions() throws Exception
+    {
+        authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        UserTransaction txn = transactionService.getUserTransaction();
+        txn.begin();
+        
+        NodeRef contentForUserContributor = fileFolderService.create(companyHomeNodeRef, "CommentyContributor" + System.currentTimeMillis(), ContentModel.TYPE_CONTENT).getNodeRef();
+        permissionService.setPermission(new SimplePermissionEntry(contentForUserContributor, getPermission(PermissionService.CONTRIBUTOR), USER_TEST, AccessStatus.ALLOWED));
+        
+        NodeRef contentForUserConsumer = fileFolderService.create(companyHomeNodeRef, "CommentyConsumer" + System.currentTimeMillis(), ContentModel.TYPE_CONTENT).getNodeRef();
+        permissionService.setPermission(new SimplePermissionEntry(contentForUserConsumer, getPermission(PermissionService.CONSUMER), USER_TEST, AccessStatus.ALLOWED));
+
+        //Contributor should be able to add comments
+        addComment(contentForUserContributor, USER_TEST, 200);
+        
+        txn.commit();       // Hack.  Internally, the addComment starts and rolls back the next txn.
+        //Consumer shouldn't be able to add comments see MNT-9883
+        addComment(contentForUserConsumer, USER_TEST, 500);
+        
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+        nodeService.deleteNode(contentForUserContributor);
+        nodeService.deleteNode(contentForUserConsumer);
+        
+        txn.commit();
+    }
+
+    /**
+     * MNT-16446
+     * @throws Exception
+     */
+    public void testCommentUpdateAndDeletePermission() throws Exception
+    {
+        authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+
+        NodeRef sharedContent = null;
+        NodeRef siteContent = null;
+
+        {
+            //
+            // in Shared folder
+            //
+            UserTransaction txn = transactionService.getUserTransaction();
+            txn.begin();
+            sharedContent = fileFolderService.create(sharedHomeNodeRef, "SharedContent" + System.currentTimeMillis(), ContentModel.TYPE_CONTENT).getNodeRef();
+            txn.commit();
+
+            Response response = addComment(sharedContent, USER_THREE, 200);
+            JSONObject jsonResponse = parseResponseJSON(response);
+            NodeRef commentNodeRef = new NodeRef(getOrNull(jsonResponse, JSON_KEY_NODEREF));
+
+            // MNT-16446 - now returns 403 rather than 500
+            // -ve test:
+            updateComment(commentNodeRef, USER_FOUR, 403);
+
+            updateComment(commentNodeRef, USER_THREE, 200);
+
+            // -ve test: ideally would return 403, but currently v0 REST API returns 500 :-(
+            deleteComment(commentNodeRef, sharedContent, USER_FOUR, 500);
+
+            deleteComment(commentNodeRef, sharedContent, USER_THREE, 200);
+        }
+
+        {
+            //
+            // in a public Site
+            //
+            txn = transactionService.getUserTransaction();
+            txn.begin();
+            NodeRef siteDocLibNodeRef = siteService.getContainer(SITE_SHORT_NAME, DOCLIB_CONTAINER);
+            siteContent = fileFolderService.create(siteDocLibNodeRef, "SiteContent" + System.currentTimeMillis(), ContentModel.TYPE_CONTENT).getNodeRef();
+            txn.commit();
+
+            Response response = addComment(siteContent, USER_THREE, 200);
+            JSONObject jsonResponse = parseResponseJSON(response);
+            NodeRef commentNodeRef = new NodeRef(getOrNull(jsonResponse, JSON_KEY_NODEREF));
+
+            // MNT-16446 - now returns 403 rather than 200 !!
+            // -ve test:
+            updateComment(commentNodeRef, USER_FOUR, 403);
+
+            updateComment(commentNodeRef, USER_THREE, 200);
+
+            // -ve test: ideally would return 403, but currently v0 REST API returns 500 :-(
+            deleteComment(commentNodeRef, siteContent, USER_FOUR, 500);
+
+            deleteComment(commentNodeRef, siteContent, USER_THREE, 200);
+        }
+
+        {
+            // cleanup
+            authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+            txn = transactionService.getUserTransaction();
+            txn.begin();
+
+            if (sharedContent != null)
+            {
+                nodeService.deleteNode(sharedContent);
+            }
+
+            if (siteContent != null)
+            {
+                nodeService.deleteNode(siteContent);
+            }
+            txn.commit();
+        }
+    }
+
+    private void createUser(String userName)
+    {
+        // if user with given user name doesn't already exist then create user
+        if (!authenticationService.authenticationExists(userName))
+        {
+            // create user
+            authenticationService.createAuthentication(userName, "password".toCharArray());
+        }
+         
+        if (!personService.personExists(userName))
+        {
+            // create person properties
+            PropertyMap personProps = new PropertyMap();
+            personProps.put(ContentModel.PROP_USERNAME, userName);
+            personProps.put(ContentModel.PROP_FIRSTNAME, "FirstNameTest");
+            personProps.put(ContentModel.PROP_LASTNAME, "LastNameTest");
+            personProps.put(ContentModel.PROP_EMAIL, "FirstNameTest.LastNameTest@test.com");
+            personProps.put(ContentModel.PROP_JOBTITLE, "JobTitleTest");
+            
+            // create person node for user
+            personService.createPerson(personProps);
+        }
+    }
+    
+    private PermissionReference getPermission(String permission)
+    {
+        return permissionModelDAO.getPermissionReference(null, permission);
+    }
+    
+    /**
+     * MNT-9771
+     */
+    public void testCommentDoesNotChangeModifier() throws Exception
+    {
+        permissionService.setPermission(nodeRef, USER2, PermissionService.ALL_PERMISSIONS, true);
+        String modifierBefore = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIER);
+        addComment(nodeRef, USER2, 200);
+        String modifierAfter = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIER);
+        assertEquals(modifierBefore, modifierAfter);
+    }
+    
+    /**
+     * MNT-15679
+     */
+    public void testDeleteCommentDoesNotChangeModifiedDate() throws Exception
+    {
+        // in site page
+        permissionService.setPermission(sitePage, USER_TWO, PermissionService.ALL_PERMISSIONS, true);
+        String modifierBefore = (String) nodeService.getProperty(sitePage, ContentModel.PROP_MODIFIER);
+        Date modifiedDateBefore = (Date) nodeService.getProperty(sitePage, ContentModel.PROP_MODIFIED);
+
+        Response response1 = addComment(sitePage, USER_TWO, 200);
+
+        JSONObject jsonResponse1 = parseResponseJSON(response1);
+        String nodeRefComment1 = getOrNull(jsonResponse1, JSON_KEY_NODEREF);
+        if (nodeRefComment1 != null)
+        {
+            NodeRef commentNodeRef1 = new NodeRef(nodeRefComment1);
+            deleteComment(commentNodeRef1, sitePage, USER_TWO, 200);
+        }
+
+        Date modifiedDateAfter = (Date) nodeService.getProperty(sitePage, ContentModel.PROP_MODIFIED);
+        String modifierAfter = (String) nodeService.getProperty(sitePage, ContentModel.PROP_MODIFIER);
+        assertEquals(modifiedDateBefore.getTime(), modifiedDateAfter.getTime());
+        assertEquals(modifierBefore, modifierAfter);
+
+        // in repository - on nodeRef
+        permissionService.setPermission(nodeRef, USER2, PermissionService.ALL_PERMISSIONS, true);
+        modifierBefore = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIER);
+        modifiedDateBefore = (Date) nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIED);
+        Response response2 = addComment(nodeRef, USER2, 200);
+
+        JSONObject jsonResponse2 = parseResponseJSON(response2);
+        String nodeRefComment2 = getOrNull(jsonResponse2, JSON_KEY_NODEREF);
+        if (nodeRefComment2 != null)
+        {
+            NodeRef commentNodeRef2 = new NodeRef(nodeRefComment2);
+            deleteComment(commentNodeRef2, nodeRef, USER2, 200);
+        }
+
+        modifiedDateAfter = (Date) nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIED);
+        modifierAfter = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIER);
+        assertEquals(modifiedDateBefore.getTime(), modifiedDateAfter.getTime());
+        assertEquals(modifierBefore, modifierAfter);
+    }
+
+    /**
+     * REPO-828 (MNT-16401)
+     * @throws Exception
+     */
+    public void testDeleteCommentPostActivity() throws Exception
+    {
+        permissionService.setPermission(sitePage, USER_TWO, PermissionService.ALL_PERMISSIONS, true);
+        postLookup.execute();
+        feedGenerator.execute();
+        int activityNumStart = activityService.getSiteFeedEntries(SITE_SHORT_NAME).size();
+        Response response = addComment(sitePage, USER_TWO, 200);
+        postLookup.execute();
+        feedGenerator.execute();
+        int activityNumNext = activityService.getSiteFeedEntries(SITE_SHORT_NAME).size();
+        assertEquals("The activity feeds were not generated after adding a comment", activityNumStart + 1, activityNumNext);
+        JSONObject jsonResponse = parseResponseJSON(response);
+        String nodeRefComment = getOrNull(jsonResponse, JSON_KEY_NODEREF);
+        NodeRef commentNodeRef = new NodeRef(nodeRefComment);
+        deleteComment(commentNodeRef, sitePage, USER_TWO, 200);
+        activityNumStart = activityNumNext;
+        postLookup.execute();
+        feedGenerator.execute();
+        activityNumNext = activityService.getSiteFeedEntries(SITE_SHORT_NAME).size();
+        assertEquals("The activity feeds were not generated after deleting a comment", activityNumStart + 1, activityNumNext);
+    }
+
+    /**
+     * MNT-12082
+     */
+    public void testConsumerCanNotComment() throws Exception
+    {
+        // Authenticate as consumer
+        authenticationService.authenticate(USER_ONE, USER_ONE.toCharArray());
+
+        String uri = MessageFormat.format(URL_POST_COMMENT, new Object[] {sitePage.getStoreRef().getProtocol(), sitePage.getStoreRef().getIdentifier(), sitePage.getId()});
+        Response response = sendRequest(new PostRequest(uri, requestBodyJson, JSON),
+                Status.STATUS_INTERNAL_SERVER_ERROR);
+        assertEquals(Status.STATUS_INTERNAL_SERVER_ERROR, response.getStatus());
+    }
+    
+    /**
+     * MNT-12082
+     */
+    public void testContributorCanComment() throws Exception
+    {
+        // Authenticate as contributor
+        authenticationService.authenticate(USER_TWO, USER_TWO.toCharArray());
+
+        String uri = MessageFormat.format(URL_POST_COMMENT, new Object[] {sitePage.getStoreRef().getProtocol(), sitePage.getStoreRef().getIdentifier(), sitePage.getId()});
+        Response response = sendRequest(new PostRequest(uri, requestBodyJson, JSON), Status.STATUS_OK);
+        assertEquals(Status.STATUS_OK, response.getStatus());        
+    }
+    
+    private void createUser(String userName, String role)
+    {
+        // if user with given user name doesn't already exist then create user
+        if (authenticationService.authenticationExists(userName) == false)
+        {
+            authenticationService.createAuthentication(userName, userName.toCharArray());
+            
+            // create person properties
+            PropertyMap personProps = new PropertyMap();
+            personProps.put(ContentModel.PROP_USERNAME, userName);
+            personProps.put(ContentModel.PROP_FIRSTNAME, "FirstName123");
+            personProps.put(ContentModel.PROP_LASTNAME, "LastName123");
+            personProps.put(ContentModel.PROP_EMAIL, "FirstName123.LastName123@email.com");
+            personProps.put(ContentModel.PROP_JOBTITLE, "JobTitle123");
+            personProps.put(ContentModel.PROP_JOBTITLE, "Organisation123");
+            
+            personService.createPerson(personProps);
+        }
+        
+        siteService.setMembership(SITE_SHORT_NAME, userName, role);
+    }
+    
+    private void deleteUser(String user)
+    {
+        personService.deletePerson(user);
+        if (authenticationService.authenticationExists(user))
+        {
+           authenticationService.deleteAuthentication(user);
+        }
+    }
+    
+    /**
+     * returns value from JSON for a given key
+     * @param json
+     * @param key
+     * @return
+     */
+    protected String getOrNull(JSONObject json, String key)
+    {
+        if (json != null && json.containsKey(key))
+        {
+            return (String) json.get(key);
+        }
+        
+        JSONObject itemJsonObject = (JSONObject) json.get(JSON_KEY_ITEM);
+        if (itemJsonObject != null && itemJsonObject.containsKey(key))
+        {
+            return (String) itemJsonObject.get(key);
+        }
+        return null;
+    }
+    
+    /**
+     * parse JSON
+     * @param response
+     * @return
+     */
+    protected JSONObject parseResponseJSON(Response response)
+    {
+        JSONObject json = null;
+        String contentType = response.getContentType();
+        if (contentType != null && contentType.indexOf(';') != -1)
+        {
+            contentType = contentType.substring(0, contentType.indexOf(';'));
+        }
+        if (MimetypeMap.MIMETYPE_JSON.equals(contentType))
+        {
+            JSONParser parser = new JSONParser();
+            try
+            {
+                json = (JSONObject) parser.parse(response.getContentAsString());
+            }
+            catch (IOException io)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid JSON: " + io.getMessage());
+            }
+            catch (ParseException pe)
+            {
+                throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Invalid JSON: " + pe.getMessage());
+            }
+        }
+        return json;
+    } 
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/content/ContentGetTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/content/ContentGetTest.java
new file mode 100644
index 00000000000..3e0e2f0f0d1
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/content/ContentGetTest.java
@@ -0,0 +1,167 @@
+/*
+ * #%L
+ * Alfresco Share Services AMP
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.content;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.repository.*;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.PropertyMap;
+import org.junit.Assert;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Test for ContentGet web script
+ *
+ * @author martin.muller
+ */
+public class ContentGetTest extends BaseWebScriptTest
+{
+    private MutableAuthenticationService authenticationService;
+    private PersonService personService;
+    private NodeService nodeService;
+    private ContentService contentService;
+
+    NodeRef rootFolder;
+
+    private static final String USER_ONE = "ContentGetTestOne";
+    private static final String URL_CONTENT_DOWNLOAD = "/api/node/content/workspace/SpacesStore/";
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        this.authenticationService = (MutableAuthenticationService) getServer().getApplicationContext()
+                .getBean("AuthenticationService");
+        this.personService = (PersonService) getServer().getApplicationContext().getBean("PersonService");
+        this.nodeService = (NodeService) getServer().getApplicationContext().getBean("NodeService");
+        this.contentService = (ContentService) getServer().getApplicationContext().getBean("ContentService");
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        createUser(USER_ONE);
+    }
+
+    private void createUser(String userName)
+    {
+        if (!this.authenticationService.authenticationExists(userName))
+        {
+            this.authenticationService.createAuthentication(userName, "PWD".toCharArray());
+
+            PropertyMap ppOne = new PropertyMap(5);
+            ppOne.put(ContentModel.PROP_USERNAME, userName);
+            ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+            ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+            ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+
+            this.personService.createPerson(ppOne);
+        }
+    }
+
+    private void deleteUser(String username)
+    {
+        this.personService.deletePerson(username);
+        if (this.authenticationService.authenticationExists(username))
+        {
+            this.authenticationService.deleteAuthentication(username);
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+
+        nodeService.deleteNode(rootFolder);
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        // Clear the user
+        deleteUser(USER_ONE);
+    }
+
+    /**
+     * MNT-16380
+     */
+    public void testRelativePath() throws Exception
+    {
+        Repository repositoryHelper = (Repository) getServer().getApplicationContext().getBean("repositoryHelper");
+        NodeRef companyHome = repositoryHelper.getCompanyHome();
+
+        rootFolder = createNode(companyHome, "rootFolder", ContentModel.TYPE_FOLDER);
+
+        NodeRef doc1 = createNodeWithTextContent(rootFolder, "doc1", ContentModel.TYPE_CONTENT, "doc1 file content");
+
+        NodeRef folderX = createNode(rootFolder, "X", ContentModel.TYPE_FOLDER);
+        NodeRef folderY = createNode(folderX, "Y", ContentModel.TYPE_FOLDER);
+        NodeRef folderZ = createNode(folderY, "Z", ContentModel.TYPE_FOLDER);
+
+        NodeRef doc2 = createNodeWithTextContent(folderZ, "doc2", ContentModel.TYPE_CONTENT, "doc2 file content");
+
+        // uri with relative path at the end
+        String uri = URL_CONTENT_DOWNLOAD + doc1.getId() + "/X/Y/Z/doc2";
+        Response resp = sendRequest(new GetRequest(uri), 200);
+
+        // check if we really have doc2 as target
+        Assert.assertEquals("doc2 file content", resp.getContentAsString());
+    }
+
+    public NodeRef createNodeWithTextContent(NodeRef parentNode, String nodeCmName, QName nodeType, String content)
+    {
+        NodeRef nodeRef = createNode(parentNode, nodeCmName, nodeType);
+
+        // If there is any content, add it.
+        if (content != null)
+        {
+            ContentWriter writer = contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
+            writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            writer.setEncoding("UTF-8");
+            writer.putContent(content);
+        }
+        return nodeRef;
+
+    }
+
+    private NodeRef createNode(NodeRef parentNode, String nodeCmName, QName nodeType)
+    {
+        QName childName = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, nodeCmName);
+
+        Map<QName, Serializable> props = new HashMap<QName, Serializable>();
+        props.put(ContentModel.PROP_NAME, nodeCmName);
+        ChildAssociationRef childAssoc = nodeService
+                .createNode(parentNode, ContentModel.ASSOC_CONTAINS, childName, nodeType, props);
+        return childAssoc.getChildRef();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/content/MimetypesGetTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/content/MimetypesGetTest.java
new file mode 100644
index 00000000000..a9c7668963f
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/content/MimetypesGetTest.java
@@ -0,0 +1,66 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.content;
+
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.content.transform.LocalTransformServiceRegistry;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.springframework.context.ApplicationContext;
+
+/**
+ * Tests the {@link MimetypesGet} endpoint
+ */
+public class MimetypesGetTest extends BaseWebScriptTest
+{
+    private ApplicationContext ctx;
+    private LocalTransformServiceRegistry localTransformServiceRegistry;
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        ctx = getServer().getApplicationContext();
+        localTransformServiceRegistry = (LocalTransformServiceRegistry) ctx.getBean("localTransformServiceRegistry");
+    }
+    
+    /**
+     * Tests the <code>mimetypesGet.getTransformer</code> method directly for
+     * varefication of label text
+     * 
+     * @throws Exception
+     */
+    public void testGetTransformer() throws Exception
+    {
+        MimetypesGet mimetypesGet = new MimetypesGet();
+        mimetypesGet.setLocalTransformServiceRegistry(localTransformServiceRegistry);
+
+        String transformerName = mimetypesGet.getTransformer(MimetypeMap.MIMETYPE_PDF, 1000, MimetypeMap.MIMETYPE_PDF);
+        assertEquals("PassThrough", transformerName);
+
+        transformerName = mimetypesGet.getTransformer(MimetypeMap.MIMETYPE_PDF, 1000, MimetypeMap.MIMETYPE_TEXT_PLAIN);
+        assertEquals("PdfBox", transformerName);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/custommodel/CustomModelImportTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/custommodel/CustomModelImportTest.java
new file mode 100644
index 00000000000..466241d2444
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/custommodel/CustomModelImportTest.java
@@ -0,0 +1,494 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.custommodel;
+
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.dictionary.CustomModelServiceImpl;
+import org.alfresco.repo.dictionary.M2Association;
+import org.alfresco.repo.dictionary.M2Model;
+import org.alfresco.repo.dictionary.M2Type;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.dictionary.CustomModelService;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.PropertyMap;
+import org.alfresco.util.TempFileProvider;
+import org.alfresco.util.XMLUtil;
+import org.apache.commons.httpclient.methods.multipart.FilePart;
+import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
+import org.apache.commons.httpclient.methods.multipart.Part;
+import org.apache.commons.httpclient.params.HttpMethodParams;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+import org.springframework.util.ResourceUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
+/**
+ * This class tests the custom model upload REST API.
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class CustomModelImportTest extends BaseWebScriptTest
+{
+    private static final String NON_ADMIN_USER = "nonAdminUserName";
+    private static final String CUSTOM_MODEL_ADMIN = "customModelAdmin";
+    private static final String RESOURCE_PREFIX = "custommodel/";
+    private static final String UPLOAD_URL = "/api/cmm/upload";
+    private static final int BUFFER_SIZE = 20 * 1024;
+
+    private MutableAuthenticationService authenticationService;
+    private AuthorityService authorityService;
+    private PersonService personService;
+    private RetryingTransactionHelper transactionHelper;
+    private CustomModelService customModelService;
+    private List<String> importedModels = new ArrayList<>();
+    private List<File> tempFiles = new ArrayList<>();
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        authenticationService = getServer().getApplicationContext().getBean("AuthenticationService", MutableAuthenticationService.class);
+        authorityService = getServer().getApplicationContext().getBean("AuthorityService", AuthorityService.class);
+        personService = getServer().getApplicationContext().getBean("PersonService", PersonService.class);
+        transactionHelper = getServer().getApplicationContext().getBean("retryingTransactionHelper", RetryingTransactionHelper.class);
+        customModelService = getServer().getApplicationContext().getBean("customModelService", CustomModelService.class);
+
+        AuthenticationUtil.clearCurrentSecurityContext();
+
+        AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                createUser(NON_ADMIN_USER);
+                createUser(CUSTOM_MODEL_ADMIN);
+
+                if (!authorityService.getContainingAuthorities(AuthorityType.GROUP, CUSTOM_MODEL_ADMIN, true).contains(
+                            CustomModelServiceImpl.GROUP_ALFRESCO_MODEL_ADMINISTRATORS_AUTHORITY))
+                {
+                    authorityService.addAuthority(CustomModelServiceImpl.GROUP_ALFRESCO_MODEL_ADMINISTRATORS_AUTHORITY, CUSTOM_MODEL_ADMIN);
+                }
+                return null;
+            }
+        });
+        AuthenticationUtil.setFullyAuthenticatedUser(CUSTOM_MODEL_ADMIN);
+    }
+
+    @Override
+    public void tearDown() throws Exception
+    {
+        for (File file : tempFiles)
+        {
+            file.delete();
+        }
+
+        transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+        {
+            public Void execute() throws Throwable
+            {
+                for (String modelName : importedModels)
+                {
+                    customModelService.deleteCustomModel(modelName);
+                }
+                return null;
+            }
+        });
+
+        AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+                {
+                    public Void execute() throws Throwable
+                    {
+                        deleteUser(NON_ADMIN_USER);
+                        deleteUser(CUSTOM_MODEL_ADMIN);
+                        return null;
+                    }
+                });
+                return null;
+            }
+        });
+
+        AuthenticationUtil.clearCurrentSecurityContext();
+
+        super.tearDown();
+    }
+
+    public void testValidUpload_ModelAndExtModule() throws Exception
+    {
+        File zipFile = getResourceFile("validModelAndExtModule.zip");
+        PostRequest postRequest = buildMultipartPostRequest(zipFile);
+
+        AuthenticationUtil.setFullyAuthenticatedUser(NON_ADMIN_USER);
+        Response response = sendRequest(postRequest, 403);
+
+        AuthenticationUtil.setFullyAuthenticatedUser(CUSTOM_MODEL_ADMIN);
+        response = sendRequest(postRequest, 200);
+
+        JSONObject json = new JSONObject(new JSONTokener(response.getContentAsString()));
+
+        String importedModelName = json.getString("modelName");
+        importedModels.add(importedModelName);
+
+        String extModule = json.getString("shareExtModule");
+        Document document = XMLUtil.parse(extModule);
+        NodeList nodes = document.getElementsByTagName("id");
+        assertEquals(1, nodes.getLength());
+        assertNotNull(nodes.item(0).getTextContent());
+    }
+
+    public void testValidUpload_ModelOnly() throws Exception
+    {
+        File zipFile = getResourceFile("validModel.zip");
+        PostRequest postRequest = buildMultipartPostRequest(zipFile);
+
+        AuthenticationUtil.setFullyAuthenticatedUser(NON_ADMIN_USER);
+        Response response = sendRequest(postRequest, 403);
+
+        AuthenticationUtil.setFullyAuthenticatedUser(CUSTOM_MODEL_ADMIN);
+        response = sendRequest(postRequest, 200);
+
+        JSONObject json = new JSONObject(new JSONTokener(response.getContentAsString()));
+        String importedModelName = json.getString("modelName");
+        importedModels.add(importedModelName);
+
+        assertFalse(json.has("shareExtModule"));
+
+        // Import the same model again
+        sendRequest(postRequest, 409); // name conflict
+    }
+
+    public void testValidUpload_ExtModuleOnly() throws Exception
+    {
+        File zipFile = getResourceFile("validExtModule.zip");
+        PostRequest postRequest = buildMultipartPostRequest(zipFile);
+
+        AuthenticationUtil.setFullyAuthenticatedUser(NON_ADMIN_USER);
+        Response response = sendRequest(postRequest, 403);
+
+        AuthenticationUtil.setFullyAuthenticatedUser(CUSTOM_MODEL_ADMIN);
+        response = sendRequest(postRequest, 200);
+
+        JSONObject json = new JSONObject(new JSONTokener(response.getContentAsString()));
+        assertFalse(json.has("modelName"));
+
+        String extModule = json.getString("shareExtModule");
+        Document document = XMLUtil.parse(extModule);
+        NodeList nodes = document.getElementsByTagName("id");
+        assertEquals(1, nodes.getLength());
+        assertNotNull(nodes.item(0).getTextContent());
+    }
+
+    public void testNotZipFileUpload() throws Exception
+    {
+        File file = getResourceFile("validModel.zip");
+        ZipFile zipFile = new ZipFile(file);
+        ZipEntry zipEntry = zipFile.entries().nextElement();
+
+        File unzippedModelFile = TempFileProvider.createTempFile(zipFile.getInputStream(zipEntry), "validModel", ".xml");
+        tempFiles.add(unzippedModelFile);
+        zipFile.close();
+
+        PostRequest postRequest = buildMultipartPostRequest(unzippedModelFile);
+        sendRequest(postRequest, 400); // CMM upload supports only zip file.
+    }
+
+    public void testInvalidZipUpload() throws Exception
+    {
+        String content = "<note>"
+                        +   "<from>Jane</from>"
+                        +   "<to>John</to>"
+                        +   "<heading>Upload test</heading>"
+                        +   "<body>This is an invalid model or a Share extension module</body>"
+                        +"</note>";
+
+        ZipEntryContext context = new ZipEntryContext("invalidFormat.xml", content.getBytes());
+        File zipFile = createZip(context);
+
+        PostRequest postRequest = buildMultipartPostRequest(zipFile);
+        sendRequest(postRequest, 400); // Invalid. Neither a model nor a Share extension module file
+    }
+
+    public void testUploadModel_Invalid() throws Exception
+    {
+        long timestamp = System.currentTimeMillis();
+        final String modelName = getClass().getSimpleName() + timestamp;
+        final String prefix = "prefix" + timestamp;
+        final String uri = "uriNamespace" + timestamp;
+
+        M2Model model = M2Model.createModel(prefix + QName.NAMESPACE_PREFIX + modelName);
+        model.setAuthor("Admin");
+        model.setDescription("Desc");
+
+        ByteArrayOutputStream xml = new ByteArrayOutputStream();
+        model.toXML(xml);
+        ZipEntryContext context = new ZipEntryContext(modelName + ".xml", xml.toByteArray());
+        File zipFile = createZip(context);
+
+        PostRequest postRequest = buildMultipartPostRequest(zipFile);
+        sendRequest(postRequest, 409); // no namespace has been defined
+
+        // Create two namespaces
+        model.createNamespace(uri, prefix);
+        model.createNamespace(uri + "anotherUri", prefix + "anotherPrefix");
+        xml = new ByteArrayOutputStream();
+        model.toXML(xml);
+        context = new ZipEntryContext(modelName + ".xml", xml.toByteArray());
+        zipFile = createZip(context);
+
+        postRequest = buildMultipartPostRequest(zipFile);
+        sendRequest(postRequest, 409); // custom model can only have one namespace
+    }
+
+    public void testUploadModel_UnsupportedModelElements() throws Exception
+    {
+        // Note: here we only test a couple of not-supported model elements to check for the correct status code.
+        // This test should be removed when we implement the required support
+
+        long timestamp = System.currentTimeMillis();
+        final String modelName = getClass().getSimpleName() + timestamp;
+        final String prefix = "prefix"+timestamp;
+        final String uri = "uriNamespace"+timestamp;
+        final String aspectName = prefix + QName.NAMESPACE_PREFIX + "testAspec";
+        final String typeName = prefix + QName.NAMESPACE_PREFIX + "testType";
+        final String associationName = prefix + QName.NAMESPACE_PREFIX + "testAssociation";
+
+        M2Model model = M2Model.createModel(prefix + QName.NAMESPACE_PREFIX + modelName);
+        model.createNamespace(uri, prefix);
+        model.setAuthor("John Doe");
+        model.createAspect(aspectName);
+        model.createImport(NamespaceService.CONTENT_MODEL_1_0_URI, NamespaceService.CONTENT_MODEL_PREFIX);
+
+        M2Type type = model.createType(typeName);
+        // Add 'association' not supported yet.
+        M2Association association = type.createAssociation(associationName);
+        association.setSourceMandatory(false);
+        association.setSourceMany(false);
+        association.setTargetMandatory(false);
+        association.setTargetClassName("cm:content");
+
+        ByteArrayOutputStream xml = new ByteArrayOutputStream();
+        model.toXML(xml);
+        ZipEntryContext context = new ZipEntryContext(modelName + ".xml", xml.toByteArray());
+        File zipFile = createZip(context);
+
+        PostRequest postRequest = buildMultipartPostRequest(zipFile);
+        sendRequest(postRequest, 409); // <associations> element is not supported yet
+
+        type.removeAssociation(associationName);
+        // Add 'mandatory-aspect' not supported yet.
+        type.addMandatoryAspect(aspectName);
+        xml = new ByteArrayOutputStream();
+        model.toXML(xml);
+        context = new ZipEntryContext(modelName + ".xml", xml.toByteArray());
+        zipFile = createZip(context);
+
+        postRequest = buildMultipartPostRequest(zipFile);
+        sendRequest(postRequest, 409); // <mandatory-aspects> element is not supported yet
+    }
+
+    public void testInvalidNumberOfZipEntries() throws Exception
+    {
+        long timestamp = System.currentTimeMillis();
+        String modelName = getClass().getSimpleName() + timestamp;
+        String prefix = "prefix" + timestamp;
+        String uri = "uriNamespace" + timestamp;
+
+        // Model one
+        M2Model modelOne = M2Model.createModel(prefix + QName.NAMESPACE_PREFIX + modelName);
+        modelOne.createNamespace(uri, prefix);
+        modelOne.setDescription("Model 1");
+        ByteArrayOutputStream xml = new ByteArrayOutputStream();
+        modelOne.toXML(xml);
+        ZipEntryContext contextOne = new ZipEntryContext(modelName + ".xml", xml.toByteArray());
+
+        // Model two
+        modelName += "two";
+        prefix += "two";
+        uri += "two";
+        M2Model modelTwo = M2Model.createModel(prefix + QName.NAMESPACE_PREFIX + modelName);
+        modelTwo.createNamespace(uri, prefix);
+        modelTwo.setDescription("Model 2");
+        xml = new ByteArrayOutputStream();
+        modelTwo.toXML(xml);
+        ZipEntryContext contextTwo = new ZipEntryContext(modelName + ".xml", xml.toByteArray());
+
+        // Model three
+        modelName += "three";
+        prefix += "three";
+        uri += "three";
+        M2Model modelThree = M2Model.createModel(prefix + QName.NAMESPACE_PREFIX + modelName);
+        modelThree.createNamespace(uri, prefix);
+        modelThree.setDescription("Model 3");
+        xml = new ByteArrayOutputStream();
+        modelThree.toXML(xml);
+        ZipEntryContext contextThree = new ZipEntryContext(modelName + ".xml", xml.toByteArray());
+
+        File zipFile = createZip(contextOne, contextTwo, contextThree);
+
+        PostRequest postRequest = buildMultipartPostRequest(zipFile);
+        sendRequest(postRequest, 400); // more than two zip entries
+    }
+
+    public PostRequest buildMultipartPostRequest(File file) throws IOException
+    {
+        Part[] parts = { new FilePart("filedata", file.getName(), file, "application/zip", null) };
+
+        MultipartRequestEntity multipartRequestEntity = new MultipartRequestEntity(parts, new HttpMethodParams());
+
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        multipartRequestEntity.writeRequest(os);
+
+        PostRequest postReq = new PostRequest(UPLOAD_URL, os.toByteArray(), multipartRequestEntity.getContentType());
+        return postReq;
+    }
+
+    private void createUser(String userName)
+    {
+        if (!authenticationService.authenticationExists(userName))
+        {
+            authenticationService.createAuthentication(userName, "PWD".toCharArray());
+        }
+
+        if (!personService.personExists(userName))
+        {
+            PropertyMap ppOne = new PropertyMap(4);
+            ppOne.put(ContentModel.PROP_USERNAME, userName);
+            ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+            ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+            ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+
+            personService.createPerson(ppOne);
+        }
+    }
+
+    private void deleteUser(String userName)
+    {
+        if (personService.personExists(userName))
+        {
+            personService.deletePerson(userName);
+        }
+    }
+
+    private File getResourceFile(String xmlFileName) throws FileNotFoundException
+    {
+        URL url = CustomModelImportTest.class.getClassLoader().getResource(RESOURCE_PREFIX + xmlFileName);
+        if (url == null)
+        {
+            fail("Cannot get the resource: " + xmlFileName);
+        }
+        return ResourceUtils.getFile(url);
+    }
+
+    private File createZip(ZipEntryContext... zipEntryContexts)
+    {
+        File zipFile = TempFileProvider.createTempFile(getClass().getSimpleName(), ".zip");
+        tempFiles.add(zipFile);
+
+        byte[] buffer = new byte[BUFFER_SIZE];
+        try
+        {
+            OutputStream out = new BufferedOutputStream(new FileOutputStream(zipFile), BUFFER_SIZE);
+            ZipOutputStream zos = new ZipOutputStream(out);
+
+            for (ZipEntryContext context : zipEntryContexts)
+            {
+                ZipEntry zipEntry = new ZipEntry(context.getZipEntryName());
+                zos.putNextEntry(zipEntry);
+
+                InputStream input = context.getEntryContent();
+                int len;
+                while ((len = input.read(buffer)) > 0)
+                {
+                    zos.write(buffer, 0, len);
+                }
+                input.close();
+            }
+            zos.closeEntry();
+            zos.close();
+        }
+        catch (IOException ex)
+        {
+            fail("couldn't create zip file.");
+        }
+
+        return zipFile;
+    }
+
+    private static class ZipEntryContext
+    {
+        private final String zipEntryName;
+        private final InputStream entryContent;
+
+        public ZipEntryContext(String zipEntryName, byte[] zipEntryContent)
+        {
+            this.zipEntryName = zipEntryName;
+            this.entryContent = new ByteArrayInputStream(zipEntryContent);
+        }
+
+        public String getZipEntryName()
+        {
+            return this.zipEntryName;
+        }
+
+        public InputStream getEntryContent()
+        {
+            return this.entryContent;
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/dictionary/DictionaryRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/dictionary/DictionaryRestApiTest.java
new file mode 100644
index 00000000000..bb0705eea35
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/dictionary/DictionaryRestApiTest.java
@@ -0,0 +1,955 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.json.JSONObject;
+import org.json.JSONArray;
+
+/**
+ * Unit test for Dictionary REST API
+ * @author Saravanan Sellathurai
+ */
+
+public class DictionaryRestApiTest extends BaseWebScriptTest
+{
+	private static final String URL_SITES = "/api/classes";
+	private static final String URL_PROPERTIES = "/api/properties";
+	
+	@Override
+	protected void setUp() throws Exception 
+	{ 
+		super.setUp();
+		getServer();
+		AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+	}
+	
+	@Override
+	protected void tearDown() throws Exception
+    {
+		super.tearDown();
+		AuthenticationUtil.clearCurrentSecurityContext();
+    }
+	
+	private void validatePropertyDef(JSONObject result) throws Exception
+	{
+		assertEquals("cm:created", result.get("name"));
+		assertEquals("Created Date", result.get("title"));
+		assertEquals("Created Date", result.get("description"));
+		assertEquals("d:datetime", result.get("dataType"));
+		assertEquals(false, result.get("multiValued"));
+		assertEquals(true, result.get("mandatory"));
+		assertEquals(true, result.get("enforced"));
+		assertEquals(true, result.get("protected"));
+		assertEquals(true, result.get("indexed"));
+		assertEquals(true, result.get("indexedAtomically"));
+		assertEquals("/api/property/cm_created", result.get("url"));
+		
+	}
+	
+	private void validateChildAssociation(JSONObject result) throws Exception
+	{
+        assertEquals("cm:member", result.get("name"));
+		assertEquals(true, result.get("isChildAssociation"));
+		assertEquals(false, result.get("protected"));
+		
+		assertEquals("cm:authorityContainer", result.getJSONObject("source").get("class"));
+		assertEquals(false, result.getJSONObject("source").get("mandatory"));
+		assertEquals(true, result.getJSONObject("source").get("many"));
+		
+		assertEquals("cm:authority", result.getJSONObject("target").get("class"));
+		assertEquals(false, result.getJSONObject("target").get("mandatory"));
+		assertEquals(true, result.getJSONObject("target").get("many"));
+		
+		assertTrue(result.get("url").toString().startsWith("/api/classes/"));
+		assertTrue(result.get("url").toString().indexOf("/association/cm_member") > 0);;
+	}
+	
+	private void validateAssociation(JSONObject result) throws Exception
+	{
+		assertEquals("cm:workingcopylink", result.get("name"));
+		assertEquals(false, result.get("isChildAssociation"));
+		assertEquals(false, result.get("protected"));
+		
+		assertEquals("cm:checkedOut", result.getJSONObject("source").get("class"));
+		assertEquals(true, result.getJSONObject("source").get("mandatory"));
+		assertEquals(false, result.getJSONObject("source").get("many"));
+		
+		assertEquals("cm:workingcopy", result.getJSONObject("target").get("class"));
+		assertEquals(true, result.getJSONObject("target").get("mandatory"));
+		assertEquals(false, result.getJSONObject("target").get("many"));
+		
+		assertEquals("/api/classes/cm_checkedOut/association/cm_workingcopylink", result.get("url"));
+	}
+	private void validateAssociationDef(JSONObject result) throws Exception
+	{
+		assertEquals("cm:avatar", result.get("name"));
+		assertEquals("Avatar", result.get("title"));
+		assertEquals("The person's avatar image", result.get("description"));
+		assertEquals(false, result.get("isChildAssociation"));
+		assertEquals(false, result.get("protected"));
+		
+		assertEquals("cm:person", result.getJSONObject("source").get("class"));
+		assertEquals("cm:avatarOf", result.getJSONObject("source").get("role"));
+		assertEquals(false, result.getJSONObject("source").get("mandatory"));
+		assertEquals(false, result.getJSONObject("source").get("many"));
+		
+		assertEquals("cm:content", result.getJSONObject("target").get("class"));
+		assertEquals("cm:hasAvatar", result.getJSONObject("target").get("role"));
+		assertEquals(false, result.getJSONObject("target").get("mandatory"));
+		assertEquals(false, result.getJSONObject("target").get("many"));
+		
+		assertEquals("/api/classes/cm_person/association/cm_avatar", result.get("url"));
+	}
+	
+	private void validateTypeClass(JSONObject result) throws Exception
+	{
+		//cm:cmobject is of type =>type
+		assertEquals("cm:cmobject", result.get("name"));
+		assertEquals(false , result.get("isAspect"));
+		assertEquals("Object", result.get("title"));
+		assertEquals("", result.get("description"));
+		
+		assertEquals("sys:base", result.getJSONObject("parent").get("name"));
+		assertEquals("base", result.getJSONObject("parent").get("title"));
+		assertEquals("/api/classes/sys_base", result.getJSONObject("parent").get("url"));
+		
+		assertEquals("sys:referenceable", result.getJSONObject("defaultAspects").getJSONObject("sys:referenceable").get("name"));
+		assertEquals("Referenceable", result.getJSONObject("defaultAspects").getJSONObject("sys:referenceable").get("title"));
+		assertEquals("/api/classes/cm_cmobject/property/sys_referenceable", result.getJSONObject("defaultAspects").getJSONObject("sys:referenceable").get("url"));
+
+		assertEquals("cm:auditable", result.getJSONObject("defaultAspects").getJSONObject("cm:auditable").get("name"));
+		assertEquals("Auditable", result.getJSONObject("defaultAspects").getJSONObject("cm:auditable").get("title"));
+		assertEquals("/api/classes/cm_cmobject/property/cm_auditable", result.getJSONObject("defaultAspects").getJSONObject("cm:auditable").get("url"));
+		
+		//assertEquals("cm:name", result.getJSONObject("properties").getJSONObject("cm:name").get("name"));
+		//assertEquals("Name", result.getJSONObject("properties").getJSONObject("cm:name").get("title"));
+		//assertEquals("/api/classes/cm_cmobject/property/cm_name", result.getJSONObject("properties").getJSONObject("cm:name").get("url"));
+		
+		//assertEquals(, result.getJSONObject("associations").length());
+		//assertEquals(0, result.getJSONObject("childassociations").length());
+		
+		assertEquals("/api/classes/cm_cmobject", result.get("url"));
+		
+	}
+	
+	private void validateAspectClass(JSONObject result) throws Exception
+	{
+		//cm:thumbnailed is of type =>aspect
+		assertEquals("cm:thumbnailed", result.get("name"));
+		assertEquals(true , result.get("isAspect"));
+		assertEquals("Thumbnailed", result.get("title"));
+		assertEquals("", result.get("description"));
+		assertEquals(0, result.getJSONObject("defaultAspects").length());
+		
+		if (result.getJSONObject("properties").has("cm:automaticUpdate") == true)
+		{
+    		assertEquals("cm:automaticUpdate", result.getJSONObject("properties").getJSONObject("cm:automaticUpdate").get("name"));
+    		assertEquals("Automatic Update", result.getJSONObject("properties").getJSONObject("cm:automaticUpdate").get("title"));
+    		assertEquals("/api/classes/cm_thumbnailed/property/cm_automaticUpdate", result.getJSONObject("properties").getJSONObject("cm:automaticUpdate").get("url"));
+		}
+		
+		//assertEquals(2, result.getJSONObject("associations").length());
+	}
+
+    private void validatePropertiesConformity(JSONArray classDefs) throws Exception
+    {
+        final int itemsToTest = 10;
+        for (int i = 0; (i < itemsToTest) && (i < classDefs.length()); ++i)
+        {
+            JSONObject classDef1 = classDefs.getJSONObject(i);
+            JSONArray propertyNames1 = classDef1.getJSONObject("properties").names();
+            // properties of class obtained by api/classes
+            List<String> propertyValues1 = Collections.emptyList();
+            if (propertyNames1 != null)
+            {
+                propertyValues1 = new ArrayList<String>(propertyNames1.length());
+                for (int j = 0; j < propertyNames1.length(); j++)
+                {
+                    propertyValues1.add(propertyNames1.getString(j));
+                }
+            }
+
+            String classUrl = classDef1.getString("url");
+            assertTrue(classUrl.contains(URL_SITES));
+            Response responseFromGetClassDef = sendRequest(new GetRequest(classUrl), 200);
+            JSONObject classDef2 = new JSONObject(responseFromGetClassDef.getContentAsString());
+            assertTrue(classDef2.length() > 0);
+            assertEquals(200, responseFromGetClassDef.getStatus());
+            assertEquals(classDef1.getString("name"), classDef2.getString("name"));
+            JSONArray propertyNames2 = classDef2.getJSONObject("properties").names();
+            // properties of class obtained by api/classes/class
+            List<String> propertyValues2 = Collections.emptyList();
+            if (propertyNames2 != null)
+            {
+                propertyValues2 = new ArrayList<String>(propertyNames2.length());
+                for (int j = 0; j < propertyNames2.length(); j++)
+                {
+                    propertyValues2.add(propertyNames2.getString(j));
+                }
+            }
+
+            Response responseFromGetPropertiesDef = sendRequest(new GetRequest(classUrl + "/properties"), 200);
+            JSONArray propertiesDefs = new JSONArray(responseFromGetPropertiesDef.getContentAsString());
+            assertEquals(200, responseFromGetClassDef.getStatus());
+            // properties of class obtained by api/classes/class/properties
+            List<String> propertyValues3 = new ArrayList<String>(propertiesDefs.length());
+            for (int j = 0; j < propertiesDefs.length(); j++)
+            {
+                propertyValues3.add(propertiesDefs.getJSONObject(j).getString("name"));
+            }
+
+            assertEquivalenceProperties(propertyValues1, propertyValues2);
+            assertEquivalenceProperties(propertyValues2, propertyValues3);
+        }
+    }
+
+    private void assertEquivalenceProperties(List<String> propertyValues1, List<String> propertyValues2)
+    {
+        if ((propertyValues1.size() != propertyValues2.size()) || !propertyValues1.containsAll(propertyValues2))
+        {
+            fail("Wrong properties in classes");
+        }
+    }
+
+	public void testGetPropertyDef() throws Exception
+	{
+		Response response = sendRequest(new GetRequest("/api/classes/cm_auditable/property/cm_created"), 200);
+		assertEquals(200,response.getStatus());
+		JSONObject result = new JSONObject(response.getContentAsString());
+		validatePropertyDef(result);
+		
+		assertEquals(result.length()>0, true);
+		response = sendRequest(new GetRequest("/api/classes/cm_hi/property/cm_welcome"), 404);
+		assertEquals(404,response.getStatus());
+		
+		//invalid property name , returns a null JsonObject as such a property doesn't exist under cm_auditable
+		response = sendRequest(new GetRequest("/api/classes/cm_auditable/property/cm_welcome"), 200);
+		result = new JSONObject(response.getContentAsString());
+		assertEquals(0, result.length());
+		assertEquals(200,response.getStatus());
+	}
+	
+	public void testGetPropertyDefs() throws Exception
+	{
+		//validate for a particular property cm_created in the class cm_auditable
+		GetRequest req = new GetRequest(URL_SITES + "/cm_auditable/properties");
+		Map< String, String > arguments = new HashMap< String, String >();
+		arguments.put("nsp", "cm");
+		req.setArgs(arguments);
+		Response response = sendRequest(req, 200);
+		assertEquals(200,response.getStatus());
+		
+		JSONArray result = new JSONArray(response.getContentAsString());
+        assertEquals(200,response.getStatus());
+        assertEquals(5, result.length());
+		
+		//validate with no parameter => returns an array of property definitions
+		arguments.clear();
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(200,response.getStatus());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if(result.getJSONObject(i).get("name").equals("cm:created")) 
+			{
+				validatePropertyDef(result.getJSONObject(i));
+			}
+		}
+		
+		// test /api/properties
+		req = new GetRequest(URL_PROPERTIES);
+		response = sendRequest(req, 200);
+		assertEquals(200, response.getStatus());		
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+        for (int i = 0; i < result.length(); i++)
+        {
+            if(result.getJSONObject(i).get("name").equals("cm:created")) 
+            {
+                validatePropertyDef(result.getJSONObject(i));
+            }
+            
+            @SuppressWarnings("unused")
+            String title = "";
+            if (result.getJSONObject(i).has("title") == true)
+            {
+                title = result.getJSONObject(i).getString("title");
+            }
+      }
+        
+        // test /api/properties?name=cm:name&name=cm:title&name=cm:description
+        req = new GetRequest(URL_PROPERTIES + "?name=cm:name&name=cm:title&name=cm:description");
+        response = sendRequest(req, 200);
+        assertEquals(200, response.getStatus());        
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(3, result.length());
+	}
+	
+	public void testGetClassDetail() throws Exception
+	{
+		GetRequest req = new GetRequest(URL_SITES + "/cm_thumbnailed");
+		Response response = sendRequest(req, 200);
+		JSONObject result = new JSONObject(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		assertEquals(200,response.getStatus());
+		validateAspectClass(result);
+		
+		req = new GetRequest(URL_SITES + "/cm_cmobject");
+		response = sendRequest(req, 200);
+		result = new JSONObject(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		assertEquals(200,response.getStatus());
+		validateTypeClass(result);
+		
+		response = sendRequest(new GetRequest("/api/classes/cm_hi"), 404);
+		assertEquals(404,response.getStatus());
+	}
+	
+
+	public void testGetClassDetails() throws Exception
+	{
+		/**
+		 *  There are eight scenarios with getting class details , all are optional fields
+		 *  Classfilter   namespaceprefix   name   Returns  
+		 *  1   yes				yes			 yes	single class
+		 *  2   yes				yes			 no     Array of classes [returns array of classes of the particular namespaceprefix]
+		 *  3   yes				no			 no     Array of classes [depends on classfilter, either type or aspect or all classes in the repo]
+		 * 	4   no				no			 no		Array of classes [returns all classes of both type and aspects in the entire repository]
+		 * 	5   no				yes			 yes	single class [returns a single class of a valid namespaceprefix:name combination]
+		 * 	6   no				yes			 no		Array of classes [returns an array of all aspects and types under particular namespaceprefix]
+		 * 	7   no				no			 yes    404 error [since name alone doesn't makes any meaning]
+		 *  8   yes 		    no 			 yes	404 error [since name alone doesn't makes any meaning]
+		 * 	Test cases are provided for all the above scenarios	
+		 */
+		
+		
+		//check for a aspect under cm with name thumbnailes [case-type:1]
+		GetRequest req = new GetRequest(URL_SITES);
+		Map< String, String > arguments = new HashMap< String, String >();
+		arguments.put("cf", "aspect");
+		arguments.put("nsp", "cm");
+		arguments.put("n", "thumbnailed");
+		req.setArgs(arguments);
+		Response response = sendRequest(req, 200);
+		JSONArray result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:thumbnailed"))
+			{
+				validateAspectClass(result.getJSONObject(i));
+			}
+		}
+		//check array length
+		assertEquals(200,response.getStatus());
+		
+		//check for a type under cm with name cmobject [case-type:1]
+		arguments.clear();
+		arguments.put("cf", "type");
+		arguments.put("nsp", "cm");
+		arguments.put("n", "cmobject");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:cmobject")) 
+			{
+				validateTypeClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		//check for a type under cm with name cmobject [case-type:1]
+		arguments.clear();
+		arguments.put("cf", "all");
+		arguments.put("nsp", "cm");
+		arguments.put("n", "cmobject");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:cmobject")) 
+			{
+				validateTypeClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		//check for a type under cm without options=>name, namespaceprefix [case-type:2]
+		arguments.clear();
+		arguments.put("cf", "type");
+		arguments.put("nsp", "cm");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		// the above result has all the types under cm, so now check for the presence type cm:cmobject in the array of classes of all types
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+			{
+				validateTypeClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		//check for a aspect under cm without options=>name [case-type:2]
+		arguments.clear();
+		arguments.put("cf", "aspect");
+		arguments.put("nsp", "cm");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		// the above result has all the aspects under cm, so now check for the presence aspect cm:thumnailed in the array of classes of all aspects
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:thumbnailed")) 
+			{
+				validateAspectClass(result.getJSONObject(i));
+			}
+		}
+		
+		//check for all aspects under cm without options=>name [case-type:2]
+		arguments.clear();
+		arguments.put("cf", "all");
+		arguments.put("nsp", "cm");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:thumbnailed"))
+			{
+				validateAspectClass(result.getJSONObject(i));
+			}	
+		}
+		assertEquals(200,response.getStatus());
+		
+		//check for all type under cm without options=>name, namespaceprefix [case-type:3]
+		arguments.clear();
+		arguments.put("cf", "type");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+			{
+			    System.out.println(result.getJSONObject(i).toString());
+				validateTypeClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		//check for all aspect under cm without options=>name, namespaceprefix [case-type:3]
+		arguments.clear();
+		arguments.put("cf", "aspect");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:thumbnailed")) 
+			{
+				validateAspectClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		//check for all aspect and type in the repository when nothing is given [case-type:4]
+		arguments.clear();
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:thumbnailed"))
+			{
+				validateAspectClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		//check for all aspect and type in the repository when nothing is given [case-type:4]
+		arguments.clear();
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+			{
+				validateTypeClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		//check for a classname [namespaceprefix:name => cm:cmobject] without classfilter option [case-type:5]
+		arguments.clear();
+		arguments.put("nsp", "cm");
+		arguments.put("n", "cmobject");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+			{
+				validateTypeClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		//check for a classname [namespaceprefix:name => cm:thumbnailed] without classfilter option [case-type:5]
+		arguments.clear();
+		arguments.put("nsp", "cm");
+		arguments.put("n", "thumbnailed");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:thumbnailed"))
+			{
+				validateAspectClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		//check for a namespaceprefix [namespaceprefix => cm] without classfilter and name option [case-type:6]
+		arguments.clear();
+		arguments.put("nsp", "cm");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:thumbnailed"))
+			{
+				validateAspectClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		//check for a namespaceprefix [namespaceprefix => cm] without classfilter and name option [case-type:6]
+		arguments.clear();
+		arguments.put("nsp", "cm");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:cmobject")) 
+			{
+				validateTypeClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		//check for a namespaceprefix [namespaceprefix => cm] without classfilter and name option [case-type:6]
+		arguments.clear();
+		arguments.put("nsp", "cm");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:cmobject")) 
+			{
+				validateTypeClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		//check for a name alone without classfilter and namespaceprefix option [case-type:7] => returns 404 error
+		arguments.clear();
+		arguments.put("n", "cmobject");
+		req.setArgs(arguments);
+		response = sendRequest(req, 404);
+		assertEquals(404,response.getStatus());
+		
+		
+		//check for a type under cm with name cmobject and no namespaceprefix [case-type:8] => returns 404 error
+		arguments.clear();
+		arguments.put("cf", "type");
+		arguments.put("n", "cmobject");
+		req.setArgs(arguments);
+		response = sendRequest(req, 404);
+		assertEquals(404,response.getStatus());
+		
+		// Test with wrong data
+		//check for all aspects under cm without option=>name
+		arguments.clear();
+		arguments.put("cf", "aspects");
+		arguments.put("nsp", "cm");
+		req.setArgs(arguments);
+		response = sendRequest(req, 404);
+		assertEquals(404,response.getStatus());
+		
+		//check for all types under cm without option=>name
+		arguments.clear();
+		arguments.put("cf", "types");
+		arguments.put("nsp", "cmd");
+		req.setArgs(arguments);
+		response = sendRequest(req, 404);
+		assertEquals(404,response.getStatus());
+		
+		//check for all dictionary data  without option=>name and option=>namespaceprefix
+		arguments.clear();
+		arguments.put("cf", "a�&llsara");
+		req.setArgs(arguments);
+		response = sendRequest(req, 404);
+		assertEquals(404,response.getStatus());
+		
+		//check for all aspect dictionary data  without option=>name and option=>namespaceprefix
+		arguments.clear();
+		arguments.put("cf", "aspectb");
+		req.setArgs(arguments);
+		response = sendRequest(req, 404);
+		assertEquals(404,response.getStatus());
+		
+		//check for all types dictionary data  without option=>name and option=>namespaceprefix
+		arguments.clear();
+		arguments.put("cf", "typesa");
+		req.setArgs(arguments);
+		response = sendRequest(req, 404);
+		assertEquals(404,response.getStatus());
+		
+		//check for all types dictionary data  without option=>name and option=>namespaceprefix and option=>classfilter
+		arguments.clear();
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		assertEquals(200,response.getStatus());
+	}
+
+	public void testSubClassDetails() throws Exception
+	{
+		GetRequest req = new GetRequest(URL_SITES + "/sys_base/subclasses");
+		Map< String, String > arguments = new HashMap< String, String >();
+		arguments.put("r", "true");
+		req.setArgs(arguments);
+		Response response = sendRequest(req, 200);
+		assertEquals(200,response.getStatus());
+		response = sendRequest(req, 200);
+		JSONArray result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+			{
+				validateTypeClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		arguments.clear();
+		arguments.put("r", "false");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		assertEquals(200,response.getStatus());
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+			{
+				validateTypeClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		assertEquals(200,response.getStatus());
+		arguments.clear();
+		arguments.put("r", "false");
+		arguments.put("nsp", "cm");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		assertEquals(200,response.getStatus());
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+			{
+				validateTypeClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		arguments.clear();
+		arguments.put("r", "true");
+		arguments.put("nsp", "cm");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		assertEquals(200,response.getStatus());
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+			{
+				validateTypeClass(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		// data with only name along
+		arguments.clear();
+		arguments.put("r", "true");
+		arguments.put("n", "cmobject");
+		req.setArgs(arguments);
+		response = sendRequest(req, 404);
+		assertEquals(404,response.getStatus());
+		
+		// invalid name and namespaceprefix
+		arguments.clear();
+		arguments.put("r", "true");
+		arguments.put("n", "dublincore"); //name and namespaceprefix are valid one , but its not present in sys_base as a sub-class
+		arguments.put("nsp", "cm");
+		req.setArgs(arguments);
+		response = sendRequest(req, 404);
+		assertEquals(404,response.getStatus());
+		
+		//invalid name and a valid namespaceprefix
+		arguments.clear();
+		arguments.put("r", "true");
+		arguments.put("n", "dublincoresara"); //name and namespaceprefix are invalid one
+		arguments.put("nsp", "cm");
+		req.setArgs(arguments);
+		response = sendRequest(req, 404);
+		assertEquals(404,response.getStatus());
+		
+		
+	}
+	
+	public void testGetAssociationDef() throws Exception
+	{
+		GetRequest req = new GetRequest(URL_SITES + "/cm_person/association/cm_avatar");
+		Response response = sendRequest(req, 200);
+		JSONObject result = new JSONObject(response.getContentAsString());
+		assertEquals(200,response.getStatus());
+		validateAssociationDef(result);
+		
+		//wrong data
+		response = sendRequest(new GetRequest(URL_SITES +"/cm_personalbe/association/cms_avatarsara"), 404);
+		assertEquals(404,response.getStatus());
+		
+		//ask for an invalid association, which returns a null array 
+		response = sendRequest(new GetRequest(URL_SITES +"/cm_person/association/cm_atari"), 200);
+		result = new JSONObject(response.getContentAsString()); // change to return 404
+		assertEquals(0,result.length());
+		assertEquals(200,response.getStatus());
+	}
+	
+	public void testGetAssociationDefs() throws Exception
+	{
+	    // CHILD ASSOCS
+	    
+	    // All associations on cm:authorityContainer
+		GetRequest req = new GetRequest(URL_SITES + "/cm_authorityContainer/associations");
+		Map< String, String > arguments = new HashMap< String, String >();
+		arguments.put("af", "all");
+		req.setArgs(arguments);
+		Response response = sendRequest(req, 200);
+		JSONArray result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:member"))
+			{
+				validateChildAssociation(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		// Child associations on cm:authorityContainer
+		arguments.clear();
+		arguments.put("af", "child");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+            if (result.getJSONObject(i).get("name").equals("cm:member"))
+            {
+                validateChildAssociation(result.getJSONObject(i));
+            }
+		}
+		assertEquals(200,response.getStatus());
+		
+        // look for childassociation cm:member
+        arguments.clear();
+        arguments.put("af", "child");
+        arguments.put("nsp", "cm");
+        arguments.put("n", "member");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:workingcopylink"))
+            {
+                validateChildAssociation(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        // cm:authorityContainer has a child_assoc relation with cm:member , but ask for general association, this then returns a null array 
+        arguments.clear();
+        arguments.put("af", "general");
+        arguments.put("nsp", "cm");
+        arguments.put("n", "member");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(0,result.length());
+        assertEquals(200,response.getStatus());
+        
+        // PEER ASSOCS
+        
+		// Peer associations on cm:checkedOut
+        req = new GetRequest(URL_SITES + "/cm_checkedOut/associations");
+		arguments.clear();
+		arguments.put("af", "general");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+			if (result.getJSONObject(i).get("name").equals("cm:workingcopylink"))
+			{
+				validateAssociation(result.getJSONObject(i));
+			}
+		}
+		assertEquals(200,response.getStatus());
+		
+		//look for association cm:workingcopylink
+		arguments.clear();
+		arguments.put("af", "general");
+		arguments.put("nsp", "cm");
+		arguments.put("n", "workingcopylink");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+            if (result.getJSONObject(i).get("name").equals("cm:workingcopylink"))
+            {
+                validateAssociation(result.getJSONObject(i));
+            }
+		}
+		assertEquals(200,response.getStatus());
+		
+		//look for details on cm:checkedOut
+		arguments.clear();
+		arguments.put("nsp", "cm");
+		arguments.put("n", "workingcopylink");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(result.length()>0, true);
+		for(int i=0; i<result.length(); i++)
+		{
+            if (result.getJSONObject(i).get("name").equals("cm:workingcopylink"))
+            {
+                validateAssociation(result.getJSONObject(i));
+            }
+		}
+		assertEquals(200,response.getStatus());
+		
+		// cm:copiedFrom has a general association relation with cm:object , but ask for child association, this then returns a null array 
+		arguments.clear();
+		arguments.put("af", "child");
+		arguments.put("nsp", "cm");
+		arguments.put("n", "workingcopylink");
+		req.setArgs(arguments);
+		response = sendRequest(req, 200);
+		result = new JSONArray(response.getContentAsString());
+		assertEquals(0,result.length());
+		assertEquals(200,response.getStatus());
+		
+		//wrong data
+		response = sendRequest(new GetRequest(URL_SITES +"/cmsa_personalbe/associations"), 404);
+		assertEquals(404,response.getStatus());
+		
+		//data without name parameter
+		arguments.clear();
+		arguments.put("nsp", "cm");
+		req.setArgs(arguments);
+		response = sendRequest(req, 404);
+		assertEquals(404,response.getStatus());
+		
+		//data with invalid association in wca_form
+		arguments.clear();
+		arguments.put("nsp", "cm");
+		arguments.put("n", "hiwelcome");
+		req.setArgs(arguments);
+		response = sendRequest(req, 404);
+		assertEquals(404,response.getStatus());
+	}
+	
+    public void testGetClasses() throws Exception
+    {
+        GetRequest req = new GetRequest(URL_SITES);
+        Response response = sendRequest(req, 200);
+        JSONArray result = new JSONArray(response.getContentAsString());
+
+        assertTrue(result.length() > 0);
+        assertEquals(200, response.getStatus());
+        validatePropertiesConformity(result);
+    }
+	
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/dictionary/prefixed/DictionaryRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/dictionary/prefixed/DictionaryRestApiTest.java
new file mode 100644
index 00000000000..f39301b5b05
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/dictionary/prefixed/DictionaryRestApiTest.java
@@ -0,0 +1,1029 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.dictionary.prefixed;
+
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.json.JSONObject;
+import org.json.JSONArray;
+
+/**
+ * Unit test for Dictionary REST API
+ * @author Saravanan Sellathurai, Viachaslau Tsikhanovich
+ */
+
+public class DictionaryRestApiTest extends BaseWebScriptTest
+{
+    private static final String URL_SITES = "/api/defclasses";
+    private static final String URL_PROPERTIES = "/api/defproperties";
+    
+    @Override
+    protected void setUp() throws Exception 
+    { 
+        super.setUp();
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+
+    private void validatePropertyDef(JSONObject result) throws Exception
+    {
+        assertEquals("cm:created", result.get("name"));
+        assertEquals("Created Date", result.get("title"));
+        assertEquals("Created Date", result.get("description"));
+        assertEquals("d:datetime", result.get("dataType"));
+        assertEquals(false, result.get("multiValued"));
+        assertEquals(true, result.get("mandatory"));
+        assertEquals(true, result.get("enforced"));
+        assertEquals(true, result.get("protected"));
+        assertEquals(true, result.get("indexed"));
+        assertEquals(true, result.get("indexedAtomically"));
+        assertEquals("/api/property/cm/created", result.get("url"));
+
+    }
+
+    private void validateChildAssociation(JSONObject result) throws Exception
+    {
+        assertEquals("wca:formworkflowdefaults", result.get("name"));
+        assertEquals("Form Workflow Defaults", result.get("title"));
+        assertEquals("Form Workflow Defaults", result.get("description"));
+        assertEquals(true, result.get("isChildAssociation"));
+        assertEquals(false, result.get("protected"));
+        
+        assertEquals("wca:form", result.getJSONObject("source").get("class"));
+        assertEquals(false, result.getJSONObject("source").get("mandatory"));
+        assertEquals(false, result.getJSONObject("source").get("many"));
+        
+        assertEquals("wca:workflowdefaults", result.getJSONObject("target").get("class"));
+        assertEquals(false, result.getJSONObject("target").get("mandatory"));
+        assertEquals(false, result.getJSONObject("target").get("many"));
+        
+        assertEquals("/api/defclasses/wca/form/association/wca/formworkflowdefaults", result.get("url"));
+    }
+
+    private void validateAssociation(JSONObject result) throws Exception
+    {
+        assertEquals("wca:renderingenginetemplates", result.get("name"));
+        assertEquals("Rendering Engine Templates", result.get("title"));
+        assertEquals("Rendering Engine Templates", result.get("description"));
+        assertEquals(false, result.get("isChildAssociation"));
+        assertEquals(false, result.get("protected"));
+        
+        assertEquals("wca:form", result.getJSONObject("source").get("class"));
+        assertEquals("wca:capture", result.getJSONObject("source").get("role"));
+        assertEquals(false, result.getJSONObject("source").get("mandatory"));
+        assertEquals(false, result.getJSONObject("source").get("many"));
+        
+        assertEquals("wca:renderingenginetemplate", result.getJSONObject("target").get("class"));
+        assertEquals("wca:presentation", result.getJSONObject("target").get("role"));
+        assertEquals(false, result.getJSONObject("target").get("mandatory"));
+        assertEquals(true, result.getJSONObject("target").get("many"));
+        
+        assertEquals("/api/defclasses/wca/form/association/wca/renderingenginetemplates", result.get("url"));
+    }
+    private void validateAssociationDef(JSONObject result) throws Exception
+    {
+        assertEquals("cm:avatar", result.get("name"));
+        assertEquals("Avatar", result.get("title"));
+        assertEquals("The person's avatar image", result.get("description"));
+        assertEquals(false, result.get("isChildAssociation"));
+        assertEquals(false, result.get("protected"));
+        
+        assertEquals("cm:person", result.getJSONObject("source").get("class"));
+        assertEquals("cm:avatarOf", result.getJSONObject("source").get("role"));
+        assertEquals(false, result.getJSONObject("source").get("mandatory"));
+        assertEquals(false, result.getJSONObject("source").get("many"));
+        
+        assertEquals("cm:content", result.getJSONObject("target").get("class"));
+        assertEquals("cm:hasAvatar", result.getJSONObject("target").get("role"));
+        assertEquals(false, result.getJSONObject("target").get("mandatory"));
+        assertEquals(false, result.getJSONObject("target").get("many"));
+        
+        assertEquals("/api/defclasses/cm/person/association/cm/avatar", result.get("url"));
+    }
+    
+    private void validateTypeClass(JSONObject result) throws Exception
+    {
+        //cm:cmobject is of type =>type
+        assertEquals("cm:cmobject", result.get("name"));
+        assertEquals(false , result.get("isAspect"));
+        assertEquals("Object", result.get("title"));
+        assertEquals("", result.get("description"));
+        
+        assertEquals("sys:base", result.getJSONObject("parent").get("name"));
+        assertEquals("base", result.getJSONObject("parent").get("title"));
+        assertEquals("/api/defclasses/sys/base", result.getJSONObject("parent").get("url"));
+        
+        assertEquals("sys:referenceable", result.getJSONObject("defaultAspects").getJSONObject("sys:referenceable").get("name"));
+        assertEquals("Referenceable", result.getJSONObject("defaultAspects").getJSONObject("sys:referenceable").get("title"));
+        assertEquals("/api/defclasses/cm/cmobject/property/sys/referenceable", result.getJSONObject("defaultAspects").getJSONObject("sys:referenceable").get("url"));
+
+        assertEquals("cm:auditable", result.getJSONObject("defaultAspects").getJSONObject("cm:auditable").get("name"));
+        assertEquals("Auditable", result.getJSONObject("defaultAspects").getJSONObject("cm:auditable").get("title"));
+        assertEquals("/api/defclasses/cm/cmobject/property/cm/auditable", result.getJSONObject("defaultAspects").getJSONObject("cm:auditable").get("url"));
+        
+        //assertEquals("cm:name", result.getJSONObject("properties").getJSONObject("cm:name").get("name"));
+        //assertEquals("Name", result.getJSONObject("properties").getJSONObject("cm:name").get("title"));
+        //assertEquals("/api/defclasses/cm/cmobject/property/cm/name", result.getJSONObject("properties").getJSONObject("cm:name").get("url"));
+        
+        //assertEquals(, result.getJSONObject("associations").length());
+        //assertEquals(0, result.getJSONObject("childassociations").length());
+        
+        assertEquals("/api/defclasses/cm/cmobject", result.get("url"));
+        
+    }
+    
+    private void validateAspectClass(JSONObject result) throws Exception
+    {
+        //cm:thumbnailed is of type =>aspect
+        assertEquals("cm:thumbnailed", result.get("name"));
+        assertEquals(true , result.get("isAspect"));
+        assertEquals("Thumbnailed", result.get("title"));
+        assertEquals("", result.get("description"));
+        assertEquals(0, result.getJSONObject("defaultAspects").length());
+        
+        if (result.getJSONObject("properties").has("cm:automaticUpdate") == true)
+        {
+            assertEquals("cm:automaticUpdate", result.getJSONObject("properties").getJSONObject("cm:automaticUpdate").get("name"));
+            assertEquals("Automatic Update", result.getJSONObject("properties").getJSONObject("cm:automaticUpdate").get("title"));
+            assertEquals("/api/defclasses/cm/thumbnailed/property/cm/automaticUpdate", result.getJSONObject("properties").getJSONObject("cm:automaticUpdate").get("url"));
+        }
+        
+        //assertEquals(2, result.getJSONObject("associations").length());
+    }
+
+    private void validatePropertiesConformity(JSONArray classDefs) throws Exception
+    {
+        final int itemsToTest = 10;
+        for (int i = 0; (i < itemsToTest) && (i < classDefs.length()); ++i)
+        {
+            JSONObject classDef1 = classDefs.getJSONObject(i);
+            JSONArray propertyNames1 = classDef1.getJSONObject("properties").names();
+            // properties of class obtained by api/defclasses
+            List<String> propertyValues1 = Collections.emptyList();
+            if (propertyNames1 != null)
+            {
+                propertyValues1 = new ArrayList<String>(propertyNames1.length());
+                for (int j = 0; j < propertyNames1.length(); j++)
+                {
+                    propertyValues1.add(propertyNames1.getString(j));
+                }
+            }
+
+            String classUrl = classDef1.getString("url");
+            assertTrue(classUrl.contains(URL_SITES));
+            Response responseFromGetClassDef = sendRequest(new GetRequest(classUrl), 200);
+            JSONObject classDef2 = new JSONObject(responseFromGetClassDef.getContentAsString());
+            assertTrue(classDef2.length() > 0);
+            assertEquals(200, responseFromGetClassDef.getStatus());
+            assertEquals(classDef1.getString("name"), classDef2.getString("name"));
+            JSONArray propertyNames2 = classDef2.getJSONObject("properties").names();
+            // properties of class obtained by api/defclasses/class
+            List<String> propertyValues2 = Collections.emptyList();
+            if (propertyNames2 != null)
+            {
+                propertyValues2 = new ArrayList<String>(propertyNames2.length());
+                for (int j = 0; j < propertyNames2.length(); j++)
+                {
+                    propertyValues2.add(propertyNames2.getString(j));
+                }
+            }
+
+            Response responseFromGetPropertiesDef = sendRequest(new GetRequest(classUrl + "/properties"), 200);
+            JSONArray propertiesDefs = new JSONArray(responseFromGetPropertiesDef.getContentAsString());
+            assertEquals(200, responseFromGetClassDef.getStatus());
+            // properties of class obtained by api/defclasses/class/properties
+            List<String> propertyValues3 = new ArrayList<String>(propertiesDefs.length());
+            for (int j = 0; j < propertiesDefs.length(); j++)
+            {
+                propertyValues3.add(propertiesDefs.getJSONObject(j).getString("name"));
+            }
+
+            assertEquivalenceProperties(propertyValues1, propertyValues2);
+            assertEquivalenceProperties(propertyValues2, propertyValues3);
+        }
+    }
+
+    private void assertEquivalenceProperties(List<String> propertyValues1, List<String> propertyValues2)
+    {
+        if ((propertyValues1.size() != propertyValues2.size()) || !propertyValues1.containsAll(propertyValues2))
+        {
+            fail("Wrong properties in classes");
+        }
+    }
+
+    public void testGetPropertyDef() throws Exception
+    {
+        Response response = sendRequest(new GetRequest("/api/defclasses/cm/auditable/property/cm/created"), 200);
+        assertEquals(200,response.getStatus());
+        JSONObject result = new JSONObject(response.getContentAsString());
+        validatePropertyDef(result);
+        
+        assertEquals(result.length()>0, true);
+        response = sendRequest(new GetRequest("/api/defclasses/cm/hi/property/cm/welcome"), 404);
+        assertEquals(404,response.getStatus());
+        
+        //invalid property name , returns a null JsonObject as such a property doesn't exist under cm_auditable
+        response = sendRequest(new GetRequest("/api/defclasses/cm/auditable/property/cm/welcome"), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(0, result.length());
+        assertEquals(200,response.getStatus());
+    }
+    
+    public void testGetPropertyDefs() throws Exception
+    {
+        //validate for a particular property cm_created in the class cm_auditable
+        GetRequest req = new GetRequest(URL_SITES + "/cm/auditable/properties");
+        Map< String, String > arguments = new HashMap< String, String >();
+        arguments.put("nsp", "cm");
+        req.setArgs(arguments);
+        Response response = sendRequest(req, 200);
+        assertEquals(200,response.getStatus());
+        
+        JSONArray result = new JSONArray(response.getContentAsString());
+        assertEquals(200,response.getStatus());
+        assertEquals(5, result.length());
+        
+        //validate with no parameter => returns an array of property definitions
+        arguments.clear();
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(200,response.getStatus());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if(result.getJSONObject(i).get("name").equals("cm:created")) 
+            {
+                validatePropertyDef(result.getJSONObject(i));
+            }
+        }
+        
+        // test /api/properties
+        req = new GetRequest(URL_PROPERTIES);
+        response = sendRequest(req, 200);
+        assertEquals(200, response.getStatus());
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for (int i = 0; i < result.length(); i++)
+        {
+            if(result.getJSONObject(i).get("name").equals("cm:created")) 
+            {
+                validatePropertyDef(result.getJSONObject(i));
+            }
+            
+            String title = "";
+            if (result.getJSONObject(i).has("title") == true)
+            {
+                title = result.getJSONObject(i).getString("title");
+            }
+            System.out.println(title + " - " + result.getJSONObject(i).getString("name"));
+      }
+        
+//        System.out.println("/n/n");
+        
+        // test /api/properties?name=cm:name&name=cm:title&name=cm:description
+        req = new GetRequest(URL_PROPERTIES + "?name=cm:name&name=cm:title&name=cm:description");
+        response = sendRequest(req, 200);
+        assertEquals(200, response.getStatus());        
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(3, result.length());
+//        for (int i = 0; i < result.length(); i++)
+//        {
+//            String title = "";
+//            if (result.getJSONObject(i).has("title") == true)
+//            {
+//                title = result.getJSONObject(i).getString("title");
+//            }
+//            System.out.println(title + " - " + result.getJSONObject(i).getString("name"));
+//        }
+        
+        
+    }
+    
+    public void testGetClassDetail() throws Exception
+    {
+        GetRequest req = new GetRequest(URL_SITES + "/cm/thumbnailed");
+        Response response = sendRequest(req, 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        assertEquals(200,response.getStatus());
+        validateAspectClass(result);
+        
+        req = new GetRequest(URL_SITES + "/cm/cmobject");
+        response = sendRequest(req, 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        assertEquals(200,response.getStatus());
+        validateTypeClass(result);
+        
+        response = sendRequest(new GetRequest("/api/defclasses/cm/hi"), 404);
+        assertEquals(404,response.getStatus());
+    }
+    
+
+    public void testGetClassDetails() throws Exception
+    {
+        /**
+         *  There are eight scenarios with getting class details , all are optional fields
+         *  Classfilter   namespaceprefix   name   Returns  
+         *  1   yes             yes          yes    single class
+         *  2   yes             yes          no     Array of classes [returns array of classes of the particular namespaceprefix]
+         *  3   yes             no           no     Array of classes [depends on classfilter, either type or aspect or all classes in the repo]
+         *  4   no              no           no     Array of classes [returns all classes of both type and aspects in the entire repository]
+         *  5   no              yes          yes    single class [returns a single class of a valid namespaceprefix:name combination]
+         *  6   no              yes          no     Array of classes [returns an array of all aspects and types under particular namespaceprefix]
+         *  7   no              no           yes    404 error [since name alone doesn't makes any meaning]
+         *  8   yes             no           yes    404 error [since name alone doesn't makes any meaning]
+         *  Test cases are provided for all the above scenarios
+         */
+        
+        
+        //check for a aspect under cm with name thumbnailes [case-type:1]
+        GetRequest req = new GetRequest(URL_SITES);
+        Map< String, String > arguments = new HashMap< String, String >();
+        arguments.put("cf", "aspect");
+        arguments.put("nsp", "cm");
+        arguments.put("n", "thumbnailed");
+        req.setArgs(arguments);
+        Response response = sendRequest(req, 200);
+        JSONArray result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:thumbnailed"))
+            {
+                validateAspectClass(result.getJSONObject(i));
+            }
+        }
+        //check array length
+        assertEquals(200,response.getStatus());
+        
+        //check for a type under cm with name cmobject [case-type:1]
+        arguments.clear();
+        arguments.put("cf", "type");
+        arguments.put("nsp", "cm");
+        arguments.put("n", "cmobject");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:cmobject")) 
+            {
+                validateTypeClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        //check for a type under cm with name cmobject [case-type:1]
+        arguments.clear();
+        arguments.put("cf", "all");
+        arguments.put("nsp", "cm");
+        arguments.put("n", "cmobject");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:cmobject")) 
+            {
+                validateTypeClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        //check for a type under cm without options=>name, namespaceprefix [case-type:2]
+        arguments.clear();
+        arguments.put("cf", "type");
+        arguments.put("nsp", "cm");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        // the above result has all the types under cm, so now check for the presence type cm:cmobject in the array of classes of all types
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+            {
+                validateTypeClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        //check for a aspect under cm without options=>name [case-type:2]
+        arguments.clear();
+        arguments.put("cf", "aspect");
+        arguments.put("nsp", "cm");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        // the above result has all the aspects under cm, so now check for the presence aspect cm:thumnailed in the array of classes of all aspects
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:thumbnailed")) 
+            {
+                validateAspectClass(result.getJSONObject(i));
+            }
+        }
+        
+        //check for all aspects under cm without options=>name [case-type:2]
+        arguments.clear();
+        arguments.put("cf", "all");
+        arguments.put("nsp", "cm");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:thumbnailed"))
+            {
+                validateAspectClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        //check for all type under cm without options=>name, namespaceprefix [case-type:3]
+        arguments.clear();
+        arguments.put("cf", "type");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+            {
+                System.out.println(result.getJSONObject(i).toString());
+                validateTypeClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        //check for all aspect under cm without options=>name, namespaceprefix [case-type:3]
+        arguments.clear();
+        arguments.put("cf", "aspect");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:thumbnailed")) 
+            {
+                validateAspectClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        //check for all aspect and type in the repository when nothing is given [case-type:4]
+        arguments.clear();
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:thumbnailed"))
+            {
+                validateAspectClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        //check for all aspect and type in the repository when nothing is given [case-type:4]
+        arguments.clear();
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+            {
+                validateTypeClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        //check for a classname [namespaceprefix:name => cm:cmobject] without classfilter option [case-type:5]
+        arguments.clear();
+        arguments.put("nsp", "cm");
+        arguments.put("n", "cmobject");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+            {
+                validateTypeClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        //check for a classname [namespaceprefix:name => cm:thumbnailed] without classfilter option [case-type:5]
+        arguments.clear();
+        arguments.put("nsp", "cm");
+        arguments.put("n", "thumbnailed");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:thumbnailed"))
+            {
+                validateAspectClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        //check for a namespaceprefix [namespaceprefix => cm] without classfilter and name option [case-type:6]
+        arguments.clear();
+        arguments.put("nsp", "cm");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:thumbnailed"))
+            {
+                validateAspectClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        //check for a namespaceprefix [namespaceprefix => cm] without classfilter and name option [case-type:6]
+        arguments.clear();
+        arguments.put("nsp", "cm");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:cmobject")) 
+            {
+                validateTypeClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        //check for a namespaceprefix [namespaceprefix => cm] without classfilter and name option [case-type:6]
+        arguments.clear();
+        arguments.put("nsp", "cm");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:cmobject")) 
+            {
+                validateTypeClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        //check for a name alone without classfilter and namespaceprefix option [case-type:7] => returns 404 error
+        arguments.clear();
+        arguments.put("n", "cmobject");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        
+        //check for a type under cm with name cmobject and no namespaceprefix [case-type:8] => returns 404 error
+        arguments.clear();
+        arguments.put("cf", "type");
+        arguments.put("n", "cmobject");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        // Test with wrong data
+        //check for all aspects under cm without option=>name
+        arguments.clear();
+        arguments.put("cf", "aspects");
+        arguments.put("nsp", "cm");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        //check for all types under cm without option=>name
+        arguments.clear();
+        arguments.put("cf", "types");
+        arguments.put("nsp", "cmd");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        //check for all dictionary data  without option=>name and option=>namespaceprefix
+        arguments.clear();
+        arguments.put("cf", "a�&llsara");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        //check for all aspect dictionary data  without option=>name and option=>namespaceprefix
+        arguments.clear();
+        arguments.put("cf", "aspectb");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        //check for all types dictionary data  without option=>name and option=>namespaceprefix
+        arguments.clear();
+        arguments.put("cf", "typesa");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        //check for all types dictionary data  without option=>name and option=>namespaceprefix and option=>classfilter
+        arguments.clear();
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        assertEquals(200,response.getStatus());
+    }
+
+    public void testSubClassDetails() throws Exception
+    {
+        GetRequest req = new GetRequest(URL_SITES + "/sys/base/subclasses");
+        Map< String, String > arguments = new HashMap< String, String >();
+        arguments.put("r", "true");
+        req.setArgs(arguments);
+        Response response = sendRequest(req, 200);
+        assertEquals(200,response.getStatus());
+        response = sendRequest(req, 200);
+        JSONArray result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+            {
+                validateTypeClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        arguments.clear();
+        arguments.put("r", "false");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        assertEquals(200,response.getStatus());
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+            {
+                validateTypeClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        assertEquals(200,response.getStatus());
+        arguments.clear();
+        arguments.put("r", "false");
+        arguments.put("nsp", "cm");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        assertEquals(200,response.getStatus());
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+            {
+                validateTypeClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        arguments.clear();
+        arguments.put("r", "true");
+        arguments.put("nsp", "cm");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        assertEquals(200,response.getStatus());
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if (result.getJSONObject(i).get("name").equals("cm:cmobject"))
+            {
+                validateTypeClass(result.getJSONObject(i));
+            }
+        }
+        assertEquals(200,response.getStatus());
+        
+        // data with only name along
+        arguments.clear();
+        arguments.put("r", "true");
+        arguments.put("n", "cmobject");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        // invalid name and namespaceprefix
+        arguments.clear();
+        arguments.put("r", "true");
+        arguments.put("n", "dublincore"); //name and namespaceprefix are valid one , but its not present in sys_base as a sub-class
+        arguments.put("nsp", "cm");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        //invalid name and a valid namespaceprefix
+        arguments.clear();
+        arguments.put("r", "true");
+        arguments.put("n", "dublincoresara"); //name and namespaceprefix are invalid one
+        arguments.put("nsp", "cm");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        
+    }
+    
+    public void testGetAssociationDef() throws Exception
+    {
+        GetRequest req = new GetRequest(URL_SITES + "/cm/person/association/cm/avatar");
+        Response response = sendRequest(req, 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        assertEquals(200,response.getStatus());
+        validateAssociationDef(result);
+        
+        req = new GetRequest(URL_SITES + "/wca/form/association/wca/formworkflowdefaults");
+        response = sendRequest(req, 200);
+        result = new JSONObject(response.getContentAsString());
+        validateChildAssociation(result);
+        assertEquals(200,response.getStatus());
+        
+        req = new GetRequest(URL_SITES + "/wca/form/association/wca/renderingenginetemplates");
+        response = sendRequest(req, 200);
+        result = new JSONObject(response.getContentAsString());
+        validateAssociation(result);
+        assertEquals(200,response.getStatus());
+        
+        //wrong data
+        response = sendRequest(new GetRequest(URL_SITES +"/cm/personalbe/association/cms/avatarsara"), 404);
+        assertEquals(404,response.getStatus());
+        
+        //ask for an invalid association under wca:form , which returns 404 
+        response = sendRequest(new GetRequest(URL_SITES +"/wca/form/association/cmsavatarsara"), 404);
+        assertEquals(404,response.getStatus());
+    }
+    
+    public void testGetAssociationDefs() throws Exception
+    {
+        //validate with associationfilter=>all  and classname=>wca_form
+        GetRequest req = new GetRequest(URL_SITES + "/wca/form/associations");
+        Map< String, String > arguments = new HashMap< String, String >();
+        arguments.put("af", "all");
+        req.setArgs(arguments);
+        Response response = sendRequest(req, 200);
+        JSONArray result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if(result.getJSONObject(i).get("name").equals("wca:formworkflowdefaults")) 
+                validateChildAssociation(result.getJSONObject(i));
+        }
+        for(int i=0; i<result.length(); i++)
+        {
+            if(result.getJSONObject(i).get("name").equals("wca:renderingenginetemplates")) 
+                validateAssociation(result.getJSONObject(i));
+        }
+        assertEquals(200,response.getStatus());
+        
+        //validate with associationfilter=>child and classname=>wca_form
+        arguments.clear();
+        arguments.put("af", "child");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if(result.getJSONObject(i).get("name").equals("wca:formworkflowdefaults")) 
+                validateChildAssociation(result.getJSONObject(i));
+        }
+        assertEquals(200,response.getStatus());
+        
+        //validate with associationfilter=>general(that means an association and not child) and classname=>wca_form
+        arguments.clear();
+        arguments.put("af", "general");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if(result.getJSONObject(i).get("name").equals("wca:renderingenginetemplates")) 
+                validateAssociation(result.getJSONObject(i));
+        }
+        assertEquals(200,response.getStatus());
+        
+        //look for association wca_renderingenginetemplates in the class wca_form => returns a single valid class
+        arguments.clear();
+        arguments.put("af", "general");
+        arguments.put("nsp", "wca");
+        arguments.put("n", "renderingenginetemplates");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if(result.getJSONObject(i).get("name").equals("wca:renderingenginetemplates")) 
+                validateAssociation(result.getJSONObject(i));
+        }
+        assertEquals(200,response.getStatus());
+        
+        //look for childassociation wca_formworkflowdefaults in the class wca_form =>returns a single valid class
+        arguments.clear();
+        arguments.put("af", "child");
+        arguments.put("nsp", "wca");
+        arguments.put("n", "formworkflowdefaults");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if(result.getJSONObject(i).get("name").equals("wca:formworkflowdefaults")) 
+                validateChildAssociation(result.getJSONObject(i));
+        }
+        assertEquals(200,response.getStatus());
+        
+        //look for details on wca_formworkflowdefaults in the class wca_form , with no classfilter
+        arguments.clear();
+        arguments.put("nsp", "wca");
+        arguments.put("n", "formworkflowdefaults");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(result.length()>0, true);
+        for(int i=0; i<result.length(); i++)
+        {
+            if(result.getJSONObject(i).get("name").equals("wca:formworkflowdefaults")) 
+                validateChildAssociation(result.getJSONObject(i));
+        }
+        assertEquals(200,response.getStatus());
+        
+        // wca_formworkflowdefaults has a child_assoc relation with wca_form , but ask for general association, this then returns a null array 
+        arguments.clear();
+        arguments.put("af", "general");
+        arguments.put("nsp", "wca");
+        arguments.put("n", "formworkflowdefaults");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(0,result.length());
+        assertEquals(200,response.getStatus());
+        
+        // wca_renderingenginetemplates has a general association relation with wca_form , but ask for child association, this then returns a null array 
+        arguments.clear();
+        arguments.put("af", "child");
+        arguments.put("nsp", "wca");
+        arguments.put("n", "renderingenginetemplates");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        result = new JSONArray(response.getContentAsString());
+        assertEquals(0,result.length());
+        assertEquals(200,response.getStatus());
+        
+        //look for childassociation  in the class wca_form , with no name parameter =>both name and namespaceprefix are needed
+        arguments.clear();
+        arguments.put("af", "child");
+        arguments.put("nsp", "wca");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        arguments.clear();
+        arguments.put("af", "child");
+        arguments.put("n", "renderingenginetemplates");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        arguments.clear();
+        arguments.put("af", "general");
+        arguments.put("n", "formworkflowdefaults");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        //look for associations (excluding child assocs)  in the class wca_form , with no name parameter 
+        arguments.clear();
+        arguments.put("af", "general");
+        arguments.put("nsp", "wca");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        //wrong data
+        response = sendRequest(new GetRequest(URL_SITES +"/cmsa/personalbe/associations"), 404);
+        assertEquals(404,response.getStatus());
+        
+        //ask for a child-association which is actually not a valid child of classname - wca_form 
+        arguments.clear();
+        arguments.put("af", "child");
+        arguments.put("nsp", "wca");
+        arguments.put("n", "renderingenginetemplates");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        assertEquals(200,response.getStatus());
+        
+        arguments.clear();
+        arguments.put("af", "general");
+        arguments.put("nsp", "wca"); // invalid namespaceprefix => should be of class-type wca
+        arguments.put("n", "renderingenginetemplates");
+        req.setArgs(arguments);
+        response = sendRequest(req, 200);
+        assertEquals(200,response.getStatus());
+        
+        //data without name parameter
+        arguments.clear();
+        arguments.put("nsp", "cm");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        //data with invalid association in wca_form
+        arguments.clear();
+        arguments.put("nsp", "wca");
+        arguments.put("n", "dublincore");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        //data with invalid association in wca_form
+        arguments.clear();
+        arguments.put("nsp", "cm");
+        arguments.put("n", "hiwelcome");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+        
+        //data with invalid class in wca_form
+        arguments.clear();
+        arguments.put("nsp", "wca");
+        arguments.put("n", "dublincore");
+        req.setArgs(arguments);
+        response = sendRequest(req, 404);
+        assertEquals(404,response.getStatus());
+    }
+    
+    public void testGetClasses() throws Exception
+    {
+        GetRequest req = new GetRequest(URL_SITES);
+        Response response = sendRequest(req, 200);
+        JSONArray result = new JSONArray(response.getContentAsString());
+
+        assertTrue(result.length() > 0);
+        assertEquals(200, response.getStatus());
+        validatePropertiesConformity(result);
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/discussion/DiscussionRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/discussion/DiscussionRestApiTest.java
new file mode 100644
index 00000000000..2a178643fb3
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/discussion/DiscussionRestApiTest.java
@@ -0,0 +1,1306 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.discussion;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.model.ForumModel;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.policy.BehaviourFilter;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.GUID;
+import org.alfresco.util.PropertyMap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Unit Test to test Discussions Web Script API
+ */
+public class DiscussionRestApiTest extends BaseWebScriptTest
+{
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(DiscussionRestApiTest.class);
+    
+    private static final String DELETED_REPLY_POST_MARKER = "[[deleted]]";
+
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private TransactionService transactionService;
+    private BehaviourFilter policyBehaviourFilter;
+    private PermissionService permissionService;
+    private PersonService personService;
+    private SiteService siteService;
+    private NodeService nodeService;
+    private NodeService internalNodeService;
+    private NodeArchiveService nodeArchiveService;
+    
+    private static final String USER_ONE = "UserOneThird";
+    private static final String USER_TWO = "UserTwoThird";
+    private static final String SITE_SHORT_NAME_DISCUSSION = "DiscussionSiteShortNameThree";
+    private static final String COMPONENT_DISCUSSION = "discussions";
+
+    private static final String URL_FORUM_SITE_POST = "/api/forum/post/site/" + SITE_SHORT_NAME_DISCUSSION + "/" + COMPONENT_DISCUSSION + "/";
+    private static final String URL_FORUM_SITE_POSTS = "/api/forum/site/" + SITE_SHORT_NAME_DISCUSSION + "/" + COMPONENT_DISCUSSION + "/posts";
+    private static final String URL_FORUM_NODE_POST_BASE = "/api/forum/post/node/"; // Plus node id
+    private static final String URL_FORUM_NODE_POSTS_BASE = "/api/forum/node/"; // Plus node id + /posts 
+    
+    private List<String> posts = new ArrayList<String>(5);
+    private NodeRef FORUM_NODE;
+
+    
+    // General methods
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
+        this.policyBehaviourFilter = (BehaviourFilter)getServer().getApplicationContext().getBean("policyBehaviourFilter");
+        this.transactionService = (TransactionService)getServer().getApplicationContext().getBean("transactionService");
+        this.permissionService = (PermissionService)getServer().getApplicationContext().getBean("PermissionService");
+        this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+        this.siteService = (SiteService)getServer().getApplicationContext().getBean("SiteService");
+        this.nodeService = (NodeService)getServer().getApplicationContext().getBean("NodeService");
+        this.internalNodeService = (NodeService)getServer().getApplicationContext().getBean("nodeService");
+        this.nodeArchiveService = (NodeArchiveService)getServer().getApplicationContext().getBean("nodeArchiveService");
+        
+        // Authenticate as user
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        // Create test site
+        // - only create the site if it doesn't already exist
+        SiteInfo siteInfo = this.siteService.getSite(SITE_SHORT_NAME_DISCUSSION);
+        if (siteInfo == null)
+        {
+            siteInfo = this.siteService.createSite("DiscussionSitePreset", SITE_SHORT_NAME_DISCUSSION, 
+                  "DiscussionSiteTitle", "DiscussionSiteDescription", SiteVisibility.PUBLIC);
+        }
+        final NodeRef siteNodeRef = siteInfo.getNodeRef();
+        
+        // Create the forum
+        final String forumNodeName = "TestForum";
+        FORUM_NODE = nodeService.getChildByName(siteInfo.getNodeRef(), ContentModel.ASSOC_CONTAINS, forumNodeName);
+        if (FORUM_NODE == null)
+        {
+           FORUM_NODE = transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<NodeRef>() {
+              @Override
+              public NodeRef execute() throws Throwable {
+                 Map<QName, Serializable> props = new HashMap<QName, Serializable>(5);
+                 props.put(ContentModel.PROP_NAME, forumNodeName);
+                 props.put(ContentModel.PROP_TITLE, forumNodeName);
+
+                 return nodeService.createNode(
+                       siteNodeRef, ContentModel.ASSOC_CONTAINS,
+                       QName.createQName(forumNodeName), ForumModel.TYPE_FORUM, props 
+                 ).getChildRef();
+              }
+           });
+        }
+        
+        // Create users
+        createUser(USER_ONE, SiteModel.SITE_COLLABORATOR, SITE_SHORT_NAME_DISCUSSION);
+        createUser(USER_TWO, SiteModel.SITE_CONTRIBUTOR, SITE_SHORT_NAME_DISCUSSION);
+        
+        // Do tests as inviter user
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        
+        // admin user required to delete user
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        // delete the discussions users
+        if(personService.personExists(USER_ONE))
+        {
+           personService.deletePerson(USER_ONE);
+        }
+        if (this.authenticationService.authenticationExists(USER_ONE))
+        {
+           this.authenticationService.deleteAuthentication(USER_ONE);
+        }
+        
+        if(personService.personExists(USER_TWO))
+        {
+           personService.deletePerson(USER_TWO);
+        }
+        if (this.authenticationService.authenticationExists(USER_TWO))
+        {
+           this.authenticationService.deleteAuthentication(USER_TWO);
+        }
+        
+        SiteInfo siteInfo = this.siteService.getSite(SITE_SHORT_NAME_DISCUSSION);
+        if (siteInfo != null)
+        {
+           // delete discussions test site
+           RetryingTransactionCallback<Void> deleteCallback = new RetryingTransactionCallback<Void>()
+           {
+               @Override
+               public Void execute() throws Throwable
+               {
+                   siteService.deleteSite(SITE_SHORT_NAME_DISCUSSION);
+                   return null;
+               }
+            };
+            transactionService.getRetryingTransactionHelper().doInTransaction(deleteCallback);
+            nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
+        }
+    }
+    
+    private void createUser(String userName, String role, String siteName)
+    {
+        // if user with given user name doesn't already exist then create user
+        if (!this.authenticationService.authenticationExists(userName))
+        {
+            // create user
+            this.authenticationService.createAuthentication(userName, "password".toCharArray());
+        }
+         
+        if (!this.personService.personExists(userName))
+        {
+            // create person properties
+            PropertyMap personProps = new PropertyMap();
+            personProps.put(ContentModel.PROP_USERNAME, userName);
+            personProps.put(ContentModel.PROP_FIRSTNAME, "FirstName123");
+            personProps.put(ContentModel.PROP_LASTNAME, "LastName123");
+            personProps.put(ContentModel.PROP_EMAIL, "FirstName123.LastName123@email.com");
+            personProps.put(ContentModel.PROP_JOBTITLE, "JobTitle123");
+            personProps.put(ContentModel.PROP_JOBTITLE, "Organisation123");
+            
+            // create person node for user
+            this.personService.createPerson(personProps);
+        }
+        
+        // add the user as a member with the given role
+        this.siteService.setMembership(siteName, userName, role);
+        
+        // Give the test user access to the test node
+        // They need to be able to read it, and create children of it
+        permissionService.setPermission(FORUM_NODE, userName, PermissionService.READ, true);
+        permissionService.setPermission(FORUM_NODE, userName, PermissionService.CREATE_CHILDREN, true);
+    }
+    
+    
+    // -----------------------------------------------------
+    //     Test helper methods
+    // -----------------------------------------------------
+    
+    /**
+     * Creates a new topic+post in the test site
+     */
+    private JSONObject createSitePost(String title, String content, int expectedStatus)
+    throws Exception
+    {
+       return doCreatePost(URL_FORUM_SITE_POSTS, title, content, expectedStatus);
+    }
+    
+    /**
+     * Creates a new topic+post under the given node
+     */
+    private JSONObject createNodePost(NodeRef nodeRef, String title, String content, 
+          int expectedStatus) throws Exception
+    {
+       return doCreatePost(getPostsUrl(nodeRef), title, content, expectedStatus);
+    }
+    
+    private JSONObject doCreatePost(String url, String title, String content, 
+          int expectedStatus) throws Exception
+    {
+       JSONObject post = new JSONObject();
+       post.put("title", title);
+       post.put("content", content);
+       Response response = sendRequest(new PostRequest(url, post.toString(), "application/json"), expectedStatus);
+
+       if (expectedStatus != Status.STATUS_OK)
+       {
+          return null;
+       }
+
+       JSONObject result = new JSONObject(response.getContentAsString());
+       JSONObject item = result.getJSONObject("item");
+       posts.add(item.getString("name"));
+       return item;
+    }
+
+    private JSONObject updatePost(NodeRef nodeRef, String title, String content, 
+          int expectedStatus) throws Exception
+    {
+       return doUpdatePost(getPostUrl(nodeRef), title, content, expectedStatus);
+    }
+    
+    private JSONObject updatePost(String name, String title, String content, 
+          int expectedStatus) throws Exception
+    {
+       return doUpdatePost(URL_FORUM_SITE_POST + name, title, content, expectedStatus);
+    }
+    
+    private JSONObject doUpdatePost(String url, String title, String content, 
+          int expectedStatus) throws Exception
+    {
+       JSONObject post = new JSONObject();
+       post.put("title", title);
+       post.put("content", content);
+       Response response = sendRequest(new PutRequest(url, post.toString(), "application/json"), expectedStatus);
+
+       if (expectedStatus != Status.STATUS_OK)
+       {
+          return null;
+       }
+
+       JSONObject result = new JSONObject(response.getContentAsString());
+       return result.getJSONObject("item");
+    }
+    
+    private JSONObject getPost(String name, int expectedStatus) throws Exception
+    {
+       return doGetPost(URL_FORUM_SITE_POST + name, expectedStatus);
+    }
+    
+    private JSONObject getPost(NodeRef nodeRef, int expectedStatus) throws Exception
+    {
+       return doGetPost(getPostUrl(nodeRef), expectedStatus);
+    }
+    
+    private JSONObject doGetPost(String url, int expectedStatus) throws Exception
+    {
+       Response response = sendRequest(new GetRequest(url), expectedStatus);
+       if (expectedStatus == Status.STATUS_OK)
+       {
+          JSONObject result = new JSONObject(response.getContentAsString());
+          return result.getJSONObject("item");
+       }
+       else
+       {
+          return null;
+       }
+    }
+    
+    private JSONObject getReplies(String name, int expectedStatus) throws Exception
+    {
+       return doGetReplies(getRepliesUrl(name), expectedStatus);
+    }
+    
+    private JSONObject getReplies(NodeRef nodeRef, int expectedStatus) throws Exception
+    {
+       return doGetReplies(getRepliesUrl(nodeRef), expectedStatus);
+    }
+    
+    private JSONObject doGetReplies(String url, int expectedStatus) throws Exception
+    {
+       Response response = sendRequest(new GetRequest(url), expectedStatus);
+       if (expectedStatus == Status.STATUS_OK)
+       {
+          JSONObject result = new JSONObject(response.getContentAsString());
+          return result;
+       }
+       else
+       {
+          return null;
+       }
+    }
+    
+    private JSONObject getPosts(String type, int expectedStatus) throws Exception
+    {
+       return doGetPosts(URL_FORUM_SITE_POSTS, type, expectedStatus);
+    }
+    
+    private JSONObject getPosts(NodeRef nodeRef, String type, int expectedStatus) throws Exception
+    {
+       return doGetPosts(getPostsUrl(nodeRef), type, expectedStatus);
+    }
+    
+    private JSONObject doGetPosts(String baseUrl, String type, int expectedStatus) throws Exception
+    {
+       String url = null;
+       if (type == null)
+       {
+          url = baseUrl;
+       }
+       else if (type == "limit")
+       {
+          url = baseUrl + "?pageSize=1";
+       }
+       else if (type == "hot")
+       {
+          url = baseUrl + "/hot";
+       }
+       else if (type == "mine")
+       {
+          url = baseUrl + "/myposts";
+       }
+       else if (type.startsWith("new"))
+       {
+          url = baseUrl + "/" + type;
+       }
+       else
+       {
+          throw new IllegalArgumentException("Invalid search type " + type);
+       }
+       
+       Response response = sendRequest(new GetRequest(url), expectedStatus);
+       if (expectedStatus == Status.STATUS_OK)
+       {
+          JSONObject result = new JSONObject(response.getContentAsString());
+          return result;
+       }
+       else
+       {
+          return null;
+       }
+    }
+    
+    private JSONObject deletePost(String name, int expectedStatus) throws Exception
+    {
+       return doDeletePost(URL_FORUM_SITE_POST + name, expectedStatus);
+    }
+    
+    private JSONObject deletePost(NodeRef nodeRef, int expectedStatus) throws Exception
+    {
+       return doDeletePost(getPostUrl(nodeRef), expectedStatus);
+    }
+    
+    private JSONObject doDeletePost(String url, int expectedStatus) throws Exception
+    {
+       Response response = sendRequest(new DeleteRequest(url), Status.STATUS_OK);
+       if (expectedStatus == Status.STATUS_OK)
+       {
+          return new JSONObject(response.getContentAsString());
+       }
+       else
+       {
+          return null;
+       }
+    }
+
+    private String getRepliesUrl(NodeRef nodeRef)
+    {
+       return getPostUrl(nodeRef) + "/replies";
+    }
+    
+    private String getRepliesUrl(String postName)
+    {
+       return URL_FORUM_SITE_POST + postName + "/replies";
+    }
+    
+    private String getPostUrl(NodeRef nodeRef)
+    {
+       return URL_FORUM_NODE_POST_BASE + nodeRef.toString().replace("://", "/");
+    }
+    
+    private String getPostsUrl(NodeRef nodeRef)
+    {
+       return URL_FORUM_NODE_POSTS_BASE + nodeRef.toString().replace("://", "/") + "/posts";
+    }
+    
+    private JSONObject createReply(NodeRef nodeRef, String title, String content, int expectedStatus)
+    throws Exception
+    {
+       JSONObject reply = new JSONObject();
+       reply.put("title", title);
+       reply.put("content", content);
+       Response response = sendRequest(new PostRequest(getRepliesUrl(nodeRef), reply.toString(), "application/json"), expectedStatus);
+
+       if (expectedStatus != 200)
+       {
+          return null;
+       }
+
+       JSONObject result = new JSONObject(response.getContentAsString());
+       return result.getJSONObject("item");
+    }
+    
+    private JSONObject updateComment(NodeRef nodeRef, String title, String content, 
+          int expectedStatus) throws Exception
+    {
+       JSONObject comment = new JSONObject();
+       comment.put("title", title);
+       comment.put("content", content);
+       Response response = sendRequest(new PutRequest(getPostUrl(nodeRef), comment.toString(), "application/json"), expectedStatus);
+
+       if (expectedStatus != Status.STATUS_OK)
+       {
+          return null;
+       }
+
+       //logger.debug("Comment updated: " + response.getContentAsString());
+       JSONObject result = new JSONObject(response.getContentAsString());
+       return result.getJSONObject("item");
+    }
+
+    /**
+     * Monkeys with the created and published dates on a topic+posts
+     */
+    private void pushCreatedDateBack(NodeRef node, int daysAgo) throws Exception
+    {
+       Date created = (Date)nodeService.getProperty(node, ContentModel.PROP_CREATED);
+       Date newCreated = new Date(created.getTime() - daysAgo*24*60*60*1000);
+       Date published = (Date)nodeService.getProperty(node, ContentModel.PROP_PUBLISHED);
+       if(published == null) published = created;
+       Date newPublished = new Date(published.getTime() - daysAgo*24*60*60*1000);
+       
+       UserTransaction txn = transactionService.getUserTransaction();
+       txn.begin();
+
+       this.policyBehaviourFilter.disableBehaviour(ContentModel.ASPECT_AUDITABLE);
+       internalNodeService.setProperty(node, ContentModel.PROP_CREATED, newCreated);
+       internalNodeService.setProperty(node, ContentModel.PROP_MODIFIED, newCreated);
+       internalNodeService.setProperty(node, ContentModel.PROP_PUBLISHED, newPublished);
+       this.policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_AUDITABLE);
+       
+       txn.commit();
+       
+       // Now chance something else on the node to have it re-indexed
+       nodeService.setProperty(node, ContentModel.PROP_CREATED, newCreated);
+       nodeService.setProperty(node, ContentModel.PROP_MODIFIED, newCreated);
+       nodeService.setProperty(node, ContentModel.PROP_PUBLISHED, newPublished);
+       nodeService.setProperty(node, ContentModel.PROP_DESCRIPTION, "Forced change");
+       
+       // Finally change any children (eg if updating a topic, do the posts)
+       for(ChildAssociationRef ref : nodeService.getChildAssocs(node))
+       {
+          pushCreatedDateBack(ref.getChildRef(), daysAgo);
+       }
+    }
+    
+    // -----------------------------------------------------
+    //     Tests
+    // -----------------------------------------------------
+    
+    public void testCreateForumPost() throws Exception
+    {
+        String title = "test";
+        String content = "test";
+        JSONObject item = createSitePost(title, content, Status.STATUS_OK);
+        
+        // Check that the values in the response are correct
+        assertEquals(title, item.get("title"));
+        assertEquals(content, item.get("content"));
+        assertEquals(0, item.get("replyCount"));
+        assertEquals("Invalid JSON " + item, true, item.has("createdOn"));
+        assertEquals("Invalid JSON " + item, true, item.has("modifiedOn"));
+        assertEquals("Invalid JSON " + item, true, item.has("author"));
+        assertEquals("Invalid JSON " + item, true, item.has("permissions"));
+        assertEquals("Invalid JSON " + item, true, item.has("url"));
+        assertEquals("Invalid JSON " + item, true, item.has("repliesUrl"));
+        assertEquals("Invalid JSON " + item, true, item.has("nodeRef"));
+          
+        // Save some details
+        String name = item.getString("name");
+        NodeRef nodeRef = new NodeRef(item.getString("nodeRef"));
+
+      
+      // Fetch the post by name and check
+      item = getPost(name, Status.STATUS_OK);
+
+      assertEquals(title, item.get("title"));
+      assertEquals(content, item.get("content"));
+      assertEquals(0, item.get("replyCount"));
+      assertEquals("Invalid JSON " + item, true, item.has("createdOn"));
+      assertEquals("Invalid JSON " + item, true, item.has("modifiedOn"));
+      assertEquals("Invalid JSON " + item, true, item.has("author"));
+      assertEquals("Invalid JSON " + item, true, item.has("permissions"));
+      assertEquals("Invalid JSON " + item, true, item.has("url"));
+      assertEquals("Invalid JSON " + item, true, item.has("repliesUrl"));
+      assertEquals("Invalid JSON " + item, true, item.has("nodeRef"));
+
+
+      // Fetch the post by noderef and check
+      item = getPost(nodeRef, Status.STATUS_OK);
+      
+      assertEquals(title, item.get("title"));
+      assertEquals(content, item.get("content"));
+      assertEquals(0, item.get("replyCount"));
+      assertEquals("Invalid JSON " + item, true, item.has("createdOn"));
+      assertEquals("Invalid JSON " + item, true, item.has("modifiedOn"));
+      assertEquals("Invalid JSON " + item, true, item.has("author"));
+      assertEquals("Invalid JSON " + item, true, item.has("permissions"));
+      assertEquals("Invalid JSON " + item, true, item.has("url"));
+      assertEquals("Invalid JSON " + item, true, item.has("repliesUrl"));
+      assertEquals("Invalid JSON " + item, true, item.has("nodeRef"));
+
+      
+      // Create another post, this time by noderef
+      title = "By Node Title";
+      content = "By Node Content";
+      item = createNodePost(FORUM_NODE, title, content, Status.STATUS_OK);
+      
+      assertEquals(title, item.get("title"));
+      assertEquals(content, item.get("content"));
+      assertEquals(0, item.get("replyCount"));
+      
+      // Check it by noderef
+      nodeRef = new NodeRef(item.getString("nodeRef"));
+      item = getPost(nodeRef, Status.STATUS_OK);
+      
+      assertEquals(title, item.get("title"));
+      assertEquals(content, item.get("content"));
+      assertEquals(0, item.get("replyCount"));
+    }
+    
+    public void testUpdateForumPost() throws Exception
+    {
+        String title = "test";
+        String content = "test";
+        JSONObject item = createSitePost(title, content, 200);
+
+        // check that the values
+        assertEquals(title, item.get("title"));
+        assertEquals(content, item.get("content"));
+        assertEquals(false, item.getBoolean("isUpdated"));
+        
+        assertEquals(true, item.has("name"));
+        String name = item.getString("name");
+        assertEquals(true, item.has("nodeRef"));
+        NodeRef nodeRef = new NodeRef(item.getString("nodeRef"));
+
+        // fetch the post by name
+        item = getPost(item.getString("name"), 200);
+        assertEquals(title, item.get("title"));
+        assertEquals(content, item.get("content"));
+        assertEquals(false, item.getBoolean("isUpdated"));
+
+        // Fetch the post by noderef
+        item = getPost(nodeRef, 200);
+        assertEquals(title, item.get("title"));
+        assertEquals(content, item.get("content"));
+        assertEquals(false, item.getBoolean("isUpdated"));
+
+      
+        // Update it by name
+        String title2 = "updated test";
+        String content2 = "test updated";
+        item = updatePost(name, title2, content2, 200);
+      
+        // Check the response
+        assertEquals(title2, item.get("title"));
+        assertEquals(content2, item.get("content"));
+        assertEquals(name, item.get("name"));
+        assertEquals(nodeRef.toString(), item.get("nodeRef"));
+        assertEquals(true, item.getBoolean("isUpdated"));
+      
+        // Fetch and check
+        item = getPost(nodeRef, 200);
+        assertEquals(title2, item.get("title"));
+        assertEquals(content2, item.get("content"));
+        assertEquals(name, item.get("name"));
+        assertEquals(nodeRef.toString(), item.get("nodeRef"));
+        assertEquals(true, item.getBoolean("isUpdated"));
+
+      
+        // Update it again, this time by noderef
+        String title3 = "updated 3 test";
+        String content3 = "test 3 updated";
+        item = updatePost(nodeRef, title3, content3, 200);
+    
+        // Check that the values returned are correct
+        assertEquals(title3, item.get("title"));
+        assertEquals(content3, item.get("content"));
+        assertEquals(name, item.get("name"));
+        assertEquals(nodeRef.toString(), item.get("nodeRef"));
+        assertEquals(true, item.getBoolean("isUpdated"));
+        
+        // Fetch and re-check
+        item = getPost(nodeRef, 200);
+        assertEquals(title3, item.get("title"));
+        assertEquals(content3, item.get("content"));
+        assertEquals(name, item.get("name"));
+        assertEquals(nodeRef.toString(), item.get("nodeRef"));
+        assertEquals(true, item.getBoolean("isUpdated"));
+    }
+    
+    /**
+     * Tests that the permissions details included with topics and
+     *  posts are correct
+     */
+    public void testPermissions() throws Exception
+    {
+       // Create a post, and check the details on it
+       JSONObject item = createSitePost("test", "test", Status.STATUS_OK);
+       String name = item.getString("name");
+       
+       JSONObject perms = item.getJSONObject("permissions");
+       assertEquals(true, perms.getBoolean("edit"));
+       assertEquals(true, perms.getBoolean("reply"));
+       assertEquals(true, perms.getBoolean("delete"));
+       
+       // Check on a fetch too
+       item = getPost(name, Status.STATUS_OK);
+       perms = item.getJSONObject("permissions");
+       assertEquals(true, perms.getBoolean("edit"));
+       assertEquals(true, perms.getBoolean("reply"));
+       assertEquals(true, perms.getBoolean("delete"));
+       
+       
+       // Switch to another user, see what they see
+       this.authenticationComponent.setCurrentUser(USER_TWO);
+       
+       item = getPost(name, Status.STATUS_OK);
+       perms = item.getJSONObject("permissions");
+       assertEquals(false, perms.getBoolean("edit"));
+       assertEquals(true, perms.getBoolean("reply"));
+       assertEquals(false, perms.getBoolean("delete"));
+       
+       
+       // Remove the user from the site, see the change
+       this.siteService.removeMembership(SITE_SHORT_NAME_DISCUSSION, USER_TWO);
+       
+       item = getPost(name, Status.STATUS_OK);
+       perms = item.getJSONObject("permissions");
+       assertEquals(false, perms.getBoolean("edit"));
+       assertEquals(false, perms.getBoolean("reply"));
+       assertEquals(false, perms.getBoolean("delete"));
+       
+       
+       // Make the site private, will vanish
+       SiteInfo siteInfo = siteService.getSite(SITE_SHORT_NAME_DISCUSSION);
+       siteInfo.setVisibility(SiteVisibility.PRIVATE);
+       this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+       this.siteService.updateSite(siteInfo);
+       this.authenticationComponent.setCurrentUser(USER_TWO);
+       
+       // On a private site we're not a member of, shouldn't be visable at all
+       getPost(name, Status.STATUS_NOT_FOUND);
+    }
+       
+    /**
+     * ALF-1973 - If the user who added a reply has been deleted, don't break
+     */
+    public void testViewReplyByDeletedUser() throws Exception
+    {
+       // Create a post
+       JSONObject item = createSitePost("test", "test", Status.STATUS_OK);
+       String name = item.getString("name");
+       NodeRef topicNodeRef = new NodeRef(item.getString("nodeRef"));
+       
+       // Now create a reply as a different user
+       this.authenticationComponent.setCurrentUser(USER_TWO);
+       createReply(topicNodeRef, "Reply", "By the other user", Status.STATUS_OK);
+       
+       // Should see the reply
+       item = getReplies(name, Status.STATUS_OK);
+       assertEquals(1, item.getJSONArray("items").length());
+       
+       // Delete the user, check that the reply still shows
+       this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+       personService.deletePerson(USER_TWO);
+       this.authenticationComponent.setCurrentUser(USER_ONE);
+       
+       item = getReplies(name, Status.STATUS_OK);
+       assertEquals(1, item.getJSONArray("items").length());
+    }
+    
+    public void testAddReply() throws Exception
+    {
+        // Create a root post
+        JSONObject item = createSitePost("test", "test", Status.STATUS_OK);
+        String topicName = item.getString("name");
+        NodeRef topicNodeRef = new NodeRef(item.getString("nodeRef"));
+
+        // Add a reply
+        JSONObject reply = createReply(topicNodeRef, "test", "test", Status.STATUS_OK);
+        NodeRef replyNodeRef = new NodeRef(reply.getString("nodeRef"));
+        assertEquals("test", reply.getString("title"));
+        assertEquals("test", reply.getString("content"));
+        
+        // Add a reply to the reply
+        JSONObject reply2 = createReply(replyNodeRef, "test2", "test2", 200);
+          NodeRef reply2NodeRef = new NodeRef(reply2.getString("nodeRef"));
+        assertEquals("test2", reply2.getString("title"));
+        assertEquals("test2", reply2.getString("content"));
+        
+        
+        // Check things were correctly setup. These should all be siblings
+        //  of each other, with relations between the replies
+        assertEquals(ForumModel.TYPE_TOPIC, nodeService.getType(topicNodeRef));
+        assertEquals(ForumModel.TYPE_POST, nodeService.getType(replyNodeRef));
+        assertEquals(ForumModel.TYPE_POST, nodeService.getType(reply2NodeRef));
+        assertEquals(topicNodeRef, nodeService.getPrimaryParent(replyNodeRef).getParentRef());
+        assertEquals(topicNodeRef, nodeService.getPrimaryParent(reply2NodeRef).getParentRef());
+
+        // Reply 2 should have an assoc to Reply 1
+        assertEquals(0, nodeService.getSourceAssocs(reply2NodeRef, RegexQNamePattern.MATCH_ALL).size());
+        assertEquals(1, nodeService.getTargetAssocs(reply2NodeRef, RegexQNamePattern.MATCH_ALL).size());
+        assertEquals(replyNodeRef, nodeService.getTargetAssocs(reply2NodeRef, RegexQNamePattern.MATCH_ALL).get(0).getTargetRef());
+      
+        assertEquals(1, nodeService.getSourceAssocs(replyNodeRef, RegexQNamePattern.MATCH_ALL).size());
+        assertEquals(1, nodeService.getTargetAssocs(replyNodeRef, RegexQNamePattern.MATCH_ALL).size());
+        assertEquals(reply2NodeRef, nodeService.getSourceAssocs(replyNodeRef, RegexQNamePattern.MATCH_ALL).get(0).getSourceRef());
+
+        
+        // Fetch all replies for the post
+        JSONObject result = getReplies(topicNodeRef, Status.STATUS_OK);
+        // check the number of replies
+        assertEquals(1, result.getJSONArray("items").length());
+        
+        // Check the replies by name too
+        result = getReplies(topicName, Status.STATUS_OK);
+        assertEquals(1, result.getJSONArray("items").length());
+
+        
+        // Fetch the top level post again, and check the counts there
+        // That post should have one direct reply, and one reply to it's reply
+        item = getPost(topicName, Status.STATUS_OK);
+        assertEquals(2, item.getInt("totalReplyCount"));
+        assertEquals(1, item.getInt("replyCount"));
+    }
+
+    public void testUpdateReply() throws Exception
+    {
+       // Create a root post
+       JSONObject item = createSitePost("test", "test", Status.STATUS_OK);
+       String postName = item.getString("name");
+       NodeRef postNodeRef = new NodeRef(item.getString("nodeRef"));
+       assertEquals("test", item.getString("title"));
+       assertEquals("test", item.getString("content"));
+       assertEquals(false, item.getBoolean("isUpdated"));
+
+
+       // Add a reply to it
+       JSONObject reply = createReply(postNodeRef, "rtest", "rtest", Status.STATUS_OK);
+       NodeRef replyNodeRef = new NodeRef(reply.getString("nodeRef"));
+       assertEquals("rtest", reply.getString("title"));
+       assertEquals("rtest", reply.getString("content"));
+       assertEquals(false, reply.getBoolean("isUpdated"));
+
+
+       // Now update the reply
+       JSONObject reply2 = updatePost(replyNodeRef, "test2", "test2", Status.STATUS_OK);
+       assertEquals("test2", reply2.getString("title"));
+       assertEquals("test2", reply2.getString("content"));
+       assertEquals(true, reply2.getBoolean("isUpdated"));
+
+       // Fetch it to check
+       reply2 = getPost(replyNodeRef, Status.STATUS_OK);
+       assertEquals("test2", reply2.getString("title"));
+       assertEquals("test2", reply2.getString("content"));
+       assertEquals(true, reply2.getBoolean("isUpdated"));
+
+
+       // Ensure the original post wasn't changed
+       item = getPost(postName, Status.STATUS_OK);
+       assertEquals("test", item.getString("title"));
+       assertEquals("test", item.getString("content"));
+       assertEquals(false, item.getBoolean("isUpdated"));
+    }
+    
+    public void testDeleteToplevelPost() throws Exception
+    {
+       // Create two posts
+       JSONObject item1 = createSitePost("test1", "test1", Status.STATUS_OK);
+       JSONObject item2 = createSitePost("test2", "test2", Status.STATUS_OK);
+       String name1 = item1.getString("name");
+       NodeRef nodeRef1 = new NodeRef(item1.getString("nodeRef"));
+       NodeRef nodeRef2 = new NodeRef(item2.getString("nodeRef"));
+
+       // The node references returned correspond to the topics
+       assertEquals(ForumModel.TYPE_TOPIC, nodeService.getType(nodeRef1));
+       assertEquals(ForumModel.TYPE_TOPIC, nodeService.getType(nodeRef2));
+
+
+       // Delete one post by name
+       deletePost(name1, Status.STATUS_OK);
+
+       // Check it went
+       getPost(name1, Status.STATUS_NOT_FOUND);
+
+
+       // Delete the other post by noderef
+       deletePost(nodeRef2, Status.STATUS_OK);
+
+       // Check it went
+       getPost(nodeRef2, Status.STATUS_NOT_FOUND);
+
+
+       // Check all the nodes have gone
+       assertEquals(false, nodeService.exists(nodeRef1));
+       assertEquals(false, nodeService.exists(nodeRef2));
+    }
+    
+    public void testDeleteReplyPost() throws Exception
+    {
+      // Create a root post
+      JSONObject item = createSitePost("test", "test", Status.STATUS_OK);
+      String postName = item.getString("name");
+      NodeRef postNodeRef = new NodeRef(item.getString("nodeRef"));
+      
+      // It doesn't have any replies yet
+      assertEquals(0, item.getInt("totalReplyCount"));
+      assertEquals(0, item.getInt("replyCount"));
+      
+      
+      // Add a reply
+      JSONObject reply = createReply(postNodeRef, "testR", "testR", Status.STATUS_OK);
+      NodeRef replyNodeRef = new NodeRef(reply.getString("nodeRef"));
+      String replyName = reply.getString("name");
+      assertEquals("testR", reply.getString("title"));
+      assertEquals("testR", reply.getString("content"));
+      
+      // Fetch the reply and check
+      reply = getPost(replyNodeRef, Status.STATUS_OK);
+      assertEquals("testR", reply.getString("title"));
+      assertEquals("testR", reply.getString("content"));
+      
+      // Note - you can't fetch a reply by name, only by noderef
+      // It only works for primary posts as they share the topic name
+      getPost(replyName, Status.STATUS_NOT_FOUND);
+      
+      
+      // Check the main post, ensure the replies show up
+      item = getPost(postName, Status.STATUS_OK);
+      assertEquals(1, item.getInt("totalReplyCount"));
+      assertEquals(1, item.getInt("replyCount"));
+
+      
+      // Delete the reply
+      deletePost(replyNodeRef, Status.STATUS_OK);
+      
+      // These nodes don't really get deleted at the moment
+      // Due to threading, we just add special marker text
+      // TODO Really we should probably delete posts with no attached replies
+      reply = getPost(replyNodeRef, Status.STATUS_OK);
+      assertEquals(DELETED_REPLY_POST_MARKER, reply.get("title"));
+      assertEquals(DELETED_REPLY_POST_MARKER, reply.get("content"));
+      
+      
+      // Fetch the top level post again, replies stay because they
+      //  haven't really been deleted...
+      // TODO Really we should probably delete posts with no attached replies
+      item = getPost(postName, Status.STATUS_OK);
+      assertEquals(1, item.getInt("totalReplyCount"));
+      assertEquals(1, item.getInt("replyCount"));
+    }
+    
+    /**
+     * Test for the various listings:
+     *  All, New, Hot (Most Active), Mine 
+     */
+    public void testListings() throws Exception
+    {
+      JSONObject result;
+      JSONObject item;
+      
+      
+      // Check all of the listings, none should have anything yet
+      result = getPosts(null, Status.STATUS_OK);
+      assertEquals(0, result.getInt("total"));
+      assertEquals(0, result.getInt("itemCount"));
+      assertEquals(0, result.getJSONArray("items").length());
+      
+      result = getPosts("hot", Status.STATUS_OK);
+      assertEquals(0, result.getInt("total"));
+      assertEquals(0, result.getInt("itemCount"));
+      assertEquals(0, result.getJSONArray("items").length());
+
+      result = getPosts("mine", Status.STATUS_OK);
+      assertEquals(0, result.getInt("total"));
+      assertEquals(0, result.getInt("itemCount"));
+      assertEquals(0, result.getJSONArray("items").length());
+
+      result = getPosts("new?numdays=100", Status.STATUS_OK);
+      assertEquals(0, result.getInt("total"));
+      assertEquals(0, result.getInt("itemCount"));
+      assertEquals(0, result.getJSONArray("items").length());
+
+      
+      // Check with a noderef too
+      result = getPosts(FORUM_NODE, null, Status.STATUS_OK);
+      assertEquals(0, result.getInt("total"));
+      assertEquals(0, result.getInt("itemCount"));
+      assertEquals(0, result.getJSONArray("items").length());
+      
+      result = getPosts(FORUM_NODE, "hot", Status.STATUS_OK);
+      assertEquals(0, result.getInt("total"));
+      assertEquals(0, result.getInt("itemCount"));
+      assertEquals(0, result.getJSONArray("items").length());
+
+      result = getPosts(FORUM_NODE, "mine", Status.STATUS_OK);
+      assertEquals(0, result.getInt("total"));
+      assertEquals(0, result.getInt("itemCount"));
+      assertEquals(0, result.getJSONArray("items").length());
+
+      result = getPosts(FORUM_NODE, "new?numdays=100", Status.STATUS_OK);
+      assertEquals(0, result.getInt("total"));
+      assertEquals(0, result.getInt("itemCount"));
+      assertEquals(0, result.getJSONArray("items").length());
+      
+      
+      // Now add a few topics with replies
+      // Some of these will be created as different users
+      item = createSitePost("SiteTitle1", "Content", Status.STATUS_OK);
+      NodeRef siteTopic1 = new NodeRef(item.getString("nodeRef"));
+      this.authenticationComponent.setCurrentUser(USER_TWO);
+      item = createSitePost("SiteTitle2", "Content", Status.STATUS_OK);
+      NodeRef siteTopic2 = new NodeRef(item.getString("nodeRef"));
+      
+      item = createNodePost(FORUM_NODE, "NodeTitle1", "Content", Status.STATUS_OK);
+      NodeRef nodeTopic1 = new NodeRef(item.getString("nodeRef"));
+      this.authenticationComponent.setCurrentUser(USER_ONE);
+      item = createNodePost(FORUM_NODE, "NodeTitle2", "Content", Status.STATUS_OK);
+      NodeRef nodeTopic2 = new NodeRef(item.getString("nodeRef"));
+      item = createNodePost(FORUM_NODE, "NodeTitle3", "Content", Status.STATUS_OK);
+      NodeRef nodeTopic3 = new NodeRef(item.getString("nodeRef"));
+      
+      item = createReply(siteTopic1, "Reply1a", "Content", Status.STATUS_OK);
+      NodeRef siteReply1A = new NodeRef(item.getString("nodeRef"));
+      item = createReply(siteTopic1, "Reply1b", "Content", Status.STATUS_OK);
+      NodeRef siteReply1B = new NodeRef(item.getString("nodeRef"));
+      
+      this.authenticationComponent.setCurrentUser(USER_TWO);
+      item = createReply(siteTopic2, "Reply2a", "Content", Status.STATUS_OK);
+      NodeRef siteReply2A = new NodeRef(item.getString("nodeRef"));
+      item = createReply(siteTopic2, "Reply2b", "Content", Status.STATUS_OK);
+      NodeRef siteReply2B = new NodeRef(item.getString("nodeRef"));
+      item = createReply(siteTopic2, "Reply2c", "Content", Status.STATUS_OK);
+      NodeRef siteReply2C = new NodeRef(item.getString("nodeRef"));
+
+      item = createReply(siteReply2A, "Reply2aa", "Content", Status.STATUS_OK);
+      NodeRef siteReply2AA = new NodeRef(item.getString("nodeRef"));
+      item = createReply(siteReply2A, "Reply2ab", "Content", Status.STATUS_OK);
+      NodeRef siteReply2AB = new NodeRef(item.getString("nodeRef"));
+      this.authenticationComponent.setCurrentUser(USER_ONE);
+      item = createReply(siteReply2AA, "Reply2aaa", "Content", Status.STATUS_OK);
+      NodeRef siteReply2AAA = new NodeRef(item.getString("nodeRef"));
+      
+      item = createReply(nodeTopic1, "ReplyN1a", "Content", Status.STATUS_OK);
+      NodeRef nodeReply1A = new NodeRef(item.getString("nodeRef"));
+      item = createReply(nodeReply1A, "ReplyN1aa", "Content", Status.STATUS_OK);
+      NodeRef nodeReply1AA = new NodeRef(item.getString("nodeRef"));
+      item = createReply(nodeReply1AA, "ReplyN1aaa", "Content", Status.STATUS_OK);
+      NodeRef nodeReply1AAA = new NodeRef(item.getString("nodeRef"));
+      
+      
+      // Check for totals
+      // We should get all the topics
+      result = getPosts(null, Status.STATUS_OK);
+      assertEquals(2, result.getInt("total"));
+      assertEquals(2, result.getInt("itemCount"));
+      assertEquals(2, result.getJSONArray("items").length());
+      assertEquals("SiteTitle1", result.getJSONArray("items").getJSONObject(1).getString("title"));
+      assertEquals("SiteTitle2", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals(2, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
+      assertEquals(3, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      
+      result = getPosts(FORUM_NODE, null, Status.STATUS_OK);
+      assertEquals(3, result.getInt("total"));
+      assertEquals(3, result.getInt("itemCount"));
+      assertEquals(3, result.getJSONArray("items").length());
+      assertEquals("NodeTitle1", result.getJSONArray("items").getJSONObject(2).getString("title"));
+      assertEquals("NodeTitle2", result.getJSONArray("items").getJSONObject(1).getString("title"));
+      assertEquals("NodeTitle3", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals(1, result.getJSONArray("items").getJSONObject(2).getInt("replyCount"));
+      assertEquals(0, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
+      assertEquals(0, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      
+      
+      // Check for "mine"
+      // User 1 has Site 1, and Nodes 2 + 3
+      result = getPosts("mine", Status.STATUS_OK);
+      assertEquals(1, result.getInt("total"));
+      assertEquals(1, result.getInt("itemCount"));
+      assertEquals(1, result.getJSONArray("items").length());
+      assertEquals("SiteTitle1", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals(2, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      
+      result = getPosts(FORUM_NODE, "mine", Status.STATUS_OK);
+      assertEquals(2, result.getInt("total"));
+      assertEquals(2, result.getInt("itemCount"));
+      assertEquals(2, result.getJSONArray("items").length());
+      assertEquals("NodeTitle2", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals("NodeTitle3", result.getJSONArray("items").getJSONObject(1).getString("title"));
+      assertEquals(0, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      assertEquals(0, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
+      
+      
+      // Check for recent (new)
+      // We should get all the topics, with the newest one first (rather than last as with others)
+      result = getPosts("new?numdays=2", Status.STATUS_OK);
+      assertEquals(2, result.getInt("total"));
+      assertEquals(2, result.getInt("itemCount"));
+      assertEquals(2, result.getJSONArray("items").length());
+      assertEquals("SiteTitle2", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals("SiteTitle1", result.getJSONArray("items").getJSONObject(1).getString("title"));
+      assertEquals(3, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      assertEquals(2, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
+      
+      result = getPosts(FORUM_NODE, "new?numdays=2", Status.STATUS_OK);
+      assertEquals(3, result.getInt("total"));
+      assertEquals(3, result.getInt("itemCount"));
+      assertEquals(3, result.getJSONArray("items").length());
+      assertEquals("NodeTitle3", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals("NodeTitle2", result.getJSONArray("items").getJSONObject(1).getString("title"));
+      assertEquals("NodeTitle1", result.getJSONArray("items").getJSONObject(2).getString("title"));
+      assertEquals(0, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      assertEquals(0, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
+      assertEquals(1, result.getJSONArray("items").getJSONObject(2).getInt("replyCount"));
+      
+      
+      // Check for hot
+      // Will only show topics with replies. Sorting is by replies, not date
+      result = getPosts("hot", Status.STATUS_OK);
+      assertEquals(2, result.getInt("total"));
+      assertEquals(2, result.getInt("itemCount"));
+      assertEquals(2, result.getJSONArray("items").length());
+      assertEquals("SiteTitle2", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals("SiteTitle1", result.getJSONArray("items").getJSONObject(1).getString("title"));
+      assertEquals(3, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      assertEquals(2, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
+      
+      result = getPosts(FORUM_NODE, "hot", Status.STATUS_OK);
+      assertEquals(1, result.getInt("total"));
+      assertEquals(1, result.getInt("itemCount"));
+      assertEquals(1, result.getJSONArray("items").length());
+      assertEquals("NodeTitle1", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals(1, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      
+      
+      // Shift some of the posts into the past
+      // (Update the created and published dates)
+      pushCreatedDateBack(siteTopic1, 10);
+      pushCreatedDateBack(siteReply1B, -2); // Make it newer
+      
+      pushCreatedDateBack(nodeTopic2, 10);
+      pushCreatedDateBack(nodeTopic3, 4);
+      pushCreatedDateBack(nodeReply1AAA, -1); // Make it newer
+      
+      
+      // Re-check totals, only ordering changes
+      result = getPosts(null, Status.STATUS_OK);
+      assertEquals(2, result.getInt("total"));
+      assertEquals(2, result.getInt("itemCount"));
+      assertEquals(2, result.getJSONArray("items").length());
+      assertEquals("SiteTitle1", result.getJSONArray("items").getJSONObject(1).getString("title"));
+      assertEquals("SiteTitle2", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals(2, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
+      assertEquals(3, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      
+      result = getPosts(FORUM_NODE, null, Status.STATUS_OK);
+      assertEquals(3, result.getInt("total"));
+      assertEquals(3, result.getInt("itemCount"));
+      assertEquals(3, result.getJSONArray("items").length());
+      assertEquals("NodeTitle2", result.getJSONArray("items").getJSONObject(2).getString("title"));
+      assertEquals("NodeTitle3", result.getJSONArray("items").getJSONObject(1).getString("title"));
+      assertEquals("NodeTitle1", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals(0, result.getJSONArray("items").getJSONObject(2).getInt("replyCount"));
+      assertEquals(0, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
+      assertEquals(1, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      
+      
+      // Re-check recent, old ones vanish
+      result = getPosts("new?numdays=2", Status.STATUS_OK);
+      assertEquals(1, result.getInt("total"));
+      assertEquals(1, result.getInt("itemCount"));
+      assertEquals(1, result.getJSONArray("items").length());
+      assertEquals("SiteTitle2", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals(3, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      
+      result = getPosts(FORUM_NODE, "new?numdays=6", Status.STATUS_OK);
+      assertEquals(2, result.getInt("total"));
+      assertEquals(2, result.getInt("itemCount"));
+      assertEquals(2, result.getJSONArray("items").length());
+      assertEquals("NodeTitle1", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals("NodeTitle3", result.getJSONArray("items").getJSONObject(1).getString("title"));
+      assertEquals(1, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      assertEquals(0, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
+      
+      result = getPosts(FORUM_NODE, "new?numdays=2", Status.STATUS_OK);
+      assertEquals(1, result.getInt("total"));
+      assertEquals(1, result.getInt("itemCount"));
+      assertEquals(1, result.getJSONArray("items").length());
+      assertEquals("NodeTitle1", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals(1, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      
+      
+      // Re-check "mine", no change except ordering
+      result = getPosts("mine", Status.STATUS_OK);
+      assertEquals(1, result.getInt("total"));
+      assertEquals(1, result.getInt("itemCount"));
+      assertEquals(1, result.getJSONArray("items").length());
+      assertEquals("SiteTitle1", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals(2, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      
+      result = getPosts(FORUM_NODE, "mine", Status.STATUS_OK);
+      assertEquals(2, result.getInt("total"));
+      assertEquals(2, result.getInt("itemCount"));
+      assertEquals(2, result.getJSONArray("items").length());
+      assertEquals("NodeTitle2", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals("NodeTitle3", result.getJSONArray("items").getJSONObject(1).getString("title"));
+      assertEquals(0, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      assertEquals(0, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
+      
+      
+      // Re-check hot, some old ones vanish
+      result = getPosts("hot", Status.STATUS_OK);
+      assertEquals(2, result.getInt("total"));
+      assertEquals(2, result.getInt("itemCount"));
+      assertEquals(2, result.getJSONArray("items").length());
+      assertEquals("SiteTitle2", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals("SiteTitle1", result.getJSONArray("items").getJSONObject(1).getString("title"));
+      assertEquals(3, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      assertEquals(2, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
+      
+      result = getPosts(FORUM_NODE, "hot", Status.STATUS_OK);
+      assertEquals(1, result.getInt("total"));
+      assertEquals(1, result.getInt("itemCount"));
+      assertEquals(1, result.getJSONArray("items").length());
+      assertEquals("NodeTitle1", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals(1, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      
+      
+      // Check paging
+      result = getPosts("limit", Status.STATUS_OK);
+      assertEquals(2, result.getInt("total"));
+      assertEquals(1, result.getInt("itemCount"));
+      assertEquals(1, result.getJSONArray("items").length());
+      assertEquals("SiteTitle2", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals(3, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+      
+      result = getPosts(FORUM_NODE, "limit", Status.STATUS_OK);
+      assertEquals(3, result.getInt("total"));
+      assertEquals(1, result.getInt("itemCount"));
+      assertEquals(1, result.getJSONArray("items").length());
+      assertEquals("NodeTitle1", result.getJSONArray("items").getJSONObject(0).getString("title"));
+      assertEquals(1, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
+    }
+    
+    /**
+     * https://issues.alfresco.com/jira/browse/ALF-17443 reports that site contributors are unable
+     * to edit replies that they have made.
+     */
+    public void testContributorCanEditReply() throws Exception
+    {
+        authenticationComponent.setCurrentUser(USER_ONE);
+        JSONObject post = createSitePost("Can contributors edit replies?", "The title says it all", Status.STATUS_OK);
+        NodeRef postNodeRef = new NodeRef(post.getString("nodeRef"));
+
+        authenticationComponent.setCurrentUser(USER_TWO);
+        JSONObject reply = createReply(postNodeRef, "", "Let's see.", Status.STATUS_OK);
+        NodeRef replyNodeRef = new NodeRef(reply.getString("nodeRef"));
+        updateComment(replyNodeRef, "", "Yes I can", Status.STATUS_OK);
+        
+        authenticationComponent.setCurrentUser(USER_ONE);
+
+        post = getPost(postNodeRef, Status.STATUS_OK);
+        assertEquals("Can contributors edit replies?", post.getString("title"));
+        assertEquals("The title says it all", post.getString("content"));
+        assertEquals(1, post.getInt("replyCount"));
+        
+        JSONObject replies = getReplies(postNodeRef, Status.STATUS_OK);
+        JSONArray items = replies.getJSONArray("items");
+        assertEquals(1, items.length());
+        
+        reply = items.getJSONObject(0);
+        assertEquals("Yes I can", reply.getString("content"));
+
+    }
+    
+    /**
+     * Test for <a href=https://issues.alfresco.com/jira/browse/MNT-11964>MNT-11964</a>
+     * @throws Exception 
+     */
+    public void testCreateForumPermission() throws Exception
+    {
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        String siteName = SITE_SHORT_NAME_DISCUSSION + GUID.generate();
+        this.siteService.createSite("ForumSitePreset", siteName, "SiteTitle", "SiteDescription", SiteVisibility.PUBLIC);
+        
+        String userName = USER_ONE + GUID.generate();
+        createUser(userName, SiteModel.SITE_COLLABORATOR, siteName);
+
+        // Check permissions for admin
+        checkForumPermissions(siteName);
+        
+        // Check permissions for user
+        this.authenticationComponent.setCurrentUser(userName);
+        checkForumPermissions(siteName);
+
+        // Cleanup
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        this.siteService.deleteSite(siteName);
+        
+        // Create a new site as user
+        this.authenticationComponent.setCurrentUser(userName);
+        siteName = SITE_SHORT_NAME_DISCUSSION + GUID.generate();
+        this.siteService.createSite("BlogSitePreset", siteName, "SiteTitle", "SiteDescription", SiteVisibility.PUBLIC);
+        
+        // Check permissions for user
+        checkForumPermissions(siteName);
+        
+        // Check permissions for admin
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        checkForumPermissions(siteName);
+        
+        // Cleanup
+        this.siteService.deleteSite(siteName);
+        this.personService.deletePerson(userName);
+    }
+    
+    private void checkForumPermissions(String siteName) throws Exception
+    {
+        String url = "/api/forum/site/" + siteName + "/" + COMPONENT_DISCUSSION + "/posts";
+        Response response = sendRequest(new GetRequest(url), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        
+        assertTrue("The user sould have permission to create a new discussion.", result.getJSONObject("forumPermissions").getBoolean("create"));
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/download/DownloadRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/download/DownloadRestApiTest.java
new file mode 100644
index 00000000000..341ceb18e84
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/download/DownloadRestApiTest.java
@@ -0,0 +1,204 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.download;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.PropertyMap;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Tests for the Download webscripts.
+ *
+ * @author Alex Miller
+ */
+public class DownloadRestApiTest extends BaseWebScriptTest
+{
+    // Test COnstants
+    private static final long MAX_TIME = 5000;
+    private static final long PAUSE_TIME = 1000;
+    
+    private static final String TEST_USERNAME = "downloadTestUser";
+    
+    // Urls
+    public static final String URL_DOWNLOADS       = "/api/internal/downloads";
+    public static final String URL_DOWNLOAD_STATUS = "/api/internal/downloads/{0}/{1}/{2}/status";
+    
+
+    // Various supporting services
+    private AuthenticationComponent      authenticationComponent;
+    private MutableAuthenticationService authenticationService;
+    private ContentService               contentService;
+    private NodeService                  nodeService;
+    private PersonService                personService;
+    
+    // Test Content 
+    private NodeRef rootFolder;
+    private NodeRef rootFile;
+    private NodeRef level1File;
+    private NodeRef level1Folder;
+    private NodeRef level2File;
+
+    
+    public void setUp()
+    {
+        // Resolve required services
+        authenticationService = getServer().getApplicationContext().getBean("AuthenticationService", MutableAuthenticationService.class);
+        authenticationComponent = getServer().getApplicationContext().getBean("authenticationComponent", AuthenticationComponent.class);
+        contentService = getServer().getApplicationContext().getBean("ContentService", ContentService.class);
+        nodeService = getServer().getApplicationContext().getBean("NodeService", NodeService.class);
+        personService = getServer().getApplicationContext().getBean("PersonService", PersonService.class);
+        
+        // Authenticate as user
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        // if user with given user name doesn't already exist then create user
+        if (this.authenticationService.authenticationExists(TEST_USERNAME) == false)
+        {
+            // create user
+            this.authenticationService.createAuthentication(TEST_USERNAME, "password".toCharArray());
+            
+            // create person properties
+            PropertyMap personProps = new PropertyMap();
+            personProps.put(ContentModel.PROP_USERNAME, TEST_USERNAME);
+            personProps.put(ContentModel.PROP_FIRSTNAME, "FirstName123");
+            personProps.put(ContentModel.PROP_LASTNAME, "LastName123");
+            personProps.put(ContentModel.PROP_EMAIL, "FirstName123.LastName123@email.com");
+            personProps.put(ContentModel.PROP_JOBTITLE, "JobTitle123");
+            personProps.put(ContentModel.PROP_JOBTITLE, "Organisation123");
+            
+            // create person node for user
+            this.personService.createPerson(personProps);
+        }
+
+        Repository repositoryHelper = (Repository) getServer().getApplicationContext().getBean("repositoryHelper");
+        NodeRef companyHome = repositoryHelper.getCompanyHome();
+        
+        
+        // Create some static test content
+       rootFolder = createNode(companyHome, "rootFolder", ContentModel.TYPE_FOLDER, AuthenticationUtil.getAdminUserName());
+       rootFile = createNodeWithTextContent(companyHome, "rootFile", ContentModel.TYPE_CONTENT, AuthenticationUtil.getAdminUserName(), "Root file content");
+       
+       level1File = createNodeWithTextContent(rootFolder, "level1File", ContentModel.TYPE_CONTENT, AuthenticationUtil.getAdminUserName(), "Level 1 file content");
+       level1Folder = createNode(rootFolder, "level1Folder", ContentModel.TYPE_FOLDER, AuthenticationUtil.getAdminUserName());
+       
+       level2File = createNodeWithTextContent(level1Folder, "level2File", ContentModel.TYPE_CONTENT, AuthenticationUtil.getAdminUserName(), "Level 2 file content");
+    }
+    
+    public void tearDown()
+    {
+        nodeService.deleteNode(level2File);
+        nodeService.deleteNode(level1Folder);
+        nodeService.deleteNode(level1File);
+        nodeService.deleteNode(rootFolder);
+        nodeService.deleteNode(rootFile);
+        
+        personService.deletePerson(TEST_USERNAME);
+        if (this.authenticationService.authenticationExists(TEST_USERNAME))
+        {
+           this.authenticationService.deleteAuthentication(TEST_USERNAME);
+        }
+
+    }
+
+    
+    public NodeRef createNodeWithTextContent(NodeRef parentNode, String nodeCmName, QName nodeType, String ownerUserName, String content) 
+    {
+        NodeRef nodeRef = createNode(parentNode, nodeCmName, nodeType, ownerUserName);
+        
+        // If there is any content, add it.
+        if (content != null)
+        {
+            ContentWriter writer = contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
+            writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            writer.setEncoding("UTF-8");
+            writer.putContent(content);
+        }
+        return nodeRef;
+
+    }
+
+
+    private NodeRef createNode(NodeRef parentNode, String nodeCmName, QName nodeType, String ownerUserName)
+    {
+        QName childName = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, nodeCmName);
+
+        Map<QName, Serializable> props = new HashMap<QName, Serializable>();
+        props.put(ContentModel.PROP_NAME, nodeCmName);
+        ChildAssociationRef childAssoc = nodeService.createNode(parentNode,
+                    ContentModel.ASSOC_CONTAINS,
+                    childName,
+                    nodeType,
+                    props);
+        return childAssoc.getChildRef();
+    }
+
+    @Test 
+    public void testCreateAndGetDownload() throws UnsupportedEncodingException, IOException, JSONException 
+    {
+        // CReate the download
+        String postData = "[{ \"nodeRef\": \"" +
+        		              rootFile + 
+        		              "\"}, { \"nodeRef\": \"" +
+        		              rootFolder +
+        		          "\"}]";
+        Response response = sendRequest(new PostRequest(URL_DOWNLOADS, postData, "application/json"), 200);    
+
+        // Parse the response
+        JSONObject result = new JSONObject(response.getContentAsString());
+        
+        NodeRef downloadNodeRef = new NodeRef(result.getString("nodeRef"));
+        
+        // Get the status
+        String statusUrl = MessageFormat.format(URL_DOWNLOAD_STATUS, downloadNodeRef.getStoreRef().getProtocol(), downloadNodeRef.getStoreRef().getIdentifier(), downloadNodeRef.getId());
+        Response statusResponse = sendRequest(new GetRequest(statusUrl), 200);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/facet/FacetRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/facet/FacetRestApiTest.java
new file mode 100644
index 00000000000..115da6e52fe
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/facet/FacetRestApiTest.java
@@ -0,0 +1,769 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.facet;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.search.impl.solr.facet.SolrFacetService;
+import org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.util.GUID;
+import org.alfresco.util.PropertyMap;
+import org.alfresco.util.collections.CollectionUtils;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * This class tests the ReST API of the {@link SolrFacetService}.
+ * 
+ * @author Neil Mc Erlean
+ * @author Jamal Kaabi-Mofrad
+ * @since 5.0
+ */
+public class FacetRestApiTest extends BaseWebScriptTest
+{
+    private static final String SEARCH_ADMIN_USER     = "searchAdmin";
+    private static final String NON_SEARCH_ADMIN_USER = "nonSearchAdmin";
+
+    private static final String FACETS = "facets";
+    
+    private final static String GET_ALL_FACETABLE_PROPERTIES_URL      = "/api/facet/facetable-properties";
+    private final static String GET_SPECIFIC_FACETABLE_PROPERTIES_URL = "/api/facet/classes/{classname}/facetable-properties";
+    private final static String GET_FACETS_URL       = "/api/facet/facet-config";
+    private final static String PUT_FACET_URL_FORMAT = "/api/facet/facet-config/{0}?relativePos={1}";
+    private final static String POST_FACETS_URL      = GET_FACETS_URL;
+    private final static String PUT_FACETS_URL       = GET_FACETS_URL;
+
+    private MutableAuthenticationService authenticationService;
+    private AuthorityService             authorityService;
+    private PersonService                personService;
+    private RetryingTransactionHelper    transactionHelper;
+    private List<String> filters = new ArrayList<String>();
+
+    @Override protected void setUp() throws Exception
+    {
+        super.setUp();
+        authenticationService = getServer().getApplicationContext().getBean("AuthenticationService", MutableAuthenticationService.class);
+        authorityService      = getServer().getApplicationContext().getBean("AuthorityService", AuthorityService.class);
+        personService         = getServer().getApplicationContext().getBean("PersonService", PersonService.class);
+        transactionHelper     = getServer().getApplicationContext().getBean("retryingTransactionHelper", RetryingTransactionHelper.class);
+
+        AuthenticationUtil.clearCurrentSecurityContext();
+        // Create test users. TODO Create these users @BeforeClass or at a testsuite scope.
+        AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
+        {
+            @Override public Void doWork() throws Exception
+            {
+                createUser(SEARCH_ADMIN_USER);
+                createUser(NON_SEARCH_ADMIN_USER);
+
+                if ( !authorityService.getContainingAuthorities(AuthorityType.GROUP,
+                                                                SEARCH_ADMIN_USER,
+                                                                true)
+                                    .contains(SolrFacetServiceImpl.GROUP_ALFRESCO_SEARCH_ADMINISTRATORS_AUTHORITY))
+                {
+                    authorityService.addAuthority(SolrFacetServiceImpl.GROUP_ALFRESCO_SEARCH_ADMINISTRATORS_AUTHORITY,
+                                                  SEARCH_ADMIN_USER);
+                }
+                return null;
+            }
+        });
+    }
+
+    @Override public void tearDown() throws Exception
+    {
+        super.tearDown();
+
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                deleteFilters();
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+
+        AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
+        {
+            @Override public Void doWork() throws Exception
+            {
+                transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+                {
+                    public Void execute() throws Throwable
+                    {
+                        deleteUser(SEARCH_ADMIN_USER);
+                        deleteUser(NON_SEARCH_ADMIN_USER);
+                        return null;
+                    }
+                });
+                return null;
+            }
+        });
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+
+    public void testNonSearchAdminUserCannotCreateUpdateSolrFacets() throws Exception
+    {
+        // Create a filter
+        final JSONObject filter = new JSONObject();
+        final String filterName = "filter" + System.currentTimeMillis();
+        filters.add(filterName);
+        filter.put("filterID", filterName);
+        filter.put("facetQName", "cm:test1");
+        filter.put("displayName", "facet-menu.facet.test1");
+        filter.put("displayControl", "alfresco/search/FacetFilters/test1");
+        filter.put("maxFilters", 5);
+        filter.put("hitThreshold", 1);
+        filter.put("minFilterValueLength", 4);
+        filter.put("sortBy", "ALPHABETICALLY");
+
+        // Non-Search-Admin tries to create a filter
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                // Post the filter
+                sendRequest(new PostRequest(POST_FACETS_URL, filter.toString(), "application/json"), 403);
+                return null;
+            }
+        }, NON_SEARCH_ADMIN_USER);
+
+        // Search-Admin creates a filter
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                // Post the filter
+                sendRequest(new PostRequest(POST_FACETS_URL, filter.toString(), "application/json"), 200);
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+
+        // Non-Search-Admin tries to modify the filter
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                Response response = sendRequest(new GetRequest(GET_FACETS_URL + "/" + filterName), 200);
+                JSONObject jsonRsp = new JSONObject(new JSONTokener(response.getContentAsString()));
+                assertEquals(filterName, jsonRsp.getString("filterID"));
+                assertEquals(5, jsonRsp.getInt("maxFilters"));
+                // Now change the maxFilters value and try to update
+                jsonRsp.put("maxFilters", 10);
+                sendRequest(new PutRequest(PUT_FACETS_URL, jsonRsp.toString(), "application/json"), 403);
+
+                return null;
+            }
+        }, NON_SEARCH_ADMIN_USER);
+    }
+
+    public void testNonSearchAdminUserCanGetFacets() throws Exception
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override public Void doWork() throws Exception
+            {
+                Response response = sendRequest(new GetRequest(GET_FACETS_URL), 200);
+                JSONObject jsonRsp = new JSONObject(new JSONTokener(response.getContentAsString()));
+                List<String> filters = getListFromJsonArray(jsonRsp.getJSONArray(FACETS));
+                assertTrue(filters.size() > 0);
+                return null;
+            }
+        }, NON_SEARCH_ADMIN_USER);
+    }
+
+    public void testSearchAdminCanGetFacets() throws Exception
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override public Void doWork() throws Exception
+            {
+                Response rsp = sendRequest(new GetRequest(GET_FACETS_URL), 200);
+
+                String contentAsString = rsp.getContentAsString();
+                JSONObject jsonRsp = new JSONObject(new JSONTokener(contentAsString));
+
+                // FIXME The JSON payload should be contained within a 'data' object.
+                JSONArray facetsArray = (JSONArray)jsonRsp.get(FACETS);
+                assertNotNull("JSON 'facets' array was null", facetsArray);
+
+                // We'll not add any further assertions on the JSON content. If we've
+                // got valid JSON at this point, then that's good enough.
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+    }
+
+    public void testSearchAdminReordersFacets() throws Exception
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override public Void doWork() throws Exception
+            {
+                // get the existing facets.
+                Response rsp = sendRequest(new GetRequest(GET_FACETS_URL), 200);
+
+                JSONObject jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+
+                final JSONArray facetsArray = (JSONArray)jsonRsp.get(FACETS);
+                assertNotNull("JSON 'facets' array was null", facetsArray);
+
+                System.out.println("Received " + facetsArray.length() + " facets");
+
+                final List<String> idsIndexes = getListFromJsonArray(facetsArray);
+
+                System.out.println(" IDs, indexes = " + idsIndexes);
+
+                // Reorder them such that the last facet is moved left one place.
+                assertTrue("There should be more than 1 built-in facet", facetsArray.length() > 1);
+
+                final String lastIndexId = idsIndexes.get(idsIndexes.size() - 1);
+                final String url = PUT_FACET_URL_FORMAT.replace("{0}", lastIndexId)
+                                                       .replace("{1}", "-1");
+                rsp = sendRequest(new PutRequest(url, "", "application/json"), 200);
+
+
+                // Now get the facets back and we should see that one has moved.
+                rsp = sendRequest(new GetRequest(GET_FACETS_URL), 200);
+
+                jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+
+                JSONArray newfacetsArray = (JSONArray)jsonRsp.get(FACETS);
+                assertNotNull("JSON 'facets' array was null", newfacetsArray);
+
+                System.out.println("Received " + newfacetsArray.length() + " facets");
+
+                final List<String> newIdsIndexes = getListFromJsonArray(newfacetsArray);
+
+                System.out.println(" IDs, indexes = " + newIdsIndexes);
+
+                // Note here that the last Facet JSON object *is* moved one place up the list.
+                assertEquals(CollectionUtils.moveLeft(1, lastIndexId, idsIndexes), newIdsIndexes);
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+    }
+
+    public void testDefaultValues() throws Exception
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                // Build the Filter object - ignore the optional values
+                JSONObject filter_one = new JSONObject();
+                String filterNameOne = "filterOne" + System.currentTimeMillis();
+                filters.add(filterNameOne);
+                filter_one.put("filterID", filterNameOne);
+                filter_one.put("facetQName", "cm:test1");
+                filter_one.put("displayName", "facet-menu.facet.test1");
+                filter_one.put("displayControl", "alfresco/search/FacetFilters/test1");
+                filter_one.put("maxFilters", 5);
+                filter_one.put("hitThreshold", 1);
+                filter_one.put("minFilterValueLength", 4);
+                filter_one.put("sortBy", "ALPHABETICALLY");
+
+                // Post the filter
+                Response response = sendRequest(new PostRequest(POST_FACETS_URL, filter_one.toString(),"application/json"), 200);
+
+                // Retrieve the created filter
+                response = sendRequest(new GetRequest(GET_FACETS_URL + "/" + filterNameOne), 200);
+                JSONObject jsonRsp = new JSONObject(new JSONTokener(response.getContentAsString()));
+                assertEquals(filterNameOne, jsonRsp.getString("filterID"));
+                assertEquals("{http://www.alfresco.org/model/content/1.0}test1", jsonRsp.getString("facetQName"));
+                assertEquals("facet-menu.facet.test1", jsonRsp.getString("displayName"));
+                assertEquals("alfresco/search/FacetFilters/test1", jsonRsp.getString("displayControl"));
+                assertEquals(5, jsonRsp.getInt("maxFilters"));
+                assertEquals(1, jsonRsp.getInt("hitThreshold"));
+                assertEquals(4, jsonRsp.getInt("minFilterValueLength"));
+                assertEquals("ALPHABETICALLY", jsonRsp.getString("sortBy"));
+                // Check the Default values
+                assertEquals("ALL", jsonRsp.getString("scope"));
+                assertFalse(jsonRsp.getBoolean("isEnabled"));
+                assertFalse(jsonRsp.getBoolean("isDefault"));
+
+                // Build the Filter object with all the values
+                JSONObject filter_two = new JSONObject();
+                String filterNameTwo = "filterTwo" + System.currentTimeMillis();
+                filters.add(filterNameTwo);
+                filter_two.put("filterID", filterNameTwo);
+                filter_two.put("facetQName", "cm:test2");
+                filter_two.put("displayName", "facet-menu.facet.test2");
+                filter_two.put("displayControl", "alfresco/search/FacetFilters/test2");
+                filter_two.put("maxFilters", 5);
+                filter_two.put("hitThreshold", 1);
+                filter_two.put("minFilterValueLength", 4);
+                filter_two.put("sortBy", "ALPHABETICALLY");
+                filter_two.put("scope", "SCOPED_SITES");
+                List<String> expectedValues = Arrays.asList(new String[] { "sit1", "site2", "site3" });
+                filter_two.put("scopedSites", expectedValues);
+                filter_two.put("isEnabled", true);
+
+                // Post the filter
+                response = sendRequest(new PostRequest(POST_FACETS_URL, filter_two.toString(), "application/json"), 200);
+
+                // Retrieve the created filter
+                response = sendRequest(new GetRequest(GET_FACETS_URL + "/" + filterNameTwo), 200);
+                jsonRsp = new JSONObject(new JSONTokener(response.getContentAsString()));
+
+                assertEquals(filterNameTwo, jsonRsp.getString("filterID"));
+                assertEquals("SCOPED_SITES", jsonRsp.getString("scope"));
+                assertTrue(jsonRsp.getBoolean("isEnabled"));
+                JSONArray jsonArray = jsonRsp.getJSONArray("scopedSites");
+                List<String> retrievedValues = getListFromJsonArray(jsonArray);
+                // Sort the list
+                Collections.sort(retrievedValues);
+                assertEquals(expectedValues, retrievedValues);
+
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+    }
+
+    public void testFacetCustomProperties() throws Exception
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                // Build the Filter object
+                JSONObject filter = new JSONObject();
+                String filterName = "filter" + System.currentTimeMillis();
+                filters.add(filterName);
+                filter.put("filterID", filterName);
+                filter.put("facetQName", "cm:content.size.test");
+                filter.put("displayName", "facet-menu.facet.size.test");
+                filter.put("displayControl", "alfresco/search/FacetFilters/test");
+                filter.put("maxFilters", 5);
+                filter.put("hitThreshold", 1);
+                filter.put("minFilterValueLength", 4);
+                filter.put("sortBy", "ALPHABETICALLY");
+
+                JSONObject customProp = new JSONObject();
+                // 1st custom prop
+                JSONObject blockIncludeRequest = new JSONObject();
+                blockIncludeRequest.put("name", "blockIncludeFacetRequest");
+                blockIncludeRequest.put("value", "true");
+                customProp.put("blockIncludeFacetRequest", blockIncludeRequest);
+
+                // 2nd custom prop
+                JSONObject multipleValue = new JSONObject();
+                multipleValue.put("name", "multipleValueTest");
+                List<String> expectedValues = Arrays.asList(new String[] { "sit1", "site2", "site3" });
+                multipleValue.put("value", expectedValues);
+                customProp.put("multipleValueTest", multipleValue);
+
+                filter.put("customProperties", customProp);
+
+                // Post the filter
+                Response response = sendRequest(new PostRequest(POST_FACETS_URL, filter.toString(),"application/json"), 200);
+                // Retrieve the created filter
+                response = sendRequest(new GetRequest(GET_FACETS_URL + "/" + filterName), 200);
+                JSONObject jsonRsp = new JSONObject(new JSONTokener(response.getContentAsString()));
+                customProp = jsonRsp.getJSONObject("customProperties");
+
+                blockIncludeRequest = customProp.getJSONObject("blockIncludeFacetRequest");
+                assertEquals("{http://www.alfresco.org/model/solrfacetcustomproperty/1.0}blockIncludeFacetRequest", blockIncludeRequest.get("name"));
+                assertEquals("true", blockIncludeRequest.get("value"));
+
+                multipleValue = customProp.getJSONObject("multipleValueTest");
+                assertEquals("{http://www.alfresco.org/model/solrfacetcustomproperty/1.0}multipleValueTest", multipleValue.get("name"));
+
+                JSONArray jsonArray = (JSONArray) multipleValue.get("value");
+                List<String> retrievedValues = getListFromJsonArray(jsonArray);
+                // Sort the list
+                Collections.sort(retrievedValues);
+                assertEquals(expectedValues, retrievedValues);
+
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+    }
+
+    public void testCreateUpdateFacetWithInvalidFilterId() throws Exception
+    {
+        // Build the Filter object
+        final JSONObject filter = new JSONObject();
+        final String filterName = "filter" + System.currentTimeMillis();
+        filters.add(filterName);
+        filter.put("filterID", filterName);
+        filter.put("facetQName", "cm:test1");
+        filter.put("displayName", "facet-menu.facet.test1");
+        filter.put("displayControl", "alfresco/search/FacetFilters/test1");
+        filter.put("maxFilters", 5);
+        filter.put("hitThreshold", 1);
+        filter.put("minFilterValueLength", 4);
+        filter.put("sortBy", "ALPHABETICALLY");
+
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                // Post the filter
+                sendRequest(new PostRequest(POST_FACETS_URL, filter.toString(), "application/json"), 200);
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+
+        // Admin tries to change the FilterID value
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                // Retrieve the created filter
+                Response response = sendRequest(new GetRequest(GET_FACETS_URL + "/" + filterName), 200);
+                JSONObject jsonRsp = new JSONObject(new JSONTokener(response.getContentAsString()));
+                assertEquals(filterName, jsonRsp.getString("filterID"));
+                // Now change the filterID value and try to update
+                jsonRsp.put("filterID", filterName + "Modified");
+                sendRequest(new PutRequest(PUT_FACETS_URL, jsonRsp.toString(), "application/json"), 400);
+
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+
+        // Admin tries to create a filter with a duplicate FilterID
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                // Post the filter
+                sendRequest(new PostRequest(POST_FACETS_URL, filter.toString(), "application/json"), 400);
+
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+
+        // Admin tries to create a filter with a malicious FilterID
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                Response response = sendRequest(new GetRequest(GET_FACETS_URL), 200);
+                JSONObject jsonRsp = new JSONObject(new JSONTokener(response.getContentAsString()));
+                JSONArray facetsArray = (JSONArray) jsonRsp.get(FACETS);
+                assertNotNull("JSON 'facets' array was null", facetsArray);
+                final List<String> facets = getListFromJsonArray(facetsArray);
+
+                filter.put("filterID", "<script>alert('Maliciouse-FilterID')</script>");
+                // Post the filter
+                sendRequest(new PostRequest(POST_FACETS_URL, filter.toString(), "application/json"), 400);
+
+                // Retrieve all filters
+                response = sendRequest(new GetRequest(GET_FACETS_URL), 200);
+                jsonRsp = new JSONObject(new JSONTokener(response.getContentAsString()));
+                facetsArray = (JSONArray) jsonRsp.get(FACETS);
+
+                assertNotNull("JSON 'facets' array was null", facetsArray);
+                final List<String> newFacets = getListFromJsonArray(facetsArray);
+                assertEquals(facets, newFacets);
+
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+
+    }
+    
+    /** The REST API should accept both 'cm:name' and '{http://www.alfresco.org/model/content/1.0}name' forms of filter IDs. */
+    public void testCreateFacetWithLongFormQnameFilterId() throws Exception
+    {
+        final JSONObject filter = new JSONObject();
+        final String filterName = "filter" + GUID.generate();
+        filters.add(filterName);
+        filter.put("filterID", filterName);
+        // This is the long-form qname that needs to be acceptable.
+        filter.put("facetQName", "{http://www.alfresco.org/model/content/1.0}testLongQname");
+        filter.put("displayName", "facet-menu.facet.testLongQname");
+        filter.put("displayControl", "alfresco/search/FacetFilters/testLongQname");
+        filter.put("maxFilters", 5);
+        filter.put("hitThreshold", 1);
+        filter.put("minFilterValueLength", 4);
+        filter.put("sortBy", "ALPHABETICALLY");
+        
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                // Post the filter
+                sendRequest(new PostRequest(POST_FACETS_URL, filter.toString(), "application/json"), 200);
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+    }
+    
+    public void testUpdateSingleValue() throws Exception
+    {
+        // Build the Filter object
+        final JSONObject filter = new JSONObject();
+        final String filterName = "filter" + System.currentTimeMillis();
+        filters.add(filterName);
+        filter.put("filterID", filterName);
+        filter.put("facetQName", "cm:test");
+        filter.put("displayName", "facet-menu.facet.test1");
+        filter.put("displayControl", "alfresco/search/FacetFilters/test");
+        filter.put("maxFilters", 5);
+        filter.put("hitThreshold", 1);
+        filter.put("minFilterValueLength", 4);
+        filter.put("sortBy", "ALPHABETICALLY");
+        filter.put("isEnabled", true);
+
+        JSONObject customProp = new JSONObject();
+        // 1st custom prop
+        JSONObject blockIncludeRequest = new JSONObject();
+        blockIncludeRequest.put("name", "blockIncludeFacetRequest");
+        blockIncludeRequest.put("value", "true");
+        customProp.put("blockIncludeFacetRequest", blockIncludeRequest);
+        filter.put("customProperties", customProp);
+
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                // Post the filter
+                sendRequest(new PostRequest(POST_FACETS_URL, filter.toString(), "application/json"), 200);
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+
+        // Admin updates displayName and facetQName in 2 put requests
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                // Retrieve the created filter
+                Response response = sendRequest(new GetRequest(GET_FACETS_URL + "/" + filterName), 200);
+                JSONObject jsonRsp = new JSONObject(new JSONTokener(response.getContentAsString()));
+
+                assertEquals(filterName, jsonRsp.getString("filterID"));
+                assertEquals("facet-menu.facet.test1", jsonRsp.getString("displayName"));
+                assertEquals("{http://www.alfresco.org/model/content/1.0}test", jsonRsp.getString("facetQName"));
+                assertTrue(jsonRsp.getBoolean("isEnabled"));
+
+                // Just supply the filterID and the required value
+                JSONObject singleValueJson = new JSONObject();
+                singleValueJson.put("filterID", filterName);
+                // Change the displayName value and update
+                singleValueJson.put("displayName", "facet-menu.facet.modifiedValue");
+                sendRequest(new PutRequest(PUT_FACETS_URL, singleValueJson.toString(), "application/json"), 200);
+
+                // Change the isEnabled value and update
+                // We simulate two PUT requests without refreshing the page in
+                // between updates
+                singleValueJson = new JSONObject();
+                singleValueJson.put("filterID", filterName);
+                singleValueJson.put("isEnabled", false);
+                sendRequest(new PutRequest(PUT_FACETS_URL, singleValueJson.toString(), "application/json"), 200);
+
+                response = sendRequest(new GetRequest(GET_FACETS_URL + "/" + filterName), 200);
+                jsonRsp = new JSONObject(new JSONTokener(response.getContentAsString()));
+
+                // Now see if the two changes have been persisted
+                assertEquals("facet-menu.facet.modifiedValue", jsonRsp.getString("displayName"));
+                assertFalse(jsonRsp.getBoolean("isEnabled"));
+                // Make sure the rest of values haven't been changed
+                assertEquals(filterName, jsonRsp.getString("filterID"));
+                assertEquals("{http://www.alfresco.org/model/content/1.0}test", jsonRsp.getString("facetQName"));
+                assertEquals("alfresco/search/FacetFilters/test", jsonRsp.getString("displayControl"));
+                assertEquals(5, jsonRsp.getInt("maxFilters"));
+                assertEquals(1, jsonRsp.getInt("hitThreshold"));
+                assertEquals(4, jsonRsp.getInt("minFilterValueLength"));
+                assertEquals("ALPHABETICALLY", jsonRsp.getString("sortBy"));
+                assertEquals("ALL", jsonRsp.getString("scope"));
+                assertFalse(jsonRsp.getBoolean("isDefault"));
+                // Make sure custom properties haven't been deleted
+                JSONObject retrievedCustomProp = jsonRsp.getJSONObject("customProperties");
+                JSONObject retrievedBlockIncludeRequest = retrievedCustomProp.getJSONObject("blockIncludeFacetRequest");
+                assertEquals("{http://www.alfresco.org/model/solrfacetcustomproperty/1.0}blockIncludeFacetRequest", retrievedBlockIncludeRequest.get("name"));
+                assertEquals("true", retrievedBlockIncludeRequest.get("value"));
+
+                // Change the facetQName value and update
+                singleValueJson = new JSONObject();
+                singleValueJson.put("filterID", filterName);
+                singleValueJson.put("facetQName", "cm:testModifiedValue");
+                // We simulate that 'testModifiedValue' QName doesn't have custom properties
+                singleValueJson.put("customProperties", new JSONObject());
+                sendRequest(new PutRequest(PUT_FACETS_URL, singleValueJson.toString(), "application/json"), 200);
+
+                response = sendRequest(new GetRequest(GET_FACETS_URL + "/" + filterName), 200);
+                jsonRsp = new JSONObject(new JSONTokener(response.getContentAsString()));
+
+                // Now see if the facetQName and its side-effect have been persisted
+                assertEquals("{http://www.alfresco.org/model/content/1.0}testModifiedValue",jsonRsp.getString("facetQName"));
+                assertNull("Custom properties should have been deleted.", jsonRsp.opt("customProperties"));
+                // Make sure the rest of values haven't been changed
+                assertEquals(filterName, jsonRsp.getString("filterID"));
+                assertEquals("facet-menu.facet.modifiedValue", jsonRsp.getString("displayName"));
+                assertEquals("alfresco/search/FacetFilters/test", jsonRsp.getString("displayControl"));
+                assertEquals(5, jsonRsp.getInt("maxFilters"));
+                assertEquals(1, jsonRsp.getInt("hitThreshold"));
+                assertEquals(4, jsonRsp.getInt("minFilterValueLength"));
+                assertEquals("ALPHABETICALLY", jsonRsp.getString("sortBy"));
+                assertFalse(jsonRsp.getBoolean("isDefault"));
+                assertEquals("ALL", jsonRsp.getString("scope"));
+                assertFalse(jsonRsp.getBoolean("isEnabled"));
+
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+    }
+    
+    public void testGetAllFacetableProperties() throws Exception
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override public Void doWork() throws Exception
+            {
+                final Response rsp = sendRequest(new GetRequest(GET_ALL_FACETABLE_PROPERTIES_URL), 200);
+                
+                // For now, we'll only perform limited testing of the response as we primarily
+                // want to know that the GET call succeeded and that it correctly identified
+                // *some* facetable properties.
+                JSONObject jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+                
+                JSONObject data = jsonRsp.getJSONObject("data");
+                JSONArray properties = data.getJSONArray(FacetablePropertiesGet.PROPERTIES_KEY);
+                
+                final int arbitraryLimit = 25;
+                assertTrue("Expected 'many' properties, but found 'not very many'", properties.length() > arbitraryLimit);
+                
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+    }
+    
+    public void testGetFacetablePropertiesForSpecificContentClasses() throws Exception
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override public Void doWork() throws Exception
+            {
+                final Response rsp = sendRequest(new GetRequest(GET_SPECIFIC_FACETABLE_PROPERTIES_URL.replace("{classname}", "cm:content")), 200);
+                
+                // For now, we'll only perform limited testing of the response as we primarily
+                // want to know that the GET call succeeded and that it correctly identified
+                // *some* facetable properties.
+                JSONObject jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+                
+                JSONObject data = jsonRsp.getJSONObject("data");
+                JSONArray properties = data.getJSONArray(FacetablePropertiesGet.PROPERTIES_KEY);
+                
+                final int arbitraryLimit = 100;
+                assertTrue("Expected 'not very many' properties, but found 'many'", properties.length() < arbitraryLimit);
+                
+                return null;
+            }
+        }, SEARCH_ADMIN_USER);
+    }
+    
+    private List<String> getListFromJsonArray(JSONArray facetsArray) throws JSONException
+    {
+        List<String> result = new ArrayList<>();
+
+        for (int i = 0; i < facetsArray.length(); i++)
+        {
+            Object object = facetsArray.get(i);
+            if (object instanceof JSONObject)
+            {
+                final JSONObject nextFacet = (JSONObject) object;
+                final String nextId = nextFacet.getString("filterID");
+                result.add(nextId);
+            }
+            else
+            {
+                result.add((String) object);
+            }
+        }
+        return result;
+    }
+
+    private void createUser(String userName)
+    {
+        if (! authenticationService.authenticationExists(userName))
+        {
+            authenticationService.createAuthentication(userName, "PWD".toCharArray());
+        }
+
+        if (! personService.personExists(userName))
+        {
+            PropertyMap ppOne = new PropertyMap(4);
+            ppOne.put(ContentModel.PROP_USERNAME, userName);
+            ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+            ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+            ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+
+            personService.createPerson(ppOne);
+        }
+    }
+
+    private void deleteUser(String userName)
+    {
+        if (personService.personExists(userName))
+        {
+            personService.deletePerson(userName);
+        }
+    }
+
+    private void deleteFilters() throws IOException
+    {
+        for (String filter : filters)
+        {
+            sendRequest(new DeleteRequest(GET_FACETS_URL + "/" + filter), 200);
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/forms/AbstractTestFormRestApi.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/forms/AbstractTestFormRestApi.java
new file mode 100644
index 00000000000..0f9b9fbb241
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/forms/AbstractTestFormRestApi.java
@@ -0,0 +1,227 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.forms;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.GUID;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+public abstract class AbstractTestFormRestApi extends BaseWebScriptTest
+{
+    protected static final String APPLICATION_JSON = "application/json";
+    protected static final String TEST_FORM_DESCRIPTION = "Test form description";
+    protected static final String TEST_FORM_TITLE = "Test form title";
+    protected static final String FORM_DEF_URL = "/api/formdefinitions";
+    protected String referencingNodeUpdateUrl;
+    protected String containingNodeUpdateUrl;
+    protected String containingNodeUrl;
+    protected NodeRef referencingDocNodeRef;
+    protected Map<QName, Serializable> refNodePropertiesAfterCreation;
+    protected NodeRef associatedDoc_A;
+    protected NodeRef associatedDoc_B;
+    protected NodeRef associatedDoc_C;
+    protected NodeRef associatedDoc_D;
+    protected NodeRef associatedDoc_E;
+    protected NodeRef childDoc_A;
+    protected NodeRef childDoc_B;
+    protected NodeRef childDoc_C;
+    protected NodeRef childDoc_D;
+    protected NodeRef childDoc_E;
+    protected NodeRef testFolderNodeRef;
+
+    protected NodeService nodeService;
+    private FileFolderService fileFolderService;
+    private ContentService contentService;
+    private Repository repositoryHelper;
+    protected NodeRef containerNodeRef;
+    protected TransactionService transactionService;
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        this.fileFolderService = (FileFolderService) getServer().getApplicationContext().getBean(
+                "FileFolderService");
+        this.contentService = (ContentService) getServer().getApplicationContext().getBean(
+                "ContentService");
+        this.repositoryHelper = (Repository) getServer().getApplicationContext().getBean(
+                "repositoryHelper");
+        this.nodeService = (NodeService) getServer().getApplicationContext().getBean("NodeService");
+        this.transactionService = (TransactionService) getServer().getApplicationContext()
+                .getBean("transactionService");
+
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>(){
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
+
+                NodeRef companyHomeNodeRef = AbstractTestFormRestApi.this.repositoryHelper.getCompanyHome();
+
+                String guid = GUID.generate();
+
+                // Create a test file (not a folder)
+                FileInfo referencingDoc = AbstractTestFormRestApi.this.fileFolderService.create(companyHomeNodeRef,
+                        "referencingDoc" + guid + ".txt", ContentModel.TYPE_CONTENT);
+                referencingDocNodeRef = referencingDoc.getNodeRef();
+
+                // Add an aspect.
+                Map<QName, Serializable> aspectProps = new HashMap<QName, Serializable>(2);
+                aspectProps.put(ContentModel.PROP_TITLE, TEST_FORM_TITLE);
+                aspectProps.put(ContentModel.PROP_DESCRIPTION, TEST_FORM_DESCRIPTION);
+                nodeService.addAspect(referencingDocNodeRef, ContentModel.ASPECT_TITLED, aspectProps);
+
+                // Write some content into the node.
+                ContentWriter contentWriter = AbstractTestFormRestApi.this.contentService.getWriter(referencingDoc.getNodeRef(),
+                        ContentModel.PROP_CONTENT, true);
+                contentWriter.setEncoding("UTF-8");
+                contentWriter.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+                contentWriter.putContent("The quick brown fox jumped over the lazy dog.");
+                
+                // Create a folder - will use this for child-association testing
+                FileInfo associatedDocsFolder =
+                    AbstractTestFormRestApi.this.fileFolderService.create(companyHomeNodeRef, "testFolder" + guid, ContentModel.TYPE_FOLDER);
+                
+                testFolderNodeRef = associatedDocsFolder.getNodeRef();
+                
+                AbstractTestFormRestApi.this.associatedDoc_A = createTestNode("associatedDoc_A" + guid);
+                AbstractTestFormRestApi.this.associatedDoc_B = createTestNode("associatedDoc_B" + guid);
+                AbstractTestFormRestApi.this.associatedDoc_C = createTestNode("associatedDoc_C" + guid);
+                AbstractTestFormRestApi.this.associatedDoc_D = createTestNode("associatedDoc_D" + guid);
+                AbstractTestFormRestApi.this.associatedDoc_E = createTestNode("associatedDoc_E" + guid);
+
+                // Now create associations between the referencing and the two node refs.
+                aspectProps.clear();
+                AbstractTestFormRestApi.this.nodeService.addAspect(AbstractTestFormRestApi.this.referencingDocNodeRef, ContentModel.ASPECT_REFERENCING, aspectProps);
+                AbstractTestFormRestApi.this.nodeService.createAssociation(AbstractTestFormRestApi.this.referencingDocNodeRef, associatedDoc_A, ContentModel.ASSOC_REFERENCES);
+                AbstractTestFormRestApi.this.nodeService.createAssociation(AbstractTestFormRestApi.this.referencingDocNodeRef, associatedDoc_B, ContentModel.ASSOC_REFERENCES);
+                // Leave the 3rd, 4th and 5th nodes without associations as they may be created in
+                // other test code.
+
+                // Create a container for the children.
+                HashMap<QName, Serializable> containerProps = new HashMap<QName, Serializable>();
+                AbstractTestFormRestApi.this.containerNodeRef = nodeService.createNode(companyHomeNodeRef, ContentModel.ASSOC_CONTAINS,
+                        QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "testContainer" + guid),
+                        ContentModel.TYPE_CONTAINER,
+                        containerProps).getChildRef();
+                
+                AbstractTestFormRestApi.this.childDoc_A = createTestNode("childDoc_A" + guid);
+                AbstractTestFormRestApi.this.childDoc_B = createTestNode("childDoc_B" + guid);
+                AbstractTestFormRestApi.this.childDoc_C = createTestNode("childDoc_C" + guid);
+                AbstractTestFormRestApi.this.childDoc_D = createTestNode("childDoc_D" + guid);
+                AbstractTestFormRestApi.this.childDoc_E = createTestNode("childDoc_E" + guid);
+                
+                // Now create the pre-test child-associations.
+                AbstractTestFormRestApi.this.nodeService.addChild(containerNodeRef, childDoc_A, ContentModel.ASSOC_CHILDREN, QName.createQName("childA"));
+                AbstractTestFormRestApi.this.nodeService.addChild(containerNodeRef, childDoc_B, ContentModel.ASSOC_CHILDREN, QName.createQName("childB"));
+                // The other childDoc nodes will be added as children over the REST API as part
+                // of later test code.
+
+                // Create and store the urls to the referencingNode
+                StringBuilder builder = new StringBuilder();
+                builder.append("/api/node/workspace/").append(referencingDocNodeRef.getStoreRef().getIdentifier())
+                        .append("/").append(referencingDocNodeRef.getId()).append("/formprocessor");
+                AbstractTestFormRestApi.this.referencingNodeUpdateUrl = builder.toString();
+                
+                builder = new StringBuilder();
+                builder.append("/api/node/workspace/").append(containerNodeRef.getStoreRef().getIdentifier())
+                        .append("/").append(containerNodeRef.getId()).append("/formprocessor");
+                AbstractTestFormRestApi.this.containingNodeUpdateUrl = builder.toString();
+                
+                // Store the original properties of this node
+                AbstractTestFormRestApi.this.refNodePropertiesAfterCreation = nodeService.getProperties(referencingDocNodeRef);
+                
+                refNodePropertiesAfterCreation.toString();
+                return null;
+            }});
+    }
+
+    @Override
+    public void tearDown()
+    {
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>(){
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                nodeService.deleteNode(AbstractTestFormRestApi.this.referencingDocNodeRef);
+                nodeService.deleteNode(AbstractTestFormRestApi.this.associatedDoc_A);
+                nodeService.deleteNode(AbstractTestFormRestApi.this.associatedDoc_B);
+                nodeService.deleteNode(AbstractTestFormRestApi.this.associatedDoc_C);
+                nodeService.deleteNode(AbstractTestFormRestApi.this.associatedDoc_D);
+                nodeService.deleteNode(AbstractTestFormRestApi.this.associatedDoc_E);
+                nodeService.deleteNode(AbstractTestFormRestApi.this.childDoc_A);
+                nodeService.deleteNode(AbstractTestFormRestApi.this.childDoc_B);
+                nodeService.deleteNode(AbstractTestFormRestApi.this.childDoc_C);
+                nodeService.deleteNode(AbstractTestFormRestApi.this.childDoc_D);
+                nodeService.deleteNode(AbstractTestFormRestApi.this.childDoc_E);
+                nodeService.deleteNode(AbstractTestFormRestApi.this.testFolderNodeRef);
+                nodeService.deleteNode(AbstractTestFormRestApi.this.containerNodeRef);
+                return null;
+            }});
+    }
+
+    protected Response sendGetReq(String url, int expectedStatusCode)
+            throws IOException, UnsupportedEncodingException
+    {
+        Response result = sendRequest(new GetRequest(url), expectedStatusCode);
+        return result;
+    }
+
+    protected NodeRef createTestNode(String associatedDocName)
+    {
+        Map<QName, Serializable> docProps = new HashMap<QName, Serializable>(1);
+        docProps.put(ContentModel.PROP_NAME, associatedDocName + ".txt");
+        return this.nodeService.createNode(
+                    testFolderNodeRef, 
+                    ContentModel.ASSOC_CONTAINS, 
+                    QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, associatedDocName + ".txt"), 
+                    ContentModel.TYPE_CONTENT,
+                    docProps).getChildRef();
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/forms/AllFormTests.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/forms/AllFormTests.java
new file mode 100644
index 00000000000..753a06fb0d9
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/forms/AllFormTests.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.forms;
+
+import org.alfresco.repo.forms.FormService;
+import org.alfresco.repo.forms.FormServiceImplTest;
+import org.alfresco.repo.forms.processor.action.ActionFormProcessorTest;
+import org.alfresco.repo.forms.processor.node.FieldProcessorTest;
+import org.alfresco.repo.forms.processor.workflow.TaskFormProcessorTest;
+import org.alfresco.repo.forms.processor.workflow.WorkflowFormProcessorTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * This class is a holder for the various test classes associated with the {@link FormService}.
+ * It is not (at the time of writing) intended to be incorporated into the automatic build
+ * which will find the various test classes and run them individually.
+ * 
+ * @author Neil McErlean
+ * @since 4.0
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        FormServiceImplTest.class,
+        FieldProcessorTest.class,
+        TaskFormProcessorTest.class,
+        WorkflowFormProcessorTest.class,
+        ActionFormProcessorTest.class,
+        FormRestApiGet_Test.class,
+        FormRestApiJsonPost_Test.class
+})
+public class AllFormTests
+{
+    // Intentionally empty
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/forms/FormRestApiGet_Test.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/forms/FormRestApiGet_Test.java
new file mode 100644
index 00000000000..af41f164fb2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/forms/FormRestApiGet_Test.java
@@ -0,0 +1,268 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.forms;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+import org.springframework.extensions.webscripts.json.JSONUtils;
+
+public class FormRestApiGet_Test extends AbstractTestFormRestApi 
+{
+    protected JSONObject createItemJSON(NodeRef nodeRef) throws Exception
+    {
+        JSONObject jsonPostData = new JSONObject();
+        
+        jsonPostData.put("itemKind", "node");
+        
+        StringBuilder builder = new StringBuilder();
+        builder.append(nodeRef.getStoreRef().getProtocol()).append("/").append(
+                    nodeRef.getStoreRef().getIdentifier()).append("/").append(nodeRef.getId());
+        jsonPostData.put("itemId", builder.toString());
+        
+        return jsonPostData;
+    }
+    
+    public void testResponseContentType() throws Exception
+    {
+        JSONObject jsonPostData = createItemJSON(this.referencingDocNodeRef);
+        String jsonPostString = jsonPostData.toString();
+        Response rsp = sendRequest(new PostRequest(FORM_DEF_URL, 
+                    jsonPostString, APPLICATION_JSON), 200);
+        assertEquals("application/json;charset=UTF-8", rsp.getContentType());
+    }
+
+    public void testGetFormForNonExistentNode() throws Exception
+    {
+        // Create a NodeRef with all digits changed to an 'x' char - 
+        // this should make for a non-existent node.
+        String missingId = this.referencingDocNodeRef.getId().replaceAll("\\d", "x");
+        NodeRef missingNodeRef = new NodeRef(this.referencingDocNodeRef.getStoreRef(), 
+                    missingId);
+        
+        JSONObject jsonPostData = createItemJSON(missingNodeRef);
+        String jsonPostString = jsonPostData.toString();
+        Response rsp = sendRequest(new PostRequest(FORM_DEF_URL, 
+                    jsonPostString, APPLICATION_JSON), 404);
+        assertEquals("application/json;charset=UTF-8", rsp.getContentType());
+    }
+
+    public void testJsonContentParsesCorrectly() throws Exception
+    {
+        JSONObject jsonPostData = createItemJSON(this.referencingDocNodeRef);
+        String jsonPostString = jsonPostData.toString();
+        Response rsp = sendRequest(new PostRequest(FORM_DEF_URL, 
+                    jsonPostString, APPLICATION_JSON), 200);
+        String jsonResponseString = rsp.getContentAsString();
+        
+        Object jsonObject = new JSONUtils().toObject(jsonResponseString);
+        assertNotNull("JSON object was null.", jsonObject);
+    }
+
+    public void testJsonUpperStructure() throws Exception
+    {
+        JSONObject jsonPostData = createItemJSON(this.referencingDocNodeRef);
+        String jsonPostString = jsonPostData.toString();
+        Response rsp = sendRequest(new PostRequest(FORM_DEF_URL, 
+                    jsonPostString, APPLICATION_JSON), 200);
+        String jsonResponseString = rsp.getContentAsString();
+        
+        JSONObject jsonParsedObject = new JSONObject(new JSONTokener(jsonResponseString));
+        assertNotNull(jsonParsedObject);
+        
+        Object dataObj = jsonParsedObject.get("data");
+        assertEquals(JSONObject.class, dataObj.getClass());
+        JSONObject rootDataObject = (JSONObject)dataObj;
+
+        assertEquals(5, rootDataObject.length());
+        String item = (String)rootDataObject.get("item");
+        String submissionUrl = (String)rootDataObject.get("submissionUrl");
+        String type = (String)rootDataObject.get("type");
+        JSONObject definitionObject = (JSONObject)rootDataObject.get("definition");
+        JSONObject formDataObject = (JSONObject)rootDataObject.get("formData");
+        
+        assertNotNull(item);
+        assertNotNull(submissionUrl);
+        assertNotNull(type);
+        assertNotNull(definitionObject);
+        assertNotNull(formDataObject);
+    }
+
+    @SuppressWarnings("unchecked")
+    public void testJsonFormData() throws Exception
+    {
+        JSONObject jsonPostData = createItemJSON(this.referencingDocNodeRef);
+        String jsonPostString = jsonPostData.toString();
+        Response rsp = sendRequest(new PostRequest(FORM_DEF_URL, 
+                    jsonPostString, APPLICATION_JSON), 200);
+        String jsonResponseString = rsp.getContentAsString();
+
+        JSONObject jsonParsedObject = new JSONObject(new JSONTokener(jsonResponseString));
+        assertNotNull(jsonParsedObject);
+        
+        JSONObject rootDataObject = (JSONObject)jsonParsedObject.get("data");
+        
+        JSONObject formDataObject = (JSONObject)rootDataObject.get("formData");
+        List<String> keys = new ArrayList<String>();
+        for (Iterator iter = formDataObject.keys(); iter.hasNext(); )
+        {
+            String nextFieldName = (String)iter.next();
+            assertEquals("Did not expect to find a colon char in " + nextFieldName,
+                        -1, nextFieldName.indexOf(':'));
+            keys.add(nextFieldName);
+        }
+        // Threshold is a rather arbitrary number. I simply want to ensure that there
+        // are *some* entries in the formData hash.
+        final int threshold = 5;
+        int actualKeyCount = keys.size();
+        assertTrue("Expected more than " + threshold +
+                " entries in formData. Actual: " + actualKeyCount, actualKeyCount > threshold);
+    }
+    
+    @SuppressWarnings("unchecked")
+    public void testJsonDefinitionFields() throws Exception
+    {
+        JSONObject jsonPostData = createItemJSON(this.referencingDocNodeRef);
+        String jsonPostString = jsonPostData.toString();
+        Response rsp = sendRequest(new PostRequest(FORM_DEF_URL, 
+                    jsonPostString, APPLICATION_JSON), 200);
+        String jsonResponseString = rsp.getContentAsString();
+        
+        JSONObject jsonParsedObject = new JSONObject(new JSONTokener(jsonResponseString));
+        assertNotNull(jsonParsedObject);
+        
+        JSONObject rootDataObject = (JSONObject)jsonParsedObject.get("data");
+        
+        JSONObject definitionObject = (JSONObject)rootDataObject.get("definition");
+        
+        JSONArray fieldsArray = (JSONArray)definitionObject.get("fields");
+        
+        for (int i = 0; i < fieldsArray.length(); i++)
+        {
+            Object nextObj = fieldsArray.get(i);
+            
+            JSONObject nextJsonObject = (JSONObject)nextObj;
+            List<String> fieldKeys = new ArrayList<String>();
+            for (Iterator iter2 = nextJsonObject.keys(); iter2.hasNext(); )
+            {
+                fieldKeys.add((String)iter2.next());
+            }
+            for (String s : fieldKeys)
+            {
+                if (s.equals("mandatory") || s.equals("protectedField"))
+                {
+                    assertEquals("JSON booleans should be actual booleans.", java.lang.Boolean.class, nextJsonObject.get(s).getClass());
+                }
+            }
+        }
+    }
+    
+    public void testJsonSelectedFields() throws Exception
+    {
+        JSONObject jsonPostData = createItemJSON(this.referencingDocNodeRef);
+        JSONArray jsonFields = new JSONArray();
+        jsonFields.put("cm:name");
+        jsonFields.put("cm:title");
+        jsonFields.put("cm:publisher");
+        jsonPostData.put("fields", jsonFields);
+        
+        // Submit the JSON request.
+        String jsonPostString = jsonPostData.toString();        
+        Response rsp = sendRequest(new PostRequest(FORM_DEF_URL, jsonPostString,
+                APPLICATION_JSON), 200);
+        
+        String jsonResponseString = rsp.getContentAsString();
+        JSONObject jsonParsedObject = new JSONObject(new JSONTokener(jsonResponseString));
+        assertNotNull(jsonParsedObject);
+        
+        JSONObject rootDataObject = (JSONObject)jsonParsedObject.get("data");
+        JSONObject definitionObject = (JSONObject)rootDataObject.get("definition");
+        JSONArray fieldsArray = (JSONArray)definitionObject.get("fields");
+        assertEquals("Expected 2 fields", 2, fieldsArray.length());
+        
+        // get the name and title definitions
+        JSONObject nameField = (JSONObject)fieldsArray.get(0);
+        JSONObject titleField = (JSONObject)fieldsArray.get(1);
+        String nameFieldDataKey = nameField.getString("dataKeyName");
+        String titleFieldDataKey = titleField.getString("dataKeyName");
+        
+        // get the data and check it
+        JSONObject formDataObject = (JSONObject)rootDataObject.get("formData");
+        assertNotNull("Expected to find cm:name data", formDataObject.get(nameFieldDataKey));
+        assertNotNull("Expected to find cm:title data", formDataObject.get(titleFieldDataKey));
+        assertEquals(TEST_FORM_TITLE, formDataObject.get("prop_cm_title"));
+    }
+    
+    public void testJsonForcedFields() throws Exception
+    {
+        JSONObject jsonPostData = createItemJSON(this.referencingDocNodeRef);
+        
+        JSONArray jsonFields = new JSONArray();
+        jsonFields.put("cm:name");
+        jsonFields.put("cm:title");
+        jsonFields.put("cm:publisher");
+        jsonFields.put("cm:wrong");
+        jsonPostData.put("fields", jsonFields);
+        
+        JSONArray jsonForcedFields = new JSONArray();
+        jsonForcedFields.put("cm:publisher");
+        jsonForcedFields.put("cm:wrong");
+        jsonPostData.put("force", jsonForcedFields);
+        
+        // Submit the JSON request.
+        String jsonPostString = jsonPostData.toString();
+        Response rsp = sendRequest(new PostRequest(FORM_DEF_URL, jsonPostString,
+                APPLICATION_JSON), 200);
+        
+        String jsonResponseString = rsp.getContentAsString();
+        JSONObject jsonParsedObject = new JSONObject(new JSONTokener(jsonResponseString));
+        assertNotNull(jsonParsedObject);
+        
+        JSONObject rootDataObject = (JSONObject)jsonParsedObject.get("data");
+        JSONObject definitionObject = (JSONObject)rootDataObject.get("definition");
+        JSONArray fieldsArray = (JSONArray)definitionObject.get("fields");
+        assertEquals("Expected 3 fields", 3, fieldsArray.length());
+        
+        // get the name and title definitions
+        JSONObject nameField = (JSONObject)fieldsArray.get(0);
+        JSONObject titleField = (JSONObject)fieldsArray.get(1);
+        String nameFieldDataKey = nameField.getString("dataKeyName");
+        String titleFieldDataKey = titleField.getString("dataKeyName");
+        
+        // get the data and check it
+        JSONObject formDataObject = (JSONObject)rootDataObject.get("formData");
+        assertNotNull("Expected to find cm:name data", formDataObject.get(nameFieldDataKey));
+        assertNotNull("Expected to find cm:title data", formDataObject.get(titleFieldDataKey));
+        assertEquals(TEST_FORM_TITLE, formDataObject.get("prop_cm_title"));
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/forms/FormRestApiJsonPost_Test.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/forms/FormRestApiJsonPost_Test.java
new file mode 100644
index 00000000000..743e2aa7eb4
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/forms/FormRestApiJsonPost_Test.java
@@ -0,0 +1,423 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.forms;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.RegexQNamePattern;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class FormRestApiJsonPost_Test extends AbstractTestFormRestApi
+{
+    private static final String PROP_CM_DESCRIPTION = "prop_cm_description";
+    private static final String PROP_MIMETYPE = "prop_mimetype";
+    private static final String ASSOC_CM_REFERENCES = "assoc_cm_references";
+    private static final String ASSOC_CM_REFERENCES_ADDED = "assoc_cm_references_added";
+    private static final String ASSOC_CM_REFERENCES_REMOVED = "assoc_cm_references_removed";
+    private static final String ASSOC_SYS_CHILDREN = "assoc_sys_children";
+    private static final String ASSOC_SYS_CHILDREN_ADDED = "assoc_sys_children_added";
+    private static final String ASSOC_SYS_CHILDREN_REMOVED = "assoc_sys_children_removed";
+
+    public void testSimpleJsonPostRequest() throws IOException, JSONException
+    {
+        // Retrieve and store the original property value.
+        Serializable originalDescription =
+            nodeService.getProperty(referencingDocNodeRef, ContentModel.PROP_DESCRIPTION);
+        assertEquals(TEST_FORM_DESCRIPTION, originalDescription);
+        
+        // get the original mimetype
+        String originalMimetype = null;
+        ContentData content = (ContentData)this.nodeService.getProperty(referencingDocNodeRef, ContentModel.PROP_CONTENT);
+        if (content != null)
+        {
+            originalMimetype = content.getMimetype();
+        }
+        
+        // Construct some JSON to represent a new value.
+        JSONObject jsonPostData = new JSONObject();
+        final String proposedNewDescription = "Modified Description";
+        jsonPostData.put(PROP_CM_DESCRIPTION, proposedNewDescription);
+        jsonPostData.put(PROP_MIMETYPE, MimetypeMap.MIMETYPE_HTML);
+        
+        // Submit the JSON request.
+        String jsonPostString = jsonPostData.toString();
+        sendRequest(new PostRequest(referencingNodeUpdateUrl, jsonPostString, APPLICATION_JSON), 200);
+
+        // The nodeService should give us the modified property.
+        Serializable modifiedDescription =
+            nodeService.getProperty(referencingDocNodeRef, ContentModel.PROP_DESCRIPTION);
+        assertEquals(proposedNewDescription, modifiedDescription);
+        
+        // get the modified mimetype
+        String modifiedMimetype = null;
+        content = (ContentData)this.nodeService.getProperty(referencingDocNodeRef, ContentModel.PROP_CONTENT);
+        if (content != null)
+        {
+            modifiedMimetype = content.getMimetype();
+        }
+        assertEquals(MimetypeMap.MIMETYPE_HTML, modifiedMimetype);
+
+        // The Rest API should also give us the modified property.
+        /*
+        Response response = sendRequest(new GetRequest(referencingNodeUpdateUrl), 200);
+        JSONObject jsonGetResponse = new JSONObject(response.getContentAsString());
+        JSONObject jsonDataObj = (JSONObject)jsonGetResponse.get("data");
+        assertNotNull(jsonDataObj);
+
+        JSONObject formData = (JSONObject)jsonDataObj.get("formData");
+        assertNotNull(formData);
+        String retrievedValue = (String)formData.get(PROP_CM_DESCRIPTION);
+        assertEquals(modifiedDescription, retrievedValue);
+        String retrievedMimetype = (String)formData.get(PROP_MIMETYPE);
+        assertEquals(MimetypeMap.MIMETYPE_HTML, modifiedMimetype);*/
+    }
+    
+    /**
+     * This test method attempts to add new associations between existing nodes.
+     */
+    public void testAddNewAssociationsToNode() throws Exception
+    {
+        List<NodeRef> associatedNodes;
+        checkOriginalAssocsBeforeChanges();
+        
+        // Add three additional associations
+        JSONObject jsonPostData = new JSONObject();
+        String assocsToAdd = associatedDoc_C + "," + associatedDoc_D + "," + associatedDoc_E;
+        jsonPostData.put(ASSOC_CM_REFERENCES_ADDED, assocsToAdd);
+        String jsonPostString = jsonPostData.toString();
+
+        sendRequest(new PostRequest(referencingNodeUpdateUrl, jsonPostString, APPLICATION_JSON), 200);
+
+        // Check the now updated associations via the node service
+        List<AssociationRef> modifiedAssocs = nodeService.getTargetAssocs(referencingDocNodeRef, RegexQNamePattern.MATCH_ALL);
+        assertEquals(5, modifiedAssocs.size());
+
+        // Extract the target nodeRefs to make them easier to examine
+        associatedNodes = new ArrayList<NodeRef>(5);
+        for (AssociationRef assocRef : modifiedAssocs)
+        {
+            associatedNodes.add(assocRef.getTargetRef());
+        }
+
+        assertTrue(associatedNodes.contains(associatedDoc_A));
+        assertTrue(associatedNodes.contains(associatedDoc_B));
+        assertTrue(associatedNodes.contains(associatedDoc_C));
+        assertTrue(associatedNodes.contains(associatedDoc_D));
+        assertTrue(associatedNodes.contains(associatedDoc_E));
+        
+        // The Rest API should also give us the modified assocs.
+        /*Response response = sendRequest(new GetRequest(referencingNodeUpdateUrl), 200);
+        String jsonRspString = response.getContentAsString();
+        JSONObject jsonGetResponse = new JSONObject(jsonRspString);
+        JSONObject jsonData = (JSONObject)jsonGetResponse.get("data");
+        assertNotNull(jsonData);
+
+        JSONObject jsonFormData = (JSONObject)jsonData.get("formData");
+        assertNotNull(jsonFormData);
+        
+        String jsonAssocs = (String)jsonFormData.get(ASSOC_CM_REFERENCES);
+        
+        // We expect exactly 5 assocs on the test node
+        assertEquals(5, jsonAssocs.split(",").length);
+        for (AssociationRef assocRef : modifiedAssocs)
+        {
+            assertTrue(jsonAssocs.contains(assocRef.getTargetRef().toString()));
+        }*/
+    }
+
+    /**
+     * This test method attempts to remove an existing association between two existing
+     * nodes.
+     */
+    public void testRemoveAssociationsFromNode() throws Exception
+    {
+        List<NodeRef> associatedNodes;
+        checkOriginalAssocsBeforeChanges();
+
+        // Remove an association
+        JSONObject jsonPostData = new JSONObject();
+        String assocsToRemove = associatedDoc_B.toString();
+        jsonPostData.put(ASSOC_CM_REFERENCES_REMOVED, assocsToRemove);
+        String jsonPostString = jsonPostData.toString();
+
+        sendRequest(new PostRequest(referencingNodeUpdateUrl, jsonPostString, APPLICATION_JSON), 200);
+
+        // Check the now updated associations via the node service
+        List<AssociationRef> modifiedAssocs = nodeService.getTargetAssocs(referencingDocNodeRef, RegexQNamePattern.MATCH_ALL);
+        assertEquals(1, modifiedAssocs.size());
+
+        // Extract the target nodeRefs to make them easier to examine
+        associatedNodes = new ArrayList<NodeRef>(5);
+        for (AssociationRef assocRef : modifiedAssocs)
+        {
+            associatedNodes.add(assocRef.getTargetRef());
+        }
+
+        assertTrue(associatedNodes.contains(associatedDoc_A));
+        
+        // The Rest API should also give us the modified assocs.
+        /*Response response = sendRequest(new GetRequest(referencingNodeUpdateUrl), 200);
+        String jsonRspString = response.getContentAsString();
+        JSONObject jsonGetResponse = new JSONObject(jsonRspString);
+        JSONObject jsonData = (JSONObject)jsonGetResponse.get("data");
+        assertNotNull(jsonData);
+
+        JSONObject jsonFormData = (JSONObject)jsonData.get("formData");
+        assertNotNull(jsonFormData);
+        
+        String jsonAssocs = (String)jsonFormData.get(ASSOC_CM_REFERENCES);
+        
+        // We expect exactly 1 assoc on the test node
+        assertEquals(1, jsonAssocs.split(",").length);
+        for (AssociationRef assocRef : modifiedAssocs)
+        {
+            assertTrue(jsonAssocs.contains(assocRef.getTargetRef().toString()));
+        }*/
+    }
+
+    /**
+     * This test method attempts to add the same association twice. This attempt will
+     * not succeed, but the test case is to confirm that there is no exception thrown
+     * back across the REST API.
+     */
+    public void testAddAssocThatAlreadyExists() throws Exception
+    {
+        checkOriginalAssocsBeforeChanges();
+
+        // Add an association
+        JSONObject jsonPostData = new JSONObject();
+        String assocsToAdd = associatedDoc_C.toString();
+        jsonPostData.put(ASSOC_CM_REFERENCES_ADDED, assocsToAdd);
+        String jsonPostString = jsonPostData.toString();
+
+        sendRequest(new PostRequest(referencingNodeUpdateUrl, jsonPostString, APPLICATION_JSON), 200);
+
+        // Try to add the same association again
+        sendRequest(new PostRequest(referencingNodeUpdateUrl, jsonPostString, APPLICATION_JSON), 200);
+    }
+    
+    /**
+     * This test method attempts to remove an association that does not exist. This
+     * attempt will not succeed, but the test case is to confirm that there is no
+     * exception thrown back across the REST API.
+     */
+    public void testRemoveAssocThatDoesNotExist() throws Exception
+    {
+        checkOriginalAssocsBeforeChanges();
+
+        // Remove a non-existent association
+        JSONObject jsonPostData = new JSONObject();
+        String assocsToRemove = associatedDoc_E.toString();
+        jsonPostData.put(ASSOC_CM_REFERENCES_REMOVED, assocsToRemove);
+        String jsonPostString = jsonPostData.toString();
+
+        sendRequest(new PostRequest(referencingNodeUpdateUrl, jsonPostString, APPLICATION_JSON), 200);
+    }
+
+    /**
+     * This test method attempts to add new associations between existing nodes.
+     */
+    public void testAddNewChildAssociationsToNode() throws Exception
+    {
+        List<NodeRef> associatedNodes;
+        checkOriginalChildAssocsBeforeChanges();
+        
+        // Add three additional associations
+        JSONObject jsonPostData = new JSONObject();
+        String assocsToAdd = childDoc_C + "," + childDoc_D + "," + childDoc_E;
+        jsonPostData.put(ASSOC_SYS_CHILDREN_ADDED, assocsToAdd);
+        String jsonPostString = jsonPostData.toString();
+
+        sendRequest(new PostRequest(containingNodeUpdateUrl.toString(), jsonPostString, APPLICATION_JSON), 200);
+
+        // Check the now updated child associations via the node service
+        List<ChildAssociationRef> modifiedAssocs = nodeService.getChildAssocs(containerNodeRef);
+        assertEquals(5, modifiedAssocs.size());
+
+        // Extract the target nodeRefs to make them easier to examine
+        associatedNodes = new ArrayList<NodeRef>(5);
+        for (ChildAssociationRef assocRef : modifiedAssocs)
+        {
+            associatedNodes.add(assocRef.getChildRef());
+        }
+
+        assertTrue(associatedNodes.contains(childDoc_A));
+        assertTrue(associatedNodes.contains(childDoc_B));
+        assertTrue(associatedNodes.contains(childDoc_C));
+        assertTrue(associatedNodes.contains(childDoc_D));
+        assertTrue(associatedNodes.contains(childDoc_E));
+        
+        // The Rest API should also give us the modified assocs.
+        /*Response response = sendRequest(new GetRequest(containingNodeUpdateUrl), 200);
+        String jsonRspString = response.getContentAsString();
+        
+        JSONObject jsonGetResponse = new JSONObject(jsonRspString);
+        JSONObject jsonData = (JSONObject)jsonGetResponse.get("data");
+        assertNotNull(jsonData);
+
+        JSONObject jsonFormData = (JSONObject)jsonData.get("formData");
+        assertNotNull(jsonFormData);
+        
+        String jsonAssocs = (String)jsonFormData.get(ASSOC_SYS_CHILDREN);
+        
+        // We expect exactly 5 assocs on the test node
+        assertEquals(5, jsonAssocs.split(",").length);
+        for (ChildAssociationRef assocRef : modifiedAssocs)
+        {
+            String childNodeRef = assocRef.getChildRef().toString();
+            assertTrue(jsonAssocs.contains(childNodeRef));
+            assertTrue(NodeRef.isNodeRef(childNodeRef));
+        }*/
+    }
+    
+    /**
+     * This test method attempts to remove an existing child association between two
+     * existing nodes.
+     */
+    public void testRemoveChildAssociationsFromNode() throws Exception
+    {
+        List<NodeRef> associatedNodes;
+        checkOriginalChildAssocsBeforeChanges();
+
+        // Remove an association
+        JSONObject jsonPostData = new JSONObject();
+        String assocsToRemove = childDoc_B.toString();
+        jsonPostData.put(ASSOC_SYS_CHILDREN_REMOVED, assocsToRemove);
+        String jsonPostString = jsonPostData.toString();
+
+        sendRequest(new PostRequest(containingNodeUpdateUrl, jsonPostString, APPLICATION_JSON), 200);
+
+        // Check the now updated child associations via the node service
+        List<ChildAssociationRef> modifiedAssocs = nodeService.getChildAssocs(containerNodeRef);
+        assertEquals(1, modifiedAssocs.size());
+
+        // Extract the target nodeRefs to make them easier to examine
+        associatedNodes = new ArrayList<NodeRef>(5);
+        for (ChildAssociationRef assocRef : modifiedAssocs)
+        {
+            associatedNodes.add(assocRef.getChildRef());
+        }
+
+        assertTrue(associatedNodes.contains(childDoc_A));
+        
+        // The Rest API should also give us the modified assocs.
+        /*Response response = sendRequest(new GetRequest(containingNodeUpdateUrl), 200);
+        String jsonRspString = response.getContentAsString();
+        JSONObject jsonGetResponse = new JSONObject(jsonRspString);
+        JSONObject jsonData = (JSONObject)jsonGetResponse.get("data");
+        assertNotNull(jsonData);
+
+        JSONObject jsonFormData = (JSONObject)jsonData.get("formData");
+        assertNotNull(jsonFormData);
+        
+        String jsonAssocs = (String)jsonFormData.get(ASSOC_SYS_CHILDREN);
+        
+        // We expect exactly 1 assoc on the test node
+        assertEquals(1, jsonAssocs.split(",").length);
+        for (ChildAssociationRef assocRef : modifiedAssocs)
+        {
+            assertTrue(jsonAssocs.contains(assocRef.getChildRef().toString()));
+        }*/
+    }
+
+    /**
+     * This test method attempts to add the same child association twice. This attempt
+     * will not succeed, but the test case is to confirm that there is no exception thrown
+     * back across the REST API.
+     */
+    public void testAddChildAssocThatAlreadyExists() throws Exception
+    {
+        checkOriginalChildAssocsBeforeChanges();
+
+        // Add an association
+        JSONObject jsonPostData = new JSONObject();
+        String assocsToAdd = this.childDoc_C.toString();
+        jsonPostData.put(ASSOC_SYS_CHILDREN_ADDED, assocsToAdd);
+        String jsonPostString = jsonPostData.toString();
+
+        sendRequest(new PostRequest(referencingNodeUpdateUrl, jsonPostString, APPLICATION_JSON), 200);
+
+        // Try to add the same child association again
+        sendRequest(new PostRequest(referencingNodeUpdateUrl, jsonPostString, APPLICATION_JSON), 200);
+    }
+    
+    /**
+     * This test method attempts to remove a child association that does not exist. This
+     * attempt will not succeed, but the test case is to confirm that there is no
+     * exception thrown back across the REST API.
+     */
+    public void testRemoveChildAssocThatDoesNotExist() throws Exception
+    {
+        checkOriginalChildAssocsBeforeChanges();
+
+        // Remove a non-existent child association
+        JSONObject jsonPostData = new JSONObject();
+        String assocsToRemove = childDoc_E.toString();
+        jsonPostData.put(ASSOC_SYS_CHILDREN_REMOVED, assocsToRemove);
+        String jsonPostString = jsonPostData.toString();
+
+        sendRequest(new PostRequest(referencingNodeUpdateUrl, jsonPostString, APPLICATION_JSON), 200);
+    }
+
+
+    private void checkOriginalAssocsBeforeChanges()
+    {
+        List<AssociationRef> originalAssocs = nodeService.getTargetAssocs(referencingDocNodeRef, RegexQNamePattern.MATCH_ALL);
+        assertEquals(2, originalAssocs.size());
+
+        List<NodeRef> associatedNodes = new ArrayList<NodeRef>(2);
+        associatedNodes.add(originalAssocs.get(0).getTargetRef());
+        associatedNodes.add(originalAssocs.get(1).getTargetRef());
+        
+        assertTrue(associatedNodes.contains(associatedDoc_A));
+        assertTrue(associatedNodes.contains(associatedDoc_B));
+    }
+
+    private void checkOriginalChildAssocsBeforeChanges()
+    {
+        List<ChildAssociationRef> originalChildAssocs = nodeService.getChildAssocs(containerNodeRef);
+        assertEquals(2, originalChildAssocs.size());
+
+        List<NodeRef> associatedNodes = new ArrayList<NodeRef>(2);
+        associatedNodes.add(originalChildAssocs.get(0).getChildRef());
+        associatedNodes.add(originalChildAssocs.get(1).getChildRef());
+        
+        assertTrue(associatedNodes.contains(childDoc_A));
+        assertTrue(associatedNodes.contains(childDoc_B));
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/groups/GroupsTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/groups/GroupsTest.java
new file mode 100644
index 00000000000..9e2a2e58650
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/groups/GroupsTest.java
@@ -0,0 +1,1171 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.groups;
+
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.util.PropertyMap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Unit test of Groups REST APIs. 
+ * 
+ * /api/groups 
+ * /api/rootgroups 
+ *  
+ * @author Mark Rogers
+ */
+public class GroupsTest extends BaseWebScriptTest
+{    
+	private static final Log logger = LogFactory.getLog(BaseWebScriptTest.class);
+	
+    private MutableAuthenticationService authenticationService;
+    private AuthorityService authorityService;
+    private AuthenticationComponent authenticationComponent;
+    private PersonService personService;
+    
+    private String ADMIN_GROUP = "ALFRESCO_ADMINISTRATORS";
+    private String EMAIL_GROUP = "EMAIL_CONTRIBUTORS";
+    private String TEST_ROOTGROUP = "GroupsTest_ROOT";
+    private String TEST_GROUPA = "TestA";
+    private String TEST_GROUPB = "TESTB";
+    private String TEST_GROUPC = "TesTC";
+    private String TEST_GROUPD = "TESTD";
+    private String TEST_GROUPE = "TestE";
+    private String TEST_GROUPF = "TestF";
+    private String TEST_GROUPG = "TestG";
+    private String TEST_LINK = "TESTLINK";
+    private String TEST_ROOTGROUP_DISPLAY_NAME = "GROUPS_TESTROOTDisplayName";
+    
+    private static final String USER_ONE = "GroupTestOne";
+    private static final String USER_TWO = "GroupTestTwo";
+    private static final String USER_THREE = "GroupTestThree";
+    
+    private static final String URL_GROUPS = "/api/groups";
+    private static final String URL_ROOTGROUPS = "/api/rootgroups";
+        
+    /**
+     * Test Tree for all group tests
+     *
+     * TEST_ROOTGROUP
+     *	GROUPA
+     *	GROUPB
+     *		GROUPD
+     *		GROUPE (in Share Zone)
+     *		USER_TWO
+     *		USER_THREE
+     *	GROUPC
+     *		USER_TWO
+     *	GROUPF
+     *		GROUPD
+     *	GROUPG
+     *		GROUPD
+     */	
+    private synchronized String createTestTree()
+    {
+    	if(rootGroupName == null)
+    	{
+    		rootGroupName = authorityService.getName(AuthorityType.GROUP, TEST_ROOTGROUP);
+    	}
+    	
+        Set<String> shareZones = new HashSet<String>(1, 1.0f);
+        shareZones.add(AuthorityService.ZONE_APP_SHARE);
+    	
+        if(!authorityService.authorityExists(rootGroupName))
+        {
+            AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        	 
+        	rootGroupName = authorityService.createAuthority(AuthorityType.GROUP, TEST_ROOTGROUP, TEST_ROOTGROUP_DISPLAY_NAME, authorityService.getDefaultZones());
+        	String groupA = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPA, TEST_GROUPA, authorityService.getDefaultZones());
+        	authorityService.addAuthority(rootGroupName, groupA);
+        	String groupB = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPB, TEST_GROUPB,authorityService.getDefaultZones());
+            authorityService.addAuthority(rootGroupName, groupB);
+        	String groupD = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPD, TEST_GROUPD, authorityService.getDefaultZones());
+         	String groupE = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPE, TEST_GROUPE, shareZones);
+            authorityService.addAuthority(groupB, groupD);
+            authorityService.addAuthority(groupB, groupE);
+        	authorityService.addAuthority(groupB, USER_TWO);
+        	authorityService.addAuthority(groupB, USER_THREE);
+            String groupF = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPF, TEST_GROUPF, authorityService.getDefaultZones());
+            authorityService.addAuthority(rootGroupName, groupF);
+            authorityService.addAuthority(groupF, groupD);
+            String groupG = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPG, TEST_GROUPG, authorityService.getDefaultZones());
+            authorityService.addAuthority(rootGroupName, groupG);
+            authorityService.addAuthority(groupG, groupD);
+            
+        	String groupC = authorityService.createAuthority(AuthorityType.GROUP, TEST_GROUPC, TEST_GROUPC,authorityService.getDefaultZones());
+        	authorityService.addAuthority(rootGroupName, groupC);
+        	authorityService.addAuthority(groupC, USER_TWO);
+        
+        	String link = authorityService.createAuthority(AuthorityType.GROUP, TEST_LINK, TEST_LINK, authorityService.getDefaultZones());
+        	authorityService.addAuthority(rootGroupName, link);
+        	
+            this.authenticationComponent.setCurrentUser(USER_ONE);
+        }
+        
+        return rootGroupName;
+
+    }
+
+    private static String rootGroupName = null;    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
+        this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+        this.authorityService = (AuthorityService)getServer().getApplicationContext().getBean("AuthorityService");
+        
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+        
+        // Create users
+        createUser(USER_ONE);
+        createUser(USER_TWO);
+        createUser(USER_THREE);
+        
+        // Do tests as user one
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+    }
+    
+    private void createUser(String userName)
+    {
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            this.authenticationService.createAuthentication(userName, "PWD".toCharArray());
+            
+            PropertyMap ppOne = new PropertyMap(4);
+            ppOne.put(ContentModel.PROP_USERNAME, userName);
+            ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+            ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+            ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+            
+            this.personService.createPerson(ppOne);
+        }        
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+    }
+    
+    /**
+     * Detailed test of get root groups
+     */
+    public void testGetRootGroup() throws Exception
+    { 
+        createTestTree();
+        
+    	/**
+    	 * Get all root groups, regardless of zone, should be at least the ALFRESCO_ADMINISTRATORS, 
+    	 * TEST_ROOTGROUP and EMAIL_CONTRIBUTORS groups
+    	 */
+    	{
+    		Response response = sendRequest(new GetRequest(URL_ROOTGROUPS), Status.STATUS_OK);
+    		JSONObject top = new JSONObject(response.getContentAsString());
+    		logger.debug(response.getContentAsString());
+    		//System.out.println(response.getContentAsString());
+    		JSONArray data = top.getJSONArray("data");
+    		assertTrue(data.length() >= 3);
+    		boolean gotRootGroup = false;
+    		boolean gotEmailGroup = false;
+    		
+    		
+    		for(int i = 0; i < data.length(); i++)
+    		{
+    			JSONObject rootGroup = data.getJSONObject(i);
+    			if(rootGroup.getString("shortName").equals(TEST_ROOTGROUP))
+    			{
+    				// This is our test rootgroup
+    				assertEquals("shortName wrong", TEST_ROOTGROUP, rootGroup.getString("shortName"));
+    				assertEquals("displayName wrong", TEST_ROOTGROUP_DISPLAY_NAME, rootGroup.getString("displayName"));
+    				assertEquals("authorityType wrong", "GROUP", rootGroup.getString("authorityType"));
+    				gotRootGroup = true;
+    			}
+    			if(rootGroup.getString("shortName").equals(EMAIL_GROUP))
+    			{
+    				gotEmailGroup = true;
+    			}
+    		}
+        	assertTrue("root group not found", gotRootGroup);
+        	assertTrue("email group not found", gotEmailGroup);
+    	}
+
+    	
+    	if(rootGroupName != null)
+    	{
+    		rootGroupName = authorityService.getName(AuthorityType.GROUP, TEST_ROOTGROUP);
+    	}
+    	
+    	Set<String> zones = authorityService.getAuthorityZones(rootGroupName);
+    	assertTrue("root group is in APP.DEFAULT zone", zones.contains("APP.DEFAULT") );
+    	
+    	/**
+    	 * Get all root groups in the application zone "APP.DEFAULT"
+    	 */
+    	{
+    		Response response = sendRequest(new GetRequest(URL_ROOTGROUPS + "?zone=APP.DEFAULT"), Status.STATUS_OK);
+    		JSONObject top = new JSONObject(response.getContentAsString());
+    		logger.debug(response.getContentAsString());
+    		//System.out.println(response.getContentAsString());
+    		JSONArray data = top.getJSONArray("data");
+    		
+    		assertTrue(data.length() > 0);
+    		
+    		for(int i = 0; i < data.length(); i++)
+    		{
+    			JSONObject rootGroup = data.getJSONObject(i);
+    			if(rootGroup.getString("shortName").equals(TEST_ROOTGROUP))
+    			{
+    				// This is our test rootgroup
+    				assertEquals("shortName wrong", TEST_ROOTGROUP, rootGroup.getString("shortName"));
+    				assertEquals("displayName wrong", TEST_ROOTGROUP_DISPLAY_NAME, rootGroup.getString("displayName"));
+    				assertEquals("authorityType wrong", "GROUP", rootGroup.getString("authorityType"));
+    			}
+    		}	
+    	}
+    	
+    	/**
+    	 * Get all root groups in the admin zone
+    	 */
+    	{
+    		Response response = sendRequest(new GetRequest(URL_ROOTGROUPS + "?zone=AUTH.ALF"), Status.STATUS_OK);
+    		JSONObject top = new JSONObject(response.getContentAsString());
+    		logger.debug(response.getContentAsString());
+    		JSONArray data = top.getJSONArray("data");
+    		assertTrue(data.length() > 0);
+    		
+    		for(int i = 0; i < data.length(); i++)
+    		{
+    			JSONObject rootGroup = data.getJSONObject(i);
+    			if(rootGroup.getString("shortName").equals(TEST_ROOTGROUP))
+    			{
+    				// This is our test rootgroup
+    				assertEquals("shortName wrong", TEST_ROOTGROUP, rootGroup.getString("shortName"));
+    				assertEquals("displayName wrong", TEST_ROOTGROUP_DISPLAY_NAME, rootGroup.getString("displayName"));
+    				assertEquals("authorityType wrong", "GROUP", rootGroup.getString("authorityType"));
+    			}
+    		}	
+    	}
+    	
+    	/**
+    	 * Negative test Get all root groups in the a zone that does not exist
+    	 */
+    	{
+    		Response response = sendRequest(new GetRequest(URL_ROOTGROUPS + "?zone=WIBBLE"), Status.STATUS_OK);
+    		JSONObject top = new JSONObject(response.getContentAsString());
+    		logger.debug(response.getContentAsString());
+    		JSONArray data = top.getJSONArray("data");
+    		assertTrue(data.length() == 0);
+    		// Should return no results
+    	}
+    	
+    }
+    
+    /**
+     * Detailed test of get group
+     */
+    public void testGetGroup() throws Exception
+    {
+        createTestTree();
+        
+    	{
+    		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + ADMIN_GROUP), 200);
+    		JSONObject top = new JSONObject(response.getContentAsString());
+    		logger.debug(response.getContentAsString());
+    		JSONObject data = top.getJSONObject("data");
+    		assertTrue(data.length() > 0);
+    	}
+    	
+    	{
+    		sendRequest(new GetRequest(URL_GROUPS + "/" + "crap"), Status.STATUS_NOT_FOUND);
+    	}
+    	
+    	/**
+    	 * Get GROUP B
+    	 */
+    	{
+    		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB), Status.STATUS_OK);
+    		JSONObject top = new JSONObject(response.getContentAsString());
+    		logger.debug(response.getContentAsString());
+    		JSONObject data = top.getJSONObject("data");
+    		assertTrue(data.length() > 0);
+    	}
+    	
+    	/**
+    	 * Get GROUP E which is in a different zone
+    	 */
+    	{
+    		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPE), Status.STATUS_OK);
+    		JSONObject top = new JSONObject(response.getContentAsString());
+    		logger.debug(response.getContentAsString());
+    		JSONObject data = top.getJSONObject("data");
+    		assertTrue(data.length() > 0);
+    	}
+    
+    }
+    
+    /**
+     * Detailed test of create root group
+     * Detailed test of delete root group
+     */
+    public void testCreateRootGroup() throws Exception
+    {
+    	String myGroupName = "GT_CRG";
+    	String myDisplayName = "GT_CRGDisplay";
+    	
+    	/**
+    	 * Negative test - try to create a group without admin authority
+    	 */
+    	{
+    		JSONObject newGroupJSON = new JSONObject();
+    		newGroupJSON.put("displayName", myDisplayName); 
+    		sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myGroupName,  newGroupJSON.toString(), "application/json"), Status.STATUS_INTERNAL_SERVER_ERROR);   
+    	}
+    	
+    	 
+    	this.authenticationComponent.setSystemUserAsCurrentUser();
+    	
+    	try
+    	{
+    		/**
+    		 * Create a root group
+    		 */
+    		{
+    			JSONObject newGroupJSON = new JSONObject();
+    			newGroupJSON.put("displayName", myDisplayName); 
+    			Response response = sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myGroupName,  newGroupJSON.toString(), "application/json"), Status.STATUS_CREATED);
+    			JSONObject top = new JSONObject(response.getContentAsString());
+    			JSONObject rootGroup = top.getJSONObject("data");
+    			assertEquals("shortName wrong", myGroupName, rootGroup.getString("shortName"));
+    			assertEquals("displayName wrong", myDisplayName, rootGroup.getString("displayName"));
+    		}
+    	
+    		/**
+    		 * Negative test Create a root group that already exists
+    		 */
+    		{
+    			JSONObject newGroupJSON = new JSONObject();
+    			newGroupJSON.put("displayName", myDisplayName); 
+    			sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myGroupName,  newGroupJSON.toString(), "application/json"), Status.STATUS_BAD_REQUEST);   
+    		}
+    		
+    		/**
+    		 * Delete the root group
+    		 */
+    		sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myGroupName), Status.STATUS_OK);
+    		
+    		/**
+    		 * Attempt to delete the root group again - should fail
+    		 */
+    		sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myGroupName), Status.STATUS_NOT_FOUND);
+    		
+    		
+    	} 
+    	finally
+    	{
+    	
+    		/**
+    		 * Delete the root group
+    		 */
+    		sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myGroupName), 0);  
+    	}
+    }
+    
+    /**
+     * Detailed test of link group
+     */
+    public void testLinkChild() throws Exception
+    {
+    	String myRootGroup = "GT_LGROOT";
+    	
+    	try 
+    	{
+    		this.authenticationComponent.setSystemUserAsCurrentUser();
+    		sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myRootGroup), 0);
+    		
+    		String groupLinkFullName = "";
+    		{
+    			Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_LINK), Status.STATUS_OK);
+    			JSONObject top = new JSONObject(response.getContentAsString());
+    			logger.debug(response.getContentAsString());
+    			JSONObject data = top.getJSONObject("data");
+    			assertTrue(data.length() > 0);
+    			groupLinkFullName = data.getString("fullName");
+    		}
+    		
+    		/**
+    		 * Create a root group
+    		 */
+    		{
+    			JSONObject newGroupJSON = new JSONObject();
+    			newGroupJSON.put("displayName", myRootGroup); 
+    			sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myRootGroup,  newGroupJSON.toString(), "application/json"), Status.STATUS_CREATED);    
+    		}
+    		
+    		/**
+    		 * Link an existing group (GROUPB) to my root group.
+    		 */
+    		
+    		/**
+    		 * Negative test Link Group B without administrator access.
+    		 */
+    		this.authenticationComponent.setCurrentUser(USER_ONE);
+    		{
+    			JSONObject newGroupJSON = new JSONObject();
+    			sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + groupLinkFullName, newGroupJSON.toString(), "application/json" ), Status.STATUS_INTERNAL_SERVER_ERROR);
+    		}
+    		
+    		this.authenticationComponent.setSystemUserAsCurrentUser();
+    		
+    		/**
+    		 * Link Group B
+    		 */
+    		{
+    			JSONObject newGroupJSON = new JSONObject();
+    			Response response = sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + groupLinkFullName, newGroupJSON.toString(), "application/json" ), Status.STATUS_OK);
+    			JSONObject top = new JSONObject(response.getContentAsString());
+    			logger.debug(response.getContentAsString());
+    			JSONObject data = top.getJSONObject("data");
+    		}
+    		
+    		/**
+    		 * Link the group again - this fails
+    		 * - duplicate groups (children with the same name) are not allowed 
+    		 */
+    		{
+    			JSONObject newGroupJSON = new JSONObject();
+    			Response response = sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + groupLinkFullName, newGroupJSON.toString(), "application/json" ), Status.STATUS_INTERNAL_SERVER_ERROR);
+    		}
+    		
+        	/**
+        	 * Get All Children of myGroup which are GROUPS - should find GROUP B
+        	 */
+        	{
+        		logger.debug("Get child GROUPS of myRootGroup");
+        		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + myRootGroup + "/children?authorityType=GROUP"), Status.STATUS_OK);
+        		JSONObject top = new JSONObject(response.getContentAsString());
+        		logger.debug(response.getContentAsString());
+        		JSONArray data = top.getJSONArray("data");
+        		assertTrue("no child groups of myGroup", data.length() == 1);
+        		
+        		JSONObject subGroup = data.getJSONObject(0);
+        		assertEquals("shortName wrong", TEST_LINK, subGroup.getString("shortName"));
+        		assertEquals("authorityType wrong", "GROUP", subGroup.getString("authorityType"));
+        	}
+        	
+        	/**
+        	 * Now link in an existing user
+        	 */		 
+    		{
+    			JSONObject newGroupJSON = new JSONObject();
+    			String userOneFullName = USER_ONE;
+    			Response response = sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + userOneFullName, newGroupJSON.toString(), "application/json" ), Status.STATUS_OK);
+    			JSONObject top = new JSONObject(response.getContentAsString());
+    			logger.debug(response.getContentAsString());
+    			JSONObject data = top.getJSONObject("data");
+    		}
+    		
+        	/**
+        	 * Get All Children of myGroup which are USERS - should find USER ONE
+        	 */
+        	{
+        		logger.debug("Get child USERS of myRootGroup");
+        		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + myRootGroup + "/children?authorityType=USER"), Status.STATUS_OK);
+        		JSONObject top = new JSONObject(response.getContentAsString());
+        		logger.debug(response.getContentAsString());
+        		JSONArray data = top.getJSONArray("data");
+        		assertTrue("no child groups of myGroup", data.length() == 1);
+        		
+        		JSONObject subGroup = data.getJSONObject(0);
+        		assertEquals("shortName wrong", USER_ONE, subGroup.getString("shortName"));
+        		assertEquals("authorityType wrong", "USER", subGroup.getString("authorityType"));
+        	}
+    			
+    		/**
+    		 * Unlink Group B
+    		 */
+    		{
+    			logger.debug("Unlink Test Link");
+    			Response response = sendRequest(new DeleteRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + groupLinkFullName ), Status.STATUS_OK);
+    			JSONObject top = new JSONObject(response.getContentAsString());
+    			logger.debug(response.getContentAsString());
+
+    		}
+    		
+        	/**
+        	 * Get All Children of myGroup which are GROUPS - should no longer find GROUP B
+        	 */
+        	{
+        		logger.debug("Get child GROUPS of myRootGroup");
+        		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + myRootGroup + "/children?authorityType=GROUP"), Status.STATUS_OK);
+        		JSONObject top = new JSONObject(response.getContentAsString());
+        		logger.debug(response.getContentAsString());
+        		JSONArray data = top.getJSONArray("data");
+        		//TODO TEST failing
+        		
+        		//assertTrue("group B not removed", data.length() == 0);
+        	}
+        	
+    		/**
+    		 * Create a new group (BUFFY)
+    		 */
+        	String myNewGroup = "GROUP_BUFFY";
+    		{
+    			// Delete incase it already exists from a previous test run
+        		sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/BUFFY"), 0);
+        		
+    			JSONObject newGroupJSON = new JSONObject();
+    			Response response = sendRequest(new PostRequest(URL_GROUPS + "/" + myRootGroup +"/children/" + myNewGroup, newGroupJSON.toString(), "application/json" ), Status.STATUS_CREATED);
+    			JSONObject top = new JSONObject(response.getContentAsString());
+    			logger.debug(response.getContentAsString());
+    			JSONObject data = top.getJSONObject("data");
+        		assertEquals("shortName wrong", "BUFFY", data.getString("shortName"));
+        		assertEquals("fullName wrong", myNewGroup, data.getString("fullName"));
+        		assertEquals("authorityType wrong", "GROUP", data.getString("authorityType"));
+    		}
+        	
+    		/**
+        	 * Get All Children of myGroup which are GROUPS - should find GROUP(BUFFY)
+        	 */
+        	{
+        		logger.debug("Get child GROUPS of myRootGroup");
+        		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + myRootGroup + "/children?authorityType=GROUP"), Status.STATUS_OK);
+        		JSONObject top = new JSONObject(response.getContentAsString());
+        		logger.debug(response.getContentAsString());
+        		JSONArray data = top.getJSONArray("data");
+           		for(int i = 0; i < data.length(); i++)
+        		{
+        			JSONObject rootGroup = data.getJSONObject(i);
+        			if(rootGroup.getString("fullName").equals(myNewGroup))
+        			{
+        			
+        			}
+        		}
+
+        	}
+    		
+    		/**
+    		 * Negative tests
+    		 */
+    	
+    	}
+    	finally
+    	{
+    		sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myRootGroup), 0);
+    	}
+    }
+    
+    /**
+     * Detailed test of update group
+     * @throws Exception
+     */
+    public void testUpdateGroup() throws Exception
+    {
+    	String myGroupName = "GT_UG";
+    	String myDisplayName = "GT_UGDisplay";
+    	String myNewDisplayName = "GT_UGDisplayNew";
+    
+    	this.authenticationComponent.setSystemUserAsCurrentUser();
+    	
+    	try
+    	{
+    		/**
+    		 * Create a root group
+    		 */
+    		{
+    			JSONObject newGroupJSON = new JSONObject();
+    			newGroupJSON.put("displayName", myDisplayName); 
+    			sendRequest(new PostRequest(URL_ROOTGROUPS + "/" + myGroupName,  newGroupJSON.toString(), "application/json"), Status.STATUS_CREATED);
+    		}
+    		
+    		/**
+    		 * Now change its display name
+    		 */
+    		{
+    			JSONObject newGroupJSON = new JSONObject();
+    			newGroupJSON.put("displayName", myNewDisplayName); 
+    			Response response = sendRequest(new PutRequest(URL_GROUPS + "/" + myGroupName,  newGroupJSON.toString(), "application/json"), Status.STATUS_OK);    
+    			JSONObject top = new JSONObject(response.getContentAsString());
+        		logger.debug(response.getContentAsString());
+        		JSONObject data = top.getJSONObject("data");
+        		assertTrue(data.length() > 0);
+        		assertEquals("displayName wrong", myNewDisplayName, data.getString("displayName"));
+
+    		}
+    		
+        	/**
+        	 * Now get it and verify that the name has changed
+        	 */
+        	{
+        		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" +  myGroupName), Status.STATUS_OK);
+        		JSONObject top = new JSONObject(response.getContentAsString());
+        		logger.debug(response.getContentAsString());
+        		JSONObject data = top.getJSONObject("data");
+        		assertTrue(data.length() > 0);
+        		assertEquals("displayName wrong", myNewDisplayName, data.getString("displayName"));
+
+        	}   
+        	
+    		/**
+    		 * Negative test
+    		 */
+        	{
+        		JSONObject newGroupJSON = new JSONObject();
+        		newGroupJSON.put("displayName", myNewDisplayName); 
+        		sendRequest(new PutRequest(URL_GROUPS + "/" + "rubbish",  newGroupJSON.toString(), "application/json"), Status.STATUS_NOT_FOUND);    
+        	}
+    	}
+    	finally
+        {
+        	sendRequest(new DeleteRequest(URL_ROOTGROUPS + "/" + myGroupName), 0);
+        }
+    }
+    
+    
+    /**
+     * Detailed test of search groups
+     *<li>if the optional includeInternal parameter is true then will include internal groups, otherwise internalGroups are not returned.</li>
+      <li>If the optional shortNameFilter parameter is set then returns those root groups with a partial match on shortName.</li>
+     */
+    public void testSearchGroups() throws Exception
+    {
+    	 createTestTree();
+    	 
+    	// Search on partial short name
+    	{
+		    Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + "ALFRESCO_ADMIN*"), Status.STATUS_OK);
+		    JSONObject top = new JSONObject(response.getContentAsString());
+		    logger.debug(response.getContentAsString());
+		    JSONArray data = top.getJSONArray("data");
+		    assertEquals("length not 1", 1, data.length());
+ 			JSONObject authority = data.getJSONObject(0);
+			assertEquals("", ADMIN_GROUP, authority.getString("shortName"));
+    	}
+    	
+    	// Search on partial short name with a ?
+    	{
+		    Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + "ALFRE?CO_ADMIN*"), Status.STATUS_OK);
+		    JSONObject top = new JSONObject(response.getContentAsString());
+		    logger.debug(response.getContentAsString());
+		    JSONArray data = top.getJSONArray("data");
+		    assertEquals("length not 1", 1, data.length());
+ 			JSONObject authority = data.getJSONObject(0);
+			assertEquals("", ADMIN_GROUP, authority.getString("shortName"));
+    	}
+    	
+    	// Negative test.
+    	{
+		    Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + "XX?X"), Status.STATUS_OK);
+		    JSONObject top = new JSONObject(response.getContentAsString());
+		    logger.debug(response.getContentAsString());
+		    JSONArray data = top.getJSONArray("data");
+		    assertEquals("length not 0", 0, data.length());
+    	}
+    	
+    	// Search on full shortName
+		{
+		    Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + ADMIN_GROUP), Status.STATUS_OK);
+		    JSONObject top = new JSONObject(response.getContentAsString());
+		    logger.debug(response.getContentAsString());
+		    JSONArray data = top.getJSONArray("data");
+		    assertEquals("length not 1", 1, data.length());
+ 			JSONObject authority = data.getJSONObject(0);
+			assertEquals("", ADMIN_GROUP, authority.getString("shortName"));
+		}
+		
+    	// Search on partial short name of a non root group
+    	{
+		    Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPD ), Status.STATUS_OK);
+		    JSONObject top = new JSONObject(response.getContentAsString());
+		    logger.debug(response.getContentAsString());
+		    //System.out.println(response.getContentAsString());
+		    JSONArray data = top.getJSONArray("data");
+		    assertEquals("length not 1", 1, data.length());
+ 			JSONObject authority = data.getJSONObject(0);
+			assertEquals("", TEST_GROUPD, authority.getString("shortName"));
+
+    	}
+    	
+    	// Search on partial short name of a non root group in default zone
+    	{
+    		String url = URL_GROUPS + "?shortNameFilter=" + TEST_GROUPD + "& zone=" + AuthorityService.ZONE_APP_DEFAULT;
+		    Response response = sendRequest(new GetRequest(url ), Status.STATUS_OK);
+		    JSONObject top = new JSONObject(response.getContentAsString());
+		    logger.debug(response.getContentAsString());
+		    //System.out.println(response.getContentAsString());
+		    JSONArray data = top.getJSONArray("data");
+		    assertEquals("length not 1", 1, data.length());
+ 			JSONObject authority = data.getJSONObject(0);
+			assertEquals("", TEST_GROUPD, authority.getString("shortName"));
+    	}
+    	
+    	// Search for a group (which is not in the default zone) in all zones
+    	{
+		    Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPE ), Status.STATUS_OK);
+		    JSONObject top = new JSONObject(response.getContentAsString());
+		    logger.debug(response.getContentAsString());
+		    //System.out.println(response.getContentAsString());
+		    JSONArray data = top.getJSONArray("data");
+		    assertEquals("length not 1", 1, data.length());
+ 			JSONObject authority = data.getJSONObject(0);
+			assertEquals("Group E not found", TEST_GROUPE, authority.getString("shortName"));
+			
+			// Double check group E is in the share zone
+			Set<String> zones = authorityService.getAuthorityZones(authority.getString("fullName"));
+			assertTrue(zones.contains(AuthorityService.ZONE_APP_SHARE));
+    	}
+    	
+
+//TODO TEST Case failing ?
+//    	// Search for Group E in a specific zone (without name filter)
+//    	{
+//		    Response response = sendRequest(new GetRequest(URL_GROUPS + "?zone=" + AuthorityService.ZONE_APP_SHARE), Status.STATUS_OK);
+//		    JSONObject top = new JSONObject(response.getContentAsString());
+//		    logger.debug(response.getContentAsString());
+//		    System.out.println(response.getContentAsString());
+//		    JSONArray data = top.getJSONArray("data");
+//		    assertEquals("Can't find any groups in Share zone", 1, data.length());
+// 			JSONObject authority = data.getJSONObject(0);
+//			assertEquals("", TEST_GROUPE, authority.getString("shortName"));
+//    	}
+ 
+    	// Search for a group in a specifc non default zone
+    	{
+		    Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPE + "&zone=" + AuthorityService.ZONE_APP_SHARE), Status.STATUS_OK);
+		    JSONObject top = new JSONObject(response.getContentAsString());
+		    logger.debug(response.getContentAsString());
+//		    System.out.println(response.getContentAsString());
+		    JSONArray data = top.getJSONArray("data");
+		    assertEquals("Can't find Group E in Share zone", 1, data.length());
+ 			JSONObject authority = data.getJSONObject(0);
+			assertEquals("", TEST_GROUPE, authority.getString("shortName"));
+    	}
+    	
+    	// Negative test Search for a group in a wrong zone
+    	{
+		    Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPE + "&zone=" + "SOME.THING"), Status.STATUS_OK);
+		    JSONObject top = new JSONObject(response.getContentAsString());
+		    logger.debug(response.getContentAsString());
+//		    System.out.println(response.getContentAsString());
+		    JSONArray data = top.getJSONArray("data");
+		    assertEquals("length not 0", 0, data.length());
+    	}
+    	
+    
+    }
+    
+    public void testSearchGroupsPaging() throws Exception
+    {
+        createTestTree();
+
+        JSONArray data = getDataArray(URL_GROUPS + "?shortNameFilter=*");
+        int defaultSize = data.length();
+        String firstGroup = data.get(0).toString();
+
+        assertTrue("There should be at least 6 groups in default zone!", defaultSize > 5);
+
+        // Test maxItems works
+        data = getDataArray(URL_GROUPS + "?shortNameFilter=*" +"&maxItems=3");
+        assertEquals("There should only be 3 groups!", 3, data.length());
+        assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString());
+        
+        // Test skipCount works
+        data = getDataArray(URL_GROUPS + "?shortNameFilter=*" + "&skipCount=2");
+        assertEquals("The number of groups returned is wrong!", defaultSize-2, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+        
+        // Test maxItems and skipCount
+        data = getDataArray(URL_GROUPS + "?shortNameFilter=*" +"&skipCount=2&maxItems=3");
+        assertEquals("The number of groups returned is wrong!", 3, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+        
+        // Test maxItems and skipCount when maxItems is too big.
+        // Shoudl return last 2 items.
+        int skipCount = defaultSize-2;
+        data = getDataArray(URL_GROUPS + "?shortNameFilter=*" + "&skipCount="+skipCount+"&maxItems=5");
+        assertEquals("The number of groups returned is wrong!", 2, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+    }
+    
+    public void testGetRootGroupsPaging() throws Exception
+    {
+        createTestTree();
+        
+        JSONArray data = getDataArray(URL_ROOTGROUPS);
+        int defaultSize = data.length();
+        String firstGroup = data.get(0).toString();
+        
+        assertTrue("There should be at least 3 groups in default zone!", defaultSize > 2);
+        
+        // Test maxItems works
+        data = getDataArray(URL_ROOTGROUPS + "?maxItems=2");
+        assertEquals("There should only be 2 groups!", 2, data.length());
+        assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString());
+        
+        // Test skipCount works
+        data = getDataArray(URL_ROOTGROUPS + "?skipCount=1");
+        assertEquals("The number of groups returned is wrong!", defaultSize-1, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+        
+        // Test maxItems and skipCount
+        data = getDataArray(URL_ROOTGROUPS + "?skipCount=1&maxItems=2");
+        assertEquals("The number of groups returned is wrong!", 2, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+        
+        // Test maxItems and skipCount when maxItems is too big.
+        // Shoudl return last 2 items.
+        int skipCount = defaultSize-1;
+        data = getDataArray(URL_ROOTGROUPS + "?skipCount="+skipCount+"&maxItems=5");
+        assertEquals("The number of groups returned is wrong!", 1, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+    }
+    
+    public void testGetParentsPaging() throws Exception
+    {
+        createTestTree();
+
+        // Test for immediate parents
+        String baseUrl = URL_GROUPS + "/" + TEST_GROUPD + "/parents";
+        
+        JSONArray data = getDataArray(baseUrl);
+        int defaultSize = data.length();
+        String firstGroup = data.get(0).toString();
+
+        assertEquals("There should be at least 3 groups in default zone!", 3, defaultSize);
+
+        // Test maxItems works
+        data = getDataArray(baseUrl +"?maxItems=2");
+        assertEquals("There should only be 2 groups!", 2, data.length());
+        assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString());
+        
+        // Test skipCount works
+        data = getDataArray(baseUrl + "?skipCount=1");
+        assertEquals("The number of groups returned is wrong!", 2, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+        
+        // Test maxItems and skipCount
+        data = getDataArray(baseUrl + "?skipCount=1&maxItems=1");
+        assertEquals("The number of groups returned is wrong!", 1, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+        
+        // Test maxItems and skipCount when maxItems is too big.
+        // Should return last 2 items.
+        data = getDataArray(baseUrl + "?skipCount=1&maxItems=5");
+        assertEquals("The number of groups returned is wrong!", 2, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+
+        //Test for ALL parents
+        baseUrl = URL_GROUPS + "/" + TEST_GROUPD + "/parents?level=ALL";
+        
+        data = getDataArray(baseUrl);
+        defaultSize = data.length();
+        firstGroup = data.get(0).toString();
+        
+        assertTrue("There should be at least 3 groups in default zone!", defaultSize > 2);
+        
+        // Test maxItems works
+        data = getDataArray(baseUrl +"&maxItems=2");
+        assertEquals("There should only be 2 groups!", 2, data.length());
+        assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString());
+        
+        // Test skipCount works
+        data = getDataArray(baseUrl + "&skipCount=1");
+        assertEquals("The number of groups returned is wrong!", defaultSize-1, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+        
+        // Test maxItems and skipCount
+        data = getDataArray(baseUrl + "&skipCount=1&maxItems=2");
+        assertEquals("The number of groups returned is wrong!", 2, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+        
+        // Test maxItems and skipCount when maxItems is too big.
+        // Shoudl return last 2 items.
+        int skipCount = defaultSize-2;
+        data = getDataArray(baseUrl + "&skipCount="+skipCount+"&maxItems=5");
+        assertEquals("The number of groups returned is wrong!", 2, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+    }
+
+    public void testGetChildGroupsPaging() throws Exception
+    {
+        createTestTree();
+        
+        // Test for immediate parents
+        String baseUrl = URL_GROUPS + "/" + TEST_ROOTGROUP + "/children?authorityType=GROUP";
+        
+        JSONArray data = getDataArray(baseUrl);
+        int defaultSize = data.length();
+        String firstGroup = data.get(0).toString();
+        
+        assertEquals("There should be 6 groups in default zone!", 6, defaultSize);
+        
+        // Test maxItems works
+        data = getDataArray(baseUrl +"&maxItems=2");
+        assertEquals("There should only be 3 groups!", 2, data.length());
+        assertEquals("The first group should be the same!!", firstGroup, data.get(0).toString());
+        
+        // Test skipCount works
+        data = getDataArray(baseUrl + "&skipCount=2");
+        assertEquals("The number of groups returned is wrong!", 4, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+        
+        // Test maxItems and skipCount
+        data = getDataArray(baseUrl + "&skipCount=2&maxItems=2");
+        assertEquals("The number of groups returned is wrong!", 2, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+        
+        // Test maxItems and skipCount when maxItems is too big.
+        // Shoudl return last 2 items.
+        data = getDataArray(baseUrl + "&skipCount=4&maxItems=5");
+        assertEquals("The number of groups returned is wrong!", 2, data.length());
+        assertFalse("The first group should not be the same!!", firstGroup.equals(data.get(0).toString()));
+    }
+
+    private JSONArray getDataArray(String url) throws IOException, JSONException, UnsupportedEncodingException
+    {
+        Response response = sendRequest(new GetRequest(url), Status.STATUS_OK);
+        JSONObject top = new JSONObject(response.getContentAsString());
+        JSONArray data = top.getJSONArray("data");
+        return data;
+    }
+    /**
+     * Detailed test of get Parents
+     */
+    public void testGetParents() throws Exception
+    {
+        createTestTree();
+        
+    	/**
+    	 * Get all parents for the root group ALFRESCO_ADMINISTRATORS groups which has no parents
+    	 */
+    	{
+    		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + ADMIN_GROUP + "/parents"), Status.STATUS_OK);
+    		JSONObject top = new JSONObject(response.getContentAsString());
+    		logger.debug(response.getContentAsString());
+    		JSONArray data = top.getJSONArray("data");
+    		// Top level group has no parents
+    		assertTrue("top level group has no parents", data.length() == 0);
+    	}
+    	
+    	/**
+    	 * Get GROUP B   Which should be a child of TESTROOT
+    	 */
+    	{
+    		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/parents"), Status.STATUS_OK);
+    		JSONObject top = new JSONObject(response.getContentAsString());
+    		logger.debug(response.getContentAsString());
+    		JSONArray data = top.getJSONArray("data");
+    		assertTrue(data.length() > 0);
+    	}
+    	
+       	/**
+    	 * Get GROUP D   Which should be a child of GROUPB child of TESTROOT
+    	 */
+    	{
+    		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPD + "/parents?level=ALL"), Status.STATUS_OK);
+    		JSONObject top = new JSONObject(response.getContentAsString());
+    		logger.debug(response.getContentAsString());
+    		JSONArray data = top.getJSONArray("data");
+    		assertTrue(data.length() >= 2);
+    	}
+
+// TODO parents script does not have zone parameter    	
+//      /**
+//    	 * Get GROUP E   Which should be a child of GROUPB child of TESTROOT but in a different zone
+//    	 */
+//    	{
+//    		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPE + "/parents?level=ALL"), Status.STATUS_OK);
+//    		JSONObject top = new JSONObject(response.getContentAsString());
+//    		logger.debug(response.getContentAsString());
+//    		JSONArray data = top.getJSONArray("data");
+//    		assertTrue(data.length() >= 2);
+//    	}
+    	
+      	/**
+    	 * Negative test Get GROUP D level="rubbish"
+    	 */
+    	{
+    		sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPD + "/parents?level=rubbish"), Status.STATUS_BAD_REQUEST);
+    	}
+    	
+    	/**
+    	 * Negative test GROUP(Rubbish) does not exist
+    	 */
+    	{ 
+    		sendRequest(new GetRequest(URL_GROUPS + "/" + "rubbish" + "/parents?level=all"), Status.STATUS_NOT_FOUND);
+    	
+    	}
+    }
+    
+    /**
+     * Detailed test of get Children
+     */
+    public void testGetChildren() throws Exception
+    {
+        createTestTree();
+            	
+    	/**
+    	 * Get All Children of GROUP B
+    	 */
+    	{
+    		logger.debug("Get all children of GROUP B");
+    		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/children"), Status.STATUS_OK);
+    		JSONObject top = new JSONObject(response.getContentAsString());
+    		logger.debug(response.getContentAsString());
+    		JSONArray data = top.getJSONArray("data");
+    		assertTrue(data.length() > 0);
+    		boolean gotGroupD = false;
+    		boolean gotGroupE = false;
+    		boolean gotUserTwo = false;
+    		boolean gotUserThree = false;
+      		for(int i = 0; i < data.length(); i++)
+    		{
+    			JSONObject authority = data.getJSONObject(i);
+    			if(authority.getString("shortName").equals(TEST_GROUPD))
+    			{
+    				gotGroupD = true;
+    			}
+    			if(authority.getString("shortName").equals(TEST_GROUPE))
+    			{
+    				gotGroupE = true;
+    			}
+    			if(authority.getString("shortName").equals(USER_TWO))
+    			{
+    				gotUserTwo = true;
+    			}
+    			if(authority.getString("shortName").equals(USER_THREE))
+    			{
+    				gotUserThree = true;
+    			}
+    		}
+      		assertEquals("4 groups not returned", 4, data.length());
+      		assertTrue("not got group D", gotGroupD);
+      		assertTrue("not got group E", gotGroupE);
+      		assertTrue("not got user two", gotUserTwo);
+      		assertTrue("not got user three", gotUserThree);
+
+    	}
+    	
+    	/**
+    	 * Get All Children of GROUP B which are GROUPS
+    	 */
+    	{
+    		logger.debug("Get child GROUPS of GROUP B");
+    		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/children?authorityType=GROUP"), Status.STATUS_OK);
+    		JSONObject top = new JSONObject(response.getContentAsString());
+    		logger.debug(response.getContentAsString());
+    		JSONArray data = top.getJSONArray("data");
+    		assertTrue("no child groups of group B", data.length() > 1 );
+    		
+    		boolean gotGroupD = false;
+    		boolean gotGroupE = false;
+    		JSONObject subGroup = data.getJSONObject(0);
+      		for(int i = 0; i < data.length(); i++)
+    		{
+      			JSONObject authority = data.getJSONObject(i);
+    			if(authority.getString("shortName").equals(TEST_GROUPD))
+    			{
+    				gotGroupD = true;
+    			}
+    			else if(authority.getString("shortName").equals(TEST_GROUPE))
+    			{
+    				gotGroupE = true;
+    			}
+    			else
+    			{
+    				fail("unexpected authority returned:" + authority.getString("shortName"));
+    			}
+    		}
+      		assertTrue("not got group D", gotGroupD);
+      		assertTrue("not got group E", gotGroupE);
+      		
+    		assertEquals("authorityType wrong", "GROUP", subGroup.getString("authorityType"));
+      		for(int i = 0; i < data.length(); i++)
+    		{
+      			JSONObject authority = data.getJSONObject(i);
+      			assertEquals("authorityType wrong", "GROUP", authority.getString("authorityType"));      			
+    		}
+    	}
+    	
+    	/**
+    	 * Get All Children of GROUP B which are USERS
+    	 */
+    	{
+    		logger.debug("Get Child Users of Group B");
+    		Response response = sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/children?authorityType=USER"), Status.STATUS_OK);
+    		JSONObject top = new JSONObject(response.getContentAsString());
+    		logger.debug(response.getContentAsString());
+    		JSONArray data = top.getJSONArray("data");
+    		assertTrue(data.length() > 1);
+      		for(int i = 0; i < data.length(); i++)
+    		{
+      			JSONObject authority = data.getJSONObject(i);
+      			assertEquals("authorityType wrong", "USER", authority.getString("authorityType"));      			
+    		}
+    	}
+    	
+    	/**
+    	 * Negative test All Children of GROUP B, bad authorityType
+    	 */
+    	{
+    		sendRequest(new GetRequest(URL_GROUPS + "/" + TEST_GROUPB + "/children?authorityType=XXX"), Status.STATUS_BAD_REQUEST);
+    	}
+    		
+    	/**
+    	 * Negative test GROUP(Rubbish) does not exist
+    	 */
+    	{ 
+    		sendRequest(new GetRequest(URL_GROUPS + "/" + "rubbish" + "/children"), Status.STATUS_NOT_FOUND);
+    	}
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/invitation/InvitationWebScriptTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/invitation/InvitationWebScriptTest.java
new file mode 100644
index 00000000000..99c855db67d
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/invitation/InvitationWebScriptTest.java
@@ -0,0 +1,668 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.invitation;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.invitation.InvitationServiceImpl;
+import org.alfresco.repo.invitation.WorkflowModelNominatedInvitation;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.repo.web.scripts.invite.InviteServiceTest;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.GUID;
+import org.alfresco.util.PropertyMap;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Unit test of Invitation REST API.
+ * 
+ * @see org.alfresco.repo.web.scripts.site.SiteServiceTest which tests invitations to Web sites.
+ * 
+ * @author Mark Rogers
+ */
+public class InvitationWebScriptTest extends BaseWebScriptTest
+{
+    private final static QName avatarQName = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "test");
+
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private PersonService personService;
+    private NodeService nodeService;
+    private TransactionService transactionService;
+    private InvitationServiceImpl invitationServiceImpl;
+
+    private String userOne = "InvitationTestOne" + GUID.generate();
+    private String userTwo = "InvitationTestTwo" + GUID.generate();
+    private String userThree = "InvitationTestThree" + GUID.generate();
+
+    private static final String URL_SITES = "/api/sites";
+    private static final String URL_INVITATIONS = "/api/invitations";
+
+    private List<String> createdSites = new ArrayList<String>(5);
+    private List<Tracker> createdInvitations = new ArrayList<Tracker>(10);
+
+    private final Map<String, Map<String, String>> userProperties = new HashMap<String, Map<String,String>>(3);
+
+    private class Tracker
+    {
+        public Tracker(String inviteId, String siteName)
+        {
+            this.inviteId = inviteId;
+            this.siteName = siteName;
+        }
+
+        public String inviteId;
+        public String siteName;
+    }
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        this.authenticationService = (MutableAuthenticationService) getServer().getApplicationContext().getBean(
+                    "AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent) getServer().getApplicationContext().getBean(
+                    "authenticationComponent");
+        this.personService = (PersonService) getServer().getApplicationContext().getBean("PersonService");
+        this.nodeService = (NodeService) getServer().getApplicationContext().getBean("NodeService");
+        this.transactionService = (TransactionService) getServer().getApplicationContext().getBean("TransactionService");
+        this.invitationServiceImpl = (InvitationServiceImpl) getServer().getApplicationContext().getBean("invitationService");
+        
+        // turn off email sending to prevent errors during unit testing 
+        // (or sending out email by accident from tests)
+        InviteServiceTest.configureMailExecutorForTestMode(this.getServer());
+        
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+
+        // Create users
+        createUser(userOne, "Joe", "Bloggs");
+        createUser(userTwo, "Jane", "Doe");
+        createUser(userThree, "Nick", "Smith");
+
+        // Do tests as user one
+        this.authenticationComponent.setCurrentUser(userOne);
+    }
+
+    private void createUser(String userName, String firstName, String lastName)
+    {
+        this.authenticationService.createAuthentication(userName, "PWD".toCharArray());
+        PropertyMap ppOne = new PropertyMap(5);
+        ppOne.put(ContentModel.PROP_USERNAME, userName);
+        ppOne.put(ContentModel.PROP_FIRSTNAME, firstName);
+        ppOne.put(ContentModel.PROP_LASTNAME, lastName);
+        String email = firstName+"@email.com";
+        ppOne.put(ContentModel.PROP_EMAIL, email);
+        ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+        NodeRef person = personService.createPerson(ppOne);
+        String avatarUrl = makeAvatar(nodeService,person);
+
+        // Create expected user properties
+        HashMap<String, String> properties = new HashMap<String, String>(4);
+        properties.put("firstName", firstName);
+        properties.put("lastName", lastName);
+        properties.put("email", email);
+        properties.put("avatar", avatarUrl);
+        userProperties.put(userName, properties);
+    }
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+
+        RetryingTransactionCallback<Void> deleteCallback = new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                personService.deletePerson(userOne);
+                personService.deletePerson(userTwo);
+                personService.deletePerson(userThree);
+                return null;
+            }
+        };
+        transactionService.getRetryingTransactionHelper().doInTransaction(deleteCallback);
+
+        // Tidy-up any sites created during the execution of the test
+        for (String shortName : this.createdSites)
+        {
+            sendRequest(new DeleteRequest(URL_SITES + "/" + shortName), 0);
+        }
+
+        // Clear the list
+        this.createdSites.clear();
+        // Clear the list
+        this.createdInvitations.clear();
+    }
+
+    private JSONObject createSite(String sitePreset, String shortName, String title, String description,
+                SiteVisibility visibility, int expectedStatus) throws Exception
+    {
+        JSONObject site = new JSONObject();
+        site.put("sitePreset", sitePreset);
+        site.put("shortName", shortName);
+        site.put("title", title);
+        site.put("description", description);
+        site.put("visibility", visibility.toString());
+        Response response = sendRequest(new PostRequest(URL_SITES, site.toString(), "application/json"), expectedStatus);
+        this.createdSites.add(shortName);
+        return new JSONObject(response.getContentAsString());
+    }
+
+    /**
+     * Detailed Test of List Invitation Web Script. 
+     * Using URL: /api/invitations
+     * 
+     * @param requireAcceptance true if a workflow requiring acceptance is being used
+     * @throws Exception
+     */
+    protected void testInvitationsGet(boolean requireAcceptance) throws Exception
+    {
+        // Create two sites.
+        String shortNameSiteA = GUID.generate();
+        createSite("myPreset", shortNameSiteA, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+
+        String shortNameSiteB = GUID.generate();
+        createSite("myPreset", shortNameSiteB, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+
+        // Create a moderated invitation on SiteA, USER_TWO
+        String inviteeComments = "Please sir, let $* me in";
+        String userName = userTwo;
+        String roleName = SiteModel.SITE_CONSUMER;
+        String moderatedIdAUSER_TWO = createModeratedInvitation(shortNameSiteA, inviteeComments, userName, roleName);
+
+        // Create a moderated invitation on SiteB, USER_TWO
+        String moderatedIdBUSER_TWO = createModeratedInvitation(shortNameSiteB, inviteeComments, userName, roleName);
+
+        String inviteeCommentsB = "Please sir, let $* me in";
+        String userNameB = userThree;
+        String roleNameB = SiteModel.SITE_CONSUMER;
+
+        // Create a moderated invitation on SiteB, USER_THREE
+        String moderatedIdBUSER_THREE = createModeratedInvitation(shortNameSiteB, inviteeCommentsB, userNameB,
+                    roleNameB);
+
+        String inviteeFirstName = "Buffy";
+        String inviteeLastName = "Summers";
+        String inviteeEmail = "buffy@sunnydale";
+        String inviteeUserName = userName;
+        String serverPath = "http://localhost:8081/share/";
+        String acceptURL = "page/accept-invite";
+        String rejectURL = "page/reject-invite";
+
+        // Create a nominated invitation on SiteA, UsER_TWO
+        String nominatedId = createNominatedInvitation(shortNameSiteA, inviteeFirstName, inviteeLastName, inviteeEmail,
+                    inviteeUserName, roleName, serverPath, acceptURL, rejectURL);
+
+        // search by user - find USER_TWO's three invitations
+        {
+            Response response = sendRequest(new GetRequest(URL_INVITATIONS + "?inviteeUserName=" + userTwo), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            // System.out.println(response.getContentAsString());
+            JSONArray data = top.getJSONArray("data");
+
+            JSONObject moderatedAInv = getInvitation(moderatedIdAUSER_TWO, data);
+            assertNotNull("Moderated invitation to Site A not present!", moderatedAInv);
+            JSONObject moderatedBInv = getInvitation(moderatedIdBUSER_TWO, data);
+            assertNotNull("Moderated invitation to Site B not present!", moderatedBInv);
+            JSONObject nominatedInv = getInvitation(nominatedId, data);
+            if (requireAcceptance)
+            {
+                assertNotNull("Nominated invitation to Site A not present!", nominatedInv);
+            }
+
+            checkJSONInvitations(data);
+        }
+
+        
+        // search by type - should find three moderated invitations
+        {
+            Response response = sendRequest(new GetRequest(URL_INVITATIONS + "?invitationType=MODERATED"), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            // System.out.println(response.getContentAsString());
+            JSONArray data = top.getJSONArray("data");
+            for (int i = 0; i < data.length(); i++)
+            {
+                JSONObject obj = data.getJSONObject(i);
+                assertEquals("Wrong invitation type", "MODERATED", obj.getString("invitationType"));
+            }
+            JSONObject moderatedATwoInv = getInvitation(moderatedIdAUSER_TWO, data);
+            assertNotNull("first is null", moderatedATwoInv);
+            JSONObject moderatedBTwoInv = getInvitation(moderatedIdBUSER_TWO, data);
+            assertNotNull("second is null", moderatedBTwoInv);
+            JSONObject moderatedBThreeInv = getInvitation(moderatedIdBUSER_THREE, data);
+            assertNotNull("third is null", moderatedBThreeInv);
+        }
+
+        // Search by type and site
+        {
+            Response response = sendRequest(new GetRequest(URL_INVITATIONS + "?invitationType=MODERATED&resourceName="
+                        + shortNameSiteA + "&resourceType=WEB_SITE"), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            JSONArray data = top.getJSONArray("data");
+            assertEquals("One moderated invitations not found", 1, data.length());
+        }
+
+        // negative test - unknown resourceType
+        {
+            Response response = sendRequest(new GetRequest(URL_INVITATIONS + "?invitationType=MODERATED&resourceName="
+                        + shortNameSiteA + "&resourceType=madeUpStuff"), 500);
+            assertEquals(500, response.getStatus());
+            JSONObject top = new JSONObject(response.getContentAsString());
+            assertNotNull(top.getString("message"));
+        }
+    }
+    
+    /**
+     * Detailed Test of List Invitation Web Script. 
+     * Using URL: /api/invitations
+     * 
+     * @throws Exception
+     */
+    public void testInvitationsGet() throws Exception
+    {
+        testInvitationsGet(false);
+    }
+    
+    /**
+     * Detailed Test of List Invitation Web Script using legacy workflow which requires user acceptance
+     * Using URL: /api/invitations
+     * 
+     * @throws Exception
+     */
+    public void testInvitationsGetRequireNominatedAcceptance() throws Exception
+    {
+        this.invitationServiceImpl.setNominatedInvitationWorkflowId(
+                WorkflowModelNominatedInvitation.WORKFLOW_DEFINITION_NAME_ACTIVITI_INVITE);
+        testInvitationsGet(true);
+        // Reset back to default
+        this.invitationServiceImpl.setNominatedInvitationWorkflowId(
+                WorkflowModelNominatedInvitation.WORKFLOW_DEFINITION_NAME_ACTIVITI_ADD_DIRECT);
+    }
+
+    /**
+     * Detailed Test of List Invitation Web Script. 
+     * Using URL: /api/sites/{shortname}/invitations
+     * 
+     * @param requireAcceptance true if a workflow requiring acceptance is being used
+     * @throws Exception
+     */
+    protected void testSiteInvitationsGet(boolean requireAcceptance) throws Exception
+    {
+        // Create two sites.
+        String shortNameSiteA = GUID.generate();
+        createSite("myPreset", shortNameSiteA, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+
+        String shortNameSiteB = GUID.generate();
+        createSite("myPreset", shortNameSiteB, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+
+        // Create a moderated invitation on SiteA, USER_TWO
+        String inviteeComments = "Please sir, let $* me in";
+        String userName = userTwo;
+        String roleName = SiteModel.SITE_CONSUMER;
+        String moderatedIdAUSER_TWO = createModeratedInvitation(shortNameSiteA, inviteeComments, userName, roleName);
+
+        // Create a moderated invitation on SiteB, USER_TWO
+        String moderatedIdBUSER_TWO = createModeratedInvitation(shortNameSiteB, inviteeComments, userName, roleName);
+
+        String inviteeCommentsB = "Please sir, let $* me in";
+        String userNameB = userThree;
+        String roleNameB = SiteModel.SITE_CONSUMER;
+
+        // Create a moderated invitation on SiteB, USER_THREE
+        String moderatedIdBUSER_THREE = createModeratedInvitation(shortNameSiteB, inviteeCommentsB, userNameB,
+                    roleNameB);
+
+        String inviteeFirstName = "Buffy";
+        String inviteeLastName = "Summers";
+        String inviteeEmail = "buffy@sunnydale";
+        String inviteeUserName = userName;
+        String serverPath = "http://localhost:8081/share/";
+        String acceptURL = "page/accept-invite";
+        String rejectURL = "page/reject-invite";
+
+        // Create a nominated invitation on SiteA, UsER_TWO
+        String nominatedId = createNominatedInvitation(shortNameSiteA, inviteeFirstName, inviteeLastName, inviteeEmail,
+                    inviteeUserName, roleName, serverPath, acceptURL, rejectURL);
+
+        // search for all invitations to site A: One Moderated Usr2, One Nominated User2
+        {
+            String allSiteAUrl = URL_SITES +"/" + shortNameSiteA + "/invitations";
+            Response response = sendRequest(new GetRequest(allSiteAUrl), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            // System.out.println(response.getContentAsString());
+            JSONArray data = top.getJSONArray("data");
+            assertEquals("Wrong number of invitations!", requireAcceptance ? 2 : 1, data.length());
+            
+            JSONObject moderatedAInv = getInvitation(moderatedIdAUSER_TWO, data);
+            assertNotNull("Moderated invitation to Site A not present!", moderatedAInv);
+            JSONObject nominatedInv = getInvitation(nominatedId, data);
+            if (requireAcceptance)
+            {
+                assertNotNull("Nominated invitation to Site A not present!", nominatedInv);
+            }
+            checkJSONInvitations(data);
+        }
+
+        // search for all invitations to site B: One Moderated User2, One Moderated User3.
+        {
+            String allSiteBUrl = URL_SITES +"/" + shortNameSiteB + "/invitations";
+            Response response = sendRequest(new GetRequest(allSiteBUrl), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            // System.out.println(response.getContentAsString());
+            JSONArray data = top.getJSONArray("data");
+            assertEquals("Wrong number of invitations!", 2, data.length());
+            
+            JSONObject moderatedB2Inv = getInvitation(moderatedIdBUSER_TWO, data);
+            assertNotNull("Moderated invitation User 2 to Site B not present!", moderatedB2Inv);
+            JSONObject moderatedB3Inv = getInvitation(moderatedIdBUSER_THREE, data);
+            assertNotNull("Moderated invitation User 3 to Site B not present!", moderatedB3Inv);
+            checkJSONInvitations(data);
+        }
+        
+        // search SiteA by type Moderated: One Moderated User2
+        {
+            String siteAModeratedUrl = URL_SITES + "/" +shortNameSiteA + "/invitations?invitationType=MODERATED";
+            Response response = sendRequest(new GetRequest(siteAModeratedUrl), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            // System.out.println(response.getContentAsString());
+            JSONArray data = top.getJSONArray("data");
+            assertEquals(1, data.length());
+            JSONObject invitation = data.getJSONObject(0);
+            assertEquals("Wrong invitation type", "MODERATED", invitation.getString("invitationType"));
+            JSONObject moderatedATwoInv = getInvitation(moderatedIdAUSER_TWO, data);
+            assertNotNull("first is null", moderatedATwoInv);
+        }
+        
+        // search SiteA by type Nominated: One Nominated User2
+        if (requireAcceptance) {
+            String siteANominatedUrl = URL_SITES + "/" +shortNameSiteA + "/invitations?invitationType=NOMINATED";
+            Response response = sendRequest(new GetRequest(siteANominatedUrl), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            // System.out.println(response.getContentAsString());
+            JSONArray data = top.getJSONArray("data");
+            assertEquals(1, data.length());
+            JSONObject invitation = data.getJSONObject(0);
+            assertEquals("Wrong invitation type", "NOMINATED", invitation.getString("invitationType"));
+            JSONObject nominatedATwoInv = getInvitation(nominatedId, data);
+            assertNotNull("first is null", nominatedATwoInv);
+        }
+        
+        // search SiteB by userId 2: One Moderated User2
+        {
+            String siteBUser2Url = URL_SITES + "/" +shortNameSiteB + "/invitations?inviteeUserName=" + userTwo;
+            Response response = sendRequest(new GetRequest(siteBUser2Url), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            // System.out.println(response.getContentAsString());
+            JSONArray data = top.getJSONArray("data");
+            assertEquals(1, data.length());
+            JSONObject invitation = data.getJSONObject(0);
+            assertEquals("Wrong invitation user", userTwo, invitation.getString("inviteeUserName"));
+            JSONObject moderatedBTwoInv = getInvitation(moderatedIdBUSER_TWO, data);
+            assertNotNull("first is null", moderatedBTwoInv);
+        }
+        
+        // search SiteB by userId 2: One Moderated User2
+        {
+            String siteBUser2Url = URL_SITES + "/" +shortNameSiteB + "/invitations?inviteeUserName=" + userThree;
+            Response response = sendRequest(new GetRequest(siteBUser2Url), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            // System.out.println(response.getContentAsString());
+            JSONArray data = top.getJSONArray("data");
+            assertEquals(1, data.length());
+            JSONObject invitation = data.getJSONObject(0);
+            assertEquals("Wrong invitation user", userThree, invitation.getString("inviteeUserName"));
+            JSONObject moderatedBThreeInv = getInvitation(moderatedIdBUSER_THREE, data);
+            assertNotNull("first is null", moderatedBThreeInv);
+        }
+
+        // negative test - unknown resourceType
+        {
+            Response response = sendRequest(new GetRequest(URL_INVITATIONS + "?invitationType=MODERATED&resourceName="
+                        + shortNameSiteA + "&resourceType=madeUpStuff"), 500);
+            assertEquals(500, response.getStatus());
+            JSONObject top = new JSONObject(response.getContentAsString());
+            assertNotNull(top.getString("message"));
+        }
+    }
+    
+    /**
+     * Detailed Test of List Invitation Web Script. 
+     * Using URL: /api/sites/{shortname}/invitations
+     * 
+     * @throws Exception
+     */
+    public void testSiteInvitationsGet() throws Exception
+    {
+        testSiteInvitationsGet(false);
+    }
+    
+    /**
+     * Detailed Test of List Invitation Web Script using legacy workflow which requires user acceptance.
+     * Using URL: /api/sites/{shortname}/invitations
+     * 
+     * @throws Exception
+     */
+    public void testSiteInvitationsGetRequireNominatedAcceptance() throws Exception
+    {
+        this.invitationServiceImpl.setNominatedInvitationWorkflowId(
+                WorkflowModelNominatedInvitation.WORKFLOW_DEFINITION_NAME_ACTIVITI_INVITE);
+        testSiteInvitationsGet(true);
+        // Reset back to default
+        this.invitationServiceImpl.setNominatedInvitationWorkflowId(
+                WorkflowModelNominatedInvitation.WORKFLOW_DEFINITION_NAME_ACTIVITI_ADD_DIRECT);
+    }
+
+    private void checkJSONInvitations(JSONArray data) throws JSONException
+    {
+        for (int i = 0; i < data.length(); i++)
+        {
+            JSONObject invitation = data.getJSONObject(i);
+            String userId = invitation.getString("inviteeUserName");
+         
+            // Check invitee info for Nominated invitation.
+            Map<String, String> expectedProps = userProperties.get(userId);
+            JSONObject invitee = invitation.getJSONObject("invitee");
+            assertNotNull(invitee);
+            assertEquals("User name is wrong for user: " + i, userId, invitee.getString("userName"));
+            assertEquals("Avatar URI is wrong for user: " + i, expectedProps.get("avatar"), invitee.getString("avatar"));
+            assertEquals("First name is wrong!", expectedProps.get("firstName"), invitee.getString("firstName"));
+            assertEquals("Last name is wrong!", expectedProps.get("lastName"), invitee.getString("lastName"));
+        }
+    }
+
+    public static String makeAvatar(final NodeService nodeService, final NodeRef person)
+    {
+        nodeService.addAspect(person, ContentModel.ASPECT_PREFERENCES, null);
+        ChildAssociationRef assoc = nodeService.createNode(person, ContentModel.ASSOC_PREFERENCE_IMAGE, avatarQName,
+                    ContentModel.TYPE_CONTENT);
+        NodeRef avatar = assoc.getChildRef();
+        nodeService.createAssociation(person, avatar, ContentModel.ASSOC_AVATAR);
+        return "api/node/" + avatar + "/content/thumbnails/avatar";
+    }
+
+    private String createNominatedInvitation(String siteName, String inviteeFirstName, String inviteeLastName,
+                String inviteeEmail, String inviteeUserName, String inviteeRoleName, String serverPath,
+                String acceptURL, String rejectURL) throws Exception
+    {
+        /*
+         * Create a new nominated invitation
+         */
+        JSONObject newInvitation = new JSONObject();
+
+        newInvitation.put("invitationType", "NOMINATED");
+        newInvitation.put("inviteeRoleName", inviteeRoleName);
+        if (inviteeUserName != null)
+        {
+            // nominate an existing user
+            newInvitation.put("inviteeUserName", inviteeUserName);
+        } else
+        {
+            // nominate someone else
+            newInvitation.put("inviteeFirstName", inviteeFirstName);
+            newInvitation.put("inviteeLastName", inviteeLastName);
+            newInvitation.put("inviteeEmail", inviteeEmail);
+        }
+        newInvitation.put("serverPath", serverPath);
+        newInvitation.put("acceptURL", acceptURL);
+        newInvitation.put("rejectURL", rejectURL);
+
+        Response response = sendRequest(new PostRequest(URL_SITES + "/" + siteName + "/invitations", newInvitation
+                    .toString(), "application/json"), 201);
+        JSONObject top = new JSONObject(response.getContentAsString());
+        JSONObject data = top.getJSONObject("data");
+        String inviteId = data.getString("inviteId");
+
+        createdInvitations.add(new Tracker(inviteId, siteName));
+
+        return inviteId;
+    }
+
+    public void testDeleteInvitation() throws Exception
+    {
+        String nominatedId = null;
+        String shortNameSiteA = GUID.generate();
+
+        // Create a site where the action will take place
+        createSite("myPreset", shortNameSiteA, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+
+        // create an invitation for an external user
+        {
+            String inviteeFirstName = "Buffy" + GUID.generate();
+            String inviteeLastName = "Summers";
+            String inviteeEmail = "inviteeVA3Rtu@alfrescotesting.com";
+            // set null in order to create an InvitationWorkflowType.NOMINATED_EXTERNAL invitation
+            String inviteeUserName = null;
+            String serverPath = "http://localhost:8081/share/";
+            String acceptURL = "page/accept-invite";
+            String rejectURL = "page/reject-invite";
+
+            // Create an external nominated invitation on SiteA
+            nominatedId = createNominatedInvitation(shortNameSiteA, inviteeFirstName, inviteeLastName, inviteeEmail, inviteeUserName,
+                    SiteModel.SITE_COLLABORATOR, serverPath, acceptURL, rejectURL);
+        }
+        // search for all invitations to site A: one nominated should be found for user Buffy... Summers
+        {
+            JSONArray data = queryCurrentInvitationList(shortNameSiteA);
+            assertEquals("Wrong number of invitations!", 1, data.length());
+            JSONObject nominatedInv = getInvitation(nominatedId, data);
+            assertNotNull("Nominated invitation to Site A not present!", nominatedInv);
+        }
+
+        // now delete it
+        deleteInvitation(nominatedId, shortNameSiteA, 200);
+
+        // list the pending invitations and check that it is empty
+        {
+            JSONArray data = queryCurrentInvitationList(shortNameSiteA);
+            assertEquals("Wrong number of invitations!", 0, data.length());
+            JSONObject nominatedInv = getInvitation(nominatedId, data);
+            assertNull("Nominated invitation to Site A present!", nominatedInv);
+        }
+        // deleting the invitation was successful
+    }
+
+    private JSONArray queryCurrentInvitationList(String shortNameSiteA) throws IOException, JSONException, UnsupportedEncodingException
+    {
+        String allSiteAUrl = URL_SITES + "/" + shortNameSiteA + "/invitations";
+        Response response = sendRequest(new GetRequest(allSiteAUrl), 200);
+        JSONObject top = new JSONObject(response.getContentAsString());
+        return top.getJSONArray("data");
+    }
+
+    void deleteInvitation(String invitationID, String siteShortName, int expectedStatus) throws Exception
+    {
+        assertNotNull(invitationID);
+        assertNotNull(siteShortName);
+        assertFalse(invitationID.isEmpty());
+        assertFalse(siteShortName.isEmpty());
+
+        Response response = sendRequest(new DeleteRequest(URL_SITES + "/" + siteShortName + "/invitations/" + invitationID), expectedStatus);
+        assertNotNull(new JSONObject(response.getContentAsString()));
+    }
+
+    private String createModeratedInvitation(String siteName, String inviteeComments, String inviteeUserName,
+                String inviteeRoleName) throws Exception
+    {
+        /*
+         * Create a new moderated invitation
+         */
+        JSONObject newInvitation = new JSONObject();
+
+        newInvitation.put("invitationType", "MODERATED");
+        newInvitation.put("inviteeRoleName", inviteeRoleName);
+        newInvitation.put("inviteeComments", inviteeComments);
+        newInvitation.put("inviteeUserName", inviteeUserName);
+        Response response = sendRequest(new PostRequest(URL_SITES + "/" + siteName + "/invitations", newInvitation
+                    .toString(), "application/json"), 201);
+        JSONObject top = new JSONObject(response.getContentAsString());
+        JSONObject data = top.getJSONObject("data");
+        String inviteId = data.getString("inviteId");
+
+        createdInvitations.add(new Tracker(inviteId, siteName));
+
+        return inviteId;
+    }
+
+    private JSONObject getInvitation(String inviteId, JSONArray data) throws Exception
+    {
+        for (int i = 0; i < data.length(); i++)
+        {
+            JSONObject obj = data.getJSONObject(i);
+            if (inviteId.equals(obj.getString("inviteId")))
+            {
+                return obj;
+            }
+        }
+        return null;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java
new file mode 100644
index 00000000000..4b5a32ae7ed
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java
@@ -0,0 +1,1264 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.invite;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.executer.MailActionExecuter;
+import org.alfresco.repo.invitation.InvitationServiceImpl;
+import org.alfresco.repo.invitation.WorkflowModelNominatedInvitation;
+import org.alfresco.repo.invitation.script.ScriptInvitationService;
+import org.alfresco.repo.invitation.site.InviteInfo;
+import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.cmr.workflow.WorkflowDefinition;
+import org.alfresco.service.cmr.workflow.WorkflowInstance;
+import org.alfresco.service.cmr.workflow.WorkflowService;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.GUID;
+import org.alfresco.util.PropertyMap;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.alfresco.util.testing.category.RedundantTests;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Unit Test to test Invite Web Script API
+ *
+ * @author Glen Johnson at Alfresco dot com
+ */
+@Category(LuceneTests.class)
+public class InviteServiceTest extends BaseWebScriptTest
+{
+    // member variables for service instances
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private PersonService personService;
+    private SiteService siteService;
+    private NodeService nodeService;
+    private WorkflowService workflowService;
+    private MutableAuthenticationDao mutableAuthenticationDao;
+    private TransactionService transactionService;
+    private NodeArchiveService nodeArchiveService;
+    private InvitationServiceImpl invitationServiceImpl;
+
+    // stores invitee email addresses, one entry for each "start invite" operation
+    // invoked, so that resources created for each invitee for each test
+    // can be removed in the tearDown() method
+    private List<String> inviteeEmailAddrs;
+
+    private static final String WF_DEFINITION_INVITE = WorkflowModelNominatedInvitation.WORKFLOW_DEFINITION_NAME_ACTIVITI_INVITE;
+
+    private static final String USER_INVITER = "InviterUser";
+    private static final String USER_INVITER_2 = "InviterUser2";
+    private static final String INVITEE_FIRSTNAME = "InviteeFirstName";
+    private static final String INVITEE_LASTNAME = "InviteeLastName";
+    private static final String INVITER_EMAIL = "FirstName123.LastName123@email.com";
+    private static final String INVITER_EMAIL_2 = "FirstNameabc.LastNameabc@email.com";
+    private static final String INVITEE_EMAIL_DOMAIN = "alfrescotesting.com";
+    private static final String INVITEE_EMAIL_PREFIX = "invitee";
+    private static final String INVITEE_SITE_ROLE = SiteModel.SITE_COLLABORATOR;
+    private static final String SITE_SHORT_NAME_INVITE_1 = "SiteOneInviteTest";
+    private static final String SITE_SHORT_NAME_INVITE_2 = "SiteTwoInviteTest";
+    private static final String SITE_SHORT_NAME_INVITE_3 = "SiteThreeInviteTest";
+
+    private static final String URL_INVITE = "/api/invite";
+    private static final String URL_INVITES = "/api/invites";
+
+    private static final String URL_SITES = "/api/sites";
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        /**
+         * We don't want to be authenticated as 'system' but run as 'InviterUser', because then
+         * 'system' will be the creator for the sites and 'inviterUser' will be a nobody.
+         */
+        AuthenticationUtil.clearCurrentSecurityContext();
+
+        // get references to services
+        this.authenticationService = (MutableAuthenticationService) getServer().getApplicationContext()
+                .getBean("AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent) getServer().getApplicationContext()
+                .getBean("AuthenticationComponent");
+        this.personService = (PersonService) getServer().getApplicationContext().getBean("PersonService");
+        this.siteService = (SiteService) getServer().getApplicationContext().getBean("SiteService");
+        this.nodeService = (NodeService) getServer().getApplicationContext().getBean("NodeService");
+        this.workflowService = (WorkflowService) getServer().getApplicationContext().getBean("WorkflowService");
+        this.mutableAuthenticationDao = (MutableAuthenticationDao) getServer().getApplicationContext()
+                .getBean("authenticationDao");
+        this.transactionService = (TransactionService) getServer().getApplicationContext()
+                .getBean("TransactionService");
+        this.nodeArchiveService = (NodeArchiveService)getServer().getApplicationContext().getBean("nodeArchiveService");
+        this.invitationServiceImpl = (InvitationServiceImpl) getServer().getApplicationContext().getBean("invitationService");
+        ScriptInvitationService scriptInvitationService = (ScriptInvitationService) getServer().getApplicationContext().getBean("invitationServiceScript");
+        scriptInvitationService.setSiteService(this.siteService);
+
+        configureMailExecutorForTestMode(this.getServer());
+
+        // We're using a MailActionExecuter defined in outboundSMTP-test-context.xml which
+        // sets the testMode property to true via spring injection. This will prevent emails
+        // from being sent from within this test case.
+        // This MailExecutorAction bean is named "test-mail" but is in all other respects equivalent to the
+        // 'real' executer bean. It is automatically included during OutboundSMTP subsystem startup.
+
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>(){
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                //
+                // various setup operations which need to be run as system user
+                //
+                AuthenticationUtil.runAs(new RunAsWork<Object>()
+                {
+                    public Object doWork() throws Exception
+                    {
+                        // Create new invitee email address list
+                        inviteeEmailAddrs = new ArrayList<String>();
+
+                        // Create inviter person
+                        createPerson(PERSON_FIRSTNAME, PERSON_LASTNAME, USER_INVITER, INVITER_EMAIL);
+
+                        // Create inviter2 person
+                        createPerson(PERSON_FIRSTNAME, PERSON_LASTNAME, USER_INVITER_2, INVITER_EMAIL_2);
+
+                        return null;
+                    }
+                }, AuthenticationUtil.getSystemUserName());
+
+                // The creation of sites is heavily dependent on the authenticated user.  We must ensure that,
+                // when doing the runAs below, the user both 'runAs' and 'fullyAuthenticated'.  In order for
+                // this to be the case, the security context MUST BE EMPTY now.  We could do the old
+                // "defensive clear", but really there should not be any lurking authentications on this thread
+                // after the context starts up.  If there are, that is a bug, and we fail explicitly here.
+                String residuallyAuthenticatedUser = AuthenticationUtil.getFullyAuthenticatedUser();
+                assertNull(
+                        "Residual authentication on context-initiating thread (this thread):" + residuallyAuthenticatedUser,
+                        residuallyAuthenticatedUser);
+
+                //
+                // various setup operations which need to be run as inviter user
+                //
+                AuthenticationUtil.runAs(new RunAsWork<Object>()
+                {
+                    public Object doWork() throws Exception
+                    {
+                        // Create first site for Inviter to invite Invitee to
+                        SiteInfo siteInfo = siteService.getSite(SITE_SHORT_NAME_INVITE_1);
+                        if (siteInfo == null)
+                        {
+                            siteService.createSite("InviteSitePreset", SITE_SHORT_NAME_INVITE_1,
+                                    "InviteSiteTitle", "InviteSiteDescription", SiteVisibility.PUBLIC);
+                        }
+
+                        // Create second site for inviter to invite invitee to
+                        siteInfo = siteService.getSite(SITE_SHORT_NAME_INVITE_2);
+                        if (siteInfo == null)
+                        {
+                            siteService.createSite("InviteSitePreset", SITE_SHORT_NAME_INVITE_2,
+                                    "InviteSiteTitle", "InviteSiteDescription", SiteVisibility.PUBLIC);
+                        }
+
+                        // Create third site for inviter to invite invitee to
+                        siteInfo = InviteServiceTest.this.siteService.getSite(SITE_SHORT_NAME_INVITE_3);
+                        if (siteInfo == null)
+                        {
+                            siteService.createSite(
+                                "InviteSitePreset", SITE_SHORT_NAME_INVITE_3,
+                                "InviteSiteTitle", "InviteSiteDescription", SiteVisibility.PUBLIC);
+                        }
+
+                        // set inviter2's role on third site to collaborator
+                        String inviterSiteRole = siteService.getMembersRole(SITE_SHORT_NAME_INVITE_3, USER_INVITER_2);
+                        if ((inviterSiteRole == null) || (inviterSiteRole.equals(SiteModel.SITE_COLLABORATOR) == false))
+                        {
+                            siteService.setMembership(SITE_SHORT_NAME_INVITE_3, USER_INVITER_2, SiteModel.SITE_COLLABORATOR);
+                        }
+
+                        return null;
+                    }
+                }, USER_INVITER);
+
+                // Do tests as inviter user
+                InviteServiceTest.this.authenticationComponent.setCurrentUser(USER_INVITER);
+                return null;
+            }});
+    }
+
+    /**
+     * This method turns off email-sending within the MailActionExecuter bean.
+     */
+    public static void configureMailExecutorForTestMode(TestWebScriptServer server)
+    {
+    	// This test class depends on a MailActionExecuter bean which sends out emails
+    	// in a live system. We want to prevent these emails from being sent during
+    	// test execution.
+    	// To do that, we need to get at the outboundSMTP-context.xml and change its
+    	// "mail" MailActionExecuter bean to test mode. setTestMode(true) on that object
+    	// will turn off email sending.
+    	// But that bean is defined within a subsystem i.e. a child application context.
+
+    	// There are a number of ways we could do this, none of them perfect.
+    	//
+    	// 1. Expose the setTestMode(boolean) method in the subsystem API.
+    	//    We could have the "mail" bean implement a "TestModeable" interface and
+    	//    expose that through the proxy.
+    	//    But that would mean that the setTestMode method would be available in the
+    	//    live system too, which is not ideal.
+    	// 2. Replace the "mail" bean in outboundSMTP-context.xml with an alternative in a
+    	//    different subsystem context file as described in
+    	//    http://wiki.alfresco.com/wiki/Alfresco_Subsystems#Debugging_Alfresco_Subsystems
+    	//    But to do that, we'd have to reproduce all the spring config for that bean
+    	//    and add a testMode property. Again not ideal.
+    	// 3. Hack into the "mail" bean by programmatically going through the known applicationContext
+    	//    and bean structure. This is not ideal either, but it has no effect on product code
+    	//    and isolates all the hacking into this test class.
+    	//
+    	// Therefore we've decided to do [3].
+
+		ChildApplicationContextFactory outboundSmptSubsystem
+            = (ChildApplicationContextFactory)server.getApplicationContext().getBean("OutboundSMTP");
+    	ApplicationContext childAppCtxt = outboundSmptSubsystem.getApplicationContext();
+    	MailActionExecuter mailActionExecutor = (MailActionExecuter)childAppCtxt.getBean("mail");
+    	mailActionExecutor.setTestMode(true);
+    }
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+
+
+        RunAsWork<SiteInfo[]> runAsWork = new RunAsWork<SiteInfo[]>()
+        {
+            public SiteInfo[] doWork() throws Exception
+            {
+                SiteInfo[] siteInfos = { siteService.getSite(SITE_SHORT_NAME_INVITE_1),
+                                         siteService.getSite(SITE_SHORT_NAME_INVITE_2),
+                                         siteService.getSite(SITE_SHORT_NAME_INVITE_3) };
+                return siteInfos;
+            }
+        };
+        final SiteInfo[] siteInfos = AuthenticationUtil.runAs(runAsWork, AuthenticationUtil.getSystemUserName());
+
+        //
+        // run various teardown operations which need to be run as 'admin'
+        //
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>(){
+
+            @Override
+            public Void execute() throws Throwable
+            {
+                RunAsWork<Object> runAsWork = new RunAsWork<Object>()
+                {
+                    public Object doWork() throws Exception
+                    {
+                        // delete the inviter
+                        deletePersonByUserName(USER_INVITER);
+
+                        // delete all invitee people
+                        for (String inviteeEmail : inviteeEmailAddrs)
+                        {
+                            //
+                            // delete all people with given email address
+                            //
+
+                            Set<NodeRef> people =
+                                personService.getPeopleFilteredByProperty(ContentModel.PROP_EMAIL, inviteeEmail, 1000);
+                            for (NodeRef person : people)
+                            {
+                                String userName = DefaultTypeConverter.INSTANCE.convert(String.class,
+                                        InviteServiceTest.this.nodeService.getProperty(person, ContentModel.PROP_USERNAME));
+                                try
+                                {
+                                    // delete person
+                                    deletePersonByUserName(userName);
+                                }
+                                catch (Exception exp)
+                                {
+                                    //sometimes, when running single tests, not all users are initialized properly
+                                    exp.printStackTrace();
+                                }
+                            }
+                        }
+
+                        // delete invite sites
+                        siteService.deleteSite(SITE_SHORT_NAME_INVITE_1);
+                        siteService.deleteSite(SITE_SHORT_NAME_INVITE_2);
+                        siteService.deleteSite(SITE_SHORT_NAME_INVITE_3);
+                        // Sleep to ensure asynchronous invite deletion completes
+                        Thread.sleep(5000);
+
+                        return null;
+                    }
+                };
+                AuthenticationUtil.runAs(runAsWork, AuthenticationUtil.getSystemUserName());
+
+                // cancel all active invite workflows
+                WorkflowDefinition wfDef = InviteServiceTest.this.workflowService.getDefinitionByName(WF_DEFINITION_INVITE);
+                List<WorkflowInstance> workflowList = InviteServiceTest.this.workflowService.getActiveWorkflows(wfDef.id);
+                for (WorkflowInstance workflow : workflowList)
+                {
+                    InviteServiceTest.this.workflowService.cancelWorkflow(workflow.id);
+                }
+                return null;
+            }});
+
+        AuthenticationUtil.runAs(new RunAsWork<Object>()
+        {
+            public Object doWork() throws Exception
+            {
+                for (SiteInfo siteInfo : siteInfos)
+                {
+                    nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
+                }
+                return null;
+            }
+        }, AuthenticationUtil.getSystemUserName());
+
+    }
+
+    public static String PERSON_FIRSTNAME = "FirstName123";
+    public static String PERSON_LASTNAME = "LastName123";
+    public static String PERSON_JOBTITLE = "JobTitle123";
+    public static String PERSON_ORG = "Organisation123";
+
+
+    private void createPerson(String firstName, String lastName, String userName, String emailAddress)
+    {
+        // if user with given user name doesn't already exist then create user
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            // create user
+            this.authenticationService.createAuthentication(userName,
+                    "password".toCharArray());
+        }
+
+        // if person node with given user name doesn't already exist then create
+        // person
+        if (this.personService.personExists(userName) == false)
+        {
+            // create person properties
+            PropertyMap personProps = new PropertyMap();
+            personProps.put(ContentModel.PROP_USERNAME, userName);
+            personProps.put(ContentModel.PROP_FIRSTNAME, firstName);
+            personProps.put(ContentModel.PROP_LASTNAME, lastName);
+            personProps.put(ContentModel.PROP_EMAIL, emailAddress);
+            personProps.put(ContentModel.PROP_JOBTITLE, PERSON_JOBTITLE);
+            personProps.put(ContentModel.PROP_ORGANIZATION, PERSON_ORG);
+
+            // create person node for user
+            this.personService.createPerson(personProps);
+        }
+    }
+
+    private void deletePersonByUserName(String userName)
+    {
+        // delete person node associated with given user name
+        // if one exists
+        if (this.personService.personExists(userName))
+        {
+            this.personService.deletePerson(userName);
+        }
+    }
+
+    private JSONObject startInvite(String inviteeFirstName, String inviteeLastName, String inviteeEmail, String inviteeSiteRole,
+            String siteShortName, int expectedStatus)
+            throws Exception
+    {
+        this.inviteeEmailAddrs.add(inviteeEmail);
+
+        String serverPath = "http://localhost:8081/share/";
+        String acceptURL = "page/accept-invite";
+        String rejectURL = "page/reject-invite";
+        // set null in order to create an InvitationWorkflowType.NOMINATED_EXTERNAL invitation
+        String inviteeUserName = null;
+        JSONObject result = createNominatedInvitation(siteShortName, inviteeFirstName, inviteeLastName, inviteeEmail, inviteeUserName,
+                inviteeSiteRole, serverPath, acceptURL, rejectURL, expectedStatus);
+
+        return result;
+    }
+
+    private JSONObject startInvite(String inviteeFirstName,
+            String inviteeLastName, String inviteeSiteRole, String siteShortName, int expectedStatus)
+            throws Exception
+    {
+        String inviteeEmail = INVITEE_EMAIL_PREFIX + RandomStringUtils.randomAlphanumeric(6)
+                + "@" + INVITEE_EMAIL_DOMAIN;
+
+        return startInvite(inviteeFirstName, inviteeLastName, inviteeEmail, inviteeSiteRole, siteShortName,
+                expectedStatus);
+    }
+
+    private JSONObject cancelInvite(String inviteId, String siteShortName, int expectedStatus) throws Exception
+    {
+        return deleteInvitation(inviteId, siteShortName, expectedStatus);
+    }
+
+    /**
+     * Adapted from similar method in org.alfresco.repo.web.scripts.invitation.InvitationWebScriptTest
+     */
+    JSONObject deleteInvitation(String invitationID, String siteShortName, int expectedStatus) throws Exception
+    {
+        assertNotNull(invitationID);
+        assertNotNull(siteShortName);
+        assertFalse(invitationID.isEmpty());
+        assertFalse(siteShortName.isEmpty());
+
+        Response response = sendRequest(new DeleteRequest(URL_SITES + "/" + siteShortName + "/invitations/" + invitationID), expectedStatus);
+        JSONObject jsonResponse = new JSONObject(response.getContentAsString());
+        assertNotNull(jsonResponse);
+        return jsonResponse;
+    }
+
+    /**
+     * Adapted from similar method in org.alfresco.repo.web.scripts.invitation.InvitationWebScriptTest
+     */
+    private JSONObject createNominatedInvitation(String siteName, String inviteeFirstName, String inviteeLastName, String inviteeEmail,
+            String inviteeUserName, String inviteeRoleName, String serverPath, String acceptURL, String rejectURL, int expectedStatus)
+            throws Exception
+    {
+        /*
+         * Create a new nominated invitation
+         */
+        JSONObject newInvitation = new JSONObject();
+
+        newInvitation.put("invitationType", "NOMINATED");
+        newInvitation.put("inviteeRoleName", inviteeRoleName);
+        if (inviteeUserName != null)
+        {
+            // nominate an existing user
+            newInvitation.put("inviteeUserName", inviteeUserName);
+        }
+        else
+        {
+            // nominate someone else
+            newInvitation.put("inviteeFirstName", inviteeFirstName);
+            newInvitation.put("inviteeLastName", inviteeLastName);
+            newInvitation.put("inviteeEmail", inviteeEmail);
+        }
+        newInvitation.put("serverPath", serverPath);
+        newInvitation.put("acceptURL", acceptURL);
+        newInvitation.put("rejectURL", rejectURL);
+
+        Response response = sendRequest(new PostRequest(URL_SITES + "/" + siteName + "/invitations", newInvitation.toString(), "application/json"),
+                expectedStatus);
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        return result;
+    }
+
+    private JSONObject rejectInvite(String inviteId, String inviteTicket, int expectedStatus) throws Exception
+    {
+        // Invitee rejects invitation to a Site from Inviter
+        String rejectInviteUrl = URL_INVITE + "/" + inviteId + "/" + inviteTicket + "/reject";
+        Response response = sendRequest(new PutRequest(rejectInviteUrl, (byte[])null, null), expectedStatus);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        return result;
+    }
+
+    private JSONObject getInvitesByInviteId(String inviteId, int expectedStatus)
+            throws Exception
+    {
+        // construct get invites URL
+        String getInvitesUrl = URL_INVITES + "?inviteId=" + inviteId;
+
+        // invoke get invites web script
+        Response response = sendRequest(new GetRequest(getInvitesUrl), expectedStatus);
+
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        return result;
+    }
+
+    private JSONObject getInvitesByInviterUserName(String inviterUserName,
+            int expectedStatus) throws Exception
+    {
+        // construct get invites URL
+        String getInvitesUrl = URL_INVITES + "?inviterUserName="
+                + inviterUserName;
+
+        // invoke get invites web script
+        Response response = sendRequest(new GetRequest(getInvitesUrl), expectedStatus);
+
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        return result;
+    }
+
+    private JSONObject getInvitesByInviteeUserName(String inviteeUserName,
+            int expectedStatus) throws Exception
+    {
+        // construct get invites URL
+        String getInvitesUrl = URL_INVITES + "?inviteeUserName="
+                + inviteeUserName;
+
+        // invoke get invites web script
+        Response response = sendRequest(new GetRequest(getInvitesUrl), expectedStatus);
+
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        return result;
+    }
+
+    private JSONObject getInvitesBySiteShortName(String siteShortName,
+            int expectedStatus) throws Exception
+    {
+        // construct get invites URL
+        String getInvitesUrl = URL_INVITES + "?siteShortName="
+                + siteShortName;
+
+        // invoke get invites web script
+        Response response = sendRequest(new GetRequest(getInvitesUrl), expectedStatus);
+
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        return result;
+    }
+
+    private JSONObject listInvitations(String siteShortName, String userNameSearch, int expectedStatus) throws Exception
+    {
+        // construct get invites URL
+        String getInvitesUrl = "/api/sites/" + siteShortName + "/potentialmembers?authorityType=USER&sortBy=fullName&dir=asc&filter=" + userNameSearch + "&maxResults=250";
+
+        // invoke get invites web script
+        Response response = sendRequest(new GetRequest(getInvitesUrl), expectedStatus);
+
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        return result;
+    }
+
+    private JSONObject getInviteInfo(String inviteId, String inviteTicket, String inviteeUid) throws Exception
+    {
+        String url = "/api/invite/" + inviteId + "/" + inviteTicket + "?inviteeUserName=" + inviteeUid;
+
+        String runAsUser = AuthenticationUtil.getRunAsUser();
+
+        Response response = sendRequest(new GetRequest(url), Status.STATUS_OK);
+
+        if (!runAsUser.equals(AuthenticationUtil.getRunAsUser()))
+        {
+            AuthenticationUtil.setRunAsUser(runAsUser);
+        }
+
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        return result;
+    }
+
+    public void testStartInvite() throws Exception
+    {
+        JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME, INVITEE_SITE_ROLE,
+                SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+        JSONObject data = result.getJSONObject("data");
+        JSONObject inviteeData = data.getJSONObject("invitee");
+        
+        assertEquals(INVITEE_FIRSTNAME, inviteeData.get("firstName"));
+        assertEquals(INVITEE_LASTNAME, inviteeData.get("lastName"));
+        assertEquals(this.inviteeEmailAddrs.get(this.inviteeEmailAddrs.size() - 1),
+                     inviteeData.get("email"));
+        assertEquals(SITE_SHORT_NAME_INVITE_1, data.get("resourceName"));
+    }
+
+    public void testStartInviteWhenInviteeIsAlreadyMemberOfSite()
+        throws Exception
+    {
+        //
+        // add invitee as member of site: SITE_SHORT_NAME_INVITE
+        //
+
+        String randomStr = RandomStringUtils.randomNumeric(6);
+        final String inviteeUserName = "inviteeUserName" + randomStr;
+        final String inviteeEmailAddr = INVITEE_EMAIL_PREFIX + randomStr
+            + "@" + INVITEE_EMAIL_DOMAIN;
+
+        // create person with invitee user name and invitee email address
+        AuthenticationUtil.runAs(new RunAsWork<Object>()
+        {
+            public Object doWork() throws Exception
+            {
+                createPerson(INVITEE_FIRSTNAME, INVITEE_LASTNAME, inviteeUserName, inviteeEmailAddr);
+                return null;
+            }
+
+        }, AuthenticationUtil.getSystemUserName());
+
+        // add invitee person to site: SITE_SHORT_NAME_INVITE
+        AuthenticationUtil.runAs(new RunAsWork<Object>()
+        {
+            public Object doWork() throws Exception
+            {
+
+                InviteServiceTest.this.siteService.setMembership(
+                        SITE_SHORT_NAME_INVITE_1, inviteeUserName,
+                        INVITEE_SITE_ROLE);
+                return null;
+            }
+
+        }, USER_INVITER);
+
+        /**
+         * Should conflict
+         */
+        startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME, inviteeEmailAddr, INVITEE_SITE_ROLE,
+                SITE_SHORT_NAME_INVITE_1, Status.STATUS_CONFLICT);
+
+        // Should go through
+        startInvite(INVITEE_FIRSTNAME, "Belzebub", inviteeEmailAddr, INVITEE_SITE_ROLE,
+                SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+
+        // Should go through
+        startInvite("Lucifer", INVITEE_LASTNAME, inviteeEmailAddr, INVITEE_SITE_ROLE,
+                SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+    }
+
+    public void testStartInviteForSameInviteeButTwoDifferentSites()
+        throws Exception
+    {
+        final String inviteeUsername = INVITEE_FIRSTNAME + "_" + INVITEE_LASTNAME;
+        final String inviteeEmail = INVITEE_EMAIL_PREFIX + RandomStringUtils.randomAlphanumeric(6) + "@" + INVITEE_EMAIL_DOMAIN;
+
+        // Create person
+        AuthenticationUtil.runAs(new RunAsWork<Object>()
+        {
+            public Object doWork() throws Exception
+            {
+                createPerson(INVITEE_FIRSTNAME, INVITEE_LASTNAME, inviteeUsername, inviteeEmail);
+                return null;
+            }
+
+        }, AuthenticationUtil.getSystemUserName());
+
+        JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME, inviteeEmail, INVITEE_SITE_ROLE, SITE_SHORT_NAME_INVITE_1,
+                Status.STATUS_CREATED);
+
+        startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME, inviteeEmail, INVITEE_SITE_ROLE, SITE_SHORT_NAME_INVITE_2, Status.STATUS_CREATED);
+    }
+
+    public void testCancelInvite() throws Exception
+    {
+        // inviter starts invite workflow
+        JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME, INVITEE_SITE_ROLE,
+                SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+
+        // get hold of invite ID of started invite
+        JSONObject data = result.getJSONObject("data");
+        String inviteId = data.getString("inviteId");
+
+        // Inviter cancels pending invitation
+        cancelInvite(inviteId, SITE_SHORT_NAME_INVITE_1, Status.STATUS_OK);
+    }
+
+    public void testCancelInviteWithDifferentSiteIDInRequest() throws Exception
+    {
+        // inviter starts invite workflow
+        JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME, INVITEE_SITE_ROLE,
+                SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+
+        // get hold of invite ID of started invite
+        JSONObject data = result.getJSONObject("data");
+        String inviteId = data.getString("inviteId");
+
+        // Inviter cancels pending invitation but uses the wrong siteID in the request
+        cancelInvite(inviteId, SITE_SHORT_NAME_INVITE_2, Status.STATUS_FORBIDDEN);
+    }
+
+    public void testCancelInviteWithInvalidInviteID() throws Exception
+    {
+        // Inviter cancels pending invitation but user a wrong/invalid invidationID
+        cancelInvite("activiti$1019999", SITE_SHORT_NAME_INVITE_1, Status.STATUS_NOT_FOUND);
+    }
+
+    public void testAcceptInvite() throws Exception
+    {
+        // inviter starts invite (sends out invitation)
+        JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME, INVITEE_SITE_ROLE,
+                SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+
+        // get hold of invite ID and invite ticket of started invite
+        JSONObject data = result.getJSONObject("data");
+        String inviteId = data.getString("inviteId");
+        String inviteTicket = data.getString("inviteTicket");
+
+        // Invitee accepts invitation to a Site from Inviter
+        String acceptInviteUrl = URL_INVITE + "/" + inviteId + "/" + inviteTicket + "/accept";
+        sendRequest(new PutRequest(acceptInviteUrl, (byte[])null, null), Status.STATUS_OK);
+
+        // Invitee attempts to accept the invitation again
+        sendRequest(new PutRequest(acceptInviteUrl, (byte[])null, null), Status.STATUS_CONFLICT);
+
+        // Invitee attempts to reject an invitation that has already been accepted.
+        rejectInvite(inviteId, inviteTicket, Status.STATUS_CONFLICT);
+
+
+        //
+        // test that invitation represented by invite ID (of invitation started above)
+        // is no longer pending (as a result of the invitation having being accepted)
+        //
+
+        // get pending invite matching inviteId from invite started above (run as inviter user)
+        this.authenticationComponent.setCurrentUser(USER_INVITER);
+        JSONObject getInvitesResult = getInvitesByInviteId(inviteId,
+                Status.STATUS_OK);
+
+        // there should no longer be any invites identified by invite ID pending
+        //assertEquals(0, getInvitesResult.getJSONArray("invites").length());
+    }
+
+    public void testRejectInvite() throws Exception
+    {
+        // inviter starts invite (sends out invitation)
+        JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME, INVITEE_SITE_ROLE,
+                SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+
+        // get hold of invite ID of started invite
+        JSONObject data = result.getJSONObject("data");
+        String inviteId = data.getString("inviteId");
+        String inviteTicket = data.getString("inviteTicket");
+
+        rejectInvite(inviteId, inviteTicket, Status.STATUS_OK);
+
+        // Negative test
+        rejectInvite(inviteId, inviteTicket, Status.STATUS_CONFLICT);
+
+        //
+        // test that invite represented by invite ID (of invitation started above)
+        // is no longer pending (as a result of the invitation having being rejected)
+        //
+
+        // get pending invite matching inviteId from invite started above (run as inviter user)
+        this.authenticationComponent.setCurrentUser(USER_INVITER);
+        JSONObject getInvitesResult = getInvitesByInviteId(inviteId, Status.STATUS_OK);
+
+        // there should no longer be any invites identified by invite ID pending
+        // assertEquals(0, getInvitesResult.getJSONArray("invites").length());
+
+
+    }
+
+    public void testGetInvitationStatus() throws Exception
+    {
+        for (String invitationStatus : new String[]{
+                InviteInfo.INVITATION_STATUS_REJECTED,
+                InviteInfo.INVITATION_STATUS_ACCEPTED
+            })
+        {
+            // inviter starts invite (sends out invitation)
+            JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME, INVITEE_SITE_ROLE,
+                    SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+
+            JSONObject data = result.getJSONObject("data");
+            String inviteId = data.getString("inviteId");
+            String inviteTicket = data.getString("inviteTicket");
+            String inviteeUserName = data.getString("inviteeUserName");
+            // get inviteInfo about invitation
+            result = getInviteInfo(inviteId, inviteTicket, inviteeUserName);
+            // get status of current invitation
+            String status = result.getJSONObject("invite").getString("invitationStatus");
+            // it should be peding
+            assertEquals(status, InviteInfo.INVITATION_STATUS_PENDING);
+            // accept/reject invitation
+            if (invitationStatus.equals(InviteInfo.INVITATION_STATUS_REJECTED))
+            {
+                rejectInvite(inviteId, inviteTicket, Status.STATUS_OK);
+            }
+            else if (invitationStatus.equals(InviteInfo.INVITATION_STATUS_ACCEPTED))
+            {
+                // Invitee accepts invitation to a Site from Inviter
+                String acceptInviteUrl = URL_INVITE + "/" + inviteId + "/" + inviteTicket + "/accept";
+                sendRequest(new PutRequest(acceptInviteUrl, (byte[])null, null), Status.STATUS_OK);
+            }
+            else
+            {
+                fail();
+            }
+            // get inviteInfo about invitation
+            result = getInviteInfo(inviteId, inviteTicket, inviteeUserName);
+
+            status = result.getJSONObject("invite").getString("invitationStatus");
+            // invitation status should be accepted/rejected
+            assertEquals(status, invitationStatus);
+        }
+    }
+
+    public void testGetInvitesByInviteId() throws Exception
+    {
+        // inviter starts invite workflow
+        JSONObject result = startInvite(INVITEE_FIRSTNAME,
+                INVITEE_LASTNAME, INVITEE_SITE_ROLE, SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+
+        // get hold of workflow ID of started invite workflow instance
+        JSONObject data = result.getJSONObject("data");
+        String inviteId = data.getString("inviteId");
+
+        assertEquals(true, ((inviteId != null) && (inviteId.length() != 0)));
+
+        // get pending invite matching inviteId from invite started above
+        JSONObject getInvitesResult = getInvitesByInviteId(inviteId,
+                Status.STATUS_OK);
+
+        assertEquals(getInvitesResult.getJSONArray("invites").length(), 1);
+
+        JSONObject inviteJSONObj = getInvitesResult.getJSONArray("invites").getJSONObject(0);
+
+        assertEquals(inviteId, inviteJSONObj.get("inviteId"));
+    }
+
+    public void testGetInvitesByInviterUserName() throws Exception
+    {
+        // inviter starts invite workflow
+        startInvite(INVITEE_FIRSTNAME,
+                INVITEE_LASTNAME, INVITEE_SITE_ROLE, SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+
+        // get pending invites matching inviter user name used in invite started
+        // above
+        JSONObject getInvitesResult = getInvitesByInviterUserName(USER_INVITER,
+                Status.STATUS_OK);
+
+        assertEquals(true, getInvitesResult.length() > 0);
+
+        JSONObject inviteJSONObj = getInvitesResult.getJSONArray("invites").getJSONObject(0);
+        assertEquals(USER_INVITER, inviteJSONObj.getJSONObject("inviter").get("userName"));
+    }
+
+    public void testGetInvitesByInviteeUserName() throws Exception
+    {
+        // inviter starts invite workflow
+        JSONObject result = startInvite(INVITEE_FIRSTNAME,
+                INVITEE_LASTNAME, INVITEE_SITE_ROLE, SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+
+        // get hold of invitee user name property of started invite workflow instance
+        JSONObject data = result.getJSONObject("data");
+        String inviteeUserName = data.getString("inviteeUserName");
+
+        assertEquals(true, ((inviteeUserName != null) && (inviteeUserName
+                .length() != 0)));
+
+        // get pending invites matching invitee user name from invite started above
+        JSONObject getInvitesResult = getInvitesByInviteeUserName(
+                inviteeUserName, Status.STATUS_OK);
+
+        assertEquals(true, getInvitesResult.length() > 0);
+
+        JSONObject inviteJSONObj = getInvitesResult.getJSONArray("invites").getJSONObject(0);
+
+        assertEquals(inviteeUserName, inviteJSONObj.getJSONObject("invitee").get("userName"));
+    }
+
+    public void testGetInvitesBySiteShortName() throws Exception
+    {
+        // inviter starts invite workflow
+        JSONObject result = startInvite(INVITEE_FIRSTNAME,
+                INVITEE_LASTNAME, INVITEE_SITE_ROLE, SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+
+        // get hold of site short name property of started invite workflow instance
+        JSONObject data = result.getJSONObject("data");
+        String siteShortName = data.getString("resourceName");
+
+        assertEquals(true, ((siteShortName != null) && (siteShortName.length() != 0)));
+
+        // get pending invites matching site short name from invite started above
+        JSONObject getInvitesResult = getInvitesBySiteShortName(siteShortName,
+                Status.STATUS_OK);
+
+        assertEquals(true, getInvitesResult.getJSONArray("invites").length() > 0);
+
+        JSONObject inviteJSONObj = getInvitesResult.getJSONArray("invites").getJSONObject(0);
+
+        assertEquals(siteShortName, inviteJSONObj.getJSONObject("site").get("shortName"));
+    }
+
+    public void testStartInviteForbiddenWhenInviterNotSiteManager() throws Exception
+    {
+        // inviter2 starts invite workflow, but he/she is not the site manager of the given site
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_INVITER_2);
+        startInvite(INVITEE_FIRSTNAME,
+                INVITEE_LASTNAME, INVITEE_SITE_ROLE, SITE_SHORT_NAME_INVITE_3, Status.STATUS_FORBIDDEN);
+    }
+
+    public void testCancelInviteForbiddenWhenInviterNotSiteManager() throws Exception
+    {
+        // inviter (who is Site Manager of the given site) starts invite workflow
+        JSONObject result = startInvite(INVITEE_FIRSTNAME,
+                INVITEE_LASTNAME, INVITEE_SITE_ROLE, SITE_SHORT_NAME_INVITE_3, Status.STATUS_CREATED);
+
+        // get hold of invite ID of started invite
+        JSONObject data = result.getJSONObject("data");
+        String inviteId = data.getString("inviteId");
+
+        // when inviter 2 (who is not Site Manager of the given site) tries to cancel invite
+        // http status FORBIDDEN must be returned
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_INVITER_2);
+       //TODO cancelInvite(inviteId, SITE_SHORT_NAME_INVITE_3, Status.STATUS_FORBIDDEN);
+        cancelInvite(inviteId, SITE_SHORT_NAME_INVITE_3, Status.STATUS_FORBIDDEN);
+    }
+
+    public void testInviteeResourcesDeletedUponRejectWhenNoInvitePending() throws Exception
+    {
+        // inviter starts invite workflow
+        JSONObject result = startInvite(INVITEE_FIRSTNAME,
+                INVITEE_LASTNAME, INVITEE_SITE_ROLE, SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+
+        // get hold of properties of started invite
+        JSONObject data = result.getJSONObject("data");
+        String inviteId = data.getString("inviteId");
+        String inviteTicket = data.getString("inviteTicket");
+        final String inviteeUserName = data.getString("inviteeUserName");
+
+        rejectInvite(inviteId, inviteTicket, Status.STATUS_OK);
+
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            public Void doWork() throws Exception
+            {
+                transactionService.getRetryingTransactionHelper().doInTransaction(
+                        new RetryingTransactionCallback<Void>()
+                        {
+                            public Void execute() throws Throwable
+                            {
+                                assertEquals(false, mutableAuthenticationDao.userExists(inviteeUserName));
+                                assertEquals(false, personService.personExists(inviteeUserName));
+                                return null;
+                            }
+                        });
+                return null;
+            }
+
+        }, AuthenticationUtil.getSystemUserName());
+    }
+
+    public void testInviteeResourcesNotDeletedUponRejectWhenInvitesPending() throws Exception
+    {
+        // Test only applies to legacy invite workflow
+        this.invitationServiceImpl.setNominatedInvitationWorkflowId(
+                WorkflowModelNominatedInvitation.WORKFLOW_DEFINITION_NAME_ACTIVITI_INVITE);
+
+        // Create invitee person
+        final String inviteeEmail = INVITEE_EMAIL_PREFIX + RandomStringUtils.randomAlphanumeric(6) + "@" + INVITEE_EMAIL_DOMAIN;
+        AuthenticationUtil.runAs(new RunAsWork<Object>()
+        {
+            public Object doWork() throws Exception
+            {
+                createPerson(INVITEE_FIRSTNAME, INVITEE_LASTNAME, INVITEE_FIRSTNAME + "_" + INVITEE_LASTNAME, inviteeEmail);
+                return null;
+            }
+        }, AuthenticationUtil.getSystemUserName());
+
+        // inviter invites invitee to site 1
+        JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME, inviteeEmail, INVITEE_SITE_ROLE, SITE_SHORT_NAME_INVITE_1,
+                Status.STATUS_CREATED);
+
+        // get hold of properties of started invite
+        JSONObject data = result.getJSONObject("data");
+        String invite1Id = data.getString("inviteId");
+        String invite1Ticket = data.getString("inviteTicket");
+        final String inviteeUserName = data.getString("inviteeUserName");
+
+        // inviter invites invitee to site 2
+        startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME, inviteeEmail, INVITEE_SITE_ROLE, SITE_SHORT_NAME_INVITE_2, Status.STATUS_CREATED);
+
+        rejectInvite(invite1Id, invite1Ticket, Status.STATUS_OK);
+
+        boolean inviteeUserExists = AuthenticationUtil.runAs(new RunAsWork<Boolean>()
+        {
+            public Boolean doWork() throws Exception
+            {
+                RetryingTransactionHelper tranHelper = transactionService.getRetryingTransactionHelper();
+                Boolean result = tranHelper.doInTransaction(new RetryingTransactionCallback<Boolean>()
+                {
+                    public Boolean execute() throws Throwable
+                    {
+                        Boolean result = mutableAuthenticationDao.userExists(inviteeUserName);
+                        return result;
+                    }
+                });
+
+                return result;
+            }
+        }, AuthenticationUtil.getSystemUserName());
+
+        // test that the invitee's user account still exists (has not been deleted
+        assertEquals(true, inviteeUserExists);
+
+        boolean inviteePersonExists = AuthenticationUtil.runAs(new RunAsWork<Boolean>()
+        {
+                public Boolean doWork() throws Exception
+                {
+                    Boolean result = personService.personExists(inviteeUserName);
+
+                    return result;
+                }
+        }, AuthenticationUtil.getSystemUserName());
+
+        assertEquals(true, inviteePersonExists);
+
+        // Reset back to default
+        this.invitationServiceImpl.setNominatedInvitationWorkflowId(
+                WorkflowModelNominatedInvitation.WORKFLOW_DEFINITION_NAME_ACTIVITI_ADD_DIRECT);
+    }
+
+    /**
+     * https://issues.alfresco.com/jira/browse/ETHREEOH-520
+     */
+    public void testETHREEOH_520()
+        throws Exception
+    {
+        final String userName = "userInviteServiceTest" + GUID.generate();
+        final String emailAddress = " ";
+
+        // Create a person with a blank email address and
+        AuthenticationUtil.runAs(new RunAsWork<Object>()
+        {
+            public Object doWork() throws Exception
+            {
+                createPerson(PERSON_FIRSTNAME, PERSON_LASTNAME, userName, " ");
+                return null;
+            }
+
+        }, AuthenticationUtil.getSystemUserName());
+
+        // Try and add an existing person to the site with no email address
+        // Should return bad request since the email address has not been provided
+        startInvite(PERSON_FIRSTNAME, PERSON_LASTNAME, emailAddress, INVITEE_SITE_ROLE, SITE_SHORT_NAME_INVITE_1, Status.STATUS_BAD_REQUEST);
+    }
+
+    @Category(RedundantTests.class)
+    public void testMNT9905() throws Exception
+    {
+        String[] managerUsersArr = { "user1", "user2" };
+        String[] allUsersArr = { "user1", "user2", "user3", "user4" };
+        String collaborator = "user3";
+
+        try
+        {
+            // create users
+            for (String user : allUsersArr)
+            {
+                final String userName = user;
+
+                // Create a person with a blank email address and
+                AuthenticationUtil.runAs(new RunAsWork<Object>()
+                {
+                    public Object doWork() throws Exception
+                    {
+                        createPerson(userName, userName, userName, "");
+                        return null;
+                    }
+
+                }, AuthenticationUtil.getSystemUserName());
+            }
+
+            // add manager to site
+            for (String manager : managerUsersArr)
+            {
+                String manag = manager;
+
+                startInvite(manag, manag, SiteModel.SITE_MANAGER, SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+                siteService.setMembership(SITE_SHORT_NAME_INVITE_1, manag, SiteModel.SITE_MANAGER);
+            }
+
+            InviteServiceTest.this.authenticationComponent.setCurrentUser(managerUsersArr[0]);
+            JSONObject collInv = startInvite(collaborator, collaborator, SiteModel.SITE_COLLABORATOR, SITE_SHORT_NAME_INVITE_1, Status.STATUS_CREATED);
+            siteService.setMembership(SITE_SHORT_NAME_INVITE_1, collaborator, SiteModel.SITE_COLLABORATOR);
+
+            // get pending invites matching inviter user name used in invite started
+            InviteServiceTest.this.authenticationComponent.setCurrentUser(managerUsersArr[1]);
+            JSONObject getInvitesResult = getInvitesBySiteShortName(SITE_SHORT_NAME_INVITE_1, Status.STATUS_OK);
+            assertEquals(true, getInvitesResult.length() == 1);
+
+            // get site member
+            JSONObject userList = listInvitations(SITE_SHORT_NAME_INVITE_1, "user", Status.STATUS_OK);
+            JSONArray inviteJSONArr = userList.getJSONArray("people");
+            List<String> siteUsers = new ArrayList<String>();
+            for (int i = 0; i < inviteJSONArr.length(); i++)
+            {
+                String userName = (String) inviteJSONArr.getJSONObject(i).get("userName");
+
+                if (userName != null)
+                {
+                    String role = siteService.getMembersRole(SITE_SHORT_NAME_INVITE_1, userName);
+                    if (role != null)
+                    {
+                        siteUsers.add(userName);
+                    }
+                }
+            }
+
+            // MNT-14113: User admin console: sorting users causes some to disappear
+            //
+            // It was decided to make the search results of AFTS (indexed) search to be the
+            // same as the CQ search results. Therefore, 'People.getPeople(String filter)'
+            // transforms 'filter' to '*<filter>*' (adds leading wildcard).
+            // 'InviterUser' is the creator of the test site (see the 'setUp()' method).
+            // Thus, plus one more user ('user1', 'user2', 'user3' and the creator
+            // 'InviterUser')
+            assertEquals(4, siteUsers.size());
+
+            // cancel invite different manager
+            JSONObject data = collInv.getJSONObject("data");
+            String inviteId = (String) data.get("inviteId");
+            cancelInvite(inviteId, SITE_SHORT_NAME_INVITE_1, Status.STATUS_OK);
+        }
+        finally
+        {
+            AuthenticationUtil.setRunAsUserSystem();
+
+            // delete users
+            for (String user : allUsersArr)
+            {
+                deletePersonByUserName(user);
+            }
+
+            deletePersonByUserName(collaborator);
+        }
+    }
+    
+    @Test
+    public void testDontOwerrideModeratedSitePermissions() throws Exception
+    {
+        final String MODERATED_SITE_NAME = RandomStringUtils.randomAlphabetic(6);
+        final String siteManager = RandomStringUtils.randomAlphabetic(6);
+        final String secondUser = RandomStringUtils.randomAlphabetic(6);
+        
+        // Create two users
+        AuthenticationUtil.runAs(new RunAsWork<Object>()
+                {
+                    public Object doWork() throws Exception
+                    {
+                        createPerson(siteManager, siteManager, siteManager, "");
+                        createPerson(secondUser, secondUser, secondUser, "");
+                        return null;
+                    }
+
+                }, AuthenticationUtil.getSystemUserName());
+        
+        // Create moderated site
+        SiteInfo siteInfo = InviteServiceTest.this.siteService.getSite(MODERATED_SITE_NAME);
+        if (siteInfo == null)
+        {
+            siteService.createSite(
+                "InviteSitePreset", MODERATED_SITE_NAME,
+                MODERATED_SITE_NAME, MODERATED_SITE_NAME, SiteVisibility.MODERATED);
+        }
+        siteService.setMembership(MODERATED_SITE_NAME, siteManager, SiteModel.SITE_MANAGER);
+        String role = siteService.getMembersRole(MODERATED_SITE_NAME, siteManager);
+        assertEquals(SiteModel.SITE_MANAGER, role);
+        
+        // Create request to join to site
+        String inviteId = createModeratedInvitation(MODERATED_SITE_NAME, "", secondUser, SiteModel.SITE_CONSUMER);
+        
+        // Set second user to Collaborator
+        siteService.setMembership(MODERATED_SITE_NAME, secondUser, SiteModel.SITE_COLLABORATOR);
+        role = siteService.getMembersRole(MODERATED_SITE_NAME, secondUser);
+        assertEquals(SiteModel.SITE_COLLABORATOR, role);
+        
+        final String taskId = getTaskId(inviteId);
+        assertNotNull("Cannot find taskId", taskId);
+        
+        // Accept invitation
+        String oldUser = AuthenticationUtil.getFullyAuthenticatedUser();
+        AuthenticationUtil.setFullyAuthenticatedUser(siteManager);
+        workflowService.endTask(taskId, "approve");
+        AuthenticationUtil.setFullyAuthenticatedUser(oldUser);
+        
+        // Check the role
+        role = siteService.getMembersRole(MODERATED_SITE_NAME, secondUser);
+        assertEquals(SiteModel.SITE_COLLABORATOR, role);
+    }
+    
+    private String createModeratedInvitation(String siteName, String inviteeComments, String inviteeUserName, String inviteeRoleName) throws Exception
+    {
+        String URL_SITES = "/api/sites";
+        /*
+         * Create a new moderated invitation
+         */
+        JSONObject newInvitation = new JSONObject();
+
+        newInvitation.put("invitationType", "MODERATED");
+        newInvitation.put("inviteeRoleName", inviteeRoleName);
+        newInvitation.put("inviteeComments", inviteeComments);
+        newInvitation.put("inviteeUserName", inviteeUserName);
+        Response response = sendRequest(new PostRequest(URL_SITES + "/" + siteName + "/invitations", newInvitation.toString(), "application/json"), 201);
+        JSONObject top = new JSONObject(response.getContentAsString());
+        JSONObject data = top.getJSONObject("data");
+        String inviteId = data.getString("inviteId");
+
+        return inviteId;
+    }
+    
+    private String getTaskId(String inviteId) throws Exception
+    {
+        String url = "/api/task-instances";
+        Response response = sendRequest(new GetRequest(url), 200);
+        JSONObject top = new JSONObject(response.getContentAsString());
+        JSONArray data = top.getJSONArray("data");
+        for (int i=0; i < data.length(); i++)
+        {
+            JSONObject task = data.getJSONObject(i);
+            JSONObject workflowInstance = task.getJSONObject("workflowInstance");
+            if (!inviteId.equalsIgnoreCase(workflowInstance.getString("id")))
+            {
+                continue;
+            }
+            return task.getString("id");
+        }
+        return null;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/links/LinksRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/links/LinksRestApiTest.java
new file mode 100644
index 00000000000..27542d68788
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/links/LinksRestApiTest.java
@@ -0,0 +1,850 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.links;
+
+import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.activities.feed.FeedGenerator;
+import org.alfresco.repo.activities.post.lookup.PostLookup;
+import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.policy.BehaviourFilter;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.GUID;
+import org.alfresco.util.ISO8601DateFormat;
+import org.alfresco.util.PropertyMap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Unit Test to test the Links Web Script API
+ * 
+ * @author Nick Burch
+ * @since 4.0
+ */
+public class LinksRestApiTest extends BaseWebScriptTest
+{
+    @SuppressWarnings("unused")
+    private static Log logger = LogFactory.getLog(LinksRestApiTest.class);
+
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private TransactionService transactionService;
+    private BehaviourFilter policyBehaviourFilter;
+    private PersonService personService;
+    private NodeService nodeService;
+    private NodeService internalNodeService;
+    private SiteService siteService;
+    private NodeArchiveService nodeArchiveService;
+    private ActivityService activityService;
+    private FeedGenerator feedGenerator;
+    private PostLookup postLookup;
+    
+    private static final String USER_ONE = "UserOneSecondToo";
+    private static final String USER_TWO = "UserTwoSecondToo";
+    private static final String USERDETAILS_FIRSTNAME = "FirstName123";
+    private static final String USERDETAILS_LASTNAME = "LastName123";
+    private static final String SITE_SHORT_NAME_LINKS = "LinkSiteShortNameTest";
+    
+    private static final String LINK_TITLE_ONE   = "TestLinkOne";
+    private static final String LINK_TITLE_TWO   = "TestLinkTwo";
+    private static final String LINK_TITLE_THREE = "StillTestLinkThree";
+    private static final String LINK_URL_ONE   = "http://google.com/";
+    private static final String LINK_URL_TWO   = "http://alfresco.com/";
+    private static final String LINK_URL_THREE = "http://share.alfresco.com/";
+
+    private static final String URL_LINKS_BASE = "/api/links/site/" + SITE_SHORT_NAME_LINKS + "/links"; 
+    private static final String URL_LINKS_LIST = URL_LINKS_BASE;
+    private static final String URL_LINKS_CREATE = URL_LINKS_BASE + "/posts";
+    private static final String URL_LINKS_UPDATE = URL_LINKS_BASE + "/"; // plus path
+    private static final String URL_LINKS_DELETE = "/api/links/delete/site/" + SITE_SHORT_NAME_LINKS + "/links";
+    private static final String URL_LINKS_FETCH = "/api/links/link/site/" + SITE_SHORT_NAME_LINKS + "/links/"; // plus path
+
+    private static final String URL_DELETE_COMMENT = "api/comment/node/{0}/{1}/{2}?site={3}&itemtitle={4}&page={5}";
+    
+    
+    // General methods
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
+        this.policyBehaviourFilter = (BehaviourFilter)getServer().getApplicationContext().getBean("policyBehaviourFilter");
+        this.transactionService = (TransactionService)getServer().getApplicationContext().getBean("transactionService");
+        this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+        this.nodeService = (NodeService)getServer().getApplicationContext().getBean("NodeService");
+        this.siteService = (SiteService)getServer().getApplicationContext().getBean("SiteService");
+        this.internalNodeService = (NodeService)getServer().getApplicationContext().getBean("nodeService");
+        this.nodeArchiveService = (NodeArchiveService)getServer().getApplicationContext().getBean("nodeArchiveService");
+        this.activityService = (ActivityService)getServer().getApplicationContext().getBean("activityService");
+        ChildApplicationContextFactory activitiesFeed = (ChildApplicationContextFactory)getServer().getApplicationContext().getBean("ActivitiesFeed");
+        ApplicationContext activitiesFeedCtx = activitiesFeed.getApplicationContext();
+        this.feedGenerator = (FeedGenerator)activitiesFeedCtx.getBean("feedGenerator");
+        this.postLookup = (PostLookup)activitiesFeedCtx.getBean("postLookup");
+
+
+        // Authenticate as user
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        // Create test site
+        // - only create the site if it doesn't already exist
+        SiteInfo siteInfo = this.siteService.getSite(SITE_SHORT_NAME_LINKS);
+        if (siteInfo == null)
+        {
+            this.siteService.createSite("CalendarSitePreset", SITE_SHORT_NAME_LINKS, "LinksSiteTitle", "TestDescription", SiteVisibility.PUBLIC);
+        }
+        
+        // Ensure the links container is there
+        if (!siteService.hasContainer(SITE_SHORT_NAME_LINKS, "links"))
+        {
+            siteService.createContainer(SITE_SHORT_NAME_LINKS, "links", null, null);
+        }
+        
+        // Create users
+        createUser(USER_ONE, SiteModel.SITE_COLLABORATOR, SITE_SHORT_NAME_LINKS);
+        createUser(USER_TWO, SiteModel.SITE_COLLABORATOR, SITE_SHORT_NAME_LINKS);
+
+        // Do tests as inviter user
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        
+        // admin user required to delete user
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        SiteInfo siteInfo = this.siteService.getSite(SITE_SHORT_NAME_LINKS);
+        if (siteInfo != null)
+        {
+            // delete the site
+            siteService.deleteSite(SITE_SHORT_NAME_LINKS);
+            nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
+        }
+        
+        // delete the users
+        personService.deletePerson(USER_ONE);
+        if(this.authenticationService.authenticationExists(USER_ONE))
+        {
+           this.authenticationService.deleteAuthentication(USER_ONE);
+        }
+        
+        personService.deletePerson(USER_TWO);
+        if (this.authenticationService.authenticationExists(USER_TWO))
+        {
+           this.authenticationService.deleteAuthentication(USER_TWO);
+        }
+    }
+    
+    private void createUser(String userName, String role, String siteName)
+    {
+        // if user with given user name doesn't already exist then create user
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            // create user
+            this.authenticationService.createAuthentication(userName, "password".toCharArray());
+            
+            // create person properties
+            PropertyMap personProps = new PropertyMap();
+            personProps.put(ContentModel.PROP_USERNAME, userName);
+            personProps.put(ContentModel.PROP_FIRSTNAME, USERDETAILS_FIRSTNAME);
+            personProps.put(ContentModel.PROP_LASTNAME, USERDETAILS_LASTNAME);
+            personProps.put(ContentModel.PROP_EMAIL, "FirstName123.LastName123@email.com");
+            personProps.put(ContentModel.PROP_JOBTITLE, "JobTitle123");
+            personProps.put(ContentModel.PROP_JOBTITLE, "Organisation123");
+            
+            // create person node for user
+            this.personService.createPerson(personProps);
+        }
+        
+        // add the user as a member with the given role
+        this.siteService.setMembership(siteName, userName, role);
+    }
+    
+    
+    // Test helper methods
+    
+    private JSONObject getLinks(String filter, String username) throws Exception
+    {
+       String origUser = this.authenticationComponent.getCurrentUserName();
+       if (username != null)
+       {
+          this.authenticationComponent.setCurrentUser(username);
+          filter = "user";
+       }
+       
+       String url = URL_LINKS_LIST;
+       if (filter == null)
+       {
+          filter = "all";
+       }
+       url += "?filter=" + filter;
+       url += "&startIndex=0&page=1&pageSize=4";
+       
+       Response response = sendRequest(new GetRequest(url), 200);
+       JSONObject result = new JSONObject(response.getContentAsString());
+       
+       if (username != null)
+       {
+          this.authenticationComponent.setCurrentUser(origUser);
+       }
+       
+       return result;
+    }
+    
+    private JSONObject getLink(String name, int expectedStatus) throws Exception
+    {
+       Response response = sendRequest(new GetRequest(URL_LINKS_FETCH + name), expectedStatus);
+       if (expectedStatus == Status.STATUS_OK)
+       {
+          JSONObject result = new JSONObject(response.getContentAsString());
+          if (result.has("item"))
+          {
+             return result.getJSONObject("item");
+          }
+          return result;
+       }
+       else
+       {
+          return null;
+       }
+    }
+    
+    /**
+     * Creates a single link based on the supplied details
+     */
+    private JSONObject createLink(String title, String description, String url,
+          boolean internal, int expectedStatus) throws Exception
+    {
+       JSONObject json = new JSONObject();
+       json.put("site", SITE_SHORT_NAME_LINKS);
+       json.put("title", title);
+       json.put("description", description);
+       json.put("url", url);
+       json.put("tags", "");
+       if (internal)
+       {
+          json.put("internal", "true");
+       }
+       json.put("page", "links-view"); // TODO Is this really needed?
+       
+       Response response = sendRequest(new PostRequest(URL_LINKS_CREATE, json.toString(), "application/json"), expectedStatus);
+       if (expectedStatus == Status.STATUS_OK)
+       {
+          JSONObject result = new JSONObject(response.getContentAsString());
+          if (result.has("link"))
+          {
+             return result.getJSONObject("link");
+          }
+          return result;
+       }
+       else
+       {
+          return null;
+       }
+    }
+    
+    /**
+     * Updates the link with the new details
+     */
+    private JSONObject updateLink(String name, String title, String description, String url,
+          boolean internal, int expectedStatus) throws Exception
+    {
+       JSONObject json = new JSONObject();
+       json.put("site", SITE_SHORT_NAME_LINKS);
+       json.put("title", title);
+       json.put("description", description);
+       json.put("url", url);
+       json.put("tags", "");
+       json.put("internal", Boolean.toString(internal).toLowerCase());
+       json.put("page", "links-view"); // TODO Is this really needed?
+       
+       Response response = sendRequest(new PutRequest(URL_LINKS_UPDATE + name, json.toString(), "application/json"), expectedStatus);
+       if (expectedStatus == Status.STATUS_OK)
+       {
+          JSONObject result = new JSONObject(response.getContentAsString());
+          if (result.has("links"))
+          {
+             return result.getJSONObject("links");
+          }
+          return result;
+       }
+       else
+       {
+          return null;
+       }
+    }
+    
+    /**
+     * Deletes the link
+     */
+    private JSONObject deleteLink(String name, int expectedStatus) throws Exception
+    {
+       Response response = sendRequest(new DeleteRequest(URL_LINKS_FETCH+name), expectedStatus);
+       if (expectedStatus == Status.STATUS_OK)
+       {
+          JSONObject result = new JSONObject(response.getContentAsString());
+          return result;
+       }
+       else
+       {
+          return null;
+       }
+    }
+    
+    /**
+     * Deletes the links
+     */
+    private JSONObject deleteLinks(List<String> names, int expectedStatus) throws Exception
+    {
+       JSONArray items = new JSONArray();
+       for (String name : names)
+       {
+          items.put(name);
+       }
+       
+       JSONObject json = new JSONObject();
+       json.put("items", items);
+       
+       Response response = sendRequest(new PostRequest(URL_LINKS_DELETE, json.toString(), "application/json"), expectedStatus);
+       if (expectedStatus == Status.STATUS_OK)
+       {
+          JSONObject result = new JSONObject(response.getContentAsString());
+          return result;
+       }
+       else
+       {
+          return null;
+       }
+    }
+    
+    /**
+     * Monkeys with the created date on a link
+     */
+    private void pushLinkCreatedDateBack(String name, int daysAgo) throws Exception
+    {
+       NodeRef container = siteService.getContainer(SITE_SHORT_NAME_LINKS, "links");
+       NodeRef node = nodeService.getChildByName(container, ContentModel.ASSOC_CONTAINS, name);
+       
+       Date created = (Date)nodeService.getProperty(node, ContentModel.PROP_CREATED);
+       Date newCreated = new Date(created.getTime() - daysAgo*24*60*60*1000);
+       
+       UserTransaction txn = transactionService.getUserTransaction();
+       txn.begin();
+
+       this.policyBehaviourFilter.disableBehaviour(ContentModel.ASPECT_AUDITABLE);
+       internalNodeService.setProperty(node, ContentModel.PROP_CREATED, newCreated);
+       this.policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_AUDITABLE);
+       
+       txn.commit();
+       
+       // Now chance something else on the node to have it re-indexed
+       nodeService.setProperty(node, ContentModel.PROP_CREATED, newCreated);
+       nodeService.setProperty(node, ContentModel.PROP_DESCRIPTION, "Forced change");
+    }
+    
+    /**
+     * Gets the link name (link- timestamp based) from a returned link
+     */
+    private String getNameFromLink(JSONObject link) throws Exception
+    {
+       if (! link.has("name"))
+       {
+          throw new IllegalArgumentException("No name in " + link.toString());
+       }
+       
+       return link.getString("name");
+    }
+    
+    
+    // Tests
+    
+    /**
+     * Creating, editing, fetching and deleting a link
+     */
+    public void testCreateEditDeleteEntry() throws Exception
+    {
+       JSONObject link;
+       JSONObject author;
+       JSONObject permissions;
+       String name;
+       
+       
+       // None to start with
+       link = getLinks(null, null);
+       assertEquals("Incorrect JSON: " + link.toString(), true, link.has("total"));
+       assertEquals(0, link.getInt("total"));
+       
+       
+       // Won't be there to start with
+       link = getLink(LINK_TITLE_ONE, Status.STATUS_NOT_FOUND);
+       
+       
+       // Create
+       // (We don't get much info back)
+       link = createLink(LINK_TITLE_ONE, "Thing 1", LINK_URL_ONE, false, Status.STATUS_OK);
+       assertEquals("Incorrect JSON: " + link.toString(), true, link.has("name"));
+       name = getNameFromLink(link);
+       
+       assertEquals(name, link.getString("name"));
+       assertEquals(name, link.getString("message"));
+
+       
+       // Fetch
+       link = getLink(name, Status.STATUS_OK);
+       
+       assertEquals("Error found " + link.toString(), false, link.has("error"));
+       assertEquals(LINK_TITLE_ONE, link.getString("title"));
+       assertEquals("Thing 1", link.getString("description"));
+       assertEquals(LINK_URL_ONE, link.getString("url"));
+       assertEquals(false, link.getBoolean("internal"));
+       assertEquals(0, link.getJSONArray("tags").length());
+       
+       assertEquals(true, link.has("author"));
+       author = link.getJSONObject("author");
+       assertEquals(USER_ONE, author.getString("username"));
+       assertEquals(USERDETAILS_FIRSTNAME, author.getString("firstName"));
+       assertEquals(USERDETAILS_LASTNAME, author.getString("lastName"));
+       
+       // Check the permissions
+       assertEquals(true, link.has("permissions"));
+       permissions = link.getJSONObject("permissions");
+       assertEquals(true, permissions.getBoolean("edit"));
+       assertEquals(true, permissions.getBoolean("delete"));
+       
+       // Check the noderef
+       NodeRef nodeRef = new NodeRef(link.getString("nodeRef"));
+       assertEquals(true, nodeService.exists(nodeRef));
+       assertEquals(name, nodeService.getProperty(nodeRef, ContentModel.PROP_NAME));
+       
+       // Check the comments url
+       assertEquals(
+             "/node/workspace/" + nodeRef.getStoreRef().getIdentifier() + "/" + nodeRef.getId() + "/comments",
+             link.getString("commentsUrl"));
+       
+       // Check the created date: compare two java.util.Date objects.
+       assertEquals(
+             nodeService.getProperty(nodeRef, ContentModel.PROP_CREATED),
+             ISO8601DateFormat.parse(link.getJSONObject("createdOnDate").getString("iso8601")));
+       
+       // Edit
+       // We should get a simple message
+       link = updateLink(name, LINK_TITLE_ONE, "More Thing 1", LINK_URL_ONE, true, Status.STATUS_OK);
+       assertEquals(
+             "Incorrect JSON: " + link.toString(), 
+             true, link.has("message"));
+       assertEquals(
+             "Incorrect JSON: " + link.toString(), 
+             true, link.getString("message").contains("updated"));
+       
+       
+       // Fetch
+       link = getLink(name, Status.STATUS_OK);
+       
+       assertEquals("Error found " + link.toString(), false, link.has("error"));
+       assertEquals(LINK_TITLE_ONE, link.getString("title"));
+       assertEquals("More Thing 1", link.getString("description"));
+       assertEquals(LINK_URL_ONE, link.getString("url"));
+       assertEquals(true, link.getBoolean("internal"));
+       assertEquals(0, link.getJSONArray("tags").length());
+       
+       assertEquals(true, link.has("author"));
+       author = link.getJSONObject("author");
+       assertEquals(USER_ONE, author.getString("username"));
+       assertEquals(USERDETAILS_FIRSTNAME, author.getString("firstName"));
+       assertEquals(USERDETAILS_LASTNAME, author.getString("lastName"));
+       
+       
+       // Fetch as a different user, permissions different
+       this.authenticationComponent.setCurrentUser(USER_TWO);
+       link = getLink(name, Status.STATUS_OK);
+       
+       // Check the basics
+       assertEquals(LINK_TITLE_ONE, link.getString("title"));
+       assertEquals("More Thing 1", link.getString("description"));
+       assertEquals(LINK_URL_ONE, link.getString("url"));
+       assertEquals(true, link.getBoolean("internal"));
+       assertEquals(0, link.getJSONArray("tags").length());
+       
+       // Different user in the site, can edit but not delete
+       assertEquals(true, link.has("permissions"));
+       permissions = link.getJSONObject("permissions");
+       assertEquals(true, permissions.getBoolean("edit"));
+       assertEquals(false, permissions.getBoolean("delete"));
+       
+       this.authenticationComponent.setCurrentUser(USER_ONE);
+
+       
+       // Delete
+       link = deleteLinks(Arrays.asList(new String[]{name}), Status.STATUS_OK);
+       assertEquals(
+             "Incorrect JSON: " + link.toString(), 
+             true, link.has("message"));
+       
+       assertEquals(
+             "Incorrect JSON: " + link.toString(), 
+             true, link.getString("message").contains("deleted"));
+
+       
+       // Fetch, will have gone
+       link = getLink(name, Status.STATUS_NOT_FOUND);
+       
+       
+       // Can't delete again
+       deleteLinks(Arrays.asList(new String[]{name}), Status.STATUS_NOT_FOUND);
+       
+       
+       // Can't edit it when it's deleted
+       sendRequest(new PutRequest(URL_LINKS_UPDATE + name, "{}", "application/json"), Status.STATUS_NOT_FOUND);
+       
+       
+       // Do a single delete
+       link = createLink(LINK_TITLE_ONE, "Thing 1", LINK_URL_ONE, false, Status.STATUS_OK);
+       name = getNameFromLink(link);
+       
+       getLink(name, Status.STATUS_OK);
+       deleteLink(name, Status.STATUS_NO_CONTENT);
+       getLink(name, Status.STATUS_NOT_FOUND);
+       deleteLink(name, Status.STATUS_NOT_FOUND);
+    }
+
+    /**
+     * MNT-13456 Check for XSS attack via update of link
+     * @throws Exception
+     */
+    public void testXssLinks() throws Exception
+    {
+        String LINK_TITLE = "lnk" + System.currentTimeMillis();
+        String LINK_URL = "http://alfresco.com";
+
+        HashMap<String, Integer> mapForCheck = new HashMap<String, Integer>();
+        mapForCheck.put("http:javasc\\ript:alert('mail.ru')", Status.STATUS_BAD_REQUEST);
+        mapForCheck.put("javas\\0cr\\ip\\00t:alert('dd')", Status.STATUS_BAD_REQUEST);
+        mapForCheck.put("alfresco.my", Status.STATUS_OK);
+        mapForCheck.put("javascript:alert('http://somedata.html')", Status.STATUS_BAD_REQUEST);
+        mapForCheck.put("http://alfresco.org", Status.STATUS_OK);
+        mapForCheck.put("localhost:8080", Status.STATUS_OK);
+        mapForCheck.put("localhost:8080/share", Status.STATUS_OK);
+        mapForCheck.put("localhost:80A80/share", Status.STATUS_BAD_REQUEST);
+        mapForCheck.put("http:java\\00script:alert('XSS')", Status.STATUS_BAD_REQUEST);
+        mapForCheck.put("http:javas\\0cript:alert('XSS')", Status.STATUS_BAD_REQUEST);
+        mapForCheck.put("http: &#14;  javascript:alert('XSS')", Status.STATUS_BAD_REQUEST);
+        mapForCheck.put("<SCRIPT/XSS SRC='http://ha.ckers.org/xss.js'></SCRIPT>", Status.STATUS_BAD_REQUEST);
+        mapForCheck.put("<iframe src=http://ha.ckers.org/scriptlet.html <", Status.STATUS_BAD_REQUEST);
+        mapForCheck.put("html:vbscript:msgbox(\"XSS\")", Status.STATUS_BAD_REQUEST);
+        mapForCheck.put("<STYLE>@im\\port'\\ja\\vasc\\ript:alert(\"XSS\")';</STYLE>", Status.STATUS_BAD_REQUEST);
+        mapForCheck.put("<IMG SRC= onmouseover=\"alert('xxs')\">", Status.STATUS_BAD_REQUEST);
+        mapForCheck.put("BODY onload!#$%&()*~+-_.,:;?@[/|\\]^`=alert(\"XSS\")>", Status.STATUS_BAD_REQUEST);
+        mapForCheck.put("onload54(dd)fg`=df", Status.STATUS_BAD_REQUEST);
+
+        JSONObject link;
+
+        link = createLink(LINK_TITLE, "Link desc", LINK_URL, false, Status.STATUS_OK);
+        String name = getNameFromLink(link);
+
+        for (String url : mapForCheck.keySet())
+        {
+            int expStatus = mapForCheck.get(url);
+            updateLink(name, LINK_TITLE, "Link desc", url, false, expStatus);
+        }
+    }
+    
+    /**
+     * Listing
+     */
+    public void testOverallListing() throws Exception
+    {
+       JSONObject links;
+       JSONArray entries;
+       
+       // Initially, there are no events
+       links = getLinks(null, null);
+       assertEquals("Incorrect JSON: " + links.toString(), true, links.has("total"));
+       assertEquals(0, links.getInt("total"));
+       assertEquals(0, links.getInt("itemCount"));
+       
+       
+       // Add two links to get started with
+       createLink(LINK_TITLE_ONE, "Thing 1", LINK_URL_ONE, false, Status.STATUS_OK);
+       createLink(LINK_TITLE_TWO, "Thing 2", LINK_URL_TWO, false, Status.STATUS_OK);
+       
+       // Check again
+       links = getLinks(null, null);
+       
+       // Should have two links
+       assertEquals("Incorrect JSON: " + links.toString(), true, links.has("total"));
+       assertEquals(2, links.getInt("total"));
+       assertEquals(2, links.getInt("itemCount"));
+     
+       entries = links.getJSONArray("items");
+       assertEquals(2, entries.length());
+       // Sorted by newest created first
+       assertEquals(LINK_TITLE_TWO, entries.getJSONObject(0).getString("title"));
+       assertEquals(LINK_TITLE_ONE, entries.getJSONObject(1).getString("title"));
+       
+       
+       // Add a third, which is internal, and created by the other user
+       this.authenticationComponent.setCurrentUser(USER_TWO);
+       JSONObject link3 = createLink(LINK_TITLE_THREE, "Thing 3", LINK_URL_THREE, true, Status.STATUS_OK);
+       String name3 = getNameFromLink(link3);
+       updateLink(name3, LINK_TITLE_THREE, "More Where 3", LINK_URL_THREE, false, Status.STATUS_OK);
+       this.authenticationComponent.setCurrentUser(USER_ONE);
+       
+       
+       // Check now, should have three links
+       links = getLinks(null, null);
+       assertEquals(3, links.getInt("total"));
+       assertEquals(3, links.getInt("itemCount"));
+       
+       entries = links.getJSONArray("items");
+       assertEquals(3, entries.length());
+       assertEquals(LINK_TITLE_THREE, entries.getJSONObject(0).getString("title"));
+       assertEquals(LINK_TITLE_TWO, entries.getJSONObject(1).getString("title"));
+       assertEquals(LINK_TITLE_ONE, entries.getJSONObject(2).getString("title"));
+       
+       
+       // Ask for filtering by user
+       links = getLinks(null, USER_ONE);
+       assertEquals(2, links.getInt("total"));
+       assertEquals(2, links.getInt("itemCount"));
+       
+       entries = links.getJSONArray("items");
+       assertEquals(2, entries.length());
+       assertEquals(LINK_TITLE_TWO, entries.getJSONObject(0).getString("title"));
+       assertEquals(LINK_TITLE_ONE, entries.getJSONObject(1).getString("title"));
+       
+       links = getLinks(null, USER_TWO);
+       assertEquals(1, links.getInt("total"));
+       assertEquals(1, links.getInt("itemCount"));
+       
+       entries = links.getJSONArray("items");
+       assertEquals(1, entries.length());
+       assertEquals(LINK_TITLE_THREE, entries.getJSONObject(0).getString("title"));
+
+       
+       // Ask for filtering by recent docs
+       links = getLinks("recent", null);
+       assertEquals(3, links.getInt("total"));
+       assertEquals(3, links.getInt("itemCount"));
+       
+       entries = links.getJSONArray("items");
+       assertEquals(3, entries.length());
+       assertEquals(LINK_TITLE_THREE, entries.getJSONObject(0).getString("title"));
+       assertEquals(LINK_TITLE_TWO, entries.getJSONObject(1).getString("title"));
+       assertEquals(LINK_TITLE_ONE, entries.getJSONObject(2).getString("title"));
+       
+       
+       // Push the 3rd event back, it'll fall off
+       pushLinkCreatedDateBack(name3, 10);
+       
+       links = getLinks("recent", null);
+       assertEquals(2, links.getInt("total"));
+       assertEquals(2, links.getInt("itemCount"));
+       
+       entries = links.getJSONArray("items");
+       assertEquals(2, entries.length());
+       assertEquals(LINK_TITLE_TWO, entries.getJSONObject(0).getString("title"));
+       assertEquals(LINK_TITLE_ONE, entries.getJSONObject(1).getString("title"));
+       
+       
+       
+       // Trigger the paging, by going over our page size of 4
+       createLink(LINK_TITLE_THREE+"a", "Thing 4", LINK_URL_THREE, true, Status.STATUS_OK);
+       createLink(LINK_TITLE_THREE+"z", "Thing 5", LINK_URL_THREE, true, Status.STATUS_OK);
+       
+       links = getLinks(null, null);
+       assertEquals(5, links.getInt("total"));
+       assertEquals(4, links.getInt("itemCount"));
+       
+       entries = links.getJSONArray("items");
+       assertEquals(4, entries.length());
+       assertEquals(LINK_TITLE_THREE+"z", entries.getJSONObject(0).getString("title"));
+       assertEquals(LINK_TITLE_THREE+"a", entries.getJSONObject(1).getString("title"));
+       assertEquals(LINK_TITLE_TWO, entries.getJSONObject(2).getString("title"));
+       assertEquals(LINK_TITLE_ONE, entries.getJSONObject(3).getString("title"));
+       // THREE is now the oldest, as we pushed it back in time, so it's on page two
+       
+       
+       // Now hide the site, and remove the user from it, won't be allowed to see it
+       this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+       SiteInfo site = siteService.getSite(SITE_SHORT_NAME_LINKS);
+       site.setVisibility(SiteVisibility.PRIVATE);
+       siteService.updateSite(site);
+       siteService.removeMembership(SITE_SHORT_NAME_LINKS, USER_ONE);
+       this.authenticationComponent.setCurrentUser(USER_ONE);
+       
+       sendRequest(new GetRequest(URL_LINKS_LIST), Status.STATUS_NOT_FOUND);
+    }
+    
+    /**
+     * Test for <a href=https://issues.alfresco.com/jira/browse/MNT-11964>MNT-11964</a>
+     * @throws Exception 
+     */
+    public void testCreateLinkPermission() throws Exception
+    {
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        String siteName = SITE_SHORT_NAME_LINKS + GUID.generate();
+        this.siteService.createSite("LinkSitePreset", siteName, "SiteTitle", "SiteDescription", SiteVisibility.PUBLIC);
+        
+        String userName = USER_ONE + GUID.generate();
+        createUser(userName, SiteModel.SITE_COLLABORATOR, siteName);
+
+        // Check permissions for admin
+        checkLinkPermissions(siteName);
+        
+        // Check permissions for user
+        this.authenticationComponent.setCurrentUser(userName);
+        checkLinkPermissions(siteName);
+
+        // Cleanup
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        this.siteService.deleteSite(siteName);
+        
+        // Create a new site as user
+        this.authenticationComponent.setCurrentUser(userName);
+        siteName = SITE_SHORT_NAME_LINKS + GUID.generate();
+        this.siteService.createSite("LinkSitePreset", siteName, "SiteTitle", "SiteDescription", SiteVisibility.PUBLIC);
+        
+        // Check permissions for user
+        checkLinkPermissions(siteName);
+        
+        // Check permissions for admin
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        checkLinkPermissions(siteName);
+        
+        // Cleanup
+        this.siteService.deleteSite(siteName);
+        this.personService.deletePerson(userName);
+    }
+    
+    private void checkLinkPermissions(String siteName) throws Exception
+    {
+        String url = "/api/links/site/" + siteName + "/links";
+        url += "?filter=" + "all";
+        url += "&startIndex=0&page=1&pageSize=4";
+        Response response = sendRequest(new GetRequest(url), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        
+        assertTrue("The user sould have permission to create a new link.", result.getJSONObject("metadata").getJSONObject("linkPermissions").getBoolean("create"));
+    }
+
+    public void testCommentLink() throws Exception
+    {
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        JSONObject link = createLink(LINK_TITLE_ONE, "commented link", LINK_URL_ONE, false, Status.STATUS_OK);
+        postLookup.execute();
+        feedGenerator.execute();
+        int activityNumStart = activityService.getSiteFeedEntries(SITE_SHORT_NAME_LINKS).size();
+        String name = getNameFromLink(link);
+        link = getLink(name, Status.STATUS_OK);
+        String nodeRef = link.getString("nodeRef");
+        JSONObject commentOne = createComment(nodeRef, "comment", "content", 200);
+        postLookup.execute();
+        feedGenerator.execute();
+        int activityNumNext = activityService.getSiteFeedEntries(SITE_SHORT_NAME_LINKS).size();
+        assertEquals("The activity feeds were not generated after adding a comment", activityNumStart + 1, activityNumNext);
+        activityNumStart = activityNumNext;
+        NodeRef commentNodeRef = new NodeRef(commentOne.getString("nodeRef"));
+        sendRequest(new DeleteRequest(getDeleteCommentUrl(commentNodeRef)), 200);
+        postLookup.execute();
+        feedGenerator.execute();
+        activityNumNext = activityService.getSiteFeedEntries(SITE_SHORT_NAME_LINKS).size();
+        assertEquals("The activity feeds were not generated after deleting a comment", activityNumStart + 1, activityNumNext);
+    }
+
+    private JSONObject createComment(String nodeRef, String title, String content, int expectedStatus)
+            throws Exception
+    {
+        JSONObject comment = new JSONObject();
+        comment.put("title", title);
+        comment.put("content", content);
+        comment.put("site", SITE_SHORT_NAME_LINKS);
+        Response response = sendRequest(new PostRequest(getCommentsUrl(nodeRef), comment.toString(), "application/json"), expectedStatus);
+
+        if (expectedStatus != 200)
+        {
+            return null;
+        }
+
+        //logger.debug("Comment created: " + response.getContentAsString());
+        JSONObject result = new JSONObject(response.getContentAsString());
+        return result.getJSONObject("item");
+    }
+
+    private String getCommentsUrl(String nodeRef)
+    {
+        return "/api/node/" + nodeRef.replace("://", "/") + "/comments";
+    }
+
+    private String getCommentUrl(String nodeRef)
+    {
+        return "/api/comment/node/" + nodeRef.replace("://", "/");
+    }
+
+    private String getDeleteCommentUrl(NodeRef commentNodeRef)
+    {
+        String itemTitle = "Test Title";
+        String page = "document-details";
+
+        String URL = MessageFormat.format(URL_DELETE_COMMENT, new Object[] { commentNodeRef.getStoreRef().getProtocol(),
+                commentNodeRef.getStoreRef().getIdentifier(), commentNodeRef.getId(), SITE_SHORT_NAME_LINKS, itemTitle, page});
+        return URL;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/node/NodeWebScripTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/node/NodeWebScripTest.java
new file mode 100644
index 00000000000..468a2f03b92
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/node/NodeWebScripTest.java
@@ -0,0 +1,779 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.node;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ApplicationModel;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.coci.CheckOutCheckInService;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.PropertyMap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.springframework.context.support.AbstractRefreshableApplicationContext;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Request;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Unit Tests for the Java-backed Node WebScripts
+ * 
+ * @since 4.1
+ */
+public class NodeWebScripTest extends BaseWebScriptTest
+{
+    private static Log logger = LogFactory.getLog(NodeWebScripTest.class);
+    
+    private static String CREATE_LINK_API = "/api/node/doclink/";
+    private static String DESTINATION_NODE_REF_PARAM = "destinationNodeRef";
+    private static String MULTIPLE_FILES_PARAM = "multipleFiles";
+
+    private String TEST_SITE_NAME = "TestNodeSite";
+    private SiteInfo TEST_SITE;
+    
+    private MutableAuthenticationService authenticationService;
+    private RetryingTransactionHelper retryingTransactionHelper;
+    private PersonService personService;
+    private SiteService siteService;
+    private NodeService nodeService;
+    private NodeArchiveService nodeArchiveService;
+    private CheckOutCheckInService checkOutCheckInService;
+    private PermissionService permissionService;
+    
+    private static final String USER_ONE = "UserOneSecondToo";
+    private static final String USER_TWO = "UserTwoSecondToo";
+    private static final String USER_THREE = "UserThreeStill";
+    private static final String PASSWORD = "passwordTEST";
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        AbstractRefreshableApplicationContext ctx = (AbstractRefreshableApplicationContext)getServer().getApplicationContext();
+        this.retryingTransactionHelper = (RetryingTransactionHelper)ctx.getBean("retryingTransactionHelper");
+        this.authenticationService = (MutableAuthenticationService)ctx.getBean("AuthenticationService");
+        this.personService = (PersonService)ctx.getBean("PersonService");
+        this.siteService = (SiteService)ctx.getBean("SiteService");
+        this.nodeService = (NodeService)ctx.getBean("NodeService");
+        this.nodeArchiveService = (NodeArchiveService)ctx.getBean("nodeArchiveService");
+        this.checkOutCheckInService = (CheckOutCheckInService)ctx.getBean("checkOutCheckInService");
+        this.permissionService = (PermissionService)ctx.getBean("permissionService");
+        
+        // Do the setup as admin
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+
+        // Create a site
+        TEST_SITE = createSite(TEST_SITE_NAME);
+        
+        // Create two users, one who's a site member
+        createUser(USER_ONE, true);
+        createUser(USER_TWO, false);
+        
+        // Do our tests by default as the first user who is a contributor
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        
+        // Admin user required to delete users and sites
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        
+        SiteInfo siteInfo = siteService.getSite(TEST_SITE.getShortName());
+        if (siteInfo != null)
+        {
+            // Zap the site, and their contents
+            siteService.deleteSite(TEST_SITE.getShortName());
+            nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
+        }
+
+        
+        // Delete users
+        for (String user : new String[] {USER_ONE, USER_TWO, USER_THREE})
+        {
+            // Delete the user, as admin
+            AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+            if(personService.personExists(user))
+            {
+               personService.deletePerson(user);
+            }
+            if(this.authenticationService.authenticationExists(user))
+            {
+               this.authenticationService.deleteAuthentication(user);
+            }
+        }
+    }
+    
+    private SiteInfo createSite(final String shortName)
+    {
+        return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<SiteInfo>()
+           {
+              @Override
+              public SiteInfo execute() throws Throwable
+              {
+                  SiteInfo siteInfo = siteService.getSite(shortName);
+                  if (siteInfo != null)
+                  {
+                      // Tidy up after failed earlier run
+                      siteService.deleteSite(shortName);
+                      nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
+                  }
+                  
+                  // Do the create
+                  SiteInfo site = siteService.createSite("Testing", shortName, shortName, null, SiteVisibility.PUBLIC);
+                  
+                  // Ensure we have a doclib
+                  siteService.createContainer(shortName, SiteService.DOCUMENT_LIBRARY, ContentModel.TYPE_FOLDER, null);
+                  
+                  // All done
+                  return site;
+              }
+           }, false, true
+        ); 
+    }
+    
+    private void createUser(final String userName, boolean contributor)
+    {
+        // Make sure a new user is created every time
+        // This ensures a predictable password etc
+        if(this.personService.personExists(userName))
+        {
+           this.personService.deletePerson(userName);
+        }
+        if(this.authenticationService.authenticationExists(userName))
+        {
+           this.authenticationService.deleteAuthentication(userName);
+        }
+        
+        
+        // Create a fresh user
+        authenticationService.createAuthentication(userName, PASSWORD.toCharArray());
+
+        // create person properties
+        PropertyMap personProps = new PropertyMap();
+        personProps.put(ContentModel.PROP_USERNAME, userName);
+        personProps.put(ContentModel.PROP_FIRSTNAME, "First");
+        personProps.put(ContentModel.PROP_LASTNAME, "Last");
+        personProps.put(ContentModel.PROP_EMAIL, "FirstName123.LastName123@email.com");
+        personProps.put(ContentModel.PROP_JOBTITLE, "JobTitle123");
+        personProps.put(ContentModel.PROP_JOBTITLE, "Organisation123");
+
+        // create person node for user
+        personService.createPerson(personProps);
+
+        // Set site permissions as needed
+        if (contributor)
+        {
+            this.siteService.setMembership(TEST_SITE_NAME, userName, SiteModel.SITE_CONTRIBUTOR);
+        }
+        else
+        {
+            this.siteService.setMembership(TEST_SITE_NAME, userName, SiteModel.SITE_CONSUMER);
+        }
+    }
+    
+    private JSONObject asJSON(Response response) throws Exception
+    {
+        String json = response.getContentAsString();
+        JSONParser p = new JSONParser();
+        Object o = p.parse(json);
+        
+        if (o instanceof JSONObject)
+        {
+            return (JSONObject)o; 
+        }
+        throw new IllegalArgumentException("Expected JSONObject, got " + o + " from " + json);
+    }
+    
+    
+    @SuppressWarnings("unchecked")
+    public void testFolderCreation() throws Exception
+    {
+        // Create a folder within the DocLib
+        NodeRef siteDocLib = siteService.getContainer(TEST_SITE.getShortName(), SiteService.DOCUMENT_LIBRARY);
+        
+        String testFolderName = "testing";
+        Map<QName,Serializable> testFolderProps = new HashMap<QName, Serializable>();
+        testFolderProps.put(ContentModel.PROP_NAME, testFolderName);
+        NodeRef testFolder = nodeService.createNode(siteDocLib, ContentModel.ASSOC_CONTAINS, 
+                QName.createQName("testing"), ContentModel.TYPE_FOLDER, testFolderProps).getChildRef();
+        
+        String testNodeName = "aNEWfolder";
+        String testNodeTitle = "aTITLEforAfolder";
+        String testNodeDescription = "DESCRIPTIONofAfolder";
+        JSONObject jsonReq = null;
+        JSONObject json = null;
+        NodeRef folder = null;
+        
+        
+        // By NodeID
+        Request req = new Request("POST", "/api/node/folder/"+testFolder.getStoreRef().getProtocol()+"/"+
+                                   testFolder.getStoreRef().getIdentifier()+"/"+testFolder.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put("name", testNodeName);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+        
+        json = asJSON( sendRequest(req, Status.STATUS_OK) );
+        assertNotNull(json.get("nodeRef"));
+
+        folder = new NodeRef((String)json.get("nodeRef"));
+        assertEquals(true, nodeService.exists(folder));
+        assertEquals(testNodeName, nodeService.getProperty(folder, ContentModel.PROP_NAME));
+        assertEquals(testNodeName, nodeService.getProperty(folder, ContentModel.PROP_TITLE));
+        assertEquals(null, nodeService.getProperty(folder, ContentModel.PROP_DESCRIPTION));
+        
+        assertEquals(testFolder, nodeService.getPrimaryParent(folder).getParentRef());
+        assertEquals(ContentModel.TYPE_FOLDER, nodeService.getType(folder));
+        
+        nodeService.deleteNode(folder);
+
+        
+        // In a Site Container
+        req = new Request("POST", "/api/site/folder/"+TEST_SITE_NAME+"/"+SiteService.DOCUMENT_LIBRARY);
+        jsonReq = new JSONObject();
+        jsonReq.put("name", testNodeName);
+        jsonReq.put("description", testNodeDescription);
+        req.setBody(jsonReq.toString().getBytes());
+
+        json = asJSON( sendRequest(req, Status.STATUS_OK) );
+        assertNotNull(json.get("nodeRef"));
+
+        folder = new NodeRef((String)json.get("nodeRef"));
+        assertEquals(true, nodeService.exists(folder));
+        assertEquals(testNodeName, nodeService.getProperty(folder, ContentModel.PROP_NAME));
+        assertEquals(testNodeName, nodeService.getProperty(folder, ContentModel.PROP_TITLE));
+        assertEquals(testNodeDescription, nodeService.getProperty(folder, ContentModel.PROP_DESCRIPTION));
+        
+        assertEquals(siteDocLib, nodeService.getPrimaryParent(folder).getParentRef());
+        assertEquals(ContentModel.TYPE_FOLDER, nodeService.getType(folder));
+        
+        nodeService.deleteNode(folder);
+
+        
+        // A Child of a Site Container
+        req = new Request("POST", "/api/site/folder/"+TEST_SITE_NAME+"/"+SiteService.DOCUMENT_LIBRARY+"/"+testFolderName);
+        jsonReq = new JSONObject();
+        jsonReq.put("name", testNodeName);
+        jsonReq.put("title", testNodeTitle);
+        jsonReq.put("description", testNodeDescription);
+        req.setBody(jsonReq.toString().getBytes());
+
+        json = asJSON( sendRequest(req, Status.STATUS_OK) );
+        assertNotNull(json.get("nodeRef"));
+
+        folder = new NodeRef((String)json.get("nodeRef"));
+        assertEquals(true, nodeService.exists(folder));
+        assertEquals(testNodeName, nodeService.getProperty(folder, ContentModel.PROP_NAME));
+        assertEquals(testNodeTitle, nodeService.getProperty(folder, ContentModel.PROP_TITLE));
+        assertEquals(testNodeDescription, nodeService.getProperty(folder, ContentModel.PROP_DESCRIPTION));
+        
+        assertEquals(testFolder, nodeService.getPrimaryParent(folder).getParentRef());
+        assertEquals(ContentModel.TYPE_FOLDER, nodeService.getType(folder));
+
+        nodeService.deleteNode(folder);
+
+        
+        // Type needs to be a subtype of folder
+        
+        // explicit cm:folder
+        req = new Request("POST", "/api/site/folder/"+TEST_SITE_NAME+"/"+SiteService.DOCUMENT_LIBRARY+"/"+testFolderName);
+        jsonReq = new JSONObject();
+        jsonReq.put("name", testNodeName);
+        jsonReq.put("type", "cm:folder");
+        req.setBody(jsonReq.toString().getBytes());
+
+        json = asJSON( sendRequest(req, Status.STATUS_OK) );
+        assertNotNull(json.get("nodeRef"));
+
+        folder = new NodeRef((String)json.get("nodeRef"));
+        assertEquals(true, nodeService.exists(folder));
+        assertEquals(testNodeName, nodeService.getProperty(folder, ContentModel.PROP_NAME));
+        assertEquals(ContentModel.TYPE_FOLDER, nodeService.getType(folder));
+
+        nodeService.deleteNode(folder);
+
+        
+        // cm:systemfolder extends from cm:folder
+        req = new Request("POST", "/api/site/folder/"+TEST_SITE_NAME+"/"+SiteService.DOCUMENT_LIBRARY+"/"+testFolderName);
+        jsonReq = new JSONObject();
+        jsonReq.put("name", testNodeName);
+        jsonReq.put("type", "cm:systemfolder");
+        req.setBody(jsonReq.toString().getBytes());
+
+        json = asJSON( sendRequest(req, Status.STATUS_OK) );
+        assertNotNull(json.get("nodeRef"));
+
+        folder = new NodeRef((String)json.get("nodeRef"));
+        assertEquals(true, nodeService.exists(folder));
+        assertEquals(testNodeName, nodeService.getProperty(folder, ContentModel.PROP_NAME));
+        assertEquals(ContentModel.TYPE_SYSTEM_FOLDER, nodeService.getType(folder));
+
+        nodeService.deleteNode(folder);
+
+        
+        // cm:content isn't allowed
+        req = new Request("POST", "/api/site/folder/"+TEST_SITE_NAME+"/"+SiteService.DOCUMENT_LIBRARY+"/"+testFolderName);
+        jsonReq = new JSONObject();
+        jsonReq.put("name", testNodeName);
+        jsonReq.put("type", "cm:content");
+        req.setBody(jsonReq.toString().getBytes());
+
+        sendRequest(req, Status.STATUS_BAD_REQUEST);
+        
+        
+        // Check permissions - need to be Contributor
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+        req = new Request("POST", "/api/node/folder/"+testFolder.getStoreRef().getProtocol()+"/"+
+                                  testFolder.getStoreRef().getIdentifier()+"/"+testFolder.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put("name", testNodeName);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+
+        json = asJSON( sendRequest(req, Status.STATUS_OK) );
+        assertNotNull(json.get("nodeRef"));
+
+        folder = new NodeRef((String)json.get("nodeRef"));
+        assertEquals(true, nodeService.exists(folder));
+        nodeService.deleteNode(folder);
+
+        
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_TWO);
+        sendRequest(req, Status.STATUS_FORBIDDEN);
+    }
+
+    @SuppressWarnings("unchecked")
+    public void testLinkCreation() throws Exception
+    {
+        // Create a folder within the DocLib
+        NodeRef siteDocLib = siteService.getContainer(TEST_SITE.getShortName(), SiteService.DOCUMENT_LIBRARY);
+
+        String testFolder1Name = "testingLinkCreationFolder1";
+        Map<QName, Serializable> testFolderProps = new HashMap<QName, Serializable>();
+        testFolderProps.put(ContentModel.PROP_NAME, testFolder1Name);
+        NodeRef testFolder1 = nodeService.createNode(siteDocLib, ContentModel.ASSOC_CONTAINS,
+                QName.createQName("testingLinkCreationFolder1"), ContentModel.TYPE_FOLDER, testFolderProps).getChildRef();
+
+        JSONObject jsonReq = null;
+        JSONObject json = null;
+        JSONArray jsonArray = new JSONArray();
+        JSONArray jsonLinkNodes = null;
+        JSONObject jsonLinkNode = null;
+
+        // Create files in the testFolder1
+        NodeRef testFile1 = createNode(testFolder1, "testingLinkCreationFile1", ContentModel.TYPE_CONTENT,
+                AuthenticationUtil.getAdminUserName());
+        NodeRef testFile2 = createNode(testFolder1, "testingLinkCreationFile2", ContentModel.TYPE_CONTENT,
+                AuthenticationUtil.getAdminUserName());
+        NodeRef testFile3 = createNode(testFolder1, "testingLinkCreationFile3", ContentModel.TYPE_CONTENT,
+                AuthenticationUtil.getAdminUserName());
+
+        // Create testFolder2 in the testFolder1
+        String testFolder2Name = "testingLinkCreationFolder2";
+        testFolderProps = new HashMap<QName, Serializable>();
+        testFolderProps.put(ContentModel.PROP_NAME, testFolder2Name);
+        NodeRef testFolder2 = nodeService.createNode(siteDocLib, ContentModel.ASSOC_CONTAINS,
+                QName.createQName("testingLinkCreationFolder2"), ContentModel.TYPE_FOLDER, testFolderProps).getChildRef();
+
+        // Create link to file1 in same folder - testFolder1
+        Request req = new Request("POST", CREATE_LINK_API + testFile1.getStoreRef().getProtocol() + "/"
+                + testFile1.getStoreRef().getIdentifier() + "/" + testFile1.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put(DESTINATION_NODE_REF_PARAM, testFolder1.toString());
+
+        jsonArray.add(testFile1.toString());
+        jsonReq.put(MULTIPLE_FILES_PARAM, jsonArray);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+
+        json = asJSON(sendRequest(req, Status.STATUS_OK));
+        jsonLinkNodes = (JSONArray) json.get("linkNodes");
+        assertNotNull(jsonLinkNodes);
+        assertEquals(1, jsonLinkNodes.size());
+        assertEquals("true", json.get("overallSuccess"));
+        assertEquals("1", json.get("successCount"));
+        assertEquals("0", json.get("failureCount"));
+
+        jsonLinkNode = (JSONObject) jsonLinkNodes.get(0);
+        String nodeRef = (String) jsonLinkNode.get("nodeRef");
+        NodeRef file1Link = new NodeRef(nodeRef);
+
+        // Check that app:linked aspect is added on sourceNode
+        assertEquals(true, nodeService.hasAspect(testFile1, ApplicationModel.ASPECT_LINKED));
+        assertEquals(true, nodeService.exists(file1Link));
+        nodeService.deleteNode(file1Link);
+        assertEquals(false, nodeService.hasAspect(testFile1, ApplicationModel.ASPECT_LINKED));
+
+        // Create link to testFolder2 in same folder (testFolder1)
+        req = new Request("POST", CREATE_LINK_API + testFolder2.getStoreRef().getProtocol() + "/"
+                + testFolder2.getStoreRef().getIdentifier() + "/" + testFolder2.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put(DESTINATION_NODE_REF_PARAM, testFolder1.toString());
+        jsonArray = new JSONArray();
+        jsonArray.add(testFolder2.toString());
+        jsonReq.put(MULTIPLE_FILES_PARAM, jsonArray);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+
+        json = asJSON(sendRequest(req, Status.STATUS_OK));
+        jsonLinkNodes = (JSONArray) json.get("linkNodes");
+        assertNotNull(jsonLinkNodes);
+        assertEquals(1, jsonLinkNodes.size());
+        assertEquals("true", json.get("overallSuccess"));
+        assertEquals("1", json.get("successCount"));
+        assertEquals("0", json.get("failureCount"));
+
+        jsonLinkNode = (JSONObject) jsonLinkNodes.get(0);
+        nodeRef = (String) jsonLinkNode.get("nodeRef");
+        NodeRef folder2Link = new NodeRef(nodeRef);
+        assertEquals(true, nodeService.hasAspect(testFolder2, ApplicationModel.ASPECT_LINKED));
+        assertEquals(true, nodeService.exists(folder2Link));
+
+        // create another link of testFolder2 in siteDocLib
+        req = new Request("POST", CREATE_LINK_API + testFolder2.getStoreRef().getProtocol() + "/"
+                + testFolder2.getStoreRef().getIdentifier() + "/" + testFolder2.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put(DESTINATION_NODE_REF_PARAM, siteDocLib.toString());
+        jsonArray = new JSONArray();
+        jsonArray.add(testFolder2.toString());
+        jsonReq.put(MULTIPLE_FILES_PARAM, jsonArray);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+
+        json = asJSON(sendRequest(req, Status.STATUS_OK));
+        jsonLinkNodes = (JSONArray) json.get("linkNodes");
+        assertNotNull(jsonLinkNodes);
+        assertEquals(1, jsonLinkNodes.size());
+        assertEquals("true", json.get("overallSuccess"));
+        assertEquals("1", json.get("successCount"));
+        assertEquals("0", json.get("failureCount"));
+
+        jsonLinkNode = (JSONObject) jsonLinkNodes.get(0);
+        nodeRef = (String) jsonLinkNode.get("nodeRef");
+        NodeRef folder2Link2 = new NodeRef(nodeRef);
+
+        // delete folder2Link and check that aspect exists since we have another
+        // link for testFolder2
+        nodeService.deleteNode(folder2Link);
+        assertEquals(true, nodeService.hasAspect(testFolder2, ApplicationModel.ASPECT_LINKED));
+        nodeService.deleteNode(folder2Link2);
+        assertEquals(false, nodeService.hasAspect(testFolder2, ApplicationModel.ASPECT_LINKED));
+
+        // Create link to testFile1, testFile2 and testFile3 in same testFolder1
+        req = new Request("POST", CREATE_LINK_API + testFolder1.getStoreRef().getProtocol() + "/"
+                + testFolder1.getStoreRef().getIdentifier() + "/" + testFolder1.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put(DESTINATION_NODE_REF_PARAM, testFolder1.toString());
+        jsonArray = new JSONArray();
+        jsonArray.add(testFile1.toString());
+        jsonArray.add(testFile2.toString());
+        jsonArray.add(testFile3.toString());
+        jsonReq.put(MULTIPLE_FILES_PARAM, jsonArray);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+
+        json = asJSON(sendRequest(req, Status.STATUS_OK));
+        jsonLinkNodes = (JSONArray) json.get("linkNodes");
+        assertNotNull(jsonLinkNodes);
+        assertEquals(3, jsonLinkNodes.size());
+        assertEquals("true", json.get("overallSuccess"));
+        assertEquals("3", json.get("successCount"));
+        assertEquals("0", json.get("failureCount"));
+
+        NodeRef fileLink = null;
+        List<NodeRef> fileLinks = new ArrayList<NodeRef>();
+        for (int i = 0; i < jsonLinkNodes.size(); i++)
+        {
+            jsonLinkNode = (JSONObject) jsonLinkNodes.get(i);
+            nodeRef = (String) jsonLinkNode.get("nodeRef");
+            fileLink = new NodeRef(nodeRef);
+            fileLinks.add(fileLink);
+            assertEquals(true, nodeService.exists(fileLink));
+        }
+
+        //try to create another link in the same location - an exception should be thrown
+        req = new Request("POST", CREATE_LINK_API + testFolder1.getStoreRef().getProtocol() + "/"
+                + testFolder1.getStoreRef().getIdentifier() + "/" + testFolder1.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put(DESTINATION_NODE_REF_PARAM, testFolder1.toString());
+        jsonArray = new JSONArray();
+        jsonArray.add(testFile1.toString());
+        jsonReq.put(MULTIPLE_FILES_PARAM, jsonArray);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+
+        json = asJSON(sendRequest(req, Status.STATUS_BAD_REQUEST));
+
+        // delete all 3 files and check that the links are deleted too
+        nodeService.deleteNode(testFile1);
+        nodeService.deleteNode(testFile2);
+        nodeService.deleteNode(testFile3);
+        for (NodeRef linkNodeRef : fileLinks)
+        {
+            assertEquals(false, nodeService.exists(linkNodeRef));
+        }
+
+        // try create a link to a site - shouldn't be possible
+        SiteInfo site2 = createSite("Site2TestingNodeCreateLink");
+        NodeRef siteNodeRef = site2.getNodeRef();
+
+        req = new Request("POST", CREATE_LINK_API + testFolder1.getStoreRef().getProtocol() + "/"
+                + testFolder1.getStoreRef().getIdentifier() + "/" + testFolder1.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put(DESTINATION_NODE_REF_PARAM, testFolder1.toString());
+        jsonArray = new JSONArray();
+        jsonArray.add(siteNodeRef.toString());
+        jsonReq.put(MULTIPLE_FILES_PARAM, jsonArray);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+
+        json = asJSON(sendRequest(req, Status.STATUS_BAD_REQUEST));
+
+        //create a file and a link to that file inside the documentLibrary 
+        NodeRef site2DocLib = siteService.getContainer(TEST_SITE.getShortName(), SiteService.DOCUMENT_LIBRARY);
+        NodeRef testFileSite2 = createNode(site2DocLib, "testingLinkCreationFileInSite2", ContentModel.TYPE_CONTENT,
+                AuthenticationUtil.getAdminUserName());
+        req = new Request("POST", CREATE_LINK_API + testFolder1.getStoreRef().getProtocol() + "/"
+                + testFolder1.getStoreRef().getIdentifier() + "/" + testFolder1.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put(DESTINATION_NODE_REF_PARAM, site2DocLib.toString());
+        jsonArray = new JSONArray();
+        jsonArray.add(testFileSite2.toString());
+        jsonReq.put(MULTIPLE_FILES_PARAM, jsonArray);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+
+        json = asJSON(sendRequest(req, Status.STATUS_OK));
+
+        //links are created with success, try to delete site2 - should succeed
+        siteService.deleteSite(site2.getShortName());
+        nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteNodeRef));
+
+        // Links can be created in Shared Files, My Files and Repository
+        NodeRef testFile4 = createNode(testFolder1, "testingLinkCreationFile4", ContentModel.TYPE_CONTENT,
+                AuthenticationUtil.getAdminUserName());
+        req = new Request("POST", CREATE_LINK_API + testFile4.getStoreRef().getProtocol() + "/" + testFile4.getStoreRef().getIdentifier()
+                + "/" + testFile4.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put(DESTINATION_NODE_REF_PARAM, "alfresco://company/shared");
+
+        jsonArray = new JSONArray();
+        jsonArray.add(testFile4.toString());
+        jsonReq.put(MULTIPLE_FILES_PARAM, jsonArray);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+
+        json = asJSON(sendRequest(req, Status.STATUS_OK));
+
+        req = new Request("POST", CREATE_LINK_API + testFile4.getStoreRef().getProtocol() + "/" + testFile4.getStoreRef().getIdentifier()
+                + "/" + testFile4.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put(DESTINATION_NODE_REF_PARAM, "alfresco://user/home");
+
+        jsonArray = new JSONArray();
+        jsonArray.add(testFile4.toString());
+        jsonReq.put(MULTIPLE_FILES_PARAM, jsonArray);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+
+        json = asJSON(sendRequest(req, Status.STATUS_OK));
+
+        // create link in Repository as Admin
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        req = new Request("POST", CREATE_LINK_API + testFile4.getStoreRef().getProtocol() + "/" + testFile4.getStoreRef().getIdentifier()
+                + "/" + testFile4.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put(DESTINATION_NODE_REF_PARAM, "alfresco://company/home");
+
+        jsonArray = new JSONArray();
+        jsonArray.add(testFile4.toString());
+        jsonReq.put(MULTIPLE_FILES_PARAM, jsonArray);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+
+        json = asJSON(sendRequest(req, Status.STATUS_OK));
+
+        // all 3 links are created with success, delete all links
+        req = new Request("DELETE", CREATE_LINK_API + testFile4.getStoreRef().getProtocol() + "/" + testFile4.getStoreRef().getIdentifier()
+                + "/" + testFile4.getId() + "/delete");
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+        json = asJSON(sendRequest(req, Status.STATUS_OK));
+
+        //all links are removed with success marker aspect should be removed too
+        assertEquals(false, nodeService.hasAspect(testFile4, ApplicationModel.ASPECT_LINKED));
+
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+
+        //you should not be able to create links for locked nodes but you can delete links
+        final NodeRef testFile5 = createNode(testFolder1, "testingLinkCreationFileWithLock", ContentModel.TYPE_CONTENT,
+                AuthenticationUtil.getAdminUserName());
+
+        req = new Request("POST", CREATE_LINK_API + testFile5.getStoreRef().getProtocol() + "/" + testFile5.getStoreRef().getIdentifier()
+                + "/" + testFile5.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put(DESTINATION_NODE_REF_PARAM, testFolder1.toString());
+
+        jsonArray = new JSONArray();
+        jsonArray.add(testFile5.toString());
+        jsonReq.put(MULTIPLE_FILES_PARAM, jsonArray);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+
+        json = asJSON(sendRequest(req, Status.STATUS_OK));
+        jsonLinkNodes = (JSONArray) json.get("linkNodes");
+        assertNotNull(jsonLinkNodes);
+        assertEquals(1, jsonLinkNodes.size());
+        assertEquals("true", json.get("overallSuccess"));
+        assertEquals("1", json.get("successCount"));
+        assertEquals("0", json.get("failureCount"));
+
+        jsonLinkNode = (JSONObject) jsonLinkNodes.get(0);
+        nodeRef = (String) jsonLinkNode.get("nodeRef");
+        NodeRef file5Link = new NodeRef(nodeRef);
+
+        assertEquals(true, nodeService.hasAspect(testFile5, ApplicationModel.ASPECT_LINKED));
+        assertEquals(true, nodeService.exists(file5Link));
+
+        // checkout the node testFile5
+        final NodeRef workingCopy = retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<NodeRef>()
+        {
+            public NodeRef execute() throws Exception
+            {
+                return checkOutCheckInService.checkout(testFile5);
+            }
+        });
+        assertNotNull(workingCopy);
+
+        // try to create link for working copy
+        req = new Request("POST", CREATE_LINK_API + workingCopy.getStoreRef().getProtocol() + "/"
+                + workingCopy.getStoreRef().getIdentifier() + "/" + workingCopy.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put(DESTINATION_NODE_REF_PARAM, testFolder1.toString());
+
+        jsonArray = new JSONArray();
+        jsonArray.add(workingCopy.toString());
+        jsonReq.put(MULTIPLE_FILES_PARAM, jsonArray);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+
+        // should fail since source node is working copy
+        json = asJSON(sendRequest(req, Status.STATUS_BAD_REQUEST));
+
+        // delete the link when source node is locked
+        nodeService.deleteNode(file5Link);
+        assertEquals(false, nodeService.hasAspect(testFile5, ApplicationModel.ASPECT_LINKED));
+
+        // release the lock
+        retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
+        {
+            public Object execute() throws Exception
+            {
+                checkOutCheckInService.checkin(workingCopy, new HashMap<String, Serializable>());
+                return null;
+            }
+        });
+
+        assertEquals(false, nodeService.hasAspect(testFile5, ContentModel.ASPECT_LOCKABLE));
+
+        // test that Consumers can create and delete links if they have only read permission
+        NodeRef testFile6 = createNode(testFolder1, "testingLinkCreationFile6", ContentModel.TYPE_CONTENT,
+                AuthenticationUtil.getAdminUserName());
+
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_TWO);
+        assertTrue(permissionService.hasPermission(testFile6, PermissionService.READ) == AccessStatus.ALLOWED);
+        assertTrue(permissionService.hasPermission(testFile6, PermissionService.WRITE) == AccessStatus.DENIED);
+
+        // create another link of testFile1 in MyFiles
+        req = new Request("POST", CREATE_LINK_API + testFile6.getStoreRef().getProtocol() + "/"
+                + testFile6.getStoreRef().getIdentifier() + "/" + testFile6.getId());
+        jsonReq = new JSONObject();
+        jsonReq.put(DESTINATION_NODE_REF_PARAM, "alfresco://user/home");
+        jsonArray = new JSONArray();
+        jsonArray.add(testFile6.toString());
+        jsonReq.put(MULTIPLE_FILES_PARAM, jsonArray);
+        req.setBody(jsonReq.toString().getBytes());
+        req.setType(MimetypeMap.MIMETYPE_JSON);
+
+        json = asJSON(sendRequest(req, Status.STATUS_OK));
+        jsonLinkNodes = (JSONArray) json.get("linkNodes");
+        assertNotNull(jsonLinkNodes);
+        assertEquals(1, jsonLinkNodes.size());
+        assertEquals("true", json.get("overallSuccess"));
+        assertEquals("1", json.get("successCount"));
+        assertEquals("0", json.get("failureCount"));
+
+        jsonLinkNode = (JSONObject) jsonLinkNodes.get(0);
+        nodeRef = (String) jsonLinkNode.get("nodeRef");
+        NodeRef testFileSite3Link = new NodeRef(nodeRef);
+        nodeService.exists(testFileSite3Link);
+        assertEquals(true, nodeService.hasAspect(testFile6, ApplicationModel.ASPECT_LINKED));
+
+    }
+
+    private NodeRef createNode(NodeRef parentNode, String nodeCmName, QName nodeType, String ownerUserName)
+    {
+        QName childName = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, nodeCmName);
+
+        Map<QName, Serializable> props = new HashMap<QName, Serializable>();
+        props.put(ContentModel.PROP_NAME, nodeCmName);
+        ChildAssociationRef childAssoc = nodeService.createNode(parentNode,
+                    ContentModel.ASSOC_CONTAINS,
+                    childName,
+                    nodeType,
+                    props);
+        return childAssoc.getChildRef();
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorWebScriptTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorWebScriptTest.java
new file mode 100644
index 00000000000..a431975b234
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorWebScriptTest.java
@@ -0,0 +1,294 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.nodelocator;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.nodelocator.AncestorNodeLocator;
+import org.alfresco.repo.nodelocator.CompanyHomeNodeLocator;
+import org.alfresco.repo.nodelocator.SitesHomeNodeLocator;
+import org.alfresco.repo.nodelocator.UserHomeNodeLocator;
+import org.alfresco.repo.nodelocator.XPathNodeLocator;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.DocLibNodeLocator;
+import org.alfresco.repo.site.SiteServiceInternal;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.util.GUID;
+import org.json.JSONObject;
+import org.junit.experimental.categories.Category;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.surf.util.URLEncoder;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * @author Nick Smith
+ * @since 4.0
+ */
+@Category(OwnJVMTestsCategory.class)
+public class NodeLocatorWebScriptTest extends BaseWebScriptTest
+{
+    private static final String baseURL = "api/nodelocator/";
+    private SiteServiceInternal siteService;
+    private NodeService nodeService;
+    private Repository repositoryHelper;
+    private NodeRef companyHome;
+    private NamespaceService namespaceService;
+    private NodeArchiveService nodeArchiveService;
+
+    public void testCompanyHomeNodeLocator() throws Exception
+    {
+        String url = baseURL + CompanyHomeNodeLocator.NAME;
+        checkNodeLocator(url, companyHome);
+    }
+    
+    public void testSitesHomeNodeLocator() throws Exception
+    {
+        String url = baseURL + SitesHomeNodeLocator.NAME;
+        NodeRef sitesHome = siteService.getSiteRoot();
+        checkNodeLocator(url, sitesHome);
+    }
+
+    public void testDocLibNodeLocator() throws Exception
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        SiteInfo site = null;
+        
+        NodeRef companyChild = makeChildContentNode(companyHome);
+        try
+        {
+            // Set up site
+            String siteName = "TestSite" + GUID.generate();
+            site = siteService.createSite("", siteName, "Title", "Description", SiteVisibility.PUBLIC);
+            NodeRef fooFolder = makeContainer(siteName, "Foo");
+            NodeRef docLib = makeContainer(siteName, SiteService.DOCUMENT_LIBRARY);
+            NodeRef fooChild = makeChildContentNode(fooFolder);
+            NodeRef docLibChild = makeChildContentNode(docLib);
+            
+            // Check returns company home if no source node specified.
+            String noNodeUrl = baseURL + DocLibNodeLocator.NAME;
+            checkNodeLocator(noNodeUrl, companyHome);
+            
+            // Check returns company home if source is not in a site.
+            String noSiteUrl = makeUrl(companyChild, DocLibNodeLocator.NAME);
+            checkNodeLocator(noSiteUrl, companyHome);
+            
+            // Check returns site doc lib if source is in site doc lib.
+            String docLibUrl = makeUrl(docLibChild, DocLibNodeLocator.NAME);
+            checkNodeLocator(docLibUrl, docLib);
+            
+            // Check returns site doc lib if source is in other site container.
+            String fooUrl = makeUrl(fooChild, DocLibNodeLocator.NAME);
+            checkNodeLocator(fooUrl, docLib);
+        }
+        finally
+        {
+            nodeService.deleteNode(companyChild);
+            if (site != null)
+            {
+                siteService.deleteSite(site.getShortName());
+                nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(site.getNodeRef()));
+            }
+        }
+    }
+
+    public void testUserHomeNodeLocator() throws Exception
+    {
+        String url = baseURL + UserHomeNodeLocator.NAME;
+        // Run as System User, no User Home.
+        AuthenticationUtil.setRunAsUser(AuthenticationUtil.getSystemUserName());
+        checkNodeLocator(url, null);
+        
+        //Run as Admin User
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        
+        NodeRef admin = repositoryHelper.getPerson();
+        NodeRef userHome = repositoryHelper.getUserHome(admin);
+        
+        checkNodeLocator(url, userHome);
+    }
+    
+    public void testAncestorOfTypeNodeLocator() throws Exception
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        NodeRef folder= makeChildFolderNode(companyHome);
+        try
+        {
+            NodeRef sysFolder = makeChildSystemFolderNode(folder);
+            NodeRef subFolder = makeChildFolderNode(sysFolder);
+            NodeRef source = makeChildContentNode(subFolder);
+            
+            // No params so should find first parent.
+            String ancestorUrl = makeUrl(source, AncestorNodeLocator.NAME);
+            checkNodeLocator(ancestorUrl, subFolder);
+            
+            // Set type to cm:content. Should not match any node.
+            String encodedContentType = URLEncoder.encode(ContentModel.TYPE_CONTENT.toPrefixString(namespaceService));
+            String contentAncestorUrl = ancestorUrl + "?type=" + encodedContentType;
+            checkNodeLocator(contentAncestorUrl, null);
+            
+            // Set type to cm:systemfolder. Should find the sysFolder node.
+            String encodedSysFolderType = URLEncoder.encode(ContentModel.TYPE_SYSTEM_FOLDER.toPrefixString(namespaceService));
+            String sysFolderAncestorUrl = ancestorUrl + "?type=" + encodedSysFolderType;
+            checkNodeLocator(sysFolderAncestorUrl, sysFolder);
+            
+            // Set aspect to cm:ownable. Should not match any node.
+            String encodedOwnableAspect= URLEncoder.encode(ContentModel.ASPECT_OWNABLE.toPrefixString(namespaceService));
+            String ownableAncestorUrl = ancestorUrl + "?aspect=" + encodedOwnableAspect;
+            checkNodeLocator(ownableAncestorUrl, null);
+            
+            // Add ownable aspect to folder node. Now that node should be found.
+            nodeService.addAspect(folder, ContentModel.ASPECT_OWNABLE, null);
+            checkNodeLocator(ownableAncestorUrl, folder);
+
+            // Set aspect to cm:ownable and type to cm:systemfolder. Should not match any node.
+            String ownableSysFolderAncestorUrl = sysFolderAncestorUrl + "&aspect=" + encodedOwnableAspect;
+            checkNodeLocator(ownableSysFolderAncestorUrl, null);
+            
+            // Set aspect to cm:ownable and type to cm:folder. Should find folder node.
+            String encodedFOlderType = URLEncoder.encode(ContentModel.TYPE_FOLDER.toPrefixString(namespaceService));
+            String ownableFolderAncestorUrl = ownableAncestorUrl + "&type=" + encodedFOlderType;
+            checkNodeLocator(ownableFolderAncestorUrl, folder);
+        }
+        finally
+        {
+            nodeService.deleteNode(folder);
+        }
+    }
+    
+    public void testXPathNodeLocator() throws Exception
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        NodeRef first = makeChildFolderNode(companyHome);
+        try
+        {
+            NodeRef second = makeChildFolderNode(first);
+            NodeRef content = makeChildContentNode(second);
+            
+            // Check bad path returns null
+            String badPath = URLEncoder.encode("cm:foo/cm:bar/cm:foobar");
+            String badPathUrl = baseURL + XPathNodeLocator.NAME + "?query=" + badPath;
+            checkNodeLocator(badPathUrl, null);
+            
+            String path  = nodeService.getPath(content).toPrefixString(namespaceService);
+            String encodedPath = URLEncoder.encode(path);
+            
+            // Check default store ref works.
+            String defaultStoreUrl = baseURL + XPathNodeLocator.NAME + "?query=" +encodedPath;
+            checkNodeLocator(defaultStoreUrl, content);
+            
+            // Check specified store ref works.
+            String storeIdUrl = defaultStoreUrl + "&store_type=workspace&store_id=SpacesStore";
+            checkNodeLocator(storeIdUrl, content);
+            
+            // Check node store ref works.
+            String nodePathUrl = makeUrl(companyHome, XPathNodeLocator.NAME) + "?query=" + encodedPath;
+            checkNodeLocator(nodePathUrl, content);
+        }
+        finally
+        {
+            nodeService.deleteNode(first);
+        }
+    }
+    
+    private String makeUrl(NodeRef node, String locatorName)
+    {
+        StoreRef storeRef = node.getStoreRef();
+        StringBuilder url = new StringBuilder("/api/");
+        url.append(storeRef.getProtocol()).append("/")
+        .append(storeRef.getIdentifier()).append("/")
+        .append(node.getId()).append("/")
+        .append("nodelocator").append("/")
+        .append(locatorName);
+        return url.toString();
+    }
+
+    private void checkNodeLocator(String url, NodeRef expNode) throws Exception
+    {
+        Response response = sendRequest(new GetRequest(url), 200);
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        JSONObject result = json.getJSONObject("data");
+        assertNotNull(result);
+        String nodeRef = result.getString("nodeRef");
+        String expResult = expNode == null ? "null" : expNode.toString();
+        assertEquals(expResult, nodeRef);
+    }
+
+    private NodeRef makeChildContentNode(NodeRef parent)
+    {
+        return makeChildNode(parent, ContentModel.TYPE_CONTENT);
+    }
+    
+    private NodeRef makeChildSystemFolderNode(NodeRef parent)
+    {
+        return makeChildNode(parent, ContentModel.TYPE_SYSTEM_FOLDER);
+    }
+    
+    private NodeRef makeChildFolderNode(NodeRef parent)
+    {
+        return makeChildNode(parent, ContentModel.TYPE_FOLDER);
+    }
+
+    private NodeRef makeChildNode(NodeRef parent, QName type)
+    {
+        QName qName = QName.createQName("", GUID.generate());
+        QName contains = ContentModel.ASSOC_CONTAINS;
+        ChildAssociationRef result = nodeService.createNode(parent, contains, qName, type);
+        return result.getChildRef();
+    }
+
+    private NodeRef makeContainer(String siteName, String containerId)
+    {
+        QName type = ContentModel.TYPE_FOLDER;
+        return siteService.createContainer(siteName, containerId, type, null);
+    }
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        ApplicationContext appContext = getServer().getApplicationContext();
+        this.siteService = (SiteServiceInternal) appContext.getBean("SiteService");
+        this.nodeService = (NodeService) appContext.getBean("NodeService");
+        this.namespaceService= (NamespaceService) appContext.getBean("NamespaceService");
+        this.repositoryHelper = (Repository) appContext.getBean("repositoryHelper");
+        this.companyHome = repositoryHelper.getCompanyHome();
+        this.nodeArchiveService = (NodeArchiveService) appContext.getBean("nodeArchiveService");
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java
new file mode 100644
index 00000000000..ec3b216b679
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java
@@ -0,0 +1,921 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.person;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.security.person.UserNameMatcherImpl;
+import org.alfresco.repo.service.ServiceDescriptorRegistry;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.usage.ContentUsageImpl;
+import org.alfresco.repo.usage.UserUsageTrackingComponent;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.NoSuchPersonException;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.GUID;
+import org.alfresco.util.PropertyMap;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.experimental.categories.Category;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.surf.util.URLEncoder;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Unit test to test person Web Script API
+ * 
+ * @author Glen Johnson
+ */
+@Category(LuceneTests.class)
+public class PersonServiceTest extends BaseWebScriptTest
+{    
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private PersonService personService;
+    private UserNameMatcherImpl userNameMatcherImpl;
+    private NodeService nodeService;
+    private ContentService contentService;
+    private UserUsageTrackingComponent userUsageTrackingComponent;
+    private ContentUsageImpl contentUsage;
+    private TransactionService transactionService;
+
+    @Mock
+    private SearchService mockSearchService;
+    @Mock
+    private ResultSet mockSearchServiceQueryResultSet;
+    private List<NodeRef> dummySearchServiceQueryNodeRefs = new ArrayList<>();
+    private int callCount = 0;
+    private ServiceDescriptorRegistry serviceRegistry;
+
+    private static final String USER_ONE = "User.One";
+    private static final String USER_TWO = "User.Two";
+    private static final String USER_THREE = "User.Three";
+
+    private static final String URL_PEOPLE = "/api/people";
+
+    private static final String SORT_BY_USERNAME = "userName";
+    private static final String SORT_BY_FULLNAME = "fullName";
+    private static final String SORT_BY_JOBTITLE = "jobtitle";
+    private static final String SORT_BY_EMAIL = "email";
+    private static final String SORT_BY_QUOTA = "quota";
+    private static final String SORT_BY_USAGE = "usage";
+
+    private static final String ASC_DIR = "asc";
+    private static final String DESC_DIR = "desc";
+
+    private List<String> createdPeople = new ArrayList<String>(5);
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        MockitoAnnotations.initMocks(this);
+
+        ApplicationContext ctx = getServer().getApplicationContext();
+        this.authenticationService = (MutableAuthenticationService)ctx.getBean("AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent)ctx.getBean("authenticationComponent");
+        this.personService = (PersonService)ctx.getBean("PersonService");
+        this.userNameMatcherImpl = (UserNameMatcherImpl)ctx.getBean("userNameMatcher");
+        this.nodeService = (NodeService)ctx.getBean("NodeService");
+        this.contentService = (ContentService)ctx.getBean("contentService");
+        this.userUsageTrackingComponent = (UserUsageTrackingComponent)ctx.getBean("userUsageTrackingComponent");
+        this.contentUsage = (ContentUsageImpl)ctx.getBean("contentUsageImpl");
+        this.transactionService = (TransactionService) ctx.getBean("TransactionService");
+
+    	serviceRegistry = (ServiceDescriptorRegistry) ctx.getBean("ServiceRegistry");
+    	serviceRegistry.setMockSearchService(mockSearchService);
+        when(mockSearchService.query(any())).thenReturn(mockSearchServiceQueryResultSet);
+        when(mockSearchServiceQueryResultSet.getNodeRefs()).thenReturn(dummySearchServiceQueryNodeRefs);
+
+        // enable usages
+        contentUsage.setEnabled(true);
+        contentUsage.init();
+        userUsageTrackingComponent.setEnabled(true);
+        userUsageTrackingComponent.init();
+        userUsageTrackingComponent.bootstrapInternal();
+
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+
+        // Create users
+        createUser(USER_ONE);
+        createUser(USER_TWO);
+        createUser(USER_THREE);
+        
+        // Do tests as user one
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+    }
+    
+    private void createUser(String userName)
+    {
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            this.authenticationService.createAuthentication(userName, "password".toCharArray());
+            
+            PropertyMap personProps = new PropertyMap();
+            personProps.put(ContentModel.PROP_USERNAME, userName);
+            personProps.put(ContentModel.PROP_FIRSTNAME, "myFirstName");
+            personProps.put(ContentModel.PROP_LASTNAME, "myLastName");
+            personProps.put(ContentModel.PROP_EMAIL, "myFirstName.myLastName@email.com");
+            personProps.put(ContentModel.PROP_JOBTITLE, "myJobTitle");
+            personProps.put(ContentModel.PROP_JOBTITLE, "myOrganisation");
+            
+            this.personService.createPerson(personProps);
+            
+            this.createdPeople.add(userName);
+        }        
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        String adminUser = this.authenticationComponent.getSystemUserName();
+        this.authenticationComponent.setCurrentUser(adminUser);
+        
+        for (String userName : this.createdPeople)
+        {
+            personService.deletePerson(userName);
+        }
+        
+        // Clear the list
+        this.createdPeople.clear();
+
+        // Should be safe not to do the following as we don't have a search service, but it is cleaner to remove the mock.
+        if (serviceRegistry != null)
+        {
+        	serviceRegistry.setMockSearchService(null);
+        }
+    }
+    
+    private JSONObject updatePerson(String userName, String title, String firstName, String lastName, 
+            String organisation, String jobTitle, String email, String bio, String avatarUrl, int expectedStatus)
+    throws Exception
+    {
+        // switch to admin user to create a person
+        String currentUser = this.authenticationComponent.getCurrentUserName();
+        String adminUser = this.authenticationComponent.getSystemUserName();
+        this.authenticationComponent.setCurrentUser(adminUser);
+        
+        JSONObject person = new JSONObject();
+        person.put("userName", userName);
+        person.put("title", title);
+        person.put("firstName", firstName);
+        person.put("lastName", lastName);
+        person.put("organisation", organisation);
+        person.put("jobtitle", jobTitle);
+        person.put("email", email);
+        
+        Response response = sendRequest(new PutRequest(URL_PEOPLE + "/" + userName, person.toString(), "application/json"), expectedStatus); 
+        
+        // switch back to non-admin user
+        this.authenticationComponent.setCurrentUser(currentUser);
+        
+        return new JSONObject(response.getContentAsString());
+    }
+
+    private JSONObject createPerson(String userName, String title, String firstName, String lastName, 
+                                    String organisation, String jobTitle, String email, String bio, String avatarUrl,
+                                    long quota, int expectedStatus)
+        throws Exception
+    {
+        // switch to admin user to create a person
+        String currentUser = this.authenticationComponent.getCurrentUserName();
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        
+        JSONObject person = new JSONObject();
+        person.put("userName", userName);
+        person.put("title", title);
+        person.put("firstName", firstName);
+        person.put("lastName", lastName);
+        person.put("organisation", organisation);
+        person.put("jobtitle", jobTitle);
+        person.put("email", email);
+        if (quota > 0)
+        {
+            person.put("quota", quota);
+        }
+        
+        Response response = sendRequest(new PostRequest(URL_PEOPLE, person.toString(), "application/json"), expectedStatus); 
+        
+        if ((userName != null) && (userName.length() != 0))
+        {
+            this.createdPeople.add(userName);
+        }
+        
+        // switch back to non-admin user
+        this.authenticationComponent.setCurrentUser(currentUser);
+        
+        return new JSONObject(response.getContentAsString());
+    }
+    
+    private JSONObject deletePerson(String userName, int expectedStatus)
+    throws Exception
+    {
+        // switch to admin user to delete a person
+        String currentUser = this.authenticationComponent.getCurrentUserName();
+        String adminUser = this.authenticationComponent.getSystemUserName();
+        this.authenticationComponent.setCurrentUser(adminUser);
+
+        Response response = sendRequest(new DeleteRequest(URL_PEOPLE + "/" + userName), expectedStatus);
+        this.createdPeople.remove(userName);
+
+        // switch back to non-admin user
+        this.authenticationComponent.setCurrentUser(currentUser);
+
+        return new JSONObject(response.getContentAsString());
+    }
+    
+    @SuppressWarnings("unused")
+    public void testGetPeople() throws Exception
+    {
+        // Test basic GET people with no filters ==
+        Response response = sendRequest(new GetRequest(URL_PEOPLE), 200);        
+    }
+    
+    public void testJobWithSpace() throws Exception
+    {
+        String userName  = RandomStringUtils.randomNumeric(6);
+        String userJob = "myJob" + RandomStringUtils.randomNumeric(2) + " myJob" + RandomStringUtils.randomNumeric(3);
+        
+        //we need to ecape a spaces for search
+        String jobSearchString = userJob.replace(" ", "\\ ");
+        
+        createPerson(userName, "myTitle", "myFirstName", "myLastName", "myOrganisation",
+                userJob, "firstName.lastName@email.com", "myBio", "images/avatar.jpg", 0,
+                Status.STATUS_OK);  
+        dummySearchServiceQueryNodeRefs.clear();
+        NodeRef nodeRef = personService.getPerson(userName);
+        dummySearchServiceQueryNodeRefs.add(nodeRef);
+        
+        // Get a person 
+        Response response = sendRequest(new GetRequest(URL_PEOPLE + "?filter=" + URLEncoder.encode("jobtitle:" + jobSearchString)), 200);
+        assertSearchQuery("jobtitle:\"" + jobSearchString + "\"", false);
+        JSONObject res = new JSONObject(response.getContentAsString());
+        assertEquals(1, res.getJSONArray("people").length());
+        
+        dummySearchServiceQueryNodeRefs.clear();
+        response = sendRequest(new GetRequest(URL_PEOPLE + "?filter=" + URLEncoder.encode("jobtitle:" + userJob)), 200);
+        assertSearchQuery("jobtitle:\""+userJob.replace(" ", "\" \"")+"\" ", false);
+        res = new JSONObject(response.getContentAsString());
+        assertEquals(0, res.getJSONArray("people").length());
+    }
+    
+    @SuppressWarnings("unused")
+    public void testGetPerson() throws Exception
+    {
+        // Get a person that doesn't exist
+        Response response = sendRequest(new GetRequest(URL_PEOPLE + "/" + "nonExistantUser"), 404);
+        
+        // Create a person and get him/her
+        String userName  = RandomStringUtils.randomNumeric(6);
+        JSONObject result = createPerson(userName, "myTitle", "myFirstName", "myLastName", "myOrganisation",
+                                "myJobTitle", "myEmailAddress", "myBio", "images/avatar.jpg", 0, 200);
+        response = sendRequest(new GetRequest(URL_PEOPLE + "/" + userName), 200);
+    }
+    
+    public void testGetPeopleSkipCount() throws Exception
+    {
+        // Test case for MNT-15357 skipCount
+        int skipCount = 1;
+
+        // Ensure that the REST call with no filter will always be routed to a DB canned query rather than a FTS
+        // (see ALF-18876 for details)
+        String filter = "*%20[hint:useCQ]";
+
+        Response response = sendRequest(new GetRequest(URL_PEOPLE + "?filter=" + filter), 200);
+        JSONObject res = new JSONObject(response.getContentAsString());
+
+        int peopleFound = res.getJSONArray("people").length();
+        assertTrue("No people found", peopleFound > 0);
+
+        response = sendRequest(new GetRequest(URL_PEOPLE + "?filter=" + filter + "&skipCount=" + skipCount), 200);
+
+        res = new JSONObject(response.getContentAsString());
+        assertTrue("skipCount ignored", res.getJSONArray("people").length() < peopleFound);
+    }
+
+    /**
+     * Add headers required for people-enterprise webscript to show deleted users in the result set
+     */
+    private TestWebScriptServer.Request addHeadersToRequest(TestWebScriptServer.Request req)
+    {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("referer", "console/admin-console/users");
+        req.setHeaders(headers);
+
+        return req;
+    }
+
+    public void testGetPeoplePaging() throws Exception
+    {
+        dummySearchServiceQueryNodeRefs.clear();
+        final String filter = GUID.generate();
+        for (int i = 0; i < 6; i++)
+        {
+            String username = filter + i;
+            createPerson(username, "myTitle", "myFirstName", "myLastName", "myOrganisation",
+                    "myJobTitle", "myEmailAddress", "myBio", "images/avatar.jpg", 0, Status.STATUS_OK);
+            NodeRef nodeRef = personService.getPerson(username);
+            dummySearchServiceQueryNodeRefs.add(nodeRef);
+        }
+
+        // fetch all users (6)
+        Response response = sendRequest(
+                new GetRequest(URL_PEOPLE +
+                        "?filter=" + filter +
+                        "&startIndex=" + 0 +
+                        "&pageSize=" + 6
+                ), Status.STATUS_OK);
+        assertSearchQuery(filter, true);
+        JSONObject res = new JSONObject(response.getContentAsString());
+        JSONArray peopleAsc = res.getJSONArray("people");
+        assertEquals("The number of returned results is not correct.", 6, peopleAsc.length());
+        checkPaging(6, 0, 6, res);
+        // fetch a page of first 2
+        response = sendRequest(
+                new GetRequest(URL_PEOPLE +
+                        "?filter=" + filter +
+                        "&startIndex=" + 0 +
+                        "&pageSize=" + 2
+                ), Status.STATUS_OK);
+        assertSearchQuery(filter, true);
+        res = new JSONObject(response.getContentAsString());
+        peopleAsc = res.getJSONArray("people");
+        assertEquals("The number of returned results is not correct.", 2, peopleAsc.length());
+        checkPaging(6, 0, 2, res);
+        for (int i = 0; i < peopleAsc.length(); i++)
+        {
+            JSONObject person = peopleAsc.getJSONObject(i);
+            assertEquals("The name of a person does not match. Paging is not correct",
+                    filter + i, person.getString("userName"));
+        }
+        // fetch the middle 2
+        response = sendRequest(
+                new GetRequest(URL_PEOPLE +
+                        "?filter=" + filter +
+                        "&startIndex=" + 2 +
+                        "&pageSize=" + 2
+                ), Status.STATUS_OK);
+        assertSearchQuery(filter, true);
+        res = new JSONObject(response.getContentAsString());
+        peopleAsc = res.getJSONArray("people");
+        assertEquals("The number of returned results is not correct.", 2, peopleAsc.length());
+        checkPaging(6, 2, 2, res);
+        for (int i = 0; i < peopleAsc.length(); i++)
+        {
+            JSONObject person = peopleAsc.getJSONObject(i);
+            assertEquals("The name of a person does not match. Paging is not correct",
+                    filter + (2 + i), person.getString("userName"));
+        }
+        // fetch the last 2
+        response = sendRequest(
+                new GetRequest(URL_PEOPLE +
+                        "?filter=" + filter +
+                        "&startIndex=" + 4 +
+                        "&pageSize=" + 2
+                ), Status.STATUS_OK);
+        assertSearchQuery(filter, true);
+        res = new JSONObject(response.getContentAsString());
+        peopleAsc = res.getJSONArray("people");
+        assertEquals("The number of returned results is not correct.", 2, peopleAsc.length());
+        checkPaging(6, 4, 2, res);
+        for (int i = 0; i < peopleAsc.length(); i++)
+        {
+            JSONObject person = peopleAsc.getJSONObject(i);
+            assertEquals("The name of a person does not match. Paging is not correct",
+                    filter + (4 + i), person.getString("userName"));
+        }
+        // fetch the last 3 as a page of five
+        response = sendRequest(
+                new GetRequest(URL_PEOPLE +
+                        "?filter=" + filter +
+                        "&startIndex=" + 3 +
+                        "&pageSize=" + 5
+                ), Status.STATUS_OK);
+        assertSearchQuery(filter, true);
+        res = new JSONObject(response.getContentAsString());
+        peopleAsc = res.getJSONArray("people");
+        assertEquals("The number of returned results is not correct.", 3, peopleAsc.length());
+        checkPaging(6, 3, 5, res);
+        for (int i = 0; i < peopleAsc.length(); i++)
+        {
+            JSONObject person = peopleAsc.getJSONObject(i);
+            assertEquals("The name of a person does not match. Paging is not correct",
+                    filter + (i + 3), person.getString("userName"));
+        }
+    }
+
+    private void checkPaging(int totalItems, int skipCount, int maxItems, JSONObject response) throws Exception
+    {
+        JSONObject paging = response.getJSONObject("paging");
+        assertEquals("totalItems was not correct in the response", totalItems, paging.getInt("totalItems"));
+        assertEquals("skipCount was not correct in the response", skipCount, paging.getInt("skipCount"));
+        assertEquals("maxItems was not correct in the response", maxItems, paging.getInt("maxItems"));
+    }
+
+    public void testGetPeopleSorting() throws Exception
+    {
+        String filter = GUID.generate();
+        String usernameA = filter + "-aaa-";
+        String usernameB = filter + "-BBB-";
+        String usernameC = filter + "-ccc-";
+        String usernameD = filter + "-ddd-";
+        String randomUserName = "userFilterTest-" + GUID.generate();
+        createPerson(randomUserName, "myTitle", "myFirstName", "myLastName", "myOrganisation",
+                "myJobTitle", "myEmailAddress", "myBio", "images/avatar.jpg", 0, Status.STATUS_OK);
+        checkSorting(randomUserName, "userName", randomUserName);
+
+        createPerson(usernameA, "myTitle", filter, "aaa", "myOrganisation", "jobaaa", usernameA + "@alfresco.com", "myBio", "images/avatar.jpg", 2048, Status.STATUS_OK);
+        createPerson(usernameB, "myTitle", filter, "bbb", "myOrganisation", "bbjobb", usernameB + "@alfresco.com", "myBio", "images/avatar.jpg", 256, Status.STATUS_OK);
+        createPerson(usernameC, "myTitle", filter, "ccc", "myOrganisation", "cccjob", usernameC + "@alfresco.com", "myBio", "images/avatar.jpg", 512, Status.STATUS_OK);
+        createPerson(usernameD, "myTitle", filter, "DDD", "myOrganisation", "aJobd", usernameD + "@alfresco.com", "myBio", "images/avatar.jpg", 1024, Status.STATUS_OK);
+
+        addUserUsageContent(usernameA, 22);
+        addUserUsageContent(usernameB, 10);
+        addUserUsageContent(usernameC, 37);
+        addUserUsageContent(usernameD, 50);
+        userUsageTrackingComponent.execute();
+
+        checkSorting(filter, SORT_BY_USERNAME, usernameA, usernameB, usernameC, usernameD);
+        checkSorting(filter, SORT_BY_FULLNAME, usernameA, usernameB, usernameC, usernameD);
+        checkSorting(filter, SORT_BY_JOBTITLE, usernameA, usernameB, usernameC, usernameD);
+        checkSorting(filter, SORT_BY_EMAIL, usernameA, usernameB, usernameC, usernameD);
+        checkSorting(filter, SORT_BY_QUOTA, usernameA, usernameB, usernameC, usernameD);
+        checkSorting(filter, SORT_BY_USAGE, usernameA, usernameB, usernameC, usernameD);
+    }
+
+    private void checkSorting(String filter, String sortBy, String... usernames) throws Exception
+    {
+        dummySearchServiceQueryNodeRefs.clear();
+        for (String username : usernames)
+        {
+            NodeRef nodeRef = personService.getPerson(username);
+            dummySearchServiceQueryNodeRefs.add(nodeRef);
+        }
+
+        Response response = sendRequest(
+                new GetRequest(URL_PEOPLE +
+                        "?sortBy=" + sortBy +
+                        "&filter=" + filter +
+                        "&dir=" + ASC_DIR
+                ), Status.STATUS_OK);
+        assertSearchQuery(filter, true);
+        JSONObject res = new JSONObject(response.getContentAsString());
+        JSONArray peopleAsc = res.getJSONArray("people");
+        assertEquals(usernames.length, peopleAsc.length());
+
+        response = sendRequest(
+                new GetRequest(URL_PEOPLE +
+                        "?sortBy=" + sortBy +
+                        "&filter=" + filter +
+                        "&dir=" + DESC_DIR
+                ), Status.STATUS_OK);
+        assertSearchQuery(filter, true);
+        res = new JSONObject(response.getContentAsString());
+        JSONArray peopleDesc = res.getJSONArray("people");
+        assertEquals(usernames.length, peopleDesc.length());
+
+        // Check that Desc is reversed Asc
+        for (int i = 0; i < peopleAsc.length(); i++)
+        {
+            assertEquals(peopleAsc.getJSONObject(i).getString("userName"),
+                    peopleDesc.getJSONObject(peopleAsc.length() - i - 1).getString("userName"));
+        }
+
+        // Check Asc sorting for each field
+        for (int i = 0; i < peopleAsc.length() - 1; i++)
+        {
+            if (SORT_BY_USERNAME.equals(sortBy))
+            {
+                JSONObject person = peopleAsc.getJSONObject(i);
+                String userName1 = person.getString("userName");
+                person = peopleAsc.getJSONObject(i + 1);
+                String userName2 = person.getString("userName");
+                assertTrue("Users are not ordered correctly ascending by username", userName1.compareToIgnoreCase(userName2) <= 0);
+            }
+            else if (SORT_BY_FULLNAME.equals(sortBy))
+            {
+                JSONObject person = peopleAsc.getJSONObject(i);
+                String firstName1 = person.getString("firstName");
+                String lastName1 = person.getString("lastName");
+                String fullName1 = (firstName1 == null ? "" : firstName1) + (lastName1 == null ? "" : lastName1);
+
+                person = peopleAsc.getJSONObject(i + 1);
+                String firstName2 = person.getString("firstName");
+                String lastName2 = person.getString("lastName");
+                String fullName2 = (firstName2 == null ? "" : firstName2) + (lastName2 == null ? "" : lastName2);
+
+                assertTrue("Users are not ordered correctly ascending by fullname", fullName1.compareToIgnoreCase(fullName2) <= 0);
+            }
+            else if (SORT_BY_JOBTITLE.equals(sortBy))
+            {
+                JSONObject person = peopleAsc.getJSONObject(i);
+                String jobUser1 = person.getString("jobtitle");
+                person = peopleAsc.getJSONObject(i + 1);
+                String jobUser2 = person.getString("jobtitle");
+
+                assertTrue("Users are not ordered correctly ascending by jobtitle",
+                        (jobUser1 == null ? "" : jobUser1).compareToIgnoreCase(jobUser2 == null ? "" : jobUser2) <= 0);
+            }
+            else if (SORT_BY_EMAIL.equals(sortBy))
+            {
+                JSONObject person = peopleAsc.getJSONObject(i);
+                String emailUser1 = person.getString("email");
+                person = peopleAsc.getJSONObject(i + 1);
+                String emailUser2 = person.getString("email");
+
+                assertTrue("Users are not ordered correctly ascending by email",
+                        (emailUser1 == null ? "" : emailUser1).compareToIgnoreCase(emailUser2 == null ? "" : emailUser2) <= 0);
+            }
+            else if (SORT_BY_QUOTA.equals(sortBy))
+            {
+                JSONObject person = peopleAsc.getJSONObject(i);
+                long quotaUser1 = person.getLong("quota");
+                person = peopleAsc.getJSONObject(i + 1);
+                long quotaUser2 = person.getLong("quota");
+
+                assertTrue("Users are not ordered correctly ascending by quota", quotaUser1 <= quotaUser2);
+            }
+            else if (SORT_BY_USAGE.equals(sortBy))
+            {
+                JSONObject person = peopleAsc.getJSONObject(i);
+                long usageUser1 = person.getLong("sizeCurrent");
+                person = peopleAsc.getJSONObject(i + 1);
+                long usageUser2 = person.getLong("sizeCurrent");
+
+                assertTrue("Users are not ordered correctly ascending by usage", usageUser1 <= usageUser2);
+            }
+        }
+    }
+
+    private void assertSearchQuery(String term, boolean buildFilter)
+    {
+        if (buildFilter)
+        {
+            String termWithEscapedAsterisks = term.replaceAll("\\*", "\\\\*");
+            term = "\"*" + termWithEscapedAsterisks + "*" + "\"";
+        }
+        String expectedQuery = "TYPE:\"{http://www.alfresco.org/model/content/1.0}person\" AND (" + term + ")";
+        ArgumentCaptor<SearchParameters> searchParametersCaptor = ArgumentCaptor.forClass(SearchParameters.class);
+        verify(mockSearchService, times(++callCount)).query(searchParametersCaptor.capture());
+        SearchParameters parameters = searchParametersCaptor.getValue();
+        assertEquals("Query", expectedQuery, parameters.getQuery());
+    }
+
+    private void addUserUsageContent(final String userName, final int stringDataLength)
+    {
+        RetryingTransactionHelper.RetryingTransactionCallback<Void> usageCallback = new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                try
+                {
+                    AuthenticationUtil.pushAuthentication();
+                    AuthenticationUtil.setFullyAuthenticatedUser(userName);
+                    String textData = "This is default text added. Add more: ";
+                    for (int i = 0; i < stringDataLength; i++)
+                    {
+                        textData += "abc";
+                    }
+                    NodeRef homeFolder = getHomeSpaceFolderNode(userName);
+                    NodeRef folder = nodeService.createNode(
+                            homeFolder,
+                            ContentModel.ASSOC_CONTAINS,
+                            QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "testFolder"),
+                            ContentModel.TYPE_FOLDER).getChildRef();
+                    addTextContent(folder, "text1.txt", textData);
+                }
+                finally
+                {
+                    AuthenticationUtil.popAuthentication();
+                }
+                return null;
+            }
+        };
+
+        RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
+        txnHelper.doInTransaction(usageCallback);
+    }
+
+    private NodeRef getHomeSpaceFolderNode(String userName)
+    {
+        return (NodeRef) nodeService.getProperty(personService.getPerson(userName), ContentModel.PROP_HOMEFOLDER);
+    }
+
+    private NodeRef addTextContent(NodeRef folderRef, String name, String textData)
+    {
+        Map<QName, Serializable> contentProps = new HashMap<QName, Serializable>();
+        contentProps.put(ContentModel.PROP_NAME, name);
+
+        ChildAssociationRef association = nodeService.createNode(folderRef, ContentModel.ASSOC_CONTAINS,
+                QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name), ContentModel.TYPE_CONTENT, contentProps);
+
+        NodeRef content = association.getChildRef();
+
+        ContentWriter writer = contentService.getWriter(content, ContentModel.PROP_CONTENT, true);
+
+        writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+        writer.setEncoding("UTF-8");
+
+        writer.putContent(textData);
+
+        return content;
+    }
+
+    public void testUpdatePerson() throws Exception
+    {
+        // Create a new person
+        String userName  = RandomStringUtils.randomNumeric(6);                
+        createPerson(userName, "myTitle", "myFirstName", "myLastName", "myOrganisation",
+                                "myJobTitle", "firstName.lastName@email.com", "myBio", "images/avatar.jpg", 0,
+                                Status.STATUS_OK);
+        
+        // Update the person's details
+        JSONObject result = updatePerson(userName, "updatedTitle", "updatedFirstName", "updatedLastName",
+                "updatedOrganisation", "updatedJobTitle", "updatedFN.updatedLN@email.com", "updatedBio",
+                "images/updatedAvatar.jpg", Status.STATUS_OK);
+
+        assertEquals(userName, result.get("userName"));
+        assertEquals("updatedFirstName", result.get("firstName"));
+        assertEquals("updatedLastName", result.get("lastName"));
+        assertEquals("updatedOrganisation", result.get("organization"));
+        assertEquals("updatedJobTitle", result.get("jobtitle"));
+        assertEquals("updatedFN.updatedLN@email.com", result.get("email"));
+    }
+    
+    public void testDeletePerson() throws Exception
+    {
+        // Create a new person
+        String userName  = RandomStringUtils.randomNumeric(6);                
+        createPerson(userName, "myTitle", "myFirstName", "myLastName", "myOrganisation",
+                                "myJobTitle", "firstName.lastName@email.com", "myBio", "images/avatar.jpg", 0,
+                                Status.STATUS_OK);
+        
+        // Delete the person
+        deletePerson(userName, Status.STATUS_OK);
+        
+        // Make sure that the person has been deleted and no longer exists
+        deletePerson(userName, Status.STATUS_NOT_FOUND);
+    }
+    
+    public void testCreatePerson() throws Exception
+    {
+        String userName  = RandomStringUtils.randomNumeric(6);
+                
+        // Create a new person
+        JSONObject result = createPerson(userName, "myTitle", "myFirstName", "myLastName", "myOrganisation",
+                                "myJobTitle", "firstName.lastName@email.com", "myBio", "images/avatar.jpg", 0,
+                                Status.STATUS_OK);        
+        assertEquals(userName, result.get("userName"));
+        assertEquals("myFirstName", result.get("firstName"));
+        assertEquals("myLastName", result.get("lastName"));
+        assertEquals("myOrganisation", result.get("organization"));
+        assertEquals("myJobTitle", result.get("jobtitle"));
+        assertEquals("firstName.lastName@email.com", result.get("email"));
+        
+        // Check for duplicate names
+        createPerson(userName, "myTitle", "myFirstName", "mylastName", "myOrganisation",
+                "myJobTitle", "myEmail", "myBio", "images/avatar.jpg", 0, 409);
+    }
+    
+    public void testCreatePersonMissingUserName() throws Exception
+    {
+        // Create a new person with userName == null (user name missing)
+        createPerson(null, "myTitle", "myFirstName", "myLastName", "myOrganisation",
+                        "myJobTitle", "firstName.lastName@email.com", "myBio", "images/avatar.jpg", 0,
+                        Status.STATUS_BAD_REQUEST);        
+        
+        // Create a new person with userName == "" (user name is blank)
+        createPerson("", "myTitle", "myFirstName", "myLastName", "myOrganisation",
+                        "myJobTitle", "firstName.lastName@email.com", "myBio", "images/avatar.jpg", 0,
+                        Status.STATUS_BAD_REQUEST);        
+    }
+    
+    public void testCreatePersonMissingFirstName() throws Exception
+    {
+        String userName  = RandomStringUtils.randomNumeric(6);
+                
+        // Create a new person with firstName == null (first name missing)
+        createPerson(userName, "myTitle", null, "myLastName", "myOrganisation",
+                        "myJobTitle", "firstName.lastName@email.com", "myBio", "images/avatar.jpg", 0,
+                        Status.STATUS_BAD_REQUEST);        
+        
+        // Create a new person with firstName == "" (first name is blank)
+        createPerson(userName, "myTitle", "", "myLastName", "myOrganisation",
+                        "myJobTitle", "firstName.lastName@email.com", "myBio", "images/avatar.jpg", 0,
+                        Status.STATUS_BAD_REQUEST);        
+    }  
+    /**
+     * 
+     * @throws Exception
+     */
+    public void testUserNameCaseSensitivity() throws Exception
+    {
+        String upperCaseUserName = "PersonServiceTest.MixedCaseUser";
+        String lowerCaseUserName = upperCaseUserName.toLowerCase();
+        // Create a new person
+
+        String currentUser = this.authenticationComponent.getCurrentUserName();
+        boolean existingValue = userNameMatcherImpl.getUserNamesAreCaseSensitive();
+        try
+        {
+            /**
+             *  simulate cloud with lower case user names   
+             */
+            createPerson(lowerCaseUserName, "myTitle", "myFirstName", "myLastName", "myOrganisation",
+                    "myJobTitle", "firstName.lastName@email.com", "myBio", "images/avatar.jpg", 0,
+                    Status.STATUS_OK); 
+            
+            String adminUser = this.authenticationComponent.getSystemUserName();
+            this.authenticationComponent.setCurrentUser(adminUser);
+            personService.setCreateMissingPeople(false);
+            //personServiceImpl.setUserNameCaseSensitive(true); 
+            userNameMatcherImpl.setUserNamesAreCaseSensitive(true);
+            
+            assertTrue("case sensitive exists by matching case", personService.personExists(lowerCaseUserName));
+            assertFalse("case sensitive exists by non matching case", personService.personExists(upperCaseUserName));
+            assertNotNull("case sensitive lookup by matching case", personService.getPerson(lowerCaseUserName));
+            try
+            {
+                personService.getPerson(upperCaseUserName);
+                fail("case sensitive lookup by non matching case");
+            }
+            catch (NoSuchPersonException e)
+            {
+                // expect to go here
+            }
+            
+            //personServiceImpl.setUserNameCaseSensitive(false);
+            userNameMatcherImpl.setUserNamesAreCaseSensitive(false);
+            assertNotNull("case insensitive lookup by matching case", personService.getPerson(lowerCaseUserName));
+            assertNotNull("case insensitive lookup by non matching case", personService.getPerson(upperCaseUserName));
+            assertTrue("case insensitive exists by matching case", personService.personExists(lowerCaseUserName));
+            assertTrue("case insensitive exists by non matching case", personService.personExists(upperCaseUserName));
+            
+            /**
+             */
+            personService.deletePerson(upperCaseUserName);
+            
+            
+        }
+        finally
+        {
+//            personServiceImpl.setUserNameCaseSensitive(existingValue);
+            userNameMatcherImpl.setUserNamesAreCaseSensitive(existingValue);
+            this.authenticationComponent.setCurrentUser(currentUser);
+        }
+    }
+    
+    public void testDisableEnablePerson() throws Exception
+    {
+        String userName = RandomStringUtils.randomNumeric(6);
+
+        // Create a new person
+        createPerson(userName, "myTitle", "myFirstName", "myLastName", "myOrganisation", "myJobTitle", "firstName.lastName@email.com", "myBio",
+                "images/avatar.jpg", 0, Status.STATUS_OK);
+
+        String currentUser = this.authenticationComponent.getCurrentUserName();
+        String adminUser = this.authenticationComponent.getSystemUserName();
+        this.authenticationComponent.setCurrentUser(adminUser);
+
+        // Check if user is enabled
+        assertTrue("User isn't enabled", personService.isEnabled(userName));
+
+        this.authenticationComponent.setCurrentUser(adminUser);
+        // Disable user
+        authenticationService.setAuthenticationEnabled(userName, false);
+
+        this.authenticationComponent.setCurrentUser(adminUser);
+        // Check user status
+        assertFalse("User must be disabled", personService.isEnabled(userName));
+
+        // Delete the person
+        deletePerson(userName, Status.STATUS_OK);
+
+        this.authenticationComponent.setCurrentUser(currentUser);
+    }
+    
+    public void test_MNT10404_AuthenticationUtil()
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+        String user1 = "user1";
+        String user2 = "user2";
+        String user3 = "user3";
+
+        List<String> users = new ArrayList<String>();
+        try
+        {
+            users.add(user1);
+            users.add(user2);
+            users.add(user3);
+
+            for (String user : users)
+            {
+                createPerson(user);
+
+                assertEquals(user, getAuthInRun(user));
+            }
+        }
+        finally
+        {
+            if (users.size() > 0)
+            {
+                for (String user : users)
+                {
+                    if (personService.personExists(user))
+                    {
+                        personService.deletePerson(user);
+                    }
+                }
+            }
+        }
+    }
+    
+    private String getAuthInRun(String userName)
+    {
+        RunAsWork<String> getWork = new RunAsWork<String>()
+        {
+            @Override
+            public String doWork() throws Exception
+            {
+                return AuthenticationUtil.getRunAsUser();
+            }
+        };
+        return AuthenticationUtil.runAs(getWork, userName);
+    }
+    
+    private NodeRef createPerson(String userName)
+    {
+        if (personService.personExists(userName))
+        {
+            personService.deletePerson(userName);
+        }
+
+        HashMap<QName, Serializable> properties = new HashMap<QName, Serializable>();
+        properties.put(ContentModel.PROP_USERNAME, userName);
+
+        return personService.createPerson(properties);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/person/UserCSVUploadTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/person/UserCSVUploadTest.java
new file mode 100644
index 00000000000..f1ad1c752e1
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/person/UserCSVUploadTest.java
@@ -0,0 +1,104 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.repo.web.scripts.person;
+
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ApplicationContextHelper;
+import org.springframework.context.ApplicationContext;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Tests the processing of different types of files (csv, xls, xlsx) used for bulk upload of users, see {@link UserCSVUploadPost}.
+ * @author Ancuta Morarasu
+ */
+public class UserCSVUploadTest extends BaseWebScriptTest
+{
+    private static final String RESOURCE_PREFIX = "org/alfresco/repo/web/scripts/uploadcsv/";
+
+    private DictionaryService dictionaryService;
+    private UserCSVUploadPost uploadWebscript;
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
+        this.dictionaryService = (DictionaryService) ctx.getBean("DictionaryService");
+
+        this.uploadWebscript = new UserCSVUploadPost();
+        this.uploadWebscript.setDictionaryService(dictionaryService);
+    }
+
+    private InputStream getResourceAsStream(String fileName)
+    {
+        InputStream csvStream = UserCSVUploadTest.class.getClassLoader().getResourceAsStream(RESOURCE_PREFIX + fileName);
+        assertNotNull(csvStream);
+        return csvStream;
+    }
+
+    public void testProcessCVSUserTemplate() throws Exception
+    {
+        List<Map<QName,String>> users = new ArrayList<>();
+        this.uploadWebscript.processCSVUpload(getResourceAsStream("userCSV.csv"), users);
+        assertEquals(2, users.size());
+    }
+
+    public void testProcessCVSWithHeaderUserTemplate() throws Exception
+    {
+        List<Map<QName,String>> users = new ArrayList<>();
+        this.uploadWebscript.processCSVUpload(getResourceAsStream("userCSV_header.csv"), users);
+        assertEquals(2, users.size());
+    }
+
+    public void testProcessXLSUserTemplate() throws Exception
+    {
+        List<Map<QName,String>> users = new ArrayList<>();
+        this.uploadWebscript.processXLSUpload(getResourceAsStream("userCSV.xls"), users);
+        assertEquals(2, users.size());
+    }
+
+    public void testProcessXLSXUserTemplate() throws Exception
+    {
+        List<Map<QName,String>> users = new ArrayList<>();
+        this.uploadWebscript.processXLSXUpload(getResourceAsStream("userCSV.xlsx"), users);
+        assertEquals(2, users.size());
+    }
+
+    public void testProcessOtherUserTemplate() throws Exception
+    {
+        List<Map<QName,String>> users = new ArrayList<>();
+        //should be processed as csv
+        this.uploadWebscript.processUpload(getResourceAsStream("userCSV.csv1"), "userCSV.csv1", users);
+        assertEquals(2, users.size());
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/preference/PreferenceServiceTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/preference/PreferenceServiceTest.java
new file mode 100644
index 00000000000..f15adac18e8
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/preference/PreferenceServiceTest.java
@@ -0,0 +1,210 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.preference;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.util.PropertyMap;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Unit test to test preference Web Script API
+ * 
+ * @author Roy Wetherall
+ */
+public class PreferenceServiceTest extends BaseWebScriptTest
+{
+    private MutableAuthenticationService authenticationService;
+
+    private AuthenticationComponent authenticationComponent;
+
+    private PersonService personService;
+
+    private static final String USER_ONE = "PreferenceTestOne" + System.currentTimeMillis();
+
+    private static final String USER_BAD = "PreferenceTestBad" + System.currentTimeMillis();
+
+    private static final String URL = "/api/people/" + USER_ONE + "/preferences";;
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        this.authenticationService = (MutableAuthenticationService) getServer().getApplicationContext().getBean(
+                "AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent) getServer().getApplicationContext().getBean(
+                "authenticationComponent");
+        this.personService = (PersonService) getServer().getApplicationContext().getBean("PersonService");
+
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+
+        // Create users
+        createUser(USER_ONE);
+        createUser(USER_BAD);
+
+        // Do tests as user one
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+    }
+
+    private void createUser(String userName)
+    {
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            this.authenticationService.createAuthentication(userName, "PWD".toCharArray());
+
+            PropertyMap ppOne = new PropertyMap(4);
+            ppOne.put(ContentModel.PROP_USERNAME, userName);
+            ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+            ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+            ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+
+            this.personService.createPerson(ppOne);
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+
+    }
+
+    public void testPreferences() throws Exception
+    {
+        // Get the preferences before they have been set
+
+        Response resp = sendRequest(new GetRequest(URL), 200);
+        JSONObject jsonResult = new JSONObject(resp.getContentAsString());
+
+        assertNotNull(jsonResult);
+        assertFalse(jsonResult.keys().hasNext());
+
+        // Set some preferences
+
+        JSONObject jsonObject = getPreferenceObj();
+        jsonObject.put("comp1", getPreferenceObj());
+
+        resp = sendRequest(new PostRequest(URL, jsonObject.toString(), "application/json"), 200);
+        assertEquals(0, resp.getContentLength());
+
+        // Get the preferences
+
+        resp = sendRequest(new GetRequest(URL), 200);
+        jsonResult = new JSONObject(resp.getContentAsString());
+        assertNotNull(jsonResult);
+        assertTrue(jsonResult.keys().hasNext());
+
+        checkJSONObject(jsonResult);
+        checkJSONObject(jsonResult.getJSONObject("comp1"));
+
+        // Update some of the preferences
+
+        jsonObject.put("stringValue", "updated");
+        jsonObject.put("comp2", getPreferenceObj());
+
+        resp = sendRequest(new PostRequest(URL, jsonObject.toString(), "application/json"), 200);
+        assertEquals(0, resp.getContentLength());
+
+        // Get the preferences
+
+        resp = sendRequest(new GetRequest(URL), 200);
+        jsonResult = new JSONObject(resp.getContentAsString());
+        assertNotNull(jsonResult);
+        assertTrue(jsonResult.keys().hasNext());
+
+        jsonObject.put("stringValue", "updated");
+        jsonObject.put("numberValue", 10);
+        jsonObject.put("numberValue2", 3.142);
+        checkJSONObject(jsonResult.getJSONObject("comp1"));
+        checkJSONObject(jsonResult.getJSONObject("comp2"));
+
+        // Filter the preferences retrieved
+
+        resp = sendRequest(new GetRequest(URL + "?pf=comp2"), 200);
+        jsonResult = new JSONObject(resp.getContentAsString());
+        assertNotNull(jsonResult);
+        assertTrue(jsonResult.keys().hasNext());
+
+        checkJSONObject(jsonResult.getJSONObject("comp2"));
+        assertFalse(jsonResult.has("comp1"));
+        assertFalse(jsonResult.has("stringValue"));
+
+        // Clear some of the preferences
+        sendRequest(new DeleteRequest(URL + "?pf=comp1"), 200);
+
+        resp = sendRequest(new GetRequest(URL), 200);
+        jsonResult = new JSONObject(resp.getContentAsString());
+        assertNotNull(jsonResult);
+        assertTrue(jsonResult.keys().hasNext());
+
+        checkJSONObject(jsonResult.getJSONObject("comp2"));
+        assertFalse(jsonResult.has("comp1"));
+
+        // Clear all the preferences
+        sendRequest(new DeleteRequest(URL), 200);
+
+        resp = sendRequest(new GetRequest(URL), 200);
+        jsonResult = new JSONObject(resp.getContentAsString());
+        assertNotNull(jsonResult);
+        assertFalse(jsonResult.keys().hasNext());
+
+        // Test trying to update another user's permissions
+        sendRequest(new PostRequest("/api/people/" + USER_BAD + "/preferences", jsonObject.toString(),
+                "application/json"), 401);
+
+        // Test error conditions
+        sendRequest(new GetRequest("/api/people/noExistUser/preferences"), 404);
+    }
+
+    private JSONObject getPreferenceObj() throws JSONException
+    {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("stringValue", "value");
+        jsonObject.put("numberValue", 10);
+        jsonObject.put("numberValue2", 3.142);
+        return jsonObject;
+    }
+
+    private void checkJSONObject(JSONObject jsonObject) throws JSONException
+    {
+        assertEquals("value", jsonObject.get("stringValue"));
+        assertEquals(10, jsonObject.get("numberValue"));
+        assertEquals(3.142, jsonObject.get("numberValue2"));
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/quickshare/QuickShareRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/quickshare/QuickShareRestApiTest.java
new file mode 100644
index 00000000000..711f3a3868f
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/quickshare/QuickShareRestApiTest.java
@@ -0,0 +1,472 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.quickshare;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.model.QuickShareModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.content.transform.AbstractContentTransformerTest;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.rendition2.SynchronousTransformClient;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.model.FileExistsException;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.PropertyMap;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This class tests QuickShare REST API
+ * 
+ * @author janv
+ * @since Cloud/4.2
+ */
+public class QuickShareRestApiTest extends BaseWebScriptTest
+{
+    private static final String RUN_ID = ""+System.currentTimeMillis();
+    
+    private static final String USER_ONE = "UserOne-"+RUN_ID;
+    private static final String USER_TWO = "UserTwo-"+RUN_ID;
+
+    private final static String SHARE_URL = "/api/internal/shared/share/{node_ref_3}";
+    
+    private final static String UNSHARE_URL = "/api/internal/shared/unshare/{shared_id}";
+    private final static String SHARE_METADATA_URL = "/api/internal/shared/node/{shared_id}/metadata";
+    private final static String SHARE_CONTENT_URL = "/api/internal/shared/node/{shared_id}/content";
+    private final static String SHARE_CONTENT_THUMBNAIL_URL = "/api/internal/shared/node/{shared_id}/content/thumbnails/{thumbnailname}?c=force";
+    
+    private static final String SITES_URL = "/api/sites";
+    
+    // note: node_ref_3 => three segments, eg. store_protocol/store_id/node_uuid
+    private final static String AUTH_METADATA_URL = "/api/node/{node_ref_3}/metadata";
+    private final static String AUTH_CONTENT_URL = "/api/node/{node_ref_3}/content";
+    private final static String AUTH_CONTENT_THUMBNAIL_URL = "/api/node/{node_ref_3}/content/thumbnails/{thumbnailname}?c=force";
+    
+    private static final String APPLICATION_JSON = "application/json";
+    
+    private NodeRef testNode;
+    private final static String TEST_NAME = "test node";
+    private static byte[] TEST_CONTENT = null;
+    private final static String TEST_MIMETYPE_JPEG = MimetypeMap.MIMETYPE_IMAGE_JPEG;
+    private final static String TEST_MIMETYPE_PNG = MimetypeMap.MIMETYPE_IMAGE_PNG;
+    private static File quickFile = null;
+
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private NodeService nodeService;
+    private PersonService personService;
+    private PermissionService permissionService;
+    private ContentService contentService;
+    private SiteService siteService;
+    private Repository repositoryHelper;
+    private RetryingTransactionHelper transactionHelper;
+    private FileFolderService fileFolderService;
+    private NodeRef userOneHome;
+    private SynchronousTransformClient synchronousTransformClient;
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        authenticationService = (MutableAuthenticationService) getServer().getApplicationContext().getBean("AuthenticationService");
+        authenticationComponent = (AuthenticationComponent) getServer().getApplicationContext().getBean("AuthenticationComponent");
+        nodeService = (NodeService) getServer().getApplicationContext().getBean("NodeService");
+        contentService = (ContentService) getServer().getApplicationContext().getBean("ContentService");
+        personService = (PersonService) getServer().getApplicationContext().getBean("PersonService");
+        permissionService = (PermissionService) getServer().getApplicationContext().getBean("PermissionService");
+        siteService = (SiteService) getServer().getApplicationContext().getBean("SiteService"); 
+        repositoryHelper = (Repository) getServer().getApplicationContext().getBean("repositoryHelper");
+        transactionHelper = (RetryingTransactionHelper)getServer().getApplicationContext().getBean("retryingTransactionHelper");
+        fileFolderService = (FileFolderService)getServer().getApplicationContext().getBean("FileFolderService");
+        synchronousTransformClient = (SynchronousTransformClient) getServer().getApplicationContext().getBean("synchronousTransformClient");
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
+
+        createUser(USER_ONE);
+        createUser(USER_TWO);
+        
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+        
+        userOneHome = repositoryHelper.getUserHome(personService.getPerson(USER_ONE));
+        // no pun intended
+        quickFile = AbstractContentTransformerTest.loadQuickTestFile("jpg");
+        TEST_CONTENT = new byte[new Long(quickFile.length()).intValue()];
+        new FileInputStream(quickFile).read(TEST_CONTENT);
+        testNode = createTestFile(userOneHome, TEST_NAME, quickFile);
+        
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_TWO);
+        
+        assertEquals(AccessStatus.DENIED, permissionService.hasPermission(testNode, PermissionService.READ));
+
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+    
+    @Override
+    public void tearDown() throws Exception
+    {
+        super.tearDown();
+        
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+        
+        transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+        {
+            public Void execute() throws Throwable
+            {
+                if (testNode != null && nodeService.exists(testNode))
+                {
+                    nodeService.deleteNode(testNode);
+                }
+                return null;
+            }
+        });
+        
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
+        
+        deleteUser(USER_ONE);
+        deleteUser(USER_TWO);
+
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+    
+    private void checkTransformer()
+    {
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                if (!synchronousTransformClient.isSupported(MimetypeMap.MIMETYPE_IMAGE_JPEG, -1, null, MimetypeMap.MIMETYPE_IMAGE_PNG, Collections.emptyMap(), null, null
+                ))
+                {
+                    fail("Image transformer is not working.  Please check your image conversion command setup.");
+                }
+
+                return null;
+            }
+        }, AuthenticationUtil.getAdminUserName());
+    }
+    
+    private void checkBytes(byte[] content1, byte[] content2)
+    {
+        assertEquals(content1.length, content2.length);
+        
+        for (int i = 0; i < content1.length; i++)
+        {
+            assertEquals(content1[i], content2[i]);
+        }
+    }
+    
+    public void testSanityCheckUrls() throws Exception
+    {
+        checkTransformer();
+        
+        final int expectedStatusOK = 200;
+        final int expectedStatusNotFound = 404;
+        final int expectedStatusServerError = 500; // currently mapped from AccessDenied (should it be 403, 404 or does it depend on use-case)
+        final int expectedStatusForbidden = 403;
+        
+        String testNodeRef_3 = testNode.toString().replace("://", "/");
+        
+        // As user one ...
+        
+        // get metadata for node (authenticated)
+        Response rsp = sendRequest(new GetRequest(AUTH_METADATA_URL.replace("{node_ref_3}", testNodeRef_3)), expectedStatusOK, USER_ONE);
+        JSONObject jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+        String name = jsonRsp.getString("name");
+        assertEquals(TEST_NAME, name);
+        String mimetype = jsonRsp.getString("mimetype");
+        assertEquals(TEST_MIMETYPE_JPEG, mimetype);
+        
+        // get content for node (authenticated)
+// Commented out when removing original CMIS impl
+//        rsp = sendRequest(new GetRequest(AUTH_CONTENT_URL.replace("{node_ref_3}", testNodeRef_3)), expectedStatusOK, USER_ONE);
+//        byte[] content = rsp.getContentAsByteArray();
+//        checkBytes(TEST_CONTENT, content);
+        
+        // get content thumbnail for node (authenticated)
+        rsp = sendRequest(new GetRequest(AUTH_CONTENT_THUMBNAIL_URL.replace("{node_ref_3}", testNodeRef_3).replace("{thumbnailname}", "doclib")), expectedStatusOK, USER_ONE);
+        String type = rsp.getContentType();
+        assertEquals(TEST_MIMETYPE_PNG, type);
+        
+        // As user two ...
+        
+        rsp = sendRequest(new GetRequest(AUTH_METADATA_URL.replace("{node_ref_3}", testNodeRef_3)), expectedStatusServerError, USER_TWO);
+// Commented out when removing original CMIS impl
+//      rsp = sendRequest(new GetRequest(AUTH_CONTENT_URL.replace("{node_ref_3}", testNodeRef_3)), expectedStatusForbidden, USER_TWO);
+        rsp = sendRequest(new GetRequest(AUTH_CONTENT_THUMBNAIL_URL.replace("{node_ref_3}", testNodeRef_3).replace("{thumbnailname}", "doclib")), expectedStatusServerError, USER_TWO);
+        
+        // As user one ...
+        
+        // share
+        rsp = sendRequest(new PostRequest(SHARE_URL.replace("{node_ref_3}", testNodeRef_3), "", APPLICATION_JSON), expectedStatusOK, USER_ONE);
+        jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+        String sharedId = jsonRsp.getString("sharedId");
+        assertNotNull(sharedId);
+        assertEquals(22, sharedId.length()); // note: we may have to adjust/remove this check if we change length of id (or it becomes variable length)
+        
+        // As user two ...
+        
+        // get metadata for share (note: can be unauthenticated)
+        rsp = sendRequest(new GetRequest(SHARE_METADATA_URL.replace("{shared_id}", sharedId)), expectedStatusOK, USER_TWO);
+        jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+        name = jsonRsp.getString("name");
+        assertEquals(TEST_NAME, name);
+        mimetype = jsonRsp.getString("mimetype");
+        assertEquals(TEST_MIMETYPE_JPEG, mimetype);
+        
+        // get content for share (note: can be unauthenticated)
+        rsp = sendRequest(new GetRequest(SHARE_CONTENT_URL.replace("{shared_id}", sharedId)), expectedStatusOK, USER_TWO);
+        byte[] content = rsp.getContentAsByteArray();
+        checkBytes(TEST_CONTENT, content);
+        
+        // get content thumbnail for share (note: can be unauthenticated)
+        rsp = sendRequest(new GetRequest(SHARE_CONTENT_THUMBNAIL_URL.replace("{shared_id}", sharedId).replace("{thumbnailname}", "doclib")), expectedStatusOK, USER_TWO);
+        type = rsp.getContentType();
+        assertEquals(TEST_MIMETYPE_PNG, type);
+        
+        // As user one ...
+        
+        // unshare
+        rsp = sendRequest(new DeleteRequest(UNSHARE_URL.replace("{shared_id}", sharedId)), expectedStatusOK, USER_ONE);
+        
+        // As user two ...
+        
+        // -ve test (should not be able to get metadata or content via sharedId) - whether authenticated or not
+        rsp = sendRequest(new GetRequest(SHARE_METADATA_URL.replace("{shared_id}", sharedId)), expectedStatusNotFound, USER_TWO);
+        rsp = sendRequest(new GetRequest(SHARE_CONTENT_URL.replace("{shared_id}", sharedId)), expectedStatusNotFound, USER_TWO);
+        rsp = sendRequest(new GetRequest(SHARE_CONTENT_THUMBNAIL_URL.replace("{shared_id}", sharedId).replace("{thumbnailname}", "doclib")), expectedStatusNotFound, USER_TWO);
+    }
+    
+    public void testUnshareContributer() throws UnsupportedEncodingException, IOException, JSONException
+    {
+    	final int expectedStatusOK = 200;
+        final int expectedStatusForbidden = 403;
+        
+        authenticationComponent.setCurrentUser("admin");
+    	
+        SiteInfo siteInfo = createSite("site" + RUN_ID);
+        siteService.setMembership(siteInfo.getShortName(), USER_ONE, SiteModel.SITE_CONSUMER);
+        siteService.setMembership(siteInfo.getShortName(), USER_TWO, SiteModel.SITE_CONTRIBUTOR);
+        
+        NodeRef siteDocLib = siteService.getContainer(siteInfo.getShortName(), SiteService.DOCUMENT_LIBRARY);
+        NodeRef testFile = createTestFile(siteDocLib, "unshare-test" + RUN_ID, quickFile);
+        
+        String strTestNodeRef = testFile.toString().replace("://", "/");
+        
+        authenticationComponent.setCurrentUser(USER_ONE);
+        
+        // share
+        Response rsp= sendRequest(new PostRequest(SHARE_URL.replace("{node_ref_3}", strTestNodeRef), "", APPLICATION_JSON), expectedStatusOK, USER_ONE);
+        JSONObject jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+        String sharedId = jsonRsp.getString("sharedId");
+        assertNotNull(sharedId);
+        
+        // unshare
+        authenticationComponent.setCurrentUser(USER_TWO);
+        rsp = sendRequest(new DeleteRequest(UNSHARE_URL.replace("{shared_id}", sharedId)), expectedStatusForbidden, USER_TWO);
+        authenticationComponent.setCurrentUser(USER_ONE);
+        rsp = sendRequest(new DeleteRequest(UNSHARE_URL.replace("{shared_id}", sharedId)), expectedStatusOK, USER_ONE);
+        
+        authenticationComponent.setCurrentUser("admin");
+        deleteSite(siteInfo.getShortName());
+    }
+    
+    /**
+     * This test verifies that copying a shared node does not across the shared aspect and it's associated properties.
+     * @throws IOException 
+     * @throws UnsupportedEncodingException 
+     * @throws JSONException 
+     * @throws FileNotFoundException 
+     * @throws FileExistsException 
+     */
+    public void testCopy() throws UnsupportedEncodingException, IOException, JSONException, FileExistsException, FileNotFoundException 
+    {
+        final int expectedStatusOK = 200;
+        
+        String testNodeRef = testNode.toString().replace("://", "/");
+
+        // As user one ...
+        
+        // share
+        Response rsp = sendRequest(new PostRequest(SHARE_URL.replace("{node_ref_3}", testNodeRef), "", APPLICATION_JSON), expectedStatusOK, USER_ONE);
+        JSONObject jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+        String sharedId = jsonRsp.getString("sharedId");
+        assertNotNull(sharedId);
+        assertEquals(22, sharedId.length()); // note: we may have to adjust/remove this check if we change length of id (or it becomes variable length)
+
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+        FileInfo copyFileInfo = fileFolderService.copy(testNode, userOneHome, "Copied node");
+        NodeRef copyNodeRef = copyFileInfo.getNodeRef();
+        
+        assertFalse(nodeService.hasAspect(copyNodeRef, QuickShareModel.ASPECT_QSHARE));
+    }
+
+    public void testContentDispositionInResponseHeader() throws IOException, JSONException
+    {
+        checkTransformer();
+
+        String testNodeRef_3 = testNode.toString().replace("://", "/");
+
+        // Thumbnail creation by user one to genuinely create the thumbnail and allow the sharedId to get it
+        sendRequest(new GetRequest(AUTH_CONTENT_THUMBNAIL_URL.replace("{node_ref_3}", testNodeRef_3).replace("{thumbnailname}", "doclib")), 200, USER_ONE);
+
+        Response rsp = sendRequest(new PostRequest(SHARE_URL.replace("{node_ref_3}", testNodeRef_3), "", APPLICATION_JSON), 200, USER_ONE);
+        JSONObject jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+        String sharedId = jsonRsp.getString("sharedId");
+
+        // In case of requesting the content only, Content-Disposition should be present to force browsers to download the file
+        rsp = sendRequest(new GetRequest(SHARE_CONTENT_URL.replace("{shared_id}", sharedId)), 200, USER_TWO);
+        assertNotNull("The response should contain a Content-Disposition entry in the header", rsp.getHeader("Content-Disposition"));
+
+        // In case of requesting the thumbnail, Content-Disposition should not be present
+        rsp = sendRequest(new GetRequest(SHARE_CONTENT_THUMBNAIL_URL.replace("{shared_id}", sharedId).replace("{thumbnailname}", "doclib")), 200, USER_TWO);
+        assertNull("The response should not contain a Content-Disposition entry in the header", rsp.getHeader("Content-Disposition"));
+    }
+    
+    private void createUser(String userName)
+    {
+        if (! authenticationService.authenticationExists(userName))
+        {
+            authenticationService.createAuthentication(userName, "PWD".toCharArray());
+        }
+        
+        if (! personService.personExists(userName))
+        {
+            PropertyMap ppOne = new PropertyMap(4);
+            ppOne.put(ContentModel.PROP_USERNAME, userName);
+            ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+            ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+            ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+            
+            personService.createPerson(ppOne);
+        }
+    }
+    
+    private void deleteUser(String userName)
+    {
+        if (personService.personExists(userName))
+        {
+            personService.deletePerson(userName);
+        }
+    }
+    
+    private NodeRef createTestFile(final NodeRef parent, final String name, final File quickFile)
+    {
+    	return transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<NodeRef>()
+        {
+            public NodeRef execute() throws Throwable
+            {
+                Map<QName, Serializable> props = new HashMap<QName, Serializable>(1);
+                props.put(ContentModel.PROP_NAME, name);
+                ChildAssociationRef result = nodeService.createNode(parent,
+                                                        ContentModel.ASSOC_CONTAINS, ContentModel.ASSOC_CONTAINS,
+                                                        ContentModel.TYPE_CONTENT, props);
+                
+                NodeRef nodeRef = result.getChildRef();
+                ContentWriter writer = contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
+                writer.setMimetype(TEST_MIMETYPE_JPEG);
+                writer.putContent(quickFile);
+                
+                return nodeRef;
+            }
+        });
+    }
+    
+    private SiteInfo createSite(final String shortName)
+    {
+        return transactionHelper.doInTransaction(new RetryingTransactionCallback<SiteInfo>()
+           {
+              @Override
+              public SiteInfo execute() throws Throwable
+              {
+                  SiteInfo siteInfo = siteService.getSite(shortName);
+                  if (siteInfo != null)
+                  {
+                      // Tidy up after failed earlier run
+                      siteService.deleteSite(shortName);
+                  }
+                  
+                  // Do the create
+                  SiteInfo site = siteService.createSite("Testing", shortName, shortName, "myDescription", SiteVisibility.PUBLIC);
+                  
+                  // Ensure we have a doclib
+                  siteService.createContainer(shortName, SiteService.DOCUMENT_LIBRARY, ContentModel.TYPE_FOLDER, null);
+                  
+                  // All done
+                  return site;
+              }
+           }, false, true
+        ); 
+    }
+    
+    private void deleteSite(final String shortName)
+    {
+        transactionHelper.doInTransaction(new RetryingTransactionCallback<Void>()
+        {
+              @Override
+              public Void execute() throws Throwable
+              {
+                  siteService.deleteSite(shortName);
+                  return null;
+              }
+        }, false, true); 
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/quickshare/QuickShareTurnedOffRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/quickshare/QuickShareTurnedOffRestApiTest.java
new file mode 100644
index 00000000000..9f7babf202c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/quickshare/QuickShareTurnedOffRestApiTest.java
@@ -0,0 +1,61 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.quickshare;
+
+import java.io.IOException;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.springframework.extensions.webscripts.GUID;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+
+/**
+ * This class tests QuickShare REST API with disabled QuickShare feature
+ * 
+ * @author sergey.shcherbovich
+ * @since 4.2
+ */
+public class QuickShareTurnedOffRestApiTest extends BaseWebScriptTest 
+{
+    private static final String APPLICATION_JSON = "application/json";
+    private final static String SHARE_URL = "/api/internal/shared/share/{node_ref}";
+    
+    @Override
+    protected void setUp() throws Exception 
+    {
+        setCustomContext("classpath:alfresco/quick-share-turned-off-test-context.xml");
+        
+        super.setUp();
+        
+        getServer().getApplicationContext();
+    }
+    
+    public void testQuickShareDisabled() throws IOException
+    {
+        String testNodeRef = "workspace://SpacesStore/" + GUID.generate();
+        sendRequest(new PostRequest(SHARE_URL.replace("{node_ref}", testNodeRef), "", APPLICATION_JSON), 403, AuthenticationUtil.getAdminUserName());
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/rating/AllRatingTests.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/rating/AllRatingTests.java
new file mode 100644
index 00000000000..a033c3da4ea
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/rating/AllRatingTests.java
@@ -0,0 +1,48 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rating;
+
+import org.alfresco.repo.rating.RatingServiceIntegrationTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * This class is a holder for the various test classes associated with the Rating Service.
+ * It is not (at the time of writing) intended to be incorporated into the automatic build
+ * which will find the various test classes and run them individually.
+ * 
+ * @author Neil McErlean
+ * @since 3.4
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    RatingServiceIntegrationTest.class,
+    RatingRestApiTest.class
+})
+public class AllRatingTests
+{
+    // Intentionally empty
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/rating/RatingRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/rating/RatingRestApiTest.java
new file mode 100644
index 00000000000..b34df8dcf5c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/rating/RatingRestApiTest.java
@@ -0,0 +1,398 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rating;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.util.PropertyMap;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.json.JSONStringer;
+import org.json.JSONTokener;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * This class tests the ReST API of the {@link org.alfresco.service.cmr.rating.RatingService}.
+ * 
+ * @author Neil McErlean
+ * @since 3.4
+ */
+public class RatingRestApiTest extends BaseWebScriptTest
+{
+    // Miscellaneous constants used throughout this test class.
+    private static final String FIVE_STAR_RATING_SCHEME = "fiveStarRatingScheme";
+    private static final String LIKES_RATING_SCHEME = "likesRatingScheme";
+
+    private static final String USER_ONE = "UserOne";
+    private static final String USER_TWO = "UserTwo";
+
+    private static final String RATING_SCHEMES = "ratingSchemes";
+    private static final String NAME = "name";
+    private static final String MIN_RATING = "minRating";
+    private static final String MAX_RATING = "maxRating";
+    private static final String RATINGS = "ratings";
+    private static final String NODE_REF = "nodeRef";
+    private static final String DATA = "data";
+    private static final String RATINGS_TOTAL = "ratingsTotal";
+    private static final String RATINGS_COUNT = "ratingsCount";
+    private static final String AVERAGE_RATING = "averageRating";
+    private static final String NODE_STATISTICS = "nodeStatistics";
+
+    private final static String NODE_RATINGS_URL_FORMAT = "/api/node/{0}/ratings";
+    private final static String GET_RATING_DEFS_URL = "/api/rating/schemedefinitions";
+
+    private static final String APPLICATION_JSON = "application/json";
+    
+    private NodeRef testNode;
+    
+    private MutableAuthenticationService authenticationService;
+    private NodeService nodeService;
+    private PersonService personService;
+    private Repository repositoryHelper;
+    private RetryingTransactionHelper transactionHelper;
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        authenticationService = (MutableAuthenticationService) getServer().getApplicationContext().getBean("AuthenticationService");
+        nodeService = (NodeService) getServer().getApplicationContext().getBean("NodeService");
+        personService = (PersonService) getServer().getApplicationContext().getBean("PersonService");
+        repositoryHelper = (Repository) getServer().getApplicationContext().getBean("repositoryHelper");
+        transactionHelper = (RetryingTransactionHelper)getServer().getApplicationContext().getBean("retryingTransactionHelper");  
+        
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
+        
+        // Create some users to rate each other's content
+        // and a test node which we will rate.
+        // It doesn't matter that it has no content.
+        testNode = transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<NodeRef>()
+                {
+                    public NodeRef execute() throws Throwable
+                    {
+                        createUser(USER_ONE);
+                        createUser(USER_TWO);
+
+                        ChildAssociationRef result = nodeService.createNode(repositoryHelper.getCompanyHome(),
+                                                                ContentModel.ASSOC_CONTAINS, ContentModel.ASSOC_CONTAINS,
+                                                                ContentModel.TYPE_CONTENT, null);
+                        return result.getChildRef();
+                    }          
+                });        
+    }
+    
+    @Override
+    public void tearDown() throws Exception
+    {
+        super.tearDown();
+
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
+
+        transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+                {
+                    public Void execute() throws Throwable
+                    {
+                        if (testNode != null && nodeService.exists(testNode))
+                        {
+                            nodeService.deleteNode(testNode);
+                            deleteUser(USER_ONE);
+                            deleteUser(USER_TWO);
+                        }
+                        return null;
+                    }          
+                });        
+    }
+
+    public void testGetRatingSchemeDefinitions() throws Exception
+    {
+        final int expectedStatus = 200;
+        Response rsp = sendRequest(new GetRequest(GET_RATING_DEFS_URL), expectedStatus);
+
+        JSONObject jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+        
+        JSONObject dataObj = (JSONObject)jsonRsp.get(DATA);
+        assertNotNull("JSON 'data' object was null", dataObj);
+        
+        JSONArray ratingSchemesArray = (JSONArray)dataObj.get(RATING_SCHEMES);
+        assertNotNull("JSON 'ratingSchemesArray' object was null", ratingSchemesArray);
+        assertEquals(2, ratingSchemesArray.length());
+
+        // The array's objects may be in different order
+        Map<String, JSONObject> ratingsMap = new HashMap<String, JSONObject>();
+        for (int i = 0 ; i < ratingSchemesArray.length(); i++)
+        {
+            ratingsMap.put(ratingSchemesArray.getJSONObject(i).getString(NAME), ratingSchemesArray.getJSONObject(i));
+        }
+
+        JSONObject scheme1 = ratingsMap.get(LIKES_RATING_SCHEME);
+        JSONObject scheme2 = ratingsMap.get(FIVE_STAR_RATING_SCHEME);
+
+        assertNotNull("The response did not contain " + LIKES_RATING_SCHEME, scheme1);
+        assertEquals(1.0, scheme1.getDouble(MIN_RATING));
+        assertEquals(1.0, scheme1.getDouble(MAX_RATING));
+        assertTrue(scheme1.getBoolean("selfRatingAllowed"));
+        assertNotNull("The response did not contain " + FIVE_STAR_RATING_SCHEME, scheme2);
+        assertEquals(1.0, scheme2.getDouble(MIN_RATING));
+        assertEquals(5.0, scheme2.getDouble(MAX_RATING));
+        assertFalse(scheme2.getBoolean("selfRatingAllowed"));
+    }
+    
+    public void testGetRatingsFromUnratedNodeRef() throws Exception
+    {
+        // GET ratings
+        String ratingUrl = getRatingUrl(testNode);
+
+        final int expectedStatus = 200;
+        Response rsp = sendRequest(new GetRequest(ratingUrl), expectedStatus);
+
+        JSONObject jsonRsp = new JSONObject(new JSONTokener(rsp.getContentAsString()));
+        
+        JSONObject dataObj = (JSONObject)jsonRsp.get(DATA);
+        assertNotNull("JSON 'data' object was null", dataObj);
+        
+        assertEquals(testNode.toString(), dataObj.getString(NODE_REF));
+        final JSONObject ratingsObject = dataObj.getJSONObject(RATINGS);
+        assertEquals(0, ratingsObject.length());
+
+        // Unrated content
+        JSONObject statsObject = dataObj.getJSONObject(NODE_STATISTICS);
+        JSONObject likesStats = statsObject.getJSONObject(LIKES_RATING_SCHEME);
+        assertEquals("Average rating was wrong.", -1.0, likesStats.getDouble(AVERAGE_RATING));
+        assertEquals("Ratings count rating was wrong.", 0, likesStats.getInt(RATINGS_COUNT));
+        assertEquals("Ratings total was wrong.", 0.0, likesStats.getDouble(RATINGS_TOTAL));
+
+        JSONObject fiveStarStats = statsObject.getJSONObject(FIVE_STAR_RATING_SCHEME);
+        assertEquals("Average rating was wrong.", -1.0, fiveStarStats.getDouble(AVERAGE_RATING));
+        assertEquals("Ratings count rating was wrong.", 0, fiveStarStats.getInt(RATINGS_COUNT));
+        assertEquals("Ratings total was wrong.", 0.0, fiveStarStats.getDouble(RATINGS_TOTAL));
+    }
+
+    /**
+     * This test method applies ratings from multiple users in a single rating
+     * scheme to a single test node. It then retrieves those ratings to ensure they
+     * were persisted correctly.
+     */
+    public void testApplyRatingsAsMultipleUsersAndRetrieve() throws Exception
+    {
+        // POST a new rating to the testNode - as User One.
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+
+        final String testNodeRatingUrl = getRatingUrl(testNode);
+        
+        final float userOneRatingValue = 4.5f;
+        String jsonString = new JSONStringer().object()
+            .key("rating").value(userOneRatingValue)
+            .key("ratingScheme").value(FIVE_STAR_RATING_SCHEME)
+        .endObject()
+        .toString();
+        
+        Response postRsp = sendRequest(new PostRequest(testNodeRatingUrl,
+                                 jsonString, APPLICATION_JSON), 200);
+        
+        String postRspString = postRsp.getContentAsString();
+        
+        // Get the returned URL and validate
+        JSONObject jsonRsp = new JSONObject(new JSONTokener(postRspString));
+        
+        JSONObject dataObj = (JSONObject)jsonRsp.get(DATA);
+        assertNotNull("JSON 'data' object was null", dataObj);
+        String returnedUrl =  dataObj.getString("ratedNodeUrl");
+        assertEquals(testNodeRatingUrl, returnedUrl);
+        assertEquals(FIVE_STAR_RATING_SCHEME, dataObj.getString("ratingScheme"));
+        assertEquals(userOneRatingValue, (float)dataObj.getDouble("rating"));
+        assertEquals(userOneRatingValue, (float)dataObj.getDouble("averageRating"));
+        assertEquals(userOneRatingValue, (float)dataObj.getDouble("ratingsTotal"));
+        assertEquals(1, dataObj.getInt("ratingsCount"));
+
+        // And a second rating
+        jsonString = new JSONStringer().object()
+            .key("rating").value(1)
+            .key("ratingScheme").value(LIKES_RATING_SCHEME)
+        .endObject()
+        .toString();
+        
+        sendRequest(new PostRequest(testNodeRatingUrl, jsonString, APPLICATION_JSON), 200);
+
+        
+        // Now GET the ratings via that returned URL
+        Response getRsp = sendRequest(new GetRequest(testNodeRatingUrl), 200);
+        String getRspString = getRsp.getContentAsString();
+
+        jsonRsp = new JSONObject(new JSONTokener(getRspString));
+        
+        dataObj = (JSONObject)jsonRsp.get(DATA);
+        assertNotNull("JSON 'data' object was null", dataObj);
+        
+        // There should be two ratings in there.
+        final JSONObject ratingsObject = dataObj.getJSONObject(RATINGS);
+        assertEquals(2, ratingsObject.length());
+        JSONObject recoveredRating = ratingsObject.getJSONObject(FIVE_STAR_RATING_SCHEME);
+        assertEquals(userOneRatingValue, (float)recoveredRating.getDouble("rating"));
+
+        // As well as the average, total ratings.
+        JSONObject statsObject = dataObj.getJSONObject(NODE_STATISTICS);
+        JSONObject fiveStarStats = statsObject.getJSONObject(FIVE_STAR_RATING_SCHEME);
+        assertEquals("Average rating was wrong.", userOneRatingValue, (float)fiveStarStats.getDouble(AVERAGE_RATING));
+        assertEquals("Ratings count rating was wrong.", 1, fiveStarStats.getInt(RATINGS_COUNT));
+        assertEquals("Ratings total was wrong.", userOneRatingValue, (float)fiveStarStats.getDouble(RATINGS_TOTAL));
+
+        JSONObject likesStats = statsObject.getJSONObject(LIKES_RATING_SCHEME);
+        assertEquals("Average rating was wrong.", 1f, (float)likesStats.getDouble(AVERAGE_RATING));
+        assertEquals("Ratings count rating was wrong.", 1, likesStats.getInt(RATINGS_COUNT));
+        assertEquals("Ratings total was wrong.", 1f, (float)likesStats.getDouble(RATINGS_TOTAL));
+        
+
+        // Now POST a second new rating to the testNode - as User Two.
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_TWO);
+
+        final float userTwoRatingValue = 3.5f;
+        jsonString = new JSONStringer().object()
+            .key("rating").value(userTwoRatingValue)
+            .key("ratingScheme").value(FIVE_STAR_RATING_SCHEME)
+        .endObject()
+        .toString();
+        
+        postRsp = sendRequest(new PostRequest(testNodeRatingUrl,
+                                 jsonString, APPLICATION_JSON), 200);
+        postRspString = postRsp.getContentAsString();
+        
+        // Get the returned URL and validate
+        jsonRsp = new JSONObject(new JSONTokener(postRspString));
+        
+        dataObj = (JSONObject)jsonRsp.get(DATA);
+        assertNotNull("JSON 'data' object was null", dataObj);
+        returnedUrl =  dataObj.getString("ratedNodeUrl");
+
+        assertEquals((userOneRatingValue + userTwoRatingValue) / 2, (float)dataObj.getDouble("averageRating"));
+        assertEquals(userOneRatingValue + userTwoRatingValue,       (float)dataObj.getDouble("ratingsTotal"));
+        assertEquals(2, dataObj.getInt("ratingsCount"));
+
+        // Again GET the ratings via that returned URL
+        getRsp = sendRequest(new GetRequest(returnedUrl), 200);
+        getRspString = getRsp.getContentAsString();
+
+        jsonRsp = new JSONObject(new JSONTokener(getRspString));
+        
+        dataObj = (JSONObject)jsonRsp.get(DATA);
+        assertNotNull("JSON 'data' object was null", dataObj);
+
+        // There should still only be the one rating in the results - because we're running
+        // as UserTwo and should not see UserOne's rating.
+        final JSONObject userTwoRatings = dataObj.getJSONObject(RATINGS);
+        assertEquals(1, userTwoRatings.length());
+        JSONObject secondRating = (JSONObject)userTwoRatings.getJSONObject(FIVE_STAR_RATING_SCHEME);
+        assertEquals(userTwoRatingValue, (float)secondRating.getDouble("rating"));
+
+        // Now the average should have changed.
+        statsObject = dataObj.getJSONObject(NODE_STATISTICS);
+        fiveStarStats = statsObject.getJSONObject(FIVE_STAR_RATING_SCHEME);
+        assertEquals("Average rating was wrong.", (userOneRatingValue + userTwoRatingValue) / 2.0,
+                                                  fiveStarStats.getDouble(AVERAGE_RATING));
+        assertEquals("Ratings count rating was wrong.", 2, fiveStarStats.getInt(RATINGS_COUNT));
+        assertEquals("Ratings total was wrong.", userOneRatingValue + userTwoRatingValue,
+                                                 (float)fiveStarStats.getDouble(RATINGS_TOTAL));
+        
+        
+        // Now DELETE user two's rating.
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_TWO);
+        sendRequest(new DeleteRequest(testNodeRatingUrl + "/" + FIVE_STAR_RATING_SCHEME), 200);
+        
+        // GET the ratings again. Although user_one's rating will still be there,
+        // user two can't see it and so we should see zero ratings.
+        getRsp = sendRequest(new GetRequest(returnedUrl), 200);
+        getRspString = getRsp.getContentAsString();
+
+        jsonRsp = new JSONObject(new JSONTokener(getRspString));
+        
+        dataObj = (JSONObject)jsonRsp.get(DATA);
+        assertNotNull("JSON 'data' object was null", dataObj);
+
+        final JSONObject remainingRatings = dataObj.getJSONObject(RATINGS);
+        assertEquals(0, remainingRatings.length());
+
+        // Now the average should have changed.
+        statsObject = dataObj.getJSONObject(NODE_STATISTICS);
+        fiveStarStats = statsObject.getJSONObject(FIVE_STAR_RATING_SCHEME);
+        assertEquals("Average rating was wrong.", userOneRatingValue,
+                                                  (float)fiveStarStats.getDouble(AVERAGE_RATING));
+        assertEquals("Ratings count rating was wrong.", 1, fiveStarStats.getInt(RATINGS_COUNT));
+        assertEquals("Ratings total was wrong.", userOneRatingValue,
+                                                 (float)fiveStarStats.getDouble(RATINGS_TOTAL));
+    }
+    
+    /**
+     * This method gives the 'ratings' URL for the specified NodeRef.
+     */
+    private String getRatingUrl(NodeRef nodeRef)
+    {
+        String nodeUrl = nodeRef.toString().replace("://", "/");
+        String ratingUrl = MessageFormat.format(NODE_RATINGS_URL_FORMAT, nodeUrl);
+        return ratingUrl;
+    }
+
+    private void createUser(String userName)
+    {
+        if (! authenticationService.authenticationExists(userName))
+        {
+            authenticationService.createAuthentication(userName, "PWD".toCharArray());
+        }
+        
+        if (! personService.personExists(userName))
+        {
+            PropertyMap ppOne = new PropertyMap(4);
+            ppOne.put(ContentModel.PROP_USERNAME, userName);
+            ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+            ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+            ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+            
+            personService.createPerson(ppOne);
+        }
+    }
+
+    private void deleteUser(String userName)
+    {
+        if (personService.personExists(userName))
+        {
+            personService.deletePerson(userName);
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/replication/ReplicationRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/replication/ReplicationRestApiTest.java
new file mode 100644
index 00000000000..a0077c7b3ce
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/replication/ReplicationRestApiTest.java
@@ -0,0 +1,1611 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.replication;
+
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.ActionImpl;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.person.TestPersonManager;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.action.ActionStatus;
+import org.alfresco.service.cmr.action.ActionTrackingService;
+import org.alfresco.service.cmr.replication.ReplicationDefinition;
+import org.alfresco.service.cmr.replication.ReplicationService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.GUID;
+import org.alfresco.util.ISO8601DateFormat;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.surf.util.URLEncoder;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Tests for the Replication Webscripts
+ * @author Nick Burch
+ * 
+ * TODO - Scheduling parts
+ */
+public class ReplicationRestApiTest extends BaseWebScriptTest
+{
+    private static final String URL_REPLICATION_SERVICE_STATUS = "/api/replication-service-status";
+    private static final String URL_DEFINITION = "api/replication-definition/";
+    private static final String URL_DEFINITIONS = "api/replication-definitions";
+    private static final String URL_RUNNING_ACTION = "api/running-action/";
+    
+    private static final String JSON = "application/json";
+    
+    private static final String USER_NORMAL = "Normal" + GUID.generate();
+    
+    private NodeService nodeService;
+    private TestPersonManager personManager;
+    private ReplicationService replicationService;
+    private TransactionService transactionService;
+    private ActionTrackingService actionTrackingService;
+    
+    private Repository repositoryHelper;
+    private NodeRef dataDictionary;
+    
+    /**
+     * @since 3.5
+     */
+    public void testReplicationServiceIsEnabled() throws Exception
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        
+        Response response = sendRequest(new GetRequest(URL_REPLICATION_SERVICE_STATUS), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        JSONObject data = json.getJSONObject("data");
+        assertNotNull(data);
+        assertTrue("ReplicationService was unexpectedly disabled.", data.getBoolean(ReplicationServiceStatusGet.ENABLED));
+    }
+    
+    public void testReplicationDefinitionsGet() throws Exception
+    {
+        Response response;
+        
+        
+        // Not allowed if you're not an admin
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getGuestUserName());
+        response = sendRequest(new GetRequest(URL_DEFINITIONS), Status.STATUS_UNAUTHORIZED);
+        assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+        
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_NORMAL);
+        response = sendRequest(new GetRequest(URL_DEFINITIONS), Status.STATUS_UNAUTHORIZED);
+        assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+        
+       
+        // If no definitions exist, you don't get anything back
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        response = sendRequest(new GetRequest(URL_DEFINITIONS), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        JSONArray results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(0, results.length());
+
+        
+        // Add a definition, it should show up
+        ReplicationDefinition rd = replicationService.createReplicationDefinition("Test1", "Testing");
+        replicationService.saveReplicationDefinition(rd);
+        response = sendRequest(new GetRequest(URL_DEFINITIONS), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(1, results.length());
+        
+        JSONObject jsonRD = (JSONObject)results.get(0);
+        assertNotNull(jsonRD);
+        assertEquals("Test1", jsonRD.get("name"));
+        assertEquals("New", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(JSONObject.NULL, jsonRD.get("startedAt"));
+        assertEquals("/api/replication-definition/Test1", jsonRD.get("details"));
+        
+        
+        // Ensure we didn't get any unexpected data back,
+        //  only the keys we should have done
+        JSONArray keys = jsonRD.names();
+        for(int i=0; i<keys.length(); i++) {
+           String key = keys.getString(0);
+           if(key.equals("name") || key.equals("status") ||
+               key.equals("startedAt") || key.equals("enabled") ||
+               key.equals("details")) {
+              // All good
+           } else {
+              fail("Unexpected key '"+key+"' found in json, raw json is\n" + jsonStr);
+           }
+        }
+        
+        
+        // Mark it as pending execution, and re-check
+        actionTrackingService.recordActionPending(rd);
+        response = sendRequest(new GetRequest(URL_DEFINITIONS), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(1, results.length());
+        
+        jsonRD = (JSONObject)results.get(0);
+        assertNotNull(jsonRD);
+        assertEquals("Test1", jsonRD.get("name"));
+        assertEquals("Pending", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(JSONObject.NULL, jsonRD.get("startedAt"));
+        assertEquals("/api/replication-definition/Test1", jsonRD.get("details"));
+        
+        
+        // Change the status to running, and re-check
+        actionTrackingService.recordActionExecuting(rd);
+        String startedAt = ISO8601DateFormat.format(rd.getExecutionStartDate());
+        
+        response = sendRequest(new GetRequest(URL_DEFINITIONS), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(1, results.length());
+        
+        jsonRD = (JSONObject)results.get(0);
+        assertNotNull(jsonRD);
+        assertEquals("Test1", jsonRD.get("name"));
+        assertEquals("Running", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(startedAt, jsonRD.getJSONObject("startedAt").get("iso8601"));
+        assertEquals("/api/replication-definition/Test1", jsonRD.get("details"));
+        
+       
+        // Add a 2nd and 3rd
+        rd = replicationService.createReplicationDefinition("Test2", "2nd Testing");
+        replicationService.saveReplicationDefinition(rd);
+        rd = replicationService.createReplicationDefinition("AnotherTest", "3rd Testing");
+        replicationService.saveReplicationDefinition(rd);
+        
+        // They should come back sorted by name
+        response = sendRequest(new GetRequest(URL_DEFINITIONS), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(3, results.length());
+        
+        jsonRD = (JSONObject)results.get(0);
+        assertNotNull(jsonRD);
+        assertEquals("AnotherTest", jsonRD.get("name"));
+        assertEquals("New", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(JSONObject.NULL, jsonRD.get("startedAt"));
+        assertEquals("/api/replication-definition/AnotherTest", jsonRD.get("details"));
+        
+        jsonRD = (JSONObject)results.get(1);
+        assertNotNull(jsonRD);
+        assertEquals("Test1", jsonRD.get("name"));
+        assertEquals("Running", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(startedAt, jsonRD.getJSONObject("startedAt").get("iso8601"));
+        assertEquals("/api/replication-definition/Test1", jsonRD.get("details"));
+        
+        jsonRD = (JSONObject)results.get(2);
+        assertNotNull(jsonRD);
+        assertEquals("Test2", jsonRD.get("name"));
+        assertEquals("New", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(JSONObject.NULL, jsonRD.get("startedAt"));
+        assertEquals("/api/replication-definition/Test2", jsonRD.get("details"));
+        
+        
+        // Sort by status
+        response = sendRequest(new GetRequest(URL_DEFINITIONS + "?sort=status"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(3, results.length());
+        
+        // New, name sorts higher 
+        jsonRD = (JSONObject)results.get(0);
+        assertNotNull(jsonRD);
+        assertEquals("AnotherTest", jsonRD.get("name"));
+        assertEquals("New", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(JSONObject.NULL, jsonRD.get("startedAt"));
+        assertEquals("/api/replication-definition/AnotherTest", jsonRD.get("details"));
+        
+        // New, name sorts lower
+        jsonRD = (JSONObject)results.get(1);
+        assertNotNull(jsonRD);
+        assertEquals("Test2", jsonRD.get("name"));
+        assertEquals("New", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(JSONObject.NULL, jsonRD.get("startedAt"));
+        assertEquals("/api/replication-definition/Test2", jsonRD.get("details"));
+        
+        // Running
+        jsonRD = (JSONObject)results.get(2);
+        assertNotNull(jsonRD);
+        assertEquals("Test1", jsonRD.get("name"));
+        assertEquals("Running", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(startedAt, jsonRD.getJSONObject("startedAt").get("iso8601"));
+        assertEquals("/api/replication-definition/Test1", jsonRD.get("details"));
+                
+        
+        // Set start times and statuses on these other two
+        UserTransaction txn = transactionService.getUserTransaction();
+        txn.begin();
+        rd = replicationService.loadReplicationDefinition("Test2");
+        actionTrackingService.recordActionExecuting(rd);
+        actionTrackingService.recordActionComplete(rd);
+        String startedAt2 = ISO8601DateFormat.format(rd.getExecutionStartDate());
+        txn.commit();
+        
+        
+        // Try the different sorts
+        response = sendRequest(new GetRequest(URL_DEFINITIONS + "?sort=status"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(3, results.length());
+        
+        // Complete
+        jsonRD = (JSONObject)results.get(0);
+        assertNotNull(jsonRD);
+        assertEquals("Test2", jsonRD.get("name"));
+        assertEquals("Completed", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(startedAt2, jsonRD.getJSONObject("startedAt").get("iso8601"));
+        assertEquals("/api/replication-definition/Test2", jsonRD.get("details"));
+        
+        // New
+        jsonRD = (JSONObject)results.get(1);
+        assertNotNull(jsonRD);
+        assertEquals("AnotherTest", jsonRD.get("name"));
+        assertEquals("New", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(JSONObject.NULL, jsonRD.get("startedAt"));
+        assertEquals("/api/replication-definition/AnotherTest", jsonRD.get("details"));
+        
+        // Running
+        jsonRD = (JSONObject)results.get(2);
+        assertNotNull(jsonRD);
+        assertEquals("Test1", jsonRD.get("name"));
+        assertEquals("Running", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(startedAt, jsonRD.getJSONObject("startedAt").get("iso8601"));
+        assertEquals("/api/replication-definition/Test1", jsonRD.get("details"));
+        
+        
+        // By last run
+        response = sendRequest(new GetRequest(URL_DEFINITIONS + "?sort=lastRun"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(3, results.length());
+
+        // Ran most recently
+        jsonRD = (JSONObject)results.get(0);
+        assertNotNull(jsonRD);
+        assertEquals("Test2", jsonRD.get("name"));
+        assertEquals("Completed", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(startedAt2, jsonRD.getJSONObject("startedAt").get("iso8601"));
+        assertEquals("/api/replication-definition/Test2", jsonRD.get("details"));
+        
+        // Ran least recently
+        jsonRD = (JSONObject)results.get(1);
+        assertNotNull(jsonRD);
+        assertEquals("Test1", jsonRD.get("name"));
+        assertEquals("Running", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(startedAt, jsonRD.getJSONObject("startedAt").get("iso8601"));
+        assertEquals("/api/replication-definition/Test1", jsonRD.get("details"));
+        
+        // Never run last
+        jsonRD = (JSONObject)results.get(2);
+        assertNotNull(jsonRD);
+        assertEquals("AnotherTest", jsonRD.get("name"));
+        assertEquals("New", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(JSONObject.NULL, jsonRD.get("startedAt"));
+        assertEquals("/api/replication-definition/AnotherTest", jsonRD.get("details"));
+        
+       
+        // Cancel one of these
+        rd = replicationService.loadReplicationDefinition("AnotherTest");
+        rd.setEnabled(false);
+        replicationService.saveReplicationDefinition(rd);
+        actionTrackingService.recordActionExecuting(rd);
+        actionTrackingService.requestActionCancellation(rd);
+        String startedAt3 = ISO8601DateFormat.format(rd.getExecutionStartDate());
+        
+        response = sendRequest(new GetRequest(URL_DEFINITIONS), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(3, results.length());
+        
+        jsonRD = (JSONObject)results.get(0);
+        assertNotNull(jsonRD);
+        assertEquals("AnotherTest", jsonRD.get("name"));
+        assertEquals("CancelRequested", jsonRD.get("status"));
+        assertEquals(false, jsonRD.get("enabled"));
+        assertEquals(startedAt3, jsonRD.getJSONObject("startedAt").get("iso8601"));
+        assertEquals("/api/replication-definition/AnotherTest", jsonRD.get("details"));
+        
+        jsonRD = (JSONObject)results.get(1);
+        assertNotNull(jsonRD);
+        assertEquals("Test1", jsonRD.get("name"));
+        assertEquals("Running", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(startedAt, jsonRD.getJSONObject("startedAt").get("iso8601"));
+        assertEquals("/api/replication-definition/Test1", jsonRD.get("details"));
+        
+        jsonRD = (JSONObject)results.get(2);
+        assertNotNull(jsonRD);
+        assertEquals("Test2", jsonRD.get("name"));
+        assertEquals("Completed", jsonRD.get("status"));
+        assertEquals(true, jsonRD.get("enabled"));
+        assertEquals(startedAt2, jsonRD.getJSONObject("startedAt").get("iso8601"));
+        assertEquals("/api/replication-definition/Test2", jsonRD.get("details"));
+    }
+    
+    public void testReplicationDefinitionGet() throws Exception
+    {
+        Response response;
+        
+        
+        // Not allowed if you're not an admin
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getGuestUserName());
+        response = sendRequest(new GetRequest(URL_DEFINITION + "madeup"), Status.STATUS_UNAUTHORIZED);
+        assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+        
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_NORMAL);
+        response = sendRequest(new GetRequest(URL_DEFINITION + "madeup"), Status.STATUS_UNAUTHORIZED);
+        assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+        
+       
+        // If an invalid name is given, you get a 404
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        response = sendRequest(new GetRequest(URL_DEFINITION + "madeup"), 404);
+        assertEquals(Status.STATUS_NOT_FOUND, response.getStatus());
+        
+        
+        // Add a definition, it should show up
+        ReplicationDefinition rd = replicationService.createReplicationDefinition("Test1", "Testing");
+        replicationService.saveReplicationDefinition(rd);
+        response = sendRequest(new GetRequest(URL_DEFINITION + "Test1"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr).getJSONObject("data");
+        assertNotNull(json);
+        
+        // Check 
+        assertEquals("Test1", json.get("name"));
+        assertEquals("Testing", json.get("description"));
+        assertEquals("New", json.get("status"));
+        assertEquals(JSONObject.NULL, json.get("startedAt"));
+        assertEquals(JSONObject.NULL, json.get("endedAt"));
+        assertEquals(JSONObject.NULL, json.get("failureMessage"));
+        assertEquals(JSONObject.NULL, json.get("executionDetails"));
+        assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+        assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+        assertEquals(true, json.get("enabled"));
+        assertEquals(JSONObject.NULL, json.get("targetName"));
+        // Payload is empty
+        assertEquals(0, json.getJSONArray("payload").length());
+        
+        
+        // Ensure we didn't get any unexpected data back
+        JSONArray keys = json.names();
+        for(int i=0; i<keys.length(); i++) {
+           String key = keys.getString(0);
+           if(key.equals("name") || key.equals("description") || 
+               key.equals("status") || key.equals("startedAt") ||
+               key.equals("endedAt") || key.equals("failureMessage") ||
+               key.equals("executionDetails") || key.equals("payload") ||
+               key.equals("transferLocalReport") ||
+               key.equals("transferRemoteReport") ||
+               key.equals("enabled") || key.equals("targetName") || key.equals("schedule")) {
+              // All good
+           } else {
+              fail("Unexpected key '"+key+"' found in json, raw json is\n" + jsonStr);
+           }
+        }
+        
+        
+        // Mark it as pending, and check
+        actionTrackingService.recordActionPending(rd);
+        String actionId = rd.getId();
+        int instanceId = ((ActionImpl)rd).getExecutionInstance();
+        
+        response = sendRequest(new GetRequest(URL_DEFINITION + "Test1"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr).getJSONObject("data");
+        
+        assertEquals("Test1", json.get("name"));
+        assertEquals("Testing", json.get("description"));
+        assertEquals("Pending", json.get("status"));
+        assertEquals(JSONObject.NULL, json.get("startedAt"));
+        assertEquals(JSONObject.NULL, json.get("endedAt"));
+        assertEquals(JSONObject.NULL, json.get("failureMessage"));
+        assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor="+
+              actionId + "=" + instanceId, json.get("executionDetails"));
+        assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+        assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+        assertEquals(true, json.get("enabled"));
+        assertEquals(JSONObject.NULL, json.get("targetName"));
+        // Payload is empty
+        assertEquals(0, json.getJSONArray("payload").length());
+        
+        
+        // Change the status to running, and re-check
+        actionTrackingService.recordActionExecuting(rd);
+        assertEquals(actionId, rd.getId());
+        assertEquals(instanceId, ((ActionImpl)rd).getExecutionInstance());
+        String startedAt = ISO8601DateFormat.format(rd.getExecutionStartDate());
+        
+        response = sendRequest(new GetRequest(URL_DEFINITION + "Test1"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr).getJSONObject("data");
+        
+        assertEquals("Test1", json.get("name"));
+        assertEquals("Testing", json.get("description"));
+        assertEquals("Running", json.get("status"));
+        assertEquals(startedAt, json.getJSONObject("startedAt").get("iso8601"));
+        assertEquals(JSONObject.NULL, json.get("endedAt"));
+        assertEquals(JSONObject.NULL, json.get("failureMessage"));
+        assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor="+
+              actionId + "=" + instanceId, json.get("executionDetails"));
+        assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+        assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+        assertEquals(true, json.get("enabled"));
+        assertEquals(JSONObject.NULL, json.get("targetName"));
+        // Payload is empty
+        assertEquals(0, json.getJSONArray("payload").length());
+        
+        
+        // Cancel it
+        actionTrackingService.requestActionCancellation(rd);
+        
+        response = sendRequest(new GetRequest(URL_DEFINITION + "Test1"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr).getJSONObject("data");
+        
+        assertEquals("Test1", json.get("name"));
+        assertEquals("Testing", json.get("description"));
+        assertEquals("CancelRequested", json.get("status"));
+        assertEquals(startedAt, json.getJSONObject("startedAt").get("iso8601"));
+        assertEquals(JSONObject.NULL, json.get("endedAt"));
+        assertEquals(JSONObject.NULL, json.get("failureMessage"));
+        assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor="+
+              actionId + "=" + instanceId, json.get("executionDetails"));
+        assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+        assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+        assertEquals(true, json.get("enabled"));
+        assertEquals(JSONObject.NULL, json.get("targetName"));
+        // Payload is empty
+        assertEquals(0, json.getJSONArray("payload").length());
+
+        
+        // Add some payload details, ensure that they get expanded
+        //  as they should be
+        rd.getPayload().add(
+              repositoryHelper.getCompanyHome()
+        );
+        rd.getPayload().add( dataDictionary );
+        replicationService.saveReplicationDefinition(rd);
+        
+        response = sendRequest(new GetRequest(URL_DEFINITION + "Test1"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr).getJSONObject("data");
+        
+        assertEquals("Test1", json.get("name"));
+        assertEquals("Testing", json.get("description"));
+        assertEquals("CancelRequested", json.get("status"));
+        assertEquals(startedAt, json.getJSONObject("startedAt").get("iso8601"));
+        assertEquals(JSONObject.NULL, json.get("endedAt"));
+        assertEquals(JSONObject.NULL, json.get("failureMessage"));
+        assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor="+
+              actionId + "=" + instanceId, json.get("executionDetails"));
+        assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+        assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+        assertEquals(true, json.get("enabled"));
+        assertEquals(JSONObject.NULL, json.get("targetName"));
+        
+        // Check Payload
+        assertEquals(2, json.getJSONArray("payload").length());
+        
+        JSONObject payload = json.getJSONArray("payload").getJSONObject(0);
+        assertEquals(repositoryHelper.getCompanyHome().toString(), payload.get("nodeRef"));
+        assertEquals(true, payload.get("isFolder"));
+        assertEquals("Company Home", payload.get("name"));
+        assertEquals("/Company Home", payload.get("path"));
+
+        payload = json.getJSONArray("payload").getJSONObject(1);
+        assertEquals(dataDictionary.toString(), payload.get("nodeRef"));
+        assertEquals(true, payload.get("isFolder"));
+        assertEquals("Data Dictionary", payload.get("name"));
+        assertEquals("/Company Home/Data Dictionary", payload.get("path"));
+        
+        
+        // Add a deleted NodeRef too, will be silently ignored
+        //  by the webscript layer
+        UserTransaction txn = transactionService.getUserTransaction();
+        txn.begin();
+        NodeRef deleted = nodeService.createNode(
+              dataDictionary, ContentModel.ASSOC_CONTAINS,
+              QName.createQName("IwillBEdeleted"),
+              ContentModel.TYPE_CONTENT
+        ).getChildRef();
+        nodeService.deleteNode(deleted);
+        txn.commit();
+        
+        rd.getPayload().add( deleted );
+        replicationService.saveReplicationDefinition(rd);
+        
+        response = sendRequest(new GetRequest(URL_DEFINITION + "Test1"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr).getJSONObject("data");
+        
+        assertEquals("Test1", json.get("name"));
+        assertEquals("Testing", json.get("description"));
+        assertEquals("CancelRequested", json.get("status"));
+        assertEquals(startedAt, json.getJSONObject("startedAt").get("iso8601"));
+        assertEquals(JSONObject.NULL, json.get("endedAt"));
+        assertEquals(JSONObject.NULL, json.get("failureMessage"));
+        assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor="+
+              actionId + "=" + instanceId, json.get("executionDetails"));
+        assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+        assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+        assertEquals(true, json.get("enabled"));
+        assertEquals(JSONObject.NULL, json.get("targetName"));
+        
+        // Check Payload
+        assertEquals(2, json.getJSONArray("payload").length());
+        payload = json.getJSONArray("payload").getJSONObject(0);
+        assertEquals("Company Home", payload.get("name"));
+        payload = json.getJSONArray("payload").getJSONObject(1);
+        assertEquals("Data Dictionary", payload.get("name"));
+
+        
+        // Add a 2nd and 3rd definition
+        rd = replicationService.createReplicationDefinition("Test2", "2nd Testing");
+        replicationService.saveReplicationDefinition(rd);
+        
+        rd = replicationService.createReplicationDefinition("Test3", "3rd Testing");
+        rd.setLocalTransferReport( repositoryHelper.getRootHome() );
+        rd.setRemoteTransferReport( repositoryHelper.getCompanyHome() );
+        rd.setEnabled(false);
+        
+        // Have the 3rd one flagged as having failed
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+        replicationService.saveReplicationDefinition(rd);
+        actionTrackingService.recordActionExecuting(rd);
+        actionTrackingService.recordActionFailure(rd, new Exception("Test Failure"));
+        txn.commit();
+        Thread.sleep(50);
+        replicationService.saveReplicationDefinition(rd);
+        
+        
+        // Original one comes back unchanged
+        response = sendRequest(new GetRequest(URL_DEFINITION + "Test1"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr).getJSONObject("data");
+        
+        assertEquals("Test1", json.get("name"));
+        assertEquals("Testing", json.get("description"));
+        assertEquals("CancelRequested", json.get("status"));
+        assertEquals(startedAt, json.getJSONObject("startedAt").get("iso8601"));
+        assertEquals(JSONObject.NULL, json.get("endedAt"));
+        assertEquals(JSONObject.NULL, json.get("failureMessage"));
+        assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor="+
+              actionId + "=" + instanceId, json.get("executionDetails"));
+        assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+        assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+        assertEquals(true, json.get("enabled"));
+        assertEquals(JSONObject.NULL, json.get("targetName"));
+        
+        // Check Payload
+        assertEquals(2, json.getJSONArray("payload").length());
+        
+        payload = json.getJSONArray("payload").getJSONObject(0);
+        assertEquals(repositoryHelper.getCompanyHome().toString(), payload.get("nodeRef"));
+        assertEquals(true, payload.get("isFolder"));
+        assertEquals("Company Home", payload.get("name"));
+        assertEquals("/Company Home", payload.get("path"));
+
+        payload = json.getJSONArray("payload").getJSONObject(1);
+        assertEquals(dataDictionary.toString(), payload.get("nodeRef"));
+        assertEquals(true, payload.get("isFolder"));
+        assertEquals("Data Dictionary", payload.get("name"));
+        assertEquals("/Company Home/Data Dictionary", payload.get("path"));
+        
+        
+        // They show up things as expected
+        response = sendRequest(new GetRequest(URL_DEFINITION + "Test2"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr).getJSONObject("data");
+        
+        assertEquals("Test2", json.get("name"));
+        assertEquals("2nd Testing", json.get("description"));
+        assertEquals("New", json.get("status"));
+        assertEquals(JSONObject.NULL, json.get("startedAt"));
+        assertEquals(JSONObject.NULL, json.get("endedAt"));
+        assertEquals(JSONObject.NULL, json.get("failureMessage"));
+        assertEquals(JSONObject.NULL, json.get("executionDetails"));
+        assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+        assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+        assertEquals(true, json.get("enabled"));
+        assertEquals(JSONObject.NULL, json.get("targetName"));
+        assertEquals(0, json.getJSONArray("payload").length());
+        
+        
+        // And the 3rd one, which is failed
+        response = sendRequest(new GetRequest(URL_DEFINITION + "Test3"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr).getJSONObject("data");
+        startedAt = ISO8601DateFormat.format(rd.getExecutionStartDate());
+        String endedAt = ISO8601DateFormat.format(rd.getExecutionEndDate());
+        
+        assertEquals("Test3", json.get("name"));
+        assertEquals("3rd Testing", json.get("description"));
+        assertEquals("Failed", json.get("status"));
+        assertEquals(startedAt, json.getJSONObject("startedAt").get("iso8601"));
+        assertEquals(endedAt, json.getJSONObject("endedAt").get("iso8601"));
+        assertEquals("Test Failure", json.get("failureMessage"));
+        assertEquals(JSONObject.NULL, json.get("executionDetails"));
+        assertEquals(repositoryHelper.getRootHome().toString(), json.get("transferLocalReport"));
+        assertEquals(repositoryHelper.getCompanyHome().toString(), json.get("transferRemoteReport"));
+        assertEquals(false, json.get("enabled"));
+        assertEquals(JSONObject.NULL, json.get("targetName"));
+        assertEquals(0, json.getJSONArray("payload").length());
+        
+        
+        // When pending/running, the previous end time, transfer reports and
+        //  failure details are hidden
+        rd = replicationService.loadReplicationDefinition("Test3");
+        assertEquals(0, actionTrackingService.getExecutingActions(rd).size());
+        actionTrackingService.recordActionPending(rd);
+        assertEquals(1, actionTrackingService.getExecutingActions(rd).size());
+        instanceId = ((ActionImpl)rd).getExecutionInstance();
+        actionId = rd.getId();
+        
+        response = sendRequest(new GetRequest(URL_DEFINITION + "Test3"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr).getJSONObject("data");
+        
+        assertEquals("Test3", json.get("name"));
+        assertEquals("3rd Testing", json.get("description"));
+        assertEquals("Pending", json.get("status"));
+        assertEquals(JSONObject.NULL, json.get("startedAt"));
+        assertEquals(JSONObject.NULL, json.get("endedAt"));
+        assertEquals(JSONObject.NULL, json.get("failureMessage"));
+        assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor="+
+              actionId + "=" + instanceId, json.get("executionDetails"));
+        assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+        assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+        assertEquals(false, json.get("enabled"));
+        assertEquals(JSONObject.NULL, json.get("targetName"));
+        assertEquals(0, json.getJSONArray("payload").length());
+        
+        
+        actionTrackingService.recordActionExecuting(rd);
+        response = sendRequest(new GetRequest(URL_DEFINITION + "Test3"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr).getJSONObject("data");
+        startedAt = ISO8601DateFormat.format(rd.getExecutionStartDate());
+        
+        assertEquals("Test3", json.get("name"));
+        assertEquals("3rd Testing", json.get("description"));
+        assertEquals("Running", json.get("status"));
+        assertEquals(startedAt, json.getJSONObject("startedAt").get("iso8601"));
+        assertEquals(JSONObject.NULL, json.get("endedAt"));
+        assertEquals(JSONObject.NULL, json.get("failureMessage"));
+        assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor="+
+              actionId + "=" + instanceId, json.get("executionDetails"));
+        assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+        assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+        assertEquals(false, json.get("enabled"));
+        assertEquals(JSONObject.NULL, json.get("targetName"));
+        assertEquals(0, json.getJSONArray("payload").length());
+        
+        
+        actionTrackingService.requestActionCancellation(rd);
+        response = sendRequest(new GetRequest(URL_DEFINITION + "Test3"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr).getJSONObject("data");
+        startedAt = ISO8601DateFormat.format(rd.getExecutionStartDate());
+        
+        assertEquals("Test3", json.get("name"));
+        assertEquals("3rd Testing", json.get("description"));
+        assertEquals("CancelRequested", json.get("status"));
+        assertEquals(startedAt, json.getJSONObject("startedAt").get("iso8601"));
+        assertEquals(JSONObject.NULL, json.get("endedAt"));
+        assertEquals(JSONObject.NULL, json.get("failureMessage"));
+        assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor="+
+              actionId + "=" + instanceId, json.get("executionDetails"));
+        assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+        assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+        assertEquals(false, json.get("enabled"));
+        assertEquals(JSONObject.NULL, json.get("targetName"));
+        assertEquals(0, json.getJSONArray("payload").length());
+
+        
+        // These show up again when no longer running
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+        actionTrackingService.recordActionComplete(rd);
+        txn.commit();
+        response = sendRequest(new GetRequest(URL_DEFINITION + "Test3"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr).getJSONObject("data");
+        startedAt = ISO8601DateFormat.format(rd.getExecutionStartDate());
+        endedAt = ISO8601DateFormat.format(rd.getExecutionEndDate());
+        
+        assertEquals("Test3", json.get("name"));
+        assertEquals("3rd Testing", json.get("description"));
+        assertEquals("Completed", json.get("status"));
+        assertEquals(startedAt, json.getJSONObject("startedAt").get("iso8601"));
+        assertEquals(endedAt, json.getJSONObject("endedAt").get("iso8601"));
+        assertEquals(JSONObject.NULL, json.get("failureMessage"));
+        assertEquals(JSONObject.NULL, json.get("executionDetails"));
+        assertEquals(repositoryHelper.getRootHome().toString(), json.get("transferLocalReport"));
+        assertEquals(repositoryHelper.getCompanyHome().toString(), json.get("transferRemoteReport"));
+        assertEquals(false, json.get("enabled"));
+        assertEquals(JSONObject.NULL, json.get("targetName"));
+        assertEquals(0, json.getJSONArray("payload").length());
+    }
+    
+    public void testReplicationDefinitionsPost() throws Exception
+    {
+       Response response;
+       
+       
+       // Not allowed if you're not an admin
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getGuestUserName());
+       response = sendRequest(new PostRequest(URL_DEFINITIONS, "", JSON), Status.STATUS_UNAUTHORIZED);
+       assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+       
+       AuthenticationUtil.setFullyAuthenticatedUser(USER_NORMAL);
+       response = sendRequest(new PostRequest(URL_DEFINITIONS, "", JSON), Status.STATUS_UNAUTHORIZED);
+       assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+
+       
+       // Ensure there aren't any to start with
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+       assertEquals(0, replicationService.loadReplicationDefinitions().size());
+
+       
+       // If you don't give it name + description, it won't like you
+       JSONObject json = new JSONObject();
+       response = sendRequest(new PostRequest(URL_DEFINITIONS, json.toString(), JSON), Status.STATUS_BAD_REQUEST);
+       assertEquals(Status.STATUS_BAD_REQUEST, response.getStatus());
+       
+       json.put("name", "New Definition");
+       response = sendRequest(new PostRequest(URL_DEFINITIONS, json.toString(), JSON), Status.STATUS_BAD_REQUEST);
+       assertEquals(Status.STATUS_BAD_REQUEST, response.getStatus());
+       
+       
+       // If it has both, it'll work
+       json.put("description", "Testing");
+       response = sendRequest(new PostRequest(URL_DEFINITIONS, json.toString(), JSON), Status.STATUS_OK);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       
+       // Check we got the right information back
+       String jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr).getJSONObject("data");
+       assertNotNull(json);
+       
+       assertEquals("New Definition", json.get("name"));
+       assertEquals("Testing", json.get("description"));
+       assertEquals("New", json.get("status"));
+       assertEquals(JSONObject.NULL, json.get("startedAt"));
+       assertEquals(JSONObject.NULL, json.get("endedAt"));
+       assertEquals(JSONObject.NULL, json.get("failureMessage"));
+       assertEquals(JSONObject.NULL, json.get("executionDetails"));
+       assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+       assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+       assertEquals(true, json.get("enabled"));
+       assertEquals(JSONObject.NULL, json.get("targetName"));
+       assertEquals(0, json.getJSONArray("payload").length());
+       
+     
+       // Check that the right stuff ended up in the repository
+       ReplicationDefinition rd = replicationService.loadReplicationDefinition("New Definition");
+       assertEquals("New Definition", rd.getReplicationName());
+       assertEquals("Testing", rd.getDescription());
+       assertEquals(ActionStatus.New, rd.getExecutionStatus());
+       assertEquals(null, rd.getExecutionStartDate());
+       assertEquals(null, rd.getExecutionEndDate());
+       assertEquals(null, rd.getExecutionFailureMessage());
+       assertEquals(null, rd.getLocalTransferReport());
+       assertEquals(null, rd.getRemoteTransferReport());
+       assertEquals(null, rd.getTargetName());
+       assertEquals(0, rd.getPayload().size());
+       assertEquals(true, rd.isEnabled());
+       
+       
+       // Post with the full set of options
+       json = new JSONObject();
+       json.put("name", "Test");
+       json.put("description", "Test Description");
+       json.put("targetName", "Target");
+       json.put("enabled", false);
+       JSONArray payloadRefs = new JSONArray();
+       payloadRefs.put(repositoryHelper.getCompanyHome().toString());
+       payloadRefs.put(dataDictionary.toString());
+       json.put("payload", payloadRefs);
+       
+       response = sendRequest(new PostRequest(URL_DEFINITIONS, json.toString(), JSON), Status.STATUS_OK);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       
+       // Check the response for this
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr).getJSONObject("data");
+       assertNotNull(json);
+       
+       assertEquals("Test", json.get("name"));
+       assertEquals("Test Description", json.get("description"));
+       assertEquals("New", json.get("status"));
+       assertEquals(JSONObject.NULL, json.get("startedAt"));
+       assertEquals(JSONObject.NULL, json.get("endedAt"));
+       assertEquals(JSONObject.NULL, json.get("failureMessage"));
+       assertEquals(JSONObject.NULL, json.get("executionDetails"));
+       assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+       assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+       assertEquals(false, json.get("enabled"));
+       assertEquals("Target", json.get("targetName"));
+       assertEquals(2, json.getJSONArray("payload").length());
+       
+       JSONObject payload = json.getJSONArray("payload").getJSONObject(0);
+       assertEquals(repositoryHelper.getCompanyHome().toString(), payload.get("nodeRef"));
+       assertEquals(true, payload.get("isFolder"));
+       assertEquals("Company Home", payload.get("name"));
+       assertEquals("/Company Home", payload.get("path"));
+
+       payload = json.getJSONArray("payload").getJSONObject(1);
+       assertEquals(dataDictionary.toString(), payload.get("nodeRef"));
+       assertEquals(true, payload.get("isFolder"));
+       assertEquals("Data Dictionary", payload.get("name"));
+       assertEquals("/Company Home/Data Dictionary", payload.get("path"));
+       
+       
+       // Check the database for this
+       rd = replicationService.loadReplicationDefinition("Test");
+       assertEquals("Test", rd.getReplicationName());
+       assertEquals("Test Description", rd.getDescription());
+       assertEquals(ActionStatus.New, rd.getExecutionStatus());
+       assertEquals(null, rd.getExecutionStartDate());
+       assertEquals(null, rd.getExecutionEndDate());
+       assertEquals(null, rd.getExecutionFailureMessage());
+       assertEquals(null, rd.getLocalTransferReport());
+       assertEquals(null, rd.getRemoteTransferReport());
+       assertEquals("Target", rd.getTargetName());
+       assertEquals(false, rd.isEnabled());       
+       assertEquals(2, rd.getPayload().size());
+       assertEquals(repositoryHelper.getCompanyHome(), rd.getPayload().get(0));
+       assertEquals(dataDictionary, rd.getPayload().get(1));
+
+       
+       // Ensure that the original one wasn't changed by anything
+       rd = replicationService.loadReplicationDefinition("New Definition");
+       assertEquals("New Definition", rd.getReplicationName());
+       assertEquals("Testing", rd.getDescription());
+       assertEquals(ActionStatus.New, rd.getExecutionStatus());
+       assertEquals(null, rd.getExecutionStartDate());
+       assertEquals(null, rd.getExecutionEndDate());
+       assertEquals(null, rd.getExecutionFailureMessage());
+       assertEquals(null, rd.getLocalTransferReport());
+       assertEquals(null, rd.getRemoteTransferReport());
+       assertEquals(null, rd.getTargetName());
+       assertEquals(0, rd.getPayload().size());
+       assertEquals(true, rd.isEnabled());
+       
+       
+       // Ensure we can't create with a duplicate name
+       json = new JSONObject();
+       json.put("name", "Test");
+       json.put("description", "New Duplicate");
+       json.put("targetName", "New Duplicate Target");
+       
+       response = sendRequest(new PostRequest(URL_DEFINITIONS, json.toString(), JSON), Status.STATUS_BAD_REQUEST);
+       assertEquals(Status.STATUS_BAD_REQUEST, response.getStatus());
+       
+       // Ensure that even though we got BAD REQUEST back, nothing changed
+       rd = replicationService.loadReplicationDefinition("New Definition");
+       assertEquals("New Definition", rd.getReplicationName());
+       assertEquals("Testing", rd.getDescription());
+       assertEquals(ActionStatus.New, rd.getExecutionStatus());
+       assertEquals(null, rd.getExecutionStartDate());
+       assertEquals(null, rd.getExecutionEndDate());
+       assertEquals(null, rd.getExecutionFailureMessage());
+       assertEquals(null, rd.getLocalTransferReport());
+       assertEquals(null, rd.getRemoteTransferReport());
+       assertEquals(null, rd.getTargetName());
+       assertEquals(0, rd.getPayload().size());
+       assertEquals(true, rd.isEnabled());
+    }
+    
+    public void testReplicationDefinitionPut() throws Exception
+    {
+       Response response;
+       
+       
+       // Not allowed if you're not an admin
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getGuestUserName());
+       response = sendRequest(new PutRequest(URL_DEFINITION + "MadeUp", "", JSON), Status.STATUS_UNAUTHORIZED);
+       assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+       
+       AuthenticationUtil.setFullyAuthenticatedUser(USER_NORMAL);
+       response = sendRequest(new PutRequest(URL_DEFINITION + "MadeUp", "", JSON), Status.STATUS_UNAUTHORIZED);
+       assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+
+       
+       // Ensure there aren't any to start with
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+       assertEquals(0, replicationService.loadReplicationDefinitions().size());
+       
+       
+       // You need to specify a real definition
+       response = sendRequest(new PutRequest(URL_DEFINITION + "MadeUp", "", JSON), Status.STATUS_NOT_FOUND);
+       assertEquals(Status.STATUS_NOT_FOUND, response.getStatus());
+       
+       
+       // Create one, and change it
+       ReplicationDefinition rd = replicationService.createReplicationDefinition("Test", "Testing");
+       replicationService.saveReplicationDefinition(rd);
+       
+       response = sendRequest(new PutRequest(URL_DEFINITION + "Test", "{}", JSON), Status.STATUS_OK);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       
+       // Check we got the right information back on it
+       String jsonStr = response.getContentAsString();
+       JSONObject json = new JSONObject(jsonStr).getJSONObject("data");
+       assertNotNull(json);
+       
+       assertEquals("Test", json.get("name"));
+       assertEquals("Testing", json.get("description"));
+       assertEquals("New", json.get("status"));
+       assertEquals(JSONObject.NULL, json.get("startedAt"));
+       assertEquals(JSONObject.NULL, json.get("endedAt"));
+       assertEquals(JSONObject.NULL, json.get("failureMessage"));
+       assertEquals(JSONObject.NULL, json.get("executionDetails"));
+       assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+       assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+       assertEquals(true, json.get("enabled"));
+       assertEquals(JSONObject.NULL, json.get("targetName"));
+       assertEquals(0, json.getJSONArray("payload").length());
+       
+       
+       // Ensure we didn't get any unexpected data back
+       JSONArray keys = json.names();
+       for(int i=0; i<keys.length(); i++) {
+          String key = keys.getString(0);
+          if(key.equals("name") || key.equals("description") || 
+              key.equals("status") || key.equals("startedAt") ||
+              key.equals("endedAt") || key.equals("failureMessage") ||
+              key.equals("executionDetails") || key.equals("payload") ||
+              key.equals("transferLocalReport") ||
+              key.equals("transferRemoteReport") ||
+              key.equals("enabled") || key.equals("targetName") || key.equals("schedule")) {
+             // All good
+          } else {
+             fail("Unexpected key '"+key+"' found in json, raw json is\n" + jsonStr);
+          }
+       }
+       
+       
+       
+       // Change some details, and see them updated in both
+       //  the JSON and on the object in the repo
+       json = new JSONObject();
+       json.put("description", "Updated Description");
+       json.put("enabled", false);
+       response = sendRequest(new PutRequest(URL_DEFINITION + "Test", json.toString(), JSON), Status.STATUS_OK);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr).getJSONObject("data");
+       assertNotNull(json);
+       
+       assertEquals("Test", json.get("name"));
+       assertEquals("Updated Description", json.get("description"));
+       assertEquals("New", json.get("status"));
+       assertEquals(JSONObject.NULL, json.get("startedAt"));
+       assertEquals(JSONObject.NULL, json.get("endedAt"));
+       assertEquals(JSONObject.NULL, json.get("failureMessage"));
+       assertEquals(JSONObject.NULL, json.get("executionDetails"));
+       assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+       assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+       assertEquals(false, json.get("enabled"));
+       assertEquals(JSONObject.NULL, json.get("targetName"));
+       assertEquals(0, json.getJSONArray("payload").length());
+       
+       rd = replicationService.loadReplicationDefinition("Test");
+       assertEquals("Test", rd.getReplicationName());
+       assertEquals("Updated Description", rd.getDescription());
+       assertEquals(ActionStatus.New, rd.getExecutionStatus());
+       assertEquals(null, rd.getExecutionStartDate());
+       assertEquals(null, rd.getExecutionEndDate());
+       assertEquals(null, rd.getExecutionFailureMessage());
+       assertEquals(null, rd.getLocalTransferReport());
+       assertEquals(null, rd.getRemoteTransferReport());
+       assertEquals(null, rd.getTargetName());
+       assertEquals(0, rd.getPayload().size());
+       assertEquals(false, rd.isEnabled());
+       
+       
+       
+       // Create a 2nd definition, and check that the correct
+       //  one gets updated
+       rd = replicationService.createReplicationDefinition("Test2", "Testing2");
+       rd.setTargetName("Target");
+       replicationService.saveReplicationDefinition(rd);
+       
+       json = new JSONObject();
+       json.put("description", "Updated Description 2");
+       json.put("enabled", false);
+       response = sendRequest(new PutRequest(URL_DEFINITION + "Test2", json.toString(), JSON), Status.STATUS_OK);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       // Check the response we got
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr).getJSONObject("data");
+       assertNotNull(json);
+       
+       assertEquals("Test2", json.get("name"));
+       assertEquals("Updated Description 2", json.get("description"));
+       assertEquals("New", json.get("status"));
+       assertEquals(JSONObject.NULL, json.get("startedAt"));
+       assertEquals(JSONObject.NULL, json.get("endedAt"));
+       assertEquals(JSONObject.NULL, json.get("failureMessage"));
+       assertEquals(JSONObject.NULL, json.get("executionDetails"));
+       assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+       assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+       assertEquals(false, json.get("enabled"));
+       assertEquals("Target", json.get("targetName"));
+       assertEquals(0, json.getJSONArray("payload").length());
+       
+       // Check the 1st definition
+       rd = replicationService.loadReplicationDefinition("Test");
+       assertEquals("Test", rd.getReplicationName());
+       assertEquals("Updated Description", rd.getDescription());
+       assertEquals(ActionStatus.New, rd.getExecutionStatus());
+       assertEquals(null, rd.getExecutionStartDate());
+       assertEquals(null, rd.getExecutionEndDate());
+       assertEquals(null, rd.getExecutionFailureMessage());
+       assertEquals(null, rd.getLocalTransferReport());
+       assertEquals(null, rd.getRemoteTransferReport());
+       assertEquals(null, rd.getTargetName());
+       assertEquals(0, rd.getPayload().size());
+       assertEquals(false, rd.isEnabled());
+       
+       // Check the 2nd definition
+       rd = replicationService.loadReplicationDefinition("Test2");
+       assertEquals("Test2", rd.getReplicationName());
+       assertEquals("Updated Description 2", rd.getDescription());
+       assertEquals(ActionStatus.New, rd.getExecutionStatus());
+       assertEquals(null, rd.getExecutionStartDate());
+       assertEquals(null, rd.getExecutionEndDate());
+       assertEquals(null, rd.getExecutionFailureMessage());
+       assertEquals(null, rd.getLocalTransferReport());
+       assertEquals(null, rd.getRemoteTransferReport());
+       assertEquals("Target", rd.getTargetName());
+       assertEquals(0, rd.getPayload().size());
+       assertEquals(false, rd.isEnabled());
+       
+       
+       // Mark it as running, then change some details and
+       //  see it change as expected
+       rd = replicationService.loadReplicationDefinition("Test");
+       actionTrackingService.recordActionExecuting(rd);
+       replicationService.saveReplicationDefinition(rd);
+       String startedAt = ISO8601DateFormat.format(rd.getExecutionStartDate());
+       String actionId = rd.getId();
+       int instanceId = ((ActionImpl)rd).getExecutionInstance();
+       
+       json = new JSONObject();
+       json.put("enabled", true);
+       json.put("targetName", "Another Target");
+       response = sendRequest(new PutRequest(URL_DEFINITION + "Test", json.toString(), JSON), Status.STATUS_OK);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr).getJSONObject("data");
+       assertNotNull(json);
+       
+       assertEquals("Test", json.get("name"));
+       assertEquals("Updated Description", json.get("description"));
+       assertEquals("Running", json.get("status"));
+       assertEquals(startedAt, json.getJSONObject("startedAt").get("iso8601"));
+       assertEquals(JSONObject.NULL, json.get("endedAt"));
+       assertEquals(JSONObject.NULL, json.get("failureMessage"));
+       assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor="+
+             actionId + "=" + instanceId, json.get("executionDetails"));
+       assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+       assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+       assertEquals(true, json.get("enabled"));
+       assertEquals("Another Target", json.get("targetName"));
+       assertEquals(0, json.getJSONArray("payload").length());
+
+       
+       // Change the payload, and see the right information in
+       //  the response JSON for it
+       JSONArray payloadRefs = new JSONArray();
+       payloadRefs.put(repositoryHelper.getCompanyHome().toString());
+       payloadRefs.put(dataDictionary.toString());
+       json = new JSONObject();
+       json.put("payload", payloadRefs);
+       
+       response = sendRequest(new PutRequest(URL_DEFINITION + "Test", json.toString(), JSON), Status.STATUS_OK);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr).getJSONObject("data");
+       assertNotNull(json);
+       
+       assertEquals("Test", json.get("name"));
+       assertEquals("Updated Description", json.get("description"));
+       assertEquals("Running", json.get("status"));
+       assertEquals(startedAt, json.getJSONObject("startedAt").get("iso8601"));
+       assertEquals(JSONObject.NULL, json.get("endedAt"));
+       assertEquals(JSONObject.NULL, json.get("failureMessage"));
+       assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor="+
+             actionId + "=" + instanceId, json.get("executionDetails"));
+       assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+       assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+       assertEquals(true, json.get("enabled"));
+       assertEquals("Another Target", json.get("targetName"));
+       assertEquals(2, json.getJSONArray("payload").length());
+       
+       JSONObject payload = json.getJSONArray("payload").getJSONObject(0);
+       assertEquals(repositoryHelper.getCompanyHome().toString(), payload.get("nodeRef"));
+       assertEquals(true, payload.get("isFolder"));
+       assertEquals("Company Home", payload.get("name"));
+       assertEquals("/Company Home", payload.get("path"));
+
+       payload = json.getJSONArray("payload").getJSONObject(1);
+       assertEquals(dataDictionary.toString(), payload.get("nodeRef"));
+       assertEquals(true, payload.get("isFolder"));
+       assertEquals("Data Dictionary", payload.get("name"));
+       assertEquals("/Company Home/Data Dictionary", payload.get("path"));
+       
+       
+       // Remove the payload again
+       json = new JSONObject();
+       payloadRefs = new JSONArray();
+       json.put("payload", payloadRefs);
+       
+       response = sendRequest(new PutRequest(URL_DEFINITION + "Test", json.toString(), JSON), Status.STATUS_OK);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr).getJSONObject("data");
+       assertNotNull(json);
+       
+       assertEquals("Test", json.get("name"));
+       assertEquals("Updated Description", json.get("description"));
+       assertEquals("Running", json.get("status"));
+       assertEquals(startedAt, json.getJSONObject("startedAt").get("iso8601"));
+       assertEquals(JSONObject.NULL, json.get("endedAt"));
+       assertEquals(JSONObject.NULL, json.get("failureMessage"));
+       assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor="+
+             actionId + "=" + instanceId, json.get("executionDetails"));
+       assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+       assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+       assertEquals(true, json.get("enabled"));
+       assertEquals("Another Target", json.get("targetName"));
+       assertEquals(0, json.getJSONArray("payload").length());
+
+       
+       // Rename to a taken name, won't be allowed
+       json = new JSONObject();
+       json.put("name", "Test2");
+       response = sendRequest(new PutRequest(URL_DEFINITION + "Test", json.toString(), JSON), Status.STATUS_BAD_REQUEST);
+       assertEquals(Status.STATUS_BAD_REQUEST, response.getStatus());
+       
+       
+       // Rename to a spare name, will be updated
+       json = new JSONObject();
+       json.put("name", "Renamed");
+       
+       response = sendRequest(new PutRequest(URL_DEFINITION + "Test", json.toString(), JSON), Status.STATUS_OK);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr).getJSONObject("data");
+       assertNotNull(json);
+       
+       assertEquals("Renamed", json.get("name"));
+       assertEquals("Updated Description", json.get("description"));
+       assertEquals("Running", json.get("status"));
+       assertEquals(startedAt, json.getJSONObject("startedAt").get("iso8601"));
+       assertEquals(JSONObject.NULL, json.get("endedAt"));
+       assertEquals(JSONObject.NULL, json.get("failureMessage"));
+       assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor="+
+             actionId + "=" + instanceId, json.get("executionDetails"));
+       assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+       assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+       assertEquals(true, json.get("enabled"));
+       assertEquals("Another Target", json.get("targetName"));
+       assertEquals(0, json.getJSONArray("payload").length());
+       
+       // Check the repo too
+       assertEquals(null, replicationService.loadReplicationDefinition("Test"));
+       assertNotNull(replicationService.loadReplicationDefinition("Renamed"));
+
+       
+       // Rename can both rename + change details
+       json = new JSONObject();
+       json.put("name", "Renamed Again");
+       json.put("description", "Was Renamed");
+       json.put("targetName", "New Target");
+       
+       response = sendRequest(new PutRequest(URL_DEFINITION + "Renamed", json.toString(), JSON), Status.STATUS_OK);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr).getJSONObject("data");
+       assertNotNull(json);
+       
+       assertEquals("Renamed Again", json.get("name"));
+       assertEquals("Was Renamed", json.get("description"));
+       assertEquals("Running", json.get("status"));
+       assertEquals(startedAt, json.getJSONObject("startedAt").get("iso8601"));
+       assertEquals(JSONObject.NULL, json.get("endedAt"));
+       assertEquals(JSONObject.NULL, json.get("failureMessage"));
+       assertEquals("/" + URL_RUNNING_ACTION + "replicationActionExecutor="+
+             actionId + "=" + instanceId, json.get("executionDetails"));
+       assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+       assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+       assertEquals(true, json.get("enabled"));
+       assertEquals("New Target", json.get("targetName"));
+       assertEquals(0, json.getJSONArray("payload").length());
+    }
+    
+    public void testReplicationDefinitionDelete() throws Exception 
+    {
+       Response response;
+       
+       
+       // Not allowed if you're not an admin
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getGuestUserName());
+       response = sendRequest(new DeleteRequest(URL_DEFINITION + "MadeUp"), Status.STATUS_UNAUTHORIZED);
+       assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+       
+       AuthenticationUtil.setFullyAuthenticatedUser(USER_NORMAL);
+       response = sendRequest(new DeleteRequest(URL_DEFINITION + "MadeUp"), Status.STATUS_UNAUTHORIZED);
+       assertEquals(Status.STATUS_UNAUTHORIZED, response.getStatus());
+
+       
+       // Ensure there aren't any to start with
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+       assertEquals(0, replicationService.loadReplicationDefinitions().size());
+       
+       
+       // You need to specify a real definition
+       response = sendRequest(new DeleteRequest(URL_DEFINITION + "MadeUp"), Status.STATUS_NOT_FOUND);
+       assertEquals(Status.STATUS_NOT_FOUND, response.getStatus());
+       
+       
+       // Create one, and then delete it
+       ReplicationDefinition rd = replicationService.createReplicationDefinition("Test", "Testing");
+       replicationService.saveReplicationDefinition(rd);
+       assertEquals(1, replicationService.loadReplicationDefinitions().size());
+       
+       // Because some of the delete operations happen post-commit, and
+       //  because we don't have real transactions, fake it
+       UserTransaction txn = transactionService.getUserTransaction();
+       txn.begin();
+       
+       // Call the delete webscript
+       response = sendRequest(new DeleteRequest(URL_DEFINITION + "Test"), Status.STATUS_NO_CONTENT);
+       assertEquals(Status.STATUS_NO_CONTENT, response.getStatus());
+       
+       // Let the node service do its work
+       txn.commit();
+       Thread.sleep(50);
+       
+       
+       // Check the details webscript to ensure it went
+       response = sendRequest(new GetRequest(URL_DEFINITION + "Test"), Status.STATUS_NOT_FOUND);
+       assertEquals(Status.STATUS_NOT_FOUND, response.getStatus());
+       
+       
+       // Check the replication service to ensure it went
+       assertNull(replicationService.loadReplicationDefinition("Test"));
+       assertEquals(0, replicationService.loadReplicationDefinitions().size());
+       
+       
+       // If there are several, make sure the right one goes
+       rd = replicationService.createReplicationDefinition("Test", "Testing");
+       replicationService.saveReplicationDefinition(rd);
+       rd = replicationService.createReplicationDefinition("Test 2", "Testing");
+       replicationService.saveReplicationDefinition(rd);
+       rd = replicationService.createReplicationDefinition("Test 3", "Testing");
+       replicationService.saveReplicationDefinition(rd);
+       
+       // Delete one of three, correct one goes
+       assertEquals(3, replicationService.loadReplicationDefinitions().size());
+       
+       txn = transactionService.getUserTransaction();
+       txn.begin();
+       
+       response = sendRequest(new DeleteRequest(URL_DEFINITION + "Test"), Status.STATUS_NO_CONTENT);
+       assertEquals(Status.STATUS_NO_CONTENT, response.getStatus());
+       
+       txn.commit();
+       Thread.sleep(50);
+       
+       assertEquals(2, replicationService.loadReplicationDefinitions().size());
+       assertNull(replicationService.loadReplicationDefinition("Test"));
+       assertNotNull(replicationService.loadReplicationDefinition("Test 2"));
+       assertNotNull(replicationService.loadReplicationDefinition("Test 3"));
+       
+       // Delete the next one, correct one goes
+       txn = transactionService.getUserTransaction();
+       txn.begin();
+       
+       response = sendRequest(new DeleteRequest(URL_DEFINITION + "Test 3"), Status.STATUS_NO_CONTENT);
+       assertEquals(Status.STATUS_NO_CONTENT, response.getStatus());
+       
+       txn.commit();
+       Thread.sleep(50);
+       
+       assertEquals(1, replicationService.loadReplicationDefinitions().size());
+       assertNull(replicationService.loadReplicationDefinition("Test"));
+       assertNotNull(replicationService.loadReplicationDefinition("Test 2"));
+       assertNull(replicationService.loadReplicationDefinition("Test 3"));
+       
+       
+       // Ensure you can't delete for a 2nd time
+       txn = transactionService.getUserTransaction();
+       txn.begin();
+       
+       response = sendRequest(new DeleteRequest(URL_DEFINITION + "Test 3"), Status.STATUS_NOT_FOUND);
+       assertEquals(Status.STATUS_NOT_FOUND, response.getStatus());
+       
+       txn.commit();
+       Thread.sleep(50);
+       
+       assertEquals(1, replicationService.loadReplicationDefinitions().size());
+       assertNull(replicationService.loadReplicationDefinition("Test"));
+       assertNotNull(replicationService.loadReplicationDefinition("Test 2"));
+       assertNull(replicationService.loadReplicationDefinition("Test 3"));
+    }
+    
+    /**
+     * Test that when creating and working with replication
+     *  definitions with a name that includes "nasty"
+     *  characters, things still work.
+     * Related to ALF-4610.
+     */
+    public void testReplicationDefinitionsNastyNames() throws Exception
+    {
+       AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+       Response response;
+       String jsonStr;
+       
+       String nastyName = "~!@#$%^&()_+-={}[];";
+       String nastyNameURL = URLEncoder.encodeUriComponent(nastyName);
+       
+       
+       // Create
+       JSONObject json = new JSONObject();
+       json.put("name", nastyName);
+       json.put("description", "Nasty Characters");
+       response = sendRequest(new PostRequest(URL_DEFINITIONS, json.toString(), JSON), Status.STATUS_OK);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr).getJSONObject("data");
+       assertNotNull(json);
+       
+       assertEquals(nastyName, json.get("name"));
+       assertEquals("Nasty Characters", json.get("description"));
+       assertEquals("New", json.get("status"));
+       assertEquals(JSONObject.NULL, json.get("startedAt"));
+       assertEquals(JSONObject.NULL, json.get("endedAt"));
+       assertEquals(JSONObject.NULL, json.get("failureMessage"));
+       assertEquals(JSONObject.NULL, json.get("executionDetails"));
+       assertEquals(JSONObject.NULL, json.get("transferLocalReport"));
+       assertEquals(JSONObject.NULL, json.get("transferRemoteReport"));
+       assertEquals(true, json.get("enabled"));
+       assertEquals(JSONObject.NULL, json.get("targetName"));
+       assertEquals(0, json.getJSONArray("payload").length());
+       
+       
+       // Check it turned up
+       assertEquals(1, replicationService.loadReplicationDefinitions().size());
+       assertEquals(nastyName, replicationService.loadReplicationDefinitions().get(0).getReplicationName());
+       
+       
+       // Fetch the details
+       response = sendRequest(new GetRequest(URL_DEFINITION + nastyNameURL), 200);
+       assertEquals(Status.STATUS_OK, response.getStatus());
+       
+       jsonStr = response.getContentAsString();
+       json = new JSONObject(jsonStr).getJSONObject("data");
+       assertNotNull(json);
+       
+       assertEquals(nastyName, json.get("name"));
+       assertEquals("Nasty Characters", json.get("description"));
+       assertEquals("New", json.get("status"));
+       
+       
+       // Delete
+       // Because some of the delete operations happen post-commit, and
+       //  because we don't have real transactions, fake it
+       UserTransaction txn = transactionService.getUserTransaction();
+       txn.begin();
+       
+       // Call the delete webscript
+       response = sendRequest(new DeleteRequest(URL_DEFINITION + nastyNameURL), Status.STATUS_NO_CONTENT);
+       assertEquals(Status.STATUS_NO_CONTENT, response.getStatus());
+       
+       // Let the node service do its work
+       txn.commit();
+       Thread.sleep(50);
+       
+       // Check the details webscript to ensure it went
+       response = sendRequest(new GetRequest(URL_DEFINITION + nastyNameURL), Status.STATUS_NOT_FOUND);
+       assertEquals(Status.STATUS_NOT_FOUND, response.getStatus());
+       
+       // And check the service too
+       assertEquals(0, replicationService.loadReplicationDefinitions().size());
+    }
+    
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        ApplicationContext appContext = getServer().getApplicationContext();
+
+        nodeService = (NodeService)appContext.getBean("NodeService");
+        replicationService = (ReplicationService)appContext.getBean("ReplicationService");
+        actionTrackingService = (ActionTrackingService)appContext.getBean("actionTrackingService");
+        repositoryHelper = (Repository)appContext.getBean("repositoryHelper");
+        transactionService = (TransactionService)appContext.getBean("transactionService");
+        
+        MutableAuthenticationService authenticationService = (MutableAuthenticationService)appContext.getBean("AuthenticationService");
+        PersonService personService = (PersonService)appContext.getBean("PersonService");
+        personManager = new TestPersonManager(authenticationService, personService, nodeService);
+
+        UserTransaction txn = transactionService.getUserTransaction();
+        txn.begin();
+        
+        personManager.createPerson(USER_NORMAL);
+        
+        // Ensure we start with no replication definitions
+        // (eg another test left them behind)
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        for(ReplicationDefinition rd : replicationService.loadReplicationDefinitions()) {
+           replicationService.deleteReplicationDefinition(rd);
+        }
+        txn.commit();
+        
+        // Grab a reference to the data dictionary
+        dataDictionary = nodeService.getChildByName(
+                 repositoryHelper.getCompanyHome(),
+                 ContentModel.ASSOC_CONTAINS,
+                 "Data Dictionary"
+        );
+        
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+    
+    /* (non-Javadoc)
+     * @see junit.framework.TestCase#tearDown()
+     */
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        
+        UserTransaction txn = transactionService.getUserTransaction();
+        txn.begin();
+        
+        personManager.clearPeople();
+        
+        // Zap any replication definitions we created
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        for(ReplicationDefinition rd : replicationService.loadReplicationDefinitions()) {
+           replicationService.deleteReplicationDefinition(rd);
+        }
+        AuthenticationUtil.clearCurrentSecurityContext();
+        
+        txn.commit();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/rule/RuleServiceTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/rule/RuleServiceTest.java
new file mode 100644
index 00000000000..6f3979621ce
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/rule/RuleServiceTest.java
@@ -0,0 +1,858 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.rule;
+
+import java.text.MessageFormat;
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.rule.LinkRules;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.action.ParameterConstraint;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.rule.Rule;
+import org.alfresco.service.cmr.rule.RuleService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Unit test to test rules Web Script API
+ * 
+ * @author Roy Wetherall
+ *
+ */
+public class RuleServiceTest extends BaseWebScriptTest
+{
+
+    private static final String URL_RULETYPES = "/api/ruletypes";
+    private static final String URL_ACTIONDEFINITIONS = "/api/actiondefinitions";
+    private static final String URL_ACTIONCONDITIONDEFINITIONS = "/api/actionconditiondefinitions";
+
+    private static final String URL_ACTIONCONSTRAINTS = "/api/actionConstraints";
+    private static final String URL_ACTIONCONSTRAINT = "/api/actionConstraints/{0}";
+
+    private static final String URL_QUEUE_ACTION = "/api/actionQueue?async={0}";
+
+    private static final String URL_RULES = "/api/node/{0}/{1}/{2}/ruleset/rules";
+    private static final String URL_INHERITED_RULES = "/api/node/{0}/{1}/{2}/ruleset/inheritedrules";
+    private static final String URL_RULESET = "/api/node/{0}/{1}/{2}/ruleset";
+    private static final String URL_RULE = "/api/node/{0}/{1}/{2}/ruleset/rules/{3}";
+
+    private static final String TEST_STORE_IDENTIFIER = "test_store-" + System.currentTimeMillis();
+    private static final String TEST_FOLDER = "test_folder-" + System.currentTimeMillis();
+    private static final String TEST_FOLDER_2 = "test_folder-2-" + System.currentTimeMillis();
+
+    private TransactionService transactionService;
+    private NodeService nodeService;
+    private FileFolderService fileFolderService;
+    private AuthenticationComponent authenticationComponent;
+    private RuleService ruleService;
+    private ActionService actionService;
+
+    private NodeRef testNodeRef;
+    private NodeRef testNodeRef2;
+    private NodeRef testWorkNodeRef;
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        this.transactionService = (TransactionService) getServer().getApplicationContext().getBean("TransactionService");
+        this.nodeService = (NodeService) getServer().getApplicationContext().getBean("NodeService");
+        this.fileFolderService = (FileFolderService) getServer().getApplicationContext().getBean("FileFolderService");
+        this.ruleService = (RuleService) getServer().getApplicationContext().getBean("RuleService");
+        this.actionService = (ActionService) getServer().getApplicationContext().getBean("ActionService");
+        this.authenticationComponent = (AuthenticationComponent) getServer().getApplicationContext().getBean("authenticationComponent");
+
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+
+        createTestFolders();
+
+        assertNotNull(testWorkNodeRef);
+        assertNotNull(testNodeRef);
+        assertNotNull(testNodeRef2);
+    }
+
+    private void createTestFolders()
+    {
+        StoreRef testStore = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, TEST_STORE_IDENTIFIER);
+
+        if (!nodeService.exists(testStore))
+        {
+            testStore = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, TEST_STORE_IDENTIFIER);
+        }
+
+        NodeRef rootNodeRef = nodeService.getRootNode(testStore);
+
+        testWorkNodeRef = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{test}testnode"), ContentModel.TYPE_FOLDER).getChildRef();
+
+        testNodeRef = fileFolderService.create(testWorkNodeRef, TEST_FOLDER, ContentModel.TYPE_FOLDER).getNodeRef();
+        testNodeRef2 = fileFolderService.create(testWorkNodeRef, TEST_FOLDER_2, ContentModel.TYPE_FOLDER).getNodeRef();
+    }
+
+    private String formatRulesUrl(NodeRef nodeRef, boolean inherited)
+    {
+        if (inherited)
+        {
+            return MessageFormat.format(URL_INHERITED_RULES, nodeRef.getStoreRef().getProtocol(), nodeRef.getStoreRef().getIdentifier(), nodeRef.getId());
+        }
+        else
+        {
+            return MessageFormat.format(URL_RULES, nodeRef.getStoreRef().getProtocol(), nodeRef.getStoreRef().getIdentifier(), nodeRef.getId());
+        }
+    }
+
+    private String formatRulesetUrl(NodeRef nodeRef)
+    {
+        return MessageFormat.format(URL_RULESET, nodeRef.getStoreRef().getProtocol(), nodeRef.getStoreRef().getIdentifier(), nodeRef.getId());
+    }
+
+    private String formateRuleUrl(NodeRef nodeRef, String ruleId)
+    {
+        return MessageFormat.format(URL_RULE, nodeRef.getStoreRef().getProtocol(), nodeRef.getStoreRef().getIdentifier(), nodeRef.getId(), ruleId);
+    }
+
+    private String formateActionConstraintUrl(String name)
+    {
+        return MessageFormat.format(URL_ACTIONCONSTRAINT, name);
+    }
+
+    private String formateQueueActionUrl(boolean async)
+    {
+        return MessageFormat.format(URL_QUEUE_ACTION, async);
+    }
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        RetryingTransactionCallback<Void> deleteCallback = new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                deleteNodeIfExists(testNodeRef2);
+                deleteNodeIfExists(testNodeRef);
+                deleteNodeIfExists(testWorkNodeRef);
+                return null;
+            }
+            
+            private void deleteNodeIfExists(NodeRef nodeRef)
+            {
+                if (nodeService.exists(nodeRef))
+                {
+                    nodeService.deleteNode(nodeRef);
+                }
+            }
+        };
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(deleteCallback);
+        this.authenticationComponent.clearCurrentSecurityContext();
+    }
+
+    private JSONObject createRule(NodeRef ruleOwnerNodeRef) throws Exception
+    {
+        return createRule(ruleOwnerNodeRef, "test_rule");
+    }
+    
+    private JSONObject createRule(NodeRef ruleOwnerNodeRef, String title) throws Exception
+    {
+        JSONObject jsonRule = buildTestRule(title);
+
+        Response response = sendRequest(new PostRequest(formatRulesUrl(ruleOwnerNodeRef, false), jsonRule.toString(), "application/json"), 200);
+
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        return result;
+    }
+
+    private JSONArray getNodeRules(NodeRef nodeRef, boolean inherited) throws Exception
+    {
+        Response response = sendRequest(new GetRequest(formatRulesUrl(nodeRef, inherited)), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        assertNotNull(result);
+
+        assertTrue(result.has("data"));
+
+        JSONArray data = result.getJSONArray("data");
+
+        return data;
+    }
+
+    private void checkRuleComplete(JSONObject result) throws Exception
+    {
+        assertNotNull("Response is null.", result);
+
+        // if id present in response -> rule was created
+        assertTrue(result.has("id"));
+
+        assertEquals(result.getString("title"), "test_rule");
+        assertEquals(result.getString("description"), "this is description for test_rule");
+
+        JSONArray ruleType = result.getJSONArray("ruleType");
+
+        assertEquals(1, ruleType.length());
+        assertEquals("outbound", ruleType.getString(0));
+
+        assertTrue(result.getBoolean("applyToChildren"));
+        assertFalse(result.getBoolean("executeAsynchronously"));
+        assertFalse(result.getBoolean("disabled"));
+        assertTrue(result.has("owningNode"));
+        JSONObject owningNode = result.getJSONObject("owningNode");
+        assertTrue(owningNode.has("nodeRef"));
+        assertTrue(owningNode.has("name"));
+        assertTrue(result.has("url"));
+
+        JSONObject jsonAction = result.getJSONObject("action");
+
+        assertTrue(jsonAction.has("id"));
+
+        assertEquals(jsonAction.getString("actionDefinitionName"), "composite-action");
+        assertEquals(jsonAction.getString("description"), "this is description for composite-action");
+        assertEquals(jsonAction.getString("title"), "test_title");
+
+        assertTrue(jsonAction.getBoolean("executeAsync"));
+
+        assertTrue(jsonAction.has("actions"));
+        assertTrue(jsonAction.has("conditions"));
+        assertTrue(jsonAction.has("compensatingAction"));
+        assertTrue(jsonAction.has("url"));
+    }
+
+    private void checkRuleSummary(JSONObject result) throws Exception
+    {
+        assertNotNull("Response is null.", result);
+
+        assertTrue(result.has("data"));
+
+        JSONObject data = result.getJSONObject("data");
+
+        // if id present in response -> rule was created
+        assertTrue(data.has("id"));
+
+        assertEquals(data.getString("title"), "test_rule");
+        assertEquals(data.getString("description"), "this is description for test_rule");
+
+        JSONArray ruleType = data.getJSONArray("ruleType");
+
+        assertEquals(1, ruleType.length());
+        assertEquals("outbound", ruleType.getString(0));
+
+        assertFalse(data.getBoolean("disabled"));
+        assertTrue(data.has("url"));
+
+    }
+
+    private void checkUpdatedRule(JSONObject before, JSONObject after) throws JSONException
+    {
+        // check saving of basic feilds 
+        assertEquals("It seams that 'id' is not correct", before.getString("id"), after.getString("id"));
+
+        assertEquals("It seams that 'title' was not saved", before.getString("title"), after.getString("title"));
+
+        assertEquals("It seams that 'description' was not saved", before.getString("description"), after.getString("description"));
+
+        assertEquals("It seams that 'ruleType' was not saved", before.getJSONArray("ruleType").length(), after.getJSONArray("ruleType").length());
+
+        assertEquals(before.getBoolean("applyToChildren"), after.getBoolean("applyToChildren"));
+        assertEquals(before.getBoolean("executeAsynchronously"), after.getBoolean("executeAsynchronously"));
+        assertEquals(before.getBoolean("disabled"), after.getBoolean("disabled"));
+
+        // check saving of collections        
+        JSONObject afterAction = after.getJSONObject("action");
+
+        // we didn't change actions collection
+        assertEquals(1, afterAction.getJSONArray("actions").length());
+
+        // conditions should be empty (should not present in response), 
+        assertFalse(afterAction.has("conditions"));
+
+        assertEquals(before.has("url"), after.has("url"));
+    }
+
+    private void checkRuleset(JSONObject result, int rulesCount, String[] ruleIds, int inhRulesCount, String[] parentRuleIds,
+                                boolean isLinkedFrom, boolean isLinkedTo) throws Exception
+    {
+        assertNotNull("Response is null.", result);
+
+        assertTrue(result.has("data"));
+
+        JSONObject data = result.getJSONObject("data");
+
+        if (data.has("rules"))
+        {
+            JSONArray rulesArray = data.getJSONArray("rules");
+
+            assertEquals(rulesCount, rulesArray.length());
+
+            for (int i = 0; i < rulesArray.length(); i++)
+            {
+                JSONObject ruleSum = rulesArray.getJSONObject(i);
+                assertTrue(ruleSum.has("id"));
+                assertEquals(ruleIds[i], ruleSum.getString("id"));
+                assertTrue(ruleSum.has("title"));
+                assertTrue(ruleSum.has("ruleType"));
+                assertTrue(ruleSum.has("disabled"));
+                assertTrue(ruleSum.has("owningNode"));
+                JSONObject owningNode = ruleSum.getJSONObject("owningNode");
+                assertTrue(owningNode.has("nodeRef"));
+                assertTrue(owningNode.has("name"));
+                assertTrue(ruleSum.has("url"));
+            }
+        }
+
+        if (data.has("inheritedRules"))
+        {
+            JSONArray inheritedRulesArray = data.getJSONArray("inheritedRules");
+
+            assertEquals(inhRulesCount, inheritedRulesArray.length());
+
+            for (int i = 0; i < inheritedRulesArray.length(); i++)
+            {
+                JSONObject ruleSum = inheritedRulesArray.getJSONObject(i);
+                assertTrue(ruleSum.has("id"));
+                assertEquals(parentRuleIds[i], ruleSum.getString("id"));
+                assertTrue(ruleSum.has("title"));
+                assertTrue(ruleSum.has("ruleType"));
+                assertTrue(ruleSum.has("disabled"));
+                assertTrue(ruleSum.has("owningNode"));
+                JSONObject owningNode = ruleSum.getJSONObject("owningNode");
+                assertTrue(owningNode.has("nodeRef"));
+                assertTrue(owningNode.has("name"));
+                assertTrue(ruleSum.has("url"));
+            }
+        }
+
+        assertEquals(isLinkedTo, data.has("linkedToRuleSet"));
+        
+        assertEquals(isLinkedFrom, data.has("linkedFromRuleSets"));
+
+        assertTrue(data.has("url"));
+    }
+
+    public void testGetRuleTypes() throws Exception
+    {
+        Response response = sendRequest(new GetRequest(URL_RULETYPES), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        assertNotNull(result);
+
+        assertTrue(result.has("data"));
+
+        JSONArray data = result.getJSONArray("data");
+
+        for (int i = 0; i < data.length(); i++)
+        {
+            JSONObject ruleType = data.getJSONObject(i);
+
+            assertTrue(ruleType.has("name"));
+            assertTrue(ruleType.has("displayLabel"));
+            assertTrue(ruleType.has("url"));
+        }
+    }
+
+    public void testGetActionDefinitions() throws Exception
+    {
+        Response response = sendRequest(new GetRequest(URL_ACTIONDEFINITIONS), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        assertNotNull(result);
+
+        assertTrue(result.has("data"));
+
+        JSONArray data = result.getJSONArray("data");
+
+        for (int i = 0; i < data.length(); i++)
+        {
+            JSONObject actionDefinition = data.getJSONObject(i);
+
+            assertTrue(actionDefinition.has("name"));
+            assertTrue(actionDefinition.has("displayLabel"));
+            assertTrue(actionDefinition.has("description"));
+            assertTrue(actionDefinition.has("adHocPropertiesAllowed"));
+            assertTrue(actionDefinition.has("parameterDefinitions"));
+            assertTrue(actionDefinition.has("applicableTypes"));
+        }
+    }
+
+    public void testGetActionConditionDefinitions() throws Exception
+    {
+        Response response = sendRequest(new GetRequest(URL_ACTIONCONDITIONDEFINITIONS), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        assertNotNull(result);
+
+        assertTrue(result.has("data"));
+
+        JSONArray data = result.getJSONArray("data");
+
+        for (int i = 0; i < data.length(); i++)
+        {
+            JSONObject actionConditionDefinition = data.getJSONObject(i);
+
+            assertTrue(actionConditionDefinition.has("name"));
+            assertTrue(actionConditionDefinition.has("displayLabel"));
+            assertTrue(actionConditionDefinition.has("description"));
+            assertTrue(actionConditionDefinition.has("adHocPropertiesAllowed"));
+            assertTrue(actionConditionDefinition.has("parameterDefinitions"));
+        }
+    }
+    
+    public void testGetActionConstraints() throws Exception
+    {
+        Response response = sendRequest(new GetRequest(URL_ACTIONCONSTRAINTS), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        assertNotNull(result);
+
+        assertTrue(result.has("data"));
+
+        JSONArray data = result.getJSONArray("data");
+
+        for (int i = 0; i < data.length(); i++)
+        {
+            JSONObject actionConstraint = data.getJSONObject(i);
+
+            assertTrue(actionConstraint.has("name"));
+            assertTrue(actionConstraint.has("values"));
+
+            JSONArray values = actionConstraint.getJSONArray("values");
+
+            for (int j = 0; j < values.length(); j++)
+            {
+                JSONObject value = values.getJSONObject(j);
+
+                assertTrue(value.has("value"));
+                assertTrue(value.has("displayLabel"));
+            }
+        }
+    }
+    
+    public void testGetActionConstraint() throws Exception
+    {
+
+        List<ParameterConstraint> constraints = actionService.getParameterConstraints();
+
+        if (constraints.size() == 0)
+        {
+            return;
+        }
+
+        String name = constraints.get(0).getName();
+
+        Response response = sendRequest(new GetRequest(formateActionConstraintUrl(name)), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        assertNotNull(result);
+
+        assertTrue(result.has("data"));
+
+        JSONObject data = result.getJSONObject("data");
+
+        assertTrue(data.has("name"));
+        assertTrue(data.has("values"));
+
+        JSONArray values = data.getJSONArray("values");
+
+        for (int i = 0; i < values.length(); i++)
+        {
+            JSONObject value = values.getJSONObject(i);
+
+            assertTrue(value.has("value"));
+            assertTrue(value.has("displayLabel"));
+        }
+    }
+
+    public void testQueueAction() throws Exception
+    {
+        String url = formateQueueActionUrl(false);
+
+        JSONObject copyAction = buildCopyAction(testWorkNodeRef);
+
+        copyAction.put("actionedUponNode", testNodeRef);
+
+        // execute before response (should be successful)
+        Response successResponse = sendRequest(new PostRequest(url, copyAction.toString(), "application/json"), 200);
+
+        JSONObject successResult = new JSONObject(successResponse.getContentAsString());
+
+        assertNotNull(successResult);
+
+        assertTrue(successResult.has("data"));
+
+        JSONObject successData = successResult.getJSONObject("data");
+
+        assertTrue(successData.has("status"));
+        assertEquals("success", successData.getString("status"));
+        assertTrue(successData.has("actionedUponNode"));
+        assertFalse(successData.has("exception"));
+        assertTrue(successData.has("action"));
+
+        // execute before response (should fail)
+        sendRequest(new PostRequest(url, copyAction.toString(), "application/json"), 500);
+
+        // execute after response (should fail but error should not present in response)
+        String asyncUrl = formateQueueActionUrl(true);
+        Response response = sendRequest(new PostRequest(asyncUrl, copyAction.toString(), "application/json"), 200);
+
+        // wait while action executed
+        Thread.sleep(1000);
+
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        assertNotNull(result);
+
+        assertTrue(result.has("data"));
+
+        JSONObject data = result.getJSONObject("data");
+
+        assertTrue(data.has("status"));
+        assertEquals("queued", data.getString("status"));
+        assertTrue(data.has("actionedUponNode"));
+        assertFalse(data.has("exception"));
+        assertTrue(data.has("action"));
+    }
+
+    public void testCreateRule() throws Exception
+    {
+        JSONObject result = createRule(testNodeRef);
+
+        checkRuleSummary(result);
+
+        List<Rule> rules = ruleService.getRules(testNodeRef);
+
+        assertEquals(1, rules.size());
+
+    }
+
+    public void testGetRulesCollection() throws Exception
+    {
+        JSONArray data = getNodeRules(testNodeRef, false);
+
+        assertEquals(0, data.length());
+
+        createRule(testNodeRef);
+
+        data = getNodeRules(testNodeRef, false);
+
+        assertEquals(1, data.length());
+
+        for (int i = 0; i < data.length(); i++)
+        {
+            JSONObject ruleSum = data.getJSONObject(i);
+            assertTrue(ruleSum.has("id"));
+            assertTrue(ruleSum.has("title"));
+            assertTrue(ruleSum.has("ruleType"));
+            assertTrue(ruleSum.has("disabled"));
+            assertTrue(ruleSum.has("owningNode"));
+            JSONObject owningNode = ruleSum.getJSONObject("owningNode");
+            assertTrue(owningNode.has("nodeRef"));
+            assertTrue(owningNode.has("name"));
+            assertTrue(ruleSum.has("url"));
+        }
+    }
+
+    public void testGetInheritedRulesCollection() throws Exception
+    {
+        JSONArray data = getNodeRules(testNodeRef, true);
+
+        assertEquals(0, data.length());
+
+        createRule(testWorkNodeRef);
+
+        data = getNodeRules(testNodeRef, true);
+
+        assertEquals(1, data.length());
+
+        for (int i = 0; i < data.length(); i++)
+        {
+            JSONObject ruleSum = data.getJSONObject(i);
+            assertTrue(ruleSum.has("id"));
+            assertTrue(ruleSum.has("title"));
+            assertTrue(ruleSum.has("ruleType"));
+            assertTrue(ruleSum.has("disabled"));
+            assertTrue(ruleSum.has("owningNode"));
+            JSONObject owningNode = ruleSum.getJSONObject("owningNode");
+            assertTrue(owningNode.has("nodeRef"));
+            assertTrue(owningNode.has("name"));
+            assertTrue(ruleSum.has("url"));
+        }
+    }
+
+    public void testGetRuleset() throws Exception
+    {
+        JSONObject parentRule = createRule(testWorkNodeRef);
+        String[] parentRuleIds = new String[] { parentRule.getJSONObject("data").getString("id") };
+
+        JSONObject jsonRule = createRule(testNodeRef);
+        String[] ruleIds = new String[] { jsonRule.getJSONObject("data").getString("id") };
+
+        Action linkRulesAction = actionService.createAction(LinkRules.NAME);
+        linkRulesAction.setParameterValue(LinkRules.PARAM_LINK_FROM_NODE, testNodeRef);
+        actionService.executeAction(linkRulesAction, testNodeRef2);
+
+        Response linkedFromResponse = sendRequest(new GetRequest(formatRulesetUrl(testNodeRef)), 200);
+        JSONObject linkedFromResult = new JSONObject(linkedFromResponse.getContentAsString());
+        
+        checkRuleset(linkedFromResult, 1, ruleIds, 1, parentRuleIds, true, false);
+
+        Response linkedToResponse = sendRequest(new GetRequest(formatRulesetUrl(testNodeRef2)), 200);
+        JSONObject linkedToResult = new JSONObject(linkedToResponse.getContentAsString());
+        
+        checkRuleset(linkedToResult, 1, ruleIds, 1, parentRuleIds, false, true);
+    }
+
+    public void testGetRuleDetails() throws Exception
+    {
+        JSONObject jsonRule = createRule(testNodeRef);
+
+        String ruleId = jsonRule.getJSONObject("data").getString("id");
+
+        Response response = sendRequest(new GetRequest(formateRuleUrl(testNodeRef, ruleId)), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        checkRuleComplete(result);
+    }
+
+    public void testUpdateRule() throws Exception
+    {
+        JSONObject jsonRule = createRule(testNodeRef);
+
+        String ruleId = jsonRule.getJSONObject("data").getString("id");
+
+        Response getResponse = sendRequest(new GetRequest(formateRuleUrl(testNodeRef, ruleId)), 200);
+
+        JSONObject before = new JSONObject(getResponse.getContentAsString());
+
+        // do some changes
+        before.put("description", "this is modified description for test_rule");
+
+        // do some changes for action object
+        JSONObject beforeAction = before.getJSONObject("action");
+        // no changes for actions list  
+        beforeAction.remove("actions");
+        // clear conditions
+        beforeAction.put("conditions", new JSONArray());
+
+        Response putResponse = sendRequest(new PutRequest(formateRuleUrl(testNodeRef, ruleId), before.toString(), "application/json"), 200);
+
+        JSONObject after = new JSONObject(putResponse.getContentAsString());
+
+        // sent and retrieved objects should be the same (except ids and urls)
+        // this means that all changes was saved
+        checkUpdatedRule(before, after);
+    }
+
+    public void testDeleteRule() throws Exception
+    {
+        JSONObject jsonRule = createRule(testNodeRef);
+
+        assertEquals(1, ruleService.getRules(testNodeRef).size());
+
+        String ruleId = jsonRule.getJSONObject("data").getString("id");
+
+        Response response = sendRequest(new DeleteRequest(formateRuleUrl(testNodeRef, ruleId)), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+
+        assertNotNull(result);
+
+        assertTrue(result.has("success"));
+
+        boolean success = result.getBoolean("success");
+
+        assertTrue(success);
+
+        // no more rules present 
+        assertEquals(0, ruleService.getRules(testNodeRef).size());
+    }
+    
+    @SuppressWarnings("unused")
+    public void testRuleReorder() throws Exception
+    {
+        assertEquals(0, ruleService.getRules(testNodeRef).size());
+        
+        // Create 3 rules
+        NodeRef rule1 = createRuleNodeRef(testNodeRef, "Rule 1");
+        NodeRef rule2 = createRuleNodeRef(testNodeRef, "Rule 2");
+        NodeRef rule3 = createRuleNodeRef(testNodeRef, "Rule 3");
+        
+        List<Rule> rules = ruleService.getRules(testNodeRef);
+        assertEquals(3, rules.size());
+        assertEquals("Rule 1", rules.get(0).getTitle());
+        assertEquals("Rule 2", rules.get(1).getTitle());
+        assertEquals("Rule 3", rules.get(2).getTitle());
+        
+        JSONObject action = new JSONObject();
+        action.put("actionDefinitionName", "reorder-rules");
+        action.put("actionedUponNode", testNodeRef.toString());
+        
+        JSONObject params = new JSONObject();
+        JSONArray orderArray = new JSONArray();
+        orderArray.put(rules.get(2).getNodeRef().toString());
+        orderArray.put(rules.get(1).getNodeRef().toString());
+        orderArray.put(rules.get(0).getNodeRef().toString());
+        params.put("rules", orderArray);
+        action.put("parameterValues", params);
+        
+        String url = formateQueueActionUrl(false);
+
+        // execute before response (should be successful)
+        Response successResponse = sendRequest(new PostRequest(url, action.toString(), "application/json"), 200);
+        JSONObject successResult = new JSONObject(successResponse.getContentAsString());
+        assertNotNull(successResult);
+        assertTrue(successResult.has("data"));
+        JSONObject successData = successResult.getJSONObject("data");
+        assertTrue(successData.has("status"));
+        assertEquals("success", successData.getString("status"));
+        assertTrue(successData.has("actionedUponNode"));
+        assertFalse(successData.has("exception"));
+        assertTrue(successData.has("action"));
+        
+        rules = ruleService.getRules(testNodeRef);
+        assertEquals(3, rules.size());
+        assertEquals("Rule 3", rules.get(0).getTitle());
+        assertEquals("Rule 2", rules.get(1).getTitle());
+        assertEquals("Rule 1", rules.get(2).getTitle());
+    }
+    
+    private NodeRef createRuleNodeRef(NodeRef folder, String title) throws Exception
+    {
+        JSONObject jsonRule = createRule(folder, title);
+        String id = jsonRule.getJSONObject("data").getString("id");
+        return new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, id);
+    }
+
+    private JSONObject buildCopyAction(NodeRef destination) throws JSONException
+    {
+        JSONObject result = new JSONObject();
+
+        // add actionDefinitionName
+        result.put("actionDefinitionName", "copy");
+
+        // build parameterValues
+        JSONObject parameterValues = new JSONObject();
+        parameterValues.put("destination-folder", destination);
+
+        // add parameterValues
+        result.put("parameterValues", parameterValues);
+
+        // add executeAsync
+        result.put("executeAsync", false);
+
+        return result;
+    }
+
+    private JSONObject buildTestRule(String title) throws JSONException
+    {
+        JSONObject result = new JSONObject();
+
+        result.put("title", title);
+        result.put("description", "this is description for test_rule");
+
+        JSONArray ruleType = new JSONArray();
+        ruleType.put("outbound");
+
+        result.put("ruleType", ruleType);
+
+        result.put("applyToChildren", true);
+
+        result.put("executeAsynchronously", false);
+
+        result.put("disabled", false);
+
+        result.put("action", buildTestAction("composite-action", true, true));
+
+        return result;
+    }
+
+    private JSONObject buildTestAction(String actionName, boolean addActions, boolean addCompensatingAction) throws JSONException
+    {
+        JSONObject result = new JSONObject();
+
+        result.put("actionDefinitionName", actionName);
+        result.put("description", "this is description for " + actionName);
+        result.put("title", "test_title");
+
+        //JSONObject parameterValues = new JSONObject();
+        //parameterValues.put("test_name", "test_value");
+
+        //result.put("parameterValues", parameterValues);
+
+        result.put("executeAsync", addActions);
+
+        if (addActions)
+        {
+            JSONArray actions = new JSONArray();
+
+            actions.put(buildTestAction("counter", false, false));
+
+            result.put("actions", actions);
+        }
+
+        JSONArray conditions = new JSONArray();
+
+        conditions.put(buildTestCondition("no-condition"));
+
+        result.put("conditions", conditions);
+
+        if (addCompensatingAction)
+        {
+            result.put("compensatingAction", buildTestAction("script", false, false));
+        }
+
+        return result;
+    }
+
+    private JSONObject buildTestCondition(String conditionName) throws JSONException
+    {
+        JSONObject result = new JSONObject();
+
+        result.put("conditionDefinitionName", conditionName);
+        result.put("invertCondition", false);
+
+        //JSONObject parameterValues = new JSONObject();
+        //parameterValues.put("test_name", "test_value");
+
+        //result.put("parameterValues", parameterValues);
+
+        return result;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/search/PersonSearchTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/search/PersonSearchTest.java
new file mode 100644
index 00000000000..6784bca1133
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/search/PersonSearchTest.java
@@ -0,0 +1,140 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.search;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.util.PropertyMap;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.experimental.categories.Category;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Unit test for PersonSearch Web Script.
+ * 
+ *  /alfresco/service/api/search/person?q=* 
+ * @author Mark Rogers
+ */
+@Category(LuceneTests.class)
+public class PersonSearchTest extends BaseWebScriptTest
+{
+    private static Log logger = LogFactory.getLog(PersonSearchTest.class);
+    
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private PersonService personService;
+    
+    private static final String USER_ONE = "PersonSearchTestOne";
+    private static final String USER_TWO = "PersonSearchTestTwo";
+    private static final String USER_THREE = "PersonSearchTestThree";
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
+        this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+        
+        // Create users
+        createUser(USER_ONE);
+        createUser(USER_TWO);
+        createUser(USER_THREE);
+        
+        // Do tests as user one
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+    }
+    
+    private void createUser(String userName)
+    {
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            this.authenticationService.createAuthentication(userName, "PWD".toCharArray());
+            
+            PropertyMap ppOne = new PropertyMap(4);
+            ppOne.put(ContentModel.PROP_USERNAME, userName);
+            ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+            ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+            ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+            
+            this.personService.createPerson(ppOne);
+        }        
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+    }
+
+    /**
+     * This is a basic sanity check of the search/person script.
+     */
+    public void testSearch() throws Exception
+    {
+    	/*
+    	 * Do the first query for default format and all results
+    	 */
+    	{
+    		Response response = sendRequest(new GetRequest("/api/search/person?q=*"), Status.STATUS_OK);
+        	logger.debug(response.getContentAsString());
+    	}
+    	
+    	/*
+    	 * Same search with HTML format
+    	 */
+    	{
+    		Response response = sendRequest(new GetRequest("/api/search/person.html?q=*"), Status.STATUS_OK);
+        	logger.debug(response.getContentAsString());
+    	}
+
+    	    	
+    	/*
+    	 * Negative test - missing mandatory parameter 
+    	 * 
+    	 * Should really be a INVALID_REQUEST
+    	 */
+    	sendRequest(new GetRequest("/api/search/person?"), Status.STATUS_INTERNAL_SERVER_ERROR);
+    }
+    
+    public void testAtomSearch() throws Exception
+    {
+		Response response = sendRequest(new GetRequest("/api/search/person.atom?q=*"), Status.STATUS_OK);
+    	logger.debug(response.getContentAsString());
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryAdminConsoleAccessTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryAdminConsoleAccessTest.java
new file mode 100644
index 00000000000..7896a21859a
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryAdminConsoleAccessTest.java
@@ -0,0 +1,547 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.servlet;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.management.subsystems.ActivateableBean;
+import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
+import org.alfresco.repo.management.subsystems.DefaultChildApplicationContextManager;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.external.DefaultRemoteUserMapper;
+import org.alfresco.repo.security.authentication.external.RemoteUserMapper;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.util.BaseSpringTest;
+import org.alfresco.util.PropertyMap;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.springframework.extensions.webscripts.Authenticator;
+import org.springframework.extensions.webscripts.Description;
+import org.springframework.extensions.webscripts.Description.RequiredAuthentication;
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.WebScript;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletResponse;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration({ "classpath:alfresco/application-context.xml", "classpath:alfresco/web-scripts-application-context.xml",
+    "classpath:alfresco/web-scripts-application-context-test.xml" })
+public class RemoteAuthenticatorFactoryAdminConsoleAccessTest extends BaseSpringTest
+{
+    private String proxyHeader = "X-Alfresco-Remote-User";
+    public static int setStatusCode;
+
+    protected final Log logger = LogFactory.getLog(getClass());
+
+    private RemoteUserAuthenticatorFactory remoteUserAuthenticatorFactory;
+    private BlockingRemoteUserMapper blockingRemoteUserMapper;
+    private PersonService personService;
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private AuthorityService authorityService;
+
+    @Before
+    public void before() throws Exception
+    {
+        blockingRemoteUserMapper = new BlockingRemoteUserMapper();
+
+        DefaultChildApplicationContextManager childApplicationContextManager = (DefaultChildApplicationContextManager) applicationContext
+            .getBean("Authentication");
+        remoteUserAuthenticatorFactory = (RemoteUserAuthenticatorFactory) applicationContext.getBean("webscripts.authenticator.remoteuser");
+        remoteUserAuthenticatorFactory.setRemoteUserMapper(blockingRemoteUserMapper);
+        remoteUserAuthenticatorFactory
+            .setGetRemoteUserTimeoutMilliseconds((long) (BlockingRemoteUserMapper.BLOCKING_FOR_MILLIS / 2));//highly impatient
+        personService = (PersonService) applicationContext.getBean("PersonService");
+
+        authenticationService = applicationContext.getBean("AuthenticationService", MutableAuthenticationService.class);
+        authenticationComponent = applicationContext.getBean("AuthenticationComponent", AuthenticationComponent.class);
+        authorityService = applicationContext.getBean("AuthorityService", AuthorityService.class);
+
+        childApplicationContextManager.stop();
+        childApplicationContextManager.setProperty("chain", "external1:external,alfrescoNtlm1:alfrescoNtlm");
+        ChildApplicationContextFactory childApplicationContextFactory = childApplicationContextManager.getChildApplicationContextFactory("external1");
+        childApplicationContextFactory.stop();
+        childApplicationContextFactory.setProperty("external.authentication.proxyUserName", "");
+    }
+
+    @Test
+    public void testAdminGuestAccess()
+    {
+        RequiredAuthentication required = RequiredAuthentication.admin;
+        boolean isGuest = true;
+
+        final boolean authenticated = authenticateWithGuestParameters(required, isGuest);
+
+        assertFalse("This should not authenticate. Admin access and guest is not a valid combination.", authenticated);
+        checkTimeOutFeaturesWasNotUsed();
+    }
+
+    @Test
+    public void testUserGuestAccess()
+    {
+        RequiredAuthentication required = RequiredAuthentication.user;
+        boolean isGuest = true;
+
+        final boolean authenticated = authenticateWithGuestParameters(required, isGuest);
+
+        assertFalse("This should not authenticate", authenticated);
+        checkTimeOutFeaturesWasNotUsed();
+    }
+
+    @Test
+    public void testGuestGuestAccess()
+    {
+        RequiredAuthentication required = RequiredAuthentication.guest;
+        boolean isGuest = true;
+
+        final boolean authenticated = authenticateWithGuestParameters(required, isGuest);
+
+        assertTrue("This should authenticate", authenticated);
+        checkTimeOutFeaturesWasNotUsed();
+    }
+
+    @Test
+    public void testNoneGuestAccess()
+    {
+        RequiredAuthentication required = RequiredAuthentication.none;
+        boolean isGuest = true;
+
+        final boolean authenticated = authenticateWithGuestParameters(required, isGuest);
+
+        assertFalse("This should not authenticate.", authenticated);
+        checkTimeOutFeaturesWasNotUsed();
+    }
+
+    @Test
+    public void testNoneNotGuestAccess()
+    {
+        RequiredAuthentication required = RequiredAuthentication.none;
+        boolean isGuest = false;
+
+        final boolean authenticated = authenticateWithGuestParameters(RequiredAuthentication.none, false);
+
+        assertFalse("This should not authenticate.", authenticated);
+        checkTimeOutFeaturesWasNotUsed();
+    }
+
+    @Test
+    public void testExternalAuthForAdminPage()
+    {
+        RequiredAuthentication required = RequiredAuthentication.admin;
+        Set<String> families = new HashSet<>();
+        families.add("AdminConsole");
+
+        checkExtAuthStillWorks(required, families);
+    }
+
+    @Test
+    public void testExternalAuthForAdminResource()
+    {
+        RequiredAuthentication required = RequiredAuthentication.admin;
+        Set<String> families = Collections.emptySet();
+
+        checkExtAuthStillWorks(required, families);
+    }
+
+    @Test
+    public void testExternalAuthForUserResource()
+    {
+        RequiredAuthentication required = RequiredAuthentication.user;
+        Set<String> families = Collections.emptySet();
+
+        checkExtAuthStillWorks(required, families);
+    }
+
+    @Test
+    public void testAdminCanAccessAdminConsoleScript()
+    {
+        Set<String> families = new HashSet<>();
+        families.add("AdminConsole");
+        complexCheckOfScriptCases(families);
+    }
+
+    @Test
+    public void testAdminCanAccessAdminConsoleHelperScript()
+    {
+        Set<String> families = new HashSet<>();
+        families.add("AdminConsoleHelper");
+        complexCheckOfScriptCases(families);
+    }
+
+    /**
+     * Tested access to the AdminConsole for an non literal admin user
+     * but with admin permissions (user added to ALFRESCO_ADMINISTRATORS)
+     * and accessing via Basic Auth
+     */
+    @Test
+    public void testUserCanAccessAdminConsoleScript()
+    {
+        Set<String> families = new HashSet<>();
+        families.add("AdminConsole");
+
+        // Run as System to be able to give permissions
+        authenticationComponent.setSystemUserAsCurrentUser();
+
+        String username = RandomStringUtils.randomAlphabetic(10);
+        String password = RandomStringUtils.randomAlphabetic(10);
+        createUser(username, password);
+        authorityService.addAuthority("GROUP_ALFRESCO_ADMINISTRATORS", username);
+
+        authenticationComponent.clearCurrentSecurityContext();
+
+        String headerToAdd = getBasicAuthHeader(username, password);
+
+        checkAdminConsoleFamilyWithBasicAuthHeaderPresentUser(families, headerToAdd);
+
+    }
+
+    private void complexCheckOfScriptCases(final Set<String> families)
+    {
+        final String headerToAdd = "Basic YWRtaW46YWRtaW4="; //admin:admin
+
+        checkGenericResourceAccess();
+
+        checkAdminConsoleFamilyPage(families);
+
+        checkAdminConsoleFamilyPageWithRemoteUserMapperDisabled(families);
+
+        checkAdminConsoleFamilyWithBasicAuthHeaderPresent(families, headerToAdd);
+
+        checkAdminConsoleFamilyWithBasicAuthHeaderButWrongPassword(families);
+    }
+
+    private void checkAdminConsoleFamilyWithBasicAuthHeaderButWrongPassword(Set<String> families)
+    {
+        blockingRemoteUserMapper.reset();
+        // now try with bad password
+        String headerToAddWithWrongPassword = "Basic YWRtaW46YmliaQ=="; // admin:bibi
+        final boolean authenticated = authenticate(families, headerToAddWithWrongPassword);
+
+        assertFalse("It is an AdminConsole webscript now and Admin basic auth header was present BUT with wrong password. Should fail.",
+            authenticated);
+        assertEquals("Status should be 401", 401, setStatusCode);
+        final String message = "The code from blockingRemoteUserMapper shouldn't have been called";
+        assertFalse(message, blockingRemoteUserMapper.isWasInterrupted());
+        assertEquals(message, blockingRemoteUserMapper.getTimePassed(), 0);
+    }
+
+    private void checkAdminConsoleFamilyPage(Set<String> families)
+    {
+        blockingRemoteUserMapper.reset();
+        // now try an admin console family page
+        final boolean authenticated = authenticate(families, null);
+
+        assertFalse("It is an AdminConsole webscript now, but Admin basic auth header was not present. It should return 401", authenticated);
+        assertEquals("Status should be 401", 401, setStatusCode);
+        assertTrue("Because it is an AdminConsole webscript, the interrupt should have been called.", blockingRemoteUserMapper.isWasInterrupted());
+        assertTrue("The interrupt should have been called.", blockingRemoteUserMapper.getTimePassed() < BlockingRemoteUserMapper.BLOCKING_FOR_MILLIS);
+    }
+
+    private void checkAdminConsoleFamilyWithBasicAuthHeaderPresent(Set<String> families, String headerToAdd)
+    {
+        blockingRemoteUserMapper.reset();
+        // now try with valid basic auth as well
+        final boolean authenticated = authenticate(families, headerToAdd);
+
+        assertTrue("It is an AdminConsole webscript now and Admin basic auth header was present. It should succeed.", authenticated);
+        // status is not checked here, as it is not returned by this framework we are testing. It should eventually be 200
+        final String message = "The code from blockingRemoteUserMapper shouldn't have been called";
+        assertFalse(message, blockingRemoteUserMapper.isWasInterrupted());
+        assertEquals(message, blockingRemoteUserMapper.getTimePassed(), 0);
+    }
+
+    private void checkAdminConsoleFamilyWithBasicAuthHeaderPresentUser(Set<String> families, String headerToAdd)
+    {
+        blockingRemoteUserMapper.reset();
+        // now try with valid basic auth as well
+        boolean authenticated = false;
+
+        try {
+            authenticated = authenticate(families, headerToAdd);
+        } catch (Exception e) {
+            logger.error(String.format("The authentication should not require secure context to be set. %s", e.getMessage()), e);
+        }
+
+        assertTrue("It is an AdminConsole webscript and a User with Admin access and basic auth header was present. It should succeed.", authenticated);
+        // status is not checked here, as it is not returned by this framework we are testing. It should eventually be 200
+        final String message = "The code from blockingRemoteUserMapper shouldn't have been called";
+        assertFalse(message, blockingRemoteUserMapper.isWasInterrupted());
+        assertEquals(message, blockingRemoteUserMapper.getTimePassed(), 0);
+    }
+
+    private void checkAdminConsoleFamilyPageWithRemoteUserMapperDisabled(Set<String> families)
+    {
+        blockingRemoteUserMapper.reset();
+        blockingRemoteUserMapper.setEnabled(false);
+        // now try an admin console family page
+        final boolean authenticated = authenticate(families, null);
+
+        assertFalse("It is an AdminConsole webscript now, but Admin basic auth header was not present. It should return 401", authenticated);
+        assertEquals("Status should be 401", 401, setStatusCode);
+        assertFalse("The interrupt should have not been called because the RemoteUserMapper is not enabled.",
+            blockingRemoteUserMapper.isWasInterrupted());
+        assertEquals("RemoteUserMapper not called", blockingRemoteUserMapper.getTimePassed(), 0);
+    }
+
+    private void checkGenericResourceAccess()
+    {
+        blockingRemoteUserMapper.reset();
+        // first try a generic resource
+        final boolean authenticated = authenticate(Collections.emptySet(), null);
+
+        assertFalse("This should not be authenticated as it is not an Admin Console requested. And no credentials have been provided", authenticated);
+        assertFalse("Because it is not an Admin Console, the timeout feature from BasicHttpAuthenticator should not be requested. "
+            + "Therefore the interrupt should not have been called. ", blockingRemoteUserMapper.isWasInterrupted());
+        assertTrue("No interrupt should have been called.",
+            blockingRemoteUserMapper.getTimePassed() > BlockingRemoteUserMapper.BLOCKING_FOR_MILLIS - 1);
+    }
+
+    private void checkTimeOutFeaturesWasNotUsed()
+    {
+        assertFalse("The timeout feature from BasicHttpAuthenticator should not be requested. Therefore the interrupt should not have been called. ",
+            blockingRemoteUserMapper.isWasInterrupted());
+        assertTrue("No interrupt should have been called.",
+            blockingRemoteUserMapper.getTimePassed() > BlockingRemoteUserMapper.BLOCKING_FOR_MILLIS - 1);
+    }
+
+    private boolean authenticate(Set<String> families, String headerToAdd)
+    {
+        WebScriptServletRequest mockRequest = prepareMockRequest(families, headerToAdd);
+        WebScriptServletResponse mockResponse = prepareMockResponse();
+
+        Authenticator authenticator = remoteUserAuthenticatorFactory.create(mockRequest, mockResponse);
+        return authenticator.authenticate(RequiredAuthentication.admin, false);
+    }
+
+    private boolean authenticateWithGuestParameters(RequiredAuthentication required, boolean isGuest)
+    {
+        blockingRemoteUserMapper.reset();
+
+        WebScriptServletRequest mockRequest = prepareMockRequest(Collections.emptySet(), null);
+        WebScriptServletResponse mockResponse = prepareMockResponse();
+
+        Authenticator authenticator = remoteUserAuthenticatorFactory.create(mockRequest, mockResponse);
+        return authenticator.authenticate(required, isGuest);
+    }
+
+    private WebScriptServletRequest prepareMockRequest(Set<String> families, String headerToAdd)
+    {
+        HttpServletRequest mockHttpRequest = mock(HttpServletRequest.class);
+        when(mockHttpRequest.getScheme()).thenReturn("http");
+        if (headerToAdd != null)
+        {
+            when(mockHttpRequest.getHeader("Authorization")).thenReturn(headerToAdd);
+        }
+        WebScriptServletRequest mockRequest = mock(WebScriptServletRequest.class);
+        when(mockRequest.getHttpServletRequest()).thenReturn(mockHttpRequest);
+
+        WebScript mockWebScript = mock(WebScript.class);
+        Match mockMatch = new Match("fake", Collections.EMPTY_MAP, "whatever", mockWebScript);
+        when(mockRequest.getServiceMatch()).thenReturn(mockMatch);
+
+        Description mockDescription = mock(Description.class);
+        when(mockWebScript.getDescription()).thenReturn(mockDescription);
+        when(mockDescription.getFamilys()).thenReturn(families);
+        return mockRequest;
+    }
+
+    private void checkExtAuthStillWorks(RequiredAuthentication required, Set<String> families)
+    {
+        blockingRemoteUserMapper.reset();
+
+        DefaultRemoteUserMapper defaultRemoteUserMapper = new DefaultRemoteUserMapper();
+        defaultRemoteUserMapper.setActive(true);
+        defaultRemoteUserMapper.setProxyUserName(null);
+        defaultRemoteUserMapper.setPersonService(personService);
+        remoteUserAuthenticatorFactory.setRemoteUserMapper(defaultRemoteUserMapper);
+
+        HttpServletRequest mockHttpRequest = mock(HttpServletRequest.class);
+        when(mockHttpRequest.getScheme()).thenReturn("http");
+
+        final String userName = "RAFACAT_usr_" + (int) (Math.random() * 1000);
+        when(mockHttpRequest.getHeader(proxyHeader)).thenReturn(userName);
+
+        WebScriptServletRequest mockRequest = mock(WebScriptServletRequest.class);
+        when(mockRequest.getHttpServletRequest()).thenReturn(mockHttpRequest);
+
+        WebScript mockWebScript = mock(WebScript.class);
+        Match mockMatch = new Match("fake", Collections.EMPTY_MAP, "whatever", mockWebScript);
+        when(mockRequest.getServiceMatch()).thenReturn(mockMatch);
+
+        Description mockDescription = mock(Description.class);
+        when(mockWebScript.getDescription()).thenReturn(mockDescription);
+        when(mockDescription.getFamilys()).thenReturn(families);
+
+        WebScriptServletResponse mockResponse = prepareMockResponse();
+
+        Authenticator authenticator = remoteUserAuthenticatorFactory.create(mockRequest, mockResponse);
+
+        final boolean authenticated = authenticator.authenticate(required, false);
+
+        assertTrue("This should be authenticating with external auth", authenticated);
+        assertFalse("We have been using the DefaultRemoteUserMapper, so our BlockingRemoteUserMapper shouldn't have been called",
+            blockingRemoteUserMapper.isWasInterrupted());
+        assertEquals("BlockingRemoteUserMapper shouldn't have been called", blockingRemoteUserMapper.getTimePassed(), 0);
+    }
+
+    private WebScriptServletResponse prepareMockResponse()
+    {
+        HttpServletResponse mockHttpResponse = mock(HttpServletResponse.class);
+        WebScriptServletResponse mockResponse = mock(WebScriptServletResponse.class);
+        when(mockResponse.getHttpServletResponse()).thenReturn(mockHttpResponse);
+        doAnswer(new Answer()
+        {
+            public Object answer(InvocationOnMock invocation)
+            {
+                Object[] args = invocation.getArguments();
+                if (args != null && args.length == 1)
+                {
+                    setStatusCode = -1;
+                    try
+                    {
+                        setStatusCode = (int) args[0];
+                    }
+                    catch (Exception e)
+                    {
+                        logger.error("Could not get the status code: " + e.getMessage(), e);
+                    }
+                }
+                return null;
+            }
+        }).when(mockHttpResponse).setStatus(anyInt());
+        return mockResponse;
+    }
+
+    /**
+     * User creation consists of creating a user and an authentication to be compared when a login is asked
+     * @param userName
+     * @param password
+     */
+    private void createUser(String userName, String password)
+    {
+        if (!personService.personExists(userName))
+        {
+            this.authenticationService.createAuthentication(userName, password.toCharArray());
+
+            PropertyMap personProps = new PropertyMap();
+            personProps.put(ContentModel.PROP_USERNAME, userName);
+            personProps.put(ContentModel.PROP_FIRSTNAME, "myFirstName");
+            personProps.put(ContentModel.PROP_LASTNAME, "myLastName");
+            personProps.put(ContentModel.PROP_EMAIL, "myFirstName.myLastName@email.com");
+            personProps.put(ContentModel.PROP_JOBTITLE, "myJobTitle");
+            personProps.put(ContentModel.PROP_JOBTITLE, "myOrganisation");
+
+            this.personService.createPerson(personProps);
+        }
+    }
+
+    /**
+     * Formats the value for a basic auth to be put in headers
+     * @param userName
+     * @param password
+     * @return
+     */
+    private String getBasicAuthHeader(String userName, String password)
+    {
+        return String.format("Basic %s", Base64.encodeBase64String(String.format("%s:%s", userName, password).getBytes()));
+    }
+}
+
+class BlockingRemoteUserMapper implements RemoteUserMapper, ActivateableBean
+{
+    public static final int BLOCKING_FOR_MILLIS = 1000;
+    private volatile boolean wasInterrupted;
+    private volatile int timePassed;
+
+    private boolean isEnabled = true;
+
+    @Override
+    public String getRemoteUser(HttpServletRequest request)
+    {
+        long t1 = System.currentTimeMillis();
+        try
+        {
+            Thread.sleep(BLOCKING_FOR_MILLIS);
+        }
+        catch (InterruptedException ie)
+        {
+            wasInterrupted = true;
+        }
+        finally
+        {
+            timePassed = (int) (System.currentTimeMillis() - t1);
+        }
+        return null;
+    }
+
+    public boolean isWasInterrupted()
+    {
+        return wasInterrupted;
+    }
+
+    public int getTimePassed()
+    {
+        return timePassed;
+    }
+
+    public void reset()
+    {
+        wasInterrupted = false;
+        timePassed = 0;
+    }
+
+    @Override
+    public boolean isActive()
+    {
+        return isEnabled;
+    }
+
+    public void setEnabled(boolean enabled)
+    {
+        this.isEnabled = enabled;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryTest.java
new file mode 100644
index 00000000000..dc0126d73ed
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryTest.java
@@ -0,0 +1,220 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.servlet;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
+import org.alfresco.repo.management.subsystems.DefaultChildApplicationContextManager;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.GUID;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.Authenticator;
+import org.springframework.extensions.webscripts.Description.RequiredAuthentication;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletResponse;
+
+/**
+ * 
+ * @author sglover
+ *
+ */
+public class RemoteAuthenticatorFactoryTest
+{
+    private static final String[] contextLocations = new String[] {
+            "classpath:alfresco/application-context.xml",
+            "classpath:alfresco/web-scripts-application-context.xml",
+            "classpath:alfresco/web-scripts-application-context-test.xml"
+    };
+
+    private static RemoteUserAuthenticatorFactory remoteUserAuthenticatorFactory;
+    private static PersonService personService;
+    private static TransactionService transactionService;
+    private static MutableAuthenticationDao authenticationDAO;
+
+    @BeforeClass
+    public static void beforeClass() throws Exception
+    {
+        ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(contextLocations);
+        DefaultChildApplicationContextManager childApplicationContextManager = (DefaultChildApplicationContextManager) ctx.getBean("Authentication");
+        remoteUserAuthenticatorFactory = (RemoteUserAuthenticatorFactory) ctx.getBean("webscripts.authenticator.remoteuser");
+        personService = (PersonService)ctx.getBean("PersonService");
+        transactionService = (TransactionService)ctx.getBean("TransactionService");
+        authenticationDAO = (MutableAuthenticationDao)ctx.getBean("authenticationDao");
+
+        childApplicationContextManager.stop();
+        childApplicationContextManager.setProperty("chain", "external1:external");
+        ChildApplicationContextFactory childApplicationContextFactory = childApplicationContextManager.getChildApplicationContextFactory("external1");
+        childApplicationContextFactory.stop();
+        childApplicationContextFactory.setProperty("external.authentication.proxyUserName", "");
+    }
+
+    private String createPerson(boolean enabled)
+    {
+        Map<QName, Serializable> properties = new HashMap<>();
+        String username = "user" + GUID.generate();
+        properties.put(ContentModel.PROP_USERNAME, username);
+        properties.put(ContentModel.PROP_FIRSTNAME, username);
+        properties.put(ContentModel.PROP_LASTNAME, username);
+        if(!enabled)
+        {
+            properties.put(ContentModel.PROP_ENABLED, enabled);
+        }
+        personService.createPerson(properties);
+
+        authenticationDAO.createUser(username, "password".toCharArray());
+        authenticationDAO.setEnabled(username, enabled);
+
+        return username;
+    }
+
+    @Test
+    public void testDisabledUser() throws Exception
+    {
+        final String username = transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<String>()
+        {
+            @Override
+            public String execute() throws Throwable
+            {
+                return AuthenticationUtil.runAs(new RunAsWork<String>()
+                {
+                    @Override
+                    public String doWork() throws Exception
+                    {
+                        return createPerson(false);
+                    }
+                }, AuthenticationUtil.SYSTEM_USER_NAME);
+            }
+        }, false, true);
+
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                return AuthenticationUtil.runAs(new RunAsWork<Void>()
+                {
+                    @Override
+                    public Void doWork() throws Exception
+                    {
+                        // Mock a request with a username in the header
+                        HttpServletRequest mockHttpRequest = mock(HttpServletRequest.class);
+                        when(mockHttpRequest.getHeader("X-Alfresco-Remote-User")).thenReturn(username);
+                        when(mockHttpRequest.getScheme()).thenReturn("http");
+                        WebScriptServletRequest mockRequest = mock(WebScriptServletRequest.class);
+                        when(mockRequest.getHttpServletRequest()).thenReturn(mockHttpRequest);
+
+                        HttpServletResponse mockHttpResponse = mock(HttpServletResponse.class);
+                        WebScriptServletResponse mockResponse = mock(WebScriptServletResponse.class);
+                        when(mockResponse.getHttpServletResponse()).thenReturn(mockHttpResponse);
+
+                        Authenticator authenticator = remoteUserAuthenticatorFactory.create(mockRequest, mockResponse);
+                        assertFalse(authenticator.authenticate(RequiredAuthentication.user, false));
+
+                        return null;
+                    }
+                }, AuthenticationUtil.SYSTEM_USER_NAME);
+            }
+        }, false, true);
+    }
+
+    @Test
+    public void testEnabledUser() throws Exception
+    {
+        final String username = transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<String>()
+        {
+            @Override
+            public String execute() throws Throwable
+            {
+                return AuthenticationUtil.runAs(new RunAsWork<String>()
+                {
+                    @Override
+                    public String doWork() throws Exception
+                    {
+                        return createPerson(true);
+                    }
+                }, AuthenticationUtil.SYSTEM_USER_NAME);
+            }
+        }, false, true);
+
+        // Mock a request with a username in the header
+        HttpServletRequest mockHttpRequest = mock(HttpServletRequest.class);
+        when(mockHttpRequest.getHeader("X-Alfresco-Remote-User")).thenReturn(username);
+        when(mockHttpRequest.getScheme()).thenReturn("http");
+        WebScriptServletRequest mockRequest = mock(WebScriptServletRequest.class);
+        when(mockRequest.getHttpServletRequest()).thenReturn(mockHttpRequest);
+
+        HttpServletResponse mockHttpResponse = mock(HttpServletResponse.class);
+        WebScriptServletResponse mockResponse = mock(WebScriptServletResponse.class);
+        when(mockResponse.getHttpServletResponse()).thenReturn(mockHttpResponse);
+
+        Authenticator authenticator = remoteUserAuthenticatorFactory.create(mockRequest, mockResponse);
+        assertTrue(authenticator.authenticate(RequiredAuthentication.user, false));
+    }
+
+    @Test
+    public void testLogInWithNonExistingPerson()
+    {
+        // Random non existing person
+        final String username = GUID.generate();
+
+        // Mock a request with a username in the header
+        HttpServletRequest mockHttpRequest = mock(HttpServletRequest.class);
+        when(mockHttpRequest.getHeader("X-Alfresco-Remote-User")).thenReturn(username);
+        when(mockHttpRequest.getScheme()).thenReturn("http");
+        WebScriptServletRequest mockRequest = mock(WebScriptServletRequest.class);
+        when(mockRequest.getHttpServletRequest()).thenReturn(mockHttpRequest);
+
+        HttpServletResponse mockHttpResponse = mock(HttpServletResponse.class);
+        WebScriptServletResponse mockResponse = mock(WebScriptServletResponse.class);
+        when(mockResponse.getHttpServletResponse()).thenReturn(mockHttpResponse);
+
+        Authenticator authenticator = remoteUserAuthenticatorFactory.create(mockRequest, mockResponse);
+        assertTrue("The non existing user should be authenticated.", authenticator.authenticate(RequiredAuthentication.user, false));
+        assertTrue("The user should be auto created.", personService.personExists(username));
+    }
+}
+
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/AbstractSiteServiceTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/AbstractSiteServiceTest.java
new file mode 100644
index 00000000000..5cf014528ae
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/AbstractSiteServiceTest.java
@@ -0,0 +1,145 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.site;
+
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.PropertyMap;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+import com.google.common.collect.Lists;
+
+/**
+ * Unit test for the Export Web Script API of the Site Object.
+ */
+public class AbstractSiteServiceTest extends BaseWebScriptTest
+{
+    protected MutableAuthenticationService authenticationService;
+    protected AuthenticationComponent authenticationComponent;
+    protected PersonService personService;
+
+    private static final String URL_SITES = "/api/sites";
+    private static final String URL_MEMBERSHIPS = "/memberships";
+
+    protected List<String> createdSites = Lists.newArrayList();
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        this.authenticationComponent = (AuthenticationComponent) getServer()
+                .getApplicationContext().getBean("authenticationComponent");
+        this.authenticationService = (MutableAuthenticationService) getServer()
+                .getApplicationContext().getBean("AuthenticationService");
+        this.personService = (PersonService) getServer().getApplicationContext().getBean(
+                "PersonService");
+
+        // sets the testMode property to true via spring injection. This will
+        // prevent emails
+        // from being sent from within this test case.
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+    }
+
+    protected void deleteSites() throws Exception 
+    {
+        // Tidy-up any sites create during the execution of the test
+        for (String shortName : this.createdSites)
+        {
+            sendRequest(new DeleteRequest(URL_SITES + "/" + shortName), 0);
+        }
+
+        // Clear the list
+        this.createdSites.clear();
+    }
+    
+    protected void createUser(String userName)
+    {
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            this.authenticationService.createAuthentication(userName, "PWD".toCharArray());
+            createPerson(userName);
+        }
+    }
+
+    protected void createPerson(String userName)
+    {
+        PropertyMap ppOne = new PropertyMap(4);
+        ppOne.put(ContentModel.PROP_USERNAME, userName);
+        ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+        ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+        ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+        ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+
+        this.personService.createPerson(ppOne);
+    }
+
+    protected void deleteUser(String username)
+    {
+        this.personService.deletePerson(username);
+        if (this.authenticationService.authenticationExists(username))
+        {
+            this.authenticationService.deleteAuthentication(username);
+        }
+    }
+
+    protected JSONObject createSite(String sitePreset, String shortName, String title,
+            String description, SiteVisibility visibility, int expectedStatus) throws Exception
+    {
+        JSONObject site = new JSONObject();
+        site.put("sitePreset", sitePreset);
+        site.put("shortName", shortName);
+        site.put("title", title);
+        site.put("description", description);
+        site.put("visibility", visibility.toString());
+        Response response = sendRequest(new PostRequest(URL_SITES, site.toString(),
+                "application/json"), expectedStatus);
+        this.createdSites.add(shortName);
+        return new JSONObject(response.getContentAsString());
+    }
+
+    protected void addSiteMember(String userName, String site) throws Exception
+    {
+        JSONObject membership = new JSONObject();
+        membership.put("role", SiteModel.SITE_CONSUMER);
+        JSONObject person = new JSONObject();
+        person.put("userName", userName);
+        membership.put("person", person);
+
+        sendRequest(new PostRequest(URL_SITES + "/" + site + URL_MEMBERSHIPS,
+                membership.toString(), "application/json"), 200);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/AllSiteTests.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/AllSiteTests.java
new file mode 100644
index 00000000000..dc84456ac3c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/AllSiteTests.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.site;
+
+import org.alfresco.repo.activities.SiteActivityTestCaseSensitivity;
+import org.alfresco.repo.activities.SiteActivityTestCaseInsensitivity;
+import org.alfresco.repo.site.SiteServiceImplMoreTest;
+import org.alfresco.repo.site.SiteServiceImplTest;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.repo.site.SiteMembershipTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * This class is a holder for the various test classes associated with the {@link SiteService}.
+ * It is not (at the time of writing) intended to be incorporated into the automatic build
+ * which will find the various test classes and run them individually.
+ * 
+ * @author Neil Mc Erlean
+ * @since 4.0
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    SiteServiceImplTest.class,
+    SiteServiceImplMoreTest.class,
+    SiteServiceTest.class,
+    SiteExportServiceTest.class,
+    SiteActivityTestCaseSensitivity.class,
+    SiteActivityTestCaseInsensitivity.class,
+    SiteMembershipTest.class
+})
+public class AllSiteTests
+{
+    // Intentionally empty
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/SiteExportServiceTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/SiteExportServiceTest.java
new file mode 100644
index 00000000000..5340baf8dce
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/SiteExportServiceTest.java
@@ -0,0 +1,185 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.site;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipInputStream;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.junit.Ignore;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+import com.google.common.collect.Lists;
+
+/**
+ * Unit test for the Export Web Script API of the Site Object.
+ */
+public class SiteExportServiceTest extends AbstractSiteServiceTest
+{
+    private static final String USER_FROM_LDAP = "SiteUserLdap";
+    private static final String USER_ONE = "SiteUser";
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        // Create users
+        createUser(USER_ONE);
+        createPerson(USER_FROM_LDAP);
+
+        // Do tests as admin
+        this.authenticationComponent.setCurrentUser("admin");
+    }
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        // Clear the users
+        deleteUser(USER_ONE);
+        deleteUser(USER_FROM_LDAP);
+                
+        //Delete the sites
+        deleteSites();
+    }
+    
+    public void testExportSiteWithMutipleUsers() throws Exception
+    {
+        // Create a site
+        String shortName = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+
+        // add a user and a person as members
+        addSiteMember(USER_FROM_LDAP, shortName);
+        addSiteMember(USER_ONE, shortName);
+
+        // Export site
+        Response response = sendRequest(new GetRequest(getExportUrl(shortName)), 200);
+
+        // check exported files
+        List<String> entries = getEntries(new ZipInputStream(new ByteArrayInputStream(
+                response.getContentAsByteArray())));
+        assertFalse(entries.contains("No_Users_In_Site.txt"));
+        assertFalse(entries.contains("No_Persons_In_Site.txt"));
+        assertTrue(entries.contains("People.acp"));
+        assertTrue(entries.contains(shortName + "-people.xml"));
+        assertTrue(entries.contains("Users.acp"));
+        assertTrue(entries.contains(shortName + "-users.xml"));
+    }
+
+    public void testExportSiteWithOneLDAPUser() throws Exception
+    {
+        // Create a site
+        String shortName = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+
+        // add a user synced from LDAP(authenticator node not present)
+        addSiteMember(USER_FROM_LDAP, shortName);
+
+        // Export site
+        Response response = sendRequest(new GetRequest(getExportUrl(shortName)), 200);
+
+        // check No_Users_In_Site.txt present
+        // because there is no user associated with the single member of the
+        // site
+        List<String> entries = getEntries(new ZipInputStream(new ByteArrayInputStream(
+                response.getContentAsByteArray())));
+        assertFalse(entries.contains("Users.acp"));
+        assertTrue(entries.contains("No_Users_In_Site.txt"));
+        assertTrue(entries.contains("People.acp"));
+        assertTrue(entries.contains(shortName + "-people.xml"));
+    }
+
+    public void testExportSiteWithNoUsers() throws Exception
+    {
+        // Create a site
+        String shortName = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+
+        // Export site
+        Response response = sendRequest(new GetRequest(getExportUrl(shortName)), 200);
+
+        // check No_Users_In_Site.txt and No_Persons_In_Site.txt present
+        List<String> entries = getEntries(new ZipInputStream(new ByteArrayInputStream(
+                response.getContentAsByteArray())));
+        assertTrue(entries.contains("No_Users_In_Site.txt"));
+        assertTrue(entries.contains("No_Persons_In_Site.txt"));
+        assertFalse(entries.contains("Users.acp"));
+        assertFalse(entries.contains("People.acp"));
+    }
+
+    private List<String> getEntries(ZipInputStream zipStream) throws Exception
+    {
+        ZipEntry entry = null;
+        List<String> entries = Lists.newArrayList();
+        while ((entry = zipStream.getNextEntry()) != null)
+        {
+            if (entry.getName().endsWith("acp"))
+            {
+                entries.addAll(getAcpEntries(zipStream));
+            }
+            entries.add(entry.getName());
+            zipStream.closeEntry();
+        }
+        zipStream.close();
+        return entries;
+    }
+
+    private List<String> getAcpEntries(InputStream inputStream) throws Exception
+    {
+        List<String> entries = Lists.newArrayList();
+        ZipInputStream zipInputStream = new ZipInputStream(inputStream);
+        ZipEntry entry = null;
+        try
+        {
+            while ((entry = zipInputStream.getNextEntry()) != null)
+            {
+                entries.add(entry.getName());
+            }
+        }
+        catch (ZipException e)
+        {
+            // ignore
+        }
+        return entries;
+    }
+
+    private String getExportUrl(String shortName)
+    {
+        return "/api/sites/" + shortName + "/export";
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
new file mode 100644
index 00000000000..1c842c2ad15
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
@@ -0,0 +1,1563 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.site;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import junit.framework.AssertionFailedError;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.AccessPermission;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.GUID;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.experimental.categories.Category;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Unit test to test site Web Script API of the Site Object.
+ * 
+ * @author Roy Wetherall
+ */
+@Category(LuceneTests.class)
+public class SiteServiceTest extends AbstractSiteServiceTest
+{    
+    private SiteService siteService;
+    private NodeService nodeService;
+    private PermissionService permissionService;
+    private AuthorityService authorityService;
+    private FileFolderService fileFolderService;
+    
+    private static final String USER_ONE = "SiteTestOne";
+    private static final String USER_TWO = "SiteTestTwo";
+    private static final String USER_THREE = "SiteTestThree";
+    private static final String USER_NUMERIC = "1234567890";
+    private static final String USER_FOUR_AS_SITE_ADMIN = "SiteAdmin";
+    
+    private static final String URL_SITES = "/api/sites";
+    private static final String URL_SITES_QUERY = URL_SITES + "/query";
+    private static final String URL_MEMBERSHIPS = "/memberships";
+    private static final String URL_SITES_ADMIN = "/api/admin-sites";
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        this.siteService = (SiteService)getServer().getApplicationContext().getBean("SiteService");
+        this.nodeService = (NodeService)getServer().getApplicationContext().getBean("NodeService");
+        this.permissionService = (PermissionService)getServer().getApplicationContext().getBean("PermissionService");
+        this.authorityService = (AuthorityService)getServer().getApplicationContext().getBean("AuthorityService");
+        this.fileFolderService = (FileFolderService)getServer().getApplicationContext().getBean("FileFolderService");
+
+        
+        // Create users
+        createUser(USER_ONE);
+        createUser(USER_TWO);
+        createUser(USER_THREE);
+        createUser(USER_NUMERIC);
+        createUser(USER_FOUR_AS_SITE_ADMIN);
+        
+        // Add user four as a member of the site admins group
+        authorityService.addAuthority("GROUP_SITE_ADMINISTRATORS", USER_FOUR_AS_SITE_ADMIN);
+        
+        // Do tests as user one
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        // Clear the users
+        deleteUser(USER_ONE);
+        deleteUser(USER_TWO);
+        deleteUser(USER_THREE);
+        deleteUser(USER_NUMERIC);
+        deleteUser(USER_FOUR_AS_SITE_ADMIN);
+        
+        //Delete the sites
+        deleteSites();
+    }
+
+    public void testCreateSite() throws Exception
+    {
+        String shortName  = GUID.generate();
+        
+        // Create a new site
+        JSONObject result = createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);        
+        assertEquals("myPreset", result.get("sitePreset"));
+        assertEquals(shortName, result.get("shortName"));
+        assertEquals("myTitle", result.get("title"));
+        assertEquals("myDescription", result.get("description"));
+        assertNotNull(result.get("node"));
+        assertNotNull(result.get("tagScope"));
+        assertEquals(SiteVisibility.PUBLIC.toString(), result.get("visibility"));
+        assertTrue(result.getBoolean("isPublic"));
+        
+        // Check for duplicate names
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 400); 
+    }
+    
+    public void testGetSites() throws Exception
+    {
+    	int preexistingSiteCount = 0;
+        Response response;
+		JSONArray result;
+		try {
+			response = sendRequest(new GetRequest(URL_SITES), 200);        
+			result = new JSONArray(response.getContentAsString());        
+			assertNotNull(result);
+			preexistingSiteCount = result.length();
+		} catch (AssertionFailedError e) {
+			//We don't mind if the first call fails, it's the rest of the calls that are important
+			assertEquals(0,preexistingSiteCount);
+		}
+        
+        createSite("myPreset", GUID.generate(), "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        createSite("myPreset", GUID.generate(), "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        createSite("myPreset", GUID.generate(), "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        createSite("myPreset", GUID.generate(), "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        createSite("myPreset", GUID.generate(), "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        
+        response = sendRequest(new GetRequest(URL_SITES), 200);        
+        result = new JSONArray(response.getContentAsString());        
+        assertNotNull(result);
+        assertEquals("Wrong site count", preexistingSiteCount + 5, result.length());
+        
+        response = sendRequest(new GetRequest(URL_SITES + "?size=3"), 200);        
+        result = new JSONArray(response.getContentAsString());        
+        assertNotNull(result);
+        assertEquals("Wrong site count (?size=3)", 3, result.length());        
+
+        response = sendRequest(new GetRequest(URL_SITES + "?size=13"), 200);        
+        result = new JSONArray(response.getContentAsString());        
+        assertNotNull(result);
+        assertEquals("Wrong site count (?size=13)", Math.min(13, preexistingSiteCount + 5), result.length());
+    }
+    
+    /**
+     * https://issues.alfresco.com/jira/browse/JAWS-456
+     */
+    public void testQuerySites() throws Exception
+    {
+        // Generate the short names of the sites
+        String[] shortNames = new String[]{GUID.generate(), GUID.generate(), GUID.generate(), GUID.generate(), GUID.generate()};
+        
+        // Create the sites
+        createSite("myPreset", shortNames[0], "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        createSite("myPreset", shortNames[1], "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        createSite("myPreset", shortNames[2], "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        createSite("myPreset", shortNames[3], "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        createSite("myPreset", shortNames[4], "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        
+        // build query json
+        JSONObject shortNameQuery = new JSONObject();
+        shortNameQuery.put("match", "exact");
+        JSONArray valuesArray = new JSONArray();
+        valuesArray.put(0, shortNames[0]);
+        valuesArray.put(1, shortNames[2]);
+        valuesArray.put(2, shortNames[4]);
+        valuesArray.put(3, "bobbins");
+        shortNameQuery.put("values", valuesArray);
+        JSONObject query = new JSONObject();
+        query.put("shortName", shortNameQuery);
+        
+        // execute site query
+        Response response = sendRequest(new PostRequest(URL_SITES_QUERY, query.toString(), "application/json"), 200);
+        JSONArray result = new JSONArray(response.getContentAsString());
+        
+        // check we have the results we expect
+        assertEquals(3, result.length());
+        Set<String> resultSet = new HashSet<String>();
+        for (int i=0; i<result.length(); i++)
+        {
+           resultSet.add((String)result.getJSONObject(i).get("shortName"));
+        }
+        assertTrue(resultSet.contains(shortNames[0]));
+        assertFalse(resultSet.contains(shortNames[1]));
+        assertTrue(resultSet.contains(shortNames[2]));
+        assertFalse(resultSet.contains(shortNames[3]));
+        assertTrue(resultSet.contains(shortNames[4]));
+        assertFalse(resultSet.contains("bobbins"));
+        
+        // sample one of the returned sites and check it's what we expect
+        JSONObject site = result.getJSONObject(0);
+        assertNotNull(site);
+        assertEquals("myPreset", site.get("sitePreset"));
+        assertEquals("myTitle", site.get("title"));
+        assertEquals("myDescription", site.get("description"));
+        assertNotNull(site.get("node"));
+        assertNotNull(site.get("tagScope"));
+        assertTrue(site.getBoolean("isPublic"));
+    }
+    
+    public void testGetSite() throws Exception
+    {
+        // Get a site that doesn't exist
+        sendRequest(new GetRequest(URL_SITES + "/" + "somerandomshortname"), 404);
+        
+        // Create a site and get it
+        String shortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName), 200);
+       
+    }
+    
+    public void testUpdateSite() throws Exception
+    {
+        // Create a site
+        String shortName  = GUID.generate();
+        JSONObject result = createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        
+        // Update the site
+        result.put("title", "abs123abc");
+        result.put("description", "123abc123");
+        result.put("visibility", SiteVisibility.PRIVATE.toString());
+        Response response = sendRequest(new PutRequest(URL_SITES + "/" + shortName, result.toString(), "application/json"), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals("abs123abc", result.get("title"));
+        assertEquals("123abc123", result.get("description"));
+        assertFalse(result.getBoolean("isPublic"));
+        assertEquals(SiteVisibility.PRIVATE.toString(), result.get("visibility"));
+        
+        // Try and get the site and double check it's changed
+        response = sendRequest(new GetRequest(URL_SITES + "/" + shortName), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals("abs123abc", result.get("title"));
+        assertEquals("123abc123", result.get("description"));
+        assertFalse(result.getBoolean("isPublic"));
+        assertEquals(SiteVisibility.PRIVATE.toString(), result.get("visibility"));
+    }
+    
+    public void testDeleteSite() throws Exception
+    {
+        // Delete non-existent site
+        sendRequest(new DeleteRequest(URL_SITES + "/" + "somerandomshortname"), 404);
+        
+        // Create a site
+        String shortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        
+        // Get the site
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName), 200);
+        
+        // Delete the site
+        sendRequest(new DeleteRequest(URL_SITES + "/" + shortName), 200);
+        
+        // Get the site
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName), 404);
+    }
+    
+    public void testGetMemberships() throws Exception
+    {
+        // Create a site
+        String shortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        
+        // Check the memberships
+        Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS), 200);
+        JSONArray result = new JSONArray(response.getContentAsString());        
+        assertNotNull(result);
+        assertEquals(1, result.length());
+        JSONObject membership = result.getJSONObject(0);
+        assertEquals(SiteModel.SITE_MANAGER, membership.get("role"));
+        assertEquals(USER_ONE, membership.getJSONObject("authority").get("userName"));        
+    }
+    
+    public void testPostMemberships() throws Exception
+    {
+        // Create a site
+        String shortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        
+        // Build the JSON membership object
+        JSONObject membership = new JSONObject();
+        membership.put("role", SiteModel.SITE_CONSUMER);
+        JSONObject person = new JSONObject();
+        person.put("userName", USER_TWO);
+        membership.put("person", person);
+        
+        // Post the membership
+        Response response = sendRequest(new PostRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, membership.toString(), "application/json"), 200);
+        
+        // Check the result
+        assertEquals(SiteModel.SITE_CONSUMER, membership.get("role"));
+        assertEquals(USER_TWO, membership.getJSONObject("person").get("userName")); 
+        
+        // Get the membership list
+        response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS), 200);   
+        JSONArray result2 = new JSONArray(response.getContentAsString());
+        assertNotNull(result2);
+        assertEquals(2, result2.length());
+        
+        
+        // Add another user, with a fully numeric username
+        membership = new JSONObject();
+        membership.put("role", SiteModel.SITE_CONTRIBUTOR);
+        person = new JSONObject();
+        person.put("userName", USER_NUMERIC);
+        membership.put("person", person);
+        response = sendRequest(new PostRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, membership.toString(), "application/json"), 200);
+        
+        // Check the details are correct for one user
+        membership = new JSONObject(response.getContentAsString());
+        assertEquals(SiteModel.SITE_CONTRIBUTOR, membership.get("role"));
+        assertEquals(USER_NUMERIC, membership.getJSONObject("authority").get("userName"));
+        
+        
+        // Check the membership list
+        response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS), 200);
+        String json = response.getContentAsString();
+        JSONArray result3 = new JSONArray(json);
+        assertNotNull(result3);
+        assertEquals(3, result3.length());
+        
+        // Check the everyone has the correct membership
+        // (The webscript returns the users in order to make testing easier)
+        Map<String, JSONObject> membershipMap = new HashMap<String, JSONObject>();
+        for (int i = 0 ; i < membership.length(); i++)
+        {
+            membershipMap.put(result3.getJSONObject(i).getString("role"), result3.getJSONObject(i));
+        }
+
+        membership = membershipMap.get(SiteModel.SITE_MANAGER);
+        assertNotNull("The response did not contain " + SiteModel.SITE_MANAGER, membership);
+        assertEquals(USER_ONE, membership.getJSONObject("authority").get("userName"));
+        
+        membership = membershipMap.get(SiteModel.SITE_CONSUMER);
+        assertNotNull("The response did not contain " + SiteModel.SITE_CONSUMER, membership);
+        assertEquals(USER_TWO, membership.getJSONObject("authority").get("userName"));
+        
+        membership = membershipMap.get(SiteModel.SITE_CONTRIBUTOR);
+        assertNotNull("The response did not contain " + SiteModel.SITE_CONTRIBUTOR, membership);
+        assertEquals(USER_NUMERIC, membership.getJSONObject("authority").get("userName"));
+    }
+    
+    public void testGetMembership() throws Exception
+    {
+        // Create a site
+        String shortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        
+        // Test error conditions
+        sendRequest(new GetRequest(URL_SITES + "/badsite" + URL_MEMBERSHIPS + "/" + USER_ONE), 404);
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS + "/baduser"), 404);
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS + "/" + USER_TWO), 404);
+        
+        Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS + "/" + USER_ONE), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        
+        // Check the result
+        assertEquals(SiteModel.SITE_MANAGER, result.get("role"));
+        assertEquals(USER_ONE, result.getJSONObject("authority").get("userName")); 
+    }
+    
+    public void testPutMembership() throws Exception
+    {
+        // Create a site
+        String shortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+                
+        // Build the JSON membership object
+        JSONObject membership = new JSONObject();
+        membership.put("role", SiteModel.SITE_CONSUMER);
+        JSONObject person = new JSONObject();
+        person.put("userName", USER_TWO);
+        membership.put("person", person);
+        
+        // Post the membership
+        Response response = sendRequest(new PostRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, membership.toString(), "application/json"), 200);
+        JSONObject newMember = new JSONObject(response.getContentAsString());
+        
+        // Update the role by returning the data.
+        newMember.put("role", SiteModel.SITE_COLLABORATOR);
+        response = sendRequest(new PutRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, newMember.toString(), "application/json"), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        
+        // Check the result
+        assertEquals(SiteModel.SITE_COLLABORATOR, result.get("role"));
+        assertEquals(USER_TWO, result.getJSONObject("authority").get("userName"));
+        
+        // Double check and get the membership for user two
+        response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS + "/" + USER_TWO), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(SiteModel.SITE_COLLABORATOR, result.get("role"));
+        assertEquals(USER_TWO, result.getJSONObject("authority").get("userName"));
+        
+    }
+    
+    public void testGroupMembership() throws Exception
+    {
+        String testGroup = "SiteServiceTestGroupA";
+        String testGroupName = "GROUP_" + testGroup;
+        
+        if(!authorityService.authorityExists(testGroupName))
+        {
+            this.authenticationComponent.setSystemUserAsCurrentUser();
+             
+            testGroupName = authorityService.createAuthority(AuthorityType.GROUP, testGroup, testGroup, authorityService.getDefaultZones());
+        }       
+         
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+
+        // CRUD a membership group for a web site
+        // Create a site
+        String shortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+                
+        // Build the JSON membership object
+        JSONObject membership = new JSONObject();
+        membership.put("role", SiteModel.SITE_CONSUMER);
+        JSONObject group = new JSONObject();
+        group.put("fullName", testGroupName);
+        membership.put("group", group);
+        
+        // Create a new group membership
+        {
+            Response response = sendRequest(new PostRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, membership.toString(), "application/json"), 200);
+            JSONObject newMember = new JSONObject(response.getContentAsString());
+        
+            // Validate the return value
+            assertEquals("role not correct", SiteModel.SITE_CONSUMER, newMember.getString("role"));
+            JSONObject newGroup = newMember.getJSONObject("authority");
+            assertNotNull("newGroup");
+            assertEquals("full name not correct", testGroupName, newGroup.getString("fullName"));
+            assertEquals("authorityType not correct", "GROUP", newGroup.getString("authorityType"));
+            
+
+            // Now send the returned value back with a new role (COLLABORATOR)
+            newMember.put("role", SiteModel.SITE_COLLABORATOR);
+            response = sendRequest(new PutRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, newMember.toString(), "application/json"), 200);
+            JSONObject updateResult = new JSONObject(response.getContentAsString());
+            assertEquals("role not correct", SiteModel.SITE_COLLABORATOR, updateResult.getString("role"));
+            
+        }
+        
+        // Now List membership to show the group from above.
+        {
+            Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS), 200);   
+            JSONArray listResult = new JSONArray(response.getContentAsString());
+            
+            /**
+             * The result should have at least 2 elements, 1 for the user who created and 1 for the group added above
+             */
+            assertTrue("result too small", listResult.length() >= 2);
+            for(int i = 0; i < listResult.length(); i++)
+            {
+                JSONObject obj = listResult.getJSONObject(i);
+                JSONObject authority = obj.getJSONObject("authority");
+                if(authority.getString("authorityType").equals("GROUP"))
+                {
+                    assertEquals("full name not correct", testGroupName, authority.getString("fullName"));
+                    
+                }
+                if(authority.getString("authorityType").equals("USER"))
+                {
+                    assertEquals("full name not correct", USER_ONE, authority.getString("fullName"));
+                }
+            }
+        }
+        
+        // Now get the group membership from above
+        // Now List membership to show the group from above.
+        {
+            Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS + '/' + testGroupName), 200);   
+            JSONObject getResult = new JSONObject(response.getContentAsString());
+            System.out.println(response.getContentAsString());
+            JSONObject grp = getResult.getJSONObject("authority");
+            assertEquals("full name not correct", testGroupName, grp.getString("fullName"));
+        }
+        
+        // cleanup
+        if(authorityService.authorityExists(testGroupName))
+        {
+            this.authenticationComponent.setSystemUserAsCurrentUser();
+            authorityService.deleteAuthority(testGroupName);
+        }    
+    }
+    
+    public void testDeleteMembership() throws Exception
+    {
+        // Create a site
+        String shortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+     
+        // Build the JSON membership object
+        JSONObject membership = new JSONObject();
+        membership.put("role", SiteModel.SITE_CONSUMER);
+        JSONObject person = new JSONObject();
+        person.put("userName", USER_TWO);
+        membership.put("person", person);
+        
+        // Post the membership
+        sendRequest(new PostRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, membership.toString(), "application/json"), 200);
+        
+        // Delete the membership
+        sendRequest(new DeleteRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS + "/" + USER_TWO), 200);
+        
+        // Check that the membership has been deleted
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS + "/" + USER_TWO), 404);
+        
+    }
+    
+    public void testGetPersonSites() throws Exception
+    {
+        // Create a site
+        String shortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        String shortName2  = GUID.generate();
+        createSite("myPreset", shortName2, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        
+        Response response = sendRequest(new GetRequest("/api/people/" + USER_TWO + "/sites"), 200);
+        JSONArray result = new JSONArray(response.getContentAsString());
+        
+        assertNotNull(result);
+        assertEquals(0, result.length());
+        
+        // Add some memberships
+        JSONObject membership = new JSONObject();
+        membership.put("role", SiteModel.SITE_CONSUMER);
+        JSONObject person = new JSONObject();
+        person.put("userName", USER_TWO);
+        membership.put("person", person);
+        sendRequest(new PostRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, membership.toString(), "application/json"), 200);
+        membership = new JSONObject();
+        membership.put("role", SiteModel.SITE_CONSUMER);
+        person = new JSONObject();
+        person.put("userName", USER_TWO);
+        membership.put("person", person);
+        sendRequest(new PostRequest(URL_SITES + "/" + shortName2 + URL_MEMBERSHIPS, membership.toString(), "application/json"), 200);        
+        
+        response = sendRequest(new GetRequest("/api/people/" + USER_TWO + "/sites"), 200);
+        result = new JSONArray(response.getContentAsString());
+        
+        assertNotNull(result);
+        assertEquals(2, result.length());
+        
+        response = sendRequest(new GetRequest("/api/people/" + USER_ONE + "/sites"), 200);
+        result = new JSONArray(response.getContentAsString());
+        
+        assertNotNull(result);
+        assertEquals(2, result.length());
+        
+        response = sendRequest(new GetRequest("/api/people/" + USER_THREE + "/sites"), 200);
+        result = new JSONArray(response.getContentAsString());
+        
+        assertNotNull(result);
+        assertEquals(0, result.length());
+        
+        response = sendRequest(new GetRequest("/api/people/" + USER_ONE + "/sites?size=1"), 200);
+        result = new JSONArray(response.getContentAsString());
+        
+        assertNotNull(result);
+        assertEquals(1, result.length());
+        
+        response = sendRequest(new GetRequest("/api/people/" + USER_ONE + "/sites?size=5"), 200);
+        result = new JSONArray(response.getContentAsString());
+        
+        assertNotNull(result);
+        assertEquals(2, result.length());
+    }   
+    
+    /**
+     * @since 4.0
+     */
+    public void testGetPotentialMemberships() throws Exception
+    {
+        // Create a site
+        String shortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        
+        // Check the memberships
+        String filter = "";
+        String authorityType = "GROUP";
+        String url = "/api/sites/" + shortName + "/potentialmembers?filter=" + filter + "&amp;maxResults=10&amp;authorityType=" + authorityType;
+        Response response = sendRequest(new GetRequest(url), 200);
+        final String contentAsString = response.getContentAsString();
+        JSONObject result = new JSONObject(contentAsString);
+        assertNotNull(result);
+        JSONArray people = result.getJSONArray("people");
+        assertNotNull("people array was null", people);
+        
+        JSONArray data = result.getJSONArray("data");
+        assertNotNull("data array was null", data);
+        
+        // Delete the site
+        sendRequest(new DeleteRequest(URL_SITES + "/" + shortName), 200);
+    }
+    
+    public void testSiteCustomProperties()
+        throws Exception
+    {
+        QName custPropSingle = QName.createQName(SiteModel.SITE_CUSTOM_PROPERTY_URL, "additionalInformation");
+        QName custPropMuliple = QName.createQName(SiteModel.SITE_CUSTOM_PROPERTY_URL, "siteTags");
+        
+        // Create a site with custom properties, one single and one multiple
+        SiteInfo siteInfo = this.siteService.createSite("testPreset", "mySiteWithCustomProperty2", "testTitle", "testDescription", SiteVisibility.PUBLIC);
+        NodeRef siteNodeRef = siteInfo.getNodeRef();
+        Map<QName, Serializable> properties = new HashMap<QName, Serializable>(1);
+        properties.put(custPropSingle, "information");
+        properties.put(custPropMuliple, (Serializable)Arrays.asList(new String[]{ "tag1", "tag2", "tag333" }));
+        this.nodeService.addAspect(siteNodeRef, QName.createQName(SiteModel.SITE_MODEL_URL, "customSiteProperties"), properties);
+        this.createdSites.add("mySiteWithCustomProperty2");
+        
+        // Get the detail so of the site
+        Response response = sendRequest(new GetRequest(URL_SITES + "/mySiteWithCustomProperty2"), 200);
+        JSONObject result = new JSONObject(response.getContentAsString());
+        assertNotNull(result);
+        JSONObject customProperties = result.getJSONObject("customProperties");
+        assertNotNull(customProperties);
+        JSONObject addInfo = customProperties.getJSONObject("{http://www.alfresco.org/model/sitecustomproperty/1.0}additionalInformation");
+        assertNotNull(addInfo);
+        assertEquals("{http://www.alfresco.org/model/sitecustomproperty/1.0}additionalInformation", addInfo.get("name"));
+        assertEquals("information", addInfo.get("value"));
+        assertEquals("{http://www.alfresco.org/model/dictionary/1.0}text", addInfo.get("type"));
+        assertEquals("Additional Site Information", addInfo.get("title"));
+        
+        JSONObject tags = customProperties.getJSONObject("{http://www.alfresco.org/model/sitecustomproperty/1.0}siteTags");
+        assertNotNull(tags);
+        assertEquals("{http://www.alfresco.org/model/sitecustomproperty/1.0}siteTags", tags.get("name"));
+        assertEquals(JSONObject.NULL, tags.get("type"));
+        assertEquals(JSONObject.NULL, tags.get("title"));
+        // TODO Fix ALF-2707 so this works
+        System.err.println(response.getContentAsString());
+//        JSONArray tagsA = tags.getJSONArray("value");
+//        assertEquals(3, tagsA.length());
+//        assertEquals("tag1", tagsA.getString(0));
+//        assertEquals("tag2", tagsA.getString(1));
+//        assertEquals("tag333", tagsA.getString(2));
+    }
+    
+    /*
+     * MNT-10917
+     * Check permissions of node after move/copy action from "Repository" to any site.
+     * Note: permissions should be remain
+     */
+    public void testCheckPermissionsAfterCopy()
+            throws Exception
+    {
+        AuthenticationUtil.pushAuthentication();
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        String groupName = AuthorityType.GROUP.getPrefixString() + "_" + GUID.generate().substring(0, 5).trim();
+        String createdAuth = authorityService.createAuthority(AuthorityType.GROUP, groupName);
+        NodeRef fileNode = null, 
+                siteDocLib = null, 
+                copiedNode = null, 
+                movedNode = null;
+        try
+        {
+            fileNode = createRepoFile();
+            siteDocLib = createTestSite();
+            addPermissionsToFile(fileNode, createdAuth, SiteModel.SITE_CONTRIBUTOR, true);
+            checkPermissions(fileNode, createdAuth, SiteModel.SITE_CONTRIBUTOR, "before copy");
+            
+            copiedNode = copyToSite(fileNode, siteDocLib);
+            checkPermissions(copiedNode, createdAuth, SiteModel.SITE_CONTRIBUTOR, "after copy");
+            
+            nodeService.deleteNode(copiedNode);
+            copiedNode = null;
+            checkPermissions(fileNode, createdAuth, SiteModel.SITE_CONTRIBUTOR, "before move");
+            movedNode = moveToSite(fileNode, siteDocLib);
+            checkPermissions(movedNode, createdAuth, SiteModel.SITE_CONTRIBUTOR, "after move");
+        }
+        finally
+        {
+            if (fileNode != null)
+            {
+                nodeService.deleteNode(fileNode);
+            }
+            if (siteDocLib != null)
+            {
+                nodeService.deleteNode(siteDocLib);
+            }
+            AuthenticationUtil.popAuthentication();
+        }
+    }
+    
+    private NodeRef copyToSite(NodeRef fileRef, NodeRef destRef) throws Exception
+    {
+        FileInfo copiedFileInfo = fileFolderService.copy(fileRef, destRef, null);
+        return copiedFileInfo.getNodeRef();
+    }
+    
+    private NodeRef moveToSite(NodeRef fileRef, NodeRef destRef) throws Exception
+    {
+        FileInfo movedFileInfo = fileFolderService.move(fileRef, destRef, null);
+        return movedFileInfo.getNodeRef();
+    }
+
+    private void checkPermissions(NodeRef nodeRef, String necessatyAuth, String expectedPermission, String actionInfo)
+    {
+        Set<AccessPermission> allSetPermissions = permissionService.getAllSetPermissions(nodeRef);
+        for (AccessPermission perm : allSetPermissions)
+        {
+            String authority = perm.getAuthority();
+            if (necessatyAuth.equals(authority))
+            {
+                if (expectedPermission.equals(perm.getPermission()))
+                {
+                    return;
+                }
+                fail("Expected permissions for authority \"" + necessatyAuth + "\" are incorrect. Expected: " + expectedPermission + ", but actual permission: "
+                        + perm.getPermission() + ". Check position: " + actionInfo);
+            }
+        }
+        fail("Expected authority \"" + necessatyAuth + "\" wasn't found. Check position: " + actionInfo);
+    }
+        
+    private void addPermissionsToFile(NodeRef nodeRef, String user, String permission, boolean isAllowed)
+    {
+        permissionService.setPermission(nodeRef, user, permission, isAllowed);
+    }
+
+    private NodeRef createTestSite()
+    {
+        String sName = GUID.generate();
+        // Create a public site
+        this.siteService.createSite("testSitePreset", sName, sName, sName, SiteVisibility.PUBLIC);
+        NodeRef siteContainer = this.siteService.createContainer(sName, "testContainer", ContentModel.TYPE_FOLDER, null);
+        return siteContainer;
+    }
+
+    private NodeRef createRepoFile()
+    {
+        NodeRef rootNodeRef = this.nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+        // create temporary folder
+        NodeRef workingRootNodeRef = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName(NamespaceService.ALFRESCO_URI, "working root"),
+                ContentModel.TYPE_FOLDER).getChildRef();
+
+        String fName = GUID.generate();
+        Map<QName, Serializable> properties = new HashMap<QName, Serializable>(11);
+        properties.put(ContentModel.PROP_NAME, (Serializable) fName);
+        QName assocQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName.createValidLocalName(fName));
+        // create empy file
+        ChildAssociationRef assocRef = nodeService.createNode(workingRootNodeRef, ContentModel.ASSOC_CONTAINS, assocQName, ContentModel.TYPE_CONTENT, properties);
+
+        return assocRef.getChildRef();
+    }
+
+    /**
+     * End to end sanity check of web site invitation.
+     * 
+     * Nominated and Moderated invitations.
+     * 
+     * @throws Exception
+     */
+    public void testInvitationSanityCheck() throws Exception
+    {
+        String shortName  = GUID.generate();
+        String secondShortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        createSite("myPreset", secondShortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        
+        String inviteComments = "Please sir, let me in";
+        String userName = USER_TWO;
+        String roleName = SiteModel.SITE_CONSUMER;
+        
+        String inviteeFirstName = "Buffy";
+        String inviteeLastName = "Summers";
+        String inviteeEmail = "buffy@sunnydale";
+        String inviteeUserName = userName;
+        String serverPath = "http://localhost:8081/share/";
+        String acceptURL = "page/accept-invite";
+        String rejectURL = "page/reject-invite";
+        
+        //Create a new moderated invitation
+        String moderatedId = createModeratedInvitation(secondShortName, inviteComments, userName, roleName);
+        
+        // Get the moderated invitation
+        sendRequest(new GetRequest(URL_SITES + "/" + secondShortName + "/invitations/" + moderatedId), 200);
+        
+        // search for the moderated invitation 
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations?inviteeUserName=" + userName), 200);
+        
+        // Create a nominated invitation
+        String nominatedId = createNominatedInvitation(shortName, inviteeFirstName, inviteeLastName, inviteeEmail, inviteeUserName, roleName, serverPath, acceptURL, rejectURL, 201);
+        
+        // Search for all invitations on this site
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations"), 200);
+        
+        // cancel the moderated invitation
+        sendRequest(new DeleteRequest(URL_SITES + "/" + secondShortName + "/invitations/" + moderatedId), 200);   
+    }
+    
+    /**
+     * Detailed Test of Get Invitation Web Script
+     * @throws Exception
+     */
+    public void testGetInvitation() throws Exception
+    {
+        String shortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        
+        /*
+         * Create a new moderated invitation
+         */
+        String inviteeComments = "Please sir, let $* me in";
+        String userName = USER_TWO;
+        String roleName = SiteModel.SITE_CONSUMER;
+        String inviteId = createModeratedInvitation(shortName, inviteeComments, userName, roleName);
+              
+        /*
+         * Negative test - site does not exist
+         */
+        sendRequest(new GetRequest(URL_SITES + "/rubbish/invitations/" + inviteId), 404);
+        
+        /*
+         * Negative test - site does exist but invitation doesn't
+         */
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations/activiti$8787487"), 404);
+        
+        /*
+         * Negative test - site does exist but invitation engine is wrong
+         */
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations/trash$123"), 404);
+        
+        /*
+         * Negative test - site does exist but invitation doesn't  no $ in inviteId
+         */
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations/trash123"), 404);
+        
+        /*
+         * Positive test - get the invitation and validate that it is correct
+         */
+        {
+            Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations/" + inviteId), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            //System.out.println(response.getContentAsString());
+            JSONObject data = top.getJSONObject("data");
+            assertNotNull("data is null", data);
+            assertEquals("inviteId is not set", data.getString("inviteId"), inviteId);
+            assertEquals("invitationType", "MODERATED", data.getString("invitationType"));
+            assertEquals("inviteeUserName is not set", userName, data.getString("inviteeUserName"));
+            assertEquals("resourceName is not correct", shortName, data.getString("resourceName"));
+            assertEquals("resourceType is not correct", "WEB_SITE", data.getString("resourceType"));
+            // Moderated specific properties
+            assertEquals("inviteeComments", inviteeComments, data.getString("inviteeComments"));
+            assertEquals("roleName is not set", roleName, data.getString("roleName"));
+
+        }
+        
+        /*
+         * Cancel the invitation
+         */
+        sendRequest(new DeleteRequest(URL_SITES + "/" + shortName + "/invitations/" + inviteId), 200);
+        
+        /*
+         * Verify that the invitation is no longer open
+         */
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations/" + inviteId), 404);
+        
+        /**
+         * Create a nominated invitation
+         */
+        String inviteeFirstName = "Buffy";
+        String inviteeLastName = "Summers";
+        String inviteeEmail = "FirstName123.LastName123@email.com";
+        String inviteeUserName = null;
+        String serverPath = "http://localhost:8081/share/";
+        String acceptURL = "page/accept-invite";
+        String rejectURL = "page/reject-invite";
+        inviteId = createNominatedInvitation(shortName, inviteeFirstName, inviteeLastName, inviteeEmail, inviteeUserName, roleName, serverPath, acceptURL, rejectURL, 201);
+        
+        /*
+         * Positive test - get the invitation and validate that it is correct
+         * inviteId and inviteeUserName will be generated.
+         */
+        {
+            Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations/" + inviteId), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            //System.out.println(response.getContentAsString());
+            JSONObject data = top.getJSONObject("data");
+            assertNotNull("data is null", data);
+            assertEquals("inviteId is not set", data.getString("inviteId"), inviteId);
+            assertEquals("invitationType", "NOMINATED", data.getString("invitationType"));
+            assertEquals("resourceName is not correct", shortName, data.getString("resourceName"));
+            assertEquals("resourceType is not correct", "WEB_SITE", data.getString("resourceType"));
+            
+            // Nominated specific attributes
+            assertEquals("roleName is not set", roleName, data.getString("roleName"));
+            // Generated user name
+            assertNotNull("inviteeUserName is not set", data.getString("inviteeUserName"));
+            
+        }
+        
+        /*
+         * Cancel the nominated invitation
+         */
+        sendRequest(new DeleteRequest(URL_SITES + "/" + shortName + "/invitations/" + inviteId), 200);
+                       
+    }
+    
+    public void testInviteDisabledUser() throws Exception
+    {
+        AuthenticationUtil.pushAuthentication();
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        String username = "testUser" + System.nanoTime();
+        String siteShortName = GUID.generate();
+        try
+        {
+            createUser(username);
+            createSite("myPreset", siteShortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+
+            NodeRef personNodeRef = personService.getPerson(username);
+            String firstName = (String) nodeService.getProperty(personNodeRef, ContentModel.PROP_FIRSTNAME);
+            String lastName = (String) nodeService.getProperty(personNodeRef, ContentModel.PROP_LASTNAME);
+            String email = (String) nodeService.getProperty(personNodeRef, ContentModel.PROP_EMAIL);
+            String serverPath = "http://localhost:8081/share/";
+            String acceptURL = "page/accept-invite";
+            String rejectURL = "page/reject-invite";
+
+            authenticationService.setAuthenticationEnabled(username, false);
+            createNominatedInvitation(siteShortName, firstName, lastName, email, username, SiteModel.SITE_CONSUMER, serverPath, acceptURL, rejectURL, 409);
+            fail("The user " + username + " is disabled and cannot be invited");
+        }
+        catch (JSONException e)
+        {
+            // expected
+        }
+        finally
+        {
+            siteService.deleteSite(siteShortName);
+            deleteUser(username);
+            AuthenticationUtil.popAuthentication();
+        }
+    }
+    
+    /**
+     * Detailed Test of List Invitation Web Script.
+     * @throws Exception
+     */
+    public void testListInvitation() throws Exception
+    {
+        String shortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        
+        String inviteeComments = "Please sir, let $* me in";
+        String userName = USER_TWO;
+        String roleName = SiteModel.SITE_CONSUMER;
+        String moderatedIdA = createModeratedInvitation(shortName, inviteeComments, userName, roleName);
+        
+        String inviteeCommentsB = "Please sir, let $* me in";
+        String userNameB = USER_THREE;
+        String roleNameB = SiteModel.SITE_CONSUMER;
+        String moderatedIdB = createModeratedInvitation(shortName, inviteeCommentsB, userNameB, roleNameB);
+        
+        String inviteeFirstName = "Buffy";
+        String inviteeLastName = "Summers";
+        String inviteeEmail = "buffy@sunnydale";
+        String inviteeUserName = userName;
+        String serverPath = "http://localhost:8081/share/";
+        String acceptURL = "page/accept-invite";
+        String rejectURL = "page/reject-invite";
+        
+        // Create a nominated invitation
+        String nominatedId = createNominatedInvitation(shortName, inviteeFirstName, inviteeLastName, inviteeEmail, inviteeUserName, roleName, serverPath, acceptURL, rejectURL, 201);
+        
+        /**
+         * search by user - negative test wombat does not have an invitation 
+         */
+        {
+            Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations?inviteeUserName=wombat"), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            JSONArray data = top.getJSONArray("data");
+            assertEquals("user wombat", data.length(), 0);
+            
+        }
+        /**
+         * search by user - find USER_TWO's invitation
+         */
+        {
+            Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations?inviteeUserName=" + USER_TWO), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            //System.out.println(response.getContentAsString());
+            JSONArray data = top.getJSONArray("data");
+            assertEquals("user two invitation not found", 1, data.length());
+            JSONObject first = data.getJSONObject(0);
+            assertEquals("userid is wrong", first.getString("inviteeUserName"), USER_TWO);
+            
+        }
+        
+        /**
+         * search by type - should find two moderated invitations
+         */
+
+        {
+            Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations?invitationType=MODERATED"), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            //System.out.println(response.getContentAsString());
+            JSONArray data = top.getJSONArray("data");
+            assertEquals("two moderated invitations not found", data.length(), 2);
+        }
+        
+        // negative test - unknown invitationType
+        {
+            Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations?invitationType=Crap"), 500);
+            JSONObject top = new JSONObject(response.getContentAsString());
+        }
+        
+        /**
+         * search by user and type
+         */
+        {
+            Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations?inviteeUserName=" + USER_TWO + "&invitationType=MODERATED"), 200);
+            JSONObject top = new JSONObject(response.getContentAsString());
+            //System.out.println(response.getContentAsString());
+            JSONArray data = top.getJSONArray("data");
+            assertEquals("user two invitation not found", data.length(), 1);
+            JSONObject first = data.getJSONObject(0);
+            assertEquals("first userid is wrong", first.getString("inviteeUserName"), USER_TWO);
+            assertEquals("type is wrong", first.getString("invitationType"), "MODERATED"); 
+        }      
+    }
+    
+    /**
+     * Detailed test of Create Invitation Web Script
+     * 
+     * Create Nominated Invitation
+     * 
+     * Create Moderated Invitation
+     * 
+     * @throws Exception
+     */
+    public void testCreateInvitation() throws Exception
+    {
+        String shortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        
+
+        String inviteComments = "Please sir, let me in";
+        String userName = USER_TWO;
+        String roleName = SiteModel.SITE_CONSUMER;
+        String inviteId = null;
+
+        /*
+         * Negative test - wrong invitation type
+         */
+        {
+            JSONObject newInvitation = new JSONObject();
+            newInvitation.put("invitationType", "Grundge");
+            newInvitation.put("inviteeRoleName", roleName);
+            newInvitation.put("inviteeComments", inviteComments);
+            newInvitation.put("inviteeUserName", userName);
+            sendRequest(new PostRequest(URL_SITES + "/" + shortName + "/invitations",  newInvitation.toString(), "application/json"), Status.STATUS_BAD_REQUEST);   
+        }
+        
+        /*
+         * Negative test - missing Invitation type
+         */
+        {
+            JSONObject newInvitation = new JSONObject();
+            newInvitation.put("inviteeRoleName", roleName);
+            newInvitation.put("inviteeComments", inviteComments);
+            newInvitation.put("inviteeUserName", userName);
+            sendRequest(new PostRequest(URL_SITES + "/" + shortName + "/invitations",  newInvitation.toString(), "application/json"), Status.STATUS_BAD_REQUEST);   
+        }
+        
+        /*
+         * Negative test - blank RoleName
+         */
+        {
+            JSONObject newInvitation = new JSONObject();
+            newInvitation.put("invitationType", "MODERATED");
+            newInvitation.put("inviteeRoleName", "");
+            newInvitation.put("inviteeComments", inviteComments);
+            newInvitation.put("inviteeUserName", userName);
+            sendRequest(new PostRequest(URL_SITES + "/" + shortName + "/invitations",  newInvitation.toString(), "application/json"), Status.STATUS_BAD_REQUEST);   
+        }
+        
+        /*
+         * Create a new moderated invitation
+         */
+        JSONObject newInvitation = new JSONObject();
+        {
+            newInvitation.put("invitationType", "MODERATED");
+            newInvitation.put("inviteeRoleName", roleName);
+            newInvitation.put("inviteeComments", inviteComments);
+            newInvitation.put("inviteeUserName", userName);
+            Response response = sendRequest(new PostRequest(URL_SITES + "/" + shortName + "/invitations",  newInvitation.toString(), "application/json"), Status.STATUS_CREATED);   
+            JSONObject top = new JSONObject(response.getContentAsString());
+            JSONObject data = top.getJSONObject("data");
+            inviteId = data.getString("inviteId");
+            assertEquals("invitationType", "MODERATED", data.getString("invitationType"));
+            assertEquals("inviteeUserName is not set", userName, data.getString("inviteeUserName"));
+            assertEquals("resourceName is not correct", shortName, data.getString("resourceName"));
+            assertEquals("resourceType is not correct", "WEB_SITE", data.getString("resourceType"));
+            
+        }
+        assertNotNull("inviteId is null", inviteId);
+        assertTrue("inviteId is too small", inviteId.length() > 0);
+        
+    }    
+    
+    private String createNominatedInvitation(String siteName, String inviteeFirstName, String inviteeLastName, String inviteeEmail, String inviteeUserName, String inviteeRoleName, String serverPath, String acceptURL, String rejectURL, int expectedStatus) throws Exception
+    {
+        /*
+         * Create a new nominated invitation
+         */
+        JSONObject newInvitation = new JSONObject();
+        
+        newInvitation.put("invitationType", "NOMINATED");
+        newInvitation.put("inviteeRoleName", inviteeRoleName);
+        if(inviteeUserName != null)
+        {
+            // nominate an existing user
+            newInvitation.put("inviteeUserName", inviteeUserName);
+        }
+        else
+        {
+            // nominate someone else
+            newInvitation.put("inviteeFirstName", inviteeFirstName);
+            newInvitation.put("inviteeLastName", inviteeLastName);
+            newInvitation.put("inviteeEmail", inviteeEmail);
+        }
+        newInvitation.put("serverPath", serverPath);
+        newInvitation.put("acceptURL", acceptURL);
+        newInvitation.put("rejectURL", rejectURL);    
+        
+        Response response = sendRequest(new PostRequest(URL_SITES + "/" + siteName + "/invitations",  newInvitation.toString(), "application/json"), expectedStatus);
+        JSONObject top = new JSONObject(response.getContentAsString());
+        JSONObject data = top.getJSONObject("data");
+        String inviteId = data.getString("inviteId");
+        
+        return inviteId;
+    }
+    
+    private String createModeratedInvitation(String siteName, String inviteeComments, String inviteeUserName, String inviteeRoleName) throws Exception
+    {
+        /*
+         * Create a new moderated invitation
+         */
+        JSONObject newInvitation = new JSONObject();
+        
+        newInvitation.put("invitationType", "MODERATED");
+        newInvitation.put("inviteeRoleName", inviteeRoleName);
+        newInvitation.put("inviteeComments", inviteeComments);
+        newInvitation.put("inviteeUserName", inviteeUserName);
+        Response response = sendRequest(new PostRequest(URL_SITES + "/" + siteName + "/invitations",  newInvitation.toString(), "application/json"), 201);   
+        JSONObject top = new JSONObject(response.getContentAsString());
+        JSONObject data = top.getJSONObject("data");
+        String inviteId = data.getString("inviteId");
+        
+        return inviteId;
+    }
+    
+    public void testGetMemberInfo() throws Exception
+    {
+        String testGroup = "SiteServiceTestGroupA";
+        String testGroupName = "GROUP_" + testGroup;
+
+        if (!authorityService.authorityExists(testGroupName))
+        {
+            this.authenticationComponent.setSystemUserAsCurrentUser();
+
+            testGroupName = authorityService.createAuthority(AuthorityType.GROUP, testGroup,
+                        testGroup, authorityService.getDefaultZones());
+        }
+        
+        if(!authorityService.getContainedAuthorities(AuthorityType.USER, testGroupName, true).contains(USER_TWO))
+        {
+            this.authenticationComponent.setSystemUserAsCurrentUser();
+            this.authorityService.addAuthority(testGroupName, USER_TWO);
+        }
+
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+
+        // CRUD a membership group for a web site
+        // Create a site
+        String shortName = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+
+        // Build the JSON membership object
+        JSONObject membership = new JSONObject();
+        membership.put("role", SiteModel.SITE_CONSUMER);
+        JSONObject group = new JSONObject();
+        group.put("fullName", testGroupName);
+        membership.put("group", group);
+
+        // Create a new group membership
+        {
+            Response response = sendRequest(new PostRequest(URL_SITES + "/" + shortName
+                        + URL_MEMBERSHIPS, membership.toString(), "application/json"), 200);
+            JSONObject newMember = new JSONObject(response.getContentAsString());
+
+            // Validate the return value
+            assertEquals("role not correct", SiteModel.SITE_CONSUMER, newMember.getString("role"));
+            JSONObject newGroup = newMember.getJSONObject("authority");
+            assertNotNull(newGroup);
+            assertEquals("full name not correct", testGroupName, newGroup.getString("fullName"));
+            assertEquals("authorityType not correct", "GROUP", newGroup.getString("authorityType"));
+        }
+
+        // Now List memberships
+        {
+            Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName
+                        + URL_MEMBERSHIPS + "?authorityType=USER"), 200);
+            JSONArray listResult = new JSONArray(response.getContentAsString());
+            assertNotNull(listResult);
+            assertEquals(2, listResult.length());
+
+            for (int i = 0; i < listResult.length(); i++)
+            {
+                JSONObject json = listResult.getJSONObject(i);
+
+                if (USER_ONE.equals(json.getJSONObject("authority").get("fullName")))
+                {
+                    assertEquals("user one is Not member of any group", false, json.get("isMemberOfGroup"));
+                }
+                else
+                {
+                    assertEquals("full name not correct", USER_TWO, json.getJSONObject("authority").get("fullName"));
+                    assertEquals("user two is member of a SiteServiceTestGroupA group", true, json.get("isMemberOfGroup"));
+                }
+            }
+        }
+        
+        // cleanup
+        if (authorityService.authorityExists(testGroupName))
+        {
+            this.authenticationComponent.setSystemUserAsCurrentUser();
+            this.authorityService.deleteAuthority(testGroupName);
+        }
+    }
+    
+    public void testChangeSiteVisibilityAsSiteAdmin() throws Exception
+    {
+        // Create a site
+        String shortName = GUID.generate();
+
+        // Create a new site
+        JSONObject result = createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        assertEquals(SiteVisibility.PUBLIC.toString(), result.get("visibility"));
+
+        // try to change the site visibility as user2
+        this.authenticationComponent.setCurrentUser(USER_TWO);
+        JSONObject changeVisibility = new JSONObject();
+        changeVisibility.put("shortName", shortName);
+        changeVisibility.put("visibility", "PRIVATE");
+
+        // we should get AccessDeniedException
+        sendRequest(new PutRequest(URL_SITES + "/" + shortName, changeVisibility.toString(), "application/json"), 500);
+        SiteInfo siteInfo = siteService.getSite(shortName);
+        assertEquals("Site visibility should not have been changed.", SiteVisibility.PUBLIC, siteInfo.getVisibility());
+
+        // set the current user as site-admin
+        this.authenticationComponent.setCurrentUser(USER_FOUR_AS_SITE_ADMIN);
+        // Change the visibility to private
+        Response response = sendRequest(new PutRequest(URL_SITES + "/" + shortName, changeVisibility.toString(), "application/json"), 200);
+        JSONObject jsonObj = new JSONObject(response.getContentAsString());
+        assertEquals(SiteVisibility.PRIVATE.toString(), jsonObj.get("visibility"));
+
+        // Change the visibility to moderated. We want to test if we can find
+        // the private site before changing its visibility
+        changeVisibility.put("visibility", "MODERATED");
+        response = sendRequest(new PutRequest(URL_SITES + "/" + shortName, changeVisibility.toString(), "application/json"), 200);
+        jsonObj = new JSONObject(response.getContentAsString());
+        assertEquals(SiteVisibility.MODERATED.toString(), jsonObj.get("visibility"));
+
+        // Remove user4 from the site-admin group
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        authorityService.removeAuthority("GROUP_SITE_ADMINISTRATORS", USER_FOUR_AS_SITE_ADMIN);
+
+        // set the current user as site-admin
+        this.authenticationComponent.setCurrentUser(USER_FOUR_AS_SITE_ADMIN);
+        // Now that we have removed user4 from the group, try to test if he can still modify the site
+        changeVisibility.put("visibility", "PUBLIC");
+        sendRequest(new PutRequest(URL_SITES + "/" + shortName, changeVisibility.toString(), "application/json"), 500);
+        siteInfo = siteService.getSite(shortName);
+        assertEquals("Site visibility should not have been changed.", SiteVisibility.MODERATED, siteInfo.getVisibility());
+    }
+
+    public void testChangeMembershipRoleAsSiteAdmin() throws Exception
+    {
+        // Create a site
+        String shortName = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+
+        // Build the JSON membership object
+        JSONObject membership = new JSONObject();
+        membership.put("role", SiteModel.SITE_CONSUMER);
+        JSONObject person = new JSONObject();
+        person.put("userName", USER_TWO);
+        membership.put("person", person);
+
+        // Post the membership
+        Response response = sendRequest(new PostRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, membership.toString(), "application/json"), 200);
+        JSONObject jsonObj = new JSONObject(response.getContentAsString());
+        // Check the result
+        assertEquals(SiteModel.SITE_CONSUMER,  jsonObj.get("role"));
+        assertEquals(USER_TWO,  jsonObj.getJSONObject("authority").get("userName"));
+
+        // try to change the user role as user3
+        this.authenticationComponent.setCurrentUser(USER_THREE);
+        membership.put("role", SiteModel.SITE_COLLABORATOR);
+        sendRequest(new PutRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, membership.toString(), "application/json"), 500);
+        assertEquals("User's role should not have been changed.", SiteModel.SITE_CONSUMER.toString(), siteService.getMembersRole(shortName, USER_TWO));
+
+        // set the current user as site-admin
+        this.authenticationComponent.setCurrentUser(USER_FOUR_AS_SITE_ADMIN);
+        response = sendRequest(new PutRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, membership.toString(), "application/json"), 200);
+        jsonObj = new JSONObject(response.getContentAsString());
+        // Check the result
+        assertEquals(SiteModel.SITE_COLLABORATOR,  jsonObj.get("role"));
+        assertEquals(USER_TWO,  jsonObj.getJSONObject("authority").get("userName"));
+    }
+    
+    public void testDeleteMembershipAsSiteAdmin() throws Exception
+    {
+        // Create a site
+        String shortName = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+
+        // Build the JSON membership object
+        JSONObject membership = new JSONObject();
+        membership.put("role", SiteModel.SITE_CONSUMER);
+        JSONObject person = new JSONObject();
+        person.put("userName", USER_TWO);
+        membership.put("person", person);
+
+        // Post the membership
+        Response response = sendRequest(new PostRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, membership.toString(), "application/json"), 200);
+        JSONObject jsonObj = new JSONObject(response.getContentAsString());
+        // Check the result
+        assertEquals(SiteModel.SITE_CONSUMER, jsonObj.get("role"));
+        assertEquals(USER_TWO, jsonObj.getJSONObject("authority").get("userName"));
+
+        // try to delete user2 from the site
+        this.authenticationComponent.setCurrentUser(USER_THREE);
+        sendRequest(new DeleteRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS + "/" + USER_TWO), 500);
+        assertTrue(USER_THREE + " doesn’t have permission to delete users from the site", siteService.isMember(shortName, USER_TWO));
+
+        // set the current user as site-admin
+        this.authenticationComponent.setCurrentUser(USER_FOUR_AS_SITE_ADMIN);
+        sendRequest(new DeleteRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS + "/" + USER_TWO), 200);
+        assertFalse(siteService.isMember(shortName, USER_TWO));
+    }
+
+    public void testDeleteSiteAsSiteAdmin() throws Exception
+    {
+        // Create a site
+        String shortName = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        // Get the site
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName), 200);
+
+        // try to delete the site
+        this.authenticationComponent.setCurrentUser(USER_THREE);
+        // Delete the site
+        sendRequest(new DeleteRequest(URL_SITES + "/" + shortName), 500);
+        // Get the site
+        Response response = sendRequest(new GetRequest(URL_SITES + "/" + shortName), 200);
+        JSONObject jsonObj = new JSONObject(response.getContentAsString());
+        assertEquals(shortName, jsonObj.get("shortName"));
+
+        // set the current user as site-admin
+        this.authenticationComponent.setCurrentUser(USER_FOUR_AS_SITE_ADMIN);
+        // Delete the site
+        sendRequest(new DeleteRequest(URL_SITES + "/" + shortName), 200);
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName), 404);
+    }
+
+    public void testGetAllSitesAsSiteAdmin() throws Exception
+    {
+        String user1PublicSiteName = GUID.generate();
+        String user1ModeratedSiteName = GUID.generate();
+        String user1PrivateSiteName = GUID.generate();
+
+        String user2PrivateSiteName = GUID.generate();
+
+        // USER_ONE public site
+        JSONObject result = createSite("myPreset", user1PublicSiteName, "u1PublicSite", "myDescription",
+                    SiteVisibility.PUBLIC, 200);
+        assertEquals(SiteVisibility.PUBLIC.toString(), result.get("visibility"));
+
+        // USER_ONE moderated site
+        result = createSite("myPreset", user1ModeratedSiteName, "u1ModeratedSite", "myDescription",
+                    SiteVisibility.MODERATED, 200);
+        assertEquals(SiteVisibility.MODERATED.toString(), result.get("visibility"));
+
+        // USER_ONE private site
+        result = createSite("myPreset", user1PrivateSiteName, "u1PrivateSite", "myDescription", SiteVisibility.PRIVATE,
+                    200);
+        assertEquals(SiteVisibility.PRIVATE.toString(), result.get("visibility"));
+
+        this.authenticationComponent.setCurrentUser(USER_TWO);
+        // USER_TWO private site
+        result = createSite("myPreset", user2PrivateSiteName, "u2PrivateSite", "myDescription", SiteVisibility.PRIVATE, 200);
+        assertEquals(SiteVisibility.PRIVATE.toString(), result.get("visibility"));
+
+        this.authenticationComponent.setCurrentUser(USER_THREE);
+        // Note: we'll get 404 rather than 403
+        sendRequest(new GetRequest(URL_SITES_ADMIN), 404);
+        
+        this.authenticationComponent.setCurrentUser(USER_FOUR_AS_SITE_ADMIN);
+        Response response = sendRequest(new GetRequest(URL_SITES_ADMIN), 200);
+        JSONObject jsonObject = new JSONObject(response.getContentAsString());
+        JSONArray jsonArray = jsonObject.getJSONObject("list").getJSONArray("entries");
+        
+        int siteAdminGetSitesSize = jsonArray.length(); 
+        // SiteAdmin can see the public, moderated and private sites
+        assertTrue("result too small", siteAdminGetSitesSize >= 4);
+        assertTrue("Site admin can access all the sites (PUBLIC | MODERATED | PRIVATE).", canSeePrivateSites(jsonArray));
+        
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        response = sendRequest(new GetRequest(URL_SITES_ADMIN), 200);
+        jsonObject = new JSONObject(response.getContentAsString());
+        jsonArray = jsonObject.getJSONObject("list").getJSONArray("entries");;
+        assertEquals("SiteAdmin must have access to the same sites as the super Admin.", siteAdminGetSitesSize,
+                    jsonArray.length());
+    }
+    
+    public void testGetAllSitesPagedAsSiteAdmin() throws Exception
+    {
+        // we use this as a name filter
+        long siteNamePrefix = System.currentTimeMillis();
+        String siteNameSuffix = GUID.generate();;
+        String user1PublicSiteName = siteNamePrefix + siteNameSuffix.substring(siteNameSuffix.lastIndexOf('-'));
+        
+        createSite("myPreset", user1PublicSiteName, "u1PublicSite", "myDescription",
+                    SiteVisibility.PUBLIC, 200);
+        // Create 5 more sites
+        for(int i =1; i < 6; i++)
+        {
+            createSite("myPreset", GUID.generate(), "u1PublicSite"+i, "myDescription"+i,
+                        SiteVisibility.PUBLIC, 200);
+        }
+        
+        this.authenticationComponent.setCurrentUser(USER_FOUR_AS_SITE_ADMIN);
+        
+        Response response = sendRequest(new GetRequest(URL_SITES_ADMIN+"?maxItems=5&skipCount=0"), 200);
+        JSONObject jsonObject = new JSONObject(response.getContentAsString());
+        JSONObject paging = jsonObject.getJSONObject("list").getJSONObject("pagination");
+        assertEquals("The skipCount must be 0", 0, paging.getInt("skipCount"));
+        assertEquals("The maxItems must be 5", 5, paging.getInt("maxItems"));
+        // There are only 7 sites in total (including the default alfresco site 'swsdp'),
+        // but in case there are hanging sites that haven't been cleaned, 
+        // or the default alfresco site has been deleted by previous tests, we check for what we have created in this test.
+        assertTrue("The totalItems must be 6", paging.getInt("totalItems") >= 6 );
+        assertTrue(paging.getBoolean("hasMoreItems"));
+        
+        response = sendRequest(new GetRequest(URL_SITES_ADMIN+"?nf="+siteNamePrefix+"&maxItems=5&skipCount=0"), 200);
+        jsonObject = new JSONObject(response.getContentAsString());
+        paging = jsonObject.getJSONObject("list").getJSONObject("pagination");
+        assertEquals("The count must be 1", 1, paging.getInt("count"));
+        assertEquals("The maxItems must be 5", 5, paging.getInt("maxItems"));
+        assertEquals("The totalItems must be 1", 1, paging.getInt("totalItems"));
+        assertFalse(paging.getBoolean("hasMoreItems"));
+
+    }
+
+    private boolean canSeePrivateSites(JSONArray jsonArray) throws Exception
+    {
+        for (int i = 0; i < jsonArray.length(); i++)
+        {
+            JSONObject obj = jsonArray.getJSONObject(i);
+            String visibility = obj.getJSONObject("entry").getString("visibility");
+            if (SiteVisibility.PRIVATE.equals(SiteVisibility.valueOf(visibility)))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    public void testMultipleInviteRequests() throws Exception
+    {
+        String shortName  = GUID.generate();
+        createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.MODERATED, 200);
+        String userName = USER_TWO;
+        String roleName = SiteModel.SITE_CONSUMER;
+        String inviteComments = "Request to join";
+ 
+        try {
+             //Create a new moderated invitation
+             String moderatedInvitationId = createModeratedInvitation(shortName, inviteComments, userName, roleName);
+             //Create another invitation
+             String newModeratedInvitationId = createModeratedInvitation(shortName, inviteComments, userName, roleName);
+             fail("A request to join this site is already in pending");
+        }
+        catch (AssertionFailedError e) {
+              // Ignore since we where expecting this
+        }
+    }
+    
+    public void testDeleteSiteAsAdministrator() throws Exception {
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        String shortName  = GUID.generate();
+        createSite("mySite", shortName, "myTitle", "myDescription", SiteVisibility.MODERATED, 200);
+        
+        // Do tests as site admin
+        this.authenticationComponent.setCurrentUser(USER_ONE);
+        
+        //Get the site
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName), 200);
+        
+        // we should get AccessDeniedException
+        sendRequest(new DeleteRequest(URL_SITES + "/" + shortName), 500);
+   
+        
+        this.authenticationComponent.setCurrentUser(USER_FOUR_AS_SITE_ADMIN);
+        
+        // Delete the site
+        sendRequest(new DeleteRequest(URL_SITES + "/" + shortName), 200);
+   
+       
+        // Get the site
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName), 404);
+    }
+    
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/SurfConfigTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/SurfConfigTest.java
new file mode 100644
index 00000000000..6d255292b1b
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/site/SurfConfigTest.java
@@ -0,0 +1,224 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.site;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.query.CannedQueryPageDetails;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AccessPermission;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class SurfConfigTest extends AbstractSiteServiceTest
+{
+    private SiteService siteService;
+    private NodeService nodeService;
+    private PermissionService permissionService;
+    private FileFolderService fileFolderService;
+    private static final long RD = System.currentTimeMillis();
+    private static final String USER_ONE = "SiteUserOne" + RD;
+    private static final String USER_TWO = "SiteUserTwo" + RD;
+    private static final String USER_THREE = "SiteUserThree" + RD;
+    private static final String URL_SITES = "/api/sites";
+    private static final String URL_MEMBERSHIPS = "/memberships";
+    private static final String URL_ADM = "/remoteadm/";
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        this.siteService = (SiteService) getServer().getApplicationContext().getBean("SiteService");
+        this.nodeService = (NodeService) getServer().getApplicationContext().getBean("NodeService");
+        this.permissionService = (PermissionService) getServer().getApplicationContext().getBean("PermissionService");
+        this.fileFolderService = (FileFolderService) getServer().getApplicationContext().getBean("FileFolderService");
+
+        createUser(USER_ONE);
+        createUser(USER_TWO);
+        createUser(USER_THREE);
+
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+    }
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        deleteUser(USER_ONE);
+        deleteUser(USER_TWO);
+        deleteUser(USER_THREE);
+
+        //Delete the sites
+        deleteSites();
+
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+
+    //MNT-16371
+    public void testSurfConfigPermissions() throws Exception
+    {
+        // Create a site as USER_ONE
+        String shortName = UUID.randomUUID().toString();
+        JSONObject result = createSite("myPreset", shortName, "myTitle", "myDescription", SiteVisibility.PUBLIC, 200);
+        assertEquals("myPreset", result.get("sitePreset"));
+        assertEquals(shortName, result.get("shortName"));
+        assertEquals("myTitle", result.get("title"));
+        assertEquals("myDescription", result.get("description"));
+        assertEquals(SiteVisibility.PUBLIC.toString(), result.get("visibility"));
+
+        // Make ADMRemoteStore to create the surf-config folder and the dashboard.xml file.
+        sendRequest(new PostRequest(URL_ADM + "CREATE/alfresco/site-data/pages/site/" + shortName + "/dashboard.xml?s=sitestore",
+                    new JSONObject().toString(), "application/json"), 200);
+
+        // {siteName}/cm:surf-config/
+        NodeRef surfConfigFolderRef = nodeService
+                    .getChildByName(siteService.getSite(shortName).getNodeRef(), ContentModel.ASSOC_CONTAINS, "surf-config");
+        assertEquals("surf-config", nodeService.getProperty(surfConfigFolderRef, ContentModel.PROP_NAME));
+
+        String owner = (String) nodeService.getProperty(surfConfigFolderRef, ContentModel.PROP_OWNER);
+        assertFalse(USER_ONE.equalsIgnoreCase(owner));
+        assertEquals(AuthenticationUtil.getAdminUserName(), owner);
+
+        assertFalse("Inherit Permissions should be off.", permissionService.getInheritParentPermissions(surfConfigFolderRef));
+
+        Set<AccessPermission> permissions = permissionService.getAllSetPermissions(surfConfigFolderRef);
+        assertEquals(1, permissions.size());
+        String siteManagerGroup = siteService.getSiteRoleGroup(shortName, SiteModel.SITE_MANAGER);
+        AccessPermission accessPermission = permissions.iterator().next();
+        assertEquals(siteManagerGroup, accessPermission.getAuthority());
+        assertEquals(SiteModel.SITE_MANAGER, accessPermission.getPermission());
+        assertTrue(accessPermission.getAccessStatus() == AccessStatus.ALLOWED);
+
+        // This is the method that finally gets called when ALF-21643 steps are followed.
+        PagingResults<FileInfo> pageResults = fileFolderService
+                    .list(surfConfigFolderRef, true, true, null, null, null, new PagingRequest(CannedQueryPageDetails.DEFAULT_PAGE_SIZE));
+        List<FileInfo> fileInfos = pageResults.getPage();
+        assertNotNull(fileInfos);
+        assertEquals(1, fileInfos.size());
+        // {siteName}/cm:surf-config/pages
+        assertEquals("pages", fileInfos.get(0).getName());
+
+        // Add USER_TWO as a site collaborator
+        JSONObject membership = new JSONObject();
+        membership.put("role", SiteModel.SITE_COLLABORATOR);
+        JSONObject person = new JSONObject();
+        person.put("userName", USER_TWO);
+        membership.put("person", person);
+        // Post the membership
+        Response response = sendRequest(new PostRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, membership.toString(), "application/json"),
+                    200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(SiteModel.SITE_COLLABORATOR, result.get("role"));
+        assertEquals(USER_TWO, result.getJSONObject("authority").get("userName"));
+
+        // Add USER_THREE as a site manager
+        membership.put("role", SiteModel.SITE_MANAGER);
+        person.put("userName", USER_THREE);
+        membership.put("person", person);
+        // Post the membership
+        response = sendRequest(new PostRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, membership.toString(), "application/json"), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(SiteModel.SITE_MANAGER, result.get("role"));
+        assertEquals(USER_THREE, result.getJSONObject("authority").get("userName"));
+
+        // USER_TWO is a site collaborator so he should not be able to access the surf-config folder
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_TWO);
+        try
+        {
+            fileFolderService.list(surfConfigFolderRef, true, true, null, null, null, new PagingRequest(CannedQueryPageDetails.DEFAULT_PAGE_SIZE));
+            fail("USER_TWO dose not have the appropriate permissions to perform this operation.");
+        }
+        catch (AccessDeniedException ex)
+        {
+            //expected
+        }
+
+        // USER_THREE is a site manager so he is able to access the surf-config folder
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_THREE);
+        pageResults = fileFolderService
+                    .list(surfConfigFolderRef, true, true, null, null, null, new PagingRequest(CannedQueryPageDetails.DEFAULT_PAGE_SIZE));
+        fileInfos = pageResults.getPage();
+        assertNotNull(fileInfos);
+        assertEquals(1, fileInfos.size());
+        // {siteName}/cm:surf-config/pages
+        assertEquals("pages", fileInfos.get(0).getName());
+
+        // Update USER_ONE role from SiteManager to SiteContributor.
+        membership.put("role", SiteModel.SITE_CONTRIBUTOR);
+        person.put("userName", USER_ONE);
+        membership.put("person", person);
+        response = sendRequest(new PutRequest(URL_SITES + "/" + shortName + URL_MEMBERSHIPS, membership.toString(), "application/json"), 200);
+        result = new JSONObject(response.getContentAsString());
+        assertEquals(SiteModel.SITE_CONTRIBUTOR, result.get("role"));
+        assertEquals(USER_ONE, result.getJSONObject("authority").get("userName"));
+
+        // USER_ONE is no longer a site manager
+        // USER_ONE tries to access "{siteName}/cm:surf-config" children
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ONE);
+        try
+        {
+            fileFolderService.list(surfConfigFolderRef, true, true, null, null, null, new PagingRequest(CannedQueryPageDetails.DEFAULT_PAGE_SIZE));
+            fail("USER_ONE is not the owner and he is no longer a site manager, so does not have the appropriate permissions to perform this operation");
+        }
+        catch (AccessDeniedException ex)
+        {
+            //expected
+        }
+
+        // USER_ONE tries to access "{siteName}/cm:surf-config/pages" children
+        try
+        {
+            fileFolderService.list(fileInfos.get(0).getNodeRef(), true, true, null, null, null,
+                        new PagingRequest(CannedQueryPageDetails.DEFAULT_PAGE_SIZE));
+            fail("USER_ONE is not the owner and he is no longer a site manager, so does not have the appropriate permissions to perform this operation");
+        }
+        catch (AccessDeniedException ex)
+        {
+            //expected
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/SOLRSerializerTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/SOLRSerializerTest.java
new file mode 100644
index 00000000000..5594dfa7e0e
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/SOLRSerializerTest.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import static org.junit.Assert.*;
+
+import java.util.Date;
+
+import org.alfresco.repo.web.scripts.solr.SOLRSerializer.SOLRTypeConverter;
+import org.alfresco.util.ISO8601DateFormat;
+import org.junit.Test;
+
+public class SOLRSerializerTest 
+{
+	@Test
+    public void testDateSerializer()
+    {
+		  SOLRTypeConverter typeConverter = new SOLRTypeConverter(null);
+		  
+		  trip(typeConverter, "1912-01-01T00:40:00-06:00", "1912-01-01T06:40:00.000Z");
+		  trip(typeConverter, "1812-01-01T00:40:00-06:00", "1812-01-01T06:40:00.000Z");
+		  trip(typeConverter, "1845-01-01T00:40:00-06:00", "1845-01-01T06:40:00.000Z");
+		  trip(typeConverter, "1846-01-01T00:40:00-06:00", "1846-01-01T06:40:00.000Z");
+		  trip(typeConverter, "1847-01-01T00:40:00-06:00", "1847-01-01T06:40:00.000Z");
+		  trip(typeConverter, "1848-01-01T00:40:00-06:00", "1848-01-01T06:40:00.000Z");
+        
+		  
+    }
+	
+	
+	private void trip( SOLRTypeConverter typeConverter, String iso, String zulu)
+	{
+          Date testDate = ISO8601DateFormat.parse(iso);
+          String strDate = typeConverter.INSTANCE.convert(String.class, testDate);
+          assertEquals(zulu, strDate);
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.java
new file mode 100644
index 00000000000..9cf239abee5
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.java
@@ -0,0 +1,820 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.domain.node.NodeDAO;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.solr.Acl;
+import org.alfresco.repo.solr.AclChangeSet;
+import org.alfresco.repo.solr.AclReaders;
+import org.alfresco.repo.solr.SOLRTrackingComponent;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.Pair;
+import org.alfresco.util.PropertyMap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Test the SOLR web scripts
+ * 
+ * @since 4.0
+ */
+public class SOLRWebScriptTest extends BaseWebScriptTest
+{
+    protected static final Log logger = LogFactory.getLog(SOLRWebScriptTest.class);
+
+    private ApplicationContext ctx;
+    private SOLRTrackingComponent solrTrackingComponent;
+    private NodeDAO nodeDAO;
+    private TransactionService transactionService;
+    private NodeService nodeService;
+    private FileFolderService fileFolderService;
+    private RetryingTransactionHelper txnHelper;
+    private NamespaceService namespaceService;
+
+    private String admin;
+
+    private StoreRef storeRef;
+    private NodeRef rootNodeRef;
+    private NodeRef container3;
+
+    private ArrayList<NodeRef> contents = new ArrayList<NodeRef>(100);
+    private List<Long> nodeIDs = new ArrayList<Long>(100);
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        ctx = getServer().getApplicationContext();
+
+        ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
+        transactionService = serviceRegistry.getTransactionService();
+        nodeService = serviceRegistry.getNodeService();
+        fileFolderService = serviceRegistry.getFileFolderService();
+        namespaceService = serviceRegistry.getNamespaceService();
+        txnHelper = transactionService.getRetryingTransactionHelper();
+        nodeDAO = (NodeDAO)ctx.getBean("nodeDAO");
+        solrTrackingComponent = (SOLRTrackingComponent) ctx.getBean("solrTrackingComponent");
+
+        admin = AuthenticationUtil.getAdminUserName();
+
+        AuthenticationUtil.setFullyAuthenticatedUser(admin);
+        
+        storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, getName() + ".1." + System.currentTimeMillis());
+        rootNodeRef = nodeService.getRootNode(storeRef);
+    }
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+
+    private JSONArray getTransactions(long fromCommitTime) throws Exception
+    {
+        String url = "/api/solr/transactions?fromCommitTime=" + fromCommitTime;
+        TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url);
+        long startTime = System.currentTimeMillis();
+        Response response = sendRequest(req, Status.STATUS_OK, admin);
+        long endTime = System.currentTimeMillis();
+
+        if(logger.isDebugEnabled())
+        {
+            logger.debug(response.getContentAsString());
+        }
+        JSONObject json = new JSONObject(response.getContentAsString());
+
+        JSONArray transactions = json.getJSONArray("transactions");
+        
+        logger.debug("Got " + transactions.length() + " txns in " + (endTime - startTime) + " ms");
+        
+        return transactions;
+    }
+
+    public void testAclChangeSetsGet() throws Exception
+    {
+        String url = "/api/solr/aclchangesets?fromTime=" + 0L + "&fromId=" + 0L;
+        TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url);
+        long startTime = System.currentTimeMillis();
+        Response response = sendRequest(req, Status.STATUS_OK, admin);
+        long endTime = System.currentTimeMillis();
+
+        if(logger.isDebugEnabled())
+        {
+            logger.debug(response.getContentAsString());
+        }
+        JSONObject json = new JSONObject(response.getContentAsString());
+
+        JSONArray aclChangeSets = json.getJSONArray("aclChangeSets");
+        
+        logger.debug("Got " + aclChangeSets.length() + " txns in " + (endTime - startTime) + " ms");
+    }
+
+    public void testAclsGet() throws Exception
+    {
+        List<AclChangeSet> aclChangeSets = solrTrackingComponent.getAclChangeSets(null, null, null, null, 100);
+        if (aclChangeSets.size() == 0)
+        {
+            return;         // Can't test, but very unlikely
+        }
+        // Build JSON using these
+        JSONObject json = new JSONObject();
+        JSONArray aclChangeSetIdsJSON = new JSONArray();
+        int count = 0;
+        List<Long> aclChangeSetIds = new ArrayList<Long>();
+        for (AclChangeSet aclChangeSet : aclChangeSets)
+        {
+            if (count >= 512)
+            {
+                break;
+            }
+            if (aclChangeSet.getAclCount() == 0)
+            {
+                continue;           // No ACLs
+            }
+            Long aclChangeSetId = aclChangeSet.getId();
+            aclChangeSetIdsJSON.put(aclChangeSetId);
+            aclChangeSetIds.add(aclChangeSetId);
+            count++;
+        }
+        json.put("aclChangeSetIds", aclChangeSetIdsJSON);
+        
+        String url = "/api/solr/acls";
+        TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, json.toString(), "application/json");
+        Response response = sendRequest(req, Status.STATUS_OK, admin);
+        if(logger.isDebugEnabled())
+        {
+            logger.debug(response.getContentAsString());
+        }
+        json = new JSONObject(response.getContentAsString());
+        JSONArray acls = json.getJSONArray("acls");
+        
+        // Check
+        List<Acl> aclsCheck = solrTrackingComponent.getAcls(aclChangeSetIds, null, 512);
+        assertEquals("Script and API returned different number of results", aclsCheck.size(), acls.length());
+    }
+    
+    public void testAclReadersGet() throws Exception
+    {
+        txnHelper.doInTransaction(
+            new RetryingTransactionCallback<Void>()
+            {
+                public Void execute() throws Throwable
+                {
+                    aclReadersGetImpl();
+                    return null;
+                }
+            }
+        );
+    }
+    
+    private void aclReadersGetImpl() throws Exception
+    {
+        List<AclChangeSet> aclChangeSets = solrTrackingComponent.getAclChangeSets(null, null, null, null, 1024);
+        List<Long> aclChangeSetIds = new ArrayList<Long>(50);
+        for (AclChangeSet aclChangeSet : aclChangeSets)
+        {
+            if (aclChangeSet.getAclCount() > 0)
+            {
+                aclChangeSetIds.add(aclChangeSet.getId());
+                break;
+            }
+        }
+        if (aclChangeSetIds.size() == 0)
+        {
+            // No ACLs; not likely
+        }
+        List<Acl> acls = solrTrackingComponent.getAcls(aclChangeSetIds, null, 1024);
+        List<Long> aclIds = new ArrayList<Long>(acls.size());
+        JSONObject json = new JSONObject();
+        JSONArray aclIdsJSON = new JSONArray();
+        for (Acl acl : acls)
+        {
+            Long aclId = acl.getId();
+            aclIds.add(aclId);
+            aclIdsJSON.put(aclId);
+        }
+        json.put("aclIds", aclIdsJSON);
+        
+        // Now get the readers
+        List<AclReaders> aclsReaders = solrTrackingComponent.getAclsReaders(aclIds);
+        assertEquals("Should have same number of ACLs as supplied", aclIds.size(), aclsReaders.size());
+        assertTrue("Must have *some* ACLs here", aclIds.size() > 0);
+        Map<Long, Set<String>> readersByAclId = new HashMap<Long, Set<String>>();
+        for (AclReaders aclReaders : aclsReaders)
+        {
+            readersByAclId.put(aclReaders.getAclId(), aclReaders.getReaders());
+        }
+        
+        Map<Long, Set<String>> deniedByAclId = new HashMap<Long, Set<String>>();
+        for (AclReaders aclReaders : aclsReaders)
+        {
+            assertNotNull("AclReaders should not contain null denial set", aclReaders.getDenied());
+            deniedByAclId.put(aclReaders.getAclId(), aclReaders.getDenied());
+        }
+        
+        // Now query using the webscript
+        String url = "/api/solr/aclsReaders";
+        TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, json.toString(), "application/json");
+        Response response = sendRequest(req, Status.STATUS_OK, admin);
+        if(logger.isDebugEnabled())
+        {
+            logger.debug(response.getContentAsString());
+        }
+        json = new JSONObject(response.getContentAsString());
+        JSONArray aclsReadersJSON = json.getJSONArray("aclsReaders");
+        // Check
+        assertEquals("Script and API returned different number of results", readersByAclId.size(), aclsReadersJSON.length());
+        
+        // Iterate of the JSON and ensure that the list of ACL readers is correct
+        for (int i = 0; i < aclsReadersJSON.length(); i++)
+        {
+            // Choose an ACL and check the readers
+            JSONObject aclReadersJSON = aclsReadersJSON.getJSONObject(i);
+            Long aclIdJSON = aclReadersJSON.getLong("aclId");
+            Set<String> readersCheck = readersByAclId.get(aclIdJSON);
+            JSONArray readersJSON = aclReadersJSON.getJSONArray("readers");
+            assertEquals("Readers list for ACL " + aclIdJSON + " is wrong. ", readersCheck.size(), readersJSON.length());
+            for (int j = 0; j < readersJSON.length(); j++)
+            {
+                String readerJSON = readersJSON.getString(j);
+                assertTrue("Found reader not in check set: " + readerJSON, readersCheck.contains(readerJSON));
+            }
+            
+            Set<String> deniedCheck = deniedByAclId.get(aclIdJSON);
+            JSONArray deniedJSON = aclReadersJSON.getJSONArray("denied");
+            assertEquals("Denied list for ACL " + aclIdJSON + " is wrong. ", deniedCheck.size(), deniedJSON.length());
+            for (int j = 0; j < deniedJSON.length(); j++)
+            {
+                String denyJSON = deniedJSON.getString(j);
+                assertTrue("Found denied authority not in check set: " + denyJSON, deniedCheck.contains(denyJSON));
+            }
+        }
+    }
+
+    private JSONArray getNodes(GetNodesParameters parameters, int maxResults, int expectedNumNodes) throws Exception
+    {
+    	StringBuilder url = new StringBuilder("/api/solr/nodes");
+        
+        JSONObject json = new JSONObject();
+        if(parameters.getTransactionIds() != null)
+        {
+            JSONArray array = new JSONArray();
+            for(Long txnId : parameters.getTransactionIds())
+            {
+                array.put(txnId);
+            }
+            json.put("txnIds", array);
+        }
+    	
+    	if(parameters.getFromNodeId() != null)
+    	{
+    	    json.put("fromNodeId", parameters.getFromNodeId());
+    	}
+
+    	if(parameters.getToNodeId() != null)
+    	{
+            json.put("toNodeId", parameters.getToNodeId());
+    	}
+    	
+        if(parameters.getExcludeAspects() != null)
+        {
+            JSONArray array = new JSONArray();
+            for(QName excludeAspect : parameters.getExcludeAspects())
+            {
+                array.put(excludeAspect.toString());
+            }
+            json.put("excludeAspects", array);
+        }
+        
+        if(parameters.getIncludeAspects() != null)
+        {
+            JSONArray array = new JSONArray();
+            for(QName includeAspect : parameters.getIncludeAspects())
+            {
+                array.put(includeAspect.toString());
+            }
+            json.put("includeAspects", array);
+        }
+
+        if(parameters.getStoreProtocol() != null)
+        {
+            json.put("storeProtocol", parameters.getStoreProtocol());
+        }
+
+        if(parameters.getStoreIdentifier() != null)
+        {
+            json.put("storeIdentifier", parameters.getStoreIdentifier());
+        }
+            
+        json.put("maxResults", maxResults);
+
+        TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url.toString(), json.toString(), "application/json");
+ 
+        long startTime = System.currentTimeMillis();
+    	Response response = sendRequest(req, Status.STATUS_OK, admin);
+        long endTime = System.currentTimeMillis();
+        
+//      assertEquals("Expected application/json content type", "application/json[;charset=UTF-8]", response.getContentType());
+        
+    	if(logger.isDebugEnabled())
+    	{
+    		logger.debug(response.getContentAsString());
+    	}
+    	//logger.debug("getNodes: " + response.getContentAsString());
+        JSONObject jsonResponse = new JSONObject(response.getContentAsString());
+        jsonResponse.write(new PrintWriter(System.out));
+
+        JSONArray nodes = jsonResponse.getJSONArray("nodes");
+
+        //assertEquals("Node count is incorrect", nodes.length(), json.getInt("count"));
+
+        logger.debug("Got " + nodes.length() + " nodes in " + (endTime - startTime) + " ms");
+
+        assertEquals("Number of returned node meta data results is incorrect", expectedNumNodes, nodes.length());
+
+        return nodes;
+    }
+    
+    private List<Long> getTransactionIds(JSONArray transactions) throws JSONException
+    {
+        List<Long> txnIds = new ArrayList<Long>(transactions.length());
+
+        int numTxns = transactions.length();
+        for(int i = 0; i < numTxns; i++)
+        {
+            JSONObject txn = transactions.getJSONObject(i);
+            txnIds.add(txn.getLong("id"));
+        }
+
+        return txnIds;
+    }
+
+    public static String join(Collection<Object> s, String delimiter)
+    {
+        StringBuffer buffer = new StringBuffer();
+        Iterator<Object> iter = s.iterator();
+        while (iter.hasNext())
+        {
+            buffer.append(iter.next());
+            if (iter.hasNext())
+            {
+                buffer.append(delimiter);
+            }
+        }
+        return buffer.toString();
+    }
+    
+    private void buildTransactions3()
+    {
+        txnHelper.doInTransaction(new RetryingTransactionCallback<Void>()
+        {
+            public Void execute() throws Throwable
+            {
+                PropertyMap props = new PropertyMap();
+                props.put(ContentModel.PROP_NAME, "Container3");
+                container3 = nodeService.createNode(
+                        rootNodeRef,
+                        ContentModel.ASSOC_CHILDREN,
+                        ContentModel.ASSOC_CHILDREN,
+                        ContentModel.TYPE_FOLDER,
+                        props).getChildRef();
+                if(logger.isDebugEnabled())
+                {
+                    logger.debug("container3 = " + container3);
+                }
+                
+                for(int i = 0; i < 100; i++)
+                {
+                    FileInfo content1Info = fileFolderService.create(container3, "Content" + i, ContentModel.TYPE_CONTENT);
+                    NodeRef nodeRef = content1Info.getNodeRef();
+                    contents.add(nodeRef);
+                    nodeIDs.add(Long.valueOf(getNodeID(nodeRef)));
+                    
+                    if(i % 2 == 1)
+                    {
+                        nodeService.addAspect(nodeRef, ContentModel.ASPECT_TEMPORARY, null);
+                    }
+                }
+                
+                return null;
+            }
+        });
+    }
+
+    private NodeRef container6;
+    
+    private void buildTransactions5()
+    {
+        txnHelper.doInTransaction(new RetryingTransactionCallback<Void>()
+        {
+            public Void execute() throws Throwable
+            {
+                PropertyMap props = new PropertyMap();
+                props.put(ContentModel.PROP_NAME, "Container6");
+                container6 = nodeService.createNode(
+                        rootNodeRef,
+                        ContentModel.ASSOC_CHILDREN,
+                        ContentModel.ASSOC_CHILDREN,
+                        ContentModel.TYPE_FOLDER,
+                        props).getChildRef();
+
+                FileInfo contentInfo = fileFolderService.create(container6, "Content1", ContentModel.TYPE_CONTENT);
+                contents.add(contentInfo.getNodeRef());
+
+                Map<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>();
+                aspectProperties.put(ContentModel.PROP_AUTHOR, "steve");
+                nodeService.addAspect(contentInfo.getNodeRef(), ContentModel.ASPECT_AUTHOR, aspectProperties);
+
+                return null;
+            }
+        });
+    }
+
+    private JSONArray getNodesMetaData(List<Long> nodeIds, int maxResults, int numMetaDataNodes) throws Exception
+    {
+        StringBuilder url = new StringBuilder("/api/solr/metadata");
+
+        JSONObject json = new JSONObject();
+        if(nodeIds != null && nodeIds.size() > 0)
+        {
+            JSONArray array = new JSONArray();
+            for(Long nodeId : nodeIds)
+            {
+                array.put(nodeId);
+            }
+            json.put("nodeIds", array);
+        }
+
+        json.put("maxResults", maxResults);
+
+        TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url.toString(), json.toString(), "application/json");
+        long startTime = System.currentTimeMillis();
+        Response response = sendRequest(req, Status.STATUS_OK, admin);
+        long endTime = System.currentTimeMillis();
+
+        String content = response.getContentAsString();
+        
+        if(logger.isDebugEnabled())
+        {
+            logger.debug("nodesMetaData = " + content);
+        }
+
+        JSONObject jsonResponse = null;
+
+        try
+        {
+        	jsonResponse = new JSONObject(content);
+        }
+        catch(JSONException e)
+        {
+        	fail(e.getMessage());
+        }
+
+        JSONArray nodes = jsonResponse.getJSONArray("nodes");
+
+        logger.debug("Got metadata for " + nodes.length() + " nodes in " + (endTime - startTime) + " ms");
+        
+        assertEquals("Number of returned nodes is incorrect", numMetaDataNodes, nodes.length());
+        
+        return nodes;
+    }
+    
+    private void buildTransactions6()
+    {
+        txnHelper.doInTransaction(new RetryingTransactionCallback<Void>()
+        {
+            public Void execute() throws Throwable
+            {
+                PropertyMap props = new PropertyMap();
+                props.put(ContentModel.PROP_NAME, "Container6");
+                NodeRef container6 = nodeService.createNode(
+                        rootNodeRef,
+                        ContentModel.ASSOC_CHILDREN,
+                        ContentModel.ASSOC_CHILDREN,
+                        ContentModel.TYPE_FOLDER,
+                        props).getChildRef();
+                if(logger.isDebugEnabled())
+                {
+                    logger.debug("container6 = " + container6);
+                }
+                
+                for(int i = 0; i < 2000; i++)
+                {
+                    FileInfo content1Info = fileFolderService.create(container6, "Content" + i, ContentModel.TYPE_CONTENT);
+                    NodeRef nodeRef = content1Info.getNodeRef();
+                    contents.add(nodeRef);
+                    
+                    if(i % 2 == 1)
+                    {
+                        nodeService.addAspect(nodeRef, ContentModel.ASPECT_TEMPORARY, null);
+                    }
+                }
+                
+                return null;
+            }
+        });
+    }
+    
+    public void testNodeMetaData() throws Exception
+    {
+        long fromCommitTime = System.currentTimeMillis();
+
+        buildTransactions5();
+
+        JSONArray transactions = getTransactions(fromCommitTime);
+        assertEquals("Number of transactions is incorrect", 1, transactions.length());
+
+        List<Long> transactionIds = getTransactionIds(transactions);
+
+        GetNodesParameters params = new GetNodesParameters();
+        params.setTransactionIds(transactionIds);
+        params.setStoreProtocol(storeRef.getProtocol());
+        params.setStoreIdentifier(storeRef.getIdentifier());
+        JSONArray nodes = getNodes(params, 0, 2);
+        
+        List<Long> nodeIds = new ArrayList<Long>(nodes.length());
+        for(int i = 0; i < nodes.length(); i++)
+        {
+            JSONObject node = nodes.getJSONObject(i);
+            nodeIds.add(node.getLong("id"));
+        }
+        
+        JSONArray nodesMetaData = getNodesMetaData(nodeIds, 0, 2);
+
+        // test second entry (second node created in buildTransactions)
+        NodeRef expectedNodeRef = contents.get(0);
+        
+        JSONObject node = nodesMetaData.getJSONObject(1);
+        NodeRef nodeRef = new NodeRef(node.getString("nodeRef"));
+
+        assertEquals("NodeRef is incorrect", expectedNodeRef, nodeRef);
+        
+        JSONArray aspects = node.getJSONArray("aspects");
+        JSONObject properties = node.getJSONObject("properties");
+        Map<QName, String> propertyMap = getPropertyMap(properties);
+        
+        assertTrue("Expected author aspect", containsAspect(aspects, ContentModel.ASPECT_AUTHOR));
+        assertTrue("Expected author property", containsProperty(propertyMap, ContentModel.PROP_AUTHOR, "steve"));
+        
+        JSONArray paths = node.getJSONArray("paths");
+        List<Path> expectedPaths = nodeService.getPaths(expectedNodeRef, false);
+        for(int i = 0; i < paths.length(); i++)
+        {
+            JSONObject o = paths.getJSONObject(i);
+            String path = o.getString("path");
+            String qname = o.has("qname") ? o.getString("qname") : null;
+            String expectedPath = expectedPaths.get(i).toString();
+            assertEquals("Path element " + i + " is incorrect", expectedPath, path);
+            assertNull("qname should be null", qname);
+        }
+    }
+
+    private NodeRef container7;
+    
+    private void buildTransactions7()
+    {
+        txnHelper.doInTransaction(new RetryingTransactionCallback<Void>()
+        {
+            public Void execute() throws Throwable
+            {
+                PropertyMap props = new PropertyMap();
+                props.put(ContentModel.PROP_NAME, "Container7");
+                container7 = nodeService.createNode(
+                        rootNodeRef,
+                        ContentModel.ASSOC_CHILDREN,
+                        ContentModel.ASSOC_CHILDREN,
+                        ContentModel.TYPE_FOLDER,
+                        props).getChildRef();
+
+                FileInfo contentInfo = fileFolderService.create(container7, "Content1", ContentModel.TYPE_CONTENT);
+                contents.add(contentInfo.getNodeRef());
+
+                Map<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>();
+                aspectProperties.put(ContentModel.PROP_AUTHOR, "ste\"ve");
+                nodeService.addAspect(contentInfo.getNodeRef(), ContentModel.ASPECT_AUTHOR, aspectProperties);
+
+                return null;
+            }
+        });
+    }
+    
+    public void testNodeMetaDataStringEscaping() throws Exception
+    {
+        long fromCommitTime = System.currentTimeMillis();
+
+        buildTransactions7();
+
+        JSONArray transactions = getTransactions(fromCommitTime);
+        assertEquals("Number of transactions is incorrect", 1, transactions.length());
+
+        List<Long> transactionIds = getTransactionIds(transactions);
+
+        GetNodesParameters params = new GetNodesParameters();
+        params.setTransactionIds(transactionIds);
+        params.setStoreProtocol(storeRef.getProtocol());
+        params.setStoreIdentifier(storeRef.getIdentifier());
+        JSONArray nodes = getNodes(params, 0, 2);
+        
+        List<Long> nodeIds = new ArrayList<Long>(nodes.length());
+        for(int i = 0; i < nodes.length(); i++)
+        {
+            JSONObject node = nodes.getJSONObject(i);
+            nodeIds.add(node.getLong("id"));
+        }
+        
+        JSONArray nodesMetaData = getNodesMetaData(nodeIds, 0, 2);
+
+        // test second entry (second node created in buildTransactions)
+        NodeRef expectedNodeRef = contents.get(0);
+        
+        JSONObject node = nodesMetaData.getJSONObject(1);
+        NodeRef nodeRef = new NodeRef(node.getString("nodeRef"));
+
+        assertEquals("NodeRef is incorrect", expectedNodeRef, nodeRef);
+        
+        JSONArray aspects = node.getJSONArray("aspects");
+        JSONObject properties = node.getJSONObject("properties");
+        Map<QName, String> propertyMap = getPropertyMap(properties);
+
+        assertTrue("Expected author aspect", containsAspect(aspects, ContentModel.ASPECT_AUTHOR));
+        assertTrue("Expected author property", containsProperty(propertyMap, ContentModel.PROP_AUTHOR, "ste\"ve"));
+    }
+    
+    public void testNodeMetaDataManyNodes() throws Exception
+    {
+        long fromCommitTime = System.currentTimeMillis();
+
+        buildTransactions6();
+
+        JSONArray transactions = getTransactions(fromCommitTime);
+        assertEquals("Number of transactions is incorrect", 1, transactions.length());
+
+        List<Long> transactionIds = getTransactionIds(transactions);
+
+        GetNodesParameters params = new GetNodesParameters();
+        params.setStoreProtocol(storeRef.getProtocol());
+        params.setStoreIdentifier(storeRef.getIdentifier());
+        params.setTransactionIds(transactionIds);
+        JSONArray nodes = getNodes(params, 0, 2001);
+        
+        List<Long> nodeIds = new ArrayList<Long>(nodes.length());
+        for(int i = 0; i < nodes.length(); i++)
+        {
+            JSONObject node = nodes.getJSONObject(i);
+            nodeIds.add(node.getLong("id"));
+        }
+
+        // make sure caches are warm - time last call
+        @SuppressWarnings("unused")
+        JSONArray nodesMetaData = getNodesMetaData(nodeIds, 0, 2001);
+        nodesMetaData = getNodesMetaData(nodeIds, 0, 2001);
+
+        // sleep for a couple of seconds
+        try
+        {
+            Thread.sleep(2000);
+        }
+        catch(InterruptedException e)
+        {
+            // ignore
+        }
+        nodesMetaData = getNodesMetaData(nodeIds, 0, 2001);
+        
+        nodesMetaData = getNodesMetaData(nodeIds, 1000, 1000);
+        nodesMetaData = getNodesMetaData(nodeIds, 600, 600);
+        nodesMetaData = getNodesMetaData(nodeIds, 300, 300);
+        nodesMetaData = getNodesMetaData(nodeIds, 100, 100);
+        nodesMetaData = getNodesMetaData(nodeIds, 50, 50);
+
+        // clear out caches
+        nodeDAO.clear();
+
+        nodesMetaData = getNodesMetaData(nodeIds, 0, 2001);
+    }
+    
+    private boolean containsAspect(JSONArray aspectsArray, QName aspect) throws Exception
+    {
+        if(aspect == null)
+        {
+            throw new IllegalArgumentException("aspect cannot be null");
+        }
+
+        boolean success = false;
+        for(int i = 0; i < aspectsArray.length(); i++)
+        {
+            String qName = aspectsArray.getString(i);
+            if(aspect.equals(QName.createQName(qName, namespaceService)))
+            {
+                success |= true;
+                break;
+            }
+        }
+        
+        return success;
+    }
+
+    private Map<QName, String> getPropertyMap(JSONObject properties) throws Exception
+    {
+        Map<QName, String> propertyMap = new HashMap<QName, String>(properties.length());
+        @SuppressWarnings("rawtypes")
+        Iterator propNames = properties.keys();
+        while(propNames.hasNext())
+        {
+            String propName = (String)propNames.next();
+            String value = properties.getString(propName);
+
+            propertyMap.put(QName.resolveToQName(namespaceService, propName), value);
+        }
+
+        return propertyMap;
+    }
+    
+    private boolean containsProperty(Map<QName, String> propertyMap, QName propName, String propValue) throws Exception
+    {
+        if(propName == null)
+        {
+            throw new IllegalArgumentException("propName cannot be null");
+        }
+
+        String value = propertyMap.get(propName);
+        return (value == null ? false : value.equals(propValue));
+    }
+    
+    public void DISABLED_testGetContent() throws Exception
+    {
+        long nodeId = -1l;
+        String propertyName = ContentModel.PROP_CONTENT.toString();
+
+        buildTransactions3();
+        
+        String url = "/api/solr/content?nodeId=" + nodeId + "&propertyName=" + propertyName;
+        TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url);
+        Response response = sendRequest(req, Status.STATUS_OK, admin);
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("content1 = " + response.getContentAsString());
+        }
+        assertEquals("Content length is incorrect", "test content".length(), response.getContentLength());
+    }
+    
+    private long getNodeID(NodeRef nodeRef)
+    {
+        Pair<Long, NodeRef> pair = nodeDAO.getNodePair(nodeRef);
+        assertNotNull("Can't find node " + nodeRef, pair);
+        return pair.getFirst();
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/StatsGetTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/StatsGetTest.java
new file mode 100644
index 00000000000..d2ab8e8014e
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/StatsGetTest.java
@@ -0,0 +1,80 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.solr;
+
+import static org.junit.Assert.*;
+
+import org.alfresco.util.Pair;
+import org.joda.time.LocalDate;
+import org.junit.Test;
+
+/**
+ * Tests StatsGet Webscript
+ *
+ * @author Gethin James
+ * @since 5.0
+ */
+public class StatsGetTest
+{
+
+    @Test
+    public void testGetStartAndEndDates()
+    {
+        LocalDate currentDate = LocalDate.now();
+        Pair<LocalDate, LocalDate> dates = StatsGet.getStartAndEndDates(null, null);
+        assertNull(dates);
+        
+        String test1 = "2014-05-01";
+        String test2 = "2015-06-30";
+        dates = StatsGet.getStartAndEndDates(test1, null);
+        assertNotNull(dates);
+        assertEquals(2014, dates.getFirst().getYear());
+        assertEquals(5, dates.getFirst().getMonthOfYear());
+        assertEquals(1, dates.getFirst().getDayOfMonth());
+        assertEquals(currentDate, dates.getSecond());
+        
+        dates = StatsGet.getStartAndEndDates(null, test2);
+        assertNull(dates);
+        
+        dates = StatsGet.getStartAndEndDates(test1, test2);
+        assertNotNull(dates);
+        assertEquals(2014, dates.getFirst().getYear());
+        assertEquals(5, dates.getFirst().getMonthOfYear());
+        assertEquals(1, dates.getFirst().getDayOfMonth());
+        assertNotNull(dates);
+        assertEquals(2015, dates.getSecond().getYear());
+        assertEquals(6, dates.getSecond().getMonthOfYear());
+        assertEquals(30, dates.getSecond().getDayOfMonth());
+    }
+    
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetStartAndEndDatesWithRubbish()
+    {      
+        Pair<LocalDate, LocalDate> dates = StatsGet.getStartAndEndDates("rubbish", "more");
+        assertNotNull(dates);
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceRestApiTest.java
new file mode 100644
index 00000000000..5963efe5340
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/subscriptions/SubscriptionServiceRestApiTest.java
@@ -0,0 +1,313 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.subscriptions;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.util.PropertyMap;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Subscription Service REST API tests
+ */
+public class SubscriptionServiceRestApiTest extends BaseWebScriptTest
+{
+    public static final String USER_BOB = "bob";
+    public static final String USER_TOM = "tom";
+    public static final String USER_LISA = "lisa";
+
+    private static final String URL_FOLLOW = "/api/subscriptions/{userid}/follow";
+    private static final String URL_UNFOLLOW = "/api/subscriptions/{userid}/unfollow";
+    private static final String URL_FOLLOWERS = "/api/subscriptions/{userid}/followers";
+    private static final String URL_FOLLOWERS_COUNT = "/api/subscriptions/{userid}/followers/count";
+    private static final String URL_FOLLOWING = "/api/subscriptions/{userid}/following";
+    private static final String URL_FOLLOWING_COUNT = "/api/subscriptions/{userid}/following/count";
+    private static final String URL_FOLLOWS = "/api/subscriptions/{userid}/follows";
+    private static final String URL_PRIVATE = "/api/subscriptions/{userid}/private";
+
+    protected PersonService personService;
+
+    @Override
+    public void setUp() throws Exception
+    {
+        // Get the required services
+        personService = (PersonService) getServer().getApplicationContext().getBean("PersonService");
+
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
+
+        createPerson(USER_BOB);
+        createPerson(USER_TOM);
+        createPerson(USER_LISA);
+    }
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        deletePerson(USER_BOB);
+        deletePerson(USER_TOM);
+        deletePerson(USER_LISA);
+    }
+
+    protected void deletePerson(String userId)
+    {
+        personService.deletePerson(userId);
+    }
+
+    protected NodeRef createPerson(String userId)
+    {
+        deletePerson(userId);
+
+        PropertyMap properties = new PropertyMap(5);
+        properties.put(ContentModel.PROP_USERNAME, userId);
+        properties.put(ContentModel.PROP_FIRSTNAME, userId);
+        properties.put(ContentModel.PROP_LASTNAME, "Test");
+        properties.put(ContentModel.PROP_EMAIL, userId + "@test.demo.alfresco.com");
+
+        return personService.createPerson(properties);
+    }
+
+    protected String getUrl(String urlPattern, String user)
+    {
+        return urlPattern.replaceFirst("\\{userid\\}", user);
+    }
+
+    protected void follow(String user1, String user2) throws Exception
+    {
+        JSONArray jsonUsers = new JSONArray();
+        jsonUsers.put(user2);
+
+        String url = getUrl(URL_FOLLOW, user1);
+        sendRequest(new PostRequest(url, jsonUsers.toString(), "application/json"), Status.STATUS_NO_CONTENT);
+    }
+
+    protected void unfollow(String user1, String user2) throws Exception
+    {
+        JSONArray jsonUsers = new JSONArray();
+        jsonUsers.put(user2);
+
+        String url = getUrl(URL_UNFOLLOW, user1);
+        sendRequest(new PostRequest(url, jsonUsers.toString(), "application/json"), Status.STATUS_NO_CONTENT);
+    }
+
+    protected boolean follows(String user1, String user2) throws Exception
+    {
+        JSONArray jsonUsers = new JSONArray();
+        jsonUsers.put(user2);
+
+        String url = getUrl(URL_FOLLOWS, user1);
+        Response response = sendRequest(new PostRequest(url, jsonUsers.toString(), "application/json"),
+                Status.STATUS_OK);
+
+        JSONArray resultArray = new JSONArray(response.getContentAsString());
+        assertEquals(1, resultArray.length());
+
+        JSONObject resultObject = resultArray.getJSONObject(0);
+        assertTrue(resultObject.has(user2));
+
+        return resultObject.getBoolean(user2);
+    }
+
+    protected int getFollowingCount(String user) throws Exception
+    {
+        String url = getUrl(URL_FOLLOWING_COUNT, user);
+        Response response = sendRequest(new GetRequest(url), Status.STATUS_OK);
+
+        JSONObject resultObject = new JSONObject(response.getContentAsString());
+        assertTrue(resultObject.has("count"));
+
+        return resultObject.getInt("count");
+    }
+
+    protected int getFollowersCount(String user) throws Exception
+    {
+        String url = getUrl(URL_FOLLOWERS_COUNT, user);
+        Response response = sendRequest(new GetRequest(url), Status.STATUS_OK);
+
+        JSONObject resultObject = new JSONObject(response.getContentAsString());
+        assertTrue(resultObject.has("count"));
+
+        return resultObject.getInt("count");
+    }
+
+    protected List<String> getFollowing(String user) throws Exception
+    {
+        String url = getUrl(URL_FOLLOWING, user);
+        Response response = sendRequest(new GetRequest(url), Status.STATUS_OK);
+
+        JSONObject resultObject = new JSONObject(response.getContentAsString());
+        assertTrue(resultObject.has("people"));
+
+        List<String> result = new ArrayList<String>();
+        JSONArray people = resultObject.getJSONArray("people");
+
+        for (int i = 0; i < people.length(); i++)
+        {
+            JSONObject person = people.getJSONObject(i);
+            assertTrue(person.has("userName"));
+            assertTrue(person.has("firstName"));
+            assertTrue(person.has("lastName"));
+
+            result.add(person.getString("userName"));
+        }
+
+        return result;
+    }
+
+    protected List<String> getFollowers(String user) throws Exception
+    {
+        String url = getUrl(URL_FOLLOWERS, user);
+        Response response = sendRequest(new GetRequest(url), Status.STATUS_OK);
+
+        JSONObject resultObject = new JSONObject(response.getContentAsString());
+        assertTrue(resultObject.has("people"));
+
+        List<String> result = new ArrayList<String>();
+        JSONArray people = resultObject.getJSONArray("people");
+
+        for (int i = 0; i < people.length(); i++)
+        {
+            JSONObject person = people.getJSONObject(i);
+            assertTrue(person.has("userName"));
+            assertTrue(person.has("firstName"));
+            assertTrue(person.has("lastName"));
+
+            result.add(person.getString("userName"));
+        }
+
+        return result;
+    }
+
+    protected boolean isSubscriptionListPrivate(String user) throws Exception
+    {
+        String url = getUrl(URL_PRIVATE, user);
+        Response response = sendRequest(new GetRequest(url), Status.STATUS_OK);
+
+        JSONObject resultObject = new JSONObject(response.getContentAsString());
+        assertTrue(resultObject.has("private"));
+
+        return resultObject.getBoolean("private");
+    }
+
+    protected void setSubscriptionListPrivate(String user, boolean setPrivate) throws Exception
+    {
+        JSONObject privateObject = new JSONObject();
+        privateObject.put("private", setPrivate);
+
+        String url = getUrl(URL_PRIVATE, user);
+        Response response = sendRequest(new PutRequest(url, privateObject.toString(), "application/json"),
+                Status.STATUS_OK);
+
+        JSONObject resultObject = new JSONObject(response.getContentAsString());
+        assertTrue(resultObject.has("private"));
+        assertEquals(setPrivate, resultObject.getBoolean("private"));
+    }
+
+    public void testFollow() throws Exception
+    {
+        String userId1 = USER_BOB;
+        String userId2 = USER_TOM;
+        String userId3 = USER_LISA;
+
+        // check follows first
+        if (follows(userId1, userId2))
+        {
+            unfollow(userId1, userId2);
+        }
+        assertFalse(follows(userId1, userId2));
+
+        // count the people user 1 is following
+        int count = getFollowingCount(userId1);
+        assertTrue(count >= 0);
+
+        // user 1 follows user 2 -- twice (the second follow request should be
+        // ignored)
+        follow(userId1, userId2);
+        follow(userId1, userId2);
+        assertEquals(count + 1, getFollowingCount(userId1));
+        assertTrue(follows(userId1, userId2));
+
+        // user 1 follows user 3
+        follow(userId1, userId3);
+        assertEquals(count + 2, getFollowingCount(userId1));
+        assertTrue(follows(userId1, userId3));
+
+        // get following list of user 1
+        List<String> following = getFollowing(userId1);
+        assertNotNull(following);
+        assertTrue(following.contains(userId2));
+        assertTrue(following.contains(userId3));
+
+        // count followers of user 2
+        int followerCount = getFollowersCount(userId2);
+        assertTrue(followerCount > 0);
+
+        // get followers of user 2
+        List<String> followers = getFollowers(userId2);
+        assertNotNull(followers);
+        assertTrue(followers.contains(userId1));
+
+        // unfollow
+        unfollow(userId1, userId2);
+        assertEquals(count + 1, getFollowingCount(userId1));
+        assertFalse(follows(userId1, userId2));
+        assertTrue(follows(userId1, userId3));
+
+        unfollow(userId1, userId3);
+        assertEquals(count, getFollowingCount(userId1));
+        assertFalse(follows(userId1, userId3));
+    }
+
+    public void testPrivateList() throws Exception
+    {
+        final String userId1 = USER_BOB;
+
+        assertFalse(isSubscriptionListPrivate(userId1));
+
+        setSubscriptionListPrivate(userId1, false);
+        assertFalse(isSubscriptionListPrivate(userId1));
+
+        setSubscriptionListPrivate(userId1, true);
+        assertTrue(isSubscriptionListPrivate(userId1));
+
+        setSubscriptionListPrivate(userId1, false);
+        assertFalse(isSubscriptionListPrivate(userId1));
+
+        setSubscriptionListPrivate(userId1, true);
+        assertTrue(isSubscriptionListPrivate(userId1));
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/tagging/TaggingServiceTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/tagging/TaggingServiceTest.java
new file mode 100644
index 00000000000..a5f45d58d4b
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/tagging/TaggingServiceTest.java
@@ -0,0 +1,199 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.tagging;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.tagging.TaggingService;
+import org.alfresco.util.GUID;
+import org.alfresco.util.PropertyMap;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.alfresco.util.testing.category.RedundantTests;
+import org.junit.experimental.categories.Category;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+import org.json.JSONArray;
+
+/**
+ * Unit test to test tagging Web Script API
+ * 
+ * @author Roy Wetherall
+ */
+@Category({LuceneTests.class, RedundantTests.class})
+public class TaggingServiceTest extends BaseWebScriptTest
+{    
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private PersonService personService;
+    private TaggingService taggingService;
+    private FileFolderService fileFolderService;
+    private Repository repositoryHelper;
+    private NodeService nodeService;
+    
+    private static final String TEST_USER = "TaggingServiceTestUser";
+    
+    private static final String TAG_1 = "tagOneREST";
+    private static final String TAG_2 = "tagTwoREST";
+    private static final String TAG_3 = "tagThreeREST";
+    private static final String TAG_4 = "tagFourREST";
+    private static final String TAG_5 = "tagFiveREST";
+    
+    private NodeRef nodeOne;
+    private NodeRef nodeTwo;
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
+        this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+        this.taggingService = (TaggingService)getServer().getApplicationContext().getBean("TaggingService");        
+        this.fileFolderService = (FileFolderService)getServer().getApplicationContext().getBean("FileFolderService");
+        this.repositoryHelper = (Repository)getServer().getApplicationContext().getBean("repositoryHelper");
+        this.nodeService = (NodeService)getServer().getApplicationContext().getBean("NodeService");
+        
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+        
+        // Add a load of tags ready to use
+        this.taggingService.createTag(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"), TAG_1);
+        this.taggingService.createTag(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"), TAG_2);
+        this.taggingService.createTag(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"), TAG_3);
+        this.taggingService.createTag(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"), TAG_4);
+        this.taggingService.createTag(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"), TAG_5);     
+        
+        // Create test node's
+        NodeRef testRoot = this.repositoryHelper.getCompanyHome();
+        String guid = GUID.generate();
+        this.nodeOne = this.fileFolderService.create(testRoot, "test_doc1" + guid + ".txt", ContentModel.TYPE_CONTENT).getNodeRef();
+        this.nodeTwo = this.fileFolderService.create(testRoot, "test_dco2" + guid + ".txt", ContentModel.TYPE_CONTENT).getNodeRef();
+        
+        // Add tags to test nodes
+        this.taggingService.addTag(nodeOne, TAG_1);
+        this.taggingService.addTag(nodeOne, TAG_2);
+        this.taggingService.addTag(nodeTwo, TAG_2);
+        
+        // Create users
+        createUser(TEST_USER);
+        
+        // Do tests as user one
+        this.authenticationComponent.setCurrentUser(TEST_USER);
+    }
+    
+    private void createUser(String userName)
+    {
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            this.authenticationService.createAuthentication(userName, "PWD".toCharArray());
+            
+            PropertyMap ppOne = new PropertyMap(4);
+            ppOne.put(ContentModel.PROP_USERNAME, userName);
+            ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+            ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+            ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+            
+            this.personService.createPerson(ppOne);
+        }        
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
+        
+        this.taggingService.deleteTag(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"), TAG_1);
+        this.taggingService.deleteTag(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"), TAG_2);
+        this.taggingService.deleteTag(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"), TAG_3);
+        this.taggingService.deleteTag(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"), TAG_4);
+        this.taggingService.deleteTag(new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"), TAG_5);
+        
+        this.nodeService.deleteNode(this.nodeOne);
+        this.nodeService.deleteNode(this.nodeTwo);
+    }
+    
+    public void testGetTags()
+        throws Exception
+    {
+        Response response = sendRequest(new GetRequest("/api/tags/" + StoreRef.PROTOCOL_WORKSPACE + "/SpacesStore"), 200);
+        JSONArray jsonArray = new JSONArray(response.getContentAsString());
+        
+        // make sure there are results
+        assertNotNull(jsonArray);
+        assertTrue(jsonArray.length() > 0);
+        
+        response = sendRequest(new GetRequest("/api/tags/" + StoreRef.PROTOCOL_WORKSPACE + "/SpacesStore?tf=one"), 200);
+        jsonArray = new JSONArray(response.getContentAsString());
+        
+        // make sure there are results
+        assertNotNull(jsonArray);
+        assertTrue(jsonArray.length() > 0);
+        
+        response = sendRequest(new GetRequest("/api/tags/" + StoreRef.PROTOCOL_WORKSPACE + "/SpacesStore?tf=none"), 200);
+        jsonArray = new JSONArray(response.getContentAsString());
+        
+        // make sure there are no results
+        assertNotNull(jsonArray);
+        assertEquals(0, jsonArray.length());
+    }
+    
+    public void testGetNodes()
+        throws Exception
+    {
+        Response response = sendRequest(new GetRequest("/api/tags/" + StoreRef.PROTOCOL_WORKSPACE + "/SpacesStore/" + TAG_1 + "/nodes"), 200);
+        JSONArray jsonArray = new JSONArray(response.getContentAsString());
+        
+        assertNotNull(jsonArray);
+        assertEquals(1, jsonArray.length());
+        
+        System.out.println(response.getContentAsString());
+        
+        response = sendRequest(new GetRequest("/api/tags/" + StoreRef.PROTOCOL_WORKSPACE + "/SpacesStore/" + TAG_2 + "/nodes"), 200);
+        jsonArray = new JSONArray(response.getContentAsString());
+        
+        assertNotNull(jsonArray);
+        assertEquals(2, jsonArray.length());
+        
+        response = sendRequest(new GetRequest("/api/tags/" + StoreRef.PROTOCOL_WORKSPACE + "/SpacesStore/jumk/nodes"), 200);
+        jsonArray = new JSONArray(response.getContentAsString());
+        
+        assertNotNull(jsonArray);
+        assertEquals(0, jsonArray.length());
+        
+    }
+    
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/tenant/TenantAdminSystemTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/tenant/TenantAdminSystemTest.java
new file mode 100644
index 00000000000..413f8e53171
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/tenant/TenantAdminSystemTest.java
@@ -0,0 +1,412 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.tenant;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONObject;
+import org.springframework.extensions.surf.util.Base64;
+
+/**
+ * Simple test of Tenant REST API - eg. create tenant
+ * 
+ * @author janv
+ * @since 4.2
+ */
+public class TenantAdminSystemTest extends TestCase
+{
+    private static Log logger = LogFactory.getLog(TenantAdminSystemTest.class);
+    
+    // TODO - use test property file
+    private static final String REPO = "http://localhost:8080/alfresco";
+    
+    // web script (REST)
+    private static final String WEBSCRIPT_ENDPOINT  = REPO + "/service";
+    
+    // Tenant Admin Service part-URLs
+    private static final String URL_TENANTS = "/api/tenants";
+    
+    // Test users & passwords
+    private static final String ADMIN_USER = "admin";
+    private static final String ADMIN_PW = "admin";
+    
+    private static final String TENANT_PREFIX = "t"+System.currentTimeMillis()+"-";
+    
+    private static final int T_CNT = 5;
+    
+    public enum Op {CREATE_TENANT};
+    
+    public TenantAdminSystemTest()
+    {
+    }
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+    
+    public void testLogin() throws Exception
+    {
+        String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+        assertNotNull(ticket);
+    }
+    
+    public void testCreateTenants() throws Exception
+    {
+        runWorkers(1, T_CNT, Op.CREATE_TENANT);
+    }
+    
+    protected static void createTenant(String tenantDomain, String ticket) throws Exception
+    {
+        JSONObject tenant = new JSONObject();
+        tenant.put("tenantDomain", tenantDomain);
+        tenant.put("tenantAdminPassword", tenantDomain);
+        
+        String url = WEBSCRIPT_ENDPOINT + URL_TENANTS;
+        String response = callPostWebScript(url, ticket, tenant.toString());
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("createTenant: " + tenantDomain);
+            logger.debug("----------");
+            logger.debug(url);
+            logger.debug(response);
+        }
+    }
+    
+    public void testGetTenants() throws Exception
+    {
+        String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+        
+        getTenants(ticket);
+    }
+    
+    protected void getTenants(String ticket) throws Exception
+    {
+        String url = WEBSCRIPT_ENDPOINT + URL_TENANTS;
+        String response = callGetWebScript(url, ticket);
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("getTenants:");
+            logger.debug("-------");
+            logger.debug(url);
+            logger.debug(response);
+        }
+    }
+    
+    protected static String callGetWebScript(String urlString, String ticket) throws MalformedURLException, URISyntaxException, IOException
+    {
+        return callOutWebScript(urlString, "GET", ticket);
+    }
+    
+    protected static String callDeleteWebScript(String urlString, String ticket) throws MalformedURLException, URISyntaxException, IOException
+    {
+        return callOutWebScript(urlString, "DELETE", ticket);
+    }
+    
+    protected static String callPostWebScript(String urlString, String ticket, String data) throws MalformedURLException, URISyntaxException, IOException
+    {
+        return callInOutWebScript(urlString, "POST", ticket, data);
+    }
+    
+    protected static String callPutWebScript(String urlString, String ticket, String data) throws MalformedURLException, URISyntaxException, IOException
+    {
+        return callInOutWebScript(urlString, "PUT", ticket, data);
+    }
+    
+    private static String callOutWebScript(String urlString, String method, String ticket) throws MalformedURLException, URISyntaxException, IOException
+    {
+        URL url = new URL(urlString);
+        
+        HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+        conn.setRequestMethod(method);
+        
+        if (ticket != null)
+        {
+            // add Base64 encoded authorization header
+            // refer to: http://wiki.alfresco.com/wiki/Web_Scripts_Framework#HTTP_Basic_Authentication
+            conn.addRequestProperty("Authorization", "Basic " + Base64.encodeBytes(ticket.getBytes()));
+        }
+        
+        String result = null;
+        InputStream is = null;
+        BufferedReader br = null;
+        
+        try
+        {
+            is = conn.getInputStream();
+            br = new BufferedReader(new InputStreamReader(is));
+            
+            String line = null;
+            StringBuffer sb = new StringBuffer();
+            while(((line = br.readLine()) !=null))  {
+                sb.append(line);
+            }
+            
+            result = sb.toString();
+        }
+        finally
+        {
+            if (br != null) { br.close(); };
+            if (is != null) { is.close(); };
+        }
+        
+        return result;
+    }
+    
+    private static String callInOutWebScript(String urlString, String method, String ticket, String data) throws MalformedURLException, URISyntaxException, IOException
+    {
+        return callInOutWeb(urlString, method, ticket, data, "application/json", null);
+    }
+    
+    private static String callInOutWeb(String urlString, String method, String ticket, String data, String contentType, String soapAction) throws MalformedURLException, URISyntaxException, IOException
+    {
+        URL url = new URL(urlString);
+        
+        HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+        conn.setRequestMethod(method);
+        
+        conn.setRequestProperty("Content-type", contentType);
+        
+        conn.setDoOutput(true);
+        conn.setDoInput(true);
+        conn.setUseCaches (false);
+        
+        if (soapAction != null)
+        {
+            conn.setRequestProperty("SOAPAction", soapAction);
+        }
+        
+        if (ticket != null)
+        {
+            // add Base64 encoded authorization header
+            // refer to: http://wiki.alfresco.com/wiki/Web_Scripts_Framework#HTTP_Basic_Authentication
+            conn.addRequestProperty("Authorization", "Basic " + Base64.encodeBytes(ticket.getBytes()));
+        }
+        
+        String result = null;
+        BufferedReader br = null;
+        DataOutputStream wr = null;
+        OutputStream os = null;
+        InputStream is = null;
+        
+        try
+        {
+            os = conn.getOutputStream();
+            wr = new DataOutputStream(os);
+            wr.write(data.getBytes());
+            wr.flush();
+        }
+        finally
+        {
+            if (wr != null) { wr.close(); };
+            if (os != null) { os.close(); };
+        }
+        
+        try
+        {
+            is = conn.getInputStream();
+            br = new BufferedReader(new InputStreamReader(is));
+            
+            String line = null;
+            StringBuffer sb = new StringBuffer();
+            while(((line = br.readLine()) !=null)) 
+            {
+                sb.append(line);
+            }
+            
+            result = sb.toString();
+        }
+        finally
+        {
+            if (br != null) { br.close(); };
+            if (is != null) { is.close(); };
+        }
+        
+        return result;
+    }
+    
+    protected static String callLoginWebScript(String serviceUrl, String username, String password) throws MalformedURLException, URISyntaxException, IOException
+    {
+        // Refer to: http://wiki.alfresco.com/wiki/Web_Scripts_Framework#HTTP_Basic_Authentication  
+        String ticketResult = callGetWebScript(serviceUrl+"/api/login?u="+username+"&pw="+password, null);
+        
+        if (ticketResult != null)
+        {
+            int startTag = ticketResult.indexOf("<ticket>");
+            int endTag = ticketResult.indexOf("</ticket>");
+            if ((startTag != -1) && (endTag != -1))
+            {
+                ticketResult = ticketResult.substring(startTag+("<ticket>".length()), endTag);
+            }
+        }
+        
+        return ticketResult;
+    }
+    
+    private static void runWorkers(int threadCount, int threadBatch, Op mode)
+    {
+        logger.info("Start: Mode "+mode+" ["+threadCount+"]");
+        
+        long start = System.currentTimeMillis();
+        
+        Thread[] threads = new Thread[threadCount];
+        
+        Worker[] nesters = new Worker[threadCount];
+        
+        for (int i = 0; i < threadCount; i++)
+        {
+            int startId = (i*threadBatch)+1;
+            int endId = (i+1)*threadBatch;
+            
+            Worker nester = new Worker(mode, startId, endId);
+            nesters[i] = nester;
+            
+            threads[i] = new Thread(nester);
+            threads[i].start();
+        }
+        
+        int totalCnt = 0;
+        long totalTime = 0;
+        
+        // join each thread so that we wait for them all to finish
+        for (int i = 0; i < threadCount; i++)
+        {
+            try
+            {
+                threads[i].join();
+                
+                if (nesters[i].getErrorStackTrace() != null)
+                {
+                    throw new RuntimeException(nesters[i].getErrorStackTrace());
+                }
+                
+                if (nesters[i].getOpTime() != null)
+                {
+                    totalTime = totalTime + nesters[i].getOpTime();
+                    totalCnt++;
+                }
+            }
+            catch (InterruptedException e)
+            {
+                // ignore
+            }
+        }
+        
+        logger.info("Finish: Mode "+mode+" [threadCount="+threadCount+", threadBatch="+threadBatch+"] in "+(System.currentTimeMillis()-start)+" ms (avg per thread = "+totalTime/totalCnt+" ms)");
+    }
+    
+    private static class Worker implements Runnable
+    {
+        private Op op;
+        private int startId;
+        private int endId;
+        
+        private String errorStackTrace = null;
+        
+        private Long opTime;
+        
+        Worker(Op mode, int startId, int endId)
+        {
+            this.op = mode;
+            this.startId = startId;
+            this.endId = endId;
+        }
+        
+        public String getErrorStackTrace()
+        {
+            return errorStackTrace;
+        }
+        
+        public Long getOpTime()
+        {
+            return opTime;
+        }
+        
+        public void run()
+        {
+            String tenantDomain = null;
+            
+            try
+            {
+                long start = System.currentTimeMillis();
+                
+                logger.info("Start: Mode "+op+" ("+startId+" to "+endId+") [ThreadId="+Thread.currentThread().getId()+"]");
+                
+                for (int i = startId; i <= endId; i++)
+                {
+                    tenantDomain = TENANT_PREFIX+String.format("%05d", i);
+                    
+                    switch(op)
+                    {
+                    case CREATE_TENANT:
+                        String ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, ADMIN_USER, ADMIN_PW);
+                        createTenant(TENANT_PREFIX+"--"+String.format("%05d", i), ticket);
+                        break;
+                    default:
+                        throw new UnsupportedOperationException("Unsupported op type: "+op);
+                    }
+                }
+                
+                opTime = (System.currentTimeMillis()-start);
+                
+                logger.info("Finish: Mode "+op+" ("+startId+" to "+endId+") [ThreadId="+Thread.currentThread().getId()+"] in "+opTime+" ms");
+            }
+            catch (Throwable t)
+            {
+                logger.error("End " + tenantDomain + " with error " + t.getMessage());
+                
+                StringWriter sw = new StringWriter();
+                t.printStackTrace(new PrintWriter(sw));
+                
+                errorStackTrace = sw.toString();
+            }
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/test/LargeContentTestPut.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/test/LargeContentTestPut.java
new file mode 100644
index 00000000000..0d31baa9e20
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/test/LargeContentTestPut.java
@@ -0,0 +1,62 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.test;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Test webscript class that simply read request content. Used in unit test for MNT-11237 issue.
+ * 
+ * @author pavel.yurkevich
+ */
+public class LargeContentTestPut extends DeclarativeWebScript
+{
+    @Override
+    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
+    {
+        Map<String, Object> model = new HashMap<String, Object>();
+        
+        try
+        {
+            req.getContent().getInputStream().close();
+            model.put("result", "success");
+        }
+        catch (IOException e)
+        {
+            throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR, "Fail to read request content.");
+        }
+        return model;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java
new file mode 100644
index 00000000000..2e806baba69
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java
@@ -0,0 +1,388 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.thumbnail;
+
+import java.io.InputStream;
+import java.util.Collections;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.rendition2.SynchronousTransformClient;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.TransactionServiceImpl;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.TransformationOptions;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.util.GUID;
+import org.alfresco.util.PropertyMap;
+import org.junit.experimental.categories.Category;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * Unit test to test thumbnail web script API
+ * 
+ * @author Roy Wetherall
+ */
+@Category(OwnJVMTestsCategory.class)
+public class ThumbnailServiceTest extends BaseWebScriptTest
+{    
+    private NodeRef testRoot;
+    private NodeRef pdfNode;
+    private NodeRef jpgNode;
+    
+    private FileFolderService fileFolderService;
+    private ContentService contentService;
+    private SynchronousTransformClient synchronousTransformClient;
+    private Repository repositoryHelper;
+    private TransactionServiceImpl transactionService;
+    private MutableAuthenticationService authenticationService;
+    private PersonService personService;
+    
+    private static final String USER_ALFRESCO = "AlfrescoUser";
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();       
+ 
+        this.fileFolderService = (FileFolderService)getServer().getApplicationContext().getBean("FileFolderService");
+        this.contentService = (ContentService)getServer().getApplicationContext().getBean("ContentService");
+        synchronousTransformClient = (SynchronousTransformClient) getServer().getApplicationContext().getBean("synchronousTransformClient");
+        this.repositoryHelper = (Repository)getServer().getApplicationContext().getBean("repositoryHelper");
+        this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
+        this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+        try
+        {
+            this.transactionService = (TransactionServiceImpl) getServer().getApplicationContext().getBean("transactionComponent");
+        }
+        catch (ClassCastException e)
+        {
+            throw new AlfrescoRuntimeException("The ThumbnailServiceTest needs direct access to the TransactionServiceImpl");
+        }
+        
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
+        
+        this.testRoot = this.repositoryHelper.getCompanyHome();
+        
+        // Get test content
+        InputStream pdfStream = ThumbnailServiceTest.class.getClassLoader().getResourceAsStream("org/alfresco/repo/web/scripts/thumbnail/test_doc.pdf");        
+        assertNotNull(pdfStream);
+        InputStream jpgStream = ThumbnailServiceTest.class.getClassLoader().getResourceAsStream("org/alfresco/repo/web/scripts/thumbnail/test_image.jpg");
+        assertNotNull(jpgStream);
+        
+        String guid = GUID.generate();
+        
+        // Create new nodes and set test content
+        FileInfo fileInfoPdf = this.fileFolderService.create(this.testRoot, "test_doc" + guid + ".pdf", ContentModel.TYPE_CONTENT);
+        this.pdfNode = fileInfoPdf.getNodeRef();
+        ContentWriter contentWriter = this.contentService.getWriter(fileInfoPdf.getNodeRef(), ContentModel.PROP_CONTENT, true);
+        contentWriter.setEncoding("UTF-8");
+        contentWriter.setMimetype(MimetypeMap.MIMETYPE_PDF);
+        contentWriter.putContent(pdfStream);
+        
+        FileInfo fileInfoJpg = this.fileFolderService.create(this.testRoot, "test_image" + guid + ".jpg", ContentModel.TYPE_CONTENT);
+        this.jpgNode = fileInfoJpg.getNodeRef();
+        contentWriter = this.contentService.getWriter(fileInfoJpg.getNodeRef(), ContentModel.PROP_CONTENT, true);
+        contentWriter.setEncoding("UTF-8");
+        contentWriter.setMimetype(MimetypeMap.MIMETYPE_IMAGE_JPEG);
+        contentWriter.putContent(jpgStream);        
+    }    
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        transactionService.setAllowWrite(true);
+
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+    
+    public void testCreateThumbnail() throws Exception
+    {
+        // Check for pdfToSWF transformation before doing test
+        if (synchronousTransformClient.isSupported(MimetypeMap.MIMETYPE_PDF, -1, null,
+                MimetypeMap.MIMETYPE_FLASH, Collections.emptyMap(), null, null))
+        {
+            String url = "/api/node/" + pdfNode.getStoreRef().getProtocol() + "/" + pdfNode.getStoreRef().getIdentifier() + "/" + pdfNode.getId() + "/content/thumbnails";
+            
+            JSONObject tn = new JSONObject();
+            tn.put("thumbnailName", "webpreview");
+            
+            Response response = sendRequest(new PostRequest(url, tn.toString(), "application/json"), 200);
+            
+            System.out.println(response.getContentAsString());
+        }
+        
+        // Check getAll whilst we are here 
+        Response getAllResp = sendRequest(new GetRequest(getThumbnailsURL(jpgNode)), 200);
+        JSONArray getArr = new JSONArray(getAllResp.getContentAsString());
+        assertNotNull(getArr);
+        assertEquals(0, getArr.length());
+        
+        // Do a image transformation (medium)
+        String url = "/api/node/" + jpgNode.getStoreRef().getProtocol() + "/" + jpgNode.getStoreRef().getIdentifier() + "/" + jpgNode.getId() + "/content/thumbnails";
+        JSONObject tn = new JSONObject();
+        tn.put("thumbnailName", "medium");
+        Response response = sendRequest(new PostRequest(url, tn.toString(), "application/json"), 200);
+        System.out.println(response.getContentAsString());
+        JSONObject result = new JSONObject(response.getContentAsString());
+        String thumbnailUrl = result.getString("url").substring(17);
+        
+        System.out.println(thumbnailUrl);
+        response = sendRequest(new GetRequest(thumbnailUrl), 200);
+        
+        // Check getAll whilst we are here 
+        getAllResp = sendRequest(new GetRequest(getThumbnailsURL(jpgNode)), 200);
+        getArr = new JSONArray(getAllResp.getContentAsString());
+        assertNotNull(getArr);
+        assertEquals(1, getArr.length());
+        assertEquals("medium", getArr.getJSONObject(0).get("thumbnailName"));
+        
+    }
+    
+    private void createUser(String userName)
+    {
+        // if user with given user name doesn't already exist then create user
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            // create user
+            this.authenticationService.createAuthentication(userName, "password".toCharArray());
+            
+            // create person properties
+            PropertyMap personProps = new PropertyMap();
+            personProps.put(ContentModel.PROP_USERNAME, userName);
+            personProps.put(ContentModel.PROP_FIRSTNAME, "First");
+            personProps.put(ContentModel.PROP_LASTNAME, "Last");
+            personProps.put(ContentModel.PROP_EMAIL, "FirstName123.LastName123@email.com");
+            personProps.put(ContentModel.PROP_JOBTITLE, "JobTitle123");
+            personProps.put(ContentModel.PROP_JOBTITLE, "Organisation123");
+            
+            // create person node for user
+            this.personService.createPerson(personProps);
+        }
+    }
+    
+    public void testCreateThumbnailInReadonlyMode() throws Exception
+    {
+        createUser(USER_ALFRESCO);
+        AuthenticationUtil.setFullyAuthenticatedUser(USER_ALFRESCO);
+        this.transactionService.setAllowWrite(false);
+        
+        // do pdfToSWF transformation in read-only
+        if (synchronousTransformClient.isSupported(MimetypeMap.MIMETYPE_PDF, -1, null,
+                MimetypeMap.MIMETYPE_FLASH, Collections.emptyMap(), null, null))
+        {
+            // in share creation of thumbnail for webpreview is forced
+            String url = "/api/node/" + pdfNode.getStoreRef().getProtocol() + "/" + pdfNode.getStoreRef().getIdentifier() + "/" + pdfNode.getId() + "/content/thumbnails/webpreview?c=force";
+            
+            JSONObject tn = new JSONObject();
+            tn.put("thumbnailName", "webpreview");
+            
+            sendRequest(new GetRequest(url), 200, USER_ALFRESCO);
+        }
+        
+        this.transactionService.setAllowWrite(true);
+        
+        // Check getAll whilst we are here 
+        Response getAllResp = sendRequest(new GetRequest(getThumbnailsURL(jpgNode)), 200);
+        JSONArray getArr = new JSONArray(getAllResp.getContentAsString());
+        assertNotNull(getArr);
+        assertEquals(0, getArr.length());
+    }
+    
+    public void testUpdateThumbnail() throws Exception
+    {
+        // Do a image transformation
+        String url = "/api/node/" + jpgNode.getStoreRef().getProtocol() + "/" + jpgNode.getStoreRef().getIdentifier() + "/" + jpgNode.getId() + "/content/thumbnails";
+        JSONObject tn = new JSONObject();
+        tn.put("thumbnailName", "doclib");
+        Response response = sendRequest(new PostRequest(url, tn.toString(), "application/json"), 200);
+        System.out.println(response.getContentAsString());
+        
+        // Check getAll whilst we are here 
+        Response getAllResp = sendRequest(new GetRequest(getThumbnailsURL(jpgNode)), 200);
+        JSONArray getArr = new JSONArray(getAllResp.getContentAsString());
+        assertNotNull(getArr);
+        assertEquals(1, getArr.length());
+        assertEquals("doclib", getArr.getJSONObject(0).get("thumbnailName"));
+        //Now we know that thumbnail was created
+        
+        
+        sendRequest(new GetRequest(getThumbnailsURL(jpgNode) + "/incorrectname"), 404);
+        //Request for update of thumbnail, that is absent
+        sendRequest(new PutRequest(getThumbnailsURL(jpgNode) + "/incorrectname", "", "application/json"), 404);
+        //Request for update of correct thumbnail
+        sendRequest(new PutRequest(getThumbnailsURL(jpgNode) + "/doclib", "", "application/json"), 200);
+    }
+    
+    public void testThumbnailDefinitions() throws Exception
+    {
+        // Check for pdfToSWF transformation before doing test
+        if (synchronousTransformClient.isSupported(MimetypeMap.MIMETYPE_PDF, -1, null,
+                MimetypeMap.MIMETYPE_FLASH, Collections.emptyMap(), null, null))
+        {
+            String url = "/api/node/" + pdfNode.getStoreRef().getProtocol() + "/" + pdfNode.getStoreRef().getIdentifier() + "/" + pdfNode.getId() + "/content/thumbnaildefinitions";
+            Response response = sendRequest(new GetRequest(url), 200);
+            
+            JSONArray array = new JSONArray(response.getContentAsString());
+            assertNotNull(array);
+            assertFalse(array.length() == 0);
+            boolean hasMedium = false;
+            boolean hasWebPreview = false;
+            for (int i = 0; i < array.length(); i++)
+            {
+                if (array.getString(i).equals("medium") == true)
+                {
+                    hasMedium = true;
+                }
+                else if (array.getString(i).equals("webpreview") == true)
+                {
+                    hasWebPreview = true;
+                }
+            }
+            assertTrue(hasMedium);
+            assertTrue(hasWebPreview);
+        }
+        
+        String url = "/api/node/" + jpgNode.getStoreRef().getProtocol() + "/" + jpgNode.getStoreRef().getIdentifier() + "/" + jpgNode.getId() + "/content/thumbnaildefinitions";
+        Response response = sendRequest(new GetRequest(url), 200);
+        
+        JSONArray array = new JSONArray(response.getContentAsString());
+        assertNotNull(array);
+        assertFalse(array.length() == 0);
+        boolean hasMedium = false;
+        boolean hasWebPreview = false;
+        for (int i = 0; i < array.length(); i++)
+        {
+            if (array.getString(i).equals("medium") == true)
+            {
+                hasMedium = true;
+            }
+            else if (array.getString(i).equals("webpreview") == true)
+            {
+                hasWebPreview = true;
+            }
+        }
+        assertTrue(hasMedium);
+        assertFalse(hasWebPreview);
+    }
+    
+    public void testCreateAsyncThumbnail() throws Exception
+    {
+        // Check for pdfToSWF transformation before doing test
+        if (synchronousTransformClient.isSupported(MimetypeMap.MIMETYPE_PDF, -1, null,
+                MimetypeMap.MIMETYPE_FLASH, Collections.emptyMap(), null, null))
+        {
+            String url = "/api/node/" + pdfNode.getStoreRef().getProtocol() + "/" + pdfNode.getStoreRef().getIdentifier() + "/" + pdfNode.getId() + "/content/thumbnails?as=true";
+            
+            JSONObject tn = new JSONObject();
+            tn.put("thumbnailName", "webpreview");
+            
+            Response response = sendRequest(new PostRequest(url, tn.toString(), "application/json"), 200);
+            assertEquals("", response.getContentAsString().trim());
+            getWait(pdfNode, "webpreview");            
+        }
+        
+        // Do a image transformation (medium)
+        String url = "/api/node/" + jpgNode.getStoreRef().getProtocol() + "/" + jpgNode.getStoreRef().getIdentifier() + "/" + jpgNode.getId() + "/content/thumbnails?as=true";
+        JSONObject tn = new JSONObject();
+        tn.put("thumbnailName", "medium");
+        Response response = sendRequest(new PostRequest(url, tn.toString(), "application/json"), 200);
+
+        assertEquals("", response.getContentAsString().trim());
+        getWait(jpgNode, "medium");        
+    }
+    
+    private void getWait(NodeRef node, String thumbnailName)
+        throws Exception
+    {
+        String url = "/api/node/" + node.getStoreRef().getProtocol() + "/" + node.getStoreRef().getIdentifier() + "/" + node.getId() + "/content/thumbnails/" + thumbnailName;
+       
+        int retries = 50;
+        int tries = 0;
+        while (true)
+        {
+            if (tries >= retries)
+            {
+                fail("Thumbnail never gets created " + thumbnailName);
+            }
+            
+            Response response = sendRequest(new GetRequest(url), 0);
+            if (response.getStatus() == 200)
+            {
+                break;
+            }
+            else if (response.getStatus() == 500)
+            {
+                System.out.println("Error during getWait: " + response.getContentAsString());
+                fail("A 500 status was found whilst waiting for the thumbnail to be processed");
+            }
+            else
+            {
+                Thread.sleep(100);
+            }
+            
+            tries++;
+        }        
+    } 
+    
+    public void testPlaceHolder()
+        throws Exception
+    {
+        if (synchronousTransformClient.isSupported(MimetypeMap.MIMETYPE_PDF, -1, null,
+                MimetypeMap.MIMETYPE_FLASH, Collections.emptyMap(), null, null))
+        {
+            // Check that there is no place holder set for webpreview
+            sendRequest(new GetRequest(getThumbnailsURL(pdfNode) + "/webpreview"), 404);
+            sendRequest(new GetRequest(getThumbnailsURL(pdfNode) + "/webpreview?ph=true"), 404);
+        }
+        
+        // Check that here is a place holder for medium
+        sendRequest(new GetRequest(getThumbnailsURL(jpgNode) + "/medium"), 404);
+        sendRequest(new GetRequest(getThumbnailsURL(jpgNode) + "/medium?ph=true"), 200);
+        
+        System.out.println(getThumbnailsURL(jpgNode) + "/medium?ph=true");
+    }
+    
+    private String getThumbnailsURL(NodeRef nodeRef)
+    {
+        return "/api/node/" + nodeRef.getStoreRef().getProtocol() + "/" + nodeRef.getStoreRef().getIdentifier() + "/" + nodeRef.getId() + "/content/thumbnails";
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/transfer/TransferWebScriptTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/transfer/TransferWebScriptTest.java
new file mode 100644
index 00000000000..b0a7e0ffd28
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/transfer/TransferWebScriptTest.java
@@ -0,0 +1,127 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.transfer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.util.PropertyMap;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+
+/**
+ * Test the transfer web script API
+ * 
+ * @author brian
+ */
+public class TransferWebScriptTest extends BaseWebScriptTest
+{    
+    private static final String USERNAME = "noddy.transfer";
+
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private PersonService personService;
+    private List<String> createdPeople = new ArrayList<String>(5);
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();       
+ 
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
+        this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
+        this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
+        this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
+        
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+        
+        // Create users
+        createUser(USERNAME);
+    }    
+
+    private void createUser(String userName)
+    {
+        if (this.authenticationService.authenticationExists(userName) == false)
+        {
+            this.authenticationService.createAuthentication(userName, "password".toCharArray());
+            
+            PropertyMap personProps = new PropertyMap();
+            personProps.put(ContentModel.PROP_USERNAME, userName);
+            personProps.put(ContentModel.PROP_FIRSTNAME, "myFirstName");
+            personProps.put(ContentModel.PROP_LASTNAME, "myLastName");
+            personProps.put(ContentModel.PROP_EMAIL, "myFirstName.myLastName@email.com");
+            personProps.put(ContentModel.PROP_JOBTITLE, "myJobTitle");
+            personProps.put(ContentModel.PROP_JOBTITLE, "myOrganisation");
+            
+            this.personService.createPerson(personProps);
+            
+            this.createdPeople.add(userName);
+        }        
+    }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        String adminUser = this.authenticationComponent.getSystemUserName();
+        this.authenticationComponent.setCurrentUser(adminUser);
+        
+        for (String userName : this.createdPeople)
+        {
+            personService.deletePerson(userName);
+        }
+        // Clear the list
+        this.createdPeople.clear();
+    }
+    
+    
+    public void testVerify() throws Exception
+    {
+        String url = "/api/transfer/test";
+        PostRequest req = new PostRequest(url, new JSONObject().toString(), "application/json");
+        
+        //First, we'll try the request as a simple, non-admin user (expect a 401)
+        AuthenticationUtil.setFullyAuthenticatedUser(USERNAME);
+        sendRequest(req, 401);
+        
+        //Then we'll have a go as the system user (expect a 200)
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.SYSTEM_USER_NAME);
+        sendRequest(req, 200);
+        
+        //Then we'll disable the transfer receiver and try again as the system user (expect a 404)
+        TransferWebScript webscript = (TransferWebScript)getServer().getApplicationContext().getBean("webscript.org.alfresco.repository.transfer.transfer.post");
+        webscript.setEnabled(false);
+        sendRequest(req, 404);
+    }
+    
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/upload/UploadWebScriptTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/upload/UploadWebScriptTest.java
new file mode 100644
index 00000000000..95dfd714a41
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/upload/UploadWebScriptTest.java
@@ -0,0 +1,247 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.upload;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.version.VersionModel;
+import org.alfresco.repo.version.VersionableAspectTest;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.coci.CheckOutCheckInService;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.cmr.version.VersionType;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.GUID;
+import org.apache.commons.httpclient.methods.multipart.FilePart;
+import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
+import org.apache.commons.httpclient.methods.multipart.Part;
+import org.apache.commons.httpclient.methods.multipart.StringPart;
+import org.apache.commons.httpclient.params.HttpMethodParams;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+import org.springframework.util.ResourceUtils;
+
+public class UploadWebScriptTest extends BaseWebScriptTest
+{
+
+    public static final String AUTO_VERSION_KEY = "version.store.enableAutoVersioning";
+    public static final String AUTO_VERSION_PROPS_KEY = "version.store.enableAutoVersionOnUpdateProps";
+    private static final String ADMIN_CREDENTIAL = "admin";
+
+    private AuthenticationService authenticationService;
+    private Properties globalProperties;
+    private TransactionService transactionService;
+    private SiteService siteService;
+    private NodeService nodeService;
+    private ContentService contentService;
+    private CheckOutCheckInService checkOutCheckInService;
+    private static final String DOCUMENT_SITE_NAME = "docSiteWithVersionLabel-.txt";
+    private static final String UPLOAD_URL = "api/upload";
+    private static final String RESOURCE_PREFIX = "publicapi/upload/";
+    private static final String TEST_SITE_PRESET = "testSitePreset";
+    private static final String TEST_TITLE = "TitleTest This is my title";
+    private static final String TEST_DESCRIPTION = "DescriptionTest This is my description";
+
+    private NodeRef documentSite;
+    private String fileName;
+    private File file;
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        this.authenticationService = (MutableAuthenticationService) getServer().getApplicationContext().getBean("AuthenticationService");
+        this.globalProperties = (Properties) getServer().getApplicationContext().getBean("global-properties");
+        this.transactionService = (TransactionService) getServer().getApplicationContext().getBean("transactionService");
+        this.siteService = (SiteService) getServer().getApplicationContext().getBean("SiteService");
+        this.nodeService = (NodeService) getServer().getApplicationContext().getBean("nodeService");
+        this.contentService = (ContentService) getServer().getApplicationContext().getBean("contentService");
+        this.checkOutCheckInService = (CheckOutCheckInService) getServer().getApplicationContext().getBean("checkOutCheckInService");
+
+        globalProperties.setProperty(AUTO_VERSION_PROPS_KEY, "true");
+
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                authenticationService.authenticate(ADMIN_CREDENTIAL, ADMIN_CREDENTIAL.toCharArray());
+                fileName = "quick-2.pdf";
+                file = getResourceFile(fileName);
+
+                // Create a Public site
+                SiteInfo siteInfo = createSite("site" + GUID.generate(), "doclib", SiteVisibility.PUBLIC);
+                
+                //Upload file in a site using webScript
+                Response response = uploadFileWs(file, fileName, siteInfo.getShortName(), "doclib");
+                assertNotNull("content of file", response.getContentAsString());
+                JSONObject jsonRsp = (JSONObject) JSONValue.parse(response.getContentAsString());
+                final String ssdNodeRefString = (String) jsonRsp.get("nodeRef");
+                assertNotNull("nodeRef", ssdNodeRefString);
+                documentSite = new NodeRef(ssdNodeRefString);
+
+                return null;
+            }
+        });
+    }
+
+    public void testChangeMetadataOnSite()
+    {
+
+        final String name11 = GUID.generate() + "02";
+        final String name21 = GUID.generate() + "2.1";
+
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                Map<QName, Serializable> properties = getAndAssertProperties(documentSite, "1.0");
+
+                Serializable autoVersionProps = properties.get(ContentModel.PROP_AUTO_VERSION_PROPS);
+                assertNotNull(("Autoversion property is NULL! NodeRef = '" + documentSite.toString() + "'"), autoVersionProps);
+                assertTrue(("Autoversion must be TRUE! NodeRef = '" + documentSite.toString() + "'"), (Boolean) autoVersionProps);
+
+                //change name minor version increment
+                nodeService.setProperty(documentSite, ContentModel.PROP_NAME, name11);
+                return null;
+            }
+        });
+        
+        Map<QName, Serializable> properties = getAndAssertProperties(documentSite, "1.1");
+        assertEquals(name11, properties.get(ContentModel.PROP_NAME));
+
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                NodeRef workingCopyDocSite = checkOutCheckInService.checkout(documentSite);
+                contentService.getWriter(workingCopyDocSite, ContentModel.PROP_CONTENT, true).putContent("content new");
+                Map<String, Serializable> versionProperties = new HashMap<String, Serializable>();
+                versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MAJOR);
+                //checkIn major version increment
+                documentSite = checkOutCheckInService.checkin(workingCopyDocSite, versionProperties);
+                return null;
+            }
+        });
+
+        getAndAssertProperties(documentSite, "2.0");
+
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                //change name minor version increment
+                nodeService.setProperty(documentSite, ContentModel.PROP_NAME, name21);
+                return null;
+            }
+        });
+
+        getAndAssertProperties(documentSite, "2.1");
+
+    }
+
+    private Response uploadFileWs(File file, String filename, String siteId, String containerId) throws IOException
+    {
+        PostRequest postRequest = buildMultipartPostRequest(file, filename, siteId, containerId);
+        return sendRequest(postRequest, 200);
+    }
+
+    public PostRequest buildMultipartPostRequest(File file, String filename, String siteId, String containerId) throws IOException
+    {
+        Part[] parts = 
+            { 
+                new FilePart("filedata", file.getName(), file, "text/plain", null), 
+                new StringPart("filename", filename),
+                new StringPart("description", "description"), 
+                new StringPart("siteid", siteId), 
+                new StringPart("containerid", containerId) 
+            };
+
+        MultipartRequestEntity multipartRequestEntity = new MultipartRequestEntity(parts, new HttpMethodParams());
+
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        multipartRequestEntity.writeRequest(os);
+
+        PostRequest postReq = new PostRequest(UPLOAD_URL, os.toByteArray(), multipartRequestEntity.getContentType());
+        return postReq;
+    }
+
+    private File getResourceFile(String fileName) throws FileNotFoundException
+    {
+        URL url = VersionableAspectTest.class.getClassLoader().getResource(RESOURCE_PREFIX + fileName);
+        if (url == null)
+        {
+            fail("Cannot get the resource: " + fileName);
+        }
+        return ResourceUtils.getFile(url);
+    }
+
+    private SiteInfo createSite(String siteShortName, String componentId, SiteVisibility visibility)
+    {
+        // Create a public site
+        SiteInfo siteInfo = this.siteService.createSite(TEST_SITE_PRESET, siteShortName, TEST_TITLE, TEST_DESCRIPTION, visibility);
+        this.siteService.createContainer(siteShortName, componentId, ContentModel.TYPE_FOLDER, null);
+        return siteInfo;
+    }
+
+    private Map<QName, Serializable> getAndAssertProperties(NodeRef nodeRef, String versionLabel)
+    {
+        assertNotNull("NodeRef of document is NULL!", nodeRef);
+
+        Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
+
+        assertNotNull(("Properties must not be NULL! NodeRef = '" + nodeRef.toString() + "'"), properties);
+        assertFalse(("Version specific properties can't be found! NodeRef = '" + nodeRef.toString() + "'"), properties.isEmpty());
+        assertEquals(versionLabel, properties.get(ContentModel.PROP_VERSION_LABEL));
+
+        return properties;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java
new file mode 100644
index 00000000000..1e711c76cf4
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java
@@ -0,0 +1,1895 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.person.TestGroupManager;
+import org.alfresco.repo.security.person.TestPersonManager;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.repo.workflow.WorkflowAdminServiceImpl;
+import org.alfresco.repo.workflow.WorkflowModel;
+import org.alfresco.repo.workflow.WorkflowTestHelper;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.workflow.WorkflowDefinition;
+import org.alfresco.service.cmr.workflow.WorkflowInstance;
+import org.alfresco.service.cmr.workflow.WorkflowNode;
+import org.alfresco.service.cmr.workflow.WorkflowPath;
+import org.alfresco.service.cmr.workflow.WorkflowService;
+import org.alfresco.service.cmr.workflow.WorkflowTask;
+import org.alfresco.service.cmr.workflow.WorkflowTaskDefinition;
+import org.alfresco.service.cmr.workflow.WorkflowTaskState;
+import org.alfresco.service.cmr.workflow.WorkflowTransition;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.GUID;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.experimental.categories.Category;
+import org.springframework.context.ApplicationContext;
+import org.alfresco.util.ISO8601DateFormat;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+
+/**
+ * @author Nick Smith
+ * @author Frederik Heremans
+ * @since 3.4.e
+ */
+@Category(LuceneTests.class)
+public abstract class AbstractWorkflowRestApiTest extends BaseWebScriptTest
+{
+    protected final static String USER1 = "Bob" + GUID.generate();
+    protected final static String USER2 = "Jane" + GUID.generate();
+    protected final static String USER3 = "Nick" + GUID.generate();
+    protected final static String GROUP ="Group" + GUID.generate();
+    protected static final String URL_TASKS = "api/task-instances";
+    protected static final String URL_USER_TASKS = "api/task-instances?authority={0}";
+    protected static final String URL_USER_TASKS_PROPERTIES = "api/task-instances?authority={0}&properties={1}";
+    protected static final String URL_TASKS_DUE_BEFORE = "api/task-instances?dueBefore={0}";
+    protected static final String URL_TASKS_DUE_AFTER = "api/task-instances?dueAfter={0}";
+    protected static final String URL_TASKS_DUE_AFTER_AND_SKIP = "api/task-instances?dueAfter={0}&skipCount={1}";
+    protected static final String URL_WORKFLOW_TASKS = "api/workflow-instances/{0}/task-instances";
+    protected static final String URL_WORKFLOW_DEFINITIONS = "api/workflow-definitions";
+    protected static final String URL_WORKFLOW_DEFINITION = "api/workflow-definitions/{0}";
+    protected static final String URL_WORKFLOW_INSTANCES = "api/workflow-instances";
+    protected static final String URL_WORKFLOW_INSTANCES_FOR_DEFINITION = "api/workflow-definitions/{0}/workflow-instances";
+    protected static final String URL_WORKFLOW_INSTANCES_FOR_NODE = "api/node/{0}/{1}/{2}/workflow-instances";
+
+    protected static final String COMPANY_HOME = "/app:company_home";
+    protected static final String TEST_CONTENT = "TestContent";
+    protected static final String ADHOC_START_TASK_TYPE = "wf:submitAdhocTask";
+    protected static final String ADHOC_TASK_TYPE = "wf:adhocTask";
+    protected static final String ADHOC_TASK_COMPLETED_TYPE = "wf:completedAdhocTask";
+
+
+    private TestPersonManager personManager;
+    private TestGroupManager groupManager;
+    
+    protected WorkflowService workflowService;
+    private NodeService nodeService;
+    private NamespaceService namespaceService;
+    private NodeRef packageRef;
+    private NodeRef contentNodeRef;
+    private AuthenticationComponent authenticationComponent;
+    private DictionaryService dictionaryService;
+
+    private List<String> workflows = new LinkedList<String>(); 
+
+    private WorkflowTestHelper wfTestHelper;
+
+    public void testTaskInstancesGet() throws Exception
+    {
+        // Check USER2 starts with no tasks.
+        personManager.setUser(USER2);
+        Response response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2)), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        JSONArray results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertTrue(results.length() == 0);
+
+        // Start workflow as USER1 and assign task to USER2.
+        personManager.setUser(USER1);
+        WorkflowDefinition adhocDef = workflowService.getDefinitionByName(getAdhocWorkflowDefinitionName());
+        Map<QName, Serializable> params = new HashMap<QName, Serializable>();
+        params.put(WorkflowModel.ASSOC_ASSIGNEE, personManager.get(USER2));
+        Calendar dueDateCal = Calendar.getInstance();
+        Date dueDate = dueDateCal.getTime();
+
+        params.put(WorkflowModel.PROP_DUE_DATE, dueDate);
+        params.put(WorkflowModel.PROP_PRIORITY, 1);
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+
+        WorkflowPath adhocPath = workflowService.startWorkflow(adhocDef.getId(), params);
+        String workflowId = adhocPath.getInstance().getId();
+        workflows.add(workflowId);
+
+        WorkflowTask startTask = workflowService.getStartTask(workflowId);
+        workflowService.endTask(startTask.getId(), null);
+
+        // Check USER2 now has one task.
+        List<WorkflowTask> tasks = workflowService.getAssignedTasks(USER2, WorkflowTaskState.IN_PROGRESS);
+        WorkflowTask task = tasks.get(0);
+
+        Map<QName, Serializable> updateParams = new HashMap<QName, Serializable>(1);
+        updateParams.put(WorkflowModel.PROP_DUE_DATE, new Date());
+        workflowService.updateTask(task.getId(), updateParams, null, null);
+
+        personManager.setUser(USER2);
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2)), 200);
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertTrue(results.length() == tasks.size());
+        JSONObject result = results.getJSONObject(0);
+
+        int totalItems = results.length();
+
+        String expUrl = "api/task-instances/" + task.getId();
+        assertEquals(expUrl, result.getString("url"));
+        assertEquals(task.getName(), result.getString("name"));
+        assertEquals(task.getTitle(), result.getString("title"));
+        assertEquals(task.getDescription(), result.getString("description"));
+        assertEquals(task.getState().name(), result.getString("state"));
+        assertEquals("api/workflow-paths/" + adhocPath.getId(), result.getString("path"));
+        assertFalse(result.getBoolean("isPooled"));
+        assertTrue(result.getBoolean("isEditable"));
+        assertTrue(result.getBoolean("isReassignable"));
+        assertFalse(result.getBoolean("isClaimable"));
+        assertFalse(result.getBoolean("isReleasable"));
+
+        JSONObject owner = result.getJSONObject("owner");
+        assertEquals(USER2, owner.getString("userName"));
+        assertEquals(personManager.getFirstName(USER2), owner.getString("firstName"));
+        assertEquals(personManager.getLastName(USER2), owner.getString("lastName"));
+
+        JSONObject properties = result.getJSONObject("properties");
+        assertNotNull(properties);
+
+        JSONObject instance = result.getJSONObject("workflowInstance");
+        assertNotNull(instance);
+
+        // Check state filtering
+        checkTasksState(URL_TASKS + "?state=completed", WorkflowTaskState.COMPLETED);
+        checkTasksState(URL_TASKS + "?state=in_progress", WorkflowTaskState.IN_PROGRESS);
+
+        // TODO: Add more tests to check pooled actors.
+
+        // Check for priority filtering
+        checkPriorityFiltering(URL_TASKS + "?priority=2");
+
+        // Due after yesterday, started task should be in it
+        dueDateCal.add(Calendar.DAY_OF_MONTH, -1);
+        checkTasksPresent(MessageFormat.format(URL_TASKS_DUE_AFTER, ISO8601DateFormat.format(dueDateCal.getTime())),
+                true, task.getId());
+
+        // Due before yesterday, started task shouldn't be in it
+        checkTasksPresent(MessageFormat.format(URL_TASKS_DUE_BEFORE, ISO8601DateFormat.format(dueDateCal.getTime())),
+                false, task.getId());
+
+        // Due before tomorrow, started task should be in it
+        dueDateCal.add(Calendar.DAY_OF_MONTH, 2);
+        checkTasksPresent(MessageFormat.format(URL_TASKS_DUE_BEFORE, ISO8601DateFormat.format(dueDateCal.getTime())),
+                true, task.getId());
+
+        // Due after tomorrow, started task shouldn't be in it
+        checkTasksPresent(MessageFormat.format(URL_TASKS_DUE_AFTER, ISO8601DateFormat.format(dueDateCal.getTime())),
+                false, task.getId());
+
+        // checkFiltering(URL_TASKS + "?dueAfter=" +
+        // ISO8601DateFormat.format(dueDate));
+
+        // checkFiltering(URL_TASKS + "?dueBefore=" +
+        // ISO8601DateFormat.format(new Date()));
+
+        // Check property filtering on the task assigned to USER2
+        String customProperties = "bpm_description,bpm_priority";
+        checkTaskPropertyFiltering(customProperties, Arrays.asList("bpm_description", "bpm_priority"));
+
+        // Properties that aren't explicitally present on task should be
+        // returned as wel
+        customProperties = "bpm_unexistingProperty,bpm_description,bpm_priority";
+        checkTaskPropertyFiltering(customProperties,
+                Arrays.asList("bpm_description", "bpm_priority", "bpm_unexistingProperty"));
+
+        // Check paging
+        int maxItems = 3;
+        for (int skipCount = 0; skipCount < totalItems; skipCount += maxItems)
+        {
+            // one of this should test situation when skipCount + maxItems >
+            // totalItems
+            checkPaging(MessageFormat.format(URL_USER_TASKS, USER2) + "&maxItems=" + maxItems + "&skipCount="
+                    + skipCount, totalItems, maxItems, skipCount);
+        }
+
+        // testing when skipCount > totalItems
+        checkPaging(MessageFormat.format(URL_USER_TASKS, USER2) + "&maxItems=" + maxItems + "&skipCount="
+                + (totalItems + 1), totalItems, maxItems, totalItems + 1);
+
+        // check the exclude filtering
+        String exclude = "wf:submitAdhocTask";
+        response = sendRequest(new GetRequest(URL_TASKS + "?exclude=" + exclude), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+
+        boolean adhocTasksPresent = false;
+        for (int i = 0; i < results.length(); i++)
+        {
+            JSONObject taskJSON = results.getJSONObject(i);
+
+            String type = taskJSON.getString("name");
+            if (exclude.equals(type))
+            {
+                adhocTasksPresent = true;
+                break;
+            }
+        }
+        assertFalse("Found wf:submitAdhocTask when they were supposed to be excluded", adhocTasksPresent);
+        
+        // CLOUD-1928: Check skip-count works toghether with filter, start another process
+        personManager.setUser(USER1);
+        params.clear();
+        params.put(WorkflowModel.ASSOC_ASSIGNEE, personManager.get(USER2));
+        dueDateCal.add(Calendar.DAY_OF_YEAR, 2);
+
+        params.put(WorkflowModel.PROP_DUE_DATE, dueDateCal.getTime());
+        params.put(WorkflowModel.PROP_PRIORITY, 1);
+        params.put(WorkflowModel.ASSOC_PACKAGE, workflowService.createPackage(null));
+
+        WorkflowPath adhocPath2 = workflowService.startWorkflow(adhocDef.getId(), params);
+        String workflowId2 = adhocPath2.getInstance().getId();
+        workflows.add(workflowId2);
+
+        WorkflowTask startTask2 = workflowService.getStartTask(workflowId2);
+        workflowService.endTask(startTask2.getId(), null);
+        
+        // Filter based on due-date and skip first result. Should return nothing instead of
+        // the second task, since only one matches and one is skipped
+        
+        // Due after tomorrow, started task shouldn't be in it
+       String url = MessageFormat.format(URL_TASKS_DUE_AFTER_AND_SKIP,  ISO8601DateFormat.format(dueDateCal.getTime()), 1);
+       json = getDataFromRequest(url);
+       JSONArray resultArray = json.getJSONArray("data");
+       assertEquals(0, resultArray.length());
+    }
+
+    public void testTaskInstancesGetWithFiltering() throws Exception
+    {
+        // Check USER2 starts with no tasks.
+        personManager.setUser(USER2);
+        Response response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2)), 200);
+        getJsonArray(response, 0);
+
+        // Start workflow as USER1 and assign the task to GROUP.
+        personManager.setUser(USER1);
+        WorkflowDefinition wfDefinition = workflowService.getDefinitionByName(getReviewPooledWorkflowDefinitionName());
+        Map<QName, Serializable> params = new HashMap<>(3);
+        params.put(WorkflowModel.ASSOC_GROUP_ASSIGNEE, groupManager.get(GROUP));
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+        params.put(WorkflowModel.PROP_WORKFLOW_DESCRIPTION, "descTest1");
+
+        WorkflowPath wfPath = workflowService.startWorkflow(wfDefinition.getId(), params);
+        String workflowId = wfPath.getInstance().getId();
+        workflows.add(workflowId);
+
+        WorkflowTask startTask = workflowService.getStartTask(workflowId);
+        workflowService.endTask(startTask.getId(), null);
+
+        // Start another workflow as USER1 and assign the task to GROUP.
+        wfDefinition = workflowService.getDefinitionByName(getReviewPooledWorkflowDefinitionName());
+        params.put(WorkflowModel.ASSOC_GROUP_ASSIGNEE, groupManager.get(GROUP));
+        params.put(WorkflowModel.ASSOC_PACKAGE, workflowService.createPackage(null));
+        params.put(WorkflowModel.PROP_WORKFLOW_DESCRIPTION, "descTest2/withSlash");
+
+        wfPath = workflowService.startWorkflow(wfDefinition.getId(), params);
+        workflowId = wfPath.getInstance().getId();
+        workflows.add(workflowId);
+
+        startTask = workflowService.getStartTask(workflowId);
+        workflowService.endTask(startTask.getId(), null);
+
+        // Check USER2's tasks without filtering. It should return two tasks as USER2 is a member of the GROUP
+        personManager.setUser(USER2);
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2)), 200);
+        getJsonArray(response, 2);
+
+        //Check USER2's tasks With filtering where property bpm:description should match "descTest1"
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2) + "&property=bpm:description/descTest1"), 200);
+        JSONArray results = getJsonArray(response, 1);
+        JSONObject result = results.getJSONObject(0);
+        assertNotNull(result);
+        JSONObject properties = result.getJSONObject("properties");
+        assertNotNull(properties);
+        assertEquals("descTest1", properties.getString("bpm_description"));
+
+        //Check USER2's tasks With filtering where property bpm:description should match "descTest2"
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2) + "&property=bpm:description/descTest2/withSlash"), 200);
+        results = getJsonArray(response, 1);
+        result = results.getJSONObject(0);
+        assertNotNull(result);
+        properties = result.getJSONObject("properties");
+        assertNotNull(properties);
+        assertEquals("descTest2/withSlash", properties.getString("bpm_description"));
+
+        /*
+         * -ve tests
+         */
+        // Mismatched property value - There is no task with the description "somePropValue"
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2) + "&property=bpm:description/somePropValue"), 200);
+        getJsonArray(response, 0);
+
+        //Unregistered namespace prefix (ignores "property" parameter)
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2) + "&property=unknownPrefix:description/test"), 200);
+        getJsonArray(response, 2);
+
+        // Nonexistent property (ignores "property" parameter)
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2) + "&property=bpm:nonexistentProp/test"), 200);
+        getJsonArray(response, 2);
+
+        // Not well-formed parameter
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2) + "&property=bpm:description/"), 200);
+        getJsonArray(response, 2);
+
+        // Not well-formed parameter
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2) + "&property=descTest1"), 200);
+        getJsonArray(response, 2);
+
+        // Not well-formed parameter
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2) + "&property=/descTest1"), 200);
+        getJsonArray(response, 2);
+
+        // Check USER3's tasks without filtering. It should return 0 task as USER3 is not a member of the GROUP
+        personManager.setUser(USER3);
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER3)), 200);
+        getJsonArray(response, 0);
+    }
+
+    public void testWorkflowPermissions() throws Exception
+    {
+        // Start workflow as USER1 and assign task to USER1.
+        personManager.setUser(USER1);
+        WorkflowDefinition adhocDef = workflowService.getDefinitionByName(getAdhocWorkflowDefinitionName());
+        Map<QName, Serializable> params = new HashMap<QName, Serializable>();
+        params.put(WorkflowModel.ASSOC_ASSIGNEE, personManager.get(USER1));
+        Calendar dueDateCal = Calendar.getInstance();
+        Date dueDate = dueDateCal.getTime();
+
+        params.put(WorkflowModel.PROP_DUE_DATE, dueDate);
+        params.put(WorkflowModel.PROP_PRIORITY, 1);
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+
+        WorkflowPath adhocPath = workflowService.startWorkflow(adhocDef.getId(), params);
+        String workflowId = adhocPath.getInstance().getId();
+        workflows.add(workflowId);
+
+        WorkflowTask startTask = workflowService.getStartTask(workflowId);
+        workflowService.endTask(startTask.getId(), null);
+
+        // Check tasks of USER1 from behalf of USER2
+        personManager.setUser(USER2);
+        Response response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER1)), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        JSONArray results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertTrue("User2 should not see any tasks if he is not initiator or assignee", results.length() == 0);
+    }
+    
+    public void testTaskInstancesForWorkflowGet() throws Exception
+    {
+        // Check starts with no workflow.
+        personManager.setUser(USER2);
+        sendRequest(new GetRequest(MessageFormat.format(URL_WORKFLOW_TASKS, "Foo")), Status.STATUS_INTERNAL_SERVER_ERROR);
+
+        // Start workflow as USER1 and assign task to USER2.
+        personManager.setUser(USER1);
+        WorkflowDefinition adhocDef = workflowService.getDefinitionByName(getAdhocWorkflowDefinitionName());
+        Map<QName, Serializable> params = new HashMap<QName, Serializable>();
+        params.put(WorkflowModel.ASSOC_ASSIGNEE, personManager.get(USER2));
+        Calendar dueDateCal = Calendar.getInstance();
+        Date dueDate = dueDateCal.getTime();
+
+        params.put(WorkflowModel.PROP_DUE_DATE, dueDate);
+        params.put(WorkflowModel.PROP_PRIORITY, 1);
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+
+        WorkflowPath adhocPath = workflowService.startWorkflow(adhocDef.getId(), params);
+        String workflowId = adhocPath.getInstance().getId();
+        workflows.add(workflowId);
+
+        // End start task.
+        WorkflowTask startTask = workflowService.getStartTask(workflowId);
+        String startTaskId = startTask.getId();
+        workflowService.endTask(startTaskId, null);
+
+        // Check USER2 now has one task.
+        List<WorkflowTask> tasks = workflowService.getAssignedTasks(USER2, WorkflowTaskState.IN_PROGRESS);
+        assertEquals(1, tasks.size());
+        WorkflowTask task = tasks.get(0);
+
+        // Retrieve tasks using the workflow instance
+        String baseUrl = MessageFormat.format(URL_WORKFLOW_TASKS, workflowId);
+
+        // Check returns the completed start task.
+        String adhocTaskId = task.getId();
+        checkTasksMatch(baseUrl, startTaskId);
+
+        String completedUrl = baseUrl + "?state=" + WorkflowTaskState.COMPLETED;
+        checkTasksMatch(completedUrl, startTaskId);
+
+        personManager.setUser(USER2);
+        String inProgressUrl = baseUrl + "?state=" + WorkflowTaskState.IN_PROGRESS;
+        checkTasksMatch(inProgressUrl, adhocTaskId);
+
+        String user1Url = baseUrl + "?authority=" + USER1;
+        checkTasksMatch(user1Url, startTaskId);
+
+        String user2Url = baseUrl + "?authority=" + USER2;
+        checkTasksMatch(user2Url, adhocTaskId);
+
+        String user1CompletedURL = user1Url + "&state=" + WorkflowTaskState.COMPLETED;
+        checkTasksMatch(user1CompletedURL, startTaskId);
+
+        String user1InProgressURL = user1Url + "&state=" + WorkflowTaskState.IN_PROGRESS;
+        checkTasksMatch(user1InProgressURL);
+
+        String user2CompletedURL = user2Url + "&state=" + WorkflowTaskState.COMPLETED;
+        checkTasksMatch(user2CompletedURL);
+
+        String user2InProgressURL = user2Url + "&state=" + WorkflowTaskState.IN_PROGRESS;
+        checkTasksMatch(user2InProgressURL, adhocTaskId);
+    }
+
+    public void testTaskInstanceGet() throws Exception
+    {
+        //Start workflow as USER1 and assign task to USER2.
+        personManager.setUser(USER1);
+        WorkflowDefinition adhocDef = workflowService.getDefinitionByName(getAdhocWorkflowDefinitionName());
+        
+        Calendar dueDateCal = Calendar.getInstance();
+        dueDateCal.clear(Calendar.MILLISECOND);
+        Date dueDate = dueDateCal.getTime();
+        
+        NodeRef assignee = personManager.get(USER2);
+        Map<QName, Serializable> params = new HashMap<QName, Serializable>();
+        params.put(WorkflowModel.ASSOC_ASSIGNEE, assignee);
+        params.put(WorkflowModel.PROP_DUE_DATE, dueDate);
+        params.put(WorkflowModel.PROP_PRIORITY, 1);
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+
+        WorkflowPath adhocPath = workflowService.startWorkflow(adhocDef.getId(), params);
+        String workflowId = adhocPath.getInstance().getId();
+        workflows.add(workflowId);
+        
+        WorkflowTask startTask = workflowService.getTasksForWorkflowPath(adhocPath.getId()).get(0);
+
+        // Get the start-task
+        Response response = sendRequest(new GetRequest(URL_TASKS + "/" + startTask.getId()), Status.STATUS_OK);
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        JSONObject result = json.getJSONObject("data");
+        assertNotNull(result);
+
+        assertEquals(startTask.getId(), result.getString("id"));
+        assertEquals(URL_TASKS + "/" + startTask.getId(), result.getString("url"));
+        assertEquals(startTask.getName(), result.getString("name"));
+        assertEquals(startTask.getTitle(), result.getString("title"));
+        assertEquals(startTask.getDescription(), result.getString("description"));
+
+        assertEquals(startTask.getState().name(), result.getString("state"));
+        assertEquals("api/workflow-paths/" + adhocPath.getId(), result.getString("path"));
+        
+        checkWorkflowTaskEditable(result);
+        checkWorkflowTaskOwner(result, USER1);
+        checkWorkflowTaskPropertiesPresent(result);
+
+        JSONObject properties = result.getJSONObject("properties");
+        assertEquals(1, properties.getInt("bpm_priority"));
+        String dueDateStr = ISO8601DateFormat.format(dueDate);
+        assertEquals(dueDateStr, properties.getString("bpm_dueDate"));
+        assertEquals(assignee.toString(), properties.getString("bpm_assignee"));
+        assertEquals(packageRef.toString(), properties.getString("bpm_package"));
+        
+        checkWorkflowInstance(startTask.getPath().getInstance(), result.getJSONObject("workflowInstance"));
+        checkWorkflowTaskDefinition(startTask.getDefinition(), result.getJSONObject("definition"));
+        
+        // Finish the start-task, and fetch it again
+        personManager.setUser(USER2);
+        workflowService.endTask(startTask.getId(), null);
+        startTask = workflowService.getTaskById(startTask.getId()); 
+
+        response = sendRequest(new GetRequest(URL_TASKS + "/" + startTask.getId()), Status.STATUS_OK);
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        result = json.getJSONObject("data");
+        assertNotNull(result);
+        
+        assertEquals(startTask.getId(), result.getString("id"));
+        assertEquals(URL_TASKS + "/" + startTask.getId(), result.getString("url"));
+        assertEquals(startTask.getName(), result.getString("name"));
+        assertEquals(startTask.getTitle(), result.getString("title"));
+        assertEquals(startTask.getDescription(), result.getString("description"));
+        
+        assertEquals(startTask.getState().name(), result.getString("state"));
+        assertEquals("api/workflow-paths/" + adhocPath.getId(), result.getString("path"));
+
+        checkWorkflowTaskReadOnly(result);
+        checkWorkflowTaskOwner(result, USER1);
+        checkWorkflowTaskPropertiesPresent(result);
+
+        checkWorkflowInstance(startTask.getPath().getInstance(), result.getJSONObject("workflowInstance"));
+        checkWorkflowTaskDefinition(startTask.getDefinition(), result.getJSONObject("definition"));
+        
+        // Get the next active task
+        WorkflowTask firstTask = workflowService.getTasksForWorkflowPath(adhocPath.getId()).get(0);
+        
+        response = sendRequest(new GetRequest(URL_TASKS + "/" + firstTask.getId()), 200);
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        result = json.getJSONObject("data");
+        assertNotNull(result);
+        
+        assertEquals(firstTask.getId(), result.getString("id"));
+        assertEquals(URL_TASKS + "/" + firstTask.getId(), result.getString("url"));
+        assertEquals(firstTask.getName(), result.getString("name"));
+        assertEquals(firstTask.getTitle(), result.getString("title"));
+        assertEquals(firstTask.getDescription(), result.getString("description"));
+       
+        // Task should be in progress
+        assertEquals(firstTask.getState().name(), result.getString("state"));
+        assertEquals(WorkflowTaskState.IN_PROGRESS.toString(), result.getString("state"));
+        assertEquals("api/workflow-paths/" + adhocPath.getId(), result.getString("path"));
+        
+        checkWorkflowTaskEditable(result);
+        checkWorkflowTaskOwner(result, USER2);
+        checkWorkflowTaskPropertiesPresent(result);
+        
+        checkWorkflowInstance(firstTask.getPath().getInstance(), result.getJSONObject("workflowInstance"));
+        checkWorkflowTaskDefinition(firstTask.getDefinition(), result.getJSONObject("definition"));
+        
+        // Finish the task, and fetch it again
+        workflowService.endTask(firstTask.getId(), null);
+        firstTask = workflowService.getTaskById(firstTask.getId()); 
+        
+        response = sendRequest(new GetRequest(URL_TASKS + "/" + firstTask.getId()), 200);
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        result = json.getJSONObject("data");
+        assertNotNull(result);
+        
+        assertEquals(firstTask.getId(), result.getString("id"));
+        assertEquals(URL_TASKS + "/" + firstTask.getId(), result.getString("url"));
+        assertEquals(firstTask.getName(), result.getString("name"));
+        assertEquals(firstTask.getTitle(), result.getString("title"));
+        assertEquals(firstTask.getDescription(), result.getString("description"));
+        
+        // The task should be completed
+        assertEquals(firstTask.getState().name(), result.getString("state"));
+        assertEquals(WorkflowTaskState.COMPLETED.toString(), result.getString("state"));
+        assertEquals("api/workflow-paths/" + adhocPath.getId(), result.getString("path"));
+
+        checkWorkflowTaskReadOnly(result);
+        checkWorkflowTaskOwner(result, USER2);
+        checkWorkflowTaskPropertiesPresent(result);
+        
+        checkWorkflowInstance(firstTask.getPath().getInstance(), result.getJSONObject("workflowInstance"));
+        checkWorkflowTaskDefinition(firstTask.getDefinition(), result.getJSONObject("definition"));
+    }
+
+    private void checkWorkflowTaskPropertiesPresent(JSONObject taskJson) throws Exception
+    {
+        JSONObject properties = taskJson.getJSONObject("properties");
+        assertNotNull(properties);
+        assertTrue(properties.has("bpm_priority"));
+        assertTrue(properties.has("bpm_description"));
+        assertTrue(properties.has("bpm_reassignable"));
+        JSONObject labels =taskJson.getJSONObject("propertyLabels");
+        assertNotNull(labels);
+        assertTrue(labels.has("bpm_status"));
+        
+    }
+
+    private void checkWorkflowTaskReadOnly(JSONObject taskJson) throws Exception
+    {
+        // Task shouldn't be editable and reassignable, since it's completed
+        assertFalse(taskJson.getBoolean("isPooled"));
+        assertFalse(taskJson.getBoolean("isEditable"));
+        assertFalse(taskJson.getBoolean("isReassignable"));
+        assertFalse(taskJson.getBoolean("isClaimable"));
+        assertFalse(taskJson.getBoolean("isReleasable"));
+    }
+
+    private void checkWorkflowTaskOwner(JSONObject taskJson, String user) throws Exception
+    {
+        JSONObject owner = taskJson.getJSONObject("owner");
+        assertEquals(user, owner.getString("userName"));
+        assertEquals(personManager.getFirstName(user), owner.getString("firstName"));
+        assertEquals(personManager.getLastName(user), owner.getString("lastName"));
+    }
+
+    private void checkWorkflowTaskEditable(JSONObject taskJson) throws Exception
+    {
+        assertFalse(taskJson.getBoolean("isPooled"));
+        assertTrue(taskJson.getBoolean("isEditable"));
+        assertTrue(taskJson.getBoolean("isReassignable"));
+        assertFalse(taskJson.getBoolean("isClaimable"));
+        assertFalse(taskJson.getBoolean("isReleasable"));
+    }
+
+    private void checkWorkflowInstance(WorkflowInstance wfInstance, JSONObject instance) throws Exception
+    {
+        assertNotNull(instance);
+        assertEquals(wfInstance.getId(), instance.getString("id"));
+        assertTrue(instance.has("url"));
+        assertEquals(wfInstance.getDefinition().getName(), instance.getString("name"));
+        assertEquals(wfInstance.getDefinition().getTitle(), instance.getString("title"));
+        assertEquals(wfInstance.getDefinition().getDescription(), instance.getString("description"));
+        assertEquals(wfInstance.isActive(), instance.getBoolean("isActive"));
+        assertTrue(instance.has("startDate"));
+
+        JSONObject initiator = instance.getJSONObject("initiator");
+
+        assertEquals(USER1, initiator.getString("userName"));
+        assertEquals(personManager.getFirstName(USER1), initiator.getString("firstName"));
+        assertEquals(personManager.getLastName(USER1), initiator.getString("lastName"));
+    }
+
+    private void checkWorkflowTaskDefinition(WorkflowTaskDefinition wfDefinition, JSONObject definition) throws Exception
+    {
+        assertNotNull(definition);
+
+        assertEquals(wfDefinition.getId(), definition.getString("id"));
+        assertTrue(definition.has("url"));
+
+        JSONObject type = definition.getJSONObject("type");
+        TypeDefinition startType = (wfDefinition).getMetadata();
+
+        assertNotNull(type);
+
+        assertEquals(startType.getName().toPrefixString(), type.getString("name"));
+        assertEquals(startType.getTitle(this.dictionaryService), type.getString("title"));
+        assertEquals(startType.getDescription(this.dictionaryService), type.getString("description"));
+        assertTrue(type.has("url"));
+
+        JSONObject node = definition.getJSONObject("node");
+        WorkflowNode startNode = wfDefinition.getNode();
+
+        assertNotNull(node);
+
+        assertEquals(startNode.getName(), node.getString("name"));
+        assertEquals(startNode.getTitle(), node.getString("title"));
+        assertEquals(startNode.getDescription(), node.getString("description"));
+        assertEquals(startNode.isTaskNode(), node.getBoolean("isTaskNode"));
+
+        JSONArray transitions = node.getJSONArray("transitions");
+        WorkflowTransition[] startTransitions = startNode.getTransitions();
+
+        assertNotNull(transitions);
+
+        assertEquals(startTransitions.length, transitions.length());
+
+        for (int i = 0; i < transitions.length(); i++)
+        {
+            JSONObject transition = transitions.getJSONObject(i);
+            WorkflowTransition startTransition = startTransitions[i];
+
+            assertNotNull(transition);
+
+            if (startTransition.getId() == null)
+            {
+                assertEquals("", transition.getString("id"));
+            }
+            else
+            {
+                assertEquals(startTransition.getId(), transition.getString("id"));
+            }
+            assertEquals(startTransition.getTitle(), transition.getString("title"));
+            assertEquals(startTransition.getDescription(), transition.getString("description"));
+            assertEquals(startTransition.isDefault(), transition.getBoolean("isDefault"));
+            assertTrue(transition.has("isHidden"));
+        }
+
+    }
+
+    public void testTaskInstancePut() throws Exception
+    {
+        // Start workflow as USER1 and assign task to USER2.
+        personManager.setUser(USER1);
+        WorkflowDefinition adhocDef = workflowService.getDefinitionByName(getAdhocWorkflowDefinitionName());
+        Map<QName, Serializable> params = new HashMap<QName, Serializable>();
+        params.put(WorkflowModel.ASSOC_ASSIGNEE, personManager.get(USER2));
+        
+        Calendar dueDate = Calendar.getInstance();
+        dueDate.set(Calendar.MILLISECOND, 0);
+        
+        params.put(WorkflowModel.PROP_DUE_DATE, new Date());
+        params.put(WorkflowModel.PROP_PRIORITY, 2);
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+
+        WorkflowPath adhocPath = workflowService.startWorkflow(adhocDef.getId(), params);
+        String worfklowId = adhocPath.getInstance().getId();
+        workflows.add(worfklowId);
+        
+        WorkflowTask startTask = workflowService.getStartTask(adhocPath.getInstance().getId());
+        
+        // Finish the start-task
+        workflowService.endTask(startTask.getId(), null);
+        
+        WorkflowTask firstTask = workflowService.getTasksForWorkflowPath(adhocPath.getId()).get(0);
+
+        Response response = sendRequest(new GetRequest(URL_TASKS + "/" + firstTask.getId()), 200);
+
+        JSONObject jsonProperties = new JSONObject(response.getContentAsString()).getJSONObject("data").getJSONObject("properties");
+
+        // make some changes in existing properties
+        jsonProperties.remove(qnameToString(WorkflowModel.ASSOC_PACKAGE));
+        jsonProperties.put(qnameToString(WorkflowModel.PROP_COMMENT), "Edited comment");
+        
+        Calendar newDueDate = Calendar.getInstance();
+        newDueDate.set(Calendar.MILLISECOND, 0);
+        
+        jsonProperties.put(qnameToString(WorkflowModel.PROP_DUE_DATE), ISO8601DateFormat.format(newDueDate.getTime()));
+        jsonProperties.put(qnameToString(WorkflowModel.PROP_DESCRIPTION), "Edited description");
+        jsonProperties.put(qnameToString(WorkflowModel.PROP_PRIORITY), 1);
+
+        // Add some custom properties, which are not defined in typeDef
+        jsonProperties.put("customIntegerProperty", 1234);
+        jsonProperties.put("customBooleanProperty", Boolean.TRUE);
+        jsonProperties.put("customStringProperty", "Property value");
+
+        // test USER3 can not update the task
+        personManager.setUser(USER3);
+        Response unauthResponse = sendRequest(new PutRequest(URL_TASKS + "/" + firstTask.getId(), jsonProperties.toString(), "application/json"), 401);
+        assertEquals(Status.STATUS_UNAUTHORIZED, unauthResponse.getStatus());
+
+
+        // test USER2 (the task owner) can update the task
+        personManager.setUser(USER2);
+        Response putResponse = sendRequest(new PutRequest(URL_TASKS + "/" + firstTask.getId(), jsonProperties.toString(), "application/json"), 200);
+
+        assertEquals(Status.STATUS_OK, putResponse.getStatus());
+        String jsonStr = putResponse.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        JSONObject result = json.getJSONObject("data");
+        assertNotNull(result);
+
+        JSONObject editedJsonProperties = result.getJSONObject("properties");
+        editedJsonProperties.remove(qnameToString(ContentModel.PROP_CREATOR));
+        compareProperties(jsonProperties, editedJsonProperties);
+        
+        // test USER1 (the task workflow initiator) can update the task
+        personManager.setUser(USER1);
+        putResponse = sendRequest(new PutRequest(URL_TASKS + "/" + firstTask.getId(), jsonProperties.toString(), "application/json"), 200);
+
+        assertEquals(Status.STATUS_OK, putResponse.getStatus());
+        jsonStr = putResponse.getContentAsString();
+        json = new JSONObject(jsonStr);
+        result = json.getJSONObject("data");
+        assertNotNull(result);
+
+        editedJsonProperties = result.getJSONObject("properties");
+        editedJsonProperties.remove(qnameToString(ContentModel.PROP_CREATOR));
+        compareProperties(jsonProperties, editedJsonProperties);
+
+        // Reassign the task to USER3 using taskInstance PUT
+        jsonProperties = new JSONObject();
+        jsonProperties.put(qnameToString(ContentModel.PROP_OWNER), USER3);
+        putResponse = sendRequest(new PutRequest(URL_TASKS + "/" + firstTask.getId(), jsonProperties.toString(), "application/json"), 200);
+        assertEquals(Status.STATUS_OK, putResponse.getStatus());
+        
+        // test USER3 (now the task owner) can update the task
+        personManager.setUser(USER3);
+        
+        jsonProperties.put(qnameToString(WorkflowModel.PROP_COMMENT), "Edited comment by USER3");
+        putResponse = sendRequest(new PutRequest(URL_TASKS + "/" + firstTask.getId(), jsonProperties.toString(), "application/json"), 200);
+        
+        assertEquals(Status.STATUS_OK, putResponse.getStatus());
+        
+        jsonStr = putResponse.getContentAsString();
+        json = new JSONObject(jsonStr);
+        result = json.getJSONObject("data");
+        assertNotNull(result);
+        
+        editedJsonProperties = result.getJSONObject("properties");
+        editedJsonProperties.remove(qnameToString(ContentModel.PROP_CREATOR));
+        compareProperties(jsonProperties, editedJsonProperties);
+    }
+
+    public void testTaskInstancePutCompletedTask() throws Exception
+    {
+        // Start workflow as USER1 and assign to self
+        personManager.setUser(USER1);
+        WorkflowDefinition adhocDef = workflowService.getDefinitionByName(getAdhocWorkflowDefinitionName());
+        Map<QName, Serializable> params = new HashMap<QName, Serializable>();
+        params.put(WorkflowModel.ASSOC_ASSIGNEE, personManager.get(USER1));
+        params.put(WorkflowModel.PROP_DUE_DATE, new Date());
+        params.put(WorkflowModel.PROP_PRIORITY, 1);
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+
+        WorkflowPath adhocPath = workflowService.startWorkflow(adhocDef.getId(), params);
+        String WorkflowId = adhocPath.getInstance().getId();
+        workflows.add(WorkflowId);
+        
+        WorkflowTask startTask = workflowService.getTasksForWorkflowPath(adhocPath.getId()).get(0);
+        
+        // Finish the start-task
+        workflowService.endTask(startTask.getId(), null);
+        
+        WorkflowTask firstTask = workflowService.getTasksForWorkflowPath(adhocPath.getId()).get(0);
+        
+        Response getResponse = sendRequest(new GetRequest(URL_TASKS + "/" + firstTask.getId()), 200);
+
+        JSONObject jsonProperties = new JSONObject(getResponse.getContentAsString()).getJSONObject("data").getJSONObject("properties");
+
+        // Make a change
+        jsonProperties.put(qnameToString(WorkflowModel.PROP_DESCRIPTION), "Edited description");
+
+        // Update task. An error is expected, since the task is completed (and not editable)
+       sendRequest(new PutRequest(URL_TASKS + "/" + startTask.getId(), jsonProperties.toString(), "application/json"), Status.STATUS_UNAUTHORIZED);
+    }
+
+    public void testWorkflowDefinitionsGet() throws Exception
+    {
+        personManager.setUser(USER1);
+         
+        Response response = sendRequest(new GetRequest(URL_WORKFLOW_DEFINITIONS), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        JSONObject json = new JSONObject(response.getContentAsString());
+        JSONArray results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertTrue(results.length() > 0);
+
+        boolean adhocWorkflowPresent = false;
+        
+        String adhocDefName = getAdhocWorkflowDefinitionName();
+        for (int i = 0; i < results.length(); i++)
+        {
+            JSONObject workflowDefinitionJSON = results.getJSONObject(i);
+
+            assertTrue(workflowDefinitionJSON.has("id"));
+            assertTrue(workflowDefinitionJSON.getString("id").length() > 0);
+
+            assertTrue(workflowDefinitionJSON.has("url"));
+            String url = workflowDefinitionJSON.getString("url");
+            assertTrue(url.length() > 0);
+            assertTrue(url.startsWith("api/workflow-definitions/"));
+
+            assertTrue(workflowDefinitionJSON.has("name"));
+            assertTrue(workflowDefinitionJSON.getString("name").length() > 0);
+
+            assertTrue(workflowDefinitionJSON.has("title"));
+            String title = workflowDefinitionJSON.getString("title");
+            assertTrue(title.length() > 0);
+
+            assertTrue(workflowDefinitionJSON.has("description"));
+            String description = workflowDefinitionJSON.getString("description");
+            assertTrue(description.length() > 0);
+
+            if(adhocDefName.equals(workflowDefinitionJSON.getString("name"))) 
+            {
+                assertEquals(getAdhocWorkflowDefinitionTitle(), title);
+                assertEquals(getAdhocWorkflowDefinitionDescription(), description);
+                adhocWorkflowPresent = true;
+            }
+        }
+        
+        assertTrue("Adhoc workflow definition was not present!", adhocWorkflowPresent);
+        
+        // filter the workflow definitions and check they are not returned
+        String exclude = adhocDefName;
+        response = sendRequest(new GetRequest(URL_WORKFLOW_DEFINITIONS + "?exclude=" + exclude), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        json = new JSONObject(response.getContentAsString());
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        
+        adhocWorkflowPresent = false;
+        for (int i = 0; i < results.length(); i++)
+        {
+            JSONObject workflowDefinitionJSON = results.getJSONObject(i);
+            
+            String name = workflowDefinitionJSON.getString("name");
+            if (exclude.equals(name))
+            {
+                adhocWorkflowPresent = true;
+                break;
+            }
+        }
+        
+        assertFalse("Found adhoc workflow when it was supposed to be excluded", adhocWorkflowPresent);
+        
+        // filter with a wildcard and ensure they all get filtered out
+        exclude = adhocDefName;
+        response = sendRequest(new GetRequest(URL_WORKFLOW_DEFINITIONS + "?exclude=" + exclude), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        json = new JSONObject(response.getContentAsString());
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        
+        adhocWorkflowPresent = false;
+        for (int i = 0; i < results.length(); i++)
+        {
+            JSONObject workflowDefinitionJSON = results.getJSONObject(i);
+            
+            String name = workflowDefinitionJSON.getString("name");
+            if (name.equals(adhocDefName))
+            {
+                adhocWorkflowPresent = true;
+            }
+        }
+        
+        assertFalse("Found adhoc workflow when it was supposed to be excluded", adhocWorkflowPresent);
+    }
+
+    public void testWorkflowDefinitionGet() throws Exception
+    {
+        personManager.setUser(USER1);
+         
+        // Get the latest definition for the adhoc-workflow
+        WorkflowDefinition wDef = workflowService.getDefinitionByName(getAdhocWorkflowDefinitionName());
+
+        String responseUrl = MessageFormat.format(URL_WORKFLOW_DEFINITION, wDef.getId());
+
+        Response response = sendRequest(new GetRequest(responseUrl), Status.STATUS_OK);
+        JSONObject json = new JSONObject(response.getContentAsString());
+        JSONObject workflowDefinitionJSON = json.getJSONObject("data");
+        assertNotNull(workflowDefinitionJSON);
+        
+        // Check fields
+        assertTrue(workflowDefinitionJSON.has("id"));
+        assertTrue(workflowDefinitionJSON.getString("id").length() > 0);
+
+        assertTrue(workflowDefinitionJSON.has("url"));
+        String url = workflowDefinitionJSON.getString("url");
+        assertTrue(url.length() > 0);
+        assertTrue(url.startsWith("api/workflow-definitions/"));
+
+        assertTrue(workflowDefinitionJSON.has("name"));
+        assertTrue(workflowDefinitionJSON.getString("name").length() > 0);
+        assertEquals(getAdhocWorkflowDefinitionName(), workflowDefinitionJSON.getString("name"));
+
+        assertTrue(workflowDefinitionJSON.has("title"));
+        assertTrue(workflowDefinitionJSON.getString("title").length() > 0);
+
+        assertTrue(workflowDefinitionJSON.has("description"));
+        assertTrue(workflowDefinitionJSON.getString("description").length() > 0);
+        
+        assertTrue(workflowDefinitionJSON.has("startTaskDefinitionUrl"));
+        String startTaskDefUrl = workflowDefinitionJSON.getString("startTaskDefinitionUrl");
+        assertEquals(startTaskDefUrl, "api/classes/" + getSafeDefinitionName(ADHOC_START_TASK_TYPE));
+        
+        assertTrue(workflowDefinitionJSON.has("startTaskDefinitionType"));
+        assertEquals(ADHOC_START_TASK_TYPE, workflowDefinitionJSON.getString("startTaskDefinitionType"));
+        
+        // Check task-definitions
+        JSONArray taskDefinitions = workflowDefinitionJSON.getJSONArray("taskDefinitions");
+        assertNotNull(taskDefinitions);
+        
+        // Two task definitions should be returned. Start-task is not included
+        assertEquals(2, taskDefinitions.length());
+        
+        // Should be adhoc-task
+        JSONObject firstTaskDefinition  = (JSONObject) taskDefinitions.get(0);
+        checkTaskDefinitionTypeAndUrl(ADHOC_TASK_TYPE, firstTaskDefinition);
+                
+        // Should be adhoc completed task
+        JSONObject secondTaskDefinition  = (JSONObject) taskDefinitions.get(1);
+        checkTaskDefinitionTypeAndUrl(ADHOC_TASK_COMPLETED_TYPE, secondTaskDefinition);
+    }
+    
+    private void checkTaskDefinitionTypeAndUrl(String expectedTaskType, JSONObject taskDefinition) throws Exception
+    {
+        // Check type
+        assertTrue(taskDefinition.has("type"));
+        assertEquals(expectedTaskType, taskDefinition.getString("type"));
+        
+        // Check URL
+        assertTrue(taskDefinition.has("url"));
+        assertEquals("api/classes/" + 
+                    getSafeDefinitionName(expectedTaskType), taskDefinition.getString("url"));
+    }
+
+    private String getSafeDefinitionName(String definitionName) 
+    {
+        return definitionName.replace(":", "_");
+    }
+
+    public void testWorkflowInstanceGet() throws Exception
+    {
+        //Start workflow as USER1 and assign task to USER2.
+        personManager.setUser(USER1);
+        WorkflowDefinition adhocDef = workflowService.getDefinitionByName(getAdhocWorkflowDefinitionName());
+        Map<QName, Serializable> params = new HashMap<QName, Serializable>();
+        params.put(WorkflowModel.ASSOC_ASSIGNEE, personManager.get(USER2));
+        Date dueDate = new Date();
+        params.put(WorkflowModel.PROP_WORKFLOW_DUE_DATE, dueDate);
+        params.put(WorkflowModel.PROP_WORKFLOW_PRIORITY, 1);
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+        params.put(WorkflowModel.PROP_CONTEXT, packageRef);
+
+        WorkflowPath adhocPath = workflowService.startWorkflow(adhocDef.getId(), params);
+        String WorkflowId = adhocPath.getInstance().getId();
+        workflows.add(WorkflowId);
+        
+        // End start task.
+        WorkflowTask startTask = workflowService.getTasksForWorkflowPath(adhocPath.getId()).get(0);
+        startTask = workflowService.endTask(startTask.getId(), null);
+
+        WorkflowInstance adhocInstance = startTask.getPath().getInstance();
+
+        Response response = sendRequest(new GetRequest(URL_WORKFLOW_INSTANCES + "/" + adhocInstance.getId() + "?includeTasks=true"), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        JSONObject result = json.getJSONObject("data");
+        assertNotNull(result);
+
+        assertEquals(adhocInstance.getId(), result.getString("id"));
+        assertTrue(result.opt("message").equals(JSONObject.NULL));
+        assertEquals(adhocInstance.getDefinition().getName(), result.getString("name"));
+        assertEquals(adhocInstance.getDefinition().getTitle(), result.getString("title"));
+        assertEquals(adhocInstance.getDefinition().getDescription(), result.getString("description"));
+        assertEquals(adhocInstance.isActive(), result.getBoolean("isActive"));
+        assertEquals(org.springframework.extensions.surf.util.ISO8601DateFormat.format(adhocInstance.getStartDate()), result.getString("startDate"));
+        assertNotNull(result.get("dueDate"));
+        assertNotNull(result.get("endDate"));
+        assertEquals(1, result.getInt("priority"));
+        JSONObject initiator = result.getJSONObject("initiator");
+
+        assertEquals(USER1, initiator.getString("userName"));
+        assertEquals(personManager.getFirstName(USER1), initiator.getString("firstName"));
+        assertEquals(personManager.getLastName(USER1), initiator.getString("lastName"));
+
+        assertEquals(adhocInstance.getContext().toString(), result.getString("context"));
+        assertEquals(adhocInstance.getWorkflowPackage().toString(), result.getString("package"));
+        assertNotNull(result.getString("startTaskInstanceId"));
+
+        JSONObject jsonDefinition = result.getJSONObject("definition");
+        WorkflowDefinition adhocDefinition = adhocInstance.getDefinition();
+
+        assertNotNull(jsonDefinition);
+
+        assertEquals(adhocDefinition.getId(), jsonDefinition.getString("id"));
+        assertEquals(adhocDefinition.getName(), jsonDefinition.getString("name"));
+        assertEquals(adhocDefinition.getTitle(), jsonDefinition.getString("title"));
+        assertEquals(adhocDefinition.getDescription(), jsonDefinition.getString("description"));
+        assertEquals(adhocDefinition.getVersion(), jsonDefinition.getString("version"));
+        assertEquals(adhocDefinition.getStartTaskDefinition().getMetadata().getName().toPrefixString(namespaceService), jsonDefinition.getString("startTaskDefinitionType"));
+        assertTrue(jsonDefinition.has("taskDefinitions"));
+
+        JSONArray tasks = result.getJSONArray("tasks");
+        assertTrue(tasks.length() > 1);
+    }
+
+    public void testWorkflowInstancesGet() throws Exception
+    {
+        // Should work even with definitions hidden.
+        wfTestHelper.setVisible(false);
+        
+        //Start workflow as USER1 and assign task to USER2.
+        personManager.setUser(USER1);
+        WorkflowDefinition adhocDef = workflowService.getDefinitionByName(getAdhocWorkflowDefinitionName());
+        Map<QName, Serializable> params = new HashMap<QName, Serializable>();
+        params.put(WorkflowModel.ASSOC_ASSIGNEE, personManager.get(USER2));
+        Date dueDate = new Date();
+        params.put(WorkflowModel.PROP_WORKFLOW_DUE_DATE, dueDate);
+        params.put(WorkflowModel.PROP_WORKFLOW_PRIORITY, 1);
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+        params.put(WorkflowModel.PROP_CONTEXT, packageRef);
+
+        WorkflowPath adhocPath = workflowService.startWorkflow(adhocDef.getId(), params);
+        String WorkflowId = adhocPath.getInstance().getId();
+        workflows.add(WorkflowId);
+        
+        WorkflowTask startTask = workflowService.getTasksForWorkflowPath(adhocPath.getId()).get(0);
+        WorkflowInstance adhocInstance = startTask.getPath().getInstance();
+        workflowService.endTask(startTask.getId(), null);
+
+        // Get Workflow Instance Collection 
+        Response response = sendRequest(new GetRequest(URL_WORKFLOW_INSTANCES), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        JSONArray result = json.getJSONArray("data");
+        assertNotNull(result);
+
+        int totalItems = result.length();
+        for (int i = 0; i < result.length(); i++)
+        {
+            checkSimpleWorkflowInstanceResponse(result.getJSONObject(i));
+        }
+
+        Response forDefinitionResponse = sendRequest(new GetRequest(MessageFormat.format(URL_WORKFLOW_INSTANCES_FOR_DEFINITION, adhocDef.getId())), 200);
+        assertEquals(Status.STATUS_OK, forDefinitionResponse.getStatus());
+        String forDefinitionJsonStr = forDefinitionResponse.getContentAsString();
+        JSONObject forDefinitionJson = new JSONObject(forDefinitionJsonStr);
+        JSONArray forDefinitionResult = forDefinitionJson.getJSONArray("data");
+        assertNotNull(forDefinitionResult);
+
+        for (int i = 0; i < forDefinitionResult.length(); i++)
+        {
+            checkSimpleWorkflowInstanceResponse(forDefinitionResult.getJSONObject(i));
+        }
+        
+        // create a date an hour ago to test filtering
+        Calendar hourAgoCal = Calendar.getInstance();
+        hourAgoCal.setTime(dueDate);
+        hourAgoCal.add(Calendar.HOUR_OF_DAY, -1);
+        Date anHourAgo = hourAgoCal.getTime();
+        
+        Calendar hourLater = Calendar.getInstance();
+        hourLater.setTime(dueDate);
+        hourLater.add(Calendar.HOUR_OF_DAY, 1);
+        Date anHourLater = hourLater.getTime();
+
+        // filter by initiator
+        checkFiltering(URL_WORKFLOW_INSTANCES + "?initiator=" + USER1);
+
+        // filter by startedAfter
+        checkFiltering(URL_WORKFLOW_INSTANCES + "?startedAfter=" + ISO8601DateFormat.format(anHourAgo));
+
+        // filter by startedBefore
+        checkFiltering(URL_WORKFLOW_INSTANCES + "?startedBefore=" + ISO8601DateFormat.format(anHourLater));
+
+        // filter by dueAfter
+        checkFiltering(URL_WORKFLOW_INSTANCES + "?dueAfter=" + ISO8601DateFormat.format(anHourAgo));
+
+        // filter by dueBefore
+        checkFiltering(URL_WORKFLOW_INSTANCES + "?dueBefore=" + ISO8601DateFormat.format(anHourLater));
+
+        if (adhocInstance.getEndDate() != null)
+        {
+            // filter by completedAfter
+            checkFiltering(URL_WORKFLOW_INSTANCES + "?completedAfter=" + ISO8601DateFormat.format(adhocInstance.getEndDate()));
+
+            // filter by completedBefore
+            checkFiltering(URL_WORKFLOW_INSTANCES + "?completedBefore=" + ISO8601DateFormat.format(adhocInstance.getEndDate()));
+        }
+
+        // filter by priority        
+        checkFiltering(URL_WORKFLOW_INSTANCES + "?priority=1");
+
+        // filter by state
+        checkFiltering(URL_WORKFLOW_INSTANCES + "?state=active");
+        
+        // filter by definition name
+        checkFiltering(URL_WORKFLOW_INSTANCES + "?definitionName=" + getAdhocWorkflowDefinitionName());
+        
+        // paging
+        int maxItems = 3;        
+        for (int skipCount = 0; skipCount < totalItems; skipCount += maxItems)
+        {
+            checkPaging(URL_WORKFLOW_INSTANCES + "?maxItems=" + maxItems + "&skipCount=" + skipCount, totalItems, maxItems, skipCount);
+        }
+        
+        // check the exclude filtering
+        String exclude = getAdhocWorkflowDefinitionName();
+        response = sendRequest(new GetRequest(URL_WORKFLOW_INSTANCES + "?exclude=" + exclude), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        JSONArray results = json.getJSONArray("data");
+        assertNotNull(results);
+        
+        boolean adhocWorkflowPresent = false;
+        for (int i = 0; i < results.length(); i++)
+        {
+            JSONObject workflowInstanceJSON = results.getJSONObject(i);
+            
+            String type = workflowInstanceJSON.getString("name");
+            if (exclude.equals(type))
+            {
+                adhocWorkflowPresent = true;
+                break;
+            }
+        }
+        
+        assertFalse("Found adhoc workflows when they were supposed to be excluded", adhocWorkflowPresent);
+    }
+
+    public void testWorkflowInstancesForNodeGet() throws Exception
+    {
+        //Start workflow as USER1 and assign task to USER2.
+        personManager.setUser(USER1);
+        WorkflowDefinition adhocDef = workflowService.getDefinitionByName(getAdhocWorkflowDefinitionName());
+        Map<QName, Serializable> params = new HashMap<QName, Serializable>();
+        params.put(WorkflowModel.ASSOC_ASSIGNEE, personManager.get(USER2));
+        params.put(WorkflowModel.PROP_DUE_DATE, new Date());
+        params.put(WorkflowModel.PROP_PRIORITY, 1);
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+
+        nodeService.addChild(packageRef, contentNodeRef, 
+                WorkflowModel.ASSOC_PACKAGE_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI,
+                QName.createValidLocalName((String)nodeService.getProperty(
+                        contentNodeRef, ContentModel.PROP_NAME))));
+
+        WorkflowPath adhocPath = workflowService.startWorkflow(adhocDef.getId(), params);
+
+        String url = MessageFormat.format(URL_WORKFLOW_INSTANCES_FOR_NODE, contentNodeRef.getStoreRef().getProtocol(), contentNodeRef.getStoreRef().getIdentifier(), contentNodeRef.getId());
+        Response response = sendRequest(new GetRequest(url), 200);
+
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        JSONArray result = json.getJSONArray("data");
+        assertNotNull(result);
+
+        assertTrue(result.length() > 0);
+
+        workflowService.cancelWorkflow(adhocPath.getInstance().getId());
+
+        Response afterCancelResponse = sendRequest(new GetRequest(url), 200);
+
+        assertEquals(Status.STATUS_OK, afterCancelResponse.getStatus());
+        String afterCancelJsonStr = afterCancelResponse.getContentAsString();
+        JSONObject afterCancelJson = new JSONObject(afterCancelJsonStr);
+        JSONArray afterCancelResult = afterCancelJson.getJSONArray("data");
+        assertNotNull(afterCancelResult);
+
+        assertTrue(afterCancelResult.length() == 0);
+    }
+    
+    public void testWorkflowInstanceDeleteAsAdministrator() throws Exception
+    {
+        //Start workflow as USER1 
+        personManager.setUser(USER1);
+        WorkflowDefinition adhocDef = workflowService.getDefinitionByName(getAdhocWorkflowDefinitionName());
+        Map<QName, Serializable> params = new HashMap<QName, Serializable>();
+        params.put(WorkflowModel.ASSOC_ASSIGNEE, personManager.get(USER2));
+        Date dueDate = new Date();
+        params.put(WorkflowModel.PROP_DUE_DATE, dueDate);
+        params.put(WorkflowModel.PROP_PRIORITY, 1);
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+        params.put(WorkflowModel.PROP_CONTEXT, packageRef);
+
+        WorkflowPath adhocPath = workflowService.startWorkflow(adhocDef.getId(), params);
+        WorkflowTask startTask = workflowService.getTasksForWorkflowPath(adhocPath.getId()).get(0);
+        startTask = workflowService.endTask(startTask.getId(), null);
+
+        WorkflowInstance adhocInstance = startTask.getPath().getInstance();
+        
+        // Run next request as admin
+        String admin = authenticationComponent.getDefaultAdministratorUserNames().iterator().next();
+        AuthenticationUtil.setFullyAuthenticatedUser(admin);
+        
+        sendRequest(new DeleteRequest(URL_WORKFLOW_INSTANCES + "/" + adhocInstance.getId()), Status.STATUS_OK);
+
+        WorkflowInstance instance = workflowService.getWorkflowById(adhocInstance.getId());
+        if (instance != null)
+        {
+            assertFalse("The deleted workflow is still active!", instance.isActive());
+        }
+        
+        List<WorkflowInstance> instances = workflowService.getActiveWorkflows(adhocInstance.getDefinition().getId());
+        for (WorkflowInstance activeInstance : instances)
+        {
+            assertFalse(adhocInstance.getId().equals(activeInstance.getId()));
+        }
+    }
+    
+    public void testWorkflowInstanceDelete() throws Exception
+    {
+        //Start workflow as USER1 and assign task to USER2.
+        personManager.setUser(USER1);
+        WorkflowDefinition adhocDef = workflowService.getDefinitionByName(getAdhocWorkflowDefinitionName());
+        Map<QName, Serializable> params = new HashMap<QName, Serializable>();
+        params.put(WorkflowModel.ASSOC_ASSIGNEE, personManager.get(USER2));
+        Date dueDate = new Date();
+        params.put(WorkflowModel.PROP_DUE_DATE, dueDate);
+        params.put(WorkflowModel.PROP_PRIORITY, 1);
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+        params.put(WorkflowModel.PROP_CONTEXT, packageRef);
+
+        WorkflowPath adhocPath = workflowService.startWorkflow(adhocDef.getId(), params);
+        WorkflowTask startTask = workflowService.getTasksForWorkflowPath(adhocPath.getId()).get(0);
+        startTask = workflowService.endTask(startTask.getId(), null);
+
+        WorkflowInstance adhocInstance = startTask.getPath().getInstance();
+        
+        // attempt to delete workflow as a user that is not the initiator
+        personManager.setUser(USER3);
+        String instanceId = adhocInstance.getId();
+        sendRequest(new DeleteRequest(URL_WORKFLOW_INSTANCES + "/" + instanceId), Status.STATUS_FORBIDDEN);
+        
+        // make sure workflow instance is still present
+        assertNotNull(workflowService.getWorkflowById(instanceId));
+
+        // now delete as initiator of workflow
+        personManager.setUser(USER1);
+        sendRequest(new DeleteRequest(URL_WORKFLOW_INSTANCES + "/" + instanceId), Status.STATUS_OK);
+
+        WorkflowInstance instance = workflowService.getWorkflowById(instanceId);
+        if (instance != null)
+        {
+            assertFalse("The deleted workflow is still active!", instance.isActive());
+        }
+        
+        List<WorkflowInstance> instances = workflowService.getActiveWorkflows(adhocInstance.getDefinition().getId());
+        for (WorkflowInstance activeInstance : instances)
+        {
+            assertFalse(instanceId.equals(activeInstance.getId()));
+        }
+        
+        // Try deleting an non-existent workflow instance, should result in 404
+        sendRequest(new DeleteRequest(URL_WORKFLOW_INSTANCES + "/" + instanceId), Status.STATUS_NOT_FOUND);
+    }
+    
+    public void testWorkflowInstanceDeleteAsRecreatedUser() throws Exception
+    {
+        // Create task as USER1 and assign it to another user 
+        personManager.setUser(USER1);
+        WorkflowDefinition adhocDef = workflowService.getDefinitionByName(getAdhocWorkflowDefinitionName());
+        Map<QName, Serializable> params = new HashMap<QName, Serializable>();
+        params.put(WorkflowModel.ASSOC_ASSIGNEE, personManager.get(USER2));
+        Date dueDate = new Date();
+        params.put(WorkflowModel.PROP_DUE_DATE, dueDate);
+        params.put(WorkflowModel.PROP_PRIORITY, 1);
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+        params.put(WorkflowModel.PROP_CONTEXT, packageRef);
+
+        WorkflowPath adhocPath = workflowService.startWorkflow(adhocDef.getId(), params);
+        
+        // Check the workflow was created 
+        assertNotNull(workflowService.getWorkflowById(adhocPath.getInstance().getId()));
+       
+        // Delete USER1
+        personManager.deletePerson(USER1);
+        
+        // Recreate USER1
+        personManager.createPerson(USER1);
+        
+        // Delete workflow
+        personManager.setUser(USER1);
+        sendRequest(new DeleteRequest(URL_WORKFLOW_INSTANCES + "/" + adhocPath.getInstance().getId()), Status.STATUS_OK);
+        
+        // Check the workflow was deleted
+        assertNull(workflowService.getWorkflowById(adhocPath.getInstance().getId()));
+    }
+
+    public void testReviewProcessFlow() throws Exception 
+    {
+        // Approve path
+        runReviewFlow(true);
+        
+        // Create package again, since WF is deleteds
+        packageRef = workflowService.createPackage(null);
+        
+        // Reject path
+        runReviewFlow(false);
+    }
+    
+    public void testReviewPooledProcessFlow() throws Exception 
+    {
+        // Approve path
+        runReviewPooledFlow(true);
+        
+        // Create package again, since WF is deleteds
+        packageRef = workflowService.createPackage(null);
+        
+        // Reject path
+        runReviewPooledFlow(false);
+    }
+    
+    protected void runReviewFlow(boolean approve) throws Exception
+    {
+        // Start workflow as USER1
+        personManager.setUser(USER1);
+        WorkflowDefinition reviewDef = workflowService.getDefinitionByName(getReviewWorkflowDefinitionName());
+        Map<QName, Serializable> params = new HashMap<QName, Serializable>();
+        // Reviewer is USER2
+        params.put(WorkflowModel.ASSOC_ASSIGNEE, personManager.get(USER2));
+        Date dueDate = new Date();
+        params.put(WorkflowModel.PROP_DUE_DATE, dueDate);
+        params.put(WorkflowModel.PROP_PRIORITY, 1);
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+        params.put(WorkflowModel.PROP_CONTEXT, packageRef);
+
+        WorkflowPath reviewPath = workflowService.startWorkflow(reviewDef.getId(), params);
+        String workflowId = reviewPath.getInstance().getId();
+        workflows.add(workflowId);
+        
+        WorkflowTask startTask = workflowService.getTasksForWorkflowPath(reviewPath.getId()).get(0);
+
+        // End start task
+        startTask = workflowService.endTask(startTask.getId(), null);
+
+        // Check of task is available in list of reviewer, USER2
+        personManager.setUser(USER2);
+        Response response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2)), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        JSONArray results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(1, results.length());
+
+        String taskId = results.getJSONObject(0).getString("id");
+
+        // Delegate approval/rejection to implementing engine-test
+        if (approve)
+        {
+            approveTask(taskId);
+        }
+        else
+        {
+            rejectTask(taskId);
+        }
+
+        // 'Approved'/'Rejected' task should be available for initiator
+        personManager.setUser(USER1);
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER1)), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(1, results.length());
+
+        // Correct task type check
+        String taskType = results.getJSONObject(0).getString("name");
+        if (approve)
+        {
+            assertEquals("wf:approvedTask", taskType);
+        }
+        else
+        {
+            assertEquals("wf:rejectedTask", taskType);
+        }
+        workflowService.cancelWorkflow(workflowId);
+    }
+    
+    protected void runReviewPooledFlow(boolean approve) throws Exception
+    {
+        // Start workflow as USER1
+        personManager.setUser(USER1);
+        WorkflowDefinition reviewDef = workflowService.getDefinitionByName(getReviewPooledWorkflowDefinitionName());
+        Map<QName, Serializable> params = new HashMap<QName, Serializable>();
+
+        // Reviewer is group GROUP
+        params.put(WorkflowModel.ASSOC_GROUP_ASSIGNEE, groupManager.get(GROUP));
+        Date dueDate = new Date();
+        params.put(WorkflowModel.PROP_DUE_DATE, dueDate);
+        params.put(WorkflowModel.PROP_PRIORITY, 1);
+        params.put(WorkflowModel.ASSOC_PACKAGE, packageRef);
+        params.put(WorkflowModel.PROP_CONTEXT, packageRef);
+
+        WorkflowPath reviewPath = workflowService.startWorkflow(reviewDef.getId(), params);
+        String workflowId = reviewPath.getInstance().getId();
+        workflows.add(workflowId);
+        
+        WorkflowTask startTask = workflowService.getTasksForWorkflowPath(reviewPath.getId()).get(0);
+
+        // End start task
+        startTask = workflowService.endTask(startTask.getId(), null);
+
+        // Check if task is NOT available in list USER3, not a member of the
+        // group
+        personManager.setUser(USER3);
+        Response response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER3)), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        JSONArray results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(0, results.length());
+
+        // Check if task is available in list of reviewer, member of GROUP:
+        // USER2
+        personManager.setUser(USER2);
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2)), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(1, results.length());
+
+        // Check if task is claimable and pooled
+        JSONObject taskJson = results.getJSONObject(0);
+        String taskId = taskJson.getString("id");
+        assertTrue(taskJson.getBoolean("isClaimable"));
+        assertTrue(taskJson.getBoolean("isPooled"));
+
+        // Claim task, using PUT, updating the owner
+        JSONObject properties = new JSONObject();
+        properties.put(qnameToString(ContentModel.PROP_OWNER), USER2);
+        sendRequest(new PutRequest(URL_TASKS + "/" + taskId, properties.toString(), "application/json"), 200);
+
+        // Check if task insn't claimable anymore
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER2)), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(1, results.length());
+
+        taskJson = results.getJSONObject(0);
+        assertFalse(taskJson.getBoolean("isClaimable"));
+        assertTrue(taskJson.getBoolean("isPooled"));
+
+        // Delegate approval/rejection to implementing engine-test
+        if (approve)
+        {
+            approveTask(taskId);
+        }
+        else
+        {
+            rejectTask(taskId);
+        }
+
+        // 'Approved'/'Rejected' task should be available for initiator
+        personManager.setUser(USER1);
+        response = sendRequest(new GetRequest(MessageFormat.format(URL_USER_TASKS, USER1)), 200);
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        jsonStr = response.getContentAsString();
+        json = new JSONObject(jsonStr);
+        results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(1, results.length());
+
+        // Correct task type check
+        String taskType = results.getJSONObject(0).getString("name");
+        if (approve)
+        {
+            assertEquals("wf:approvedTask", taskType);
+        }
+        else
+        {
+            assertEquals("wf:rejectedTask", taskType);
+        }
+        workflowService.cancelWorkflow(workflowId);
+    }
+
+    protected abstract void approveTask(String taskId) throws Exception;
+
+    protected abstract void rejectTask(String taskId) throws Exception;
+
+    protected abstract String getAdhocWorkflowDefinitionName();
+    
+    protected abstract String getAdhocWorkflowDefinitionTitle();
+    
+    protected abstract String getAdhocWorkflowDefinitionDescription();
+    
+    protected abstract String getReviewWorkflowDefinitionName();
+    
+    protected abstract String getReviewPooledWorkflowDefinitionName();
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        ApplicationContext appContext = getServer().getApplicationContext();
+
+        namespaceService = (NamespaceService) appContext.getBean("NamespaceService");
+        workflowService = (WorkflowService) appContext.getBean("WorkflowService");
+        MutableAuthenticationService authenticationService = (MutableAuthenticationService) appContext.getBean("AuthenticationService");
+        PersonService personService = (PersonService) appContext.getBean("PersonService");
+        SearchService searchService = (SearchService) appContext.getBean("SearchService");
+        FileFolderService fileFolderService = (FileFolderService) appContext.getBean("FileFolderService");
+        nodeService = (NodeService) appContext.getBean("NodeService");
+        
+        // for the purposes of the tests make sure workflow engine is enabled/visible.
+        WorkflowAdminServiceImpl workflowAdminService = (WorkflowAdminServiceImpl) appContext.getBean("workflowAdminService");
+        this.wfTestHelper = new WorkflowTestHelper(workflowAdminService, getEngine(), true);
+        
+        AuthorityService authorityService = (AuthorityService) appContext.getBean("AuthorityService");
+        personManager = new TestPersonManager(authenticationService, personService, nodeService);
+        groupManager = new TestGroupManager(authorityService);
+
+        authenticationComponent = (AuthenticationComponent) appContext.getBean("authenticationComponent");
+        dictionaryService = (DictionaryService) appContext.getBean("dictionaryService");
+
+        personManager.createPerson(USER1);
+        personManager.createPerson(USER2);
+        personManager.createPerson(USER3);
+
+        authenticationComponent.setSystemUserAsCurrentUser();
+
+        groupManager.addUserToGroup(GROUP, USER2);
+
+        packageRef = workflowService.createPackage(null);
+
+        NodeRef companyHome = searchService.selectNodes(nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE), COMPANY_HOME, null, namespaceService, false).get(0);
+
+        contentNodeRef = fileFolderService.create(companyHome, TEST_CONTENT + System.currentTimeMillis(), ContentModel.TYPE_CONTENT).getNodeRef();
+
+        authenticationComponent.clearCurrentSecurityContext();
+    }
+
+    /* (non-Javadoc)
+     * @see junit.framework.TestCase#tearDown()
+     */
+    @Override
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+        authenticationComponent.setSystemUserAsCurrentUser();
+        for (String id: workflows)
+        {
+            try 
+            {
+                workflowService.cancelWorkflow(id);
+            }
+            catch (Throwable t)
+            {
+                // Do nothing
+            }
+        }
+        wfTestHelper.tearDown();
+        groupManager.clearGroups();
+        personManager.clearPeople();
+        authenticationComponent.clearCurrentSecurityContext();
+    }
+
+    private String qnameToString(QName qName)
+    {
+        String separator = Character.toString(QName.NAMESPACE_PREFIX);
+
+        return qName.toPrefixString(namespaceService).replaceFirst(separator, "_");
+    }
+
+    private void compareProperties(JSONObject before, JSONObject after) throws JSONException
+    {
+        for (String name : JSONObject.getNames(after))
+        {
+            if (before.has(name))
+            {
+                if (before.get(name) instanceof JSONArray)
+                {
+                    for (int i = 0; i < before.getJSONArray(name).length(); i++)
+                    {
+                        assertEquals(before.getJSONArray(name).get(i), after.getJSONArray(name).get(i));
+                    }
+                }
+                else
+                {
+                    assertEquals(before.get(name), after.get(name));
+                }
+            }
+        }
+    }
+
+    private void checkSimpleWorkflowInstanceResponse(JSONObject json) throws JSONException
+    {
+        assertTrue(json.has("id"));
+        assertTrue(json.getString("id").length() > 0);
+
+        assertTrue(json.has("url"));
+        assertTrue(json.getString("url").startsWith(URL_WORKFLOW_INSTANCES));
+
+        assertTrue(json.has("name"));
+        assertTrue(json.getString("name").length() > 0);
+
+        assertTrue(json.has("title"));
+        assertTrue(json.getString("title").length() > 0);
+
+        assertTrue(json.has("description"));
+        assertTrue(json.getString("description").length() > 0);
+
+        assertTrue(json.has("isActive"));
+
+        assertTrue(json.has("startDate"));
+        assertTrue(json.getString("startDate").length() > 0);
+
+        assertTrue(json.has("endDate"));
+
+        assertTrue(json.has("initiator"));
+        Object initiator = json.get("initiator");
+        if (!initiator.equals(JSONObject.NULL))
+        {
+            assertTrue(((JSONObject) initiator).has("userName"));
+            assertTrue(((JSONObject) initiator).has("firstName"));
+            assertTrue(((JSONObject) initiator).has("lastName"));
+        }
+
+        assertTrue(json.has("definitionUrl"));
+        assertTrue(json.getString("definitionUrl").startsWith(URL_WORKFLOW_DEFINITIONS));
+    }
+
+    private void checkPriorityFiltering(String url) throws Exception 
+    {
+        JSONObject json = getDataFromRequest(url);
+        JSONArray result = json.getJSONArray("data");
+        assertNotNull(result);
+        assertTrue(result.length() > 0);
+
+        for (int i=0; i<result.length(); i++)
+        {
+            JSONObject taskObject = result.getJSONObject(i);
+            assertEquals(2, taskObject.getJSONObject("properties").get("bpm_priority"));
+        }
+    }
+    
+    private void checkTasksPresent(String url, boolean mustBePresent, String... ids) throws Exception 
+    {
+        List<String> taskIds = Arrays.asList(ids);
+        JSONObject json = getDataFromRequest(url);
+        JSONArray result = json.getJSONArray("data");
+        assertNotNull(result);
+
+        ArrayList<String> resultIds = new ArrayList<String>(result.length());
+        for (int i=0; i<result.length(); i++)
+        {
+            JSONObject taskObject = result.getJSONObject(i);
+            String taskId = taskObject.getString("id");
+            resultIds.add(taskId);
+            if (mustBePresent == false && taskIds.contains(taskId))
+            {
+                fail("The results should not contain id: "+taskId);
+            }
+        }
+        if (mustBePresent && resultIds.containsAll(taskIds) == false)
+        {
+            fail("Not all task Ids were present!\nExpected: "+taskIds +"\nActual: "+resultIds); 
+        }
+    }
+    
+    private void checkTasksMatch(String url, String... ids) throws Exception 
+    {
+        List<String> taskIds = Arrays.asList(ids);
+        JSONObject json = getDataFromRequest(url);
+        JSONArray result = json.getJSONArray("data");
+        assertNotNull(result);
+        
+        ArrayList<String> resultIds = new ArrayList<String>(result.length());
+        for (int i=0; i<result.length(); i++)
+        {
+            JSONObject taskObject = result.getJSONObject(i);
+            String taskId = taskObject.getString("id");
+            resultIds.add(taskId);
+        }
+        assertTrue("Expected: "+taskIds +"\nActual: "+resultIds, resultIds.containsAll(taskIds));
+        assertTrue("Expected: "+taskIds +"\nActual: "+resultIds, taskIds.containsAll(resultIds));
+    }
+    
+    private void checkTasksState(String url, WorkflowTaskState expectedState) throws Exception 
+    {
+        JSONObject json = getDataFromRequest(url);
+        JSONArray result = json.getJSONArray("data");
+        assertNotNull(result);
+
+        for (int i=0; i<result.length(); i++)
+        {
+            JSONObject taskObject = result.getJSONObject(i);
+            String state = taskObject.getString("state");
+            assertEquals(expectedState.toString(), state);
+        }
+    }
+
+    private JSONObject getDataFromRequest(String url) throws Exception
+    {
+        Response response = sendRequest(new GetRequest(url), Status.STATUS_OK);
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        return json;
+    }
+    
+    private void checkTaskPropertyFiltering(String propertiesParamValue, List<String> expectedProperties) throws Exception
+    {
+        JSONObject data = getDataFromRequest(MessageFormat.format(URL_USER_TASKS_PROPERTIES, USER2, propertiesParamValue));
+        JSONArray taskArray = data.getJSONArray("data");
+        assertEquals(1, taskArray.length());
+
+        JSONObject taskProperties = taskArray.getJSONObject(0).getJSONObject("properties");
+        assertNotNull(taskProperties);
+
+        int expectedNumberOfProperties = 0;
+        if(expectedProperties != null)
+        {
+            expectedNumberOfProperties = expectedProperties.size();
+        }
+        // Check right number of properties
+        assertEquals(expectedNumberOfProperties, taskProperties.length());
+
+        // Check if all properties are present
+        if (expectedProperties != null)
+        {
+            for (String prop : expectedProperties)
+            {
+                assertTrue(taskProperties.has(prop));
+            }
+        }
+    }
+    
+    private void checkFiltering(String url) throws Exception
+    {
+        JSONObject json = getDataFromRequest(url);
+        JSONArray result = json.getJSONArray("data");
+        assertNotNull(result);
+
+        assertTrue(result.length() > 0);
+    }
+    
+    private void checkPaging(String url, int totalItems, int maxItems, int skipCount) throws Exception
+    {
+        Response response = sendRequest(new GetRequest(url), 200);
+
+        assertEquals(Status.STATUS_OK, response.getStatus());
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        
+        JSONArray data = json.getJSONArray("data");
+        JSONObject paging = json.getJSONObject("paging");
+        
+        assertNotNull(data);
+        assertNotNull(paging);
+
+        assertTrue(data.length() >= 0);
+        assertTrue(data.length() <= maxItems);
+        
+        assertEquals(totalItems, paging.getInt("totalItems"));
+        assertEquals(maxItems, paging.getInt("maxItems"));
+        assertEquals(skipCount, paging.getInt("skipCount"));
+    }
+
+    private JSONArray getJsonArray(Response response, int expectedLength) throws Exception
+    {
+        String jsonStr = response.getContentAsString();
+        JSONObject json = new JSONObject(jsonStr);
+        JSONArray results = json.getJSONArray("data");
+        assertNotNull(results);
+        assertEquals(expectedLength, results.length());
+        return results;
+    }
+
+    protected abstract String getEngine();
+    
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/workflow/ActivitiWorkflowRestApiTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/workflow/ActivitiWorkflowRestApiTest.java
new file mode 100644
index 00000000000..bcd73cd2932
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/workflow/ActivitiWorkflowRestApiTest.java
@@ -0,0 +1,107 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import java.io.Serializable;
+import java.util.HashMap;
+
+import org.alfresco.repo.workflow.activiti.ActivitiConstants;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.junit.experimental.categories.Category;
+
+/**
+ * @author Nick Smith
+ * @author Frederik Heremans
+ * @since 3.4.e
+ */
+@Category(LuceneTests.class)
+public class ActivitiWorkflowRestApiTest extends AbstractWorkflowRestApiTest 
+{
+    private static final String ADHOC_WORKFLOW_DEFINITION_NAME = "activiti$activitiAdhoc";
+    private static final String ADHOC_WORKFLOW_DEFINITION_TITLE = "New Task";
+    private static final String ADHOC_WORKFLOW_DEFINITION_DESCRIPTION = "Assign a new task to yourself or a colleague";
+    private static final String REVIEW_WORKFLOW_DEFINITION_NAME = "activiti$activitiReview";
+    private static final String REVIEW_POOLED_WORKFLOW_DEFINITION_NAME = "activiti$activitiReviewPooled";
+    
+    @Override
+    protected String getAdhocWorkflowDefinitionName() 
+    {
+        return ADHOC_WORKFLOW_DEFINITION_NAME;
+    }
+    
+    @Override
+    protected String getAdhocWorkflowDefinitionTitle() 
+    {
+        return ADHOC_WORKFLOW_DEFINITION_TITLE;
+    }
+    
+    @Override
+    protected String getAdhocWorkflowDefinitionDescription() 
+    {
+        return ADHOC_WORKFLOW_DEFINITION_DESCRIPTION;
+    }
+    
+    @Override
+    protected String getReviewWorkflowDefinitionName() 
+    {
+        return REVIEW_WORKFLOW_DEFINITION_NAME;
+    }
+    
+    @Override
+    protected String getReviewPooledWorkflowDefinitionName() 
+    {
+        return REVIEW_POOLED_WORKFLOW_DEFINITION_NAME;
+    }
+
+    @Override
+    protected void approveTask(String taskId) 
+    {
+        HashMap<QName, Serializable> params = new HashMap<QName, Serializable>();
+        params.put(QName.createQName(NamespaceService.WORKFLOW_MODEL_1_0_URI, "reviewOutcome"), "Approve");
+        workflowService.updateTask(taskId, params, null, null);
+        workflowService.endTask(taskId, null);
+    }
+
+    @Override
+    protected void rejectTask(String taskId) 
+    {
+        HashMap<QName, Serializable> params = new HashMap<QName, Serializable>();
+        params.put(QName.createQName(NamespaceService.WORKFLOW_MODEL_1_0_URI, "reviewOutcome"), "Reject");
+        workflowService.updateTask(taskId, params, null, null);
+        workflowService.endTask(taskId, null);
+    }
+    
+    /**
+    * {@inheritDoc}
+    */
+    @Override
+    protected String getEngine()
+    {
+        return ActivitiConstants.ENGINE_ID;
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilderTest.java b/remote-api/src/test/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilderTest.java
new file mode 100644
index 00000000000..af0b6ae828b
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilderTest.java
@@ -0,0 +1,434 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.scripts.workflow;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.workflow.WorkflowModel;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.workflow.WorkflowDefinition;
+import org.alfresco.service.cmr.workflow.WorkflowInstance;
+import org.alfresco.service.cmr.workflow.WorkflowNode;
+import org.alfresco.service.cmr.workflow.WorkflowPath;
+import org.alfresco.service.cmr.workflow.WorkflowService;
+import org.alfresco.service.cmr.workflow.WorkflowTask;
+import org.alfresco.service.cmr.workflow.WorkflowTaskDefinition;
+import org.alfresco.service.cmr.workflow.WorkflowTaskState;
+import org.alfresco.service.cmr.workflow.WorkflowTransition;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.NamespaceServiceMemoryImpl;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ISO8601DateFormat;
+
+/**
+ * @author Nick Smith
+ * @since 3.4
+ */
+public class WorkflowModelBuilderTest extends TestCase
+{
+    private static final String URI = "http://test";
+    private static final String userName = "joeBloggs";
+    private static final String firstName = "Joe";
+    private static final String lastName = "Bloggs";
+    private static final NodeRef person = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, userName);
+    private static final NodeRef workflowPackage = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, "workflowPackage");
+    
+    private NamespaceService namespaceService;
+    private PersonService personService;
+    private NodeService nodeService;
+    private WorkflowService workflowService;
+    private DictionaryService dictionaryService;
+    private AuthenticationService authenticationService;
+    private WorkflowModelBuilder builder;
+
+    @SuppressWarnings("unchecked")
+    public void testBuildWorkflowTask() throws Exception
+    {
+        Date date = new Date();
+        WorkflowTask task = makeTask(date);
+        
+        Map<String, Object> model = builder.buildSimple(task, null);
+        Object id = model.get(WorkflowModelBuilder.TASK_ID);
+        assertEquals(task.getId(), id);
+        Object url = model.get(WorkflowModelBuilder.TASK_URL);
+        assertEquals("api/task-instances/" + task.getId(), url);
+        assertEquals(task.getName(), model.get(WorkflowModelBuilder.TASK_NAME));
+        assertEquals(task.getTitle(), model.get(WorkflowModelBuilder.TASK_TITLE));
+        assertEquals(task.getDescription(), model.get(WorkflowModelBuilder.TASK_DESCRIPTION));
+        assertEquals(task.getState().name(), model.get(WorkflowModelBuilder.TASK_STATE));
+        assertNull(model.get(WorkflowModelBuilder.TASK_OUTCOME));
+        assertEquals(false, model.get(WorkflowModelBuilder.TASK_IS_POOLED));
+        assertEquals(false, model.get(WorkflowModelBuilder.TASK_IS_EDITABLE));
+        assertEquals(false, model.get(WorkflowModelBuilder.TASK_IS_REASSIGNABLE));
+        assertEquals(false, model.get(WorkflowModelBuilder.TASK_IS_CLAIMABLE));
+        assertEquals(false, model.get(WorkflowModelBuilder.TASK_IS_RELEASABLE));
+        
+        Map<String, Object> owner = (Map<String, Object>) model.get(WorkflowModelBuilder.TASK_OWNER);
+        assertEquals(userName, owner.get(WorkflowModelBuilder.PERSON_USER_NAME));
+        assertEquals(firstName, owner.get(WorkflowModelBuilder.PERSON_FIRST_NAME));
+        assertEquals(lastName, owner.get(WorkflowModelBuilder.PERSON_LAST_NAME));
+        
+        Map<String, Object> props = (Map<String, Object>) model.get(WorkflowModelBuilder.TASK_PROPERTIES);
+        assertEquals(task.getProperties().size() + 1, props.size());
+        assertEquals(5, props.get("test_int"));
+        assertEquals(false, props.get("test_boolean"));
+        assertEquals("foo bar", props.get("test_string"));
+        String dateStr = (String) props.get("test_date");
+        assertEquals(date, ISO8601DateFormat.parse(dateStr));
+        
+        Map<String, Object> workflowInstance = (Map<String, Object>)model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE);
+        assertNotNull(workflowInstance);
+        WorkflowInstance instance = task.getPath().getInstance();
+        assertEquals(instance.getId(), workflowInstance.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_ID));
+        assertEquals(instance.isActive(), workflowInstance.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_IS_ACTIVE));
+        String startDateStr = ISO8601DateFormat.format(instance.getStartDate());
+        String workFlowStartDateStr = (String) workflowInstance.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_START_DATE);
+        assertEquals(startDateStr, ISO8601DateFormat.formatToZulu(workFlowStartDateStr));
+        
+        task.getProperties().put(WorkflowModel.ASSOC_POOLED_ACTORS, new ArrayList<NodeRef>(0));
+        model = builder.buildSimple(task, null);
+        assertEquals(false, model.get(WorkflowModelBuilder.TASK_IS_POOLED));
+        
+        ArrayList<NodeRef> actors = new ArrayList<NodeRef>(1);
+        actors.add(person);
+        task.getProperties().put(WorkflowModel.ASSOC_POOLED_ACTORS, actors);
+        model = builder.buildSimple(task, null);
+        assertEquals(true, model.get(WorkflowModelBuilder.TASK_IS_POOLED));
+
+        model = builder.buildSimple(task, Arrays.asList("test_int", "test_string"));
+        //Check task owner still created properly.
+        owner = (Map<String, Object>) model.get(WorkflowModelBuilder.TASK_OWNER);
+        assertEquals(userName, owner.get(WorkflowModelBuilder.PERSON_USER_NAME));
+
+        // Check properties populated correctly
+        props = (Map<String, Object>) model.get(WorkflowModelBuilder.TASK_PROPERTIES);
+        assertEquals(2, props.size());
+        assertEquals(5, props.get("test_int"));
+        assertEquals("foo bar", props.get("test_string"));
+    }
+
+    @SuppressWarnings("unchecked")
+    public void testBuildWorkflowTaskDetailed() throws Exception
+    {
+        Date date = new Date();
+        WorkflowTask workflowTask = makeTask(date);
+        
+        Map<String, Object> model = builder.buildDetailed(workflowTask);
+
+        Object id = model.get(WorkflowModelBuilder.TASK_ID);
+        assertEquals(workflowTask.getId(), id);
+        Object url = model.get(WorkflowModelBuilder.TASK_URL);
+        assertEquals("api/task-instances/" + workflowTask.getId(), url);
+        assertEquals(workflowTask.getName(), model.get(WorkflowModelBuilder.TASK_NAME));
+        assertEquals(workflowTask.getTitle(), model.get(WorkflowModelBuilder.TASK_TITLE));
+        assertEquals(workflowTask.getDescription(), model.get(WorkflowModelBuilder.TASK_DESCRIPTION));
+        assertEquals(workflowTask.getState().name(), model.get(WorkflowModelBuilder.TASK_STATE));
+        assertEquals(false, model.get(WorkflowModelBuilder.TASK_IS_POOLED));
+
+        Map<String, Object> owner = (Map<String, Object>) model.get(WorkflowModelBuilder.TASK_OWNER);
+        assertEquals(userName, owner.get(WorkflowModelBuilder.PERSON_USER_NAME));
+        assertEquals(firstName, owner.get(WorkflowModelBuilder.PERSON_FIRST_NAME));
+        assertEquals(lastName, owner.get(WorkflowModelBuilder.PERSON_LAST_NAME));
+
+        Map<String, Object> props = (Map<String, Object>) model.get(WorkflowModelBuilder.TASK_PROPERTIES);
+        assertEquals(workflowTask.getProperties().size() + 1, props.size());
+
+        Map<String, Object> workflowInstance = (Map<String, Object>) model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE);
+        
+        WorkflowInstance instance = workflowTask.getPath().getInstance();
+        assertEquals(instance.getId(), workflowInstance.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_ID));
+        assertEquals(instance.isActive(), workflowInstance.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_IS_ACTIVE));
+        String startDateStr = ISO8601DateFormat.format(instance.getStartDate());
+        String startDateBuilderStr = ISO8601DateFormat.formatToZulu((String) workflowInstance.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_START_DATE));
+        assertEquals(startDateStr, startDateBuilderStr);        
+        
+        WorkflowDefinition workflowDef = instance.getDefinition();
+        assertEquals(workflowDef.getName(), workflowInstance.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_NAME));
+        assertEquals(workflowDef.getTitle(), workflowInstance.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_TITLE));
+        assertEquals(workflowDef.getDescription(), workflowInstance.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_DESCRIPTION));
+        
+        Map<String, Object> actualDefinition = (Map<String, Object>) model.get(WorkflowModelBuilder.TASK_DEFINITION);
+        WorkflowTaskDefinition taskDef = workflowTask.getDefinition();
+        assertEquals(taskDef.getId(), actualDefinition.get(WorkflowModelBuilder.TASK_DEFINITION_ID));
+
+        Map<String, Object> actualType = (Map<String, Object>) actualDefinition.get(WorkflowModelBuilder.TASK_DEFINITION_TYPE);
+        TypeDefinition taskType = taskDef.getMetadata();
+        assertEquals(taskType.getName(), actualType.get(WorkflowModelBuilder.TYPE_DEFINITION_NAME));
+        assertEquals(taskType.getTitle(dictionaryService), actualType.get(WorkflowModelBuilder.TYPE_DEFINITION_TITLE));
+        assertEquals(taskType.getDescription(dictionaryService), actualType.get(WorkflowModelBuilder.TYPE_DEFINITION_DESCRIPTION));
+
+        Map<String, Object> actualNode = (Map<String, Object>) actualDefinition.get(WorkflowModelBuilder.TASK_DEFINITION_NODE);
+        WorkflowNode taskNode = taskDef.getNode();
+        assertEquals(taskNode.getName(), actualNode.get(WorkflowModelBuilder.WORKFLOW_NODE_NAME));
+        assertEquals(taskNode.getTitle(), actualNode.get(WorkflowModelBuilder.WORKFLOW_NODE_TITLE));
+        assertEquals(taskNode.getDescription(), actualNode.get(WorkflowModelBuilder.WORKFLOW_NODE_DESCRIPTION));
+        assertEquals(taskNode.isTaskNode(), actualNode.get(WorkflowModelBuilder.WORKFLOW_NODE_IS_TASK_NODE));
+
+        List<Map<String, Object>> transitions = (List<Map<String, Object>>) actualNode.get(WorkflowModelBuilder.WORKFLOW_NODE_TRANSITIONS);
+
+        WorkflowTransition[] taskTransitions = taskNode.getTransitions();
+        int i = 0;
+        for (Map<String, Object> transition : transitions)
+        {
+            WorkflowTransition workflowTransition = taskTransitions[i];
+            assertEquals(workflowTransition.getId(), transition.get(WorkflowModelBuilder.WORKFLOW_NODE_TRANSITION_ID));
+            assertEquals(workflowTransition.getTitle(), transition.get(WorkflowModelBuilder.WORKFLOW_NODE_TRANSITION_TITLE));
+            assertEquals(workflowTransition.getDescription(), transition.get(WorkflowModelBuilder.WORKFLOW_NODE_TRANSITION_DESCRIPTION));
+            assertEquals(workflowTransition.isDefault(), transition.get(WorkflowModelBuilder.WORKFLOW_NODE_TRANSITION_IS_DEFAULT));
+            assertEquals(false, transition.get(WorkflowModelBuilder.WORKFLOW_NODE_TRANSITION_IS_HIDDEN));
+            i++;
+        }
+    }
+    
+    public void testBuildWorkflowDefinition() throws Exception
+    {
+        WorkflowTaskDefinition workflowTaskDefinition = makeTaskDefinition();
+        WorkflowDefinition workflowDefinition = new WorkflowDefinition("The Id", "The Name", "The Version", "The Title", "The Description", workflowTaskDefinition);
+        
+        Map<String, Object> model = builder.buildSimple(workflowDefinition);
+        assertEquals(workflowDefinition.getId(), model.get(WorkflowModelBuilder.WORKFLOW_DEFINITION_ID));
+        assertEquals("api/workflow-definitions/" + workflowDefinition.getId(), model.get(WorkflowModelBuilder.WORKFLOW_DEFINITION_URL));
+        assertEquals(workflowDefinition.getName(), model.get(WorkflowModelBuilder.WORKFLOW_DEFINITION_NAME));
+        assertEquals(workflowDefinition.getTitle(), model.get(WorkflowModelBuilder.WORKFLOW_DEFINITION_TITLE));
+        assertEquals(workflowDefinition.getDescription(), model.get(WorkflowModelBuilder.WORKFLOW_DEFINITION_DESCRIPTION));
+    }
+
+    @SuppressWarnings("unchecked")
+    public void testBuildWorkflowInstance() throws Exception
+    {
+        WorkflowInstance workflowInstance = makeWorkflowInstance(null);                        
+        
+        Map<String, Object> model = builder.buildSimple(workflowInstance);
+        
+        assertEquals(workflowInstance.getId(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_ID));
+        assertTrue(model.containsKey(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_URL));
+        assertEquals(workflowInstance.getDefinition().getName(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_NAME));
+        assertEquals(workflowInstance.getDefinition().getTitle(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_TITLE));
+        assertEquals(workflowInstance.getDefinition().getDescription(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_DESCRIPTION));
+        assertEquals(workflowInstance.getDescription(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_MESSAGE));
+        assertEquals(workflowInstance.isActive(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_IS_ACTIVE));        
+        String startDate = ISO8601DateFormat.format(workflowInstance.getStartDate());
+        String endDate = ISO8601DateFormat.format(workflowInstance.getEndDate());
+        String startDateBuilder = ISO8601DateFormat.formatToZulu((String) model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_START_DATE));
+        String endDateBuilder = ISO8601DateFormat.formatToZulu((String) model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_END_DATE));
+        assertEquals(startDate, startDateBuilder);
+        assertEquals(endDate, endDateBuilder);
+        
+        Map<String, Object> initiator = (Map<String, Object>) model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_INITIATOR);
+        if (initiator != null)
+        {
+            assertEquals(userName, initiator.get(WorkflowModelBuilder.PERSON_USER_NAME));
+            assertEquals(firstName, initiator.get(WorkflowModelBuilder.PERSON_FIRST_NAME));
+            assertEquals(lastName, initiator.get(WorkflowModelBuilder.PERSON_LAST_NAME));
+        }
+        
+        assertTrue(model.containsKey(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_DEFINITION_URL));
+    }
+    
+    @SuppressWarnings("unchecked")
+    public void testBuildWorkflowInstanceDetailed() throws Exception
+    {
+        WorkflowTaskDefinition workflowTaskDefinition = makeTaskDefinition();
+        QName taskTypeName = WorkflowModel.TYPE_WORKFLOW_TASK;
+        when(workflowTaskDefinition.getMetadata().getName()).thenReturn(taskTypeName);
+        when(workflowTaskDefinition.getMetadata().getTitle(dictionaryService)).thenReturn("The Type Title");
+        when(workflowTaskDefinition.getMetadata().getDescription(dictionaryService)).thenReturn("The Type Description");
+        
+        WorkflowInstance workflowInstance = makeWorkflowInstance(workflowTaskDefinition);
+        
+        Map<String, Object> model = builder.buildDetailed(workflowInstance, true);
+        
+        assertEquals(workflowInstance.getId(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_ID));
+        assertEquals(workflowInstance.getDefinition().getName(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_NAME));
+        assertEquals(workflowInstance.getDefinition().getTitle(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_TITLE));
+        assertEquals(workflowInstance.getDefinition().getDescription(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_DESCRIPTION));
+        assertEquals(workflowInstance.isActive(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_IS_ACTIVE));
+        String startDateStr = ISO8601DateFormat.format(workflowInstance.getStartDate());
+        String endDateStr = ISO8601DateFormat.format(workflowInstance.getEndDate());
+        String startDateBuilderStr = ISO8601DateFormat.formatToZulu((String)model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_START_DATE)) ;
+        String endDateBuilderStr = ISO8601DateFormat.formatToZulu((String)model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_END_DATE)); 
+        assertEquals( startDateStr,startDateBuilderStr);
+        assertEquals(endDateStr, endDateBuilderStr);
+        
+        Map<String, Object> initiator = (Map<String, Object>) model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_INITIATOR);
+        if (initiator != null)
+        {
+            assertEquals(userName, initiator.get(WorkflowModelBuilder.PERSON_USER_NAME));
+            assertEquals(firstName, initiator.get(WorkflowModelBuilder.PERSON_FIRST_NAME));
+            assertEquals(lastName, initiator.get(WorkflowModelBuilder.PERSON_LAST_NAME));
+        }
+        
+        assertEquals(workflowInstance.getContext().toString(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_CONTEXT));        
+        assertEquals(workflowInstance.getWorkflowPackage().toString(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_PACKAGE));
+        
+        Map<String, Object> taskInstanceModel = (Map<String, Object>) model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_DEFINITION);
+        
+        assertEquals(workflowInstance.getDefinition().getVersion(), taskInstanceModel.get(WorkflowModelBuilder.WORKFLOW_DEFINITION_VERSION));
+        assertEquals(workflowInstance.getDefinition().getStartTaskDefinition().getMetadata().getName(), 
+                    taskInstanceModel.get(WorkflowModelBuilder.WORKFLOW_DEFINITION_START_TASK_DEFINITION_TYPE));
+        
+    }
+    
+    private WorkflowNode makeNode()
+    {
+        String name = "The Node Name";
+        String title = "The Node Title";
+        String description = "The Node Description";
+        String type= "The Node Type";
+        boolean isTaskNode = true;
+        WorkflowTransition workflowTransition = makeTransition();
+        return new WorkflowNode(name, title, description, type, isTaskNode, workflowTransition);
+    }
+
+    private WorkflowTransition makeTransition()
+    {
+        String id = "The Transition Id";
+        String title = "The Transition Title";
+        String description = "The Transition Description";
+        boolean isDefault = true;
+        return new WorkflowTransition(id, title, description, isDefault);
+    }
+
+    private WorkflowTaskDefinition makeTaskDefinition()
+    {
+        String id = "The Definition Id";
+        TypeDefinition metadata = makeTypeDefinition();
+        WorkflowNode node = makeNode();
+        return new WorkflowTaskDefinition(id, node, metadata);
+    }
+
+    private TypeDefinition makeTypeDefinition()
+    {
+        TypeDefinition typeDef = mock(TypeDefinition.class);
+        when(typeDef.getName()).thenReturn(QName.createQName(URI, "The Type Name"));
+        when(typeDef.getTitle(dictionaryService)).thenReturn("The Type Title");
+        when(typeDef.getDescription(dictionaryService)).thenReturn("The Type Description");
+        return typeDef;
+    }
+
+    private WorkflowPath makePath()
+    {
+        String id = "pathId$1";
+        Date startDate = new Date();
+        WorkflowDefinition definition = new WorkflowDefinition(
+                "The Id", "The Name", "1", "The Title", "The Description", null);
+        WorkflowInstance instance = new WorkflowInstance("",
+                    definition, null, null, null,
+                    workflowPackage, true, startDate, null);
+        return new WorkflowPath(id, instance, null, true);
+    }
+    
+    private WorkflowTask makeTask(Date date)
+    {
+        String description = "Task Desc";
+        String id = "testId$1";
+        String name = "Task Name";
+        WorkflowTaskState state = WorkflowTaskState.IN_PROGRESS;
+        String title = "Task Title";
+        WorkflowPath path = makePath();
+        WorkflowTaskDefinition definition = makeTaskDefinition();
+        HashMap<QName, Serializable> properties = makeTaskProperties(date);
+        return new WorkflowTask(id,
+                    definition, name, title, description, state, path, properties);
+    }
+    
+    private WorkflowInstance makeWorkflowInstance(WorkflowTaskDefinition taskDefinition)
+    {
+        String id = "The id";
+        boolean active = true;
+        Date startDate = new Date();
+        Date endDate = new Date();
+        NodeRef initiator = person;
+        WorkflowDefinition definition = new WorkflowDefinition(
+                    "The Id", "The Name", "The Version", "The Title", "The Description", taskDefinition);
+        return new WorkflowInstance(id,
+                    definition, "", initiator, workflowPackage,
+                    workflowPackage, active, startDate, endDate);
+    }
+
+    private HashMap<QName, Serializable> makeTaskProperties(Date date)
+    {
+        HashMap<QName, Serializable> properties = new HashMap<QName, Serializable>();
+        properties.put(ContentModel.PROP_OWNER, userName);
+        QName testInt = QName.createQName(URI, "int");
+        properties.put(testInt, 5);
+        QName testBoolean = QName.createQName(URI, "boolean");
+        properties.put(testBoolean, false);
+        QName testString = QName.createQName(URI, "string");
+        properties.put(testString, "foo bar");
+        QName testDate = QName.createQName(URI, "date");
+        properties.put(testDate, date);
+        return properties;
+    }
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        namespaceService = new NamespaceServiceMemoryImpl();
+        namespaceService.registerNamespace("test", URI);
+        namespaceService.registerNamespace(NamespaceService.CONTENT_MODEL_PREFIX, NamespaceService.CONTENT_MODEL_1_0_URI);
+        namespaceService.registerNamespace(NamespaceService.BPM_MODEL_PREFIX, NamespaceService.BPM_MODEL_1_0_URI);
+        
+        personService = mock(PersonService.class);
+        when(personService.getPerson(userName)).thenReturn(person);
+        when(personService.personExists(userName)).thenReturn(true);
+        
+        nodeService = mock(NodeService.class);
+        Map<QName, Serializable> personProps = new HashMap<QName, Serializable>();
+        personProps.put(ContentModel.PROP_USERNAME, userName);
+        personProps.put(ContentModel.PROP_FIRSTNAME, firstName);
+        personProps.put(ContentModel.PROP_LASTNAME, lastName);
+        when(nodeService.getProperties(person)).thenReturn(personProps);
+        when(nodeService.getProperty(person, ContentModel.PROP_USERNAME)).thenReturn(userName);
+        when(nodeService.getProperty(person, ContentModel.PROP_FIRSTNAME)).thenReturn(firstName);
+        when(nodeService.getProperty(person, ContentModel.PROP_LASTNAME)).thenReturn(lastName);
+        
+        workflowService = mock(WorkflowService.class);
+        dictionaryService = mock(DictionaryService.class);
+        authenticationService = mock(AuthenticationService.class);
+        
+        builder = new WorkflowModelBuilder(namespaceService, nodeService, authenticationService, personService, workflowService, dictionaryService);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/util/AbstractJettyComponent.java b/remote-api/src/test/java/org/alfresco/repo/web/util/AbstractJettyComponent.java
new file mode 100644
index 00000000000..7f74b09a738
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/util/AbstractJettyComponent.java
@@ -0,0 +1,264 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.util;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.Date;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.util.BaseApplicationContextHelper;
+import org.alfresco.util.TempFileProvider;
+import org.alfresco.util.WebApplicationContextLoader;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
+import org.springframework.beans.BeanUtils;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.web.context.ConfigurableWebApplicationContext;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.GenericWebApplicationContext;
+
+/**
+ * Manages an embedded jetty server, hooking it up to the repository spring context.
+ * 
+ * @author steveglover
+ *
+ */
+public abstract class AbstractJettyComponent implements JettyComponent
+{
+	protected static final Log logger = LogFactory.getLog(AbstractJettyComponent.class);
+
+    public static final int JETTY_STOP_PORT = 8079;
+    public static final String JETTY_LOCAL_IP = "127.0.0.1";
+
+    protected int port = 8081;
+    protected String contextPath = "/alfresco";
+    protected String publicApiServletName = "api";
+    protected String[] configLocations;
+    protected String[] classLocations;
+    protected static Server server;
+
+    private WebAppContext webAppContext;
+
+	public AbstractJettyComponent(int port, String contextPath, String[] configLocations, String[] classLocations)
+	{
+		this.configLocations = configLocations;
+		this.classLocations = classLocations;
+		this.port = port;
+		this.contextPath = contextPath;
+	    server = new Server(port);
+	}
+	
+	public int getPort()
+	{
+		return port;
+	}
+
+	/*
+	 * Creates a web application context wrapping a Spring application context (adapted from core spring code in
+	 * org.springframework.web.context.ContextLoader)
+	 */
+	protected WebApplicationContext createWebApplicationContext(ServletContext sc, ApplicationContext parent)
+	{
+		GenericWebApplicationContext wac = (GenericWebApplicationContext) BeanUtils.instantiateClass(GenericWebApplicationContext.class);
+
+		// Assign the best possible id value.
+		wac.setId(ConfigurableWebApplicationContext.APPLICATION_CONTEXT_ID_PREFIX + contextPath);
+
+		wac.setParent(parent);
+		wac.setServletContext(sc);
+		wac.refresh();
+
+		return wac;
+	}
+	
+	public ConfigurableApplicationContext getApplicationContext()
+	{
+		return (ConfigurableApplicationContext)webAppContext.getServletContext().getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE);
+	}
+	
+	protected abstract void configureWebAppContext(WebAppContext webAppContext);
+
+	public void start()
+	{
+		if(logger.isDebugEnabled())
+		{
+			logger.debug("["+new Date()+"] startJetty: starting embedded Jetty server ...");
+		}
+
+	    try
+	    {
+			if(logger.isDebugEnabled())
+			{
+				logger.debug("["+new Date()+"] startJetty");
+			}
+
+		    this.webAppContext = new WebAppContext();
+		    webAppContext.setContextPath(contextPath);
+
+		    configure(webAppContext);
+
+		    server.setHandler(webAppContext);
+
+		    // for clean shutdown, add monitor thread 
+		    
+		    // from: http://ptrthomas.wordpress.com/2009/01/24/how-to-start-and-stop-jetty-revisited/
+		    // adapted from: http://jetty.codehaus.org/jetty/jetty-6/xref/org/mortbay/start/Monitor.html
+		    Thread monitor = new MonitorThread();
+		    monitor.start();
+		    
+		    configureWebAppContext(webAppContext);
+
+		    server.start();
+
+			if(logger.isDebugEnabled())
+			{
+				logger.debug("["+new Date()+"] startJetty: ... embedded Jetty server started on port " + port);
+			}
+        }
+        catch (Exception e)
+        {
+        	logger.error("["+new Date()+"] startJetty: ... failed to start embedded Jetty server on port " + port + ", " + e);
+        }
+	}
+	
+	protected void configure(WebAppContext webAppContext)
+	{
+        try
+        {
+        	ClassLoader classLoader = BaseApplicationContextHelper.buildClassLoader(classLocations);
+            webAppContext.setClassLoader(classLoader);
+        }
+        catch (IOException e)
+        {
+            throw new ExceptionInInitializerError(e);
+        }
+        
+	    webAppContext.addEventListener(new ServletContextListener()
+		{
+	    	public void contextInitialized(ServletContextEvent sce)
+		    {
+	    		// create a Spring web application context, wrapping and providing access to
+	    		// the application context
+	    		try
+	    		{
+		    		ServletContext servletContext = sce.getServletContext();
+
+		    		// initialise web application context
+		    		WebApplicationContextLoader.getApplicationContext(servletContext, configLocations, classLocations);
+
+					if(logger.isDebugEnabled())
+					{
+						logger.debug("contextInitialized "+sce);
+					}
+	    		}
+	    		catch(Throwable t)
+	    		{
+	    			logger.error("Failed to start Jetty server: " + t);
+	    			throw new AlfrescoRuntimeException("Failed to start Jetty server", t);
+	    		}
+	    	}
+
+		    public void contextDestroyed(ServletContextEvent sce)
+		    {
+				if(logger.isDebugEnabled())
+				{
+					logger.debug("contextDestroyed "+sce);
+				}
+			}    
+		});
+	    
+	    // with a login-config in web.xml, jetty seems to require this in order to start successfully
+	    webAppContext.getSecurityHandler().setLoginService(new HashLoginService());
+
+	    // arbitrary temporary file location
+	    File tmp = new File(TempFileProvider.getSystemTempDir(), String.valueOf(System.currentTimeMillis()));
+	    webAppContext.setResourceBase(tmp.getAbsolutePath());		
+	}
+
+	public void shutdown()
+	{
+		try
+		{
+			server.stop();
+		}
+		catch(Exception e)
+		{
+			throw new AlfrescoRuntimeException("", e);
+		}
+	}
+	
+    private static class MonitorThread extends Thread 
+    {
+        private ServerSocket socket;
+        
+        public MonitorThread() 
+        {
+            setDaemon(true);
+            setName("StopMonitor");
+            try 
+            {
+                socket = new ServerSocket(JETTY_STOP_PORT, 1, InetAddress.getByName(JETTY_LOCAL_IP));
+            } 
+            catch(Exception e) 
+            {
+                throw new RuntimeException(e);
+            }
+        }
+        
+        @Override
+        public void run() 
+        {
+            Socket accept;
+            try 
+            {
+                accept = socket.accept();
+                BufferedReader reader = new BufferedReader(new InputStreamReader(accept.getInputStream()));
+                reader.readLine();
+                server.stop();
+                accept.close();
+                socket.close();
+            } 
+            catch(Exception e) 
+            {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/util/HttpRangeProcessorTest.java b/remote-api/src/test/java/org/alfresco/repo/web/util/HttpRangeProcessorTest.java
new file mode 100644
index 00000000000..ab93f69753b
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/util/HttpRangeProcessorTest.java
@@ -0,0 +1,99 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+/**
+ * Tests for the HttpRangeProcessor class.
+ * 
+ * @author Ray Gauss II
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class HttpRangeProcessorTest
+{
+    private HttpRangeProcessor httpRangeProcessor;
+    private @Mock ContentReader reader;
+    
+    @Before
+    public void setUp() throws Exception
+    {
+        httpRangeProcessor = new HttpRangeProcessor(null);
+        when(reader.getMimetype()).thenReturn("image/jpeg");
+        when(reader.getSize()).thenReturn(19133L);
+        when(reader.getContentInputStream()).thenReturn(this.getClass().getResourceAsStream("/test.jpg"));
+    }
+
+    @Test
+    public void testValidRange() throws IOException
+    {
+        testRange("700-800", HttpServletResponse.SC_PARTIAL_CONTENT);
+    }
+    
+    @Test
+    public void testStartOnlyRange() throws IOException
+    {
+        testRange("19000-", HttpServletResponse.SC_PARTIAL_CONTENT);
+    }
+    
+    @Test
+    public void testNegativeRange() throws IOException
+    {
+        testRange("800-700", HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE);
+    }
+    
+    @Test
+    public void testBeyondLengthRange() throws IOException
+    {
+        testRange("20000-", HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE);
+    }
+    
+    protected void testRange(String range, int expectedStatus) throws IOException
+    {
+        MockHttpServletResponse response = new MockHttpServletResponse();
+        
+        boolean result = httpRangeProcessor.processRange(response, reader, range, null, null, null, null);
+        
+        assertTrue(result);
+        assertEquals(expectedStatus, response.getStatus());
+        reader.getContentInputStream().close();
+    }
+    
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/util/JettyComponent.java b/remote-api/src/test/java/org/alfresco/repo/web/util/JettyComponent.java
new file mode 100644
index 00000000000..75f64c97681
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/util/JettyComponent.java
@@ -0,0 +1,36 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.util;
+
+import org.springframework.context.ConfigurableApplicationContext;
+
+public interface JettyComponent
+{
+	int getPort();
+	ConfigurableApplicationContext getApplicationContext();
+	void start();
+	void shutdown();
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/util/PagingCursorTest.java b/remote-api/src/test/java/org/alfresco/repo/web/util/PagingCursorTest.java
new file mode 100644
index 00000000000..4a592c62f12
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/util/PagingCursorTest.java
@@ -0,0 +1,342 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.util;
+
+import junit.framework.TestCase;
+
+import org.alfresco.repo.web.util.PagingCursor.Page;
+import org.alfresco.repo.web.util.PagingCursor.Rows;
+
+
+/**
+ * Test Paged and Row Based Cursors
+ * 
+ * @author davidc
+ */
+public class PagingCursorTest extends TestCase
+{
+    protected PagingCursor pageCursor;
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        pageCursor = new PagingCursor();
+    }
+
+    public void testZeroBasedBooleans()
+    {
+        assertFalse(pageCursor.isZeroBasedPage());
+        pageCursor.setZeroBasedPage(true);
+        assertTrue(pageCursor.isZeroBasedPage());
+        assertTrue(pageCursor.isZeroBasedRow());
+        pageCursor.setZeroBasedRow(false);
+        assertFalse(pageCursor.isZeroBasedRow());
+    }
+    
+    public void testZeroRowsPageCursor()
+    {
+        Page page = pageCursor.createPageCursor(0, 10, 1);
+        assertNotNull(page);
+        assertEquals(0, page.getTotalRows());
+        assertEquals(0, page.getTotalPages());
+        assertEquals(10, page.getRowsPerPage());
+        assertFalse(page.isInRange());
+        assertEquals(1, page.getCurrentPage());
+        assertEquals(-1, page.getFirstPage());
+        assertEquals(-1, page.getLastPage());
+        assertEquals(-1, page.getPreviousPage());
+        assertEquals(-1, page.getNextPage());
+        assertEquals(-1, page.getStartRow());
+        assertEquals(-1, page.getEndRow());
+    }
+
+    public void testOutOfBoundsPageCursor()
+    {
+        Page page1 = pageCursor.createPageCursor(1, 1, 1);
+        assertNotNull(page1);
+        assertTrue(page1.isInRange());
+        Page page2 = pageCursor.createPageCursor(1, 1, 2);
+        assertNotNull(page2);
+        assertFalse(page2.isInRange());
+        Page page3 = pageCursor.createPageCursor(1, 2, 1);
+        assertNotNull(page3);
+        assertTrue(page3.isInRange());
+        Page page4 = pageCursor.createPageCursor(10, 2, 5);
+        assertNotNull(page4);
+        assertTrue(page4.isInRange());
+        Page page5 = pageCursor.createPageCursor(10, 2, 6);
+        assertNotNull(page5);
+        assertFalse(page5.isInRange());
+        Page page6 = pageCursor.createPageCursor(11, 2, 5);
+        assertNotNull(page6);
+        assertTrue(page6.isInRange());
+        Page page7 = pageCursor.createPageCursor(11, 2, 6);
+        assertNotNull(page7);
+        assertTrue(page7.isInRange());
+        Page page8 = pageCursor.createPageCursor(11, 2, 0);
+        assertNotNull(page8);
+        assertFalse(page8.isInRange());
+
+        pageCursor.setZeroBasedPage(true);
+        Page page10 = pageCursor.createPageCursor(1, 1, 0);
+        assertNotNull(page10);
+        assertTrue(page10.isInRange());
+        Page page11 = pageCursor.createPageCursor(1, 1, 1);
+        assertNotNull(page11);
+        assertFalse(page11.isInRange());
+        Page page12 = pageCursor.createPageCursor(1, 2, 0);
+        assertNotNull(page12);
+        assertTrue(page12.isInRange());
+        Page page13 = pageCursor.createPageCursor(10, 2, 4);
+        assertNotNull(page13);
+        assertTrue(page13.isInRange());
+        Page page14 = pageCursor.createPageCursor(10, 2, 5);
+        assertNotNull(page14);
+        assertFalse(page14.isInRange());
+        Page page15 = pageCursor.createPageCursor(11, 2, 4);
+        assertNotNull(page15);
+        assertTrue(page15.isInRange());
+        Page page16 = pageCursor.createPageCursor(11, 2, 5);
+        assertNotNull(page16);
+        assertTrue(page16.isInRange());
+        Page page17 = pageCursor.createPageCursor(11, 2, -1);
+        assertNotNull(page17);
+        assertFalse(page17.isInRange());
+    }
+
+    public void testTotalPageCursor()
+    {
+        Page page1 = pageCursor.createPageCursor(10, 1, 1);
+        assertEquals(10, page1.getTotalRows());
+        assertEquals(10, page1.getTotalPages());
+        Page page2 = pageCursor.createPageCursor(10, 10, 1);
+        assertEquals(10, page2.getTotalRows());
+        assertEquals(1, page2.getTotalPages());
+        Page page3 = pageCursor.createPageCursor(9, 10, 1);
+        assertEquals(9, page3.getTotalRows());
+        assertEquals(1, page3.getTotalPages());
+        Page page4 = pageCursor.createPageCursor(11, 10, 1);
+        assertEquals(11, page4.getTotalRows());
+        assertEquals(2, page4.getTotalPages());
+        Page page5 = pageCursor.createPageCursor(20, 10, 1);
+        assertEquals(20, page5.getTotalRows());
+        assertEquals(2, page5.getTotalPages());
+    }
+
+    public void testPagingPageCursor()
+    {
+        Page page1 = pageCursor.createPageCursor(10, 1, 1);
+        assertEquals(1, page1.getCurrentPage());
+        assertEquals(1, page1.getFirstPage());
+        assertEquals(10, page1.getLastPage());
+        assertEquals(-1, page1.getPreviousPage());
+        assertEquals(2, page1.getNextPage());
+        assertEquals(0, page1.getStartRow());
+        assertEquals(0, page1.getEndRow());
+        Page page2 = pageCursor.createPageCursor(10, 1, 2);
+        assertEquals(2, page2.getCurrentPage());
+        assertEquals(1, page2.getFirstPage());
+        assertEquals(10, page2.getLastPage());
+        assertEquals(1, page2.getPreviousPage());
+        assertEquals(3, page2.getNextPage());
+        assertEquals(1, page2.getStartRow());
+        assertEquals(1, page2.getEndRow());
+        Page page3 = pageCursor.createPageCursor(10, 10, 1);
+        assertEquals(1, page3.getCurrentPage());
+        assertEquals(1, page3.getFirstPage());
+        assertEquals(1, page3.getLastPage());
+        assertEquals(-1, page3.getPreviousPage());
+        assertEquals(-1, page3.getNextPage());
+        assertEquals(0, page3.getStartRow());
+        assertEquals(9, page3.getEndRow());
+        Page page4 = pageCursor.createPageCursor(9, 10, 1);
+        assertEquals(1, page4.getCurrentPage());
+        assertEquals(1, page4.getFirstPage());
+        assertEquals(1, page4.getLastPage());
+        assertEquals(-1, page4.getPreviousPage());
+        assertEquals(-1, page4.getNextPage());
+        assertEquals(0, page4.getStartRow());
+        assertEquals(8, page4.getEndRow());
+        Page page5 = pageCursor.createPageCursor(11, 10, 1);
+        assertEquals(1, page5.getCurrentPage());
+        assertEquals(1, page5.getFirstPage());
+        assertEquals(2, page5.getLastPage());
+        assertEquals(-1, page5.getPreviousPage());
+        assertEquals(2, page5.getNextPage());
+        assertEquals(0, page5.getStartRow());
+        assertEquals(9, page5.getEndRow());
+        Page page6 = pageCursor.createPageCursor(20, 10, 1);
+        assertEquals(1, page6.getCurrentPage());
+        assertEquals(1, page6.getFirstPage());
+        assertEquals(2, page6.getLastPage());
+        assertEquals(-1, page6.getPreviousPage());
+        assertEquals(2, page6.getNextPage());
+        assertEquals(0, page6.getStartRow());
+        assertEquals(9, page6.getEndRow());
+        Page page7 = pageCursor.createPageCursor(20, 10, 2);
+        assertEquals(2, page7.getCurrentPage());
+        assertEquals(1, page7.getFirstPage());
+        assertEquals(2, page7.getLastPage());
+        assertEquals(1, page7.getPreviousPage());
+        assertEquals(-1, page7.getNextPage());
+        assertEquals(10, page7.getStartRow());
+        assertEquals(19, page7.getEndRow());
+        Page page8 = pageCursor.createPageCursor(11, 10, 2);
+        assertEquals(2, page8.getCurrentPage());
+        assertEquals(1, page8.getFirstPage());
+        assertEquals(2, page8.getLastPage());
+        assertEquals(1, page8.getPreviousPage());
+        assertEquals(-1, page8.getNextPage());
+        assertEquals(10, page8.getStartRow());
+        assertEquals(10, page8.getEndRow());
+    }
+
+    public void testUnlimitedPageCursor()
+    {
+        Page page1 = pageCursor.createPageCursor(100, 0, 1);
+        assertTrue(page1.isInRange());
+        assertEquals(1, page1.getCurrentPage());
+        assertEquals(1, page1.getFirstPage());
+        assertEquals(1, page1.getLastPage());
+        assertEquals(-1, page1.getPreviousPage());
+        assertEquals(-1, page1.getNextPage());
+        assertEquals(0, page1.getStartRow());
+        assertEquals(99, page1.getEndRow());
+        Page page2 = pageCursor.createPageCursor(100, 0, 2);
+        assertFalse(page2.isInRange());
+    }
+
+    public void testScrollPageCursor()
+    {
+        int count = 0;
+        long[] coll = new long[100];
+
+        Page page = pageCursor.createPageCursor(100, 10, 1);
+        while (page.isInRange())
+        {
+           for (long i = page.getStartRow(); i <= page.getEndRow(); i++)
+           {
+              coll[(int)i] = i;
+              count++;
+           }
+           page = pageCursor.createPageCursor(100, 10, page.getNextPage());
+        }
+        
+        assertEquals(100, count);
+        for (int test = 0; test < count; test++)
+        {
+            assertEquals(test, coll[test]);
+        }
+    }
+    
+    public void testZeroRowsIndexCursor()
+    {
+        Rows rows = pageCursor.createRowsCursor(0, 10, 0);
+        assertNotNull(rows);
+        assertEquals(0, rows.getTotalRows());
+        assertFalse(rows.isInRange());
+        assertEquals(10, rows.getMaxRows());
+        assertEquals(-1, rows.getStartRow());
+        assertEquals(-1, rows.getEndRow());
+        assertEquals(-1, rows.getNextSkipRows());
+    }
+
+    public void testOutOfBoundsRowsCursor()
+    {
+        Rows rows1 = pageCursor.createRowsCursor(1, 1, 0);
+        assertNotNull(rows1);
+        assertTrue(rows1.isInRange());
+        Rows rows2 = pageCursor.createRowsCursor(1, 1, 1);
+        assertNotNull(rows2);
+        assertFalse(rows2.isInRange());
+        Rows rows3 = pageCursor.createRowsCursor(1, -1, 0);
+        assertNotNull(rows3);
+        assertTrue(rows3.isInRange());
+    }
+
+    public void testTotalRowsCursor()
+    {
+        Rows rows1 = pageCursor.createRowsCursor(10, 1, 1);
+        assertEquals(10, rows1.getTotalRows());
+    }
+
+    public void testPagingRowsCursor()
+    {
+        Rows rows1 = pageCursor.createRowsCursor(10, 1, 0);
+        assertEquals(0, rows1.getStartRow());
+        assertEquals(0, rows1.getEndRow());
+        assertEquals(1, rows1.getNextSkipRows());
+        Rows rows2 = pageCursor.createRowsCursor(10, 7, 0);
+        assertEquals(0, rows2.getStartRow());
+        assertEquals(6, rows2.getEndRow());
+        assertEquals(7, rows2.getNextSkipRows());
+        Rows rows3 = pageCursor.createRowsCursor(10, 7, 7);
+        assertEquals(7, rows3.getStartRow());
+        assertEquals(9, rows3.getEndRow());
+        assertEquals(-1, rows3.getNextSkipRows());
+        Rows rows4 = pageCursor.createRowsCursor(10, 10, 0);
+        assertEquals(0, rows4.getStartRow());
+        assertEquals(9, rows4.getEndRow());
+        assertEquals(-1, rows4.getNextSkipRows());
+        Rows rows5 = pageCursor.createRowsCursor(10, 11, 0);
+        assertEquals(0, rows5.getStartRow());
+        assertEquals(9, rows5.getEndRow());
+        assertEquals(-1, rows5.getNextSkipRows());
+    }
+
+    public void testUnlimitedRowsCursor()
+    {
+        Rows rows1 = pageCursor.createRowsCursor(100, 0, 0);
+        assertTrue(rows1.isInRange());
+        assertEquals(0, rows1.getStartRow());
+        assertEquals(99, rows1.getEndRow());
+        assertEquals(-1, rows1.getNextSkipRows());
+    }
+
+    public void testScrollRowsCursor()
+    {
+        int count = 0;
+        long[] coll = new long[100];
+
+        Rows rows = pageCursor.createRowsCursor(100, 10, 0);
+        while (rows.isInRange())
+        {
+           for (long i = rows.getStartRow(); i <= rows.getEndRow(); i++)
+           {
+              coll[(int)i] = i;
+              count++;
+           }
+           rows = pageCursor.createRowsCursor(100, 10, rows.getNextSkipRows());
+        }
+        
+        assertEquals(100, count);
+        for (int test = 0; test < count; test++)
+        {
+            assertEquals(test, coll[test]);
+        }
+    }
+    
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/web/util/paging/PagingTest.java b/remote-api/src/test/java/org/alfresco/repo/web/util/paging/PagingTest.java
new file mode 100644
index 00000000000..6c5e7cee0df
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/web/util/paging/PagingTest.java
@@ -0,0 +1,372 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.web.util.paging;
+
+import junit.framework.TestCase;
+
+
+/**
+ * Test Paged and Window Based Cursors
+ * 
+ * @author davidc
+ */
+public class PagingTest extends TestCase
+{
+    protected Paging paging;
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        paging = new Paging();
+    }
+
+    public void testZeroBasedBooleans()
+    {
+        assertFalse(paging.isZeroBasedPage());
+        paging.setZeroBasedPage(true);
+        assertTrue(paging.isZeroBasedPage());
+        assertTrue(paging.isZeroBasedRow());
+        paging.setZeroBasedRow(false);
+        assertFalse(paging.isZeroBasedRow());
+    }
+
+    public void testCreatePage()
+    {
+        Page page = paging.createPage(1, 10);
+        assertNotNull(page);
+        assertEquals(Paging.PageType.PAGE, page.getType());
+        assertFalse(page.isZeroBasedIdx());
+        assertEquals(1, page.getNumber());
+        assertEquals(10, page.getSize());
+        
+        Page window = paging.createWindow(1, 10);
+        assertNotNull(window);
+        assertEquals(Paging.PageType.WINDOW, window.getType());
+        assertTrue(window.isZeroBasedIdx());
+        assertEquals(1, window.getNumber());
+        assertEquals(10, window.getSize());
+    }
+
+    public void testZeroRowsPage()
+    {
+        Cursor cursor = paging.createCursor(0, paging.createPage(1, 10));
+        assertNotNull(cursor);
+        assertEquals(0, cursor.getTotalRows());
+        assertEquals(0, cursor.getTotalPages());
+        assertEquals(10, cursor.getPageSize());
+        assertFalse(cursor.isInRange());
+        assertEquals(1, cursor.getCurrentPage());
+        assertEquals(-1, cursor.getFirstPage());
+        assertEquals(-1, cursor.getLastPage());
+        assertEquals(-1, cursor.getPrevPage());
+        assertEquals(-1, cursor.getNextPage());
+        assertEquals(0, cursor.getStartRow());
+        assertEquals(-1, cursor.getEndRow());
+        assertEquals(0, cursor.getRowCount());
+    }
+
+    public void testOutOfBoundsPage()
+    {
+        Cursor cursor1 = paging.createCursor(1, paging.createPage(1, 1));
+        assertNotNull(cursor1);
+        assertTrue(cursor1.isInRange());
+        Cursor cursor2 = paging.createCursor(1, paging.createPage(2, 1));
+        assertNotNull(cursor2);
+        assertFalse(cursor2.isInRange());
+        Cursor cursor3 = paging.createCursor(1, paging.createPage(1, 2));
+        assertNotNull(cursor3);
+        assertTrue(cursor3.isInRange());
+        Cursor cursor4 = paging.createCursor(10, paging.createPage(5, 2));
+        assertNotNull(cursor4);
+        assertTrue(cursor4.isInRange());
+        Cursor cursor5 = paging.createCursor(10, paging.createPage(6, 2));
+        assertNotNull(cursor5);
+        assertFalse(cursor5.isInRange());
+        Cursor cursor6 = paging.createCursor(11, paging.createPage(5, 2));
+        assertNotNull(cursor6);
+        assertTrue(cursor6.isInRange());
+        Cursor cursor7 = paging.createCursor(11, paging.createPage(6, 2));
+        assertNotNull(cursor7);
+        assertTrue(cursor7.isInRange());
+        Cursor cursor8 = paging.createCursor(11, paging.createPage(0, 2));
+        assertNotNull(cursor8);
+        assertFalse(cursor8.isInRange());
+
+        paging.setZeroBasedPage(true);
+        Cursor cursor10 = paging.createCursor(1, paging.createPage(0, 1));
+        assertNotNull(cursor10);
+        assertTrue(cursor10.isInRange());
+        Cursor cursor11 = paging.createCursor(1, paging.createPage(1, 1));
+        assertNotNull(cursor11);
+        assertFalse(cursor11.isInRange());
+        Cursor cursor12 = paging.createCursor(1, paging.createPage(0, 2));
+        assertNotNull(cursor12);
+        assertTrue(cursor12.isInRange());
+        Cursor cursor13 = paging.createCursor(10, paging.createPage(4, 2));
+        assertNotNull(cursor13);
+        assertTrue(cursor13.isInRange());
+        Cursor cursor14 = paging.createCursor(10, paging.createPage(5, 2));
+        assertNotNull(cursor14);
+        assertFalse(cursor14.isInRange());
+        Cursor cursor15 = paging.createCursor(11, paging.createPage(4, 2));
+        assertNotNull(cursor15);
+        assertTrue(cursor15.isInRange());
+        Cursor cursor16 = paging.createCursor(11, paging.createPage(5, 2));
+        assertNotNull(cursor16);
+        assertTrue(cursor16.isInRange());
+        Cursor cursor17 = paging.createCursor(11, paging.createPage(-1, 2));
+        assertNotNull(cursor17);
+        assertFalse(cursor17.isInRange());
+    }
+
+    public void testTotalPage()
+    {
+        Cursor cursor1 = paging.createCursor(10, paging.createPage(1, 1));
+        assertEquals(10, cursor1.getTotalRows());
+        assertEquals(10, cursor1.getTotalPages());
+        Cursor cursor2 = paging.createCursor(10, paging.createPage(1, 10));
+        assertEquals(10, cursor2.getTotalRows());
+        assertEquals(1, cursor2.getTotalPages());
+        Cursor cursor3 = paging.createCursor(9, paging.createPage(1, 10));
+        assertEquals(9, cursor3.getTotalRows());
+        assertEquals(1, cursor3.getTotalPages());
+        Cursor cursor4 = paging.createCursor(11, paging.createPage(1, 10));
+        assertEquals(11, cursor4.getTotalRows());
+        assertEquals(2, cursor4.getTotalPages());
+        Cursor cursor5 = paging.createCursor(20, paging.createPage(1, 10));
+        assertEquals(20, cursor5.getTotalRows());
+        assertEquals(2, cursor5.getTotalPages());
+    }
+
+    public void testCursorPage()
+    {
+        Cursor cursor1 = paging.createCursor(10, paging.createPage(1, 1));
+        assertEquals(1, cursor1.getCurrentPage());
+        assertEquals(1, cursor1.getFirstPage());
+        assertEquals(10, cursor1.getLastPage());
+        assertEquals(-1, cursor1.getPrevPage());
+        assertEquals(2, cursor1.getNextPage());
+        assertEquals(0, cursor1.getStartRow());
+        assertEquals(0, cursor1.getEndRow());
+        assertEquals(1, cursor1.getRowCount());
+        Cursor cursor2 = paging.createCursor(10, paging.createPage(2, 1));
+        assertEquals(2, cursor2.getCurrentPage());
+        assertEquals(1, cursor2.getFirstPage());
+        assertEquals(10, cursor2.getLastPage());
+        assertEquals(1, cursor2.getPrevPage());
+        assertEquals(3, cursor2.getNextPage());
+        assertEquals(1, cursor2.getStartRow());
+        assertEquals(1, cursor2.getEndRow());
+        assertEquals(1, cursor2.getRowCount());
+        Cursor cursor3 = paging.createCursor(10, paging.createPage(1, 10));
+        assertEquals(1, cursor3.getCurrentPage());
+        assertEquals(1, cursor3.getFirstPage());
+        assertEquals(1, cursor3.getLastPage());
+        assertEquals(-1, cursor3.getPrevPage());
+        assertEquals(-1, cursor3.getNextPage());
+        assertEquals(0, cursor3.getStartRow());
+        assertEquals(9, cursor3.getEndRow());
+        assertEquals(10, cursor3.getRowCount());
+        Cursor cursor4 = paging.createCursor(9, paging.createPage(1, 10));
+        assertEquals(1, cursor4.getCurrentPage());
+        assertEquals(1, cursor4.getFirstPage());
+        assertEquals(1, cursor4.getLastPage());
+        assertEquals(-1, cursor4.getPrevPage());
+        assertEquals(-1, cursor4.getNextPage());
+        assertEquals(0, cursor4.getStartRow());
+        assertEquals(8, cursor4.getEndRow());
+        assertEquals(9, cursor4.getRowCount());
+        Cursor cursor5 = paging.createCursor(11, paging.createPage(1, 10));
+        assertEquals(1, cursor5.getCurrentPage());
+        assertEquals(1, cursor5.getFirstPage());
+        assertEquals(2, cursor5.getLastPage());
+        assertEquals(-1, cursor5.getPrevPage());
+        assertEquals(2, cursor5.getNextPage());
+        assertEquals(0, cursor5.getStartRow());
+        assertEquals(9, cursor5.getEndRow());
+        assertEquals(10, cursor5.getRowCount());
+        Cursor cursor6 = paging.createCursor(20, paging.createPage(1, 10));
+        assertEquals(1, cursor6.getCurrentPage());
+        assertEquals(1, cursor6.getFirstPage());
+        assertEquals(2, cursor6.getLastPage());
+        assertEquals(-1, cursor6.getPrevPage());
+        assertEquals(2, cursor6.getNextPage());
+        assertEquals(0, cursor6.getStartRow());
+        assertEquals(9, cursor6.getEndRow());
+        assertEquals(10, cursor6.getRowCount());
+        Cursor cursor7 = paging.createCursor(20, paging.createPage(2, 10));
+        assertEquals(2, cursor7.getCurrentPage());
+        assertEquals(1, cursor7.getFirstPage());
+        assertEquals(2, cursor7.getLastPage());
+        assertEquals(1, cursor7.getPrevPage());
+        assertEquals(-1, cursor7.getNextPage());
+        assertEquals(10, cursor7.getStartRow());
+        assertEquals(19, cursor7.getEndRow());
+        assertEquals(10, cursor7.getRowCount());
+        Cursor cursor8 = paging.createCursor(11, paging.createPage(2, 10));
+        assertEquals(2, cursor8.getCurrentPage());
+        assertEquals(1, cursor8.getFirstPage());
+        assertEquals(2, cursor8.getLastPage());
+        assertEquals(1, cursor8.getPrevPage());
+        assertEquals(-1, cursor8.getNextPage());
+        assertEquals(10, cursor8.getStartRow());
+        assertEquals(10, cursor8.getEndRow());
+        assertEquals(1, cursor8.getRowCount());
+    }
+
+    public void testUnlimitedPage()
+    {
+        Cursor cursor1 = paging.createCursor(100, paging.createPage(1, -1));
+        assertTrue(cursor1.isInRange());
+        assertEquals(1, cursor1.getCurrentPage());
+        assertEquals(1, cursor1.getFirstPage());
+        assertEquals(1, cursor1.getLastPage());
+        assertEquals(-1, cursor1.getPrevPage());
+        assertEquals(-1, cursor1.getNextPage());
+        assertEquals(0, cursor1.getStartRow());
+        assertEquals(99, cursor1.getEndRow());
+        Cursor cursor2 = paging.createCursor(100, paging.createPage(2, -1));
+        assertFalse(cursor2.isInRange());
+    }
+
+    public void testScrollPage()
+    {
+        int count = 0;
+        long[] coll = new long[100];
+
+        Cursor cursor = paging.createCursor(coll.length, paging.createPage(1, 10));
+        while (cursor.isInRange())
+        {
+           for (long i = cursor.getStartRow(); i <= cursor.getEndRow(); i++)
+           {
+              coll[(int)i] = i;
+              count++;
+           }
+           cursor = paging.createCursor(coll.length, paging.createPage(cursor.getNextPage(), cursor.getPageSize()));
+        }
+        
+        assertEquals(100, count);
+        for (int test = 0; test < count; test++)
+        {
+            assertEquals(test, coll[test]);
+        }
+    }
+
+    public void testZeroRowsWindow()
+    {
+        Cursor rows = paging.createCursor(0, paging.createWindow(0, 10));
+        assertNotNull(rows);
+        assertEquals(0, rows.getTotalRows());
+        assertFalse(rows.isInRange());
+        assertEquals(10, rows.getPageSize());
+        assertEquals(0, rows.getStartRow());
+        assertEquals(-1, rows.getEndRow());
+        assertEquals(0, rows.getRowCount());
+        assertEquals(-1, rows.getNextPage());
+    }
+
+    public void testOutOfBoundsWindow()
+    {
+        Cursor cursor1 = paging.createCursor(1, paging.createWindow(0, 1));
+        assertNotNull(cursor1);
+        assertTrue(cursor1.isInRange());
+        Cursor cursor2 = paging.createCursor(1, paging.createWindow(1, 1));
+        assertNotNull(cursor2);
+        assertFalse(cursor2.isInRange());
+        Cursor cursor3 = paging.createCursor(1, paging.createWindow(0, -1));
+        assertNotNull(cursor3);
+        assertTrue(cursor3.isInRange());
+    }
+
+    public void testTotalWindow()
+    {
+        Cursor cursor1 = paging.createCursor(10, paging.createWindow(1, 1));
+        assertEquals(10, cursor1.getTotalRows());
+    }
+
+    public void testCursorWindow()
+    {
+        Cursor cursor1 = paging.createCursor(10, paging.createWindow(0, 1));
+        assertEquals(0, cursor1.getStartRow());
+        assertEquals(0, cursor1.getEndRow());
+        assertEquals(1, cursor1.getRowCount());
+        assertEquals(1, cursor1.getNextPage());
+        Cursor cursor2 = paging.createCursor(10, paging.createWindow(0, 7));
+        assertEquals(0, cursor2.getStartRow());
+        assertEquals(6, cursor2.getEndRow());
+        assertEquals(7, cursor2.getRowCount());
+        assertEquals(7, cursor2.getNextPage());
+        Cursor cursor3 = paging.createCursor(10, paging.createWindow(7, 7));
+        assertEquals(7, cursor3.getStartRow());
+        assertEquals(9, cursor3.getEndRow());
+        assertEquals(3, cursor3.getRowCount());
+        assertEquals(-1, cursor3.getNextPage());
+        Cursor cursor4 = paging.createCursor(10, paging.createWindow(0, 10));
+        assertEquals(0, cursor4.getStartRow());
+        assertEquals(9, cursor4.getEndRow());
+        assertEquals(10, cursor4.getRowCount());
+        assertEquals(-1, cursor4.getNextPage());
+        Cursor cursor5 = paging.createCursor(10, paging.createWindow(0, 11));
+        assertEquals(0, cursor5.getStartRow());
+        assertEquals(9, cursor5.getEndRow());
+        assertEquals(10, cursor5.getRowCount());
+        assertEquals(-1, cursor5.getNextPage());
+    }
+
+    public void testUnlimitedWindow()
+    {
+        Cursor cursor1 = paging.createCursor(100, paging.createWindow(0, -1));
+        assertTrue(cursor1.isInRange());
+        assertEquals(0, cursor1.getStartRow());
+        assertEquals(99, cursor1.getEndRow());
+        assertEquals(100, cursor1.getRowCount());
+        assertEquals(-1, cursor1.getNextPage());
+    }
+
+    public void testScrollWindow()
+    {
+        int count = 0;
+        long[] coll = new long[100];
+
+        Cursor cursor = paging.createCursor(coll.length, paging.createWindow(0, 10));
+        while (cursor.isInRange())
+        {
+           for (long i = cursor.getStartRow(); i <= cursor.getEndRow(); i++)
+           {
+              coll[(int)i] = i;
+              count++;
+           }
+           cursor = paging.createCursor(coll.length, paging.createWindow(cursor.getNextPage(), cursor.getPageSize()));
+        }
+        
+        assertEquals(100, count);
+        for (int test = 0; test < count; test++)
+        {
+            assertEquals(test, coll[test]);
+        }
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/DeleteMethodTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/DeleteMethodTest.java
new file mode 100644
index 00000000000..469146b2a43
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/webdav/DeleteMethodTest.java
@@ -0,0 +1,220 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.transaction.Status;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.GUID;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.springframework.context.ApplicationContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+/** 
+ * 
+ * Class for webdav delete method unit tests
+ * 
+ * @author jcule
+ *
+ */
+@Category(LuceneTests.class)
+public class DeleteMethodTest
+{
+    //protected static Log logger = LogFactory.getLog("org.alfresco.webdav.protocol");
+    
+    private static ApplicationContext ctx;
+    
+    private MockHttpServletRequest request;
+    private MockHttpServletResponse response;
+    private DeleteMethod method;
+    private UserTransaction txn = null;
+    
+    private SearchService searchService;
+    private TransactionService transactionService;
+    private NodeService nodeService;
+    private ContentService contentService;
+    private WebDAVHelper webDAVHelper;
+    
+    private Repository repositoryHelper;
+    private NodeRef companyHomeNodeRef;
+    private NodeRef versionableDoc;
+    private String versionableDocName;
+    private StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
+
+
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception
+    {
+        ctx = ApplicationContextHelper.getApplicationContext(new String[]
+            {
+                "classpath:alfresco/application-context.xml",
+                "classpath:alfresco/web-scripts-application-context.xml",
+                "classpath:alfresco/remote-api-context.xml"
+            });
+    }
+
+    @Before
+    public void setUp() throws Exception
+    {
+        transactionService = ctx.getBean("transactionService", TransactionService.class);
+        searchService = ctx.getBean("SearchService", SearchService.class);
+        nodeService = ctx.getBean("NodeService", NodeService.class);
+        contentService = ctx.getBean("contentService", ContentService.class);
+        webDAVHelper = ctx.getBean("webDAVHelper", WebDAVHelper.class);         
+        repositoryHelper = (Repository)ctx.getBean("repositoryHelper");
+        companyHomeNodeRef = repositoryHelper.getCompanyHome();
+    }
+    
+    @After
+    public void tearDown() throws Exception
+    {
+        method = null;
+        request = null;
+        response = null;
+
+        if (txn.getStatus() == Status.STATUS_MARKED_ROLLBACK)
+        {
+            txn.rollback();
+        }
+        else
+        {
+            txn.commit();
+        }
+        
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+ 
+        nodeService.deleteNode(versionableDoc);
+
+        // As per MNT-10037 try to create a node and delete it in the next txn
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+
+        Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
+        String nodeName = "leak-session-doc-" + GUID.generate();
+        properties.put(ContentModel.PROP_NAME, nodeName);
+
+        NodeRef nodeRef = nodeService.createNode(companyHomeNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName(ContentModel.USER_MODEL_URI, nodeName),
+                ContentModel.TYPE_CONTENT, properties).getChildRef();
+        contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true).putContent("WebDAVTestContent");
+
+        txn.commit();
+
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+
+        nodeService.deleteNode(nodeRef);
+
+        txn.commit();
+
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+
+    /**
+     * Checks that file with the versionable aspect applied can be deleted   
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testDeleteFileWithVersionableAspect() throws Exception
+    {
+        //create file
+        createFileWithVersionableAscpect();
+
+        //delete file 
+        method = new DeleteMethod();
+        request = new MockHttpServletRequest(WebDAV.METHOD_DELETE, "/alfresco/webdav/" + versionableDocName);
+        response = new MockHttpServletResponse();
+        request.setServerPort(8080);
+        request.setServletPath("/webdav");
+        method.setDetails(request, response, webDAVHelper, companyHomeNodeRef);
+        method.execute(); 
+       
+        //check the response
+        assertEquals(HttpServletResponse.SC_OK, response.getStatus());
+
+    }
+    
+    /**
+     * Create file with versionable aspect
+     * 
+     * @throws Exception
+     */
+    private void createFileWithVersionableAscpect() throws Exception
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+         txn = transactionService.getUserTransaction();
+         txn.begin();
+         
+         // Create a test file with versionable aspect and content
+         Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
+         versionableDocName = "doc-" + GUID.generate();
+         properties.put(ContentModel.PROP_NAME, versionableDocName);
+
+         versionableDoc = nodeService.createNode(companyHomeNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName(ContentModel.USER_MODEL_URI, versionableDocName),
+         ContentModel.TYPE_CONTENT, properties).getChildRef();
+         contentService.getWriter(versionableDoc, ContentModel.PROP_CONTENT, true).putContent("WebDAVTestContent");
+         nodeService.addAspect(versionableDoc, ContentModel.ASPECT_VERSIONABLE, null);
+
+         txn.commit();
+
+         txn = transactionService.getUserTransaction();
+         txn.begin();
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/GetMethodRegressionTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/GetMethodRegressionTest.java
new file mode 100644
index 00000000000..51d62d0f07b
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/webdav/GetMethodRegressionTest.java
@@ -0,0 +1,307 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import java.io.Serializable;
+import java.net.HttpURLConnection;
+import java.util.Map;
+
+import javax.transaction.Status;
+import javax.transaction.UserTransaction;
+
+import junit.framework.TestCase;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.audit.model.AuditModelRegistryImpl;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.nodelocator.CompanyHomeNodeLocator;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.audit.AuditQueryParameters;
+import org.alfresco.service.cmr.audit.AuditService;
+import org.alfresco.service.cmr.audit.AuditService.AuditQueryCallback;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.apache.chemistry.opencmis.commons.spi.Holder;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.context.ApplicationContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+/**
+ * Tests {@link GetMethod} in real environment, using {@link Mock} HTTP request and {@link Mock} HTTP response
+ * 
+ * @author Dmitry Velichkevich
+ */
+@RunWith(MockitoJUnitRunner.class)
+@Category(LuceneTests.class)
+public class GetMethodRegressionTest extends TestCase
+{
+    private static final int DOCUMENTS_AMOUNT_FOR_GET_METHOD_TEST = 25;
+
+
+    private static final String HTTP_METHOD_GET = "GET";
+
+    private static final String TEST_ENCODING = "UTF-8";
+
+    private static final String TEST_MIMETYPE = "text/plain";
+
+    private static final String TEST_WEBDAV_URL_PREFIX = "/";
+
+    private static final String AUDIT_REGISTRY_BEAN_NAME = "Audit";
+
+    private static final String PROP_AUDIT_ALFRESCO_ACCESS_ENABLED = "audit.alfresco-access.enabled";
+
+    private static final String ROOT_TEST_FOLDER_NAME = "TestFolder-" + System.currentTimeMillis();
+
+    private static final String TEST_DOCUMENT_NAME_PATTERN = "TestDocument-%d-%d.pdf";
+
+    private static final String TEXT_DOCUMENT_CONTENT_PATTERN = "Text content for '%s' document";
+
+
+    private ApplicationContext applicationContext;
+
+    private WebDAVHelper davHelper;
+
+    private AuditService auditService;
+
+    private FileFolderService fileFolderService;
+
+    private AuditModelRegistryImpl auditRegistry;
+
+    private TransactionService transactionService;
+
+
+    private UserTransaction transaction;
+
+    private GetMethod testingMethod;
+
+    private NodeRef companyHomeNodeRef;
+
+    private NodeRef rootTestFolder;
+
+    private MockHttpServletResponse mockResponse;
+
+
+    @Before
+    public void setUp() throws Exception
+    {
+        applicationContext = ApplicationContextHelper.getApplicationContext();
+        ServiceRegistry registry = (ServiceRegistry) applicationContext.getBean(ServiceRegistry.SERVICE_REGISTRY);
+        davHelper = (WebDAVHelper) applicationContext.getBean(WebDAVHelper.BEAN_NAME);
+        auditRegistry = (AuditModelRegistryImpl) applicationContext.getBean(AUDIT_REGISTRY_BEAN_NAME);
+
+        auditService = registry.getAuditService();
+        fileFolderService = registry.getFileFolderService();
+        transactionService = registry.getTransactionService();
+
+        testingMethod = new GetMethod();
+        mockResponse = new MockHttpServletResponse();
+
+        restartTransaction(TransactionActionEnum.ACTION_NONE);
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+        companyHomeNodeRef = registry.getNodeLocatorService().getNode(CompanyHomeNodeLocator.NAME, null, null);
+        rootTestFolder = fileFolderService.create(companyHomeNodeRef, ROOT_TEST_FOLDER_NAME, ContentModel.TYPE_FOLDER).getNodeRef();
+    }
+
+    @After
+    public void tearDown() throws Exception
+    {
+        if ((null != transaction) && (Status.STATUS_ROLLEDBACK != transaction.getStatus()) && (Status.STATUS_COMMITTED != transaction.getStatus()))
+        {
+            transaction.rollback();
+        }
+
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+
+    /**
+     * Test for <a href="https://issues.alfresco.com/jira/browse/MNT-10820">MNT-10820</a>
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testAuditRecordsAdditionAsbsence() throws Exception
+    {
+        String url = new StringBuilder(TEST_WEBDAV_URL_PREFIX).append(ROOT_TEST_FOLDER_NAME).toString();
+        MockHttpServletRequest mockRequest = new MockHttpServletRequest(HTTP_METHOD_GET, url);
+        testingMethod.setDetails(mockRequest, mockResponse, davHelper, companyHomeNodeRef);
+
+        boolean auditEnabled = auditService.isAuditEnabled();
+
+        if (!auditEnabled)
+        {
+            auditService.setAuditEnabled(true);
+        }
+
+        boolean alfrescoAccessEnabled = Boolean.valueOf(auditRegistry.getProperty(PROP_AUDIT_ALFRESCO_ACCESS_ENABLED));
+
+        if (!alfrescoAccessEnabled)
+        {
+            setAuditRegistryProperty(PROP_AUDIT_ALFRESCO_ACCESS_ENABLED, Boolean.TRUE.toString());
+        }
+
+        try
+        {
+            createTestContent(rootTestFolder, DOCUMENTS_AMOUNT_FOR_GET_METHOD_TEST);
+
+            restartTransaction(TransactionActionEnum.ACTION_COMMIT);
+
+            Long expectedLastTime = getLastAuditRecordTime();
+
+            testingMethod.executeImpl();
+            assertEquals(HttpURLConnection.HTTP_OK, mockResponse.getStatus());
+
+            String contentAsString = mockResponse.getContentAsString();
+            assertNotNull("WebDAV 'GET' method response is empty!", contentAsString);
+            assertTrue(contentAsString.contains(ROOT_TEST_FOLDER_NAME));
+
+            restartTransaction(TransactionActionEnum.ACTION_COMMIT);
+
+            Long actualLastTime = getLastAuditRecordTime();
+
+            if (null == expectedLastTime)
+            {
+                assertNull("Audit entry table is not empty after 'GetMethod.executeImpl()' invocation. But it is expected to be empty!", actualLastTime);
+            }
+            else
+            {
+                assertEquals(expectedLastTime, actualLastTime);
+            }
+        }
+        finally
+        {
+            if (!alfrescoAccessEnabled)
+            {
+                setAuditRegistryProperty(PROP_AUDIT_ALFRESCO_ACCESS_ENABLED, Boolean.FALSE.toString());
+            }
+
+            if (!auditEnabled)
+            {
+                auditService.setAuditEnabled(false);
+            }
+        }
+    }
+
+    private void setAuditRegistryProperty(String propertyName, String value)
+    {
+        assertTrue(("'" + propertyName + "' is not updatable!"), auditRegistry.isUpdateable(propertyName));
+
+        auditRegistry.stop();
+        auditRegistry.setProperty(propertyName, value);
+        auditRegistry.start();
+    }
+
+    private void createTestContent(NodeRef parentNode, int documentsAmount)
+    {
+        for (int i = 0; i < documentsAmount; i++)
+        {
+            String testDocumentName = String.format(TEST_DOCUMENT_NAME_PATTERN, i, System.currentTimeMillis());
+            FileInfo testDocument = fileFolderService.create(parentNode, testDocumentName, ContentModel.TYPE_CONTENT);
+            ContentWriter writer = fileFolderService.getWriter(testDocument.getNodeRef());
+            writer.putContent(String.format(TEXT_DOCUMENT_CONTENT_PATTERN, testDocumentName));
+            writer.setMimetype(TEST_MIMETYPE);
+            writer.setEncoding(TEST_ENCODING);
+        }
+    }
+
+    private enum TransactionActionEnum
+    {
+        ACTION_NONE,
+
+        ACTION_COMMIT,
+
+        ACTION_ROLLBACK
+    }
+
+    /**
+     * Commits or rolls back or does nothing with the current transaction and begins a new {@link UserTransaction}
+     * 
+     * @param transactionAction - one of the {@link TransactionActionEnum} values which specifies action to be done for the current transaction
+     * @throws Exception
+     */
+    private void restartTransaction(TransactionActionEnum transactionAction) throws Exception
+    {
+        if ((null != transaction) && (Status.STATUS_ROLLEDBACK != transaction.getStatus()) && (Status.STATUS_COMMITTED != transaction.getStatus()))
+        {
+            if (TransactionActionEnum.ACTION_COMMIT == transactionAction)
+            {
+                transaction.commit();
+            }
+            else if (TransactionActionEnum.ACTION_ROLLBACK == transactionAction)
+            {
+                transaction.rollback();
+            }
+        }
+
+        transaction = transactionService.getUserTransaction();
+        transaction.begin();
+    }
+
+    private Long getLastAuditRecordTime()
+    {
+        final Holder<Long> lastTime = new Holder<Long>();
+
+        AuditQueryParameters parameters = new AuditQueryParameters();
+        parameters.setForward(false);
+
+        auditService.auditQuery(new AuditQueryCallback()
+        {
+            @Override
+            public boolean valuesRequired()
+            {
+                return false;
+            }
+
+            @Override
+            public boolean handleAuditEntryError(Long entryId, String errorMsg, Throwable error)
+            {
+                return false;
+            }
+
+            @Override
+            public boolean handleAuditEntry(Long entryId, String applicationName, String user, long time, Map<String, Serializable> values)
+            {
+                lastTime.setValue(time);
+                return false;
+            }
+        }, parameters, 1);
+
+        return lastTime.getValue();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/GetMethodTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/GetMethodTest.java
new file mode 100644
index 00000000000..223154e44cf
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/webdav/GetMethodTest.java
@@ -0,0 +1,256 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.same;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.SocketException;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.ContentIOException;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.apache.commons.logging.Log;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.mock.web.MockHttpServletRequest;
+
+/**
+ * Unit tests for the {@link GetMethod} class.
+ *  
+ * @author Matt Ward
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class GetMethodTest
+{
+    private GetMethod getMethod;
+    private MockHttpServletRequest req;
+    private @Mock HttpServletResponse resp;
+    private @Mock WebDAVHelper davHelper;
+    private NodeRef rootNode;
+    private @Mock ContentReader reader;
+    private @Mock FileInfo fileInfo;
+    private @Mock Log logger;
+    private @Mock ServiceRegistry serviceRegistry;
+    private @Mock ContentService contentService;
+    
+    @Before
+    public void setUp() throws Exception
+    {
+        getMethod = new GetMethod();
+        req = new MockHttpServletRequest();
+        rootNode = new NodeRef("workspace://SpacesStore/node-id");
+        getMethod.setDetails(req, resp, davHelper, rootNode);
+        getMethod.logger = logger;
+        
+        when(reader.getMimetype()).thenReturn("text/plain");
+        when(logger.isErrorEnabled()).thenReturn(true);
+        when(logger.isDebugEnabled()).thenReturn(true);
+    }
+
+    
+    @Test
+    public void readByteRangeContentDoesNotLogSocketExceptions() throws IOException, WebDAVServerException
+    {
+        // getContentService() during range request
+        when(davHelper.getServiceRegistry()).thenReturn(serviceRegistry);
+        when(serviceRegistry.getContentService()).thenReturn(contentService);
+        
+        req.addHeader("Range", "bytes=500-1500");
+        getMethod.parseRequestHeaders();
+        SocketException sockEx = new SocketException("Client aborted connection");
+        IOException ioEx = new IOException("Wrapping the socket exception.", sockEx);
+        
+        // Somewhere along the line a client disconnect will happen (IOException)
+        when(resp.getOutputStream()).thenThrow(ioEx);
+        
+        try
+        {
+            getMethod.readContent(fileInfo, reader);
+            fail("Exception should have been thrown.");
+        }
+        catch(WebDAVServerException e)
+        {
+            verify(logger, never()).error(anyString(), same(ioEx));
+            verify(logger).debug(anyString(), same(ioEx));
+            assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getHttpStatusCode());
+            assertNull(e.getCause()); // Avoids logging stacking trace
+        }
+    }
+    
+    @Test
+    public void readByteRangeContentLogsLegitimateExceptions() throws IOException, WebDAVServerException
+    {
+        // getContentService() during range request
+        when(davHelper.getServiceRegistry()).thenReturn(serviceRegistry);
+        when(serviceRegistry.getContentService()).thenReturn(contentService);
+        
+        req.addHeader("Range", "bytes=500-1500");
+        getMethod.parseRequestHeaders();
+        RuntimeException rEx = new RuntimeException("Some sort of proper error");
+        IOException ioEx = new IOException("Wrapping the exception.", rEx);
+        
+        // Somewhere along the line a client disconnect will happen (IOException)
+        when(resp.getOutputStream()).thenThrow(ioEx);
+        
+        try
+        {
+            getMethod.readContent(fileInfo, reader);
+            fail("Exception should have been thrown.");
+        }
+        catch(WebDAVServerException e)
+        {
+            verify(logger).error(anyString(), same(ioEx));
+            verify(logger, never()).debug(anyString(), same(ioEx));
+            assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getHttpStatusCode());
+            assertNull(e.getCause()); // Avoids logging stacking trace elsewhere
+        }
+    }
+    
+    @Test
+    public void readContentDoesNotLogSocketExceptions() throws IOException, WebDAVServerException
+    {
+        SocketException sockEx = new SocketException("Client aborted connection");
+        ContentIOException contentEx = new ContentIOException("Wrapping the socket exception.", sockEx);
+        
+        // Reader.getContent() will throw a ContentIOException when a client aborts.
+        doThrow(contentEx).when(reader).getContent(nullable(OutputStream.class));
+        
+        try
+        {
+            getMethod.readContent(fileInfo, reader);
+            fail("Exception should have been thrown.");
+        }
+        catch(WebDAVServerException e)
+        {
+            verify(logger, never()).error(anyString(), same(contentEx));
+            // Error will only be seen when debugging.
+            verify(logger).debug(anyString(), same(contentEx));
+            assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getHttpStatusCode());
+            assertNull(e.getCause()); // Avoids logging stacking trace
+        }
+    }
+    
+    @Test
+    public void readContentLogsLegitimateExceptions() throws IOException, WebDAVServerException
+    {
+        RuntimeException rEx = new RuntimeException("Some sort of proper error");
+        ContentIOException contentEx = new ContentIOException("Wrapping the exception.", rEx);
+        
+        doThrow(contentEx).when(reader).getContent(nullable(OutputStream.class));
+        
+        try
+        {
+            getMethod.readContent(fileInfo, reader);
+            fail("Exception should have been thrown.");
+        }
+        catch(WebDAVServerException e)
+        {
+            verify(logger).error(anyString(), same(contentEx));
+            verify(logger, never()).debug(anyString(), same(contentEx));
+            assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getHttpStatusCode());
+            assertNull(e.getCause()); // Avoids logging stacking trace
+        }
+    }
+
+    @Test
+    public void readByteRangeContentDoesNotLogClientAbortException() throws IOException, WebDAVServerException
+    {
+        // getContentService() during range request
+        when(davHelper.getServiceRegistry()).thenReturn(serviceRegistry);
+        when(serviceRegistry.getContentService()).thenReturn(contentService);
+
+        req.addHeader("Range", "bytes=500-1500");
+        getMethod.parseRequestHeaders();
+        IOException caEx = new ClientAbortException();
+        IOException ioEx = new IOException("Wrapping the socket exception.", caEx);
+
+        // Somewhere along the line a client disconnect will happen (IOException)
+        when(resp.getOutputStream()).thenThrow(ioEx);
+
+        try
+        {
+            getMethod.readContent(fileInfo, reader);
+            fail("Exception should have been thrown.");
+        }
+        catch(WebDAVServerException e)
+        {
+            verify(logger, never()).error(anyString(), same(ioEx));
+            verify(logger).debug(anyString(), same(ioEx));
+            assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getHttpStatusCode());
+            assertNull(e.getCause()); // Avoids logging stacking trace
+        }
+    }
+
+    @Test
+    public void readContentDoesNotLogClientAbortException() throws IOException, WebDAVServerException
+    {
+        IOException caEx = new ClientAbortException();
+        ContentIOException contentEx = new ContentIOException("Wrapping the socket exception.", caEx);
+
+        // Reader.getContent() will throw a ContentIOException when a client aborts.
+        doThrow(contentEx).when(reader).getContent(nullable(OutputStream.class));
+
+        try
+        {
+            getMethod.readContent(fileInfo, reader);
+            fail("Exception should have been thrown.");
+        }
+        catch(WebDAVServerException e)
+        {
+            verify(logger, never()).error(anyString(), same(contentEx));
+            // Error will only be seen when debugging.
+            verify(logger).debug(anyString(), same(contentEx));
+            assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getHttpStatusCode());
+            assertNull(e.getCause()); // Avoids logging stacking trace
+        }
+    }
+
+    // Fake ClientAbortException class - to emulate Tomcat's and JBOSS's ClientAbortException.
+    private static class ClientAbortException extends IOException
+    {
+
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/LockInfoImplTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/LockInfoImplTest.java
new file mode 100644
index 00000000000..04444f65c50
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/webdav/LockInfoImplTest.java
@@ -0,0 +1,227 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.junit.Test;
+
+
+public class LockInfoImplTest
+{
+    @Test
+    public void canSetTimeoutSeconds()
+    {
+        LockInfoImplEx lockInfo = new LockInfoImplEx();
+        
+        // This should add 7 seconds (7000 millis) to the expiry date.
+        lockInfo.setTimeoutSeconds(7);
+        
+        // Check the new date.
+        assertEquals(86407000, lockInfo.getExpires().getTime());
+    }
+    
+    @Test
+    public void canSetTimeoutSecondsToInfinity()
+    {
+        LockInfoImplEx lockInfo = new LockInfoImplEx();
+        
+        lockInfo.setTimeoutSeconds(WebDAV.TIMEOUT_INFINITY);
+        
+        // Check the new date.
+        assertNull(lockInfo.getExpires());
+    }
+    
+    @Test
+    public void canSetTimeoutMinutes()
+    {
+        LockInfoImplEx lockInfo = new LockInfoImplEx();
+        
+        // This should add 5 minutes to the expiry date.
+        lockInfo.setTimeoutMinutes(5);
+        
+        // Check the new date.
+        assertEquals(86700000, lockInfo.getExpires().getTime());
+    }
+    
+    @Test
+    public void canSetTimeoutMinutesToInfinity()
+    {
+        LockInfoImplEx lockInfo = new LockInfoImplEx();
+        
+        lockInfo.setTimeoutMinutes(WebDAV.TIMEOUT_INFINITY);
+        
+        // Check the new date.
+        assertNull(lockInfo.getExpires());
+    }
+    
+    @Test
+    public void canGetRemainingTimeoutSeconds()
+    {
+        LockInfoImplEx lockInfo = new LockInfoImplEx();
+        
+        lockInfo.setTimeoutSeconds(7);
+        
+        assertEquals(7, lockInfo.getRemainingTimeoutSeconds());
+    }
+    
+    @Test(expected=IllegalStateException.class)
+    public void cannotChangeSharedLockToExclusive()
+    {
+        LockInfoImpl lockInfo = new LockInfoImpl();
+        lockInfo.addSharedLockToken("shared-token");
+        
+        // Not allowed
+        lockInfo.setExclusiveLockToken("token");
+    }
+    
+    @Test(expected=IllegalStateException.class)
+    public void cannotChangeExclusiveLockToShared()
+    {
+        LockInfoImpl lockInfo = new LockInfoImpl();
+        lockInfo.setExclusiveLockToken("token");
+
+        // Not allowed
+        lockInfo.addSharedLockToken("shared-token");
+    }
+    
+    public void canSetShared()
+    {
+        LockInfoImpl lockInfo = new LockInfoImpl();
+        lockInfo.setExclusiveLockToken("exc-token");
+        
+        assertEquals("exc-token", lockInfo.getExclusiveLockToken());
+    }
+    
+    public void canSetExclusive()
+    {
+        LockInfoImpl lockInfo = new LockInfoImpl();
+        lockInfo.addSharedLockToken("shared1");
+        lockInfo.addSharedLockToken("shared2");
+        
+        assertEquals(2, lockInfo.getSharedLockTokens().size());
+        assertTrue(lockInfo.getSharedLockTokens().contains("shared1"));
+        assertTrue(lockInfo.getSharedLockTokens().contains("shared2"));
+    }
+
+    @Test
+    public void canGenerateJSON() throws JsonParseException, JsonMappingException, IOException
+    {
+        // Exclusive lock
+        LockInfoImpl lockInfo = new LockInfoImpl();
+        lockInfo.setExclusiveLockToken("opaque-lock-token");
+        lockInfo.setDepth(WebDAV.INFINITY);
+        lockInfo.setScope(WebDAV.XML_EXCLUSIVE);
+        
+        String json = lockInfo.toJSON();
+        ObjectMapper objectMapper = new ObjectMapper();
+        assertTrue("ADDINFO_WEBDAV_MARKER", json.startsWith(LockInfoImpl.ADDINFO_WEBDAV_MARKER));
+        json = json.substring(LockInfoImpl.ADDINFO_WEBDAV_MARKER.length() + 1);
+        LockInfoImpl parsed = objectMapper.readValue(json, LockInfoImpl.class);
+        assertEquals("opaque-lock-token", parsed.getExclusiveLockToken());
+        assertEquals(WebDAV.INFINITY, parsed.getDepth());
+        assertEquals(WebDAV.XML_EXCLUSIVE, parsed.getScope());
+        
+        // Shared lock
+        lockInfo = new LockInfoImpl();
+        lockInfo.addSharedLockToken("opaque-lock-token-1");
+        lockInfo.addSharedLockToken("opaque-lock-token-2");
+        lockInfo.addSharedLockToken("opaque-lock-token-3");
+        lockInfo.setDepth(WebDAV.ZERO);
+        lockInfo.setScope(WebDAV.XML_SHARED);
+        
+        json = lockInfo.toJSON();
+        assertTrue("ADDINFO_WEBDAV_MARKER", json.startsWith(LockInfoImpl.ADDINFO_WEBDAV_MARKER));
+        json = json.substring(LockInfoImpl.ADDINFO_WEBDAV_MARKER.length() + 1);
+        parsed = objectMapper.readValue(json, LockInfoImpl.class);
+        Set<String> sortedTokens = new TreeSet<String>(parsed.getSharedLockTokens());
+        Iterator<String> tokenIt = sortedTokens.iterator();
+        assertEquals("opaque-lock-token-1", tokenIt.next());
+        assertEquals("opaque-lock-token-2", tokenIt.next());
+        assertEquals("opaque-lock-token-3", tokenIt.next());        
+        assertEquals(WebDAV.ZERO, parsed.getDepth());
+        assertEquals(WebDAV.XML_SHARED, parsed.getScope());
+    }
+    
+    @Test
+    public void canParseJSON() throws JsonParseException, JsonMappingException, IOException
+    {
+        // Exclusive lock
+        LockInfoImpl lockInfo = new LockInfoImpl();
+        lockInfo.setExclusiveLockToken("opaque-lock-token");
+        lockInfo.setDepth(WebDAV.INFINITY);
+        lockInfo.setScope(WebDAV.XML_EXCLUSIVE);
+        
+        String json = lockInfo.toJSON();
+        // Execute the factory method we're testing
+        LockInfo parsed = LockInfoImpl.fromJSON(json);
+        assertEquals("opaque-lock-token", parsed.getExclusiveLockToken());
+        assertEquals(WebDAV.INFINITY, parsed.getDepth());
+        assertEquals(WebDAV.XML_EXCLUSIVE, parsed.getScope());
+        
+        // Shared lock
+        lockInfo = new LockInfoImpl();
+        lockInfo.addSharedLockToken("opaque-lock-token-1");
+        lockInfo.addSharedLockToken("opaque-lock-token-2");
+        lockInfo.addSharedLockToken("opaque-lock-token-3");
+        lockInfo.setDepth(WebDAV.ZERO);
+        lockInfo.setScope(WebDAV.XML_SHARED);
+        
+        json = lockInfo.toJSON();
+        // Execute the factory method we're testing
+        parsed = LockInfoImpl.fromJSON(json);
+        Set<String> sortedTokens = new TreeSet<String>(parsed.getSharedLockTokens());
+        Iterator<String> tokenIt = sortedTokens.iterator();
+        assertEquals("opaque-lock-token-1", tokenIt.next());
+        assertEquals("opaque-lock-token-2", tokenIt.next());
+        assertEquals("opaque-lock-token-3", tokenIt.next());        
+        assertEquals(WebDAV.ZERO, parsed.getDepth());
+        assertEquals(WebDAV.XML_SHARED, parsed.getScope());
+    }
+    
+    public static class LockInfoImplEx extends LockInfoImpl
+    {
+        public static final Date DATE_NOW = new Date(86400000);
+        private static final long serialVersionUID = 1669378516554195322L;
+
+        @Override
+        protected Date dateNow()
+        {
+            return DATE_NOW;
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/LockMethodTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/LockMethodTest.java
new file mode 100644
index 00000000000..b547e857530
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/webdav/LockMethodTest.java
@@ -0,0 +1,423 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.Serializable;
+import java.util.Collections;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.GUID;
+import org.alfresco.util.TestWithUserUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.context.ApplicationContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+/**
+ * Tests for the {@link LockMethod} class.
+ * 
+ * @author pavel.yurkevich
+ */
+public class LockMethodTest
+{
+    private LockMethod lockMethod;
+    private PropFindMethod propFindMethod;
+    
+    private ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext(new String[]
+    {
+        "classpath:alfresco/application-context.xml", "classpath:alfresco/web-scripts-application-context.xml",
+        "classpath:alfresco/remote-api-context.xml"
+    });
+    
+    /**
+     * Services used by the tests
+     */
+    private WebDAVHelper davHelper;
+    private TransactionService transactionService;
+    private AuthenticationComponent authenticationComponent;
+    private NodeService nodeService;
+    private MutableAuthenticationService authenticationService;
+    private PermissionService permissionService;
+    private ContentService contentService;
+    private FileFolderService fileFolderService;
+
+    /**
+     * Types and properties used by the tests
+     */
+    private static final String CONTENT_1 = "This is some content";
+    private static final String TEST_FILE_NAME = "file" + GUID.generate();
+    private static final String TEST_NEW_FILE_NAME = "new_file" + GUID.generate();
+    private static final String TEST_FOLDER_NAME = "folder" + GUID.generate();
+    private static final String TEST_NEW_FOLDER_NAME = "new_folder" + GUID.generate();
+
+    /**
+     * Data used by the tests
+     */
+    private NodeRef folderNodeRef;
+    private NodeRef fileNodeRef;
+    
+    /**
+     * User details 
+     */
+    private String userName;
+    private static final String PWD = "password";
+    
+    @Before
+    public void setUp() throws Exception
+    {
+        lockMethod = new LockMethod();
+        propFindMethod = new PropFindMethod();
+        
+        this.transactionService = (TransactionService) applicationContext.getBean("TransactionService");
+        this.davHelper = (WebDAVHelper) applicationContext.getBean("webDAVHelper");
+        this.authenticationComponent = (AuthenticationComponent) applicationContext.getBean("authenticationComponent");        
+        this.nodeService = (NodeService) applicationContext.getBean("NodeService");
+        this.authenticationService = (MutableAuthenticationService) applicationContext.getBean("authenticationService");
+        this.permissionService = (PermissionService) applicationContext.getBean("permissionService");
+        this.contentService = (ContentService) applicationContext.getBean("contentService");
+        this.fileFolderService = (FileFolderService) applicationContext.getBean("fileFolderService");
+        
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+        
+        RetryingTransactionCallback<Void> createTestFileCallback = new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                NodeRef rootNodeRef = nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+
+                // Create and authenticate the user
+                userName = "webdavLockTest" + GUID.generate();
+                TestWithUserUtils.createUser(userName, PWD, rootNodeRef, nodeService, authenticationService);
+                permissionService.setPermission(rootNodeRef, userName, PermissionService.ALL_PERMISSIONS, true);
+                TestWithUserUtils.authenticateUser(userName, PWD, rootNodeRef, authenticationService);
+
+                // create test file in test folder
+                folderNodeRef = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("test"), ContentModel.TYPE_FOLDER,
+                        Collections.<QName, Serializable> singletonMap(ContentModel.PROP_NAME, TEST_FOLDER_NAME)).getChildRef();
+                fileNodeRef = nodeService.createNode(folderNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName("test"), ContentModel.TYPE_CONTENT,
+                        Collections.<QName, Serializable> singletonMap(ContentModel.PROP_NAME, TEST_FILE_NAME)).getChildRef();
+                ContentWriter contentWriter = contentService.getWriter(fileNodeRef, ContentModel.PROP_CONTENT, true);
+                contentWriter.setMimetype("text/plain");
+                contentWriter.setEncoding("UTF-8");
+                contentWriter.putContent(CONTENT_1);
+
+                return null;
+            }
+
+        };
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(createTestFileCallback);
+    }
+    
+    @After
+    public void tearDown()
+    {
+        lockMethod = null;
+        propFindMethod = null;
+        
+        // clear context for current user
+        this.authenticationComponent.clearCurrentSecurityContext();
+
+        // delete test store as system user
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+        RetryingTransactionCallback<Void> deleteTestFolderCallback = new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                if (nodeService.exists(folderNodeRef))
+                {
+                    nodeService.deleteNode(folderNodeRef);
+                }
+                return null;
+            }
+        };
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(deleteTestFolderCallback);
+    }
+    
+    @Test
+    public void testRefreshLock() throws Exception
+    {
+        MockHttpServletRequest lockRequest = new MockHttpServletRequest(); 
+        lockRequest.addHeader(WebDAV.HEADER_TIMEOUT, WebDAV.SECOND + 5);
+        lockRequest.setRequestURI("/" + TEST_FILE_NAME);
+        
+        String content = "<?xml version=\"1.0\" encoding=\"utf-8\" ?><D:lockinfo xmlns:D=\"DAV:\"><D:lockscope xmlns:D=\"DAV:\">" +
+        		"<D:exclusive xmlns:D=\"DAV:\"/></D:lockscope><D:locktype xmlns:D=\"DAV:\"><D:write xmlns:D=\"DAV:\"/></D:locktype>" +
+        		"<D:owner xmlns:D=\"DAV:\">" + userName + "</D:owner></D:lockinfo>";
+
+        lockRequest.setContent(content.getBytes("UTF-8"));
+
+        lockMethod.setDetails(lockRequest, new MockHttpServletResponse(), davHelper, folderNodeRef);
+        lockMethod.parseRequestHeaders();
+        lockMethod.parseRequestBody();
+        
+        RetryingTransactionCallback<Void> lockExecuteImplCallBack = new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                lockMethod.executeImpl();
+                return null;
+            }
+        };
+        
+        // lock node for 5 seconds
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(lockExecuteImplCallBack);
+        
+        RetryingTransactionCallback<LockInfo> getNodeLockInfoCallBack = new RetryingTransactionCallback<LockInfo>()
+        {
+            @Override
+            public LockInfo execute() throws Throwable
+            {
+                return lockMethod.getNodeLockInfo(fileFolderService.getFileInfo(fileNodeRef));
+            }
+        };
+        
+        // get lock info
+        LockInfo lockInfo = this.transactionService.getRetryingTransactionHelper().doInTransaction(getNodeLockInfoCallBack);
+        
+        assertNotNull(lockInfo);
+        
+        // wait for 1 second
+        Thread.sleep(1000);
+        
+        String lockToken = fileNodeRef.getId() + WebDAV.LOCK_TOKEN_SEPERATOR + this.userName;
+        String lockHeaderValue = "(<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">)";
+        lockRequest.addHeader(WebDAV.HEADER_IF, lockHeaderValue);
+        
+        lockMethod.parseRequestHeaders();
+        
+        // update lock for another 5 seconds
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(lockExecuteImplCallBack);
+        
+        // get updated lock info
+        LockInfo updatedLockInfo = this.transactionService.getRetryingTransactionHelper().doInTransaction(getNodeLockInfoCallBack);
+        
+        assertNotNull(updatedLockInfo);
+        
+        assertEquals("Lock owner should not change after lock refresh.", lockInfo.getOwner(), updatedLockInfo.getOwner());
+        assertEquals("Lock token should not change after lock refresh.", lockInfo.getExclusiveLockToken(), updatedLockInfo.getExclusiveLockToken());
+        
+        assertFalse("Expires was not updated.", lockInfo.getExpires().equals(updatedLockInfo.getExpires()));
+        assertTrue("Expires was updated incorrectly.", lockInfo.getExpires().before(updatedLockInfo.getExpires()));
+        
+        // prepare propfind method
+        MockHttpServletRequest propFindRequest = new MockHttpServletRequest();
+        propFindRequest.setRequestURI("/" + TEST_FILE_NAME);
+        propFindRequest.addHeader(WebDAV.HEADER_DEPTH, "1");
+        content = "<?xml version=\"1.0\" encoding=\"utf-8\" ?><D:propfind xmlns:D=\"DAV:\"><D:prop><D:getlastmodified/>" +
+        		"<D:getcontentlength/><D:resourcetype/><D:supportedlock/><D:lockdiscovery/></D:prop></D:propfind>";
+
+        propFindRequest.setContent(content.getBytes("UTF-8"));
+        
+        MockHttpServletResponse propfindResponse = new MockHttpServletResponse();
+        propFindMethod.setDetails(propFindRequest, propfindResponse, davHelper, folderNodeRef);
+        
+        propFindMethod.parseRequestHeaders();
+        propFindMethod.parseRequestBody();
+        
+        RetryingTransactionCallback<Void> propfindExecuteImplCallBack = new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                propFindMethod.executeImpl();
+                return null;
+            }
+        };
+        
+        // make propfind method call for locked resource
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(propfindExecuteImplCallBack);
+        
+        String response = propfindResponse.getContentAsString();
+        
+        assertFalse("Propfind response should contain lock informarion.", response.indexOf("lockdiscovery") == -1);
+        
+        // wait for lock expiration
+        Thread.sleep(6000);
+        
+        propfindResponse = new MockHttpServletResponse();
+        propFindMethod.setDetails(propFindRequest, propfindResponse, davHelper, folderNodeRef);
+        
+        // make another propfind call on resource with expired lock
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(propfindExecuteImplCallBack);
+        response = propfindResponse.getContentAsString();
+        
+        // check that lock information is not there for expired lock
+        assertTrue("Propfind response should not conatain information about expired lock", response.indexOf("lockdiscovery") == -1);
+    }
+    
+    @Test
+    public void testMNT_10873() throws Exception
+    {
+        String fileName = TEST_FILE_NAME + GUID.generate();
+        final MockHttpServletRequest lockRequest = new MockHttpServletRequest();
+        MockHttpServletResponse lockResponse = new MockHttpServletResponse();
+        lockRequest.addHeader(WebDAV.HEADER_TIMEOUT, WebDAV.SECOND + 5);
+        // set request uri to point to non-existent file
+        lockRequest.setRequestURI("/" + fileName);
+        
+        String content = "<?xml version=\"1.0\" encoding=\"utf-8\" ?><D:lockinfo xmlns:D=\"DAV:\"><D:lockscope xmlns:D=\"DAV:\">" +
+                "<D:exclusive xmlns:D=\"DAV:\"/></D:lockscope><D:locktype xmlns:D=\"DAV:\"><D:write xmlns:D=\"DAV:\"/></D:locktype>" +
+                "<D:owner xmlns:D=\"DAV:\">" + userName + "</D:owner></D:lockinfo>";
+
+        lockRequest.setContent(content.getBytes("UTF-8"));
+
+        lockMethod.setDetails(lockRequest, lockResponse, davHelper, folderNodeRef);
+        lockMethod.parseRequestHeaders();
+        lockMethod.parseRequestBody();
+        
+        RetryingTransactionCallback<Void> lockExecuteImplCallBack = new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                lockMethod.executeImpl();
+                return null;
+            }
+        };
+        
+        // lock node for 5 seconds
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(lockExecuteImplCallBack);
+        
+        assertEquals("Unexpected response status code.", HttpServletResponse.SC_CREATED, lockResponse.getStatus());
+        
+        RetryingTransactionCallback<NodeRef> getNodeRefCallback = new RetryingTransactionCallback<NodeRef>()
+        {
+            @Override
+            public NodeRef execute() throws Throwable
+            {
+                return lockMethod.getNodeForPath(folderNodeRef, lockRequest.getRequestURI()).getNodeRef();
+            }
+        };
+        
+        NodeRef nodeRef = this.transactionService.getRetryingTransactionHelper().doInTransaction(getNodeRefCallback);
+        
+        assertTrue("NodeRef should exists.", nodeService.exists(nodeRef));        
+        assertTrue("sys:webdavNoContent aspect should be applied on node.", nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WEBDAV_NO_CONTENT));
+        
+        // sleep for 6 seconds to ensure that timer was triggered
+        Thread.sleep(6000);
+        
+        assertFalse("File should note exist in repo any more.", nodeService.exists(nodeRef));
+        assertFalse("File should note exist in trashcan.", nodeService.exists(new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, nodeRef.getId())));
+    }
+    
+    @Test
+    public void testMNT_11990() throws Exception
+    {
+        MockHttpServletRequest lockRequest = new MockHttpServletRequest(); 
+        lockRequest.addHeader(WebDAV.HEADER_TIMEOUT, WebDAV.SECOND + 3600);        
+        lockRequest.addHeader(WebDAV.HEADER_IF, "(<" + WebDAV.makeLockToken(fileNodeRef, userName) + ">)");
+        lockRequest.setRequestURI("/" + TEST_FILE_NAME);
+
+        lockMethod.setDetails(lockRequest, new MockHttpServletResponse(), davHelper, folderNodeRef);
+        lockMethod.parseRequestHeaders();
+        lockMethod.parseRequestBody();
+        
+        RetryingTransactionCallback<Void> lockExecuteImplCallBack = new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                try
+                {
+                    lockMethod.executeImpl();
+                    fail("Lock should not be refreshed for non-locked file.");
+                }
+                catch (WebDAVServerException e)
+                {
+                    assertEquals(e.getHttpStatusCode(), HttpServletResponse.SC_BAD_REQUEST);
+                }
+                return null;
+            }
+        };
+        
+        // try to refresh lock for non-locked node        
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(lockExecuteImplCallBack);
+    }
+    
+    @Test
+    public void testMNT_12425() throws Exception
+    {
+        MockHttpServletRequest lockRequest = new MockHttpServletRequest();
+        MockHttpServletResponse lockResponse = new MockHttpServletResponse();
+        
+        // refresh lock set to 1 hour
+        lockRequest.addHeader(WebDAV.HEADER_TIMEOUT, WebDAV.SECOND + 3600);
+        lockRequest.addHeader(WebDAV.HEADER_IF, "(<" + WebDAV.makeLockToken(fileNodeRef, userName) + ">)");
+        // specify path to non-existing file
+        lockRequest.setRequestURI("/" + TEST_NEW_FOLDER_NAME + "/" + TEST_NEW_FILE_NAME);
+        
+        lockMethod.setDetails(lockRequest, lockResponse, davHelper, folderNodeRef);
+        lockMethod.parseRequestHeaders();
+        
+        RetryingTransactionCallback<Void> lockExecuteImplCallBack = new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                try
+                {
+                    lockMethod.executeImpl();
+                    fail("Refresh lock for non-exisitent resource should fail.");
+                }
+                catch (WebDAVServerException e)
+                {
+                    assertEquals(HttpServletResponse.SC_FORBIDDEN, e.getHttpStatusCode());
+                }
+                return null;
+            }
+        };
+        
+        // try to lock non-existent file        
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(lockExecuteImplCallBack);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/MoveMethodTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/MoveMethodTest.java
new file mode 100644
index 00000000000..09696b905a4
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/webdav/MoveMethodTest.java
@@ -0,0 +1,562 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.GUID;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.context.ApplicationContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+/**
+ * Tests for the {@link MoveMethod} class.
+ * 
+ * @author Matt Ward
+ */
+@RunWith(MockitoJUnitRunner.class)
+@Category(LuceneTests.class)
+public class MoveMethodTest
+{
+    private static ApplicationContext ctx;
+
+    private MoveMethod moveMethod;
+    private @Mock WebDAVHelper davHelper;
+    private MockHttpServletRequest req;
+    private MockHttpServletResponse resp;
+    private NodeRef rootNode;
+    private @Mock FileFolderService mockFileFolderService;
+    private @Mock WebDAVLockService davLockService;
+    private @Mock ServiceRegistry mockServiceRegistry;
+    private @Mock ContentService mockContentService;
+    private String destPath;
+    private String sourcePath;
+    private FileInfo sourceFileInfo;
+    private NodeRef sourceParentNodeRef;
+    private NodeRef destParentNodeRef;
+    private NodeRef sourceNodeRef;
+
+    private SearchService searchService;
+    private FileFolderService fileFolderService;
+    private NodeService nodeService;
+    private TransactionService transactionService;
+    private ContentService contentService;
+    private WebDAVHelper webDAVHelper;
+
+    private Repository repositoryHelper;
+    private NodeRef companyHomeNodeRef;
+
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception
+    {
+        ctx = ApplicationContextHelper.getApplicationContext(new String[]
+        {
+            "classpath:alfresco/application-context.xml", "classpath:alfresco/web-scripts-application-context.xml",
+            "classpath:alfresco/remote-api-context.xml"
+        });
+    }
+
+    @After
+    public void tearDown()
+    {
+        moveMethod = null;
+        req = null;
+        resp = null;
+
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+
+    @Before
+    public void setUp() throws Exception
+    {
+        req = new MockHttpServletRequest();
+        resp = new MockHttpServletResponse();
+        rootNode = new NodeRef("workspace://SpacesStore/node1");
+        moveMethod = new MoveMethod()
+        {
+            @Override
+            protected LockInfo checkNode(FileInfo fileInfo, boolean ignoreShared, boolean lockMethod)
+                        throws WebDAVServerException
+            {
+                return new LockInfoImpl();
+            }
+
+            @Override
+            protected LockInfo checkNode(FileInfo fileInfo) throws WebDAVServerException
+            {
+                return new LockInfoImpl();
+            }
+        };
+        moveMethod.setDetails(req, resp, davHelper, rootNode);
+        
+        sourceFileInfo = Mockito.mock(FileInfo.class);
+        when(sourceFileInfo.isFolder()).thenReturn(true);
+        
+        destPath = "/path/to/dest.doc";
+        moveMethod.m_strDestinationPath = destPath;
+        
+        sourcePath = "/path/to/source.doc";
+        moveMethod.m_strPath = sourcePath;
+        
+        when(davHelper.getFileFolderService()).thenReturn(mockFileFolderService);
+        
+        List<String> sourcePathSplit = Arrays.asList("path", "to", "source.doc");
+        when(davHelper.splitAllPaths(sourcePath)).thenReturn(sourcePathSplit);
+        
+        
+        List<String> destPathSplit = Arrays.asList("path", "to", "dest.doc");
+        when(davHelper.splitAllPaths(destPath)).thenReturn(destPathSplit);
+        
+        
+        when(mockFileFolderService.resolveNamePath(rootNode, sourcePathSplit)).thenReturn(sourceFileInfo);
+        
+        FileInfo destFileInfo = Mockito.mock(FileInfo.class);
+        when(mockFileFolderService.resolveNamePath(rootNode, destPathSplit)).thenReturn(destFileInfo);
+        
+        sourceParentNodeRef = new NodeRef("workspace://SpacesStore/parent");
+        destParentNodeRef = new NodeRef("workspace://SpacesStore/parent");
+        
+        
+        sourceNodeRef = new NodeRef("workspace://SpacesStore/sourcefile");
+        
+        when(davHelper.getLockService()).thenReturn(davLockService);
+
+        searchService = ctx.getBean("SearchService", SearchService.class);
+        fileFolderService = ctx.getBean("FileFolderService", FileFolderService.class);
+        nodeService = ctx.getBean("NodeService", NodeService.class);
+        transactionService = ctx.getBean("transactionService", TransactionService.class);
+        contentService = ctx.getBean("contentService", ContentService.class);
+        webDAVHelper = ctx.getBean("webDAVHelper", WebDAVHelper.class);
+
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+        repositoryHelper = (Repository)ctx.getBean("repositoryHelper");
+        companyHomeNodeRef = repositoryHelper.getCompanyHome();
+    }
+
+    
+    @Test
+    public void canRenameFolders() throws Exception
+    {
+        moveMethod.moveOrCopy(sourceNodeRef, sourceParentNodeRef, destParentNodeRef, "dest.doc");
+        
+        verify(mockFileFolderService).rename(sourceNodeRef, "dest.doc");
+        // sourceNodeRef is not locked, so unlock should not be called after rename
+        verify(davLockService, never()).unlock(sourceNodeRef);
+        verify(mockFileFolderService, never()).create(destParentNodeRef, "dest.doc", ContentModel.TYPE_CONTENT);
+    }
+    
+    
+    @Test
+    public void canRenameFoldersWhenNewNameMatchesShufflePattern() throws Exception
+    {
+        when(davHelper.isRenameShuffle(destPath)).thenReturn(true);
+        when(davHelper.isRenameShuffle(sourcePath)).thenReturn(false);
+        
+        // Test: Perform the rename
+        moveMethod.moveOrCopy(sourceNodeRef, sourceParentNodeRef, destParentNodeRef, "dest.doc");
+        
+        verify(mockFileFolderService).rename(sourceNodeRef, "dest.doc");
+        // sourceNodeRef is not locked, so unlock should not be called after rename
+        verify(davLockService, never()).unlock(sourceNodeRef);
+        verify(mockFileFolderService, never()).create(destParentNodeRef, "dest.doc", ContentModel.TYPE_CONTENT);
+    }
+    
+    @Test
+    public void canMoveFileUnlock() throws Exception
+    {
+        moveMethod = new MoveMethod()
+        {
+            @Override
+            protected LockInfo checkNode(FileInfo fileInfo, boolean ignoreShared, boolean lockMethod) throws WebDAVServerException
+            {
+                LockInfoImpl lockInfo = new LockInfoImpl();
+                lockInfo.setExclusiveLockToken("opaque-lock-token");
+                lockInfo.setDepth(WebDAV.INFINITY);
+                lockInfo.setScope(WebDAV.XML_EXCLUSIVE);
+                return lockInfo;
+            }
+
+            @Override
+            protected LockInfo checkNode(FileInfo fileInfo) throws WebDAVServerException
+            {
+                return checkNode(fileInfo, false, false);
+            }
+        };
+        
+        moveMethod.setDetails(req, resp, davHelper, rootNode);
+        
+        sourceFileInfo = Mockito.mock(FileInfo.class);
+        when(sourceFileInfo.isFolder()).thenReturn(true);
+        
+        destPath = "/path/to/test.doc";
+        moveMethod.m_strDestinationPath = destPath;
+        
+        sourcePath = "/path/from/test.doc";
+        moveMethod.m_strPath = sourcePath;
+        
+        when(davHelper.getServiceRegistry()).thenReturn(mockServiceRegistry);
+        when(mockServiceRegistry.getContentService()).thenReturn(mockContentService);
+        
+        List<String> sourcePathSplit = Arrays.asList("path", "from", "test.doc");
+        when(davHelper.splitAllPaths(sourcePath)).thenReturn(sourcePathSplit);
+        
+        List<String> destPathSplit = Arrays.asList("path", "to", "dest.doc");
+        when(davHelper.splitAllPaths(destPath)).thenReturn(destPathSplit);
+        
+        when(mockFileFolderService.resolveNamePath(rootNode, sourcePathSplit)).thenReturn(sourceFileInfo);
+        
+        FileInfo destFileInfo = Mockito.mock(FileInfo.class);
+        when(mockFileFolderService.resolveNamePath(rootNode, destPathSplit)).thenReturn(destFileInfo);
+        
+        sourceParentNodeRef = new NodeRef("workspace://SpacesStore/parent1");
+        destParentNodeRef = new NodeRef("workspace://SpacesStore/parent2");
+        sourceNodeRef = new NodeRef("workspace://SpacesStore/sourcefile");
+        
+        moveMethod.moveOrCopy(sourceNodeRef, sourceParentNodeRef, destParentNodeRef, "test.doc");
+        
+        verify(mockFileFolderService).moveFrom(sourceNodeRef, sourceParentNodeRef, destParentNodeRef, "test.doc");
+        verify(davLockService).unlock(sourceNodeRef);
+    }
+
+    @Test
+    public void testMNT_13144() throws Exception
+    {
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
+        {
+            @Override
+            public Object execute() throws Throwable
+            {
+                FileInfo dwgFI = null;
+                String fileName = "source-" + GUID.generate();
+                String sourceFileName = fileName + ".dwg";
+
+                FileInfo atmpFI = null;
+                String destFileName = "atmp1234";
+
+                FileInfo tmpFI = null;
+                String tmpFileName = fileName + ".tmp";
+
+                String bakFileName = fileName + ".bak";
+
+                String content = "Some dwg content.";
+                String tmpContent = "Change dwg content.";
+
+                try
+                {
+                    dwgFI = fileFolderService.create(companyHomeNodeRef, sourceFileName, ContentModel.TYPE_CONTENT);
+                    ContentWriter writer = contentService.getWriter(dwgFI.getNodeRef(), ContentModel.PROP_CONTENT, true);
+                    writer.setMimetype(MimetypeMap.MIMETYPE_APP_DWG);
+                    writer.setEncoding("UTF-8");
+                    writer.putContent(content);
+
+                    tmpFI = fileFolderService.create(companyHomeNodeRef, tmpFileName, ContentModel.TYPE_CONTENT);
+                    writer = contentService.getWriter(tmpFI.getNodeRef(), ContentModel.PROP_CONTENT, true);
+                    writer.setMimetype(MimetypeMap.MIMETYPE_APP_DWG);
+                    writer.setEncoding("UTF-8");
+                    writer.putContent(tmpContent);
+
+                    atmpFI = fileFolderService.create(companyHomeNodeRef, destFileName, ContentModel.TYPE_CONTENT);
+
+                    sourcePath = "/" + sourceFileName;
+                    moveMethod.m_strPath = sourcePath;
+
+                    destPath = "/" + destFileName;
+                    moveMethod.m_strDestinationPath = destPath;
+
+                    List<String> sourcePathSplit = Arrays.asList(sourceFileName);
+                    when(davHelper.splitAllPaths(sourcePath)).thenReturn(sourcePathSplit);
+
+                    when(mockFileFolderService.resolveNamePath(rootNode, sourcePathSplit)).thenReturn(dwgFI);
+                    when(davHelper.isRenameShuffle(destPath)).thenReturn(true);
+                    when(davHelper.isRenameShuffle(sourcePath)).thenReturn(false);
+
+                    when(mockFileFolderService.create(companyHomeNodeRef, destFileName, ContentModel.TYPE_CONTENT)).thenReturn(atmpFI);
+
+                    ServiceRegistry mockServiceRegistry = Mockito.mock(ServiceRegistry.class);
+                    when(davHelper.getServiceRegistry()).thenReturn(mockServiceRegistry);
+                    when(davHelper.getServiceRegistry().getContentService()).thenReturn(contentService);
+
+                    // move webdav method dwg copy to atmp1234
+                    moveMethod.moveOrCopy(dwgFI.getNodeRef(), companyHomeNodeRef, companyHomeNodeRef, destFileName);
+
+                    ContentReader reader = contentService.getReader(atmpFI.getNodeRef(), ContentModel.PROP_CONTENT);
+                    assertNotNull(reader);
+                    assertEquals(content, reader.getContentString());
+
+                    // move webdav method atmp1234 rename to bak
+                    sourcePath = "/" + destFileName;
+                    moveMethod.m_strPath = sourcePath;
+
+                    destPath = "/" + bakFileName;
+                    moveMethod.m_strDestinationPath = destPath;
+
+                    sourcePathSplit = Arrays.asList(destFileName);
+                    when(davHelper.splitAllPaths(sourcePath)).thenReturn(sourcePathSplit);
+
+                    when(mockFileFolderService.resolveNamePath(rootNode, sourcePathSplit)).thenReturn(atmpFI);
+                    when(davHelper.isRenameShuffle(destPath)).thenReturn(true);
+                    when(davHelper.isRenameShuffle(sourcePath)).thenReturn(true);
+
+                    moveMethod.moveOrCopy(atmpFI.getNodeRef(), companyHomeNodeRef, companyHomeNodeRef, bakFileName);
+
+                    verify(mockFileFolderService).rename(atmpFI.getNodeRef(), bakFileName);
+                    verify(mockFileFolderService, never()).create(destParentNodeRef, bakFileName, ContentModel.TYPE_CONTENT);
+
+                    // move webdav method tmp copy content to dwg
+                    sourcePath = "/" + tmpFileName;
+                    moveMethod.m_strPath = sourcePath;
+
+                    destPath = "/" + sourceFileName;
+                    moveMethod.m_strDestinationPath = destPath;
+
+                    sourcePathSplit = Arrays.asList(tmpFileName);
+                    when(davHelper.splitAllPaths(sourcePath)).thenReturn(sourcePathSplit);
+
+                    when(mockFileFolderService.resolveNamePath(rootNode, sourcePathSplit)).thenReturn(tmpFI);
+                    when(davHelper.isRenameShuffle(destPath)).thenReturn(false);
+                    when(davHelper.isRenameShuffle(sourcePath)).thenReturn(true);
+
+                    moveMethod.moveOrCopy(atmpFI.getNodeRef(), companyHomeNodeRef, companyHomeNodeRef, bakFileName);
+
+                    reader = contentService.getReader(dwgFI.getNodeRef(), ContentModel.PROP_CONTENT);
+                    assertNotNull(reader);
+                    assertEquals(tmpContent, reader.getContentString());
+                }
+                finally
+                {
+                    if (dwgFI != null)
+                    {
+                        nodeService.deleteNode(dwgFI.getNodeRef());
+                    }
+
+                    if (atmpFI != null)
+                    {
+                        nodeService.deleteNode(atmpFI.getNodeRef());
+                    }
+                }
+
+                return null;
+            }
+        });
+    }
+    
+    @Test(expected=AccessDeniedException.class)
+    public void testMNT_10380_ThrowAccessDeniedExceptionWhenUserLacksPermissions() throws Exception
+    {
+        when(mockFileFolderService.rename(sourceNodeRef, "dest.doc")).
+            thenThrow(new AccessDeniedException("Access denied in test by mockFileFolderService"));
+        
+        moveMethod.moveOrCopy(sourceNodeRef, sourceParentNodeRef, destParentNodeRef, "dest.doc");
+    }
+    
+    @Test
+    public void testMNT_9662()
+    {
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
+        {
+            @Override
+            public Object execute() throws Throwable
+            {
+                // create test folder with name that doesn't match getDAVHelper().isRenameShuffle()
+                FileInfo testFileInfo = fileFolderService.create(companyHomeNodeRef, "folder-" + GUID.generate().substring(29), ContentModel.TYPE_FOLDER);
+
+                req = new MockHttpServletRequest(WebDAV.METHOD_MOVE, "/alfresco/webdav/" + testFileInfo.getName());
+                resp = new MockHttpServletResponse();
+                req.setServerPort(8080);
+                req.setContextPath("/alfresco");
+                req.setServletPath("/webdav");
+
+                moveMethod = new MoveMethod();
+                moveMethod.setDetails(req, resp, webDAVHelper, companyHomeNodeRef);
+
+                // generate new name that matches getDAVHelper().isRenameShuffle()
+                String newName = GUID.generate().substring(28);
+                req.addHeader(WebDAV.HEADER_DESTINATION, "http://localhost:8080/alfresco/webdav/" + newName);
+
+                try
+                {
+                    moveMethod.execute();
+
+                    assertTrue(nodeService.exists(testFileInfo.getNodeRef()));
+                    assertEquals(newName, nodeService.getProperty(testFileInfo.getNodeRef(), ContentModel.PROP_NAME));
+                }
+                catch (WebDAVServerException e)
+                {
+                    fail("Fail to rename folder: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+                }
+                finally
+                {
+                    nodeService.deleteNode(testFileInfo.getNodeRef());
+                }
+                return null;
+            }
+        });
+    }
+    
+    @Test
+    public void testMNT_6480()
+    {
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
+        {
+            @Override
+            public Object execute() throws Throwable
+            {
+                // create test file with name that doesn't match getDAVHelper().isRenameShuffle()
+                String originalFileName = "content-" + GUID.generate() + ".txt";
+                FileInfo testFileInfo = fileFolderService.create(companyHomeNodeRef, originalFileName, ContentModel.TYPE_CONTENT);
+                
+                // rename source file to file with upper case name
+                String newFileName = originalFileName.toUpperCase();
+
+                req = new MockHttpServletRequest(WebDAV.METHOD_MOVE, "/alfresco/webdav/" + testFileInfo.getName());
+                req.setServerPort(8080);
+                req.setContextPath("/alfresco");
+                req.setServletPath("/webdav");
+                req.addHeader(WebDAV.HEADER_DESTINATION, "http://localhost:8080/alfresco/webdav/" + newFileName);
+                
+                resp = new MockHttpServletResponse();
+
+                moveMethod = new MoveMethod();
+                moveMethod.setDetails(req, resp, webDAVHelper, companyHomeNodeRef);
+
+                try
+                {
+                    moveMethod.execute();
+                    
+                    // MNT-6480 - File should be renamed but not deleted
+                    assertTrue(nodeService.exists(testFileInfo.getNodeRef()));
+                    assertEquals(newFileName, nodeService.getProperty(testFileInfo.getNodeRef(), ContentModel.PROP_NAME));
+                }
+                catch (WebDAVServerException e)
+                {
+                    fail("Fail to rename node: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+                }
+                finally
+                {
+                    nodeService.deleteNode(testFileInfo.getNodeRef());
+                }
+                return null;
+            }
+        });
+    }
+    
+    @Test
+    public void testMNT_9777()
+    {
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
+        {
+            @Override
+            public Object execute() throws Throwable
+            {
+                // create test file with name that does match getDAVHelper().isRenameShuffle()
+                String originalFileName = "tempfile-" + GUID.generate() + ".tmp";
+                
+                // destination within same folder
+                String newFileName = "destfile-" + GUID.generate() + ".txt";
+                
+                FileInfo sourceFileInfo = fileFolderService.create(companyHomeNodeRef, originalFileName, ContentModel.TYPE_CONTENT);
+                FileInfo newFileInfo = fileFolderService.create(companyHomeNodeRef, newFileName, ContentModel.TYPE_CONTENT);
+
+                String newContent = GUID.generate();
+                ContentWriter writer;
+                writer = contentService.getWriter(sourceFileInfo.getNodeRef(), ContentModel.PROP_CONTENT, true);
+                writer.putContent(newContent);
+                
+                req = new MockHttpServletRequest(WebDAV.METHOD_MOVE, "/alfresco/webdav/" + sourceFileInfo.getName());
+                resp = new MockHttpServletResponse();
+                req.setServerPort(8080);
+                req.setContextPath("/alfresco");
+                req.setServletPath("/webdav");
+
+                moveMethod = new MoveMethod();
+                moveMethod.setDetails(req, resp, webDAVHelper, companyHomeNodeRef);
+
+                String destPath = "http://localhost:8080/alfresco/webdav/" + newFileName;
+                req.addHeader(WebDAV.HEADER_DESTINATION, destPath);
+
+                try
+                {
+                    moveMethod.execute();
+                    
+                    // MNT-9777 - Source node should be deleted
+                    assertTrue(!nodeService.exists(sourceFileInfo.getNodeRef()));
+                    
+                    // Content should be updated
+                    ContentReader reader = contentService.getReader(newFileInfo.getNodeRef(), ContentModel.PROP_CONTENT);
+                    assertEquals(newContent, reader.getContentString());
+                }
+                catch (WebDAVServerException e)
+                {
+                    fail("Fail to move node: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+                }
+                finally
+                {
+                    nodeService.deleteNode(newFileInfo.getNodeRef());
+                }
+                return null;
+            }
+        });
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/PutMethodTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/PutMethodTest.java
new file mode 100644
index 00000000000..dfb85113825
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/webdav/PutMethodTest.java
@@ -0,0 +1,895 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.executer.ContentMetadataExtracter;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.permissions.AccessDeniedException;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.rest.api.tests.client.data.Action;
+import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.coci.CheckOutCheckInService;
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.lock.LockStatus;
+import org.alfresco.service.cmr.lock.LockType;
+import org.alfresco.service.cmr.lock.UnableToAquireLockException;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.GUID;
+import org.alfresco.util.PropertyMap;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.springframework.context.ApplicationContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.transaction.Status;
+import javax.transaction.UserTransaction;
+
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * Unit tests for the {@link PutMethod} class.
+ *
+ * @author alex.mukha
+ */
+@Category(LuceneTests.class)
+public class PutMethodTest
+{
+    private static ApplicationContext ctx;
+
+    private static final String USER1_NAME = "user1-" + PutMethodTest.class.getName();
+    private static final String USER2_NAME = "user2-" + PutMethodTest.class.getName();
+    private static final String TEST_DATA_FILE_NAME = "filewithdata.txt";
+    private static final String DAV_LOCK_INFO_ADMIN = "davLockInfoAdmin.xml";
+    private static final String DAV_LOCK_INFO_USER2 = "davLockInfoUser2.xml";
+    private byte[] testDataFile;
+    private byte[] davLockInfoAdminFile;
+    private byte[] davLockInfoUser2File;
+
+    private MockHttpServletRequest request;
+    private MockHttpServletResponse response;
+    private WebDAVMethod method;
+    private UserTransaction txn = null;
+
+    private SearchService searchService;
+    private FileFolderService fileFolderService;
+    private NodeService nodeService;
+    private TransactionService transactionService;
+    private WebDAVHelper webDAVHelper;
+    private MutableAuthenticationService authenticationService;
+    private PersonService personService;
+    private LockService lockService;
+    private ContentService contentService;
+    private CheckOutCheckInService checkOutCheckInService;
+    private PermissionService permissionService;
+    private ActionService actionService;
+
+    private Repository repositoryHelper;
+    private NodeRef companyHomeNodeRef;
+    private NodeRef versionableDoc;
+    private String versionableDocName;
+    private StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
+    private NamespaceService namespaceService;
+
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception
+    {
+        ctx = ApplicationContextHelper.getApplicationContext(new String[]
+            {
+                "classpath:alfresco/application-context.xml",
+                "classpath:alfresco/web-scripts-application-context.xml",
+                "classpath:alfresco/remote-api-context.xml"
+            });
+    }
+
+    @Before
+    public void setUp() throws Exception
+    {
+        searchService = ctx.getBean("SearchService", SearchService.class);
+        fileFolderService = ctx.getBean("FileFolderService", FileFolderService.class);
+        nodeService = ctx.getBean("NodeService", NodeService.class);
+        transactionService = ctx.getBean("transactionService", TransactionService.class);
+        webDAVHelper = ctx.getBean("webDAVHelper", WebDAVHelper.class);
+        authenticationService = ctx.getBean("authenticationService", MutableAuthenticationService.class);
+        personService = ctx.getBean("PersonService", PersonService.class);
+        lockService = ctx.getBean("LockService", LockService.class);
+        contentService = ctx.getBean("contentService", ContentService.class);
+        checkOutCheckInService = ctx.getBean("CheckOutCheckInService", CheckOutCheckInService.class);
+        permissionService = ctx.getBean("PermissionService", PermissionService.class);
+        namespaceService = ctx.getBean("namespaceService", NamespaceService.class);
+        actionService = ctx.getBean("ActionService", ActionService.class);
+
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+        repositoryHelper = (Repository)ctx.getBean("repositoryHelper");
+        companyHomeNodeRef = repositoryHelper.getCompanyHome();
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+        createUser(USER1_NAME);
+        createUser(USER2_NAME);
+
+        InputStream testDataIS = getClass().getClassLoader().getResourceAsStream(TEST_DATA_FILE_NAME);
+        InputStream davLockInfoAdminIS = getClass().getClassLoader().getResourceAsStream(DAV_LOCK_INFO_ADMIN);
+        InputStream davLockInfoUser2IS = getClass().getClassLoader().getResourceAsStream(DAV_LOCK_INFO_USER2);
+        
+        testDataFile = IOUtils.toByteArray(testDataIS);
+        davLockInfoAdminFile = IOUtils.toByteArray(davLockInfoAdminIS);
+        davLockInfoUser2File = IOUtils.toByteArray(davLockInfoUser2IS);
+
+        testDataIS.close();
+        davLockInfoAdminIS.close();
+        davLockInfoUser2IS.close();
+
+        // Create a test file with versionable aspect and content
+        Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
+        versionableDocName = "doc-" + GUID.generate();
+        properties.put(ContentModel.PROP_NAME, versionableDocName);
+
+        versionableDoc = nodeService.createNode(companyHomeNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName(ContentModel.USER_MODEL_URI, versionableDocName),
+                ContentModel.TYPE_CONTENT, properties).getChildRef();
+        contentService.getWriter(versionableDoc, ContentModel.PROP_CONTENT, true).putContent("WebDAVTestContent");
+        nodeService.addAspect(versionableDoc, ContentModel.ASPECT_VERSIONABLE, null);
+
+        txn.commit();
+
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+    }
+
+    private void createUser(String userName)
+    {
+        if (!authenticationService.authenticationExists(userName))
+        {
+            authenticationService.createAuthentication(userName, "PWD".toCharArray());
+        }
+
+        if (!personService.personExists(userName))
+        {
+            PropertyMap ppOne = new PropertyMap();
+            ppOne.put(ContentModel.PROP_USERNAME, userName);
+            ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
+            ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
+            ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
+            ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
+
+            personService.createPerson(ppOne);
+        }
+    }
+
+    @After
+    public void tearDown() throws Exception
+    {
+        method = null;
+        request = null;
+        response = null;
+        testDataFile = null;
+        davLockInfoAdminFile = null;
+
+        if (txn.getStatus() == Status.STATUS_MARKED_ROLLBACK)
+        {
+            txn.rollback();
+        }
+        else
+        {
+            txn.commit();
+        }
+        
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        deleteUser(USER1_NAME);
+        deleteUser(USER2_NAME);
+
+        nodeService.deleteNode(versionableDoc);
+
+        // As per MNT-10037 try to create a node and delete it in the next txn
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+
+        Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
+        String nodeName = "leak-session-doc-" + GUID.generate();
+        properties.put(ContentModel.PROP_NAME, nodeName);
+
+        NodeRef nodeRef = nodeService.createNode(companyHomeNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName(ContentModel.USER_MODEL_URI, nodeName),
+                ContentModel.TYPE_CONTENT, properties).getChildRef();
+        contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true).putContent("WebDAVTestContent");
+
+        txn.commit();
+
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+
+        nodeService.deleteNode(nodeRef);
+
+        txn.commit();
+
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+
+    private void deleteUser(String userName)
+    {
+        // Delete the user, as admin
+        if (this.personService.personExists(userName))
+        {
+            this.personService.deletePerson(userName);
+        }
+        if (this.authenticationService.authenticationExists(userName))
+        {
+            this.authenticationService.deleteAuthentication(userName);
+        }
+    }
+
+    @Test
+    public void testPutContentToNonExistingFile() throws Exception
+    {
+        String fileName = "file-" + GUID.generate();
+        NodeRef fileNoderef = null;
+        try
+        {
+            executeMethod(WebDAV.METHOD_PUT, fileName, testDataFile, null);
+
+            List<NodeRef> refs = searchService.selectNodes(nodeService.getRootNode(storeRef),
+                "/app:company_home/cm:" + fileName , null, namespaceService, false);
+            fileNoderef = refs.get(0);
+
+            assertTrue("File does not exist.", nodeService.exists(fileNoderef));
+            assertEquals("Filename is not correct", fileName, nodeService.getProperty(fileNoderef, ContentModel.PROP_NAME));
+            assertTrue("Expected return status is " + HttpServletResponse.SC_CREATED + ", but returned is " + response.getStatus(),
+                    HttpServletResponse.SC_CREATED == response.getStatus());
+            InputStream updatedFileIS = fileFolderService.getReader(fileNoderef).getContentInputStream();
+            byte[] updatedFile = IOUtils.toByteArray(updatedFileIS);
+            updatedFileIS.close();
+            assertTrue("The content has to be equal", ArrayUtils.isEquals(testDataFile, updatedFile));
+        }
+        catch (Exception e)
+        {
+            fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+        finally
+        {
+            if (fileNoderef != null)
+            {
+                nodeService.deleteNode(fileNoderef);
+            }
+        }
+    }
+
+    @Test
+    public void testPutContentToAnExistingFile() throws Exception
+    {
+        FileInfo testFileInfo = fileFolderService.create(companyHomeNodeRef, "file-" + GUID.generate(), ContentModel.TYPE_CONTENT);
+        try
+        {
+            executeMethod(WebDAV.METHOD_PUT, testFileInfo.getName(), testDataFile, null);
+
+            assertTrue("File does not exist.", nodeService.exists(testFileInfo.getNodeRef()));
+            assertEquals("Filename is not correct.", testFileInfo.getName(), nodeService.getProperty(testFileInfo.getNodeRef(), ContentModel.PROP_NAME));
+            assertTrue("Expected return status is " + HttpServletResponse.SC_NO_CONTENT + ", but returned is " + response.getStatus(),
+                    HttpServletResponse.SC_NO_CONTENT == response.getStatus());
+            InputStream updatedFileIS = fileFolderService.getReader(testFileInfo.getNodeRef()).getContentInputStream();
+            byte[] updatedFile = IOUtils.toByteArray(updatedFileIS);
+            updatedFileIS.close();
+            assertTrue("The content has to be equal", ArrayUtils.isEquals(testDataFile, updatedFile));
+        }
+        catch (Exception e)
+        {
+            fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+        finally
+        {
+            nodeService.deleteNode(testFileInfo.getNodeRef());
+        }
+    }
+
+    /**
+     * Updating a file in an non-existent path
+     */
+    @Test
+    public void testPutContentBadPath() throws Exception
+    {
+        String fileName = "file-" + GUID.generate();
+        NodeRef fileNoderef = null;
+        try
+        {
+            // Add non-existent path
+            executeMethod(WebDAV.METHOD_PUT, "non/existent/path" + fileName, testDataFile, null);
+
+            fail("The PUT execution should fail with a 400 error");
+        }
+        catch (WebDAVServerException wse)
+        {
+            // The execution failed and it is expected
+            assertTrue(wse.getHttpStatusCode() == HttpServletResponse.SC_CONFLICT);
+        }
+        catch (Exception e)
+        {
+            fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+        finally
+        {
+            if (fileNoderef != null)
+            {
+                nodeService.deleteNode(fileNoderef);
+            }
+        }
+    }
+
+    /**
+     * Creating a folder and trying to update it with a file
+     */
+    @Test
+    public void testPutContentToFolder() throws Exception
+    {
+        FileInfo testFileInfo = fileFolderService.create(companyHomeNodeRef, "folder-" + GUID.generate(), ContentModel.TYPE_FOLDER);
+        try
+        {
+            executeMethod(WebDAV.METHOD_PUT, testFileInfo.getName(), testDataFile, null);
+
+            fail("The PUT execution should fail with a 400 error");
+        }
+        catch (WebDAVServerException wse)
+        {
+            // The execution failed and it is expected
+            assertTrue(wse.getHttpStatusCode() == HttpServletResponse.SC_BAD_REQUEST);
+        }
+        catch (Exception e)
+        {
+            fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+        finally
+        {
+            nodeService.deleteNode(testFileInfo.getNodeRef());
+        }
+    }
+
+    /**
+     * Putting a content to a locked file
+     * <p>
+     * Create and lock a file by admin
+     * <p>
+     * Try to put the content by user
+     */
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testPutContentToLockedFIle() throws Exception
+    {
+        FileInfo testFileInfo = fileFolderService.create(companyHomeNodeRef, "file-" + GUID.generate(), ContentModel.TYPE_CONTENT);
+        lockService.lock(testFileInfo.getNodeRef(), LockType.WRITE_LOCK);
+        try
+        {
+            AuthenticationUtil.setFullyAuthenticatedUser(USER1_NAME);
+            executeMethod(WebDAV.METHOD_PUT, testFileInfo.getName(), testDataFile, null);
+
+            fail("The PUT execution should fail with a 423 error");
+        }
+        catch (WebDAVServerException wse)
+        {
+            // The execution failed and it is expected
+            assertTrue(wse.getHttpStatusCode() == WebDAV.WEBDAV_SC_LOCKED);
+        }
+        catch (Exception e)
+        {
+            fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+        finally
+        {
+            AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+            nodeService.deleteNode(testFileInfo.getNodeRef());
+        }
+    }
+
+    /**
+     * Putting a content to a working copy file
+     * <p>
+     * Create and check out a file by user1
+     * <p>
+     * Try to put the content to the working copy by user2
+     * 
+     * See MNT-8614.
+     */
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testPutContentToWorkingCopy() throws Exception
+    {
+        FileInfo folder = fileFolderService.create(companyHomeNodeRef, "folder-" + GUID.generate(), ContentModel.TYPE_FOLDER);
+        permissionService.setInheritParentPermissions(folder.getNodeRef(), false);
+        permissionService.setPermission(folder.getNodeRef(), USER1_NAME, permissionService.getAllPermission(), true);
+
+        AuthenticationUtil.setFullyAuthenticatedUser(USER1_NAME);
+        FileInfo testFileInfo = fileFolderService.create(folder.getNodeRef(), "file-" + GUID.generate(), ContentModel.TYPE_CONTENT);
+        NodeRef workingCopyNodeRef = checkOutCheckInService.checkout(testFileInfo.getNodeRef());
+        String workingCopyName = fileFolderService.getFileInfo(workingCopyNodeRef).getName();
+        String pathToWC = "/" + folder.getName() + "/" + workingCopyName;
+        String pathToOriginal = "/" + folder.getName() + "/" + testFileInfo.getName();
+
+        // Negative test, try to edit the WC without permissions.
+        AuthenticationUtil.setFullyAuthenticatedUser(USER2_NAME);
+        try
+        {
+            lockService.lock(workingCopyNodeRef, LockType.WRITE_LOCK);
+        }
+        catch (AccessDeniedException ade)
+        {
+            // expected
+        }
+
+        try
+        {
+            executeMethod(WebDAV.METHOD_LOCK, pathToWC, davLockInfoUser2File, null);
+
+            fail("The LOCK execution should fail with a 401 error");
+        }
+        catch (WebDAVServerException wse)
+        {
+            // The execution failed and it is expected
+            assertTrue("The status code was " + wse.getHttpStatusCode() + ", but should be " + HttpServletResponse.SC_UNAUTHORIZED,
+                    wse.getHttpStatusCode() == HttpServletResponse.SC_UNAUTHORIZED);
+        }
+        catch (Exception e)
+        {
+            fail("Unexpected exception occurred: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+
+        // Construct IF HEADER
+        String lockToken = workingCopyNodeRef.getId() + WebDAV.LOCK_TOKEN_SEPERATOR + USER2_NAME;
+        String lockHeaderValue = "(<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">)";
+        HashMap<String, String> headers = new HashMap<String, String>();
+        headers.put(WebDAV.HEADER_IF, lockHeaderValue);
+        try
+        {
+            executeMethod(WebDAV.METHOD_PUT, pathToWC, testDataFile, headers);
+            fail("The PUT execution should fail with a 423 error");
+        }
+        catch (WebDAVServerException wse)
+        {
+            // The execution failed and it is expected
+            assertTrue("The status code was " + wse.getHttpStatusCode() + ", but should be " + HttpServletResponse.SC_UNAUTHORIZED,
+                    wse.getHttpStatusCode() == HttpServletResponse.SC_UNAUTHORIZED);
+        }
+        catch (Exception e)
+        {
+            fail("Unexpected exception occurred: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+
+        // Positive test
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        permissionService.setPermission(folder.getNodeRef(), USER2_NAME, permissionService.getAllPermission(), true);
+
+        AuthenticationUtil.setFullyAuthenticatedUser(USER2_NAME);
+        try
+        {
+            executeMethod(WebDAV.METHOD_LOCK, pathToWC, davLockInfoUser2File, null);
+
+            assertEquals("File should be locked", LockStatus.LOCK_OWNER, lockService.getLockStatus(workingCopyNodeRef));
+        }
+        catch (Exception e)
+        {
+            fail("Failed to lock a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+
+        headers = new HashMap<String, String>();
+        headers.put(WebDAV.HEADER_IF, lockHeaderValue);
+        try
+        {
+            executeMethod(WebDAV.METHOD_PUT, pathToWC, testDataFile, headers);
+
+            assertTrue("File does not exist.", nodeService.exists(workingCopyNodeRef));
+            assertEquals("Filename is not correct", workingCopyName, nodeService.getProperty(workingCopyNodeRef, ContentModel.PROP_NAME));
+            assertTrue("Expected return status is " + HttpServletResponse.SC_NO_CONTENT + ", but returned is " + response.getStatus(),
+                    HttpServletResponse.SC_NO_CONTENT == response.getStatus());
+
+            assertTrue("File should have NO_CONTENT aspect", nodeService.hasAspect(workingCopyNodeRef, ContentModel.ASPECT_NO_CONTENT));
+            InputStream updatedFileIS = fileFolderService.getReader(workingCopyNodeRef).getContentInputStream();
+            byte[] updatedFile = IOUtils.toByteArray(updatedFileIS);
+            updatedFileIS.close();
+            assertTrue("The content has to be equal", ArrayUtils.isEquals(testDataFile, updatedFile));
+        }
+        catch (Exception e)
+        {
+            fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+
+        headers = new HashMap<String, String>();
+        headers.put(WebDAV.HEADER_LOCK_TOKEN, "<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">");
+        try
+        {
+            executeMethod(WebDAV.METHOD_UNLOCK, pathToWC, null, headers);
+
+            assertTrue("Expected return status is " + HttpServletResponse.SC_NO_CONTENT + ", but returned is " + response.getStatus(),
+                    HttpServletResponse.SC_NO_CONTENT == response.getStatus());
+            assertFalse("File should not have NO_CONTENT aspect", nodeService.hasAspect(workingCopyNodeRef, ContentModel.ASPECT_NO_CONTENT));
+            assertEquals("File should be unlocked", LockStatus.NO_LOCK, lockService.getLockStatus(workingCopyNodeRef));
+        }
+        catch (Exception e)
+        {
+            fail("Failed to unlock a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+
+        // Negative test try to lock or edit the original file
+        AuthenticationUtil.setFullyAuthenticatedUser(USER2_NAME);
+        try
+        {
+            lockService.lock(testFileInfo.getNodeRef(), LockType.WRITE_LOCK);
+        }
+        catch (UnableToAquireLockException uale)
+        {
+            // expected
+        }
+
+        try
+        {
+            executeMethod(WebDAV.METHOD_LOCK, pathToOriginal, davLockInfoUser2File, null);
+
+            fail("The LOCK execution should fail with a 423 error");
+        }
+        catch (WebDAVServerException wse)
+        {
+            // The execution failed and it is expected
+            assertTrue("The status code was " + wse.getHttpStatusCode() + ", but should be " + WebDAV.WEBDAV_SC_LOCKED, wse.getHttpStatusCode() == WebDAV.WEBDAV_SC_LOCKED);
+        }
+        catch (Exception e)
+        {
+            fail("Unexpected exception occurred: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+
+        // Construct IF HEADER
+        lockToken = testFileInfo.getNodeRef().getId() + WebDAV.LOCK_TOKEN_SEPERATOR + USER2_NAME;
+        lockHeaderValue = "(<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">)";
+        headers = new HashMap<String, String>();
+        headers.put(WebDAV.HEADER_IF, lockHeaderValue);
+        try
+        {
+            executeMethod(WebDAV.METHOD_PUT, pathToOriginal, testDataFile, headers);
+            fail("The PUT execution should fail with a 423 error");
+        }
+        catch (WebDAVServerException wse)
+        {
+            // The execution failed and it is expected
+            assertTrue("The status code was " + wse.getHttpStatusCode() + ", but should be " + WebDAV.WEBDAV_SC_LOCKED, wse.getHttpStatusCode() == WebDAV.WEBDAV_SC_LOCKED);
+        }
+        catch (Exception e)
+        {
+            fail("Unexpected exception occurred: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+
+        AuthenticationUtil.setFullyAuthenticatedUser(USER1_NAME);
+        checkOutCheckInService.checkin(workingCopyNodeRef, null);
+
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        nodeService.deleteNode(folder.getNodeRef());
+    }
+    
+    /**
+     * Putting a content and check versioning
+     * <p>
+     * The node will be deleted in after test.
+     */
+    @Test
+    public void testPutContentCheckVersions() throws Exception
+    {
+        assertEquals("The version should be 1.0 as no file modifications were done yet.", "1.0", nodeService.getProperty(versionableDoc, ContentModel.PROP_VERSION_LABEL));
+
+        // Lock the node
+        try
+        {
+            executeMethod(WebDAV.METHOD_LOCK, versionableDocName, davLockInfoAdminFile, null);
+
+            assertEquals("The version should not advance", "1.0", nodeService.getProperty(versionableDoc, ContentModel.PROP_VERSION_LABEL));
+        }
+        catch (Exception e)
+        {
+            fail("Failed to lock a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+
+        // Split to transactions to check the commit
+        txn.commit();
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+        assertEquals("The version should not advance", "1.0", nodeService.getProperty(versionableDoc, ContentModel.PROP_VERSION_LABEL));
+
+        // Put non-zero content
+        // Construct IF HEADER
+        String lockToken = versionableDoc.getId() + WebDAV.LOCK_TOKEN_SEPERATOR + AuthenticationUtil.getAdminUserName();
+        String lockHeaderValue = "(<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">)";
+        HashMap<String, String> headers = new HashMap<String, String>();
+        headers.put(WebDAV.HEADER_IF, lockHeaderValue);
+        try
+        {
+            executeMethod(WebDAV.METHOD_PUT, versionableDocName, testDataFile, headers);
+
+            assertEquals("The version should not advance", "1.0", nodeService.getProperty(versionableDoc, ContentModel.PROP_VERSION_LABEL));
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("Failed to upload a file", e);
+        }
+
+        // Split to transactions to check the commit
+        txn.commit();
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+        assertEquals("The version should advance", "1.1", nodeService.getProperty(versionableDoc, ContentModel.PROP_VERSION_LABEL));
+
+        // Unlock
+        headers = new HashMap<String, String>();
+        headers.put(WebDAV.HEADER_LOCK_TOKEN, "<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">");
+        try
+        {
+            executeMethod(WebDAV.METHOD_UNLOCK, versionableDocName, null, headers);
+
+            assertEquals("The version should not advance from 1.1", "1.1", nodeService.getProperty(versionableDoc, ContentModel.PROP_VERSION_LABEL));
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("Failed to unlock a file", e);
+        }
+
+        // Split to transactions to check the commit
+        txn.commit();
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+        assertEquals("The version should not advance from 1.1", "1.1", nodeService.getProperty(versionableDoc, ContentModel.PROP_VERSION_LABEL));
+    }
+
+    /**
+     * Putting a zero content file and update it
+     * <p>
+     * Put an empty file
+     * <p>
+     * Lock the file
+     * <p>
+     * Put the contents
+     * <p>
+     * Unlock the node
+     */
+    @Test
+    public void testPutNoContentFileAndUpdate() throws Exception
+    {
+        String fileName = "file-" + GUID.generate();
+        NodeRef fileNoderef = null;
+        try
+        {
+            executeMethod(WebDAV.METHOD_PUT, fileName, new byte[0], null);
+
+            List<NodeRef> refs = searchService.selectNodes(nodeService.getRootNode(storeRef),
+                "/app:company_home/cm:" + fileName , null, namespaceService, false);
+            fileNoderef = refs.get(0);
+
+            assertTrue("File should exist.", nodeService.exists(fileNoderef));
+            assertEquals("Filename is not correct", fileName, nodeService.getProperty(fileNoderef, ContentModel.PROP_NAME));
+
+            assertTrue("Expected return status is " + HttpServletResponse.SC_CREATED + ", but returned is " + response.getStatus(),
+                    HttpServletResponse.SC_CREATED == response.getStatus());
+            byte[] updatedFile = IOUtils.toByteArray(fileFolderService.getReader(fileNoderef).getContentInputStream());
+            assertTrue("The content should be empty", updatedFile.length == 0);
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("Failed to upload a file", e);
+        }
+
+        try
+        {
+            executeMethod(WebDAV.METHOD_LOCK, fileName, davLockInfoAdminFile, null);
+
+            assertEquals("File should be locked", LockStatus.LOCK_OWNER, lockService.getLockStatus(fileNoderef));
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("Failed to lock a file", e);
+        }
+
+        // Construct IF HEADER
+        String lockToken = fileNoderef.getId() + WebDAV.LOCK_TOKEN_SEPERATOR + AuthenticationUtil.getAdminUserName();
+        String lockHeaderValue = "(<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">)";
+        HashMap<String, String> headers = new HashMap<String, String>();
+        headers.put(WebDAV.HEADER_IF, lockHeaderValue);
+        try
+        {
+            executeMethod(WebDAV.METHOD_PUT, fileName, testDataFile, headers);
+
+            assertTrue("File does not exist.", nodeService.exists(fileNoderef));
+            assertEquals("Filename is not correct", fileName, nodeService.getProperty(fileNoderef, ContentModel.PROP_NAME));
+            assertTrue("Expected return status is " + HttpServletResponse.SC_NO_CONTENT + ", but returned is " + response.getStatus(),
+                    HttpServletResponse.SC_NO_CONTENT == response.getStatus());
+
+            assertTrue("File should have NO_CONTENT aspect", nodeService.hasAspect(fileNoderef, ContentModel.ASPECT_NO_CONTENT));
+            InputStream updatedFileIS = fileFolderService.getReader(fileNoderef).getContentInputStream();
+            byte[] updatedFile = IOUtils.toByteArray(updatedFileIS);
+            updatedFileIS.close();
+            assertTrue("The content has to be equal", ArrayUtils.isEquals(testDataFile, updatedFile));
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("Failed to upload a file", e);
+        }
+
+        headers = new HashMap<String, String>();
+        headers.put(WebDAV.HEADER_LOCK_TOKEN, "<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">");
+        try
+        {
+            executeMethod(WebDAV.METHOD_UNLOCK, fileName, null, headers);
+
+            assertTrue("Expected return status is " + HttpServletResponse.SC_NO_CONTENT + ", but returned is " + response.getStatus(),
+                    HttpServletResponse.SC_NO_CONTENT == response.getStatus());
+            assertFalse("File should not have NO_CONTENT aspect", nodeService.hasAspect(fileNoderef, ContentModel.ASPECT_NO_CONTENT));
+            assertEquals("File should be unlocked", LockStatus.NO_LOCK, lockService.getLockStatus(fileNoderef));
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("Failed to unlock a file", e);
+        }
+
+        if (fileNoderef != null)
+        {
+            nodeService.deleteNode(fileNoderef);
+        }
+    }
+
+    /**
+     * Negative test to check that a temp file will be deleted from the repo if writing the content fails
+     */
+    @Test
+    public void testPutNullContent() throws Exception
+    {
+        String fileName = "file-" + GUID.generate();
+        NodeRef fileNoderef = null;
+
+        // Lock the node
+        try
+        {
+            executeMethod(WebDAV.METHOD_LOCK, fileName, davLockInfoAdminFile, null);
+            List<NodeRef> refs = searchService.selectNodes(nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE),
+                "/app:company_home/cm:" + fileName , null, namespaceService, false);
+            fileNoderef = refs.get(0);
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("Failed to lock a file", e);
+        }
+
+        txn.commit();
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+
+        // Construct IF HEADER
+        String lockToken = fileNoderef.getId() + WebDAV.LOCK_TOKEN_SEPERATOR + AuthenticationUtil.getAdminUserName();
+        String lockHeaderValue = "(<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">)";
+        HashMap<String, String> headers = new HashMap<String, String>();
+        headers.put(WebDAV.HEADER_IF, lockHeaderValue);
+        // Simulate any failure during the content write
+        // null content is no longer null in MockHttpServletRequest (Spring 5)
+        ActionService mockActionService = mock(ActionService.class);
+        when(mockActionService.createAction(ContentMetadataExtracter.EXECUTOR_NAME))
+                .thenThrow(new AlfrescoRuntimeException("Negative test"));
+        try
+        {
+            webDAVHelper.setActionService(mockActionService);
+            // setting a null content
+            executeMethod(WebDAV.METHOD_PUT, fileName, null, headers);
+
+            fail("The execution should fail.");
+        }
+        catch (WebDAVServerException wse)
+        {
+            if (nodeService.exists(fileNoderef))
+            {
+                nodeService.deleteNode(fileNoderef);
+                fail("File exist, but should not.");
+            }
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("Failed to upload a file", e);
+        }
+        finally
+        {
+            webDAVHelper.setActionService(actionService);
+        }
+
+        if (fileNoderef != null && nodeService.exists(fileNoderef))
+        {
+            nodeService.deleteNode(fileNoderef);
+        }
+    }
+
+    /**
+     * Executes WebDAV method for testing
+     * <p>
+     * Sets content to request from a test file
+     * 
+     * @param methodName Method to prepare, should be initialized (PUT, LOCK, UNLOCK are supported)
+     * @param fileName the name of the file set to the context, can be used with path, i.e. "path/to/file/fileName.txt"
+     * @param content If <b>not null</b> adds test content to the request
+     * @param headers to set to request, can be null
+     * @throws Exception
+     */
+    private void executeMethod(String methodName, String fileName, byte[] content, Map<String, String> headers) throws Exception
+    {
+        if (methodName == WebDAV.METHOD_PUT)
+            method = new PutMethod();
+        else if (methodName == WebDAV.METHOD_LOCK)
+            method = new LockMethod();
+        else if (methodName == WebDAV.METHOD_UNLOCK)
+            method = new UnlockMethod();
+        if (method != null)
+        {
+            request = new MockHttpServletRequest(methodName, "/alfresco/webdav/" + fileName);
+            response = new MockHttpServletResponse();
+            request.setServerPort(8080);
+            request.setServletPath("/webdav");
+            if (content != null)
+            {
+                request.setContent(content);
+            }
+
+            if (headers != null && !headers.isEmpty())
+            {
+                for (String key : headers.keySet())
+                {
+                    request.addHeader(key, headers.get(key));
+                }
+            }
+
+            method.setDetails(request, response, webDAVHelper, companyHomeNodeRef);
+
+            method.execute();
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/RenameShuffleDetectionTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/RenameShuffleDetectionTest.java
new file mode 100644
index 00000000000..26b0e25a40c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/webdav/RenameShuffleDetectionTest.java
@@ -0,0 +1,106 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Tests for {@link WebDAVHelper}'s rename shuffle detection method.
+ * 
+ * @author Matt Ward
+ */
+@RunWith(Parameterized.class)
+public class RenameShuffleDetectionTest
+{
+    private WebDAVHelper davHelper;
+    private String path;
+    private boolean expectedResult;
+    
+    public RenameShuffleDetectionTest(String path, boolean expectedResult)
+    {
+        this.path = path;
+        this.expectedResult = expectedResult;
+    }
+    
+    @Before
+    public void setUp() throws Exception
+    {
+        davHelper = new WebDAVHelper();
+    }
+
+    @Parameters
+    public static Collection<Object[]> data()
+    {
+        Object[][] data = new Object[][] {
+            // Simple cases that shouldn't be detected as a rename shuffle
+            { "a_file.doc", false },
+            { "/path/a_file.doc", false },
+            { "__file__name.xls", false },
+            { "/some/parent/ffffffff.doc", false}, // ALF-19673
+            // Paths that should be detected as "rename shuffles"
+            { "/some/parent/.tmp", true },
+            { "/some/parent/a.tmp", true },
+            { "/some/parent/ffffffff.tmp", true },
+            { "/some/parent/.any_hidden_file", true },
+            { "/some/parent/any_file.wbk", true },            
+            { "/some/parent/ends_in_tilda~", true },            
+            { "/some/parent/junk_backup_morejunk.doc", true },            
+            { "/some/parent/junk_backup_morejunk.docx", true },            
+            { "/some/parent/junk_backup_morejunk.docm", true },            
+            { "/some/parent/junk_backup_morejunk.docxm", true }, // MW: is this an intentional match?            
+            { "/some/parent/junk_backup_morejunk.dotx", true },
+            { "/some/parent/junk_backup_morejunk.dotm", true },
+            { "/some/parent/junk_backup_morejunk.dotxm", true }, // MW: is this an intentional match?
+            // TODO: review these cases, in context of ALF-19673
+            { "/some/parent/aaaaaaaa", true },
+            { "/some/parent/ffffffff", true },
+            { "/some/parent/ffffffffff", true },
+            { "/some/parent/ab0c1d2ef3456789", true},
+            { "aaaaaaaa", true },
+            { "abcdef01", true },
+            { "1234567890.txt.sb-764f0c5c-JUoEKy", true }, // MNT-10373 test for TextEdit shuffle
+            // Photoshop (MNT-8971)
+            { "/psC1DA.tmp", true },
+            { "/path/psA1B5.tmp", true }
+        };
+        return Arrays.asList(data);
+    }
+    
+    @Test
+    public void testIsRenameShuffle()
+    {
+        assertEquals("Incorrect result for path: " + path, expectedResult, davHelper.isRenameShuffle(path));
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/UnlockMethodTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/UnlockMethodTest.java
new file mode 100644
index 00000000000..06831061936
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/webdav/UnlockMethodTest.java
@@ -0,0 +1,400 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import java.io.Serializable;
+import java.util.Collections;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.coci.CheckOutCheckInService;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.GUID;
+import org.alfresco.util.TestWithUserUtils;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.context.ApplicationContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+@RunWith(MockitoJUnitRunner.class)
+public class UnlockMethodTest
+{
+    private UnlockMethod unlockMethod;
+    private LockMethod lockMethod;
+    private MockHttpServletRequest request;
+    private MockHttpServletResponse response;
+    private @Mock WebDAVHelper davHelper;    
+    ApplicationContext appContext;
+    
+    /**
+     * Services used by the tests
+     */
+    private NodeService nodeService;
+    private CheckOutCheckInService cociService;
+    private ContentService contentService;
+    private MutableAuthenticationService authenticationService;
+    private AuthenticationComponent authenticationComponent;
+    private TransactionService transactionService;
+    private PermissionService permissionService;
+
+    /**
+     * Data used by the tests
+     */
+    private StoreRef storeRef;
+    private NodeRef rootNodeRef;
+    private String userNodeRef;
+    private NodeRef folderNodeRef;
+    private NodeRef fileNodeRef;
+    private NodeRef fileWorkingCopyNodeRef;
+
+    /**
+     * Types and properties used by the tests
+     */
+    private static final String CONTENT_1 = "This is some content";
+    private static final String TEST_STORE_IDENTIFIER = "test_store-" + System.currentTimeMillis();
+    private static final String TEST_FILE_NAME = "file";
+
+    /**
+     * User details 
+     */
+    private String userName;
+    private static final String PWD = "password";
+    
+    @Before
+    public void setUp() throws Exception
+    {
+        request = new MockHttpServletRequest();
+        response = new MockHttpServletResponse();
+        unlockMethod = new UnlockMethod();
+        unlockMethod.setDetails(request, response, davHelper, null);
+        lockMethod = new LockMethod();
+        lockMethod.setDetails(request, null, davHelper, null);
+    }
+
+    /**
+     * Set up preconditions for unlock a checked out node
+     */
+    protected void setUpPreconditionForCheckedOutTest() throws Exception
+    {
+        appContext = ApplicationContextHelper.getApplicationContext(new String[]
+        {
+            "classpath:alfresco/application-context.xml", "classpath:alfresco/web-scripts-application-context.xml",
+            "classpath:alfresco/remote-api-context.xml"
+        });
+
+        // Set the services
+        this.cociService = (CheckOutCheckInService) appContext.getBean("checkOutCheckInService");
+        this.contentService = (ContentService) appContext.getBean("contentService");
+        this.authenticationService = (MutableAuthenticationService) appContext.getBean("authenticationService");
+        this.permissionService = (PermissionService) appContext.getBean("permissionService");
+        this.transactionService = (TransactionService) appContext.getBean("TransactionService");
+        this.nodeService = (NodeService) appContext.getBean("NodeService");
+        // Authenticate as system to create initial test data set
+        this.authenticationComponent = (AuthenticationComponent) appContext.getBean("authenticationComponent");
+        this.authenticationComponent.setSystemUserAsCurrentUser();
+
+        RetryingTransactionCallback<Void> createTestFileCallback = new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                // Create the store and get the root node reference
+                storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, TEST_STORE_IDENTIFIER);
+                if (!nodeService.exists(storeRef))
+                {
+                    storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, TEST_STORE_IDENTIFIER);
+                }
+                rootNodeRef = nodeService.getRootNode(storeRef);
+
+                // Create and authenticate the user
+                userName = "webdavUnlockTest" + GUID.generate();
+                TestWithUserUtils.createUser(userName, PWD, rootNodeRef, nodeService, authenticationService);
+                permissionService.setPermission(rootNodeRef, userName, PermissionService.ALL_PERMISSIONS, true);
+                TestWithUserUtils.authenticateUser(userName, PWD, rootNodeRef, authenticationService);
+                userNodeRef = TestWithUserUtils.getCurrentUser(authenticationService);
+
+                // create test file in test folder
+                folderNodeRef = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("test"), ContentModel.TYPE_FOLDER,
+                        Collections.<QName, Serializable> singletonMap(ContentModel.PROP_NAME, "folder")).getChildRef();
+                fileNodeRef = nodeService.createNode(folderNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName("test"), ContentModel.TYPE_CONTENT,
+                        Collections.<QName, Serializable> singletonMap(ContentModel.PROP_NAME, TEST_FILE_NAME)).getChildRef();
+                ContentWriter contentWriter = contentService.getWriter(fileNodeRef, ContentModel.PROP_CONTENT, true);
+                contentWriter.setMimetype("text/plain");
+                contentWriter.setEncoding("UTF-8");
+                contentWriter.putContent(CONTENT_1);
+
+                // Check out test file
+                fileWorkingCopyNodeRef = cociService.checkout(fileNodeRef);
+                assertNotNull(fileWorkingCopyNodeRef);
+                assertEquals(userNodeRef, nodeService.getProperty(fileNodeRef, ContentModel.PROP_LOCK_OWNER));
+
+                return null;
+            }
+
+        };
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(createTestFileCallback);
+    }
+
+    @Test
+    public void parseValidLockTokenHeader() throws WebDAVServerException
+    {
+        String lockToken = "976e2f82-40ab-4852-a867-986e9ce11f82:admin";
+        String lockHeaderValue = "<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">";
+        request.addHeader(WebDAV.HEADER_LOCK_TOKEN, lockHeaderValue);
+        unlockMethod.parseRequestHeaders();
+        
+        assertEquals(lockToken, unlockMethod.getLockToken());
+    }
+    
+    @Test
+    public void parseInvalidLockTokenHeader()
+    {        
+        String lockToken = "976e2f82-40ab-4852-a867-986e9ce11f82:admin";
+        String lockHeaderValue = "<wrongprefix:" + lockToken + ">";
+        request.addHeader(WebDAV.HEADER_LOCK_TOKEN, lockHeaderValue);
+        try
+        {
+            unlockMethod.parseRequestHeaders();
+            fail("Exception should have been thrown, but wasn't.");
+        }
+        catch (WebDAVServerException e)
+        {
+            assertEquals(HttpServletResponse.SC_BAD_REQUEST, e.getHttpStatusCode());
+        }
+    }
+    
+    @Test
+    public void parseMissingLockTokenHeader()
+    {        
+        // Note: we're not adding the lock token header
+        try
+        {
+            unlockMethod.parseRequestHeaders();
+            fail("Exception should have been thrown, but wasn't.");
+        }
+        catch (WebDAVServerException e)
+        {
+            assertEquals(HttpServletResponse.SC_BAD_REQUEST, e.getHttpStatusCode());
+        }
+    }
+    
+    /**
+     * OpenOffice.org on Windows 7 results in a lock token header that is NOT enclosed in
+     * the required &lt; and &gt; characters. Whilst technically an invalid header, we treat
+     * this case specially for reasons of interoperability (ALF-13904)
+     * 
+     * @throws WebDAVServerException 
+     */
+    @Test
+    public void parseLockTokenHeaderFromOOoOnWindows7() throws WebDAVServerException
+    {        
+        String lockToken = "976e2f82-40ab-4852-a867-986e9ce11f82:admin";
+        // Note the missing enclosing < and > characters
+        String lockHeaderValue = WebDAV.OPAQUE_LOCK_TOKEN + lockToken;
+        request.addHeader(WebDAV.HEADER_LOCK_TOKEN, lockHeaderValue);
+        unlockMethod.parseRequestHeaders();
+        
+        assertEquals(lockToken, unlockMethod.getLockToken());
+    }
+
+    /**
+     * Test MNT-9680: Working copies are open in read-only mode when using Webdav online edit
+     *
+     * @throws Exception
+     */
+    @Test
+    public void unlockWorkingCopy() throws Exception
+    {
+        setUpPreconditionForCheckedOutTest();
+        try
+        {
+            String workingCopyName = nodeService.getProperty(fileWorkingCopyNodeRef, ContentModel.PROP_NAME).toString();
+            String lockToken = fileWorkingCopyNodeRef.getId() + WebDAV.LOCK_TOKEN_SEPERATOR + this.userName;
+            String lockHeaderValue = "<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">";
+            final WebDAVHelper davHelper = (WebDAVHelper) appContext.getBean("webDAVHelper");
+
+            request.addHeader(WebDAV.HEADER_LOCK_TOKEN, lockHeaderValue);
+            request.setRequestURI("/" + workingCopyName);
+            String content = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"
+                + "<d:lockinfo xmlns:d=\"DAV:\">"
+                + "<d:lockscope><d:exclusive/></d:lockscope>"
+                + "</d:lockinfo>";
+
+            request.setContent(content.getBytes("UTF-8"));
+
+            lockMethod.setDetails(request, new MockHttpServletResponse(), davHelper, folderNodeRef);
+            lockMethod.parseRequestHeaders();
+            lockMethod.parseRequestBody();
+
+            RetryingTransactionCallback<Void> lockExecuteImplCallBack = new RetryingTransactionCallback<Void>()
+            {
+
+                @Override
+                public Void execute() throws Throwable
+                {
+                    lockMethod.executeImpl();
+                    return null;
+                }
+
+            };
+            this.transactionService.getRetryingTransactionHelper().doInTransaction(lockExecuteImplCallBack);
+
+            unlockMethod.setDetails(request, new MockHttpServletResponse(), davHelper, folderNodeRef);
+            unlockMethod.parseRequestHeaders();
+
+            RetryingTransactionCallback<Void> unlockExecuteImplCallBack = new RetryingTransactionCallback<Void>()
+            {
+
+                @Override
+                public Void execute() throws Throwable
+                {
+                    unlockMethod.executeImpl();
+                    return null;
+                }
+
+            };
+            this.transactionService.getRetryingTransactionHelper().doInTransaction(unlockExecuteImplCallBack);
+
+            assertNull("lockType property should be deleted on unlock", nodeService.getProperty(fileWorkingCopyNodeRef, ContentModel.PROP_LOCK_TYPE));
+            assertNull("lockOwner property should be deleted on unlock", nodeService.getProperty(fileWorkingCopyNodeRef, ContentModel.PROP_LOCK_OWNER));
+
+        }
+        finally
+        {
+            // clear context for current user
+            this.authenticationComponent.clearCurrentSecurityContext();
+
+            // delete test store as system user
+            this.authenticationComponent.setSystemUserAsCurrentUser();
+            RetryingTransactionCallback<Void> deleteStoreCallback = new RetryingTransactionCallback<Void>()
+            {
+                @Override
+                public Void execute() throws Throwable
+                {
+                    if (nodeService.exists(storeRef))
+                    {
+                        nodeService.deleteStore(storeRef);
+                    }
+                    return null;
+                }
+            };
+            this.transactionService.getRetryingTransactionHelper().doInTransaction(deleteStoreCallback);
+        }
+    }
+
+    /**
+     * Test that it is impossible to unlock a checked out node
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void unlockCheckedOutNode() throws Exception
+    {
+        setUpPreconditionForCheckedOutTest();
+        try
+        {
+            String lockToken = fileNodeRef.getId() + WebDAV.LOCK_TOKEN_SEPERATOR + this.userName;
+            String lockHeaderValue = "<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">";
+            request.addHeader(WebDAV.HEADER_LOCK_TOKEN, lockHeaderValue);
+            request.setRequestURI("/" + TEST_FILE_NAME);
+
+            WebDAVHelper davHelper = (WebDAVHelper) appContext.getBean("webDAVHelper");
+            unlockMethod.setDetails(request, new MockHttpServletResponse(), davHelper, folderNodeRef);
+            unlockMethod.parseRequestHeaders();
+            transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+            {
+                @Override
+                public Void execute() throws Throwable
+                {
+                    unlockMethod.executeImpl();
+                    return null;
+                }
+            });
+
+            fail("Exception should have been thrown, but wasn't.");
+        }
+        catch (AlfrescoRuntimeException e)
+        {
+            if (e.getCause() instanceof WebDAVServerException)
+            {
+                WebDAVServerException ee = (WebDAVServerException) e.getCause();
+                assertEquals(HttpServletResponse.SC_PRECONDITION_FAILED, ee.getHttpStatusCode());
+            }
+            else
+            {
+                fail("Incorrect exception thrown.");
+            }
+        }
+        catch (WebDAVServerException e)
+        {
+            assertEquals(HttpServletResponse.SC_PRECONDITION_FAILED, e.getHttpStatusCode());
+        }
+        finally
+        {
+            // clear context for current user
+            this.authenticationComponent.clearCurrentSecurityContext();
+
+            // delete test store as system user
+            this.authenticationComponent.setSystemUserAsCurrentUser();
+            RetryingTransactionCallback<Void> deleteStoreCallback = new RetryingTransactionCallback<Void>()
+            {
+                @Override
+                public Void execute() throws Throwable
+                {
+                    if (nodeService.exists(storeRef))
+                    {
+                        nodeService.deleteStore(storeRef);
+                    }
+                    return null;
+                }
+            };
+            this.transactionService.getRetryingTransactionHelper().doInTransaction(deleteStoreCallback);
+        }
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVHelperIntegrationTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVHelperIntegrationTest.java
new file mode 100644
index 00000000000..8e6aa0ebdbc
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVHelperIntegrationTest.java
@@ -0,0 +1,143 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.util.UUID;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.util.ApplicationContextHelper;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.context.ApplicationContext;
+
+/**
+ * Integration tests for the {@link WebDAVHelper} class.
+ * 
+ * @author Matt Ward
+ */
+public class WebDAVHelperIntegrationTest
+{
+   private static ApplicationContext ctx;
+   private WebDAVHelper webDAVHelper;
+   private FileFolderService fileFolderService;
+   private NodeRef rootNodeRef;
+   private NodeRef rootFolder;
+   private NodeService nodeService;
+//   private EventPublisherForTestingOnly eventPublisher;
+   
+   @BeforeClass
+   public static void setUpSpring()
+   {
+       ctx = ApplicationContextHelper.getApplicationContext();
+   }
+   
+   @Before
+   public void setUp()
+   {
+       AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+       
+       webDAVHelper = (WebDAVHelper) ctx.getBean("webDAVHelper");
+       fileFolderService = (FileFolderService) ctx.getBean("FileFolderService");
+       nodeService = (NodeService) ctx.getBean("NodeService");
+       
+       StoreRef storeRef = nodeService.createStore("workspace", "WebDAVHelperTest-"+UUID.randomUUID());
+       rootNodeRef = nodeService.getRootNode(storeRef);
+       
+       rootFolder = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN,
+                   ContentModel.ASSOC_CHILDREN, ContentModel.TYPE_FOLDER).getChildRef();
+       
+       //eventPublisher = (EventPublisherForTestingOnly) ctx.getBean("eventPublisher");
+   }
+   
+   @Test
+   public void canGetNodeForPathWithCorrectCase() throws FileNotFoundException
+   {
+       FileInfo folderInfo = fileFolderService.create(rootFolder, "my_folder", ContentModel.TYPE_FOLDER);
+       FileInfo fileInfo = fileFolderService.create(folderInfo.getNodeRef(), "my_file.txt", ContentModel.TYPE_CONTENT);
+       
+       FileInfo found = webDAVHelper.getNodeForPath(rootFolder, "my_folder/my_file.txt");
+       // Sanity check, but the main test is that we haven't have a FileNotFoundException thrown.
+       assertEquals(fileInfo, found);
+       
+       found = webDAVHelper.getNodeForPath(rootFolder, "my_folder");
+       assertEquals(folderInfo, found);
+   }
+   
+   @Test
+   public void cannotGetNodeForPathWithIncorrectCase() throws FileNotFoundException
+   {
+       FileInfo folderInfo = fileFolderService.create(rootFolder, "my_folder", ContentModel.TYPE_FOLDER);
+       fileFolderService.create(folderInfo.getNodeRef(), "my_file.txt", ContentModel.TYPE_CONTENT);
+       
+       try
+       {
+           webDAVHelper.getNodeForPath(rootFolder, "My_Folder/My_File.txt");
+           fail("FileNotFoundException should have been thrown.");
+       }
+       catch (FileNotFoundException e)
+       {
+           // Got here, good.
+       }
+   }
+   
+   @Test
+   public void cannotGetNodeForFolderPathWithIncorrectCase() throws FileNotFoundException
+   {
+       FileInfo folderInfo = fileFolderService.create(rootFolder, "my_folder", ContentModel.TYPE_FOLDER);
+       fileFolderService.create(folderInfo.getNodeRef(), "my_file.txt", ContentModel.TYPE_CONTENT);
+       
+       try
+       {
+           webDAVHelper.getNodeForPath(rootFolder, "My_Folder");
+           fail("FileNotFoundException should have been thrown.");
+       }
+       catch (FileNotFoundException e)
+       {
+           // Got here, good.
+       }
+   }
+   
+   @Test
+   public void canGetNodeForRootFolderPath() throws FileNotFoundException
+   {
+       FileInfo folderInfo = fileFolderService.create(rootFolder, "my_folder", ContentModel.TYPE_FOLDER);
+       fileFolderService.create(folderInfo.getNodeRef(), "my_file.txt", ContentModel.TYPE_CONTENT);
+       
+       FileInfo found = webDAVHelper.getNodeForPath(rootFolder, "/");
+       assertEquals(rootFolder, found.getNodeRef());
+   }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVHelperTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVHelperTest.java
new file mode 100644
index 00000000000..c61514ac9f1
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVHelperTest.java
@@ -0,0 +1,122 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.mock.web.MockHttpServletRequest;
+
+/**
+ * Tests for the WebDAVHelper class.
+ * 
+ * @see RenameShuffleDetectionTest
+ * @author Matt Ward
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class WebDAVHelperTest
+{
+    private WebDAVHelper davHelper;
+    
+    @Before
+    public void setUp() throws Exception
+    {
+        davHelper = new WebDAVHelper();
+    }
+
+    @Test
+    public void canGetUrlPathPrefixWhenExplicitlySet()
+    {
+        // Path prefix explicitly set on helper.
+        davHelper.setUrlPathPrefix("/my/prefix");
+        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/my/prefix/folder/filename.txt");
+        String prefix = davHelper.getUrlPathPrefix(request);
+        assertEquals("/my/prefix/", prefix);
+    }
+
+    @Test
+    public void canGetUrlPathPrefixFromServletPath()
+    {
+        // Path prefix not explicitly set on helper.
+        davHelper.setUrlPathPrefix("");
+        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/before/the-servlet/folder/filename.txt");
+        // Servlet path will be used to determine path prefix.
+        request.setServletPath("/the-servlet");
+        String prefix = davHelper.getUrlPathPrefix(request);
+        assertEquals("/before/the-servlet/", prefix);
+    }
+    
+    @Test
+    public void canGetDestinationPathWhenNoServletName()
+    {
+        assertPathForURL("/the-tenant.com/the-site/path/to/file",
+                    "http://webdav.alfresco.com/the-tenant.com/the-site/path/to/file");
+     
+    }
+    
+    /**
+     * THOR-1459: WebDAV: site names cannot start with 'webdav'.
+     * <p>
+     * <code>/webdav-test</code> begins with servlet path <code>/webdav</code>
+     */
+    @Test
+    public void canGetDestinationPathWhenPathElementStartsWithServletPath()
+    {
+        assertPathForURL("/t/webdav-test/path/to/file",
+                    "http://webdav.alfresco.com/t/webdav-test/path/to/file");
+
+        // Looks like /contextPath/servletName in URL's path prefix, but isn't
+        assertPathForURL("/alfresco/webdav-test/path/to/file",
+                    "http://webdav.alfresco.com/alfresco/webdav-test/path/to/file");
+    }
+    
+    @Test
+    public void canGetDestinationPathWhenPrefixedWithContextPathAndServletName()
+    {
+        assertPathForURL("/path/to/file",
+                    "http://webdav.alfresco.com/alfresco/webdav/path/to/file");
+        
+        assertPathForURL("/alfresco/webdav/path/to/file",
+                    "http://webdav.alfresco.com/alfresco/webdav/alfresco/webdav/path/to/file");
+
+        assertPathForURL("/my/folder/alfresco/webdav/path/to/file",
+                    "http://webdav.alfresco.com/alfresco/webdav/my/folder/alfresco/webdav/path/to/file");
+    }
+
+    /**
+     * Check that the expected path was extracted from a given URL.
+     * 
+     * @param path The expected path.
+     * @param url URL to extract the path from.
+     */
+    private void assertPathForURL(String path, String url)
+    {
+        assertEquals(path, davHelper.getDestinationPath("/alfresco", "/webdav", url));
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVLockServiceImplTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVLockServiceImplTest.java
new file mode 100644
index 00000000000..c6cc5cd7238
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVLockServiceImplTest.java
@@ -0,0 +1,256 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
+import org.alfresco.repo.lock.mem.Lifetime;
+import org.alfresco.repo.lock.mem.LockState;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.coci.CheckOutCheckInService;
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.lock.LockStatus;
+import org.alfresco.service.cmr.lock.LockType;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.Pair;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.stubbing.Answer;
+
+@RunWith(MockitoJUnitRunner.class)
+public class WebDAVLockServiceImplTest
+{
+    private WebDAVLockServiceImpl davLockService;
+    private @Mock HttpSession session;
+    private @Mock List<Pair<String, NodeRef>> sessionList;
+    private @Mock AuthenticationUtil authenticationUtil;
+    private @Mock TransactionService transactionService;
+    private @Mock RetryingTransactionHelper txHelper;
+    private @Mock NodeService nodeService;
+    private @Mock LockService lockService;
+    private @Mock CheckOutCheckInService cociService;
+    private NodeRef nodeRef1;
+    private NodeRef nodeRef2;
+    private LockInfoImpl lockInfo1;
+    private LockState lockState1;
+    private LockInfoImpl lockInfo2;
+    private LockState lockState2;
+    
+    @SuppressWarnings("unchecked")
+    @Before
+    public void setUp() throws Exception
+    {
+        davLockService = new WebDAVLockServiceImpl();
+        davLockService.setNodeService(nodeService);
+        davLockService.setCheckOutCheckInService(cociService);
+        davLockService.setCurrentSession(session);
+        davLockService.setLockService(lockService);
+        
+        // Train the mock LockStore to respond to get() requests for certain noderefs.
+        nodeRef1 = new NodeRef("workspace://SpacesStore/f6e3f82a-cfef-445b-9fca-7986a14181cc");
+        lockInfo1 = new LockInfoImplTest.LockInfoImplEx();
+        lockState1 = LockState.createLock(nodeRef1, LockType.WRITE_LOCK, "user1", null, Lifetime.EPHEMERAL, null);
+        Mockito.when(lockService.getLockState(nodeRef1)).thenReturn(lockState1);
+        nodeRef2 = new NodeRef("workspace://SpacesStore/a6a4371c-99b9-4618-8cd2-e71d7d96aa87");
+        lockInfo2 = new LockInfoImplTest.LockInfoImplEx();
+        lockInfo2.setExclusiveLockToken("a-random-token");
+        lockInfo2.setDepth("infinity");
+        lockInfo2.setScope(WebDAV.XML_EXCLUSIVE);
+        lockState2 = LockState.createLock(nodeRef2, LockType.WRITE_LOCK, "user2", new Date(999L), Lifetime.EPHEMERAL, lockInfo2.toJSON());
+        Mockito.when(lockService.getLockState(nodeRef2)).thenReturn(lockState2);
+        
+        // The mock HttpSession should return the mock session list.
+        Mockito.when(session.getAttribute("_webdavLockedResources")).thenReturn(sessionList);
+        
+        // Provide a user name for our fictional user.
+        authenticationUtil = new AuthenticationUtil();
+        authenticationUtil.afterPropertiesSet();
+        AuthenticationUtil.setFullyAuthenticatedUser("some_user_name");
+        
+        Mockito.when(txHelper.doInTransaction(any(RetryingTransactionCallback.class), anyBoolean())).thenAnswer(new Answer()
+        {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable
+            {
+                Object[] args = invocation.getArguments();
+                RetryingTransactionCallback<Void> callback = (RetryingTransactionCallback<Void>) args[0];
+                callback.execute();
+                return null;
+            }
+            
+        });
+        Mockito.when(transactionService.getRetryingTransactionHelper()).thenReturn(txHelper);
+        davLockService.setTransactionService(transactionService);
+    }
+
+
+    @Test
+    public void testSessionDestroyed()
+    {
+        List<Pair<String, NodeRef>> lockedNodes = new ArrayList<Pair<String, NodeRef>>(2);
+        lockedNodes.add(new Pair<String, NodeRef>("some_user_name", nodeRef1));
+        lockedNodes.add(new Pair<String, NodeRef>("another_user_name", nodeRef2));
+        Mockito.when(sessionList.size()).thenReturn(2);
+        Mockito.when(sessionList.iterator()).thenReturn(lockedNodes.iterator());
+        
+        Mockito.when(nodeService.exists(nodeRef1)).thenReturn(true);
+        Mockito.when(nodeService.exists(nodeRef2)).thenReturn(true);
+        
+        Mockito.when(lockService.getLockStatus(nodeRef1)).thenReturn(LockStatus.LOCKED);
+        Mockito.when(lockService.getLockStatus(nodeRef2)).thenReturn(LockStatus.LOCKED);
+
+        // We're not going to do anything with nodeRef2
+        NodeRef wcNodeRef2 = new NodeRef("workspace://SpacesStore/a6e3f82a-cfef-363d-9fca-3986a14180a0");
+        Mockito.when(cociService.getWorkingCopy(nodeRef2)).thenReturn(wcNodeRef2);
+        
+        davLockService.sessionDestroyed();
+        
+        // nodeRef1 is unlocked
+        Mockito.verify(lockService).unlock(nodeRef1);
+        
+        // nodeRef2 is not unlocked
+        Mockito.verify(lockService, Mockito.never()).unlock(nodeRef2);        
+    }
+
+    @Test
+    public void lockLessThan24Hours()
+    {
+        lockInfo1.setTimeoutSeconds(100);
+        
+        davLockService.lock(nodeRef1, lockInfo1);
+        
+        Mockito.verify(lockService).lock(nodeRef1, LockType.WRITE_LOCK, 100, Lifetime.EPHEMERAL, lockInfo1.toJSON());
+        // 100 seconds (in millis) should have been added to the date/time stamp.
+        assertEquals(86500000, lockInfo1.getExpires().getTime());
+    }
+    
+    @Test
+    public void lockGreaterThan24Hours()
+    {
+        int timeout25hours = WebDAV.TIMEOUT_24_HOURS + 3600;
+        lockInfo1.setTimeoutSeconds(timeout25hours);
+        
+        davLockService.lock(nodeRef1, lockInfo1);
+        
+        Mockito.verify(lockService).lock(nodeRef1, LockType.WRITE_LOCK, WebDAV.TIMEOUT_24_HOURS, Lifetime.EPHEMERAL, lockInfo1.toJSON());
+        Mockito.verify(sessionList).add(new Pair<String, NodeRef>("some_user_name", nodeRef1));
+        // Timeout should be capped at 24 hours.
+        assertEquals(WebDAV.TIMEOUT_24_HOURS, lockInfo1.getRemainingTimeoutSeconds());
+    }
+    
+    @Test
+    public void lockForInfinityTime()
+    {
+        lockInfo1.setTimeoutSeconds(WebDAV.TIMEOUT_INFINITY);
+        
+        davLockService.lock(nodeRef1, lockInfo1);
+        
+        Mockito.verify(lockService).lock(nodeRef1, LockType.WRITE_LOCK, WebDAV.TIMEOUT_24_HOURS, Lifetime.EPHEMERAL, lockInfo1.toJSON());
+        Mockito.verify(sessionList).add(new Pair<String, NodeRef>("some_user_name", nodeRef1));
+        // Timeout should be capped at 24 hours.
+        assertEquals(WebDAV.TIMEOUT_24_HOURS, lockInfo1.getRemainingTimeoutSeconds());
+    }
+
+    @Test
+    public void canUnlock()
+    {
+        davLockService.unlock(nodeRef1);
+        
+        // NodeRef should have been unlocked.
+        Mockito.verify(lockService).unlock(nodeRef1);
+        // Node should have been removed from the list in the user's session.
+        Mockito.verify(sessionList).remove(new Pair<String, NodeRef>("some_user_name", nodeRef1));
+    }
+
+    @Test
+    public void canGetLockInfo()
+    {
+        NodeRef nodeRef3 = new NodeRef("workspace://SpacesStore/a6a4371c-99b9-4618-8cd2-e71d28374859");
+        Mockito.when(lockService.getLockState(nodeRef1)).thenReturn(lockState1);
+        Mockito.when(lockService.getLockState(nodeRef2)).thenReturn(lockState2);
+        Mockito.when(lockService.getLockState(nodeRef3)).thenReturn(null);
+
+        // nodeRef1
+        LockInfo lockInfo = davLockService.getLockInfo(nodeRef1);
+        assertEquals(null, lockInfo.getExpires());
+        assertEquals("user1", lockInfo.getOwner());
+        
+        // nodeRef2
+        lockInfo = davLockService.getLockInfo(nodeRef2);
+        assertEquals(new Date(999L), lockInfo.getExpires());
+        assertEquals("user2", lockInfo.getOwner());
+        assertEquals("a-random-token", lockInfo.getExclusiveLockToken());
+        assertEquals("infinity", lockInfo.getDepth());
+        assertEquals(WebDAV.XML_EXCLUSIVE, lockInfo.getScope());
+        
+        // nodeRef3
+        lockInfo = davLockService.getLockInfo(nodeRef3);
+        assertEquals(null, lockInfo);
+    }
+    
+    @Test
+    public void mnt13183LockInfo()
+    {
+        // CIFS lock node to 1 hour
+        lockService.lock(nodeRef1, LockType.WRITE_LOCK, 3600, Lifetime.EPHEMERAL, "lock_info_that_is_not_from_webdav");
+
+        // WebDAV get lock info
+        LockInfo lockInfoNodeRef1 = davLockService.getLockInfo(nodeRef1);
+        assertNull("exclusiveLockToken is null", lockInfoNodeRef1.getExclusiveLockToken());
+        
+        String user = AuthenticationUtil.getFullyAuthenticatedUser();
+        
+        // WebDav lock, check marker
+        davLockService.lock(nodeRef2, user, 3600);
+        
+        LockState lockState2 = lockService.getLockState(nodeRef2);
+        assertNotNull("lockState is not null", lockState2);
+        
+        String additionalInfo2 = lockState2.getAdditionalInfo();
+        assertNotNull("additionalInfo is not null", additionalInfo2);
+        assertTrue("Check WEBDAV_LOCK marker", additionalInfo2.startsWith(LockInfoImpl.ADDINFO_WEBDAV_MARKER));   
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVMethodTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVMethodTest.java
new file mode 100644
index 00000000000..f12f57dff6b
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVMethodTest.java
@@ -0,0 +1,525 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantAdminService;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.GUID;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.context.ApplicationContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+import com.ibm.icu.impl.Assert;
+
+/**
+ * Tests for the WebDAVMethod class.
+ * 
+ * @author Matt Ward
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class WebDAVMethodTest
+{
+    private WebDAVMethod method;
+    private MockHttpServletRequest req;
+    private MockHttpServletResponse resp;
+    private @Mock WebDAVHelper davHelper;
+
+    private NodeService nodeService;
+    private SearchService searchService;
+    private NamespaceService namespaceService;
+    private TenantService tenantService;
+    private TransactionService transactionService;
+    private WebDAVHelper webDAVHelper;
+    private TenantAdminService tenantAdminService;
+
+    private @Mock LockMethod lockMethod;
+    private @Mock PutMethod putMethod;
+    private @Mock DeleteMethod deleteMethod;
+    private @Mock UnlockMethod unlockMethod;
+
+    private static Log logger = LogFactory.getLog(WebDAVMethodTest.class);
+
+    public static final String TEST_RUN = System.currentTimeMillis()+"";
+    public static final String TEST_TENANT_DOMAIN = TEST_RUN+".my.test";
+    public static final String DEFAULT_ADMIN_PW = "admin";
+
+    private Level saveLogLevel;
+
+    protected void setUpApplicationContext()
+    {
+        ApplicationContext appContext = ApplicationContextHelper.getApplicationContext(new String[]
+                {
+                        "classpath:alfresco/application-context.xml", "classpath:alfresco/web-scripts-application-context.xml",
+                        "classpath:alfresco/remote-api-context.xml"
+                });
+
+        this.nodeService = (NodeService) appContext.getBean("NodeService");
+        this.searchService = (SearchService) appContext.getBean("SearchService");
+        this.namespaceService = (NamespaceService) appContext.getBean("NamespaceService");
+        this.tenantService = (TenantService) appContext.getBean("tenantService");
+        this.transactionService = (TransactionService) appContext.getBean("transactionService");
+        this.webDAVHelper = (WebDAVHelper) appContext.getBean("webDAVHelper");
+        this.tenantAdminService = (TenantAdminService) appContext.getBean("tenantAdminService");
+
+        // Authenticate as system to create initial test data set
+        AuthenticationComponent authenticationComponent = (AuthenticationComponent) appContext.getBean("authenticationComponent");
+        authenticationComponent.setSystemUserAsCurrentUser();
+    }
+
+    private void checkLockedNodeTestWork() throws WebDAVServerException
+    {
+        req = new MockHttpServletRequest();
+        resp = new MockHttpServletResponse();
+
+        String rootPath = "/app:company_home";
+        String storeName = "workspace://SpacesStore";
+        StoreRef storeRef = new StoreRef(storeName);
+        NodeRef storeRootNodeRef = nodeService.getRootNode(storeRef);
+        List<NodeRef> nodeRefs = searchService.selectNodes(storeRootNodeRef, rootPath, null, namespaceService, false);
+        NodeRef defaultRootNode = nodeRefs.get(0);
+
+        lockMethod = new LockMethod();
+        NodeRef rootNodeRef = tenantService.getRootNode(nodeService, searchService, namespaceService, rootPath, defaultRootNode);
+        String strPath = "/" + "testLockedNode" + GUID.generate();
+
+        lockMethod.createExclusive = true;
+        lockMethod.setDetails(req, resp, webDAVHelper, rootNodeRef);
+        lockMethod.m_strPath = strPath;
+
+        // Lock the node (will create a new one).
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Object>()
+        {
+            @Override
+            public Object execute() throws Throwable {
+                lockMethod.executeImpl();
+                return null;
+            }
+        });
+
+        // Prepare for PUT
+        req.addHeader(WebDAV.HEADER_IF, "(<" + lockMethod.lockToken + ">)");
+        putMethod = new PutMethod();
+        putMethod.setDetails(req, resp, webDAVHelper, rootNodeRef);
+        putMethod.parseRequestHeaders();
+        putMethod.m_strPath = strPath;
+        String content = "test content stream";
+        req.setContent(content.getBytes());
+
+        // Issue a put request
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Object>()
+        {
+            @Override
+            public Object execute() throws Throwable
+            {
+                putMethod.executeImpl();
+                return null;
+            }
+        });
+    }
+
+    /**
+     * Call the org.alfresco.repo.webdav.WebDAVMethod#checkNode(org.alfresco.service.cmr.model.FileInfo, boolean, boolean)
+     * for a write locked node for tenant and non-tenant.
+     * See ALF-19915.
+     */
+    @Test
+    public void checkLockedNodeTest() throws Exception
+    {
+        setUpApplicationContext();
+
+        // Create a tenant domain
+        TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork<Object>() {
+            public Object doWork() throws Exception {
+                if (!tenantAdminService.existsTenant(TEST_TENANT_DOMAIN))
+                {
+                    tenantAdminService.createTenant(TEST_TENANT_DOMAIN, (DEFAULT_ADMIN_PW + " " + TEST_TENANT_DOMAIN).toCharArray(), null);
+                }
+                return null;
+            }
+        }, TenantService.DEFAULT_DOMAIN);
+
+        // run as admin
+        try
+        {
+            TenantUtil.runAsUserTenant(new TenantUtil.TenantRunAsWork<Object>()
+            {
+                @Override
+                public Object doWork() throws Exception
+                {
+                    checkLockedNodeTestWork();
+                    return null;
+                }
+            }, AuthenticationUtil.getAdminUserName(), TenantService.DEFAULT_DOMAIN);
+        }
+        catch (Exception e)
+        {
+            fail("Failed to lock and put content as admin with error: " + e.getCause());
+        }
+
+        // run as tenant admin
+        try
+        {
+            TenantUtil.runAsUserTenant(new TenantUtil.TenantRunAsWork<Object>()
+            {
+                @Override
+                public Object doWork() throws Exception
+                {
+                    checkLockedNodeTestWork();
+                    return null;
+                }
+            }, AuthenticationUtil.getAdminUserName(), TEST_TENANT_DOMAIN);
+        }
+        catch (Exception e)
+        {
+            fail("Failed to lock and put content as tenant admin with error: " + e.getCause());
+        }
+    }
+    
+    private void checkLockedNodeTestTenantWork() throws Exception
+    {
+        req = new MockHttpServletRequest();
+        resp = new MockHttpServletResponse();
+
+        String rootPath = "/app:company_home";
+        String storeName = "workspace://SpacesStore";
+        StoreRef storeRef = new StoreRef(storeName);
+        NodeRef storeRootNodeRef = nodeService.getRootNode(storeRef);
+        List<NodeRef> nodeRefs = searchService.selectNodes(storeRootNodeRef, rootPath, null, namespaceService, false);
+        NodeRef defaultRootNode = nodeRefs.get(0);
+
+        lockMethod = new LockMethod();
+        NodeRef rootNodeRef = tenantService.getRootNode(nodeService, searchService, namespaceService, rootPath, defaultRootNode);
+        String strPath = "/" + "testLockedNode" + GUID.generate();
+
+        lockMethod.createExclusive = true;
+        lockMethod.setDetails(req, resp, webDAVHelper, rootNodeRef);
+        lockMethod.m_strPath = strPath;
+
+        // Lock the node (will create a new one).
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Object>()
+        {
+            @Override
+            public Object execute() throws Throwable {
+                lockMethod.executeImpl();
+                return null;
+            }
+        });
+
+        // Prepare for DELETE
+        String corruptedLockToken = lockMethod.lockToken + "corr";
+        req.addHeader(WebDAV.HEADER_IF, "(<" + corruptedLockToken + ">)");
+        deleteMethod = new DeleteMethod();
+        deleteMethod.setDetails(req, resp, webDAVHelper, rootNodeRef);
+        deleteMethod.parseRequestHeaders();
+        deleteMethod.m_strPath = strPath;
+
+        // can't be deleted with corrupted lockTocken
+        try
+        {
+            transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Object>()
+            {
+                @Override
+                public Object execute() throws Throwable
+                {
+                    deleteMethod.executeImpl();
+                    return null;
+                }
+            });
+            fail("Locked node shouldn't be deleted");
+        }
+        catch(Exception e)
+        {
+            if (!(e.getCause() instanceof WebDAVServerException))
+            {
+                throw e;
+            }
+        }
+        
+        req = new MockHttpServletRequest();
+        req.addHeader(WebDAV.HEADER_LOCK_TOKEN, lockMethod.lockToken);
+        
+        unlockMethod = new UnlockMethod();
+        unlockMethod.setDetails(req, resp, webDAVHelper, rootNodeRef);
+        unlockMethod.parseRequestHeaders();
+        unlockMethod.m_strPath = strPath;
+        // unlock the node
+        try
+        {
+            transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Object>()
+            {
+                @Override
+                public Object execute() throws Throwable
+                {
+                    unlockMethod.executeImpl();
+                    return null;
+                }
+            });
+        }
+        catch(Exception e)
+        {
+            fail("Locked node should be unlocked with correct lockTocken " + e.getCause());
+        }
+        
+        // Lock it again
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Object>()
+        {
+            @Override
+            public Object execute() throws Throwable {
+                lockMethod.executeImpl();
+                return null;
+            }
+        });
+        
+        req.addHeader(WebDAV.HEADER_IF, "(<" + lockMethod.lockToken + ">)");
+        deleteMethod = new DeleteMethod();
+        deleteMethod.setDetails(req, resp, webDAVHelper, rootNodeRef);
+        deleteMethod.parseRequestHeaders();
+        deleteMethod.m_strPath = strPath;
+
+        // can be deleted with correct lockTocken
+        try
+        {
+            transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Object>()
+            {
+                @Override
+                public Object execute() throws Throwable
+                {
+                    deleteMethod.executeImpl();
+                    return null;
+                }
+            });
+        }
+        catch(Exception e)
+        {
+            fail("Locked node should be deleted with correct lockTocken " + e.getCause());
+        }
+        
+    }
+    
+    /* CLOUD-2204 Test */
+    @Test
+    public void checkLockedNodeTenantTest()
+    {
+        setUpApplicationContext();
+
+        // Create a tenant domain
+        TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork<Object>() {
+            public Object doWork() throws Exception {
+                if (!tenantAdminService.existsTenant(TEST_TENANT_DOMAIN))
+                {
+                    tenantAdminService.createTenant(TEST_TENANT_DOMAIN, (DEFAULT_ADMIN_PW + " " + TEST_TENANT_DOMAIN).toCharArray(), null);
+                }
+                return null;
+            }
+        }, TenantService.DEFAULT_DOMAIN);
+        
+        TenantUtil.runAsUserTenant(new TenantUtil.TenantRunAsWork<Object>()
+        {
+            @Override
+            public Object doWork() throws Exception
+            {
+                checkLockedNodeTestTenantWork();
+                return null;
+            }
+        }, AuthenticationUtil.getAdminUserName(), TEST_TENANT_DOMAIN);
+    }
+
+    @Test
+    public void canGetStatusForAccessDeniedException()
+    {
+        // Initially Mac OS X Finder uses a different UA string than for subsequent requests.
+        assertStatusCode(500, "WebDAVLib/1.3");
+        
+        // Current UA string at time of writing test.
+        assertStatusCode(500, "WebDAVFS/1.9.0 (01908000) Darwin/11.4.0 (x86_64)");
+        
+        // A fictitious version number long in the future.
+        assertStatusCode(500, "WebDAVFS/100.10.5 (01908000) Darwin/11.4.0 (x86_64)");
+
+        // Other processor architectures, e.g. x86_32 should work too.
+        assertStatusCode(500, "WebDAVFS/100.10.5 (01908000) Darwin/109.6.3 (some_other_processor_arch)");
+        
+        // Other clients should give 403.
+        assertStatusCode(403, "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6; en-us)");
+        // Mozilla-based Windows browser.
+        assertStatusCode(403, "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.12)");
+        assertStatusCode(403, "SomeBrowser/1.0 (Macintosh; U; Intel Mac OS X 10_6; en-us)");
+        assertStatusCode(403, "SomeBrowser/1.9.0 (01908000) Darwin/11.4.0 (x86_64)");
+        assertStatusCode(403, "Cyberduck/4.2.1 (Mac OS X/10.7.4) (i386)");
+        // Chrome
+        assertStatusCode(403, "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_4) AppleWebKit/536.5 (KHTML, like Gecko) Chrome/19.0.1084.54 Safari/536.5");
+        // Safari
+        assertStatusCode(403, "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_4) AppleWebKit/534.57.2 (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2");
+    }
+    
+    /* MNT-10555 Test */
+    @Test
+    public void expiryLockTest()
+    {
+        // ACE-4347 extra debug logging just for this test so we can see what's going on when it next fails
+        Level repoWebdavSaveLogLevel = Logger.getLogger("org.alfresco.repo.webdav").getLevel();
+        Logger.getLogger("org.alfresco.repo.webdav").setLevel(Level.ALL);
+        Level webdavProtocolSaveLogLevel = Logger.getLogger("org.alfresco.webdav.protocol").getLevel();
+        Logger.getLogger("org.alfresco.webdav.protocol").setLevel(Level.ALL);
+        try
+        {
+            setUpApplicationContext();
+    
+            req = new MockHttpServletRequest();
+            resp = new MockHttpServletResponse();
+    
+            String rootPath = "/app:company_home";
+            StoreRef storeRef = new StoreRef("workspace://SpacesStore");
+            NodeRef storeRootNodeRef = nodeService.getRootNode(storeRef);
+            List<NodeRef> nodeRefs = searchService.selectNodes(storeRootNodeRef, rootPath, null, namespaceService, false);
+            NodeRef defaultRootNode = nodeRefs.get(0);
+    
+            NodeRef rootNodeRef = tenantService.getRootNode(nodeService, searchService, namespaceService, rootPath, defaultRootNode);
+    
+            // Create test folder.
+            NodeRef folderNodeRef = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName("test"), ContentModel.TYPE_FOLDER,
+                    Collections.<QName, Serializable> singletonMap(ContentModel.PROP_NAME, "WebDavMethodExpiryLockTest" + System.currentTimeMillis())).getChildRef();
+    
+            // Create test document.
+            NodeRef nodeRef = nodeService.createNode(folderNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName("test"), ContentModel.TYPE_CONTENT,
+                    Collections.<QName, Serializable> singletonMap(ContentModel.PROP_NAME, "text.txt")).getChildRef();
+    
+            lockMethod = new LockMethod();
+            lockMethod.createExclusive = true;
+            lockMethod.m_timeoutDuration = 1;
+            lockMethod.setDetails(req, resp, webDAVHelper, nodeRef);
+    
+            transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Object>()
+            {
+                @Override
+                public Object execute() throws Throwable
+                {
+                    try
+                {
+                    // LOCK document.
+                    lockMethod.executeImpl();
+                    
+                    //wait for the lock to expire up to 5 seconds
+                    int timeout = 5;
+                    while( timeout > 0 && !lockMethod.lockInfo.isExpired())
+                    {
+                        Thread.sleep(1000);
+                        timeout--;
+                    }
+                    
+                    // LOCK against an expired lock.
+                    lockMethod.executeImpl();
+                }
+                catch (WebDAVServerException e)
+                {
+                    logger.debug(e);
+                    Assert.fail("Document was not locked again, when lock has expired.");
+                }
+                return null;
+                }
+            });
+    
+            // Remove test folder.
+            nodeService.deleteNode(folderNodeRef);
+        }
+        finally
+        {
+            Logger.getLogger("org.alfresco.webdav.protocol").setLevel(webdavProtocolSaveLogLevel);
+            Logger.getLogger("org.alfresco.repo.webdav").setLevel(repoWebdavSaveLogLevel);
+        }
+    }
+    
+    private void assertStatusCode(int expectedStatusCode, String userAgent)
+    {
+        // Fresh objects needed for each status code test.
+        createRequestObjects();
+        req.addHeader("User-Agent", userAgent);
+        method.setDetails(req, resp, davHelper, null);
+        
+        int statusCode = method.getStatusForAccessDeniedException();
+        
+        assertEquals("Incorrect status code for user-agent string \"" + userAgent + "\"",
+                    expectedStatusCode,
+                    statusCode);
+    }
+
+    private void createRequestObjects()
+    {
+        method = new TestWebDAVMethod();
+        req = new MockHttpServletRequest();
+        resp = new MockHttpServletResponse();
+    }
+
+    
+    /**
+     * Empty subclass of abstract base class for testing base class' behaviour.
+     */
+    private static class TestWebDAVMethod extends WebDAVMethod
+    {
+        @Override
+        protected void executeImpl() throws WebDAVServerException, Exception
+        {
+        }
+
+        @Override
+        protected void parseRequestBody() throws WebDAVServerException
+        {
+        }
+
+        @Override
+        protected void parseRequestHeaders() throws WebDAVServerException
+        {
+        }   
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVonContentUpdateTest.java b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVonContentUpdateTest.java
new file mode 100644
index 00000000000..9f96eb30efa
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVonContentUpdateTest.java
@@ -0,0 +1,301 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.webdav;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.ContentServicePolicies.OnContentUpdatePolicy;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.policy.JavaBehaviour;
+import org.alfresco.repo.policy.PolicyComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.lock.LockStatus;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.GUID;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.springframework.context.ApplicationContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+/**
+ * Unit test for MNT-10966: 4.1.7 breaks onContentUpdate policies when using webdav
+ * Implemented on base of PutMethodTest which was introduced by alex.mukha.
+ *
+ * @author viachaslau.tsikhanovich, alex.mukha
+ */
+@Category(LuceneTests.class)
+public class WebDAVonContentUpdateTest
+{
+    private static ApplicationContext ctx;
+
+    private static final String TEST_DATA_FILE_NAME = "filewithdata.txt";
+    private static final String DAV_LOCK_INFO_XML = "davLockInfoAdmin.xml";
+    private byte[] testDataFile;
+    private byte[] davLockInfoFile;
+
+    private MockHttpServletRequest request;
+    private MockHttpServletResponse response;
+    private WebDAVMethod method;
+    private UserTransaction txn = null;
+
+    private SearchService searchService;
+    private FileFolderService fileFolderService;
+    private NodeService nodeService;
+    private TransactionService transactionService;
+    private WebDAVHelper webDAVHelper;
+    private LockService lockService;
+    private PolicyComponent policyComponent;
+
+    private Repository repositoryHelper;
+    private NodeRef companyHomeNodeRef;
+    private StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
+
+	private boolean flag;
+	private int counter = 0;
+    private NamespaceService namespaceService;
+
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception
+    {
+        ctx = ApplicationContextHelper.getApplicationContext(new String[]
+            {
+                "classpath:alfresco/application-context.xml",
+                "classpath:alfresco/web-scripts-application-context.xml",
+                "classpath:alfresco/remote-api-context.xml"
+            });
+    }
+
+    @Before
+    public void setUp() throws Exception
+    {
+        searchService = ctx.getBean("SearchService", SearchService.class);
+        fileFolderService = ctx.getBean("FileFolderService", FileFolderService.class);
+        nodeService = ctx.getBean("NodeService", NodeService.class);
+        transactionService = ctx.getBean("transactionService", TransactionService.class);
+        webDAVHelper = ctx.getBean("webDAVHelper", WebDAVHelper.class);
+        lockService = ctx.getBean("LockService", LockService.class);
+        policyComponent = ctx.getBean("policyComponent", PolicyComponent.class);
+        namespaceService = ctx.getBean("namespaceService", NamespaceService.class);
+
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+        repositoryHelper = (Repository)ctx.getBean("repositoryHelper");
+        companyHomeNodeRef = repositoryHelper.getCompanyHome();
+
+        InputStream testDataIS = getClass().getClassLoader().getResourceAsStream(TEST_DATA_FILE_NAME);
+        InputStream davLockInfoIS = getClass().getClassLoader().getResourceAsStream(DAV_LOCK_INFO_XML);
+        testDataFile = IOUtils.toByteArray(testDataIS);
+        davLockInfoFile = IOUtils.toByteArray(davLockInfoIS);
+        testDataIS.close();
+        davLockInfoIS.close();
+
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+    }
+
+    @After
+    public void tearDown() throws Exception
+    {
+        method = null;
+        request = null;
+        response = null;
+        testDataFile = null;
+        davLockInfoFile = null;
+
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+
+    public void doOnContentUpdate(NodeRef nodeRef, boolean newContent)
+    {
+        flag = true;
+        ++counter;
+    }
+
+    /**
+     * Put a content file and check that onContentUpdate fired
+     * <p>
+     * Lock the file
+     * <p>
+     * Put the contents
+     * <p>
+     * Unlock the node
+     */
+    @Test
+    public void testUploadNewContentFiresContentUpdatePolicies() throws Exception
+    {
+        flag = false;
+        counter = 0;
+        policyComponent.bindClassBehaviour(OnContentUpdatePolicy.QNAME, ContentModel.TYPE_CONTENT, new JavaBehaviour(this, "doOnContentUpdate"));
+
+        String fileName = "file-" + GUID.generate();
+        NodeRef fileNoderef = null;
+
+        try
+        {
+            executeMethod(WebDAV.METHOD_LOCK, fileName, davLockInfoFile, null);
+            
+            List<NodeRef> refs = searchService.selectNodes(nodeService.getRootNode(storeRef),
+                "/app:company_home/cm:" + fileName , null, namespaceService, false);
+            fileNoderef = refs.get(0);
+
+            assertEquals("File should be locked", LockStatus.LOCK_OWNER, lockService.getLockStatus(fileNoderef));
+        }
+        catch (Exception e)
+        {
+            fail("Failed to lock a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+
+        txn.commit();
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+
+        // Construct IF HEADER
+        String lockToken = fileNoderef.getId() + WebDAV.LOCK_TOKEN_SEPERATOR + AuthenticationUtil.getAdminUserName();
+        String lockHeaderValue = "(<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">)";
+        HashMap<String, String> headers = new HashMap<String, String>();
+        headers.put(WebDAV.HEADER_IF, lockHeaderValue);
+        try
+        {
+            executeMethod(WebDAV.METHOD_PUT, fileName, testDataFile, headers);
+            
+            assertTrue("File does not exist.", nodeService.exists(fileNoderef));
+            assertEquals("Filename is not correct", fileName, nodeService.getProperty(fileNoderef, ContentModel.PROP_NAME));
+            assertTrue("Expected return status is " + HttpServletResponse.SC_NO_CONTENT + ", but returned is " + response.getStatus(),
+                    HttpServletResponse.SC_NO_CONTENT == response.getStatus());
+
+            assertTrue("File should have NO_CONTENT aspect", nodeService.hasAspect(fileNoderef, ContentModel.ASPECT_NO_CONTENT));
+            InputStream updatedFileIS = fileFolderService.getReader(fileNoderef).getContentInputStream();
+            byte[] updatedFile = IOUtils.toByteArray(updatedFileIS);
+            updatedFileIS.close();
+            assertTrue("The content has to be equal", ArrayUtils.isEquals(testDataFile, updatedFile));
+        }
+        catch (Exception e)
+        {
+            fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+
+        txn.commit();
+        txn = transactionService.getUserTransaction();
+        txn.begin();
+
+        headers = new HashMap<String, String>();
+        headers.put(WebDAV.HEADER_LOCK_TOKEN, "<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">");
+        try
+        {
+            executeMethod(WebDAV.METHOD_UNLOCK, fileName, null, headers);
+
+            assertTrue("Expected return status is " + HttpServletResponse.SC_NO_CONTENT + ", but returned is " + response.getStatus(),
+                    HttpServletResponse.SC_NO_CONTENT == response.getStatus());
+            assertFalse("File should not have NO_CONTENT aspect", nodeService.hasAspect(fileNoderef, ContentModel.ASPECT_NO_CONTENT));
+            assertEquals("File should be unlocked", LockStatus.NO_LOCK, lockService.getLockStatus(fileNoderef));
+        }
+        catch (Exception e)
+        {
+            fail("Failed to unlock a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+        }
+
+        assertTrue("onContentUpdate policies were not triggered", flag);
+        assertEquals("onContentUpdate policies should be triggered only once",  counter, 1);
+
+        if (fileNoderef != null)
+        {
+            nodeService.deleteNode(fileNoderef);
+        }
+    }
+
+    /**
+     * Executes WebDAV method for testing
+     * <p>
+     * Sets content to request from a test file
+     * 
+     * @param methodName Method name to prepare, should be initialized (PUT, LOCK, UNLOCK are supported)
+     * @param fileName the name of the file set to the context, can be used with path, i.e. "path/to/file/fileName.txt"
+     * @param content If <b>not null</b> adds test content to the request
+     * @param headers to set to request, can be null
+     * @throws Exception
+     */
+    private void executeMethod(String methodName, String fileName, byte[] content, Map<String, String> headers) throws Exception
+    {
+        if (methodName == WebDAV.METHOD_PUT)
+            method = new PutMethod();
+        else if (methodName == WebDAV.METHOD_LOCK)
+            method = new LockMethod();
+        else if (methodName == WebDAV.METHOD_UNLOCK)
+            method = new UnlockMethod();
+        if (method != null)
+        {
+            request = new MockHttpServletRequest(methodName, "/alfresco/webdav/" + fileName);
+            response = new MockHttpServletResponse();
+            request.setServerPort(8080);
+            request.setServletPath("/webdav");
+            if (content != null)
+            {
+                request.setContent(content);
+            }
+
+            if (headers != null && !headers.isEmpty())
+            {
+                for (String key : headers.keySet())
+                {
+                    request.addHeader(key, headers.get(key));
+                }
+            }
+
+            method.setDetails(request, response, webDAVHelper, companyHomeNodeRef);
+
+            method.execute();
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/AbstractSingleNetworkSiteTest.java b/remote-api/src/test/java/org/alfresco/rest/AbstractSingleNetworkSiteTest.java
new file mode 100644
index 00000000000..ffcfd0c8dec
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/AbstractSingleNetworkSiteTest.java
@@ -0,0 +1,133 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest;
+
+import org.alfresco.repo.service.ServiceDescriptorRegistry;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.rest.api.tests.AbstractBaseApiTest;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchService;
+import org.junit.After;
+import org.junit.Before;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+
+/**
+ * Overrides AbstractBaseApiTest so that only a single network & site is created per test 
+ * (instead of pre-creating multiple networks & sites)
+ * 
+ * Can also be optionally tweaked locally to:
+ * 
+ * - use the default network (ie. super tenant) => instead of creating a new tenant
+ * 
+ * - re-use a single setup across test methods => although this does mean that each individual test method must either rely on uniquely created test data and/or cleanup
+ * 
+ * Note: For now, these can be explicitly tweaked by a dev (do not commit) 
+ * but in the future we could consider making these runtime options.
+ * 
+ * @author Gethin James
+ * @author janv
+ */
+public class AbstractSingleNetworkSiteTest extends AbstractBaseApiTest
+{
+    // note: experimental - for local/dev-use only (YMMV) ;-)
+    // - setting both to true should make the related tests run faster
+    // - if singleSetupNoTearDown=true then each individual test method should create unique data (or cleanup) to avoid interdependent test/run failures
+    // - if useDefaultNetwork=true then no tenant will be created (ie. will use default/super tenant)
+    protected static boolean singleSetupNoTearDown = false;
+    protected static boolean useDefaultNetwork = false;
+    
+    private static boolean isSetup = false;
+
+    // Mock up search service query calls
+    @Mock
+    protected SearchService mockSearchService;
+    @Mock
+    protected ResultSet mockSearchServiceQueryResultSet;
+    protected List<NodeRef> dummySearchServiceQueryNodeRefs = new ArrayList<>();
+    protected int callCountToMockSearchService = 0;
+    protected TenantService tenantService;
+    private ServiceDescriptorRegistry serviceRegistry;
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+    
+    @Override
+    @Before
+    public void setup() throws Exception
+    {
+        if ((! isSetup) || (! singleSetupNoTearDown))
+        {
+            if (! useDefaultNetwork)
+            {
+                networkOne = getRepoService().createNetwork(this.getClass().getName().toLowerCase(), true);
+                networkOne.create();
+            }
+            else
+            {
+                networkOne = getRepoService().getSystemNetwork();
+            }
+            
+            super.setup();
+            isSetup = true;
+        }
+
+        MockitoAnnotations.initMocks(this);
+
+    	tenantService = (TenantService)applicationContext.getBean("tenantService");
+    	serviceRegistry = (ServiceDescriptorRegistry) applicationContext.getBean("ServiceRegistry");
+    	serviceRegistry.setMockSearchService(mockSearchService);
+        when(mockSearchService.query(any())).thenReturn(mockSearchServiceQueryResultSet);
+        when(mockSearchServiceQueryResultSet.getNodeRefs()).thenReturn(dummySearchServiceQueryNodeRefs);
+    }
+
+    @Override
+    @After
+    public void tearDown() throws Exception
+    {
+        if (! singleSetupNoTearDown)
+        {
+            super.tearDown();
+        }
+
+        // Should be safe not to do the following as we don't have a search service, but it is cleaner to remove the mock.
+        if (serviceRegistry != null)
+        {
+        	serviceRegistry.setMockSearchService(null);
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/DeletedNodesTest.java b/remote-api/src/test/java/org/alfresco/rest/DeletedNodesTest.java
new file mode 100644
index 00000000000..44741ce6621
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/DeletedNodesTest.java
@@ -0,0 +1,709 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest;
+
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.NodeTargetAssoc;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.data.ContentInfo;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.Folder;
+import org.alfresco.rest.api.tests.client.data.Node;
+import org.alfresco.rest.api.tests.client.data.PathInfo;
+import org.alfresco.rest.api.tests.client.data.Rendition;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.rest.api.trashcan.TrashcanEntityResource;
+import org.junit.After;
+import org.junit.Test;
+import org.springframework.extensions.webscripts.Status;
+
+import com.google.common.collect.Ordering;
+
+/**
+ * V1 REST API tests for managing the user's Trashcan (ie. "deleted nodes")
+ * 
+ * Tests Deleting nodes and recovering
+ *
+ * @author gethin
+ */
+public class DeletedNodesTest extends AbstractSingleNetworkSiteTest
+{
+
+    protected static final String URL_DELETED_NODES = "deleted-nodes";
+    private static final String URL_RENDITIONS = "renditions";
+
+    private final static long DELAY_IN_MS = 500;
+    
+    @Override
+    public void setup() throws Exception
+    {
+        super.setup();
+    }
+
+    @After
+    public void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+    
+    /**
+     * Tests getting deleted nodes
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/deleted-nodes/}
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/deleted-nodes/<nodeId>/}
+     */
+    @Test
+    public void testCreateAndDelete() throws Exception
+    {
+        setRequestContext(user1);
+        
+        Date now = new Date();
+        String folder1 = "folder-testCreateAndDelete-" + now.getTime() + "_1";
+        Folder createdFolder = createFolder(tDocLibNodeId, folder1, null);
+        assertNotNull(createdFolder);
+        String f1Id = createdFolder.getId();
+
+        //Create a folder outside a site
+        Folder createdFolderNonSite = createFolder(Nodes.PATH_MY, folder1, null);
+        assertNotNull(createdFolderNonSite);
+
+        Document document = createEmptyTextFile(f1Id, "d1.txt");
+
+        PublicApiClient.Paging paging = getPaging(0, 100);
+        
+        //First get any deleted nodes
+        HttpResponse response = getAll(URL_DELETED_NODES, paging, 200);
+        List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertNotNull(nodes);
+        int numOfNodes = nodes.size();
+
+        deleteNode(document.getId());
+        deleteNode(createdFolder.getId());
+        deleteNode(createdFolderNonSite.getId());
+
+        response = getAll(URL_DELETED_NODES, paging, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertNotNull(nodes);
+        assertEquals(numOfNodes+3,nodes.size());
+
+        //The list is ordered with the most recently deleted node first
+        checkDeletedNodes(now, createdFolder, createdFolderNonSite, document, nodes);
+
+        // sanity check paging
+        paging = getPaging(1, 1);
+        response = getAll(URL_DELETED_NODES, paging, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertNotNull(nodes);
+        assertEquals(1, nodes.size());
+        PublicApiClient.ExpectedPaging expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+        assertEquals(numOfNodes+3, expectedPaging.getTotalItems().intValue());
+        assertEquals(1, expectedPaging.getCount().intValue());
+        assertEquals(1, expectedPaging.getSkipCount().intValue());
+        assertEquals(1, expectedPaging.getMaxItems().intValue());
+        assertTrue(expectedPaging.getHasMoreItems().booleanValue());
+
+        Map<String, String> params = Collections.singletonMap("include", "path");
+        response = getSingle(URL_DELETED_NODES, document.getId(), params, 200);
+        Document node = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class);
+        assertNotNull(node);
+        assertEquals(user1, node.getArchivedByUser().getId());
+        assertTrue(node.getArchivedAt().after(now));
+        PathInfo path = node.getPath();
+        assertNull("Path should be null because its parent has been deleted",path);
+        assertNull("We don't show the parent id for a deleted node",node.getParentId());
+
+        response = getSingle(URL_DELETED_NODES, createdFolder.getId(), params, 200);
+        Folder fNode = jacksonUtil.parseEntry(response.getJsonResponse(), Folder.class);
+        assertNotNull(fNode);
+        assertEquals(user1, fNode.getArchivedByUser().getId());
+        assertTrue(fNode.getArchivedAt().after(now));
+        path = fNode.getPath();
+        assertNotNull(path);
+        assertEquals("/Company Home/Sites/"+tSiteId+"/documentLibrary", path.getName());
+        assertTrue(path.getIsComplete());
+        assertNull("We don't show the parent id for a deleted node",fNode.getParentId());
+
+        response = getSingle(URL_DELETED_NODES, createdFolderNonSite.getId(), params, 200);
+        fNode = jacksonUtil.parseEntry(response.getJsonResponse(), Folder.class);
+        assertNotNull(fNode);
+        assertEquals(user1, fNode.getArchivedByUser().getId());
+        assertTrue(fNode.getArchivedAt().after(now));
+        path = fNode.getPath();
+        assertNotNull(path);
+        assertEquals("/Company Home/User Homes/"+user1, path.getName());
+        assertTrue(path.getIsComplete());
+
+        //User 2 can't get it but user 1 can.
+        setRequestContext(user2);
+        getSingle(URL_DELETED_NODES, createdFolderNonSite.getId(), Status.STATUS_FORBIDDEN);
+
+        setRequestContext(user1);
+        
+        //Invalid node ref
+        getSingle(URL_DELETED_NODES, "iddontexist", 404);
+
+        //Now as admin
+        setRequestContext(networkAdmin);
+        paging = getPaging(0, 100);
+        response = publicApiClient.get(getScope(), URL_DELETED_NODES, null, null, null, createParams(paging, null));
+        checkStatus(200, response.getStatusCode());
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertNotNull(nodes);
+        checkDeletedNodes(now, createdFolder, createdFolderNonSite, document, nodes);
+    }
+
+    /**
+     * Tests restoring deleted nodes
+     * <p>post:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/deleted-nodes/<nodeId>/restore}
+     */
+    @Test
+    public void testCreateAndRestore() throws Exception
+    {
+        setRequestContext(user1);
+
+        Date now = new Date();
+        String folder1 = "folder" + now.getTime() + "_1";
+        Folder createdFolder = createFolder(tDocLibNodeId, folder1, null);
+        assertNotNull(createdFolder);
+        String f1Id = createdFolder.getId();
+
+        // Create a folder outside a site
+        Folder createdFolderNonSite = createFolder(Nodes.PATH_MY, folder1, null);
+        assertNotNull(createdFolderNonSite);
+
+        Document document = createEmptyTextFile(f1Id, "restoreme.txt");
+        deleteNode(document.getId());
+
+        // Create another document with the same name
+        Document documentSameName = createEmptyTextFile(f1Id, "restoreme.txt");
+
+        // Can't restore a node of the same name
+        post(URL_DELETED_NODES + "/" + document.getId() + "/restore", null, null, Status.STATUS_CONFLICT);
+
+        deleteNode(documentSameName.getId());
+
+        // Now we can restore it.
+        post(URL_DELETED_NODES + "/" + document.getId() + "/restore", null, null, 200);
+
+        deleteNode(document.getId());
+
+        // Create a new nodeTargetAssoc containing target id and association type
+        NodeTargetAssoc nodeTargetAssoc = new NodeTargetAssoc();
+        nodeTargetAssoc.setTargetParentId(f1Id);
+        nodeTargetAssoc.setAssocType(ASSOC_TYPE_CM_CONTAINS);
+
+        // restore to new location
+        post(URL_DELETED_NODES + "/" + document.getId() + "/restore", toJsonAsStringNonNull(nodeTargetAssoc), null, 200);
+
+        deleteNode(document.getId());
+        // restore to nonexistent nodeId as the new location
+        nodeTargetAssoc.setTargetParentId("nonexistentTargetNode");
+        post(URL_DELETED_NODES + "/" + document.getId() + "/restore", toJsonAsStringNonNull(nodeTargetAssoc), null, 404);
+
+        // restore to new location and using an invalid assocType
+        nodeTargetAssoc.setTargetParentId(f1Id);
+        nodeTargetAssoc.setAssocType("invalidAssociationType");
+        post(URL_DELETED_NODES + "/" + document.getId() + "/restore", toJsonAsStringNonNull(nodeTargetAssoc), null, 400);
+
+        // restore to new location without adding an association type
+        nodeTargetAssoc.setTargetParentId(f1Id);
+        nodeTargetAssoc.setAssocType(null);
+        post(URL_DELETED_NODES + "/" + document.getId() + "/restore", toJsonAsStringNonNull(nodeTargetAssoc), null, 400);
+
+        // create an folder as an admin
+        setRequestContext(networkAdmin);
+
+        String folderAdmin = "adminsFolder" + now.getTime() + "_1";
+        Folder adminCreatedFolder = createFolder(Nodes.PATH_MY, folderAdmin, null);
+        assertNotNull(adminCreatedFolder);
+        String adminf1Id = adminCreatedFolder.getId();
+
+        // switch context, re-delete the document and try to restore it to a
+        // folder user1 does not have permissions to
+        setRequestContext(user1);
+        nodeTargetAssoc.setTargetParentId(adminf1Id);
+        nodeTargetAssoc.setAssocType(ASSOC_TYPE_CM_CONTAINS);
+        post(URL_DELETED_NODES + "/" + document.getId() + "/restore", toJsonAsStringNonNull(nodeTargetAssoc), null, 403);
+        
+        deleteNode(createdFolder.getId());
+
+        // We deleted the parent folder so lets see if we can restore a child
+        // doc, hopefully not.
+        post(URL_DELETED_NODES + "/" + documentSameName.getId() + "/restore", null, null, Status.STATUS_NOT_FOUND);
+
+        // Can't delete "nonsense" noderef
+        post("deleted-nodes/nonsense/restore", null, null, Status.STATUS_NOT_FOUND);
+
+        // User 2 can't restore it but user 1 can.
+        setRequestContext(user2);
+        post(URL_DELETED_NODES + "/" + createdFolder.getId() + "/restore", null, null, Status.STATUS_FORBIDDEN);
+        setRequestContext(user1);
+        post(URL_DELETED_NODES + "/" + createdFolder.getId() + "/restore", null, null, 200);
+    }
+
+    /**
+     * Tests purging a deleted node
+     * <p>delete:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/deleted-nodes/<nodeId>/}
+     */
+    @Test
+    public void testCreateAndPurge() throws Exception
+    {
+        setRequestContext(user1);
+
+        Date now = new Date();
+        String folder1 = "folder" + now.getTime() + "_1";
+        Folder createdFolder = createFolder(tDocLibNodeId, folder1, null);
+        assertNotNull(createdFolder);
+
+        deleteNode(createdFolder.getId());
+
+        HttpResponse response = getSingle(URL_DELETED_NODES, createdFolder.getId(), 200);
+        Folder fNode = jacksonUtil.parseEntry(response.getJsonResponse(), Folder.class);
+        assertNotNull(fNode);
+
+        //try purging "nonsense"
+        delete(URL_DELETED_NODES, "nonsense", 404);
+
+        //User 2 can't do it
+        setRequestContext(user2);
+        delete(URL_DELETED_NODES, createdFolder.getId(), Status.STATUS_FORBIDDEN);
+
+        setRequestContext(user1);
+
+        //Now purge the folder
+        delete(URL_DELETED_NODES, createdFolder.getId(), 204);
+
+        //This time we can't find it.
+        getSingle(URL_DELETED_NODES, createdFolder.getId(), 404);
+    }
+
+    /**
+     * Tests download of file/content.
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/deleted-nodes/<nodeId>/content}
+     */
+    @Test
+    public void testDownloadFileContent() throws Exception
+    {
+        setRequestContext(user1);
+
+        // Use existing test file
+        String fileName = "quick-1.txt";
+        File file = getResourceFile(fileName);
+
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new MultiPartBuilder.FileData(fileName, file));
+        MultiPartBuilder.MultiPartRequest reqBody = multiPartBuilder.build();
+
+        // Upload text content
+        HttpResponse response = post(getNodeChildrenUrl(Nodes.PATH_MY), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        String contentNodeId = document.getId();
+
+        // Check the upload response
+        assertEquals(fileName, document.getName());
+        ContentInfo contentInfo = document.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+
+        // move the node to Trashcan
+        deleteNode(document.getId());
+
+        // Download text content - by default with Content-Disposition header
+        response = getSingle(TrashcanEntityResource.class, contentNodeId + "/content", null, 200);
+
+        String textContent = response.getResponse();
+        assertEquals("The quick brown fox jumps over the lazy dog", textContent);
+        Map<String, String> responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertEquals("attachment; filename=\"quick-1.txt\"; filename*=UTF-8''quick-1.txt", responseHeaders.get("Content-Disposition"));
+        String cacheControl = responseHeaders.get("Cache-Control");
+        assertNotNull(cacheControl);
+        assertTrue(cacheControl.contains("must-revalidate"));
+        assertTrue(cacheControl.contains("max-age=0"));
+        assertNotNull(responseHeaders.get("Expires"));
+        String lastModifiedHeader = responseHeaders.get(LAST_MODIFIED_HEADER);
+        assertNotNull(lastModifiedHeader);
+        Map<String, String> headers = Collections.singletonMap(IF_MODIFIED_SINCE_HEADER, lastModifiedHeader);
+        // Test 304 response
+        getSingle(URL_DELETED_NODES + "/" + contentNodeId + "/content", null, null, headers, 304);
+
+        // Use existing pdf test file
+        fileName = "quick.pdf";
+        file = getResourceFile(fileName);
+        byte[] originalBytes = Files.readAllBytes(Paths.get(file.getAbsolutePath()));
+
+        multiPartBuilder = MultiPartBuilder.create().setFileData(new MultiPartBuilder.FileData(fileName, file));
+        reqBody = multiPartBuilder.build();
+
+        // Upload binary content
+        response = post(getNodeChildrenUrl(Nodes.PATH_MY), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        // move the node to Trashcan
+        deleteNode(document.getId());
+        contentNodeId = document.getId();
+
+        // Check the upload response
+        assertEquals(fileName, document.getName());
+        contentInfo = document.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_PDF, contentInfo.getMimeType());
+
+        // Download binary content (as bytes) - without Content-Disposition
+        // header (attachment=false)
+        Map<String, String> params = new LinkedHashMap<>();
+        params.put("attachment", "false");
+
+        response = getSingle(TrashcanEntityResource.class, contentNodeId + "/content", params, 200);
+        byte[] bytes = response.getResponseAsBytes();
+        assertArrayEquals(originalBytes, bytes);
+
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertNull(responseHeaders.get("Content-Disposition"));
+        assertNotNull(responseHeaders.get("Cache-Control"));
+        assertNotNull(responseHeaders.get("Expires"));
+        lastModifiedHeader = responseHeaders.get(LAST_MODIFIED_HEADER);
+        assertNotNull(lastModifiedHeader);
+        headers = Collections.singletonMap(IF_MODIFIED_SINCE_HEADER, lastModifiedHeader);
+        // Test 304 response
+        getSingle(URL_DELETED_NODES + "/" + contentNodeId + "/content", null, null, headers, 304);
+
+        // -ve - nodeId in the path parameter does not exist
+        getSingle(TrashcanEntityResource.class, UUID.randomUUID().toString() + "/content", params, 404);
+
+        // -ve test - Authentication failed
+        setRequestContext(null);
+        getSingle(TrashcanEntityResource.class, contentNodeId + "/content", params, 401);
+
+        // -ve - Current user does not have permission for nodeId
+        setRequestContext(user2);
+        getSingle(TrashcanEntityResource.class, contentNodeId + "/content", params, 403);
+    }
+
+    /**
+     * Test retrieve renditions for deleted nodes
+     * <p>post:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/deleted-nodes/<nodeId>/renditions}
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/deleted-nodes/<nodeId>/rendition/<renditionId>}
+     */
+    @Test
+    public void testListRenditions() throws Exception
+    {
+        setRequestContext(user1);
+
+        Date now = new Date();
+        String folder1 = "folder" + now.getTime() + "_1";
+        Folder createdFolder = createFolder(tDocLibNodeId, folder1, null);
+        assertNotNull(createdFolder);
+        String f1Id = createdFolder.getId();
+
+        // Create multipart request
+        String fileName = "quick.pdf";
+        File file = getResourceFile(fileName);
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new MultiPartBuilder.FileData(fileName, file));
+        MultiPartBuilder.MultiPartRequest reqBody = multiPartBuilder.build();
+
+        // Upload quick.pdf file into the folder previously created
+        HttpResponse response = post(getNodeChildrenUrl(f1Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String contentNodeId = document.getId();
+
+        // create doclib rendition and move node to trashcan
+        createAndGetRendition(contentNodeId, "doclib");
+        deleteNode(contentNodeId);
+
+        // List all renditions and check for results
+        PublicApiClient.Paging paging = getPaging(0, 50);
+        response = getAll(getDeletedNodeRenditionsUrl(contentNodeId), paging, 200);
+        List<Rendition> renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertTrue(renditions.size() >= 3);
+
+        // +ve test - get previously created 'doclib' rendition
+        response = getSingle(getDeletedNodeRenditionsUrl(contentNodeId), "doclib", 200);
+        Rendition doclibRendition = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Rendition.class);
+
+        assertNotNull(doclibRendition);
+        assertEquals(Rendition.RenditionStatus.CREATED, doclibRendition.getStatus());
+        ContentInfo contentInfo = doclibRendition.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_IMAGE_PNG, contentInfo.getMimeType());
+        assertEquals("PNG Image", contentInfo.getMimeTypeName());
+        assertNotNull(contentInfo.getEncoding());
+        assertTrue(contentInfo.getSizeInBytes() > 0);
+
+        //  +ve test - Add a filter on rendition 'status' and list only 'NOT_CREATED' renditions
+        Map<String, String> params = new HashMap<>(1);
+        params.put("where", "(status='NOT_CREATED')");
+        response = getAll(getDeletedNodeRenditionsUrl(contentNodeId), paging, params, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertTrue(renditions.size() >= 2);
+
+        //  +ve test - Add a filter on rendition 'status' and list only the CREATED renditions
+        params.put("where", "(status='CREATED')");
+        response = getAll(getDeletedNodeRenditionsUrl(contentNodeId), paging, params, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertEquals("Only 'doclib' rendition should be returned.", 1, renditions.size());
+
+        // SkipCount=0,MaxItems=2
+        paging = getPaging(0, 2);
+        // List all available renditions
+        response = getAll(getDeletedNodeRenditionsUrl(contentNodeId), paging, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertEquals(2, renditions.size());
+        PublicApiClient.ExpectedPaging expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+        assertEquals(2, expectedPaging.getCount().intValue());
+        assertEquals(0, expectedPaging.getSkipCount().intValue());
+        assertEquals(2, expectedPaging.getMaxItems().intValue());
+        assertTrue(expectedPaging.getTotalItems() >= 3);
+        assertTrue(expectedPaging.getHasMoreItems());
+
+        // SkipCount=1,MaxItems=3
+        paging = getPaging(1, 3);
+        // List all available renditions
+        response = getAll(getDeletedNodeRenditionsUrl(contentNodeId), paging, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertEquals(3, renditions.size());
+        expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+        assertEquals(3, expectedPaging.getCount().intValue());
+        assertEquals(1, expectedPaging.getSkipCount().intValue());
+        assertEquals(3, expectedPaging.getMaxItems().intValue());
+        assertTrue(expectedPaging.getTotalItems() >= 3);
+
+        // +ve test - Test returned renditions are ordered (natural sort order)
+        response = getAll(getDeletedNodeRenditionsUrl(contentNodeId), paging, params, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertTrue(Ordering.natural().isOrdered(renditions));
+        // Check again to make sure the ordering wasn't coincidental
+        response = getAll(getDeletedNodeRenditionsUrl(contentNodeId), paging, params, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertTrue(Ordering.natural().isOrdered(renditions));
+        
+        // -ve - nodeId in the path parameter does not exist
+        getAll(getDeletedNodeRenditionsUrl(UUID.randomUUID().toString()), paging, params, 404);
+
+        // -ve test - Create an empty text file
+        Document emptyDoc = createEmptyTextFile(f1Id, "d1.txt");
+        getAll(getDeletedNodeRenditionsUrl(emptyDoc.getId()), paging, params, 404);
+
+        // -ve - nodeId in the path parameter does not represent a file
+        deleteNode(f1Id);
+        getAll(getDeletedNodeRenditionsUrl(f1Id), paging, params, 400);
+        
+        // -ve - Invalid status value
+        params.put("where", "(status='WRONG')");
+        getAll(getDeletedNodeRenditionsUrl(contentNodeId), paging, params, 400);
+
+        // -ve - Invalid filter (only 'status' is supported)
+        params.put("where", "(id='doclib')");
+        getAll(getDeletedNodeRenditionsUrl(contentNodeId), paging, params, 400);
+
+        // -ve test - Authentication failed
+        setRequestContext(null);
+        getAll(getDeletedNodeRenditionsUrl(contentNodeId), paging, params, 401);
+
+        // -ve - Current user does not have permission for nodeId
+        setRequestContext(user2);
+        getAll(getDeletedNodeRenditionsUrl(contentNodeId), paging, params, 403);
+        
+        // Test get single node rendition
+        setRequestContext(user1);
+        // -ve - nodeId in the path parameter does not exist
+        getSingle(getDeletedNodeRenditionsUrl(UUID.randomUUID().toString()), "doclib", 404);
+
+        // -ve - renditionId in the path parameter is not registered/available
+        getSingle(getNodeRenditionsUrl(contentNodeId), ("renditionId" + System.currentTimeMillis()), 404);
+
+        // -ve - nodeId in the path parameter does not represent a file
+        getSingle(getDeletedNodeRenditionsUrl(f1Id), "doclib", 400);
+
+        // -ve test - Authentication failed
+        setRequestContext(null);
+        getSingle(getDeletedNodeRenditionsUrl(contentNodeId), "doclib", 401);
+
+        // -ve - Current user does not have permission for nodeId
+        setRequestContext(user2);
+        getSingle(getDeletedNodeRenditionsUrl(contentNodeId), "doclib", 403);
+    }
+
+    /**
+     * Tests download rendition.
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/deleted-nodes/<nodeId>/renditions/<renditionId>/content}
+     */
+    @Test
+    public void testDownloadRendition() throws Exception
+    {
+        setRequestContext(user1);
+
+        // Create a folder within the site document's library
+        Date now = new Date();
+        String folder1 = "folder" + now.getTime() + "_1";
+        Folder createdFolder = createFolder(tDocLibNodeId, folder1, null);
+        assertNotNull(createdFolder);
+        String f1Id = createdFolder.getId();
+
+        // Create multipart request using an existing file
+        String fileName = "quick.pdf";
+        File file = getResourceFile(fileName);
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new MultiPartBuilder.FileData(fileName, file));
+        MultiPartBuilder.MultiPartRequest reqBody = multiPartBuilder.build();
+
+        // Upload quick.pdf file into 'folder'
+        HttpResponse response = post(getNodeChildrenUrl(f1Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String contentNodeId = document.getId();
+        
+        Rendition rendition = createAndGetRendition(contentNodeId, "doclib");
+        assertNotNull(rendition);
+        assertEquals(Rendition.RenditionStatus.CREATED, rendition.getStatus());
+        deleteNode(contentNodeId);
+
+        // Download rendition - by default with Content-Disposition header
+        response = getSingle(getDeletedNodeRenditionsUrl(contentNodeId), "doclib/content", 200);
+        assertNotNull(response.getResponseAsBytes());
+        Map<String, String> responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        String contentDisposition = responseHeaders.get("Content-Disposition");
+        assertNotNull(contentDisposition);
+        assertTrue(contentDisposition.contains("filename=\"doclib\""));
+        String contentType = responseHeaders.get("Content-Type");
+        assertNotNull(contentType);
+        assertTrue(contentType.startsWith(MimetypeMap.MIMETYPE_IMAGE_PNG));
+
+        // Download rendition - without Content-Disposition header
+        // (attachment=false)
+        Map<String, String> params = new HashMap<>();
+        params = Collections.singletonMap("attachment", "false");
+        response = getSingle(getDeletedNodeRenditionsUrl(contentNodeId), "doclib/content", params, 200);
+        assertNotNull(response.getResponseAsBytes());
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertNull(responseHeaders.get("Content-Disposition"));
+        contentType = responseHeaders.get("Content-Type");
+        assertNotNull(contentType);
+        assertTrue(contentType.startsWith(MimetypeMap.MIMETYPE_IMAGE_PNG));
+
+        // Download rendition - with Content-Disposition header
+        // (attachment=true) same as default
+        params = Collections.singletonMap("attachment", "true");
+        response = getSingle(getDeletedNodeRenditionsUrl(contentNodeId), "doclib/content", params, 200);
+        assertNotNull(response.getResponseAsBytes());
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        String cacheControl = responseHeaders.get("Cache-Control");
+        assertNotNull(cacheControl);
+        assertFalse(cacheControl.contains("must-revalidate"));
+        assertTrue(cacheControl.contains("max-age=31536000"));
+        contentDisposition = responseHeaders.get("Content-Disposition");
+        assertNotNull(contentDisposition);
+        assertTrue(contentDisposition.contains("filename=\"doclib\""));
+        contentType = responseHeaders.get("Content-Type");
+        assertNotNull(contentType);
+        assertTrue(contentType.startsWith(MimetypeMap.MIMETYPE_IMAGE_PNG));
+
+        // Test 304 response - doclib rendition (attachment=true)
+        String lastModifiedHeader = responseHeaders.get(LAST_MODIFIED_HEADER);
+        assertNotNull(lastModifiedHeader);
+        Map<String, String> headers = Collections.singletonMap(IF_MODIFIED_SINCE_HEADER, lastModifiedHeader);
+        getSingle(getDeletedNodeRenditionsUrl(contentNodeId), "doclib/content", params, headers, 304);
+
+        // -ve tests
+        // nodeId in the path parameter does not represent a file
+        deleteNode(f1Id);
+        getSingle(getDeletedNodeRenditionsUrl(f1Id), "doclib/content", 400);
+
+        // nodeId in the path parameter does not exist
+        getSingle(getDeletedNodeRenditionsUrl(UUID.randomUUID().toString()), "doclib/content", 404);
+
+        // renditionId in the path parameter is not registered/available
+        getSingle(getDeletedNodeRenditionsUrl(contentNodeId), ("renditionId" + System.currentTimeMillis() + "/content"), 404);
+
+        // The rendition does not exist, a placeholder is not available and the
+        // placeholder parameter has a value of "true"
+        params = Collections.singletonMap("placeholder", "true");
+        getSingle(getDeletedNodeRenditionsUrl(contentNodeId), ("renditionId" + System.currentTimeMillis() + "/content"), params, 404);
+    }
+
+    /**
+     *  Checks the deleted nodes are in the correct order.
+     */
+    protected void checkDeletedNodes(Date now, Folder createdFolder, Folder createdFolderNonSite, Document document, List<Node> nodes)
+    {
+        Node aNode = (Node) nodes.get(0);
+        assertNotNull(aNode);
+        assertEquals("This folder was deleted most recently", createdFolderNonSite.getId(), aNode.getId());
+        assertEquals(user1, aNode.getArchivedByUser().getId());
+        assertTrue(aNode.getArchivedAt().after(now));
+        assertNull("We don't show the parent id for a deleted node",aNode.getParentId());
+
+        Node folderNode = (Node) nodes.get(1);
+        assertNotNull(folderNode);
+        assertEquals(createdFolder.getId(), folderNode.getId());
+        assertEquals(user1, folderNode.getArchivedByUser().getId());
+        assertTrue(folderNode.getArchivedAt().after(now));
+        assertTrue("This folder was deleted before the non-site folder", folderNode.getArchivedAt().before(aNode.getArchivedAt()));
+        assertNull("We don't show the parent id for a deleted node",folderNode.getParentId());
+
+        aNode = (Node) nodes.get(2);
+        assertNotNull(aNode);
+        assertEquals(document.getId(), aNode.getId());
+        assertEquals(user1, aNode.getArchivedByUser().getId());
+        assertTrue(aNode.getArchivedAt().after(now));
+        assertNull("We don't show the parent id for a deleted node",aNode.getParentId());
+    }
+
+    private String getDeletedNodeRenditionsUrl(String nodeId)
+    {
+        return URL_DELETED_NODES + "/" + nodeId + "/" + URL_RENDITIONS;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/impl/CommentsImplUnitTest.java b/remote-api/src/test/java/org/alfresco/rest/api/impl/CommentsImplUnitTest.java
new file mode 100644
index 00000000000..a7d4817f692
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/impl/CommentsImplUnitTest.java
@@ -0,0 +1,163 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.impl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.forum.CommentService;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.model.Comment;
+import org.alfresco.rest.api.model.Person;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.TypeConstraint;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link CommentsImpl} class.
+ *
+ * @author Chris Shields
+ */
+public class CommentsImplUnitTest
+{
+    private CommentsImpl commentsImpl;
+    private Nodes nodes;
+    private TypeConstraint typeConstraint;
+    private CommentService commentService;
+    private NodeService nodeService;
+    private ContentService contentService;
+    private People people;
+    
+    @Before
+    public void setUp(){
+        commentsImpl = new CommentsImpl();
+        nodes = mock(Nodes.class);
+        typeConstraint = mock(TypeConstraint.class);
+        commentService = mock(CommentService.class);
+        nodeService = mock(NodeService.class);
+        contentService = mock(ContentService.class);
+        people = mock(People.class);
+
+        commentsImpl.setNodes(nodes);
+        commentsImpl.setTypeConstraint(typeConstraint);
+        commentsImpl.setCommentService(commentService);
+        commentsImpl.setNodeService(nodeService);
+        commentsImpl.setContentService(contentService);
+        commentsImpl.setPeople(people);
+    }
+
+    @Test
+    public void createComment()
+    {
+        String nodeId = "node-id";
+        Comment comment = new Comment();
+        NodeRef nodeRef = new NodeRef("protocol", "identifier", "id");
+        NodeRef commentNode = new NodeRef("protocol", "identifier", "comment-id");
+        Map<String, Boolean> map = new HashMap<>();
+        map.put(CommentService.CAN_EDIT, true);
+        map.put(CommentService.CAN_DELETE, true);
+
+        Map<QName, Serializable> nodeProps = new HashMap<>();
+        nodeProps.put(ContentModel.PROP_CREATOR, "user1");
+        nodeProps.put(ContentModel.PROP_MODIFIER, "user2");
+        
+        Person person1 = new Person();
+        person1.setUserName("user1");
+        person1.setEmail("user1@alfresco.com");
+        Person person2 = new Person();
+        person2.setUserName("user2");
+        person2.setEmail("user2@alfresco.com");
+
+        when(nodes.validateNode(nodeId)).thenReturn(nodeRef);
+        when(typeConstraint.matches(nodeRef)).thenReturn(true);
+        when(commentService.createComment(nodeRef, comment.getTitle(), comment.getContent(), false)).thenReturn(commentNode);
+        when(nodeService.getProperties(commentNode)).thenReturn(nodeProps);
+        when(commentService.getCommentPermissions(any(NodeRef.class), any(NodeRef.class))).thenReturn(map);
+        when(people.getPerson(eq("user1"), any(List.class))).thenReturn(person1);
+        when(people.getPerson(eq("user2"), any(List.class))).thenReturn(person2);
+
+        Comment resultComment = commentsImpl.createComment(nodeId, comment);
+
+        assertNotNull(resultComment);
+        assertNotNull(resultComment.getCreatedBy());
+        assertEquals("user1", resultComment.getCreatedBy().getUserName());
+        assertEquals("user1@alfresco.com", resultComment.getCreatedBy().getEmail());
+        assertNotNull(resultComment.getModifiedBy());
+        assertEquals("user2", resultComment.getModifiedBy().getUserName());
+        assertEquals("user2@alfresco.com", resultComment.getModifiedBy().getEmail());
+    }
+
+    @Test
+    public void testCreateCommentForDeletedUser(){
+        
+        String nodeId = "node-id";
+        Comment comment = new Comment();
+        NodeRef nodeRef = new NodeRef("protocol", "identifier", "id");
+        NodeRef commentNode = new NodeRef("protocol", "identifier", "comment-id");
+        Map<String, Boolean> map = new HashMap<>();
+        map.put(CommentService.CAN_EDIT, true);
+        map.put(CommentService.CAN_DELETE, true);
+        
+        Map<QName, Serializable> nodeProps = new HashMap<>();
+        nodeProps.put(ContentModel.PROP_CREATOR, "user1");
+        nodeProps.put(ContentModel.PROP_MODIFIER, "user2");
+
+        when(nodes.validateNode(nodeId)).thenReturn(nodeRef);
+        when(typeConstraint.matches(nodeRef)).thenReturn(true);
+        when(commentService.createComment(nodeRef, comment.getTitle(), comment.getContent(), false)).thenReturn(commentNode);
+        when(nodeService.getProperties(commentNode)).thenReturn(nodeProps);
+        when(commentService.getCommentPermissions(any(NodeRef.class), any(NodeRef.class))).thenReturn(map);
+        when(people.getPerson(eq("user1"), any(List.class))).thenThrow(EntityNotFoundException.class);
+        when(people.getPerson(eq("user2"), any(List.class))).thenThrow(EntityNotFoundException.class);
+
+        Comment resultComment = commentsImpl.createComment(nodeId, comment);
+        
+        assertNotNull(resultComment);
+        assertNotNull(resultComment.getCreatedBy());
+        assertEquals("user1", resultComment.getCreatedBy().getUserName());
+        assertNull(resultComment.getCreatedBy().getEmail());
+        assertNotNull(resultComment.getModifiedBy());
+        assertEquals("user2", resultComment.getModifiedBy().getUserName());
+        assertNull(resultComment.getCreatedBy().getEmail());
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/search/AllSearchApiTests.java b/remote-api/src/test/java/org/alfresco/rest/api/search/AllSearchApiTests.java
new file mode 100644
index 00000000000..57c7cb17ee5
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/search/AllSearchApiTests.java
@@ -0,0 +1,42 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * The suite of tests for the Search Api
+ *
+ * @author Gethin James
+ */
+@RunWith(Suite.class)
+@SuiteClasses({ SearchMapperTests.class, ResultMapperTests.class,SearchQuerySerializerTests.class,
+              SearchApiWebscriptTests.class, StoreMapperTests.class})
+public class AllSearchApiTests
+{
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/search/BasicSearchApiIntegrationTest.java b/remote-api/src/test/java/org/alfresco/rest/api/search/BasicSearchApiIntegrationTest.java
new file mode 100644
index 00000000000..246a122c866
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/search/BasicSearchApiIntegrationTest.java
@@ -0,0 +1,112 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.Queries;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.data.FolderNode;
+import org.alfresco.rest.api.tests.client.data.Node;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.alfresco.util.testing.category.RedundantTests;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Basic test to exercise the Search API endpoint
+ *
+ * <p>POST:</p>
+ * {@literal <host>:<port>/alfresco/api/<networkId>/public/search/versions/1/search}
+ *
+ * @author Gethin James
+ */
+@Category({LuceneTests.class, RedundantTests.class})
+public class BasicSearchApiIntegrationTest extends AbstractSingleNetworkSiteTest
+{
+    private static final String URL_SEARCH = "search";
+    private static final String SEARCH_API_NAME = "search";
+    private static final String  json = "{ \"query\": {\"query\": \"cm:name:king\",\"userQuery\": \"great\",\"language\": \"afts\"}, \"fields\" : [\"id\",\"name\", \"search\"]}";
+    private static final String  bad_json = "{ \"query\": {\"qu\": \"cm:some nonsense \",\"userQuery\": \"great\",\"language\": \"afts\"}}";
+
+    /**
+     * Tests basic api for search
+     */
+    @Test
+    public void testQuery() throws Exception
+    {
+        setRequestContext(user1);
+        String f1Id = null;
+        try
+        {
+            // As user 1 ...
+            // Try to get nodes with search term 'king*' - assume clean repo (ie. none to start with)
+            HttpResponse response = post(URL_SEARCH, json, null, null, SEARCH_API_NAME, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            String myFolderNodeId = getMyNodeId();
+
+            f1Id = createFolder(myFolderNodeId, "king").getId();
+
+            response = post(URL_SEARCH, json, null, null, SEARCH_API_NAME, 200);
+            ExpectedPaging paging = RestApiUtil.parsePaging(response.getJsonResponse());
+            assertEquals(1, paging.getTotalItems().intValue());
+            assertFalse(paging.getHasMoreItems());
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+
+            //Just happy if it doesn't error
+            response = post(URL_SEARCH, SerializerTestHelper.JSON, null, null, SEARCH_API_NAME, 200);
+
+        }
+        finally
+        {
+            // some cleanup
+            if (f1Id != null)
+            {
+                deleteNode(f1Id, true, 204);
+            }
+        }
+    }
+
+    @Test
+    public void testBadQuery() throws Exception
+    {
+        setRequestContext(user1);
+        //Bad request
+        HttpResponse response = post(URL_SEARCH, bad_json, null, null, SEARCH_API_NAME, 400);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/search/RangeResultMapperTests.java b/remote-api/src/test/java/org/alfresco/rest/api/search/RangeResultMapperTests.java
new file mode 100644
index 00000000000..bb51fb3fae8
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/search/RangeResultMapperTests.java
@@ -0,0 +1,187 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search;
+
+import static junit.framework.TestCase.assertEquals;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericBucket;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericFacetResponse;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.RangeResultMapper;
+import org.alfresco.service.cmr.search.RangeParameters;
+import org.junit.Test;
+
+/**
+ * Tests the RangeResultMapper class
+ *
+ * @author Michael Suzuki
+ */
+public class RangeResultMapperTests
+{
+
+    @Test
+    public void testBuildGenericBucketFromRange() throws Exception
+    {
+      //=============== Default
+        GenericBucket response = queryWithoutInclude("head");
+        assertEquals("test:[\"0\" TO \"10\">", response.getFilterQuery());
+        assertEquals("true", response.getBucketInfo().get("startInclusive"));
+        assertEquals("false", response.getBucketInfo().get("endInclusive"));
+        response = queryWithoutInclude("body");
+        assertEquals("test:[\"0\" TO \"10\">", response.getFilterQuery());
+        assertEquals("true", response.getBucketInfo().get("startInclusive"));
+        assertEquals("false", response.getBucketInfo().get("endInclusive"));
+        response = queryWithoutInclude("tail");
+        assertEquals("test:[\"0\" TO \"10\"]", response.getFilterQuery());
+        assertEquals("true", response.getBucketInfo().get("startInclusive"));
+        assertEquals("true", response.getBucketInfo().get("endInclusive"));
+        //=============== start bucket
+        response = queryWithInclude("head", null);
+        assertEquals("test:[\"0\" TO \"10\">", response.getFilterQuery());
+        assertEquals("true", response.getBucketInfo().get("startInclusive"));
+        assertEquals("false", response.getBucketInfo().get("endInclusive"));
+        
+        response = queryWithInclude("head","outer");
+        assertEquals("test:<\"0\" TO \"10\">", response.getFilterQuery());
+        assertEquals("false", response.getBucketInfo().get("startInclusive"));
+        assertEquals("false", response.getBucketInfo().get("endInclusive"));
+        
+        response = queryWithInclude("head","lower");
+        assertEquals("test:[\"0\" TO \"10\">", response.getFilterQuery());
+        assertEquals("true", response.getBucketInfo().get("startInclusive"));
+        assertEquals("false", response.getBucketInfo().get("endInclusive"));
+        
+        response = queryWithInclude("head","upper","lower");
+        assertEquals("test:[\"0\" TO \"10\"]", response.getFilterQuery());
+        assertEquals("true", response.getBucketInfo().get("startInclusive"));
+        assertEquals("true", response.getBucketInfo().get("endInclusive"));
+        
+        response = queryWithInclude("head","edge","upper");
+        assertEquals("test:[\"0\" TO \"10\"]", response.getFilterQuery());
+        assertEquals("true", response.getBucketInfo().get("startInclusive"));
+        assertEquals("true", response.getBucketInfo().get("endInclusive"));
+        
+        response = queryWithInclude("head","upper");
+        assertEquals("test:<\"0\" TO \"10\"]", response.getFilterQuery());
+        assertEquals("false", response.getBucketInfo().get("startInclusive"));
+        assertEquals("true", response.getBucketInfo().get("endInclusive"));
+        
+        //=============== Non start end bucket
+        response = queryWithInclude("body","lower");
+        assertEquals("test:[\"0\" TO \"10\">", response.getFilterQuery());
+        assertEquals("true", response.getBucketInfo().get("startInclusive"));
+        assertEquals("false", response.getBucketInfo().get("endInclusive"));
+        
+        response = queryWithInclude("body","upper");
+        assertEquals("test:<\"0\" TO \"10\"]", response.getFilterQuery());
+        assertEquals("false", response.getBucketInfo().get("startInclusive"));
+        assertEquals("true", response.getBucketInfo().get("endInclusive"));
+        //=============== End bucket
+        response = queryWithInclude("tail","lower");
+        assertEquals("test:[\"0\" TO \"10\">", response.getFilterQuery());
+        assertEquals("true", response.getBucketInfo().get("startInclusive"));
+        assertEquals("false", response.getBucketInfo().get("endInclusive"));
+        
+        response = queryWithInclude("tail","edge");
+        assertEquals("test:<\"0\" TO \"10\"]", response.getFilterQuery());
+        assertEquals("false", response.getBucketInfo().get("startInclusive"));
+        assertEquals("true", response.getBucketInfo().get("endInclusive"));
+        
+        response = queryWithInclude("tail","upper");
+        assertEquals("test:<\"0\" TO \"10\"]", response.getFilterQuery());
+        assertEquals("false", response.getBucketInfo().get("startInclusive"));
+        assertEquals("true", response.getBucketInfo().get("endInclusive"));
+        
+        //Before
+        response = queryWithInclude("head","before");
+        assertEquals("test:<\"0\" TO \"10\">", response.getFilterQuery());
+        assertEquals("false", response.getBucketInfo().get("startInclusive"));
+        assertEquals("false", response.getBucketInfo().get("endInclusive"));
+        
+        response = queryWithIncludeAndOther("head","outer","before");
+        assertEquals("test:<\"0\" TO \"10\"]", response.getFilterQuery());
+        assertEquals("false", response.getBucketInfo().get("startInclusive"));
+        assertEquals("true", response.getBucketInfo().get("endInclusive"));
+        
+        //After
+        response = queryWithIncludeAndOther("head","outer","after");
+        assertEquals("test:<\"0\" TO \"10\"]", response.getFilterQuery());
+        assertEquals("false", response.getBucketInfo().get("startInclusive"));
+        assertEquals("true", response.getBucketInfo().get("endInclusive"));
+    }
+    
+    private GenericBucket queryWithInclude(String bucketPosition, String ...includeParam)
+    {
+   
+        List<RangeParameters> ranges = new ArrayList<RangeParameters>();
+        if(includeParam != null && includeParam.length >= 1)
+        {
+            List<String> include = new ArrayList<String>();
+            for(int i = 0; i < includeParam.length; i++)
+            {
+                include.add(includeParam[i]);
+            }
+            ranges.add(new RangeParameters("test", "0", "10", "1", true, null, include, null, null));
+        }
+        Map<String,String> facet = new HashMap<String,String>();
+        facet.put("bucketPosition", bucketPosition);
+        facet.put(GenericFacetResponse.LABEL, "test");
+        facet.put(GenericFacetResponse.COUNT, "11");
+        facet.put(GenericFacetResponse.START, "0");
+        facet.put(GenericFacetResponse.END, "10");
+        return RangeResultMapper.buildGenericBucketFromRange("test", facet, ranges);
+    }
+    private Map<String,String> buildFaet(String bucketPosition)
+    {
+        Map<String,String> facet = new HashMap<String,String>();
+        facet.put("bucketPosition", bucketPosition);
+        facet.put(GenericFacetResponse.LABEL, "test");
+        facet.put(GenericFacetResponse.COUNT, "11");
+        facet.put(GenericFacetResponse.START, "0");
+        facet.put(GenericFacetResponse.END, "10");
+        return facet;
+    }
+    private GenericBucket queryWithIncludeAndOther(String bucketPosition, String includeParam, String otherParam)
+    {
+        List<RangeParameters> ranges = new ArrayList<RangeParameters>();
+        List<String> include = new ArrayList<String>();
+        include.add(includeParam);
+        List<String> other = new ArrayList<String>();
+        other.add(otherParam);
+        ranges.add(new RangeParameters("test", "0", "10", "1", true, other, include, null, null));
+        return RangeResultMapper.buildGenericBucketFromRange("test", buildFaet(bucketPosition), ranges);
+    }
+    private GenericBucket queryWithoutInclude(String bucketPosition)
+    {
+        List<RangeParameters> ranges = new ArrayList<RangeParameters>();
+        ranges.add(new RangeParameters("test", "0", "10", "1", true, null, null, null, null));
+        return RangeResultMapper.buildGenericBucketFromRange("test", buildFaet(bucketPosition), ranges);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/search/ResultMapperTests.java b/remote-api/src/test/java/org/alfresco/rest/api/search/ResultMapperTests.java
new file mode 100644
index 00000000000..380de61b35a
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/search/ResultMapperTests.java
@@ -0,0 +1,889 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.assertTrue;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.notNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.alfresco.repo.search.EmptyResultSet;
+import org.alfresco.repo.search.impl.lucene.SolrJSONResultSet;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericBucket;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericFacetResponse;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericFacetResponse.FACET_TYPE;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.ListMetric;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.Metric;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.Metric.METRIC_TYPE;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.PercentileMetric;
+import org.alfresco.repo.search.impl.solr.facet.facetsresponse.SimpleMetric;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.version.Version2Model;
+import org.alfresco.repo.version.common.VersionImpl;
+import org.alfresco.rest.api.DeletedNodes;
+import org.alfresco.rest.api.impl.NodesImpl;
+import org.alfresco.rest.api.lookups.PersonPropertyLookup;
+import org.alfresco.rest.api.lookups.PropertyLookupRegistry;
+import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.UserInfo;
+import org.alfresco.rest.api.nodes.NodeVersionsRelation;
+import org.alfresco.rest.api.search.context.FacetFieldContext;
+import org.alfresco.rest.api.search.context.FacetQueryContext;
+import org.alfresco.rest.api.search.context.SearchContext;
+import org.alfresco.rest.api.search.context.SearchRequestContext;
+import org.alfresco.rest.api.search.context.SpellCheckContext;
+import org.alfresco.rest.api.search.impl.ResultMapper;
+import org.alfresco.rest.api.search.impl.SearchMapper;
+import org.alfresco.rest.api.search.impl.StoreMapper;
+import org.alfresco.rest.api.search.model.HighlightEntry;
+import org.alfresco.rest.api.search.model.SearchQuery;
+import org.alfresco.rest.api.search.model.SearchSQLQuery;
+import org.alfresco.rest.api.search.model.TupleList;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.FieldHighlightParameters;
+import org.alfresco.service.cmr.search.GeneralHighlightParameters;
+import org.alfresco.service.cmr.search.LimitBy;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.version.Version;
+import org.alfresco.service.cmr.version.VersionHistory;
+import org.alfresco.service.cmr.version.VersionService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.GUID;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Tests the ResultMapper class
+ *
+ * @author Gethin James
+ */
+public class ResultMapperTests
+{
+    static ResultMapper mapper;
+    static SearchMapper searchMapper = new SearchMapper();
+    public static final String JSON_REPONSE = "{\"responseHeader\":{\"status\":0,\"QTime\":9},\"_original_parameters_\":\"org.apache.solr.common.params.DefaultSolrParams:{params(df=TEXT&alternativeDic=DEFAULT_DICTIONARY&fl=DBID,score&start=0&fq={!afts}AUTHORITY_FILTER_FROM_JSON&fq={!afts}TENANT_FILTER_FROM_JSON&rows=1000&locale=en_US&wt=json),defaults(carrot.url=id&spellcheck.collateExtendedResults=true&carrot.produceSummary=true&spellcheck.maxCollations=3&spellcheck.maxCollationTries=5&spellcheck.alternativeTermCount=2&spellcheck.extendedResults=false&defType=afts&spellcheck.maxResultsForSuggest=5&spellcheck=false&carrot.outputSubClusters=false&spellcheck.count=5&carrot.title=mltext@m___t@{http://www.alfresco.org/model/content/1.0}title&carrot.snippet=content@s___t@{http://www.alfresco.org/model/content/1.0}content&spellcheck.collate=true)}\",\"_field_mappings_\":{},\"_date_mappings_\":{},\"_range_mappings_\":{},\"_pivot_mappings_\":{},\"_interval_mappings_\":{},\"_stats_field_mappings_\":{},\"_stats_facet_mappings_\":{},\"_facet_function_mappings_\":{},\"response\":{\"numFound\":6,\"start\":0,\"maxScore\":0.7849362,\"docs\":[{\"DBID\":565,\"score\":0.7849362},{\"DBID\":566,\"score\":0.7849362},{\"DBID\":521,\"score\":0.3540957},{\"DBID\":514,\"score\":0.33025497},{\"DBID\":420,\"score\":0.32440513},{\"DBID\":415,\"score\":0.2780319}]},"
+                + "\"facet_counts\":{\"facet_queries\":{\"small\":0,\"large\":0,\"xtra small\":3,\"xtra large\":0,\"medium\":8,\"XX large\":0},"
+                + "\"facet_fields\":{\"content.size\":[\"Big\",8,\"Brown\",3,\"Fox\",5,\"Jumped\",2,\"somewhere\",3]},"
+                +"\"facet_dates\":{},"
+                +"\"facet_ranges\":{"
+                + "\"created\": { \"counts\": [\"2015-09-29T10:45:15.729Z\",0,\"2016-01-07T10:45:15.729Z\",0,\"2016-04-16T10:45:15.729Z\",0,\"2016-07-25T10:45:15.729Z\",0],\"gap\": \"+100DAY\",\"start\": \"2015-09-29T10:45:15.729Z\",\"end\": \"2016-11-02T10:45:15.729Z\"},"
+                + "\"content.size\": {\"counts\": [\"0\",4,\"100\",6,\"200\",3],\"gap\": 100,\"start\": 0,\"end\": 300}},"
+                +"\"facet_pivot\":{\"creator,modifier\":[{\"field\":\"creator\",\"count\":7,\"pivot\":[{\"field\":\"modifier\",\"count\":3,\"value\":\"mjackson\"},{\"field\":\"modifier\",\"count\":4,\"value\":\"admin\"}],\"value\":\"mjackson\"}]},"
+                +"\"facet_intervals\":{\"creator\":{\"last\":4,\"first\":0},\"TheCreated\":{\"earlier\":5,\"lastYear\":0,\"currentYear\":854}}"
+                + "},"
+                + "\"spellcheck\":{\"searchInsteadFor\":\"alfresco\"},"
+                + "\"highlighting\": {"
+                + "  \"_DEFAULT_!800001579e3d1964!800001579e3d1969\": {\"name\": [\"some very <al>long<fresco> name\"],\"title\": [\"title1 is very <al>long<fresco>\"], \"DBID\": \"521\"},"
+                + " \"_DEFAULT_!800001579e3d1964!800001579e3d196a\": {\"name\": [\"this is some <al>long<fresco> text.  It\", \" has the word <al>long<fresco> in many places\", \".  In fact, it has <al>long<fresco> on some\", \" happens to <al>long<fresco> in this case.\"], \"DBID\": \"1475846153692\"}"
+                + "},"
+                + "\"stats\":{\"stats_fields\":{\"numericLabel\":{\"sumOfSquares\":0,\"min\":null,\"max\":null,\"mean\":\"NaN\",\"percentiles\":[\"0.0\",12,\"0.99\",20.0685], \"count\":0,\"missing\":0,\"sum\":0,\"distinctValues\":[12,13,14,15,16,17,1],\"stddev\":0}, \"creator\":{\"min\":\"System\",\"max\":\"mjackson\",\"count\":\"990\",\"missing\":\"290\"}, \"created\":{\"sumOfSquares\":2.1513045770343806E27,\"min\":\"2011-02-15T20:16:27.080Z\",\"max\":\"2017-04-10T15:06:30.143Z\",\"mean\":\"2016-09-05T04:20:12.898Z\",\"count\":990,\"missing\":290,\"sum\":1.458318720769983E15,\"stddev\":5.6250677994522545E10}}},"
+                + "\"processedDenies\":true, \"lastIndexedTx\":34}";
+    public static final Params EMPTY_PARAMS = Params.valueOf((String)null,(String)null,(WebScriptRequest) null);
+    public static final String FROZEN_ID = "frozen";
+    public static final String FROZEN_VER = "1.1";
+    private static final long VERSIONED_ID = 521l;
+
+    private static SerializerTestHelper helper;
+
+    @BeforeClass
+    public static void setupTests() throws Exception
+    {
+        Map<String, UserInfo> mapUserInfo = new HashMap<>();
+        mapUserInfo.put(AuthenticationUtil.getSystemUserName(), new UserInfo(AuthenticationUtil.getSystemUserName(), "sys", "sys"));
+        Map<QName, Serializable> nodeProps = new HashMap<>();
+
+        NodesImpl nodes = mock(NodesImpl.class);
+        ServiceRegistry sr = mock(ServiceRegistry.class);
+        DeletedNodes deletedNodes = mock(DeletedNodes.class);
+        nodes.setServiceRegistry(sr);
+        VersionService versionService = mock(VersionService.class);
+        VersionHistory versionHistory = mock(VersionHistory.class);
+
+        Map<String, Serializable> versionProperties = new HashMap<>();
+        versionProperties.put(Version.PROP_DESCRIPTION, "ver desc");
+        versionProperties.put(Version2Model.PROP_VERSION_TYPE, "v type");
+        when(versionHistory.getVersion(anyString())).thenAnswer(invocation ->
+        {
+            return new VersionImpl(versionProperties,new NodeRef(StoreMapper.STORE_REF_VERSION2_SPACESSTORE, GUID.generate()));
+        });
+        NodeService nodeService = mock(NodeService.class);
+
+        when(versionService.getVersionHistory(any(NodeRef.class))).thenAnswer(invocation ->
+        {
+            Object[] args = invocation.getArguments();
+            NodeRef aNode = (NodeRef)args[0];
+            return versionHistory;
+        });
+
+        when(nodeService.getProperties(any(NodeRef.class))).thenAnswer(invocation ->
+        {
+            Object[] args = invocation.getArguments();
+            NodeRef aNode = (NodeRef)args[0];
+            if (StoreMapper.STORE_REF_VERSION2_SPACESSTORE.equals(aNode.getStoreRef()))
+            {
+                nodeProps.put(Version2Model.PROP_QNAME_FROZEN_NODE_REF, new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, FROZEN_ID+aNode.getId()));
+                nodeProps.put(Version2Model.PROP_QNAME_VERSION_LABEL, FROZEN_VER);
+            }
+            return nodeProps;
+        });
+
+        when(sr.getVersionService()).thenReturn(versionService);
+        when(sr.getNodeService()).thenReturn(nodeService);
+
+        when(nodes.validateOrLookupNode(nullable(String.class), nullable(String.class))).thenAnswer(invocation ->
+        {
+            Object[] args = invocation.getArguments();
+            String aNode = (String)args[0];
+            if (aNode.endsWith(""+VERSIONED_ID))
+            {
+                throw new EntityNotFoundException(""+VERSIONED_ID);
+            }
+            else
+            {
+                return new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, aNode);
+            }
+        });
+
+        //        // NodeRef nodeRef = nodes.validateOrLookupNode(nodeId, null);
+        when(nodes.getFolderOrDocument(any(NodeRef.class), nullable(NodeRef.class), nullable(QName.class), nullable(List.class), nullable(Map.class))).thenAnswer(new Answer<Node>() {
+            @Override
+            public Node answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                NodeRef aNode = (NodeRef)args[0];
+                if (StoreRef.STORE_REF_ARCHIVE_SPACESSTORE.equals(aNode.getStoreRef()))
+                {
+                    //Return NULL if its from the archive store.
+                    return null;
+                }
+                return new Node(aNode, (NodeRef)args[1], nodeProps, mapUserInfo, sr);
+            }
+        });
+
+        when(deletedNodes.getDeletedNode(nullable(String.class), nullable(
+                    Parameters.class), anyBoolean(), nullable(Map.class))).thenAnswer(new Answer<Node>() {
+            @Override
+            public Node answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                String nodeId = (String)args[0];
+                if (FROZEN_ID.equals(nodeId)) throw new EntityNotFoundException(nodeId);
+                NodeRef aNode = new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, nodeId);
+                return new Node(aNode, new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE,"unknown"), nodeProps, mapUserInfo, sr);
+            }
+        });
+
+        PersonPropertyLookup propertyLookups = mock(PersonPropertyLookup.class);
+        when(propertyLookups.supports()).thenReturn(Stream.of("creator","modifier").collect(Collectors.toSet()));
+        when(propertyLookups.lookup(notNull(String.class))).thenAnswer(invocation -> {
+            Object[] args = invocation.getArguments();
+            String value = (String)args[0];
+            if ("mjackson".equals(value)) return "Michael Jackson";
+            return null;
+        });
+        PropertyLookupRegistry propertyLookupRegistry = new PropertyLookupRegistry();
+        propertyLookupRegistry.setLookups(Arrays.asList(propertyLookups));
+        mapper = new ResultMapper();
+        mapper.setNodes(nodes);
+        mapper.setStoreMapper(new StoreMapper());
+        mapper.setPropertyLookup(propertyLookupRegistry);
+        mapper.setDeletedNodes(deletedNodes);
+        mapper.setServiceRegistry(sr);
+        NodeVersionsRelation nodeVersionsRelation = new NodeVersionsRelation();
+        nodeVersionsRelation.setNodes(nodes);
+        nodeVersionsRelation.setServiceRegistry(sr);
+        nodeVersionsRelation.afterPropertiesSet();
+        mapper.setNodeVersions(nodeVersionsRelation);
+
+        helper = new SerializerTestHelper();
+        searchMapper.setStoreMapper(new StoreMapper());
+    }
+
+    @Test
+    public void testNoResults() throws Exception
+    {
+        SearchRequestContext searchRequest = SearchRequestContext.from(SearchQuery.EMPTY);
+        CollectionWithPagingInfo<Node> collection =  mapper.toCollectionWithPagingInfo(EMPTY_PARAMS, searchRequest, null, new EmptyResultSet());
+        assertNotNull(collection);
+        assertFalse(collection.hasMoreItems());
+        assertTrue(collection.getTotalItems() < 1);
+        assertNull(collection.getContext());
+    }
+
+    @Test
+    public void testToCollectionWithPagingInfo() throws Exception
+    {
+        ResultSet results = mockResultset(Arrays.asList(514l), Arrays.asList(566l, VERSIONED_ID));
+        SearchRequestContext searchRequest = SearchRequestContext.from(SearchQuery.EMPTY);
+        CollectionWithPagingInfo<Node> collectionWithPage =  mapper.toCollectionWithPagingInfo(EMPTY_PARAMS, searchRequest, SearchQuery.EMPTY, results);
+        assertNotNull(collectionWithPage);
+        Long found = results.getNumberFound();
+        assertEquals(found.intValue(), collectionWithPage.getTotalItems().intValue());
+        Node firstNode = collectionWithPage.getCollection().stream().findFirst().get();
+        assertNotNull(firstNode.getSearch().getScore());
+        assertEquals(StoreMapper.LIVE_NODES, firstNode.getLocation());
+        collectionWithPage.getCollection().stream().forEach(aNode -> {
+            List<HighlightEntry> high = aNode.getSearch().getHighlight();
+            if (high != null)
+            {
+                assertEquals(2, high.size());
+                HighlightEntry first = high.get(0);
+                assertNotNull(first.getField());
+                assertNotNull(first.getSnippets());
+            }
+        });
+        //1 deleted node in the test data
+        assertEquals(1l, collectionWithPage.getCollection().stream().filter(node -> StoreMapper.DELETED.equals(node.getLocation())).count());
+
+        //1 version nodes in the test data (and 1 is not shown because it is in the archive store)
+        assertEquals(1l, collectionWithPage.getCollection().stream().filter(node -> StoreMapper.VERSIONS.equals(node.getLocation())).count());
+    }
+
+    @Test
+    public void testToSearchContext() throws Exception
+    {
+        ResultSet results = mockResultset(Collections.emptyList(),Collections.emptyList());
+        SearchQuery searchQuery = helper.searchQueryFromJson();
+        SearchRequestContext searchRequest = SearchRequestContext.from(searchQuery);
+        SearchParameters searchParams = searchMapper.toSearchParameters(EMPTY_PARAMS, searchQuery, searchRequest);
+        SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0);
+        assertEquals(34l, searchContext.getConsistency().getlastTxId());
+        assertEquals(6, searchContext.getFacetQueries().size());
+        assertEquals(0,searchContext.getFacetQueries().get(0).getCount());
+        assertEquals("cm:created:bob",searchContext.getFacetQueries().get(0).getFilterQuery());
+        assertEquals("small",searchContext.getFacetQueries().get(0).getLabel());
+        assertEquals("searchInsteadFor",searchContext.getSpellCheck().getType());
+        assertEquals(1,searchContext.getSpellCheck().getSuggestions().size());
+        assertEquals("alfresco",searchContext.getSpellCheck().getSuggestions().get(0));
+        assertEquals(1, searchContext.getFacetsFields().size());
+        assertEquals("content.size",searchContext.getFacetsFields().get(0).getLabel());
+
+        //Facet intervals
+        List<GenericFacetResponse> intervalFacets = searchContext.getFacets().stream()
+                    .filter(f -> f.getType().equals(FACET_TYPE.interval)).collect(Collectors.toList());
+        assertEquals(2, intervalFacets.size());
+        assertEquals("creator",intervalFacets.get(0).getLabel());
+        assertEquals("last",intervalFacets.get(0).getBuckets().get(0).getLabel());
+        assertEquals("cm:creator:<\"a\" TO \"b\"]",intervalFacets.get(0).getBuckets().get(0).getFilterQuery());
+        Metric[] metrics = intervalFacets.get(0).getBuckets().get(0).getMetrics().toArray(new Metric[intervalFacets.get(0).getBuckets().get(0).getMetrics().size()]);
+        assertEquals(METRIC_TYPE.count,metrics[0].getType());
+        assertEquals("4",metrics[0].getValue().get("count"));
+
+        //Requests search Query
+        assertNotNull(searchContext.getRequest());
+        assertEquals("great", searchContext.getRequest().getQuery().getUserQuery());
+
+        //Pivot
+        assertEquals(7, searchContext.getFacets().size());
+        GenericFacetResponse pivotFacet = searchContext.getFacets().get(4);
+        assertEquals(FACET_TYPE.pivot,pivotFacet.getType());
+        assertEquals("creator",pivotFacet.getLabel());
+        assertEquals(2, pivotFacet.getBuckets().size());
+        GenericBucket pivotBucket = pivotFacet.getBuckets().get(1);
+        assertEquals("mjackson",pivotBucket.getLabel());
+        assertEquals("creator:\"mjackson\"",pivotBucket.getFilterQuery());
+        metrics =  pivotBucket.getMetrics().toArray(new Metric[pivotBucket.getMetrics().size()]);
+        assertEquals("{count=7}",metrics[0].getValue().toString());
+        assertEquals(1,pivotBucket.getFacets().size());
+        GenericFacetResponse nestedFacet = pivotBucket.getFacets().get(0);
+        assertEquals(FACET_TYPE.pivot,nestedFacet.getType());
+        assertEquals("mylabel",nestedFacet.getLabel());
+        assertEquals(2,nestedFacet.getBuckets().size());
+        GenericBucket nestedBucket = nestedFacet.getBuckets().get(0);
+        assertEquals("mjackson",nestedBucket.getLabel());
+        assertEquals("modifier:\"mjackson\"",nestedBucket.getFilterQuery());
+
+        metrics = nestedBucket.getMetrics().toArray(new Metric[nestedBucket.getMetrics().size()]);
+        assertEquals("{count=3}",metrics[0].getValue().toString());
+        GenericBucket nestedBucket2 = nestedFacet.getBuckets().get(1);
+        assertEquals("admin",nestedBucket2.getLabel());
+        assertEquals("modifier:\"admin\"",nestedBucket2.getFilterQuery());
+        metrics = nestedBucket2.getMetrics().toArray(new Metric[nestedBucket2.getMetrics().size()]);
+        assertEquals("{count=4}",metrics[0].getValue().toString());
+
+        //Stats
+        GenericFacetResponse statsFacet = searchContext.getFacets().get(5);
+        assertEquals(FACET_TYPE.stats,statsFacet.getType());
+        assertEquals("created",statsFacet.getLabel());
+        Set<Metric> statsMetrics = statsFacet.getBuckets().get(0).getMetrics();
+        assertEquals(8,statsMetrics.size());
+        assertTrue(statsMetrics.contains(new SimpleMetric(METRIC_TYPE.sumOfSquares, 2.1513045770343806E27 )));
+        assertTrue(statsMetrics.contains(new SimpleMetric(METRIC_TYPE.min, "2011-02-15T20:16:27.080Z" )));
+        assertTrue(statsMetrics.contains(new SimpleMetric(METRIC_TYPE.max, "2017-04-10T15:06:30.143Z" )));
+        assertTrue(statsMetrics.contains(new SimpleMetric(METRIC_TYPE.mean, "2016-09-05T04:20:12.898Z" )));
+        assertTrue(statsMetrics.contains(new SimpleMetric(METRIC_TYPE.countValues, 990 )));
+        assertTrue(statsMetrics.contains(new SimpleMetric(METRIC_TYPE.missing, 290 )));
+        assertTrue(statsMetrics.contains(new SimpleMetric(METRIC_TYPE.sum, 1.458318720769983E15)));
+        assertTrue(statsMetrics.contains(new SimpleMetric(METRIC_TYPE.stddev, 5.6250677994522545E10)));
+
+        statsFacet = searchContext.getFacets().get(6);
+        assertEquals("numericLabel",statsFacet.getLabel());
+        statsMetrics = statsFacet.getBuckets().get(0).getMetrics();
+        assertEquals(7,statsMetrics.size());
+
+        assertTrue(statsMetrics.contains(new SimpleMetric(METRIC_TYPE.sumOfSquares, 0)));
+        assertTrue(statsMetrics.contains(new SimpleMetric(METRIC_TYPE.countValues, 0)));
+        assertTrue(statsMetrics.contains(new SimpleMetric(METRIC_TYPE.missing, 0)));
+        assertTrue(statsMetrics.contains(new SimpleMetric(METRIC_TYPE.sum, 0)));
+        assertTrue(statsMetrics.contains(new SimpleMetric(METRIC_TYPE.stddev, 0)));
+        JSONArray dVals = new JSONArray(Arrays.asList(12, 13, 14, 15, 16, 17, 1));
+        assertTrue(statsMetrics.contains(new ListMetric(METRIC_TYPE.distinctValues, dVals)));
+        JSONArray pers = new JSONArray(Arrays.asList("0.99",20.0685, "0.0", 12.0));
+        assertTrue(statsMetrics.contains(new PercentileMetric(METRIC_TYPE.percentiles, pers)));
+
+        assertEquals("min must be excluded because its null",0,statsMetrics.stream().filter(metric -> METRIC_TYPE.min.equals(metric.getType())).count());
+        assertEquals("max must be excluded because its null",0,statsMetrics.stream().filter(metric -> METRIC_TYPE.max.equals(metric.getType())).count());
+        assertEquals("mean must be excluded because its NaN",0,statsMetrics.stream().filter(metric -> METRIC_TYPE.mean.equals(metric.getType())).count());
+    }
+
+    @Test
+    public void testIsNullContext() throws Exception
+    {
+        assertTrue(mapper.isNullContext(new SearchContext(0l,null,null,null,null, null)));
+        assertFalse(mapper.isNullContext(new SearchContext(1l,null,null,null,null, null)));
+        assertFalse(mapper.isNullContext(new SearchContext(0l,null,null,null,new SpellCheckContext(null, null), null)));
+        assertFalse(mapper.isNullContext(new SearchContext(0l,null, Arrays.asList(new FacetQueryContext(null, null, 0)),null,null, null)));
+        assertFalse(mapper.isNullContext(new SearchContext(0l,null,null,Arrays.asList(new FacetFieldContext(null, null)),null, null)));
+        assertFalse(mapper.isNullContext(new SearchContext(0l,Arrays.asList(new GenericFacetResponse(null,null, null)),null,null, null, null)));
+    }
+
+    @Test
+    public void testHighlight() throws Exception
+    {
+        SearchParameters sp = new SearchParameters();
+        sp.setBulkFetchEnabled(false);
+        GeneralHighlightParameters highlightParameters = new GeneralHighlightParameters(null,null,null,null,null,null,null,null);
+        sp.setHighlight(highlightParameters);
+        assertNull(sp.getHighlight().getMergeContiguous());
+        assertNull(sp.getHighlight().getFields());
+
+        List<FieldHighlightParameters> fields = new ArrayList<>(2);
+        fields.add(new FieldHighlightParameters(null, null, null, null, null,null));
+        fields.add(new FieldHighlightParameters("myfield", null, null, null, "(",")"));
+        highlightParameters = new GeneralHighlightParameters(1,2,null,null,null,50,true,fields);
+        sp.setHighlight(highlightParameters);
+        assertEquals(2,sp.getHighlight().getFields().size());
+        assertEquals(true,sp.getHighlight().getUsePhraseHighlighter().booleanValue());
+        assertEquals(1,sp.getHighlight().getSnippetCount().intValue());
+        assertEquals(50,sp.getHighlight().getMaxAnalyzedChars().intValue());
+        assertEquals(2,sp.getHighlight().getFragmentSize().intValue());
+        assertEquals("myfield",sp.getHighlight().getFields().get(1).getField());
+        assertEquals("(",sp.getHighlight().getFields().get(1).getPrefix());
+        assertEquals(")",sp.getHighlight().getFields().get(1).getPostfix());
+    }
+
+
+    @Test
+    public void testInterval() throws Exception
+    {
+        ResultSet results = mockResultset(Collections.emptyList(),Collections.emptyList());
+        SearchQuery searchQuery = helper.searchQueryFromJson();
+        SearchRequestContext searchRequest = SearchRequestContext.from(searchQuery);
+        SearchParameters searchParams = searchMapper.toSearchParameters(EMPTY_PARAMS, searchQuery, searchRequest);
+        SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0);
+
+        //Facet intervals
+        List<GenericFacetResponse> intervalFacets = searchContext.getFacets().stream()
+                    .filter(f -> f.getType().equals(FACET_TYPE.interval)).collect(Collectors.toList());
+        assertEquals(2, intervalFacets.size());
+        assertEquals("creator",intervalFacets.get(0).getLabel());
+        assertEquals("last",intervalFacets.get(0).getBuckets().get(0).getLabel());
+        assertEquals("cm:creator:<\"a\" TO \"b\"]",intervalFacets.get(0).getBuckets().get(0).getFilterQuery());
+
+        Object[] metrics = intervalFacets.get(0).getBuckets().get(0).getMetrics().toArray();
+        assertEquals(METRIC_TYPE.count,((SimpleMetric) metrics[0]).getType());
+        assertEquals("4",((SimpleMetric) metrics[0]).getValue().get("count"));
+
+        metrics = intervalFacets.get(1).getBuckets().get(0).getMetrics().toArray();
+        assertEquals("TheCreated",intervalFacets.get(1).getLabel());
+        assertEquals("earlier",intervalFacets.get(1).getBuckets().get(0).getLabel());
+        assertEquals("cm:created:[\"*\" TO \"2016\">",intervalFacets.get(1).getBuckets().get(0).getFilterQuery());
+        assertEquals(METRIC_TYPE.count,((SimpleMetric) metrics[0]).getType());
+        assertEquals("5",((SimpleMetric) metrics[0]).getValue().get("count"));
+
+        metrics = intervalFacets.get(1).getBuckets().get(1).getMetrics().toArray();
+        assertEquals("lastYear",intervalFacets.get(1).getBuckets().get(1).getLabel());
+        assertEquals("cm:created:[\"2016\" TO \"2017\">",intervalFacets.get(1).getBuckets().get(1).getFilterQuery());
+        assertEquals(METRIC_TYPE.count,((SimpleMetric) metrics[0]).getType());
+        assertEquals("0",((SimpleMetric) metrics[0]).getValue().get("count"));
+
+        metrics = intervalFacets.get(1).getBuckets().get(2).getMetrics().toArray();
+        assertEquals("currentYear",intervalFacets.get(1).getBuckets().get(2).getLabel());
+        assertEquals("cm:created:[\"NOW/YEAR\" TO \"NOW/YEAR+1YEAR\"]",intervalFacets.get(1).getBuckets().get(2).getFilterQuery());
+        assertEquals(METRIC_TYPE.count,((SimpleMetric) metrics[0]).getType());
+        assertEquals("854",((SimpleMetric) metrics[0]).getValue().get("count"));
+    }
+    @Test
+    public void testRange() throws Exception
+    {
+        ResultSet results = mockResultset(Collections.emptyList(),Collections.emptyList());
+        SearchQuery searchQuery = helper.searchQueryFromJson();
+        SearchRequestContext searchRequest = SearchRequestContext.from(searchQuery);
+        SearchParameters searchParams = searchMapper.toSearchParameters(EMPTY_PARAMS, searchQuery, searchRequest);
+        SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0);
+        
+        //Numeric facet range 
+        List<GenericFacetResponse> rangeFacets = searchContext.getFacets().stream()
+                    .filter(f -> f.getType().equals(FACET_TYPE.range)).collect(Collectors.toList());
+        assertEquals(2, rangeFacets.size());
+        assertEquals(4, rangeFacets.get(0).getBuckets().size());
+        assertEquals("created",rangeFacets.get(0).getLabel());
+        assertEquals("[2015-09-29T10:45:15.729Z - 2016-01-07T10:45:15.729Z)",rangeFacets.get(0).getBuckets().get(0).getLabel());
+        Object[] metrics1 = rangeFacets.get(0).getBuckets().get(0).getMetrics().toArray();
+        assertEquals("0",((SimpleMetric) metrics1[0]).getValue().get("count"));
+        assertEquals("created:[\"2015-09-29T10:45:15.729Z\" TO \"2016-01-07T10:45:15.729Z\">", rangeFacets.get(0).getBuckets().get(0).getFilterQuery());
+        assertEquals(null,rangeFacets.get(0).getBuckets().get(0).getBucketInfo().get("count"));
+        assertEquals("false",rangeFacets.get(0).getBuckets().get(0).getBucketInfo().get("endInclusive"));
+        assertEquals("true",rangeFacets.get(0).getBuckets().get(0).getBucketInfo().get("startInclusive"));
+
+        assertEquals(3, rangeFacets.get(1).getBuckets().size());
+        assertEquals("content.size",rangeFacets.get(1).getLabel());
+        assertEquals("[0 - 100)",rangeFacets.get(1).getBuckets().get(0).getLabel());
+        Object[] metrics = rangeFacets.get(1).getBuckets().get(0).getMetrics().toArray();
+        assertEquals("4",((SimpleMetric) metrics[0]).getValue().get("count"));
+        assertEquals("content.size:[\"0\" TO \"100\">", rangeFacets.get(1).getBuckets().get(0).getFilterQuery());
+        assertEquals(null,rangeFacets.get(1).getBuckets().get(0).getBucketInfo().get("count"));
+        Map<String, String> facetInfo = rangeFacets.get(1).getBuckets().get(0).getBucketInfo();
+        assertEquals("0",facetInfo.get("start"));
+        assertEquals("100",facetInfo.get("end"));
+        
+        assertEquals("[100 - 200)",rangeFacets.get(1).getBuckets().get(1).getLabel());
+        metrics = rangeFacets.get(1).getBuckets().get(1).getMetrics().toArray();
+        assertEquals("6",((SimpleMetric) metrics[0]).getValue().get("count"));
+        facetInfo = rangeFacets.get(1).getBuckets().get(1).getBucketInfo();
+        assertEquals("100",facetInfo.get("start"));
+        assertEquals("200",facetInfo.get("end"));
+        assertEquals("content.size:[\"100\" TO \"200\">", rangeFacets.get(1).getBuckets().get(1).getFilterQuery());
+        assertEquals(null,rangeFacets.get(1).getBuckets().get(1).getBucketInfo().get("count"));
+        assertEquals("false",rangeFacets.get(1).getBuckets().get(0).getBucketInfo().get("endInclusive"));
+        assertEquals("true",rangeFacets.get(1).getBuckets().get(0).getBucketInfo().get("startInclusive"));
+        
+        assertEquals("[200 - 300)",rangeFacets.get(1).getBuckets().get(2).getLabel());
+        metrics = rangeFacets.get(1).getBuckets().get(2).getMetrics().toArray();
+        assertEquals("3",((SimpleMetric) metrics[0]).getValue().get("count"));
+        facetInfo = rangeFacets.get(1).getBuckets().get(2).getBucketInfo();
+        assertEquals("200",facetInfo.get("start"));
+        assertEquals("300",facetInfo.get("end"));
+        assertEquals("content.size:[\"200\" TO \"300\">", rangeFacets.get(1).getBuckets().get(2).getFilterQuery());
+    }
+    @Test
+    public void testRangeExclusiec() throws Exception
+    {
+        ResultSet results = mockResultset(Collections.emptyList(),Collections.emptyList());
+        String updatedJSON = helper.JSON.replace("lower", "upper");
+        SearchQuery searchQuery = helper.extractFromJson(updatedJSON);
+        SearchRequestContext searchRequest = SearchRequestContext.from(searchQuery);
+        SearchParameters searchParams = searchMapper.toSearchParameters(EMPTY_PARAMS, searchQuery, searchRequest);
+        SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0);
+        
+        //Numeric facet range 
+        List<GenericFacetResponse> rangeFacets = searchContext.getFacets().stream()
+                    .filter(f -> f.getType().equals(FACET_TYPE.range)).collect(Collectors.toList());
+        assertEquals(2, rangeFacets.size());
+        assertEquals(4, rangeFacets.get(0).getBuckets().size());
+        assertEquals(3, rangeFacets.get(1).getBuckets().size());
+        assertEquals("content.size",rangeFacets.get(1).getLabel());
+        assertEquals("(0 - 100]",rangeFacets.get(1).getBuckets().get(0).getLabel());
+        Object[] metrics = rangeFacets.get(1).getBuckets().get(0).getMetrics().toArray();
+        assertEquals("4",((SimpleMetric) metrics[0]).getValue().get("count"));
+        assertEquals("content.size:<\"0\" TO \"100\"]", rangeFacets.get(1).getBuckets().get(0).getFilterQuery());
+        assertEquals(null,rangeFacets.get(1).getBuckets().get(0).getBucketInfo().get("count"));
+        Map<String, String> facetInfo = rangeFacets.get(1).getBuckets().get(0).getBucketInfo();
+        assertEquals("0",facetInfo.get("start"));
+        assertEquals("100",facetInfo.get("end"));
+        assertEquals("false",facetInfo.get("startInclusive"));
+        assertEquals("true",facetInfo.get("endInclusive"));
+        
+    }
+
+    @Test
+    /**
+     * Test facet group with out facet fields
+     * @throws Exception
+     */
+    public void testFacetingGroupResponse() throws Exception
+    {
+        String jsonQuery = "{\"query\": {\"query\": \"alfresco\"},"
+                    + "\"facetQueries\": [" 
+                    + "{\"query\": \"content.size:[o TO 102400]\", \"label\": \"small\",\"group\":\"foo\"},"
+                    + "{\"query\": \"content.size:[102400 TO 1048576]\", \"label\": \"medium\",\"group\":\"foo\"}," 
+                    + "{\"query\": \"content.size:[1048576 TO 16777216]\", \"label\": \"large\",\"group\":\"foo\"}]"
+                    + "}";
+        
+        String expectedResponse = "{\"responseHeader\":{\"status\":0,\"QTime\":9},\"_original_parameters_\":\"org.apache.solr.common.params.DefaultSolrParams:{params(df=TEXT&alternativeDic=DEFAULT_DICTIONARY&fl=DBID,score&start=0&fq={!afts}AUTHORITY_FILTER_FROM_JSON&fq={!afts}TENANT_FILTER_FROM_JSON&rows=1000&locale=en_US&wt=json),defaults(carrot.url=id&spellcheck.collateExtendedResults=true&carrot.produceSummary=true&spellcheck.maxCollations=3&spellcheck.maxCollationTries=5&spellcheck.alternativeTermCount=2&spellcheck.extendedResults=false&defType=afts&spellcheck.maxResultsForSuggest=5&spellcheck=false&carrot.outputSubClusters=false&spellcheck.count=5&carrot.title=mltext@m___t@{http://www.alfresco.org/model/content/1.0}title&carrot.snippet=content@s___t@{http://www.alfresco.org/model/content/1.0}content&spellcheck.collate=true)}\",\"_field_mappings_\":{},\"_date_mappings_\":{},\"_range_mappings_\":{},\"_pivot_mappings_\":{},\"_interval_mappings_\":{},\"_stats_field_mappings_\":{},\"_stats_facet_mappings_\":{},\"_facet_function_mappings_\":{},\"response\":{\"numFound\":6,\"start\":0,\"maxScore\":0.7849362,\"docs\":[{\"DBID\":565,\"score\":0.7849362},{\"DBID\":566,\"score\":0.7849362},{\"DBID\":521,\"score\":0.3540957},{\"DBID\":514,\"score\":0.33025497},{\"DBID\":420,\"score\":0.32440513},{\"DBID\":415,\"score\":0.2780319}]},"
+                        + "\"spellcheck\":{\"searchInsteadFor\":\"alfresco\"},"
+                        + "\"facet_counts\":{\"facet_queries\": {\"small\": 52,\"large\": 0,\"medium\": 0}},"
+                        + "\"processedDenies\":true, \"lastIndexedTx\":34}";
+
+        ResultSet results = mockResultset(expectedResponse);
+        SearchQuery searchQuery = helper.extractFromJson(jsonQuery);
+        SearchRequestContext searchRequest = SearchRequestContext.from(searchQuery);
+        SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0);
+        assertEquals(34l, searchContext.getConsistency().getlastTxId());
+        assertEquals(null, searchContext.getFacetQueries());
+        assertEquals(1, searchContext.getFacets().size());
+        assertEquals(3,searchContext.getFacets().get(0).getBuckets().size());
+        assertEquals("small",searchContext.getFacets().get(0).getBuckets().get(0).getLabel());
+        assertEquals("content.size:[o TO 102400]",searchContext.getFacets().get(0).getBuckets().get(0).getFilterQuery());
+        assertFalse(searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().isEmpty());
+        Metric[] metrics = searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().toArray(new Metric[searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().size()]);
+        assertEquals(METRIC_TYPE.count, metrics[0].getType());
+        assertEquals("{count=52}", metrics[0].getValue().toString());
+        
+    }
+    @Test
+    /**
+     * Test facet group with out facet fields
+     * @throws Exception
+     */
+    public void testFacetingGroupResponseV1() throws Exception
+    {
+        String jsonQuery = "{\"query\": {\"query\": \"alfresco\"}, \"facetFormat\":\"V1\","
+                    + "\"facetQueries\": [" 
+                    + "{\"query\": \"content.size:[o TO 102400]\", \"label\": \"small\"},"
+                    + "{\"query\": \"content.size:[102400 TO 1048576]\", \"label\": \"medium\",\"group\":\"foo\"}," 
+                    + "{\"query\": \"content.size:[1048576 TO 16777216]\", \"label\": \"large\"}]"
+                    + "}";
+        
+        String expectedResponse = "{\"responseHeader\":{\"status\":0,\"QTime\":9},\"_original_parameters_\":\"org.apache.solr.common.params.DefaultSolrParams:{params(df=TEXT&alternativeDic=DEFAULT_DICTIONARY&fl=DBID,score&start=0&fq={!afts}AUTHORITY_FILTER_FROM_JSON&fq={!afts}TENANT_FILTER_FROM_JSON&rows=1000&locale=en_US&wt=json),defaults(carrot.url=id&spellcheck.collateExtendedResults=true&carrot.produceSummary=true&spellcheck.maxCollations=3&spellcheck.maxCollationTries=5&spellcheck.alternativeTermCount=2&spellcheck.extendedResults=false&defType=afts&spellcheck.maxResultsForSuggest=5&spellcheck=false&carrot.outputSubClusters=false&spellcheck.count=5&carrot.title=mltext@m___t@{http://www.alfresco.org/model/content/1.0}title&carrot.snippet=content@s___t@{http://www.alfresco.org/model/content/1.0}content&spellcheck.collate=true)}\",\"_field_mappings_\":{},\"_date_mappings_\":{},\"_range_mappings_\":{},\"_pivot_mappings_\":{},\"_interval_mappings_\":{},\"_stats_field_mappings_\":{},\"_stats_facet_mappings_\":{},\"_facet_function_mappings_\":{},\"response\":{\"numFound\":6,\"start\":0,\"maxScore\":0.7849362,\"docs\":[{\"DBID\":565,\"score\":0.7849362},{\"DBID\":566,\"score\":0.7849362},{\"DBID\":521,\"score\":0.3540957},{\"DBID\":514,\"score\":0.33025497},{\"DBID\":420,\"score\":0.32440513},{\"DBID\":415,\"score\":0.2780319}]},"
+                        + "\"spellcheck\":{\"searchInsteadFor\":\"alfresco\"},"
+                        + "\"facet_counts\":{\"facet_queries\": {\"small\": 52,\"large\": 0,\"medium\": 0}},"
+                        + "\"processedDenies\":true, \"lastIndexedTx\":34}";
+
+        ResultSet results = mockResultset(expectedResponse);
+        SearchQuery searchQuery = helper.extractFromJson(jsonQuery);
+        SearchRequestContext searchRequest = SearchRequestContext.from(searchQuery);
+        SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0);
+        assertEquals(34l, searchContext.getConsistency().getlastTxId());
+        assertEquals(null, searchContext.getFacetQueries());
+        assertEquals(2, searchContext.getFacets().size());
+        assertEquals(2,searchContext.getFacets().get(0).getBuckets().size());
+        assertEquals("small",searchContext.getFacets().get(0).getBuckets().get(0).getLabel());
+        assertEquals("content.size:[o TO 102400]",searchContext.getFacets().get(0).getBuckets().get(0).getFilterQuery());
+        assertFalse(searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().isEmpty());
+        Metric[] metrics = searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().toArray(new Metric[searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().size()]);
+        assertEquals(METRIC_TYPE.count, metrics[0].getType());
+        assertEquals("{count=52}", metrics[0].getValue().toString());
+        
+    }
+    @Test
+    /**
+     * Test facet fields with out group label in the query.
+     * This is to support original api methods query for facet query.
+     *
+     * 
+     * @throws Exception
+     */
+    public void testFacetQueryWithoutGroupResponse() throws Exception
+    {
+        String jsonQuery = "{\"query\": {\"query\": \"alfresco\"},"
+                    + "\"facetQueries\": [" 
+                    + "{\"query\": \"content.size:[0 TO 102400]\", \"label\": \"small\"},"
+                    + "{\"query\": \"content.size:[102400 TO 1048576]\", \"label\": \"medium\"}," 
+                    + "{\"query\": \"content.size:[1048576 TO 16777216]\", \"label\": \"large\"}]"
+                    + "}";
+        
+        String expectedResponse = "{\"responseHeader\":{\"status\":0,\"QTime\":9},\"_original_parameters_\":\"org.apache.solr.common.params.DefaultSolrParams:{params(df=TEXT&alternativeDic=DEFAULT_DICTIONARY&fl=DBID,score&start=0&fq={!afts}AUTHORITY_FILTER_FROM_JSON&fq={!afts}TENANT_FILTER_FROM_JSON&rows=1000&locale=en_US&wt=json),defaults(carrot.url=id&spellcheck.collateExtendedResults=true&carrot.produceSummary=true&spellcheck.maxCollations=3&spellcheck.maxCollationTries=5&spellcheck.alternativeTermCount=2&spellcheck.extendedResults=false&defType=afts&spellcheck.maxResultsForSuggest=5&spellcheck=false&carrot.outputSubClusters=false&spellcheck.count=5&carrot.title=mltext@m___t@{http://www.alfresco.org/model/content/1.0}title&carrot.snippet=content@s___t@{http://www.alfresco.org/model/content/1.0}content&spellcheck.collate=true)}\",\"_field_mappings_\":{},\"_date_mappings_\":{},\"_range_mappings_\":{},\"_pivot_mappings_\":{},\"_interval_mappings_\":{},\"_stats_field_mappings_\":{},\"_stats_facet_mappings_\":{},\"_facet_function_mappings_\":{},\"response\":{\"numFound\":6,\"start\":0,\"maxScore\":0.7849362,\"docs\":[{\"DBID\":565,\"score\":0.7849362},{\"DBID\":566,\"score\":0.7849362},{\"DBID\":521,\"score\":0.3540957},{\"DBID\":514,\"score\":0.33025497},{\"DBID\":420,\"score\":0.32440513},{\"DBID\":415,\"score\":0.2780319}]},"
+                        + "\"spellcheck\":{\"searchInsteadFor\":\"alfresco\"},"
+                        + "\"facet_counts\":{\"facet_queries\": {\"small\": 52,\"large\": 0,\"medium\": 0}},"
+                        + "\"processedDenies\":true, \"lastIndexedTx\":34}";
+
+        ResultSet results = mockResultset(expectedResponse);
+        SearchQuery searchQuery = helper.extractFromJson(jsonQuery);
+        SearchRequestContext searchRequest = SearchRequestContext.from(searchQuery);
+        SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0);
+        assertEquals(34l, searchContext.getConsistency().getlastTxId());
+        assertTrue(searchContext.getFacets().isEmpty());
+        assertEquals(3,searchContext.getFacetQueries().size());
+        assertEquals("small",searchContext.getFacetQueries().get(0).getLabel());
+        assertEquals("content.size:[0 TO 102400]",searchContext.getFacetQueries().get(0).getFilterQuery());
+        assertEquals(52, searchContext.getFacetQueries().get(0).getCount());
+        assertEquals("large",searchContext.getFacetQueries().get(1).getLabel());
+        assertEquals("content.size:[1048576 TO 16777216]",searchContext.getFacetQueries().get(1).getFilterQuery());
+        assertEquals(0, searchContext.getFacetQueries().get(1).getCount());
+        assertEquals("medium",searchContext.getFacetQueries().get(2).getLabel());
+        assertEquals("content.size:[102400 TO 1048576]",searchContext.getFacetQueries().get(2).getFilterQuery());
+        assertEquals(0, searchContext.getFacetQueries().get(2).getCount());
+    }
+    private ResultSet mockResultset(String json) throws Exception
+    {
+        NodeService nodeService = mock(NodeService.class);
+        JSONObject jsonObj = new JSONObject(new JSONTokener(json));
+        SearchParameters sp = new SearchParameters();
+        sp.setBulkFetchEnabled(false);
+        ResultSet results = new SolrJSONResultSet(jsonObj,
+                                                  sp,
+                                                  nodeService,
+                                                  null,
+                                                  LimitBy.FINAL_SIZE,
+                                                  10);
+        return results;
+    }
+
+    private ResultSet mockResultset(List<Long> archivedNodes, List<Long> versionNodes) throws JSONException
+    {
+
+        NodeService nodeService = mock(NodeService.class);
+        when(nodeService.getNodeRef(any())).thenAnswer(new Answer<NodeRef>() {
+            @Override
+            public NodeRef answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                //If the DBID is in the list archivedNodes, instead of returning a noderef return achivestore noderef
+                if (archivedNodes.contains(args[0])) return new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, GUID.generate());
+                if (versionNodes.contains(args[0])) return new NodeRef(StoreMapper.STORE_REF_VERSION2_SPACESSTORE, GUID.generate()+args[0]);
+                return new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, GUID.generate());
+            }
+        });
+
+        SearchParameters sp = new SearchParameters();
+        sp.setBulkFetchEnabled(false);
+        JSONObject json = new JSONObject(new JSONTokener(JSON_REPONSE));
+        ResultSet results = new SolrJSONResultSet(json,sp,nodeService, null, LimitBy.FINAL_SIZE, 10);
+        return results;
+    }
+    
+    @Test
+    /**
+     * Validates that when facetFormat is specified then all facets are returned
+     * in the generic facet response format AKA V2.
+     */
+    public void facetFormatTest() throws Exception
+    {
+        String jsonQuery = "{\"query\": {\"query\": \"alfresco\"},"
+                + "\"facetQueries\": [" 
+                + "{\"query\": \"content.size:[0 TO 102400]\", \"label\": \"small\"},"
+                + "{\"query\": \"content.size:[102400 TO 1048576]\", \"label\": \"medium\"}," 
+                + "{\"query\": \"content.size:[1048576 TO 16777216]\", \"label\": \"large\"}]"
+                + ",\"facetFormat\":\"V2\""
+                + "}";
+    
+        String expectedResponse = "{\"responseHeader\":{\"status\":0,\"QTime\":9},\"_original_parameters_\":\"org.apache.solr.common.params.DefaultSolrParams:{params(df=TEXT&alternativeDic=DEFAULT_DICTIONARY&fl=DBID,score&start=0&fq={!afts}AUTHORITY_FILTER_FROM_JSON&fq={!afts}TENANT_FILTER_FROM_JSON&rows=1000&locale=en_US&wt=json),defaults(carrot.url=id&spellcheck.collateExtendedResults=true&carrot.produceSummary=true&spellcheck.maxCollations=3&spellcheck.maxCollationTries=5&spellcheck.alternativeTermCount=2&spellcheck.extendedResults=false&defType=afts&spellcheck.maxResultsForSuggest=5&spellcheck=false&carrot.outputSubClusters=false&spellcheck.count=5&carrot.title=mltext@m___t@{http://www.alfresco.org/model/content/1.0}title&carrot.snippet=content@s___t@{http://www.alfresco.org/model/content/1.0}content&spellcheck.collate=true)}\",\"_field_mappings_\":{},\"_date_mappings_\":{},\"_range_mappings_\":{},\"_pivot_mappings_\":{},\"_interval_mappings_\":{},\"_stats_field_mappings_\":{},\"_stats_facet_mappings_\":{},\"_facet_function_mappings_\":{},\"response\":{\"numFound\":6,\"start\":0,\"maxScore\":0.7849362,\"docs\":[{\"DBID\":565,\"score\":0.7849362},{\"DBID\":566,\"score\":0.7849362},{\"DBID\":521,\"score\":0.3540957},{\"DBID\":514,\"score\":0.33025497},{\"DBID\":420,\"score\":0.32440513},{\"DBID\":415,\"score\":0.2780319}]},"
+                    + "\"spellcheck\":{\"searchInsteadFor\":\"alfresco\"},"
+                    + "\"facet_counts\":{\"facet_queries\": {\"small\": 52,\"large\": 0,\"medium\": 0}},"
+                    + "\"processedDenies\":true, \"lastIndexedTx\":34}";
+
+        ResultSet results = mockResultset(expectedResponse);
+        SearchQuery searchQuery = helper.extractFromJson(jsonQuery);
+        SearchRequestContext searchRequest = SearchRequestContext.from(searchQuery);
+        SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0);
+        assertEquals(34l, searchContext.getConsistency().getlastTxId());
+        assertEquals(null, searchContext.getFacetQueries());
+        assertEquals(1, searchContext.getFacets().size());
+        assertEquals(3,searchContext.getFacets().get(0).getBuckets().size());
+        assertEquals("small",searchContext.getFacets().get(0).getBuckets().get(0).getLabel());
+        assertEquals("content.size:[0 TO 102400]",searchContext.getFacets().get(0).getBuckets().get(0).getFilterQuery());
+        assertFalse(searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().isEmpty());
+        Metric[] metrics = searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().toArray(new Metric[searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().size()]);
+        assertEquals(METRIC_TYPE.count, metrics[0].getType());
+        assertEquals("{count=52}", metrics[0].getValue().toString());
+        
+        jsonQuery = jsonQuery.replace("V2", "V1");
+        searchQuery = helper.extractFromJson(jsonQuery);
+        results = mockResultset(expectedResponse);
+        searchRequest = SearchRequestContext.from(searchQuery);
+        searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0);
+        assertEquals(34l, searchContext.getConsistency().getlastTxId());
+        assertEquals(3,searchContext.getFacetQueries().size());
+        assertEquals("small",searchContext.getFacetQueries().get(0).getLabel());
+        assertEquals("content.size:[0 TO 102400]",searchContext.getFacetQueries().get(0).getFilterQuery());
+        assertEquals(52, searchContext.getFacetQueries().get(0).getCount());
+        assertEquals("large",searchContext.getFacetQueries().get(1).getLabel());
+        
+        //FacetField Test
+        jsonQuery = 
+                "{\"query\": {\"query\": \"A*\"},"
+                + "\"facetFields\": {\"facets\": ["
+                + "{\"field\": \"creator\", \"mincount\": 1},"
+                + "{\"field\": \"modifier\", \"mincount\": 1}]},"
+                + "\"facetFormat\":\"V1\"}";
+        expectedResponse = "{\"responseHeader\":{\"status\":0,\"QTime\":9},\"_original_parameters_\":\"org.apache.solr.common.params.DefaultSolrParams:{params(df=TEXT&alternativeDic=DEFAULT_DICTIONARY&fl=DBID,score&start=0&fq={!afts}AUTHORITY_FILTER_FROM_JSON&fq={!afts}TENANT_FILTER_FROM_JSON&rows=1000&locale=en_US&wt=json),defaults(carrot.url=id&spellcheck.collateExtendedResults=true&carrot.produceSummary=true&spellcheck.maxCollations=3&spellcheck.maxCollationTries=5&spellcheck.alternativeTermCount=2&spellcheck.extendedResults=false&defType=afts&spellcheck.maxResultsForSuggest=5&spellcheck=false&carrot.outputSubClusters=false&spellcheck.count=5&carrot.title=mltext@m___t@{http://www.alfresco.org/model/content/1.0}title&carrot.snippet=content@s___t@{http://www.alfresco.org/model/content/1.0}content&spellcheck.collate=true)}\",\"_field_mappings_\":{},\"_date_mappings_\":{},\"_range_mappings_\":{},\"_pivot_mappings_\":{},\"_interval_mappings_\":{},\"_stats_field_mappings_\":{},\"_stats_facet_mappings_\":{},\"_facet_function_mappings_\":{},\"response\":{\"numFound\":6,\"start\":0,\"maxScore\":0.7849362,\"docs\":[{\"DBID\":565,\"score\":0.7849362},{\"DBID\":566,\"score\":0.7849362},{\"DBID\":521,\"score\":0.3540957},{\"DBID\":514,\"score\":0.33025497},{\"DBID\":420,\"score\":0.32440513},{\"DBID\":415,\"score\":0.2780319}]},"
+                + "\"spellcheck\":{\"searchInsteadFor\":\"alfresco\"},"
+                + "\"facet_counts\":{\"facet_fields\":{\"creator\":[\"System\",124,\"mjackson\",11,\"abeecher\",4],\"modifier\":[\"System\",124,\"mjackson\",8,\"admin\",7]}},"
+                + "\"processedDenies\":true, \"lastIndexedTx\":34}";
+        results = mockResultset(expectedResponse);
+        searchQuery = helper.extractFromJson(jsonQuery);
+        searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0);
+        assertFalse(searchContext.getFacetsFields().isEmpty());
+        assertTrue(searchContext.getFacets().isEmpty());
+        assertEquals("creator",searchContext.getFacetsFields().get(0).getLabel());
+        assertEquals(3,searchContext.getFacetsFields().get(0).getBuckets().size());
+        assertEquals(124,searchContext.getFacetsFields().get(0).getBuckets().get(0).getCount());
+        assertEquals("creator:\"System\"",searchContext.getFacetsFields().get(0).getBuckets().get(0).getFilterQuery());
+        assertEquals("System",searchContext.getFacetsFields().get(0).getBuckets().get(0).getLabel());
+        assertEquals("modifier",searchContext.getFacetsFields().get(1).getLabel());
+        jsonQuery = jsonQuery.replace("V1", "V2");
+        searchQuery = helper.extractFromJson(jsonQuery);
+        searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0);
+        assertTrue(searchContext.getFacetsFields().isEmpty());
+        assertFalse(searchContext.getFacets().isEmpty());
+        assertEquals("creator",searchContext.getFacets().get(0).getLabel());
+        assertEquals(3,searchContext.getFacets().get(0).getBuckets().size());
+        metrics = searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().toArray(new Metric[searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().size()]);
+        assertEquals("{count=124}",metrics[0].getValue().toString());
+        assertEquals("creator:\"System\"",searchContext.getFacets().get(0).getBuckets().get(0).getFilterQuery());
+        assertEquals("System",searchContext.getFacets().get(0).getBuckets().get(0).getLabel());
+        assertEquals("modifier",searchContext.getFacets().get(1).getLabel());
+    }
+    
+    @Test
+    public void hasGroupTest() throws IOException
+    {
+        String jsonQuery = "{\"query\": {\"query\": \"alfresco\"},"
+                + "\"facetQueries\": [" 
+                + "{\"query\": \"content.size:[0 TO 102400]\", \"label\": \"small\"},"
+                + "{\"query\": \"content.size:[102400 TO 1048576]\", \"label\": \"medium\"}," 
+                + "{\"query\": \"content.size:[1048576 TO 16777216]\", \"label\": \"large\"}]"
+                + "}";
+        String jsonQueryWithGroup = "{\"query\": {\"query\": \"alfresco\"},"
+                + "\"facetQueries\": [" 
+                + "{\"query\": \"content.size:[0 TO 102400]\", \"label\": \"small\"},"
+                + "{\"query\": \"content.size:[102400 TO 1048576]\", \"label\": \"medium\",\"group\":\"foo\"}," 
+                + "{\"query\": \"content.size:[1048576 TO 16777216]\", \"label\": \"large\"}]"
+                + "}";
+        SearchQuery searchQuery = helper.extractFromJson(jsonQuery);
+        assertFalse(ResultMapper.hasGroup(searchQuery));
+        SearchQuery searchQuery2 = helper.extractFromJson(jsonQueryWithGroup);
+        assertTrue(ResultMapper.hasGroup(searchQuery2));
+        assertFalse(ResultMapper.hasGroup(null));
+        String noFacetQueries = "{\"query\": {\"query\": \"alfresco\"},"
+                + "\"facetQueries\": []"
+                + "}";
+        SearchQuery searchQuery3 = helper.extractFromJson(noFacetQueries);
+        assertFalse(ResultMapper.hasGroup(searchQuery3));
+    }
+    @Test
+    /**
+     *  When the following is passed
+     * "facetQueries": [
+     *       {"query": "content.size:[0 TO 102400]", "label": "small", "group": "one"},
+     *       {"query": "content.size:[102400 TO 1048576]", "label": "medium", "group": "two"},
+     *       {"query": "content.size:[1048576 TO 16777216]", "label": "large"}
+     *  We expect to see 3 groups of 1,2,null.
+     * @throws Exception
+     */
+    public void testFacetingWithPartialGroup() throws Exception
+    {
+        String jsonQuery = "{\"query\": {\"query\": \"alfresco\"},"
+                    + "\"facetQueries\": [" 
+                    + "{\"query\": \"content.size:[o TO 102400]\", \"label\": \"small\",\"group\":\"1\"},"
+                    + "{\"query\": \"content.size:[102400 TO 1048576]\", \"label\": \"medium\",\"group\":\"2\"}," 
+                    + "{\"query\": \"content.size:[1048576 TO 16777216]\", \"label\": \"large\"}]"
+                    + "}";
+        
+        String expectedResponse = "{\"responseHeader\":{\"status\":0,\"QTime\":9},\"_original_parameters_\":\"org.apache.solr.common.params.DefaultSolrParams:{params(df=TEXT&alternativeDic=DEFAULT_DICTIONARY&fl=DBID,score&start=0&fq={!afts}AUTHORITY_FILTER_FROM_JSON&fq={!afts}TENANT_FILTER_FROM_JSON&rows=1000&locale=en_US&wt=json),defaults(carrot.url=id&spellcheck.collateExtendedResults=true&carrot.produceSummary=true&spellcheck.maxCollations=3&spellcheck.maxCollationTries=5&spellcheck.alternativeTermCount=2&spellcheck.extendedResults=false&defType=afts&spellcheck.maxResultsForSuggest=5&spellcheck=false&carrot.outputSubClusters=false&spellcheck.count=5&carrot.title=mltext@m___t@{http://www.alfresco.org/model/content/1.0}title&carrot.snippet=content@s___t@{http://www.alfresco.org/model/content/1.0}content&spellcheck.collate=true)}\",\"_field_mappings_\":{},\"_date_mappings_\":{},\"_range_mappings_\":{},\"_pivot_mappings_\":{},\"_interval_mappings_\":{},\"_stats_field_mappings_\":{},\"_stats_facet_mappings_\":{},\"_facet_function_mappings_\":{},\"response\":{\"numFound\":6,\"start\":0,\"maxScore\":0.7849362,\"docs\":[{\"DBID\":565,\"score\":0.7849362},{\"DBID\":566,\"score\":0.7849362},{\"DBID\":521,\"score\":0.3540957},{\"DBID\":514,\"score\":0.33025497},{\"DBID\":420,\"score\":0.32440513},{\"DBID\":415,\"score\":0.2780319}]},"
+                        + "\"spellcheck\":{\"searchInsteadFor\":\"alfresco\"},"
+                        + "\"facet_counts\":{\"facet_queries\": {\"small\": 52,\"large\": 0,\"medium\": 0}},"
+                        + "\"processedDenies\":true, \"lastIndexedTx\":34}";
+
+        ResultSet results = mockResultset(expectedResponse);
+        SearchQuery searchQuery = helper.extractFromJson(jsonQuery);
+        SearchRequestContext searchRequest = SearchRequestContext.from(searchQuery);
+        SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0);
+        assertEquals(34l, searchContext.getConsistency().getlastTxId());
+        assertEquals(null, searchContext.getFacetQueries());
+        assertEquals(3, searchContext.getFacets().size());
+        assertEquals(1,searchContext.getFacets().get(0).getBuckets().size());
+        assertEquals(1,searchContext.getFacets().get(1).getBuckets().size());
+        assertEquals(1,searchContext.getFacets().get(2).getBuckets().size());
+        assertEquals("large",searchContext.getFacets().get(0).getBuckets().get(0).getLabel());
+        assertEquals("small",searchContext.getFacets().get(1).getBuckets().get(0).getLabel());
+        assertEquals("medium",searchContext.getFacets().get(2).getBuckets().get(0).getLabel());
+        assertEquals("content.size:[o TO 102400]",searchContext.getFacets().get(1).getBuckets().get(0).getFilterQuery());
+        assertFalse(searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().isEmpty());
+        Metric[] metrics = searchContext.getFacets().get(1).getBuckets().get(0).getMetrics().toArray(new Metric[searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().size()]);
+        assertEquals(METRIC_TYPE.count, metrics[0].getType());
+        assertEquals("{count=52}", metrics[0].getValue().toString());
+        
+    }
+    @Test
+    public void testSqlResponse() throws IOException, JSONException
+    {
+        JSONObject response = new JSONObject("{\"docs\":[{\"SITE\":\"_REPOSITORY_\"},{\"SITE\":\"surf-config\"},{\"SITE\":\"swsdp\"},{\"EOF\":true,\"RESPONSE_TIME\":96}]}");
+        JSONArray docs = response.getJSONArray("docs");
+        SearchSQLQuery query = new SearchSQLQuery("select SITE from alfresco group by SITE", null, null, 100, false, null, null);
+        CollectionWithPagingInfo<TupleList> info = mapper.toCollectionWithPagingInfo(docs, query);
+        assertEquals(100, info.getPaging().getMaxItems());
+        assertEquals(0, info.getPaging().getSkipCount());
+        assertEquals(false, info.getCollection().isEmpty());
+        assertEquals(3, info.getCollection().size());
+        info = mapper.toCollectionWithPagingInfo(new JSONArray(), query);
+        assertEquals(100, info.getPaging().getMaxItems());
+        assertEquals(0, info.getPaging().getSkipCount());
+        assertEquals(true, info.getCollection().isEmpty());
+        assertEquals(0, info.getCollection().size());
+        try 
+        {
+            mapper.toCollectionWithPagingInfo(null, query);
+        }
+        catch (Exception e) 
+        {
+            assertNotNull(e);
+            assertEquals("Solr response is required instead of JSONArray docs was null", e.getMessage());
+        }
+        try 
+        {
+            mapper.toCollectionWithPagingInfo(docs, null);
+        }
+        catch (Exception e) 
+        {
+            assertNotNull(e);
+            assertEquals("SearchSQLQuery is required", e.getMessage());
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/search/SearchApiWebscriptTests.java b/remote-api/src/test/java/org/alfresco/rest/api/search/SearchApiWebscriptTests.java
new file mode 100644
index 00000000000..a80e3501a0c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/search/SearchApiWebscriptTests.java
@@ -0,0 +1,99 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+import java.util.Arrays;
+
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.junit.Test;
+
+/**
+ * Tests the SearchApiWebscript class
+ *
+ * @author Gethin James
+ */
+public class SearchApiWebscriptTests
+{
+    static SearchApiWebscript webscript = new SearchApiWebscript();
+
+    @Test
+    public void testPaging() throws Exception
+    {
+        Params params = webscript.getParams(null, null, null, null);
+        //Defaults
+        assertNotNull(params.getPaging());
+        assertEquals(Paging.DEFAULT_MAX_ITEMS, params.getPaging().getMaxItems());
+        assertEquals(Paging.DEFAULT_SKIP_COUNT,params.getPaging().getSkipCount());
+
+        params = webscript.getParams(null, null, null, Paging.valueOf(4,20));
+        assertEquals(20, params.getPaging().getMaxItems());
+        assertEquals(4,params.getPaging().getSkipCount());
+
+    }
+
+    @Test
+    public void testFilter() throws Exception
+    {
+        Params params = webscript.getParams(null, null, null, null);
+        //Defaults
+        assertNotNull(params.getFilter());
+
+        params = webscript.getParams(null, null, Arrays.asList("name", "size"), null);
+        assertTrue("This isn't used until include is also specfied", params.getFilter().isAllowed("name"));
+
+        assertTrue("Anything is allowed if include hasn't been specfied", params.getFilter().isAllowed("horse"));
+
+        params = webscript.getParams(null, Arrays.asList("cat", "dog"), null, null);
+        assertTrue(params.getFilter().isAllowed("cat"));
+        assertTrue(params.getFilter().isAllowed("dog"));
+        assertFalse(params.getFilter().isAllowed("horse"));
+
+        params = webscript.getParams(null, Arrays.asList("cat", "dog"), Arrays.asList("name", "size"), null);
+        assertTrue(params.getFilter().isAllowed("cat"));
+        assertFalse(params.getFilter().isAllowed("horse"));
+        assertTrue("name and size should be automatically added to the filter list",params.getFilter().isAllowed("name"));
+        assertTrue("name and size should be automatically added to the filter list",params.getFilter().isAllowed("size"));
+    }
+
+    @Test
+    public void testInclude() throws Exception
+    {
+        Params params = webscript.getParams(null, null, null, null);
+        //Defaults
+        assertNotNull(params.getInclude());
+        assertEquals(0, params.getInclude().size());
+
+        params = webscript.getParams(null, null, Arrays.asList("name", "size"), null);
+        assertNotNull(params.getInclude());
+        assertEquals(2, params.getInclude().size());
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/search/SearchMapperTests.java b/remote-api/src/test/java/org/alfresco/rest/api/search/SearchMapperTests.java
new file mode 100644
index 00000000000..a054f4761a2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/search/SearchMapperTests.java
@@ -0,0 +1,1145 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertTrue;
+import static junit.framework.TestCase.fail;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ALLOWABLEOPERATIONS;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ASPECTNAMES;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ASSOCIATION;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ISLINK;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_ISLOCKED;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_PATH;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_PERMISSIONS;
+import static org.alfresco.rest.api.Nodes.PARAM_INCLUDE_PROPERTIES;
+import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_CMIS_ALFRESCO;
+import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_FTS_ALFRESCO;
+import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_LUCENE;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import org.alfresco.rest.api.search.context.SearchRequestContext;
+import org.alfresco.rest.api.search.impl.SearchMapper;
+import org.alfresco.rest.api.search.impl.StoreMapper;
+import org.alfresco.rest.api.search.model.Default;
+import org.alfresco.rest.api.search.model.FacetField;
+import org.alfresco.rest.api.search.model.FacetFields;
+import org.alfresco.rest.api.search.model.FacetQuery;
+import org.alfresco.rest.api.search.model.FilterQuery;
+import org.alfresco.rest.api.search.model.Limits;
+import org.alfresco.rest.api.search.model.Localization;
+import org.alfresco.rest.api.search.model.Pivot;
+import org.alfresco.rest.api.search.model.Query;
+import org.alfresco.rest.api.search.model.Scope;
+import org.alfresco.rest.api.search.model.SearchQuery;
+import org.alfresco.rest.api.search.model.SortDef;
+import org.alfresco.rest.api.search.model.Spelling;
+import org.alfresco.rest.api.search.model.Template;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.FacetFormat;
+import org.alfresco.service.cmr.search.FieldHighlightParameters;
+import org.alfresco.service.cmr.search.GeneralHighlightParameters;
+import org.alfresco.service.cmr.search.Interval;
+import org.alfresco.service.cmr.search.IntervalParameters;
+import org.alfresco.service.cmr.search.IntervalSet;
+import org.alfresco.service.cmr.search.LimitBy;
+import org.alfresco.service.cmr.search.RangeParameters;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchParameters.FieldFacet;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.search.StatsRequestParameters;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+/**
+ * Tests the SearchMapper class
+ *
+ * @author Gethin James
+ */
+public class SearchMapperTests
+{
+
+    static SearchMapper searchMapper = new SearchMapper();
+    static SerializerTestHelper helper = new SerializerTestHelper();
+
+    @BeforeClass
+    public static void setupTests() throws Exception
+    {
+        searchMapper.setStoreMapper(new StoreMapper());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testMandatory() throws Exception
+    {
+        SearchRequestContext searchRequest = SearchRequestContext.from(SearchQuery.EMPTY);
+        SearchParameters searchParameters = searchMapper.toSearchParameters(ResultMapperTests.EMPTY_PARAMS, SearchQuery.EMPTY, searchRequest);
+    }
+
+    @Test
+    public void toSearchParameters() throws Exception
+    {
+        SearchRequestContext searchRequest = SearchRequestContext.from(minimalQuery());
+        SearchParameters searchParameters = searchMapper.toSearchParameters(ResultMapperTests.EMPTY_PARAMS, minimalQuery(), searchRequest);
+        assertNotNull(searchParameters);
+
+        //Test defaults
+        assertEquals("There should be only 1 default store", 1,searchParameters.getStores().size());
+        assertEquals("workspaces store is the default", StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, searchParameters.getStores().get(0));
+        assertEquals(LimitBy.FINAL_SIZE, searchParameters.getLimitBy());
+        assertEquals(100, searchParameters.getLimit());
+
+        searchParameters = searchMapper.toSearchParameters(ResultMapperTests.EMPTY_PARAMS, helper.searchQueryFromJson(), searchRequest);
+        assertNotNull(searchParameters);
+    }
+
+    @Test
+    public void fromQuery() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        try
+        {
+            searchMapper.fromQuery(searchParameters, new Query(null,null, null));
+            fail();
+        } catch (IllegalArgumentException iae)
+        {
+            assertTrue(iae.getLocalizedMessage().contains("query is a mandatory parameter"));
+        }
+
+        Query q = new Query(null,"hello", null);
+
+        searchMapper.fromQuery(searchParameters, q);
+        //Default
+        assertEquals(LANGUAGE_FTS_ALFRESCO, searchParameters.getLanguage());
+
+        q = new Query("world", "hello", null);
+
+        try
+        {
+            searchMapper.fromQuery(searchParameters, q);
+            fail();
+        } catch (InvalidArgumentException iae)
+        {
+            assertNotNull(iae);
+            //world is not a valid language type
+        }
+
+        q = new Query("afts", "hello", null);
+        searchMapper.fromQuery(searchParameters, q);
+        assertEquals(LANGUAGE_FTS_ALFRESCO, searchParameters.getLanguage());
+
+        q = new Query("cMiS", "hello", null);
+        searchMapper.fromQuery(searchParameters, q);
+        assertEquals(LANGUAGE_CMIS_ALFRESCO, searchParameters.getLanguage());
+
+        q = new Query("LuCENE", "hello", null);
+        searchMapper.fromQuery(searchParameters, q);
+        assertEquals(LANGUAGE_LUCENE, searchParameters.getLanguage());
+
+        assertEquals("hello", searchParameters.getQuery());
+
+        q = new Query("LuCENE", "hello", "Heload");
+        searchMapper.fromQuery(searchParameters, q);
+        assertEquals("Heload", searchParameters.getSearchTerm());
+    }
+
+    @Test
+    public void fromPaging() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        //Doesn't error
+        searchMapper.fromPaging(searchParameters, null);
+
+        Paging paging = Paging.DEFAULT;
+        searchMapper.fromPaging(searchParameters, paging);
+        assertEquals(searchParameters.getLimit(),paging.getMaxItems());
+        assertEquals(searchParameters.getSkipCount(),paging.getSkipCount());
+    }
+
+
+    @Test
+    public void fromSort() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        //Doesn't error
+        searchMapper.fromSort(searchParameters, null);
+
+        try
+        {
+            searchMapper.fromSort(searchParameters, Arrays.asList(new SortDef("wrongenum", null, false)));
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //wrongenum is illegal
+            assertNotNull(iae);
+        }
+
+        searchMapper.fromSort(searchParameters, Arrays.asList(new SortDef("FIELD", "my", true), new SortDef("SCORE", null, false), new SortDef("DOCUMENT", null, true)));
+        assertEquals(3 , searchParameters.getSortDefinitions().size());
+        searchParameters.getSortDefinitions().forEach(sortDefinition ->
+        {
+            switch (sortDefinition.getSortType())
+            {
+                case FIELD:
+                    assertEquals("my", sortDefinition.getField());
+                    assertEquals(true, sortDefinition.isAscending());
+                    break;
+                case SCORE:
+                    assertNull(sortDefinition.getField());
+                    assertEquals(false, sortDefinition.isAscending());
+                    break;
+                case DOCUMENT:
+                    assertNull(sortDefinition.getField());
+                    assertEquals(true, sortDefinition.isAscending());
+                    break;
+                default:
+                    fail("Invalid sortDefinition");
+            }
+        });
+
+        searchParameters = new SearchParameters();
+        searchParameters.setLanguage(SearchService.LANGUAGE_CMIS_ALFRESCO);
+        try
+        {
+            searchMapper.fromSort(searchParameters, Arrays.asList(new SortDef("FIELD", null, false)));
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //You can't specify SORT when using the CMIS language
+            assertNotNull(iae);
+        }
+    }
+
+
+    @Test
+    public void fromTemplate() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        //Doesn't error
+        searchMapper.fromTemplate(searchParameters, null);
+
+        searchMapper.fromTemplate(searchParameters, Arrays.asList(new Template("hedge", "hog"), new Template("king", "kong"), new Template("bish", "bash")));
+        assertEquals(3 ,searchParameters.getQueryTemplates().size());
+        assertEquals("hog" ,searchParameters.getQueryTemplates().get("hedge"));
+        assertEquals("kong" ,searchParameters.getQueryTemplates().get("king"));
+        assertEquals("bash" ,searchParameters.getQueryTemplates().get("bish"));
+    }
+
+    @Test
+    public void fromDefaults() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        //Doesn't error
+        searchMapper.fromDefault(searchParameters, null);
+        searchMapper.fromDefault(searchParameters, new Default(null,null,null,null,null));
+
+        searchMapper.fromDefault(searchParameters, new Default(null,"AND",null,null,null));
+        assertEquals("AND", searchParameters.getDefaultFTSOperator().toString());
+
+        searchMapper.fromDefault(searchParameters, new Default(null, null, "or", null,null));
+        assertEquals("OR", searchParameters.getDefaultFTSFieldOperator().toString());
+
+        try
+        {
+            searchMapper.fromDefault(searchParameters, new Default(null, null, "ELSE", null,null));
+            fail();
+        }
+        catch (IllegalArgumentException iae)
+        {
+            //ELSE is illegal
+            assertNotNull(iae);
+        }
+
+        searchMapper.fromDefault(searchParameters, new Default(null, null, null, "nspa","dfn"));
+        assertEquals("nspa", searchParameters.getNamespace());
+        assertEquals("dfn", searchParameters.getDefaultFieldName());
+
+        assertEquals(0 , searchParameters.getTextAttributes().size());
+        searchMapper.fromDefault(searchParameters, new Default(Arrays.asList("sausage", "mash"), null, null, null,null));
+        assertEquals(2 , searchParameters.getTextAttributes().size());
+        assertTrue(searchParameters.getTextAttributes().contains("sausage"));
+        assertTrue(searchParameters.getTextAttributes().contains("mash"));
+    }
+
+    @Test
+    public void searchParameterIncludesValidation_validInclude_shouldReturnSuccessfulValidation()
+    {
+        searchMapper.validateInclude(Arrays.asList(PARAM_INCLUDE_ALLOWABLEOPERATIONS,PARAM_INCLUDE_ASPECTNAMES,
+                PARAM_INCLUDE_ISLINK, PARAM_INCLUDE_PATH, PARAM_INCLUDE_PROPERTIES,
+                PARAM_INCLUDE_ASSOCIATION, PARAM_INCLUDE_ISLOCKED, PARAM_INCLUDE_PERMISSIONS));
+    }
+
+    
+    @Test
+    public void searchParameterIncludesValidation_invalidInclude_shouldThrowInvalidArgumentException() throws Exception
+    {
+        try
+        {
+            searchMapper.validateInclude(Arrays.asList(PARAM_INCLUDE_ALLOWABLEOPERATIONS,PARAM_INCLUDE_ASPECTNAMES,
+                    PARAM_INCLUDE_ISLINK, PARAM_INCLUDE_PATH, "notValid",
+                    PARAM_INCLUDE_ASSOCIATION, PARAM_INCLUDE_ISLOCKED));
+            fail();
+        }
+        catch (InvalidArgumentException exception)
+        {
+            assertNotNull(exception);
+        }
+        
+    }
+    
+    @Test
+    public void validateInclude() throws Exception
+    {
+        try
+        {
+            searchMapper.validateInclude(Arrays.asList("sausage"));
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+           //Sausage is illegal
+           assertNotNull(iae);
+        }
+
+        searchMapper.validateInclude(null);
+
+        try
+        {
+            searchMapper.validateInclude(Arrays.asList("AspectNames"));
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //Case sensitive
+            assertNotNull(iae);
+        }
+
+        searchMapper.validateInclude(Arrays.asList("properties", "aspectNames"));
+    }
+
+    @Test
+    public void fromFilterQuery() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        //Doesn't error
+
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("hedgehog", null, null), new FilterQuery("king", null, null)));
+        assertEquals(2 ,searchParameters.getFilterQueries().size());
+        assertEquals("hedgehog" ,searchParameters.getFilterQueries().get(0));
+        assertEquals("king" ,searchParameters.getFilterQueries().get(1));
+
+        searchParameters = new SearchParameters();
+        searchParameters.setLanguage(SearchService.LANGUAGE_CMIS_ALFRESCO);
+        try
+        {
+            searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("hedgehog", null, null)));
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //You can't specify FilterQuery when using the CMIS language
+            assertNotNull(iae);
+        }
+
+        try
+        {
+            searchParameters.setLanguage(SearchService.LANGUAGE_SOLR_ALFRESCO);
+            searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery(null, null, null)));
+            fail();
+        }
+        catch (IllegalArgumentException iae)
+        {
+            //You can't specify FilterQuery when using the CMIS language
+            assertNotNull(iae);
+        }
+
+        searchParameters = new SearchParameters();
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("{!afts}description:xyz", Arrays.asList("desc1", "desc2"), null)));
+        assertEquals("{!afts tag=desc1,desc2 }description:xyz" ,searchParameters.getFilterQueries().get(0));
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("{!afts}description:xyz", Arrays.asList("desc1"), null)));
+        assertEquals("{!afts tag=desc1 }description:xyz" ,searchParameters.getFilterQueries().get(1));
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("description:xyz", Arrays.asList("desc1"), null)));
+        assertEquals("{!afts tag=desc1 }description:xyz" ,searchParameters.getFilterQueries().get(2));
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("{!afts} description:xyz", Arrays.asList("desc1"), null)));
+        assertEquals("{!afts tag=desc1 } description:xyz" ,searchParameters.getFilterQueries().get(3));
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery(" {!afts cake} description:xyz", Arrays.asList("desc1"), null)));
+        assertEquals("{!afts tag=desc1 cake} description:xyz" ,searchParameters.getFilterQueries().get(4));
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("{!afts tag=desc1}description:xyz", Arrays.asList("desc1"), null)));
+        assertEquals("{!afts tag=desc1}description:xyz" ,searchParameters.getFilterQueries().get(5));
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("created:2011", Arrays.asList("desc1"), null)));
+        assertEquals("{!afts tag=desc1 }created:2011" ,searchParameters.getFilterQueries().get(6));
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("=cm:name:cabbage", Arrays.asList("desc1"), null)));
+        assertEquals("{!afts tag=desc1 }=cm:name:cabbage" ,searchParameters.getFilterQueries().get(7));
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("{http://www.alfresco.org/model/content/1.0}title:workflow", null, null)));
+        assertEquals("{http://www.alfresco.org/model/content/1.0}title:workflow" ,searchParameters.getFilterQueries().get(8));
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("{http://www.alfresco.org/model/content/1.0}title:workflow", Arrays.asList("desc1"), null)));
+        assertEquals("{!afts tag=desc1 }{http://www.alfresco.org/model/content/1.0}title:workflow" ,searchParameters.getFilterQueries().get(9));
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("{!afts} description:xyz", Arrays.asList("desc1", "desc2"), null)));
+        assertEquals("{!afts tag=desc1,desc2 }description:xyz" ,searchParameters.getFilterQueries().get(0));
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("{ !afts } description:xyz", Arrays.asList("desc1", "desc2"), null)));
+        assertEquals("{!afts tag=desc1,desc2 }description:xyz" ,searchParameters.getFilterQueries().get(0));
+
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery(null, Arrays.asList("desc1"),  Arrays.asList("cm:name:cabbage", "cm:creator:bob"))));
+        assertEquals("{!afts tag=desc1 }cm:name:cabbage OR cm:creator:bob" ,searchParameters.getFilterQueries().get(12));
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery(null, null,  Arrays.asList("cm:name:cabbage", "cm:creator:bob"))));
+        assertEquals("cm:name:cabbage OR cm:creator:bob" ,searchParameters.getFilterQueries().get(13));
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery(null, null,  Arrays.asList("cm:name:cabbage"))));
+        assertEquals("cm:name:cabbage" ,searchParameters.getFilterQueries().get(14));
+        searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("created:2011", null,  Arrays.asList("cm:name:cabbage"))));
+        assertEquals("Single query should take precident over multiple queries ORed together.","created:2011" ,searchParameters.getFilterQueries().get(15));
+    }
+
+    @Test
+    public void fromFacetQuery() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        //Doesn't error
+        searchMapper.fromFacetQuery(searchParameters, null);
+
+        searchMapper.fromFacetQuery(searchParameters, Arrays.asList(new FacetQuery("ping", null,null), new FacetQuery("pong", "table",null)));
+        assertEquals(2 ,searchParameters.getFacetQueries().size());
+        assertEquals("{!afts key='ping'}ping" ,searchParameters.getFacetQueries().get(0));
+        assertEquals("{!afts key='table'}pong" ,searchParameters.getFacetQueries().get(1));
+
+        try
+        {
+            searchMapper.fromFacetQuery(searchParameters, Arrays.asList(new FacetQuery("ping", null,null),new FacetQuery("{!afts}pang", "tennis",null)));
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //Cannot start with afts
+            assertNotNull(iae);
+        }
+    }
+
+    @Test
+    public void fromSpelling() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        //Doesn't error
+        searchMapper.fromSpellCheck(searchParameters, null);
+        assertFalse(searchParameters.isSpellCheck());
+
+        try
+        {
+            searchMapper.fromSpellCheck(searchParameters, new Spelling(null));
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //Can't be null
+            assertNotNull(iae);
+        }
+
+        //Now set search term first
+        searchParameters.setSearchTerm("fred");
+        searchMapper.fromSpellCheck(searchParameters, new Spelling(null));
+        assertEquals("fred",searchParameters.getSearchTerm());
+
+        //Now query replaces userQuery (search term)
+        searchMapper.fromSpellCheck(searchParameters, new Spelling("favourit"));
+        assertEquals("favourit",searchParameters.getSearchTerm());
+        assertTrue(searchParameters.isSpellCheck());
+    }
+
+    @Test
+    public void fromScope() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        searchMapper.setDefaults(searchParameters);
+        SearchRequestContext searchRequestContext = SearchRequestContext.from(minimalQuery());
+
+        //Doesn't error, has default store
+        searchMapper.fromScope(searchParameters, null, searchRequestContext);
+        assertEquals(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE,searchParameters.getStores().get(0));
+
+        searchMapper.fromScope(searchParameters, new Scope(null), searchRequestContext);
+        assertEquals(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE,searchParameters.getStores().get(0));
+
+        try
+        {
+            searchMapper.fromScope(searchParameters, new Scope(Arrays.asList("nonsense")), searchRequestContext);
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //Must be a valid store ref
+            assertNotNull(iae);
+        }
+
+        searchMapper.fromScope(searchParameters, new Scope(Arrays.asList(StoreMapper.DELETED, StoreMapper.LIVE_NODES, StoreMapper.VERSIONS)),
+                    searchRequestContext);
+        assertEquals(3 ,searchParameters.getStores().size());
+        assertEquals(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE.toString(),searchParameters.getStores().get(0).toString());
+        assertEquals(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.toString(),searchParameters.getStores().get(1).toString());
+        assertEquals(StoreMapper.STORE_REF_VERSION2_SPACESSTORE.toString(),searchParameters.getStores().get(2).toString());
+
+        searchMapper.fromScope(searchParameters, new Scope(Arrays.asList(StoreMapper.HISTORY)), searchRequestContext);
+        assertEquals(1 ,searchParameters.getStores().size());
+        assertEquals(StoreMapper.STORE_REF_HISTORY.toString(),searchParameters.getStores().get(0).toString());
+
+        try
+        {
+            searchMapper.fromScope(searchParameters, new Scope(Arrays.asList(StoreMapper.HISTORY, StoreMapper.DELETED)), searchRequestContext);
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //Must be a valid scope with history
+            assertNotNull(iae);
+        }
+
+
+        try
+        {
+            searchMapper.fromScope(searchParameters, new Scope(Arrays.asList(StoreMapper.HISTORY, StoreMapper.LIVE_NODES)), searchRequestContext);
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //Must be a valid scope with history
+            assertNotNull(iae);
+        }
+
+        try
+        {
+            searchMapper.fromScope(searchParameters, new Scope(Arrays.asList(StoreMapper.HISTORY, StoreMapper.VERSIONS)), searchRequestContext);
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //Must be a valid scope with history
+            assertNotNull(iae);
+        }
+    }
+
+    @Test
+    public void fromTimezone() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        //Doesn't error
+        searchMapper.fromLocalization(searchParameters, null);
+        searchMapper.fromLocalization(searchParameters, new Localization("", null));
+
+        try
+        {
+            searchMapper.fromLocalization(searchParameters,  new Localization("nonsense", null));
+            fail();
+        } catch (IllegalArgumentException iae)
+        {
+            assertTrue(iae.getLocalizedMessage().contains( "Invalid timezone"));
+        }
+
+        try
+        {
+            searchMapper.fromLocalization(searchParameters,  new Localization("GMT+25", null));
+            fail();
+        } catch (IllegalArgumentException iae)
+        {
+            assertTrue(iae.getLocalizedMessage().contains("Invalid timezone"));
+        }
+
+        searchMapper.fromLocalization(searchParameters,  new Localization("America/New_York", null));
+        assertEquals("America/New_York", searchParameters.getTimezone());
+        searchMapper.fromLocalization(searchParameters,  new Localization("America/Denver", null));
+        assertEquals("America/Denver", searchParameters.getTimezone());
+        searchMapper.fromLocalization(searchParameters,  new Localization("America/Los_Angeles", null));
+        assertEquals("America/Los_Angeles", searchParameters.getTimezone());
+        searchMapper.fromLocalization(searchParameters,  new Localization("Europe/Madrid", null));
+        assertEquals("Europe/Madrid", searchParameters.getTimezone());
+        searchMapper.fromLocalization(searchParameters,  new Localization("GMT+1", null));
+        assertEquals("GMT+01:00", searchParameters.getTimezone());
+        searchMapper.fromLocalization(searchParameters,  new Localization("GMT+01:00", null));
+        assertEquals("GMT+01:00", searchParameters.getTimezone());
+        searchMapper.fromLocalization(searchParameters,  new Localization("GMT-9", null));
+        assertEquals("GMT-09:00", searchParameters.getTimezone());
+        searchMapper.fromLocalization(searchParameters,  new Localization("GMT+08:00", null));
+        assertEquals("GMT+08:00", searchParameters.getTimezone());
+        searchMapper.fromLocalization(searchParameters,  new Localization("GMT-12:00", null));
+        assertEquals("GMT-12:00", searchParameters.getTimezone());
+
+        try
+        {
+            searchMapper.fromLocalization(searchParameters,  new Localization("UTC+5", null));
+            fail();
+        }
+        catch (IllegalArgumentException iae)
+        {
+            assertTrue("UTC is not support by java.util.timezone",iae.getLocalizedMessage().contains("Incompatible timezoneId"));
+        }
+
+        try
+        {
+            searchMapper.fromLocalization(searchParameters,  new Localization("UTC+06:00", null));
+            fail();
+        }
+        catch (IllegalArgumentException iae)
+        {
+            assertTrue(iae.getLocalizedMessage().contains("Incompatible timezoneId"));
+        }
+    }
+
+    @Test
+    public void fromLocales() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        //Doesn't error
+        searchMapper.fromLocalization(searchParameters, null);
+        searchMapper.fromLocalization(searchParameters, new Localization(null, null));
+        List<String> testLocales = new ArrayList<>();
+        testLocales.add(null);
+        try
+        {
+            searchMapper.fromLocalization(searchParameters, new Localization(null, testLocales));
+            fail();
+        }
+        catch (IllegalArgumentException iae)
+        {
+            assertTrue(iae.getLocalizedMessage().contains("Invalid locale"));
+        }
+
+        //Unfortunately this isn't validated, language can be anything.
+        searchMapper.fromLocalization(searchParameters, new Localization(null, Arrays.asList("NOTTHIS")));
+
+        searchParameters = new SearchParameters();
+        searchMapper.fromLocalization(searchParameters, new Localization(null, Arrays.asList("fr")));
+        assertEquals(Locale.FRENCH, searchParameters.getLocales().get(0));
+
+        searchParameters = new SearchParameters();
+        searchMapper.fromLocalization(searchParameters, new Localization(null, Arrays.asList("fr_FR")));
+        assertEquals(Locale.FRANCE, searchParameters.getLocales().get(0));
+
+        searchParameters = new SearchParameters();
+        searchMapper.fromLocalization(searchParameters, new Localization(null, Arrays.asList("fr-FR")));
+        assertEquals(Locale.FRANCE, searchParameters.getLocales().get(0));
+
+        searchParameters = new SearchParameters();
+        searchMapper.fromLocalization(searchParameters, new Localization(null, Arrays.asList("fr-fr")));
+        assertEquals(Locale.FRANCE, searchParameters.getSortLocale());
+
+        searchParameters = new SearchParameters();
+        searchMapper.fromLocalization(searchParameters, new Localization(null, Arrays.asList("fr-ca")));
+        assertEquals(Locale.CANADA_FRENCH, searchParameters.getSortLocale());
+
+        searchParameters = new SearchParameters();
+        searchMapper.fromLocalization(searchParameters, new Localization(null, Arrays.asList("fr_ca")));
+        assertEquals(Locale.CANADA_FRENCH, searchParameters.getSortLocale());
+
+        searchParameters = new SearchParameters();
+        searchMapper.fromLocalization(searchParameters, new Localization(null, Arrays.asList("en-gb")));
+        assertEquals(Locale.UK, searchParameters.getSortLocale());
+
+        searchParameters = new SearchParameters();
+        searchMapper.fromLocalization(searchParameters, new Localization(null, Arrays.asList("en-us")));
+        assertEquals(Locale.US, searchParameters.getSortLocale());
+    }
+
+    @Test
+    public void fromFacetFields() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        //Doesn't error
+        searchMapper.fromFacetFields(searchParameters, null);
+
+        try
+        {
+            searchMapper.fromFacetFields(searchParameters, new FacetFields(null));
+            fail();
+        } catch (IllegalArgumentException iae)
+        {
+            assertTrue(iae.getLocalizedMessage().contains("facetFields facets is a mandatory parameter"));
+        }
+
+        try
+        {
+            searchMapper.fromFacetFields(searchParameters, new FacetFields(Arrays.asList(new FacetField(null,null,null,null,null,null,null,null,null,null,null))));
+            fail();
+        } catch (IllegalArgumentException iae)
+        {
+            assertTrue(iae.getLocalizedMessage().contains("facetFields facet field is a mandatory parameter"));
+        }
+
+        searchMapper.fromFacetFields(searchParameters, new FacetFields(Arrays.asList(new FacetField("myfield",null,null,null,null,null,null,null,null,null,null))));
+        assertEquals(1 ,searchParameters.getFieldFacets().size());
+        FieldFacet ff = searchParameters.getFieldFacets().get(0);
+
+        //Check defaults
+        //assertEquals(true, ff.getMissing());
+        assertNull(ff.getLimitOrNull());
+        assertEquals(0, ff.getOffset());
+        assertEquals(1, ff.getMinCount());
+        assertFalse(ff.isCountDocsMissingFacetField());
+        assertEquals(0, ff.getEnumMethodCacheMinDF());
+
+//        assertEquals("{key='myfield'}myfield" ,ff.getField());
+
+        searchParameters = new SearchParameters();
+        searchMapper.fromFacetFields(searchParameters, new FacetFields(Arrays.asList(new FacetField("myfield","mylabel","myprefix",null,null,null,null,null,null,null,null))));
+
+        ff = searchParameters.getFieldFacets().get(0);
+//        assertEquals("{key='mylabel'}myfield" ,ff.getField());
+        assertEquals("myprefix" ,ff.getPrefix());
+
+        try
+        {
+            searchMapper.fromFacetFields(searchParameters, new FacetFields(Arrays.asList(new FacetField("myfield",null,null,"badsort",null,null,null,null,null,null,null))));
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //Sort is an enum
+            assertNotNull(iae);
+        }
+
+        try
+        {
+            searchMapper.fromFacetFields(searchParameters, new FacetFields(Arrays.asList(new FacetField("myfield",null,null, null,"badmethod",null,null,null,null,null,null))));
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //Method is an enum
+            assertNotNull(iae);
+        }
+
+        searchParameters = new SearchParameters();
+        searchMapper.fromFacetFields(searchParameters, new FacetFields(Arrays.asList(new FacetField("myfield",null,null,"INDEX","ENUM",null,null,null,null,null,null))));
+        ff = searchParameters.getFieldFacets().get(0);
+        assertEquals("INDEX" ,ff.getSort().toString());
+        assertEquals("ENUM" ,ff.getMethod().toString());
+    }
+
+    @Test
+    public void fromLimits() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        searchMapper.setDefaults(searchParameters);
+
+        //Doesn't error
+        searchMapper.fromLimits(searchParameters, null);
+        assertEquals(500, searchParameters.getLimit());
+        assertEquals(LimitBy.UNLIMITED, searchParameters.getLimitBy());
+
+        searchMapper.fromLimits(searchParameters, new Limits(null, null));
+        assertEquals(LimitBy.UNLIMITED, searchParameters.getLimitBy());
+        assertEquals(500, searchParameters.getLimit());
+
+        searchMapper.fromLimits(searchParameters, new Limits(null, 34));
+        assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy());
+        assertEquals(34, searchParameters.getMaxPermissionChecks());
+        assertEquals(-1, searchParameters.getLimit());
+        assertEquals(-1, searchParameters.getMaxPermissionCheckTimeMillis());
+
+        searchParameters = new SearchParameters();
+        searchMapper.setDefaults(searchParameters);
+        searchMapper.fromLimits(searchParameters, new Limits(1000, null));
+        assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy());
+        assertEquals(1000, searchParameters.getMaxPermissionCheckTimeMillis());
+        assertEquals(-1, searchParameters.getLimit());
+        assertEquals(-1, searchParameters.getMaxPermissionChecks());
+    }
+
+    @Test
+    public void fromHighlight() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        List<FieldHighlightParameters> fields = Arrays.asList(new FieldHighlightParameters("desc",50,100,false,"@","#"), new FieldHighlightParameters("title",55,105,true,"*","¿"));
+        GeneralHighlightParameters highlightParameters = new GeneralHighlightParameters(5, 10, false, "{", "}", 20, true, fields);
+        searchMapper.fromHighlight(searchParameters,highlightParameters);
+        assertEquals(searchParameters.getHighlight(), highlightParameters);
+    }
+
+    @Test
+    public void fromStats() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        searchMapper.fromStats(searchParameters, null);
+
+        List<StatsRequestParameters> statsRequestParameters = new ArrayList<>(1);
+        statsRequestParameters.add(new StatsRequestParameters(null, null, null, null, null,null, null, null, null,null, null, null,null, null, null, null));
+
+        try
+        {
+          searchMapper.fromStats(searchParameters, statsRequestParameters);
+        }
+        catch (IllegalArgumentException iae)
+        {
+            assertTrue(iae.getLocalizedMessage().contains("field is a mandatory parameter"));
+        }
+
+        statsRequestParameters.clear();
+        statsRequestParameters.add(new StatsRequestParameters("cm:content", "myLabel", null, null,null, null, null, null,null, null, null, null,null, null, null, null));
+        searchMapper.fromStats(searchParameters, statsRequestParameters);
+        assertEquals(1 ,searchParameters.getStats().size());
+
+        statsRequestParameters.clear();
+        statsRequestParameters.add(new StatsRequestParameters("cm:content", "myLabel", Arrays.asList(3.4f, 12f, 10f), null, null,null, null, null, null,null, null, null,null, null, null, null));
+        searchMapper.fromStats(searchParameters, statsRequestParameters);
+        assertEquals(1 ,searchParameters.getStats().size());
+
+        statsRequestParameters.clear();
+        statsRequestParameters.add(new StatsRequestParameters("cm:content", "myLabel", Arrays.asList(-3.4f), null, null,null, null, null, null,null, null, null,null, null, null, null));
+
+        try
+        {
+          searchMapper.fromStats(searchParameters, statsRequestParameters);
+        }
+        catch (IllegalArgumentException iae)
+        {
+          assertTrue(iae.getLocalizedMessage().contains("Invalid percentile -3.4"));
+        }
+
+        statsRequestParameters.clear();
+        statsRequestParameters.add(new StatsRequestParameters("cm:content", "myLabel", Arrays.asList(101f),null, null,null, null, null, null,null, null,  null,null, null, null, null));
+
+        try
+        {
+            searchMapper.fromStats(searchParameters, statsRequestParameters);
+        }
+        catch (IllegalArgumentException iae)
+        {
+            assertTrue(iae.getLocalizedMessage().contains("Invalid percentile 101"));
+        }
+
+        statsRequestParameters.clear();
+        statsRequestParameters.add(new StatsRequestParameters("cm:content", "myLabel", null, null,null, null, null, null,null, null, null, null,null, true, 12f, null));
+        try
+        {
+            searchMapper.fromStats(searchParameters, statsRequestParameters);
+        }
+        catch (IllegalArgumentException iae)
+        {
+            assertTrue(iae.getLocalizedMessage().contains("Invalid cardinality accuracy 12.0"));
+        }
+
+        statsRequestParameters.clear();
+        statsRequestParameters.add(new StatsRequestParameters("cm:content", "myLabel", null, null,null, null, null, null,null, null, null, null,null, null, 12f, null));
+        searchMapper.fromStats(searchParameters, statsRequestParameters);
+        //cardinality is ignored if not true
+        assertEquals(1 ,searchParameters.getStats().size());
+
+    }
+
+    @Test
+    public void fromPivot() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        searchMapper.fromPivot(searchParameters, null, null, null, null, null);
+
+        List<FacetField> facets = new ArrayList<>(1);
+        facets.add(new FacetField("myfield",null,null,null,null,null,null,null,null,null,null));
+        facets.add(new FacetField("yourfield",null,null,null,null,null,null,null,null,null,null));
+        FacetFields ff = new FacetFields(facets);
+        searchMapper.fromFacetFields(searchParameters,ff);
+        searchMapper.fromPivot(searchParameters, null, ff, null, null, null);
+        assertEquals(2 ,searchParameters.getFieldFacets().size());
+        assertEquals(0 ,searchParameters.getPivots().size());
+
+        //Handle unknown pivot.
+        searchParameters = new SearchParameters();
+
+        try
+        {
+            searchMapper.fromPivot(searchParameters, null, ff, null, Arrays.asList(new Pivot(null, null)), null);
+            fail();
+        }
+        catch (IllegalArgumentException iae)
+        {
+            //"bob" doesn't refer to a field facet
+            assertNotNull(iae);
+        }
+
+        try
+        {
+            searchMapper.fromPivot(searchParameters, null, ff, null, Arrays.asList(new Pivot("", null)), null);
+            fail();
+        }
+        catch (IllegalArgumentException iae)
+        {
+            assertNotNull(iae);
+        }
+
+        SearchRequestContext searchRequestContext = SearchRequestContext.from(minimalQuery());
+
+        //"bob" doesn't refer to a field facet but its the last one so needs to refer to a stat
+        StatsRequestParameters bobf = new StatsRequestParameters("bob", null, null, null,null, null, null, null,null, null, null, null,null, null, null, null);
+        StatsRequestParameters bobL = new StatsRequestParameters("creator", "bob", null, null,null, null, null, null,null, null, null, null,null, null, null, null);
+        try
+        {
+            searchMapper.fromPivot(searchParameters, Arrays.asList(bobf), ff, null, Arrays.asList(new Pivot("bob", null)), searchRequestContext);
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //"bob" refers to a stat but it can't be at the root pivot, it needs to be nested
+            assertNotNull(iae);
+        }
+
+        searchMapper.fromPivot(searchParameters, Arrays.asList(bobf), ff, null, Arrays.asList(new Pivot("yourfield", Arrays.asList(new Pivot("bob", null)))), searchRequestContext);
+        assertEquals(1 ,searchParameters.getPivots().size());
+
+        try
+        {
+            searchMapper.fromPivot(searchParameters, null, ff, null,
+                        Arrays.asList(new Pivot("ken", null),new Pivot("bob", null)), searchRequestContext);
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //"ken" doesn't refer to a field facet and its not the last one
+            assertNotNull(iae);
+        }
+
+        searchParameters = new SearchParameters();
+
+        searchMapper.fromPivot(searchParameters, null, ff, null, Arrays.asList(new Pivot("myfield", null)), searchRequestContext);
+        searchMapper.fromFacetFields(searchParameters,ff);
+        //Moved from a field facet to a pivot
+        assertEquals(0 ,searchParameters.getFieldFacets().size());
+        assertEquals(1 ,searchParameters.getPivots().size());
+        assertEquals("myfield" ,searchParameters.getPivots().get(0).get(0));
+
+        searchParameters = new SearchParameters();
+        try
+        {
+            searchMapper.fromPivot(searchParameters, Arrays.asList(bobf), ff, null,
+                        Arrays.asList(new Pivot("bob", Arrays.asList(new Pivot("hope", null)))), searchRequestContext);
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //"bob" doesn't refer to a field facet or stat
+            assertNotNull(iae);
+        }
+
+        searchRequestContext = SearchRequestContext.from(minimalQuery());
+        facets = new ArrayList<>(1);
+        facets.add(new FacetField("king",null,null,null,null,null,null,null,null,null,null));
+        ff = new FacetFields(facets);
+        searchMapper.fromPivot(searchParameters, Arrays.asList(bobf), ff, null,
+                    Arrays.asList(new Pivot("king", Arrays.asList(new Pivot("bob", null)))), searchRequestContext);
+        assertEquals(1 ,searchParameters.getPivots().size());
+        assertEquals(2 ,searchParameters.getPivots().get(0).size());
+        assertEquals("king" ,searchParameters.getPivots().get(0).get(0));
+        assertEquals("bob" ,searchParameters.getPivots().get(0).get(1));
+
+        searchRequestContext = SearchRequestContext.from(minimalQuery());
+        searchParameters = new SearchParameters();
+        facets = new ArrayList<>(1);
+        facets.add(new FacetField("king",null,null,null,null,null,null,null,null,null,null));
+        facets.add(new FacetField("kong",null,null,null,null,null,null,null,null,null,null));
+        facets.add(new FacetField("kang",null,null,null,null,null,null,null,null,null,null));
+        ff = new FacetFields(facets);
+        searchMapper.fromPivot(searchParameters, Arrays.asList(bobf), ff, null,
+                    Arrays.asList(new Pivot("king", Arrays.asList(new Pivot("bob", null))), new Pivot("kong", null)), searchRequestContext);
+        assertEquals(2 ,searchParameters.getPivots().size());
+        assertEquals(2 ,searchParameters.getPivots().get(0).size());
+        assertEquals("king" ,searchParameters.getPivots().get(0).get(0));
+        assertEquals("bob" ,searchParameters.getPivots().get(0).get(1));
+        assertEquals("kong" ,searchParameters.getPivots().get(1).get(0));
+
+        searchRequestContext = SearchRequestContext.from(minimalQuery());
+        searchParameters = new SearchParameters();
+        List<RangeParameters> rangeParams = new ArrayList<RangeParameters>();
+        facets = new ArrayList<>(2);
+        facets.add(new FacetField("king",null,null,null,null,null,null,null,null,null,null));
+        facets.add(new FacetField("kong",null,null,null,null,null,null,null,null,null,null));
+        ff = new FacetFields(facets);
+        rangeParams.add(new RangeParameters("content.size", "0", "100000", "1000",true,null,null,"hope",null));
+        searchMapper.fromPivot(searchParameters, Arrays.asList(bobf), ff, rangeParams,
+                    Arrays.asList(new Pivot("king", Arrays.asList(new Pivot("bob", null))), new Pivot("kong", Arrays.asList(new Pivot("hope", null)))), searchRequestContext);
+        assertEquals(2 ,searchParameters.getPivots().size());
+        assertEquals(2 ,searchParameters.getPivots().get(0).size());
+        assertEquals("king" ,searchParameters.getPivots().get(0).get(0));
+        assertEquals("bob"  ,searchParameters.getPivots().get(0).get(1));
+        assertEquals("kong" ,searchParameters.getPivots().get(1).get(0));
+        assertEquals("hope" ,searchParameters.getPivots().get(1).get(1));
+
+    }
+
+    @Test
+    public void fromInterval() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        IntervalParameters intervalParameters = new IntervalParameters(null, null);
+        try
+        {
+            searchMapper.fromFacetIntervals(searchParameters, intervalParameters);
+            fail();
+        }
+        catch (IllegalArgumentException iae)
+        {
+            //intervals is required
+            assertNotNull(iae);
+        }
+
+        Set<IntervalSet> intervalSets = new HashSet(Arrays.asList(new IntervalSet(null,"1", null, null, null)));
+        List<Interval> intervalList = Arrays.asList(new Interval(null, "bob", null));
+        intervalParameters = new IntervalParameters(intervalSets,intervalList);
+
+        try
+        {
+            searchMapper.fromFacetIntervals(searchParameters, intervalParameters);
+            fail();
+        }
+        catch (IllegalArgumentException iae)
+        {
+            //facetIntervals intervals field is required
+            assertNotNull(iae);
+        }
+
+        intervalList = Arrays.asList(new Interval("aFileld", "bob", null));
+        intervalParameters = new IntervalParameters(intervalSets,intervalList);
+        try
+        {
+            searchMapper.fromFacetIntervals(searchParameters, intervalParameters);
+            fail();
+        }
+        catch (IllegalArgumentException iae)
+        {
+            //set start is required
+            assertNotNull(iae);
+        }
+
+        intervalSets = new HashSet(Arrays.asList(new IntervalSet("1",null, null, null, true)));
+        intervalParameters = new IntervalParameters(intervalSets,intervalList);
+
+        try
+        {
+            searchMapper.fromFacetIntervals(searchParameters, intervalParameters);
+            fail();
+        }
+        catch (IllegalArgumentException iae)
+        {
+            //set end is required
+            assertNotNull(iae);
+        }
+
+        intervalSets =  new HashSet<>();
+        intervalSets.add(new IntervalSet("0", "3", "bob", null, null));
+        intervalSets.add(new IntervalSet("30", "50", "bill", true,true));
+        Set<IntervalSet> anIntervalSet = new HashSet<>();
+        anIntervalSet.add(new IntervalSet("1", "10", "bert", false, false));
+        intervalList = Arrays.asList(new Interval("cm:price", "Price", null), new Interval("cm:price", "Price", anIntervalSet));
+        intervalParameters = new IntervalParameters(intervalSets,intervalList);
+
+        try
+        {
+            searchMapper.fromFacetIntervals(searchParameters, intervalParameters);
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //duplicate labels
+            assertNotNull(iae);
+        }
+
+        intervalList = Arrays.asList(new Interval("cm:price", "Prices", null), new Interval("cm:price", "Pricey", anIntervalSet));
+        intervalParameters = new IntervalParameters(intervalSets,intervalList);
+        searchMapper.fromFacetIntervals(searchParameters, intervalParameters);
+        assertEquals(searchParameters.getInterval(), intervalParameters);
+
+    }
+    @Test
+    public void facetFormatV2()
+    {
+        Query query = new Query("afts", "a*", "");
+        SearchQuery sq = new SearchQuery(query, null, null, null, null, null, null, null,
+                    null, null, null, null, null, null, null, null,
+                    null, null,null, null,FacetFormat.V2);
+
+        SearchRequestContext searchRequestContext = SearchRequestContext.from(sq);
+        SearchParameters searchParameters = searchMapper.toSearchParameters(ResultMapperTests.EMPTY_PARAMS, sq, searchRequestContext);
+        assertNotNull(searchParameters);
+
+        //Test defaults
+        assertEquals("There should be only 1 default store", 1,searchParameters.getStores().size());
+        assertEquals("workspaces store is the default", StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, searchParameters.getStores().get(0));
+        assertEquals(LimitBy.FINAL_SIZE, searchParameters.getLimitBy());
+        assertEquals(100, searchParameters.getLimit());
+
+        
+    }
+
+    @Test
+    public void facetRange()
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        List<RangeParameters> rangeParams = new ArrayList<RangeParameters>();
+        rangeParams.add(new RangeParameters(null, null, null, null,false,null,null,null,null));
+        try
+        {
+            searchMapper.fromRange(searchParameters, rangeParams);
+            fail();
+        }
+        catch (IllegalArgumentException iae)
+        {
+            assertNotNull(iae);
+        }
+        rangeParams.clear();
+        rangeParams.add(new RangeParameters("content.size", "0", "100000", "1000",true,null,null,null,null));
+        searchMapper.fromRange(searchParameters, rangeParams);
+        assertEquals(searchParameters.getRanges(), rangeParams);
+        
+        rangeParams.clear();
+        List<String> includes = new ArrayList<String>();
+        includes.add("lower");
+        List<String> other = new ArrayList<String>();
+        includes.add("before");
+        
+        rangeParams.add(new RangeParameters("content.size", "0", "100000", "1000",true, other,includes,null,null));
+        searchMapper.fromRange(searchParameters, rangeParams);
+        assertEquals(searchParameters.getRanges(), rangeParams);
+        
+        //Assert multiple ranges
+        rangeParams.add(new RangeParameters("created", "2015-09-29T10:45:15.729Z", "2016-09-29T10:45:15.729Z", "+100DAY", true, other, includes, null, null));
+        searchMapper.fromRange(searchParameters, rangeParams);
+        assertEquals(searchParameters.getRanges(), rangeParams);
+        assertEquals(2,searchParameters.getRanges().size());
+    }
+    
+    private SearchQuery minimalQuery()
+    {
+        Query query = new Query("cmis", "foo", "");
+        SearchQuery sq = new SearchQuery(query, null, null, null, null, null, null, null,
+                    null, null, null, null, null, null, null, null,
+                    null, null,null, null,null);
+        return sq;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/search/SearchQuerySerializerTests.java b/remote-api/src/test/java/org/alfresco/rest/api/search/SearchQuerySerializerTests.java
new file mode 100644
index 00000000000..4b593eb94c4
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/search/SearchQuerySerializerTests.java
@@ -0,0 +1,208 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.alfresco.rest.api.search.context.FacetFieldContext;
+import org.alfresco.rest.api.search.context.FacetFieldContext.Bucket;
+import org.alfresco.rest.api.search.context.FacetQueryContext;
+import org.alfresco.rest.api.search.context.SearchContext;
+import org.alfresco.rest.api.search.context.SpellCheckContext;
+import org.alfresco.rest.api.search.impl.StoreMapper;
+import org.alfresco.rest.api.search.model.Default;
+import org.alfresco.rest.api.search.model.FacetField;
+import org.alfresco.rest.api.search.model.SearchQuery;
+import org.alfresco.rest.framework.jacksonextensions.ExecutionResult;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.tests.api.mocks.Farmer;
+import org.alfresco.service.cmr.search.FieldHighlightParameters;
+import org.alfresco.service.cmr.search.Interval;
+import org.alfresco.service.cmr.search.IntervalParameters;
+import org.alfresco.service.cmr.search.IntervalSet;
+import org.alfresco.service.cmr.search.RangeParameters;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Tests json -> SearchQuery deserialization
+ *
+ * @author Gethin James
+ */
+public class SearchQuerySerializerTests
+{
+
+    private static SerializerTestHelper helper;
+
+    @BeforeClass
+    public static void setupTests() throws Exception
+    {
+        helper = new SerializerTestHelper();
+    }
+
+    @Test
+    public void testDeserializeQuery() throws IOException
+    {
+        SearchQuery searchQuery = helper.searchQueryFromJson();
+        assertEquals(SearchQuery.class, searchQuery.getClass());
+        assertEquals("afts", searchQuery.getQuery().getLanguage());
+        assertEquals("g*", searchQuery.getQuery().getQuery());
+        assertEquals("great", searchQuery.getQuery().getUserQuery());
+        assertEquals(99, searchQuery.getPaging().getMaxItems());
+        assertEquals(4, searchQuery.getPaging().getSkipCount());
+        assertEquals(2, searchQuery.getInclude().size());
+        assertTrue(searchQuery.getInclude().contains("aspectNames"));
+        assertTrue(searchQuery.getInclude().contains("properties"));
+        assertEquals(1, searchQuery.getSort().size());
+        assertEquals(2, searchQuery.getTemplates().size());
+        Default defaults = searchQuery.getDefaults();
+        assertEquals("namesp",  defaults.getNamespace());
+        assertEquals("myfield", defaults.getDefaultFieldName());
+        assertEquals("AND",     defaults.getDefaultFTSOperator());
+        assertEquals(2, defaults.getTextAttributes().size());
+        assertTrue(defaults.getTextAttributes().contains("roy"));
+        assertTrue(defaults.getTextAttributes().contains("king"));
+        assertEquals(2, searchQuery.getFilterQueries().size());
+        assertEquals("myquery",searchQuery.getFilterQueries().get(0).getQuery());
+        assertEquals(2, searchQuery.getFilterQueries().get(0).getTags().size());
+        assertEquals("myquery2",searchQuery.getFilterQueries().get(1).getQuery());
+        assertEquals(1, searchQuery.getFacetQueries().size());
+        assertEquals("cm:created:bob",searchQuery.getFacetQueries().get(0).getQuery());
+        assertEquals("small",searchQuery.getFacetQueries().get(0).getLabel());
+        assertEquals("alfrezco", searchQuery.getSpellcheck().getQuery());
+        assertEquals(1, searchQuery.getScope().getLocations().size());
+        assertEquals(StoreMapper.LIVE_NODES, searchQuery.getScope().getLocations().get(0));
+        assertEquals(3, searchQuery.getFacetFields().getFacets().size());
+        FacetField ff = searchQuery.getFacetFields().getFacets().get(0);
+        assertEquals("cm:creator", ff.getField());
+        assertEquals("myquery2", ff.getPrefix());
+        assertEquals("COUNT", ff.getSort());
+        assertEquals(false, ff.getMissing());
+        ff = searchQuery.getFacetFields().getFacets().get(1);
+        assertEquals("modifier", ff.getField());
+        assertEquals("mylabel", ff.getLabel());
+        assertEquals("FC", ff.getMethod());
+        assertEquals(Integer.valueOf(5), ff.getMincount());
+        assertEquals(2000, searchQuery.getLimits().getPermissionEvaluationCount().intValue());
+        assertEquals(5000, searchQuery.getLimits().getPermissionEvaluationTime().intValue());
+        assertEquals(2, searchQuery.getFields().size());
+        assertTrue(searchQuery.getFields().contains("id"));
+        assertTrue(searchQuery.getFields().contains("name"));
+
+        //Highlight
+        assertEquals("]", searchQuery.getHighlight().getPostfix());
+        assertEquals("[", searchQuery.getHighlight().getPrefix());
+        assertEquals(20, searchQuery.getHighlight().getSnippetCount().intValue());
+        assertEquals(10, searchQuery.getHighlight().getFragmentSize().intValue());
+        assertEquals(true, searchQuery.getHighlight().getMergeContiguous());
+        assertEquals(40, searchQuery.getHighlight().getMaxAnalyzedChars().intValue());
+        assertEquals(true, searchQuery.getHighlight().getUsePhraseHighlighter());
+
+        assertEquals(2, searchQuery.getHighlight().getFields().size());
+        FieldHighlightParameters high1 = searchQuery.getHighlight().getFields().get(0);
+        assertEquals("my", high1.getField());
+        assertEquals("¡", high1.getPostfix());
+        assertEquals("?", high1.getPrefix());
+        assertEquals(23,  high1.getSnippetCount().intValue());
+        assertEquals(5,  high1.getFragmentSize().intValue());
+        assertEquals(true,high1.getMergeContiguous());
+
+        FieldHighlightParameters high2 = searchQuery.getHighlight().getFields().get(1);
+        assertEquals("your", high2.getField());
+        assertEquals(")", high2.getPostfix());
+        assertEquals("(", high2.getPrefix());
+        assertEquals(3,  high2.getSnippetCount().intValue());
+        assertEquals(15,  high2.getFragmentSize().intValue());
+        assertEquals(false,high2.getMergeContiguous());
+
+        //Facet intervals
+        IntervalParameters ip = searchQuery.getFacetIntervals();
+        assertNotNull(ip);
+        assertEquals(1,ip.getSets().size());
+        IntervalSet expected = new IntervalSet("1","2","king",true, false );
+        assertTrue(ip.getSets().contains(expected));
+
+        assertEquals(2,ip.getIntervals().size());
+        Interval interval = ip.getIntervals().get(0);
+        assertEquals("creator", interval.getLabel());
+        assertEquals("cm:creator", interval.getField());
+        expected = new IntervalSet("a","b","last",false, true );
+        assertTrue(interval.getSets().contains(expected));
+
+        assertEquals(1,searchQuery.getPivots().size());
+        assertEquals("mylabel",searchQuery.getPivots().get(0).getKey());
+
+        assertEquals(1,searchQuery.getStats().size());
+        assertEquals("cm:creator",searchQuery.getStats().get(0).getField());
+        assertEquals("mylabel",searchQuery.getStats().get(0).getLabel());
+        //Range Facet
+        List<RangeParameters> ranges = searchQuery.getFacetRanges();
+        assertNotNull(ranges);
+        
+    }
+
+    @Test
+    public void testSerializeContext() throws IOException
+    {
+        ExecutionResult exec1 = new ExecutionResult(new Farmer("180"),null);
+
+        FacetFieldContext ffc = new FacetFieldContext("theLabel",
+                Arrays.asList(
+                        new Bucket("b1", "name:b1", 23, "displayText1"),
+                        new Bucket("b2", null, 34, "displayText2"),
+                        new Bucket("", null, 42, "displayText3")));
+        SearchContext searchContext = new SearchContext(23l,null, Arrays.asList(new FacetQueryContext("f1", "creator:bob", 15), new FacetQueryContext("f2", null, 20)),
+                    Arrays.asList(ffc),
+                    new SpellCheckContext("aFlag", Arrays.asList("bish", "bash")), null);
+        CollectionWithPagingInfo<ExecutionResult> coll = CollectionWithPagingInfo.asPaged(null, Arrays.asList(exec1), false, 2, null, searchContext);
+        String out = helper.writeResponse(coll);
+        assertTrue("There must 'context' json output", out.contains("\"context\":{\"consistency\":{\"lastTxId\":23}"));
+        assertTrue("There must 'facetQueries' json output", out.contains("\"facetQueries\":"));
+        assertTrue("There must 'facetQueries f1' json output", out.contains("{\"label\":\"f1\",\"filterQuery\":\"creator:bob\",\"count\":15}"));
+        assertTrue("There must 'facetQueries f2' json output", out.contains("{\"label\":\"f2\",\"count\":20}"));
+        assertTrue("There must 'spellCheck' json output", out.contains("\"spellCheck\":{\"type\":\"aFlag\",\"suggestions\":[\"bish\",\"bash\"]}"));
+        assertTrue("There must 'facetsFields' json output", out.contains("\"facetsFields\":[{\"label\":\"theLabel\",\"buckets\""));
+        assertTrue("There must 'bucket1' json output", out.contains("{\"label\":\"b1\",\"filterQuery\":\"name:b1\",\"count\":23,\"display\":\"displayText1\"}"));
+        assertTrue("There must 'bucket2' json output", out.contains("{\"label\":\"b2\",\"count\":34,\"display\":\"displayText2\"}"));
+        assertTrue("There must 'bucket3' json output", out.contains("{\"label\":\"\",\"count\":42,\"display\":\"displayText3\"}"));
+
+        searchContext = new SearchContext(-1, null, null,null, null, null);
+        coll = CollectionWithPagingInfo.asPaged(null, Arrays.asList(exec1), false, 2, null, searchContext);
+        out = helper.writeResponse(coll);
+        assertTrue("There must NOT BE a 'context' json output", out.contains("\"context\":{}"));
+        assertFalse("There must NOT BE a 'facetsFields' json output", out.contains("\"facetsFields\":{}"));
+
+    }
+
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/search/SearchSQLApiWebscriptTests.java b/remote-api/src/test/java/org/alfresco/rest/api/search/SearchSQLApiWebscriptTests.java
new file mode 100644
index 00000000000..83790f626dd
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/search/SearchSQLApiWebscriptTests.java
@@ -0,0 +1,115 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search;
+
+import static java.util.Collections.emptyList;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+
+import java.util.Collections;
+
+import org.alfresco.rest.api.search.model.SearchSQLQuery;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.junit.Test;
+
+/**
+ * Tests the SearchSQLApiWebscript class
+ *
+ * @author Michael Suzuki
+ */
+public class SearchSQLApiWebscriptTests
+{
+    static SearchSQLApiWebscript webscript = new SearchSQLApiWebscript();
+
+    @Test
+    public void testSearchQueryParams() throws Exception
+    {
+        String query = "select SITE from alfresco";
+        SearchSQLQuery searchQuery = new SearchSQLQuery(query, "solr", emptyList(), 1000, false, "", emptyList());
+        SearchParameters sparams = webscript.buildSearchParameters(searchQuery);
+        
+        assertNotNull(sparams);
+        assertEquals(query, sparams.getQuery());
+        assertEquals(false, sparams.isIncludeMetadata());
+        assertEquals(Collections.EMPTY_LIST, sparams.getLocales());
+        assertEquals("solr",sparams.getExtraParameters().get("format"));
+        assertEquals(null, sparams.getTimezone());
+    }
+    @Test
+    public void testSearchQueryParamsTimezone() throws Exception
+    {
+        String query = "select SITE from alfresco";
+        SearchSQLQuery searchQuery = new SearchSQLQuery(query, "solr", emptyList(), 1000, false, "Israel", emptyList());
+        SearchParameters sparams = webscript.buildSearchParameters(searchQuery);
+        
+        assertNotNull(sparams);
+        assertEquals(query, sparams.getQuery());
+        assertEquals(false, sparams.isIncludeMetadata());
+        assertEquals(Collections.EMPTY_LIST, sparams.getLocales());
+        assertEquals("solr", sparams.getExtraParameters().get("format"));
+        assertEquals("Israel", sparams.getTimezone());
+    }
+    @Test
+    public void testSearchQueryParamsFormatNull() throws Exception
+    {
+        String query = "select SITE from alfresco";
+        SearchSQLQuery searchQuery = new SearchSQLQuery(query, "", emptyList(), 1000, false, "", emptyList());
+        SearchParameters sparams = webscript.buildSearchParameters(searchQuery);
+        
+        assertNotNull(sparams);
+        assertEquals(query, sparams.getQuery());
+        assertEquals(false, sparams.isIncludeMetadata());
+        assertEquals(Collections.EMPTY_LIST, sparams.getLocales());
+        assertEquals(null, sparams.getExtraParameters().get("format"));
+        assertEquals(null, sparams.getTimezone());
+        
+        searchQuery = new SearchSQLQuery(query, null, emptyList(), 1000, true, "", emptyList());
+        sparams = webscript.buildSearchParameters(searchQuery);
+        
+        assertNotNull(sparams);
+        assertEquals(query, sparams.getQuery());
+        assertEquals(true, sparams.isIncludeMetadata());
+        assertEquals(Collections.EMPTY_LIST, sparams.getLocales());
+        assertEquals(null, sparams.getExtraParameters().get("format"));
+        assertEquals(null, sparams.getTimezone());
+    }
+    @Test
+    public void testSearchQueryNullStmt() throws Exception
+    {
+        SearchSQLQuery searchQuery = new SearchSQLQuery(null, "solr", emptyList(), null, false, null, emptyList());
+        try
+        {
+            webscript.buildSearchParameters(searchQuery);
+        }
+        catch (Exception e) 
+        {
+            assertEquals(true, e.getMessage().contains("Required stmt parameter is missing."));
+        }
+    }
+
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/search/SearchSQLParseTest.java b/remote-api/src/test/java/org/alfresco/rest/api/search/SearchSQLParseTest.java
new file mode 100644
index 00000000000..4bbc963ae6d
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/search/SearchSQLParseTest.java
@@ -0,0 +1,62 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+
+import org.alfresco.rest.api.search.model.SearchSQLQuery;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class SearchSQLParseTest
+{
+    private static SerializerTestHelper helper;
+
+    @BeforeClass
+    public static void setupTests() throws Exception
+    {
+        helper = new SerializerTestHelper();
+    }
+    @Test
+    public void testSQLDeserializeQuery() throws IOException
+    {
+        String query = "{\"stmt\": \"select cm_name from alfresco\"}";
+        SearchSQLQuery searchQuery = parse(query);
+        assertEquals("select cm_name from alfresco", searchQuery.getStmt());
+    }
+    @Test
+    public void testSQLDeserializeSelectQuery() throws IOException
+    {
+        String query = "{\"stmt\": \"select SITE from alfresco\"}";
+        SearchSQLQuery searchQuery = parse(query);
+        assertEquals("select SITE from alfresco", searchQuery.getStmt());
+    }
+    private SearchSQLQuery parse(String json) throws IOException
+    {
+        return (SearchSQLQuery) helper.searchSQLQueryFromJson(json, SearchSQLQuery.class);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/search/SerializerTestHelper.java b/remote-api/src/test/java/org/alfresco/rest/api/search/SerializerTestHelper.java
new file mode 100644
index 00000000000..03198adfff3
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/search/SerializerTestHelper.java
@@ -0,0 +1,138 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.alfresco.rest.api.search.model.SearchQuery;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper.Writer;
+import org.alfresco.rest.framework.jacksonextensions.RestJsonModule;
+import org.alfresco.rest.framework.tools.RequestReader;
+import org.springframework.extensions.surf.util.Content;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.StringReader;
+
+/**
+ * Sets up an parses a valid JSON request.
+ *
+ * @author Gethin James
+ */
+public class SerializerTestHelper implements RequestReader
+{
+
+    JacksonHelper jsonHelper = null;
+
+    public static final String JSON = "{ \"query\": {\"query\": \"g*\",\"userQuery\": \"great\",\"language\": \"afts\"}, "
+                + "\"paging\": {\"maxItems\": \"99\",\"skipCount\": \"4\"},"
+                + "\"includeRequest\": true,"
+                + "\"sort\": {\"type\": \"FIELD\",\"field\": \"cm:title\",\"ascending\": \"true\"},"
+                + "\"templates\": [{\"name\": \"mytemp\",\"template\": \"ATEMP\"}, {\"name\": \"yourtemp\",\"template\": \"%cm:content\"}],"
+                + "\"defaults\": {\"namespace\": \"namesp\",\"defaultFieldName\": \"myfield\",\"defaultFTSOperator\": \"AND\", \"textAttributes\": [\"roy\", \"king\"]},"
+                + "\"filterQueries\": [{\"query\": \"myquery\",\"tags\": [\"tag1\", \"tag2\"]},{\"query\": \"myquery2\"}],"
+                + "\"facetFields\": {\"facets\": [{\"field\": \"cm:creator\",\"prefix\": \"myquery2\",\"sort\": \"COUNT\",\"missing\": \"false\"}, {\"field\": \"modifier\",\"label\": \"mylabel\",\"method\": \"FC\",\"mincount\": \"5\"}, {\"field\": \"owner\",\"label\": \"ownerLabel\"}]},"
+                + "\"facetQueries\": [{\"query\": \"cm:created:bob\",\"label\": \"small\"}],"
+                + "\"pivots\": [{\"key\": \"mylabel\"}],"
+                + "\"ranges\": [{\"field\": \"content.size\",\"start\": \"0\",\"end\": \"300\",\"gap\": \"100\",\"include\":[\"lower\"]}],"
+                + "\"facetIntervals\": {\"sets\": [{ \"label\": \"king\", \"start\": \"1\", \"end\": \"2\",\"startInclusive\": true,\"endInclusive\": false}]"
+                + ",\"intervals\": [{\"field\": \"cm:creator\",\"label\": \"creator\","
+                + "\"sets\": [{\"label\": \"last\",\"start\": \"a\",\"end\": \"b\",\"startInclusive\": false}]"
+                + "},"
+                + "{\"label\":\"TheCreated\",\"field\":\"cm:created\",\"sets\":[{\"label\":\"lastYear\",\"start\":\"2016\",\"end\":\"2017\",\"endInclusive\":false},{\"label\":\"currentYear\",\"start\":\"NOW/YEAR\",\"end\":\"NOW/YEAR+1YEAR\"},{\"label\":\"earlier\",\"start\":\"*\",\"end\":\"2016\",\"endInclusive\":false}]}"
+                + "]},"
+                + "\"stats\": [{\"field\": \"cm:creator\", \"label\": \"mylabel\"}],"
+                + "\"spellcheck\": {\"query\": \"alfrezco\"},"
+                + "\"limits\": {\"permissionEvaluationCount\": \"2000\",\"permissionEvaluationTime\": \"5000\"},"
+                + "\"scope\": { \"locations\": [\"nodes\"]},"
+                + "\"fields\": [\"id\", \"name\"],"
+                + "\"highlight\": {\"prefix\": \"[\",\"postfix\": \"]\",\"snippetCount\": \"20\","
+                + "\"fragmentSize\": \"10\",\"mergeContiguous\": \"true\",\"maxAnalyzedChars\": \"40\", \"usePhraseHighlighter\": \"true\","
+                + "\"fields\": [ "
+                +" {\"field\": \"my\", \"snippetCount\": \"23\", \"fragmentSize\": \"5\", \"mergeContiguous\": \"true\", \"prefix\": \"?\", \"postfix\": \"¡\"  }, "
+                +" {\"field\": \"your\", \"snippetCount\": \"3\", \"fragmentSize\": \"15\", \"mergeContiguous\": \"false\", \"prefix\": \"(\", \"postfix\": \")\"  } "
+                + " ]" + " },"
+                + "\"include\": [\"aspectNames\", \"properties\"]}";
+
+    public SerializerTestHelper()
+    {
+        this.jsonHelper = new JacksonHelper();
+        RestJsonModule module = new RestJsonModule();
+        jsonHelper.setModule(module);
+        try
+        {
+            jsonHelper.afterPropertiesSet();
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+    }
+
+    public SearchQuery extractFromJson(String json) throws IOException
+    {
+        Content content = mock(Content.class);
+        when(content.getReader()).thenReturn(new StringReader(json));
+        WebScriptRequest request = mock(WebScriptRequest.class);
+        when(request.getContent()).thenReturn(content);
+        return extractJsonContent(request, jsonHelper, SearchQuery.class);
+    }
+
+    public SearchQuery searchQueryFromJson() throws IOException
+    {
+        return extractFromJson(JSON);
+    }
+
+    public String writeResponse(final Object respons) throws IOException
+    {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        jsonHelper.withWriter(out, new Writer()
+        {
+            @Override
+            public void writeContents(JsonGenerator generator, ObjectMapper objectMapper)
+                        throws JsonGenerationException, JsonMappingException, IOException
+            {
+                objectMapper.writeValue(generator, respons);
+            }
+        });
+        return out.toString();
+    }
+    public Object searchSQLQueryFromJson(String query, Class<?> classz) throws IOException
+    {
+        Content content = mock(Content.class);
+        when(content.getReader()).thenReturn(new StringReader(query));
+        WebScriptRequest request = mock(WebScriptRequest.class);
+        when(request.getContent()).thenReturn(content);
+        return extractJsonContent(request, jsonHelper, classz);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/search/StoreMapperTests.java b/remote-api/src/test/java/org/alfresco/rest/api/search/StoreMapperTests.java
new file mode 100644
index 00000000000..513a54d8dc1
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/search/StoreMapperTests.java
@@ -0,0 +1,88 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.search;
+
+import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertNull;
+import org.alfresco.rest.api.search.impl.StoreMapper;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.junit.Test;
+
+/**
+ * Tests the StoreMapper class
+ *
+ * @author Gethin James
+ */
+public class StoreMapperTests
+{
+    static StoreMapper storeMapper = new StoreMapper();
+
+    @Test(expected = InvalidArgumentException.class)
+    public void testGetStoreErrors() throws Exception
+    {
+        storeMapper.getStoreRef(null);
+    }
+
+    @Test(expected = InvalidArgumentException.class)
+    public void testGetStoreWithEmpty() throws Exception
+    {
+        storeMapper.getStoreRef("");
+    }
+
+    @Test(expected = InvalidArgumentException.class)
+    public void testInvalidStoreName() throws Exception
+    {
+        storeMapper.getStoreRef("bob");
+    }
+
+    @Test
+    public void testGetStoreRef() throws Exception
+    {
+        assertEquals(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, storeMapper.getStoreRef("nodes"));
+        assertEquals(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, storeMapper.getStoreRef("Nodes"));
+        assertEquals(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, storeMapper.getStoreRef("NODES"));
+
+        assertEquals(StoreMapper.STORE_REF_VERSION2_SPACESSTORE, storeMapper.getStoreRef("Versions"));
+        assertEquals(StoreMapper.STORE_REF_VERSION2_SPACESSTORE, storeMapper.getStoreRef("versions"));
+        assertEquals(StoreMapper.STORE_REF_VERSION2_SPACESSTORE, storeMapper.getStoreRef("VERSIONS"));
+
+        assertEquals(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, storeMapper.getStoreRef("Deleted-nodes"));
+        assertEquals(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, storeMapper.getStoreRef("deleted-nodes"));
+        assertEquals(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, storeMapper.getStoreRef("DELETED-NODES"));
+    }
+
+    @Test
+    public void testGetStore() throws Exception
+    {
+        assertEquals(storeMapper.LIVE_NODES, storeMapper.getStore(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, "not interested")));
+        assertEquals(storeMapper.VERSIONS, storeMapper.getStore(new NodeRef(StoreMapper.STORE_REF_VERSION2_SPACESSTORE, "not interested")));
+        assertEquals(storeMapper.DELETED, storeMapper.getStore(new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, "not interested")));
+
+        assertNull(storeMapper.getStore(null));
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
new file mode 100644
index 00000000000..c6399e74a46
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
@@ -0,0 +1,1096 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.rest.api.tests.client.PublicApiHttpClient;
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsString;
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.Site;
+import org.alfresco.rest.api.nodes.NodesEntityResource;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiHttpClient.BinaryPayload;
+import org.alfresco.rest.api.tests.client.PublicApiHttpClient.RequestBuilder;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.ContentInfo;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.Folder;
+import org.alfresco.rest.api.tests.client.data.Node;
+import org.alfresco.rest.api.tests.client.data.DirectAccessUrl;
+import org.alfresco.rest.api.tests.client.data.Rendition;
+import org.alfresco.rest.api.tests.client.data.SiteMember;
+import org.alfresco.rest.api.tests.client.data.SiteRole;
+import org.alfresco.rest.api.tests.util.JacksonUtil;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.TempFileProvider;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.json.simple.JSONObject;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+import org.springframework.util.ResourceUtils;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * Generic methods for calling the Api (originally taken and adapted from BaseCustomModelApiTest)
+ * 
+ * @author Jamal Kaabi-Mofrad
+ * @author janv
+ * @author gethin
+ */
+@Category(LuceneTests.class)
+public abstract class AbstractBaseApiTest extends EnterpriseTestApi
+{
+    public static final String LAST_MODIFIED_HEADER = "Last-Modified";
+    public static final String IF_MODIFIED_SINCE_HEADER = "If-Modified-Since";
+
+    private static final String RESOURCE_PREFIX = "publicapi/upload/";
+
+    protected static final String URL_NODES = "nodes";
+
+    protected static final String URL_RENDITIONS = "renditions";
+    protected static final String URL_VERSIONS = "versions";
+
+    private static final String URL_CHILDREN = "children";
+    private static final String URL_CONTENT = "content";
+
+    protected static final String TYPE_CM_FOLDER = "cm:folder";
+    protected static final String TYPE_CM_CONTENT = "cm:content";
+    protected static final String TYPE_CM_OBJECT = "cm:cmobject";
+
+    protected static final String ASPECT_CM_PREFERENCES = "cm:preferences";
+    protected static final String ASSOC_TYPE_CM_PREFERENCE_IMAGE = "cm:preferenceImage";
+
+    protected static final String ASSOC_TYPE_CM_CONTAINS = "cm:contains";
+    
+    // TODO improve admin-related tests, including ability to override default admin un/pw
+    protected static final String DEFAULT_ADMIN = "admin";
+    protected static final String DEFAULT_ADMIN_PWD = "admin";
+
+    // network1 with user1, user2 and a testsite1
+    protected static TestNetwork networkOne;
+    
+    protected static String user1; // user1 from network1
+    protected static String user2; // user2 from network1
+
+    // network admin (or default super admin, if not running within a tenant/network)
+    protected static String networkAdmin = DEFAULT_ADMIN;
+
+    protected static String tSiteId;
+    protected static String tDocLibNodeId;
+    
+    
+    protected static List<String> users = new ArrayList<>();
+
+    protected static JacksonUtil jacksonUtil;
+    protected static MutableAuthenticationService authenticationService;
+    protected static PersonService personService;
+
+    protected final String RUNID = System.currentTimeMillis()+"";
+    
+    @Override
+    @Before
+    public void setup() throws Exception
+    {
+        jacksonUtil = new JacksonUtil(applicationContext.getBean("jsonHelper", JacksonHelper.class));
+
+        if (networkOne == null)
+        {
+            // note: populateTestData/createTestData will be called (which currently creates 2 tenants, 9 users per tenant, 10 sites per tenant, ...)
+            networkOne = getTestFixture().getRandomNetwork();
+        }
+        
+        //userOneN1 = networkN1.createUser();
+        //userTwoN1 = networkN1.createUser();
+
+        String tenantDomain = networkOne.getId();
+        
+        if (! TenantService.DEFAULT_DOMAIN.equals(tenantDomain))
+        {
+            networkAdmin = DEFAULT_ADMIN+"@"+tenantDomain;
+        }
+
+        // to enable admin access via test calls - eg. via PublicApiClient -> AbstractTestApi -> findUserByUserName
+        getOrCreateUser(networkAdmin, "admin", networkOne);
+        
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        
+        // note: createUser currently relies on repoService
+        user1 = createUser("user1-" + RUNID, "user1Password", networkOne);
+        user2 = createUser("user2-" + RUNID, "user2Password", networkOne);
+
+        // used-by teardown to cleanup
+        authenticationService = applicationContext.getBean("authenticationService", MutableAuthenticationService.class);
+        personService = applicationContext.getBean("personService", PersonService.class);
+        users.add(user1);
+        users.add(user2);
+
+        setRequestContext(networkOne.getId(), user1, null);
+        
+        tSiteId = createSite("TestSite A - " + RUNID, SiteVisibility.PRIVATE).getId();
+        tDocLibNodeId = getSiteContainerNodeId(tSiteId, "documentLibrary");
+
+        setRequestContext(null, null, null);
+    }
+
+    @After
+    public void tearDown() throws Exception
+    {
+        if ((networkOne != null) && (user1 != null) && (tSiteId != null))
+        {
+            setRequestContext(networkOne.getId(), user1, null);
+            deleteSite(tSiteId, true, 204);
+        }
+
+        setRequestContext(networkAdmin);
+        
+        for (final String username : users)
+        {
+            transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+            {
+                @Override
+                public Void execute() throws Throwable
+                {
+                    deleteUser(username, networkOne);
+                    return null;
+                }
+            });
+        }
+        
+        users.clear();
+        AuthenticationUtil.clearCurrentSecurityContext();
+        setRequestContext(null);
+    }
+
+    /**
+     * The api scope. either public or private
+     *
+     * @return public or private
+     */
+    public abstract String getScope();
+
+    protected HttpResponse post(String url, String body, int expectedStatus) throws Exception
+    {
+        HttpResponse response = publicApiClient.post(getScope(), url, null, null, null, body);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected HttpResponse post(String url, byte[] body, Map<String, String> params, Map<String, String> headers, String apiName, String contentType, int expectedStatus) throws Exception
+    {
+        RequestBuilder requestBuilder = httpClient.new PostRequestBuilder()
+                .setBodyAsByteArray(body)
+                .setContentType(contentType)
+                .setRequestContext(publicApiClient.getRequestContext())
+                .setScope(getScope())
+                .setApiName(apiName)
+                .setEntityCollectionName(url)
+                .setHeaders(headers)
+                .setParams(params);
+        HttpResponse response = publicApiClient.execute(requestBuilder);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected HttpResponse post(String url, String body, Map<String, String> params, Map<String, String> headers, String apiName, int expectedStatus) throws Exception
+    {
+        RequestBuilder requestBuilder = httpClient.new PostRequestBuilder()
+                .setBodyAsString(body)
+                .setRequestContext(publicApiClient.getRequestContext())
+                .setScope(getScope())
+                .setApiName(apiName)
+                .setEntityCollectionName(url)
+                .setHeaders(headers)
+                .setParams(params);
+        HttpResponse response = publicApiClient.execute(requestBuilder);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected HttpResponse post(String url, String body, String queryString, int expectedStatus) throws Exception
+    {
+        if (queryString != null)
+        {
+            url += queryString;
+        }
+        HttpResponse response = publicApiClient.post(getScope(), url, null, null, null, body);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected HttpResponse post(String url, String body, String queryString, String contentType, int expectedStatus) throws Exception
+    {
+        if (queryString != null)
+        {
+            url += queryString;
+        }
+        HttpResponse response = publicApiClient.post(getScope(), url, null, null, null, body, contentType);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected HttpResponse post(String url, byte[] body, String queryString, String contentType, int expectedStatus) throws Exception
+    {
+        if (queryString != null)
+        {
+            url += queryString;
+        }
+        HttpResponse response = publicApiClient.post(getScope(), url, null, null, null, body, contentType);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    // TODO unused queryString - fix-up usages and then remove
+    protected HttpResponse post(String entityCollectionName, String entityId, String relationCollectionName, byte[] body, String queryString, String contentType, int expectedStatus) throws Exception
+    {
+        HttpResponse response = publicApiClient.post(getScope(), entityCollectionName, entityId, relationCollectionName, null, body, contentType);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected HttpResponse getAll(String url, PublicApiClient.Paging paging, int expectedStatus) throws Exception
+    {
+        return getAll(url, paging, null, expectedStatus);
+    }
+
+    protected HttpResponse getAll(String url, PublicApiClient.Paging paging, Map<String, String> otherParams, int expectedStatus) throws Exception
+    {
+        Map<String, String> params = createParams(paging, otherParams);
+
+        HttpResponse response = publicApiClient.get(getScope(), url, null, null, null, params);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected HttpResponse getAll(Class<?> entityResource, PublicApiClient.Paging paging, Map<String, String> otherParams, int expectedStatus) throws Exception
+    {
+        HttpResponse response = publicApiClient.get(entityResource, null, null, otherParams);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected HttpResponse getAll(String url, PublicApiClient.Paging paging, Map<String, String> otherParams, Map<String, String> headers, int expectedStatus) throws Exception
+    {
+        return getAll(url, paging, otherParams, headers, null, expectedStatus);
+    }
+
+    protected HttpResponse getAll(String url, PublicApiClient.Paging paging, Map<String, String> otherParams, Map<String, String> headers, String apiName, int expectedStatus) throws Exception
+    {
+        Map<String, String> params = createParams(paging, otherParams);
+        RequestBuilder requestBuilder = httpClient.new GetRequestBuilder()
+                .setRequestContext(publicApiClient.getRequestContext())
+                .setScope(getScope())
+                .setApiName(apiName)
+                .setEntityCollectionName(url)
+                .setParams(params)
+                .setHeaders(headers);
+
+        HttpResponse response = publicApiClient.execute(requestBuilder);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+    
+    protected HttpResponse getSingle(String url, String entityId, int expectedStatus) throws Exception
+    {
+        return getSingle(url, entityId, null, expectedStatus);
+    }
+
+    public HttpResponse get(String url, Map<String, String> params, int expectedStatus) throws IOException
+    {
+        HttpResponse response = publicApiClient.get(url, params);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected HttpResponse getSingle(String url, String entityId, Map<String, String> params, int expectedStatus) throws Exception
+    {
+        HttpResponse response = publicApiClient.get(getScope(), url, entityId, null, null, params);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected HttpResponse getSingle(Class<?> entityResource, String entityId, Map<String, String> params, int expectedStatus) throws Exception
+    {
+        HttpResponse response = publicApiClient.get(entityResource, entityId, null, params);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected HttpResponse getSingle(String url, String entityId, Map<String, String> params, Map<String, String> headers, int expectedStatus) throws Exception
+    {
+        return getSingle(url, entityId, params, headers, null, expectedStatus);
+    }
+
+    protected HttpResponse getSingle(String url, String entityId, Map<String, String> params, Map<String, String> headers, String apiName, int expectedStatus) throws Exception
+    {
+        RequestBuilder requestBuilder = httpClient.new GetRequestBuilder()
+                .setRequestContext(publicApiClient.getRequestContext())
+                .setScope(getScope())
+                .setApiName(apiName)
+                .setEntityCollectionName(url)
+                .setEntityId(entityId)
+                .setParams(params)
+                .setHeaders(headers);
+
+        HttpResponse response = publicApiClient.execute(requestBuilder);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected HttpResponse getSingleWithDelayRetry(String url, String entityId, Map<String, String> params,
+                                                   Map<String, String> headers, int repeat, long pauseInMillisecond, int expectedStatus) throws Exception
+    {
+        int retryCount = 0;
+        while (retryCount < repeat)
+        {
+            try
+            {
+                return getSingle(url, entityId, params, headers, expectedStatus);
+            } 
+            catch (AssertionError ex)
+            {
+                retryCount++;
+                Thread.sleep(pauseInMillisecond);
+            }
+        }
+        return null;
+    }
+
+    protected HttpResponse put(String url, String entityId, String body, String queryString, int expectedStatus) throws Exception
+    {
+        if (queryString != null)
+        {
+            entityId += queryString;
+        }
+        HttpResponse response = publicApiClient.put(getScope(), url, entityId, null, null, body, null);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected HttpResponse putBinary(String url, int version, BinaryPayload payload, String queryString, Map<String, String> params,
+                                     int expectedStatus) throws Exception
+    {
+        if (queryString != null)
+        {
+            url += queryString;
+        }
+
+        HttpResponse response = publicApiClient.putBinary(getScope(), version, url, null, null, null, payload, params);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected HttpResponse putBinary(String url, BinaryPayload payload, String queryString, Map<String, String> params,
+                                     int expectedStatus) throws Exception
+    {
+        return putBinary(url, 1, payload, queryString, params, expectedStatus);
+    }
+
+    protected HttpResponse delete(String url, String entityId, int expectedStatus) throws Exception
+    {
+        return delete(url, entityId, null, expectedStatus);
+    }
+
+    protected HttpResponse delete(String url, String entityId, Map<String, String> params, int expectedStatus) throws Exception
+    {
+        HttpResponse response = publicApiClient.delete(getScope(), 1, url, entityId, null, null, params);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+    
+    protected HttpResponse delete(String url, String entityId, Map<String, String> params, Map<String, String> headers, String apiName, int expectedStatus) throws Exception
+    {
+        RequestBuilder requestBuilder = httpClient.new DeleteRequestBuilder()
+                .setRequestContext(publicApiClient.getRequestContext())
+                .setScope(getScope())
+                .setApiName(apiName)
+                .setEntityCollectionName(url)
+                .setEntityId(entityId)
+                .setParams(params)
+                .setHeaders(headers);
+
+        HttpResponse response = publicApiClient.execute(requestBuilder);
+        checkStatus(expectedStatus, response.getStatusCode());
+
+        return response;
+    }
+
+    protected String createUser(String username)
+    {
+        return createUser(username, "password", null);
+    }
+
+    protected String createUser(String usernameIn, String password, TestNetwork network)
+    {
+        return createUser(new PersonInfo(usernameIn, usernameIn, usernameIn, password, null, null, null, null, null, null, null), network);
+    }
+
+    /**
+     * TODO implement as remote api call
+     */
+    protected String createUser(final PersonInfo personInfo, final TestNetwork network)
+    {
+        final String tenantDomain = (network != null ? network.getId() : TenantService.DEFAULT_DOMAIN);
+        
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<String>()
+        {
+            @Override
+            public String doWork() throws Exception
+            {
+                return TenantUtil.runAsTenant(new TenantUtil.TenantRunAsWork<String>()
+                {
+                    public String doWork() throws Exception
+                    {
+                        String username = repoService.getPublicApiContext().createUserName(personInfo.getUsername(), tenantDomain);
+                        personInfo.setUsername(username);
+                        RepoService.TestPerson person = repoService.createUser(personInfo, username, network);
+                        return person.getId();
+
+                    }
+                }, tenantDomain);
+            }
+        }, networkAdmin);
+    }
+
+    /**
+     * TODO implement as remote api call
+     */
+    protected String getOrCreateUser(String usernameIn, String password, TestNetwork network)
+    {
+        final String tenantDomain = (network != null ? network.getId() : TenantService.DEFAULT_DOMAIN);
+
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<String>()
+        {
+            @Override
+            public String doWork() throws Exception
+            {
+                return TenantUtil.runAsTenant(new TenantUtil.TenantRunAsWork<String>()
+                {
+                    public String doWork() throws Exception
+                    {
+                        String username = repoService.getPublicApiContext().createUserName(usernameIn, tenantDomain);
+                        PersonInfo personInfo = new PersonInfo(username, username, username, password, null, null, null, null, null, null, null);
+                        RepoService.TestPerson person = repoService.getOrCreateUser(personInfo, username, network);
+                        return person.getId();
+                    }
+                }, tenantDomain);
+            }
+        }, networkAdmin);
+    }
+
+    /**
+     * TODO implement as remote api call
+     */
+    protected String deleteUser(final String username, final TestNetwork network)
+    {
+        final String tenantDomain = (network != null ? network.getId() : TenantService.DEFAULT_DOMAIN);
+
+        return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<String>()
+        {
+            @Override
+            public String doWork() throws Exception
+            {
+                return TenantUtil.runAsTenant(new TenantUtil.TenantRunAsWork<String>()
+                {
+                    public String doWork() throws Exception
+                    {
+                        repoService.deleteUser(username, network);
+                        return null;
+                    }
+                }, tenantDomain);
+            }
+        }, networkAdmin);
+    }
+    
+    protected SiteMember addSiteMember(String siteId, String userId, final SiteRole siteRole) throws Exception
+    {
+        SiteMember siteMember = new SiteMember(userId, siteRole.name());
+        HttpResponse response = publicApiClient.post(getScope(), "sites", siteId, "members", null, siteMember.toJSON().toString());
+        checkStatus(201, response.getStatusCode());
+        return SiteMember.parseSiteMember(siteMember.getSiteId(), (JSONObject)response.getJsonResponse().get("entry"));
+    }
+
+    protected Site createSite(String siteTitle, SiteVisibility siteVisibility) throws Exception
+    {
+        return createSite(null, siteTitle, null, siteVisibility, 201);
+    }
+
+    protected Site createSite(String siteId, String siteTitle, String siteDescription, SiteVisibility siteVisibility, int expectedStatus) throws Exception
+    {
+        Site site = new Site();
+        site.setId(siteId);
+        site.setTitle(siteTitle);
+        site.setVisibility(siteVisibility);
+        site.setDescription(siteDescription);
+
+        HttpResponse response = publicApiClient.post(getScope(), "sites", null, null, null, toJsonAsStringNonNull(site));
+        checkStatus(expectedStatus, response.getStatusCode());
+        return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Site.class);
+    }
+
+    protected HttpResponse deleteSite(String siteId, boolean permanent, int expectedStatus) throws Exception
+    {
+        Map params = null;
+        if (permanent == true)
+        {
+            params = Collections.singletonMap("permanent", "true");
+        }
+
+        HttpResponse response = publicApiClient.delete(getScope(), 1, "sites", siteId, null, null, params);
+        checkStatus(expectedStatus, response.getStatusCode());
+        return response;
+    }
+
+    /**
+     * Helper: to get site container id (see also RepoService.getContainerNodeRef -> SiteService.getContainer)
+     * <p>
+     * GET /nodes/-root?relativePath=/Sites/siteId/documentLibrary
+     * <p>
+     * alternatively:
+     * <p>
+     * GET /nodes/siteNodeId?relativePath=documentLibrary
+     */
+    protected String getSiteContainerNodeId(String siteId, String containerNameId) throws Exception
+    {
+        Map<String, String> params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, "/Sites/" + siteId + "/" + containerNameId);
+        
+        HttpResponse response = publicApiClient.get(NodesEntityResource.class, Nodes.PATH_ROOT, null, params);
+        checkStatus(200, response.getStatusCode());
+
+        Node node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        return node.getId();
+    }
+    
+    protected void checkStatus(int expectedStatus, int actualStatus)
+    {
+        if (expectedStatus > 0 && expectedStatus != actualStatus)
+        {
+            fail("Status code " + actualStatus + " returned, but expected " + expectedStatus);
+        }
+    }
+
+    /**
+     * @deprecated
+     * 
+     * @param runAsUser
+     */
+    protected void setRequestContext(String runAsUser)
+    {
+        String password = null;
+        if ((runAsUser != null) && runAsUser.equals(DEFAULT_ADMIN))
+        {
+            // TODO improve "admin" related tests
+            password = DEFAULT_ADMIN_PWD;
+        }
+
+        // Assume "networkN1" if set !
+        String runAsNetwork = (networkOne != null ? networkOne.getId() : null);
+
+        setRequestContext(runAsNetwork, runAsUser, password);
+    }
+
+    /**
+     * TODO implement as remote (login) api call
+     */
+    protected void setRequestContext(String runAsNetwork, String runAsUser, String password)
+    {
+        if ((runAsNetwork == null) || TenantService.DEFAULT_DOMAIN.equals(runAsNetwork))
+        {
+            runAsNetwork = "-default-";
+        }
+        else if ((runAsUser != null) && runAsUser.equals(DEFAULT_ADMIN))
+        {
+            runAsUser = runAsUser+"@"+runAsNetwork;
+        }
+        
+        publicApiClient.setRequestContext(new RequestContext(runAsNetwork, runAsUser, password));
+    }
+
+    // -root- (eg. Company Home for on-prem)
+    protected String getRootNodeId() throws Exception
+    {
+        HttpResponse response = getSingle(NodesEntityResource.class, Nodes.PATH_ROOT, null, 200);
+        Node node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        return node.getId();
+    }
+
+    // -my- (eg. User's Home for on-prem)
+    protected String getMyNodeId() throws Exception
+    {
+        HttpResponse response = getSingle(NodesEntityResource.class, Nodes.PATH_MY, null, 200);
+        Node node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        return node.getId();
+    }
+
+    // -shared- (eg. "Shared" folder for on-prem)
+    protected String getSharedNodeId() throws Exception
+    {
+        HttpResponse response = getSingle(NodesEntityResource.class, Nodes.PATH_SHARED, null, 200);
+        Node node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        return node.getId();
+    }
+
+    protected Folder createFolder(String parentId, String folderName) throws Exception
+    {
+        return createFolder(parentId, folderName, null);
+    }
+    
+    protected Folder createFolder(String parentId, String folderName, Map<String, Object> props) throws Exception
+    {
+        return createNode(parentId, folderName, TYPE_CM_FOLDER, props, Folder.class);
+    }
+
+    protected Node createNode(String parentId, String nodeName, String nodeType, Map<String, Object> props) throws Exception
+    {
+        return createNode(parentId, nodeName, nodeType, props, Node.class);
+    }
+
+    protected <T> T createNode(String parentId, String nodeName, String nodeType, Map<String, Object> props, Class<T> returnType)
+                throws Exception
+    {
+        Node n = new Node();
+        n.setName(nodeName);
+        n.setNodeType(nodeType);
+        n.setProperties(props);
+
+        // create node
+        HttpResponse response = post(getNodeChildrenUrl(parentId), RestApiUtil.toJsonAsStringNonNull(n), 201);
+
+        return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), returnType);
+    }
+    
+    protected void deleteNode(String nodeId) throws Exception
+    {
+        deleteNode(nodeId, 204);
+    }
+
+    protected void deleteNode(String nodeId, int expectedStatus) throws Exception
+    {
+        deleteNode(nodeId, false, expectedStatus);
+    }
+
+    protected void deleteNode(String nodeId, boolean permanent, int expectedStatus) throws Exception
+    {
+        Map params = null;
+        if (permanent == true)
+        {
+            params = Collections.singletonMap("permanent", "true");
+        }
+        
+        delete(URL_NODES, nodeId, params, expectedStatus);
+    }
+
+    protected Document createTextFile(String parentId, String fileName, String textContent) throws IOException, Exception
+    {
+        return createTextFile(parentId, fileName, textContent, "UTF-8", null);
+    }
+
+    protected Document createTextFile(String parentId, String fileName, String textContent, String encoding, Map<String, String> props) throws IOException, Exception
+    {
+        return createTextFile(parentId, fileName, textContent, encoding, props, 201);
+    }
+
+    protected Document createTextFile(String parentId, String fileName, String textContent, String encoding, Map<String, String> props, int expectedStatus) throws IOException, Exception
+    {
+        if (props == null)
+        {
+            props = Collections.EMPTY_MAP;
+
+        }
+
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(textContent.getBytes());
+        File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+
+        MultiPartBuilder.MultiPartRequest reqBody = MultiPartBuilder.create()
+                .setFileData(new MultiPartBuilder.FileData(fileName, txtFile))
+                .setProperties(props)
+                .build();
+
+        HttpResponse response = post(getNodeChildrenUrl(parentId), reqBody.getBody(), null, reqBody.getContentType(), expectedStatus);
+
+        if (response.getJsonResponse().get("error") != null)
+        {
+            return null;
+        }
+
+        return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+    }
+
+    protected Document createEmptyTextFile(String parentFolderId, String docName) throws Exception
+    {
+        return createEmptyTextFile(parentFolderId, docName, null, 201);
+    }
+    
+    protected Document createEmptyTextFile(String parentFolderId, String docName, Map<String, String> params, int expectedStatus) throws Exception
+    {
+        Document d1 = new Document();
+        d1.setName(docName);
+        d1.setNodeType("cm:content");
+        ContentInfo ci = new ContentInfo();
+        ci.setMimeType("text/plain");
+        d1.setContent(ci);
+
+        // create empty file
+        HttpResponse response = post(getNodeChildrenUrl(parentFolderId), toJsonAsStringNonNull(d1), params, null, "alfresco", expectedStatus);
+        if (expectedStatus != 201)
+        {
+            return null;
+        }
+        return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+    }
+
+    protected Document updateTextFile(String contentId, String textContent, Map<String, String> params) throws Exception
+    {
+        return updateTextFile(contentId, textContent, params, 200);
+    }
+
+    protected Document updateTextFile(String contentId, String textContent, Map<String, String> params, int expectedStatus) throws Exception
+    {
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(textContent.getBytes());
+        File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+        BinaryPayload payload = new BinaryPayload(txtFile);
+
+        HttpResponse response = putBinary(getNodeContentUrl(contentId), payload, null, params, expectedStatus);
+        if (expectedStatus != 200)
+        {
+            return null;
+        }
+        return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+    }
+
+    protected File getResourceFile(String fileName) throws FileNotFoundException
+    {
+        URL url = NodeApiTest.class.getClassLoader().getResource(RESOURCE_PREFIX + fileName);
+        if (url == null)
+        {
+            fail("Cannot get the resource: " + fileName);
+        }
+        return ResourceUtils.getFile(url);
+    }
+
+    protected Document lock(String nodeId, String body) throws Exception
+    {
+        HttpResponse response = post(getNodeOperationUrl(nodeId, "lock"), body, null, 200);
+        return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+    }
+
+    protected Document unlock(String nodeId) throws Exception
+    {
+        HttpResponse response = post(getNodeOperationUrl(nodeId, "unlock"), null, null, 200);
+        return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+    }
+
+    protected DirectAccessUrl requestContentUrl(String nodeId, String body, int expectedStatus) throws Exception
+    {
+        HttpResponse response = post(getNodeOperationUrl(nodeId, "request-content-url"), body, null, null, null, expectedStatus);
+
+        if (response.getJsonResponse().get("error") != null)
+        {
+            return null;
+        }
+
+        return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), DirectAccessUrl.class);
+    }
+
+    protected DirectAccessUrl requestContentUrl(String nodeId, String versionId, String body, int expectedStatus) throws Exception
+    {
+        HttpResponse response = post(getNodeVersionsOperationUrl(nodeId, versionId, "request-content-url"), body, null, null, null, expectedStatus);
+
+        if (response.getJsonResponse().get("error") != null)
+        {
+            return null;
+        }
+
+        return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), DirectAccessUrl.class);
+    }
+
+    /**
+     * This test helper method uses "update binary content" to create one or more new versions. The file must already exist.
+     *
+     * @param userId
+     * @param contentNodeId
+     * @param cnt
+     * @param textContentPrefix
+     * @param verCnt
+     * @param majorVersion
+     * @param currentVersionLabel
+     * @return
+     * @throws Exception
+     */
+    protected String updateFileVersions(String userId, String contentNodeId, int cnt,
+                                      String textContentPrefix, int verCnt,
+                                      Boolean majorVersion, String currentVersionLabel) throws Exception
+    {
+        String[] parts = currentVersionLabel.split("\\.");
+
+        int majorVer = new Integer(parts[0]).intValue();
+        int minorVer = new Integer(parts[1]).intValue();
+
+        Map<String, String> params = new HashMap<>();
+        params.put(Nodes.PARAM_OVERWRITE, "true");
+
+        if (majorVersion != null)
+        {
+            params.put(Nodes.PARAM_VERSION_MAJOR, majorVersion.toString());
+        }
+        else
+        {
+            majorVersion = false;
+        }
+
+
+        if (majorVersion)
+        {
+            minorVer = 0;
+        }
+
+        for (int i = 1; i <= cnt; i++)
+        {
+            if (majorVersion)
+            {
+                majorVer++;
+            }
+            else
+            {
+                minorVer++;
+            }
+
+            verCnt++;
+
+            params.put("comment", "my version " + verCnt);
+
+            String textContent = textContentPrefix + verCnt;
+
+            currentVersionLabel = majorVer + "." + minorVer;
+
+            // Update
+            ByteArrayInputStream inputStream = new ByteArrayInputStream(textContent.getBytes());
+            File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+            PublicApiHttpClient.BinaryPayload payload = new PublicApiHttpClient.BinaryPayload(txtFile);
+
+            HttpResponse response = putBinary(getNodeContentUrl(contentNodeId), payload, null, params, 200);
+            Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+
+            assertTrue(nodeResp.getAspectNames().contains("cm:versionable"));
+            assertNotNull(nodeResp.getProperties());
+            assertEquals(currentVersionLabel, nodeResp.getProperties().get("cm:versionLabel"));
+            assertEquals((majorVersion ? "MAJOR" : "MINOR"), nodeResp.getProperties().get("cm:versionType"));
+
+            // double-check - get version node info
+            response = getSingle(getNodeVersionsUrl(contentNodeId), currentVersionLabel, null, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals(currentVersionLabel, nodeResp.getProperties().get("cm:versionLabel"));
+            assertEquals((majorVersion ? "MAJOR" : "MINOR"), nodeResp.getProperties().get("cm:versionType"));
+        }
+
+        return currentVersionLabel;
+    }
+
+    protected static final long PAUSE_TIME = 5000; //millisecond
+    protected static final int MAX_RETRY = 20;
+
+    protected Rendition waitAndGetRendition(String sourceNodeId, String versionId, String renditionId) throws Exception
+    {
+        return waitAndGetRendition(sourceNodeId, versionId, renditionId, MAX_RETRY, PAUSE_TIME);
+    }
+
+    protected Rendition waitAndGetRendition(String sourceNodeId, String versionId, String renditionId, int maxRetry, long pauseTime) throws Exception
+    {
+        int retryCount = 0;
+        while (retryCount < maxRetry)
+        {
+            try
+            {
+                HttpResponse response;
+                if ((versionId != null) && (! versionId.isEmpty()))
+                {
+                    response = getSingle(getNodeVersionRenditionsUrl(sourceNodeId, versionId), renditionId, 200);
+                }
+                else
+                {
+                    response = getSingle(getNodeRenditionsUrl(sourceNodeId), renditionId, 200);
+                }
+                Rendition rendition = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Rendition.class);
+                assertNotNull(rendition);
+                assertEquals(Rendition.RenditionStatus.CREATED, rendition.getStatus());
+                return rendition;
+            }
+            catch (AssertionError ex)
+            {
+                // If the asynchronous create rendition action is not finished yet,
+                // wait for 'PAUSE_TIME' and try again.
+                retryCount++;
+
+                System.out.println("waitAndGetRendition: "+retryCount);
+                Thread.sleep(pauseTime);
+            }
+        }
+
+        return null;
+    }
+
+    protected Rendition createAndGetRendition(String sourceNodeId, String renditionId) throws Exception
+    {
+        return createAndGetRendition(sourceNodeId, null, renditionId);
+    }
+
+    protected Rendition createAndGetRendition(String sourceNodeId, String versionId, String renditionId) throws Exception
+    {
+        Rendition renditionRequest = new Rendition();
+        renditionRequest.setId(renditionId);
+
+        int retryCount = 0;
+        while (retryCount < MAX_RETRY)
+        {
+            try
+            {
+                HttpResponse response;
+                if ((versionId != null) && (! versionId.isEmpty()))
+                {
+                    response = post(getNodeVersionRenditionsUrl(sourceNodeId, versionId), toJsonAsString(renditionRequest), 202);
+                }
+                else
+                {
+                    response = post(getNodeRenditionsUrl(sourceNodeId), toJsonAsString(renditionRequest), 202);
+                }
+                assertNull(response.getJsonResponse());
+                break;
+            }
+            catch (AssertionError ex)
+            {
+                // If no transformer is currently available,
+                // wait for 'PAUSE_TIME' and try again.
+                retryCount++;
+
+                System.out.println("waitAndGetRendition: "+retryCount);
+                Thread.sleep(PAUSE_TIME);
+            }
+        }
+
+        return waitAndGetRendition(sourceNodeId, versionId, renditionId);
+    }
+
+    protected String getNodeRenditionsUrl(String nodeId)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_RENDITIONS;
+    }
+
+    protected String getNodeRenditionOperationUrl(String nodeId, String renditionId, String operation)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_RENDITIONS+ "/" + renditionId + "/" + operation;
+    }
+
+    protected String getNodeVersionsUrl(String nodeId, String versionId)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_VERSIONS + "/" + versionId;
+    }
+
+    protected String getNodeVersionsOperationUrl(String nodeId, String versionId, String operation)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_VERSIONS + "/" + versionId + "/" + operation;
+    }
+
+    protected String getNodeVersionsUrl(String nodeId)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_VERSIONS;
+    }
+
+    protected String getNodeVersionRenditionsUrl(String nodeId, String versionId)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_VERSIONS + "/" + versionId + "/" + URL_RENDITIONS;
+    }
+
+    protected String getNodeVersionRenditionsOperationUrl(String nodeId, String versionId, String renditionId, String operation)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_VERSIONS + "/" + versionId + "/" + URL_RENDITIONS + "/" + renditionId + "/" + operation;
+    }
+
+    protected String getNodeChildrenUrl(String nodeId)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_CHILDREN;
+    }
+
+    protected String getNodeContentUrl(String nodeId)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_CONTENT;
+    }
+
+    protected String getNodeOperationUrl(String nodeId, String operation)
+    {
+        return URL_NODES + "/" + nodeId + "/" + operation;
+    }
+
+    protected String getNode(String nodeId)
+    {
+        return URL_NODES + "/" + nodeId;
+    }
+
+}
+
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS10TCKTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS10TCKTest.java
new file mode 100644
index 00000000000..41ae9be3fb3
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS10TCKTest.java
@@ -0,0 +1,30 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+public abstract class AbstractEnterpriseOpenCMIS10TCKTest extends AbstractEnterpriseOpenCMISTCKTest
+{
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS11TCKTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS11TCKTest.java
new file mode 100644
index 00000000000..1ba96dfa9b9
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS11TCKTest.java
@@ -0,0 +1,177 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import java.util.Map;
+
+import org.alfresco.opencmis.tck.tests.query.QueryForObjectCustom;
+import org.alfresco.opencmis.tck.tests.query.QueryInFolderTestCustom;
+import org.alfresco.opencmis.tck.tests.query.QueryLikeTestCustom;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.alfresco.util.testing.category.RedundantTests;
+import org.apache.chemistry.opencmis.tck.impl.AbstractSessionTestGroup;
+import org.apache.chemistry.opencmis.tck.impl.JUnitHelper;
+import org.apache.chemistry.opencmis.tck.tests.basics.BasicsTestGroup;
+import org.apache.chemistry.opencmis.tck.tests.control.ControlTestGroup;
+import org.apache.chemistry.opencmis.tck.tests.crud.BulkUpdatePropertiesTest;
+import org.apache.chemistry.opencmis.tck.tests.crud.CRUDTestGroup;
+import org.apache.chemistry.opencmis.tck.tests.crud.ChangeTokenTest;
+import org.apache.chemistry.opencmis.tck.tests.crud.ContentRangesTest;
+import org.apache.chemistry.opencmis.tck.tests.crud.CopyTest;
+import org.apache.chemistry.opencmis.tck.tests.crud.CreateAndDeleteDocumentTest;
+import org.apache.chemistry.opencmis.tck.tests.crud.CreateAndDeleteFolderTest;
+import org.apache.chemistry.opencmis.tck.tests.crud.CreateAndDeleteItemTest;
+import org.apache.chemistry.opencmis.tck.tests.crud.CreateAndDeleteRelationshipTest;
+import org.apache.chemistry.opencmis.tck.tests.crud.CreateBigDocument;
+import org.apache.chemistry.opencmis.tck.tests.crud.CreateDocumentWithoutContent;
+import org.apache.chemistry.opencmis.tck.tests.crud.DeleteTreeTest;
+import org.apache.chemistry.opencmis.tck.tests.crud.MoveTest;
+import org.apache.chemistry.opencmis.tck.tests.crud.NameCharsetTest;
+import org.apache.chemistry.opencmis.tck.tests.crud.OperationContextTest;
+import org.apache.chemistry.opencmis.tck.tests.crud.SetAndDeleteContentTest;
+import org.apache.chemistry.opencmis.tck.tests.crud.UpdateSmokeTest;
+import org.apache.chemistry.opencmis.tck.tests.filing.FilingTestGroup;
+import org.apache.chemistry.opencmis.tck.tests.query.ContentChangesSmokeTest;
+import org.apache.chemistry.opencmis.tck.tests.query.QuerySmokeTest;
+import org.apache.chemistry.opencmis.tck.tests.versioning.VersionDeleteTest;
+import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningSmokeTest;
+import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningStateCreateTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterpriseOpenCMISTCKTest
+{
+    @Test
+    public void testCMISTCKBasics() throws Exception
+    {
+        BasicsTestGroup basicsTestGroup = new BasicsTestGroup();
+        JUnitHelper.run(basicsTestGroup);
+    }
+
+    @Test
+    public void testCMISTCKCRUD() throws Exception
+    {
+        CRUDTestGroup crudTestGroup = new CRUDTestGroup();
+        JUnitHelper.run(crudTestGroup);
+    }
+
+    @Test
+    public void testCMISTCKVersioning() throws Exception
+    {
+        OverrideVersioningTestGroup versioningTestGroup = new OverrideVersioningTestGroup();
+        JUnitHelper.run(versioningTestGroup);
+    }
+
+    @Test
+    public void testCMISTCKFiling() throws Exception
+    {
+        FilingTestGroup filingTestGroup = new FilingTestGroup();
+        JUnitHelper.run(filingTestGroup);
+    }
+
+    @Test
+    public void testCMISTCKControl() throws Exception
+    {
+        ControlTestGroup controlTestGroup = new ControlTestGroup();
+        JUnitHelper.run(controlTestGroup);
+    }
+
+    @Test
+    @Category({LuceneTests.class, RedundantTests.class})
+    public void testCMISTCKQuery() throws Exception
+    {
+        OverrideQueryTestGroup queryTestGroup = new OverrideQueryTestGroup();
+        JUnitHelper.run(queryTestGroup);
+    }
+    
+    class OverrideVersioningTestGroup extends AbstractSessionTestGroup
+    {
+        @Override
+        public void init(Map<String, String> parameters) throws Exception
+        {
+            super.init(parameters);
+
+            setName("Versioning Test Group");
+            setDescription("Versioning tests.");
+
+            addTest(new VersioningSmokeTest());
+            addTest(new VersionDeleteTest());
+            addTest(new VersioningStateCreateTest());
+            // relies on Solr being available
+//            addTest(new CheckedOutTest());
+        }
+    }
+       
+    class OverrideCRUDTestGroup extends AbstractSessionTestGroup
+    {
+        @Override
+        public void init(Map<String, String> parameters) throws Exception
+        {
+            super.init(parameters);
+
+            setName("CRUD Test Group");
+            setDescription("Create, Read, Update, and Delete tests.");
+
+            addTest(new CreateAndDeleteFolderTest());
+            addTest(new CreateAndDeleteDocumentTest());
+            addTest(new CreateBigDocument());
+            addTest(new CreateDocumentWithoutContent());
+            addTest(new NameCharsetTest());
+            addTest(new CreateAndDeleteRelationshipTest());
+            addTest(new CreateAndDeleteItemTest());
+            addTest(new UpdateSmokeTest());
+            addTest(new BulkUpdatePropertiesTest());
+            addTest(new BulkUpdatePropertiesCustomTest());
+            addTest(new SetAndDeleteContentTest());
+            addTest(new ChangeTokenTest());
+            addTest(new ContentRangesTest());
+            addTest(new CopyTest());
+            addTest(new MoveTest());
+            addTest(new DeleteTreeTest());
+            addTest(new OperationContextTest());
+        }
+    }
+
+    public class OverrideQueryTestGroup extends AbstractSessionTestGroup
+    {
+        @Override
+        public void init(Map<String, String> parameters) throws Exception
+        {
+            super.init(parameters);
+
+            setName("Query Test Group");
+            setDescription("Query and content changes tests.");
+
+            addTest(new QuerySmokeTest());
+            // The test fails on Lucene see MNT-11223
+//            addTest(new QueryRootFolderTest());
+            addTest(new QueryForObjectCustom());
+            addTest(new QueryLikeTestCustom());
+            addTest(new QueryInFolderTestCustom());
+            addTest(new ContentChangesSmokeTest());
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMISTCKTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMISTCKTest.java
new file mode 100644
index 00000000000..bac6d4137b6
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMISTCKTest.java
@@ -0,0 +1,68 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.opencmis.OpenCMISClientContext;
+import org.alfresco.repo.dictionary.DictionaryDAO;
+import org.alfresco.repo.dictionary.M2Aspect;
+import org.alfresco.repo.dictionary.M2Model;
+import org.alfresco.repo.dictionary.M2Property;
+import org.alfresco.service.namespace.QName;
+import org.springframework.context.ApplicationContext;
+
+/**
+ * Base class for Chemistry OpenCMIS TCK tests.
+ * 
+ * @author steveglover
+ *
+ */
+public abstract class AbstractEnterpriseOpenCMISTCKTest extends EnterpriseTestApi
+{
+	protected static OpenCMISClientContext clientContext;
+	
+   @Override
+    protected TestFixture getTestFixture() throws Exception
+    {
+        return EnterprisePublicApiTestFixture.getInstance();
+    }
+   
+    protected void overrideVersionableAspectProperties(ApplicationContext ctx)
+    {
+        final DictionaryDAO dictionaryDAO = (DictionaryDAO) ctx.getBean("dictionaryDAO");
+        dictionaryDAO.removeModel(QName.createQName("cm:contentmodel"));
+        M2Model contentModel = M2Model.createModel(getClass().getClassLoader().getResourceAsStream("alfresco/model/contentModel.xml"));
+
+        M2Aspect versionableAspect = contentModel.getAspect("cm:versionable");
+        M2Property prop = versionableAspect.getProperty("cm:initialVersion"); 
+        prop.setDefaultValue(Boolean.FALSE.toString());
+        prop = versionableAspect.getProperty("cm:autoVersion"); 
+        prop.setDefaultValue(Boolean.FALSE.toString());
+        prop = versionableAspect.getProperty("cm:autoVersionOnUpdateProps"); 
+        prop.setDefaultValue(Boolean.FALSE.toString());
+
+        dictionaryDAO.putModel(contentModel);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractTestApi.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractTestApi.java
new file mode 100644
index 00000000000..0240548470f
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractTestApi.java
@@ -0,0 +1,231 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.text.Collator;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.client.AuthenticatedHttp;
+import org.alfresco.rest.api.tests.client.AuthenticationDetailsProvider;
+import org.alfresco.rest.api.tests.client.HttpClientProvider;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiHttpClient;
+import org.alfresco.rest.api.tests.client.UserAuthenticationDetailsProviderImpl;
+import org.alfresco.rest.api.tests.client.UserData;
+import org.alfresco.rest.api.tests.client.UserDataService;
+import org.alfresco.rest.api.tests.client.data.ExpectedComparison;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.springframework.context.ApplicationContext;
+
+public abstract class AbstractTestApi
+{
+    private static final Log logger = LogFactory.getLog(AbstractTestApi.class);
+
+	protected RepoService repoService;
+	protected ApplicationContext applicationContext;
+
+	protected PublicApiHttpClient httpClient; 
+    protected PublicApiClient publicApiClient;
+    protected RetryingTransactionHelper transactionHelper;
+	protected Collator collator = Collator.getInstance();
+
+	public RepoService getRepoService()
+	{
+		return repoService;
+	}
+	
+	@Before
+	public void setupTests() throws Exception
+	{
+		TestFixture testFixture = getTestFixture(false);
+		this.applicationContext = testFixture.getApplicationContext();
+		this.repoService = testFixture.getRepoService();
+		this.transactionHelper = (RetryingTransactionHelper)applicationContext.getBean("retryingTransactionHelper");
+		
+		HttpClientProvider httpClientProvider = (HttpClientProvider)applicationContext.getBean("httpClientProvider");
+		
+		UserDataService userDataService = new UserDataService()
+		{
+			@Override
+			public UserData findUserByUserName(String userName)
+			{
+				UserData userData = new UserData();
+				TestPerson person = getRepoService().getPerson(userName.toLowerCase());
+				userData.setUserName(person.getId());
+				userData.setPassword(person.getPassword());
+				userData.setId(person.getId());
+				return userData;
+			}
+		};
+	    AuthenticationDetailsProvider authenticationDetailsProvider = new UserAuthenticationDetailsProviderImpl(userDataService, "admin", "admin");
+	    AuthenticatedHttp authenticatedHttp = new AuthenticatedHttp(httpClientProvider, authenticationDetailsProvider);
+		this.httpClient = new PublicApiHttpClient(TestFixture.HOST, TestFixture.PORT, TestFixture.CONTEXT_PATH,
+				TestFixture.PUBLIC_API_SERVLET_NAME, authenticatedHttp);
+	    this.publicApiClient = new PublicApiClient(httpClient, userDataService);
+	}
+
+	protected void log(String msg)
+	{
+	    log(msg, null);
+	}
+	
+	protected void log(String msg, Throwable t)
+	{
+	    if(logger.isDebugEnabled())
+    	    {
+                logger.debug(msg, t);
+	    }
+	}
+	
+	protected Paging getPaging(Integer skipCount, Integer maxItems)
+	{
+		return new Paging(skipCount, maxItems, null);
+	}
+
+	protected Paging getPaging(Integer skipCount, Integer maxItems, int total, Integer expectedTotal)
+	{
+		ExpectedPaging expectedPaging = ExpectedPaging.getExpectedPaging(skipCount, maxItems, total, expectedTotal);
+		return new Paging(skipCount, maxItems, expectedPaging);
+	}
+	
+	protected <T extends ExpectedComparison> void check(ExpectedComparison expected, T actual)
+	{
+		assertNotNull(expected);
+		assertNotNull(actual);
+
+		expected.expected(actual);
+	}
+	
+	protected String stripCMISSuffix(String nodeId)
+	{
+		String ret = null;
+
+		int idx = nodeId.indexOf(";");
+		if(idx != -1)
+		{
+			ret = nodeId.substring(0, idx);
+		}
+		else
+		{
+			ret = nodeId;
+		}
+
+		return ret;
+	}
+	
+	protected Map<String, String> createParams(Paging paging, Map<String, String> otherParams)
+	{
+        Map<String, String> params = new HashMap<String, String>(2);
+        if(paging != null)
+        {
+        	if(paging.getSkipCount() != null)
+        	{
+        		params.put("skipCount", String.valueOf(paging.getSkipCount()));
+        	}
+        	if(paging.getMaxItems() != null)
+        	{
+        		params.put("maxItems", String.valueOf(paging.getMaxItems()));
+        	}
+        }
+        if(otherParams != null)
+        {
+        	params.putAll(otherParams);
+        }
+        return params;
+	}
+	
+	protected <T1 extends ExpectedComparison, T extends Object> void checkList(List<T1> expected, ExpectedPaging expectedPaging, ListResponse<T> actual)
+	{
+		assertNotNull(expectedPaging);
+		assertNotNull(actual);
+		
+		log("Expected paging " + expectedPaging.toString());
+
+		for(T1 expectedEntry : expected)
+		{
+			log("Expected entry " + expectedEntry.toString());
+		}
+		
+		log("Actual paging " + actual.getPaging().toString());
+
+		for(Object actualEntry : actual.getList())
+		{
+			log("Actual entry " + actualEntry.toString());
+		}
+
+		assertEquals(expectedPaging, actual.getPaging());
+		assertEquals(expected.size(), actual.getList().size());
+
+		for(int i = 0; i < expected.size(); i++)
+		{
+			ExpectedComparison expectedEntry = (ExpectedComparison)expected.get(i);
+			T actualEntry = actual.getList().get(i);
+			assertNotNull(actualEntry);
+			assertNotNull(expectedEntry);
+			expectedEntry.expected(actualEntry);
+		}
+	}
+	
+	protected <T extends Object> List<T> sublist(List<T> list, int skipCount, int maxItems)
+	{
+		List<T> ret = null;
+		
+		int size = list.size();
+		int start = skipCount;
+		int end = Math.min(skipCount + maxItems, size);
+
+		if(start > size)
+		{
+			ret = Collections.emptyList();
+		}
+		else
+		{
+			ret = list.subList(start, end);
+		}
+
+		return ret;
+	}
+
+	protected abstract TestFixture getTestFixture() throws Exception;
+
+	/**
+	 * @param createTestData The created instance can optionally create test data if required
+     */
+	protected abstract TestFixture getTestFixture(boolean createTestData) throws Exception;
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractTestFixture.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractTestFixture.java
new file mode 100644
index 00000000000..7c108d728d1
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractTestFixture.java
@@ -0,0 +1,281 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.TreeMap;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.web.util.JettyComponent;
+import org.alfresco.rest.api.tests.RepoService.SiteInformation;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.data.SiteRole;
+import org.springframework.context.ApplicationContext;
+
+public abstract class AbstractTestFixture implements TestFixture
+{
+	public static final int DEFAULT_NUM_MEMBERS_PER_SITE = 4;
+	
+	public static final String TEST_DOMAIN_PREFIX = "acme";
+
+    protected List<PersonInfo> people = new ArrayList<PersonInfo>(10);
+	protected TreeMap<String, TestNetwork> networks = new TreeMap<String, TestNetwork>();
+    protected TreeMap<String, SiteInformation> sites = new TreeMap<String, SiteInformation>();
+
+    private String[] configLocations;
+    private final String[] classLocations;
+    private int port = PORT;
+    private String contextPath = CONTEXT_PATH;
+    private String servletName = PUBLIC_API_SERVLET_NAME;
+
+    protected JettyComponent jetty;
+    protected boolean cleanup;
+    protected Random random = new Random();
+    protected RepoService repoService;
+    protected RetryingTransactionHelper transactionHelper;
+    protected int numMembersPerSite;
+    protected ApplicationContext applicationContext;
+
+	public ApplicationContext getApplicationContext()
+	{
+		return applicationContext;
+	}
+
+	protected AbstractTestFixture(String[] configLocations, String[] classLocations, int port, String contextPath, String servletName,
+			int numMembersPerSite, boolean cleanup)
+	{
+		this.configLocations = configLocations;
+		this.classLocations = classLocations;
+		this.port = port;
+		this.contextPath = contextPath;
+		this.servletName = servletName;
+		this.numMembersPerSite = numMembersPerSite;
+		this.cleanup = cleanup;
+	}
+	
+	public JettyComponent getJettyComponent()
+	{
+		return jetty;
+	}
+	
+	public int getPort()
+	{
+		return port;
+	}
+
+	public String getContextPath()
+	{
+		return contextPath;
+	}
+
+	public String getServletName()
+	{
+		return servletName;
+	}
+
+	public String[] getConfigLocations()
+	{
+		return configLocations;
+	}
+
+	public String[] getClassLocations()
+	{
+		return classLocations;
+	}
+
+	protected abstract JettyComponent makeJettyComponent();
+	protected abstract void populateTestData();
+	protected abstract RepoService makeRepoService() throws Exception;
+
+	public void setup() throws Exception
+	{
+		setup(true);
+	}
+
+	public void setup(boolean createTestData) throws Exception
+	{
+		this.jetty = makeJettyComponent();
+		this.jetty.start();
+		this.applicationContext = jetty.getApplicationContext();
+    	this.repoService = makeRepoService();
+		this.transactionHelper = (RetryingTransactionHelper)repoService.getApplicationContext().getBean("retryingTransactionHelper");
+
+		if (createTestData)
+		{
+			populateTestData();
+			createTestData();
+		}
+	}
+	
+	public RepoService getRepoService()
+	{
+		return repoService;
+	}
+	
+	public TestNetwork getNetwork(String name)
+	{
+		return networks.get(name);
+	}
+
+	public Iterator<TestNetwork> getNetworksIt()
+	{
+		return networks.values().iterator();
+	}
+
+	public TreeMap<String, TestNetwork> getNetworks()
+    {
+    	return networks;
+    }
+	
+	public Iterator<TestNetwork> networksIterator()
+	{
+		return networks.values().iterator();
+	}
+
+    public TestNetwork getRandomNetwork()
+    {
+		if (networks.isEmpty())
+		{
+			populateTestData();
+			createTestData();
+		}
+    	int r = random.nextInt(networks.size());
+    	List<TestNetwork> a = new ArrayList<TestNetwork>();
+    	a.addAll(networks.values());
+    	return a.get(r);
+    }
+
+	protected void addNetwork(TestNetwork network)
+	{
+		networks.put(network.getId(), network);
+	}
+	
+	public void addPerson(PersonInfo personInfo)
+	{
+		people.add(personInfo);
+	}
+	
+	public void addSite(SiteInformation siteInfo)
+	{
+		sites.put(siteInfo.getShortName(), siteInfo);
+	}
+    
+	public TreeMap<String, SiteInformation> getSites()
+    {
+    	return sites;
+    }
+
+    public void createTestData()
+    {
+		for(final TestNetwork testAccount : getNetworks().values())
+		{
+	        transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+            {
+            	@SuppressWarnings("synthetic-access")
+            	public Void execute() throws Throwable
+            	{
+        	        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+        	        testAccount.create();
+
+        			for(PersonInfo testPerson : people)
+        			{
+        				testAccount.createUser(testPerson);
+        			}
+
+        			return null;
+            	}
+            }, false, true);
+
+	        transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+            {
+            	@SuppressWarnings("synthetic-access")
+            	public Void execute() throws Throwable
+            	{
+					// clear fully authenticated user ("admin") - affects site creation (which uses this to setup perms)
+					AuthenticationUtil.clearCurrentSecurityContext();
+					
+					if(testAccount.getPersonIds().size() > 0)
+					{
+						// use a fixed sample size of account members (so we have some left over for tests)
+						List<String> people = testAccount.peopleSample(testAccount.getPersonIds().size());
+			
+						String tenantDomain = testAccount.getId();
+	
+						int i = 0;
+						for(final SiteInformation site : getSites().values())
+						{
+	    					final Iterator<String> peopleIterator = RepoService.getWrappingIterator(i++, people);
+	
+							final String siteCreator = peopleIterator.next();
+			        		assertNotNull(siteCreator);
+	
+			    			TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+							{
+								@Override
+								public Void doWork() throws Exception
+								{
+									final TestSite testSite = testAccount.createSite(site);
+	
+									// invite some members to the site, leave at least one non-site member
+									for(int j = 0; j < numMembersPerSite; j++)
+									{
+										String siteMember = peopleIterator.next();
+										assertNotNull(siteMember);
+										testSite.inviteToSite(siteMember, SiteRole.SiteContributor);
+									}
+			
+			    					return null;
+			        			}
+							}, siteCreator, tenantDomain);
+						}
+					}
+					
+					return null;
+            	}
+            }, false, true);
+		}
+    }
+
+    public void shutdown()
+    {
+    	if(cleanup)
+    	{
+    		repoService.shutdown();
+    	}
+
+    	this.jetty.shutdown();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/ActivitiesPostingTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/ActivitiesPostingTest.java
new file mode 100644
index 00000000000..34860cfb43a
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/ActivitiesPostingTest.java
@@ -0,0 +1,206 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import org.alfresco.repo.activities.ActivityType;
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.Activities;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.nodes.NodesEntityResource;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.data.Activity;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.Folder;
+import org.alfresco.rest.api.tests.client.data.Node;
+import org.alfresco.service.cmr.activities.ActivityPoster;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * V1 REST API test for posting Activities
+ * 
+ * Tests posting activities from the public api.
+ *
+ * @author gethin
+ */
+public class ActivitiesPostingTest extends AbstractSingleNetworkSiteTest
+{
+
+    /**
+     * Tests the main activites, added, updated, deleted, downloaded
+     */
+    @Test
+    public void testCreateUpdate() throws Exception
+    {
+        setRequestContext(user1);
+
+        List<Activity> activities = getMyActivities();
+        int beforeCount = activities.size();
+        
+        String folder1 = "folder" + System.currentTimeMillis() + "_1";
+        Folder createdFolder = createFolder(tDocLibNodeId, folder1, null);
+        assertNotNull(createdFolder);
+        String f1Id = createdFolder.getId();
+
+        String docName = "d1.txt";
+        Document documentResp = createEmptyTextFile(f1Id, docName);
+
+        //Update the file
+        Document dUpdate = new Document();
+        dUpdate.setName("d1b.txt");
+        put(URL_NODES, documentResp.getId(), toJsonAsStringNonNull(dUpdate), null, 200);
+
+        //Now download it
+        HttpResponse response = getSingle(NodesEntityResource.class, documentResp.getId()+"/content", null, 200);
+        String textContent = response.getResponse();
+        assertNotNull(textContent);
+
+        deleteNode(documentResp.getId());
+        deleteNode(createdFolder.getId());
+
+        activities = getMyActivities();
+        assertEquals(beforeCount+6, activities.size());
+        
+        Activity act = matchActivity(activities, ActivityType.FOLDER_ADDED, user1, tSiteId, tDocLibNodeId, folder1);
+        assertNotNull(act);
+
+        act = matchActivity(activities, ActivityType.FILE_ADDED, user1, tSiteId, createdFolder.getId(), docName);
+        assertNotNull(act);
+
+        act = matchActivity(activities, ActivityType.FILE_UPDATED, user1, tSiteId, createdFolder.getId(), dUpdate.getName());
+        assertNotNull(act);
+
+        act = matchActivity(activities, ActivityType.FOLDER_DELETED, user1, tSiteId, tDocLibNodeId, folder1);
+        assertNotNull(act);
+
+        act = matchActivity(activities, ActivityType.FILE_DELETED, user1, tSiteId, createdFolder.getId(), dUpdate.getName());
+        assertNotNull(act);
+
+        act = matchActivity(activities, ActivityPoster.DOWNLOADED, user1, tSiteId, createdFolder.getId(), dUpdate.getName());
+        assertNotNull(act);
+    }
+
+    /**
+     * Tests non-file activites. So no events.
+     */
+    @Test
+    public void testNonFileActivities() throws Exception
+    {
+        setRequestContext(user1);
+        
+        String folder1 = "InSitefolder" + System.currentTimeMillis() + "_1";
+        Folder createdFolder = createFolder(tDocLibNodeId, folder1, null);
+        assertNotNull(createdFolder);
+
+        List<Activity> activities = getMyActivities();
+
+        Node aNode = createNode(createdFolder.getId(), "mynode", "cm:failedThumbnail", null);
+        assertNotNull(aNode);
+
+        deleteNode(aNode.getId());
+
+        List<Activity> activitiesAgain = getMyActivities();
+        assertEquals("No activites should be created for non-file activities", activities, activitiesAgain);
+    }
+
+    /**
+     * Tests non-site file activites. So no events.
+     */
+    @Test
+    public void testNonSite() throws Exception
+    {
+        setRequestContext(user1);
+        
+        List<Activity> activities = getMyActivities();
+        String folder1 = "nonSitefolder" + System.currentTimeMillis() + "_1";
+        
+        //Create a folder outside a site
+        Folder createdFolder = createFolder(Nodes.PATH_MY, folder1, null);
+        assertNotNull(createdFolder);
+        String f1Id = createdFolder.getId();
+
+        String docName = "nonsite_d1.txt";
+        Document documentResp = createEmptyTextFile(f1Id, docName);
+        assertNotNull(documentResp);
+
+        //Update the file
+        Document dUpdate = new Document();
+        dUpdate.setName("nonsite_d2.txt");
+        put(URL_NODES, documentResp.getId(), toJsonAsStringNonNull(dUpdate), null, 200);
+
+        List<Activity> activitiesAgain = getMyActivities();
+        assertEquals("No activites should be created for non-site nodes", activities, activitiesAgain);
+    }
+
+    /**
+     * Generate the feed an get the activities for user1
+     * @return
+     * @throws Exception
+     */
+    private List<Activity> getMyActivities() throws Exception
+    {
+        repoService.generateFeed();
+
+        setRequestContext(user1);
+        
+        Map<String, String> meParams = new HashMap<>();
+        meParams.put("who", String.valueOf(Activities.ActivityWho.me));
+        return publicApiClient.people().getActivities(user1, meParams).getList();
+    }
+
+
+    /**
+     * Match an exact activity by a combination of the parameters
+     * @param list
+     * @param type
+     * @param user
+     * @param siteId
+     * @param parentId
+     * @param title
+     * @return
+     */
+    private Activity matchActivity(List<Activity> list, String type, String user, String siteId, String parentId, String title)
+    {
+        for (Activity act:list)
+        {
+          if (type.equals(act.getActivityType())
+                  && user.equals(act.getPostPersonId())
+                  && siteId.equals(act.getSiteId())
+                  && parentId.equals(act.getSummary().get("parentObjectId"))
+                  && title.equals((act.getSummary().get("title"))))
+          {
+              return act;
+          }
+        }
+        return null;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/ApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/ApiTest.java
new file mode 100644
index 00000000000..5a2191b711c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/ApiTest.java
@@ -0,0 +1,92 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+
+import org.alfresco.rest.DeletedNodesTest;
+import org.alfresco.rest.api.search.BasicSearchApiIntegrationTest;
+import org.junit.AfterClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * Public V1 REST API tests
+ * 
+ * @author steveglover
+ * @author janv
+ * @author Jamal Kaabi-Mofrad
+ * @author Gethin James
+ *
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        
+    NodeApiTest.class,
+    NodeAssociationsApiTest.class,
+    NodeVersionsApiTest.class,
+    BasicSearchApiIntegrationTest.class,
+    QueriesNodesApiTest.class,
+    QueriesPeopleApiTest.class,
+    QueriesSitesApiTest.class,
+    RenditionsTest.class,
+    SharedLinkApiTest.class,
+    ActivitiesPostingTest.class,
+    DeletedNodesTest.class,
+    AuthenticationsTest.class,
+    ModulePackagesApiTest.class,
+    WherePredicateApiTest.class,
+    DiscoveryApiTest.class,
+    TestSites.class,
+    TestNodeComments.class,
+    TestFavouriteSites.class,
+    TestSiteContainers.class,
+    TestNodeRatings.class,
+    TestUserPreferences.class,
+    TestTags.class,
+    TestNetworks.class,
+    TestActivities.class,
+    GroupsTest.class,
+    TestPeople.class,
+    TestSiteMembers.class,
+    TestSiteGroups.class,
+    TestPersonSites.class,
+    TestSiteMembershipRequests.class,
+    TestFavourites.class,
+    TestPublicApi128.class,
+    TestPublicApiCaching.class,
+    TestDownloads.class,
+    AuditAppTest.class,
+    TempOutputStreamTest.class,
+    BufferedResponseTest.class
+})
+public class ApiTest
+{
+    @AfterClass
+    public static void after() throws Exception
+    {
+//        EnterprisePublicApiTestFixture.cleanup();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/AuditAppTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/AuditAppTest.java
new file mode 100644
index 00000000000..630e32d44be
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/AuditAppTest.java
@@ -0,0 +1,948 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.net.URL;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.audit.model.AuditModelRegistryImpl;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.AuditApps;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.data.AuditApp;
+import org.alfresco.rest.api.tests.client.data.AuditEntry;
+import org.alfresco.rest.api.tests.client.data.Node;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.service.cmr.audit.AuditService;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.ISO8601DateFormat;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.util.ResourceUtils;
+
+/**
+ * @author anechifor, aforascu, eknizat, janv
+ */
+public class AuditAppTest extends AbstractSingleNetworkSiteTest 
+{
+    protected PermissionService permissionService;
+    protected AuthorityService authorityService;
+    protected AuditService auditService;
+    protected static String AUDIT_APP_ID = "alfresco-access";
+
+    @Before
+    public void setup() throws Exception 
+    {
+        super.setup();
+
+        permissionService = applicationContext.getBean("permissionService", PermissionService.class);
+        authorityService = (AuthorityService) applicationContext.getBean("AuthorityService");
+        auditService = applicationContext.getBean("AuditService", AuditService.class);
+
+        AuditModelRegistryImpl auditModelRegistry = (AuditModelRegistryImpl) applicationContext.getBean("auditModel.modelRegistry");
+
+        // Register the test model
+        URL testModelUrl = ResourceUtils.getURL("classpath:alfresco/audit/alfresco-audit-access.xml");
+        auditModelRegistry.registerModel(testModelUrl);
+        auditModelRegistry.loadAuditModels();
+    }
+
+    @After
+    public void tearDown() throws Exception 
+    {
+        super.tearDown();
+    }
+
+    @Test
+    public void testGetAuditApps() throws Exception 
+    {
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        testGetAuditAppsSkipPaging();
+    }
+
+    @Test
+    public void testGetAuditApp() throws Exception 
+    {
+        final AuditApps auditAppsProxy = publicApiClient.auditApps();
+
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        String appId = getFirstAuditAppId();
+
+        // Enable system audit
+        AuthenticationUtil.setFullyAuthenticatedUser(networkAdmin);
+        enableSystemAudit();
+
+        // Negative tests
+        // Check with invalid audit application id.
+        {
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+            auditAppsProxy.getAuditApp("invalidAuditId", HttpServletResponse.SC_NOT_FOUND);
+        }
+
+        // Check that non-admin user doesn't have access to audit applications
+        {
+            setRequestContext(networkOne.getId(), user1, null);
+            auditAppsProxy.getAuditApp("randomAuditId", HttpServletResponse.SC_FORBIDDEN);
+        }
+
+        // Check that response code 501 is received when system audit is
+        // disabled
+        {
+            // Get an enabled audit application
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+            // Disable system audit
+            AuthenticationUtil.setFullyAuthenticatedUser(networkAdmin);
+            disableSystemAudit();
+
+            // Check response code
+            auditAppsProxy.getAuditApp(appId, HttpServletResponse.SC_NOT_IMPLEMENTED);
+
+            // Re-enable system audit
+            enableSystemAudit();
+        }
+
+        // Positive tests
+        // Get audit application information
+        {
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+            AuditApp auditApp = auditAppsProxy.getAuditApp(appId);
+            validateAuditApplicationFields(auditApp);
+        }
+
+        {
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+            AuditApp auditApp = auditAppsProxy.getAuditApp("alfresco-access");
+            HashMap <String, String> params = new HashMap<>();
+
+            // Get only minimum record id
+            params.put("include", "min");
+            auditApp = auditAppsProxy.getAuditApp(auditApp.getId(), params, HttpServletResponse.SC_OK);
+            validateAuditApplicationFields(auditApp, params);
+
+            // Get minimum and maximum record id
+            params.put("include", "max,min");
+            auditApp = auditAppsProxy.getAuditApp(auditApp.getId(), params, HttpServletResponse.SC_OK);
+            validateAuditApplicationFields(auditApp, params);
+
+            // Get with invalid include parameters
+            params.put("include", "test,test1,test2");
+            auditApp = auditAppsProxy.getAuditApp(auditApp.getId(), params, HttpServletResponse.SC_OK);
+            validateAuditApplicationFields(auditApp, params);
+
+            // Get with duplicate params
+            params.put("include", "max,max");
+            auditApp = auditAppsProxy.getAuditApp(auditApp.getId(), params, HttpServletResponse.SC_OK);
+            validateAuditApplicationFields(auditApp, params);
+        }
+    }
+
+    private void testGetAuditAppsSkipPaging() throws Exception 
+    {
+        // +ve: check skip count.
+        {
+            // Paging and list auditApp
+
+            int skipCount = 0;
+            int maxItems = 4;
+            Paging paging = getPaging(skipCount, maxItems);
+
+            ListResponse<AuditApp> resp = getAuditApps(paging);
+
+            // Paging and list groups with skip count.
+
+            skipCount = 2;
+            maxItems = 2;
+            paging = getPaging(skipCount, maxItems);
+
+            ListResponse<AuditApp> sublistResponse = getAuditApps(paging);
+
+            List<AuditApp> expectedSublist = sublist(resp.getList(), skipCount, maxItems);
+            checkList(expectedSublist, sublistResponse.getPaging(), sublistResponse);
+        }
+
+        // -ve: check skip count.
+        {
+            getAuditApps(getPaging(-1, null), "", HttpServletResponse.SC_BAD_REQUEST);
+        }
+
+    }
+
+    private ListResponse<AuditApp> getAuditApps(final PublicApiClient.Paging paging, String errorMessage,
+            int expectedStatus) throws Exception 
+    {
+        final AuditApps auditAppsProxy = publicApiClient.auditApps();
+        return auditAppsProxy.getAuditApps(createParams(paging), errorMessage, expectedStatus);
+    }
+
+    private ListResponse<AuditApp> getAuditApps(final PublicApiClient.Paging paging) throws Exception 
+    {
+        return getAuditApps(paging, "Failed to get audit applications", HttpServletResponse.SC_OK);
+    }
+
+    protected Map<String, String> createParams(Paging paging) 
+    {
+        Map<String, String> params = new HashMap<String, String>(2);
+        if (paging != null) 
+        {
+            if (paging.getSkipCount() != null) 
+            {
+                params.put("skipCount", String.valueOf(paging.getSkipCount()));
+            }
+            if (paging.getMaxItems() != null) 
+            {
+                params.put("maxItems", String.valueOf(paging.getMaxItems()));
+            }
+        }
+
+        return params;
+    }
+
+    private void validateAuditApplicationFields(AuditApp auditApp) 
+    {
+        assertNotNull(auditApp);
+        assertNotNull(auditApp.getId());
+        assertNotNull(auditApp.getName());
+        assertNotNull(auditApp.getIsEnabled());
+        assertFalse(auditApp.getId().isEmpty());
+        assertFalse(auditApp.getName().isEmpty());
+        assertTrue(auditApp.getIsEnabled());
+    }
+
+    private void validateAuditApplicationFields(AuditApp auditApp, HashMap<String, String> params)
+    {
+        validateAuditApplicationFields(auditApp);
+
+        if (params.get("include").contains("max"))
+        {
+            assertNotNull(auditApp.getMaxEntryId());
+        }
+
+        if (params.get("include").contains("min"))
+        {
+            assertNotNull(auditApp.getMinEntryId());
+        }
+    }
+
+    private void validateAuditEntryFields(AuditEntry auditEntry, AuditApp auditApp) 
+    {
+        String auditAppid = auditApp.getId();
+
+        assertNotNull(auditEntry);
+        assertNotNull(auditEntry.getId());
+        assertNotNull(auditEntry.getAuditApplicationId());
+        assertNotNull(auditEntry.getCreatedAt());
+        assertNotNull(auditEntry.getCreatedByUser());
+        assertFalse(auditEntry.getId().toString().isEmpty());
+        assertFalse(auditEntry.getAuditApplicationId().isEmpty());
+
+        if (auditApp.getId().equals(AUDIT_APP_ID)) 
+        {
+            assertTrue(auditEntry.getAuditApplicationId().toString().equals(auditAppid));
+        }
+    }
+
+    private String getFirstAuditAppId() throws PublicApiException 
+    {
+        // Get one of the audit app ids ( fail test if there are no audit apps
+        // in the system )
+        ListResponse<AuditApp> apps = publicApiClient.auditApps().getAuditApps(null, "Getting audit apps error ",
+                HttpServletResponse.SC_OK);
+        if (apps.getList().size() == 0) 
+        {
+            fail("There are no audit applications to run this test against.");
+        }
+        return apps.getList().get(0).getId();
+    }
+
+    @Test
+    public void testEnableDisableAuditApplication() throws Exception 
+    {
+        AuditApp requestAuditApp = new AuditApp();
+        AuditApp responseAuditApp = null;
+
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        String appId = getFirstAuditAppId();
+
+        // +ve
+        // Disable audit app
+        requestAuditApp.setIsEnabled(false);
+        responseAuditApp = publicApiClient.auditApps().updateAuditApp(appId, requestAuditApp, null,
+                HttpServletResponse.SC_OK);
+        assertFalse("Wrong response for request to disable audit app.", responseAuditApp.getIsEnabled());
+        assertFalse("Disable audit app test failed.", publicApiClient.auditApps().getAuditApp(appId).getIsEnabled());
+
+        // Enable audit app
+        requestAuditApp.setIsEnabled(true);
+        responseAuditApp = publicApiClient.auditApps().updateAuditApp(appId, requestAuditApp, null,
+                HttpServletResponse.SC_OK);
+        assertTrue("Wrong response for request to enable audit app.", responseAuditApp.getIsEnabled());
+        assertTrue("Enable audit app test failed.", publicApiClient.auditApps().getAuditApp(appId).getIsEnabled());
+
+        // -ve
+        // 400
+        publicApiClient.auditApps().update("audit-applications", appId, null, null, "badBody", null,
+                "Was expecting error 400", HttpServletResponse.SC_BAD_REQUEST);
+        // 401
+        setRequestContext(networkOne.getId(), networkAdmin, "fakepswd");
+        publicApiClient.auditApps().updateAuditApp(appId, requestAuditApp, null, HttpServletResponse.SC_UNAUTHORIZED);
+        // 403
+        setRequestContext(networkOne.getId(), user1, null);
+        publicApiClient.auditApps().updateAuditApp(appId, requestAuditApp, null, HttpServletResponse.SC_FORBIDDEN);
+        // 404
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        publicApiClient.auditApps().updateAuditApp("fakeid", requestAuditApp, null, HttpServletResponse.SC_NOT_FOUND);
+        // 501
+        AuthenticationUtil.setFullyAuthenticatedUser(networkAdmin);
+        disableSystemAudit();
+        publicApiClient.auditApps().updateAuditApp(appId, requestAuditApp, null,
+                HttpServletResponse.SC_NOT_IMPLEMENTED);
+        enableSystemAudit();
+    }
+
+    protected void enableSystemAudit() 
+    {
+        boolean isEnabled = auditService.isAuditEnabled();
+        if (!isEnabled) 
+        {
+            auditService.setAuditEnabled(true);
+            isEnabled = auditService.isAuditEnabled();
+            if (!isEnabled) 
+            {
+                fail("Failed to enable system audit for testing");
+            }
+        }
+    }
+
+    protected void disableSystemAudit() 
+    {
+        boolean isEnabled = auditService.isAuditEnabled();
+        if (isEnabled) 
+        {
+            auditService.setAuditEnabled(false);
+            isEnabled = auditService.isAuditEnabled();
+            if (isEnabled) 
+            {
+                fail("Failed to disable system audit for testing");
+            }
+        }
+    }
+
+    @Test
+    public void testAuditEntries() throws Exception 
+    {
+        final AuditApps auditAppsProxy = publicApiClient.auditApps();
+
+        // Get and enable audit app
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        AuditApp auditApp = auditAppsProxy.getAuditApp("alfresco-access");
+
+        testGetAuditEntries(auditAppsProxy, auditApp);
+        testAuditEntriesSorting(auditAppsProxy, auditApp);
+        testAuditEntriesWhereDate(auditAppsProxy, auditApp);
+        testAuditEntriesWhereId(auditAppsProxy, auditApp);
+        testAuditEntriesWithInclude(auditAppsProxy, auditApp);
+        testAuditEntriesSkipCount(auditAppsProxy, auditApp);
+        testRetrieveAuditEntry(auditAppsProxy, auditApp);
+        testDeleteAuditEntry(auditAppsProxy, auditApp);
+        testDeleteAuditEntries(auditAppsProxy, auditApp);
+    }
+
+    private void testGetAuditEntries(AuditApps auditAppsProxy, AuditApp auditApp) throws Exception 
+    {
+        // Positive tests
+        ListResponse<AuditEntry> auditEntries = auditAppsProxy.getAuditAppEntries(auditApp.getId(), null,
+                HttpServletResponse.SC_OK);
+        for (AuditEntry ae : auditEntries.getList()) 
+        {
+            validateAuditEntryFields(ae, auditApp);
+        }
+
+        // Negative tests
+        // 401
+        setRequestContext(networkOne.getId(), networkAdmin, "wrongPassword");
+        auditAppsProxy.getAuditAppEntries(auditApp.getId(), null, HttpServletResponse.SC_UNAUTHORIZED);
+        // 403
+        setRequestContext(networkOne.getId(), user1, null);
+        auditAppsProxy.getAuditAppEntries(auditApp.getId(), null, HttpServletResponse.SC_FORBIDDEN);
+        // 404
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        auditAppsProxy.getAuditAppEntries("randomId", null, HttpServletResponse.SC_NOT_FOUND);
+        // 501
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        AuthenticationUtil.setFullyAuthenticatedUser(networkAdmin);
+        disableSystemAudit();
+        auditAppsProxy.getAuditAppEntries("randomId", null, HttpServletResponse.SC_NOT_IMPLEMENTED);
+        enableSystemAudit();
+    }
+
+    private void testAuditEntriesSorting(AuditApps auditAppsProxy, AuditApp auditApp) throws Exception 
+    {
+        // paging
+        Paging paging = getPaging(0, 10);
+        Map<String, String> otherParams = new HashMap<>();
+
+        // Default order.
+        addOrderBy(otherParams, org.alfresco.rest.api.Audit.CREATED_AT, null);
+        ListResponse<AuditEntry> auditEntries = auditAppsProxy.getAuditAppEntries(auditApp.getId(),
+                createParams(paging, otherParams), HttpServletResponse.SC_OK);
+        assertNotNull(auditEntries);
+        assertTrue("audit entry size more that 2", auditEntries.getList().size() > 1);
+        assertTrue("auditEntries order not valid",
+                auditEntries.getList().get(0).getCreatedAt().before(auditEntries.getList().get(1).getCreatedAt()));
+
+    }
+
+    private void testAuditEntriesWhereDate(AuditApps auditAppsProxy, AuditApp auditApp) throws Exception 
+    {
+        // paging
+        Paging paging = getPaging(0, 10);
+
+        Date dateBefore = new Date();
+
+        String dateBeforeWhere = ISO8601DateFormat.format(dateBefore);
+
+        createUser("usern-" + RUNID, "userNPassword", networkOne);
+
+        login("usern-" + RUNID, "userNPassword");
+
+        Date dateAfter = new Date();
+
+        String dateAfterWhere = ISO8601DateFormat.format(dateAfter);
+
+        Map<String, String> otherParams = new HashMap<>();
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.CREATED_AT + " between (" + "\'" + dateBeforeWhere + "\'" + ", " + "\'"
+                + dateAfterWhere + "\'" + "))");
+
+        ListResponse<AuditEntry> auditEntries = auditAppsProxy.getAuditAppEntries(auditApp.getId(), createParams(paging, otherParams),
+                HttpServletResponse.SC_OK);
+        assertNotNull(auditEntries);
+        assertTrue(auditEntries.getList().size() > 0);
+
+        for (AuditEntry ae : auditEntries.getList())
+        {
+            validateAuditEntryFields(ae, auditApp);
+        }
+
+        //
+        // note: sanity test parsing of a few ISO8601 formats (non-exhaustive) - eg. +01:00, +0000, Z
+        //
+
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.CREATED_AT + " between ("
+                + "\'2016-06-02T12:13:51.593+01:00\'" + ", " + "\'2017-06-04T10:05:16.536+01:00\'" + "))");
+        auditAppsProxy.getAuditAppEntries(auditApp.getId(), createParams(paging, otherParams), HttpServletResponse.SC_OK);
+
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.CREATED_AT + " between ("
+                + "\'2016-06-02T11:13:51.593+0000\'" + ", " + "\'2017-06-04T09:05:16.536+0000\'" + "))");
+        auditAppsProxy.getAuditAppEntries(auditApp.getId(), createParams(paging, otherParams), HttpServletResponse.SC_OK);
+
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.CREATED_AT + " between ("
+                + "\'2016-06-02T11:13:51.593Z\'" + ", " + "\'2017-06-04T09:05:16.536Z\'" + "))");
+        auditAppsProxy.getAuditAppEntries(auditApp.getId(), createParams(paging, otherParams), HttpServletResponse.SC_OK);
+
+        // Negative tests
+        otherParams = new HashMap<>();
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.CREATED_AT + " between ("
+                + "\'2017-06-04T10:05:16.536+01:00\'" + ", " + "\'2016-06-02T12:13:51.593+01:00\'" + "))");
+        auditAppsProxy.getAuditAppEntries(auditApp.getId(), createParams(paging, otherParams), HttpServletResponse.SC_BAD_REQUEST);
+    }
+
+    private void testAuditEntriesWhereId(AuditApps auditAppsProxy, AuditApp auditApp) throws Exception 
+    {
+        // paging
+        Paging paging = getPaging(0, 10);
+
+        // where params
+        Map<String, String> otherParams = new HashMap<>();
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.ID + " between (" + "\'1\' , \'10\'" + "))");
+
+        ListResponse<AuditEntry> auditEntries = auditAppsProxy.getAuditAppEntries(auditApp.getId(),
+                createParams(paging, otherParams), HttpServletResponse.SC_OK);
+        assertNotNull(auditEntries);
+
+        // Negative tests
+        otherParams = new HashMap<>();
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.CREATED_AT + " between between (" + "\'10\' , \'1\'" + "))");
+        auditAppsProxy.getAuditAppEntries(auditApp.getId(), createParams(paging, otherParams), HttpServletResponse.SC_BAD_REQUEST);
+    }
+
+    private void testAuditEntriesWithInclude(AuditApps auditAppsProxy, AuditApp auditApp) throws Exception 
+    {
+        Paging paging = getPaging(0, 10);
+        Map<String, String> otherParams = new HashMap<>();
+        ListResponse<AuditEntry> auditEntriesWithoutValues = auditAppsProxy.getAuditAppEntries(auditApp.getId(), createParams(paging, otherParams),
+                HttpServletResponse.SC_OK);
+        assertNotNull(auditEntriesWithoutValues);
+
+        for (AuditEntry ae : auditEntriesWithoutValues.getList())
+        {
+            validateAuditEntryFields(ae, auditApp);
+            assertNull(ae.getValues());
+        }
+
+        otherParams.put("include", org.alfresco.rest.api.Audit.PARAM_INCLUDE_VALUES);
+        // list auditEntries with values
+        ListResponse<AuditEntry> auditEntriesWithValues = auditAppsProxy.getAuditAppEntries(auditApp.getId(), createParams(paging, otherParams),
+                HttpServletResponse.SC_OK);
+        assertNotNull(auditEntriesWithValues);
+
+        for (AuditEntry ae : auditEntriesWithValues.getList())
+        {
+            validateAuditEntryFields(ae, auditApp);
+            assertNotNull(ae.getValues());
+            assertTrue("audit values not empty", ae.getValues().keySet().size() > 0);
+        }
+
+    }
+
+    private void testAuditEntriesSkipCount(AuditApps auditAppsProxy, AuditApp auditApp) throws Exception 
+    {
+        int skipCount = 0;
+        int maxItems = 4;
+        Paging paging = getPaging(skipCount, maxItems);
+
+        Map<String, String> otherParams = new HashMap<>();
+        ListResponse<AuditEntry> resp = auditAppsProxy.getAuditAppEntries(auditApp.getId(),
+                createParams(paging, otherParams), HttpServletResponse.SC_OK);
+
+        // Paging and list groups with skip count.
+        skipCount = 2;
+        maxItems = 2;
+        paging = getPaging(skipCount, maxItems);
+
+        ListResponse<AuditEntry> sublistResponse = auditAppsProxy.getAuditAppEntries(auditApp.getId(),
+                createParams(paging, otherParams), HttpServletResponse.SC_OK);
+        List<AuditEntry> expectedSublist = sublist(resp.getList(), skipCount, maxItems);
+        checkList(expectedSublist, sublistResponse.getPaging(), sublistResponse);
+    }
+
+    private void testRetrieveAuditEntry(AuditApps auditAppsProxy, AuditApp auditApp) throws Exception
+    {
+        int skipCount = 0;
+        int maxItems = 4;
+        Paging paging = getPaging(skipCount, maxItems);
+
+        Map<String, String> otherParams = new HashMap<>();
+        ListResponse<AuditEntry> resp = auditAppsProxy.getAuditAppEntries(auditApp.getId(),
+                createParams(paging, otherParams), HttpServletResponse.SC_OK);
+        String id = resp.getList().get(0).getId().toString();
+
+        //Positive tests
+        //200
+        AuditEntry entryResp = auditAppsProxy.getAuditEntry(auditApp.getId(), id, null, HttpServletResponse.SC_OK);
+        validateAuditEntryFields(entryResp, auditApp);
+        assertNotNull(entryResp.getValues());
+
+        // Negative tests
+        // 400
+        auditAppsProxy.getAuditEntry(auditApp.getId(), id+"invalidIdText", null, HttpServletResponse.SC_BAD_REQUEST);
+        // 401
+        setRequestContext(networkOne.getId(), networkAdmin, "wrongPassword");
+        auditAppsProxy.getAuditEntry(auditApp.getId(), id, null, HttpServletResponse.SC_UNAUTHORIZED);
+        // 403
+        setRequestContext(networkOne.getId(), user1, null);
+        auditAppsProxy.getAuditEntry(auditApp.getId(), id, null, HttpServletResponse.SC_FORBIDDEN);
+        // 404
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        auditAppsProxy.getAuditEntry(auditApp.getId(), "" + Math.abs(new Random().nextLong()), null, HttpServletResponse.SC_NOT_FOUND);
+        // 501
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        AuthenticationUtil.setFullyAuthenticatedUser(networkAdmin);
+        disableSystemAudit();
+        auditAppsProxy.getAuditEntry(auditApp.getId(), id, null, HttpServletResponse.SC_NOT_IMPLEMENTED);
+        enableSystemAudit();
+    }
+
+    private void testDeleteAuditEntry(AuditApps auditAppsProxy, AuditApp auditApp) throws Exception
+    {
+        int skipCount = 0;
+        int maxItems = 4;
+        Paging paging = getPaging(skipCount, maxItems);
+
+        Map<String, String> otherParams = new HashMap<>();
+        ListResponse<AuditEntry> resp = auditAppsProxy.getAuditAppEntries(auditApp.getId(),
+                createParams(paging, otherParams), HttpServletResponse.SC_OK);
+        String id = resp.getList().get(0).getId().toString();
+
+        // Negative tests
+        // 400
+        auditAppsProxy.getAuditEntry(auditApp.getId(), id+"invalidIdText", null, HttpServletResponse.SC_BAD_REQUEST);
+        // 401
+        setRequestContext(networkOne.getId(), networkAdmin, "wrongPassword");
+        auditAppsProxy.deleteAuditEntry(auditApp.getId(), id, null, HttpServletResponse.SC_UNAUTHORIZED);
+        // 403
+        setRequestContext(networkOne.getId(), user1, null);
+        auditAppsProxy.deleteAuditEntry(auditApp.getId(), id, null, HttpServletResponse.SC_FORBIDDEN);
+        // 404
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        auditAppsProxy.deleteAuditEntry(auditApp.getId(), "" + Math.abs(new Random().nextLong()), null, HttpServletResponse.SC_NOT_FOUND);
+        // 501
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        AuthenticationUtil.setFullyAuthenticatedUser(networkAdmin);
+        disableSystemAudit();
+        auditAppsProxy.deleteAuditEntry(auditApp.getId(), id, null, HttpServletResponse.SC_NOT_IMPLEMENTED);
+        enableSystemAudit();
+
+        //Positive tests
+        //204
+        auditAppsProxy.deleteAuditEntry(auditApp.getId(), id, null, HttpServletResponse.SC_NO_CONTENT);
+    }
+
+    private void testDeleteAuditEntries(AuditApps auditAppsProxy, AuditApp auditApp) throws Exception
+    {
+        int skipCount = 0;
+        int maxItems = 4;
+        Paging paging = getPaging(skipCount, maxItems);
+
+        Map<String, String> otherParams = new HashMap<>();
+        ListResponse<AuditEntry> resp = auditAppsProxy.getAuditAppEntries(auditApp.getId(), createParams(paging, otherParams),
+                HttpServletResponse.SC_OK);
+        String dateBefore = ISO8601DateFormat.format(resp.getList().get(0).getCreatedAt());
+        String dateAfter = ISO8601DateFormat.format(resp.getList().get(2).getCreatedAt());
+        Long secondDeleteEntryId = resp.getList().get(1).getId();
+        Long lastDeleteEntryId = resp.getList().get(2).getId();
+
+        // Negative tests
+        // 400 - switched dates and consecutive switched IDs
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.CREATED_AT + " between (" + "\'" + dateAfter + "\'" + ", " + "\'"
+                + dateBefore + "\'" + "))");
+        auditAppsProxy.deleteAuditEntries(auditApp.getId(), otherParams, HttpServletResponse.SC_BAD_REQUEST);
+
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.ID + " between (" + "\'" + lastDeleteEntryId + "\'" + ", " + "\'"
+                + secondDeleteEntryId + "\'" + "))");
+        auditAppsProxy.deleteAuditEntries(auditApp.getId(), otherParams, HttpServletResponse.SC_BAD_REQUEST);
+        // 401
+        // put correct dates back
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.CREATED_AT + " between (" + "\'" + dateBefore + "\'" + ", " + "\'"
+                + dateAfter + "\'" + "))");
+        setRequestContext(networkOne.getId(), networkAdmin, "wrongPassword");
+        auditAppsProxy.deleteAuditEntries(auditApp.getId(), otherParams, HttpServletResponse.SC_UNAUTHORIZED);
+        // 403
+        setRequestContext(networkOne.getId(), user1, null);
+        auditAppsProxy.deleteAuditEntries(auditApp.getId(), otherParams, HttpServletResponse.SC_FORBIDDEN);
+        // 404
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        auditAppsProxy.deleteAuditEntries("invalidAppId", otherParams, HttpServletResponse.SC_NOT_FOUND);
+        // 501
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        AuthenticationUtil.setFullyAuthenticatedUser(networkAdmin);
+        disableSystemAudit();
+        auditAppsProxy.deleteAuditEntries(auditApp.getId(), otherParams, HttpServletResponse.SC_NOT_IMPLEMENTED);;
+        enableSystemAudit();
+
+        // Positive tests
+        // 200
+        auditAppsProxy.deleteAuditEntries(auditApp.getId(), otherParams, HttpServletResponse.SC_NO_CONTENT);
+
+        // check that the entries were deleted.
+        // firstEntry should have id > than lastDeleteEntryId
+        resp = auditAppsProxy.getAuditAppEntries(auditApp.getId(), createParams(paging, new HashMap<>()),
+                HttpServletResponse.SC_OK);
+        assertTrue("Entries were not deleted", resp.getList().get(0).getId() > lastDeleteEntryId);
+    }
+
+    /**
+     * Perform a login attempt (to be used to create audit entries)
+     */
+    private void login(final String username, final String password) throws Exception 
+    {
+        // Force a failed login
+        RunAsWork<Void> failureWork = new RunAsWork<Void>() 
+        {
+            @Override
+            public Void doWork() throws Exception 
+            {
+                try 
+                {
+                    authenticationService.authenticate(username, password.toCharArray());
+                    fail("Failed to force authentication failure");
+                } 
+                catch (AuthenticationException e) 
+                {
+                    // Expected
+                }
+                return null;
+            }
+        };
+        AuthenticationUtil.runAs(failureWork, AuthenticationUtil.getSystemUserName());
+    }
+
+    protected Map<String, String> createParams(Paging paging, Map<String, String> otherParams) 
+    {
+        Map<String, String> params = new HashMap<String, String>(2);
+        if (paging != null) 
+        {
+            if (paging.getSkipCount() != null) 
+            {
+                params.put("skipCount", String.valueOf(paging.getSkipCount()));
+            }
+            if (paging.getMaxItems() != null) 
+            {
+                params.put("maxItems", String.valueOf(paging.getMaxItems()));
+            }
+        }
+        if (otherParams != null) 
+        {
+            params.putAll(otherParams);
+        }
+        return params;
+    }
+
+    private void addOrderBy(Map<String, String> otherParams, String sortColumn, Boolean asc) 
+    {
+        otherParams.put("orderBy",
+                sortColumn + (asc != null ? " " + (asc ? SortColumn.ASCENDING : SortColumn.DESCENDING) : ""));
+    }
+
+    private String createFolderInPrivateSite(String siteTitle, String folderName) throws Exception
+    {
+        String siteId = createSite(siteTitle, SiteVisibility.PRIVATE).getId();
+        String siteDocLibNodeId = getSiteContainerNodeId(siteId, "documentLibrary");
+        return createFolder(siteDocLibNodeId, folderName).getId();
+    }
+    
+    private void renameNode(String nodeId, String newName) throws Exception
+    {
+        Node nUpdate = new Node();
+        nUpdate.setName(newName);
+        put(URL_NODES, nodeId, toJsonAsStringNonNull(nUpdate), null, 200);
+    }
+
+    @Test
+    public void testAuditEntriesByNodeId() throws Exception
+    {
+        final AuditApps auditAppsProxy = publicApiClient.auditApps();
+
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        String adminNodeId = createFolderInPrivateSite("testSiteAdmin" + RUNID, "testFolderAdmin" + RUNID);
+
+        // requires admin
+        AuditApp alfAccessAuditApp = auditAppsProxy.getAuditApp(AUDIT_APP_ID);
+
+        setRequestContext(user1);
+        String nodeId = createFolderInPrivateSite("testSiteUser" + RUNID, "testFolderUser1" + RUNID);
+        renameNode(nodeId, "testFolderUser1" + RUNID + "b");
+
+        testGetAuditEntriesByNodeId(auditAppsProxy, nodeId, alfAccessAuditApp);
+        testAuditEntriesSortingByNodeId(auditAppsProxy, nodeId);
+        testAuditEntriesWhereDateByNodeId(auditAppsProxy, nodeId);
+        testAuditEntriesWithIncludeByNodeId(auditAppsProxy, nodeId, alfAccessAuditApp);
+        testAuditEntriesSkipCountByNodeId(auditAppsProxy, nodeId);
+
+        testAuditEntriesWhereUserByNodeId(auditAppsProxy, adminNodeId, alfAccessAuditApp);
+    }
+
+    private void testAuditEntriesSkipCountByNodeId(AuditApps auditAppsProxy, String nodeId) throws Exception
+    {
+        setRequestContext(user1);
+
+        int skipCount = 0;
+        int maxItems = 4;
+        final Paging paging = getPaging(skipCount, maxItems);
+        Map<String, String> params;
+
+        Map<String, String> otherParams = new HashMap<>();
+        params = createParams(paging, otherParams);
+        ListResponse<AuditEntry> resp = auditAppsProxy.getAuditAppEntriesByNodeRefId(nodeId, params, HttpServletResponse.SC_OK);
+
+        // Paging and list groups with skip count.
+        skipCount = 2;
+        maxItems = 2;
+        final Paging pagingSkip = getPaging(skipCount, maxItems);
+        params = createParams(pagingSkip, otherParams);
+        ListResponse<AuditEntry> sublistResponse = auditAppsProxy.getAuditAppEntriesByNodeRefId(nodeId, params, HttpServletResponse.SC_OK);
+
+        List<AuditEntry> expectedSublist = sublist(resp.getList(), skipCount, maxItems);
+        checkList(expectedSublist, sublistResponse.getPaging(), sublistResponse);
+    }
+
+    private void testAuditEntriesWithIncludeByNodeId(AuditApps auditAppsProxy, String nodeId, AuditApp alfAccessAuditApp) throws Exception
+    {
+        setRequestContext(user1);
+
+        Paging paging = getPaging(0, 10);
+        Map<String, String> otherParams = new HashMap<>();
+        Map<String, String> params = createParams(paging, otherParams);
+
+        ListResponse<AuditEntry> auditEntriesWithoutValues = auditAppsProxy.getAuditAppEntriesByNodeRefId(nodeId, params, HttpServletResponse.SC_OK);
+        assertNotNull(auditEntriesWithoutValues);
+        
+        for (AuditEntry ae : auditEntriesWithoutValues.getList())
+        {
+            validateAuditEntryFields(ae, alfAccessAuditApp);
+            assertNull(ae.getValues());
+        }
+
+        otherParams.put("include", org.alfresco.rest.api.Audit.PARAM_INCLUDE_VALUES);
+        params = createParams(paging, otherParams);
+        // list auditEntries with values
+        ListResponse<AuditEntry> auditEntriesWithValues = auditAppsProxy.getAuditAppEntriesByNodeRefId(nodeId, params, HttpServletResponse.SC_OK);
+        assertNotNull(auditEntriesWithValues);
+
+        for (AuditEntry ae : auditEntriesWithValues.getList())
+        {
+            validateAuditEntryFields(ae, alfAccessAuditApp);
+            assertNotNull(ae.getValues());
+            assertTrue("audit values not empty", ae.getValues().keySet().size() > 0);
+        }
+    }
+
+    private void testAuditEntriesWhereDateByNodeId(AuditApps auditAppsProxy, String nodeId) throws Exception
+    {
+        setRequestContext(user1);
+
+        // paging
+        Paging paging = getPaging(0, 10);
+        final Map<String, String> otherParams = new HashMap<>();
+        Map<String, String> params;
+
+        //
+        // note: sanity test parsing of a few ISO8601 formats (non-exhaustive) -
+        // eg. +01:00, +0000, Z
+        //
+
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.CREATED_AT + " between (" + "\'2016-06-02T12:13:51.593+01:00\'" + ", "
+                + "\'2017-06-04T10:05:16.536+01:00\'" + "))");
+        params = createParams(paging, otherParams);
+        auditAppsProxy.getAuditAppEntriesByNodeRefId(nodeId, params, HttpServletResponse.SC_OK);
+
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.CREATED_AT + " between (" + "\'2016-06-02T11:13:51.593+0000\'" + ", "
+                + "\'2017-06-04T09:05:16.536+0000\'" + "))");
+        params = createParams(paging, otherParams);
+        auditAppsProxy.getAuditAppEntriesByNodeRefId(nodeId, params, HttpServletResponse.SC_OK);
+
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.CREATED_AT + " between (" + "\'2016-06-02T11:13:51.593Z\'" + ", "
+                + "\'2017-06-04T09:05:16.536Z\'" + "))");
+        params = createParams(paging, otherParams);
+        auditAppsProxy.getAuditAppEntriesByNodeRefId(nodeId, params, HttpServletResponse.SC_OK);
+
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.CREATED_AT + " between (" + "\'2017-06-04T10:05:16.536+01:00\'" + ", "
+                + "\'2016-06-02T12:13:51.593+01:00\'" + "))");
+        params = createParams(paging, otherParams);
+        auditAppsProxy.getAuditAppEntriesByNodeRefId(nodeId, params, HttpServletResponse.SC_BAD_REQUEST);
+    }
+
+    private void testAuditEntriesWhereUserByNodeId(AuditApps auditAppsProxy, String nodeId, AuditApp alfAccessAuditApp) throws Exception
+    {
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+        Paging paging = getPaging(0, 10);
+        final Map<String, String> otherParams = new HashMap<>();
+        Map<String, String> params;
+        int countEntries;
+
+        // Get audit entries for node using 'CREATED_BY_USER' param with admin
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.CREATED_BY_USER + "=" + "'" + networkAdmin + "'" + ")");
+        params = createParams(paging, otherParams);
+        ListResponse<AuditEntry> auditEntries = auditAppsProxy.getAuditAppEntriesByNodeRefId(nodeId, params, HttpServletResponse.SC_OK);
+        countEntries = auditEntries.getList().size();
+
+        // Get audit entries for node using 'admin' user and '-me-' alias
+        otherParams.put("where", "(" + org.alfresco.rest.api.Audit.CREATED_BY_USER + "=" + "'" + "-me-" + "'" + ")");
+        params = createParams(paging, otherParams);
+        auditEntries = auditAppsProxy.getAuditAppEntriesByNodeRefId(nodeId, params, HttpServletResponse.SC_OK);
+
+        // Check the audit entries list from the second GET call
+        assertTrue("The number of entries should be the same in both GET calls", countEntries == auditEntries.getList().size());
+        assertNotNull(auditEntries);
+        for (AuditEntry ae : auditEntries.getList())
+        {
+            validateAuditEntryFields(ae, alfAccessAuditApp);
+        }
+    }
+
+    private void testGetAuditEntriesByNodeId(AuditApps auditAppsProxy, String nodeId, AuditApp alfAccessAuditApp) throws Exception
+    {
+        setRequestContext(user1);
+
+        ListResponse<AuditEntry> auditEntries = auditAppsProxy.getAuditAppEntriesByNodeRefId(nodeId, null, HttpServletResponse.SC_OK);
+        
+        for (AuditEntry ae : auditEntries.getList())
+        {
+            validateAuditEntryFields(ae, alfAccessAuditApp);
+        }
+
+        // Negative tests
+        // 401
+        setRequestContext(networkOne.getId(), networkAdmin, "wrongPassword");
+        auditAppsProxy.getAuditAppEntries(nodeId, null, HttpServletResponse.SC_UNAUTHORIZED);
+        // 403
+        setRequestContext(networkOne.getId(), user1, null);
+        auditAppsProxy.getAuditAppEntries(nodeId, null, HttpServletResponse.SC_FORBIDDEN);
+        // 404
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        auditAppsProxy.getAuditAppEntries("randomId", null, HttpServletResponse.SC_NOT_FOUND);
+        // 501
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+        AuthenticationUtil.setFullyAuthenticatedUser(networkAdmin);
+        disableSystemAudit();
+        auditAppsProxy.getAuditAppEntries("randomId", null, HttpServletResponse.SC_NOT_IMPLEMENTED);
+        enableSystemAudit();
+    }
+
+    private void testAuditEntriesSortingByNodeId(AuditApps auditAppsProxy, String nodeId) throws Exception
+    {
+        setRequestContext(user1);
+
+        // paging
+        Paging paging = getPaging(0, 10);
+        Map<String, String> otherParams = new HashMap<>();
+
+        // Default order.
+        addOrderBy(otherParams, org.alfresco.rest.api.Audit.CREATED_AT, null);
+        Map<String, String> params = createParams(paging, otherParams);
+
+        ListResponse<AuditEntry> auditEntries = auditAppsProxy.getAuditAppEntriesByNodeRefId(nodeId, params, HttpServletResponse.SC_OK);
+
+        assertNotNull(auditEntries);
+        assertTrue("audit entry size less than 2", auditEntries.getList().size() > 1);
+        assertTrue("auditEntries order not valid", auditEntries.getList().get(0).getCreatedAt().before(auditEntries.getList().get(1).getCreatedAt()));
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/AuthenticationsTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/AuthenticationsTest.java
new file mode 100644
index 00000000000..bee6884e4ae
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/AuthenticationsTest.java
@@ -0,0 +1,636 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
+import org.alfresco.repo.management.subsystems.DefaultChildApplicationContextManager;
+import org.alfresco.repo.security.authentication.external.DefaultRemoteUserMapper;
+import org.alfresco.repo.security.authentication.external.RemoteUserMapper;
+import org.alfresco.repo.security.authentication.identityservice.IdentityServiceRemoteUserMapper;
+import org.alfresco.repo.transaction.TransactionServiceImpl;
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.PublicApiAuthenticatorFactory;
+import org.alfresco.rest.api.impl.AuthenticationsImpl;
+import org.alfresco.rest.api.model.LoginTicket;
+import org.alfresco.rest.api.model.LoginTicketResponse;
+import org.alfresco.rest.api.sites.SiteEntityResource;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.Folder;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.GUID;
+import org.apache.commons.codec.binary.Base64;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * V1 REST API tests for authentication Tickets
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class AuthenticationsTest extends AbstractSingleNetworkSiteTest
+{
+    private static final String TICKETS_URL = "tickets";
+    private static final String TICKETS_API_NAME = "authentication";
+    private PublicApiAuthenticatorFactory authFactory;
+    private TransactionServiceImpl transactionService;
+
+    @Before
+    public void setUpAuthTest()
+    {
+        authFactory = (PublicApiAuthenticatorFactory) applicationContext.getBean("publicapi.authenticator");
+        transactionService = (TransactionServiceImpl) applicationContext.getBean("transactionService");
+    }
+
+    @Test
+    public void canDisableBasicAuthChallenge() throws Exception
+    {
+        authFactory.setUseBasicAuth(false);
+
+        // Expect to be challenged for an AlfTicket (REPO-2575)
+        testAuthChallenge("AlfTicket");
+    }
+
+    @Test
+    public void canEnableBasicAuthChallenge() throws Exception
+    {
+        authFactory.setUseBasicAuth(true);
+
+        // Expect to be challenged for Basic auth.
+        testAuthChallenge("Basic");
+    }
+
+    private void testAuthChallenge(String expectedScheme) throws Exception
+    {
+        // Unauthorized call
+        setRequestContext(null);
+
+        HttpResponse response = getAll(SiteEntityResource.class, getPaging(0, 100), null, 401);
+        String authenticateHeader = response.getHeaders().get("WWW-Authenticate");
+        assertNotNull("Expected an authentication challenge", authenticateHeader);
+        String authScheme = authenticateHeader.split(" ")[0]; // Other parts may contain, e.g. realm="..."
+        assertEquals(expectedScheme, authScheme);
+    }
+
+    /**
+     * Tests login (create ticket), logout (delete ticket), and validate (get ticket).
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/authentication/versions/1/tickets}
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/authentication/versions/1/tickets/-me-}
+     *
+     * <p>DELETE:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/authentication/versions/1/tickets/-me-}
+     */
+    @Test
+    public void testCreateValidateDeleteTicketAlfTicketParameter() throws Exception
+    {
+        Paging paging = getPaging(0, 100);
+
+        setRequestContext(null);
+
+        // Unauthorized call
+        getAll(SiteEntityResource.class, paging, null, 401);
+
+        /*
+         *  user1 login - via alf_ticket parameter
+         */
+
+        // User1 login request
+        LoginTicket loginRequest = new LoginTicket();
+        // Invalid login details
+        post(TICKETS_URL, RestApiUtil.toJsonAsString(loginRequest), null, null, TICKETS_API_NAME, 400);
+
+        loginRequest.setUserId(null);
+        loginRequest.setPassword("user1Password");
+        // Invalid login details
+        post(TICKETS_URL, RestApiUtil.toJsonAsString(loginRequest), null, null, TICKETS_API_NAME, 400);
+
+        loginRequest.setUserId(user1);
+        loginRequest.setPassword(null);
+        // Invalid login details
+        post(TICKETS_URL, RestApiUtil.toJsonAsString(loginRequest), null, null, TICKETS_API_NAME, 400);
+
+        loginRequest.setUserId(user1);
+        loginRequest.setPassword("user1Password");
+        // Authenticate and create a ticket
+        HttpResponse response = post(TICKETS_URL, RestApiUtil.toJsonAsString(loginRequest), null, null, TICKETS_API_NAME, 201);
+        LoginTicketResponse loginResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), LoginTicketResponse.class);
+        assertNotNull(loginResponse.getId());
+        assertNotNull(loginResponse.getUserId());
+
+        // Get list of sites by appending the alf_ticket to the URL
+        // e.g. .../alfresco/versions/1/sites/?alf_ticket=TICKET_57866258ea56c28491bb3e75d8355ebf6fbaaa23
+        Map<String, String> ticket = Collections.singletonMap("alf_ticket", loginResponse.getId());
+        getAll(SiteEntityResource.class, paging, ticket, 200);
+
+        // Unauthorized - Invalid ticket
+        getAll(SiteEntityResource.class, paging, Collections.singletonMap("alf_ticket", "TICKET_" + System.currentTimeMillis()), 401);
+
+        // Validate ticket - Invalid parameter. Only '-me-' is supported
+        getSingle(TICKETS_URL, loginResponse.getId(), ticket, null, TICKETS_API_NAME, 400);
+
+        // Validate ticket
+        response = getSingle(TICKETS_URL, People.DEFAULT_USER, ticket, null, TICKETS_API_NAME, 200);
+        LoginTicketResponse validatedTicket = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), LoginTicketResponse.class);
+        assertEquals(loginResponse.getId(), validatedTicket.getId());
+
+        // Validate ticket - Invalid parameter. Only '-me-' is supported
+        getSingle(TICKETS_URL, loginResponse.getId(), ticket, null, TICKETS_API_NAME, 400);
+
+        // Delete the ticket  - Logout
+        delete(TICKETS_URL, People.DEFAULT_USER, ticket, null, TICKETS_API_NAME, 204);
+
+        // Validate ticket - 401 as ticket has been invalidated so the API call is unauthorized
+        getSingle(TICKETS_URL, People.DEFAULT_USER, ticket, null, TICKETS_API_NAME, 401);
+
+        setRequestContext(user1);
+
+        // Check the ticket has been invalidated - the difference with the above is that the API call is authorized
+        response = getSingle(TICKETS_URL, People.DEFAULT_USER, ticket, null, TICKETS_API_NAME, 404);
+        PublicApiClient.ExpectedErrorResponse error = RestApiUtil.parseErrorResponse(response.getJsonResponse());
+        // Double check that we've retrieved a standard error response (REPO-1773)
+        assertEquals(404, error.getStatusCode());
+
+        // Ticket has already been invalidated
+        delete(TICKETS_URL, People.DEFAULT_USER, ticket, null, TICKETS_API_NAME, 404);
+
+        setRequestContext(null);
+
+        // Get list of site by appending the invalidated ticket
+        getAll(SiteEntityResource.class, paging, ticket, 401);
+    }
+
+    /**
+     * Tests login (create ticket), logout (delete ticket), and validate (get ticket).
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/authentication/versions/1/tickets}
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/authentication/versions/1/tickets/-me-}
+     *
+     * <p>DELETE:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/authentication/versions/1/tickets/-me-}
+     */
+    @Test
+    public void testCreateValidateDeleteTicketViaBasicAuthHeader() throws Exception
+    {
+        /*
+         *  user2 login - Via Authorization header
+         */
+        Paging paging = getPaging(0, 100);
+
+        setRequestContext(null);
+
+        // Unauthorized call
+        getAll(SiteEntityResource.class, paging, null, 401);
+
+        // login request
+        LoginTicket loginRequest = new LoginTicket();
+        // Invalid login details
+        post(TICKETS_URL, RestApiUtil.toJsonAsString(loginRequest), null, null, TICKETS_API_NAME, 400);
+
+        loginRequest.setUserId(null);
+        loginRequest.setPassword("user1Password");
+        // Invalid login details
+        post(TICKETS_URL, RestApiUtil.toJsonAsString(loginRequest), null, null, TICKETS_API_NAME, 400);
+
+        setRequestContext(user2);
+
+        // User2 create a folder within his home folder (-my-)
+        Folder folderResp = createFolder(Nodes.PATH_MY, "F2", null);
+        assertNotNull(folderResp.getId());
+
+        setRequestContext(null);
+
+        getAll(getNodeChildrenUrl(Nodes.PATH_MY), paging, 401);
+
+        // User2 login request
+        loginRequest = new LoginTicket();
+        loginRequest.setUserId(user2);
+        loginRequest.setPassword("wrongPassword");
+        // Authentication failed - wrong password
+        post(TICKETS_URL, RestApiUtil.toJsonAsString(loginRequest), null, null, TICKETS_API_NAME, 403);
+
+        loginRequest.setUserId(user1);
+        loginRequest.setPassword("user2Password");
+        // Authentication failed - userId/password mismatch
+        post(TICKETS_URL, RestApiUtil.toJsonAsString(loginRequest), null, null, TICKETS_API_NAME, 403);
+
+        // Set the correct details
+        loginRequest.setUserId(user2);
+        loginRequest.setPassword("user2Password");
+        // Authenticate and create a ticket
+        HttpResponse response = post(TICKETS_URL, RestApiUtil.toJsonAsString(loginRequest), null, null, TICKETS_API_NAME, 201);
+        LoginTicketResponse loginResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), LoginTicketResponse.class);
+        assertNotNull(loginResponse.getId());
+        assertNotNull(loginResponse.getUserId());
+
+        String encodedTicket = encodeB64(loginResponse.getId());
+        // Set the authorization (encoded ticket only) header rather than appending the ticket to the URL
+        Map<String, String> header = Collections.singletonMap("Authorization", "Basic " + encodedTicket);
+        // Get children of user2 home folder
+        response = getAll(getNodeChildrenUrl(Nodes.PATH_MY), paging, null, header, 200);
+        List<Document> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Document.class);
+        assertEquals(1, nodes.size());
+
+        // Validate ticket - Invalid parameter. Only '-me-' is supported
+        getSingle(TICKETS_URL, loginResponse.getId(), null, header, TICKETS_API_NAME, 400);
+
+        // Validate ticket - user2
+        response = getSingle(TICKETS_URL, People.DEFAULT_USER, null, header, TICKETS_API_NAME, 200);
+        LoginTicketResponse validatedTicket = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), LoginTicketResponse.class);
+        assertEquals(loginResponse.getId(), validatedTicket.getId());
+
+        // now use the "bearer" keyword with the alf-ticket  - should not succeed
+        header = Collections.singletonMap("Authorization", "bearer " + encodedTicket);
+        response = getSingle(TICKETS_URL, People.DEFAULT_USER, null, header, TICKETS_API_NAME, 401);
+
+        // now send some junk  - should not succeed
+        header = Collections.singletonMap("Authorization", "junk " + encodedTicket);
+        response = getSingle(TICKETS_URL, People.DEFAULT_USER, null, header, TICKETS_API_NAME, 401);
+
+        // Try list children for user2 again.
+        // Encode Alfresco predefined userId for ticket authentication, ROLE_TICKET, and the ticket
+        String encodedUserIdAndTicket = encodeB64("ROLE_TICKET:" + loginResponse.getId());
+        // Set the authorization (encoded userId:ticket) header rather than appending the ticket to the URL
+        header = Collections.singletonMap("Authorization", "Basic " + encodedUserIdAndTicket);
+        // Get children of user2 home folder
+        response = getAll(getNodeChildrenUrl(Nodes.PATH_MY), paging, null, header, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Document.class);
+        assertEquals(1, nodes.size());
+
+        // now use the "bearer" keyword with the alf-ticket  - should not succeed
+        encodedUserIdAndTicket = encodeB64("ROLE_TICKET:" + loginResponse.getId());
+        // Set the authorization (encoded userId:ticket) header rather than appending the ticket to the URL
+        header = Collections.singletonMap("Authorization", "bearer " + encodedUserIdAndTicket);
+        // Get children of user2 home folder
+        response = getAll(getNodeChildrenUrl(Nodes.PATH_MY), paging, null, header, 401);
+
+        // Try list children for user2 again - appending ticket
+        Map<String, String> ticket = Collections.singletonMap("alf_ticket", loginResponse.getId());
+        response = getAll(getNodeChildrenUrl(Nodes.PATH_MY), paging, ticket, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Document.class);
+        assertEquals(1, nodes.size());
+
+        setRequestContext(user2);
+
+        // Try to validate the ticket without supplying the Authorization header or the alf_ticket param
+        getSingle(TICKETS_URL, People.DEFAULT_USER, null, null, TICKETS_API_NAME, 400);
+
+        setRequestContext(null);
+
+        // Delete the ticket  - Invalid parameter. Only '-me-' is supported
+        header = Collections.singletonMap("Authorization", "Basic " + encodedUserIdAndTicket);
+        delete(TICKETS_URL, loginResponse.getId(), null, header, TICKETS_API_NAME, 400);
+
+        // Delete the ticket  - Logout
+        delete(TICKETS_URL, People.DEFAULT_USER, null, header, TICKETS_API_NAME, 204);
+
+        // Get children of user2 home folder - invalidated ticket
+        getAll(getNodeChildrenUrl(Nodes.PATH_MY), paging, null, header, 401);
+    }
+
+    @Test
+    public void testGetTicketViaBearerAuthHeaderWithExternalAuthentication() throws Exception
+    {
+        RemoteUserMapper originalRemoteUserMapper = (RemoteUserMapper) applicationContext.getBean("RemoteUserMapper");
+        try
+        {
+            checkGetTicketViaBearerAuthHeader(false);
+        }
+        finally
+        {
+            //reset authentication chain
+            resetAuthentication(originalRemoteUserMapper);
+        }
+    }
+
+    @Test
+    public void testGetTicketViaBearerAuthHeaderWithAlfrescoIdentityService() throws Exception
+    {
+        RemoteUserMapper originalRemoteUserMapper = (RemoteUserMapper) applicationContext.getBean("RemoteUserMapper");
+        try
+        {
+            checkGetTicketViaBearerAuthHeader(true);
+        }
+        finally
+        {
+            //reset authentication chain
+            resetAuthentication(originalRemoteUserMapper);
+        }
+    }
+
+    // REPO-4168 / MNT-20308
+    @Test
+    public void testTicketLoginSystemReadOnly() throws Exception
+    {
+        QName veto = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "TestVeto");
+
+        try
+        {
+            // Set transactions to read-only
+            transactionService.setAllowWrite(false, veto);
+
+            // Set the login details
+            LoginTicket loginRequest = new LoginTicket();
+            loginRequest.setUserId(user1);
+            loginRequest.setPassword("user1Password");
+
+            // Authenticate and create a ticket
+            HttpResponse response = post(TICKETS_URL, RestApiUtil.toJsonAsString(loginRequest), null, null, TICKETS_API_NAME, 201);
+            LoginTicketResponse validatedTicket = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), LoginTicketResponse.class);
+            Map<String, String> ticket = Collections.singletonMap("alf_ticket", validatedTicket.getId());
+
+            // Delete the ticket - logout
+            delete(TICKETS_URL, People.DEFAULT_USER, ticket, null, TICKETS_API_NAME, 204);
+        }
+        finally
+        {
+            // Set transactions back to write allow write
+            transactionService.setAllowWrite(true, veto);
+        }
+    }
+
+    private void resetAuthentication(RemoteUserMapper originalRemoteUserMapper)
+    {
+        DefaultChildApplicationContextManager childApplicationContextManager = (DefaultChildApplicationContextManager) applicationContext
+            .getBean("Authentication");
+        PublicApiAuthenticatorFactory publicApiAuthenticatorFactory = (PublicApiAuthenticatorFactory) applicationContext
+            .getBean("publicapi.authenticator");
+        String chain = "alfrescoNtlm1:alfrescoNtlm";
+
+        childApplicationContextManager.stop();
+        childApplicationContextManager.setProperty("chain", chain);
+        ChildApplicationContextFactory childApplicationContextFactory = childApplicationContextManager
+            .getChildApplicationContextFactory("alfrescoNtlm1");
+        childApplicationContextFactory.stop();
+        childApplicationContextFactory.start();
+
+        publicApiAuthenticatorFactory = (PublicApiAuthenticatorFactory) applicationContext.getBean("publicapi.authenticator");
+        publicApiAuthenticatorFactory.setRemoteUserMapper(originalRemoteUserMapper);
+
+        AuthenticationsImpl authentications = (AuthenticationsImpl) applicationContext.getBean("authentications");
+        authentications.setRemoteUserMapper(originalRemoteUserMapper);
+    }
+
+    /**
+     * @param useIdentityService if not true we use "external" authentication in the chain,
+     *                           if it is true we use "identity-service"
+     */
+    private void checkGetTicketViaBearerAuthHeader(boolean useIdentityService) throws Exception
+    {
+        final String folderName = "F2_" + GUID.generate();
+        Paging paging = getPaging(0, 100);
+        LoginTicket loginRequest = null;
+        LoginTicketResponse validatedTicket = null;
+        HttpResponse response = null;
+        Map<String, String> header = new HashMap<>();
+
+        runPreCheckToEnsureBasicFunctionalityWorks(folderName, paging);
+
+        RemoteUserMapper remoteUserMapper = createRemoteUserMapperToUseForTheTest(useIdentityService);
+
+        setupAuthChainForTest(useIdentityService, remoteUserMapper);
+
+        if (!useIdentityService)
+        {
+            // these tests run by default with multi tenancy enabled
+            header.put("X-Alfresco-Remote-User", buildUserNameMultiTenancyAware());
+
+            response = getAll(getNodeChildrenUrl(Nodes.PATH_MY), paging, null, header, 200);
+            List<Document> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Document.class);
+            assertEquals(0, nodes.size()); // this is "someUserName" user home, and it should be empty
+        }
+
+        // check that without an Authorization header, we still can't get the ticket
+        getSingle(TICKETS_URL, People.DEFAULT_USER, null, header, TICKETS_API_NAME, 400);
+
+        Map<String, String> headersWtihBasicAuth = new HashMap<>(header);
+        headersWtihBasicAuth.put("Authorization", "basic " + encodeB64("someRandomString"));
+        // "someRandomString" will be considered the ticket, and that is not valid still
+        getSingle(TICKETS_URL, People.DEFAULT_USER, null, headersWtihBasicAuth, TICKETS_API_NAME, 404);
+        checkRemoteUserMapperWasCalled(useIdentityService);
+
+        reset(useIdentityService);
+        headersWtihBasicAuth = new HashMap<>(header);
+        headersWtihBasicAuth.put("Authorization", "basic " + encodeB64(user2 + ":user2password"));
+        // only "Ticket base authentication required." is accepted
+        getSingle(TICKETS_URL, People.DEFAULT_USER, null, headersWtihBasicAuth, TICKETS_API_NAME, 400);
+        checkRemoteUserMapperWasCalled(useIdentityService);
+
+        // now, for the big test. use "someOtherRandomString" as the ticket, because we override the IdentityServiceRemoteUserMapper in our test
+        reset(useIdentityService);
+        header.put("Authorization", "bearer " + "someOtherRandomString");
+        // NOTE: external authentication (using the DefaultRemoteUserMapper) could be used to login
+        // if you include some value in the "bearer" authorization header;
+        // We consider this not to be a big problem since we trust external uses with any api call
+        response = getSingle(TICKETS_URL, People.DEFAULT_USER, null, header, TICKETS_API_NAME, 200);
+        validatedTicket = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), LoginTicketResponse.class);
+        assertNotNull("We should have gotten a valid ticket id", validatedTicket.getId());
+        checkRemoteUserMapperWasCalled(useIdentityService);
+
+        reset(useIdentityService);
+    }
+
+    private String buildUserNameMultiTenancyAware()
+    {
+        return "someUserName" + ((useDefaultNetwork) ? "" : ("@" + this.getClass().getName().toLowerCase()));
+    }
+
+    private void runPreCheckToEnsureBasicFunctionalityWorks(String folderName, Paging paging) throws Exception
+    {
+        setRequestContext(null);
+        getAll(SiteEntityResource.class, paging, null, 401);
+
+        setRequestContext(user2);
+        // User2 create a folder within his home folder (-my-)
+        Folder folderResp = createFolder(Nodes.PATH_MY, folderName, null);
+        assertNotNull(folderResp.getId());
+
+        setRequestContext(null);
+        getAll(getNodeChildrenUrl(Nodes.PATH_MY), paging, 401);
+    }
+
+    private void setupAuthChainForTest(boolean useIdentityService, RemoteUserMapper remoteUserMapper)
+    {
+        PublicApiAuthenticatorFactory publicApiAuthenticatorFactory = (PublicApiAuthenticatorFactory) applicationContext
+            .getBean("publicapi.authenticator");
+        publicApiAuthenticatorFactory.setRemoteUserMapper(remoteUserMapper);
+
+        AuthenticationsImpl authentications = (AuthenticationsImpl) applicationContext.getBean("authentications");
+        authentications.setRemoteUserMapper(remoteUserMapper);
+
+        String chain = useIdentityService ?
+            "identity-service1:identity-service,alfrescoNtlm1:alfrescoNtlm" :
+            "external1:external,alfrescoNtlm1:alfrescoNtlm";
+        String chainId = useIdentityService ? "identity-service1" : "external1";
+
+        DefaultChildApplicationContextManager childApplicationContextManager = (DefaultChildApplicationContextManager) applicationContext
+            .getBean("Authentication");
+
+        childApplicationContextManager.stop();
+        childApplicationContextManager.setProperty("chain", chain);
+        ChildApplicationContextFactory childApplicationContextFactory = childApplicationContextManager.getChildApplicationContextFactory(chainId);
+        childApplicationContextFactory.stop();
+        childApplicationContextFactory.setProperty("external.authentication.proxyUserName", "");
+        childApplicationContextFactory.start();
+    }
+
+    private RemoteUserMapper createRemoteUserMapperToUseForTheTest(boolean useIdentityService)
+    {
+        PersonService personServiceLocal = (PersonService) applicationContext.getBean("PersonService");
+        RemoteUserMapper remoteUserMapper;
+        if (useIdentityService)
+        {
+            InterceptingIdentityRemoteUserMapper interceptingRemoteUserMapper = new InterceptingIdentityRemoteUserMapper();
+            interceptingRemoteUserMapper.setActive(true);
+            interceptingRemoteUserMapper.setPersonService(personServiceLocal);
+            interceptingRemoteUserMapper.setIdentityServiceDeployment(null);
+            interceptingRemoteUserMapper.setUserIdToReturn(user2);
+            remoteUserMapper = interceptingRemoteUserMapper;
+        }
+        else
+        {
+            DefaultRemoteUserMapper interceptingRemoteUserMapper = new InterceptingDefaultRemoteUserMapper();
+            interceptingRemoteUserMapper.setActive(true);
+            interceptingRemoteUserMapper.setPersonService(personServiceLocal);
+            interceptingRemoteUserMapper.setProxyUserName(null);
+            remoteUserMapper = interceptingRemoteUserMapper;
+        }
+        return remoteUserMapper;
+    }
+
+    private void checkRemoteUserMapperWasCalled(boolean useIdentityService)
+    {
+        if (useIdentityService)
+        {
+            assertTrue(InterceptingIdentityRemoteUserMapper.isGetRemoteUserCalled());
+        }
+        else
+        {
+            assertTrue(InterceptingDefaultRemoteUserMapper.isGetRemoteUserCalled());
+        }
+    }
+
+    private void reset(boolean useIdentityService)
+    {
+        if (useIdentityService)
+        {
+            InterceptingIdentityRemoteUserMapper.reset();
+        }
+        else
+        {
+            InterceptingDefaultRemoteUserMapper.reset();
+        }
+    }
+
+    private String encodeB64(String str)
+    {
+        return Base64.encodeBase64String(str.getBytes());
+    }
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+}
+
+class InterceptingDefaultRemoteUserMapper extends DefaultRemoteUserMapper
+{
+    static private volatile boolean getRemoteUserCalled;
+
+    public static void reset()
+    {
+        getRemoteUserCalled = false;
+    }
+
+    public static boolean isGetRemoteUserCalled()
+    {
+        return getRemoteUserCalled;
+    }
+
+    @Override
+    public String getRemoteUser(HttpServletRequest request)
+    {
+        getRemoteUserCalled = true;
+        return super.getRemoteUser(request);
+    }
+}
+
+class InterceptingIdentityRemoteUserMapper extends IdentityServiceRemoteUserMapper
+{
+    static private volatile boolean getRemoteUserCalled;
+
+    public static void reset()
+    {
+        getRemoteUserCalled = false;
+    }
+
+    public static boolean isGetRemoteUserCalled()
+    {
+        return getRemoteUserCalled;
+    }
+
+    String userIdToReturn;
+
+    public void setUserIdToReturn(String userId)
+    {
+        userIdToReturn = userId;
+    }
+
+    @Override
+    public String getRemoteUser(HttpServletRequest request)
+    {
+        getRemoteUserCalled = true;
+        if (userIdToReturn != null)
+        {
+            return userIdToReturn;
+        }
+        return super.getRemoteUser(request);
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/BaseCustomModelApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/BaseCustomModelApiTest.java
new file mode 100644
index 00000000000..18ad636b489
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/BaseCustomModelApiTest.java
@@ -0,0 +1,366 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertTrue;
+
+import org.alfresco.repo.dictionary.CustomModelServiceImpl;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.rest.api.model.AbstractClassModel;
+import org.alfresco.rest.api.model.CustomAspect;
+import org.alfresco.rest.api.model.CustomModel;
+import org.alfresco.rest.api.model.CustomModel.ModelStatus;
+import org.alfresco.rest.api.model.CustomModelConstraint;
+import org.alfresco.rest.api.model.CustomModelNamedValue;
+import org.alfresco.rest.api.model.CustomModelProperty;
+import org.alfresco.rest.api.model.CustomType;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.dictionary.CustomModelDefinition;
+import org.alfresco.service.cmr.dictionary.CustomModelService;
+import org.alfresco.service.cmr.dictionary.NamespaceDefinition;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.util.Pair;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.junit.After;
+import org.junit.Before;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Base class for CMM API tests
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class BaseCustomModelApiTest extends AbstractBaseApiTest
+{
+    public static final String CMM_SCOPE = "private";
+    public static final String SELECT_PROPS_QS = "?select=props";
+    public static final String SELECT_STATUS_QS = "?select=status";
+    public static final String SELECT_ALL = "?select=all";
+    public static final String SELECT_ALL_PROPS = "?select=allProps";
+
+    protected String nonAdminUserName;
+    protected String customModelAdmin;
+
+    protected MutableAuthenticationService authenticationService;
+    protected PersonService personService;
+    protected CustomModelService customModelService;
+
+    private List<String> users = new ArrayList<>();
+
+    @Before
+    public void setup() throws Exception
+    {
+        authenticationService = applicationContext.getBean("authenticationService", MutableAuthenticationService.class);
+        personService = applicationContext.getBean("personService", PersonService.class);
+        customModelService = applicationContext.getBean("customModelService", CustomModelService.class);
+
+        final AuthorityService authorityService = applicationContext.getBean("authorityService", AuthorityService.class);
+
+        this.nonAdminUserName = createUser("nonAdminUser" + System.currentTimeMillis(), "password", null);
+        this.customModelAdmin = createUser("customModelAdmin" + System.currentTimeMillis(), "password", null);
+        users.add(nonAdminUserName);
+        users.add(customModelAdmin);
+
+        // Add 'customModelAdmin' user into 'ALFRESCO_MODEL_ADMINISTRATORS' group
+        AuthenticationUtil.runAsSystem((RunAsWork<Void>) () -> {
+            transactionHelper.doInTransaction((RetryingTransactionCallback<Void>) () -> {
+                authorityService.addAuthority(CustomModelServiceImpl.GROUP_ALFRESCO_MODEL_ADMINISTRATORS_AUTHORITY, customModelAdmin);
+                return null;
+            });
+            return null;
+        });
+    }
+
+    @After
+    public void tearDown() throws Exception
+    {
+        AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+        for (final String user : users)
+        {
+            transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+            {
+                @Override
+                public Void execute() throws Throwable
+                {
+                    deleteUser(user, null);
+                    return null;
+                }
+            });
+        }
+        users.clear();
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+
+    protected CustomModel createCustomModel(String modelName, Pair<String, String> namespacePair, ModelStatus status) throws Exception
+    {
+        return createCustomModel(modelName, namespacePair, status, "Test model description", null);
+    }
+
+    protected CustomModel createCustomModel(String modelName, Pair<String, String> namespacePair, ModelStatus status, String desc, String author)
+                throws Exception
+    {
+        CustomModel customModel = new CustomModel();
+        customModel.setName(modelName);
+        customModel.setNamespaceUri(namespacePair.getFirst());
+        customModel.setNamespacePrefix(namespacePair.getSecond());
+        customModel.setDescription(desc);
+        customModel.setStatus(status);
+        customModel.setAuthor(author);
+        
+        // Create the model as a Model Administrator
+        HttpResponse response = post("cmm", RestApiUtil.toJsonAsString(customModel), 201);
+        CustomModel returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        if (author == null)
+        {
+            // ignore 'author' in the comparison
+            compareCustomModels(customModel, returnedModel, "author");
+        }
+        else
+        {
+            compareCustomModels(customModel, returnedModel);
+        }
+
+        return customModel;
+    }
+
+    protected <T extends AbstractClassModel> T createTypeAspect(Class<T> glazz, String modelName, String typeAspectName, String title, String desc,
+                String parent) throws Exception
+    {
+        AbstractClassModel classModel = null;
+        String uri = "cmm/" + modelName;
+        if (glazz.equals(CustomType.class))
+        {
+            classModel = new CustomType();
+            uri += "/types";
+        }
+        else
+        {
+            classModel = new CustomAspect();
+            uri += "/aspects";
+        }
+
+        classModel.setName(typeAspectName);
+        classModel.setDescription(desc);
+        classModel.setTitle(title);
+        classModel.setParentName(parent);
+
+        // Create type as a Model Administrator
+        HttpResponse response = post(uri, RestApiUtil.toJsonAsString(classModel), 201);
+        T returnedClassModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), glazz);
+
+        compareCustomTypesAspects(classModel, returnedClassModel, "prefixedName");
+
+        return returnedClassModel;
+    }
+
+    protected void compareCustomModels(CustomModel expectedModel, CustomModel actualModel, String... excludeFields)
+    {
+        boolean result = EqualsBuilder.reflectionEquals(expectedModel, actualModel, excludeFields);
+        assertTrue("Two models are not equal. Expected:<" + expectedModel.toString() + "> but was:<" + actualModel.toString() + ">", result);
+    }
+
+    protected void compareCustomTypesAspects(AbstractClassModel expectedDetails, AbstractClassModel actualDetails, String... excludeFields)
+    {
+        List<CustomModelProperty> expectedProps = expectedDetails.getProperties();
+        List<CustomModelProperty> actualProps = actualDetails.getProperties();
+        // Sort them
+        sortIfnotNull(expectedProps);
+        sortIfnotNull(actualProps);
+
+        boolean propEqualResult = true;
+        if (expectedProps.size() == actualProps.size())
+        {
+            for (int i = 0, size = expectedProps.size(); i < size; i++)
+            {
+                boolean equalProp = EqualsBuilder.reflectionEquals(expectedProps.get(i), actualProps.get(i), excludeFields);
+                if (!equalProp)
+                {
+                    propEqualResult = false;
+                    break;
+                }
+            }
+        }
+        else
+        {
+            propEqualResult = false;
+        }
+
+        if (excludeFields.length > 0)
+        {
+            int size = excludeFields.length;
+            excludeFields = Arrays.copyOf(excludeFields, size + 1);
+            excludeFields[size] = "properties";
+        }
+        boolean result = EqualsBuilder.reflectionEquals(expectedDetails, actualDetails, excludeFields);
+
+        String typesAspects = (expectedDetails instanceof CustomAspect) ? "aspects" : "types";
+        assertTrue("Two " + typesAspects + " are not equal. Expected:<" + expectedDetails.toString() + "> but was:<" + actualDetails.toString() + ">",
+                    (result && propEqualResult));
+    }
+
+    protected void compareCustomModelConstraints(CustomModelConstraint expectedConstraint, CustomModelConstraint actualConstraint, String... excludeFields)
+    {
+        if (expectedConstraint.getParameters() != null)
+        {
+            Collections.sort(expectedConstraint.getParameters());
+        }
+        if (actualConstraint.getParameters() != null)
+        {
+            Collections.sort(actualConstraint.getParameters());
+        }
+
+        boolean result = EqualsBuilder.reflectionEquals(expectedConstraint, actualConstraint, excludeFields);
+        assertTrue("Two constraints are not equal. Expected:<" + expectedConstraint.toString() + "> but was:<" + actualConstraint.toString() + ">", result);
+    }
+
+    protected void compareCustomModelProperties(CustomModelProperty expectedProperty, CustomModelProperty actualProperty, String... excludeFields)
+    {
+        boolean result = EqualsBuilder.reflectionEquals(expectedProperty, actualProperty, excludeFields);
+        assertTrue("Two constraints are not equal. Expected:<" + expectedProperty.toString() + "> but was:<" + actualProperty.toString() + ">", result);
+    }
+
+    protected Pair<String, String> getTestNamespaceUriPrefixPair()
+    {
+        long timeMillis = System.currentTimeMillis();
+        String uri = "http://www.alfresco.org/model/testcmmnamespace" + timeMillis + "/1.0";
+        String prefix = "testcmm" + timeMillis;
+
+        return new Pair<String, String>(uri, prefix);
+    }
+
+    protected CustomModelDefinition getModelDefinition(final String modelName)
+    {
+        return transactionHelper.doInTransaction(new RetryingTransactionCallback<CustomModelDefinition>()
+        {
+            @Override
+            public CustomModelDefinition execute() throws Throwable
+            {
+                return customModelService.getCustomModel(modelName);
+            }
+        });
+    }
+
+    protected void sortIfnotNull(List<CustomModelProperty> list)
+    {
+        if (list != null && list.size() > 0)
+        {
+            Collections.sort(list);
+        }
+    }
+
+    protected boolean hasNamespaceUri(Collection<NamespaceDefinition> namespaces, String expectedNamespaceUri)
+    {
+        for (NamespaceDefinition ns : namespaces)
+        {
+            if (ns.getUri().equals(expectedNamespaceUri))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    protected boolean hasNamespacePrefix(Collection<NamespaceDefinition> namespaces, String expectedNamespacePrefix)
+    {
+        for (NamespaceDefinition ns : namespaces)
+        {
+            if (ns.getPrefix().equals(expectedNamespacePrefix))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    protected CustomModelProperty getProperty(List<CustomModelProperty> properties, String propName)
+    {
+        for (CustomModelProperty prop : properties)
+        {
+            if (prop.getName().equals(propName))
+            {
+                return prop;
+            }
+        }
+        return null;
+    }
+
+    protected CustomModelNamedValue buildNamedValue(String name, String simpleValue, String... listValue)
+    {
+        CustomModelNamedValue namedValue = new CustomModelNamedValue();
+        namedValue.setName(name);
+        namedValue.setSimpleValue(simpleValue);
+        if (listValue.length > 0)
+        {
+            namedValue.setListValue(Arrays.asList(listValue));
+        }
+
+        return namedValue;
+    }
+
+    protected String getParameterSimpleValue(List<CustomModelNamedValue> params, String paramName)
+    {
+        for (CustomModelNamedValue p : params)
+        {
+            if (p.getName().equals(paramName))
+            {
+                return p.getSimpleValue();
+            }
+        }
+        return null;
+    }
+
+    protected List<String> getParameterListValue(List<CustomModelNamedValue> params, String paramName)
+    {
+        for (CustomModelNamedValue p : params)
+        {
+            if (p.getName().equals(paramName))
+            {
+                return p.getListValue();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String getScope()
+    {
+        return CMM_SCOPE;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/BufferedResponseTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/BufferedResponseTest.java
new file mode 100644
index 00000000000..39c86ed916e
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/BufferedResponseTest.java
@@ -0,0 +1,119 @@
+
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.repo.web.scripts.BufferedResponse;
+import org.alfresco.repo.web.scripts.TempOutputStream;
+import org.alfresco.repo.web.scripts.TempOutputStreamFactory;
+import org.alfresco.util.TempFileProvider;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+/**
+ * Test that BufferedResponse uses a temp file instead of buffering the entire output stream in memory
+ *
+ * @author Andrei Zapodeanu
+ * @author azapodeanu
+ */
+public class BufferedResponseTest
+{
+    private static final String TEMP_FOLDER_PATH = TempFileProvider.getTempDir().getAbsolutePath();
+
+    private static final String TEMP_DIRECTORY_NAME = "testLargeFile";
+    private static final String LARGE_FILE_NAME = "largeFile.tmp";
+    private static final String FILE_PREFIX = TempOutputStream.TEMP_FILE_PREFIX;
+
+    private static final Integer LARGE_FILE_SIZE_BYTES = 5 * 1024 * 1024;
+    private static final Integer MEMORY_THRESHOLD = 4 * 1024 * 1024;
+    private static final Integer MAX_CONTENT_SIZE = 1024 * 1024 * 1024;
+
+    @Before
+    public void createSourceFile() throws IOException
+    {
+        createRandomFileInDirectory(TEMP_FOLDER_PATH, LARGE_FILE_NAME, LARGE_FILE_SIZE_BYTES);
+    }
+
+    @After
+    public void tearDown() throws Exception
+    {
+        File largeFileSource = new File(TEMP_FOLDER_PATH, LARGE_FILE_NAME);
+        largeFileSource.delete();
+    }
+
+    /**
+     * Test that the output stream creates a temp file to cache its content when file size was bigger than its memory threshold ( 5 > 4 MB )
+     * MNT-19833
+     */
+    @Test
+    public void testOutputStream() throws IOException
+    {
+        File bufferTempDirectory = TempFileProvider.getTempDir(TEMP_DIRECTORY_NAME);
+        TempOutputStreamFactory streamFactory = new TempOutputStreamFactory(bufferTempDirectory, MEMORY_THRESHOLD, MAX_CONTENT_SIZE, false,true);
+        BufferedResponse response = new BufferedResponse(null, 0, streamFactory);
+
+        long countBefore = countFilesInDirectoryWithPrefix(bufferTempDirectory, FILE_PREFIX );
+        copyFileToOutputStream(response);
+        long countAfter = countFilesInDirectoryWithPrefix(bufferTempDirectory, FILE_PREFIX);
+        
+        response.getOutputStream().close();
+
+        Assert.assertEquals(countBefore + 1, countAfter);
+
+    }
+
+    private void copyFileToOutputStream(BufferedResponse response) throws IOException
+    {
+        File largeFileSource = new File(TEMP_FOLDER_PATH, LARGE_FILE_NAME);
+        OutputStream testOutputStream = response.getOutputStream();
+        Files.copy(largeFileSource.toPath(), testOutputStream);
+    }
+
+    private void createRandomFileInDirectory(String path, String fileName, int size) throws IOException
+    {
+        String fullPath = new File(path, fileName).getPath();
+        RandomAccessFile file = new RandomAccessFile(fullPath,"rw");
+        file.setLength(size);
+        file.close();
+    }
+
+    private long countFilesInDirectoryWithPrefix(File directory, String filePrefix) throws IOException
+    {
+        Stream<File> fileStream = Arrays.stream(directory.listFiles());
+        return fileStream.filter( f -> f.getName().startsWith(filePrefix)).count();
+    }
+}
+
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/BulkUpdatePropertiesCustomTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/BulkUpdatePropertiesCustomTest.java
new file mode 100644
index 00000000000..bde22e5bcd2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/BulkUpdatePropertiesCustomTest.java
@@ -0,0 +1,170 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests;
+
+import static org.apache.chemistry.opencmis.tck.CmisTestResultStatus.FAILURE;
+import static org.apache.chemistry.opencmis.tck.CmisTestResultStatus.INFO;
+import static org.apache.chemistry.opencmis.tck.CmisTestResultStatus.SKIPPED;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.chemistry.opencmis.client.api.CmisObject;
+import org.apache.chemistry.opencmis.client.api.Document;
+import org.apache.chemistry.opencmis.client.api.Folder;
+import org.apache.chemistry.opencmis.client.api.Session;
+import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.data.BulkUpdateObjectIdAndChangeToken;
+import org.apache.chemistry.opencmis.commons.enums.BindingType;
+import org.apache.chemistry.opencmis.commons.enums.CmisVersion;
+import org.apache.chemistry.opencmis.tck.CmisTestResult;
+import org.apache.chemistry.opencmis.tck.impl.AbstractSessionTest;
+
+/**
+ * Class to test if bulk properties update works for the
+ * description(cmis:description) property
+ * 
+ * This test checks the fix from MNT-16376 is valid but only if the change in
+ * MNT-13670 is not present in the code base. The fix from MNT-16376 ensures
+ * that the correct call context is available to the working threads that
+ * process bulk update. The fix from MNT-13670 added the description to the CMIS
+ * version 1.0 mapping in RuntimePropertyAccessorMapping and that masks the
+ * problem of the missing call context of the bulk update working threads for
+ * the description property.
+ * 
+ * Currently all of the properties in the RuntimePropertyAccessorMapping are
+ * added to the CMIS version 1.0, except for isSecondaryTypesProperty and
+ * IsPrivateWorkingCopy. I am not sure if/how and what would be the consequences
+ * if we update in the bulk update operation the two properties that are
+ * missing for version CMIS 1.0.
+ *
+ */
+public class BulkUpdatePropertiesCustomTest extends AbstractSessionTest
+{
+    private static final String CONTENT = "Custom Bluk update test content.";
+    private static final String NEW_DESCRIPTION_VALUE = "new description value";
+
+    @Override
+    public void init(Map<String, String> parameters)
+    {
+        super.init(parameters);
+        setName("Custom Bulk Update Properties Test");
+        setDescription("Creates a few folders and documents,bulk update the description and check that it has been updated, and deletes all created objects.");
+    }
+
+    @Override
+    public void run(Session session)
+    {
+        if (session.getRepositoryInfo().getCmisVersion() == CmisVersion.CMIS_1_0)
+        {
+            addResult(createResult(SKIPPED, "Bulk Update Properties is not supported by CMIS 1.0. Test skipped!"));
+            return;
+        }
+
+        CmisTestResult failure = null;
+        int numOfObjects = 25;
+
+        // create a test folder
+        Folder testFolder = createTestFolder(session);
+
+        try
+        {
+            Map<String, Folder> folders = new HashMap<String, Folder>();
+            Map<String, Document> documents = new HashMap<String, Document>();
+
+            // create folders and documents
+            for (int i = 0; i < numOfObjects; i++)
+            {
+                Folder newFolder = createFolder(session, testFolder, "bufolder" + i);
+                folders.put(newFolder.getId(), newFolder);
+                Document newDocument = createDocument(session, newFolder, "budoc" + i + ".txt", CONTENT);
+                documents.put(newDocument.getId(), newDocument);
+            }
+
+            // update cmis:description of all the documents
+            List<CmisObject> objects = new ArrayList<CmisObject>(documents.values());
+            Map<String, Object> properties = new HashMap<String, Object>();
+            properties.put(PropertyIds.DESCRIPTION, NEW_DESCRIPTION_VALUE);
+
+            List<BulkUpdateObjectIdAndChangeToken> updatedIds = session.bulkUpdateProperties(objects, properties, null, null);
+
+            // check the result
+            if (getBinding() == BindingType.WEBSERVICES)
+            {
+                addResult(createResult(INFO, "The Web Services binding does not return the updated ids."
+                        + " This issue has to be clarified by the CMIS TC and the test to adopted later."));
+            }
+            else
+            {
+                if (updatedIds == null || updatedIds.isEmpty())
+                {
+                    addResult(createResult(FAILURE, "Bulk Update Properties did not update any documents!"));
+                }
+                else
+                {
+                    failure = createResult(FAILURE, "Bulk Update Properties did not update all test documents!");
+                    addResult(assertEquals(documents.size(), updatedIds.size(), null, failure));
+                }
+            }
+
+            // check all documents
+            for (Folder folder : folders.values())
+            {
+                List<CmisObject> children = new ArrayList<CmisObject>();
+                for (CmisObject child : folder.getChildren(SELECT_ALL_NO_CACHE_OC))
+                {
+                    children.add(child);
+                }
+
+                if (children.size() != 1)
+                {
+                    String errorMessage = "Test folder should have exactly one child, but it has " + children.size() + "!";
+                    addResult(createResult(FAILURE, errorMessage));
+                }
+                else
+                {
+                    failure = createResult(FAILURE, "Document does not have the new description! Id: " + children.get(0).getId());
+                    addResult(assertEquals(NEW_DESCRIPTION_VALUE, children.get(0).getDescription(), null, failure));
+                }
+            }
+
+            // delete folders and documents
+            for (Folder folder : folders.values())
+            {
+                folder.deleteTree(true, null, true);
+            }
+        }
+        finally
+        {
+            // delete the test folder
+            deleteTestFolder();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/CMISTCKJettyComponent.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/CMISTCKJettyComponent.java
new file mode 100644
index 00000000000..e5cc63c3a54
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/CMISTCKJettyComponent.java
@@ -0,0 +1,56 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.repo.web.util.AbstractJettyComponent;
+import org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.webapp.WebAppContext;
+
+/**
+ * Manages an embedded jetty server, hooking it up to the repository spring context and providing access to the Chemistry OpenCMIS servlet.
+ * 
+ * @author steveglover
+ *
+ */
+public class CMISTCKJettyComponent extends AbstractJettyComponent
+{
+	public CMISTCKJettyComponent(int port, String contextPath, String servletName, String[] configLocations, String[] classLocations)
+	{
+		super(port, contextPath, configLocations, classLocations);
+	}
+	
+	@Override
+	protected void configureWebAppContext(WebAppContext webAppContext)
+	{
+		super.configure(webAppContext);
+
+	    // the Chemistry OpenCMIS servlet
+	    ServletHolder servletHolder = new ServletHolder(CmisAtomPubServlet.class);
+	    servletHolder.setInitParameter("callContextHandler", "org.apache.chemistry.opencmis.server.shared.BasicAuthCallContextHandler");
+	    webAppContext.addServlet(servletHolder, "/cmisatom/*");
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/CMMApiTestSuite.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/CMMApiTestSuite.java
new file mode 100644
index 00000000000..84f827f53c6
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/CMMApiTestSuite.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests;
+
+import junit.framework.JUnit4TestAdapter;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class CMMApiTestSuite extends TestSuite
+{
+    /**
+     * Creates the test suite
+     *
+     * @return the test suite
+     */
+    public static Test suite()
+    {
+        TestSuite suite = new TestSuite();
+        suite.addTest(new JUnit4TestAdapter(TestCustomModel.class));
+        suite.addTest(new JUnit4TestAdapter(TestCustomTypeAspect.class));
+        suite.addTest(new JUnit4TestAdapter(TestCustomProperty.class));
+        suite.addTest(new JUnit4TestAdapter(TestCustomConstraint.class));
+        suite.addTest(new JUnit4TestAdapter(TestCustomModelExport.class));
+
+        return suite;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/Cleanup.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/Cleanup.java
new file mode 100644
index 00000000000..10262db0175
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/Cleanup.java
@@ -0,0 +1,38 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.junit.After;
+
+public class Cleanup
+{
+	@After
+	public void after() throws Exception
+	{
+//		PublicApiTestFixture fixture = PublicApiTestFixture.getInstance();
+//		fixture.shutdown();
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/CloudPersonInfo.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/CloudPersonInfo.java
new file mode 100644
index 00000000000..634c723747f
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/CloudPersonInfo.java
@@ -0,0 +1,48 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.rest.api.tests.client.data.Company;
+
+public class CloudPersonInfo extends PersonInfo
+{
+	private boolean networkAdmin;
+	
+	public CloudPersonInfo(String firstName, String lastName, String username,
+			String password, boolean networkAdmin, Company company, String skype,
+			String location, String tel, String mob, String instantmsg,
+			String google)
+	{
+		super(firstName, lastName, username, password, company, skype, location, tel, mob, instantmsg, google);
+		if(username == null)
+		this.networkAdmin = networkAdmin;
+	}
+	
+	public boolean isNetworkAdmin()
+	{
+		return networkAdmin;
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/DiscoveryApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/DiscoveryApiTest.java
new file mode 100644
index 00000000000..6cfbdb98857
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/DiscoveryApiTest.java
@@ -0,0 +1,339 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.discovery.DiscoveryApiWebscript;
+import org.alfresco.rest.api.model.DiscoveryDetails;
+import org.alfresco.rest.api.model.ModulePackage;
+import org.alfresco.rest.api.model.RepositoryInfo;
+import org.alfresco.rest.api.model.RepositoryInfo.LicenseEntitlement;
+import org.alfresco.rest.api.model.RepositoryInfo.LicenseInfo;
+import org.alfresco.rest.api.model.RepositoryInfo.StatusInfo;
+import org.alfresco.rest.api.model.RepositoryInfo.VersionInfo;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.admin.RepoUsage.LicenseMode;
+import org.alfresco.service.descriptor.Descriptor;
+import org.alfresco.service.descriptor.DescriptorService;
+import org.alfresco.service.license.LicenseDescriptor;
+import org.joda.time.DateTime;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * V1 REST API tests for retrieving detailed repository information.
+ * <ul>
+ * <li> {@literal <host>:<port>/alfresco/api/discovery} </li>
+ * </ul>
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
+{
+
+    private static final DateTime NOW = DateTime.now();
+
+    @Mock
+    private DescriptorService descriptorServiceMock;
+    @Mock
+    private Descriptor serverDescriptor;
+    @Mock
+    private Descriptor currentRepositoryDescriptor;
+    @Mock
+    private LicenseDescriptor licenseDescriptorMock;
+    private DiscoveryApiWebscript discoveryApiWebscript;
+
+    private Date licenseIssuedAt;
+    private Date licenseExpiresAt;
+
+    @Before
+    public void setup() throws Exception
+    {
+        super.setup();
+
+        this.licenseIssuedAt = NOW.toDate();
+        this.licenseExpiresAt = NOW.plusDays(5).toDate();
+
+        // Mock the required descriptors
+        this.descriptorServiceMock = mock(DescriptorService.class);
+        this.serverDescriptor = mock(Descriptor.class);
+        this.licenseDescriptorMock = mock(LicenseDescriptor.class);
+
+        when(descriptorServiceMock.getServerDescriptor()).thenReturn(serverDescriptor);
+        when(descriptorServiceMock.getCurrentRepositoryDescriptor()).thenReturn(currentRepositoryDescriptor);
+        when(currentRepositoryDescriptor.getId()).thenReturn("repoId");
+        when(serverDescriptor.getEdition()).thenReturn("Enterprise");
+        when(serverDescriptor.getVersionMajor()).thenReturn("5");
+        when(serverDescriptor.getVersionMinor()).thenReturn("2");
+        when(serverDescriptor.getVersionRevision()).thenReturn("1");
+        when(serverDescriptor.getVersionLabel()).thenReturn(".3");
+        when(serverDescriptor.getVersionBuild()).thenReturn("r123456-b0");
+        when(serverDescriptor.getSchema()).thenReturn(10051);
+
+        when(descriptorServiceMock.getLicenseDescriptor()).thenReturn(licenseDescriptorMock);
+        when(licenseDescriptorMock.getIssued()).thenReturn(this.licenseIssuedAt);
+        when(licenseDescriptorMock.getValidUntil()).thenReturn(this.licenseExpiresAt);
+        when(licenseDescriptorMock.getRemainingDays()).thenReturn(5);
+        when(licenseDescriptorMock.getLicenseMode()).thenReturn(LicenseMode.ENTERPRISE);
+        when(licenseDescriptorMock.getHolderOrganisation()).thenReturn("Alfresco Dev Test");
+        when(licenseDescriptorMock.getMaxUsers()).thenReturn(20L);
+        when(licenseDescriptorMock.getMaxDocs()).thenReturn(1000L);
+        when(licenseDescriptorMock.isClusterEnabled()).thenReturn(true);
+
+        // Override the descriptor service
+        discoveryApiWebscript = applicationContext
+                    .getBean("webscript.org.alfresco.api.DiscoveryApiWebscript.get", DiscoveryApiWebscript.class);
+        discoveryApiWebscript.setDescriptorService(descriptorServiceMock);
+        discoveryApiWebscript.setEnabled(true);
+    }
+
+    @After
+    public void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+
+    /**
+     * Tests get discovery.
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/discovery}
+     */
+    @Test
+    public void testGetDiscovery() throws Exception
+    {
+        setRequestContext(null, user1, "wrongPassword");
+        get("discovery", null, 401);
+
+        setRequestContext(null, user1, null);
+        HttpResponse response = get("discovery", null, 200);
+
+        DiscoveryDetails discoveryDetails = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), DiscoveryDetails.class);
+        assertNotNull(discoveryDetails);
+        RepositoryInfo repositoryInfo = discoveryDetails.getRepository();
+        assertNotNull(repositoryInfo);
+        assertEquals("repoId", repositoryInfo.getId());
+        assertEquals("Enterprise", repositoryInfo.getEdition());
+
+        // Check version info
+        VersionInfo versionInfo = repositoryInfo.getVersion();
+        assertNotNull(versionInfo);
+        assertEquals("5", versionInfo.getMajor());
+        assertEquals("2", versionInfo.getMinor());
+        assertEquals("1", versionInfo.getPatch());
+        assertEquals("3", versionInfo.getHotfix());
+        assertEquals("r123456-b0", versionInfo.getLabel());
+        assertEquals(10051, versionInfo.getSchema());
+        assertEquals("5.2.1.3 (r123456-b0) schema 10051", versionInfo.getDisplay());
+
+        // Check license info
+        LicenseInfo licenseInfo = repositoryInfo.getLicense();
+        assertNotNull(licenseInfo);
+        assertEquals(LicenseMode.ENTERPRISE.name(), licenseInfo.getMode());
+        assertEquals(licenseIssuedAt.toString(), licenseInfo.getIssuedAt().toString());
+        assertEquals(licenseExpiresAt.toString(), licenseInfo.getExpiresAt().toString());
+        assertEquals(Integer.valueOf(5), licenseInfo.getRemainingDays());
+        assertEquals("Alfresco Dev Test", licenseInfo.getHolder());
+        LicenseEntitlement entitlements = licenseInfo.getEntitlements();
+        assertNotNull(entitlements);
+        assertNotNull(entitlements.getMaxUsers());
+        assertEquals(20L, entitlements.getMaxUsers().longValue());
+        assertNotNull(entitlements.getMaxDocs());
+        assertEquals(1000L, entitlements.getMaxDocs().longValue());
+        assertTrue(entitlements.getIsClusterEnabled());
+        assertFalse(entitlements.getIsCryptodocEnabled());
+
+        // Check status
+        StatusInfo statusInfo = repositoryInfo.getStatus();
+        assertNotNull(statusInfo);
+        assertFalse(statusInfo.getIsReadOnly());
+        assertTrue(statusInfo.getIsAuditEnabled());
+        assertTrue(statusInfo.getIsQuickShareEnabled());
+        assertTrue(statusInfo.getIsThumbnailGenerationEnabled());
+
+        // Check modules
+        List<ModulePackage> modulePackageList = repositoryInfo.getModules();
+        assertNotNull(modulePackageList);
+    }
+
+    /**
+     * Tests get discovery.
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/discovery}
+     */
+    @Test
+    public void testGetDiscovery_hotfixValue() throws Exception
+    {
+        /*
+        * The agreement was that if the hotfix value (versionLabel) does not follow the standard
+        * of "dot then digits" or just "digits", the API should return zero.
+         */
+
+        when(serverDescriptor.getVersionLabel()).thenReturn("4");
+        setRequestContext(null, user1, null);
+        HttpResponse response = get("discovery", null, 200);
+
+        DiscoveryDetails discoveryDetails = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), DiscoveryDetails.class);
+        assertNotNull(discoveryDetails);
+        RepositoryInfo repositoryInfo = discoveryDetails.getRepository();
+        assertNotNull(repositoryInfo);
+        assertEquals("Enterprise", repositoryInfo.getEdition());
+
+        // Check version info
+        VersionInfo versionInfo = repositoryInfo.getVersion();
+        assertNotNull(versionInfo);
+        assertEquals("5", versionInfo.getMajor());
+        assertEquals("2", versionInfo.getMinor());
+        assertEquals("1", versionInfo.getPatch());
+        assertEquals("4", versionInfo.getHotfix());
+        assertEquals("r123456-b0", versionInfo.getLabel());
+        assertEquals(10051, versionInfo.getSchema());
+        assertEquals("5.2.1.4 (r123456-b0) schema 10051", versionInfo.getDisplay());
+
+        when(serverDescriptor.getVersionLabel()).thenReturn("d");
+        response = get("discovery", null, 200);
+
+        discoveryDetails = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), DiscoveryDetails.class);
+        assertNotNull(discoveryDetails);
+        repositoryInfo = discoveryDetails.getRepository();
+        assertNotNull(repositoryInfo);
+        // Check version info
+        versionInfo = repositoryInfo.getVersion();
+        assertNotNull(versionInfo);
+        assertEquals("5", versionInfo.getMajor());
+        assertEquals("2", versionInfo.getMinor());
+        assertEquals("1", versionInfo.getPatch());
+        assertEquals("0", versionInfo.getHotfix());
+        assertEquals("r123456-b0", versionInfo.getLabel());
+        assertEquals(10051, versionInfo.getSchema());
+        assertEquals("5.2.1.0 (r123456-b0) schema 10051", versionInfo.getDisplay());
+
+        when(serverDescriptor.getVersionLabel()).thenReturn("39.4");
+        response = get("discovery", null, 200);
+
+        discoveryDetails = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), DiscoveryDetails.class);
+        assertNotNull(discoveryDetails);
+        repositoryInfo = discoveryDetails.getRepository();
+        assertNotNull(repositoryInfo);
+        // Check version info
+        versionInfo = repositoryInfo.getVersion();
+        assertNotNull(versionInfo);
+        assertEquals("5", versionInfo.getMajor());
+        assertEquals("2", versionInfo.getMinor());
+        assertEquals("1", versionInfo.getPatch());
+        assertEquals("0", versionInfo.getHotfix());
+        assertEquals("r123456-b0", versionInfo.getLabel());
+        assertEquals(10051, versionInfo.getSchema());
+        assertEquals("5.2.1.0 (r123456-b0) schema 10051", versionInfo.getDisplay());
+    }
+
+    /**
+     * Tests get discovery.
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/discovery}
+     */
+    @Test
+    public void testGetDiscovery_licenseEntitlement() throws Exception
+    {
+        // Override maxUsers
+        when(licenseDescriptorMock.getMaxUsers()).thenReturn(null);
+
+        setRequestContext(null, user1, null);
+        HttpResponse response = get("discovery", null, 200);
+
+        DiscoveryDetails discoveryDetails = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), DiscoveryDetails.class);
+        assertNotNull(discoveryDetails);
+        RepositoryInfo repositoryInfo = discoveryDetails.getRepository();
+        assertNotNull(repositoryInfo);
+        assertEquals("Enterprise", repositoryInfo.getEdition());
+
+        // Check license info
+        LicenseInfo licenseInfo = repositoryInfo.getLicense();
+        assertNotNull(licenseInfo);
+        assertEquals(LicenseMode.ENTERPRISE.name(), licenseInfo.getMode());
+        assertEquals(licenseIssuedAt.toString(), licenseInfo.getIssuedAt().toString());
+        assertEquals(licenseExpiresAt.toString(), licenseInfo.getExpiresAt().toString());
+        assertEquals(Integer.valueOf(5), licenseInfo.getRemainingDays());
+        assertEquals("Alfresco Dev Test", licenseInfo.getHolder());
+        LicenseEntitlement entitlements = licenseInfo.getEntitlements();
+        assertNotNull(entitlements);
+        assertNull(entitlements.getMaxUsers());
+        assertEquals(1000L, entitlements.getMaxDocs().longValue());
+        assertTrue(entitlements.getIsClusterEnabled());
+        assertFalse(entitlements.getIsCryptodocEnabled());
+
+        // Override entitlements
+        when(licenseDescriptorMock.getMaxDocs()).thenReturn(null);
+        when(licenseDescriptorMock.isClusterEnabled()).thenReturn(false);
+        when(licenseDescriptorMock.isCryptodocEnabled()).thenReturn(true);
+
+        response = get("discovery", null, 200);
+
+        discoveryDetails = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), DiscoveryDetails.class);
+        assertNotNull(discoveryDetails);
+        repositoryInfo = discoveryDetails.getRepository();
+        assertNotNull(repositoryInfo);
+
+        // Check license info
+        licenseInfo = repositoryInfo.getLicense();
+        assertNotNull(licenseInfo);
+        entitlements = licenseInfo.getEntitlements();
+        assertNotNull(entitlements);
+        assertNull(entitlements.getMaxUsers());
+        assertNull(entitlements.getMaxDocs());
+        assertFalse(entitlements.getIsClusterEnabled());
+        assertTrue(entitlements.getIsCryptodocEnabled());
+    }
+
+    @Test
+    public void testDiscoveryDisabled() throws Exception
+    {
+        try
+        {
+            discoveryApiWebscript.setEnabled(false);
+
+            setRequestContext(null, user1, null);
+            get("discovery", null, 501);
+        }
+        finally
+        {
+            discoveryApiWebscript.setEnabled(true);
+        }
+    }
+}
+
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterpriseJettyComponent.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterpriseJettyComponent.java
new file mode 100644
index 00000000000..bb93c253dae
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterpriseJettyComponent.java
@@ -0,0 +1,56 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.webapp.WebAppContext;
+
+/**
+ * Manages an embedded jetty server, hooking it up to the repository spring context and providing 
+ * authenticated, tenant-based access through the tenant servlet.
+ * 
+ * @author steveglover
+ *
+ */
+public class EnterpriseJettyComponent extends PublicApiJettyComponent
+{
+	public EnterpriseJettyComponent(int port, String contextPath, String[] configLocations, String[] classLocations)
+	{
+		super(port, contextPath, configLocations, classLocations);
+	}
+	
+	@Override
+	protected void configureWebAppContext(WebAppContext webAppContext)
+	{
+		super.configureWebAppContext(webAppContext);
+
+	    // the tenant servlet with alfresco managed authentication
+	    ServletHolder servletHolder = new ServletHolder(CmisAtomPubServlet.class);
+	    servletHolder.setInitParameter("callContextHandler", "org.apache.chemistry.opencmis.server.shared.BasicAuthCallContextHandler");
+	    webAppContext.addServlet(servletHolder, "/cmisatom/*");
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterprisePublicApiTestFixture.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterprisePublicApiTestFixture.java
new file mode 100644
index 00000000000..bdb58b47cc6
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterprisePublicApiTestFixture.java
@@ -0,0 +1,80 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.repo.web.util.JettyComponent;
+
+public class EnterprisePublicApiTestFixture extends EnterpriseTestFixture
+{
+	public final static String[] CONFIG_LOCATIONS = new String[]
+    {
+		"classpath:alfresco/application-context.xml",
+		"classpath:alfresco/web-scripts-application-context.xml",
+		"classpath:alfresco/web-scripts-application-context-test.xml",
+		"rest-api-test-context.xml",
+		"testcmis-model-context.xml"
+    };
+
+	public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/lucene/"};
+	   
+    private static EnterprisePublicApiTestFixture instance;
+
+	/*
+	 * Note: synchronized for multi-threaded test access
+	 */
+    public synchronized static EnterprisePublicApiTestFixture getInstance(boolean createTestData) throws Exception
+    {
+    	if(instance == null)
+    	{
+    		instance = new EnterprisePublicApiTestFixture();
+    		instance.setup(createTestData);
+    	}
+    	return instance;
+    }
+
+	public static EnterprisePublicApiTestFixture getInstance() throws Exception
+	{
+		return getInstance(true);
+	}
+
+    private EnterprisePublicApiTestFixture()
+	{
+		super(CONFIG_LOCATIONS, CLASS_LOCATIONS, PORT, CONTEXT_PATH, PUBLIC_API_SERVLET_NAME, DEFAULT_NUM_MEMBERS_PER_SITE, false);
+	}
+    
+	@Override
+	protected JettyComponent makeJettyComponent()
+	{
+		JettyComponent jettyComponent = new EnterpriseJettyComponent(getPort(), getContextPath(), getConfigLocations(), getClassLocations());
+		return jettyComponent;
+	}
+
+	@Override
+	protected RepoService makeRepoService() throws Exception
+	{
+		return new RepoService(applicationContext);
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterpriseTestApi.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterpriseTestApi.java
new file mode 100644
index 00000000000..a3fa40c8be7
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterpriseTestApi.java
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.junit.Before;
+
+public class EnterpriseTestApi extends AbstractTestApi
+{
+	@Before
+	public void setup() throws Exception
+	{
+		// force creation of some test data (if not specifically overridden)
+		getTestFixture().getRandomNetwork();
+	}
+	
+	@Override
+	protected TestFixture getTestFixture() throws Exception
+	{
+		return EnterprisePublicApiTestFixture.getInstance();
+	}
+
+	@Override
+	protected TestFixture getTestFixture(boolean createTestData) throws Exception
+	{
+		return EnterprisePublicApiTestFixture.getInstance(createTestData);
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterpriseTestFixture.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterpriseTestFixture.java
new file mode 100644
index 00000000000..6647dbd0b54
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/EnterpriseTestFixture.java
@@ -0,0 +1,74 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.rest.api.tests.RepoService.SiteInformation;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.service.cmr.site.SiteVisibility;
+
+public abstract class EnterpriseTestFixture extends AbstractTestFixture
+{
+	public static final String WITH_AVATAR = "withAvatar"; //If you set PersonInfo instantmsg to WITH_AVATAR, an avatar gets created.
+    public EnterpriseTestFixture(String[] configLocations, String[] classLocations, int port, String contextPath,
+    		String servletName, int numMembersPerSite, boolean cleanup)
+    {
+		super(configLocations, classLocations, port, contextPath, servletName, numMembersPerSite, cleanup);
+	}
+
+	@Override
+	protected void populateTestData()
+	{
+		for(int i = 1; i <= 2; i++)
+        {
+			TestNetwork network = repoService.createNetworkWithAlias(TEST_DOMAIN_PREFIX + "00" + i, true);
+			addNetwork(network);
+        }
+
+        // 5 public sites
+        for(int i = 0; i < 5;  i++)
+        {
+        	SiteInformation siteInfo = new SiteInformation("testSite" + i, "Public Test Site" + i, "Public Test Site" + i, SiteVisibility.PUBLIC);
+        	addSite(siteInfo);
+        }
+
+        // 5 private sites
+        for(int i = 5; i < 10;  i++)
+        {
+        	SiteInformation siteInfo = new SiteInformation("testSite" + i, "Private Test Site" + i, "Private Test Site" + i, SiteVisibility.PRIVATE);
+        	addSite(siteInfo);
+        }
+
+    	addPerson(new PersonInfo("David", "Smith", "david.smith", "password", null, "skype", "location", "telephone", "mob", "instant", "google"));
+    	addPerson(new PersonInfo("Bob", "Jones", "bob.jones", "password", null, "skype", "location", "telephone", "mob", "instant", "google"));
+    	addPerson(new PersonInfo("Bill", "Grainger", "bill.grainger", "password", null, "skype", "location", "telephone", "mob", WITH_AVATAR, "google"));
+    	addPerson(new PersonInfo("Jill", "Fry", "jill.fry", "password", null, "skype", "location", "telephone", "mob", "instant", "google"));
+    	addPerson(new PersonInfo("Elvis", "Presley", "elvis.presley", "password", null, "skype", "location", "telephone", "mob", WITH_AVATAR, "google"));
+    	addPerson(new PersonInfo("John", "Lennon", "john.lennon", "password", null, "skype", "location", "telephone", "mob", WITH_AVATAR, "google"));
+    	addPerson(new PersonInfo("George", "Harrison", "george.harrison", "password", null, "skype", "location", "telephone", "mob", "instant", "google"));
+    	addPerson(new PersonInfo("David", "Bowie", "david.bowie", "password", null, "skype", "location", "telephone", "mob", "instant", "google"));
+    	addPerson(new PersonInfo("Ford", "Prefect", "ford.prefect", "password", null, "skype", "location", "telephone", "mob", "instant", "google"));
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java
new file mode 100644
index 00000000000..e28de0e99de
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java
@@ -0,0 +1,1859 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authority.AuthorityDAOImpl;
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Groups;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Group;
+import org.alfresco.rest.api.tests.client.data.GroupMember;
+import org.alfresco.rest.api.tests.client.data.Person;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.service.cmr.search.ResultSetRow;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.util.GUID;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.Mock;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.when;
+
+/**
+ * V1 REST API tests for managing Groups
+ *
+ * @author cturlica
+ */
+public class GroupsTest extends AbstractSingleNetworkSiteTest
+{
+    private static final String MEMBER_TYPE_GROUP = "GROUP";
+    private static final String MEMBER_TYPE_PERSON = "PERSON";
+    private static final String GROUP_EVERYONE = "GROUP_EVERYONE";
+
+    protected AuthorityService authorityService;
+
+    private String rootGroupName = null;
+    private Group rootGroup = null;
+    private Group groupA = null;
+    private Group groupB = null;
+    private GroupMember groupMemberA = null;
+    private GroupMember groupMemberB = null;
+    private GroupMember personMember = null;
+    @Mock
+    private ResultSetRow groupAResultSetRow;
+    @Mock
+    private ResultSetRow groupBResultSetRow;
+    @Mock
+    private Iterator iterator;
+
+    @Before
+    public void setup() throws Exception
+    {
+        super.setup();
+
+        authorityService = (AuthorityService) applicationContext.getBean("AuthorityService");
+        AuthorityDAOImpl authorityDAOImpl = (AuthorityDAOImpl) applicationContext.getBean("authorityDAO");
+        authorityDAOImpl.setSearchService(mockSearchService);
+        when(mockSearchServiceQueryResultSet.iterator()).thenReturn(iterator);
+    }
+
+    @After
+    public void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+
+    @Test
+    public void testGetGroups() throws Exception
+    {
+        try
+        {
+            createAuthorityContext(user1);
+
+            setRequestContext(user1);
+
+            testGetGroupsSorting();
+            testGetGroupsWithInclude();
+            testGetGroupsSkipPaging();
+            testGetGroupsByIsRoot(true);
+            testGetGroupsByIsRoot(false);
+            testGetGroupsWithZoneFilter();
+        }
+        finally
+        {
+            clearAuthorityContext();
+        }
+    }
+
+    private void testGetGroupsSkipPaging() throws Exception
+    {
+        // +ve: check skip count.
+        {
+            // Sort params
+            Map<String, String> otherParams = new HashMap<>();
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, false);
+
+            // Paging and list groups
+
+            int skipCount = 0;
+            int maxItems = 4;
+            Paging paging = getPaging(skipCount, maxItems);
+
+            ListResponse<Group> resp = getGroups(paging, otherParams);
+
+            // Paging and list groups with skip count.
+
+            skipCount = 2;
+            maxItems = 2;
+            paging = getPaging(skipCount, maxItems);
+
+            ListResponse<Group> sublistResponse = getGroups(paging, otherParams);
+
+            List<Group> expectedSublist = sublist(resp.getList(), skipCount, maxItems);
+            checkList(expectedSublist, sublistResponse.getPaging(), sublistResponse);
+        }
+
+        // -ve: check skip count.
+        {
+            getGroups(getPaging(-1, null), null, "", HttpServletResponse.SC_BAD_REQUEST);
+        }
+    }
+
+    private void testGetGroupsSorting() throws Exception
+    {
+        // orderBy=sortColumn should be the same to orderBy=sortColumn ASC
+        {
+            // paging
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+            Map<String, String> otherParams = new HashMap<>();
+
+            // Default order.
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, null);
+
+            ListResponse<Group> resp = getGroups(paging, otherParams);
+            List<Group> groups = resp.getList();
+            assertTrue("groups order not valid", groups.indexOf(groupA) < groups.indexOf(groupB));
+
+            // Ascending order.
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, true);
+
+            ListResponse<Group> respOrderAsc = getGroups(paging, otherParams);
+
+            checkList(respOrderAsc.getList(), resp.getPaging(), resp);
+        }
+
+        // Sorting should be the same regardless of implementation (canned query
+        // or postprocessing).
+        {
+            // paging
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+            Map<String, String> otherParams = new HashMap<>();
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, null);
+
+            // Get and sort groups using canned query.
+            ListResponse<Group> respCannedQuery = getGroups(paging, otherParams);
+
+            // Get and sort groups using postprocessing.
+            otherParams.put("where", "(isRoot=true)");
+            ListResponse<Group> respPostProcess = getGroups(paging, otherParams);
+
+            List<Group> expected = respCannedQuery.getList();
+            expected.retainAll(respPostProcess.getList());
+
+            checkList(expected, respPostProcess.getPaging(), respPostProcess);
+        }
+        {
+            // paging
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+            Map<String, String> otherParams = new HashMap<>();
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_ID, null);
+
+            // Get and sort groups using canned query.
+            ListResponse<Group> respCannedQuery = getGroups(paging, otherParams);
+
+            // Get and sort groups using postprocessing.
+            otherParams.put("where", "(isRoot=true)");
+            ListResponse<Group> respPostProcess = getGroups(paging, otherParams);
+
+            List<Group> expected = respCannedQuery.getList();
+            expected.retainAll(respPostProcess.getList());
+
+            checkList(expected, respPostProcess.getPaging(), respPostProcess);
+        }
+
+        // Sort by displayName.
+        {
+            // paging
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+            Map<String, String> otherParams = new HashMap<>();
+
+            // Default order.
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, true);
+
+            ListResponse<Group> resp = getGroups(paging, otherParams);
+            List<Group> groups = resp.getList();
+            assertTrue("groups order not valid", groups.indexOf(groupA) < groups.indexOf(groupB));
+        }
+
+        // Sort by id.
+        {
+            // paging
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+            Map<String, String> otherParams = new HashMap<>();
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_ID, false);
+
+            // list sites
+            ListResponse<Group> resp = getGroups(paging, otherParams);
+
+            List<Group> groups = resp.getList();
+            assertTrue("groups order not valid", groups.indexOf(groupB) < groups.indexOf(groupA));
+        }
+
+        // Multiple sort fields not allowed.
+        {
+            // paging
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+            Map<String, String> otherParams = new HashMap<>();
+            otherParams.put("orderBy", org.alfresco.rest.api.Groups.PARAM_ID + " ASC," + org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME + " ASC");
+
+            getGroups(paging, otherParams, "", HttpServletResponse.SC_BAD_REQUEST);
+        }
+
+        {
+            Group aardvark = new Group();
+            Group gecko = new Group();
+            try
+            {
+                aardvark.setId("GROUP_AARDVARK");
+                aardvark.setDisplayName("Aardvark");
+                authorityService.createAuthority(AuthorityType.GROUP, aardvark.getId());
+                authorityService.setAuthorityDisplayName(aardvark.getId(), aardvark.getDisplayName());
+
+                gecko.setId("GROUP_GECKO");
+                gecko.setDisplayName("Aaaaah, a gecko!");
+                authorityService.createAuthority(AuthorityType.GROUP, gecko.getId());
+                authorityService.setAuthorityDisplayName(gecko.getId(), gecko.getDisplayName());
+
+                // Check sorting by ID when groups have no display name (REPO-1844)
+                // We don't want the GROUP_EVERYONE group to be sorted as an empty string, for example,
+                // which is what happens when the "short" name is used for sorting.
+                Map<String, String> params = new HashMap<>();
+                addOrderBy(params, org.alfresco.rest.api.Groups.PARAM_ID, true);
+
+                ListResponse<Group> response = getGroups(getPaging(0, Integer.MAX_VALUE),
+                        params, "Couldn't get user's groups", 200);
+
+                Group groupEveryone = new Group();
+                groupEveryone.setId(PermissionService.ALL_AUTHORITIES);
+                List<Group> groups = response.getList();
+                assertFalse(groups.isEmpty());
+
+                // At time of writing, GROUP_EVERYONE is never present. When REPO-1878
+                // is implemented, GROUP_EVERYONE will be included in the results and
+                // this must be reflected in the ordering.
+                //
+                // The expected ordering, when sorting by ID ASC:
+                //
+                // GROUP_AARDVARK
+                // ...
+                // GROUP_EVERYONE
+                // ...
+                // GROUP_GECKO
+                //
+                if (groups.contains(groupEveryone))
+                {
+                    assertTrue(groups.indexOf(aardvark) < groups.indexOf(groupEveryone));
+                    assertTrue(groups.indexOf(groupEveryone) < groups.indexOf(gecko));
+                }
+
+                // The display name ordering would be reversed, i.e. "Aaaaah, a gecko!" < "Aardvark"
+                assertTrue(groups.indexOf(aardvark) < groups.indexOf(gecko));
+            }
+            finally
+            {
+                authorityService.deleteAuthority(aardvark.getId());
+                authorityService.deleteAuthority(gecko.getId());
+            }
+        }
+    }
+
+    private void testGetGroupsWithInclude() throws Exception
+    {
+        // paging
+        int maxItems = 2;
+        Paging paging = getPaging(0, maxItems);
+
+        Map<String, String> otherParams = new HashMap<>();
+
+        // Validate that by default optionally fields aren't returned.
+        {
+            // list sites
+            ListResponse<Group> resp = getGroups(paging, null);
+
+            // check results
+            assertNotNull(resp);
+            assertNotNull(resp.getList());
+            assertFalse(resp.getList().isEmpty());
+
+            assertEquals(maxItems, resp.getList().size());
+
+            resp.getList().forEach(group -> validateGroupDefaultFields(group));
+        }
+
+        // Check include parent ids.
+        {
+            otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_PARENT_IDS);
+
+            // list sites
+            ListResponse<Group> resp = getGroups(paging, otherParams);
+
+            // check results
+            assertEquals(maxItems, resp.getList().size());
+
+            resp.getList().forEach(group ->
+            {
+                assertNotNull(group);
+
+                assertNotNull(group.getParentIds());
+            });
+        }
+
+        // Check include zones.
+        {
+            otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_ZONES);
+
+            // list sites
+            ListResponse<Group> resp = getGroups(paging, otherParams);
+
+            // check results
+            assertEquals(maxItems, resp.getList().size());
+
+            resp.getList().forEach(group ->
+            {
+                assertNotNull(group);
+
+                assertNotNull(group.getZones());
+            });
+        }
+    }
+
+    private void testGetGroupsByIsRoot(boolean isRoot) throws Exception
+    {
+        // Sort params
+        Map<String, String> otherParams = new HashMap<>();
+        otherParams.put("where", "(isRoot=" + isRoot + ")");
+
+        // Paging
+        Paging paging = getPaging(0, 4);
+
+        ListResponse<Group> resp = getGroups(paging, otherParams);
+        resp.getList().forEach(group -> {
+            validateGroupDefaultFields(group);
+            assertEquals("isRoot was expected to be " + isRoot, isRoot, group.getIsRoot());
+        });
+    }
+
+    private void testGetGroupsWithZoneFilter() throws Exception
+    {
+        // Filter by zone
+        {
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+            Map<String, String> otherParams = new HashMap<>();
+            otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_ZONES);
+
+            otherParams.put("where", "(zones in ('APP.DEFAULT'))");
+
+            ListResponse<Group> response = getGroups(paging, otherParams);
+            List<Group> groups = response.getList();
+
+            assertFalse(groups.isEmpty());
+            // All groups should contain the selected zone.
+            groups.forEach(group -> assertTrue(group.getZones().contains("APP.DEFAULT")));
+        }
+
+        // Filter by zone - custom zones, "include" them in the response.
+        {
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+            Map<String, String> otherParams = new HashMap<>();
+            // Ensure predictable result ordering
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, true);
+            otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_ZONES);
+
+            otherParams.put("where", "(zones in ('APITEST.MYZONE'))");
+
+            ListResponse<Group> response = getGroups(paging, otherParams);
+            List<Group> groups = response.getList();
+
+            // We know exactly which groups are in the selected zone.
+            assertEquals(3, groups.size());
+            assertEquals(groupA, groups.get(0));
+            assertEquals(groupB, groups.get(1));
+            assertEquals(rootGroup, groups.get(2));
+            groups.forEach(group -> assertTrue(group.getZones().contains("APITEST.MYZONE")));
+
+            otherParams.put("where", "(zones in ('APITEST.ANOTHER'))");
+            response = getGroups(paging, otherParams);
+            groups = response.getList();
+
+            // We know exactly which groups are in the selected zone.
+            assertEquals(1, groups.size());
+            assertEquals(groupA, groups.get(0));
+            assertTrue(groups.get(0).getZones().contains("APITEST.MYZONE"));
+            assertTrue(groups.get(0).getZones().contains("APITEST.ANOTHER"));
+        }
+
+        // Filter without "include"-ing zones
+        {
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+            Map<String, String> otherParams = new HashMap<>();
+            // Ensure predictable result ordering
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, true);
+
+            otherParams.put("where", "(zones in ('APITEST.MYZONE'))");
+
+            assertFalse(otherParams.containsKey("include"));
+            ListResponse<Group> response = getGroups(paging, otherParams);
+            List<Group> groups = response.getList();
+
+            // We know exactly which groups are in the selected zone.
+            assertEquals(3, groups.size());
+            assertEquals(groupA, groups.get(0));
+            assertEquals(groupB, groups.get(1));
+            assertEquals(rootGroup, groups.get(2));
+            // We haven't included the zones info.
+            groups.forEach(group -> assertNull(group.getZones()));
+        }
+
+        // Filter zones while using where isRoot=true
+        // (this causes a different query path to be used)
+        {
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+            Map<String, String> otherParams = new HashMap<>();
+            // Ensure predictable result ordering
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, true);
+            otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_ZONES);
+
+            otherParams.put("where", "(isRoot=true AND zones in ('APITEST.MYZONE'))");
+
+            ListResponse<Group> response = getGroups(paging, otherParams);
+            List<Group> groups = response.getList();
+
+            assertEquals(1, groups.size());
+            assertEquals(rootGroup, groups.get(0));
+            assertTrue(groups.get(0).getZones().contains("APITEST.MYZONE"));
+
+            // Zone that doesn't exist.
+            otherParams.put("where", "(isRoot=true AND zones in ('I.DO.NOT.EXIST'))");
+            response = getGroups(paging, otherParams, "Incorrect response", 200);
+            groups = response.getList();
+            assertTrue(groups.isEmpty());
+        }
+
+        // Filter zones while using where isRoot=false
+        {
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+            Map<String, String> otherParams = new HashMap<>();
+            // Ensure predictable result ordering
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, true);
+
+            otherParams.put("where", "(isRoot=false AND zones in ('APITEST.MYZONE'))");
+
+            ListResponse<Group> response = getGroups(paging, otherParams);
+            List<Group> groups = response.getList();
+
+            assertEquals(2, groups.size());
+            assertEquals(groupA, groups.get(0));
+            assertEquals(groupB, groups.get(1));
+            // We haven't included the zones info.
+            groups.forEach(group -> assertNull(group.getZones()));
+
+            // Zone that doesn't exist.
+            otherParams.put("where", "(isRoot=false AND zones in ('I.DO.NOT.EXIST'))");
+            response = getGroups(paging, otherParams, "Incorrect response", 200);
+            groups = response.getList();
+            assertTrue(groups.isEmpty());
+        }
+
+        // -ve test: invalid zones clause
+        {
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+            Map<String, String> otherParams = new HashMap<>();
+            otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_ZONES);
+
+            // Empty zone list
+            otherParams.put("where", "(zones in ())");
+            getGroups(paging, otherParams, "Incorrect response", 400);
+
+            // Empty zone name
+            otherParams.put("where", "(zones in (''))");
+            getGroups(paging, otherParams, "Incorrect response", 400);
+
+            // Too many zones
+            otherParams.put("where", "(zones in ('APP.DEFAULT', 'APITEST.MYZONE'))");
+            getGroups(paging, otherParams, "Incorrect response", 400);
+
+            // "A series of unfortunate errors"
+            otherParams.put("where", "(zones in ('', 'APP.DEFAULT', '', 'APITEST.MYZONE'))");
+            getGroups(paging, otherParams, "Incorrect response", 400);
+
+            // OR operator not currently supported
+            otherParams.put("where", "(isRoot=true OR zones in ('APP.DEFAULT'))");
+            getGroups(paging, otherParams, "Incorrect response", 400);
+        }
+    }
+
+    private ListResponse<Group> getGroups(final PublicApiClient.Paging paging, Map<String, String> otherParams, String errorMessage, int expectedStatus) throws Exception
+    {
+        final Groups groupsProxy = publicApiClient.groups();
+        return groupsProxy.getGroups(createParams(paging, otherParams), errorMessage, expectedStatus);
+    }
+
+    private ListResponse<Group> getGroups(final PublicApiClient.Paging paging, Map<String, String> otherParams) throws Exception
+    {
+        return getGroups(paging, otherParams, "Failed to get groups", HttpServletResponse.SC_OK);
+    }
+
+    private void addOrderBy(Map<String, String> otherParams, String sortColumn, Boolean asc)
+    {
+        otherParams.put("orderBy", sortColumn + (asc != null ? " " + (asc ? SortColumn.ASCENDING : SortColumn.DESCENDING) : ""));
+    }
+
+    /**
+     * Creates authority context.
+     *
+     * @param userName
+     *            The user to run as.
+     */
+    private void createAuthorityContext(String userName) throws PublicApiException
+    {
+        String groupName = "Group_ROOT" + GUID.generate();
+
+        AuthenticationUtil.setRunAsUser(userName);
+        if (rootGroupName == null)
+        {
+            rootGroupName = authorityService.getName(AuthorityType.GROUP, groupName);
+        }
+
+        if (!authorityService.authorityExists(rootGroupName))
+        {
+            AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+
+            rootGroupName = authorityService.createAuthority(AuthorityType.GROUP, groupName);
+            authorityService.addAuthorityToZones(rootGroupName, zoneSet("APITEST.MYZONE"));
+            authorityService.setAuthorityDisplayName(rootGroupName, "Root Group");
+
+            String groupBAuthorityName = authorityService.createAuthority(AuthorityType.GROUP, "Test_GroupB" + GUID.generate());
+            authorityService.setAuthorityDisplayName(groupBAuthorityName, "B Group");
+            authorityService.addAuthority(rootGroupName, groupBAuthorityName);
+            authorityService.addAuthorityToZones(groupBAuthorityName, zoneSet("APITEST.MYZONE"));
+            when(groupBResultSetRow.getNodeRef()).thenReturn(authorityService.getAuthorityNodeRef(groupBAuthorityName));
+
+            String groupAAuthorityName = authorityService.createAuthority(AuthorityType.GROUP, "Test_GroupA" + GUID.generate());
+            authorityService.setAuthorityDisplayName(groupAAuthorityName, "A Group");
+            authorityService.addAuthority(rootGroupName, groupAAuthorityName);
+            authorityService.addAuthorityToZones(groupAAuthorityName, zoneSet("APITEST.MYZONE", "APITEST.ANOTHER"));
+            when(groupAResultSetRow.getNodeRef()).thenReturn(authorityService.getAuthorityNodeRef(groupAAuthorityName));
+
+            authorityService.addAuthority(groupAAuthorityName, user1);
+            authorityService.addAuthority(groupBAuthorityName, user2);
+
+            rootGroup = new Group();
+            rootGroup.setId(rootGroupName);
+            rootGroup.setDisplayName("Root Group");
+
+            groupA = new Group();
+            groupA.setId(groupAAuthorityName);
+            groupA.setDisplayName("A Group");
+
+            groupB = new Group();
+            groupB.setId(groupBAuthorityName);
+            groupB.setDisplayName("B Group");
+
+            groupMemberA = new GroupMember();
+            groupMemberA.setId(groupAAuthorityName);
+            groupMemberA.setMemberType(AuthorityType.GROUP.toString());
+
+            groupMemberB = new GroupMember();
+            groupMemberB.setId(groupBAuthorityName);
+            groupMemberB.setMemberType(AuthorityType.GROUP.toString());
+        }
+
+        {
+            publicApiClient.setRequestContext(new RequestContext(networkOne.getId(), networkAdmin, "admin"));
+            Person personAlice = new Person();
+            String aliceId = "alice-" + UUID.randomUUID() + "@" + networkOne.getId();
+            personAlice.setUserName(aliceId);
+            personAlice.setId(aliceId);
+            personAlice.setFirstName("Alice");
+            personAlice.setEmail("alison.smith@example.com");
+            personAlice.setPassword("password");
+            personAlice.setEnabled(true);
+            PublicApiClient.People people = publicApiClient.people();
+            people.create(personAlice);
+            personMember = new GroupMember();
+            personMember.setId(personAlice.getId());
+            personMember.setMemberType(MEMBER_TYPE_PERSON);
+        }
+    }
+
+    private Set<String> zoneSet(String... zones)
+    {
+        Set<String> zoneSet = new HashSet<>(zones.length);
+        zoneSet.addAll(Arrays.asList(zones));
+        return zoneSet;
+    }
+
+    /**
+     * Clears authority context: removes root group and all child groups.
+     */
+    private void clearAuthorityContext()
+    {
+        if (authorityService.authorityExists(rootGroupName))
+        {
+            AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+            authorityService.deleteAuthority(rootGroupName, true);
+        }
+    }
+
+    private void validateGroupDefaultFields(Group group, boolean ignoreOptionallyIncluded)
+    {
+        assertNotNull(group);
+        assertNotNull(group.getId());
+        assertNotNull(group.getDisplayName());
+        assertNotNull(group.getIsRoot());
+
+        if (!ignoreOptionallyIncluded)
+        {
+            // Optionally included.
+            assertNull(group.getParentIds());
+            assertNull(group.getZones());
+        }
+    }
+
+    private void validateGroupDefaultFields(Group group)
+    {
+        validateGroupDefaultFields(group, false);
+    }
+
+    private ListResponse<GroupMember> getGroupMembers(String groupId, final PublicApiClient.Paging paging, Map<String, String> otherParams, String errorMessage, int expectedStatus) throws Exception
+    {
+        final Groups groupsProxy = publicApiClient.groups();
+        return groupsProxy.getGroupMembers(groupId, createParams(paging, otherParams), errorMessage, expectedStatus);
+    }
+
+    private ListResponse<Group> getGroupsByPersonId(String userId, final PublicApiClient.Paging paging,
+                                                    Map<String, String> otherParams) throws Exception
+    {
+        return getGroupsByPersonId(
+                userId,
+                paging,
+                otherParams,
+                HttpServletResponse.SC_OK);
+    }
+
+    private ListResponse<Group> getGroupsByPersonId(
+            String userId,
+            final PublicApiClient.Paging paging,
+            Map<String, String> otherParams,
+            int expectedStatus) throws Exception
+    {
+        final Groups groupsProxy = publicApiClient.groups();
+        return groupsProxy.getGroupsByPersonId(
+                userId,
+                createParams(paging, otherParams),
+                "Incorrect response when getting groups for user ID " + userId,
+                expectedStatus);
+    }
+
+    private ListResponse<GroupMember> getGroupMembers(String groupId, final PublicApiClient.Paging paging, Map<String, String> otherParams) throws Exception
+    {
+        return getGroupMembers(groupId, paging, otherParams, "Failed to get group members", HttpServletResponse.SC_OK);
+    }
+
+    @Test
+    public void testGetGroupMembers() throws Exception
+    {
+        try
+        {
+            createAuthorityContext(user1);
+
+            setRequestContext(user1);
+
+            testGetGroupMembersByGroupId();
+            testGetGroupMembersSorting();
+            testGetGroupMembersSkipPaging();
+            testGetGroupsByMemberType();
+        }
+        finally
+        {
+            clearAuthorityContext();
+        }
+    }
+
+    @Test
+    public void testGetGroupsByUserId() throws Exception
+    {
+        try
+        {
+            createAuthorityContext(user1);
+            canGetGroupsForUserId();
+        }
+        finally
+        {
+            clearAuthorityContext();
+        }
+    }
+
+    private void canGetGroupsForUserId() throws Exception
+    {
+        Person personAlice;
+        {
+            publicApiClient.setRequestContext(new RequestContext(networkOne.getId(), networkAdmin, "admin"));
+            personAlice = new Person();
+            String aliceId = "alice-" + UUID.randomUUID() + "@" + networkOne.getId();
+            personAlice.setUserName(aliceId);
+            personAlice.setId(aliceId);
+            personAlice.setFirstName("Alice");
+            personAlice.setEmail("alison.smith@example.com");
+            personAlice.setPassword("password");
+            personAlice.setEnabled(true);
+            PublicApiClient.People people = publicApiClient.people();
+            people.create(personAlice);
+        }
+
+        Groups groupsProxy = publicApiClient.groups();
+
+        // As admin
+        setRequestContext(networkOne.getId(), networkAdmin, "admin");
+
+        // New user has only the one default group.
+        {
+            ListResponse<Group> groups = groupsProxy.getGroupsByPersonId(personAlice.getId(), null, "Couldn't get user's groups", 200);
+            assertEquals(1L, (long) groups.getPaging().getTotalItems());
+            Iterator<Group> it = groups.getList().iterator();
+            assertEquals(GROUP_EVERYONE, it.next().getId());
+        }
+
+        // Add the user to a couple more groups and list them.
+        {
+            AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+            authorityService.addAuthority(groupA.getId(), personAlice.getId());
+            authorityService.addAuthority(groupB.getId(), personAlice.getId());
+
+            ListResponse<Group> groups = groupsProxy.getGroupsByPersonId(personAlice.getId(), null, "Couldn't get user's groups", 200);
+            assertEquals(4L, (long) groups.getPaging().getTotalItems());
+            Iterator<Group> it = groups.getList().iterator();
+            assertEquals(groupA, it.next());
+            assertEquals(groupB, it.next());
+            assertEquals(GROUP_EVERYONE, it.next().getId());
+            assertEquals(rootGroup, it.next());
+        }
+
+        {
+            Group aardvark = new Group();
+            try
+            {
+                aardvark.setId("GROUP_AARDVARK");
+                aardvark.setDisplayName("Aardvark");
+                authorityService.createAuthority(AuthorityType.GROUP, aardvark.getId());
+                authorityService.setAuthorityDisplayName(aardvark.getId(), aardvark.getDisplayName());
+
+                Person personBob;
+                personBob = new Person();
+                String bobId = "bob-" + UUID.randomUUID() + "@" + networkOne.getId();
+                personBob.setUserName(bobId);
+                personBob.setId(bobId);
+                personBob.setFirstName("Bob");
+                personBob.setEmail("bob.cratchet@example.com");
+                personBob.setPassword("password");
+                personBob.setEnabled(true);
+                PublicApiClient.People people = publicApiClient.people();
+                people.create(personBob);
+
+                authorityService.addAuthority(aardvark.getId(), personBob.getId());
+
+                // Check sorting by ID when groups have no display name (REPO-1844)
+                // We don't want the GROUP_EVERYONE group to be sorted as an empty string, for example,
+                // which is what the comparator was doing.
+                Map<String, String> params = new HashMap<>();
+                addOrderBy(params, org.alfresco.rest.api.Groups.PARAM_ID, true);
+
+                ListResponse<Group> groups = groupsProxy.getGroupsByPersonId(personBob.getId(), params, "Couldn't get user's groups", 200);
+                assertEquals(2L, (long) groups.getPaging().getTotalItems());
+                Iterator<Group> it = groups.getList().iterator();
+                assertEquals(aardvark.getId(), it.next().getId());
+                assertEquals("GROUP_EVERYONE", it.next().getId());
+            }
+            finally
+            {
+                authorityService.deleteAuthority(aardvark.getId());
+            }
+        }
+
+        // Get network admin's groups by explicit ID.
+        {
+            ListResponse<Group> groups = groupsProxy.getGroupsByPersonId(networkAdmin, null, "Couldn't get user's groups", 200);
+            assertEquals(6L, (long) groups.getPaging().getTotalItems());
+        }
+
+        // test -me- alias (as network admin)
+        {
+            ListResponse<Group> groups = groupsProxy.getGroupsByPersonId("-me-", null, "Couldn't get user's groups", 200);
+            assertEquals(6L, (long) groups.getPaging().getCount());
+            Iterator<Group> it = groups.getList().iterator();
+            assertEquals("GROUP_ALFRESCO_ADMINISTRATORS", it.next().getId());
+        }
+
+        // Filter by isRoot
+        {
+            Map<String, String> params = new HashMap<>();
+
+            params.put("where", "(isRoot=true)");
+            ListResponse<Group> response = groupsProxy.getGroupsByPersonId("-me-", params, "Couldn't get user's groups", 200);
+            List<Group> groups = response.getList();
+            assertFalse(groups.isEmpty());
+            // All groups should be root groups.
+            groups.forEach(group -> assertTrue(group.getIsRoot()));
+
+            params.put("where", "(isRoot=false)");
+            response = groupsProxy.getGroupsByPersonId("-me-", params, "Couldn't get user's groups", 200);
+            groups = response.getList();
+            assertFalse(groups.isEmpty());
+            // All groups should be non-root groups.
+            groups.forEach(group -> assertFalse(group.getIsRoot()));
+        }
+
+        // -ve test: attempt to get groups for non-existent person
+        {
+            groupsProxy.getGroupsByPersonId("i-do-not-exist", null, "Incorrect response", 404);
+        }
+
+        // As Alice
+        setRequestContext(networkOne.getId(), personAlice.getId(), "password");
+
+        // test -me- alias as Alice
+        {
+            ListResponse<Group> groups = groupsProxy.getGroupsByPersonId("-me-", null, "Couldn't get user's groups", 200);
+            assertEquals(4L, (long) groups.getPaging().getCount());
+            Iterator<Group> it = groups.getList().iterator();
+            assertEquals(groupA, it.next());
+            assertEquals(groupB, it.next());
+            assertEquals(GROUP_EVERYONE, it.next().getId());
+            assertEquals(rootGroup, it.next());
+        }
+
+        // +ve: check skip count.
+        {
+            // Sort params
+            Map<String, String> otherParams = new HashMap<>();
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, false);
+
+            // Paging and list groups
+
+            int skipCount = 0;
+            int maxItems = 4;
+            Paging paging = getPaging(skipCount, maxItems);
+
+            ListResponse<Group> resp = getGroupsByPersonId(personAlice.getId(), paging, otherParams);
+
+            // Paging and list groups with skip count.
+
+            skipCount = 2;
+            maxItems = 2;
+            paging = getPaging(skipCount, maxItems);
+
+            ListResponse<Group> sublistResponse = getGroupsByPersonId(personAlice.getId(), paging, otherParams);
+
+            List<Group> expectedSublist = sublist(resp.getList(), skipCount, maxItems);
+            checkList(expectedSublist, sublistResponse.getPaging(), sublistResponse);
+        }
+
+        // -ve: check skip count.
+        {
+            getGroupsByPersonId(personAlice.getId(), getPaging(-1, null), null, HttpServletResponse.SC_BAD_REQUEST);
+        }
+
+        // orderBy=sortColumn should be the same to orderBy=sortColumn ASC
+        {
+            // paging
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+            Map<String, String> otherParams = new HashMap<>();
+
+            // Default order.
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, null);
+
+            ListResponse<Group> resp = getGroupsByPersonId(personAlice.getId(), paging, otherParams);
+            List<Group> groups = resp.getList();
+            assertTrue("groups order not valid", groups.indexOf(groupA) < groups.indexOf(groupB));
+
+            // Ascending order.
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, true);
+            ListResponse<Group> respOrderAsc = getGroupsByPersonId(personAlice.getId(), paging, otherParams);
+            checkList(respOrderAsc.getList(), resp.getPaging(), resp);
+        }
+
+        // Sorting should be the same regardless of implementation (canned query
+        // or postprocessing).
+        {
+            // paging
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+            Map<String, String> otherParams = new HashMap<>();
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, null);
+
+            // Get and sort groups using canned query.
+            ListResponse<Group> respCannedQuery = getGroupsByPersonId(personAlice.getId(), paging, otherParams);
+
+            // Get and sort groups using postprocessing.
+            otherParams.put("where", "(isRoot=true)");
+            ListResponse<Group> respPostProcess = getGroupsByPersonId(personAlice.getId(), paging, otherParams);
+
+            List<Group> expected = respCannedQuery.getList();
+            expected.retainAll(respPostProcess.getList());
+
+            // If this assertion fails, then the tests aren't providing any value - change them!
+            assertTrue("List doesn't contain enough items for test to be conclusive.", expected.size() > 0);
+            checkList(expected, respPostProcess.getPaging(), respPostProcess);
+        }
+
+        {
+            // paging
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+            Map<String, String> otherParams = new HashMap<>();
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_ID, null);
+
+            // Get and sort groups using canned query.
+            ListResponse<Group> respCannedQuery = getGroupsByPersonId(personAlice.getId(), paging, otherParams);
+
+            // Get and sort groups using postprocessing.
+            otherParams.put("where", "(isRoot=true)");
+            ListResponse<Group> respPostProcess = getGroupsByPersonId(personAlice.getId(), paging, otherParams);
+
+            List<Group> expected = respCannedQuery.getList();
+            expected.retainAll(respPostProcess.getList());
+
+            // If this assertion fails, then the tests aren't providing any value - change them!
+            assertTrue("List doesn't contain enough items for test to be conclusive.", expected.size() > 0);
+            checkList(expected, respPostProcess.getPaging(), respPostProcess);
+        }
+
+        // Sort by id.
+        {
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+            Map<String, String> otherParams = new HashMap<>();
+
+            Group groupEveryone = new Group();
+            groupEveryone.setId(PermissionService.ALL_AUTHORITIES);
+
+            // Sort by ID ascending
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_ID, true);
+            ListResponse<Group> resp = getGroupsByPersonId(personAlice.getId(), paging, otherParams);
+            assertEquals(4, resp.getList().size());
+            Iterator<Group> it = resp.getList().iterator();
+            assertEquals(groupEveryone, it.next()); // GROUP_EVERYONE
+            assertEquals(rootGroup, it.next());     // GROUP_Group_ROOT<UUID>
+            assertEquals(groupA, it.next());        // GROUP_Test_GroupA<UUID>
+            assertEquals(groupB, it.next());        // GROUP_Test_GroupB<UUID>
+
+            // Sort by ID descending
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_ID, false);
+            resp = getGroupsByPersonId(personAlice.getId(), paging, otherParams);
+            assertEquals(4, resp.getList().size());
+            it = resp.getList().iterator();
+            assertEquals(groupB, it.next());        // GROUP_Test_GroupB<UUID>
+            assertEquals(groupA, it.next());        // GROUP_Test_GroupA<UUID>
+            assertEquals(rootGroup, it.next());     // GROUP_Group_ROOT<UUID>
+            assertEquals(groupEveryone, it.next()); // GROUP_EVERYONE
+        }
+
+        // Multiple sort fields not allowed.
+        {
+            // paging
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+            Map<String, String> otherParams = new HashMap<>();
+            otherParams.put("orderBy", org.alfresco.rest.api.Groups.PARAM_ID + " ASC," + org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME + " ASC");
+
+            getGroupsByPersonId(personAlice.getId(), paging, otherParams, HttpServletResponse.SC_BAD_REQUEST);
+        }
+
+        // Check include parent ids.
+        {
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+            Map<String, String> otherParams = new HashMap<>();
+            otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_PARENT_IDS);
+
+            ListResponse<Group> resp = getGroupsByPersonId(personAlice.getId(), paging, otherParams);
+
+            assertEquals(4, resp.getList().size());
+
+            Iterator<Group> it = resp.getList().iterator();
+
+            Group group = it.next();
+            assertEquals(groupA.getId(), group.getId());
+            assertEquals(1, group.getParentIds().size());
+            assertTrue(group.getParentIds().contains(rootGroup.getId()));
+
+            group = it.next();
+            assertEquals(groupB.getId(), group.getId());
+            assertEquals(1, group.getParentIds().size());
+            assertTrue(group.getParentIds().contains(rootGroup.getId()));
+
+            group = it.next();
+            assertEquals(PermissionService.ALL_AUTHORITIES, group.getId());
+            assertEquals(0, group.getParentIds().size());
+
+            group = it.next();
+            assertEquals(rootGroup.getId(), group.getId());
+            assertEquals(0, group.getParentIds().size());
+        }
+
+        // Filter by zone, use the -me- alias.
+        {
+            Map<String, String> params = new HashMap<>();
+            params.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_ZONES);
+
+            params.put("where", "(zones in ('APP.DEFAULT'))");
+
+            // Use the -me- alias
+            ListResponse<Group> response = groupsProxy.
+                    getGroupsByPersonId("-me-", params, "Couldn't get user's groups", 200);
+            List<Group> groups = response.getList();
+
+            assertFalse(groups.isEmpty());
+            // All groups should contain the selected zone.
+            groups.forEach(group -> assertTrue(group.getZones().contains("APP.DEFAULT")));
+        }
+
+        // Filter by zone, use the -me- alias.
+        {
+            Map<String, String> params = new HashMap<>();
+            params.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_ZONES);
+
+            params.put("where", "(zones in ('APITEST.MYZONE'))");
+
+            // Use the -me- alias
+            ListResponse<Group> response = groupsProxy.
+                    getGroupsByPersonId("-me-", params, "Couldn't get user's groups", 200);
+            List<Group> groups = response.getList();
+
+            assertEquals(3, groups.size());
+            // All groups should contain the selected zone.
+            groups.forEach(group -> assertTrue(group.getZones().contains("APITEST.MYZONE")));
+        }
+
+        // Filter by zone - use the person's ID, without "include"-ing zones
+        {
+            Map<String, String> params = new HashMap<>();
+            params.put("where", "(zones in ('APITEST.ANOTHER'))");
+
+            ListResponse<Group> response = groupsProxy.
+                    getGroupsByPersonId(personAlice.getId(), params, "Couldn't get user's groups", 200);
+            List<Group> groups = response.getList();
+
+            assertEquals(1, groups.size());
+            // We haven't included the zone info
+            groups.forEach(group -> assertNull(group.getZones()));
+        }
+
+        // Filter zones while using where isRoot=true
+        // (this causes a different query path to be used)
+        {
+            Map<String, String> otherParams = new HashMap<>();
+            // Ensure predictable result ordering
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, true);
+            otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_ZONES);
+
+            otherParams.put("where", "(isRoot=true AND zones in ('APITEST.MYZONE'))");
+
+            ListResponse<Group> response = groupsProxy.
+                    getGroupsByPersonId("-me-", otherParams, "Unexpected response", 200);
+            List<Group> groups = response.getList();
+
+            assertEquals(1, groups.size());
+            assertEquals(rootGroup, groups.get(0));
+            assertTrue(groups.get(0).getZones().contains("APITEST.MYZONE"));
+
+            // Zone that doesn't exist.
+            otherParams.put("where", "(isRoot=true AND zones in ('I.DO.NOT.EXIST'))");
+            response = groupsProxy.
+                    getGroupsByPersonId("-me-", otherParams, "Unexpected response", 200);
+            groups = response.getList();
+            assertTrue(groups.isEmpty());
+        }
+
+        // Filter zones while using where isRoot=false
+        {
+            Map<String, String> otherParams = new HashMap<>();
+            // Ensure predictable result ordering
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, true);
+
+            otherParams.put("where", "(isRoot=false AND zones in ('APITEST.MYZONE'))");
+
+            ListResponse<Group> response = groupsProxy.
+                    getGroupsByPersonId("-me-", otherParams, "Unexpected response", 200);
+            List<Group> groups = response.getList();
+
+            assertEquals(2, groups.size());
+            assertEquals(groupA, groups.get(0));
+            assertEquals(groupB, groups.get(1));
+            // We haven't included the zones info.
+            groups.forEach(group -> assertNull(group.getZones()));
+
+            // Zone that doesn't exist.
+            otherParams.put("where", "(isRoot=false AND zones in ('I.DO.NOT.EXIST'))");
+            response = groupsProxy.
+                    getGroupsByPersonId("-me-", otherParams, "Unexpected response", 200);
+            groups = response.getList();
+            assertTrue(groups.isEmpty());
+        }
+
+        // -ve test: invalid zones clause
+        {
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+            Map<String, String> otherParams = new HashMap<>();
+            otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_ZONES);
+
+            // Empty zone list
+            otherParams.put("where", "(zones in ())");
+            groupsProxy.getGroupsByPersonId(personAlice.getId(), otherParams, "Incorrect response", 400);
+
+            // Empty zone name
+            otherParams.put("where", "(zones in (''))");
+            groupsProxy.getGroupsByPersonId(personAlice.getId(), otherParams, "Incorrect response", 400);
+
+            // Too many zones
+            otherParams.put("where", "(zones in ('APP.DEFAULT', 'APITEST.MYZONE'))");
+            groupsProxy.getGroupsByPersonId(personAlice.getId(), otherParams, "Incorrect response", 400);
+
+            // "A series of unfortunate errors"
+            otherParams.put("where", "(zones in ('', 'APP.DEFAULT', '', 'APITEST.MYZONE'))");
+            groupsProxy.getGroupsByPersonId(personAlice.getId(), otherParams, "Incorrect response", 400);
+
+            // OR operator not currently supported
+            otherParams.put("where", "(isRoot=true OR zones in ('APP.DEFAULT'))");
+            groupsProxy.getGroupsByPersonId(personAlice.getId(), otherParams, "Incorrect response", 400);
+        }
+    }
+
+    private void testGetGroupMembersByGroupId() throws Exception
+    {
+        Paging paging = getPaging(0, 4);
+
+        getGroupMembers("", paging, null, "", HttpServletResponse.SC_BAD_REQUEST);
+        getGroupMembers("invalidGroupId", paging, null, "", HttpServletResponse.SC_NOT_FOUND);
+        getGroupMembers(GROUP_EVERYONE, paging, null, "", HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+    }
+
+    private void testGetGroupMembersSorting() throws Exception
+    {
+        // orderBy=sortColumn should be the same to orderBy=sortColumn ASC
+        {
+            // paging
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+            Map<String, String> otherParams = new HashMap<>();
+
+            // Default order.
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, null);
+
+            when(iterator.hasNext()).thenReturn(true, true,false);
+            when(iterator.next()).thenReturn(groupBResultSetRow, groupAResultSetRow);
+            ListResponse<GroupMember> resp = getGroupMembers(rootGroupName, paging, otherParams);
+            List<GroupMember> groupMembers = resp.getList();
+            assertTrue("group members order not valid", groupMembers.indexOf(groupMemberA) < groupMembers.indexOf(groupMemberB));
+
+            // Ascending order
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, true);
+
+            when(iterator.hasNext()).thenReturn(true, true,false);
+            when(iterator.next()).thenReturn(groupBResultSetRow, groupAResultSetRow);
+            ListResponse<GroupMember> respOrderAsc = getGroupMembers(rootGroupName, paging, otherParams);
+
+            checkList(respOrderAsc.getList(), resp.getPaging(), resp);
+        }
+
+        // Sort by displayName.
+        {
+            // paging
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+            Map<String, String> otherParams = new HashMap<>();
+
+            // Default order.
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, true);
+
+            when(iterator.hasNext()).thenReturn(true, true,false);
+            when(iterator.next()).thenReturn(groupBResultSetRow, groupAResultSetRow);
+            ListResponse<GroupMember> resp = getGroupMembers(rootGroupName, paging, otherParams);
+            List<GroupMember> groupMembers = resp.getList();
+            assertTrue("group members order not valid", groupMembers.indexOf(groupMemberA) < groupMembers.indexOf(groupMemberB));
+        }
+
+        // Sort by id.
+        {
+            // paging
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+            Map<String, String> otherParams = new HashMap<>();
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_ID, false);
+
+            when(iterator.hasNext()).thenReturn(true, true,false);
+            when(iterator.next()).thenReturn(groupBResultSetRow, groupAResultSetRow);
+            // list sites
+            ListResponse<GroupMember> resp = getGroupMembers(rootGroupName, paging, otherParams);
+
+            List<GroupMember> groupMembers = resp.getList();
+            assertTrue("group members order not valid", groupMembers.indexOf(groupMemberB) < groupMembers.indexOf(groupMemberA));
+        }
+
+        // Multiple sort fields not allowed.
+        {
+            // paging
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+            Map<String, String> otherParams = new HashMap<>();
+            otherParams.put("orderBy", org.alfresco.rest.api.Groups.PARAM_ID + " ASC," + org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME + " ASC");
+
+            when(iterator.hasNext()).thenReturn(true, true,false);
+            when(iterator.next()).thenReturn(groupBResultSetRow, groupAResultSetRow);
+            getGroupMembers(rootGroupName, paging, otherParams, "", HttpServletResponse.SC_BAD_REQUEST);
+        }
+    }
+
+    private void testGetGroupMembersSkipPaging() throws Exception
+    {
+        // +ve: check skip count.
+        {
+            // Sort params
+            Map<String, String> otherParams = new HashMap<>();
+            addOrderBy(otherParams, org.alfresco.rest.api.Groups.PARAM_DISPLAY_NAME, false);
+
+            // Paging and list groups
+
+            int skipCount = 0;
+            int maxItems = 2;
+            Paging paging = getPaging(skipCount, maxItems);
+
+            when(iterator.hasNext()).thenReturn(true, true,false);
+            when(iterator.next()).thenReturn(groupBResultSetRow, groupAResultSetRow);
+            ListResponse<GroupMember> resp = getGroupMembers(rootGroupName, paging, otherParams);
+
+            // Paging and list groups with skip count.
+
+            skipCount = 1;
+            maxItems = 1;
+            paging = getPaging(skipCount, maxItems);
+
+            when(iterator.hasNext()).thenReturn(true, true,false);
+            when(iterator.next()).thenReturn(groupBResultSetRow, groupAResultSetRow);
+            ListResponse<GroupMember> sublistResponse = getGroupMembers(rootGroupName, paging, otherParams);
+
+            List<GroupMember> expectedSublist = sublist(resp.getList(), skipCount, maxItems);
+            checkList(expectedSublist, sublistResponse.getPaging(), sublistResponse);
+        }
+
+        // -ve: check skip count.
+        {
+            getGroupMembers(rootGroupName, getPaging(-1, null), null, "", HttpServletResponse.SC_BAD_REQUEST);
+        }
+    }
+
+    private void testGetGroupsByMemberType() throws Exception
+    {
+        testGetGroupsByMemberType(rootGroupName, org.alfresco.rest.api.Groups.PARAM_MEMBER_TYPE_GROUP);
+        testGetGroupsByMemberType(groupB.getId(), org.alfresco.rest.api.Groups.PARAM_MEMBER_TYPE_PERSON);
+
+        // Invalid member type
+        {
+            Map<String, String> otherParams = new HashMap<>();
+            otherParams.put("where", "(memberType=invalidMemberType)");
+
+            getGroupMembers(rootGroupName, getPaging(0, 4), otherParams, "", HttpServletResponse.SC_BAD_REQUEST);
+        }
+    }
+
+    private void testGetGroupsByMemberType(String groupId, String memberType) throws Exception
+    {
+        // Sort params
+        Map<String, String> otherParams = new HashMap<>();
+        otherParams.put("where", "(memberType=" + memberType + ")");
+
+        // Paging
+        Paging paging = getPaging(0, 4);
+
+        ListResponse<GroupMember> resp = getGroupMembers(groupId, paging, otherParams);
+        resp.getList().forEach(groupMember -> {
+            validateGroupMemberDefaultFields(groupMember);
+            assertEquals("memberType was expected to be " + memberType, memberType, groupMember.getMemberType());
+        });
+    }
+
+    private void validateGroupMemberDefaultFields(GroupMember groupMember)
+    {
+        assertNotNull(groupMember);
+        assertNotNull(groupMember.getId());
+        assertNotNull(groupMember.getDisplayName());
+        assertNotNull(groupMember.getMemberType());
+    }
+
+    @Test
+    public void testGetGroup() throws Exception
+    {
+        final Groups groupsProxy = publicApiClient.groups();
+        try
+        {
+            createAuthorityContext(user1);
+
+            setRequestContext(user1);
+
+            // Check invalid group id.
+            {
+                groupsProxy.getGroup("invalidGroupId", HttpServletResponse.SC_NOT_FOUND);
+            }
+
+            {
+                Group group = groupsProxy.getGroup(groupA.getId());
+                validateGroupDefaultFields(group);
+            }
+
+            {
+                Map<String, String> otherParams = new HashMap<>();
+                otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_PARENT_IDS);
+
+                Group group = groupsProxy.getGroup(groupA.getId(), otherParams, HttpServletResponse.SC_OK);
+                validateGroupDefaultFields(group, true);
+                assertNotNull(group.getParentIds());
+                assertNull(group.getZones());
+            }
+
+            {
+                Map<String, String> otherParams = new HashMap<>();
+                otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_ZONES);
+
+                Group group = groupsProxy.getGroup(groupA.getId(), otherParams, HttpServletResponse.SC_OK);
+                validateGroupDefaultFields(group, true);
+                assertNull(group.getParentIds());
+                assertNotNull(group.getZones());
+            }
+
+            // Support GROUP_EVERYONE
+            {
+                Group group = groupsProxy.getGroup(GROUP_EVERYONE, null, HttpServletResponse.SC_OK);
+                assertNotNull(group);
+                assertNotNull(group.getId());
+                assertNotNull(group.getIsRoot());
+            }
+        }
+        finally
+        {
+            clearAuthorityContext();
+        }
+    }
+
+    @Test
+    public void testCreateGroup() throws Exception
+    {
+        final Groups groupsProxy = publicApiClient.groups();
+
+        // User without admin rights can't create a group.
+        {
+            setRequestContext(user1);
+
+            Group group = generateGroup();
+            groupsProxy.createGroup(group, null, HttpServletResponse.SC_FORBIDDEN);
+        }
+
+        // Invalid auth.
+        {
+            setRequestContext(networkOne.getId(), GUID.generate(), "password");
+            groupsProxy.createGroup(generateGroup(), null, HttpServletResponse.SC_UNAUTHORIZED);
+        }
+
+        // Create group and subgroup.
+        {
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+            Map<String, String> otherParams = new HashMap<>();
+            otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_PARENT_IDS);
+
+            Group group = generateGroup();
+
+            Group createdGroup01 = groupsProxy.createGroup(group, null, HttpServletResponse.SC_CREATED);
+
+            assertNotNull(createdGroup01);
+            assertNotNull(createdGroup01.getId());
+            assertTrue(createdGroup01.getIsRoot());
+            assertNull(createdGroup01.getParentIds());
+
+            Set<String> subGroup01Parents = new HashSet<>();
+            subGroup01Parents.add(createdGroup01.getId());
+
+            Group subGroup01 = generateGroup();
+            subGroup01.setParentIds(subGroup01Parents);
+
+            Group createdSubGroup01 = groupsProxy.createGroup(subGroup01, otherParams, HttpServletResponse.SC_CREATED);
+            assertNotNull(createdSubGroup01);
+            assertNotNull(createdSubGroup01.getId());
+            assertFalse(createdSubGroup01.getIsRoot());
+            assertNotNull(createdSubGroup01.getParentIds());
+            assertEquals(subGroup01Parents, createdSubGroup01.getParentIds());
+        }
+
+        // Group id is missing.
+        {
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+            Group group = new Group();
+            groupsProxy.createGroup(group, null, HttpServletResponse.SC_BAD_REQUEST);
+        }
+
+        // Create group with an id that contains invalid characters {'/', '\\', '\n', '\r', '"'} should return an error.
+        {
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+            char[] invalidCharacters = {'/', '\\', '\n', '\r', '"'};
+            for (char invalidCharacter : invalidCharacters)
+            {
+                Group group = new Group();
+                group.setId(invalidCharacter + "test" + invalidCharacter);
+                groupsProxy.createGroup(group, null, HttpServletResponse.SC_BAD_REQUEST);
+            }
+        }
+
+        // Id clashes with an existing group.
+        {
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+            Group group = generateGroup();
+
+            groupsProxy.createGroup(group, null, HttpServletResponse.SC_CREATED);
+            groupsProxy.createGroup(group, null, HttpServletResponse.SC_CONFLICT);
+        }
+
+        // Create subgroup with invalid parent.
+        {
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+            Map<String, String> otherParams = new HashMap<>();
+            otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_PARENT_IDS);
+
+            Set<String> subGroupParents = new HashSet<>();
+            subGroupParents.add("invalidId");
+
+            Group subGroup = generateGroup();
+            subGroup.setParentIds(subGroupParents);
+
+            groupsProxy.createGroup(subGroup, otherParams, HttpServletResponse.SC_NOT_FOUND);
+        }
+    }
+
+    @Test
+    public void testCreateGroupMembers() throws PublicApiException
+    {
+        final Groups groupsProxy = publicApiClient.groups();
+
+        try
+        {
+            createAuthorityContext(user1);
+
+            // +ve tests
+            // Create a group membership (for a existing person and a sub-group)
+            // within a group groupId
+            {
+                // Add person as groupB member
+                groupsProxy.createGroupMember(groupB.getId(), personMember, HttpServletResponse.SC_CREATED);
+                // Add group as groupB sub-group
+                groupsProxy.createGroupMember(groupB.getId(), groupMemberA, HttpServletResponse.SC_CREATED);
+            }
+
+            // If the added sub-group was previously a root group then it
+            // becomes a non-root group since it now has a parent.
+            {
+                // create a group without parent
+                Group groupRoot = generateGroup();
+                Group groupRootCreated = groupsProxy.createGroup(groupRoot, null, HttpServletResponse.SC_CREATED);
+                assertTrue("Group was expected to be root.", groupRootCreated.getIsRoot());
+                GroupMember groupMember = new GroupMember();
+                groupMember.setId(groupRootCreated.getId());
+                groupMember.setMemberType(MEMBER_TYPE_GROUP);
+
+                groupsProxy.createGroupMember(groupB.getId(), groupMember, HttpServletResponse.SC_CREATED);
+                Group subGroup = groupsProxy.getGroup(groupMember.getId());
+                assertFalse("Group was expected to be sub-group.", subGroup.getIsRoot());
+            }
+
+            // -ve tests
+            // Id clashes with an existing group member
+            {
+                //Add a group member that has been already added
+                groupsProxy.createGroupMember(groupB.getId(), groupMemberA, HttpServletResponse.SC_CONFLICT);
+            }
+
+            // Not allowed to modify a GROUP_EVERYONE member.
+            {
+                groupsProxy.createGroupMember(GROUP_EVERYONE, groupMemberA, HttpServletResponse.SC_CONFLICT);
+            }
+
+            // Person or group with given id does not exists
+            {
+                GroupMember invalidIdGroupMember = new GroupMember();
+                invalidIdGroupMember.setId("invalidPersonId-" + GUID.generate());
+                invalidIdGroupMember.setMemberType(MEMBER_TYPE_PERSON);
+                groupsProxy.createGroupMember(groupA.getId(), invalidIdGroupMember, HttpServletResponse.SC_NOT_FOUND);
+                invalidIdGroupMember.setMemberType(MEMBER_TYPE_GROUP);
+                groupsProxy.createGroupMember(groupA.getId(), invalidIdGroupMember, HttpServletResponse.SC_NOT_FOUND);
+            }
+
+            // Invalid group Id
+            {
+                groupsProxy.createGroupMember("invalidGroupId", groupMemberA, HttpServletResponse.SC_NOT_FOUND);
+            }
+
+            // Invalid group member
+            {
+                GroupMember invalidGroupMember = new GroupMember();
+                groupsProxy.createGroupMember(groupA.getId(), invalidGroupMember, HttpServletResponse.SC_BAD_REQUEST);
+
+                // Member type still missing
+                invalidGroupMember.setId("Test_" + GUID.generate());
+                groupsProxy.createGroupMember(groupA.getId(), invalidGroupMember, HttpServletResponse.SC_BAD_REQUEST);
+                // invalid member type
+                invalidGroupMember.setMemberType("invalidMemberType");
+                groupsProxy.createGroupMember(groupA.getId(), invalidGroupMember, HttpServletResponse.SC_BAD_REQUEST);
+            }
+
+            // Validation tests
+            {
+                // Add group as groupB sub-group with member id null
+                personMember.setId(null);
+                groupsProxy.createGroupMember(groupB.getId(), personMember, HttpServletResponse.SC_BAD_REQUEST);
+                // Add group as groupB sub-group with member display name null
+                personMember.setDisplayName(null);
+                groupsProxy.createGroupMember(groupB.getId(), personMember, HttpServletResponse.SC_BAD_REQUEST);
+                // Add group as groupB sub-group with member type null
+                personMember.setMemberType(null);
+                groupsProxy.createGroupMember(groupB.getId(), personMember, HttpServletResponse.SC_BAD_REQUEST);
+            }
+
+            // Add group member with a different type from the existing one
+            {
+                // Add person as groupB member with member type GROUP
+                personMember.setMemberType(MEMBER_TYPE_GROUP);
+                groupsProxy.createGroupMember(groupB.getId(), personMember, HttpServletResponse.SC_BAD_REQUEST);
+                // Add group as groupB sub-group with member type PERSON
+                groupMemberA.setMemberType(MEMBER_TYPE_PERSON);
+                groupsProxy.createGroupMember(groupB.getId(), groupMemberA, HttpServletResponse.SC_BAD_REQUEST);
+            }
+
+            // User does not have admin permission to create a group membership
+            {
+                setRequestContext(user1);
+                groupsProxy.createGroupMember(groupB.getId(), groupMemberB, HttpServletResponse.SC_FORBIDDEN);
+            }
+            //Authentication failed
+            {
+                setRequestContext(networkOne.getId(), GUID.generate(), "password");
+                groupsProxy.createGroupMember(groupB.getId(), groupMemberB, HttpServletResponse.SC_UNAUTHORIZED);
+            }
+
+        }
+        finally
+        {
+            clearAuthorityContext();
+        }
+    }
+
+    @Test
+    public void testUpdateGroup() throws Exception
+    {
+        final Groups groupsProxy = publicApiClient.groups();
+
+        Map<String, String> otherParams = new HashMap<>();
+        otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_PARENT_IDS);
+
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+        Group group = groupsProxy.createGroup(generateGroup(), null, HttpServletResponse.SC_CREATED);
+
+        Set<String> subGroupParents = new HashSet<>();
+        subGroupParents.add(group.getId());
+
+        Group generatedSubGroup = generateGroup();
+        generatedSubGroup.setParentIds(subGroupParents);
+
+        Group subGroup = groupsProxy.createGroup(generatedSubGroup, otherParams, HttpServletResponse.SC_CREATED);
+
+        // User without admin rights can't update a group.
+        {
+            setRequestContext(user1);
+            groupsProxy.updateGroup(group.getId(), new Group(), null, HttpServletResponse.SC_FORBIDDEN);
+        }
+
+        // Invalid auth.
+        {
+            setRequestContext(networkOne.getId(), GUID.generate(), "password");
+            groupsProxy.updateGroup(group.getId(), new Group(), null, HttpServletResponse.SC_UNAUTHORIZED);
+        }
+
+        // Update group and subgroup.
+        {
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+
+            String displayName = "newDisplayName";
+
+            Group mySubGroup = new Group();
+            mySubGroup.setDisplayName(displayName);
+
+            Group updateGroup = groupsProxy.updateGroup(subGroup.getId(), mySubGroup, otherParams, HttpServletResponse.SC_OK);
+
+            // Validate default response and additional information (parentIds).
+            assertNotNull(updateGroup);
+            assertNotNull(updateGroup.getId());
+            assertFalse(updateGroup.getIsRoot());
+            assertNotNull(updateGroup.getParentIds());
+
+            // Check that only display name changed.
+            assertEquals(displayName, updateGroup.getDisplayName());
+
+            // Check that nothing else changed.
+            assertEquals(subGroup.getId(), updateGroup.getId());
+            assertEquals(subGroup.getIsRoot(), updateGroup.getIsRoot());
+            assertEquals(subGroup.getParentIds(), updateGroup.getParentIds());
+        }
+
+        // Group id doesn't exist.
+        {
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+            groupsProxy.updateGroup("invalidId", group, null, HttpServletResponse.SC_NOT_FOUND);
+        }
+
+        // It isn't allowed to update GROUP_EVERYONE.
+        {
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+            Group myGroup = new Group();
+            myGroup.setDisplayName("newDisplayName");
+
+            groupsProxy.updateGroup(GROUP_EVERYONE, myGroup, null, HttpServletResponse.SC_CONFLICT);
+        }
+    }
+
+    @Test
+    public void testDeleteGroup() throws Exception
+    {
+        final Groups groupsProxy = publicApiClient.groups();
+
+        Map<String, String> otherParams = new HashMap<>();
+        otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_PARENT_IDS);
+
+        setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+        Group group = groupsProxy.createGroup(generateGroup(), otherParams, HttpServletResponse.SC_CREATED);
+
+        // User without admin rights can't delete a group.
+        {
+            setRequestContext(user1);
+
+            groupsProxy.deleteGroup(group.getId(), false, HttpServletResponse.SC_FORBIDDEN);
+        }
+
+        // Invalid auth.
+        {
+            setRequestContext(networkOne.getId(), GUID.generate(), "password");
+            groupsProxy.deleteGroup("invalidId", false, HttpServletResponse.SC_UNAUTHORIZED);
+        }
+
+        // Group id doesn't exist.
+        {
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+            groupsProxy.deleteGroup("GROUP_invalidId", false, HttpServletResponse.SC_NOT_FOUND);
+        }
+
+        // Trying to modify a fixed authority.
+        {
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+            groupsProxy.deleteGroup(GROUP_EVERYONE, false, HttpServletResponse.SC_CONFLICT);
+        }
+
+        // Trying to delete a person.
+        {
+            setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+
+            groupsProxy.deleteGroup(user1, false, HttpServletResponse.SC_BAD_REQUEST);
+        }
+
+        {
+            Group groupLevel1 = groupsProxy.createGroup(generateGroup(), otherParams, HttpServletResponse.SC_CREATED);
+            Group groupLevel2 = groupsProxy.createGroup(generateSubGroup(groupLevel1), otherParams, HttpServletResponse.SC_CREATED);
+            Group groupLevel3 = groupsProxy.createGroup(generateSubGroup(groupLevel2), otherParams, HttpServletResponse.SC_CREATED);
+
+            // Delete the primary root (no cascade)
+            groupsProxy.deleteGroup(groupLevel1.getId(), false, HttpServletResponse.SC_NO_CONTENT);
+            groupsProxy.getGroup(groupLevel1.getId(), HttpServletResponse.SC_NOT_FOUND);
+
+            // Check that second level group is now root.
+            groupLevel2 = groupsProxy.getGroup(groupLevel2.getId(), HttpServletResponse.SC_OK);
+            assertTrue(groupLevel2.getIsRoot());
+
+            // Check that third level group wasn't deleted.
+            groupsProxy.getGroup(groupLevel3.getId(), HttpServletResponse.SC_OK);
+
+            // Delete new root with cascade.
+            groupsProxy.deleteGroup(groupLevel2.getId(), true, HttpServletResponse.SC_NO_CONTENT);
+
+            // Check that delete with cascade worked.
+            groupsProxy.getGroup(groupLevel2.getId(), HttpServletResponse.SC_NOT_FOUND);
+            groupsProxy.getGroup(groupLevel3.getId(), HttpServletResponse.SC_NOT_FOUND);
+        }
+    }
+
+    @Test
+    public void testDeleteGroupMembership() throws Exception
+    {
+        final Groups groupsProxy = publicApiClient.groups();
+
+        try
+        {
+            createAuthorityContext(user1);
+
+            {
+                Map<String, String> otherParams = new HashMap<>();
+                otherParams.put("include", org.alfresco.rest.api.Groups.PARAM_INCLUDE_PARENT_IDS);
+                Group createdTestGroup = groupsProxy.createGroup(generateGroup(), null, HttpServletResponse.SC_CREATED);
+                // Add new created group to groupA
+                GroupMember groupMember = new GroupMember();
+                groupMember.setId(createdTestGroup.getId());
+                groupMember.setMemberType(MEMBER_TYPE_GROUP);
+                groupsProxy.createGroupMember(groupA.getId(), groupMember, HttpServletResponse.SC_CREATED);
+
+                // If a removed sub-group no longer has any parent groups then
+                // it becomes a root group.
+                assertFalse(groupsProxy.getGroup(groupMember.getId(), otherParams, HttpServletResponse.SC_OK).getParentIds().isEmpty());
+                groupsProxy.deleteGroupMembership(groupA.getId(), groupMember.getId(), HttpServletResponse.SC_NO_CONTENT);
+                assertTrue(groupsProxy.getGroup(groupMember.getId(), otherParams, HttpServletResponse.SC_OK).getParentIds().isEmpty());
+            }
+
+            {
+                // Add new a person as a member of groupA
+                groupsProxy.createGroupMember(groupA.getId(), personMember, HttpServletResponse.SC_CREATED);
+                ListResponse<Group> groups = groupsProxy.getGroupsByPersonId(personMember.getId(), null, "Cannot retrieve user groups", 200);
+                assertEquals(3L, (long) groups.getPaging().getTotalItems());
+                Iterator<Group> it = groups.getList().iterator();
+                assertEquals(groupA, it.next());
+                assertEquals(GROUP_EVERYONE, it.next().getId());
+                assertEquals(rootGroup, it.next());
+                groupsProxy.deleteGroupMembership(groupA.getId(), personMember.getId(), HttpServletResponse.SC_NO_CONTENT);
+                groups = groupsProxy.getGroupsByPersonId(personMember.getId(), null, "Cannot retrieve user groups", 200);
+                assertEquals(1L, (long) groups.getPaging().getTotalItems());
+                it = groups.getList().iterator();
+                assertEquals(GROUP_EVERYONE, it.next().getId());
+            }
+
+            // -ve tests
+            // Group id or group member id do not exist.
+            {
+                groupsProxy.deleteGroupMembership("invalidGroupId", groupMemberA.getId(), HttpServletResponse.SC_NOT_FOUND);
+                groupsProxy.deleteGroupMembership(groupA.getId(), "invalidGroupMemberId", HttpServletResponse.SC_NOT_FOUND);
+            }
+
+            // Not allowed to delete member of GROUP_EVERYONE.
+            {
+                groupsProxy.deleteGroupMembership(GROUP_EVERYONE, groupMemberA.getId(), HttpServletResponse.SC_CONFLICT);
+            }
+
+            // Removing a group that is not a member (REPO-1943)
+            {
+                groupsProxy.deleteGroupMembership(groupB.getId(), personMember.getId(), HttpServletResponse.SC_NOT_FOUND);
+            }
+
+            // Authentication failed
+            {
+                setRequestContext(networkOne.getId(), GUID.generate(), "password");
+                groupsProxy.deleteGroupMembership(groupA.getId(), groupMemberA.getId(), HttpServletResponse.SC_UNAUTHORIZED);
+            }
+
+            // User does not have permission to delete a group membership
+            {
+                setRequestContext(networkOne.getId(), networkAdmin, DEFAULT_ADMIN_PWD);
+                groupsProxy.createGroupMember(groupA.getId(), personMember, HttpServletResponse.SC_CREATED);
+                setRequestContext(user1);
+                groupsProxy.deleteGroupMembership(groupA.getId(), personMember.getId(), HttpServletResponse.SC_FORBIDDEN);
+            }
+        }
+        finally
+        {
+            clearAuthorityContext();
+        }
+    }
+
+    private Group generateGroup()
+    {
+        Group group = new Group();
+        group.setId("TST" + GUID.generate());
+
+        return group;
+    }
+
+    private Group generateSubGroup(Group parentGroup)
+    {
+
+        Set<String> subGroupParents = new HashSet<>();
+        if (parentGroup.getParentIds() != null && !parentGroup.getParentIds().isEmpty())
+        {
+            subGroupParents.addAll(parentGroup.getParentIds());
+        }
+        subGroupParents.add(parentGroup.getId());
+
+        Group subGroup = generateGroup();
+        subGroup.setParentIds(subGroupParents);
+
+        return subGroup;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/ModulePackageTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/ModulePackageTest.java
new file mode 100644
index 00000000000..9f1f76ca5e6
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/ModulePackageTest.java
@@ -0,0 +1,66 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.*;
+
+import org.alfresco.repo.module.ModuleDetailsImpl;
+import org.alfresco.repo.module.ModuleDetailsImplTest;
+import org.alfresco.rest.api.model.ModulePackage;
+import org.alfresco.service.cmr.module.ModuleDetails;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Properties;
+
+/**
+ * Basic tests for taking ModuleDetailsImpl and representing it as a ModulePackage class.
+ * @author Gethin James.
+ */
+public class ModulePackageTest
+{
+    static Properties props = ModuleDetailsImplTest.DEFAULT_PROPS;
+
+    @Test
+    public void testConstructor() throws IOException
+    {
+        ModuleDetails details = new ModuleDetailsImpl(props);
+        ModulePackage modulePackage = ModulePackage.fromModuleDetails(details);
+        assertNotNull(modulePackage);
+        assertEquals(props.getProperty(ModuleDetails.PROP_ID), modulePackage.getId());
+        assertEquals(props.getProperty(ModuleDetails.PROP_VERSION),modulePackage.getVersion());
+        assertEquals(props.getProperty(ModuleDetails.PROP_REPO_VERSION_MIN),modulePackage.getVersionMin());
+        assertEquals(props.getProperty(ModuleDetails.PROP_REPO_VERSION_MAX),modulePackage.getVersionMax());
+        assertEquals(props.getProperty(ModuleDetails.PROP_INSTALL_STATE),modulePackage.getInstallState().toString());
+    }
+
+    @Test
+    public void testInvalidConstructor() throws IOException
+    {
+        ModulePackage modulePackage = ModulePackage.fromModuleDetails(null);
+        assertNull(modulePackage);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/ModulePackagesApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/ModulePackagesApiTest.java
new file mode 100644
index 00000000000..6b7b6eb30b0
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/ModulePackagesApiTest.java
@@ -0,0 +1,139 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests;
+
+import static org.alfresco.rest.api.tests.util.RestApiUtil.parsePaging;
+import static org.alfresco.rest.api.tests.util.RestApiUtil.parseRestApiEntries;
+import static org.alfresco.rest.api.tests.util.RestApiUtil.parseRestApiEntry;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.alfresco.rest.api.model.ModulePackage;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.apache.commons.httpclient.HttpStatus;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Basic modulepackages api calls
+ * 
+ * @author Gethin James.
+ */
+public class ModulePackagesApiTest extends AbstractBaseApiTest
+{
+    public static final String MODULEPACKAGES = "modulepackages";
+    protected String nonAdminUserName;
+    
+    @Before
+    public void setup() throws Exception
+    {
+        networkOne = null; // used by setRequestContext
+        
+        nonAdminUserName = createUser("nonAdminUser" + System.currentTimeMillis(), "password", null);
+
+        // used-by teardown (deleteUser) to cleanup
+        //users.add(nonAdminUserName);
+    }
+    
+    @After
+    public void tearDown() throws Exception
+    {
+        deleteUser(nonAdminUserName, networkOne);
+    }
+
+    @Test
+    public void testAllModulePackages() throws Exception
+    {
+        setRequestContext(nonAdminUserName);
+        
+        HttpResponse response = getAll(MODULEPACKAGES, null, HttpStatus.SC_OK);
+        assertNotNull(response);
+
+        PublicApiClient.ExpectedPaging paging = parsePaging(response.getJsonResponse());
+        assertNotNull(paging);
+
+        if (paging.getCount() > 0)
+        {
+            List<ModulePackage> modules = parseRestApiEntries(response.getJsonResponse(), ModulePackage.class);
+            assertNotNull(modules);
+            assertEquals(paging.getCount().intValue(), modules.size());
+        }
+
+    }
+
+    @Test
+    public void testSingleModulePackage() throws Exception
+    {
+        setRequestContext(nonAdminUserName);
+        
+        HttpResponse response = getSingle(MODULEPACKAGES, "NonSENSE_NOTFOUND", HttpStatus.SC_NOT_FOUND);
+        assertNotNull(response);
+
+        response = getSingle(MODULEPACKAGES, "alfresco-simple-module", HttpStatus.SC_OK);
+        assertNotNull(response);
+
+        ModulePackage simpleModule = parseRestApiEntry(response.getJsonResponse(),ModulePackage.class);
+        assertNotNull(simpleModule);
+        assertTrue("Simple module must be the correct version","1.0.0-SNAPSHOT".equals(simpleModule.getVersion().toString()));
+    }
+
+
+    @Test
+    public void testErrorUrls() throws Exception
+    {
+        setRequestContext(null);
+        
+        Map<String, String> params = createParams(null, null);
+
+        //Call an endpoint that doesn't exist
+        HttpResponse response = publicApiClient.get(getScope(), MODULEPACKAGES+"/fred/blogs/king/kong/got/if/wrong", null, null, null, params);
+        assertNotNull(response);
+        assertEquals(HttpStatus.SC_NOT_FOUND, response.getStatusCode());
+        assertEquals("no-cache", response.getHeaders().get("Cache-Control"));
+        assertEquals("application/json;charset=UTF-8", response.getHeaders().get("Content-Type"));
+
+        PublicApiClient.ExpectedErrorResponse errorResponse = RestApiUtil.parseErrorResponse(response.getJsonResponse());
+        assertNotNull(errorResponse);
+        assertNotNull(errorResponse.getErrorKey());
+        assertNotNull(errorResponse.getBriefSummary());
+    }
+
+    @Override
+    public String getScope()
+    {
+        return "private";
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiTest.java
new file mode 100644
index 00000000000..45ca3ba6571
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiTest.java
@@ -0,0 +1,5994 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.alfresco.rest.api.tests.util.RestApiUtil.parsePaging;
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.RandomAccessFile;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.ContentLimitProvider.SimpleFixedLimitProvider;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.LockInfo;
+import org.alfresco.rest.api.model.NodeDefinition;
+import org.alfresco.rest.api.model.NodeDefinitionConstraint;
+import org.alfresco.rest.api.model.NodePermissions;
+import org.alfresco.rest.api.model.NodeTarget;
+import org.alfresco.rest.api.model.NodeDefinitionProperty;
+import org.alfresco.rest.api.model.Site;
+import org.alfresco.rest.api.nodes.NodesEntityResource;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiHttpClient.BinaryPayload;
+import org.alfresco.rest.api.tests.client.data.Association;
+import org.alfresco.rest.api.tests.client.data.ContentInfo;
+import org.alfresco.rest.api.tests.client.data.DirectAccessUrlRequest;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.Folder;
+import org.alfresco.rest.api.tests.client.data.Node;
+import org.alfresco.rest.api.tests.client.data.PathInfo;
+import org.alfresco.rest.api.tests.client.data.PathInfo.ElementInfo;
+import org.alfresco.rest.api.tests.client.data.SiteRole;
+import org.alfresco.rest.api.tests.client.data.UserInfo;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder.FileData;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder.MultiPartRequest;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.lock.LockType;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.AccessPermission;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.util.GUID;
+import org.alfresco.util.TempFileProvider;
+import org.apache.commons.collections.map.MultiValueMap;
+import org.joda.time.DateTime;
+import org.json.simple.JSONObject;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * V1 REST API tests for Nodes (files, folders and custom node types)
+ * 
+ * <ul>
+ * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>} </li>
+ * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/children} </li>
+ * </ul>
+ *
+ * TODO
+ * - improve test 'fwk' to enable api tests to be run against remote repo (rather than embedded jetty)
+ * - requires replacement of remaining non-remote calls with remote (preferably public) apis
+ *   - eg. createUser (or any other usage of repoService), permissionService, AuthenticationUtil, ...
+ *
+ * @author Jamal Kaabi-Mofrad
+ * @author janv
+ */
+public class NodeApiTest extends AbstractSingleNetworkSiteTest
+{
+    private static final String PROP_OWNER = "cm:owner";
+
+    private static final String URL_DELETED_NODES = "deleted-nodes";
+    private static final String EMPTY_BODY = "{}";
+
+    protected PermissionService permissionService;
+    protected AuthorityService authorityService;
+    private NodeService nodeService;
+    private NamespaceService namespaceService;
+
+
+    private String rootGroupName = null;
+    private String groupA = null;
+    private String groupB = null;
+
+    @Before
+    public void setup() throws Exception
+    {
+        super.setup();
+
+        permissionService = applicationContext.getBean("permissionService", PermissionService.class);
+        authorityService = (AuthorityService) applicationContext.getBean("AuthorityService");
+        nodeService = applicationContext.getBean("NodeService", NodeService.class);
+        namespaceService= (NamespaceService) applicationContext.getBean("NamespaceService");
+    }
+    
+    @After
+    public void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+    
+    /**
+     * Tests get document library children.
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/children}
+     */
+    @Test
+    public void testListChildrenWithinSiteDocLib() throws Exception
+    {
+        setRequestContext(user1);
+
+        // create folder f0
+        String folder0Name = "f0-testListChildrenWithinSiteDocLib-"+RUNID;
+        String f0Id = createFolder(tDocLibNodeId, folder0Name).getId();
+        
+        String folder1 = "folder" + RUNID + "_1";
+        createFolder(f0Id, folder1, null).getId();
+
+        String folder2 = "folder" + RUNID + "_2";
+        createFolder(f0Id, folder2, null).getId();
+
+        String content1 = "content" + RUNID + "_1";
+        createTextFile(f0Id, content1, "The quick brown fox jumps over the lazy dog 1.").getId();
+
+        String content2 = "content" + RUNID + "_2";
+        createTextFile(f0Id, content2, "The quick brown fox jumps over the lazy dog 2.").getId();
+
+        String forum1 = "forum" + RUNID + "_1";
+        createNode(f0Id, forum1, "fm:topic", null);
+
+        Paging paging = getPaging(0, 100);
+        HttpResponse response = getAll(getNodeChildrenUrl(f0Id), paging, 200);
+        List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertEquals(4, nodes.size()); // forum is part of the default ignored types
+        // Paging
+        ExpectedPaging expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+        assertEquals(4, expectedPaging.getCount().intValue());
+        assertEquals(0, expectedPaging.getSkipCount().intValue());
+        assertEquals(100, expectedPaging.getMaxItems().intValue());
+        assertFalse(expectedPaging.getHasMoreItems().booleanValue());
+
+        // Order by folders and modified date first
+        Map<String, String> orderBy = Collections.singletonMap("orderBy", "isFolder DESC,modifiedAt DESC");
+        response = getAll(getNodeChildrenUrl(f0Id), paging, orderBy, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertEquals(4, nodes.size());
+        assertEquals(folder2, nodes.get(0).getName());
+        assertTrue(nodes.get(0).getIsFolder());
+        assertFalse(nodes.get(0).getIsFile());
+        assertEquals(folder1, nodes.get(1).getName());
+        assertTrue(nodes.get(1).getIsFolder());
+        assertFalse(nodes.get(1).getIsFile());
+        assertEquals(content2, nodes.get(2).getName());
+        assertFalse(nodes.get(2).getIsFolder());
+        assertTrue(nodes.get(2).getIsFile());
+        assertEquals(content1, nodes.get(3).getName());
+        assertFalse(nodes.get(3).getIsFolder());
+        assertTrue(nodes.get(3).getIsFile());
+
+        // Order by folders last and modified date first
+        orderBy = Collections.singletonMap("orderBy", "isFolder ASC,modifiedAt DESC");
+        response = getAll(getNodeChildrenUrl(f0Id), paging, orderBy, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertEquals(4, nodes.size());
+        assertEquals(content2, nodes.get(0).getName());
+        assertEquals(content1, nodes.get(1).getName());
+        assertEquals(folder2, nodes.get(2).getName());
+        assertEquals(folder1, nodes.get(3).getName());
+
+        // Order by folders and modified date last
+        orderBy = Collections.singletonMap("orderBy", "isFolder,modifiedAt");
+        response = getAll(getNodeChildrenUrl(f0Id), paging, orderBy, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertEquals(4, nodes.size());
+        assertEquals(content1, nodes.get(0).getName());
+        assertEquals(content2, nodes.get(1).getName());
+        assertEquals(folder1, nodes.get(2).getName());
+        assertEquals(folder2, nodes.get(3).getName());
+
+        // Order by folders and modified date first
+        orderBy = Collections.singletonMap("orderBy", "isFolder DESC,modifiedAt DESC");
+
+        // SkipCount=0,MaxItems=2
+        paging = getPaging(0, 2);
+        response = getAll(getNodeChildrenUrl(f0Id), paging, orderBy, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertEquals(2, nodes.size());
+        assertEquals(folder2, nodes.get(0).getName());
+        assertEquals(folder1, nodes.get(1).getName());
+        expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+        assertEquals(2, expectedPaging.getCount().intValue());
+        assertEquals(0, expectedPaging.getSkipCount().intValue());
+        assertEquals(2, expectedPaging.getMaxItems().intValue());
+        assertTrue(expectedPaging.getHasMoreItems().booleanValue());
+
+        // SkipCount=null,MaxItems=2
+        paging = getPaging(null, 2);
+        response = getAll(getNodeChildrenUrl(f0Id), paging, orderBy, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertEquals(2, nodes.size());
+        assertEquals(folder2, nodes.get(0).getName());
+        assertEquals(folder1, nodes.get(1).getName());
+        expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+        assertEquals(2, expectedPaging.getCount().intValue());
+        assertEquals(0, expectedPaging.getSkipCount().intValue());
+        assertEquals(2, expectedPaging.getMaxItems().intValue());
+        assertTrue(expectedPaging.getHasMoreItems().booleanValue());
+
+        // SkipCount=2,MaxItems=4
+        paging = getPaging(2, 4);
+        response = getAll(getNodeChildrenUrl(f0Id), paging, orderBy, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertEquals(2, nodes.size());
+        assertEquals(content2, nodes.get(0).getName());
+        assertEquals(content1, nodes.get(1).getName());
+        expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+        assertEquals(2, expectedPaging.getCount().intValue());
+        assertEquals(2, expectedPaging.getSkipCount().intValue());
+        assertEquals(4, expectedPaging.getMaxItems().intValue());
+        assertFalse(expectedPaging.getHasMoreItems().booleanValue());
+
+
+        // SkipCount=2,MaxItems=null
+        paging = getPaging(2, null);
+        response = getAll(getNodeChildrenUrl(f0Id), paging, orderBy, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertEquals(2, nodes.size());
+        assertEquals(content2, nodes.get(0).getName());
+        assertEquals(content1, nodes.get(1).getName());
+        expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+        assertEquals(2, expectedPaging.getCount().intValue());
+        assertEquals(2, expectedPaging.getSkipCount().intValue());
+        assertEquals(100, expectedPaging.getMaxItems().intValue());
+        assertFalse(expectedPaging.getHasMoreItems().booleanValue());
+
+        setRequestContext(user2);
+
+        // user2 tries to access user1's folder in a private docLib
+        paging = getPaging(0, Integer.MAX_VALUE);
+        getAll(getNodeChildrenUrl(f0Id), paging, 403);
+
+        setRequestContext(user1);
+
+        // -ve test - paging (via list children) cannot have skipCount < 0
+        paging = getPaging(-1, 4);
+        getAll(getNodeChildrenUrl(f0Id), paging, orderBy, 400);
+
+
+        // -ve test - paging (via list children) cannot have maxItems < 1
+        paging = getPaging(0, 0);
+        getAll(getNodeChildrenUrl(f0Id), paging, orderBy, 400);
+    }
+
+    /**
+     * Tests list children.
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/children}
+     */
+    @Test
+    public void testListChildrenWithinMyFiles() throws Exception
+    {
+        setRequestContext(user1);
+        
+        String myNodeId = getMyNodeId();
+        
+        String rootChildrenUrl = getNodeChildrenUrl(Nodes.PATH_ROOT);
+
+        String folder0Name = "folder " + RUNID + " 0";
+        String folder0Id = createFolder(myNodeId, folder0Name, null).getId();
+
+        String childrenUrl = getNodeChildrenUrl(folder0Id);
+
+        Map<String, Object> props = new HashMap<>(1);
+        props.put("cm:title", "This is folder 1");
+        String folder1 = "folder " + RUNID + " 1";
+        String folder1_Id = createFolder(folder0Id, folder1, props).getId();
+
+        String contentF1 = "content" + RUNID + " in folder 1";
+        String contentF1_Id = createTextFile(folder1_Id, contentF1, "The quick brown fox jumps over the lazy dog 1.").getId();
+
+        props = new HashMap<>(1);
+        props.put("cm:title", "This is folder 2");
+        String folder2 = "folder " + RUNID + " 2";
+        String folder2_Id = createFolder(folder0Id, folder2, props).getId();
+
+        String contentF2 = "content" + RUNID + " in folder 2.txt";
+        String contentF2_Id = createTextFile(folder2_Id, contentF2, "The quick brown fox jumps over the lazy dog 2.").getId();
+
+        String content1 = "content" + RUNID + " 1.txt";
+        String content1_Id = createTextFile(folder0Id, content1, "The quick brown fox jumps over the lazy dog.").getId();
+
+        props = new HashMap<>();
+        props.put(PROP_OWNER, user1);
+        props.put("cm:lastThumbnailModification", Collections.singletonList("doclib:1444660852296"));
+
+        Node nodeUpdate = new Node();
+        nodeUpdate.setProperties(props);
+        put(URL_NODES, content1_Id, toJsonAsStringNonNull(nodeUpdate), null, 200);
+
+        List<String> folderIds = Arrays.asList(folder1_Id, folder2_Id);
+        List<String> contentIds = Arrays.asList(content1_Id);
+        
+        Paging paging = getPaging(0, 100);
+        HttpResponse response = getAll(childrenUrl, paging, 200);
+        List<Document> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Document.class);
+        assertEquals(3, nodes.size());
+
+        // Order by folders and modified date first
+        Map<String, String> orderBy = Collections.singletonMap("orderBy", "isFolder DESC,modifiedAt DESC");
+        response = getAll(childrenUrl, paging, orderBy, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Document.class);
+        assertEquals(3, nodes.size());
+        assertEquals(folder2, nodes.get(0).getName());
+        assertEquals(folder1, nodes.get(1).getName());
+        Document node = nodes.get(2);
+        assertEquals(content1, node.getName());
+        assertEquals(TYPE_CM_CONTENT, node.getNodeType());
+        assertEquals(content1_Id, node.getId());
+        UserInfo createdByUser = node.getCreatedByUser();
+        assertEquals(user1, createdByUser.getId());
+        assertEquals(UserInfo.getTestDisplayName(user1), createdByUser.getDisplayName());
+        UserInfo modifiedByUser = node.getModifiedByUser();
+        assertEquals(user1, modifiedByUser.getId());
+        assertEquals(UserInfo.getTestDisplayName(user1), modifiedByUser.getDisplayName());
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, node.getContent().getMimeType());
+        assertNotNull(node.getContent().getMimeTypeName());
+        assertNotNull(node.getContent().getEncoding());
+        assertTrue(node.getContent().getSizeInBytes() > 0);
+
+        // request without "include"
+        Map<String, String> params = new HashMap<>();
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Document.class);
+        for (Node n : nodes)
+        {
+            assertNull("There shouldn't be a 'properties' object in the response.", n.getProperties());
+            assertNull("There shouldn't be a 'isLink' object in the response.", n.getIsLink());
+            assertNull("There shouldn't be a 'path' object in the response.", n.getPath());
+            assertNull("There shouldn't be a 'aspectNames' object in the response.", n.getAspectNames());
+        }
+
+        // request with include - example 1
+        params = new HashMap<>();
+        params.put("include", "isLink");
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Document.class);
+        for (Node n : nodes)
+        {
+            assertNotNull("There should be a 'isLink' object in the response.", n.getIsLink());
+        }
+
+        // request with include - example 2
+        params = new HashMap<>();
+        params.put("include", "aspectNames,properties,path,isLink");
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = jacksonUtil.parseEntries(response.getJsonResponse(), Document.class);
+        for (Node n : nodes)
+        {
+            assertNotNull("There should be a 'properties' object in the response.", n.getProperties()); // eg. cm:title, see above
+            assertNotNull("There should be a 'isLink' object in the response.", n.getIsLink());
+            assertNotNull("There should be a 'path' object in the response.", n.getPath());
+            assertNotNull("There should be a 'aspectNames' object in the response.", n.getAspectNames());
+        }
+
+        // request specific property via include
+        params = new HashMap<>();
+        params.put("include", "cm:lastThumbnailModification");
+        params.put("orderBy", "isFolder DESC,modifiedAt DESC");
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Document.class);
+        assertEquals(3, nodes.size());
+        assertNull("There shouldn't be a 'properties' object in the response.", nodes.get(0).getProperties());
+        assertNull("There shouldn't be a 'properties' object in the response.", nodes.get(1).getProperties());
+        assertNotNull("There should be a 'properties' object in the response.", nodes.get(2).getProperties());
+        Set<Entry<String, Object>> propsSet = nodes.get(2).getProperties().entrySet();
+        assertEquals(1, propsSet.size());
+        Entry<String, Object> entry = propsSet.iterator().next();
+        assertEquals("cm:lastThumbnailModification", entry.getKey());
+        assertEquals("doclib:1444660852296", ((List<?>) entry.getValue()).get(0));
+
+
+        // filtering, via where clause - folders only
+        params = new HashMap<>();
+        params.put("where", "("+Nodes.PARAM_ISFOLDER+"=true)");
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Document.class);
+        assertEquals(2, nodes.size());
+
+        assertTrue(nodes.get(0).getIsFolder());
+        assertFalse(nodes.get(0).getIsFile());
+        assertTrue(folderIds.contains(nodes.get(0).getId()));
+
+        assertTrue(nodes.get(1).getIsFolder());
+        assertFalse(nodes.get(1).getIsFile());
+        assertTrue(folderIds.contains(nodes.get(1).getId()));
+
+        // filtering, via where clause - content only
+        params = new HashMap<>();
+        params.put("where", "("+Nodes.PARAM_ISFILE+"=true)");
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Document.class);
+        assertEquals(1, nodes.size());
+        assertFalse(nodes.get(0).getIsFolder());
+        assertTrue(nodes.get(0).getIsFile());
+        assertTrue(contentIds.contains(nodes.get(0).getId()));
+
+        // list children via relativePath
+
+        params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, folder1);
+        response = getAll(childrenUrl, paging, params, 200);
+        JSONObject jsonResponse = response.getJsonResponse();
+        nodes = RestApiUtil.parseRestApiEntries(jsonResponse, Document.class);
+        assertEquals(1, nodes.size());
+        assertEquals(contentF1_Id, nodes.get(0).getId());
+
+        JSONObject jsonList = (JSONObject)jsonResponse.get("list");
+        assertNotNull(jsonList);
+        JSONObject jsonSrcObj = (JSONObject)jsonResponse.get("source");
+        assertNull(jsonSrcObj);
+
+        params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, "User Homes/" + user1 + "/" + folder0Name + "/" + folder2);
+        response = getAll(rootChildrenUrl, paging, params, 200);
+        jsonResponse = response.getJsonResponse();
+        nodes = RestApiUtil.parseRestApiEntries(jsonResponse, Document.class);
+        assertEquals(1, nodes.size());
+        assertEquals(contentF2_Id, nodes.get(0).getId());
+
+        jsonList = (JSONObject)jsonResponse.get("list");
+        assertNotNull(jsonList);
+        jsonSrcObj = (JSONObject)jsonResponse.get("source");
+        assertNull(jsonSrcObj);
+
+        // list children via relativePath and also return the source entity
+
+        params = new HashMap<>();
+        params.put(Nodes.PARAM_RELATIVE_PATH, "User Homes/" + user1 + "/" + folder0Name + "/" + folder2);
+        params.put("includeSource", "true");
+        params.put("include", "path,isLink");
+        params.put("fields", "id");
+        response = getAll(rootChildrenUrl, paging, params, 200);
+        jsonResponse = response.getJsonResponse();
+        nodes = RestApiUtil.parseRestApiEntries(jsonResponse, Document.class);
+        assertEquals(1, nodes.size());
+        Document doc = nodes.get(0);
+        assertEquals(contentF2_Id, doc.getId());
+        assertNotNull(doc.getPath());
+        assertEquals(Boolean.FALSE, doc.getIsLink());
+        assertNull(doc.getName());
+
+        jsonList = (JSONObject)jsonResponse.get("list");
+        assertNotNull(jsonList);
+
+        // source is not affected by include (or fields for that matter) - returns the default node response
+        Folder src = RestApiUtil.parsePojo("source", jsonList, Folder.class);
+        assertEquals(folder2_Id, src.getId());
+        assertNull(src.getPath());
+        assertNull(src.getIsLink());
+        assertNotNull(src.getName());
+        assertNotNull(src.getAspectNames());
+        assertNotNull(src.getProperties());
+
+        // -ve test - Invalid QName (Namespace prefix cm... is not mapped to a namespace URI) for the orderBy parameter.
+        params = Collections.singletonMap("orderBy", Nodes.PARAM_ISFOLDER+" DESC,cm" + System.currentTimeMillis() + ":modified DESC");
+        getAll(childrenUrl, paging, params, 400);
+
+        paging = getPaging(0, 10);
+
+        // -ve test - list folder children for unknown node should return 404
+        getAll(getNodeChildrenUrl(UUID.randomUUID().toString()), paging, 404);
+
+        // -ve test - user2 tries to access user1's home folder
+        setRequestContext(user2);
+        getAll(getNodeChildrenUrl(myNodeId), paging, 403);
+
+        setRequestContext(user1);
+
+        // -ve test - try to list children using relative path to unknown node
+        params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, "User Homes/" + user1 + "/unknown");
+        getAll(rootChildrenUrl, paging, params, 404);
+
+        // -ve test - try to list children using relative path to node for which user does not have read permission (expect 404 instead of 403)
+        params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, "User Homes/" + user2);
+        getAll(rootChildrenUrl, paging, params, 404);
+
+        // -ve test - list folder children with relative path to unknown node should return 400
+        params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, "/unknown");
+        getAll(getNodeChildrenUrl(content1_Id), paging, params, 400);
+        
+        // filtering, via where clause - negated comparison
+        params = new HashMap<>();
+        params.put("where", "(NOT "+Nodes.PARAM_ISFILE+"=true)");
+        getAll(childrenUrl, paging, params, 400);
+        
+    }
+
+    /**
+     * Tests get node with path information.
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>?include=path}
+     */
+    @Test
+    public void testGetPathElements_DocLib() throws Exception
+    {
+        setRequestContext(user1);
+
+        // user1 creates a private site and adds user2 as a site consumer
+        String site1Title = "site-testGetPathElements_DocLib-" + RUNID;
+        String site1Id = createSite(site1Title, SiteVisibility.PRIVATE).getId();
+        addSiteMember(site1Id, user2, SiteRole.SiteConsumer);
+        
+        String site1DocLibNodeId = getSiteContainerNodeId(site1Id, "documentLibrary");
+        
+        // /Company Home/Sites/RandomSite<timestamp>/documentLibrary/folder<timestamp>_A
+        String folderA = "folder" + RUNID + "_A";
+        String folderA_Id = createFolder(site1DocLibNodeId, folderA).getId();
+
+        // /Company Home/Sites/RandomSite<timestamp>/documentLibrary/folder<timestamp>_A/folder<timestamp>_B
+        String folderB = "folder" + RUNID + "_B";
+        String folderB_Id = createFolder(folderA_Id, folderB).getId();
+        NodeRef folderB_Ref = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, folderB_Id);
+
+        // /Company Home/Sites/RandomSite<timestamp>/documentLibrary/folder<timestamp>_A/folder<timestamp>_B/folder<timestamp>_C
+        String folderC = "folder" + RUNID + "_C";
+        String folderC_Id = createFolder(folderB_Id, folderC).getId();
+        NodeRef folderC_Ref = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, folderC_Id);
+
+        // /Company Home/Sites/RandomSite<timestamp>/documentLibrary/folder<timestamp>_A/folder<timestamp>_B/folder<timestamp>_C/content<timestamp>
+        String content = "content" + RUNID;
+        String content1_Id = createTextFile(folderC_Id, content, "The quick brown fox jumps over the lazy dog.").getId();
+        
+        
+        // TODO refactor with remote permission api calls (maybe use v0 until we have v1 ?)
+        final String tenantDomain = (networkOne != null ? networkOne.getId() : TenantService.DEFAULT_DOMAIN);
+        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                return TenantUtil.runAsTenant(new TenantUtil.TenantRunAsWork<Void>()
+                {
+                    public Void doWork() throws Exception
+                    {
+                        // Revoke folderB inherited permissions
+                        permissionService.setInheritParentPermissions(folderB_Ref, false);
+                        // Grant user2 permission for folderC
+                        permissionService.setPermission(folderC_Ref, user2, PermissionService.CONSUMER, true);
+                        return null;
+                    }
+                }, tenantDomain);
+            }
+        }, user1);
+        
+
+        //...nodes/nodeId?include=path
+        Map<String, String> params = Collections.singletonMap("include", "path");
+        HttpResponse response = getSingle(NodesEntityResource.class, content1_Id, params, 200);
+        Document node = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class);
+        PathInfo path = node.getPath();
+        assertNotNull(path);
+        assertTrue(path.getIsComplete());
+        assertNotNull(path.getName());
+        // the path should only include the parents (not the requested node)
+        assertFalse(path.getName().endsWith(content));
+        assertTrue(path.getName().startsWith("/Company Home"));
+        List<ElementInfo> pathElements = path.getElements();
+        assertEquals(7, pathElements.size());
+        
+        // Check path element names and types, and one or two random aspects.
+        assertEquals("Company Home", pathElements.get(0).getName());
+        assertEquals("cm:folder", pathElements.get(0).getNodeType());
+        
+        assertEquals("Sites", pathElements.get(1).getName());
+        assertEquals("st:sites", pathElements.get(1).getNodeType());
+        
+        assertEquals(site1Id, pathElements.get(2).getName());
+        assertEquals("st:site", pathElements.get(2).getNodeType());
+        assertTrue(pathElements.get(2).getAspectNames().contains("cm:titled"));
+        // Check that sys:* is filtered out - to be consistent with other aspect name lists
+        // e.g. /nodes/{nodeId}/children?include=aspectNames
+        assertFalse(pathElements.get(2).getAspectNames().contains("sys:undeletable"));
+        assertFalse(pathElements.get(2).getAspectNames().contains("sys:unmovable"));
+
+        assertEquals("documentLibrary", pathElements.get(3).getName());
+        assertEquals("cm:folder", pathElements.get(3).getNodeType());
+        assertTrue(pathElements.get(3).getAspectNames().contains("st:siteContainer"));
+        
+        assertEquals(folderA, pathElements.get(4).getName());
+        assertEquals("cm:folder", pathElements.get(4).getNodeType());
+        
+        assertEquals(folderB, pathElements.get(5).getName());
+        assertEquals("cm:folder", pathElements.get(5).getNodeType());
+
+        assertEquals(folderC, pathElements.get(6).getName());
+        assertEquals("cm:folder", pathElements.get(6).getNodeType());
+
+        // Try the above tests with user2 (site consumer)
+        setRequestContext(user2);
+        
+        response = getSingle(NodesEntityResource.class, content1_Id, params, 200);
+        node = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class);
+        path = node.getPath();
+        assertNotNull(path);
+        assertFalse("The path is not complete as the user doesn't have permission to access the full path.", path.getIsComplete());
+        assertNotNull(path.getName());
+        // site consumer (user2) dose not have access to the folderB
+        assertFalse("site consumer (user2) dose not have access to the folderB", path.getName().contains(folderB));
+        assertFalse(path.getName().startsWith("/Company Home"));
+        // Go up as far as they can, before getting access denied (i.e. "/folderC")
+        assertTrue(path.getName().endsWith(folderC));
+        pathElements = path.getElements();
+        assertEquals(1, pathElements.size());
+        assertEquals(folderC, pathElements.get(0).getName());
+
+        // cleanup
+        setRequestContext(user1);
+        deleteSite(site1Id, true, 204);
+    }
+
+    /**
+     * Tests get node information.
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>}
+     */
+    @Test
+    public void testGetNodeInfo() throws Exception
+    {
+        setRequestContext(user1);
+
+        HttpResponse response = getSingle(NodesEntityResource.class, Nodes.PATH_ROOT, null, 200);
+        Node node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        String rootNodeId = node.getId();
+
+        response = getSingle(NodesEntityResource.class, Nodes.PATH_MY, null, 200);
+        node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        String myFilesNodeId = node.getId();
+        assertNotNull(myFilesNodeId);
+        assertEquals(user1, node.getName());
+        assertTrue(node.getIsFolder());
+        assertFalse(node.getIsFile());
+
+        String userHomesId = node.getParentId();
+
+        // /Company Home/User Homes/user<timestamp>/folder<timestamp>_A
+        String folderA = "folder" + RUNID + "_A";
+        String folderA_Id = createFolder(myFilesNodeId, folderA).getId();
+
+        // /Company Home/User Homes/user<timestamp>/folder<timestamp>_A/folder<timestamp>_B
+        String folderB = "folder" + RUNID + "_B";
+        String folderB_Id = createFolder(folderA_Id, folderB).getId();
+
+        // /Company Home/User Homes/user<timestamp>/folder<timestamp>_A/folder<timestamp>_B/content<timestamp>
+        String title = "test title";
+        Map<String,String> docProps = new HashMap<>();
+        docProps.put("cm:title", title);
+        String contentName = "content " + RUNID + ".txt";
+        String content1Id = createTextFile(folderB_Id, contentName, "The quick brown fox jumps over the lazy dog.", "UTF-8", docProps).getId();
+
+
+        // get node info
+        response = getSingle(NodesEntityResource.class, content1Id, null, 200);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String content_Id = documentResp.getId();
+
+        // Expected result ...
+        UserInfo expectedUser = new UserInfo(user1);
+
+        Document d1 = new Document();
+        d1.setId(content_Id);
+        d1.setParentId(folderB_Id);
+        d1.setName(contentName);
+        d1.setNodeType(TYPE_CM_CONTENT);
+
+        ContentInfo ciExpected = new ContentInfo();
+        ciExpected.setMimeType("text/plain");
+        ciExpected.setMimeTypeName("Plain Text");
+        ciExpected.setSizeInBytes(44L);
+        ciExpected.setEncoding("ISO-8859-1");
+
+        d1.setContent(ciExpected);
+        d1.setCreatedByUser(expectedUser);
+        d1.setModifiedByUser(expectedUser);
+
+        Map<String, Object> props = new HashMap<>();
+        props.put("cm:title", title);
+        props.put("cm:versionLabel", "1.0");
+        props.put("cm:versionType", "MAJOR");
+
+        d1.setProperties(props);
+        d1.setAspectNames(Arrays.asList("cm:auditable","cm:titled","cm:versionable","cm:author"));
+
+        // Note: Path is not part of the default info
+        d1.expected(documentResp);
+
+        // get node info + path
+        //...nodes/nodeId?include=path
+        Map<String, String> params = Collections.singletonMap("include", "path");
+        response = getSingle(NodesEntityResource.class, content1Id, params, 200);
+        documentResp = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class);
+
+        // Expected path ...
+        // note: the pathInfo should only include the parents (not the requested node)
+        List<ElementInfo> elements = new ArrayList<>(5);
+        elements.add(new ElementInfo(rootNodeId, "Company Home"));
+        elements.add(new ElementInfo(userHomesId, "User Homes"));
+        elements.add(new ElementInfo(myFilesNodeId, user1));
+        elements.add(new ElementInfo(folderA_Id, folderA));
+        elements.add(new ElementInfo(folderB_Id, folderB));
+        PathInfo expectedPath = new PathInfo("/Company Home/User Homes/"+user1+"/"+folderA+"/"+folderB, true, elements);
+        d1.setPath(expectedPath);
+
+        d1.expected(documentResp);
+
+        // get node info via relativePath
+
+        params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, "/"+folderA+"/"+folderB);
+        response = getSingle(NodesEntityResource.class, Nodes.PATH_MY, params, 200);
+        Folder folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(folderB_Id, folderResp.getId());
+
+        params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, folderA+"/"+folderB+"/"+contentName);
+        response = getSingle(NodesEntityResource.class, Nodes.PATH_MY, params, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals(content_Id, documentResp.getId());
+
+        // test path with utf-8 encoded param (eg. ¢ => )
+        String folderC = "folder" + RUNID + " ¢";
+        String folderC_Id = createFolder(folderB_Id, folderC).getId();
+
+        params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, "/"+folderA+"/"+folderB+"/"+folderC);
+        response = getSingle(NodesEntityResource.class, Nodes.PATH_MY, params, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(folderC_Id, folderResp.getId());
+
+        // -ve test - get info for unknown node should return 404
+        getSingle(NodesEntityResource.class, UUID.randomUUID().toString(), null, 404);
+
+        // -ve test - user2 tries to get node info about user1's home folder
+        setRequestContext(user2);
+        getSingle(NodesEntityResource.class, myFilesNodeId, null, 403);
+
+        setRequestContext(user1);
+
+        // -ve test - try to get node info using relative path to unknown node
+        params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, folderA+"/unknown");
+        getSingle(NodesEntityResource.class, Nodes.PATH_MY, params, 404);
+
+        // -ve test - try to get node info using relative path to node for which user does not have read permission (expect 404 instead of 403)
+        params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, "User Homes/"+user2);
+        getSingle(NodesEntityResource.class, Nodes.PATH_ROOT, params, 404);
+
+        // -ve test - attempt to get node info for non-folder node with relative path should return 400
+        params = Collections.singletonMap(Nodes.PARAM_RELATIVE_PATH, "/unknown");
+        getSingle(NodesEntityResource.class, content_Id, params, 400);
+    }
+
+    /**
+     * Tests well-known aliases.
+     * <p>GET:</p>
+     * <ul>
+     * <li> {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-}</li>
+     * <li> {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/-my-} </li>
+     * <li> {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/-shared-} </li>
+     * </ul>
+     */
+    @Test
+    public void testGetNodeWithKnownAlias() throws Exception
+    {
+        setRequestContext(user1);
+        
+        HttpResponse response = getSingle(NodesEntityResource.class, Nodes.PATH_ROOT, null, 200);
+        Node node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertEquals("Company Home", node.getName());
+        assertNotNull(node.getId());
+        assertNull(node.getPath());
+
+        // unknown alias
+        getSingle(NodesEntityResource.class, "testSomeUndefinedAlias", null, 404);
+
+        response = getSingle(NodesEntityResource.class, Nodes.PATH_MY, null, 200);
+        node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        String myFilesNodeId = node.getId();
+        assertNotNull(myFilesNodeId);
+        assertEquals(user1, node.getName());
+        assertTrue(node.getIsFolder());
+        assertFalse(node.getIsFile());
+        assertNull(node.getPath()); // note: path can be optionally "include"'ed - see separate test
+
+        response = getSingle(NodesEntityResource.class, Nodes.PATH_SHARED, null, 200);
+        node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        String sharedFilesNodeId = node.getId();
+        assertNotNull(sharedFilesNodeId);
+        assertEquals("Shared", node.getName());
+        assertTrue(node.getIsFolder());
+        assertFalse(node.getIsFile());
+        assertNull(node.getPath());
+
+        //Delete user1's home
+        setRequestContext(networkAdmin);
+        deleteNode(myFilesNodeId);
+        
+        setRequestContext(user1);
+        getSingle(NodesEntityResource.class, Nodes.PATH_MY, null, 404); // Not found
+    }
+
+    /**
+     * Tests guess mimetype & guess encoding when uploading file/content (create or update) - also empty file/content
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/children}
+     * <p>PUT:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/content}
+     */
+    @Test
+    public void testGuessMimeTypeAndEncoding() throws Exception
+    {
+        setRequestContext(user1);
+        
+        String fId = createFolder(getMyNodeId(), "test-folder-guess-"+RUNID).getId();
+
+        // create empty files
+
+        Document d = new Document();
+        d.setName("my doc");
+        d.setNodeType(TYPE_CM_CONTENT);
+
+        HttpResponse response = post(getNodeChildrenUrl(fId), toJsonAsStringNonNull(d), 201);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals(MimetypeMap.MIMETYPE_BINARY, documentResp.getContent().getMimeType());
+        assertEquals("Binary File (Octet Stream)", documentResp.getContent().getMimeTypeName());
+        assertEquals(0L, documentResp.getContent().getSizeInBytes().longValue());
+        assertEquals("UTF-8",  documentResp.getContent().getEncoding());
+
+        d = new Document();
+        d.setName("my doc.txt");
+        d.setNodeType(TYPE_CM_CONTENT);
+
+        response = post(getNodeChildrenUrl(fId), toJsonAsStringNonNull(d), 201);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, documentResp.getContent().getMimeType());
+        assertEquals("Plain Text", documentResp.getContent().getMimeTypeName());
+        assertEquals(0L, documentResp.getContent().getSizeInBytes().longValue());
+        assertEquals("UTF-8",  documentResp.getContent().getEncoding());
+
+        d = new Document();
+        d.setName("my doc.pdf");
+        d.setNodeType(TYPE_CM_CONTENT);
+
+        response = post(getNodeChildrenUrl(fId), toJsonAsStringNonNull(d), 201);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals(MimetypeMap.MIMETYPE_PDF, documentResp.getContent().getMimeType());
+        assertEquals("Adobe PDF Document", documentResp.getContent().getMimeTypeName());
+        assertEquals(0L, documentResp.getContent().getSizeInBytes().longValue());
+        assertEquals("UTF-8",  documentResp.getContent().getEncoding());
+
+        // upload files
+
+        String fileName = "quick-2.pdf";
+        File file = getResourceFile(fileName);
+
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file));
+        MultiPartRequest reqBody = multiPartBuilder.build();
+
+        response = post(getNodeChildrenUrl(fId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        ContentInfo contentInfo = document.getContent();
+        assertEquals(MimetypeMap.MIMETYPE_PDF, contentInfo.getMimeType());
+        assertEquals("UTF-8", contentInfo.getEncoding());
+
+        fileName = "quick-2.pdf";
+        file = getResourceFile(fileName);
+
+        multiPartBuilder = MultiPartBuilder.create()
+                .setFileData(new FileData("quick-2", file)); // note: we've deliberately dropped the file ext here
+        reqBody = multiPartBuilder.build();
+
+        response = post(getNodeChildrenUrl(fId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        contentInfo = document.getContent();
+        assertEquals(MimetypeMap.MIMETYPE_PDF, contentInfo.getMimeType());
+        assertEquals("UTF-8", contentInfo.getEncoding());
+
+        fileName = "example-1.txt";
+        file = getResourceFile(fileName);
+
+        multiPartBuilder = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file));
+        reqBody = multiPartBuilder.build();
+
+        response = post(getNodeChildrenUrl(fId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        contentInfo = document.getContent();
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+        assertEquals("ISO-8859-1", contentInfo.getEncoding());
+
+        fileName = "example-2.txt";
+        file = getResourceFile(fileName);
+
+        multiPartBuilder = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file));
+        reqBody = multiPartBuilder.build();
+
+        response = post(getNodeChildrenUrl(fId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        contentInfo = document.getContent();
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+        assertEquals("UTF-8", contentInfo.getEncoding());
+
+        fileName = "shift-jis.txt";
+        file = getResourceFile(fileName);
+
+        multiPartBuilder = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file));
+        reqBody = multiPartBuilder.build();
+
+        response = post(getNodeChildrenUrl(fId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        contentInfo = document.getContent();
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+        assertEquals("Shift_JIS", contentInfo.getEncoding());
+
+        fileName = "example-1.xml";
+        file = getResourceFile(fileName);
+
+        multiPartBuilder = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file));
+        reqBody = multiPartBuilder.build();
+
+        response = post(getNodeChildrenUrl(fId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        contentInfo = document.getContent();
+        assertEquals(MimetypeMap.MIMETYPE_XML, contentInfo.getMimeType());
+        assertEquals("ISO-8859-1", contentInfo.getEncoding());
+
+        fileName = "example-2.xml";
+        file = getResourceFile(fileName);
+
+        multiPartBuilder = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file));
+        reqBody = multiPartBuilder.build();
+
+        response = post(getNodeChildrenUrl(fId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        contentInfo = document.getContent();
+        assertEquals(MimetypeMap.MIMETYPE_XML, contentInfo.getMimeType());
+        assertEquals("UTF-8", contentInfo.getEncoding());
+
+        // upload file, rename and then update file
+
+        fileName = "quick.pdf";
+        file = getResourceFile(fileName);
+
+        multiPartBuilder = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file));
+        reqBody = multiPartBuilder.build();
+
+        response = post(getNodeChildrenUrl(fId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String docId = document.getId();
+        contentInfo = document.getContent();
+        assertEquals(MimetypeMap.MIMETYPE_PDF, contentInfo.getMimeType());
+        assertEquals("UTF-8", contentInfo.getEncoding());
+
+        // rename (mimeType remains unchanged, binary has not changed)
+        Document dUpdate = new Document();
+        dUpdate.setName("quick.docx");
+
+        response = put(URL_NODES, docId, toJsonAsStringNonNull(dUpdate), null, 200);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        contentInfo = document.getContent();
+        assertEquals(MimetypeMap.MIMETYPE_PDF, contentInfo.getMimeType());
+        assertEquals("UTF-8", contentInfo.getEncoding());
+
+        fileName = "quick.docx";
+        file = getResourceFile(fileName);
+        BinaryPayload payload = new BinaryPayload(file);
+
+        response = putBinary(getNodeContentUrl(docId), payload, null, null, 200);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        contentInfo = document.getContent();
+        assertEquals(MimetypeMap.MIMETYPE_OPENXML_WORDPROCESSING, contentInfo.getMimeType());
+        assertEquals("UTF-8", contentInfo.getEncoding());
+        
+        // additional test
+        fileName = "CMIS-Delete.json";
+        file = getResourceFile(fileName);
+
+        multiPartBuilder = MultiPartBuilder.create()
+                .setFileData(new FileData("special-"+GUID.generate(), file));
+        reqBody = multiPartBuilder.build();
+
+        response = post(getNodeChildrenUrl(fId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        contentInfo = document.getContent();
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+        assertEquals("UTF-8", contentInfo.getEncoding());
+
+        // cleanup
+        deleteNode(fId);
+    }
+
+    /**
+     * Tests Multipart upload to user's home (a.k.a My Files).
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/children}
+     */
+    @Test
+    public void testUploadToMyFiles() throws Exception
+    {
+        setRequestContext(user1);
+
+        // create folder f0
+        String folder0Name = "f0-testUploadToMyFiles-"+RUNID;
+        Folder folderResp = createFolder(Nodes.PATH_MY, folder0Name);
+        String f0Id = folderResp.getId();
+        
+        final String fileName = "quick.pdf";
+        final File file = getResourceFile(fileName);
+
+        Paging paging = getPaging(0, Integer.MAX_VALUE);
+        HttpResponse response = getAll(getNodeChildrenUrl(f0Id), paging, 200);
+        PublicApiClient.ExpectedPaging pagingResult = parsePaging(response.getJsonResponse());
+        assertNotNull(paging);
+        final int numOfNodes = pagingResult.getCount();
+
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create()
+                    .setFileData(new FileData(fileName, file));
+        MultiPartRequest reqBody = multiPartBuilder.build();
+
+        // Try to upload into a non-existent folder
+        post(getNodeChildrenUrl(UUID.randomUUID().toString()), reqBody.getBody(), null, reqBody.getContentType(), 404);
+
+        // Upload
+        response = post(getNodeChildrenUrl(f0Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        // Check the upload response
+        assertEquals(fileName, document.getName());
+        ContentInfo contentInfo = document.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_PDF, contentInfo.getMimeType());
+        // Default encoding
+        assertEquals("UTF-8", contentInfo.getEncoding());
+        // Check there is no path info returned.
+        // The path info should only be returned when it is requested via a include statement.
+        assertNull(document.getPath());
+
+        // Retrieve the uploaded file
+        response = getSingle(NodesEntityResource.class, document.getId(), null, 200);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals(fileName, document.getName());
+        contentInfo = document.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_PDF, contentInfo.getMimeType());
+
+        // Check 'get children' is confirming the upload
+        response = getAll(getNodeChildrenUrl(f0Id), paging, 200);
+        pagingResult = parsePaging(response.getJsonResponse());
+        assertNotNull(paging);
+        assertEquals(numOfNodes + 1, pagingResult.getCount().intValue());
+
+        // Upload the same file again to check the name conflicts handling
+        post(getNodeChildrenUrl(f0Id), reqBody.getBody(), null, reqBody.getContentType(), 409);
+
+        response = getAll(getNodeChildrenUrl(f0Id), paging, 200);
+        pagingResult = parsePaging(response.getJsonResponse());
+        assertNotNull(paging);
+        assertEquals("Duplicate file name. The file shouldn't have been uploaded.", numOfNodes + 1, pagingResult.getCount().intValue());
+
+        // Set autoRename=true and upload the same file again
+        reqBody = MultiPartBuilder.copy(multiPartBuilder)
+                          .setAutoRename(true)
+                          .build();
+
+        response = post(getNodeChildrenUrl(f0Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        // Check the upload response
+        assertEquals("quick-1.pdf", document.getName());
+
+        // upload the same file again, and request the path info to be present in the response
+        response = post(getNodeChildrenUrl(f0Id), reqBody.getBody(), "?include=path", reqBody.getContentType(), 201);
+        document = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class);
+        // Check the upload response
+        assertEquals("quick-2.pdf", document.getName());
+        assertNotNull(document.getPath());
+
+        response = getAll(getNodeChildrenUrl(f0Id), paging, 200);
+        pagingResult = parsePaging(response.getJsonResponse());
+        assertNotNull(paging);
+        assertEquals(numOfNodes + 3, pagingResult.getCount().intValue());
+
+        // upload without specifying content type or without overriding filename - hence guess mimetype and use file's name
+        final String fileName1 = "quick-1.txt";
+        final File file1 = getResourceFile(fileName1);
+        reqBody = MultiPartBuilder.create()
+                .setFileData(new FileData(null, file1))
+                .build();
+        response = post(getNodeChildrenUrl(f0Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class);
+        // Check the upload response
+        assertEquals(fileName1, document.getName());
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, document.getContent().getMimeType());
+
+        // upload with "default" binary content type and override filename - hence guess mimetype & use overridden name
+        final String fileName2 = "quick-2.txt";
+        final String fileName2b = "quick-2b.txt";
+        final File file2 = getResourceFile(fileName2);
+        reqBody = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName2b, file2))
+                .build();
+        response = post(getNodeChildrenUrl(f0Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class);
+        // Check the upload response
+        assertEquals(fileName2b, document.getName());
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, document.getContent().getMimeType());
+
+        
+        response = getSingle(NodesEntityResource.class, Nodes.PATH_MY, null, 200);
+        Folder user1Home = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+
+        // User2 tries to upload a new file into the user1's home folder.
+        
+        setRequestContext(user2);
+        
+        final File file3 = getResourceFile(fileName2);
+        reqBody = MultiPartBuilder.create()
+                    .setFileData(new FileData(fileName2, file3))
+                    .build();
+        post(getNodeChildrenUrl(user1Home.getId()), reqBody.getBody(), null, reqBody.getContentType(), 403);
+        
+        post(getNodeChildrenUrl(f0Id), reqBody.getBody(), null, reqBody.getContentType(), 403);
+
+        setRequestContext(user1);
+
+        response = getAll(getNodeChildrenUrl(f0Id), paging, 200);
+        pagingResult = parsePaging(response.getJsonResponse());
+        assertNotNull(paging);
+        assertEquals("Access Denied. The file shouldn't have been uploaded.", numOfNodes + 5, pagingResult.getCount().intValue());
+
+        // User1 tries to upload a file into a document rather than a folder!
+        post(getNodeChildrenUrl(document.getId()), reqBody.getBody(), null, reqBody.getContentType(), 400);
+
+        // Try to upload a file without defining the required formData
+        reqBody = MultiPartBuilder.create().setAutoRename(true).build();
+        post(getNodeChildrenUrl(f0Id), reqBody.getBody(), null, reqBody.getContentType(), 400);
+
+        // Test unsupported node type
+        reqBody = MultiPartBuilder.create()
+                    .setFileData(new FileData(fileName2, file2))
+                    .setAutoRename(true)
+                    .setNodeType("cm:link")
+                    .build();
+        post(getNodeChildrenUrl(f0Id), reqBody.getBody(), null, reqBody.getContentType(), 400);
+
+        // User1 uploads a new file
+        reqBody = MultiPartBuilder.create()
+                    .setFileData(new FileData(fileName2, file2))
+                    .build();
+        response = post(getNodeChildrenUrl(f0Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        // Check the upload response
+        assertEquals(fileName2, document.getName());
+        contentInfo = document.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+        assertEquals("ISO-8859-1", contentInfo.getEncoding());
+
+        // Test content size limit
+        final SimpleFixedLimitProvider limitProvider = applicationContext.getBean("defaultContentLimitProvider", SimpleFixedLimitProvider.class);
+        final long defaultSizeLimit = limitProvider.getSizeLimit();
+        limitProvider.setSizeLimitString("20000"); //20 KB
+
+        try
+        {
+            // quick.pdf size is about 23 KB
+            reqBody = MultiPartBuilder.create()
+                        .setFileData(new FileData(fileName, file))
+                        .setAutoRename(true)
+                        .build();
+
+            // Try to upload a file larger than the configured size limit
+            post(getNodeChildrenUrl(f0Id), reqBody.getBody(), null, reqBody.getContentType(), 413);
+        }
+        finally
+        {
+            limitProvider.setSizeLimitString(Long.toString(defaultSizeLimit));
+        }
+    }
+
+    /**
+     * Tests Multipart upload to a Site.
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/children}
+     */
+    @Test
+    public void testUploadToSite() throws Exception
+    {
+        setRequestContext(user1);
+        
+        final String fileName = "quick-1.txt";
+        final File file = getResourceFile(fileName);
+        
+        String folderA = "folder" + RUNID + "_A";
+        String folderA_id = createFolder(tDocLibNodeId, folderA).getId();
+
+        Paging paging = getPaging(0, Integer.MAX_VALUE);
+        HttpResponse response = getAll(getNodeChildrenUrl(folderA_id), paging, 200);
+        PublicApiClient.ExpectedPaging pagingResult = parsePaging(response.getJsonResponse());
+        assertNotNull(paging);
+        final int numOfNodes = pagingResult.getCount();
+
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create()
+                    .setFileData(new FileData(fileName, file));
+        MultiPartRequest reqBody = multiPartBuilder.build();
+        // Try to upload
+        response = post(getNodeChildrenUrl(folderA_id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        // Check the upload response
+        assertEquals(fileName, document.getName());
+        ContentInfo contentInfo = document.getContent();
+        assertNotNull(contentInfo);
+        // As the client didn't set the mimeType, the API must guess it.
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+
+        // Retrieve the uploaded file
+        response = getSingle(NodesEntityResource.class, document.getId(), null, 200);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals(fileName, document.getName());
+        contentInfo = document.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+
+        // Check 'get children' is confirming the upload
+        response = getAll(getNodeChildrenUrl(folderA_id), paging, 200);
+        pagingResult = parsePaging(response.getJsonResponse());
+        assertNotNull(paging);
+        assertEquals(numOfNodes + 1, pagingResult.getCount().intValue());
+
+        // Upload the same file again to check the name conflicts handling
+        post(getNodeChildrenUrl(folderA_id), reqBody.getBody(), null, reqBody.getContentType(), 409);
+
+        response = getAll(getNodeChildrenUrl(folderA_id), paging, 200);
+        pagingResult = parsePaging(response.getJsonResponse());
+        assertNotNull(paging);
+        assertEquals(numOfNodes + 1, pagingResult.getCount().intValue());
+
+        setRequestContext(user2);
+        
+        final String fileName2 = "quick-2.txt";
+        final File file2 = getResourceFile(fileName2);
+        reqBody = MultiPartBuilder.create()
+                    .setFileData(new FileData(fileName2, file2))
+                    .build();
+        // user2 tries to upload a new file into the folderA of user1
+        post(getNodeChildrenUrl(folderA_id), reqBody.getBody(), null, reqBody.getContentType(), 403);
+
+        setRequestContext(user1);
+        
+        // Test upload with properties
+        response = post(getNodeChildrenUrl(folderA_id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        // Check the upload response
+        assertEquals(fileName2, document.getName());
+        contentInfo = document.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+        assertNotNull(document.getProperties());
+        assertNull(document.getProperties().get("cm:title"));
+        assertNull(document.getProperties().get("cm:description"));
+
+        // upload a file with properties. Also, set autoRename=true
+        Map<String, String> props = new HashMap<>(2);
+        props.put("cm:title", "test title");
+        props.put("cm:description", "test description");
+        reqBody = MultiPartBuilder.create()
+                    .setFileData(new FileData(fileName2, file2))
+                    .setAutoRename(true)
+                    .setProperties(props)
+                    .build();
+
+        response = post(getNodeChildrenUrl(folderA_id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        // Check the upload response
+        // "quick-2-1.txt" => fileName2 + autoRename
+        assertEquals("quick-2-1.txt", document.getName());
+        contentInfo = document.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+        assertNotNull(document.getProperties());
+        assertEquals("test title", document.getProperties().get("cm:title"));
+        assertEquals("test description", document.getProperties().get("cm:description"));
+
+        // Test unknown property name
+        props = new HashMap<>(1);
+        props.put("unknownPrefix" + System.currentTimeMillis() + ":description", "test description");
+        reqBody = MultiPartBuilder.create()
+                    .setFileData(new FileData(fileName2, file2))
+                    .setAutoRename(true)
+                    .setProperties(props)
+                    .build();
+        // Prop prefix is unknown
+        post(getNodeChildrenUrl(folderA_id), reqBody.getBody(), null, reqBody.getContentType(), 400);
+
+        // Test relativePath multi-part field.
+        // Any folders in the relativePath that do not exist, are created before the content is created.
+        multiPartBuilder = MultiPartBuilder.create()
+                    .setFileData(new FileData(fileName, file))
+                    .setRelativePath("X/Y/Z");
+        reqBody = multiPartBuilder.build();
+
+        response = post(getNodeChildrenUrl(folderA_id), reqBody.getBody(), "?include=path", reqBody.getContentType(), 201);
+        document = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class);
+        // Check the upload response
+        assertEquals(fileName, document.getName());
+        contentInfo = document.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+        // Check the uploaded file parent folders
+        PathInfo pathInfo = document.getPath();
+        assertNotNull(pathInfo);
+        List<ElementInfo> elementInfos = pathInfo.getElements();
+        assertNotNull(elementInfos);
+        // /Company Home/Sites/RandomSite<timestamp>/documentLibrary/folder<timestamp>_A/X/Y/Z
+        assertEquals(8, elementInfos.size());
+        assertEquals(document.getParentId(), elementInfos.get(7).getId());
+        assertEquals("Z", elementInfos.get(7).getName());
+        assertEquals("Y", elementInfos.get(6).getName());
+        assertEquals("X", elementInfos.get(5).getName());
+        assertEquals(folderA, elementInfos.get(4).getName());
+
+        // Try to create a folder with the same name as the document within the 'Z' folder.
+        reqBody = MultiPartBuilder.copy(multiPartBuilder)
+                    .setRelativePath("X/Y/Z/" + document.getName())
+                    .build();
+        post(getNodeChildrenUrl(folderA_id), reqBody.getBody(), null, reqBody.getContentType(), 409);
+
+        // Test the same functionality as "mkdir -p x/y/z" which the folders should be created
+        // as needed but no errors thrown if the path or any part of the path already exists.
+        // NOTE: white spaces, leading and trailing "/" are ignored.
+        reqBody = MultiPartBuilder.copy(multiPartBuilder)
+                    .setRelativePath("/X/ Y/Z /CoolFolder/")
+                    .build();
+        response = post(getNodeChildrenUrl(folderA_id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        // Check the upload response
+        assertEquals(fileName, document.getName());
+        contentInfo = document.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+
+        // Retrieve the uploaded file parent folder
+        response = getSingle(NodesEntityResource.class, document.getParentId(), null, 200);
+        Folder coolFolder = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(document.getParentId(), coolFolder.getId());
+        assertEquals("CoolFolder", coolFolder.getName());
+
+        // Try to upload quick-1.txt within coolFolder and set the relativePath to a blank string.
+        reqBody = MultiPartBuilder.copy(multiPartBuilder)
+                    .setRelativePath("  ")// blank
+                    .build();
+        // 409 -> as the blank string is ignored and quick-1.txt already exists in the coolFolder
+        post(getNodeChildrenUrl(coolFolder.getId()), reqBody.getBody(), null, reqBody.getContentType(), 409);
+
+        setRequestContext(user2);
+
+        // user2 tries to upload the same file by creating sub-folders in the folderA of user1
+        reqBody = MultiPartBuilder.copy(multiPartBuilder)
+                    .setRelativePath("userTwoFolder1/userTwoFolder2")
+                    .build();
+        post(getNodeChildrenUrl(folderA_id), reqBody.getBody(), null, reqBody.getContentType(), 403);
+
+        // -ve test: integrity error
+        setRequestContext(user1);
+        reqBody = MultiPartBuilder.create()
+                .setFileData(new FileData("invalid:name", file))
+                .build();
+        // 422 -> invalid name (includes a ':' in this example)
+        post(getNodeChildrenUrl(coolFolder.getId()), reqBody.getBody(), null, reqBody.getContentType(), 422);
+    }
+
+    /**
+     * Tests delete (file or folder)
+     * <p>DELETE:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>}
+     */
+    @Test
+    public void testDelete() throws Exception
+    {
+        setRequestContext(user1);
+        
+        // create folder f0
+        String folder0Name = "f0-testDelete-"+RUNID;
+        String f0Id = createFolder(Nodes.PATH_MY, folder0Name).getId();
+
+        String content1Id = createTextFile(f0Id, "content" + RUNID + "_1", "The quick brown fox jumps over the lazy dog.").getId();
+
+        // delete file
+        deleteNode(content1Id);
+
+        assertTrue(existsArchiveNode(content1Id));
+
+        // -ve test
+        deleteNode(content1Id, 404);
+
+        String folder1Id = createFolder(f0Id, "folder " + RUNID + "_1").getId();
+        String folder2Id = createFolder(folder1Id, "folder " + RUNID + "_2").getId();
+
+        String content2Id = createTextFile(folder2Id, "content" + RUNID + "_2", "The quick brown fox jumps over the lazy dog.").getId();
+
+        // cascade delete folder
+        deleteNode(folder1Id);
+
+        assertTrue(existsArchiveNode(folder1Id));
+        assertTrue(existsArchiveNode(folder2Id));
+        assertTrue(existsArchiveNode(content2Id));
+
+        // -ve test
+        deleteNode(folder2Id, 404);
+        deleteNode(content2Id, 404);
+
+        // -ve test
+        String rootNodeId = getRootNodeId();
+        deleteNode(rootNodeId, 403);
+
+        //
+        // permanently delete - ie. bypass trashcan (archive store)
+        //
+
+        String folder3Id = createFolder(f0Id, "folder " + RUNID + "_3").getId();
+        String folder4Id = createFolder(folder3Id, "folder " + RUNID + "_4").getId();
+        
+        deleteNode(folder3Id, true, 204);
+
+        assertFalse(existsArchiveNode(folder3Id));
+        assertFalse(existsArchiveNode(folder4Id));
+
+        
+        String sharedNodeId = getSharedNodeId();
+        final String folder5Id = createFolder(sharedNodeId, "folder " + RUNID + "_5").getId();
+
+        // -ve test - another user cannot delete
+        setRequestContext(user2);
+        deleteNode(folder5Id, 403);
+
+        setRequestContext(user1);
+
+        Map<String, Object> props = new HashMap<>();
+        props.put(PROP_OWNER, user2);
+        Node nUpdate = new Node();
+        nUpdate.setProperties(props);
+
+        HttpResponse response = put(URL_NODES, folder5Id, toJsonAsStringNonNull(nUpdate), null, 200);
+        Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertEquals(user2, ((Map)nodeResp.getProperties().get(PROP_OWNER)).get("id"));
+
+        // TODO see REPO-907. Apparently returns 204 here in tenant context ?? (eg. if useDefaultNetwork=false)
+        if (useDefaultNetwork)
+        {
+            // -ve test - user1 can no longer delete
+            deleteNode(folder5Id, 403); 
+        }
+
+        // TODO refactor with remote permission api calls (maybe use v0 until we have v1 ?)
+        final String tenantDomain = (networkOne != null ? networkOne.getId() : TenantService.DEFAULT_DOMAIN);
+        AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                return TenantUtil.runAsTenant(new TenantUtil.TenantRunAsWork<Void>()
+                {
+                    public Void doWork() throws Exception
+                    {
+                        permissionService.setPermission(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, folder5Id), user1, PermissionService.DELETE, true);
+                        return null;
+                    }
+                }, tenantDomain);
+            }
+        }, user1);
+
+
+        // -ve test - non-owner cannot bypass trashcan
+        deleteNode(folder5Id, true, 403);
+
+        // user1 has permission to delete (via trashcan)
+        deleteNode(folder5Id);
+
+        // admin can permanently delete
+        String folder6Id = createFolder(sharedNodeId, "folder " + RUNID + "_6").getId();
+        
+        setRequestContext(networkAdmin);
+        
+        deleteNode(folder6Id, true, 204);
+
+        // -ve - cannot delete Company Home root node
+        deleteNode(rootNodeId, true, 403);
+
+        Map<String, String> params = new HashMap<>();
+        params.put(Nodes.PARAM_RELATIVE_PATH, "/Sites");
+        response = getSingle(NodesEntityResource.class, rootNodeId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        String sitesNodeId = nodeResp.getId();
+
+        // -ve - cannot delete Sites node
+        deleteNode(sitesNodeId, true, 403);
+
+        params = new HashMap<>();
+        params.put(Nodes.PARAM_RELATIVE_PATH, "/Data Dictionary");
+        response = getSingle(NodesEntityResource.class, rootNodeId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        String ddNodeId = nodeResp.getId();
+
+        // -ve - cannot delete Data Dictionary node
+        deleteNode(ddNodeId, true, 403);
+    }
+
+    private boolean existsArchiveNode(String nodeId) throws Exception
+    {
+        boolean result = false;
+        
+        HttpResponse response = publicApiClient.get(getScope(), URL_DELETED_NODES, nodeId, null, null, null);
+        if ((response != null) && (response.getStatusCode() == 200))
+        {
+            Node node = jacksonUtil.parseEntry(response.getJsonResponse(), Node.class);
+            result = ((node != null) && (node.getId() != null));
+        }
+        
+        return result;
+    }
+
+    /**
+     * Tests move (file or folder)
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/move}
+     */
+    @Test
+    public void testMove() throws Exception
+    {
+        setRequestContext(user1);
+
+        // create folder f0
+        String folder0Name = "f0-testMove-"+RUNID;
+        String f0Id = createFolder(Nodes.PATH_MY, folder0Name).getId();
+        
+        // create folder f1
+        Folder folderResp = createFolder(f0Id, "f1");
+        String f1Id = folderResp.getId();
+
+        // create folder f2
+        folderResp = createFolder(f0Id, "f2");
+        String f2Id = folderResp.getId();
+
+        // create doc d1
+        String d1Name = "content" + RUNID + "_1";
+        String d1Id = createTextFile(f1Id, d1Name, "The quick brown fox jumps over the lazy dog 1.").getId();
+
+        // create doc d2
+        String d2Name = "content" + RUNID + "_2";
+        String d2Id = createTextFile(f2Id, d2Name, "The quick brown fox jumps over the lazy dog 2.").getId();
+
+        // move file (without rename)
+
+        NodeTarget tgt = new NodeTarget();
+        tgt.setTargetParentId(f2Id);
+
+        HttpResponse response = post("nodes/"+d1Id+"/move", toJsonAsStringNonNull(tgt), null, 200);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertEquals(d1Name, documentResp.getName());
+        assertEquals(f2Id, documentResp.getParentId());
+
+        // move file (with rename)
+
+        String d1NewName = d1Name+" updated !!";
+
+        tgt = new NodeTarget();
+        tgt.setName(d1NewName);
+        tgt.setTargetParentId(f1Id);
+
+        response = post("nodes/"+d1Id+"/move", toJsonAsStringNonNull(tgt), null, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertEquals(d1NewName, documentResp.getName());
+        assertEquals(f1Id, documentResp.getParentId());
+
+        // -ve tests
+
+        // missing target
+        tgt = new NodeTarget();
+        tgt.setName("new name");
+        post("nodes/"+d1Id+"/move", toJsonAsStringNonNull(tgt), null, 400);
+
+        // name already exists
+        tgt = new NodeTarget();
+        tgt.setName(d2Name);
+        tgt.setTargetParentId(f2Id);
+        post("nodes/"+d1Id+"/move", toJsonAsStringNonNull(tgt), null, 409);
+
+        // unknown source nodeId
+        tgt = new NodeTarget();
+        tgt.setTargetParentId(f2Id);
+        post("nodes/"+UUID.randomUUID().toString()+"/move", toJsonAsStringNonNull(tgt), null, 404);
+
+        // unknown target nodeId
+        tgt = new NodeTarget();
+        tgt.setTargetParentId(UUID.randomUUID().toString());
+        post("nodes/"+d1Id+"/move", toJsonAsStringNonNull(tgt), null, 404);
+
+        // target is not a folder
+        tgt = new NodeTarget();
+        tgt.setTargetParentId(d2Id);
+        post("nodes/"+d1Id+"/move", toJsonAsStringNonNull(tgt), null, 400);
+
+        String rootNodeId = getRootNodeId();
+
+        // create folder f3 (sub-folder of f2)
+        folderResp = createFolder(f2Id, "f3");
+        String f3Id = folderResp.getId();
+
+        // can't create cycle (move into own subtree)
+        tgt = new NodeTarget();
+        tgt.setTargetParentId(f3Id);
+        post("nodes/"+f2Id+"/move", toJsonAsStringNonNull(tgt), null, 400);
+
+        // no (write/create) permissions to move to target
+        tgt = new NodeTarget();
+        tgt.setTargetParentId(rootNodeId);
+        post("nodes/"+d1Id+"/move", toJsonAsStringNonNull(tgt), null, 403);
+
+        setRequestContext(user2);
+
+        String my2NodeId = getMyNodeId();
+
+        // no (write/delete) permissions to move source
+        tgt = new NodeTarget();
+        tgt.setTargetParentId(my2NodeId);
+        post("nodes/"+f1Id+"/move", toJsonAsStringNonNull(tgt), null, 403);
+        
+        // -ve - cannot move (delete) Company Home root node
+        setRequestContext(networkAdmin);
+        post("nodes/"+rootNodeId+"/move", toJsonAsStringNonNull(tgt), null, 403);
+        
+        setRequestContext(user1);                                
+        
+        Map params = new HashMap<>();
+        params.put(Nodes.PARAM_RELATIVE_PATH, "/Sites");
+        response = getSingle(NodesEntityResource.class, rootNodeId, params, 200);
+        Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        String sitesNodeId = nodeResp.getId();
+
+        // -ve - cannot move (delete) Sites node
+        setRequestContext(networkAdmin);
+        post("nodes/"+sitesNodeId+"/move", toJsonAsStringNonNull(tgt), null, 403);
+
+        setRequestContext(user1);
+        
+        params = new HashMap<>();
+        params.put(Nodes.PARAM_RELATIVE_PATH, "/Data Dictionary");
+        response = getSingle(NodesEntityResource.class, rootNodeId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        String ddNodeId = nodeResp.getId();
+
+        // -ve - cannot move (delete) Data Dictionary node
+        setRequestContext(networkAdmin);
+        post("nodes/"+ddNodeId+"/move", toJsonAsStringNonNull(tgt), null, 403);
+
+        // -ve test - cannot move to multiple destinations in single POST call (unsupported)
+        List<NodeTarget> nodeDestinations = new ArrayList<>(2);
+        NodeTarget nodeTarget = new NodeTarget();
+        nodeTarget.setTargetParentId(f1Id);
+        nodeDestinations.add(nodeTarget);
+        nodeTarget = new NodeTarget();
+        nodeTarget.setTargetParentId(f2Id);
+        nodeDestinations.add(nodeTarget);
+
+        post("nodes/"+d1Id+"/move", toJsonAsStringNonNull(nodeDestinations), null, 405);
+    }
+
+    /**
+     * Tests copy (file or folder)
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/copy}
+     */
+    @Test
+    public void testCopy() throws Exception
+    {
+        setRequestContext(user1);
+        
+        // create folder
+        Folder folderResp = createFolder(Nodes.PATH_MY, "fsource");
+        String sourceId = folderResp.getId();
+
+        // create folder
+        folderResp = createFolder(Nodes.PATH_MY, "ftarget");
+        String targetId = folderResp.getId();
+
+        // create doc d1
+        String d1Name = "content" + RUNID + "_1";
+        String d1Id = createTextFile(sourceId, d1Name, "The quick brown fox jumps over the lazy dog 1.").getId();
+
+        // create doc d2
+        String d2Name = "content" + RUNID + "_2";
+        String d2Id = createTextFile(sourceId, d2Name, "The quick brown fox jumps over the lazy dog 2.").getId();
+
+        Map<String, String> body = new HashMap<>();
+        body.put("targetParentId", targetId);
+
+        HttpResponse response = post(URL_NODES, d1Id, "copy", toJsonAsStringNonNull(body).getBytes(), null, null, 201);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertEquals(d1Name, documentResp.getName());
+        assertEquals(targetId, documentResp.getParentId());
+
+        // copy file (with rename)
+        String newD2Name = d2Name + " updated !!";
+
+        body = new HashMap<>();
+        body.put("targetParentId", targetId);
+        body.put("name", newD2Name);
+
+        response = post(URL_NODES, d2Id, "copy", toJsonAsStringNonNull(body).getBytes(), null, null, 201);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertEquals(newD2Name, documentResp.getName());
+        assertEquals(targetId, documentResp.getParentId());
+
+        // -ve tests
+
+        // missing target
+        NodeTarget tgt = new NodeTarget();
+        tgt.setName("new name");
+        post("nodes/"+d1Id+"/copy", toJsonAsStringNonNull(tgt), null, 400);
+
+        // name already exists - different parent
+        tgt = new NodeTarget();
+        tgt.setName(newD2Name);
+        tgt.setTargetParentId(targetId);
+        post("nodes/"+d1Id+"/copy", toJsonAsStringNonNull(tgt), null, 409);
+
+        // name already exists - same parent
+        tgt = new NodeTarget();
+        tgt.setTargetParentId(sourceId);
+        post("nodes/"+d1Id+"/copy", toJsonAsStringNonNull(tgt), null, 409);
+
+        // unknown source nodeId
+        tgt = new NodeTarget();
+        tgt.setTargetParentId(targetId);
+        post("nodes/"+UUID.randomUUID().toString()+"/copy", toJsonAsStringNonNull(tgt), null, 404);
+
+        // unknown target nodeId
+        tgt = new NodeTarget();
+        tgt.setTargetParentId(UUID.randomUUID().toString());
+        post("nodes/"+d1Id+"/copy", toJsonAsStringNonNull(tgt), null, 404);
+
+        // target is not a folder
+        tgt = new NodeTarget();
+        tgt.setTargetParentId(d2Id);
+        post("nodes/"+d1Id+"/copy", toJsonAsStringNonNull(tgt), null, 400);
+
+        String rootNodeId = getRootNodeId();
+
+        // no (write/create) permissions to copy to target
+        tgt = new NodeTarget();
+        tgt.setTargetParentId(rootNodeId);
+        post("nodes/"+d1Id+"/copy", toJsonAsStringNonNull(tgt), null, 403);
+
+        // -ve test - cannot copy to multiple destinations in single POST call (unsupported)
+        List<NodeTarget> nodeDestinations = new ArrayList<>(2);
+        NodeTarget nodeTarget = new NodeTarget();
+        nodeTarget.setTargetParentId(sourceId);
+        nodeDestinations.add(nodeTarget);
+        nodeTarget = new NodeTarget();
+        nodeTarget.setTargetParentId(targetId);
+        nodeDestinations.add(nodeTarget);
+
+        post("nodes/"+d1Id+"/copy", toJsonAsStringNonNull(nodeDestinations), null, 405);
+    }
+
+    @Test
+    public void testCopySite() throws Exception
+    {
+        setRequestContext(user1);
+        
+        // create folder
+        Folder folderResp = createFolder(Nodes.PATH_MY, "siteCopytarget");
+        String targetId = folderResp.getId();
+
+        Map<String, String> body = new HashMap<>();
+        body.put("targetParentId", targetId);
+
+        //test that you can't copy a site
+        HttpResponse response = getSingle("sites", tSiteId, null, null, 200);
+        Site siteResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Site.class);
+        String siteNodeId = siteResp.getGuid();
+        post("nodes/"+siteNodeId+"/copy", toJsonAsStringNonNull(body), null, 422);
+        
+        //test that you can't copy a site doclib
+        post("nodes/"+tDocLibNodeId+"/copy", toJsonAsStringNonNull(body), null, 422);
+
+    }
+
+    /**
+     * Tests move and copy folder between sites.
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/move}
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/copy}
+     */
+    @Test
+    public void testMoveCopyBetweenSites() throws Exception
+    {
+        setRequestContext(user1);
+        
+        /*
+         * Precondition - create two sites, invite users, create folders
+         */
+        
+        // user1 creates a public site and adds user2 as a site collaborator
+        String site1Title = "site-testMoveCopyBetweenSites1-" + RUNID;
+        final String site1Id = createSite(site1Title, SiteVisibility.PUBLIC).getId();
+        addSiteMember(site1Id, user2, SiteRole.SiteCollaborator);
+
+        // Get user1Site's docLib node id
+        final String user1SitetDocLibNodeId = getSiteContainerNodeId(site1Id, "documentLibrary");
+
+        // user1 creates a folder in the docLib of his site (user1Site)
+        String user1Folder = "folder" + RUNID + "_user1";
+        String user1FolderNodeId = createFolder(user1SitetDocLibNodeId, user1Folder, null).getId();
+        
+        setRequestContext(user2);
+        
+        // user2 creates a public site and adds user1 as a site collaborator
+        String site2Title = "site-testMoveCopyBetweenSites2--" + RUNID;
+        final String site2Id = createSite(site2Title, SiteVisibility.PUBLIC).getId();
+        addSiteMember(site2Id, user1, SiteRole.SiteCollaborator);
+        
+        // Get user2Site's docLib node id
+        final String user2SitetDocLibNodeId = getSiteContainerNodeId(site2Id, "documentLibrary");
+
+        // user2 creates 2 folders within the docLib of the user1Site
+        String user2Folder1 = "folder1" + RUNID + "_user2";
+        String user2FolderNodeId = createFolder(user1SitetDocLibNodeId, user2Folder1, null).getId();
+
+        String user2Folder2 = "folder2" + RUNID + "_user2";
+        String user2Folder2NodeId = createFolder(user1SitetDocLibNodeId, user2Folder2, null).getId();
+
+        /*
+         * Test move between sites
+         */
+        // user1 moves the folder created by user2 to the user2Site's docLib
+
+        setRequestContext(user1);
+        
+        NodeTarget target = new NodeTarget();
+        target.setTargetParentId(user2SitetDocLibNodeId);
+        HttpResponse response = post("nodes/" + user2FolderNodeId + "/move", toJsonAsStringNonNull(target), null, 200);
+        Folder moveFolderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(user2SitetDocLibNodeId, moveFolderResp.getParentId());
+
+        // user1 tries to undo the move (moves back the folder to its original place)
+        // as user1 is just a SiteCollaborator in the user2Site, he can't move the folder which he doesn't own - ACL access permission.
+        target = new NodeTarget();
+        target.setTargetParentId(user1SitetDocLibNodeId);
+        post("nodes/" + user2FolderNodeId + "/move", toJsonAsStringNonNull(target), null, 403);
+
+        // user1 moves the folder created by himself to the docLib of the user2Site
+        target = new NodeTarget();
+        target.setTargetParentId(user2SitetDocLibNodeId);
+        response = post("nodes/" + user1FolderNodeId + "/move", toJsonAsStringNonNull(target), null, 200);
+        moveFolderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(user2SitetDocLibNodeId, moveFolderResp.getParentId());
+
+        // user1 tries to undo the move (moves back the folder to its original place)
+        // The undo should be successful as user1 owns the folder
+        target = new NodeTarget();
+        target.setTargetParentId(user1SitetDocLibNodeId);
+        response = post("nodes/" + user1FolderNodeId + "/move", toJsonAsStringNonNull(target), null, 200);
+        moveFolderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(user1SitetDocLibNodeId, moveFolderResp.getParentId());
+
+
+        /*
+         * Test copy between sites
+         */
+        // user1 copies the folder created by user2 to the user2Site's docLib
+        target = new NodeTarget();
+        target.setTargetParentId(user2SitetDocLibNodeId);
+        response = post("nodes/" + user2Folder2NodeId + "/copy", toJsonAsStringNonNull(target), null, 201);
+        Folder copyFolderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(user2SitetDocLibNodeId, copyFolderResp.getParentId());
+
+        // user1 tries to undo the copy (hard deletes the created copy)
+        deleteNode( copyFolderResp.getId(), true, 204);
+        
+        // Check it's deleted
+        getSingle("nodes", copyFolderResp.getId(), 404);
+        
+        
+        // cleanup
+        
+        setRequestContext(user1);
+        deleteSite(site1Id, true, 204);
+        
+        setRequestContext(user2);
+        deleteSite(site2Id, true, 204);
+    }
+
+    /**
+     * Tests create folder.
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/children}
+     */
+    @Test
+    public void testCreateFolder() throws Exception
+    {
+        setRequestContext(user1);
+        
+        String myNodeId = getMyNodeId();
+
+        UserInfo expectedUser = new UserInfo(user1);
+
+        String postUrl = getNodeChildrenUrl(myNodeId);
+
+        // create folder
+        Folder folderResp = createFolder(myNodeId, "f1");
+        String f1Id = folderResp.getId();
+
+        Folder f1 = new Folder();
+        f1.setName("f1");
+        f1.setNodeType(TYPE_CM_FOLDER);
+
+        f1.setIsFolder(true);
+        f1.setParentId(myNodeId);
+        f1.setAspectNames(Collections.singletonList("cm:auditable"));
+
+        f1.setCreatedByUser(expectedUser);
+        f1.setModifiedByUser(expectedUser);
+
+        f1.expected(folderResp);
+
+        // create sub-folder with properties
+        Map<String,Object> props = new HashMap<>();
+        props.put("cm:title","my folder title");
+        props.put("cm:description","my folder description");
+
+        folderResp = createFolder(f1Id, "f2", props);
+        String f2Id = folderResp.getId();
+
+        Folder f2 = new Folder();
+        f2.setName("f2");
+        f2.setNodeType(TYPE_CM_FOLDER);
+        f2.setProperties(props);
+
+        f2.setIsFolder(true);
+        f2.setParentId(f1Id);
+        f2.setAspectNames(Arrays.asList("cm:auditable","cm:titled"));
+
+        f2.setCreatedByUser(expectedUser);
+        f2.setModifiedByUser(expectedUser);
+
+        f2.expected(folderResp);
+
+        // create another folder in a (partially existing) folder path
+        Node n = new Node();
+        n.setName("fZ");
+        n.setNodeType(TYPE_CM_FOLDER);
+        n.setRelativePath("/f1/f2/f3/f4");
+
+        // create node
+        HttpResponse response = post(getNodeChildrenUrl(myNodeId), RestApiUtil.toJsonAsStringNonNull(n), 201);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+
+        // check parent hierarchy ...
+        response = getSingle(NodesEntityResource.class, folderResp.getId(), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(folderResp.getName(),"fZ");
+
+        response = getSingle(NodesEntityResource.class, folderResp.getParentId(), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(folderResp.getName(),"f4");
+
+        response = getSingle(NodesEntityResource.class, folderResp.getParentId(), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(folderResp.getName(),"f3");
+
+        response = getSingle(NodesEntityResource.class, folderResp.getParentId(), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(folderResp.getName(),"f2");
+        assertEquals(folderResp.getId(), f2Id);
+
+        // -ve test - name is mandatory
+        Folder invalid = new Folder();
+        invalid.setNodeType(TYPE_CM_FOLDER);
+        post(postUrl, toJsonAsStringNonNull(invalid), 400);
+
+        // -ve test - invalid name
+        invalid = new Folder();
+        invalid.setName("inv:alid");
+        invalid.setNodeType(TYPE_CM_FOLDER);
+        post(postUrl, toJsonAsStringNonNull(invalid), 422);
+
+        // -ve test - node type is mandatory
+        invalid = new Folder();
+        invalid.setName("my folder");
+        post(postUrl, toJsonAsStringNonNull(invalid), 400);
+
+        // create empty file - used in -ve test below
+        Document d1 = new Document();
+        d1.setName("d1.txt");
+        d1.setNodeType(TYPE_CM_CONTENT);
+
+        response = post(postUrl, toJsonAsStringNonNull(d1), 201);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String d1Id = documentResp.getId();
+
+        // -ve test - invalid (model integrity exception)
+        Folder f3 = new Folder();
+        f3.setName("f3");
+        f3.setNodeType(TYPE_CM_FOLDER);
+        post(getNodeChildrenUrl(d1Id), toJsonAsStringNonNull(f3), 422);
+
+        // -ve test - it should not be possible to create a "system folder"
+        invalid = new Folder();
+        invalid.setName("my sys folder");
+        invalid.setNodeType("cm:systemfolder");
+        post(postUrl, toJsonAsStringNonNull(invalid), 400);
+
+        // -ve test - unknown parent folder node id
+        post(getNodeChildrenUrl(UUID.randomUUID().toString()), toJsonAsStringNonNull(f3), 404);
+
+        // -ve test - duplicate name
+        post(postUrl, toJsonAsStringNonNull(f1), 409);
+
+        // Create a folder with a duplicate name (f1), but set the autoRename to true
+        response = post(postUrl, toJsonAsStringNonNull(f1), "?"+Nodes.PARAM_AUTO_RENAME+"=true", 201);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals("f1-1", documentResp.getName());
+
+        // Create a folder with a duplicate name (f1) again, but set the autoRename to true
+        response = post(postUrl, toJsonAsStringNonNull(f1), "?"+Nodes.PARAM_AUTO_RENAME+"=true", 201);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals("f1-2", documentResp.getName());
+
+        // -ve test - create a folder with a duplicate name (f1), but set the autoRename to false
+        post(postUrl, toJsonAsStringNonNull(f1), "?"+Nodes.PARAM_AUTO_RENAME+"=false", 409);
+        
+        // Create folder using relative path
+        n = new Node();
+        n.setName("fX");
+        n.setNodeType(TYPE_CM_FOLDER);
+        n.setRelativePath("/f1/f2");
+        
+        response = post(postUrl, toJsonAsStringNonNull(n), "?"+Nodes.PARAM_AUTO_RENAME+"=true", 201);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals("fX", documentResp.getName());
+
+        // Create a folder using relative path, with a duplicate name (fX) but set the autoRename to true
+        response = post(postUrl, toJsonAsStringNonNull(n), "?"+Nodes.PARAM_AUTO_RENAME+"=true", 201);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals("fX-1", documentResp.getName());
+
+        // -ve test - create a folder with a duplicate name (fX), but set the autoRename to false
+        post(postUrl, toJsonAsStringNonNull(n), "?"+Nodes.PARAM_AUTO_RENAME+"=false", 409);
+
+        // -ve test - invalid relative path
+        n = new Node();
+        n.setName("fX");
+        n.setNodeType(TYPE_CM_FOLDER);
+        n.setRelativePath("/f1/inv:alid");
+        post(getNodeChildrenUrl(f2Id), RestApiUtil.toJsonAsStringNonNull(n), 422);
+
+        // -ve test - invalid relative path - points to existing node that is not a folder
+        n = new Node();
+        n.setName("fY");
+        n.setNodeType(TYPE_CM_FOLDER);
+        n.setRelativePath("d1.txt");
+        post(getNodeChildrenUrl(myNodeId), RestApiUtil.toJsonAsStringNonNull(n), 409);
+
+        // -ve test - minor: error code if trying to create with property with invalid format (REPO-473)
+        props = new HashMap<>();
+        props.put("exif:pixelYDimension", "my unknown property");
+        n = new Folder();
+        n.setName("fZ");
+        n.setNodeType(TYPE_CM_FOLDER);
+        n.setProperties(props);
+        post(getNodeChildrenUrl(myNodeId), RestApiUtil.toJsonAsStringNonNull(n), 400);
+    }
+
+    /**
+     * Tests creation and listing of children using assoc type other than "cm:contains".
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/children}
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/children}
+     */
+    @Test
+    public void testChildrenAssocType() throws Exception
+    {
+        setRequestContext(user1);
+        
+        String myNodeId = getMyNodeId();
+
+        String fId = null;
+
+        try
+        {
+            fId = createFolder(myNodeId, "testChildrenAssocType folder").getId();
+
+            Node nodeUpdate = new Node();
+            nodeUpdate.setAspectNames(Collections.singletonList(ASPECT_CM_PREFERENCES));
+
+            put(URL_NODES, fId, toJsonAsStringNonNull(nodeUpdate), null, 200);
+
+            HttpResponse response = getAll(getNodeChildrenUrl(fId), null, null, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            Node obj = new Node();
+            obj.setName("c1");
+            obj.setNodeType(TYPE_CM_CONTENT);
+
+            // assoc type => cm:contains
+            response = post(getNodeChildrenUrl(fId), toJsonAsStringNonNull(obj), 201);
+            Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            String c1Id = nodeResp.getId();
+            assertEquals(fId, nodeResp.getParentId());
+
+            response = getAll(getNodeChildrenUrl(fId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+
+            obj = new Node();
+            obj.setName("c2");
+            obj.setNodeType(TYPE_CM_CONTENT);
+            Association assoc = new Association();
+            assoc.setAssocType(ASSOC_TYPE_CM_PREFERENCE_IMAGE);
+            obj.setAssociation(assoc);
+
+            // assoc type => cm:preferenceImage
+            response = post(getNodeChildrenUrl(fId), toJsonAsStringNonNull(obj), 201);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            String c2Id = nodeResp.getId();
+            assertEquals(fId, nodeResp.getParentId());
+
+            response = getAll(getNodeChildrenUrl(fId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+
+            Map<String, String> params = new HashMap<>();
+            params.put("where", "(assocType='"+ASSOC_TYPE_CM_CONTAINS+"')");
+            params.put("include", "association");
+            response = getAll(getNodeChildrenUrl(fId), null, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(c1Id, nodes.get(0).getId());
+            assertTrue(nodes.get(0).getAssociation().getIsPrimary());
+
+            params = new HashMap<>();
+            params.put("where", "(assocType='"+ASSOC_TYPE_CM_PREFERENCE_IMAGE+"')");
+            params.put("include", "association");
+            response = getAll(getNodeChildrenUrl(fId), null, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(c2Id, nodes.get(0).getId());
+            assertTrue(nodes.get(0).getAssociation().getIsPrimary());
+
+            //
+            // test that we can also create children below content
+            //
+
+            obj = new Node();
+            obj.setName("c3");
+            obj.setNodeType(TYPE_CM_CONTENT);
+            nodeUpdate.setAspectNames(Collections.singletonList(ASPECT_CM_PREFERENCES));
+
+            // assoc type => cm:contains
+            response = post(getNodeChildrenUrl(fId), toJsonAsStringNonNull(obj), 201);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            String c3Id = nodeResp.getId();
+
+            obj = new Node();
+            obj.setName("c4");
+            obj.setNodeType(TYPE_CM_CONTENT);
+            assoc = new Association();
+            assoc.setAssocType(ASSOC_TYPE_CM_PREFERENCE_IMAGE);
+            obj.setAssociation(assoc);
+
+            // assoc type => cm:preferenceImage
+            response = post(getNodeChildrenUrl(c3Id), toJsonAsStringNonNull(obj), 201);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals(c3Id, nodeResp.getParentId());
+
+            // -ve test
+            obj = new Node();
+            obj.setName("c5");
+            obj.setNodeType(TYPE_CM_CONTENT);
+            assoc = new Association();
+            assoc.setAssocType(ASSOC_TYPE_CM_CONTAINS);
+            obj.setAssociation(assoc);
+
+            // assoc type => cm:contains (requires parent to be a folder !)
+            post(getNodeChildrenUrl(c3Id), toJsonAsStringNonNull(obj), 422);
+        }
+        finally
+        {
+            // some cleanup
+            if (fId != null)
+            {
+                deleteNode(fId);
+            }
+        }
+    }
+
+    // TODO test custom types with properties (sub-type of cm:cmobject)
+
+    @Test
+    public void testListChildrenIsFileIsFolderFilter() throws Exception
+    {
+        setRequestContext(user1);
+        
+        String myNodeId = getMyNodeId();
+        
+        String fId = createFolder(myNodeId, "f1-testUpdateOwner-"+RUNID).getId();
+        
+        String childrenUrl = getNodeChildrenUrl(fId);
+        
+        int folderCnt = 2;
+        int fileCnt = 3;
+        int objCnt = 4;
+
+        // create some folders
+        List<String> folderIds = new ArrayList<>(folderCnt);
+
+        for (int i = 1; i <= folderCnt; i++)
+        {
+            folderIds.add(createFolder(fId, "folder "+i+" "+RUNID).getId());
+        }
+
+        // create some files
+        List<String> fileIds = new ArrayList<>(fileCnt);
+        for (int i = 1; i <= fileCnt; i++)
+        {
+            fileIds.add(createTextFile(fId, "file "+i+" "+RUNID, "The quick brown fox jumps over the lazy dog "+i).getId());
+        }
+
+        // create some nodes (cmobject)
+        List<String> objIds = new ArrayList<>(objCnt);
+        for (int i = 1; i <= objCnt; i++)
+        {
+            Node obj = new Node();
+            obj.setName("obj "+i+" "+RUNID);
+            obj.setNodeType(TYPE_CM_OBJECT);
+
+            // create node/object
+            HttpResponse response = post(childrenUrl, toJsonAsStringNonNull(obj), 201);
+            Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            objIds.add(nodeResp.getId());
+        }
+
+        List<String> allIds = new ArrayList<>(objCnt+folderCnt+fileCnt);
+        allIds.addAll(folderIds);
+        allIds.addAll(fileIds);
+        allIds.addAll(objIds);
+
+        List<String> folderAndFileIds = new ArrayList<>(folderCnt+fileCnt);
+        folderAndFileIds.addAll(folderIds);
+        folderAndFileIds.addAll(fileIds);
+
+        List<String> notFileIds = new ArrayList<>(folderCnt+objCnt);
+        notFileIds.addAll(folderIds);
+        notFileIds.addAll(objIds);
+
+        List<String> notFolderIds = new ArrayList<>(fileCnt+objCnt);
+        notFolderIds.addAll(fileIds);
+        notFolderIds.addAll(objIds);
+
+        Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+        // no filtering
+
+        HttpResponse response = getAll(childrenUrl, paging, null, 200);
+        List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        checkNodeIds(nodes, allIds);
+
+        // filtering, via where clause - folders
+
+        Map<String, String> params = new HashMap<>();
+        params.put("where", "(nodeType='"+TYPE_CM_FOLDER+"')");
+
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        checkNodeIds(nodes, folderIds);
+
+        params = new HashMap<>();
+        params.put("where", "(isFolder=true)");
+
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        checkNodeIds(nodes, folderIds);
+
+        params = new HashMap<>();
+        params.put("where", "(isFolder=true AND isFile=false)");
+
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        checkNodeIds(nodes, folderIds);
+
+        // filtering, via where clause - files
+
+        params = new HashMap<>();
+        params.put("where", "(nodeType='"+TYPE_CM_CONTENT+"')");
+
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        checkNodeIds(nodes, fileIds);
+
+        params = new HashMap<>();
+        params.put("where", "(isFile=true)");
+
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        checkNodeIds(nodes, fileIds);
+
+        params = new HashMap<>();
+        params.put("where", "(isFile=true AND isFolder=false)");
+
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        checkNodeIds(nodes, fileIds);
+
+        // filtering, via where clause - non-folders / non-files
+
+        params = new HashMap<>();
+        params.put("where", "(nodeType='"+TYPE_CM_OBJECT+"')");
+
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        checkNodeIds(nodes, objIds);
+
+        params = new HashMap<>();
+        params.put("where", "(nodeType='cm:cmobject INCLUDESUBTYPES')");
+
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        checkNodeIds(nodes, allIds);
+
+        params = new HashMap<>();
+        params.put("where", "(isFile=false AND isFolder=false)");
+
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        checkNodeIds(nodes, objIds);
+
+        // filtering, via where clause - not files
+        params = new HashMap<>();
+        params.put("where", "(isFile=false)");
+
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        checkNodeIds(nodes, notFileIds);
+
+        // filtering, via where clause - not folders
+        params = new HashMap<>();
+        params.put("where", "(isFolder=false)");
+
+        response = getAll(childrenUrl, paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        checkNodeIds(nodes, notFolderIds);
+
+        // -ve - node cannot be both a file and a folder
+        params = new HashMap<>();
+        params.put("where", "(isFile=true AND isFolder=true)");
+        getAll(childrenUrl, paging, params, 400);
+
+        // -ve - nodeType and isFile/isFolder are mutually exclusive
+        params = new HashMap<>();
+        params.put("where", "(nodeType='cm:object' AND isFolder=true)");
+        getAll(childrenUrl, paging, params, 400);
+
+        params = new HashMap<>();
+        params.put("where", "(nodeType='cm:object' AND isFile=true)");
+        getAll(childrenUrl, paging, params, 400);
+    }
+
+    private void checkNodeIds(List<Node> nodes, List<String> nodeIds)
+    {
+        assertEquals(nodeIds.size(), nodes.size());
+        for (Node node : nodes)
+        {
+            assertTrue(nodeIds.contains(node.getId()));
+        }
+    }
+
+    // note: app:folderlink & app:filelink both extend cm:link (which in turn extends cm:cmobject)
+    //       (see applicationModel.xml / contentModel.xml)
+    @Test
+    public void testLinkCRUD() throws Exception
+    {
+        setRequestContext(user1);
+
+        String myNodeId = getMyNodeId();
+        UserInfo expectedUser = new UserInfo(user1);
+        String myChildrenUrl = getNodeChildrenUrl(myNodeId);
+        
+        // create folder f1
+        Folder folderResp = createFolder(myNodeId, "f1 "+RUNID);
+        String f1Id = folderResp.getId();
+
+        // create empty file d1 in f1
+        Document d1 = new Document();
+        d1.setName("d1.txt");
+        d1.setNodeType(TYPE_CM_CONTENT);
+
+        HttpResponse response = post(getNodeChildrenUrl(f1Id), toJsonAsStringNonNull(d1), 201);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String d1Id = documentResp.getId();
+
+        // create folder f2
+        folderResp = createFolder(myNodeId, "f2 "+RUNID);
+        String f2Id = folderResp.getId();
+
+        // create folder link node in f2 (pointing to f1)
+        String nodeName = "f1 link";
+        String nodeType = "app:folderlink";
+
+        Map<String,Object> props = new HashMap<>();
+        props.put("cm:destination", f1Id);
+
+        Node nodeResp = createNode(f2Id, nodeName, nodeType, props);
+        String n1Id = nodeResp.getId();
+
+        Node n1 = new Node();
+        n1.setName(nodeName);
+        n1.setNodeType(nodeType);
+        n1.setIsFolder(true);
+        n1.setParentId(f2Id); // note: parent of the link (not where it is pointing)
+        n1.setAspectNames(Collections.singletonList("cm:auditable"));
+        n1.setProperties(props);
+        n1.setCreatedByUser(expectedUser);
+        n1.setModifiedByUser(expectedUser);
+
+        n1.expected(nodeResp);
+
+        // get node info
+        response = getSingle(NodesEntityResource.class, n1Id, null, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+
+        n1.expected(nodeResp);
+
+        // create file link node in f2 pointing to d1
+        nodeName = "d1 link";
+        nodeType = "app:filelink";
+
+        props = new HashMap<>();
+        props.put("cm:destination", d1Id);
+
+        nodeResp = createNode(f2Id, nodeName, nodeType, props);
+        String n2Id = nodeResp.getId();
+
+        Node n2 = new Node();
+        n2.setName(nodeName);
+        n2.setNodeType(nodeType);
+        n2.setIsFolder(false);
+        n2.setParentId(f2Id); // note: parent of the link (not where it is pointing)
+        n2.setAspectNames(Collections.singletonList("cm:auditable"));
+        n2.setProperties(props);
+        n2.setCreatedByUser(expectedUser);
+        n2.setModifiedByUser(expectedUser);
+
+        n2.expected(nodeResp);
+
+        // get node info
+        response = getSingle(NodesEntityResource.class, n2Id, null, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+
+        n2.expected(nodeResp);
+
+
+        // update node - rename
+
+        String updatedName = "f1 link renamed";
+
+        Node nUpdate = new Node();
+        nUpdate.setName(updatedName);
+
+        response = put(URL_NODES, n1Id, toJsonAsStringNonNull(nUpdate), null, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        n1.setName(updatedName);
+        n1.expected(nodeResp);
+
+
+        // filtering, via where clause (nodeType + optionally including sub-types)
+
+        List<String> linkIds = Arrays.asList(n1Id, n2Id);
+
+        Map<String, String> params = new HashMap<>();
+        params.put("where", "(nodeType='cm:link')");
+
+        Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+        response = getAll(getNodeChildrenUrl(f2Id), paging, params, 200);
+        List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertEquals(0, nodes.size());
+
+        // filter by including sub-types - note: includesubtypes is case-insensitive
+
+        params = new HashMap<>();
+        params.put("where", "(nodeType='cm:link INCLUDESUBTYPES')");
+
+        paging = getPaging(0, Integer.MAX_VALUE);
+
+        response = getAll(getNodeChildrenUrl(f2Id), paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertEquals(linkIds.size(), nodes.size());
+        assertTrue(linkIds.contains(nodes.get(0).getId()));
+        assertTrue(linkIds.contains(nodes.get(1).getId()));
+
+        params = new HashMap<>();
+        params.put("where", "(nodeType='cm:link includeSubTypes')");
+
+        paging = getPaging(0, Integer.MAX_VALUE);
+
+        response = getAll(getNodeChildrenUrl(f2Id), paging, params, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertEquals(linkIds.size(), nodes.size());
+        assertTrue(linkIds.contains(nodes.get(0).getId()));
+        assertTrue(linkIds.contains(nodes.get(1).getId()));
+
+
+        // delete link
+        deleteNode(n1Id);
+
+        // -ve test - delete - cannot delete nonexistent link
+        deleteNode(n1Id, 404);
+
+        // -ve test - create - name is mandatory
+        Node invalid = new Node();
+        invalid.setNodeType("cm:link");
+        post(myChildrenUrl, toJsonAsStringNonNull(invalid), 400);
+
+        // -ve test - create - node type is mandatory
+        invalid = new Node();
+        invalid.setName("my node");
+        post(myChildrenUrl, toJsonAsStringNonNull(invalid), 400);
+
+        // -ve test - create - unsupported node type
+        invalid = new Node();
+        invalid.setName("my node");
+        invalid.setNodeType("sys:base");
+        post(myChildrenUrl, toJsonAsStringNonNull(invalid), 400);
+
+        // -ve test - create - duplicate name
+        post(getNodeChildrenUrl(f2Id), toJsonAsStringNonNull(n2), 409);
+
+        // -ve test - unknown nodeType when filtering
+        params = new HashMap<>();
+        params.put("where", "(nodeType='my:unknown'");
+        getAll(getNodeChildrenUrl(f2Id), paging, params, 400);
+
+        // -ver test - invalid node type localname format and suffix is not ' includesubtypes'
+        params = new HashMap<>();
+        params.put("where", "(nodeType='cm:link ')");
+        getAll(getNodeChildrenUrl(f2Id), paging, params, 400);
+
+        params = new HashMap<>();
+        params.put("where", "(nodeType='cm:link blah')");
+        getAll(getNodeChildrenUrl(f2Id), paging, params, 400);
+    }
+
+    /**
+     * REPO-24
+     * Tests upload fails with empty or invalid multipart/form-data.
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/children}
+     */
+    @Test
+    public void testMultipartFormDataUpload() throws Exception
+    {
+        setRequestContext(user1);
+
+        final String fileName = "quick-1.txt";
+        final File file = getResourceFile(fileName);
+
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file));
+        MultiPartRequest reqBody = multiPartBuilder.build();
+
+        // Upload with empty multipart
+        post(getNodeChildrenUrl(Nodes.PATH_MY), "", null, reqBody.getContentType(), 400);
+
+        // Upload with multipart with missing boundary e.g. multipart/form-data; boundary=7cgH0q1hSgrlmU7tUe8kGSWT4Un6aRH
+        post(getNodeChildrenUrl(Nodes.PATH_MY), reqBody.getBody(), null, "multipart/form-data", 415);
+    }
+
+
+    /**
+     * Tests create empty file.
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/children}
+     */
+    @Test
+    public void testCreateEmptyFile() throws Exception
+    {
+        setRequestContext(user1);
+        
+        // create folder f0
+        String folder0Name = "f0-testCreateEmptyFile-"+RUNID;
+        String f0Id = createFolder(Nodes.PATH_MY, folder0Name).getId();
+
+        UserInfo expectedUser = new UserInfo(user1);
+
+        String postUrl = getNodeChildrenUrl(f0Id);
+
+        Document d1 = new Document();
+        d1.setName("d1.txt");
+        d1.setNodeType(TYPE_CM_CONTENT);
+
+        // create empty file
+        HttpResponse response = post(postUrl, toJsonAsStringNonNull(d1), 201);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String d1Id = documentResp.getId();
+
+        d1.setIsFolder(false);
+        d1.setParentId(f0Id);
+        d1.setAspectNames(Collections.singletonList("cm:auditable"));
+
+        d1.setCreatedByUser(expectedUser);
+        d1.setModifiedByUser(expectedUser);
+
+        ContentInfo ciExpected = new ContentInfo();
+        ciExpected.setMimeType("text/plain");
+        ciExpected.setMimeTypeName("Plain Text");
+        ciExpected.setSizeInBytes(0L);
+        ciExpected.setEncoding("UTF-8");
+        d1.setContent(ciExpected);
+
+        d1.expected(documentResp);
+
+        // create empty file with properties
+        Map<String,Object> props = new HashMap<>();
+        props.put("cm:title","my file title");
+        props.put("cm:description","my file description");
+
+        Document d2 = new Document();
+        d2.setName("d2.txt");
+        d2.setNodeType(TYPE_CM_CONTENT);
+        d2.setProperties(props);
+
+        response = post(postUrl, toJsonAsStringNonNull(d2), 201);
+
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        d2.setIsFolder(false);
+        d2.setParentId(f0Id);
+        d2.setAspectNames(Arrays.asList("cm:auditable","cm:titled"));
+
+        d2.setCreatedByUser(expectedUser);
+        d2.setModifiedByUser(expectedUser);
+
+        ciExpected = new ContentInfo();
+        ciExpected.setMimeType("text/plain");
+        ciExpected.setMimeTypeName("Plain Text");
+        ciExpected.setSizeInBytes(0L);
+        ciExpected.setEncoding("UTF-8");
+        d2.setContent(ciExpected);
+
+        d2.expected(documentResp);
+
+        // create another empty file in a (partially existing) folder path
+        Node n = new Node();
+        n.setName("d3.txt");
+        n.setNodeType(TYPE_CM_CONTENT);
+        n.setRelativePath("/f1/f2");
+
+        // create node
+        response = post(getNodeChildrenUrl(f0Id), RestApiUtil.toJsonAsStringNonNull(n), 201);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        // check parent hierarchy ...
+        response = getSingle(NodesEntityResource.class, documentResp.getId(), null, 200);
+        Folder folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(folderResp.getName(),"d3.txt");
+
+        response = getSingle(NodesEntityResource.class, folderResp.getParentId(), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(folderResp.getName(),"f2");
+
+        response = getSingle(NodesEntityResource.class, folderResp.getParentId(), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(folderResp.getName(),"f1");
+
+        response = getSingle(NodesEntityResource.class, folderResp.getParentId(), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(f0Id, folderResp.getId());
+
+        // -ve test - name is mandatory
+        Document invalid = new Document();
+        invalid.setNodeType(TYPE_CM_CONTENT);
+        post(postUrl, toJsonAsStringNonNull(invalid), 400);
+
+        // -ve test - node type is mandatory
+        invalid = new Document();
+        invalid.setName("my file.txt");
+        post(postUrl, toJsonAsStringNonNull(invalid), 400);
+
+        // -ve test - invalid (model integrity exception)
+        Document d3 = new Document();
+        d3.setName("d3.txt");
+        d3.setNodeType(TYPE_CM_CONTENT);
+        post(getNodeChildrenUrl(d1Id), toJsonAsStringNonNull(d3), 422);
+
+        // -ve test - unknown parent folder node id
+        post(getNodeChildrenUrl(UUID.randomUUID().toString()), toJsonAsStringNonNull(d3), 404);
+
+        // -ve test - duplicate name
+        post(postUrl, toJsonAsStringNonNull(d1), 409);
+
+        // Create a file with a duplicate name (d1.txt), but set the autoRename to true
+        response = post(postUrl, toJsonAsStringNonNull(d1), "?"+Nodes.PARAM_AUTO_RENAME+"=true", 201);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals("d1-1.txt", documentResp.getName());
+
+        // Create a file with a duplicate name (d1.txt) again, but set the autoRename to true
+        response = post(postUrl, toJsonAsStringNonNull(d1), "?"+Nodes.PARAM_AUTO_RENAME+"=true", 201);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals("d1-2.txt", documentResp.getName());
+
+        // Create a file with a duplicate name (d1-2.txt) again, but set the autoRename to true
+        d1.setName("d1-2.txt");
+        response = post(postUrl, toJsonAsStringNonNull(d1), "?"+Nodes.PARAM_AUTO_RENAME+"=true", 201);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals("d1-2-1.txt", documentResp.getName());
+
+        // -ve test - create a file with a duplicate name (d1-2.txt), but set the autoRename to false
+        post(postUrl, toJsonAsStringNonNull(d1), "?"+Nodes.PARAM_AUTO_RENAME+"=false", 409);
+    }
+
+    @Test
+    public void testUpdateNodeConcurrentlyUsingInMemoryBacked() throws Exception
+    {
+        // Less than its memory threshold ( 4 MB )
+        updateNodeConcurrently(1024L);
+    }
+
+    @Test
+    public void testUpdateNodeConcurrentlyUsingFileBacked() throws Exception
+    {
+        // Bigger than its memory threshold ( 5 > 4 MB )
+        updateNodeConcurrently(5 * 1024 * 1024L);
+    }
+
+    private void updateNodeConcurrently(Long contentSize) throws Exception
+    {
+        setRequestContext(user1);
+
+        // Create folder
+        String folder0Name = "f0-testUpdateNodeConcurrently-" + RUNID;
+        String f0Id = createFolder(Nodes.PATH_MY, folder0Name).getId();
+
+        // Create empty file
+        Document d1 = new Document();
+        d1.setName("d1.txt");
+        d1.setNodeType(TYPE_CM_CONTENT);
+
+        Map params = new HashMap<>();
+        params.put("majorVersion", "true");
+
+        Document documentResp = createEmptyTextFile(f0Id, d1.getName(), params, 201);
+        assertEquals("1.0", documentResp.getProperties().get("cm:versionLabel"));
+        String docId = documentResp.getId();
+
+        // Store the threads so that we can check if they are done
+        List<Thread> threads = new ArrayList<Thread>();
+
+        // Create threads
+        for (int i = 0; i < 2; i++)
+        {
+            Runnable task = new UpdateNodeRunnable(docId, contentSize);
+
+            Thread worker = new Thread(task);
+            worker.setName(String.valueOf(i));
+            worker.start();
+
+            // Remember the thread for later usage
+            threads.add(worker);
+        }
+        int running = 0;
+        do
+        {
+            running = 0;
+            for (Thread thread : threads)
+            {
+                if (thread.isAlive())
+                {
+                    running++;
+                }
+            }
+        } while (running > 0);
+
+        HttpResponse response = getSingle(URL_NODES, docId, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertTrue("File size is 0 bytes", documentResp.getContent().getSizeInBytes().intValue() > 0);
+
+        // Download text content - by default with Content-Disposition header
+        response = getSingle(NodesEntityResource.class, docId + "/content", null, 200);
+
+        byte[] bytes = response.getResponseAsBytes();
+        assertEquals(contentSize.intValue(), bytes.length);
+    }
+
+    private class UpdateNodeRunnable implements Runnable
+    {
+        private final String docId;
+        private final Long contentSize;
+
+        UpdateNodeRunnable(String docId, Long contentSize)
+        {
+            this.docId = docId;
+            this.contentSize = contentSize;
+        }
+
+        @Override
+        public void run()
+        {
+            setRequestContext(user1);
+
+            Map<String, String> params = new HashMap<>();
+            params.put("majorVersion", "true");
+
+            Document documentResp = null;
+            try
+            {
+                documentResp = updateTextFileWithRandomContent(docId, contentSize, params);
+            }
+            catch (Exception e)
+            {
+                e.printStackTrace();
+            }
+            assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+            assertNotNull(documentResp.getProperties());
+
+            assertEquals(contentSize, documentResp.getContent().getSizeInBytes());
+        }
+    }
+
+    protected Document updateTextFileWithRandomContent(String contentId, Long contentSize, Map<String, String> params) throws Exception
+    {
+        return updateTextFileWithRandomContent(contentId, contentSize, params, 200);
+    }
+
+    protected Document updateTextFileWithRandomContent(String contentId, Long contentSize, Map<String, String> params, int expectedStatus) throws Exception
+    {
+        File txtFile = TempFileProvider.createTempFile(getClass().getSimpleName(), ".txt");
+        RandomAccessFile file = new RandomAccessFile(txtFile.getPath(), "rw");
+        file.setLength(contentSize);
+        file.close();
+
+        BinaryPayload payload = new BinaryPayload(txtFile);
+
+        HttpResponse response = putBinary(getNodeContentUrl(contentId), payload, null, params, expectedStatus);
+        if (expectedStatus != 200)
+        {
+            return null;
+        }
+        return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+    }
+
+    /**
+     * Tests update node info (file or folder)
+     * <p>PUT:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>}
+     */
+    @Test
+    public void testUpdateNodeInfo() throws Exception
+    {
+        setRequestContext(user1);
+        
+        // create folder f0
+        String folder0Name = "f0-testUpdateNodeInfo-"+RUNID;
+        String f0Id = createFolder(Nodes.PATH_MY, folder0Name).getId();
+
+        UserInfo expectedUser = new UserInfo(user1);
+
+        String postUrl = getNodeChildrenUrl(f0Id);
+
+        String folderName = "My Folder";
+
+        // create folder
+        Folder folderResp = createFolder(f0Id, folderName);
+
+        String fId = folderResp.getId();
+
+        Folder f1 = new Folder();
+        f1.setName(folderName);
+        f1.setNodeType(TYPE_CM_FOLDER);
+
+        f1.setIsFolder(true);
+        f1.setParentId(f0Id);
+        f1.setAspectNames(Collections.singletonList("cm:auditable"));
+
+        f1.setCreatedByUser(expectedUser);
+        f1.setModifiedByUser(expectedUser);
+
+        f1.expected(folderResp);
+
+        // create empty file
+
+        Document d1 = new Document();
+        d1.setName("d1.txt");
+        d1.setNodeType(TYPE_CM_CONTENT);
+
+        HttpResponse response = post(postUrl, toJsonAsStringNonNull(d1), 201);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        String dId = documentResp.getId();
+
+        d1.setIsFolder(false);
+        d1.setParentId(f0Id);
+        d1.setAspectNames(Collections.singletonList("cm:auditable"));
+
+        d1.setCreatedByUser(expectedUser);
+        d1.setModifiedByUser(expectedUser);
+
+        ContentInfo ciExpected = new ContentInfo();
+        ciExpected.setMimeType("text/plain");
+        ciExpected.setMimeTypeName("Plain Text");
+        ciExpected.setSizeInBytes(0L);
+        ciExpected.setEncoding("UTF-8");
+        d1.setContent(ciExpected);
+
+        d1.expected(documentResp);
+
+        // update file - name (=> rename within current folder)
+
+        Document dUpdate = new Document();
+        dUpdate.setName("d1b.txt");
+
+        response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        d1.setName("d1b.txt");
+        d1.expected(documentResp);
+
+        // update file - add some properties
+
+        Map<String,Object> props = new HashMap<>();
+        props.put("cm:title","my file title");
+        props.put("cm:description","my file description");
+
+        dUpdate = new Document();
+        dUpdate.setProperties(props);
+
+        response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        d1.setProperties(props);
+        d1.setAspectNames(Arrays.asList("cm:auditable","cm:titled"));
+        d1.expected(documentResp);
+
+        // update file - add versionable aspect
+
+        dUpdate = new Document();
+        dUpdate.setAspectNames(Arrays.asList("cm:auditable","cm:titled","cm:versionable"));
+
+        response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        d1.getProperties().put("cm:versionLabel","1.0");
+        d1.getProperties().put("cm:versionType","MAJOR");
+        d1.setAspectNames(Arrays.asList("cm:auditable","cm:titled","cm:versionable"));
+        d1.expected(documentResp);
+
+        response = getSingle(URL_NODES, dId, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        d1.getProperties().put("cm:versionLabel", "1.0");
+        d1.getProperties().put("cm:versionType", "MAJOR");
+        d1.expected(documentResp);
+
+        // update file - remove titled aspect (and it's related aspect properties)
+
+        dUpdate = new Document();
+        dUpdate.setAspectNames(Arrays.asList("cm:auditable","cm:versionable"));
+
+        response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        d1.getProperties().remove("cm:title");
+        d1.getProperties().remove("cm:description");
+        d1.setAspectNames(Arrays.asList("cm:auditable","cm:versionable"));
+        d1.expected(documentResp);
+
+        // update folder - rename and add some properties
+
+        props = new HashMap<>();
+        props.put("cm:title","my folder title");
+        props.put("cm:description","my folder description");
+
+        folderName = "My Updated Folder";
+        Folder fUpdate = new Folder();
+        fUpdate.setProperties(props);
+        fUpdate.setName(folderName);
+
+        response = put(URL_NODES, fId, toJsonAsStringNonNull(fUpdate), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+
+        f1.setName(folderName);
+        f1.setAspectNames(Arrays.asList("cm:auditable","cm:titled"));
+        f1.setProperties(props);
+        f1.expected(folderResp);
+
+        // update folder - unset a property
+
+        props = new HashMap<>();
+        props.put("cm:title",null);
+
+        fUpdate = new Folder();
+        fUpdate.setProperties(props);
+
+        response = put(URL_NODES, fId, toJsonAsStringNonNull(fUpdate), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+
+        f1.getProperties().remove("cm:title");
+        f1.expected(folderResp);
+
+        // update folder - specialise node type
+
+        fUpdate = new Folder();
+        fUpdate.setNodeType("app:glossary");
+
+        response = put(URL_NODES, fId, toJsonAsStringNonNull(fUpdate), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+
+        f1.setNodeType("app:glossary");
+        f1.expected(folderResp);
+        
+        {
+            // test versioning for metadata-only updates
+            
+            Map params = new HashMap<>();
+            params.put("majorVersion", "true");
+            params.put("comment", "Initial empty file :-)");
+
+            String fileName = "My File";
+            Node nodeResp = createEmptyTextFile(f0Id, fileName, params, 201);
+            assertEquals("1.0", nodeResp.getProperties().get("cm:versionLabel"));
+
+            props = new HashMap<>();
+            props.put("cm:title", "my file title");
+            dUpdate = new Document();
+            dUpdate.setProperties(props);
+
+            response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals("1.0", nodeResp.getProperties().get("cm:versionLabel"));
+
+            // turn-off auto-version on metadata-only updates (OOTB this is now false by default, as per MNT-12226)
+            props = new HashMap<>();
+            props.put("cm:autoVersionOnUpdateProps", true);
+            dUpdate = new Document();
+            dUpdate.setProperties(props);
+            
+            response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals("1.1", nodeResp.getProperties().get("cm:versionLabel"));
+            
+            props = new HashMap<>();
+            props.put("cm:title","my file title 2");
+            dUpdate = new Document();
+            dUpdate.setProperties(props);
+            
+            response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals("1.2", nodeResp.getProperties().get("cm:versionLabel"));
+
+            props = new HashMap<>();
+            props.put("cm:title","my file title 3");
+            dUpdate = new Document();
+            dUpdate.setProperties(props);
+
+            response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals("1.3", nodeResp.getProperties().get("cm:versionLabel"));
+
+            // turn-off auto-version on metadata-only updates
+            props = new HashMap<>();
+            props.put("cm:autoVersionOnUpdateProps", false);
+            dUpdate = new Document();
+            dUpdate.setProperties(props);
+
+            response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals("1.3", nodeResp.getProperties().get("cm:versionLabel"));
+
+            props = new HashMap<>();
+            props.put("cm:title","my file title 4");
+            dUpdate = new Document();
+            dUpdate.setProperties(props);
+
+            response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals("1.3", nodeResp.getProperties().get("cm:versionLabel"));
+        }
+
+        // update folder(s) via well-known aliases rather than node id
+
+        // note: as of now, the platform does allow a user to modify their home folder [this may change in the future, if so adjust the test accordingly]
+        response = getSingle(URL_NODES, Nodes.PATH_MY, 200);
+        Folder user1MyFolder = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        String user1MyFolderId = user1MyFolder.getId();
+
+        String description = "my folder description "+RUNID;
+        props = new HashMap<>();
+        props.put("cm:description", description);
+
+        fUpdate = new Folder();
+        fUpdate.setProperties(props);
+
+        response = put(URL_NODES, Nodes.PATH_MY, toJsonAsStringNonNull(fUpdate), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(description, folderResp.getProperties().get("cm:description"));
+
+        setRequestContext(networkAdmin);
+
+        props = new HashMap<>();
+        props.put("cm:description", description);
+
+        fUpdate = new Folder();
+        fUpdate.setProperties(props);
+
+        response = put(URL_NODES, Nodes.PATH_ROOT, toJsonAsStringNonNull(fUpdate), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(description, folderResp.getProperties().get("cm:description"));
+
+        props = new HashMap<>();
+        props.put("cm:description", description);
+
+        fUpdate = new Folder();
+        fUpdate.setProperties(props);
+
+        response = put(URL_NODES, Nodes.PATH_SHARED, toJsonAsStringNonNull(fUpdate), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals(description, folderResp.getProperties().get("cm:description"));
+
+
+        setRequestContext(user1);
+
+        // -ve test - fail on unknown property
+        props = new HashMap<>();
+        props.put("cm:xyz","my unknown property");
+        dUpdate = new Document();
+        dUpdate.setProperties(props);
+        put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 400);
+
+        // -ve test - fail on unknown aspect
+        List<String> aspects = new ArrayList<>(d1.getAspectNames());
+        aspects.add("cm:unknownAspect");
+        dUpdate = new Document();
+        dUpdate.setAspectNames(aspects);
+        put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 400);
+
+        // -ve test - duplicate name
+        dUpdate = new Document();
+        dUpdate.setName(folderName);
+        put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 409);
+
+        // -ve test - unknown node id
+        dUpdate = new Document();
+        dUpdate.setName("some.txt");
+        put(URL_NODES, UUID.randomUUID().toString(), toJsonAsStringNonNull(dUpdate), null, 404);
+
+        // -ve test - generalise node type
+        fUpdate = new Folder();
+        fUpdate.setNodeType(TYPE_CM_FOLDER);
+        put(URL_NODES, fId, toJsonAsStringNonNull(fUpdate), null, 400);
+
+        // -ve test - try to move to a different parent using PUT (note: should use new POST /nodes/{nodeId}/move operation instead)
+
+        folderResp = createFolder(f0Id, "folder 2");
+        String f2Id = folderResp.getId();
+
+        fUpdate = new Folder();
+        fUpdate.setParentId(f2Id);
+        put(URL_NODES, fId, toJsonAsStringNonNull(fUpdate), null, 400);
+
+        // ok - if parent does not change
+        fUpdate = new Folder();
+        fUpdate.setParentId(f0Id);
+        put(URL_NODES, fId, toJsonAsStringNonNull(fUpdate), null, 200);
+
+        // -ve test - minor: error code if trying to update property with invalid format (REPO-473)
+        props = new HashMap<>();
+        props.put("exif:pixelYDimension", "my unknown property");
+        fUpdate = new Folder();
+        fUpdate.setProperties(props);
+        put(URL_NODES, f2Id, toJsonAsStringNonNull(fUpdate), null, 400);
+
+        // -ve test - minor: error code if trying to update property with invalid format (REPO-1635)
+        props = new HashMap<>();
+        props.put("exif:dateTimeOriginal", "25-11-2016");
+        fUpdate = new Folder();
+        fUpdate.setProperties(props);
+        put(URL_NODES, f2Id, toJsonAsStringNonNull(fUpdate), null, 400);
+        
+        // +ve test - try again with valid formats (REPO-473, REPO-1635)
+        props = new HashMap<>();
+        props.put("exif:pixelYDimension", "123");
+        props.put("exif:dateTimeOriginal", "2016-11-21T16:26:19.037+0000");
+        fUpdate = new Folder();
+        fUpdate.setProperties(props);
+        put(URL_NODES, f2Id, toJsonAsStringNonNull(fUpdate), null, 200);
+        
+        
+        // -ve test - non-admin cannot modify root (Company Home) folder
+        props = new HashMap<>();
+        props.put("cm:description", "my folder description");
+        fUpdate = new Folder();
+        fUpdate.setProperties(props);
+        put(URL_NODES, Nodes.PATH_ROOT, toJsonAsStringNonNull(fUpdate), null, 403);
+
+        // -ve test - non-admin cannot modify "Shared" folder
+        props = new HashMap<>();
+        props.put("cm:description", "my folder description");
+        fUpdate = new Folder();
+        fUpdate.setProperties(props);
+        put(URL_NODES, Nodes.PATH_SHARED, toJsonAsStringNonNull(fUpdate), null, 403);
+
+        setRequestContext(user2);
+
+        // -ve test - user cannot modify another user's home folder
+        props = new HashMap<>();
+        props.put("cm:description", "my folder description");
+        fUpdate = new Folder();
+        fUpdate.setProperties(props);
+        put(URL_NODES, user1MyFolderId, toJsonAsStringNonNull(fUpdate), null, 403);
+
+    }
+
+    /**
+     * Tests update owner (file or folder)
+     * <p>PUT:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>}
+     */
+    @Test
+    public void testUpdateOwner() throws Exception
+    {
+        setRequestContext(user1);
+        
+        // create folder f0
+        String folderName = "f0-testUpdateOwner-"+RUNID;
+        Folder folderResp = createFolder(Nodes.PATH_SHARED, folderName);
+        String f0Id = folderResp.getId();
+
+        assertNull(user1, folderResp.getProperties()); // owner is implied
+
+        // explicitly set owner to oneself
+        Map<String, Object> props = new HashMap<>();
+        props.put(PROP_OWNER, user1);
+        Folder fUpdate = new Folder();
+        fUpdate.setProperties(props);
+
+        HttpResponse response = put(URL_NODES, f0Id, toJsonAsStringNonNull(fUpdate), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+
+        assertEquals(user1, ((Map)folderResp.getProperties().get(PROP_OWNER)).get("id"));
+
+        // create doc d1
+        String d1Name = "content1 " + RUNID;
+        String d1Id = createTextFile(f0Id, d1Name, "The quick brown fox jumps over the lazy dog.").getId();
+
+        // get node info
+        response = getSingle(NodesEntityResource.class, d1Id, null, 200);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        // note: owner is implied
+        assertEquals(2, documentResp.getProperties().size());
+        assertEquals("1.0", documentResp.getProperties().get("cm:versionLabel"));
+        assertEquals("MAJOR", documentResp.getProperties().get("cm:versionType"));
+
+        props = new HashMap<>();
+        props.put(PROP_OWNER, user1);
+        Document dUpdate = new Document();
+        dUpdate.setProperties(props);
+
+        response = put(URL_NODES, d1Id, toJsonAsStringNonNull(dUpdate), null, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertEquals(user1, ((Map)documentResp.getProperties().get(PROP_OWNER)).get("id"));
+
+        // -ve test - cannot set owner to a nonexistent user
+
+        props = new HashMap<>();
+        props.put(PROP_OWNER, "unknownusernamedoesnotexist");
+        dUpdate = new Document();
+        dUpdate.setProperties(props);
+
+        put(URL_NODES, d1Id, toJsonAsStringNonNull(dUpdate), null, 400);
+
+        setRequestContext(user2);
+
+        response = getSingle(URL_NODES, d1Id, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertEquals(user1, ((Map)documentResp.getProperties().get(PROP_OWNER)).get("id"));
+
+        // -ve test - cannot take/change ownership
+
+        props = new HashMap<>();
+        props.put(PROP_OWNER, user2);
+        dUpdate = new Document();
+        dUpdate.setProperties(props);
+
+        put(URL_NODES, d1Id, toJsonAsStringNonNull(dUpdate), null, 403);
+
+        props = new HashMap<>();
+        props.put(PROP_OWNER, user1);
+        dUpdate = new Document();
+        dUpdate.setProperties(props);
+
+        put(URL_NODES, d1Id, toJsonAsStringNonNull(dUpdate), null, 403);
+
+        setRequestContext(user1);
+
+        props = new HashMap<>();
+        props.put(PROP_OWNER, user2);
+        dUpdate = new Document();
+        dUpdate.setProperties(props);
+
+        response = put(URL_NODES, d1Id, toJsonAsStringNonNull(dUpdate), null, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertEquals(user2, ((Map)documentResp.getProperties().get(PROP_OWNER)).get("id"));
+
+        setRequestContext(user2);
+
+        response = getSingle(URL_NODES, d1Id, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertEquals(user2, ((Map)documentResp.getProperties().get(PROP_OWNER)).get("id"));
+
+        // -ve test - user2 cannot delete the test folder/file - TODO is that expected ?
+        setRequestContext(user2);
+        deleteNode(f0Id, 403);
+        
+        setRequestContext(user1);
+        deleteNode(f0Id);
+    }
+
+    /**
+     * Tests update type
+     * <p>PUT:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>}
+     */
+    @Test
+    public void testUpdateType() throws Exception
+    {
+        setRequestContext(user1);
+
+        // create folder f0
+        String folderName = "f0-testUpdateOwner-"+RUNID;
+        Folder folderResp = createFolder(Nodes.PATH_SHARED, folderName);
+        String f0Id = folderResp.getId();
+
+        assertNull(user1, folderResp.getProperties()); // owner is implied
+
+        // non-update case
+        Folder fUpdate = new Folder();
+        fUpdate.setNodeType(folderResp.getNodeType());
+
+        HttpResponse response = put(URL_NODES, f0Id, toJsonAsStringNonNull(fUpdate), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+
+        assertEquals(TYPE_CM_FOLDER, folderResp.getNodeType());
+
+        // set type to an incompatible type
+        fUpdate.setNodeType(TYPE_CM_CONTENT);
+        put(URL_NODES, f0Id, toJsonAsStringNonNull(fUpdate), null, 400);
+
+        // set type to system folder (a special, unsupported case)
+        fUpdate.setNodeType("cm:systemfolder");
+        put(URL_NODES, f0Id, toJsonAsStringNonNull(fUpdate), null, 400);
+
+        // set type to supported folder sub-type
+        // (none exists in contentModel, so forumsModel it is)
+        fUpdate.setNodeType("fm:forums");
+        response = put(URL_NODES, f0Id, toJsonAsStringNonNull(fUpdate), null, 200);
+        folderResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        assertEquals("fm:forums", folderResp.getNodeType());
+
+        // set type to a generalised type (unsupported case)
+        fUpdate.setNodeType(TYPE_CM_FOLDER);
+        put(URL_NODES, f0Id, toJsonAsStringNonNull(fUpdate), null, 400);
+    }
+
+    /**
+     * Tests update file content
+     * <p>PUT:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/content}
+     */
+    @Test
+    public void testUpdateFileWithBinaryUpload() throws Exception
+    {
+        setRequestContext(user1);
+        
+        String myNodeId = getMyNodeId();
+
+        String folderName = "f1-testUpdateFileWithBinaryUpload-"+RUNID;
+        Folder folderResp = createFolder(myNodeId, folderName);
+        String f1_nodeId = folderResp.getId();
+        
+        String anoNodeName = "another";
+        createFolder(f1_nodeId, anoNodeName);
+
+        Document doc = new Document();
+        final String docName = "testdoc.txt";
+        doc.setName(docName);
+        doc.setNodeType(TYPE_CM_CONTENT);
+        doc.setProperties(Collections.singletonMap("cm:title", (Object)"test title"));
+        ContentInfo contentInfo = new ContentInfo();
+        doc.setContent(contentInfo);
+
+        // create an empty file within F1 folder
+        HttpResponse response = post(getNodeChildrenUrl(f1_nodeId), toJsonAsStringNonNull(doc), 201);
+        Document docResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertEquals(docName, docResp.getName());
+        assertNotNull(docResp.getContent());
+        assertEquals(0, docResp.getContent().getSizeInBytes().intValue());
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, docResp.getContent().getMimeType());
+        // Default encoding
+        assertEquals("UTF-8", docResp.getContent().getEncoding());
+
+        // Update the empty node's content
+        String content = "The quick brown fox jumps over the lazy dog.";
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(content.getBytes());
+        File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+        BinaryPayload payload = new BinaryPayload(txtFile);
+
+        // Try to update a folder!
+        putBinary(getNodeContentUrl(f1_nodeId), payload, null, null, 400);
+
+        // Try to update a non-existent file
+        putBinary(getNodeContentUrl(UUID.randomUUID().toString()), payload, null, null, 404);
+
+        final String url = getNodeContentUrl(docResp.getId());
+
+        // Update the empty file
+        response = putBinary(url, payload, null, null, 200);
+        docResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals(docName, docResp.getName());
+        assertNotNull(docResp.getId());
+        assertNotNull(docResp.getCreatedAt());
+        assertNotNull(docResp.getCreatedByUser());
+        assertNotNull(docResp.getModifiedAt());
+        assertNotNull(docResp.getModifiedByUser());
+        assertFalse(docResp.getIsFolder());
+        assertTrue(docResp.getIsFile());
+        assertNull(docResp.getIsLink());
+        assertEquals(TYPE_CM_CONTENT, docResp.getNodeType());
+        assertNotNull(docResp.getParentId());
+        assertEquals(f1_nodeId, docResp.getParentId());
+        assertNotNull(docResp.getProperties());
+        assertNotNull(docResp.getAspectNames());
+        contentInfo = docResp.getContent();
+        assertNotNull(contentInfo);
+        assertNotNull(contentInfo.getEncoding());
+        assertTrue(contentInfo.getSizeInBytes() > 0);
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+        assertNotNull(contentInfo.getMimeTypeName());
+        assertEquals("ISO-8859-1", contentInfo.getEncoding());
+        // path is not part of the default response
+        assertNull(docResp.getPath());
+
+        // Download the file
+        response = getSingle(url, user1, null, 200);
+        assertEquals(content, response.getResponse());
+
+        // Update the node's content again. Also make the response return the path!
+        content = "The quick brown fox jumps over the lazy dog updated !";
+        inputStream = new ByteArrayInputStream(content.getBytes());
+        txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+        payload = new BinaryPayload(txtFile);
+
+        response = putBinary(url + "?include=path", payload, null, null, 200);
+        docResp = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class);
+        assertEquals(docName, docResp.getName());
+        assertNotNull(docResp.getContent());
+        assertTrue(docResp.getContent().getSizeInBytes().intValue() > 0);
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, docResp.getContent().getMimeType());
+        assertEquals("ISO-8859-1", docResp.getContent().getEncoding());
+        PathInfo pathInfo = docResp.getPath();
+        assertNotNull(pathInfo);
+        assertTrue(pathInfo.getIsComplete());
+        List<ElementInfo> pathElements = pathInfo.getElements();
+        assertNotNull(pathElements);
+        assertTrue(pathElements.size() > 0);
+        // check the last element is F1
+        assertEquals(folderResp.getName(), pathElements.get(pathElements.size() - 1).getName());
+
+        // Download the file
+        response = getSingle(url, user1, null, 200);
+        assertEquals(content, response.getResponse());
+        
+        // Update the node's content again. Also rename the file !
+        content = "The quick brown fox jumps over the lazy dog updated again !";
+        inputStream = new ByteArrayInputStream(content.getBytes());
+        txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+        payload = new BinaryPayload(txtFile);
+
+        String docName2 = "hello-world.txt";
+        Map params = new HashMap<>();
+        params.put(Nodes.PARAM_NAME, docName2);
+        response = putBinary(url, payload, null, params, 200);
+        docResp = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class);
+        assertEquals(docName2, docResp.getName());
+        
+        // Download the file
+        response = getSingle(url, user1, null, 200);
+        assertEquals(content, response.getResponse());
+
+        // -ve - optional "name" is invalid
+        params = new HashMap<>();
+        params.put(Nodes.PARAM_NAME, "hello/world.txt");
+        payload = new BinaryPayload(txtFile);
+        putBinary(url, payload, null, params, 422);
+        
+        // -ve - optional "name" already exists ...
+        params = new HashMap<>();
+        params.put(Nodes.PARAM_NAME, anoNodeName);
+        payload = new BinaryPayload(txtFile);
+        putBinary(url, payload, null, params, 409);
+
+        // -ve - try to  update content using multi-part form data
+        payload = new BinaryPayload(txtFile, "multipart/form-data", null);
+        putBinary(url, payload, null, null, 415);
+
+        // -ve - try to invalid media type argument (when parsing request)
+        payload = new BinaryPayload(txtFile, "/jpeg", null);
+        putBinary(url, payload, null, null, 415);
+    }
+
+    /**
+     * Tests download of file/content.
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/content}
+     */
+    @Test
+    public void testDownloadFileContent() throws Exception
+    {
+        setRequestContext(user1);
+
+        //
+        // Test plain text
+        //
+
+        String fileName = "quick-1.txt";
+        File file = getResourceFile(fileName);
+
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file));
+        MultiPartRequest reqBody = multiPartBuilder.build();
+
+        // Upload text content
+        HttpResponse response = post(getNodeChildrenUrl(Nodes.PATH_MY), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        String contentNodeId = document.getId();
+
+        // Check the upload response
+        assertEquals(fileName, document.getName());
+        ContentInfo contentInfo = document.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+
+        // Download text content - by default with Content-Disposition header
+        response = getSingle(NodesEntityResource.class, contentNodeId + "/content", null, 200);
+
+        String textContent = response.getResponse();
+        assertEquals("The quick brown fox jumps over the lazy dog", textContent);
+        Map<String, String> responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertEquals("attachment; filename=\"quick-1.txt\"; filename*=UTF-8''quick-1.txt", responseHeaders.get("Content-Disposition"));
+        String cacheControl = responseHeaders.get("Cache-Control");
+        assertNotNull(cacheControl);
+        assertTrue(cacheControl.contains("must-revalidate"));
+        assertTrue(cacheControl.contains("max-age=0"));
+        assertNotNull(responseHeaders.get("Expires"));
+        String lastModifiedHeader = responseHeaders.get(LAST_MODIFIED_HEADER);
+        assertNotNull(lastModifiedHeader);
+        Map<String, String> headers = Collections.singletonMap(IF_MODIFIED_SINCE_HEADER, lastModifiedHeader);
+        // Test 304 response
+        getSingle(getNodeContentUrl(contentNodeId), null, null, headers, 304);
+
+        // Update the content to change the node's modified date
+        Document docUpdate = new Document();
+        docUpdate.setProperties(Collections.singletonMap("cm:description", (Object) "desc updated!"));
+        // Wait a second then update, as the dates will be rounded to
+        // ignore millisecond when checking for If-Modified-Since
+        Thread.sleep(1000L);
+        response = put(URL_NODES, contentNodeId, toJsonAsStringNonNull(docUpdate), null, 200);
+        Document updatedDocument = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals(contentNodeId, updatedDocument.getId());
+
+        // The requested "If-Modified-Since" date is older than node's modified date
+        response = getSingle(getNodeContentUrl(contentNodeId), null, null, headers, 200);
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertNotNull(responseHeaders.get("Cache-Control"));
+        assertNotNull(responseHeaders.get("Expires"));
+        String newLastModifiedHeader = responseHeaders.get(LAST_MODIFIED_HEADER);
+        assertNotNull(newLastModifiedHeader);
+        assertNotEquals(lastModifiedHeader, newLastModifiedHeader);
+
+        //
+        // Test binary (eg. PDF)
+        //
+
+        fileName = "quick.pdf";
+        file = getResourceFile(fileName);
+        byte[] originalBytes = Files.readAllBytes(Paths.get(file.getAbsolutePath()));
+
+        multiPartBuilder = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file));
+        reqBody = multiPartBuilder.build();
+
+        // Upload binary content
+        response = post(getNodeChildrenUrl(Nodes.PATH_MY), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        contentNodeId = document.getId();
+
+        // Check the upload response
+        assertEquals(fileName, document.getName());
+        contentInfo = document.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_PDF, contentInfo.getMimeType());
+
+        // Download binary content (as bytes) - without Content-Disposition header (attachment=false)
+        Map<String, String> params = new LinkedHashMap<>();
+        params.put("attachment", "false");
+
+        response = getSingle(NodesEntityResource.class, contentNodeId + "/content", params, 200);
+        byte[] bytes = response.getResponseAsBytes();
+        assertArrayEquals(originalBytes, bytes);
+
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertNull(responseHeaders.get("Content-Disposition"));
+        assertNotNull(responseHeaders.get("Cache-Control"));
+        assertNotNull(responseHeaders.get("Expires"));
+        lastModifiedHeader = responseHeaders.get(LAST_MODIFIED_HEADER);
+        assertNotNull(lastModifiedHeader);
+        headers = Collections.singletonMap(IF_MODIFIED_SINCE_HEADER, lastModifiedHeader);
+        // Test 304 response
+        getSingle(getNodeContentUrl(contentNodeId), null, null, headers, 304);
+    }
+
+    /**
+     * Tests download of file/content using backed temp file for streaming.
+     * <p>
+     * GET:
+     * </p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/content}
+     */
+    @Test
+    public void testDownloadFileContentUsingTempFile() throws Exception
+    {
+        setRequestContext(user1);
+
+        // This should be grater then TempOutputStream.DEFAULT_MEMORY_THRESHOLD
+        Long contentSize = 5 * 1024 * 1024L;
+        String fileName = "tempFile.txt";
+
+        File file = null;
+        try
+        {
+            file = TempFileProvider.createTempFile(getClass().getSimpleName(), ".txt");
+            RandomAccessFile rndFile = new RandomAccessFile(file.getPath(), "rw");
+            rndFile.setLength(contentSize);
+            rndFile.close();
+
+            MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file));
+            MultiPartRequest reqBody = multiPartBuilder.build();
+
+            // Upload text content
+            HttpResponse response = post(getNodeChildrenUrl(Nodes.PATH_MY), reqBody.getBody(), null, reqBody.getContentType(), 201);
+            Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+            String contentNodeId = document.getId();
+
+            // Check the upload response
+            assertEquals(fileName, document.getName());
+            ContentInfo contentInfo = document.getContent();
+            assertNotNull(contentInfo);
+            assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+
+            // Download text content
+            response = getSingle(NodesEntityResource.class, contentNodeId + "/content", null, 200);
+
+            byte[] bytes = response.getResponseAsBytes();
+            assertEquals(contentSize.intValue(), bytes.length);
+        }
+        finally
+        {
+            file.delete();
+        }
+    }
+
+    /**
+     * Tests download of file/content - basic read permission
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/content}
+     */
+    @Test
+    public void testDownloadFileContentReadPermission() throws Exception
+    {
+        setRequestContext(user1);
+
+        String fileName = "quick-1.txt";
+        File file = getResourceFile(fileName);
+
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file));
+        MultiPartRequest reqBody = multiPartBuilder.build();
+
+        // Upload text content
+        HttpResponse response = post(getNodeChildrenUrl(Nodes.PATH_MY), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String contentNodeId = document.getId();
+
+        // Download text content
+        response = getSingle(NodesEntityResource.class, contentNodeId+"/content", null, 200);
+        String textContent = response.getResponse();
+        assertEquals("The quick brown fox jumps over the lazy dog", textContent);
+
+        // Also test versions endpoint (1.0 in this case)
+        response = getSingle(NodesEntityResource.class, contentNodeId+"/versions/1.0/content", null, 200);
+        textContent = response.getResponse();
+        assertEquals("The quick brown fox jumps over the lazy dog", textContent);
+
+        // -ve test: user2 does not have read permission
+        setRequestContext(user2);
+        getSingle(NodesEntityResource.class, contentNodeId+"/content", null, 403);
+        getSingle(NodesEntityResource.class, contentNodeId+"/versions/1.0/content", null, 403);
+
+        // add Consumer (~ Read) permission
+        setRequestContext(user1);
+
+        Document dUpdate = new Document();
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(user2, PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+        dUpdate.setPermissions(nodePermissions);
+
+        // update node
+        response = put(URL_NODES, contentNodeId, toJsonAsStringNonNull(dUpdate), null, 200);
+
+        setRequestContext(user2);
+
+        // Download text content
+        response = getSingle(NodesEntityResource.class, contentNodeId+"/content", null, 200);
+        textContent = response.getResponse();
+        assertEquals("The quick brown fox jumps over the lazy dog", textContent);
+
+        // Also test versions endpoint (1.0 in this case)
+        response = getSingle(NodesEntityResource.class, contentNodeId+"/versions/1.0/content", null, 200);
+        textContent = response.getResponse();
+        assertEquals("The quick brown fox jumps over the lazy dog", textContent);
+    }
+
+    @Test
+    public void testGetNodeWithEmptyProperties() throws Exception
+    {
+        setRequestContext(user1);
+
+        String myNodeId = getMyNodeId();
+
+        // create folder f1
+        Folder folderResp = createFolder(myNodeId, "fld1_" + RUNID);
+        String f1Id = folderResp.getId();
+
+        String nodeName = "f1 link";
+        String nodeType = "app:folderlink";
+        String propertyName = "cm:destination";
+
+        Map<String, Object> props = new HashMap<>();
+        props.put(propertyName, "");
+
+        Node nodeResp = createNode(f1Id, nodeName, nodeType, props);
+        String nodeId = nodeResp.getId();
+
+        Node n1 = new Node();
+        n1.setName(nodeName);
+        n1.setNodeType(nodeType);
+        n1.setIsFolder(true);
+        // note: parent of the link (not where it is pointing)
+        n1.setParentId(f1Id);
+        n1.setAspectNames(Collections.singletonList("cm:auditable"));
+        // Empty (zero length) string values are considered to be
+        // null values, and will be represented the same as null
+        // values (i.e. by non-existence of the property).
+        n1.setProperties(null);
+
+        // Check create response.
+        n1.expected(nodeResp);
+
+        HttpResponse httpResponse = getSingle(NodesEntityResource.class, nodeId, null, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(httpResponse.getJsonResponse(), Node.class);
+
+        // Check get response.
+        n1.expected(nodeResp);
+    }
+
+    /**
+     * Tests optional lookup of Allowable Operations (eg. when getting node info, listing node children, ...)
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/children?include=allowableOperations}
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>?include=allowableOperations}
+     */
+    @Test
+    public void testAllowableOps() throws Exception
+    {
+        // as user1 ...
+        setRequestContext(user1);
+
+        String rootNodeId = getRootNodeId();
+        String sharedNodeId = getSharedNodeId();
+
+        Map params = new HashMap<>();
+        params.put(Nodes.PARAM_RELATIVE_PATH, "/Sites");
+        HttpResponse response = getSingle(NodesEntityResource.class, rootNodeId, params, 200);
+        Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        String sitesNodeId = nodeResp.getId();
+
+        params = new HashMap<>();
+        params.put(Nodes.PARAM_RELATIVE_PATH, "/Data Dictionary");
+        response = getSingle(NodesEntityResource.class, rootNodeId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        String ddNodeId = nodeResp.getId();
+
+
+        params = new HashMap<>();
+        params.put("include", "allowableOperations");
+
+        response = getSingle(NodesEntityResource.class, rootNodeId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNull(nodeResp.getAllowableOperations());
+
+        response = getSingle(NodesEntityResource.class, sharedNodeId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNotNull(nodeResp.getAllowableOperations());
+        assertEquals(1, nodeResp.getAllowableOperations().size());
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_CREATE));
+
+        // -ve
+        deleteNode(sharedNodeId, 403);
+
+        response = getSingle(NodesEntityResource.class, getMyNodeId(), params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNotNull(nodeResp.getAllowableOperations());
+        assertEquals(4, nodeResp.getAllowableOperations().size());
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_DELETE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_CREATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE_PERMISSIONS));
+
+        // create folder
+        nodeResp = createFolder(sharedNodeId, "folder 1 - "+RUNID);
+        String folderId = nodeResp.getId();
+        assertNull(nodeResp.getAllowableOperations());
+
+        response = getSingle(NodesEntityResource.class, folderId, null, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNull(nodeResp.getAllowableOperations());
+
+        response = getSingle(NodesEntityResource.class, folderId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNotNull(nodeResp.getAllowableOperations());
+        assertEquals(4, nodeResp.getAllowableOperations().size());
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_DELETE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_CREATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE_PERMISSIONS));
+
+        // create file
+        nodeResp = createTextFile(folderId, "my file - "+RUNID+".txt", "The quick brown fox jumps over the lazy dog");
+        String fileId = nodeResp.getId();
+        assertNull(nodeResp.getAllowableOperations());
+
+        response = getSingle(NodesEntityResource.class, fileId, null, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNull(nodeResp.getAllowableOperations());
+
+        // a file - no create
+        response = getSingle(NodesEntityResource.class, fileId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNotNull(nodeResp.getAllowableOperations());
+        assertEquals(3, nodeResp.getAllowableOperations().size());
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_DELETE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE_PERMISSIONS));
+
+
+        // as user2 ...
+        setRequestContext(user2);
+
+        response = getSingle(NodesEntityResource.class, folderId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNotNull(nodeResp.getAllowableOperations());
+        assertEquals(1, nodeResp.getAllowableOperations().size());
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_CREATE));
+
+        // -ve
+        deleteNode(folderId, 403);
+
+        response = getSingle(NodesEntityResource.class, fileId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNull(nodeResp.getAllowableOperations());
+
+        // -ve
+        deleteNode(fileId, 403);
+
+        // as admin ...
+        setRequestContext(networkAdmin);
+
+        response = publicApiClient.get(NodesEntityResource.class, folderId, null, params);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNotNull(nodeResp.getAllowableOperations());
+        assertEquals(4, nodeResp.getAllowableOperations().size());
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_DELETE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_CREATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE_PERMISSIONS));
+
+        // a file - no create
+        response = publicApiClient.get(NodesEntityResource.class, fileId, null, params);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNotNull(nodeResp.getAllowableOperations());
+        assertEquals(3, nodeResp.getAllowableOperations().size());
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_DELETE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE_PERMISSIONS));
+
+        response = publicApiClient.get(NodesEntityResource.class, sharedNodeId, null, params);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNotNull(nodeResp.getAllowableOperations());
+        assertEquals(4, nodeResp.getAllowableOperations().size());
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_CREATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_DELETE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE_PERMISSIONS));
+
+        // Company Home - no delete
+        response = publicApiClient.get(NodesEntityResource.class, rootNodeId, null, params);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNotNull(nodeResp.getAllowableOperations());
+        assertEquals(3, nodeResp.getAllowableOperations().size());
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_CREATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE_PERMISSIONS));
+
+        // -ve
+        deleteNode(rootNodeId, 403);
+
+        // Sites - no delete
+        response = publicApiClient.get(NodesEntityResource.class, sitesNodeId, null, params);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNotNull(nodeResp.getAllowableOperations());
+        assertEquals(3, nodeResp.getAllowableOperations().size());
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_CREATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE_PERMISSIONS));
+
+        // -ve
+        deleteNode(sitesNodeId, 403);
+
+        // Data Dictionary - no delete
+        response = publicApiClient.get(NodesEntityResource.class, ddNodeId, null, params);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNotNull(nodeResp.getAllowableOperations());
+        assertEquals(3, nodeResp.getAllowableOperations().size());
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_CREATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE_PERMISSIONS));
+
+        // -ve
+        deleteNode(ddNodeId, 403);
+
+        publicApiClient.setRequestContext(null);
+
+        // as user1 ...
+        String userId = user1;
+        setRequestContext(userId);
+
+        response = getSingle("sites", tSiteId, null, null, 200);
+        Site siteResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Site.class);
+        String siteNodeId = siteResp.getGuid();
+
+        response = getSingle(NodesEntityResource.class, siteNodeId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertEquals(userId, nodeResp.getCreatedByUser().getId());
+        assertNotNull(nodeResp.getAllowableOperations());
+        assertEquals(3, nodeResp.getAllowableOperations().size());
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_CREATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE));
+        assertTrue(nodeResp.getAllowableOperations().contains(Nodes.OP_UPDATE_PERMISSIONS));
+
+        // -ve
+        deleteNode(siteNodeId, 403);
+
+        setRequestContext(user1);
+
+        // fix for REPO-514 (NPE for a node that was neither a file/document nor a folder)
+        Node n = new Node();
+        n.setName("o1");
+        n.setNodeType(TYPE_CM_OBJECT);
+        response = post(getNodeChildrenUrl(folderId), toJsonAsStringNonNull(n), 201);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        String o1Id = nodeResp.getId();
+
+        params = new HashMap<>();
+        params.put("include", "allowableOperations");
+        response = getSingle(NodesEntityResource.class, o1Id, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNotNull(nodeResp.getAllowableOperations());
+
+        // some cleanup
+        deleteNode(folderId, true, 204);
+    }
+
+    /**
+     * Tests lock of a node
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/lock}
+     */
+   @Test
+    public void testLock() throws Exception
+    {
+        setRequestContext(user1);
+
+        // create folder
+        Folder folderResp = createFolder(Nodes.PATH_MY, "folder" + RUNID);
+        String folderId = folderResp.getId();
+        
+        // try to lock the folder and check that is not allowed
+        LockInfo lockInfo = new LockInfo();
+        lockInfo.setTimeToExpire(60);
+        lockInfo.setType("FULL");
+        lockInfo.setLifetime("PERSISTENT");
+        HttpResponse response = post(getNodeOperationUrl(folderId, "lock"), toJsonAsStringNonNull(lockInfo), null, 400);
+        
+        // create document d1
+        String d1Name = "content" + RUNID + "_1l";
+        Document d1 = createTextFile(folderId, d1Name, "The quick brown fox jumps over the lazy dog 1.");
+        String d1Id = d1.getId();
+        
+        // lock d1 document
+        lockInfo = new LockInfo();
+        lockInfo.setTimeToExpire(30);
+        lockInfo.setType("FULL");
+        lockInfo.setLifetime("PERSISTENT");
+        response = post(getNodeOperationUrl(d1Id, "lock"), toJsonAsStringNonNull(lockInfo), null, 200);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertEquals(d1Name, documentResp.getName());
+        assertEquals(d1Id, documentResp.getId());
+        assertEquals(LockType.READ_ONLY_LOCK.toString(), documentResp.getProperties().get("cm:lockType"));
+        assertNotNull(documentResp.getProperties().get("cm:lockOwner"));
+        assertNull(documentResp.getIsLocked());
+        
+        // invalid test - delete a locked node
+        deleteNode(d1Id, true, 409);
+        
+        // wait for expiration time set to pass and delete node
+		TimeUnit.SECONDS.sleep(30);
+		deleteNode(d1Id, true, 204);
+       
+        // create doc d2
+        String d2Name = "content" + RUNID + "_2l";
+        Document d2 = createTextFile(folderId, d2Name, "The quick brown fox jumps over the lazy dog 2.");
+        String d2Id = d2.getId();
+
+        response = getSingle(URL_NODES, d2Id, null, null, 200);
+        Node node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNull(node.getProperties().get("cm:lockType"));
+        assertNull(node.getProperties().get("cm:lockOwner"));
+        assertNull(node.getIsLocked());
+
+        Map<String, String> params = Collections.singletonMap("include", "isLocked");
+        response = getSingle(URL_NODES, d2Id, params, null, 200);
+        node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNull(node.getProperties().get("cm:lockType"));
+        assertNull(node.getProperties().get("cm:lockOwner"));
+        assertFalse(node.getIsLocked());
+
+        lockInfo = new LockInfo();
+        lockInfo.setTimeToExpire(60);
+        lockInfo.setType("FULL");
+        lockInfo.setLifetime("PERSISTENT");
+
+        response = post(getNodeOperationUrl(d2Id, "lock"), toJsonAsStringNonNull(lockInfo), null, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertEquals(d2Name, documentResp.getName());
+        assertEquals(d2Id, documentResp.getId());
+        assertEquals(LockType.READ_ONLY_LOCK.toString(), documentResp.getProperties().get("cm:lockType"));
+        assertNotNull(documentResp.getProperties().get("cm:lockOwner"));
+        assertNull(documentResp.getIsLocked());
+
+        unlock(d2Id);
+        // Empty lock body, the default values are used
+        post(getNodeOperationUrl(d2Id, "lock"), EMPTY_BODY, null, 200);
+
+        // Lock on already locked node
+        post(getNodeOperationUrl(d2Id, "lock"), toJsonAsStringNonNull(lockInfo), null, 200);
+
+        // Test delete on a folder which contains a locked node - NodeLockedException
+        deleteNode(folderId, true, 409);
+
+        // Content update on a locked node
+        updateTextFile(d2Id, "Updated text", null, 409);
+        unlock(d2Id);
+
+        // Test lock file
+        // create folder
+        String folderAName = "folder" + RUNID + "_A";
+        Folder folderA = createFolder(Nodes.PATH_MY, folderAName);
+        String folderAId = folderA.getId();
+
+        // create a file in the folderA
+        Document dA1 = createTextFile(folderAId, "content" + RUNID + "_A1", "A1 content");
+        String dA1Id = dA1.getId();
+
+        lockInfo = new LockInfo();
+        lockInfo.setTimeToExpire(60);
+        lockInfo.setType("ALLOW_OWNER_CHANGES");
+        lockInfo.setLifetime("EPHEMERAL");
+
+        // lock the file
+        post(getNodeOperationUrl(dA1Id, "lock"), toJsonAsStringNonNull(lockInfo), null, 200);
+
+        params = Collections.singletonMap("include", "aspectNames,properties,isLocked");
+        response = getSingle(URL_NODES, dA1Id, params, null, 200);
+        node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertTrue(node.getIsLocked());
+        // note: this can be updated by the owner since the lock type is "ALLOW_OWNER_CHANGES"
+        updateTextFile(node.getId(), "Updated text", null, 200);
+
+        // Lock body properties - boundary values
+        Document dB1 = createTextFile(folderAId, "content" + RUNID + "_dB1", "dB1 content");
+        String dB1Id = dB1.getId();
+
+        lockInfo = new LockInfo();
+        lockInfo.setTimeToExpire(-100); // values lower than 0 are considered as no expiry time
+        post(getNodeOperationUrl(dB1Id, "lock"), toJsonAsStringNonNull(lockInfo), null, 200);
+
+        // Lock node by a different user than the owner
+        setRequestContext(user1);
+        Folder folder1Resp = createFolder(Nodes.PATH_SHARED, "folder1" + RUNID);
+        String folder1Id = folder1Resp.getId();
+
+        String f1d1Name = "content f1" + RUNID + "_1l";
+        Document f1d1 = createTextFile(folder1Id, f1d1Name, "The quick brown fox jumps over the lazy dog 1.");
+        String f1d1Id = f1d1.getId();
+        // use admin for now (might be better to use a user with given WRITE permission)
+        setRequestContext(networkAdmin);
+        post(getNodeOperationUrl(f1d1Id, "lock"), EMPTY_BODY, null, 200);
+        unlock(f1d1Id);
+        // -ve tests
+
+        // Missing target node
+        lockInfo = new LockInfo();
+        post(getNodeOperationUrl("fakeId", "lock"), toJsonAsStringNonNull(lockInfo), null, 404);
+
+        // Cannot lock Data Dictionary node
+        params = new HashMap<>();
+        params.put(Nodes.PARAM_RELATIVE_PATH, "/Data Dictionary");
+        response = getSingle(NodesEntityResource.class, getRootNodeId(), params, 200);
+        Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        String ddNodeId = nodeResp.getId();
+
+        setRequestContext(networkAdmin);
+        post(getNodeOperationUrl(ddNodeId, "lock"), toJsonAsStringNonNull(lockInfo), null, 403);
+
+        // Lock node already locked by another user - UnableToAquireLockException
+        post(getNodeOperationUrl(dB1Id, "lock"), EMPTY_BODY, null, 422);
+
+        // Lock node without permission (node created by user 1 in the Home folder)
+        setRequestContext(user1);
+        Folder folder2Resp = createFolder(Nodes.PATH_MY, "folder2" + RUNID);
+        String folder2Id = folder2Resp.getId();
+
+        String f2d1Name = "content f2" + RUNID + "_1l";
+        Document f2d1 = createTextFile(folder2Id, f2d1Name, "The quick brown fox jumps over the lazy dog 1.");
+        String f2d1Id = f2d1.getId();
+
+        setRequestContext(user2);
+        post(getNodeOperationUrl(f2d1Id, "lock"), EMPTY_BODY, null, 403);
+
+        // Invalid lock body values
+        setRequestContext(user1);
+
+        Folder folderC = createFolder(Nodes.PATH_MY, "folder" + RUNID + "_C");
+        String folderCId = folderC.getId();
+
+        Document dC1 = createTextFile(folderCId, "content" + RUNID + "_dC1", "dC1 content");
+        String dC1Id = dC1.getId();
+
+        Map<String, String> body = new HashMap<>();
+        body.put("type", "FULL123");
+        post(getNodeOperationUrl(dC1Id, "lock"), toJsonAsStringNonNull(body), null, 400);
+
+        body = new HashMap<>();
+        body.put("type", "ALLOW_ADD_CHILDREN");
+        post(getNodeOperationUrl(dC1Id, "lock"), toJsonAsStringNonNull(body), null, 400);
+
+        body = new HashMap<>();
+        body.put("lifetime", "PERSISTENT123");
+        post(getNodeOperationUrl(dC1Id, "lock"), toJsonAsStringNonNull(body), null, 400);
+
+        body = new HashMap<>();
+        body.put("includeChildren", "true");
+        post(getNodeOperationUrl(dC1Id, "lock"), toJsonAsStringNonNull(body), null, 400);
+        
+        body = new HashMap<>();
+        body.put("timeToExpire", "NaN");
+        post(getNodeOperationUrl(dC1Id, "lock"), toJsonAsStringNonNull(body), null, 400);
+
+        body = new HashMap<>();
+        body.put("invalid_property", "true");
+        post(getNodeOperationUrl(dC1Id, "lock"), toJsonAsStringNonNull(body), null, 400);
+
+        // Invalid lock of a folder
+        post(getNodeOperationUrl(folderId, "lock"), toJsonAsStringNonNull(lockInfo), null, 400);
+
+        //cleanup
+        setRequestContext(user1); // all locks were made by user1
+        unlock(dB1Id);
+        deleteNode(dB1Id);
+        deleteNode(folderId);
+        deleteNode(folderAId);
+        deleteNode(folderCId);
+        deleteNode(folder1Id);
+        deleteNode(folder2Id);
+    }
+
+
+    /**
+     * Tests unlock of a node
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/unlock}
+     */
+    @Test
+    public void testUnlock() throws Exception
+    {
+        setRequestContext(user1);
+
+        // create folder
+        Folder folderResp = createFolder(Nodes.PATH_MY, "folder" + RUNID);
+        String folderId = folderResp.getId();
+
+        // create doc d1
+        String d1Name = "content" + RUNID + "_1l";
+        Document d1 = createTextFile(folderId, d1Name, "The quick brown fox jumps over the lazy dog 1.");
+        String d1Id = d1.getId();
+
+        lock(d1Id, EMPTY_BODY);
+
+        HttpResponse response = post(getNodeOperationUrl(d1Id, "unlock"), null, null, 200);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertEquals(d1Name, documentResp.getName());
+        assertEquals(d1Id, documentResp.getId());
+        assertNull(documentResp.getProperties().get("cm:lockType"));
+        assertNull(documentResp.getProperties().get("cm:lockOwner"));
+
+        lock(d1Id, EMPTY_BODY);
+        // Users with admin rights can unlock nodes locked by other users.
+        setRequestContext(networkAdmin);
+        post(getNodeOperationUrl(d1Id, "unlock"), null, null, 200);
+
+        // -ve
+        // Missing target node
+        post(getNodeOperationUrl("fakeId", "unlock"), null, null, 404);
+
+        // Unlock by a user without permission
+        lock(d1Id, EMPTY_BODY);
+        setRequestContext(user2);
+        post(getNodeOperationUrl(d1Id, "unlock"), null, null, 403);
+
+        setRequestContext(user1);
+
+        //Unlock on a not locked node
+        post(getNodeOperationUrl(folderId, "unlock"), null, null, 422);
+
+        // clean up
+        setRequestContext(user1); // all locks were made by user1
+
+        unlock(d1Id);
+        deleteNode(folderId);
+    }
+
+    @Test
+    public void testLockFileCreatedByDeletedUser() throws Exception
+    {
+        // Create temp user
+        String user = createUser("userRND-" + RUNID, "userRNDPassword", networkOne);
+
+        setRequestContext(user);
+
+        // Create folder
+        Folder folderResp = createFolder(Nodes.PATH_MY, "folderRND" + RUNID);
+        String folderId = folderResp.getId();
+
+        // Create doc d1
+        String d1Name = "content" + RUNID + "_1l";
+        Document d1 = createTextFile(folderId, d1Name, "The quick brown fox jumps over the lazy dog 1.");
+        String d1Id = d1.getId();
+
+        setRequestContext(networkAdmin);
+
+        transactionHelper.doInTransaction(() -> {
+            deleteUser(user, networkOne);
+            return null;
+        });
+
+        // Lock d1 document
+        LockInfo lockInfo = new LockInfo();
+        lockInfo.setTimeToExpire(30);
+        lockInfo.setType("FULL");
+        lockInfo.setLifetime("PERSISTENT");
+        HttpResponse response = post(getNodeOperationUrl(d1Id, "lock"), toJsonAsStringNonNull(lockInfo), null, 200);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        // Check that the lock was successful - from default response
+        assertEquals(d1Name, documentResp.getName());
+        assertEquals(d1Id, documentResp.getId());
+        assertEquals(LockType.READ_ONLY_LOCK.toString(), documentResp.getProperties().get("cm:lockType"));
+        assertNotNull(documentResp.getProperties().get("cm:lockOwner"));
+        assertNull(documentResp.getIsLocked());
+
+        // Get node info (ensure rollback didn't happen)
+        Map<String, String> params = Collections.singletonMap("include", "isLocked");
+        response = getSingle(NodesEntityResource.class, d1Id, params, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        // Check that the lock was successful - from get info call response
+        assertEquals(d1Name, documentResp.getName());
+        assertEquals(d1Id, documentResp.getId());
+        assertEquals(LockType.READ_ONLY_LOCK.toString(), documentResp.getProperties().get("cm:lockType"));
+        assertNotNull(documentResp.getProperties().get("cm:lockOwner"));
+        assertTrue(documentResp.getIsLocked());
+
+        // Clean up
+        unlock(d1Id);
+
+        // Get node info (ensure rollback didn't happen)
+        response = getSingle(NodesEntityResource.class, d1Id, params, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        // Check that the unlock was successful
+        assertEquals(d1Name, documentResp.getName());
+        assertEquals(d1Id, documentResp.getId());
+        assertEquals(null, documentResp.getProperties().get("cm:lockType"));
+        assertNull(documentResp.getProperties().get("cm:lockOwner"));
+        assertFalse(documentResp.getIsLocked());
+
+        deleteNode(folderId);
+    }
+
+    @Test
+    public void testRequestContentUrl() throws Exception
+    {
+        setRequestContext(user1);
+
+        // create folder
+        Folder folderResp = createFolder(Nodes.PATH_MY, "folder" + RUNID);
+        String folderId = folderResp.getId();
+
+        // create doc d1
+        String d1Name = "content" + RUNID + "_1l";
+        Document d1 = createTextFile(folderId, d1Name, "The quick brown fox jumps over the lazy dog 1.");
+        String nodeId = d1.getId();
+
+        // node found but direct access isn't available
+        requestContentUrl(nodeId, null, 501);
+
+        // unknown alias
+        requestContentUrl("testSomeUndefinedAlias", null, 404);
+
+        // no content
+        requestContentUrl(Nodes.PATH_MY, null, 400);
+        requestContentUrl(Nodes.PATH_SHARED, null, 400);
+
+        {
+            requestContentUrl(nodeId, toJsonAsStringNonNull(new DirectAccessUrlRequest()), 501);
+
+            {
+                DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                directAccessUrlRequest.setExpiresAt(DateTime.now().plusSeconds(30).toDate());
+                directAccessUrlRequest.setValidFor(60L);
+
+                requestContentUrl(nodeId, toJsonAsStringNonNull(directAccessUrlRequest), 400);
+            }
+
+            {
+                DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                directAccessUrlRequest.setValidFor(60L);
+
+                requestContentUrl(nodeId, toJsonAsStringNonNull(directAccessUrlRequest), 501);
+            }
+
+            {
+                DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                directAccessUrlRequest.setValidFor(-60L);
+
+                requestContentUrl(nodeId, toJsonAsStringNonNull(directAccessUrlRequest), 400);
+            }
+
+            {
+                DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                directAccessUrlRequest.setExpiresAt(DateTime.now().plusSeconds(30).toDate());
+                requestContentUrl(nodeId, toJsonAsStringNonNull(directAccessUrlRequest), 501);
+            }
+
+            {
+                DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                directAccessUrlRequest.setExpiresAt(DateTime.now().minusSeconds(30).toDate());
+                requestContentUrl(nodeId, toJsonAsStringNonNull(directAccessUrlRequest), 400);
+            }
+        }
+
+        // node not accessible
+        setRequestContext(user2);
+        requestContentUrl(nodeId, null, 403);
+    }
+
+    @Test
+    public void testMoveFileCreatedByDeletedUser() throws Exception
+    {
+        // Create temp user
+        String user = createUser("userTstMove-" + RUNID, "userRNDPassword", networkOne);
+        
+        setRequestContext(user);
+
+        // create folder f0
+        String folder0Name = "f0-testMove-"+RUNID;
+        String f0Id = createFolder(Nodes.PATH_MY, folder0Name).getId();
+
+        // create folder f1
+        Folder folderResp = createFolder(f0Id, "f1");
+        String f1Id = folderResp.getId();
+
+        // create folder f2
+        folderResp = createFolder(f0Id, "f2");
+        String f2Id = folderResp.getId();
+
+        // create doc d1
+        String d1Name = "content" + RUNID + "_1";
+        String d1Id = createTextFile(f1Id, d1Name, "The quick brown fox jumps over the lazy dog 1.").getId();
+
+        setRequestContext(networkAdmin);
+
+        transactionHelper.doInTransaction(() -> {
+            deleteUser(user, networkOne);
+            return null;
+        });
+        
+        // move file (without rename)
+
+        NodeTarget tgt = new NodeTarget();
+        tgt.setTargetParentId(f2Id);
+
+        HttpResponse response = post("nodes/"+d1Id+"/move", toJsonAsStringNonNull(tgt), null, 200);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertEquals(d1Name, documentResp.getName());
+        assertEquals(f2Id, documentResp.getParentId());
+
+        // Get node info (ensure rollback didn't happen)
+        response = getSingle(NodesEntityResource.class, d1Id, null, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals(f2Id, documentResp.getParentId());
+
+        // move file (with rename)
+
+        String d1NewName = d1Name+" updated !!";
+
+        tgt = new NodeTarget();
+        tgt.setName(d1NewName);
+        tgt.setTargetParentId(f1Id);
+
+        response = post("nodes/"+d1Id+"/move", toJsonAsStringNonNull(tgt), null, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertEquals(d1NewName, documentResp.getName());
+        assertEquals(f1Id, documentResp.getParentId());
+
+        // Get node info (ensure rollback didn't happen)
+        response = getSingle(NodesEntityResource.class, d1Id, null, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals(f1Id, documentResp.getParentId());
+    }
+
+    /**
+     * Tests update of content after owner of the document is deleted
+     * <p>PUT:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/content}
+     */
+    @Test
+    public void testUploadContentDeletedOwner() throws Exception
+    {
+        // Create person2delete
+        String personToDelete = createUser("usertodelete-" + RUNID, "userdelPassword", networkOne);
+
+        // PersonToDelete creates a site and adds user1 as a site collab
+        setRequestContext(personToDelete);
+        String site1Title = "site-testUploadContentDeadUser_DocLib-" + RUNID;
+        String site1Id = createSite(site1Title, SiteVisibility.PUBLIC).getId();
+        String site1DocLibNodeId = getSiteContainerNodeId(site1Id, "documentLibrary");
+
+        addSiteMember(site1Id, user1, SiteRole.SiteCollaborator);
+
+        // PersonToDelete creates a file within DL
+        Document deadDoc = createTextFile(site1DocLibNodeId, "testdeaddoc.txt", "The quick brown fox jumps over the lazy dog 1.");
+        final String deadDocUrl = getNodeContentUrl(deadDoc.getId());
+
+        // PersonToDelete updates the file
+        String content = "Soft you a word or two before you go... I took by the throat the circumcised dog, And smote him, thus.";
+        String docName = "goodbye-world.txt";
+        Map params_doc = new HashMap<>();
+        params_doc.put(Nodes.PARAM_NAME, docName);
+        deadDoc = updateFileWithContent(deadDoc.getId(), content, params_doc, 200);
+        assertEquals("person2delete cannot update document", docName, deadDoc.getName());
+
+        // Download the file and confirm its contents on person2delete
+        HttpResponse response = getSingle(deadDocUrl, personToDelete, null, 200);
+        assertEquals("person2delete cannot view document", content, response.getResponse());
+
+        // Download the file and confirm its contents on user1
+        response = getSingle(deadDocUrl, user1, null, 200);
+        assertEquals("user1 cannot view document", content, response.getResponse());
+
+        // PersonToDelete is deleted
+        transactionHelper.doInTransaction(() -> {
+            deleteUser(personToDelete, networkOne);
+            return null;
+        });
+
+        // User1 updates the file
+        setRequestContext(user1);
+        content = "This did I fear, but thought he had no weapon; For he was great of heart.";
+        updateFileWithContent(deadDoc.getId(), content, null, 200);
+
+        // Download the file and confirm its contents (ensure rollback didn't happen)
+        response = getSingle(deadDocUrl, user1, null, 200);
+        assertEquals("user1 cannot update after owner is deleted", content, response.getResponse());
+    }
+
+    private Document updateFileWithContent(String docId, String content, Map<String, String> params, int expectedStatus) throws Exception
+    {
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(content.getBytes());
+        File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+
+        BinaryPayload payload = new BinaryPayload(txtFile);
+
+        HttpResponse response = putBinary(getNodeContentUrl(docId), payload, null, params, expectedStatus);
+        if (expectedStatus != 200)
+        {
+            return null;
+        }
+        return RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+    }
+
+    /**
+     * Creates authority context
+     *
+     * @param user
+     * @return
+     */
+    private void createAuthorityContext(String user)
+    {
+        String groupName = "Group_ROOT" + GUID.generate();
+
+        AuthenticationUtil.setRunAsUser(user);
+        if (rootGroupName == null)
+        {
+            rootGroupName = authorityService.getName(AuthorityType.GROUP, groupName);
+        }
+
+        if (!authorityService.authorityExists(rootGroupName))
+        {
+            AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+            rootGroupName = authorityService.createAuthority(AuthorityType.GROUP, groupName);
+            groupA = authorityService.createAuthority(AuthorityType.GROUP, "Test_GroupA");
+            authorityService.addAuthority(rootGroupName, groupA);
+            groupB = authorityService.createAuthority(AuthorityType.GROUP, "Test_GroupB");
+            authorityService.addAuthority(rootGroupName, groupB);
+            authorityService.addAuthority(groupA, user1);
+            authorityService.addAuthority(groupB, user2);
+        }
+    }
+
+    /**
+     * Clears authority context: removes root group and all child groups
+     */
+    private void clearAuthorityContext()
+    {
+        if (authorityService.authorityExists(rootGroupName))
+        {
+            AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+            authorityService.deleteAuthority(rootGroupName, true);
+        }
+    }
+
+    @Test
+    public void testRetrievePermissions() throws Exception
+    {
+        try
+        {
+            createAuthorityContext(user1);
+            testRetrieveNodePermissionsSpecialNodes();
+            testRetrieveNodePermissions();
+        }
+        finally
+        {
+            clearAuthorityContext();
+        }
+    }
+
+    /**
+     * Test retrieve node permissions for special nodes like:
+     * 'Company Home', 'Data Dictionary', 'Shared', 'Sites', 'User Home'
+     *
+     * @throws Exception
+     */
+    private void testRetrieveNodePermissionsSpecialNodes() throws Exception
+    {
+        setRequestContext(user1);
+        String rootNodeId = getRootNodeId();
+        String userHome = getMyNodeId();
+        String sharedFolder = getSharedNodeId();
+        String sitesNodeId = getSitesNodeId();
+        String ddNodeId = getDataDictionaryNodeId();
+
+        Map params = new HashMap<>();
+        params.put("include", "permissions");
+
+        // Test permissions for node 'Company Home'
+        HttpResponse response = getSingle(NodesEntityResource.class, rootNodeId, params, 200);
+        Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNull(nodeResp.getPermissions());
+
+        // Test permissions for node 'Sites'
+        response = getSingle(NodesEntityResource.class, sitesNodeId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNull(nodeResp.getPermissions());
+
+        // Test permissions for node 'Data Dictionary'
+        response = getSingle(NodesEntityResource.class, ddNodeId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNull(nodeResp.getPermissions());
+
+        // Test permissions for node 'Shared Folder'
+        response = getSingle(NodesEntityResource.class, sharedFolder, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNotNull(nodeResp.getPermissions());
+
+        Set<String> expectedSettable = new HashSet<>(Arrays.asList("Coordinator", "Collaborator", "Contributor", "Consumer", "Editor"));
+
+        // Test permissions for node 'User Home'
+        response = getSingle(NodesEntityResource.class, userHome, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNotNull(nodeResp.getPermissions());
+        assertNotNull(nodeResp.getPermissions().getSettable());
+        assertTrue("Incorrect list of settable permissions returned!", nodeResp.getPermissions().getSettable().containsAll(expectedSettable));
+        assertFalse(nodeResp.getPermissions().getIsInheritanceEnabled());
+
+        // Try as admin
+        setRequestContext(networkAdmin);
+
+        // Test permissions for node 'Company Home'
+        response = getSingle(NodesEntityResource.class, rootNodeId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertFalse(nodeResp.getPermissions().getIsInheritanceEnabled());
+        assertNull(nodeResp.getPermissions().getInherited());
+        assertNotNull(nodeResp.getPermissions().getLocallySet());
+        assertTrue(nodeResp.getPermissions().getLocallySet().contains(new NodePermissions.NodePermission("GROUP_EVERYONE", PermissionService.CONSUMER, AccessStatus.ALLOWED.toString())));
+        assertNotNull(nodeResp.getPermissions().getSettable());
+        assertTrue("Incorrect list of settable permissions returned!", nodeResp.getPermissions().getSettable().containsAll(expectedSettable));
+
+        // Test permissions for node 'Sites'
+        response = getSingle(NodesEntityResource.class, sitesNodeId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertTrue(nodeResp.getPermissions().getIsInheritanceEnabled());
+        assertNotNull(nodeResp.getPermissions().getInherited());
+        assertTrue(nodeResp.getPermissions().getInherited().contains(new NodePermissions.NodePermission("GROUP_EVERYONE", PermissionService.CONSUMER, AccessStatus.ALLOWED.toString())));
+        assertNull(nodeResp.getPermissions().getLocallySet());
+        assertNotNull(nodeResp.getPermissions().getSettable());
+        assertTrue("Incorrect list of settable permissions returned!", nodeResp.getPermissions().getSettable().containsAll(expectedSettable));
+
+        // Test permissions for node 'Data Dictionary'
+        response = getSingle(NodesEntityResource.class, ddNodeId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertFalse(nodeResp.getPermissions().getIsInheritanceEnabled());
+        assertNull(nodeResp.getPermissions().getInherited());
+        assertNotNull(nodeResp.getPermissions().getLocallySet());
+        assertTrue(nodeResp.getPermissions().getLocallySet().contains(new NodePermissions.NodePermission("GROUP_EVERYONE", PermissionService.CONSUMER, AccessStatus.ALLOWED.toString())));
+        assertNotNull(nodeResp.getPermissions().getSettable());
+        assertTrue("Incorrect list of settable permissions returned!", nodeResp.getPermissions().getSettable().containsAll(expectedSettable));
+
+        // Test permissions for node 'Shared Folder'
+        response = getSingle(NodesEntityResource.class, sharedFolder, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertFalse(nodeResp.getPermissions().getIsInheritanceEnabled());
+        assertNull(nodeResp.getPermissions().getInherited());
+        assertNotNull(nodeResp.getPermissions().getLocallySet());
+        assertTrue(nodeResp.getPermissions().getLocallySet().contains(new NodePermissions.NodePermission("GROUP_EVERYONE", PermissionService.CONTRIBUTOR, AccessStatus.ALLOWED.toString())));
+        assertNotNull(nodeResp.getPermissions().getSettable());
+        assertTrue("Incorrect list of settable permissions returned!", nodeResp.getPermissions().getSettable().containsAll(expectedSettable));
+
+        // Test permissions for node 'User Home'
+        response = getSingle(NodesEntityResource.class, userHome, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertFalse(nodeResp.getPermissions().getIsInheritanceEnabled());
+        assertNull(nodeResp.getPermissions().getInherited());
+        assertNotNull(nodeResp.getPermissions().getLocallySet());
+        assertTrue(nodeResp.getPermissions().getLocallySet().contains(new NodePermissions.NodePermission("ROLE_OWNER", "All", AccessStatus.ALLOWED.toString())));
+        assertTrue(nodeResp.getPermissions().getLocallySet().contains(new NodePermissions.NodePermission(user1, "All", AccessStatus.ALLOWED.toString())));
+        assertNotNull(nodeResp.getPermissions().getSettable());
+        assertTrue("Incorrect list of settable permissions returned!", nodeResp.getPermissions().getSettable().containsAll(expectedSettable));
+
+    }
+
+    private void testRetrieveNodePermissions() throws Exception
+    {
+        setRequestContext(user1);
+        // create folder with an empty document
+        String postUrl = createFolder();
+        String docId = createDocument(postUrl);
+
+        Map params = new HashMap<>();
+        params.put("include", "permissions");
+
+        // update permissions
+        Document dUpdate = new Document();
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupB, PermissionService.CONSUMER, AccessStatus.DENIED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+        dUpdate.setPermissions(nodePermissions);
+
+        // update node
+        HttpResponse response = put(URL_NODES, docId, toJsonAsStringNonNull(dUpdate), null, 200);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        // Check if permission are retrieved if 'include=permissions' is not
+        // sent in the request
+        response = getSingle(NodesEntityResource.class, documentResp.getId(), null, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertNull("Permissions should not be retrieved unless included!", documentResp.getPermissions());
+
+        // Call again with 'include=permissions'
+        response = getSingle(NodesEntityResource.class, documentResp.getId(), params, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        // Check that all permissions are retrieved
+        assertNotNull(documentResp.getPermissions());
+        assertTrue("Locally set permissions were not set properly!", documentResp.getPermissions().getLocallySet().size() == 2);
+        // Check inherit default true
+        assertTrue("Inheritance flag was not retrieved!", documentResp.getPermissions().getIsInheritanceEnabled());
+        // Check inherited permissions (for ROLE_OWNER and user1)
+        assertNotNull(documentResp.getPermissions().getInherited());
+        assertTrue(documentResp.getPermissions().getInherited().size() == 2);
+        assertNotNull(documentResp.getPermissions().getSettable());
+        assertTrue(documentResp.getPermissions().getSettable().size() == 5);
+        Set<String> expectedSettable = new HashSet<>(Arrays.asList("Coordinator", "Collaborator", "Contributor", "Consumer", "Editor"));
+        assertTrue("Incorrect list of settable permissions returned!", documentResp.getPermissions().getSettable().containsAll(expectedSettable));
+    }
+
+    /**
+     * Tests set permissions on a new node
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testCreateNodePermissions() throws Exception
+    {
+        try
+        {
+            createAuthorityContext(networkAdmin);
+
+            setRequestContext(user1);
+            // +ve tests
+            testCreatePermissionsOnNode();
+
+            // -ve tests
+            // invalid permission tests (authority, name or access level)
+            testCreatePermissionInvalidAuthority();
+            testCreatePermissionInvalidName();
+            testCreatePermissionInvalidAccessStatus();
+            testCreatePermissionAddDuplicate();
+
+            // required permission properties missing
+            testCreatePermissionMissingFields();
+            
+            // 'Permission Denied' tests
+            testCreatePermissionsPermissionDeniedUser();
+
+            // Inherit from parent tests
+            testCreatePermissionsSetFalseInheritFromParent();
+        }
+        finally
+        {
+            clearAuthorityContext();
+        }
+    }
+
+    /**
+     * Tests set permissions on an existing node
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testUpdateNodePermissions() throws Exception
+    {
+        try
+        {
+            createAuthorityContext(networkAdmin);
+
+            setRequestContext(user1);
+            // +ve tests
+            testUpdatePermissionsOnNode();
+
+            // -ve tests
+            // invalid permission tests (authority, name or access level)
+            testUpdatePermissionInvalidAuthority();
+            testUpdatePermissionInvalidName();
+            testUpdatePermissionInvalidAccessStatus();
+            testUpdatePermissionAddDuplicate();
+
+            // required permission properties missing
+            testUpdatePermissionMissingFields();
+            
+            // 'Permission Denied' tests
+            testUpdatePermissionsPermissionDeniedUser();
+            testUpdatePermissionsOnSpecialNodes();
+
+            // Inherit from parent tests
+            testUpdatePermissionsDefaultInheritFromParent();
+            testUpdatePermissionsSetFalseInheritFromParent();
+        }
+        finally
+        {
+            clearAuthorityContext();
+        }
+    }
+    
+    /**
+     * Test upload using relativePath
+     */
+    @Test
+    public void testUploadUsingRelativePath() throws Exception
+    {
+        setRequestContext(user1);
+
+        // user1 creates a private site and adds user2 as a site consumer
+        String site1Title = "site-testGetPathElements_DocLib-" + RUNID;
+        String site1Id = createSite(site1Title, SiteVisibility.PRIVATE).getId();
+        addSiteMember(site1Id, user2, SiteRole.SiteConsumer);
+
+        String site1DocLibNodeId = getSiteContainerNodeId(site1Id, "documentLibrary");
+
+        // /Company
+        // Home/Sites/RandomSite<timestamp>/documentLibrary/folder<timestamp>_A
+        String folderA = "folder" + RUNID + "_A";
+        String folderA_Id = createFolder(site1DocLibNodeId, folderA).getId();
+
+        // /Company
+        // Home/Sites/RandomSite<timestamp>/documentLibrary/folder<timestamp>_A/folder<timestamp>_B
+        String folderB = "folder" + RUNID + "_B";
+        String folderB_Id = createFolder(folderA_Id, folderB).getId();
+        NodeRef folderB_Ref = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, folderB_Id);
+
+        // /Company
+        // Home/Sites/RandomSite<timestamp>/documentLibrary/folder<timestamp>_A/folder<timestamp>_B/folder<timestamp>_C
+        String folderC = "folder" + RUNID + "_C";
+        String folderC_Id = createFolder(folderB_Id, folderC).getId();
+        NodeRef folderC_Ref = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, folderC_Id);
+
+        // /Company
+        // Home/Sites/RandomSite<timestamp>/documentLibrary/folder<timestamp>_A/folder<timestamp>_B/folder<timestamp>_C/content<timestamp>
+        String content = "content" + RUNID;
+        String content_Id = createTextFile(folderC_Id, content, "The quick brown fox jumps over the lazy dog.").getId();
+
+        Map<String, String> params = new HashMap<>();
+        params.put("include", "path");
+        params.put("relativePath", folderA + "/" + folderB + "/" + folderC);
+
+        // call get with relativePathParam
+        HttpResponse response = getAll(getNodeChildrenUrl(site1DocLibNodeId), null, params, 200);
+        List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+
+        assertEquals(1, nodes.size());
+        assertEquals("/" + folderA + "/" + folderB + "/" + folderC, ((Node) (nodes.get(0))).getPath().getRelativePath());
+    }
+
+    /**
+     * Test create permission on a node
+     *
+     * @throws Exception
+     */
+    private void testCreatePermissionsOnNode() throws Exception
+    {
+        String postUrl = createFolder();
+
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+
+        String dId = createDocument(postUrl, nodePermissions);
+
+        validatePermissions(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, dId), locallySetPermissions);
+
+        // Check permissions on node for user2 (part of groupB)
+        AuthenticationUtil.setRunAsUser(user2);
+        assertTrue(permissionService.hasPermission(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, dId), PermissionService.CONSUMER) == AccessStatus.DENIED);
+
+        // Check permissions on node for user1 (part of groupA)
+        AuthenticationUtil.setRunAsUser(user1);
+        assertTrue(permissionService.hasPermission(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, dId), PermissionService.CONSUMER) == AccessStatus.ALLOWED);
+    }
+
+    /**
+     * Test attempt to set permission with an invalid authority
+     *
+     * @throws Exception
+     */
+    private void testCreatePermissionInvalidAuthority() throws Exception
+    {
+        String postUrl = createFolder();
+
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission("NonExistingAuthority", PermissionService.CONSUMER, AccessStatus.DENIED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+
+        Document d1 = new Document();
+        d1.setName("testDoc" + GUID.generate());
+        d1.setNodeType(TYPE_CM_CONTENT);
+        d1.setPermissions(nodePermissions);
+        
+        // "Cannot set permissions on this node - unknown authority:
+        // NonExistingAuthority"
+        post(postUrl, toJsonAsStringNonNull(d1), null, 400);
+    }
+
+    /**
+     * Test attempt to set permission with an invalid name
+     *
+     * @throws Exception
+     */
+    private void testCreatePermissionInvalidName() throws Exception
+    {
+        String postUrl = createFolder();
+
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, "InvalidName", AccessStatus.DENIED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+
+        Document d1 = new Document();
+        d1.setName("testDoc" + GUID.generate());
+        d1.setNodeType(TYPE_CM_CONTENT);
+        d1.setPermissions(nodePermissions);
+
+        // "Cannot set permissions on this node - unknown permission name:
+        // InvalidName"
+        post(postUrl, toJsonAsStringNonNull(d1), null, 400);
+    }
+
+    /**
+     * Test attempt to set permission with an invalid access status
+     *
+     * @throws Exception
+     */
+    private void testCreatePermissionInvalidAccessStatus() throws Exception
+    {
+        String postUrl = createFolder();
+
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, "InvalidAccessLevel"));
+        nodePermissions.setLocallySet(locallySetPermissions);
+
+        Document d1 = new Document();
+        d1.setName("testDoc" + GUID.generate());
+        d1.setNodeType(TYPE_CM_CONTENT);
+        d1.setPermissions(nodePermissions);
+
+        // "Cannot set permissions on this node - unknown access status:
+        // InvalidName"
+        post(postUrl, toJsonAsStringNonNull(d1), null, 400);
+    }
+
+    /**
+     * Test add duplicate permissions
+     *
+     * @throws Exception
+     */
+    private void testCreatePermissionAddDuplicate() throws Exception
+    {
+        String postUrl = createFolder();
+
+        // Add same permission with different access status
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, AccessStatus.DENIED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+
+        Document d1 = new Document();
+        d1.setName("testDoc" + GUID.generate());
+        d1.setNodeType(TYPE_CM_CONTENT);
+        d1.setPermissions(nodePermissions);
+
+        // "Duplicate node permissions, there is more than one permission with
+        // the same authority and name!"
+        post(postUrl, toJsonAsStringNonNull(d1), null, 400);
+
+        // Add the same permission with same access status
+        locallySetPermissions.clear();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+
+        // "Duplicate node permissions, there is more than one permission with
+        // the same authority and name!"
+        post(postUrl, toJsonAsStringNonNull(d1), null, 400);
+    }
+
+    /**
+     * Tests creating permissions on a new node without providing mandatory
+     * properties
+     * 
+     * @throws Exception
+     */
+    private void testCreatePermissionMissingFields() throws Exception
+    {
+        String postUrl = createFolder();
+
+        // Add same permission with different access status
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(null, PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+
+        Document d1 = new Document();
+        d1.setName("testDoc" + GUID.generate());
+        d1.setNodeType(TYPE_CM_CONTENT);
+        d1.setPermissions(nodePermissions);
+
+        // "Authority Id is expected."
+        post(postUrl, toJsonAsStringNonNull(d1), null, 400);
+        locallySetPermissions.clear();
+        locallySetPermissions.add(new NodePermissions.NodePermission("", PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        post(postUrl, toJsonAsStringNonNull(d1), null, 400);
+
+        locallySetPermissions.clear();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, null, AccessStatus.ALLOWED.toString()));
+        // "Permission name is expected."
+        post(postUrl, toJsonAsStringNonNull(d1), null, 400);
+        locallySetPermissions.clear();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, "", AccessStatus.ALLOWED.toString()));
+        post(postUrl, toJsonAsStringNonNull(d1), null, 400);
+    }
+    
+    /**
+     * Tests creating permissions on a new node that user doesn't have permission for
+     *
+     * @throws Exception
+     */
+    private void testCreatePermissionsPermissionDeniedUser() throws Exception
+    {
+        String postUrl = createFolder();
+
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, AccessStatus.DENIED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+
+        Document d1 = new Document();
+        d1.setName("testDoc" + GUID.generate());
+        d1.setNodeType(TYPE_CM_CONTENT);
+        d1.setPermissions(nodePermissions);
+
+        setRequestContext(user2);
+        // "Permission Denied" expected
+        post(postUrl, toJsonAsStringNonNull(d1), null, 403);
+    }
+
+    /**
+     * Test set inherit from parent to false
+     *
+     * @throws Exception
+     */
+    private void testCreatePermissionsSetFalseInheritFromParent() throws Exception
+    {
+        String testFolderUrl = createFolder();
+
+        NodePermissions nodePermissions = new NodePermissions();
+        nodePermissions.setIsInheritanceEnabled(false);
+
+        Document d1 = new Document();
+        d1.setName("testDoc" + GUID.generate());
+        d1.setNodeType(TYPE_CM_CONTENT);
+        d1.setPermissions(nodePermissions);
+
+        String dId = createDocument(testFolderUrl, nodePermissions);
+
+        Map params = new HashMap<>();
+        params.put("include", "permissions");
+
+        HttpResponse response = getSingle(NodesEntityResource.class, dId, params, 200);
+        Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+
+        assertFalse("Inheritance hasn't been disabled!", nodeResp.getPermissions().getIsInheritanceEnabled());
+        assertNull("Permissions were inherited from parent!", nodeResp.getPermissions().getInherited());
+
+    }
+
+    /**
+     * Test update permission on a node
+     *
+     * @throws Exception
+     */
+    private void testUpdatePermissionsOnNode() throws Exception
+    {
+        // create folder with an empty document
+        String postUrl = createFolder();
+        String dId = createDocument(postUrl);
+
+        // update permissions
+        Document dUpdate = new Document();
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+        dUpdate.setPermissions(nodePermissions);
+
+        // update node
+        HttpResponse response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        validatePermissions(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, documentResp.getId()), locallySetPermissions);
+
+        // Check permissions on node for user2 (part of groupB)
+        AuthenticationUtil.setRunAsUser(user2);
+        assertTrue(permissionService.hasPermission(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, documentResp.getId()), PermissionService.CONSUMER) == AccessStatus.DENIED);
+
+        // Check permissions on node for user1 (part of groupA)
+        AuthenticationUtil.setRunAsUser(user1);
+        assertTrue(permissionService.hasPermission(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, documentResp.getId()), PermissionService.CONSUMER) == AccessStatus.ALLOWED);
+
+        // add two groups with different permissions for each
+        locallySetPermissions.clear();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.EDITOR, AccessStatus.ALLOWED.toString()));
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupB, PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+        dUpdate.setPermissions(nodePermissions);
+
+        // update node
+        response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        validatePermissions(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, documentResp.getId()), locallySetPermissions);
+
+        // Check permissions on node for user2 (part of groupB)
+        AuthenticationUtil.setRunAsUser(user2);
+        assertTrue(permissionService.hasPermission(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, documentResp.getId()), PermissionService.CONSUMER) == AccessStatus.ALLOWED);
+        assertTrue(permissionService.hasPermission(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, documentResp.getId()), PermissionService.EDITOR) == AccessStatus.DENIED);
+        assertTrue(permissionService.hasPermission(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, documentResp.getId()), PermissionService.WRITE) == AccessStatus.DENIED);
+        assertTrue(permissionService.hasPermission(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, documentResp.getId()), PermissionService.READ) == AccessStatus.ALLOWED);
+
+        // Check permissions on node for user1 (part of groupA)
+        AuthenticationUtil.setRunAsUser(user1);
+        assertTrue(permissionService.hasPermission(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, documentResp.getId()), PermissionService.EDITOR) == AccessStatus.ALLOWED);
+        assertTrue(permissionService.hasPermission(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, documentResp.getId()), PermissionService.WRITE) == AccessStatus.ALLOWED);
+        assertTrue(permissionService.hasPermission(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, documentResp.getId()), PermissionService.READ) == AccessStatus.ALLOWED);
+    }
+
+    /**
+     * Test attempt to set permission with an invalid authority
+     *
+     * @throws Exception
+     */
+    private void testUpdatePermissionInvalidAuthority() throws Exception
+    {
+        // create folder containing an empty document
+        String postUrl = createFolder();
+        String dId = createDocument(postUrl);
+
+        // update permissions
+        Document dUpdate = new Document();
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission("NonExistingAuthority", PermissionService.CONSUMER, AccessStatus.DENIED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+        dUpdate.setPermissions(nodePermissions);
+
+        // "Cannot set permissions on this node - unknown authority:
+        // NonExistingAuthority"
+        put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 400);
+    }
+
+    /**
+     * Test attempt to set permission with an invalid name
+     *
+     * @throws Exception
+     */
+    private void testUpdatePermissionInvalidName() throws Exception
+    {
+        // create folder with an empty document
+        String postUrl = createFolder();
+        String dId = createDocument(postUrl);
+
+        // update permissions
+        Document dUpdate = new Document();
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, "InvalidName", AccessStatus.DENIED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+        dUpdate.setPermissions(nodePermissions);
+
+        // "Cannot set permissions on this node - unknown permission name:
+        // InvalidName"
+        put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 400);
+    }
+
+    /**
+     * Test attempt to set permission with an invalid access status
+     *
+     * @throws Exception
+     */
+    private void testUpdatePermissionInvalidAccessStatus() throws Exception
+    {
+        // create folder with an empty document
+        String postUrl = createFolder();
+        String dId = createDocument(postUrl);
+
+        // update permissions
+        Document dUpdate = new Document();
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, "InvalidAccessLevel"));
+        nodePermissions.setLocallySet(locallySetPermissions);
+        dUpdate.setPermissions(nodePermissions);
+
+        // "Cannot set permissions on this node - unknown access status:
+        // InvalidName"
+        put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 400);
+    }
+
+    /**
+     * Test add duplicate permissions
+     *
+     * @throws Exception
+     */
+    private void testUpdatePermissionAddDuplicate() throws Exception
+    {
+        // create folder with an empty document
+        String postUrl = createFolder();
+        String dId = createDocument(postUrl);
+
+        // update permissions
+        Document dUpdate = new Document();
+        // Add same permission with different access status
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, AccessStatus.DENIED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+        dUpdate.setPermissions(nodePermissions);
+
+        // "Duplicate node permissions, there is more than one permission with
+        // the same authority and name!"
+        put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 400);
+
+        // Add the same permission with same access status
+        locallySetPermissions.clear();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+        dUpdate.setPermissions(nodePermissions);
+
+        // "Duplicate node permissions, there is more than one permission with
+        // the same authority and name!"
+        put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 400);
+    }
+
+    /**
+     * Tests updating permissions on a node without providing mandatory
+     * properties
+     * 
+     * @throws Exception
+     */
+    private void testUpdatePermissionMissingFields() throws Exception
+    {
+        // create folder with an empty document
+        String postUrl = createFolder();
+        String dId = createDocument(postUrl);
+
+        // update permissions
+        Document dUpdate = new Document();
+        // Add same permission with different access status
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(null, PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+        dUpdate.setPermissions(nodePermissions);
+
+        // "Authority Id is expected."
+        put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 400);
+        locallySetPermissions.clear();
+        locallySetPermissions.add(new NodePermissions.NodePermission("", PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 400);
+
+        locallySetPermissions.clear();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, null, AccessStatus.ALLOWED.toString()));
+        // "Permission name is expected."
+        put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 400);
+        locallySetPermissions.clear();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, "", AccessStatus.ALLOWED.toString()));
+        put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 400);
+    }
+    
+    /**
+     * Tests updating permissions on a node that user doesn't have permission for
+     *
+     * @throws Exception
+     */
+    private void testUpdatePermissionsPermissionDeniedUser() throws Exception
+    {
+        // create folder with an empty document
+        String postUrl = createFolder();
+        String dId = createDocument(postUrl);
+
+        // update permissions
+        Document dUpdate = new Document();
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.CONSUMER, AccessStatus.DENIED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+        dUpdate.setPermissions(nodePermissions);
+
+        setRequestContext(user2);
+        // "Permission Denied" expected
+        put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 403);
+    }
+
+    /**
+     * Test update permissions on special nodes like
+     * 'Company Home', 'Sites', 'Shared', 'User Home', 'Data Dictionary'
+     *
+     * @throws Exception
+     */
+    private void testUpdatePermissionsOnSpecialNodes() throws Exception
+    {
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.EDITOR, AccessStatus.ALLOWED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+
+        // 'Company Home'
+        HttpResponse response = getSingle(NodesEntityResource.class, getRootNodeId(), null, 200);
+        Node node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        node.setPermissions(nodePermissions);
+        put(URL_NODES, node.getId(), toJsonAsStringNonNull(node), null, 403);
+
+        // 'Sites' folder
+        response = getSingle(NodesEntityResource.class, getSharedNodeId(), null, 200);
+        node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        node.setPermissions(nodePermissions);
+        put(URL_NODES, node.getId(), toJsonAsStringNonNull(node), null, 403);
+
+        // 'Data Dictionary' folder
+        response = getSingle(NodesEntityResource.class, getDataDictionaryNodeId(), null, 200);
+        node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        node.setPermissions(nodePermissions);
+        put(URL_NODES, node.getId(), toJsonAsStringNonNull(node), null, 403);
+
+        // 'Shared' folder
+        response = getSingle(NodesEntityResource.class, getSharedNodeId(), null, 200);
+        node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        node.setPermissions(nodePermissions);
+        put(URL_NODES, node.getId(), toJsonAsStringNonNull(node), null, 403);
+
+        // 'User Home' folder
+        HttpResponse responseUserHome = getSingle(NodesEntityResource.class, getMyNodeId(), null, 200);
+        Node nodeUserHome = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        node.setPermissions(nodePermissions);
+        put(URL_NODES, node.getId(), toJsonAsStringNonNull(node), null, 403);
+    }
+
+    /**
+     * Test default inherit from parent
+     *
+     * @throws Exception
+     */
+    private void testUpdatePermissionsDefaultInheritFromParent() throws Exception
+    {
+        // create folder
+        Folder folder = new Folder();
+        folder.setName("testFolder" + GUID.generate());
+        folder.setNodeType(TYPE_CM_FOLDER);
+
+        // set permissions on previously created folder
+        NodePermissions nodePermissions = new NodePermissions();
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(groupA, PermissionService.EDITOR, AccessStatus.DENIED.toString()));
+        nodePermissions.setLocallySet(locallySetPermissions);
+        folder.setPermissions(nodePermissions);
+
+        HttpResponse response = post(getNodeChildrenUrl(Nodes.PATH_MY), RestApiUtil.toJsonAsStringNonNull(folder), 201);
+        Folder f = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+
+        // create a new document in testFolder
+        String docId = createDocument(getNodeChildrenUrl(f.getId()));
+
+        Map params = new HashMap<>();
+        params.put("include", "permissions");
+
+        response = getSingle(NodesEntityResource.class, docId, params, 200);
+        Document docResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertTrue("Inheritance hasn't been enabled!", docResp.getPermissions().getIsInheritanceEnabled());
+        assertTrue("Permissions were not inherited from parent!", docResp.getPermissions().getInherited().size() > 0);
+    }
+
+    /**
+     * Test set inherit from parent to false
+     *
+     * @throws Exception
+     */
+    private void testUpdatePermissionsSetFalseInheritFromParent() throws Exception
+    {
+        // create folder
+        String testFolderUrl = createFolder();
+        String dId = createDocument(testFolderUrl);
+
+        // create a new document in testFolder and set inherit to false
+        Document dUpdate = new Document();
+        NodePermissions nodePermissionsUpdate = new NodePermissions();
+        nodePermissionsUpdate.setIsInheritanceEnabled(false);
+        dUpdate.setPermissions(nodePermissionsUpdate);
+
+        HttpResponse response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        Map params = new HashMap<>();
+        params.put("include", "permissions");
+
+        response = getSingle(NodesEntityResource.class, documentResp.getId(), params, 200);
+        Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+
+        assertFalse("Inheritance hasn't been disabled!", nodeResp.getPermissions().getIsInheritanceEnabled());
+        assertNull("Permissions were inherited from parent!", nodeResp.getPermissions().getInherited());
+
+    }
+    
+    @Test
+    public void createContentWithAllParametersAccepted() throws Exception
+    {
+        setRequestContext(user1);
+
+        // Let's start with creating a folder in our home folder.
+        String folderName = "My Folder" + GUID.generate();
+        // -my- (eg. User's Home for on-prem)
+        String myNodeId = getMyNodeId();
+        Folder folder = new Folder();
+        folder.setName(folderName);
+        folder.setNodeType(TYPE_CM_FOLDER);
+        HttpResponse response = post(getNodeChildrenUrl(myNodeId), toJsonAsStringNonNull(folder), 201);
+        Folder folderResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Folder.class);
+        // Check the upload response
+        assertEquals(folderName, folderResponse.getName());
+        assertEquals(TYPE_CM_FOLDER, folderResponse.getNodeType());
+
+        // Let's now create an empty file within our home folder.
+        String fileName = "myfile" + GUID.generate() + ".txt";
+        Document document = new Document();
+        document.setName(fileName);
+        document.setNodeType(TYPE_CM_CONTENT);
+        response = post(getNodeChildrenUrl(myNodeId), toJsonAsStringNonNull(document), 201);
+        Document documentResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        // Check the upload response
+        assertEquals(fileName, documentResponse.getName());
+        assertEquals(TYPE_CM_CONTENT, documentResponse.getNodeType());
+
+        // multipart/form-data upload with known parameters
+        /*
+         * case "name": case "filedata": case "autorename": case "nodetype":
+         * case "overwrite": case "majorversion": case "comment": case
+         * "relativepath": case "renditions":
+         */
+        fileName = "quick-2.pdf";
+        File file = getResourceFile(fileName);
+
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file));
+        multiPartBuilder.setAutoRename(true);
+        multiPartBuilder.setNodeType(TYPE_CM_CONTENT);
+        multiPartBuilder.setOverwrite(false);
+        multiPartBuilder.setMajorVersion(true);
+        multiPartBuilder.setDescription("test");
+        // multiPartBuilder.setRelativePath("/");
+        multiPartBuilder.setRenditions(Collections.singletonList("doclib"));
+        MultiPartRequest reqBody = multiPartBuilder.build();
+        response = post(getNodeChildrenUrl(myNodeId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        ContentInfo contentInfo = document.getContent();
+        assertEquals(MimetypeMap.MIMETYPE_PDF, contentInfo.getMimeType());
+        assertEquals("UTF-8", contentInfo.getEncoding());
+
+        // multipart/form-data upload with unknown parameters
+        /*
+         * 
+         * setPropeties custom
+         */
+
+        document.setNodeType("custom:destination");
+        multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file));
+        multiPartBuilder.setAutoRename(true);
+        multiPartBuilder.setNodeType("custom:destination");
+        Map<String, String> props = new MultiValueMap();
+        props.put("cm:title", "test title");
+        props.put("custom:locations", "loc1");
+        props.put("custom:locations", "loc2");
+        props.put("custom:locations", "loc3");
+        multiPartBuilder.setProperties(props);
+
+        reqBody = multiPartBuilder.build();
+        response = post(getNodeChildrenUrl(myNodeId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        contentInfo = document.getContent();
+        assertEquals(MimetypeMap.MIMETYPE_PDF, contentInfo.getMimeType());
+        assertEquals("UTF-8", contentInfo.getEncoding());
+
+    }
+    
+    @Test
+    public void updatePropertiesMultivalueTest() throws Exception
+    {
+        setRequestContext(user1);
+        
+        String myNodeId = getMyNodeId();
+        // create a multiple-value field from multipart\formdata
+        String fileName = "myfile" + GUID.generate() + ".txt";
+        File file = getResourceFile("quick-2.pdf");
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file));
+        multiPartBuilder.setAutoRename(true);
+        multiPartBuilder.setNodeType("custom:destination");
+        multiPartBuilder.setOverwrite(false);
+        multiPartBuilder.setMajorVersion(true);
+        multiPartBuilder.setDescription("test");
+        multiPartBuilder.setRenditions(Collections.singletonList("doclib"));
+        Map<String, String> props = new MultiValueMap();
+        props.put("cm:title", "test title");
+        props.put("custom:locations", "loc1");
+        props.put("custom:locations", "loc2");
+        props.put("custom:locations", "loc3");
+        multiPartBuilder.setProperties(props);
+
+        MultiPartRequest reqBody = multiPartBuilder.build();
+        HttpResponse response = post(getNodeChildrenUrl(myNodeId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document documentResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        //build the multiple-value as json array       
+        String jsonUpdate = "{" +
+         	         "\"name\":\"My Other Folder\","+
+         	         "\"nodeType\":\"custom:destination\"," +
+           	          "\"properties\":"+
+           	          "{" +
+           	          		"\"cm:title\":\"Folder title\","+
+           	          		"\"cm:description\":\"This is an important folder\"," +
+           	          		"\"custom:locations\":["+
+       	                                 "\"location X\","+
+       	                                 "\"location Y\""+
+       	                                 "]" +
+           	          "}" +
+         	      "}";
+         
+        response = put(URL_NODES, documentResponse.getId(), jsonUpdate, null, 200);
+
+        Node nodeUpdateResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        Map<String, Object> propUpdateResponse = nodeUpdateResponse.getProperties();
+        assertNotNull(propUpdateResponse.get("custom:locations"));
+        assertTrue(((ArrayList) (propUpdateResponse.get("custom:locations"))).size() == 2);
+
+        // build the multiple-value as array
+        Map<String, Object> properties = new HashMap();
+        List locations = new ArrayList<String>();
+        locations.add("location X1");
+        properties.put("custom:locations", locations);
+        Node nodeUpdate = new Node();
+        nodeUpdate.setProperties(properties);
+
+        response = put(URL_NODES, documentResponse.getId(), toJsonAsStringNonNull(nodeUpdate), null, 200);
+
+        nodeUpdateResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        propUpdateResponse = nodeUpdateResponse.getProperties();
+        assertNotNull(propUpdateResponse.get("custom:locations"));
+        assertTrue(((ArrayList) (propUpdateResponse.get("custom:locations"))).size() == 1);
+    }
+
+    @Test public void testAuditableProperties() throws Exception
+    {
+        setRequestContext(user1);
+        String myNodeId = getMyNodeId();
+
+        UserInfo expectedUser = new UserInfo(user1);
+
+        String auditCreator = "unacceptable creator";
+        String auditCreated = "unacceptable created";
+        String auditModifier = "unacceptable modifier";
+        String auditModified = "unacceptable modified";
+        String auditAccessed = "unacceptable accessed";
+
+        Map<String, Object> auditableProperties = new HashMap<>();
+        auditableProperties.put("cm:creator", auditCreator);
+        auditableProperties.put("cm:created", auditCreated);
+        auditableProperties.put("cm:modifier", auditModifier);
+        auditableProperties.put("cm:modified", auditModified);
+        auditableProperties.put("cm:accessed", auditAccessed);
+
+        Map<String, Object> systemProperties = new HashMap<>();
+        systemProperties.put("sys:node:uuid", "someRandomID");
+
+        //create folder node
+        Node node = new Node();
+        node.setName("folderName");
+        node.setNodeType(TYPE_CM_FOLDER);
+        node.setProperties(auditableProperties);
+        HttpResponse response = post(getNodeChildrenUrl(myNodeId), RestApiUtil.toJsonAsStringNonNull(node), 400);
+
+        node.setProperties(systemProperties);
+        post(getNodeChildrenUrl(myNodeId), RestApiUtil.toJsonAsStringNonNull(node), 400);
+
+        node.setProperties(new HashMap<>());
+        response = post(getNodeChildrenUrl(myNodeId), RestApiUtil.toJsonAsStringNonNull(node), 201);
+        Node createdFolder =  RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertEquals(createdFolder.getCreatedByUser().getId(), expectedUser.getId());
+        validateAuditableProperties(auditableProperties, createdFolder);
+
+        //update folder node
+        createdFolder.setProperties(auditableProperties);
+        put(URL_NODES, createdFolder.getId(), toJsonAsStringNonNull(createdFolder), null, 400);
+
+        Map<String, Object> otherProperties = new HashMap<>();
+        otherProperties.put("cm:title", "newTitle");
+        createdFolder.setProperties(otherProperties);
+        response = put(URL_NODES, createdFolder.getId(), toJsonAsStringNonNull(createdFolder), null, 200);
+        Node updateFolderResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        validateAuditableProperties(auditableProperties, updateFolderResponse);
+    }
+
+    private void validateAuditableProperties(Map<String, Object> givenProperties, Node node)
+    {
+        assertFalse(givenProperties.get("cm:creator").equals(node.getCreatedByUser().getDisplayName()));
+        assertFalse(givenProperties.get("cm:created").equals(node.getCreatedAt().getTime()));
+        assertFalse(givenProperties.get("cm:modifier").equals(node.getModifiedAt().getTime()));
+        assertFalse(givenProperties.get("cm:modified").equals(node.getModifiedByUser().getDisplayName()));
+    }
+
+    @Test public void testPrimaryPath() throws Exception
+    {
+        setRequestContext(user1);
+        AuthenticationUtil.setFullyAuthenticatedUser(user1);
+        String myNodeId = getMyNodeId();
+
+        String nameA = "folder_A";
+        String nameA01 = "folder_A01";
+        String nameA02 = "folder_A02";
+        String nameA03 = "folder_A03";
+        String nameB = "folder_B";
+
+        // /Company Home/User Homes/user<timestamp>/folder_A/folder_B
+        Folder folderA = createFolder(myNodeId, nameA);
+        Folder folderB = createFolder(folderA.getId(), nameB);
+        NodeRef folderANodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, folderA.getId());
+        NodeRef folderBNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, folderB.getId());
+
+        folderA.setName(nameA01);
+        put(URL_NODES, folderA.getId(), toJsonAsStringNonNull(folderA), null, 200);
+        Path folderAPath = nodeService.getPath(folderANodeRef);
+        Path.ChildAssocElement pathElement = (Path.ChildAssocElement) folderAPath.last();
+        String localNameForFolderA = pathElement.getRef().getQName().getLocalName();
+        assertFalse(nameA.equals(localNameForFolderA));
+
+        folderA.setName(nameA02);
+        Map<String, Object> properties = new HashMap<>();
+        properties.put("cm:name", nameA03);
+        folderA.setProperties(properties);
+        put(URL_NODES, folderA.getId(), toJsonAsStringNonNull(folderA), null, 200);
+        folderAPath = nodeService.getPath(folderANodeRef);
+        pathElement = (Path.ChildAssocElement) folderAPath.last();
+        localNameForFolderA = pathElement.getRef().getQName().getLocalName();
+        assertFalse(nameA.equals(localNameForFolderA));
+        assertFalse(nameA03.equals(localNameForFolderA));
+        assertTrue(nameA02.equals(localNameForFolderA));
+
+        Path folderBPath = nodeService.getPath(folderBNodeRef);
+        Path.ChildAssocElement pathBLastElement = (Path.ChildAssocElement) folderBPath.last();
+        String currentPath = folderBPath.toDisplayPath(nodeService, permissionService) + "/" + pathBLastElement.getRef().getQName().getLocalName();
+        String expectedPath = "/Company Home/User Homes/" + user1 + "/" + nameA02 + "/" + nameB;
+        assertTrue(currentPath.equals(expectedPath));
+    }
+
+    private String getDataDictionaryNodeId() throws Exception
+    {
+        Map params = new HashMap<>();
+        params.put(Nodes.PARAM_RELATIVE_PATH, "/Data Dictionary");
+        HttpResponse response = getSingle(NodesEntityResource.class, getRootNodeId(), params, 200);
+        Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        return nodeResp.getId();
+    }
+
+    private String getSitesNodeId() throws Exception
+    {
+        Map params = new HashMap<>();
+        params.put(Nodes.PARAM_RELATIVE_PATH, "/Sites");
+        HttpResponse response = getSingle(NodesEntityResource.class, getRootNodeId(), params, 200);
+        Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        return nodeResp.getId();
+    }
+
+    private String createFolder() throws Exception
+    {
+        String folderName = "testPermissionsFolder-" + GUID.generate();
+        String folderId = createFolder(Nodes.PATH_MY, folderName).getId();
+        return getNodeChildrenUrl(folderId);
+    }
+
+    /**
+     * Created an empty document in the given url path
+     * 
+     * @param url
+     * @return
+     * @throws Exception
+     */
+    private String createDocument(String url) throws Exception
+    {
+        Document d1 = new Document();
+        d1.setName("testDoc" + GUID.generate());
+        d1.setNodeType(TYPE_CM_CONTENT);
+
+        HttpResponse response = post(url, toJsonAsStringNonNull(d1), 201);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        return documentResp.getId();
+    }
+
+    /**
+     * Created an empty document in the given url path
+     * 
+     * @param url
+     * @return
+     * @throws Exception
+     */
+    private String createDocument(String url, NodePermissions perms) throws Exception
+    {
+        Document d1 = new Document();
+        d1.setName("testDoc" + GUID.generate());
+        d1.setNodeType(TYPE_CM_CONTENT);
+        d1.setPermissions(perms);
+        
+        HttpResponse response = post(url, toJsonAsStringNonNull(d1), 201);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        return documentResp.getId();
+    }
+
+    private void validatePermissions(NodeRef nodeRef, List<NodePermissions.NodePermission> expectedPermissions)
+    {
+        Set<AccessPermission> permissions = permissionService.getAllSetPermissions(nodeRef);
+
+        for (NodePermissions.NodePermission permission : expectedPermissions)
+        {
+            String authority = permission.getAuthorityId();
+            AccessPermission ap = getPermission(permissions, authority);
+            assertNotNull("Permission " + authority + " missing", ap);
+
+            assertEquals(authority, ap.getAuthority());
+            comparePermissions(authority, permission, ap);
+        }
+    }
+
+    private void comparePermissions(String authority, NodePermissions.NodePermission permission, AccessPermission ap)
+    {
+        assertEquals("Wrong permission for " + authority, permission.getAuthorityId(), ap.getAuthority());
+        assertEquals("Wrong permission for " + authority, permission.getName(), ap.getPermission());
+        assertEquals("Wrong access status for " + authority, permission.getAccessStatus(), ap.getAccessStatus().toString());
+    }
+
+    /**
+     * Searches through actual set of permissions
+     *
+     * @param permissions
+     * @param expectedAuthority
+     * @return
+     */
+    private AccessPermission getPermission(Set<AccessPermission> permissions, String expectedAuthority)
+    {
+        AccessPermission result = null;
+        for (AccessPermission ap : permissions)
+        {
+            if (expectedAuthority.equals(ap.getAuthority()))
+            {
+                result = ap;
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+
+    @Test 
+    public void testRetrieveNodeDefinition() throws Exception
+    {
+        setRequestContext(networkOne.getId(), user1, null);
+        
+        String node1 = "nodeSample" + RUNID + "_1";
+        String node1Type = TYPE_CM_CONTENT;
+        Map<String,Object> props = new HashMap<>();
+        props.put("cm:title", "add aspect property");
+        Node node = createNode(Nodes.PATH_MY, node1, node1Type, props);
+        String nodeId = node.getId();
+        
+        HttpResponse  response = getSingle(NodesEntityResource.class, nodeId, null, 200);
+        Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertNull("Definition should not be retrieved unless included!", nodeResp.getDefinition());
+
+        Map params = new HashMap<>();
+        params.put("include", "definition");
+        response = getSingle(NodesEntityResource.class, nodeId, params, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        NodeDefinition nodeDefinition = nodeResp.getDefinition();
+        assertNotNull(nodeDefinition);
+        checkDefinitionProperties(nodeDefinition.getProperties());
+    }
+    
+    private void checkDefinitionProperties(List<NodeDefinitionProperty> properties)
+    {
+        assertNotNull(properties);
+        shouldNotContainSystemProperties(properties);
+        shouldContainParentProperties(properties);
+        shouldContainAspectProperties(properties);
+
+        NodeDefinitionProperty testProperty = properties.stream().
+                filter(property ->
+                        property.getId().equals("cm:name"))
+                .findFirst()
+                .get();
+        assertNotNull(testProperty);
+        assertEquals("Name", testProperty.getTitle());
+        assertEquals("d:text", testProperty.getDataType());
+        assertEquals("Name", testProperty.getDescription());
+        assertTrue(testProperty.getIsMandatory());
+        assertTrue(testProperty.getIsMandatoryEnforced());
+        assertFalse(testProperty.getIsMultiValued());
+        assertNull(testProperty.getDefaultValue());
+        checkPropertyConstraints(testProperty.getConstraints());
+
+    }
+    
+    private void shouldNotContainSystemProperties(List<NodeDefinitionProperty> properties)
+    {
+        assertTrue(properties.stream()
+                .noneMatch(property -> 
+                        property.getId().startsWith(NamespaceService.SYSTEM_MODEL_PREFIX) ||
+                                property.getId().equals(ContentModel.PROP_CONTENT.toPrefixString(namespaceService))));
+    }
+    
+    private void shouldContainParentProperties(List<NodeDefinitionProperty> properties)
+    {
+        assertTrue(properties.stream()
+                .anyMatch(property -> 
+                        property.getId().equals("cm:name")));
+    }
+
+    private void shouldContainAspectProperties(List<NodeDefinitionProperty> properties)
+    {
+        NodeDefinitionProperty mandatoryAspectProperty = properties.stream()
+                .filter(property -> property.getId().equals("cm:created"))
+                .findFirst()
+                .get();
+        assertNotNull(mandatoryAspectProperty);
+
+        NodeDefinitionProperty nodeAspectProperty = properties.stream()
+                .filter(property -> property.getId().equals("cm:title"))
+                .findFirst()
+                .get();
+        assertNotNull(nodeAspectProperty);
+    }
+
+    private void checkPropertyConstraints(List<NodeDefinitionConstraint> constraints)
+    {
+        assertNotNull(constraints);
+        NodeDefinitionConstraint  nodeDefinitionConstraint = constraints.stream()
+                .filter(constraint -> constraint.getId().equals("cm:filename"))
+                .findFirst()
+                .get();
+        assertNotNull(nodeDefinitionConstraint);
+        assertEquals("REGEX", nodeDefinitionConstraint.getType());
+        Map<String, Object> constraintParameters = nodeDefinitionConstraint.getParameters();
+        assertNotNull(constraintParameters);
+        assertNull(nodeDefinitionConstraint.getDescription());
+        assertNull(nodeDefinitionConstraint.getTitle());
+        assertEquals(2, constraintParameters.size());
+        assertEquals("(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$)", constraintParameters.get("expression"));
+        assertFalse((Boolean) constraintParameters.get("requiresMatch"));
+    }
+
+}
+
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeAssociationsApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeAssociationsApiTest.java
new file mode 100644
index 00000000000..2151b55b8cc
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeAssociationsApiTest.java
@@ -0,0 +1,1630 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.model.AssocChild;
+import org.alfresco.rest.api.model.AssocTarget;
+import org.alfresco.rest.api.nodes.NodesEntityResource;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.data.Association;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.Node;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
+import static org.junit.Assert.*;
+
+/**
+ * V1 REST API tests for Node Associations
+ *
+ * Peer Associations  (source -> target)
+ * <ul>
+ * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/{sourceId}/targets</li>
+ * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/{targetId}/sources</li>
+ * </ul>
+ *
+ * Child Associations (parent -> child) - secondary (*)
+ *
+ * <ul>
+ * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/{parentId}/children</li>
+ * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/{parentId}/secondary-children</li>
+ * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/{childId}/parents</li>
+ * </ul>
+ *
+ * (*) for primary child assocs, please refer to NodeApiTest - eg. create/delete node (primary child), list children, move, copy etc
+ *
+ * @author janv
+ */
+public class NodeAssociationsApiTest extends AbstractSingleNetworkSiteTest
+{
+    private static final String URL_DELETED_NODES = "deleted-nodes";
+
+    private static final String PARAM_ASSOC_TYPE = "assocType";
+
+    // peer assocs
+
+    private static final String URL_TARGETS = "targets";
+    private static final String URL_SOURCES = "sources";
+
+    private static final String ASPECT_CM_REFERENCING = "cm:referencing";
+    private static final String ASSOC_TYPE_CM_REFERENCES = "cm:references";
+
+    private static final String ASPECT_CM_PARTABLE = "cm:partable";
+    private static final String ASSOC_TYPE_CM_PARTS = "cm:parts";
+
+    // child assocs
+
+    private static final String URL_SECONDARY_CHILDREN = "secondary-children";
+    private static final String URL_PARENTS = "parents";
+    
+    protected String getNodeTargetsUrl(String nodeId)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_TARGETS;
+    }
+
+    protected String getNodeSourcesUrl(String nodeId)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_SOURCES;
+    }
+
+    protected String getNodeSecondaryChildrenUrl(String nodeId)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_SECONDARY_CHILDREN;
+    }
+
+    protected String getNodeParentsUrl(String nodeId)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_PARENTS;
+    }
+
+    private PermissionService permissionService;
+
+    @Before
+    public void setup() throws Exception
+    {
+        super.setup();
+
+        permissionService = applicationContext.getBean("permissionService", PermissionService.class);
+    }
+
+    /**
+     * Tests basic api to manage (add, list, remove) node peer associations (ie. source node -> target node)
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<sourceNodeId>/targets}
+     *
+     * <p>DELETE:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<sourceNodeId>/targets/<targetNodeId>}
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<sourceNodeId>/targets}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<targetNodeId>/sources}
+     */
+    @Test
+    public void testNodePeerAssocs() throws Exception
+    {
+        setRequestContext(user1);
+                
+        String myFolderNodeId = getMyNodeId();
+
+        // create folder
+        String f1Id = createFolder(myFolderNodeId, "f1").getId();
+
+        // create content node
+        Node n = new Node();
+        n.setName("o1");
+        n.setNodeType(TYPE_CM_CONTENT);
+        n.setAspectNames(Arrays.asList(ASPECT_CM_REFERENCING, ASPECT_CM_PARTABLE));
+        HttpResponse response = post(getNodeChildrenUrl(f1Id), toJsonAsStringNonNull(n), 201);
+        String o1Id = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+        // create ano' folder
+        String f2Id = createFolder(myFolderNodeId, "f2").getId();
+
+        // create ano' content node
+        n = new Node();
+        n.setName("o2");
+        n.setNodeType(TYPE_CM_CONTENT);
+        n.setAspectNames(Arrays.asList(ASPECT_CM_REFERENCING, ASPECT_CM_PARTABLE));
+        response = post(getNodeChildrenUrl(f2Id), toJsonAsStringNonNull(n), 201);
+        String o2Id = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+
+        try
+        {
+            // As user 1 ...
+
+            Paging paging = getPaging(0, 100);
+
+            // empty lists - before
+
+            response = getAll(getNodeTargetsUrl(o1Id), paging, null, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeSourcesUrl(o1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeTargetsUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeSourcesUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            // create two assocs in one direction (from src to tgt)
+
+            AssocTarget tgt = new AssocTarget(o2Id, ASSOC_TYPE_CM_REFERENCES);
+            post(getNodeTargetsUrl(o1Id), toJsonAsStringNonNull(tgt), 201);
+
+            tgt = new AssocTarget(o2Id, ASSOC_TYPE_CM_PARTS);
+            post(getNodeTargetsUrl(o1Id), toJsonAsStringNonNull(tgt), 201);
+
+            response = getAll(getNodeTargetsUrl(o1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+
+            response = getAll(getNodeSourcesUrl(o1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeTargetsUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeSourcesUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+
+            // create two assocs in the other direction (from tgt to src)
+
+            tgt = new AssocTarget(o1Id, ASSOC_TYPE_CM_REFERENCES);
+            post(getNodeTargetsUrl(o2Id), toJsonAsStringNonNull(tgt), 201);
+
+            tgt = new AssocTarget(o1Id, ASSOC_TYPE_CM_PARTS);
+            post(getNodeTargetsUrl(o2Id), toJsonAsStringNonNull(tgt), 201);
+
+            response = getAll(getNodeTargetsUrl(o1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+
+            response = getAll(getNodeSourcesUrl(o1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+
+            response = getAll(getNodeTargetsUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+
+            response = getAll(getNodeSourcesUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+
+            // test basic list filter
+
+            Map<String, String> params = new HashMap<>(1);
+            params.put("where", "(assocType='"+ASSOC_TYPE_CM_REFERENCES+"')");
+
+            response = getAll(getNodeTargetsUrl(o1Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(o2Id, nodes.get(0).getId());
+            assertEquals(ASSOC_TYPE_CM_REFERENCES, nodes.get(0).getAssociation().getAssocType());
+
+            response = getAll(getNodeSourcesUrl(o1Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(o2Id, nodes.get(0).getId());
+            assertEquals(ASSOC_TYPE_CM_REFERENCES, nodes.get(0).getAssociation().getAssocType());
+
+            params = new HashMap<>(1);
+            params.put("where", "(assocType='"+ASSOC_TYPE_CM_PARTS+"')");
+
+            response = getAll(getNodeTargetsUrl(o2Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(o1Id, nodes.get(0).getId());
+            assertEquals(ASSOC_TYPE_CM_PARTS, nodes.get(0).getAssociation().getAssocType());
+
+            response = getAll(getNodeSourcesUrl(o2Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(o1Id, nodes.get(0).getId());
+            assertEquals(ASSOC_TYPE_CM_PARTS, nodes.get(0).getAssociation().getAssocType());
+
+            // remove assocs - specific type - in one direction
+            params = new HashMap<>(1);
+            params.put(PARAM_ASSOC_TYPE, ASSOC_TYPE_CM_REFERENCES);
+            delete(getNodeTargetsUrl(o1Id), o2Id, params, 204);
+
+            response = getAll(getNodeTargetsUrl(o1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+
+            response = getAll(getNodeSourcesUrl(o1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+
+            response = getAll(getNodeTargetsUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+
+            response = getAll(getNodeSourcesUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+
+            params = new HashMap<>(1);
+            params.put(PARAM_ASSOC_TYPE, ASSOC_TYPE_CM_PARTS);
+            delete(getNodeTargetsUrl(o1Id), o2Id, params, 204);
+
+            response = getAll(getNodeTargetsUrl(o1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeSourcesUrl(o1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+
+            response = getAll(getNodeTargetsUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+
+            response = getAll(getNodeSourcesUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            // remove assocs - both types at once (ie. no assocType param) - in the other direction
+            delete(getNodeTargetsUrl(o2Id), o1Id, 204);
+
+            // empty lists - after
+
+            response = getAll(getNodeTargetsUrl(o1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeSourcesUrl(o1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeTargetsUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeSourcesUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+
+            //
+            // -ve tests - add assoc
+            //
+
+            {
+                setRequestContext(null);
+                
+                // -ve test - unauthenticated - belts-and-braces ;-)
+                tgt = new AssocTarget(o2Id, ASSOC_TYPE_CM_REFERENCES);
+                post(getNodeTargetsUrl(o1Id), toJsonAsStringNonNull(tgt), 401);
+
+                setRequestContext(user1);
+
+                // -ve test - model integrity
+                tgt = new AssocTarget(f2Id, ASSOC_TYPE_CM_REFERENCES);
+                post(getNodeTargetsUrl(o1Id), toJsonAsStringNonNull(tgt), 422);
+
+                // -ve test - duplicate assoc
+                tgt = new AssocTarget(o1Id, ASSOC_TYPE_CM_REFERENCES);
+                post(getNodeTargetsUrl(o2Id), toJsonAsStringNonNull(tgt), 201);
+                post(getNodeTargetsUrl(o2Id), toJsonAsStringNonNull(tgt), 409);
+
+                tgt = new AssocTarget(o1Id, "cm:unknowntype");
+                post(getNodeTargetsUrl(o2Id), toJsonAsStringNonNull(tgt), 400);
+            }
+
+            //
+            // -ve test - list assocs
+            //
+
+            {
+                setRequestContext(null);
+                
+                // -ve test - unauthenticated - belts-and-braces ;-)
+                getAll(getNodeTargetsUrl(f1Id), paging, null, 401);
+                getAll(getNodeSourcesUrl(f1Id), paging, null, 401);
+
+                setRequestContext(user1);
+
+                getAll(getNodeTargetsUrl(UUID.randomUUID().toString()), paging, null, 404);
+                getAll(getNodeSourcesUrl(UUID.randomUUID().toString()), paging, null, 404);
+
+                params = new HashMap<>(1);
+                params.put("where", "(assocType='cm:unknownassoctype')");
+
+                getAll(getNodeTargetsUrl(o1Id), paging, params, 400);
+                getAll(getNodeSourcesUrl(o1Id), paging, params, 400);
+
+                // TODO paging - in-built sort order ? (RA-926, RA-927)
+            }
+
+
+            //
+            // -ve test - remove assoc(s)
+            //
+
+            {
+                setRequestContext(null);
+                
+                // -ve test - unauthenticated - belts-and-braces ;-)
+                delete(getNodeTargetsUrl(o1Id), o2Id, 401);
+
+                setRequestContext(user1);
+
+                delete(getNodeTargetsUrl(UUID.randomUUID().toString()), o2Id, null, 404);
+                delete(getNodeTargetsUrl(o1Id), UUID.randomUUID().toString(), null, 404);
+
+                // -ve test -nothing to delete - for any assoc type
+                delete(getNodeTargetsUrl(o1Id), o2Id, null, 404);
+
+                // -ve test - nothing to delete - for given assoc type
+                params = new HashMap<>(1);
+                params.put(PARAM_ASSOC_TYPE, ASSOC_TYPE_CM_REFERENCES);
+                delete(getNodeTargetsUrl(o1Id), o2Id, params, 404);
+
+                // -ve test - unknown assoc type
+                params = new HashMap<>(1);
+                params.put(PARAM_ASSOC_TYPE, "cm:unknowntype");
+                delete(getNodeTargetsUrl(o1Id), o2Id, params, 400);
+            }
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            deleteNode(f1Id, true, 204);
+            deleteNode(f2Id, true, 204);
+        }
+    }
+
+    /**
+     * Tests base permissions for managing (adding, listing and removing) peer associations.
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<sourceNodeId>/targets}
+     *
+     * <p>DELETE:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<sourceNodeId>/targets/<targetNodeId>}
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<sourceNodeId>/targets}
+     * {
+     */
+    @Test
+    public void testNodePeerAssocsPermissions() throws Exception
+    {
+        setRequestContext(user1);
+        
+        // as user 1 - create folder in "Shared Files" area and content within the folder
+        String sharedFolderNodeId = getSharedNodeId();
+
+        String sf1Id = createFolder(sharedFolderNodeId, "shared folder "+RUNID).getId();
+
+        Node n = new Node();
+        n.setName("shared content "+RUNID);
+        n.setNodeType(TYPE_CM_CONTENT);
+        n.setAspectNames(Arrays.asList(ASPECT_CM_REFERENCING, ASPECT_CM_PARTABLE));
+        HttpResponse response = post(getNodeChildrenUrl(sf1Id), toJsonAsStringNonNull(n), 201);
+        String so1Id = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+
+        // as user 1 - create folder in user's home (My Files) area and content within the folder
+
+        String u1myNodeId = getMyNodeId();
+
+        String u1f1Id = createFolder(u1myNodeId, "f1").getId();
+
+        n = new Node();
+        n.setName("o1");
+        n.setNodeType(TYPE_CM_CONTENT);
+        n.setAspectNames(Arrays.asList(ASPECT_CM_REFERENCING, ASPECT_CM_PARTABLE));
+        response = post(getNodeChildrenUrl(u1f1Id), toJsonAsStringNonNull(n), 201);
+        String u1o1Id = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+        // as user 2 - create folder in user's home (My Files) area and content within the folder
+
+        setRequestContext(user2);
+        
+        String u2myNodeId = getMyNodeId();
+
+        String u2f1Id = createFolder(u2myNodeId, "f1").getId();
+
+        n = new Node();
+        n.setName("o1");
+        n.setNodeType(TYPE_CM_CONTENT);
+        n.setAspectNames(Arrays.asList(ASPECT_CM_REFERENCING, ASPECT_CM_PARTABLE));
+        response = post(getNodeChildrenUrl(u2f1Id), toJsonAsStringNonNull(n), 201);
+        String u2o1Id = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+        try
+        {
+            Paging paging = getPaging(0, 100);
+
+            // empty lists - before
+
+            setRequestContext(user1);
+
+            response = getAll(getNodeTargetsUrl(u1f1Id), paging, null, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            setRequestContext(user2);
+
+            response = getAll(getNodeTargetsUrl(u2f1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            // Create some assocs
+
+            setRequestContext(user1);
+
+            AssocTarget tgt = new AssocTarget(u1o1Id, ASSOC_TYPE_CM_REFERENCES);
+            post(getNodeTargetsUrl(u1f1Id), toJsonAsStringNonNull(tgt), 201);
+
+            setRequestContext(user2);
+
+            tgt = new AssocTarget(u2o1Id, ASSOC_TYPE_CM_REFERENCES);
+            post(getNodeTargetsUrl(u2f1Id), toJsonAsStringNonNull(tgt), 201);
+
+            setRequestContext(user1);
+
+            response = getAll(getNodeTargetsUrl(u1f1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+
+            setRequestContext(user2);
+
+            response = getAll(getNodeTargetsUrl(u2f1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+
+            // -ve tests
+            {
+                // source/target not readable
+
+                setRequestContext(user2);
+
+                // list
+                getAll(getNodeTargetsUrl(u1f1Id), paging, null, 403);
+                getAll(getNodeSourcesUrl(u1o1Id), paging, null, 403);
+
+                setRequestContext(user1);
+
+                // create
+                tgt = new AssocTarget(u2o1Id, ASSOC_TYPE_CM_REFERENCES);
+                post(getNodeTargetsUrl(u1f1Id), toJsonAsStringNonNull(tgt), 403);
+
+                tgt = new AssocTarget(u1o1Id, ASSOC_TYPE_CM_REFERENCES);
+                post(getNodeTargetsUrl(u2f1Id), toJsonAsStringNonNull(tgt), 403);
+
+                setRequestContext(user2);
+
+                // remove
+                delete(getNodeTargetsUrl(u1f1Id), u2o1Id, null, 403);
+                delete(getNodeTargetsUrl(u2f1Id), u1o1Id, null, 404);
+            }
+
+            setRequestContext(user1);
+
+            // Test listing targets (with permissions applied)
+
+            // update permission
+            // TODO refactor with remote permission api calls (use v0 until we have v1 ?) (RA-1085)
+            AuthenticationUtil.setFullyAuthenticatedUser(user1);
+            permissionService.setPermission(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, sf1Id), user2, PermissionService.EDITOR, true);
+            
+            setRequestContext(networkAdmin);
+            
+            response = publicApiClient.get(getScope(), "nodes/"+sf1Id+"/targets", null, null, null, createParams(paging, null));
+            checkStatus(200, response.getStatusCode());
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            // user 1
+            setRequestContext(user1);
+            tgt = new AssocTarget(u1o1Id, ASSOC_TYPE_CM_REFERENCES);
+            post(getNodeTargetsUrl(sf1Id), toJsonAsStringNonNull(tgt), 201);
+
+            // user 2
+            setRequestContext(user2);
+            tgt = new AssocTarget(u2o1Id, ASSOC_TYPE_CM_REFERENCES);
+            post(getNodeTargetsUrl(sf1Id), toJsonAsStringNonNull(tgt), 201);
+
+            setRequestContext(networkAdmin);
+            
+            response = publicApiClient.get(getScope(), "nodes/"+sf1Id+"/targets", null, null, null, createParams(paging, null));
+            checkStatus(200, response.getStatusCode());
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+
+            setRequestContext(user1);
+            response = getAll(getNodeTargetsUrl(sf1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(u1o1Id, nodes.get(0).getId());
+
+            setRequestContext(user2);
+            response = getAll(getNodeTargetsUrl(sf1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(u2o1Id, nodes.get(0).getId());
+
+
+            // Test listing sources (with permissions applied)
+
+            // update permission
+            // TODO refactor with remote permission api calls (use v0 until we have v1 ?)
+            AuthenticationUtil.setFullyAuthenticatedUser(user1);
+            permissionService.setPermission(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, sf1Id), user2, PermissionService.EDITOR, true);
+
+            setRequestContext(networkAdmin);
+            
+            response = publicApiClient.get(getScope(), "nodes/"+so1Id+"/sources", null, null, null, createParams(paging, null));
+            checkStatus(200, response.getStatusCode());
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            // user 1
+            setRequestContext(user1);
+            tgt = new AssocTarget(so1Id, ASSOC_TYPE_CM_REFERENCES);
+            post(getNodeTargetsUrl(u1f1Id), toJsonAsStringNonNull(tgt), 201);
+
+            // user 2
+            setRequestContext(user2);
+            tgt = new AssocTarget(so1Id, ASSOC_TYPE_CM_REFERENCES);
+            post(getNodeTargetsUrl(u2f1Id), toJsonAsStringNonNull(tgt), 201);
+
+            setRequestContext(networkAdmin);
+            
+            response = publicApiClient.get(getScope(), "nodes/"+so1Id+"/sources", null, null, null, createParams(paging, null));
+            checkStatus(200, response.getStatusCode());
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+
+            setRequestContext(user1);
+            response = getAll(getNodeSourcesUrl(so1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(u1f1Id, nodes.get(0).getId());
+
+            setRequestContext(user2);
+            response = getAll(getNodeSourcesUrl(so1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(u2f1Id, nodes.get(0).getId());
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            deleteNode(u1f1Id, true, 204);
+            deleteNode(sf1Id, true, 204);
+            
+            setRequestContext(user2);
+            deleteNode(u2f1Id, true, 204);
+        }
+    }
+
+    /**
+     * Tests basic api to manage (add, list, remove) node secondary child associations (ie. parent node -> child node)
+     *
+     * Note: refer to NodeApiTest for tests for primary child association
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<parentNodeId>/secondary-children}
+     *
+     * <p>DELETE:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<parentNodeId>/secondary-children/<childNodeId>}
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<parentNodeId>/secondary-children}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<childNodeId>/parents}
+     */
+    @Test
+    public void testNodeSecondaryChildAssocs() throws Exception
+    {
+        setRequestContext(user1);
+        
+        String myFolderNodeId = getMyNodeId();
+
+        // create folder
+        Node n = new Node();
+        n.setName("f1");
+        n.setNodeType(TYPE_CM_FOLDER);
+        n.setAspectNames(Arrays.asList(ASPECT_CM_PREFERENCES));
+        HttpResponse response = post(getNodeChildrenUrl(myFolderNodeId), toJsonAsStringNonNull(n), 201);
+        String f1Id = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+        // create content node
+        String o1Name = "o1";
+        n = new Node();
+        n.setName(o1Name);
+        n.setNodeType(TYPE_CM_CONTENT);
+        response = post(getNodeChildrenUrl(f1Id), toJsonAsStringNonNull(n), 201);
+        String o1Id = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+        // create ano' folder
+        String f2Id = createFolder(myFolderNodeId, "f2").getId();
+
+        // create ano' content node
+        String o2Name = "o2";
+        n = new Node();
+        n.setName(o2Name);
+        n.setNodeType(TYPE_CM_CONTENT);
+        response = post(getNodeChildrenUrl(f2Id), toJsonAsStringNonNull(n), 201);
+        String o2Id = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+
+        String f3Id = createFolder(myFolderNodeId, "f3").getId();
+
+        String f4Id = createFolder(myFolderNodeId, "f4").getId();
+
+
+        try
+        {
+            // As user 1 ...
+
+            Paging paging = getPaging(0, 100);
+
+            // lists - before
+
+            response = getAll(getNodeSecondaryChildrenUrl(f1Id), paging, null, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            // primary parent only
+            response = getAll(getNodeParentsUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(f2Id, nodes.get(0).getId());
+            assertEquals(ASSOC_TYPE_CM_CONTAINS, nodes.get(0).getAssociation().getAssocType());
+            assertTrue(nodes.get(0).getAssociation().getIsPrimary());
+
+            // create secondary child assoc
+            AssocChild secChild = new AssocChild(o2Id, ASSOC_TYPE_CM_CONTAINS);
+            post(getNodeSecondaryChildrenUrl(f1Id), toJsonAsStringNonNull(secChild), 201);
+
+            // create ano' secondary child assoc (different type) between the same two nodes
+            secChild = new AssocChild(o2Id, ASSOC_TYPE_CM_PREFERENCE_IMAGE);
+            post(getNodeSecondaryChildrenUrl(f1Id), toJsonAsStringNonNull(secChild), 201);
+
+
+            response = getAll(getNodeSecondaryChildrenUrl(f1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            int i = 0;
+            for (Node node : nodes)
+            {
+                Association nodeAssoc = node.getAssociation();
+                if (nodeAssoc.getAssocType().equals(ASSOC_TYPE_CM_CONTAINS))
+                {
+                    i++;
+                }
+                else if ( nodeAssoc.getAssocType().equals(ASSOC_TYPE_CM_PREFERENCE_IMAGE))
+                {
+                    i++;
+                }
+                assertEquals(o2Id, node.getId());
+                assertFalse(nodeAssoc.getIsPrimary());
+            }
+            assertEquals(2, i);
+
+            response = getAll(getNodeParentsUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            i = 0;
+            for (Node node : nodes)
+            {
+                String nodeId = node.getId();
+                Association nodeAssoc = node.getAssociation();
+                if (nodeId.equals(f2Id))
+                {
+                    assertEquals(ASSOC_TYPE_CM_CONTAINS, nodeAssoc.getAssocType());
+                    assertTrue(nodeAssoc.getIsPrimary());
+                    i++;
+                }
+                else if (nodeId.equals(f1Id))
+                {
+                    if (nodeAssoc.getAssocType().equals(ASSOC_TYPE_CM_CONTAINS))
+                    {
+                        i++;
+                    }
+                    else if ( nodeAssoc.getAssocType().equals(ASSOC_TYPE_CM_PREFERENCE_IMAGE))
+                    {
+                        i++;
+                    }
+                    assertFalse(nodeAssoc.getIsPrimary());
+                }
+            }
+            assertEquals(3, i);
+
+            // test list filter - assocType (/secondary-children & /parents)
+
+            Map<String, String> params = new HashMap<>(1);
+            params.put("where", "(assocType='"+ASSOC_TYPE_CM_CONTAINS+"')");
+
+            response = getAll(getNodeSecondaryChildrenUrl(f1Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(o2Id, nodes.get(0).getId());
+            assertEquals(ASSOC_TYPE_CM_CONTAINS, nodes.get(0).getAssociation().getAssocType());
+
+            response = getAll(getNodeParentsUrl(o2Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            i = 0;
+            for (Node node : nodes)
+            {
+                String nodeId = node.getId();
+                Association nodeAssoc = node.getAssociation();
+                if (nodeId.equals(f2Id))
+                {
+                    assertEquals(ASSOC_TYPE_CM_CONTAINS, nodeAssoc.getAssocType());
+                    assertTrue(nodeAssoc.getIsPrimary());
+                    i++;
+                }
+                else if (nodeId.equals(f1Id))
+                {
+                    assertEquals(ASSOC_TYPE_CM_CONTAINS, nodeAssoc.getAssocType());
+                    assertFalse(nodeAssoc.getIsPrimary());
+                    i++;
+                }
+            }
+            assertEquals(2, i);
+
+            params = new HashMap<>(1);
+            params.put("where", "(assocType='"+ASSOC_TYPE_CM_PREFERENCE_IMAGE+"')");
+
+            response = getAll(getNodeSecondaryChildrenUrl(f1Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(o2Id, nodes.get(0).getId());
+            assertEquals(ASSOC_TYPE_CM_PREFERENCE_IMAGE, nodes.get(0).getAssociation().getAssocType());
+            assertFalse(nodes.get(0).getAssociation().getIsPrimary());
+
+            response = getAll(getNodeParentsUrl(o2Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(f1Id, nodes.get(0).getId());
+            assertEquals(ASSOC_TYPE_CM_PREFERENCE_IMAGE, nodes.get(0).getAssociation().getAssocType());
+            assertFalse(nodes.get(0).getAssociation().getIsPrimary());
+
+
+            // test list filter - isPrimary (/children)
+
+            // note: see NodeApiTest for other filters related to /nodes/{parentId}/children filters
+
+            // note: currently collapses same nodeIds (o2Id x 2) into one - makes sense in terms of File/Folder to avoid duplicate names
+            response = getAll(getNodeChildrenUrl(f1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+            List<String> nodeIds = Arrays.asList(new String[] { nodes.get(0).getId(), nodes.get(1).getId()} );
+            assertTrue(nodeIds.contains(o1Id));
+            assertTrue(nodeIds.contains(o2Id));
+
+            params = new HashMap<>(1);
+            params.put("where", "(isPrimary=true)");
+
+            response = getAll(getNodeChildrenUrl(f1Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(o1Id, nodes.get(0).getId());
+
+            params = new HashMap<>(1);
+            params.put("where", "(isPrimary=false)");
+
+            // note: currently collapses same nodeIds (o2Id x 2) into one - makes sense in terms of File/Folder to avoid duplicate names
+            response = getAll(getNodeChildrenUrl(f1Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(o2Id, nodes.get(0).getId());
+
+
+            // test list filter - isPrimary (/parents)
+
+            response = getAll(getNodeParentsUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(3, nodes.size());
+
+            params = new HashMap<>(1);
+            params.put("where", "(isPrimary=true)");
+
+            response = getAll(getNodeParentsUrl(o2Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(f2Id, nodes.get(0).getId());
+
+            params = new HashMap<>(1);
+            params.put("where", "(isPrimary=false)");
+
+            response = getAll(getNodeParentsUrl(o2Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            i = 0;
+            for (Node node : nodes)
+            {
+                String nodeId = node.getId();
+                Association nodeAssoc = node.getAssociation();
+                if (nodeId.equals(f1Id))
+                {
+                    if (nodeAssoc.getAssocType().equals(ASSOC_TYPE_CM_CONTAINS))
+                    {
+                        i++;
+                    }
+                    else if ( nodeAssoc.getAssocType().equals(ASSOC_TYPE_CM_PREFERENCE_IMAGE))
+                    {
+                        i++;
+                    }
+                    assertFalse(nodeAssoc.getIsPrimary());
+                }
+            }
+            assertEquals(2, i);
+
+            // combined filter
+            params = new HashMap<>(1);
+            params.put("where", "(isPrimary=false and assocType='"+ASSOC_TYPE_CM_PREFERENCE_IMAGE+"')");
+
+            response = getAll(getNodeParentsUrl(o2Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(f1Id, nodes.get(0).getId());
+            assertFalse(nodes.get(0).getAssociation().getIsPrimary());
+            assertEquals(ASSOC_TYPE_CM_PREFERENCE_IMAGE, nodes.get(0).getAssociation().getAssocType());
+
+
+            // remove one secondary child assoc
+
+            params = new HashMap<>(1);
+            params.put(PARAM_ASSOC_TYPE, ASSOC_TYPE_CM_CONTAINS);
+
+            delete(getNodeSecondaryChildrenUrl(f1Id), o2Id, params, 204);
+
+            response = getAll(getNodeSecondaryChildrenUrl(f1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+
+            response = getAll(getNodeParentsUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+
+            params = new HashMap<>(1);
+            params.put(PARAM_ASSOC_TYPE, ASSOC_TYPE_CM_PREFERENCE_IMAGE);
+
+            // remove other secondary child assoc
+            delete(getNodeSecondaryChildrenUrl(f1Id), o2Id, params, 204);
+
+            response = getAll(getNodeSecondaryChildrenUrl(f1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeParentsUrl(o2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+
+            {
+                // test removal of multiple secondary child assocs (if assoc type is not specified)
+
+                response = getAll(getNodeSecondaryChildrenUrl(f1Id), paging, null, 200);
+                nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+                assertEquals(0, nodes.size());
+
+                // re-create secondary child assoc
+                secChild = new AssocChild(o2Id, ASSOC_TYPE_CM_CONTAINS);
+                post(getNodeSecondaryChildrenUrl(f1Id), toJsonAsStringNonNull(secChild), 201);
+
+                // re-create ano' secondary child assoc (different type) between the same two nodes
+                secChild = new AssocChild(o2Id, ASSOC_TYPE_CM_PREFERENCE_IMAGE);
+                post(getNodeSecondaryChildrenUrl(f1Id), toJsonAsStringNonNull(secChild), 201);
+
+                response = getAll(getNodeSecondaryChildrenUrl(f1Id), paging, null, 200);
+                nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+                assertEquals(2, nodes.size());
+                assertEquals(o2Id, nodes.get(0).getId());
+                assertEquals(o2Id, nodes.get(1).getId());
+
+                // now remove both secondary child assocs
+                delete(getNodeSecondaryChildrenUrl(f1Id), o2Id, null, 204);
+
+                response = getAll(getNodeSecondaryChildrenUrl(f1Id), paging, null, 200);
+                nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+                assertEquals(0, nodes.size());
+            }
+
+            {
+                // sanity check paging of list of secondary children
+
+                paging = getPaging(0, 100);
+                response = getAll(getNodeSecondaryChildrenUrl(f3Id), paging, null, 200);
+                nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+                assertEquals(0, nodes.size());
+
+                int childCnt = 6;
+                String[] childIds = new String[childCnt];
+
+                for (int j = 0; j < childCnt; j++)
+                {
+                    String childName = "child " + j;
+                    n = new Node();
+                    n.setName(childName);
+                    n.setNodeType(TYPE_CM_CONTENT);
+                    response = post(getNodeChildrenUrl(f2Id), toJsonAsStringNonNull(n), 201);
+
+                    childIds[j] = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+                    secChild = new AssocChild(childIds[j], ASSOC_TYPE_CM_CONTAINS);
+                    post(getNodeSecondaryChildrenUrl(f3Id), toJsonAsStringNonNull(secChild), 201);
+                }
+
+                int skipCount = 0;
+                int maxItems = 100;
+                paging = getPaging(skipCount, maxItems);
+                response = getAll(getNodeSecondaryChildrenUrl(f3Id), paging, null, 200);
+                nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+                assertEquals(childCnt, nodes.size());
+
+                PublicApiClient.ExpectedPaging expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+                assertEquals(childCnt, expectedPaging.getCount().intValue());
+                assertEquals(skipCount, expectedPaging.getSkipCount().intValue());
+                assertEquals(maxItems, expectedPaging.getMaxItems().intValue());
+                assertFalse(expectedPaging.getHasMoreItems().booleanValue());
+
+                skipCount = 1;
+                maxItems = 3;
+                paging = getPaging(skipCount, maxItems);
+                response = getAll(getNodeSecondaryChildrenUrl(f3Id), paging, null, 200);
+                nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+                assertEquals(maxItems, nodes.size());
+                assertEquals(childIds[1], nodes.get(0).getId());
+                assertEquals(childIds[2], nodes.get(1).getId());
+                assertEquals(childIds[3], nodes.get(2).getId());
+                expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+                assertEquals(maxItems, expectedPaging.getCount().intValue());
+                assertEquals(skipCount, expectedPaging.getSkipCount().intValue());
+                assertEquals(maxItems, expectedPaging.getMaxItems().intValue());
+                assertTrue(expectedPaging.getHasMoreItems().booleanValue());
+            }
+
+            {
+                // sanity check paging of list of parents
+
+                String childName = "child with many parents";
+                n = new Node();
+                n.setName(childName);
+                n.setNodeType(TYPE_CM_CONTENT);
+                response = post(getNodeChildrenUrl(f4Id), toJsonAsStringNonNull(n), 201);
+
+                String childId = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+                paging = getPaging(0, 100);
+                response = getAll(getNodeParentsUrl(childId), paging, null, 200);
+                nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+                assertEquals(1, nodes.size());
+                assertEquals(f4Id, nodes.get(0).getId());
+
+                int parentCnt = 5;
+                String[] parentIds = new String[parentCnt];
+
+                for (int j = 0; j < parentCnt; j++)
+                {
+                    String parentName = "parent "+j;
+                    parentIds[j] = createFolder(f4Id, parentName).getId();
+
+                    secChild = new AssocChild(childId, ASSOC_TYPE_CM_CONTAINS);
+                    post(getNodeSecondaryChildrenUrl(parentIds[j]), toJsonAsStringNonNull(secChild), 201);
+                }
+
+                int skipCount = 0;
+                int maxItems = 100;
+                int expectedCnt = parentCnt+1;
+
+                paging = getPaging(skipCount, maxItems);
+                response = getAll(getNodeParentsUrl(childId), paging, null, 200);
+                nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+                assertEquals(expectedCnt, nodes.size());
+
+                PublicApiClient.ExpectedPaging expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+                assertEquals(expectedCnt, expectedPaging.getCount().intValue());
+                assertEquals(skipCount, expectedPaging.getSkipCount().intValue());
+                assertEquals(maxItems, expectedPaging.getMaxItems().intValue());
+                assertFalse(expectedPaging.getHasMoreItems().booleanValue());
+
+                params = new HashMap<>(1);
+                params.put("where", "(isPrimary=false)");
+
+                // TBC - order is currently undefined
+
+                List<String> expectedIds = new ArrayList<>(5);
+                expectedIds.addAll(Arrays.asList(parentIds));
+
+                skipCount=0;
+                maxItems=2;
+                paging = getPaging(skipCount, maxItems);
+                response = getAll(getNodeParentsUrl(childId), paging, params, 200);
+                nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+                assertEquals(maxItems, nodes.size());
+                for (Node node : nodes)
+                {
+                    expectedIds.remove(node.getId());
+                }
+                assertEquals(3, expectedIds.size());
+                expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+                assertEquals(maxItems, expectedPaging.getCount().intValue());
+                assertEquals(skipCount, expectedPaging.getSkipCount().intValue());
+                assertEquals(maxItems, expectedPaging.getMaxItems().intValue());
+                assertTrue(expectedPaging.getHasMoreItems().booleanValue());
+
+                skipCount=2;
+                maxItems=2;
+                paging = getPaging(skipCount, maxItems);
+                response = getAll(getNodeParentsUrl(childId), paging, params, 200);
+                nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+                assertEquals(maxItems, nodes.size());
+                for (Node node : nodes)
+                {
+                    expectedIds.remove(node.getId());
+                }
+                assertEquals(1, expectedIds.size());
+                expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+                assertEquals(maxItems, expectedPaging.getCount().intValue());
+                assertEquals(skipCount, expectedPaging.getSkipCount().intValue());
+                assertEquals(maxItems, expectedPaging.getMaxItems().intValue());
+                assertTrue(expectedPaging.getHasMoreItems().booleanValue());
+
+                skipCount=4;
+                maxItems=2;
+                paging = getPaging(skipCount, maxItems);
+                response = getAll(getNodeParentsUrl(childId), paging, params, 200);
+                nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+                assertEquals(1, nodes.size());
+                for (Node node : nodes)
+                {
+                    expectedIds.remove(node.getId());
+                }
+                assertEquals(0, expectedIds.size());
+                expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+                assertEquals(1, expectedPaging.getCount().intValue());
+                assertEquals(skipCount, expectedPaging.getSkipCount().intValue());
+                assertEquals(maxItems, expectedPaging.getMaxItems().intValue());
+                assertFalse(expectedPaging.getHasMoreItems().booleanValue());
+            }
+
+            //
+            // -ve tests - add assoc
+            //
+
+            {
+                setRequestContext(null);
+                
+                // -ve test - unauthenticated - belts-and-braces ;-)
+                secChild = new AssocChild(o2Id, ASSOC_TYPE_CM_CONTAINS);
+                post(getNodeSecondaryChildrenUrl(f1Id), toJsonAsStringNonNull(secChild), 401);
+
+                setRequestContext(user1);
+
+                // -ve test - model integrity
+                secChild = new AssocChild(o2Id, ASSOC_TYPE_CM_CONTAINS);
+                post(getNodeSecondaryChildrenUrl(o1Id), toJsonAsStringNonNull(secChild), 422);
+
+                // -ve test - duplicate assoc
+                secChild = new AssocChild(o2Id, ASSOC_TYPE_CM_CONTAINS);
+                post(getNodeSecondaryChildrenUrl(f1Id), toJsonAsStringNonNull(secChild), 201);
+                post(getNodeSecondaryChildrenUrl(f1Id), toJsonAsStringNonNull(secChild), 409);
+                delete(getNodeSecondaryChildrenUrl(f1Id), o2Id, null, 204); // cleanup
+
+                secChild = new AssocChild(o2Id, "cm:unknowntype");
+                post(getNodeSecondaryChildrenUrl(f1Id), toJsonAsStringNonNull(secChild), 400);
+            }
+
+            //
+            // -ve test - list assocs
+            //
+
+            {
+                setRequestContext(null);
+                
+                // -ve test - unauthenticated - belts-and-braces ;-)
+                getAll(getNodeSecondaryChildrenUrl(f1Id), paging, null, 401);
+                getAll(getNodeParentsUrl(o2Id), paging, null, 401);
+
+                setRequestContext(user1);
+                
+                getAll(getNodeSecondaryChildrenUrl(UUID.randomUUID().toString()), paging, null, 404);
+                getAll(getNodeParentsUrl(UUID.randomUUID().toString()), paging, null, 404);
+
+                params = new HashMap<>(1);
+                params.put("where", "(assocType='cm:unknownassoctype')");
+
+                getAll(getNodeSecondaryChildrenUrl(o1Id), paging, params, 400);
+                getAll(getNodeParentsUrl(o1Id), paging, params, 400);
+            }
+
+            //
+            // -ve test - remove assoc(s)
+            //
+
+            {
+                setRequestContext(null);
+                
+                // unauthenticated - belts-and-braces ;-)
+                delete(getNodeSecondaryChildrenUrl(f1Id), o2Id, null, 401);
+
+                setRequestContext(user1);
+
+                delete(getNodeSecondaryChildrenUrl(UUID.randomUUID().toString()), o2Id, null, 404);
+                delete(getNodeSecondaryChildrenUrl(f1Id), UUID.randomUUID().toString(), null, 404);
+
+                // nothing to remove - for any assoc type
+                delete(getNodeSecondaryChildrenUrl(f1Id), o2Id, null, 404);
+
+                // nothing to remove - for given assoc type
+                params = new HashMap<>(1);
+                params.put(PARAM_ASSOC_TYPE, ASSOC_TYPE_CM_PREFERENCE_IMAGE);
+                delete(getNodeSecondaryChildrenUrl(f1Id), o2Id, params, 404);
+
+                // unknown assoc type
+                params = new HashMap<>(1);
+                params.put(PARAM_ASSOC_TYPE, "cm:unknowntype");
+                delete(getNodeSecondaryChildrenUrl(o1Id), o2Id, params, 400);
+
+                // do not allow delete of primary child (via secondary child removal)
+                params = new HashMap<>(1);
+                params.put(PARAM_ASSOC_TYPE, "cm:contains");
+                delete(getNodeSecondaryChildrenUrl(f1Id), o1Id, params, 400);
+            }
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            deleteNode(f1Id, true, 204);
+            deleteNode(f2Id, true, 204);
+            deleteNode(f3Id, true, 204);
+            deleteNode(f4Id, true, 204);
+        }
+    }
+
+    /**
+     * Regardless of which parent is used to list children of a node, the node information
+     * should consistently present the primary parent as a node's {@code parentId}.
+     * <p>
+     * See REPO-1780
+     */
+    @Test
+    public void testListChildrenConsistentParentIdWithSecondaryAssociations() throws Exception
+    {
+        setRequestContext(user1);
+        String myNodeId = getMyNodeId();
+
+        // Create primary folder
+        String primaryFolderName = "primary folder " + RUNID;
+        String primaryFolderId = createFolder(myNodeId, primaryFolderName, null).getId();
+
+        // Create content file
+        String contentFileName = "content" + RUNID + " in folder";
+        String contentId = createTextFile(primaryFolderId, contentFileName, "The quick brown fox jumps over the lazy dog.").getId();
+
+        // Add a secondary parent for content file
+        Node n = new Node();
+        n.setName("secondary folder " + RUNID);
+        n.setNodeType(TYPE_CM_FOLDER);
+        n.setAspectNames(Arrays.asList(ASPECT_CM_PREFERENCES));
+        HttpResponse response = post(getNodeChildrenUrl(myNodeId), toJsonAsStringNonNull(n), 201);
+        String secondaryFolderId = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+        AssocChild secChild = new AssocChild(contentId, ASSOC_TYPE_CM_CONTAINS);
+        post(getNodeSecondaryChildrenUrl(secondaryFolderId), toJsonAsStringNonNull(secChild), 201);
+
+        Paging paging = getPaging(0, 100);
+        // Order by folders and modified date first
+        Map<String, String> orderBy = Collections.singletonMap("orderBy", "isFolder DESC,modifiedAt DESC");
+
+        // Retrieve the node via the primary parent
+        String primaryChildrenUrl = getNodeChildrenUrl(primaryFolderId);
+        response = getAll(primaryChildrenUrl, paging, orderBy, 200);
+        List<Document> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Document.class);
+        Document node = nodes.get(0);
+        assertEquals(contentId, node.getId());
+        assertEquals(primaryFolderId, node.getParentId());
+
+        // Retrieve the node via the secondary parent
+        String secondaryChildrenUrl = getNodeChildrenUrl(secondaryFolderId);
+        response = getAll(secondaryChildrenUrl, paging, orderBy, 200);
+        nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Document.class);
+        node = nodes.get(0);
+        assertEquals(contentId, node.getId());
+        // The parent ID must STILL be the primary parent, even when the info
+        // is retrieved via the secondary parent.
+        assertEquals(primaryFolderId, node.getParentId());
+    }
+
+    /**
+     * Test ability to delete a node with associations (to and from the node) and then restore it.
+     * Only the primary parent/child assoc(s) for the deleted node(s) is/are restored.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testDeleteAndRestoreNodeWithAssocs() throws Exception
+    {
+        // as user 1 ...
+        setRequestContext(user1);
+        
+        String f1Id = null;
+        String f2Id = null;
+        String f3Id = null;
+
+        try
+        {
+            String myFolderNodeId = getMyNodeId();
+
+            // create primary parent-child hierarchy
+            f1Id = createFolder(myFolderNodeId, "f1").getId();
+            String f1bId = createFolder(f1Id, "f1b").getId();
+            String f1cId = createFolder(f1bId, "f1c").getId();
+            String f1dId = createFolder(f1cId, "f1d").getId();
+            String c1eId = createTextFile(f1dId, "c1e", "some text content").getId();
+
+            f2Id = createFolder(myFolderNodeId, "f2").getId();
+            f3Id = createFolder(myFolderNodeId, "f3").getId();
+
+            HttpResponse response = getAll(getNodeParentsUrl(f1bId), null, null, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(f1Id, nodes.get(0).getId());
+
+            response = getAll(getNodeParentsUrl(f1dId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(f1cId, nodes.get(0).getId());
+
+            response = getAll(getNodeSourcesUrl(c1eId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            // add some secondary parent/child assocs outside of the hierarchy
+
+            AssocChild secChild = new AssocChild(f1bId, ASSOC_TYPE_CM_CONTAINS);
+            post(getNodeSecondaryChildrenUrl(f2Id), toJsonAsStringNonNull(secChild), 201);
+
+            secChild = new AssocChild(f1bId, ASSOC_TYPE_CM_CONTAINS);
+            post(getNodeSecondaryChildrenUrl(f3Id), toJsonAsStringNonNull(secChild), 201);
+
+            secChild = new AssocChild(f1dId, ASSOC_TYPE_CM_CONTAINS);
+            post(getNodeSecondaryChildrenUrl(f2Id), toJsonAsStringNonNull(secChild), 201);
+
+            secChild = new AssocChild(f1dId, ASSOC_TYPE_CM_CONTAINS);
+            post(getNodeSecondaryChildrenUrl(f3Id), toJsonAsStringNonNull(secChild), 201);
+
+            // also add a secondary parent/child assoc within the hierarchy
+            secChild = new AssocChild(f1dId, ASSOC_TYPE_CM_CONTAINS);
+            post(getNodeSecondaryChildrenUrl(f1bId), toJsonAsStringNonNull(secChild), 201);
+
+            // add some peer assocs outside of the hierarchy
+            AssocTarget tgt = new AssocTarget(c1eId, ASSOC_TYPE_CM_REFERENCES);
+            post(getNodeTargetsUrl(f2Id), toJsonAsStringNonNull(tgt), 201);
+
+            tgt = new AssocTarget(c1eId, ASSOC_TYPE_CM_PARTS);
+            post(getNodeTargetsUrl(f3Id), toJsonAsStringNonNull(tgt), 201);
+
+            // also add a peer assoc within the hierarchy
+            tgt = new AssocTarget(c1eId, ASSOC_TYPE_CM_PARTS);
+            post(getNodeTargetsUrl(f1cId), toJsonAsStringNonNull(tgt), 201);
+
+            // double-check the secondary parent/child assocs
+
+            response = getAll(getNodeParentsUrl(f1bId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(3, nodes.size());
+
+            response = getAll(getNodeParentsUrl(f1dId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(4, nodes.size());
+
+            response = getAll(getNodeSecondaryChildrenUrl(f2Id), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+            List<String> nodeIds = Arrays.asList(new String[]{nodes.get(0).getId(), nodes.get(1).getId()});
+            assertTrue(nodeIds.contains(f1bId));
+            assertTrue(nodeIds.contains(f1dId));
+
+            response = getAll(getNodeSecondaryChildrenUrl(f3Id), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+            nodeIds = Arrays.asList(new String[]{nodes.get(0).getId(), nodes.get(1).getId()});
+            assertTrue(nodeIds.contains(f1bId));
+            assertTrue(nodeIds.contains(f1dId));
+
+            response = getAll(getNodeSecondaryChildrenUrl(f1bId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(f1dId, nodes.get(0).getId());
+
+            // double-check the peer assocs
+            response = getAll(getNodeSourcesUrl(c1eId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(3, nodes.size());
+
+            response = getAll(getNodeTargetsUrl(f2Id), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(c1eId, nodes.get(0).getId());
+
+            response = getAll(getNodeTargetsUrl(f3Id), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(c1eId, nodes.get(0).getId());
+
+            response = getAll(getNodeTargetsUrl(f1cId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(c1eId, nodes.get(0).getId());
+
+
+            // ... delete to trashcan/archive ...
+            deleteNode(f1bId);
+
+            getSingle(NodesEntityResource.class, f1bId, null, 404);
+
+            response = getAll(getNodeTargetsUrl(f2Id), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeTargetsUrl(f3Id), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+
+            // ... and then restore again ...
+            post(URL_DELETED_NODES+"/"+f1bId+"/restore", null, null, 200);
+
+            // check primary parent-child hierarchy is restored
+            // but not the secondary parents or peer assocs of the deleted nodes (outside or within the hierarchy)
+
+            response = getSingle(NodesEntityResource.class, f1bId, null, 200);
+            Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals(f1Id, nodeResp.getParentId());
+
+            response = getSingle(NodesEntityResource.class, f1cId, null, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals(f1bId, nodeResp.getParentId());
+
+            response = getSingle(NodesEntityResource.class, f1dId, null, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals(f1cId, nodeResp.getParentId());
+
+            // secondary child assocs have not been restored
+
+            response = getAll(getNodeParentsUrl(f1bId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(f1Id, nodes.get(0).getId());
+
+            response = getAll(getNodeParentsUrl(f1cId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(f1bId, nodes.get(0).getId());
+
+            response = getAll(getNodeParentsUrl(f1dId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(f1cId, nodes.get(0).getId());
+
+            response = getAll(getNodeSecondaryChildrenUrl(f2Id), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeSecondaryChildrenUrl(f3Id), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            // peer assocs have not been restored
+
+            response = getAll(getNodeSourcesUrl(c1eId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeTargetsUrl(f1cId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeTargetsUrl(f2Id), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            response = getAll(getNodeTargetsUrl(f3Id), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+
+            if (f1Id != null)
+            {
+                deleteNode(f1Id, true, 204);
+            }
+
+            if (f2Id != null)
+            {
+                deleteNode(f2Id, true, 204);
+            }
+
+            if (f3Id != null)
+            {
+                deleteNode(f3Id, true, 204);
+            }
+        }
+    }
+
+    /**
+     * Test ability to create a node and optionally specify one or more associations (to other existing nodes) at time of create.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testCreateNodeWithAssocs() throws Exception
+    {
+        // as user 1
+        setRequestContext(user1);
+        
+        String myFolderNodeId = getMyNodeId();
+
+        // create node with some assocs in a single call
+
+        // create folder
+        Node n = new Node();
+        n.setName("f1");
+        n.setNodeType(TYPE_CM_FOLDER);
+        n.setAspectNames(Arrays.asList(ASPECT_CM_PREFERENCES));
+        HttpResponse response = post(getNodeChildrenUrl(myFolderNodeId), toJsonAsStringNonNull(n), 201);
+        String f1Id = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+        // create content node
+        String o1Name = "o1";
+        n = new Node();
+        n.setName(o1Name);
+        n.setNodeType(TYPE_CM_CONTENT);
+        response = post(getNodeChildrenUrl(f1Id), toJsonAsStringNonNull(n), 201);
+        String o1Id = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+        String o2Name = "o2";
+        n = new Node();
+        n.setName(o2Name);
+        n.setNodeType(TYPE_CM_CONTENT);
+        response = post(getNodeChildrenUrl(f1Id), toJsonAsStringNonNull(n), 201);
+        String o2Id = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+        // create folder node with some assocs
+        String f2Name = "f2";
+        n = new Node();
+        n.setName(f2Name);
+        n.setNodeType(TYPE_CM_FOLDER);
+
+        AssocChild secChild = new AssocChild(o1Id, ASSOC_TYPE_CM_CONTAINS);
+        n.setSecondaryChildren(Collections.singletonList(secChild));
+
+        AssocTarget tgt = new AssocTarget(o2Id, ASSOC_TYPE_CM_REFERENCES);
+        n.setTargets(Collections.singletonList(tgt));
+
+        response = post(getNodeChildrenUrl(myFolderNodeId), toJsonAsStringNonNull(n), 201);
+        String f2Id = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+        String f3Id = createFolder(myFolderNodeId, "f3").getId();
+
+        try
+        {
+            Paging paging = getPaging(0, 100);
+
+            response = getAll(getNodeSecondaryChildrenUrl(f2Id), paging, null, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(o1Id, nodes.get(0).getId());
+
+            response = getAll(getNodeTargetsUrl(f2Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(o2Id, nodes.get(0).getId());
+
+            // TODO test model with mandatory aspect
+
+
+            // -ve test -  minor: error code if creating a cyclic child assoc (REPO-475)
+            n = new Node();
+            n.setName("my-folder");
+            n.setNodeType(TYPE_CM_FOLDER);
+            AssocChild assocChild = new AssocChild(myFolderNodeId, "cm:contains");
+            n.setSecondaryChildren(Collections.singletonList(assocChild));
+            post(getNodeChildrenUrl(myFolderNodeId), RestApiUtil.toJsonAsStringNonNull(n), 400);
+
+            // -ve tests - missing targetId / childId or assocType
+
+            n = new Node();
+            n.setName("my-folder");
+            n.setNodeType(TYPE_CM_FOLDER);
+            assocChild = new AssocChild(null, ASSOC_TYPE_CM_CONTAINS);
+            n.setSecondaryChildren(Collections.singletonList(assocChild));
+            post(getNodeChildrenUrl(f3Id), RestApiUtil.toJsonAsStringNonNull(n), 400);
+
+            n = new Node();
+            n.setName("my-folder");
+            n.setNodeType(TYPE_CM_FOLDER);
+            assocChild = new AssocChild(f2Id, null);
+            n.setSecondaryChildren(Collections.singletonList(assocChild));
+            post(getNodeChildrenUrl(f3Id), RestApiUtil.toJsonAsStringNonNull(n), 400);
+
+            n = new Node();
+            n.setName("my-folder");
+            n.setNodeType(TYPE_CM_FOLDER);
+            tgt = new AssocTarget(null, ASSOC_TYPE_CM_REFERENCES);
+            n.setTargets(Collections.singletonList(tgt));
+            post(getNodeChildrenUrl(f3Id), RestApiUtil.toJsonAsStringNonNull(n), 400);
+
+            n = new Node();
+            n.setName("my-folder");
+            n.setNodeType(TYPE_CM_FOLDER);
+            tgt = new AssocTarget(f2Id, null);
+            n.setTargets(Collections.singletonList(tgt));
+            post(getNodeChildrenUrl(f3Id), RestApiUtil.toJsonAsStringNonNull(n), 400);
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            deleteNode(f1Id, true, 204);
+            deleteNode(f2Id, true, 204);
+            deleteNode(f3Id, true, 204);
+        }
+    }
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeVersionRenditionsApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeVersionRenditionsApiTest.java
new file mode 100644
index 00000000000..ffe54788e53
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeVersionRenditionsApiTest.java
@@ -0,0 +1,480 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.data.ContentInfo;
+import org.alfresco.rest.api.tests.client.data.DirectAccessUrlRequest;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.Node;
+import org.alfresco.rest.api.tests.client.data.Rendition;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsString;
+
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
+import static org.junit.Assert.*;
+
+import org.joda.time.DateTime;
+import org.junit.Test;
+
+import java.util.*;
+
+/**
+ * V1 REST API tests for Node Version Renditions
+ *
+ * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/{nodeId}/versions/{versionId}/renditions</li>
+ *
+ * @author janv
+ */
+public class NodeVersionRenditionsApiTest extends AbstractSingleNetworkSiteTest
+{
+    private final static long DELAY_IN_MS = 500;
+
+    private static final List<String> DEFAULT_RENDITIONS_FOR_TXT =
+            new ArrayList<>(List.of("avatar", "avatar32", "doclib", "imgpreview", "medium", "pdf"));
+
+    /**
+     * Upload some versions and then create and retrieve version renditions
+     *
+     * <p>POST:</p>
+     * @literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/versions/<versionId>/renditions}
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/versions/<versionId>/renditions}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/versions/<versionId>/renditions/<renditionId>}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/versions/<versionId>/renditions/<renditionId>/content}
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testUpFileVersionRenditions() throws Exception
+    {
+        setRequestContext(user1);
+        
+        String myFolderNodeId = getMyNodeId();
+
+        // create folder
+        String f1Id = createFolder(myFolderNodeId, "f1").getId();
+
+        try
+        {
+            int verCnt = 1;
+            int cnt = 1;
+            String versionLabel = "1.0";
+
+            String textContentSuffix = "Amazingly few discotheques provide jukeboxes ";
+            String contentName = "content-2-" + System.currentTimeMillis();
+            String content = textContentSuffix + cnt;
+
+            // request minor version on upload (& no pre-request for renditions for live node)
+            Boolean majorVersion = true;
+            Map<String, String> params = new HashMap<>();
+            params.put("majorVersion", majorVersion.toString());
+
+            // create a new file
+            Document documentResp = createTextFile(f1Id, contentName, content, "UTF-8", params);
+            String docId = documentResp.getId();
+            assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+            assertNotNull(documentResp.getProperties());
+            assertEquals(versionLabel, documentResp.getProperties().get("cm:versionLabel"));
+
+            cnt = 2;
+            versionLabel = updateFileVersions(user1, docId, cnt, textContentSuffix, verCnt, majorVersion, versionLabel);
+            verCnt = verCnt+cnt;
+
+            assertEquals("3.0", versionLabel);
+            assertEquals(3, verCnt);
+
+            // check version history count
+            HttpResponse response = getAll(getNodeVersionsUrl(docId), null, null, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(verCnt, nodes.size());
+
+            // pause briefly
+            Thread.sleep(DELAY_IN_MS);
+
+            checkCreateAndGetVersionRendition(docId, "1.0", "doclib");
+            checkCreateAndGetVersionRendition(docId, "3.0", "doclib");
+            checkCreateAndGetVersionRendition(docId, "2.0", "doclib");
+
+            // also live node
+            checkCreateAndGetVersionRendition(docId, null, "doclib");
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            deleteNode(f1Id, true, 204);
+        }
+    }
+
+    @Test
+    public void testUpFileVersionRenditionsWithDoclib() throws Exception
+    {
+        setRequestContext(user1);
+
+        String myFolderNodeId = getMyNodeId();
+
+        // create folder
+        String f1Id = createFolder(myFolderNodeId, "f1").getId();
+
+        try
+        {
+            int verCnt = 1;
+            int cnt = 1;
+            String versionLabel = "0.1";
+
+            String textContentSuffix = "Amazingly few discotheques provide jukeboxes ";
+            String contentName = "content-2-" + System.currentTimeMillis();
+            String content = textContentSuffix + cnt;
+
+            // request minor version on upload & also pre-request "doclib" rendition (for live node)
+            Boolean majorVersion = false;
+            Map<String, String> params = new HashMap<>();
+            params.put("majorVersion", majorVersion.toString());
+            params.put("renditions", "doclib");
+
+            // create a new file
+            Document documentResp = createTextFile(f1Id, contentName, content, "UTF-8", params);
+            String docId = documentResp.getId();
+            assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+            assertNotNull(documentResp.getProperties());
+            assertEquals(versionLabel, documentResp.getProperties().get("cm:versionLabel"));
+
+            // check live node
+            checkAndGetVersionRendition(docId, null, "doclib");
+
+            cnt = 1;
+            versionLabel = updateFileVersions(user1, docId, cnt, textContentSuffix, verCnt, majorVersion, versionLabel);
+            verCnt = verCnt+cnt;
+
+            assertEquals("0.2", versionLabel);
+            assertEquals(2, verCnt);
+
+            // check version history count
+            HttpResponse response = getAll(getNodeVersionsUrl(docId), null, null, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(verCnt, nodes.size());
+
+            // pause briefly
+            Thread.sleep(DELAY_IN_MS);
+
+            checkCreateAndGetVersionRendition(docId, "0.2", "doclib");
+
+            // check live node
+            checkAndGetVersionRendition(docId, null, "doclib");
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            deleteNode(f1Id, true, 204);
+        }
+    }
+
+    @Test
+    public void testNegative() throws Exception
+    {
+        AuthenticationUtil.clearCurrentSecurityContext();
+        setRequestContext(null);
+
+        // -ve: not authenticated
+        getAll(getNodeVersionRenditionsUrl("dummy", "1.0"), null, 401);
+        getSingle(getNodeVersionRenditionsUrl("dummy", "1.0"), ("doclib"), null, 401);
+        getSingle(getNodeVersionRenditionsUrl("dummy", "1.0"), ("doclib/content"), null, 401);
+
+        Rendition renditionRequest = new Rendition();
+        renditionRequest.setId("doclib");
+        post(getNodeVersionRenditionsUrl("dummy", "1.0"), toJsonAsString(renditionRequest), 401);
+
+        setRequestContext(user1);
+
+        String myFolderNodeId = getMyNodeId();
+
+        // create folder
+        String f1Id = createFolder(myFolderNodeId, "f1").getId();
+
+        try
+        {
+            int verCnt = 1;
+            int cnt = 1;
+            String versionLabel = "1.0";
+
+            String textContentSuffix = "Amazingly few discotheques provide jukeboxes ";
+            String contentName = "content-2-" + System.currentTimeMillis();
+            String content = textContentSuffix + cnt;
+
+            // create a new file
+            Document documentResp = createTextFile(f1Id, contentName, content, "UTF-8", null);
+            String docId = documentResp.getId();
+
+            getAll(getNodeVersionRenditionsUrl(docId, "1.0"), null, 200);
+            checkCreateAndGetVersionRendition(docId, "1.0", "doclib");
+
+
+            // -ve: rendition already exits (409)
+            renditionRequest.setId("doclib");
+            post(getNodeVersionRenditionsUrl(docId, "1.0"), toJsonAsString(renditionRequest), 409);
+
+            // -ve: no such rendition (404)
+            getSingle(getNodeVersionRenditionsUrl("dummy", "1.0"), ("dummy"), null, 404);
+            getSingle(getNodeVersionRenditionsUrl("dummy", "1.0"), ("dummy/content"), null, 404);
+
+            renditionRequest.setId("dummy");
+            post(getNodeVersionRenditionsUrl("dummy", "1.0"), toJsonAsString(renditionRequest), 404);
+
+
+            // -ve: no such version (404)
+            getAll(getNodeVersionRenditionsUrl(docId, "4.0"), null, 404);
+            getSingle(getNodeVersionRenditionsUrl(docId, "4.0"), ("doclib"), null, 404);
+            getSingle(getNodeVersionRenditionsUrl(docId, "4.0"), ("doclib/content"), null, 404);
+
+            renditionRequest.setId("doclib");
+            post(getNodeVersionRenditionsUrl(docId, "4.0"), toJsonAsString(renditionRequest), 404);
+
+
+            // -ve: no such file (404)
+            getAll(getNodeVersionRenditionsUrl("dummy", "1.0"), null, 404);
+            getSingle(getNodeVersionRenditionsUrl("dummy", "1.0"), ("doclib"), null, 404);
+            getSingle(getNodeVersionRenditionsUrl("dummy", "1.0"), ("doclib/content"), null, 404);
+
+            renditionRequest.setId("doclib");
+            post(getNodeVersionRenditionsUrl("dummy", "1.0"), toJsonAsString(renditionRequest), 404);
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            deleteNode(f1Id, true, 204);
+        }
+    }
+
+    private void checkCreateAndGetVersionRendition(String docId, String versionId, String renditionId) throws Exception
+    {
+        String getRenditionsUrl;
+        if ((versionId != null) && (! versionId.isEmpty()))
+        {
+            getRenditionsUrl = getNodeVersionRenditionsUrl(docId, versionId);
+        }
+        else
+        {
+            getRenditionsUrl = getNodeRenditionsUrl(docId);
+        }
+
+        // List renditions for version
+        Paging paging = getPaging(0, 50);
+        HttpResponse response = getAll(getRenditionsUrl, paging, 200);
+        List<Rendition> renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertTrue(renditions.size() == DEFAULT_RENDITIONS_FOR_TXT.size());
+
+        for (Rendition rendition : renditions)
+        {
+            assertEquals(Rendition.RenditionStatus.NOT_CREATED, rendition.getStatus());
+            assertTrue(DEFAULT_RENDITIONS_FOR_TXT.contains(rendition.getId()));
+        }
+
+        // Get rendition (not created yet) information for node
+        response = getSingle(getRenditionsUrl, renditionId, 200);
+        Rendition rendition = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Rendition.class);
+        assertNotNull(rendition);
+        assertEquals(Rendition.RenditionStatus.NOT_CREATED, rendition.getStatus());
+
+        // -ve test: try to download non-existent rendition (and no placeholder)
+        Map<String, String> params = new HashMap<>();
+        params.put("placeholder", "false");
+        getSingle(getRenditionsUrl, (renditionId+"/content"), params, 404);
+
+        // +ve test: download placeholder instead
+        params = new HashMap<>();
+        params.put("placeholder", "true");
+        response = getSingle(getRenditionsUrl, (renditionId+"/content"), params, 200);
+        assertNotNull(response.getResponseAsBytes());
+
+        // Create and get version rendition
+        rendition = createAndGetRendition(docId, versionId, renditionId);
+        assertNotNull(rendition);
+        assertEquals(Rendition.RenditionStatus.CREATED, rendition.getStatus());
+        ContentInfo contentInfo = rendition.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_IMAGE_PNG, contentInfo.getMimeType());
+        assertEquals("PNG Image", contentInfo.getMimeTypeName());
+        assertNotNull(contentInfo.getEncoding());
+        assertTrue(contentInfo.getSizeInBytes() > 0);
+    }
+
+    private void checkAndGetVersionRendition(String docId, String versionId, String renditionId) throws Exception
+    {
+        String getRenditionsUrl;
+        if ((versionId != null) && (! versionId.isEmpty()))
+        {
+            getRenditionsUrl = getNodeVersionRenditionsUrl(docId, versionId);
+        }
+        else
+        {
+            getRenditionsUrl = getNodeRenditionsUrl(docId);
+        }
+
+        // List renditions for version
+        Paging paging = getPaging(0, 50);
+        HttpResponse response = getAll(getRenditionsUrl, paging, 200);
+        List<Rendition> renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertTrue(renditions.size() == DEFAULT_RENDITIONS_FOR_TXT.size());
+
+        for (Rendition rendition : renditions)
+        {
+            assertTrue(DEFAULT_RENDITIONS_FOR_TXT.contains(rendition.getId()));
+        }
+
+        // Get version rendition
+        Rendition rendition = waitAndGetRendition(docId, versionId, renditionId);
+        assertNotNull(rendition);
+        assertEquals(Rendition.RenditionStatus.CREATED, rendition.getStatus());
+        ContentInfo contentInfo = rendition.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_IMAGE_PNG, contentInfo.getMimeType());
+        assertEquals("PNG Image", contentInfo.getMimeTypeName());
+        assertNotNull(contentInfo.getEncoding());
+        assertTrue(contentInfo.getSizeInBytes() > 0);
+    }
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+
+    @Test
+    public void testRequestContentUrl() throws Exception
+    {
+        setRequestContext(user1);
+
+        String myFolderNodeId = getMyNodeId();
+
+        // create folder
+        String f1Id = createFolder(myFolderNodeId, "f1").getId();
+
+        try
+        {
+            int verCnt = 1;
+            int cnt = 1;
+            String versionLabel = "1.0";
+
+            String textContentSuffix = "Amazingly few discotheques provide jukeboxes ";
+            String contentName = "content-2-" + System.currentTimeMillis();
+            String content = textContentSuffix + cnt;
+
+            // request minor version on upload (& no pre-request for renditions for live node)
+            Boolean majorVersion = true;
+            Map<String, String> params = new HashMap<>();
+            params.put("majorVersion", majorVersion.toString());
+
+            // create a new file
+            Document documentResp = createTextFile(f1Id, contentName, content, "UTF-8", params);
+            String docId = documentResp.getId();
+            assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+            assertNotNull(documentResp.getProperties());
+            assertEquals(versionLabel, documentResp.getProperties().get("cm:versionLabel"));
+
+            cnt = 2;
+            versionLabel = updateFileVersions(user1, docId, cnt, textContentSuffix, verCnt, majorVersion, versionLabel);
+            verCnt = verCnt+cnt;
+
+            assertEquals("3.0", versionLabel);
+            assertEquals(3, verCnt);
+
+            // check version history count
+            HttpResponse response = getAll(getNodeVersionsUrl(docId), null, null, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(verCnt, nodes.size());
+
+            // pause briefly
+            Thread.sleep(DELAY_IN_MS);
+
+            // found but direct access isn't available
+            checkCreateAndGetVersionRendition(docId, "1.0", "doclib");
+            post(getNodeVersionRenditionsOperationUrl(docId, "1.0", "doclib", "request-content-url"), null, null, 501);
+
+            checkCreateAndGetVersionRendition(docId, "3.0", "doclib");
+            post(getNodeVersionRenditionsOperationUrl(docId, "3.0", "doclib", "request-content-url"), null, null, 501);
+
+            checkCreateAndGetVersionRendition(docId, "2.0", "doclib");
+            post(getNodeVersionRenditionsOperationUrl(docId, "2.0", "doclib", "request-content-url"), null, null, 501);
+
+            {
+                post(getNodeVersionRenditionsOperationUrl(docId, "2.0", "doclib", "request-content-url"), toJsonAsStringNonNull(new DirectAccessUrlRequest()), null, null, null,
+                        501);
+
+                {
+                    DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                    directAccessUrlRequest.setExpiresAt(DateTime.now().plusSeconds(30).toDate());
+                    directAccessUrlRequest.setValidFor(60L);
+
+                    post(getNodeVersionRenditionsOperationUrl(docId, "2.0", "doclib", "request-content-url"), toJsonAsStringNonNull(directAccessUrlRequest), null, null, null, 400);
+                }
+
+                {
+                    DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                    directAccessUrlRequest.setValidFor(60L);
+
+                    post(getNodeVersionRenditionsOperationUrl(docId, "2.0", "doclib", "request-content-url"), toJsonAsStringNonNull(directAccessUrlRequest), null, null, null, 501);
+                }
+
+                {
+                    DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                    directAccessUrlRequest.setValidFor(-60L);
+
+                    post(getNodeVersionRenditionsOperationUrl(docId, "2.0", "doclib", "request-content-url"), toJsonAsStringNonNull(directAccessUrlRequest), null, null, null, 400);
+                }
+
+                {
+                    DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                    directAccessUrlRequest.setExpiresAt(DateTime.now().plusSeconds(30).toDate());
+                    post(getNodeVersionRenditionsOperationUrl(docId, "2.0", "doclib", "request-content-url"), toJsonAsStringNonNull(directAccessUrlRequest), null, null, null, 501);
+                }
+
+                {
+                    DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                    directAccessUrlRequest.setExpiresAt(DateTime.now().minusSeconds(30).toDate());
+                    post(getNodeVersionRenditionsOperationUrl(docId, "2.0", "doclib", "request-content-url"), toJsonAsStringNonNull(directAccessUrlRequest), null, null, null, 400);
+                }
+            }
+
+            // also live node
+            checkCreateAndGetVersionRendition(docId, null, "doclib");
+            post(getNodeVersionRenditionsOperationUrl(docId, null, "doclib", "request-content-url"), null, null, 501);
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            deleteNode(f1Id, true, 204);
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeVersionsApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeVersionsApiTest.java
new file mode 100644
index 00000000000..ad12ab3ef1f
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/NodeVersionsApiTest.java
@@ -0,0 +1,1412 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.VersionOptions;
+import org.alfresco.rest.api.nodes.NodesEntityResource;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiHttpClient;
+import org.alfresco.rest.api.tests.client.data.DirectAccessUrlRequest;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.Node;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.util.Pair;
+import org.alfresco.util.TempFileProvider;
+import org.joda.time.DateTime;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
+import static org.junit.Assert.*;
+
+/**
+ * V1 REST API tests for Node Versions (File Version History)
+ *
+ * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/{nodeId}/versions</li>
+ *
+ * @author janv
+ */
+public class NodeVersionsApiTest extends AbstractSingleNetworkSiteTest
+{
+    private static final String URL_DELETED_NODES = "deleted-nodes";
+
+    protected String getNodeVersionRevertUrl(String nodeId, String versionId)
+    {
+        return getNodeVersionsUrl(nodeId) + "/" + versionId + "/revert";
+    }
+
+    /**
+     * Test version creation when uploading files (via multi-part/form-data with overwrite=true)
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/children}
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/versions}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/versions/<versionId>}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/versions/<versionId>/content}
+     */
+    @Test
+    public void testUploadFileVersionCreateWithOverwrite() throws Exception
+    {
+        setRequestContext(user1);
+        
+        String myFolderNodeId = getMyNodeId();
+
+        // create folder
+        String f1Id = createFolder(myFolderNodeId, "f1").getId();
+
+        try
+        {
+            int verCnt = 1;
+
+            String versionLabel = "1.0";
+
+            // upload text file - versioning is currently auto enabled on upload (create file via multi-part/form-data)
+
+            String textContentSuffix = "The quick brown fox jumps over the lazy dog ";
+            String contentName = "content-1-" + System.currentTimeMillis();
+            String content = textContentSuffix + verCnt;
+
+            // create first version (ie. 1.0)
+            Document documentResp = createTextFile(f1Id, contentName, content, "UTF-8", null);
+            String docId = documentResp.getId();
+            assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+            assertNotNull(documentResp.getProperties());
+            assertEquals(versionLabel, documentResp.getProperties().get("cm:versionLabel"));
+
+            Map<String, String> params = null;
+
+            // create some minor versions (note: majorVersion=null) (ie. 1.1, 1.2, 1.3)
+            int cnt = 3;
+            versionLabel = uploadTextFileVersions(user1, f1Id, contentName, cnt, textContentSuffix, verCnt, null, versionLabel).getFirst();
+            verCnt = verCnt+cnt;
+
+            // create some major versions  (ie. 2.0, 3.0)
+            cnt = 2;
+            versionLabel = uploadTextFileVersions(user1, f1Id, contentName, cnt, textContentSuffix, verCnt, true, versionLabel).getFirst();
+            verCnt = verCnt+cnt;
+
+            // create some more minor versions (ie. 3.1, 3.2, 3.3)
+            cnt = 3;
+            versionLabel = uploadTextFileVersions(user1, f1Id, contentName, cnt, textContentSuffix, verCnt, false, versionLabel).getFirst();
+            verCnt = verCnt+cnt;
+
+            assertEquals("3.3", versionLabel);
+            assertEquals(9, verCnt);
+
+            {
+                // -ve test
+                params = new HashMap<>();
+                params.put(Nodes.PARAM_OVERWRITE, "true");
+                params.put(Nodes.PARAM_AUTO_RENAME, "true");
+
+                createTextFile(myFolderNodeId, contentName, content, "UTF-8", params, 400);
+            }
+
+            // remove versionable aspect
+            List<String> aspectNames = documentResp.getAspectNames();
+            aspectNames.remove("cm:versionable");
+            Document dUpdate = new Document();
+            dUpdate.setAspectNames(aspectNames);
+
+            HttpResponse response = put(URL_NODES, docId, toJsonAsStringNonNull(dUpdate), null, 200);
+            documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+            assertFalse(documentResp.getAspectNames().contains("cm:versionable"));
+            assertNull(documentResp.getProperties()); // no properties (ie. no "cm:versionLabel")
+
+            // check no version history
+            response = getAll(getNodeVersionsUrl(docId), null, null, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            {
+                // -ve test - do not allow overwrite (using POST upload) if the file is not versionable
+                cnt++;
+                content = textContentSuffix + cnt;
+
+                params = new HashMap<>();
+                params.put(Nodes.PARAM_OVERWRITE, "true");
+
+                createTextFile(f1Id, contentName, content, "UTF-8", params, 409);
+            }
+
+            // we do allow update of binary content with no versioning (after removing versionable)
+            textContentSuffix = "Amazingly few discotheques provide jukeboxes ";
+
+            for (int i = 1; i <= 4; i++)
+            {
+                content = textContentSuffix + i;
+                ByteArrayInputStream inputStream = new ByteArrayInputStream(content.getBytes());
+                File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+                PublicApiHttpClient.BinaryPayload payload = new PublicApiHttpClient.BinaryPayload(txtFile);
+
+                putBinary(getNodeContentUrl(docId), payload, null, null, 200);
+            }
+
+            // check no version history
+            response = getAll(getNodeVersionsUrl(docId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            deleteNode(f1Id, true, 204);
+        }
+    }
+
+    /**
+     * Test uploading a new file which starts with a minor version (0.1).
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testUploadFileVersionAsMinor() throws Exception
+    {
+        setRequestContext(user1);
+        
+        String myFolderNodeId = getMyNodeId();
+
+        // create folder
+        String f1Id = createFolder(myFolderNodeId, "f1").getId();
+
+        try
+        {
+            int verCnt = 1;
+            int cnt = 1;
+            String versionLabel = "0.1";
+
+            String textContentSuffix = "Amazingly few discotheques provide jukeboxes ";
+            String contentName = "content-2-" + System.currentTimeMillis();
+            String content = textContentSuffix + cnt;
+
+            Map<String, String> params = new HashMap<>();
+            params.put("majorVersion", "false");
+
+            // create a new file with a minor version (ie. 0.1)
+            Document documentResp = createTextFile(f1Id, contentName, content, "UTF-8", params);
+            String docId = documentResp.getId();
+            assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+            assertNotNull(documentResp.getProperties());
+            assertEquals(versionLabel, documentResp.getProperties().get("cm:versionLabel"));
+
+            // also show that we continue with minor versions
+            cnt = 2;
+            versionLabel = updateFileVersions(user1, docId, cnt, textContentSuffix, verCnt, null, versionLabel);
+            verCnt = verCnt+cnt;
+
+            // now create some major versions
+            cnt = 3;
+            versionLabel = updateFileVersions(user1, docId, cnt, textContentSuffix, verCnt, true, versionLabel);
+            verCnt = verCnt+cnt;
+
+            assertEquals("3.0", versionLabel);
+            assertEquals(6, verCnt);
+
+            // check version history count
+            HttpResponse response = getAll(getNodeVersionsUrl(docId), null, null, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(verCnt, nodes.size());
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            deleteNode(f1Id, true, 204);
+        }
+    }
+
+    /**
+     * Test delete version
+     * 
+     * Note: see also VersionServiceImplTest.testDeleteLastVersion
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testDeleteVersion() throws Exception
+    {
+        setRequestContext(user1);
+        
+        String sharedFolderNodeId = getSharedNodeId();
+
+        // create folder
+        String f1Id = null;
+
+        try
+        {
+            f1Id = createFolder(sharedFolderNodeId, "testDeleteVersion-f1").getId();
+
+            String textContentSuffix = "Amazingly few discotheques provide jukeboxes ";
+            String contentName = "content-1";
+
+            int cnt = 4;
+            Pair<String, String> pair = uploadTextFileVersions(user1, f1Id, contentName, cnt, textContentSuffix, 0, null, null);
+            String versionLabel = pair.getFirst();
+            String docId = pair.getSecond();
+
+            assertEquals("1.3", versionLabel);
+
+            // check version history count
+            HttpResponse response = getAll(getNodeVersionsUrl(docId), null, null, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(cnt, nodes.size());
+
+            // -ve tests:
+            {
+                setRequestContext(null);
+                
+                // -ve test - unauthenticated - belts-and-braces ;-)
+                delete(getNodeVersionsUrl(docId), "1.0", null, 401);
+
+                setRequestContext(user1);
+
+                // -ve test - unknown nodeId
+                delete(getNodeVersionsUrl("dummy"), "1.0", null, 404);
+
+                // -ve test - unknown versionId
+                delete(getNodeVersionsUrl(docId), "15.0", null, 404);
+
+                setRequestContext(user2);
+
+                // -ve test - permission denied (on version other than most recent)
+                delete(getNodeVersionsUrl(docId), "1.0", null, 403);
+
+                // -ve test - permission denied (on most recent version)
+                delete(getNodeVersionsUrl(docId), "1.3", null, 403);
+            }
+
+            setRequestContext(user1);
+            
+            delete(getNodeVersionsUrl(docId), "1.0", null, 204);
+
+            response = getAll(getNodeVersionsUrl(docId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(cnt - 1, nodes.size());
+
+            // check live node (does not change)
+            response = getSingle(URL_NODES, docId, 200);
+            Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals("1.3", nodeResp.getProperties().get("cm:versionLabel"));
+            
+            response = getSingle(getNodeContentUrl(docId), null, 200);
+            assertEquals(textContentSuffix+"4", response.getResponse());
+            
+            // delete current (most recent) version
+            delete(getNodeVersionsUrl(docId), "1.3", null, 204);
+
+            response = getAll(getNodeVersionsUrl(docId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(cnt - 2, nodes.size());
+
+            // check live node (changes)
+            response = getSingle(URL_NODES, docId, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals("1.2", nodeResp.getProperties().get("cm:versionLabel"));
+
+            response = getSingle(getNodeContentUrl(docId), null, 200);
+            assertEquals(textContentSuffix+"3", response.getResponse());
+
+            // delete another version
+            delete(getNodeVersionsUrl(docId), "1.1", null, 204);
+
+            response = getAll(getNodeVersionsUrl(docId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(cnt - 3, nodes.size());
+
+            // check live node (does not change)
+            response = getSingle(URL_NODES, docId, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals("1.2", nodeResp.getProperties().get("cm:versionLabel"));
+
+            response = getSingle(getNodeContentUrl(docId), null, 200);
+            assertEquals(textContentSuffix+"3", response.getResponse());
+
+            // -ve test - cannot delete last version (via delete version api call) (see REPO-835 & REPO-834)
+            delete(getNodeVersionsUrl(docId), "1.2", null, 422);
+
+            /* note: currently we cannot delete last version so this is not applicable
+            // check live node - removing last version does not (currently) remove versionable aspect
+            response = getSingle(URL_NODES, docId, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertTrue(nodeResp.getAspectNames().contains("cm:versionable"));
+            Map<String, Object> props = nodeResp.getProperties();
+            if (props != null)
+            {
+                assertNull(props.get("cm:versionLabel"));
+                assertNull(props.get("cm:versionType")); // note: see special fix in delete version API (at least for now)
+            }
+            */
+
+            response = getAll(getNodeVersionsUrl(docId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals("1.2", nodes.get(0).getId());
+
+            // Update again ..
+            String textContent = "more changes 0";
+            ByteArrayInputStream inputStream = new ByteArrayInputStream(textContent.getBytes());
+            File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+            PublicApiHttpClient.BinaryPayload payload = new PublicApiHttpClient.BinaryPayload(txtFile);
+
+            response = putBinary(getNodeContentUrl(docId), payload, null,  null, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertTrue(nodeResp.getAspectNames().contains("cm:versionable"));
+            assertEquals("1.3", nodeResp.getProperties().get("cm:versionLabel"));
+            assertEquals("MINOR", nodeResp.getProperties().get("cm:versionType"));
+            
+            // remove versionable aspect (this will clear the history and disable versioning)
+            response = getSingle(URL_NODES, docId, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+
+            List<String> aspectNamesToKeep = new ArrayList<>();
+            aspectNamesToKeep.addAll(nodeResp.getAspectNames());
+            aspectNamesToKeep.remove("cm:versionable");
+
+            Node nUpdate = new Node();
+            nUpdate.setAspectNames(aspectNamesToKeep);
+
+            response = put(URL_NODES, docId, toJsonAsStringNonNull(nUpdate), null, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertFalse(nodeResp.getAspectNames().contains("cm:versionable"));
+            Map<String, Object> props = nodeResp.getProperties();
+            if (props != null)
+            {
+                assertNull(props.get("cm:versionLabel"));
+                assertNull(props.get("cm:versionType"));
+            }
+            
+            response = getAll(getNodeVersionsUrl(docId), null, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+            
+            // Update again ..
+            textContent = "more changes 1";
+            inputStream = new ByteArrayInputStream(textContent.getBytes());
+            txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+            payload = new PublicApiHttpClient.BinaryPayload(txtFile);
+            response = putBinary(getNodeContentUrl(docId), payload, null,  null, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertFalse(nodeResp.getAspectNames().contains("cm:versionable"));
+            
+            // re-enable versioning (default model properties should cause initial version to be created as 1.0)
+            response = getSingle(URL_NODES, docId, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            aspectNamesToKeep = new ArrayList<>();
+            aspectNamesToKeep.addAll(nodeResp.getAspectNames());
+            aspectNamesToKeep.add("cm:versionable");
+
+            nUpdate = new Node();
+            nUpdate.setAspectNames(aspectNamesToKeep);
+
+            response = put(URL_NODES, docId, toJsonAsStringNonNull(nUpdate), null, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertTrue(nodeResp.getAspectNames().contains("cm:versionable"));
+            props = nodeResp.getProperties();
+            assertEquals("1.0", props.get("cm:versionLabel"));
+            assertEquals("MAJOR", props.get("cm:versionType"));
+
+            // check content
+            response = getSingle(getNodeVersionsUrl(docId), "1.0/content", null, 200);
+            assertEquals(textContent, response.getResponse());
+
+            // Update again ..
+            textContent = "more changes 2";
+            inputStream = new ByteArrayInputStream(textContent.getBytes());
+            txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+            payload = new PublicApiHttpClient.BinaryPayload(txtFile);
+
+            response = putBinary(getNodeContentUrl(docId), payload, null,  null, 200);
+            nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertTrue(nodeResp.getAspectNames().contains("cm:versionable"));
+            props = nodeResp.getProperties();
+            assertEquals("1.1", props.get("cm:versionLabel"));
+            assertEquals("MINOR", props.get("cm:versionType"));
+
+            // check content
+            response = getSingle(getNodeVersionsUrl(docId), "1.1/content", null, 200);
+            assertEquals(textContent, response.getResponse());
+        }
+        finally
+        {
+            if (f1Id != null)
+            {
+                // some cleanup
+                setRequestContext(user1);
+                deleteNode(f1Id, true, 204);
+            }
+        }
+    }
+
+    /**
+     * This test helper method uses "overwrite=true" to create one or more new versions, including the initial create if needed.
+     *
+     * If the file does not already exist (currentVersionLabel should be null) and majorVersionIn is also null
+     * then the first version is created as MAJOR (1.0) and subsequent versions are created as MINOR.
+     *
+     * @param userId
+     * @param parentFolderNodeId - parent folder
+     * @param fileName - file name
+     * @param cnt - number of new versions (>= 1)
+     * @param textContentPrefix - prefix for text content
+     * @param currentVersionCounter - overall version counter, used as a suffix in text content and version comment
+     * @param majorVersionIn - if null then false, if true then create MAJOR versions else if false create MINOR versions
+     * @param currentVersionLabel - the current version label (if file already exists)
+     * @return
+     * @throws Exception
+     */
+    private Pair<String, String> uploadTextFileVersions(String userId, String parentFolderNodeId, String fileName, int cnt,
+                                                        String textContentPrefix, int currentVersionCounter,
+                                                        final Boolean majorVersionIn, String currentVersionLabel) throws Exception
+    {
+        Map<String, String> params = new HashMap<>();
+        params.put(Nodes.PARAM_OVERWRITE, "true");
+
+        if (majorVersionIn != null)
+        {
+            params.put(Nodes.PARAM_VERSION_MAJOR, majorVersionIn.toString());
+        }
+
+        String docId = null;
+        for (int i = 1; i <= cnt; i++)
+        {
+            boolean expectedMajorVersion = (majorVersionIn != null ? majorVersionIn : false);
+
+            if (currentVersionLabel == null)
+            {
+                currentVersionLabel = "0.0";
+
+                // special case - 1st version is major (if not specified otherwise)
+                if (majorVersionIn == null)
+                {
+                    expectedMajorVersion = true;
+                }
+            }
+
+            String[] parts = currentVersionLabel.split("\\.");
+            int majorVer = new Integer(parts[0]).intValue();
+            int minorVer = new Integer(parts[1]).intValue();
+
+            if (expectedMajorVersion)
+            {
+                majorVer++;
+                minorVer = 0;
+            } else
+            {
+                minorVer++;
+            }
+
+            currentVersionLabel = majorVer + "." + minorVer;
+
+            currentVersionCounter++;
+
+            params.put("comment", "my version " + currentVersionCounter);
+
+            String textContent = textContentPrefix + currentVersionCounter;
+
+            // uses upload with overwrite here ...
+            Document documentResp = createTextFile(parentFolderNodeId, fileName, textContent, "UTF-8", params);
+            docId = documentResp.getId();
+            assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+            assertNotNull(documentResp.getProperties());
+            assertEquals(currentVersionLabel, documentResp.getProperties().get("cm:versionLabel"));
+
+            // double-check - get version node info
+            HttpResponse response = getSingle(getNodeVersionsUrl(docId), currentVersionLabel, null, 200);
+            Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals(currentVersionLabel, nodeResp.getProperties().get("cm:versionLabel"));
+            assertEquals((expectedMajorVersion ? "MAJOR" : "MINOR"), nodeResp.getProperties().get("cm:versionType"));
+        }
+
+        return new Pair<String,String>(currentVersionLabel, docId);
+    }
+
+    /**
+     * Tests api when uploading a file and then updating with a new version
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/children}
+     *
+     * <p>PUT:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/content}
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/versions}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/versions/<versionId>}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/versions/<versionId>/content}
+     */
+    @Test
+    public void testUploadFileVersionUpdate() throws Exception
+    {
+        // As user 1 ...
+        setRequestContext(user1);
+        
+        String myFolderNodeId = getMyNodeId();
+
+        // create folder
+        String f1Id = createFolder(myFolderNodeId, "f1").getId();
+
+        try
+        {
+            int majorVersion = 1;
+            int minorVersion = 0;
+
+            // Upload text file - versioning is currently auto enabled on upload (create file via multi-part/form-data)
+
+            int verCnt = 1;
+
+            String textContentSuffix = "The quick brown fox jumps over the lazy dog ";
+            String contentName = "content " + System.currentTimeMillis();
+            String content = textContentSuffix+verCnt;
+
+            Document documentResp = createTextFile(myFolderNodeId, contentName, content, "UTF-8", null);
+            String d1Id = documentResp.getId();
+
+            String versionId = majorVersion+"."+minorVersion;
+
+            HttpResponse response = getSingle(URL_NODES, d1Id, 200);
+            Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertTrue(nodeResp.getAspectNames().contains("cm:versionable"));
+            assertEquals(versionId, nodeResp.getProperties().get("cm:versionLabel"));
+            assertEquals("MAJOR", nodeResp.getProperties().get("cm:versionType"));
+
+            Paging paging = getPaging(0, 100);
+
+            Map<String, String> params = new HashMap<>();
+            params.put("include", "properties");
+            response = getAll(getNodeVersionsUrl(d1Id), paging, params, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(verCnt, nodes.size());
+            assertEquals(versionId, nodes.get(0).getProperties().get("cm:versionLabel"));
+            assertEquals("MAJOR", nodes.get(0).getProperties().get("cm:versionType"));
+
+            // get version info
+            response = getSingle(getNodeVersionsUrl(d1Id), versionId, null, 200);
+            Node node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals(versionId, node.getProperties().get("cm:versionLabel"));
+            assertEquals("MAJOR", node.getProperties().get("cm:versionType"));
+
+            // Update the content
+            int updateCnt = 3;
+            for (int i = 1; i <= updateCnt; i++)
+            {
+                verCnt++;
+                minorVersion++;
+
+                // Update
+                content = textContentSuffix+verCnt;
+                ByteArrayInputStream inputStream = new ByteArrayInputStream(content.getBytes());
+                File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+                PublicApiHttpClient.BinaryPayload payload = new PublicApiHttpClient.BinaryPayload(txtFile);
+
+                putBinary(getNodeContentUrl(d1Id), payload, null, null, 200);
+
+                versionId = majorVersion+"."+minorVersion;
+
+                // get live node
+                response = getSingle(URL_NODES, d1Id, 200);
+                nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+                assertTrue(nodeResp.getAspectNames().contains("cm:versionable"));
+                assertEquals(versionId, nodeResp.getProperties().get("cm:versionLabel"));
+                assertEquals("MINOR", nodeResp.getProperties().get("cm:versionType"));
+
+                // get version node info
+                response = getSingle(getNodeVersionsUrl(d1Id), versionId, null, 200);
+                node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+                assertEquals(versionId, node.getProperties().get("cm:versionLabel"));
+                assertEquals("MINOR", node.getProperties().get("cm:versionType"));
+
+                // check version history count
+                response = getAll(getNodeVersionsUrl(d1Id), paging, null, 200);
+                nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+                assertEquals(verCnt, nodes.size());
+            }
+
+            int totalVerCnt = verCnt;
+
+            // check total version count - also get properties so that we can check version label etc
+            params = new HashMap<>();
+            params.put("include", "properties");
+            response = getAll(getNodeVersionsUrl(d1Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(totalVerCnt, nodes.size());
+
+            checkVersionHistoryAndContent(d1Id, nodes, verCnt, textContentSuffix, null, majorVersion, minorVersion, false);
+
+            // delete to trashcan/archive ...
+            deleteNode(d1Id);
+
+            {
+                // -ve tests
+                getSingle(NodesEntityResource.class, d1Id, null, 404);
+                getAll(getNodeVersionsUrl(d1Id), null, null, 404);
+            }
+
+            // ... and then restore again
+            post(URL_DELETED_NODES+"/"+d1Id+"/restore", null, null, 200);
+
+            response = getAll(getNodeVersionsUrl(d1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(totalVerCnt, nodes.size());
+
+            {
+                setRequestContext(null);
+                
+                // -ve test - unauthenticated - belts-and-braces ;-)
+                getAll(getNodeVersionsUrl(d1Id), paging, null, 401);
+
+                setRequestContext(user1);
+
+                // -ve test - unknown nodeId
+                getAll(getNodeVersionsUrl("dummy"), paging, null, 404);
+            }
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            deleteNode(f1Id, true, 204);
+        }
+    }
+
+    /**
+     * Tests revert (ie. promote older version to become the latest/most recent version).
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/versions/<versionId>/revert}
+     */
+    @Test
+    public void testRevert() throws Exception
+    {
+        // As user 1 ...
+        setRequestContext(user1);
+        
+        String sharedFolderNodeId = getSharedNodeId();
+
+        // create folder
+        String f1Id = null;
+
+        try
+        {
+            f1Id = createFolder(sharedFolderNodeId, "testRevert-f1-"+System.currentTimeMillis()).getId();
+
+            int majorVersion = 1;
+            int minorVersion = 0;
+            int verCnt = 1;
+
+            String textContentSuffix = "The quick brown fox jumps over the lazy dog ";
+            String contentName = "content " + System.currentTimeMillis();
+            String content = textContentSuffix+verCnt;
+
+            String updateVerCommentSuffix = "Update comment ";
+            Map<String, String> params = new HashMap<>();
+            params.put(Nodes.PARAM_VERSION_COMMENT, updateVerCommentSuffix+verCnt);
+
+            // Upload text file - versioning is currently auto enabled on upload (create file via multi-part/form-data)
+            Document documentResp = createTextFile(f1Id, contentName, content, "UTF-8", params);
+            String d1Id = documentResp.getId();
+
+            // Update the content
+            int updateCnt = 3;
+            for (int i = 1; i <= updateCnt; i++)
+            {
+                verCnt++;
+                minorVersion++;
+
+                // Update
+                content = textContentSuffix+verCnt;
+                ByteArrayInputStream inputStream = new ByteArrayInputStream(content.getBytes());
+                File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+                PublicApiHttpClient.BinaryPayload payload = new PublicApiHttpClient.BinaryPayload(txtFile);
+
+                params = new HashMap<>();
+                params.put(Nodes.PARAM_VERSION_COMMENT, updateVerCommentSuffix+verCnt);
+
+                putBinary(getNodeContentUrl(d1Id), payload, null, params, 200);
+            }
+
+            // check version history count - also get properties so that we can check version label etc
+            params = new HashMap<>();
+            params.put("include", "properties");
+            HttpResponse response = getAll(getNodeVersionsUrl(d1Id), null, params, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(verCnt, nodes.size());
+
+            // check version labels and content
+            checkVersionHistoryAndContent(d1Id, nodes, verCnt, textContentSuffix, updateVerCommentSuffix, majorVersion, minorVersion, false);
+
+            int revertMajorVersion = 1;
+            int revertMinorVersion = 0;
+
+            String revertVerCommentSuffix = "Revert comment ";
+
+            int revertCnt = 3;
+            for (int i = 1; i <= revertCnt; i++)
+            {
+                String revertVersionId = revertMajorVersion+"."+revertMinorVersion;
+
+                VersionOptions versionOptions = new VersionOptions();
+                versionOptions.setMajorVersion(true);
+                versionOptions.setComment(revertVerCommentSuffix+i);
+
+                post(getNodeVersionRevertUrl(d1Id, revertVersionId), toJsonAsStringNonNull(versionOptions), null, 200);
+
+                verCnt++;
+                revertMinorVersion++;
+
+                majorVersion++;
+            }
+
+            // check version history count - also get properties so that we can check version label etc
+            params = new HashMap<>();
+            params.put("include", "properties");
+            response = getAll(getNodeVersionsUrl(d1Id), null, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(verCnt, nodes.size());
+
+            //  check version labels and content - most recently reverted, eg. version labels 4.0, 3.0, 2.0
+            List<Node> revertedNodes = nodes.subList(0, revertCnt);
+            checkVersionHistoryAndContent(d1Id, revertedNodes, updateCnt, textContentSuffix, revertVerCommentSuffix, majorVersion, 0, true);
+
+            // check version labels and content - the rest of the version history (prior to reverted), eg. version labels 1.3, 1.2, 1.1, 1.0
+            minorVersion = 3;
+            List<Node> originalUpdatedNodes = nodes.subList(revertCnt, nodes.size());
+            checkVersionHistoryAndContent(d1Id, originalUpdatedNodes, updateCnt+1, textContentSuffix, updateVerCommentSuffix, 1, minorVersion, false);
+
+            // Currently, we also allow the most recent version to be reverted (ie. not disallowed by underlying VersionService)
+            post(getNodeVersionRevertUrl(d1Id, majorVersion+".0"), "{}", null, 200);
+
+            {
+                setRequestContext(null);
+                
+                // -ve test - unauthenticated - belts-and-braces ;-)
+                post(getNodeVersionRevertUrl(d1Id, "1.0"), "{}", null, 401);
+
+                setRequestContext(user1);
+
+                // -ve test - unknown nodeId
+                post(getNodeVersionRevertUrl("dummy", "1.0"), "{}", null, 404);
+
+                // -ve test - unknown versionId
+                post(getNodeVersionRevertUrl(d1Id, "15.0"), "{}", null, 404);
+
+                // -ve test - permission denied
+                setRequestContext(user2);
+                post(getNodeVersionRevertUrl(d1Id, "1.0"), "{}", null, 403);
+            }
+        }
+        finally
+        {
+            if (f1Id != null)
+            {
+                // some cleanup
+                setRequestContext(user1);
+                deleteNode(f1Id, true, 204);
+            }
+        }
+    }
+
+    private void checkVersionHistoryAndContent(String docId, List<Node> nodesWithProps, int verCnt, String textContentSuffix, String verCommentSuffix, int majorVersion, int minorVersion, boolean majorVersions) throws Exception
+    {
+        String versionId = null;
+
+        // check version history - including default sort order (ie. time descending)
+        // also download and check the versioned content
+        for (Node versionNode : nodesWithProps)
+        {
+            versionId = majorVersion+"."+minorVersion;
+
+            assertEquals(versionId, versionNode.getId());
+            assertEquals(versionId, versionNode.getProperties().get("cm:versionLabel"));
+
+            if (versionId.endsWith(".0"))
+            {
+                assertEquals("MAJOR", versionNode.getProperties().get("cm:versionType"));
+            }
+            else
+            {
+                assertEquals("MINOR", versionNode.getProperties().get("cm:versionType"));
+            }
+            assertNull(versionNode.getParentId());
+            assertNull(versionNode.getCreatedByUser());
+            assertNull(versionNode.getCreatedAt());
+
+            assertEquals((verCommentSuffix != null ? verCommentSuffix+verCnt : null), versionNode.getVersionComment());
+
+            // Download version content - by default with Content-Disposition header
+            HttpResponse response = getSingle(getNodeVersionsUrl(docId), versionId+"/content", null, 200);
+            String textContent = response.getResponse();
+            assertEquals(textContentSuffix+verCnt, textContent);
+
+            if (majorVersions)
+            {
+                majorVersion--;
+            }
+            else
+            {
+                minorVersion--;
+            }
+
+            verCnt--;
+        }
+
+    }
+
+    /**
+     * Tests api when uploading a file and then updating with a new version
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/children}
+     *
+     * <p>PUT:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/content}
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/versions}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/versions/<versionId>}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/versions/<versionId>/content}
+     */
+    @Test
+    public void testCreateEmptyFileVersionUpdate() throws Exception
+    {
+        // As user 1 ...
+        setRequestContext(user1);
+        
+        String myFolderNodeId = getMyNodeId();
+
+        // create folder
+        String f1Id = createFolder(myFolderNodeId, "f1").getId();
+
+        try
+        {
+            // create "empty" content node
+            Node n = new Node();
+            n.setName("d1");
+            n.setNodeType(TYPE_CM_CONTENT);
+            HttpResponse response = post(getNodeChildrenUrl(f1Id), toJsonAsStringNonNull(n), 201);
+            String d1Id = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+            response = getSingle(URL_NODES, d1Id, 200);
+            Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertFalse(nodeResp.getAspectNames().contains("cm:versionable"));
+
+            Paging paging = getPaging(0, 100);
+
+            // empty list - before
+
+            response = getAll(getNodeVersionsUrl(d1Id), paging, null, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            // note: we do not disallow listing version history on non-content node - however currently no API method to version say a folder
+            response = getAll(getNodeVersionsUrl(f1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(0, nodes.size());
+
+            // Update the empty node's content a few times (before/without versioning)
+            int cntBefore = 2;
+            int verCnt = 1;
+
+            String textContentSuffix = "The quick brown fox jumps over the lazy dog ";
+
+            for (int i = 1; i <= cntBefore; i++)
+            {
+                String content = textContentSuffix + verCnt;
+                ByteArrayInputStream inputStream = new ByteArrayInputStream(content.getBytes());
+                File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+                PublicApiHttpClient.BinaryPayload payload = new PublicApiHttpClient.BinaryPayload(txtFile);
+
+                putBinary(getNodeContentUrl(d1Id), payload, null, null, 200);
+
+                verCnt++;
+
+                response = getSingle(URL_NODES, d1Id, 200);
+                nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+                assertFalse(nodeResp.getAspectNames().contains("cm:versionable"));
+
+                response = getAll(getNodeVersionsUrl(d1Id), paging, null, 200);
+                nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+                assertEquals(0, nodes.size());
+            }
+
+            // Enable versioning - done here by adding versionable aspect
+            // note: alternatively can use version params ("comment" &/or "majorVersion") on update (see separate test below)
+            Node nodeUpdate = new Node();
+            nodeUpdate.setAspectNames(Collections.singletonList("cm:versionable"));
+            put(URL_NODES, d1Id, toJsonAsStringNonNull(nodeUpdate), null, 200);
+
+            String versionId = "1.0";
+
+            Map<String, String> params = new HashMap<>();
+            params.put("include", "properties");
+            response = getAll(getNodeVersionsUrl(d1Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(1, nodes.size());
+            assertEquals(versionId, nodes.get(0).getProperties().get("cm:versionLabel"));
+            assertEquals("MAJOR", nodes.get(0).getProperties().get("cm:versionType"));
+
+            // get version info
+            response = getSingle(getNodeVersionsUrl(d1Id), versionId, null, 200);
+            Node node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+            assertEquals(versionId, node.getProperties().get("cm:versionLabel"));
+            assertEquals("MAJOR", node.getProperties().get("cm:versionType"));
+
+            // Update the content a few more times (after/with versioning)
+            int cntAfter = 3;
+            for (int i = 1; i <= cntAfter; i++)
+            {
+                // Update again
+                String content = textContentSuffix + verCnt;
+                ByteArrayInputStream inputStream = new ByteArrayInputStream(content.getBytes());
+                File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
+                PublicApiHttpClient.BinaryPayload payload = new PublicApiHttpClient.BinaryPayload(txtFile);
+
+                putBinary(getNodeContentUrl(d1Id), payload, null, null, 200);
+
+                verCnt++;
+
+                // get version info
+                versionId = "1."+i;
+                response = getSingle(getNodeVersionsUrl(d1Id), versionId, null, 200);
+                node = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+                assertEquals(versionId, node.getProperties().get("cm:versionLabel"));
+                assertEquals("MINOR", node.getProperties().get("cm:versionType"));
+
+                response = getAll(getNodeVersionsUrl(d1Id), paging, null, 200);
+                nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+                assertEquals(i+1, nodes.size());
+            }
+
+            int totalVerCnt = cntAfter+1;
+            int minorVersion = totalVerCnt-1;
+            verCnt = cntBefore+cntAfter;
+
+            params = new HashMap<>();
+            params.put("include", "properties");
+            response = getAll(getNodeVersionsUrl(d1Id), paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(totalVerCnt, nodes.size());
+
+            checkVersionHistoryAndContent(d1Id, nodes, verCnt, textContentSuffix, null, 1, minorVersion, false);
+
+            // delete to trashcan/archive ...
+            deleteNode(d1Id);
+
+            // -ve tests
+            {
+                getSingle(NodesEntityResource.class, d1Id, null, 404);
+                getAll(getNodeVersionsUrl(d1Id), null, null, 404);
+            }
+
+            // ... and then restore again
+            post(URL_DELETED_NODES+"/"+d1Id+"/restore", null, null, 200);
+
+            response = getAll(getNodeVersionsUrl(d1Id), paging, null, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(cntAfter+1, nodes.size());
+
+            //
+            // -ve tests
+            //
+
+            {
+                setRequestContext(null);
+                
+                // -ve test - unauthenticated - belts-and-braces ;-)
+                getAll(getNodeVersionsUrl(d1Id), paging, null, 401);
+
+                setRequestContext(user1);
+
+                // -ve test - unknown node
+                getAll(getNodeVersionsUrl("dummy"), paging, null, 404);
+
+                //
+                // -ve tests for non-versionable node with no version history (could be content, folder or some other node type)
+                //
+                
+                // folder node - no version history
+                String f99Id = createFolder(f1Id, "f99").getId();
+                getSingle(getNodeVersionsUrl(f99Id), "1.0", null, 404);
+                getSingle(getNodeVersionsUrl(f99Id), "1.0/content", null, 404);
+                
+                //content node - no version history
+                n = new Node();
+                n.setName("z1");
+                n.setNodeType(TYPE_CM_CONTENT);
+                response = post(getNodeChildrenUrl(f1Id), toJsonAsStringNonNull(n), 201);
+                String z1Id = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class).getId();
+
+                getSingle(getNodeVersionsUrl(z1Id), "1.0", null, 404);
+                getSingle(getNodeVersionsUrl(z1Id), "1.0/content", null, 404);
+            }
+
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            deleteNode(f1Id, true, 204);
+        }
+    }
+
+    /**
+     * Test version creation when updating file binary content.
+     *
+     * <p>PUT:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/content}
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/children}
+     */
+    @Test
+    public void testUpdateFileVersionCreate() throws Exception
+    {
+        setRequestContext(user1);
+        
+        String myNodeId = getMyNodeId();
+
+        Document d1 = new Document();
+        d1.setName("d1.txt");
+        d1.setNodeType(TYPE_CM_CONTENT);
+
+        // create *empty* text file - as of now, versioning is not enabled by default
+        HttpResponse response = post(getNodeChildrenUrl(myNodeId), toJsonAsStringNonNull(d1), 201);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        String docId = documentResp.getId();
+        assertFalse(documentResp.getAspectNames().contains("cm:versionable"));
+        assertNull(documentResp.getProperties()); // no properties (ie. no "cm:versionLabel")
+
+        int cnt = 0;
+
+        // updates - no versions
+        for (int i = 1; i <= 3; i++)
+        {
+            cnt++;
+
+            // Update the empty node's content - no version created
+            String content = "The quick brown fox jumps over the lazy dog " + cnt;
+            documentResp = updateTextFile(docId, content, null);
+            assertFalse(documentResp.getAspectNames().contains("cm:versionable"));
+            assertNull(documentResp.getProperties()); // no properties (ie. no "cm:versionLabel")
+        }
+
+        // Update again - with version comment - versioning is enabled here by using version params ("comment" &/or "majorVersion")
+        // note: alternatively could add versionable aspect before doing the update (see separate test above)
+        cnt++;
+        int majorVersion = 1;
+        int minorVersion = 0;
+
+        String content = "The quick brown fox jumps over the lazy dog "+cnt;
+
+        Map<String, String> params = new HashMap<>();
+        params.put("comment", "my version "+cnt);
+
+        documentResp = updateTextFile(docId, content, params);
+        assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+        assertNotNull(documentResp.getProperties());
+
+        assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
+
+        // Update again - with another version comment
+        cnt++;
+        minorVersion++;
+
+        content = "The quick brown fox jumps over the lazy dog "+cnt;
+        params = new HashMap<>();
+        params.put("comment", "my version "+cnt);
+
+        documentResp = updateTextFile(docId, content, params);
+        assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+        assertNotNull(documentResp.getProperties());
+        assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
+
+        minorVersion = 0;
+
+        // Updates - major versions
+        for (int i = 1; i <= 3; i++)
+        {
+            cnt++;
+            majorVersion++;
+
+            content = "The quick brown fox jumps over the lazy dog "+cnt;
+
+            params = new HashMap<>();
+            params.put("comment", "my version "+cnt);
+            params.put("majorVersion", "true");
+
+            documentResp = updateTextFile(docId, content, params);
+            assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+            assertNotNull(documentResp.getProperties());
+            assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
+        }
+
+        // Updates - minor versions
+        for (int i = 1; i <= 3; i++)
+        {
+            cnt++;
+            minorVersion++;
+
+            content = "The quick brown fox jumps over the lazy dog "+cnt;
+
+            params = new HashMap<>();
+            params.put("comment", "my version "+cnt);
+            params.put("majorVersion", "false");
+
+            documentResp = updateTextFile(docId, content, params);
+            assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+            assertNotNull(documentResp.getProperties());
+            assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
+        }
+
+        // Update again - as another major version
+        cnt++;
+        majorVersion++;
+        minorVersion = 0;
+
+        content = "The quick brown fox jumps over the lazy dog "+cnt;
+
+        params = new HashMap<>();
+        params.put("comment", "my version "+cnt);
+        params.put("majorVersion", "true");
+
+        documentResp = updateTextFile(docId, content, params);
+        assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+        assertNotNull(documentResp.getProperties());
+        assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
+
+        // Update again - as another (minor) version
+        // note: no version params (comment &/or majorVersion) needed since versioning is enabled on this content
+
+        cnt++;
+        minorVersion++;
+
+        content = "The quick brown fox jumps over the lazy dog "+cnt;
+
+        documentResp = updateTextFile(docId, content, null);
+        assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+        assertNotNull(documentResp.getProperties());
+        assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
+
+        // Remove versionable aspect
+        List<String> aspectNames = documentResp.getAspectNames();
+        aspectNames.remove("cm:versionable");
+        Document dUpdate = new Document();
+        dUpdate.setAspectNames(aspectNames);
+
+        response = put(URL_NODES, docId, toJsonAsStringNonNull(dUpdate), null, 200);
+        documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertFalse(documentResp.getAspectNames().contains("cm:versionable"));
+        assertNull(documentResp.getProperties()); // no properties (ie. no "cm:versionLabel")
+
+        // Updates - no versions
+        for (int i = 1; i <= 3; i++)
+        {
+            cnt++;
+
+            // Update the empty node's content - no version created
+            content = "The quick brown fox jumps over the lazy dog " + cnt;
+            documentResp = updateTextFile(docId, content, null);
+            assertFalse(documentResp.getAspectNames().contains("cm:versionable"));
+            assertNull(documentResp.getProperties()); // no properties (ie. no "cm:versionLabel")
+        }
+
+        // TODO add tests to also check version comment (when we can list version history)
+    }
+
+    /**
+     * Test version history paging.
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<nodeId>/versions}
+     */
+    @Test
+    public void testVersionHistoryPaging() throws Exception
+    {
+        // create folder
+        setRequestContext(user1);
+        
+        String f1Id = null;
+
+        try
+        {
+            f1Id = createFolder(Nodes.PATH_MY, "testVersionHistoryPaging-f1").getId();
+            
+            String textContentSuffix = "Amazingly few discotheques provide jukeboxes ";
+            String contentName = "content-1";
+
+            int cnt = 6;
+            Pair<String, String> pair = uploadTextFileVersions(user1, f1Id, contentName, cnt, textContentSuffix, 0, null, null);
+            String versionLabel = pair.getFirst();
+            String docId = pair.getSecond();
+
+            assertEquals("1.5", versionLabel); // 1.0, 1.1, ... 1.5
+
+            // check version history count (note: no paging => default max items => 100)
+            HttpResponse response = getAll(getNodeVersionsUrl(docId), null, null, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(cnt, nodes.size());
+
+            // Sanity Test paging
+            
+            // SkipCount=0,MaxItems=2
+            Paging paging = getPaging(0, 2);
+            response = getAll(getNodeVersionsUrl(docId), paging, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(2, nodes.size());
+            PublicApiClient.ExpectedPaging expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+            assertEquals(2, expectedPaging.getCount().intValue());
+            assertEquals(0, expectedPaging.getSkipCount().intValue());
+            assertEquals(2, expectedPaging.getMaxItems().intValue());
+            assertTrue(expectedPaging.getTotalItems() >= cnt);
+            assertTrue(expectedPaging.getHasMoreItems());
+
+            // SkipCount=2,MaxItems=3
+            paging = getPaging(2, 3);
+            response = getAll(getNodeVersionsUrl(docId), paging, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            assertEquals(3, nodes.size());
+            expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+            assertEquals(3, expectedPaging.getCount().intValue());
+            assertEquals(2, expectedPaging.getSkipCount().intValue());
+            assertEquals(3, expectedPaging.getMaxItems().intValue());
+            assertTrue(expectedPaging.getTotalItems() >= cnt);
+        }
+        finally
+        {
+            if (f1Id != null)
+            {
+                // some cleanup
+                setRequestContext(user1);
+                deleteNode(f1Id, true, 204);
+            }
+        }
+    }
+
+    @Test
+    public void testRequestContentUrl() throws Exception
+    {
+        // create folder
+        setRequestContext(user1);
+
+        String f1Id = null;
+
+        try
+        {
+            f1Id = createFolder(Nodes.PATH_MY, "testRequestContentUrl-f1").getId();
+
+            String textContentSuffix = "Amazingly few discotheques provide jukeboxes ";
+            String contentName = "content-1";
+
+            int cnt = 6;
+            Pair<String, String> pair = uploadTextFileVersions(user1, f1Id, contentName, cnt, textContentSuffix, 0, null, null);
+            String versionLabel = pair.getFirst();
+            String docId = pair.getSecond();
+
+            assertEquals("1.5", versionLabel); // 1.0, 1.1, ... 1.5
+
+            // node and version found but direct access isn't available
+            requestContentUrl(docId, "1.2", null,501);
+            requestContentUrl(docId, "1.5", null,501);
+
+            // node not found
+            requestContentUrl("testSomeUndefinedAlias", "1.6", null,404);
+
+            // version not found
+            requestContentUrl(docId, "1.6", null,404);
+
+            {
+                requestContentUrl(docId, "1.5", toJsonAsStringNonNull(new DirectAccessUrlRequest()), 501);
+
+                {
+                    DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                    directAccessUrlRequest.setExpiresAt(DateTime.now().plusSeconds(30).toDate());
+                    directAccessUrlRequest.setValidFor(60L);
+
+                    requestContentUrl(docId, "1.5", toJsonAsStringNonNull(directAccessUrlRequest), 400);
+                }
+
+                {
+                    DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                    directAccessUrlRequest.setValidFor(60L);
+
+                    requestContentUrl(docId, "1.5", toJsonAsStringNonNull(directAccessUrlRequest), 501);
+                }
+
+                {
+                    DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                    directAccessUrlRequest.setValidFor(-60L);
+
+                    requestContentUrl(docId, "1.5", toJsonAsStringNonNull(directAccessUrlRequest), 400);
+                }
+
+                {
+                    DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                    directAccessUrlRequest.setExpiresAt(DateTime.now().plusSeconds(30).toDate());
+                    requestContentUrl(docId, "1.5", toJsonAsStringNonNull(directAccessUrlRequest), 501);
+                }
+
+                {
+                    DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                    directAccessUrlRequest.setExpiresAt(DateTime.now().minusSeconds(30).toDate());
+                    requestContentUrl(docId, "1.5", toJsonAsStringNonNull(directAccessUrlRequest), 400);
+                }
+            }
+
+            // node not accessible
+            setRequestContext(user2);
+            requestContentUrl(docId, "1.5", null,403);
+        }
+        finally
+        {
+            if (f1Id != null)
+            {
+                // some cleanup
+                setRequestContext(user1);
+                deleteNode(f1Id, true, 204);
+            }
+        }
+    }
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/PersonInfo.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/PersonInfo.java
new file mode 100644
index 00000000000..8f2c62d7281
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/PersonInfo.java
@@ -0,0 +1,128 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.rest.api.tests.client.data.Company;
+
+public class PersonInfo
+{
+	protected Company company;
+	protected String firstName;
+	protected String lastName;
+	protected String username;
+	protected String password;
+	protected String skype;
+	protected String location;
+	protected String tel;
+	protected String mob;
+	protected String instantmsg;
+	protected String google;
+	protected boolean networkAdmin;
+
+	public PersonInfo(String firstName, String lastName, String username,
+			String password, Company company, String skype,
+			String location, String tel, String mob, String instantmsg,
+			String google)
+	{
+		super();
+		setUsername(username);
+		this.company = company;
+		this.networkAdmin = false;
+		this.firstName = firstName;
+		this.lastName = lastName;
+		this.password = password;
+		this.skype = skype;
+		this.location = location;
+		this.tel = tel;
+		this.mob = mob;
+		this.instantmsg = instantmsg;
+		this.google = google;
+	}
+
+    void setUsername(String username)
+    {
+        if (username == null)
+		{
+			throw new IllegalArgumentException();
+		}
+        this.username = username;
+    }
+	
+	public boolean isNetworkAdmin()
+	{
+		return networkAdmin;
+	}
+
+	public Company getCompany()
+	{
+		return company;
+	}
+
+	public String getFirstName()
+	{
+		return firstName;
+	}
+
+	public String getLastName()
+	{
+		return lastName;
+	}
+
+	public String getUsername()
+	{
+		return username;
+	}
+
+	public String getPassword()
+	{
+		return password;
+	}
+
+	public String getSkype() {
+		return skype;
+	}
+
+	public String getLocation() {
+		return location;
+	}
+
+	public String getTel() {
+		return tel;
+	}
+
+	public String getMob() {
+		return mob;
+	}
+
+	public String getInstantmsg() {
+		return instantmsg;
+	}
+
+	public String getGoogle() {
+		return google;
+	}
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/ProbeApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/ProbeApiTest.java
new file mode 100644
index 00000000000..9bfd0469d84
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/ProbeApiTest.java
@@ -0,0 +1,159 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.rest.api.discovery.DiscoveryApiWebscript;
+import org.alfresco.rest.api.probes.ProbeEntityResource;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.json.simple.JSONObject;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.alfresco.rest.api.probes.ProbeEntityResource.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.when;
+
+/**
+ * V1 REST API tests for Probes (Live and Ready)
+ *
+ * <ul>
+ * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/probe/<probeId>} </li>
+ * </ul>
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class ProbeApiTest extends AbstractBaseApiTest
+{
+    private static final boolean OK = true;
+    private static final boolean ERROR = false;
+
+    private ProbeEntityResource probe;
+    private DiscoveryApiWebscript origDiscovery;
+
+    @Mock
+    private DiscoveryApiWebscript goodDiscovery;
+
+    @Mock
+    private DiscoveryApiWebscript badDiscovery;
+
+    @Before
+    @Override
+    public void setup() throws Exception
+    {
+//      super.setup(); -- Takes a very long time and we need no test networks, sites or users.
+        setRequestContext(null, null, null);
+
+        String beanName = ProbeEntityResource.class.getCanonicalName()+".get";
+        probe = applicationContext.getBean(beanName, ProbeEntityResource.class);
+        when(badDiscovery.getRepositoryInfo()).thenThrow(AlfrescoRuntimeException.class);
+        origDiscovery = probe.setDiscovery(badDiscovery);
+    }
+
+    @After
+    @Override
+    public void tearDown() throws Exception
+    {
+        probe.setDiscovery(origDiscovery);
+        super.tearDown();
+    }
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+
+    private void assertResponse(String probeName, Boolean ready, String expected, int expectedStatus) throws Exception
+    {
+        String[] keys = expectedStatus == 200
+                ? new String[]{"entry", "message"}
+                : new String[]{"error", "briefSummary"};
+
+        probe.setDiscovery(ready == null
+                ? null // force a NPE if used - never should be
+                : ready
+                ? goodDiscovery
+                : badDiscovery);
+
+        HttpResponse response = getSingle(ProbeEntityResource.class, probeName, null, expectedStatus);
+        Object object = response.getJsonResponse();
+        for (String key: keys)
+        {
+            object = ((JSONObject)object).get(key);
+            assertNotNull("Missing \""+key+"\" in json", object);
+        }
+        String message = object.toString();
+
+        if (expectedStatus != 200) // Strip the leading number from the exception message.
+        {
+            int i = message.indexOf(' ');
+            if (i != -1)
+            {
+                message = message.substring(i + 1);
+            }
+        }
+
+        assertEquals(expected, message);
+    }
+
+    @Test
+    public void testProbes() throws Exception
+    {
+        // Live first
+        assertResponse(LIVE, ERROR, "liveProbe: Failure - Tested", 503);
+        assertResponse(LIVE, null, "liveProbe: Failure - No test", 503); // Need to wait 10 seconds.
+        assertResponse(LIVE, null, "liveProbe: Failure - No test", 503);
+        assertResponse(READY, null, "readyProbe: Failure - No test", 503);
+
+        Thread.currentThread().sleep(CHECK_PERIOD);
+        assertResponse(LIVE, OK, "liveProbe: Success - Tested", 200);
+        assertResponse(LIVE, null, "liveProbe: Success - No test", 200);
+        assertResponse(READY, null, "readyProbe: Success - No test", 200);
+        assertResponse(LIVE, null, "liveProbe: Success - No test", 200);
+
+        Thread.currentThread().sleep(CHECK_PERIOD);
+        assertResponse(LIVE, ERROR, "liveProbe: Failure - Tested", 503);
+        assertResponse(LIVE, null, "liveProbe: Failure - No test", 503);
+        assertResponse(READY, null, "readyProbe: Failure - No test", 503);
+
+
+
+        // Ready first
+        Thread.currentThread().sleep(CHECK_PERIOD);
+        assertResponse(READY, OK, "readyProbe: Success - Tested", 200);
+        assertResponse(LIVE, null, "liveProbe: Success - No test", 200);
+        assertResponse(READY, null, "readyProbe: Success - No test", 200);
+
+        Thread.currentThread().sleep(CHECK_PERIOD);
+        assertResponse(READY, ERROR, "readyProbe: Failure - Tested", 503);
+        assertResponse(LIVE, null, "liveProbe: Failure - No test", 503);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/PublicApiDateFormat.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/PublicApiDateFormat.java
new file mode 100644
index 00000000000..959724dae81
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/PublicApiDateFormat.java
@@ -0,0 +1,52 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.TimeZone;
+
+public class PublicApiDateFormat
+{
+	private static DateFormat dateFormat;
+	
+	private PublicApiDateFormat()
+	{
+	}
+
+	// The date format to use when checking dates coming back from the rest api
+	static
+	{
+		dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+        TimeZone gmt = TimeZone.getTimeZone("UTC");
+        dateFormat.setTimeZone(gmt);        
+	}
+	
+	public static DateFormat getDateFormat()
+	{
+		return dateFormat;
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/PublicApiJettyComponent.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/PublicApiJettyComponent.java
new file mode 100644
index 00000000000..8924fc1678a
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/PublicApiJettyComponent.java
@@ -0,0 +1,110 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.repo.web.util.AbstractJettyComponent;
+import org.alfresco.rest.api.PublicApiWebScriptServlet;
+import org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.webapp.WebAppContext;
+
+/**
+ * Manages an embedded jetty server, hooking it up to the repository spring context and providing 
+ * authenticated, tenant-based access through the tenant servlet.
+ * 
+ * @author steveglover
+ *
+ */
+public class PublicApiJettyComponent extends AbstractJettyComponent
+{
+	public PublicApiJettyComponent(int port, String contextPath, String[] configLocations, String[] classLocations)
+	{
+		super(port, contextPath, configLocations, classLocations);
+	}
+	
+	@Override
+	protected void configureWebAppContext(WebAppContext webAppContext)
+	{
+//		ServletContext servletContext = webAppContext.getServletContext();
+
+	    // the tenant servlet with alfresco managed authentication
+	    ServletHolder servletHolder = new ServletHolder(PublicApiWebScriptServlet.class);
+	    servletHolder.setInitParameter("authenticator", "publicapi.authenticator");
+	    webAppContext.addServlet(servletHolder, "/" + publicApiServletName + "/*");
+	    
+//	    DependencyInjectedFilter apiFilter = (DependencyInjectedFilter)getApplicationContext().getBean("publicAPICMISFilter");
+//	    BeanProxyFilter filter = new BeanProxyFilter(servletContext, apiFilter);
+//	    FilterHolder filterHolder = new FilterHolder(filter);
+//	    webAppContext.addFilter(filterHolder, "/" + publicApiServletName + "/*", null);
+
+	    // the tenant servlet with alfresco managed authentication
+	    servletHolder = new ServletHolder(CmisAtomPubServlet.class);
+	    servletHolder.setInitParameter("callContextHandler", "org.apache.chemistry.opencmis.server.shared.BasicAuthCallContextHandler");
+	    webAppContext.addServlet(servletHolder, "/cmisatom/*");
+	}
+	
+//	private static class BeanProxyFilter implements Filter
+//	{
+//	    private DependencyInjectedFilter filter;
+//	    private ServletContext context;    
+//	    
+//	    private BeanProxyFilter(ServletContext context, DependencyInjectedFilter filter)
+//	    {
+//	    	this.context = context;
+//	    	this.filter = filter;
+//	    }
+//
+//	    /**
+//	     * Initialize the filter.
+//	     * 
+//	     * @param args
+//	     *            FilterConfig
+//	     * @throws ServletException
+//	     *             the servlet exception
+//	     * @exception ServletException
+//	     */
+//	    public void init(FilterConfig args) throws ServletException
+//	    {
+//	    }
+//
+//	    /* (non-Javadoc)
+//	     * @see javax.servlet.Filter#destroy()
+//	     */
+//	    public void destroy()
+//	    {
+//	        this.filter = null;
+//	    }
+//
+//	    /* (non-Javadoc)
+//	     * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
+//	     */
+//	    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
+//	            ServletException
+//	    {
+//	        this.filter.doFilter(this.context, request, response, chain);
+//	    }
+//	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/PublicApiTestContext.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/PublicApiTestContext.java
new file mode 100644
index 00000000000..afa4a183bcf
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/PublicApiTestContext.java
@@ -0,0 +1,156 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.util.ApplicationContextHelper;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.TestWebScriptServer;
+
+/**
+ * Helper for Cloud Tests
+ */
+public class PublicApiTestContext
+{
+    private ApplicationContext applicationContext;
+    private BaseWebScriptTest test;
+    
+    private List<String> usersToBeTidied = new ArrayList<String>();
+    private List<String> invalidDomainsToBeTidied = new ArrayList<String>();
+    
+    private MutableAuthenticationService authenticationService;
+    private RetryingTransactionHelper transactionHelper;
+
+    public PublicApiTestContext()
+    {
+        init(ApplicationContextHelper.getApplicationContext());
+    }
+    
+    public PublicApiTestContext(ApplicationContext context)
+    {
+        init(context);
+    }
+    
+    public PublicApiTestContext(BaseWebScriptTest test)
+    {
+        this.test = test;
+        this.test.setCustomContext("cloud-test-context.xml");
+        init(test.getServer().getApplicationContext());
+    }
+    
+    private void init(ApplicationContext context)
+    {
+        applicationContext = context;
+        transactionHelper = (RetryingTransactionHelper)applicationContext.getBean("retryingTransactionHelper");
+        authenticationService = (MutableAuthenticationService)applicationContext.getBean("authenticationService");
+    }
+    
+    public ApplicationContext getApplicationContext()
+    {
+        return applicationContext;
+    }
+    
+    public TestWebScriptServer getTestServer()
+    {
+        return test.getServer();
+    }
+    
+    public String createUserName(String alias, String tenant)
+    {
+    	StringBuilder sb = new StringBuilder();
+    	sb.append(alias);
+    	if ((tenant != null) && (! tenant.equals(TenantService.DEFAULT_DOMAIN)) && (! alias.contains(TenantService.SEPARATOR)))
+    	{
+    		sb.append(TenantService.SEPARATOR);
+    		sb.append(tenant);
+    	}
+    	return sb.toString();
+    }
+
+    public void addUser(String user)
+    {
+        usersToBeTidied.add(user);
+    }
+    
+    public void addInvalidDomain(String domain)
+    {
+        invalidDomainsToBeTidied.add(domain);
+    }
+    
+    public void removeInvalidDomain(String domain)
+    {
+        invalidDomainsToBeTidied.remove(domain);
+    }
+
+    public void cleanup()
+    {
+        RunAsWork<Void> work = new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+                {
+                    @SuppressWarnings("synthetic-access")
+                    public Void execute() throws Throwable
+                    {
+                        return null;
+                    }
+                });
+                return null;
+            }
+        };
+        AuthenticationUtil.runAs(work, AuthenticationUtil.getSystemUserName());
+        
+        for (final String user : this.usersToBeTidied)
+        {
+            transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+            {
+                @Override
+                public Void execute() throws Throwable
+                {
+                    if (authenticationService.authenticationExists(user))
+                    {
+                        authenticationService.deleteAuthentication(user);
+                    }
+                    return null;
+                }
+            });
+        }
+        usersToBeTidied.clear();
+        
+        // finally clear authentication
+        AuthenticationUtil.clearCurrentSecurityContext();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/QueriesNodesApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/QueriesNodesApiTest.java
new file mode 100644
index 00000000000..aca4e9baf78
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/QueriesNodesApiTest.java
@@ -0,0 +1,787 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.Queries;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.Folder;
+import org.alfresco.rest.api.tests.client.data.Node;
+import org.alfresco.rest.api.tests.client.data.Tag;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.util.testing.category.RedundantTests;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.ArgumentCaptor;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+* V1 REST API tests for pre-defined 'live' search Queries on Nodes
+ * 
+ * <ul>
+ * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/queries/nodes} </li>
+ * </ul>
+ *
+ * @author janv
+ */
+public class QueriesNodesApiTest extends AbstractSingleNetworkSiteTest
+{
+    private static final String URL_QUERIES_LSN = "queries/nodes";
+
+    private static final String DEAFULT_QUERY =
+        "\"%s\" AND " +
+        "(+TYPE:\"cm:content\" OR +TYPE:\"cm:folder\") AND " +
+        "-TYPE:\"cm:thumbnail\" AND " +
+        "-TYPE:\"cm:failedThumbnail\" AND " +
+        "-TYPE:\"cm:rating\" AND " +
+        "-TYPE:\"fm:post\" AND " +
+        "-TYPE:\"st:site\" AND " +
+        "-ASPECT:\"st:siteContainer\" AND " +
+        "-ASPECT:\"sys:hidden\" AND " +
+        "-cm:creator:system AND " +
+        "-QNAME:comment\\-* ";
+
+    private static final String NODE_TYPE_QUERY =
+        "\"%s\" AND " +
+        "(+TYPE:\"%s\") AND " +
+        "-ASPECT:\"sys:hidden\" AND " +
+        "-cm:creator:system AND " +
+        "-QNAME:comment\\-* ";
+
+    private static final String ROOT_NODE_QUERY_PREFIX =
+        "PATH:\"";
+    private static final String ROOT_NODE_QUERY_SUFFIX =
+        "//*\" " +
+        "AND " +
+        "(\"%s\") AND " +
+        "(+TYPE:\"cm:content\" OR +TYPE:\"cm:folder\") " +
+        "AND -TYPE:\"cm:thumbnail\" AND " +
+        "-TYPE:\"cm:failedThumbnail\" AND " +
+        "-TYPE:\"cm:rating\" AND " +
+        "-TYPE:\"fm:post\" AND " +
+        "-TYPE:\"st:site\" AND " +
+        "-ASPECT:\"st:siteContainer\" AND " +
+        "-ASPECT:\"sys:hidden\" AND " +
+        "-cm:creator:system AND " +
+        "-QNAME:comment\\-* ";
+
+    public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue( Map<K, V> map )
+    {
+        List<Map.Entry<K, V>> list =
+                new LinkedList<>( map.entrySet() );
+        Collections.sort( list, new Comparator<Map.Entry<K, V>>()
+        {
+            public int compare( Map.Entry<K, V> o1, Map.Entry<K, V> o2 )
+            {
+                return (o1.getValue()).compareTo( o2.getValue() );
+            }
+        } );
+
+        Map<K, V> result = new LinkedHashMap<>();
+        for (Map.Entry<K, V> entry : list)
+        {
+            result.put( entry.getKey(), entry.getValue() );
+        }
+        return result;
+    }
+
+    private List<Node> checkApiCall(String pathRegex, String queryForm, String term, String nodeType, String rootNodeId,
+                                    String include, String orderBy, Paging paging, int expectedStatus,
+                                    Boolean checkNodeOrderAsc, Boolean propertyNullCheck,
+                                    List<String> ids) throws Exception
+    {
+        Map<String, String> params = new HashMap<>(1);
+        params.put(Queries.PARAM_TERM, term);
+        if (include != null)
+        {
+            params.put(Queries.PARAM_INCLUDE, include);
+        }
+        if (nodeType != null)
+        {
+            params.put(Queries.PARAM_NODE_TYPE, nodeType);
+        }
+        if (rootNodeId != null)
+        {
+            params.put(Queries.PARAM_ROOT_NODE_ID, rootNodeId);
+        }
+        if (orderBy != null)
+        {
+            params.put(Queries.PARAM_ORDERBY, orderBy);
+        }
+
+        // Create the list of NodeRefs returned from the dummy search
+        dummySearchServiceQueryNodeRefs.clear();
+        for (String id: ids)
+        {
+            NodeRef nodeRef = getNodeRef(id);
+            dummySearchServiceQueryNodeRefs.add(nodeRef);
+        }
+
+        // Mix up the NodeRefs returned from the dummy search as the client side code is going to be doing the sorting.
+        if (orderBy != null)
+        {
+            Collections.shuffle(dummySearchServiceQueryNodeRefs);
+        }
+
+        HttpResponse response = getAll(URL_QUERIES_LSN, paging, params, 200);
+        List<Node> nodes = null;
+
+        if (expectedStatus == 200)
+        {
+            String termWithEscapedAsterisks = term.replaceAll("\\*", "\\\\*").replaceAll("\"", "\\\\\"");
+            String expectedQuery =
+                  DEAFULT_QUERY.equals(queryForm)
+                ? String.format(DEAFULT_QUERY, termWithEscapedAsterisks)
+                : NODE_TYPE_QUERY.equals(queryForm)
+                ? String.format(NODE_TYPE_QUERY, termWithEscapedAsterisks, nodeType)
+                : ROOT_NODE_QUERY_SUFFIX.equals(queryForm)
+                ? String.format(ROOT_NODE_QUERY_SUFFIX, termWithEscapedAsterisks)
+                : "TODO";
+            ArgumentCaptor<SearchParameters> searchParametersCaptor = ArgumentCaptor.forClass(SearchParameters.class);
+            verify(mockSearchService, times(++callCountToMockSearchService)).query(searchParametersCaptor.capture());
+            SearchParameters parameters = searchParametersCaptor.getValue();
+            String query = parameters.getQuery();
+            if (ROOT_NODE_QUERY_SUFFIX.equals(queryForm))
+            {
+                assertNotNull(query);
+                assertTrue("Query should have started with "+ROOT_NODE_QUERY_PREFIX+" but was "+query, query.startsWith(ROOT_NODE_QUERY_PREFIX));
+                assertTrue("Query should have ended with "+expectedQuery+" but was "+query, query.endsWith(expectedQuery));
+                String path = query.substring(ROOT_NODE_QUERY_PREFIX.length(), query.length()-expectedQuery.length());
+                assertTrue("Query path should match "+pathRegex+" but was "+path, Pattern.matches(pathRegex, path));
+            }
+            else
+            {
+                assertEquals("Query", expectedQuery, query);
+            }
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            checkNodeIds(nodes, ids, checkNodeOrderAsc);
+            if (propertyNullCheck != null)
+            {
+                for (Node node : nodes)
+                {
+                    if (propertyNullCheck)
+                    {
+                        assertNull(node.getAspectNames());
+                        assertNull(node.getProperties());
+                        assertNull(node.getPath());
+                        assertNull(node.getIsLink());
+                    }
+                    else
+                    {
+                        assertNotNull(node.getAspectNames());
+                        assertNotNull(node.getProperties());
+                        assertNotNull(node.getPath());
+                        assertNotNull(node.getIsLink());
+                    }
+                }
+            }
+        }
+        return nodes;
+    }
+
+    private NodeRef getNodeRef(String id)
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(user1);
+        // The following call to new NodeRef(...) returns a NodeRef like:
+        //    workspace://SpacesStore/9db76769-96de-4de4-bdb4-a127130af362
+        // We call tenantService.getName(nodeRef) to get a fully qualified NodeRef as Solr returns this.
+        // They look like:
+        //    workspace://@org.alfresco.rest.api.tests.queriespeopleapitest@SpacesStore/9db76769-96de-4de4-bdb4-a127130af362
+        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, id);
+        nodeRef = tenantService.getName(nodeRef);
+        return nodeRef;
+    }
+
+    /**
+     * Tests basic api for nodes live search - metadata (name, title, description) &/or full text search of file/content
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/queries/nodes}
+     */
+    @Test
+    public void testLiveSearchNodes_FTS_and_Metadata() throws Exception
+    {
+        setRequestContext(user1);
+        
+        int f1Count = 5;
+        List<String> f1NodeIds = new ArrayList<>(f1Count);
+
+        int f2Count = 3;
+        List<String> f2NodeIds = new ArrayList<>(f2Count);
+
+        int f3Count = 4;
+        List<String> f3NodeIds = new ArrayList<>(f3Count);
+
+        int totalCount = f1Count + f2Count + f3Count;
+        List<String> allIds = new ArrayList<>(totalCount);
+
+        String testTerm = "abc123basic";
+
+        try
+        {
+            // As user 1 ...
+
+            Paging paging = getPaging(0, 100);
+
+            Map<String, String> params = new HashMap<>(1);
+            params.put(Queries.PARAM_TERM, testTerm);
+
+            // We can no longer check the assumption that there is a clean repo (ie. no nodes with search term 'abc123')
+            // in the same way as before which used search - Generally ok not to check.
+
+            String myFolderNodeId = getMyNodeId();
+
+            String f1Id = createFolder(myFolderNodeId, "folder 1").getId();
+            String f2Id = createFolder(myFolderNodeId, "folder 2").getId();
+
+            String name = "name";
+            String title = "title";
+            String descrip = "descrip";
+
+            String folderNameSuffix = " "+testTerm+" folder";
+            String txtSuffix = ".txt";
+
+            Map<String,String> idNameMap = new HashMap<>();
+            Map<String,List<String>> textIdMap = new HashMap<>();
+
+            int nameIdx = f1Count;
+            for (int i = 1; i <= f1Count; i++)
+            {
+                // create doc - in folder 1
+                String contentText = "f1 " + testTerm + " test document " + user1 + " document " + i;
+
+                String num = String.format("%05d", nameIdx);
+                String docName = name+num+name+txtSuffix;
+
+                Map<String,String> docProps = new HashMap<>(2);
+                docProps.put("cm:title", title + num + title);
+                docProps.put("cm:description", descrip+num+descrip);
+
+                Document doc = createTextFile(f1Id, docName, contentText, "UTF-8", docProps);
+
+                f1NodeIds.add(doc.getId());
+                idNameMap.put(doc.getId(), docName);
+                addTo(textIdMap, name+num+name, doc.getId());
+                addTo(textIdMap, docName, doc.getId());
+                addTo(textIdMap, docProps.get("cm:title"), doc.getId());
+                addTo(textIdMap, docProps.get("cm:description"), doc.getId());
+
+                nameIdx--;
+            }
+
+            nameIdx = f2Count;
+            for (int i = 1; i <= f2Count; i++)
+            {
+                // create doc - in folder 2
+                String contentText = "f2 " + testTerm + " test document";
+
+                String num = String.format("%05d", nameIdx);
+                String docName = name+num+name+txtSuffix;
+
+                Map<String, String> props = new HashMap<>(2);
+                props.put("cm:title", title+num+title);
+                props.put("cm:description", descrip+num+descrip);
+
+                Document doc = createTextFile(f2Id, docName, contentText, "UTF-8", props);
+
+                f2NodeIds.add(doc.getId());
+                idNameMap.put(doc.getId(), docName);
+
+                addTo(textIdMap, name+num+name, doc.getId());
+                addTo(textIdMap, docName, doc.getId());
+                addTo(textIdMap, props.get("cm:title"), doc.getId());
+                addTo(textIdMap, props.get("cm:description"), doc.getId());
+
+                nameIdx--;
+            }
+
+            nameIdx = f3Count;
+            for (int i = 1; i <= f3Count; i++)
+            {
+                // create folders - in folder 3
+                String num = String.format("%05d", nameIdx);
+                String folderName = name+num+name+folderNameSuffix;
+
+                Map<String, Object> props = new HashMap<>(2);
+                props.put("cm:title", title+num+title);
+                props.put("cm:description", descrip+num+descrip);
+
+                Node node = createFolder(myFolderNodeId, folderName, props);
+
+                f3NodeIds.add(node.getId());
+                idNameMap.put(node.getId(), folderName);
+
+                addTo(textIdMap, name+num+name, node.getId());
+                addTo(textIdMap, folderName, node.getId());
+                addTo(textIdMap, (String)props.get("cm:title"), node.getId());
+                addTo(textIdMap, (String)props.get("cm:description"), node.getId());
+
+                nameIdx--;
+            }
+
+            allIds.addAll(idNameMap.keySet());
+
+            //
+            // find nodes
+            //
+
+            // Search hits based on FTS (content) and also name (in case of folder nodes)
+            checkApiCall(null, DEAFULT_QUERY, testTerm, null, null, null, null, paging, 200, null, true, allIds);
+
+            // Search - include optional fields - eg. aspectNames, properties, path, isLink
+            checkApiCall(null, DEAFULT_QUERY, testTerm, null, null, "aspectNames,properties,path,isLink", null, paging, 200, null, false, allIds);
+
+            // Search hits restricted by node type
+            checkApiCall(null, NODE_TYPE_QUERY, testTerm, "cm:folder", null, null, null, paging, 200, null, null, f3NodeIds);
+
+            // Search - with -root- as the root node (for path-based / in-tree search)
+            checkApiCall("/app:company_home", ROOT_NODE_QUERY_SUFFIX, testTerm, null, Nodes.PATH_ROOT, null, null, paging, 200, null, null, allIds);
+
+            // Search - with -shared- as the root node (for path-based / in-tree search)
+            checkApiCall("/app:company_home/app:shared", ROOT_NODE_QUERY_SUFFIX, testTerm, null, Nodes.PATH_SHARED, null, null, paging, 200, null, null, Collections.EMPTY_LIST);
+
+            // Search - with folder 1 as root node (for path-based / in-tree search)
+            checkApiCall("/app:company_home/app:user_homes/cm:user1-[0-9]*_x...._org.alfresco.rest.api.tests.queriesnodesapitest/cm:folder_x...._1",
+                ROOT_NODE_QUERY_SUFFIX, testTerm, null, f1Id, null, null, paging, 200, null, null, f1NodeIds);
+
+            // Search - with folder 2 as the root node (for path-based / in-tree search)
+            checkApiCall("/app:company_home/app:user_homes/cm:user1-[0-9]*_x...._org.alfresco.rest.api.tests.queriesnodesapitest/cm:folder_x...._2",
+                ROOT_NODE_QUERY_SUFFIX, testTerm, null, f2Id, null, null, paging, 200, null, null, f2NodeIds);
+
+            // Search - with -my- as the root node (for path-based / in-tree search)
+            checkApiCall("/app:company_home/app:user_homes/cm:user1-[0-9]*_x...._org.alfresco.rest.api.tests.queriesnodesapitest",
+                ROOT_NODE_QUERY_SUFFIX, name+"*", null, Nodes.PATH_MY, null, null, paging, 200, null, null, allIds);
+
+            // Search hits based on cm:name
+            String term = name+String.format("%05d", 1)+name;
+            List<String> ids = textIdMap.get(term);
+            assertEquals(term, 3, ids.size());
+            List<Node> nodes = checkApiCall(null, DEAFULT_QUERY, "\""+term+"\"", null, null, null, null, paging, 200, null, null, ids);
+            for (Node node : nodes)
+            {
+                if (node.getIsFolder())
+                {
+                    assertEquals(term+folderNameSuffix, node.getName());
+                }
+                else
+                {
+                    assertEquals(term+txtSuffix, node.getName());
+                }
+            }
+
+            // search for name with . (eg. ".txt") without double quotes
+            term = name+String.format("%05d", 1)+name+txtSuffix;
+            ids = textIdMap.get(term);
+            assertEquals(term, 2, ids.size());
+            checkApiCall(null, DEAFULT_QUERY, term, null, null, null, null, paging, 200, null, null, ids);
+
+            // search for name with . (eg. ".txt") with double quotes
+            term = name+String.format("%05d", 1)+name+txtSuffix;
+            ids = textIdMap.get(term);
+            assertEquals(term, 2, ids.size());
+            checkApiCall(null, DEAFULT_QUERY, "\""+term+"\"", null, null, null, null, paging, 200, null, null, ids);
+
+            // Search hits based on cm:title
+            term = title+String.format("%05d", 2)+title;
+            ids = textIdMap.get(term);
+            assertEquals(term, 3, ids.size());
+            nodes = checkApiCall(null, DEAFULT_QUERY, "\""+term+"\"", null, null, "properties", null, paging, 200, null, null, ids);
+            assertEquals(term, nodes.get(0).getProperties().get("cm:title"));
+            assertEquals(term, nodes.get(1).getProperties().get("cm:title"));
+            assertEquals(term, nodes.get(2).getProperties().get("cm:title"));
+
+            // Search hits based on cm:description
+            term = descrip+String.format("%05d", 3)+descrip;
+            ids = textIdMap.get(term);
+            assertEquals(term, 3, ids.size());
+            nodes = checkApiCall(null, DEAFULT_QUERY, "\""+term+"\"", null, null, "properties", null, paging, 200, null, null, ids);
+            assertEquals(term, nodes.get(0).getProperties().get("cm:description"));
+            assertEquals(term, nodes.get(1).getProperties().get("cm:description"));
+            assertEquals(term, nodes.get(2).getProperties().get("cm:description"));
+
+            // -ve test - no params (ie. no term)
+            getAll(URL_QUERIES_LSN, paging, null, 400);
+
+            // -ve test - no term
+            params = new HashMap<>(1);
+            params.put(Queries.PARAM_ROOT_NODE_ID, f1Id);
+            getAll(URL_QUERIES_LSN, paging, params, 400);
+
+            // -ve test - unknown root node id
+            params = new HashMap<>(2);
+            params.put(Queries.PARAM_TERM, "abc");
+            params.put(Queries.PARAM_ROOT_NODE_ID, "dummy");
+            getAll(URL_QUERIES_LSN, paging, params, 404);
+
+            // -ve test - unknown node type
+            params = new HashMap<>(2);
+            params.put(Queries.PARAM_TERM, "abc");
+            params.put(Queries.PARAM_NODE_TYPE, "cm:dummy");
+            getAll(URL_QUERIES_LSN, paging, params, 400);
+
+            // -ve test - term too short
+            params = new HashMap<>(1);
+            params.put(Queries.PARAM_TERM, "ab");
+            getAll(URL_QUERIES_LSN, paging, params, 400);
+
+            // -ve test - term is still too short
+            params = new HashMap<>(1);
+            params.put(Queries.PARAM_TERM, "  \"a b *\"  ");
+            getAll(URL_QUERIES_LSN, paging, params, 400);
+
+            // -ve test - unauthenticated - belts-and-braces ;-)
+            setRequestContext(null);
+            getAll(URL_QUERIES_LSN, paging, params, 401);
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            for (String docId : allIds)
+            {
+                deleteNode(docId, true, 204);
+            }
+        }
+    }
+
+    private void addTo(Map<String, List<String>> textIdMap, String text, String id)
+    {
+        List<String> ids = textIdMap.get(text);
+        if (ids == null)
+        {
+            ids = new ArrayList<>();
+            textIdMap.put(text, ids);
+        }
+        ids.add(id);
+    }
+
+    @Test
+    public void testLiveSearchNodes_SortPage() throws Exception
+    {
+        setRequestContext(user1);
+        
+        int f1Count = 5;
+        List<String> f1NodeIds = new ArrayList<>(f1Count);
+
+        int f2Count = 3;
+        List<String> f2NodeIds = new ArrayList<>(f2Count);
+
+        int totalCount = f1Count + f2Count;
+        List<String> allIds = new ArrayList<>(totalCount);
+
+        String testTerm = "def456sortpage";
+
+        try
+        {
+            // As user 1 ...
+
+            Paging paging = getPaging(0, 100);
+
+            Map<String, String> params = new HashMap<>(1);
+            params.put(Queries.PARAM_TERM, testTerm);
+
+            String myFolderNodeId = getMyNodeId();
+
+            String f1Id = createFolder(myFolderNodeId, "folder sort 1").getId();
+            String f2Id = createFolder(myFolderNodeId, "folder sort 2").getId();
+
+            String name = "name";
+
+            Map<String,String> idNameMap = new HashMap<>();
+
+            int nameIdx = f1Count;
+            for (int i = 1; i <= f1Count; i++)
+            {
+                // create doc - in folder 1
+                String contentText = "f1 " + testTerm + " test document " + user1 + " document " + i;
+
+                String num = String.format("%05d", nameIdx);
+                String docName = name+num+name+".txt";
+
+                Document doc = createTextFile(f1Id, docName, contentText, "UTF-8", null);
+
+                f1NodeIds.add(doc.getId());
+                idNameMap.put(doc.getId(), docName);
+
+                nameIdx--;
+            }
+
+            nameIdx = f2Count;
+            for (int i = 1; i <= f2Count; i++)
+            {
+                // create doc - in folder 2
+                String contentText = "f2 " + testTerm + " test document";
+
+                String num = String.format("%05d", nameIdx);
+                String docName = name+num+name+".txt";
+
+                Document doc = createTextFile(f2Id, docName, contentText, "UTF-8", null);
+
+                f2NodeIds.add(doc.getId());
+                idNameMap.put(doc.getId(), docName);
+
+                nameIdx--;
+            }
+
+            List<String> idsSortedByNameAsc = new ArrayList<>(sortByValue(idNameMap).keySet());
+
+            List<String> idsSortedByNameDescCreatedAtAsc = new ArrayList<>(totalCount);
+            for (int i = 0; i < totalCount; i++)
+            {
+                if (i < f1Count)
+                {
+                    idsSortedByNameDescCreatedAtAsc.add(f1NodeIds.get(i));
+                }
+                if (i < f2Count)
+                {
+                    idsSortedByNameDescCreatedAtAsc.add(f2NodeIds.get(i));
+                }
+            }
+
+            allIds.addAll(idNameMap.keySet());
+
+            // test sort order
+
+            // default sort order (modifiedAt desc)
+            checkApiCall(null, DEAFULT_QUERY, testTerm, null, null, null, null, paging, 200, false, true, allIds);
+
+            // sort order - modifiedAt asc
+            checkApiCall(null, DEAFULT_QUERY, testTerm, null, null, null, "modifiedAt asc", paging, 200, false, true, allIds);
+
+            // sort order - modifiedAt desc
+            checkApiCall(null, DEAFULT_QUERY, testTerm, null, null, null, "modifiedAt desc", paging, 200, true, true, allIds);
+
+            // sort order - createdAt asc
+            checkApiCall(null, DEAFULT_QUERY, testTerm, null, null, null, "createdAt asc", paging, 200, true, true, allIds);
+
+            // sort order - createdAt desc
+            checkApiCall(null, DEAFULT_QUERY, testTerm, null, null, null, "createdAt desc", paging, 200, false, true, allIds);
+
+            // sort order - name asc
+            checkApiCall(null, DEAFULT_QUERY, testTerm, null, null, null, "name asc", paging, 200, true, true, idsSortedByNameAsc);
+
+            // sort order - name desc
+            checkApiCall(null, DEAFULT_QUERY, testTerm, null, null, null, "name desc", paging, 200, false, true, idsSortedByNameAsc);
+
+            // sort order - name desc, createdAt asc
+            checkApiCall(null, DEAFULT_QUERY, testTerm, null, null, null, "name desc, createdAt asc", paging, 200, false, true, idsSortedByNameDescCreatedAtAsc);
+
+            // sort order - name asc, createdAt asc
+            checkApiCall(null, DEAFULT_QUERY, testTerm, null, null, null, "name asc, createdAt desc", paging, 200, true, true, idsSortedByNameDescCreatedAtAsc);
+
+            // basic paging test
+
+            checkApiCall(null, DEAFULT_QUERY, testTerm, null, null, null, null, getPaging(0, 100), 200, false, true, allIds);
+
+            checkApiCall(null, DEAFULT_QUERY, testTerm, null, null, null, null, getPaging(0, f1Count), 200, false, true, f1NodeIds);
+
+            checkApiCall(null, DEAFULT_QUERY, testTerm, null, null, null, null, getPaging(f1Count, f2Count), 200, false, true, f2NodeIds);
+
+
+            // TODO sanity check modifiedAt (for now modifiedAt=createdAt)
+
+            // -ve test - invalid sort field
+            params = new HashMap<>(2);
+            params.put(Queries.PARAM_TERM, testTerm);
+            params.put(Queries.PARAM_ORDERBY, "invalid asc");
+            getAll(URL_QUERIES_LSN, paging, params, 400);
+
+            // -ve test - unauthenticated - belts-and-braces ;-)
+            setRequestContext(null);
+            getAll(URL_QUERIES_LSN, paging, params, 401);
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            for (String docId : allIds)
+            {
+                deleteNode(docId, true, 204);
+            }
+        }
+    }
+
+    @Test
+    @Category(RedundantTests.class)
+    public void testLiveSearchNodes_Tags() throws Exception
+    {
+        setRequestContext(user1);
+        
+        PublicApiClient.Nodes nodesProxy = publicApiClient.nodes();
+
+        int f1Count = 5;
+        List<String> f1NodeIds = new ArrayList<>(f1Count);
+
+        int f2Count = 3;
+        List<String> f2NodeIds = new ArrayList<>(f2Count);
+
+        int totalCount = f1Count + f2Count;
+        List<String> allIds = new ArrayList<>(totalCount);
+
+        String testTag = "ghi789tag";
+        String testFileTag = "ghi789file";
+        String testFolderTag = "ghi789folder";
+
+        try
+        {
+            // As user 1 ...
+
+            Paging paging = getPaging(0, 100);
+
+            String f1Id = createFolder(Nodes.PATH_MY, "folder tag 1").getId();
+            String f2Id = createFolder(Nodes.PATH_MY, "folder tag 2").getId();
+
+            String name = "name";
+
+            for (int i = 1; i <= f1Count; i++)
+            {
+                // create doc - in folder 1
+                String contentText = "f1 test document " + user1 + " document " + i;
+                String docName = name+i;
+
+                Document doc = createTextFile(f1Id, docName, contentText, "UTF-8", null);
+
+                publicApiClient.setRequestContext(new RequestContext("", user1));
+
+                nodesProxy.createNodeTag(doc.getId(), new Tag(testTag)); // ignore result
+                nodesProxy.createNodeTag(doc.getId(), new Tag(testFileTag)); // ignore result
+
+                f1NodeIds.add(doc.getId());
+            }
+
+            for (int i = 1; i <= f2Count; i++)
+            {
+                // create folder - in folder 2
+                String folderName = name+i;
+
+                Folder folder = createFolder(f2Id, folderName, null);
+
+                publicApiClient.setRequestContext(new RequestContext("", user1));
+
+                nodesProxy.createNodeTag(folder.getId(), new Tag(testTag)); // ignore result
+                nodesProxy.createNodeTag(folder.getId(), new Tag(testFolderTag)); // ignore result
+
+                f2NodeIds.add(folder.getId());
+            }
+
+            allIds.addAll(f1NodeIds);
+            allIds.addAll(f2NodeIds);
+
+            // Search hits based on tag
+
+            Map<String, String> params = new HashMap<>(1);
+            params.put(Queries.PARAM_TERM, testTag);
+            HttpResponse response = getAll(URL_QUERIES_LSN, paging, params, 200);
+            List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            checkNodeIds(nodes, allIds, null);
+
+            params = new HashMap<>(1);
+            params.put(Queries.PARAM_TERM, testFileTag);
+            response = getAll(URL_QUERIES_LSN, paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            checkNodeIds(nodes, f1NodeIds, null);
+
+            params = new HashMap<>(1);
+            params.put(Queries.PARAM_TERM, testFolderTag);
+            response = getAll(URL_QUERIES_LSN, paging, params, 200);
+            nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+            checkNodeIds(nodes, f2NodeIds, null);
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            for (String nodeId : allIds)
+            {
+                deleteNode(nodeId, true, 204);
+            }
+        }
+    }
+
+    private void checkNodeIds(List<Node> nodes, List<String> nodeIds, Boolean asc)
+    {
+        assertEquals(nodeIds.size(), nodes.size());
+
+        if (asc == null)
+        {
+            // ignore order
+            for (Node node : nodes)
+            {
+                assertTrue(nodeIds.contains(node.getId()));
+            }
+        }
+        else if (asc)
+        {
+            int i = 0;
+            for (Node node : nodes)
+            {
+                nodeIds.get(i).equals(node.getId());
+                i++;
+            }
+        }
+        else
+        {
+            int i = nodeIds.size() - 1;
+            for (Node node : nodes)
+            {
+                nodeIds.get(i).equals(node.getId());
+                i--;
+            }
+        }
+
+    }
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/QueriesPeopleApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/QueriesPeopleApiTest.java
new file mode 100644
index 00000000000..a00703f5b9b
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/QueriesPeopleApiTest.java
@@ -0,0 +1,519 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.Queries;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.data.Company;
+import org.alfresco.rest.api.tests.client.data.Person;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.StringJoiner;
+
+import static org.alfresco.rest.api.Queries.PARAM_FIRSTNAME;
+import static org.alfresco.rest.api.Queries.PARAM_LASTNAME;
+import static org.alfresco.rest.api.Queries.PARAM_PERSON_ID;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+* V1 REST API tests for pre-defined 'live' search Queries on People
+ * 
+ * <ul>
+ * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/queries/people} </li>
+ * </ul>
+ *
+ * @author Alan Davis
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class QueriesPeopleApiTest extends AbstractSingleNetworkSiteTest
+{
+    private static final String URL_QUERIES_LSP = "queries/people";
+    
+    private static String TEST_TERM_PREFIX = Long.toString(System.currentTimeMillis()/1000);
+    
+    // TODO Would like to use @BeforeClass and @AfterClass. But creating and
+    //      deleting users is hard from from static methods. For the moment do it
+    //      in the first and last tests, but we have to get the TEST count right!
+    //      If we don't, a test fails or the users get left behind (not too bad).
+    private static int TEST_COUNT = 22;
+    private static int testCounter = 0;
+
+    // Test usernames
+    private static final String USER0 = TEST_TERM_PREFIX+"user0";
+    private static final String USER1 = TEST_TERM_PREFIX+"user1";
+    private static final String USER2 = TEST_TERM_PREFIX+"user2";
+    private static final String USER3 = TEST_TERM_PREFIX+"user3";
+    private static final String USER4 = TEST_TERM_PREFIX+"user4";
+    private static final String USER5 = TEST_TERM_PREFIX+"user5";
+
+    // Test firstnames
+    private static final String FIRST_A = TEST_TERM_PREFIX+"FirstA";
+    private static final String FIRST_B = TEST_TERM_PREFIX+"FirstB";
+    private static final String FIRST_C = TEST_TERM_PREFIX+"FirstC";
+
+    // Test Lastnames
+    private static final String LAST_A = TEST_TERM_PREFIX+"LastA";
+    private static final String LAST_B = TEST_TERM_PREFIX+"LastB";
+    private static final String LAST_C = TEST_TERM_PREFIX+"LastC";
+
+    private static final List<String> testUsernames = new ArrayList<>();
+    private static final List<Person> testPersons = new ArrayList<>();
+    private static final List<NodeRef> testPersonNodeRefs = new ArrayList<>();
+    private static final String[][] userProperties = new String[][]
+    {
+        {USER0, FIRST_A, LAST_A},
+        {USER1, FIRST_A, LAST_B},
+        {USER2, FIRST_B, LAST_A},
+        {USER3, FIRST_C,},
+        {USER4, null   , LAST_A},
+        {USER5, null,    LAST_C},
+    };
+
+    // inputs
+    private String term = "";
+    private String orderBy = null;
+    private String fields = null;
+    private Paging paging;
+
+    // available for extra tests after call.
+    private Map<String, String> params;
+    private HttpResponse response;
+    private List<Person> people;
+
+    @Before
+    @Override
+    @SuppressWarnings("deprecation")
+    public void setup() throws Exception
+    {
+        super.setup();
+
+        if (testCounter++ == 0)
+        {
+            createTestUsers();
+        }
+        
+        paging = getPaging(0, 100);
+        params = new HashMap<>();
+        term = TEST_TERM_PREFIX;
+        orderBy = null;
+        fields = null;
+
+        setRequestContext(user1);
+    }
+
+    @After
+    @Override
+    public void tearDown() throws Exception
+    {
+        super.tearDown();
+
+        if (testCounter == TEST_COUNT)
+        {
+            deleteTestUsers();
+        }
+    }
+
+    // Helper method to create users. These are deleted on tearDown.
+    private void createTestUsers() throws IllegalArgumentException, SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException, RollbackException
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(user1);
+        for (String[] properties: userProperties)
+        {
+            int l = properties.length;
+            if (l > 0)
+            {
+                PersonInfo personInfo = newPersonInfo(properties);
+                String originalUsername = personInfo.getUsername();
+                String id = createUser(personInfo, networkOne);
+                Person person = new Person(
+                               id,
+                               null, // Not set to originalUsername, as the returned JSON does not set it
+                               true, // enabled
+                    personInfo.getFirstName(),
+                    personInfo.getLastName(),
+                    personInfo.getCompany(),
+                    personInfo.getSkype(),
+                    personInfo.getLocation(),
+                    personInfo.getTel(),
+                    personInfo.getMob(),
+                    personInfo.getInstantmsg(),
+                    personInfo.getGoogle(),
+                               null); // description
+                testUsernames.add(originalUsername);
+                testPersons.add(person);
+
+                // The following call to personService.getPerson(id) returns a NodeRef like:
+                //    workspace://SpacesStore/9db76769-96de-4de4-bdb4-a127130af362
+                // We call tenantService.getName(nodeRef) to get a fully qualified NodeRef as Solr returns this.
+                // They look like:
+                //    workspace://@org.alfresco.rest.api.tests.queriespeopleapitest@SpacesStore/9db76769-96de-4de4-bdb4-a127130af362
+                NodeRef nodeRef = personService.getPerson(id);
+                nodeRef = tenantService.getName(nodeRef);
+                testPersonNodeRefs.add(nodeRef);
+            }
+        }
+    }
+
+    private void deleteTestUsers()
+    {
+        for (String id: testUsernames)
+        {
+            try
+            {
+                deleteUser(id, null);
+            }
+            catch (Exception e)
+            {
+                System.err.println("Failed to delete test user "+id);
+            }
+        }
+        testPersons.clear();
+    }
+
+    // Helper method to create a PersonInfo object
+    // first 3 parameters are username, firstname, lastname unlike PersonInfo
+    // password defaults to "password"
+    private static PersonInfo newPersonInfo(String... properties) throws IllegalArgumentException
+    {
+        int l = properties.length;
+        if (l > 17)
+        {
+            throw new IllegalArgumentException("Too many properties supplied for "+properties);
+        }
+        return new PersonInfo(
+            (l <=  1 ? null : properties[ 1]),  // firstName
+            (l <=  2 ? null : properties[ 2]),  // lastName
+            (l <=  0 ? null : properties[ 0]),  // username
+
+            (l <=  3 || properties[ 3] == null
+               ? "password" : properties[ 3]),  // password
+            (l <=  4 ? null : new Company(
+                              properties[ 4],   // organization
+            (l <=  5 ? null : properties[ 5]),  // address1
+            (l <=  6 ? null : properties[ 6]),  // address2
+            (l <=  7 ? null : properties[ 7]),  // address3
+            (l <=  8 ? null : properties[ 8]),  // postcode
+            (l <=  9 ? null : properties[ 9]),  // telephone
+            (l <= 10 ? null : properties[10]),  // fax
+            (l <= 11 ? null : properties[11]))),// email
+            (l <= 12 ? null : properties[12]),  // skype
+            (l <= 13 ? null : properties[13]),  // location
+            (l <= 14 ? null : properties[14]),  // tel
+            (l <= 15 ? null : properties[15]),  // mob
+            (l <= 16 ? null : properties[16]),  // instantmsg
+            (l <= 17 ? null : properties[17])); // google
+    }
+
+    private void checkApiCall(String term, String orderBy, String fields, Paging paging,
+                              int expectedStatus,
+                              List<String> expectedPeople, int... userIds) throws Exception
+    {
+        createParamIdNotNull(Queries.PARAM_TERM, term);
+        createParamIdNotNull(Queries.PARAM_ORDERBY, orderBy);
+        createParamIdNotNull(Queries.PARAM_FIELDS, fields);
+
+        dummySearchServiceQueryNodeRefs.clear();
+        for (int i: userIds)
+        {
+            NodeRef nodeRef = testPersonNodeRefs.get(i);
+            dummySearchServiceQueryNodeRefs.add(nodeRef);
+        }
+
+        response = getAll(URL_QUERIES_LSP, paging, params, expectedStatus);
+
+        if (expectedStatus == 200)
+        {
+            String termWithEscapedAsterisks = term.replaceAll("\\*", "\\\\*");
+            String expectedQuery = "TYPE:\"{http://www.alfresco.org/model/content/1.0}person\" AND (\"*"+ termWithEscapedAsterisks +"*\")";
+            ArgumentCaptor<SearchParameters> searchParametersCaptor = ArgumentCaptor.forClass(SearchParameters.class);
+            verify(mockSearchService, times(++callCountToMockSearchService)).query(searchParametersCaptor.capture());
+            SearchParameters parameters = searchParametersCaptor.getValue();
+            assertEquals("Query", expectedQuery, parameters.getQuery());
+
+            people = Person.parsePeople(response.getJsonResponse()).getList();
+            
+            if (!expectedPeople.isEmpty())
+            {
+                StringJoiner actual = new StringJoiner("\n");
+                StringJoiner expected = new StringJoiner("\n");
+                for (String people : expectedPeople)
+                {
+                    expected.add(people);
+                }
+                for (Person person : people)
+                {
+                    actual.add(person.toString());
+                }
+                String exp = expected.toString().replaceAll(TEST_TERM_PREFIX, "");
+                String act = actual.toString().replaceAll(TEST_TERM_PREFIX, "");
+                assertEquals(exp, act);
+            }
+        }
+    }
+
+    private void createParamIdNotNull(String param, String value)
+    {
+        if (value != null && params != null)
+        {
+            params.put(param, value);
+        }
+    }
+
+    private List<String> expectedPeople(int... userIds)
+    {
+        List<String> list = new ArrayList<>();
+        for (int i : userIds)
+        {
+            Person person = testPersons.get(i);
+            String string = person.toString();
+            list.add(string);
+        }
+        return list;
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    public void testUnauthenticated() throws Exception
+    {
+        setRequestContext(null);
+
+        checkApiCall(term, orderBy, fields, paging, 401, null);
+    }
+
+    @Test
+    public void testOnlyTestUsersAndDefaultOrder() throws Exception
+    {
+        // Checks only test users are found as a result of using TEST_TERM_PREFIX.
+
+        // Also checks the default sort order (firstname lastname):
+        //  4   A
+        //  5   C
+        //  0 A A
+        //  1 A B
+        //  2 B A
+        //  3 C
+        checkApiCall(term, orderBy, fields, paging, 200, expectedPeople(4, 5, 0, 1, 2, 3), 4, 5, 0, 1, 2, 3);
+    }
+
+    @Test
+    public void testSearchFirstname() throws Exception
+    {
+        checkApiCall(FIRST_A, orderBy, fields, paging, 200, expectedPeople(0, 1), 0, 1);
+    }
+
+    @Test
+    public void testSearchLastName() throws Exception
+    {
+        checkApiCall(LAST_A, orderBy, fields, paging, 200, expectedPeople(4, 0, 2), 4, 0, 2);
+    }
+
+    @Test
+    public void testSearchUsername() throws Exception
+    {
+        checkApiCall(USER0, orderBy, fields, paging, 200, expectedPeople(0), 0);
+    }
+
+    @Test
+    public void testNoParams() throws Exception
+    {
+        params = null;
+        checkApiCall(term, orderBy, fields, paging, 400, null);
+    }
+
+    @Test
+    public void testNoTerm() throws Exception
+    {
+        checkApiCall(null, orderBy, fields, paging, 400, null);
+    }
+
+    @Test
+    public void testTermShorterThan2() throws Exception
+    {
+        checkApiCall("X", orderBy, fields, paging, 400, null);
+    }
+
+    @Test
+    public void testOrderbySameAsDefault() throws Exception
+    {
+        orderBy = "firstName asc, lastName"; // same as default (asc is default order)
+        checkApiCall(term, orderBy, fields, paging, 200, expectedPeople(4, 5, 0, 1, 2, 3), 4, 5, 0, 1, 2, 3);
+    }
+
+    @Test
+    public void testOrderbyDescAndAsc() throws Exception
+    {
+        //  4 C
+        //  3 B A
+        //  1 A A
+        //  2 A B
+        //  5   A
+        //  6   C
+        orderBy = "firstName desc, lastName";
+        checkApiCall(term, orderBy, fields, paging, 200, expectedPeople(3, 2, 0, 1, 4, 5), 3, 2, 0, 1, 4, 5);
+    }
+
+    @Test
+    public void testOrderbyDescAndDesc() throws Exception
+    {
+        //  4 C
+        //  3 B A
+        //  2 A B
+        //  1 A A
+        //  6   C
+        //  5   A
+        orderBy = "firstName desc, lastName desc";
+        checkApiCall(term, orderBy, fields, paging, 200, expectedPeople(3, 2, 1, 0, 5, 4), 3, 2, 1, 0, 5, 4);
+    }
+
+    @Test
+    public void testOrderbyId() throws Exception
+    {
+        orderBy = PARAM_PERSON_ID;
+        checkApiCall(term, orderBy, fields, paging, 200, expectedPeople(0, 1, 2, 3, 4, 5), 0, 1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void testBadOrderByField() throws Exception
+    {
+        orderBy = "rubbish";
+        checkApiCall(term, orderBy, fields, paging, 400, null);
+    }
+
+    @Test
+    public void testFieldsFirstLast() throws Exception
+    {
+        fields = PARAM_FIRSTNAME+","+PARAM_LASTNAME;
+        term = LAST_A;
+        List<String> expectedPeople = Arrays.asList(
+            "Person [" + "lastName=LastA, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER4
+            "Person [" + "firstName=FirstA, lastName=LastA, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER0
+            "Person [" + "firstName=FirstB, lastName=LastA, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]"  // USER2
+        );
+
+        checkApiCall(term, orderBy, fields, paging, 200, expectedPeople, 4, 0, 2);
+    }
+
+    @Test
+    public void testFieldsId() throws Exception
+    {
+        fields = PARAM_PERSON_ID;
+        String tenantSuffix = (useDefaultNetwork ? "" : "@"+networkOne.getId());
+        List<String> expectedPeople = Arrays.asList(
+            "Person [id=user4"+tenantSuffix+", company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER4
+            "Person [id=user0"+tenantSuffix+", company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER0
+            "Person [id=user2"+tenantSuffix+", company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]"  // USER2
+        );
+
+        checkApiCall(LAST_A, orderBy, fields, paging, 200, expectedPeople, 4, 0, 2);
+    }
+
+    @Test
+    public void testSearchFirstnameWithWildcard() throws Exception
+    {
+         term = FIRST_A.substring(0,FIRST_A.length()-3) + "*A";
+         checkApiCall(term, orderBy, fields, paging, 200, expectedPeople(0, 1), 0, 1);
+    }
+
+    @Test
+    public void testSearchLastNameWithWildcard() throws Exception
+    {
+        term = LAST_A;
+        term = term.substring(0,term.length()-3) + "*A";
+        checkApiCall(term, orderBy, fields, paging, 200, expectedPeople(4, 0, 2), 4, 0, 2);
+    }
+
+    @Test
+    public void testSearchUsernameWithWildcard() throws Exception
+    {
+        term = TEST_TERM_PREFIX+"us*1";
+        checkApiCall(term, orderBy, fields, paging, 200, expectedPeople(0), 0);
+    }
+
+    @Test
+    public void testOrderbyDescAndAscWithWildcard() throws Exception
+    {
+        //  3 B A
+        //  1 A A
+        //  5   A
+        term = TEST_TERM_PREFIX+"la*A";
+        orderBy = "firstName desc,lastName";
+        
+        checkApiCall(term, orderBy, fields, paging, 200, expectedPeople(2, 0, 4), 2, 0, 4);
+    }
+    
+    @Test
+    public void testOnlyWildcard() throws Exception
+    {
+        checkApiCall("*", orderBy, fields, paging, 400, null);
+    }
+    
+    @Test
+    public void testBadOrderByDirection() throws Exception
+    {
+        // note: also tested generically in RecognizedParamsExtractorTest
+        orderBy = "firstName rubbish, lastName asc";
+        checkApiCall(term, orderBy, fields, paging, 400, null);
+    }
+    
+    @Test
+    public void testFieldsWithSpace() throws Exception
+    {
+        fields = PARAM_FIRSTNAME+", "+PARAM_LASTNAME;
+        term = LAST_A;
+        List<String> expectedPeople = Arrays.asList(
+            "Person ["+                  "lastName=LastA, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER4
+            "Person ["+"firstName=FirstA, lastName=LastA, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER0
+            "Person ["+"firstName=FirstB, lastName=LastA, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]"  // USER2
+        );
+        
+        checkApiCall(term, orderBy, fields, paging, 200, expectedPeople, 4, 0, 2);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/QueriesSitesApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/QueriesSitesApiTest.java
new file mode 100644
index 00000000000..807f44bbf7a
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/QueriesSitesApiTest.java
@@ -0,0 +1,313 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.Queries;
+import org.alfresco.rest.api.model.Site;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.ArgumentCaptor;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+* V1 REST API tests for pre-defined 'live' search Queries on Sites
+ * 
+ * <ul>
+ * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/queries/sites} </li>
+ * </ul>
+ *
+ * @author janv
+ */
+public class QueriesSitesApiTest extends AbstractSingleNetworkSiteTest
+{
+    private static final String URL_QUERIES_LSS = "queries/sites";
+    
+    private SiteService siteService;
+
+    @Before
+    @Override
+    public void setup() throws Exception
+    {
+        super.setup();
+        siteService = (SiteService)applicationContext.getBean("SiteService");
+    }
+
+    // Note expectedIds defaults to ids
+    private void checkApiCall(String term, String orderBy, Paging paging, int expectedStatus, String[] expectedIds, String... ids) throws Exception
+    {
+        Map<String, String> params = new HashMap<>(1);
+        params.put(Queries.PARAM_TERM, "\"" + term + "\"");
+        if (orderBy != null)
+        {
+            params.put(Queries.PARAM_ORDERBY, orderBy);
+        }
+
+        dummySearchServiceQueryNodeRefs.clear();
+        for (String id: ids)
+        {
+            NodeRef nodeRef = getNodeRef(id);
+            dummySearchServiceQueryNodeRefs.add(nodeRef);
+        }
+        expectedIds = expectedIds != null ? expectedIds : ids;
+
+        HttpResponse response = getAll(URL_QUERIES_LSS, paging, params, 200);
+
+        if (expectedStatus == 200)
+        {
+            String termWithEscapedAsterisks = term.replaceAll("\\*", "\\\\*");
+            String expectedQuery = "TYPE:\"{http://www.alfresco.org/model/site/1.0}site\" AND (\"*"+ termWithEscapedAsterisks +"*\")";
+            ArgumentCaptor<SearchParameters> searchParametersCaptor = ArgumentCaptor.forClass(SearchParameters.class);
+            verify(mockSearchService, times(++callCountToMockSearchService)).query(searchParametersCaptor.capture());
+            SearchParameters parameters = searchParametersCaptor.getValue();
+            assertEquals("Query", expectedQuery, parameters.getQuery());
+
+            List<Site> sites = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Site.class);
+            assertEquals(expectedIds.length, sites.size());
+
+            if (orderBy != null)
+            {
+                for (int i=0; i<expectedIds.length; i++)
+                {
+                    String id = expectedIds[i];
+                    String actualId = sites.get(i).getId();
+                    assertEquals("Order "+i+":", id, actualId);
+                }
+            }
+        }
+    }
+
+   /**
+     * Tests basic api for nodes live search sites - metadata (id, title, description)
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/queries/sites}
+     */
+    @Test
+    public void testLiveSearchSites() throws Exception
+    {
+        setRequestContext(user1);
+        
+        int sCount = 5;
+        assertTrue(sCount > 4); // as relied on by test below
+        
+        List<String> siteIds = new ArrayList<>(sCount);
+
+        try
+        {
+            // As user 1 ...
+
+            Paging paging = getPaging(0, 100);
+
+            // We can no longer check the assumption that there is a clean repo (ie. no sites start with ab)
+            // in the same way as before which used search - Generally ok not to check.
+
+            String siteI = "a";
+            String siteT = "siteT";
+            String siteD = "siteD";
+
+            int charValue = siteI.charAt(0);
+            
+            // create some some sites with site id: ab00001, abc00002, abcd00003, abcde00004, abcdef00005 (and some specific titles and descriptions)
+            for (int i = 1; i <= sCount; i++)
+            {
+                String num = String.format("%05d", i);
+
+                charValue = charValue+1;
+                siteI = siteI + String.valueOf((char)charValue);
+
+                String siteId = siteI + num + RUNID;
+                String siteTitle = siteT + num + siteT;
+                String siteDescrip = siteD + num + siteD;
+
+                // create site
+                String createdSiteId = createSite(siteId, siteTitle, siteDescrip, SiteVisibility.PRIVATE, 201).getId();
+                siteIds.add(createdSiteId);
+            }
+            String ab = siteIds.get(0);
+            String abc = siteIds.get(1);
+            String abcd = siteIds.get(2);
+            String abcde = siteIds.get(3);
+            String abcdef = siteIds.get(4);
+
+            // basic search tests
+            {
+                // Search hits based on site id
+                checkApiCall("ab", null, paging, 200, null, ab, abc, abcd, abcde, abcdef);
+                checkApiCall("abc", null, paging, 200, null, abc, abcd, abcde, abcdef);
+                checkApiCall("abcd", null, paging, 200, null, abcd, abcde, abcdef);
+                checkApiCall("abcde", null, paging, 200, null, abcde, abcdef);
+
+                // Single search hit based on site id
+                checkApiCall("abcd00003", null, paging, 200, null, abcd);
+
+                // Search hits based on site title
+                checkApiCall(siteT, null, paging, 200, null, ab, abc, abcd, abcde, abcdef);
+
+                // Single search hit based on site title
+                checkApiCall(siteT + String.format("%05d", 2) + siteT, null, paging, 200, null, abc);
+
+                // Search hits based on site description
+                checkApiCall(siteD + "*", null, paging, 200, null, ab, abc, abcd, abcde, abcdef);
+
+                // Single search hit based on site description
+                checkApiCall(siteD + String.format("%05d", 3) + siteD, null, paging, 200, null, abcd);
+            }
+
+            // -ve tests
+            {
+                // -ve test - no params (ie. no term)
+                getAll(URL_QUERIES_LSS, paging, null, 400);
+
+                // -ve test - term too short
+                Map<String, String> params = new HashMap<>(1);
+                params.put(Queries.PARAM_TERM, "a");
+                getAll(URL_QUERIES_LSS, paging, params, 400);
+
+                // -ve test - term is still too short
+                params = new HashMap<>(1);
+                params.put(Queries.PARAM_TERM, "  \"a *\"  ");
+                getAll(URL_QUERIES_LSS, paging, params, 400);
+
+                // -ve test - unauthenticated - belts-and-braces ;-)
+                setRequestContext(null);
+                getAll(URL_QUERIES_LSS, paging, params, 401);
+            }
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            
+            for (String siteId : siteIds)
+            {
+                deleteSite(siteId, true, 204);
+            }
+        }
+    }
+
+    private NodeRef getNodeRef(String createdSiteId)
+    {
+        AuthenticationUtil.setFullyAuthenticatedUser(user1);
+        // The following call to siteService.getSite(createdSiteId).getNodeRef() returns a NodeRef like:
+        //    workspace://SpacesStore/9db76769-96de-4de4-bdb4-a127130af362
+        // We call tenantService.getName(nodeRef) to get a fully qualified NodeRef as Solr returns this.
+        // They look like:
+        //    workspace://@org.alfresco.rest.api.tests.queriespeopleapitest@SpacesStore/9db76769-96de-4de4-bdb4-a127130af362
+        NodeRef nodeRef = siteService.getSite(createdSiteId).getNodeRef();
+        nodeRef = tenantService.getName(nodeRef);
+        return nodeRef;
+    }
+
+    @Test
+    public void testLiveSearchSites_SortPage() throws Exception
+    {
+        setRequestContext(user1);
+        
+        List<String> siteIds = new ArrayList<>(5);
+
+        try
+        {
+            // As user 1 ...
+
+            Paging paging = getPaging(0, 100);
+            
+            // create site
+            String s1 = createSite("siABCDEF"+RUNID, "ABCDEF DEF", "sdABCDEF", SiteVisibility.PRIVATE, 201).getId();
+            String s2 = createSite("siABCD"+RUNID, "ABCD DEF", "sdABCD", SiteVisibility.PRIVATE, 201).getId();
+            String s3 = createSite("siABCDE"+RUNID, "ABCDE DEF", "sdABCDE", SiteVisibility.PRIVATE, 201).getId();
+            String s4 = createSite("siAB"+RUNID, "AB DEF", "sdAB", SiteVisibility.PRIVATE, 201).getId();
+            String s5 = createSite("siABC"+RUNID, "ABC DEF", "sdABC", SiteVisibility.PRIVATE, 201).getId();
+            
+            // test sort order
+            {
+                // default sort order - title asc
+                checkApiCall("siAB", null, paging, 200, null, s4, s5, s2, s3, s1);
+
+                // sort order - title asc
+                checkApiCall("siAB", "title asc", paging, 200, null, s4, s5, s2, s3, s1);
+
+                // sort order - title desc
+                checkApiCall("siAB", "title desc", paging, 200, null, s1, s3, s2, s5, s4);
+            }
+
+            // basic paging tests
+            {
+                // sort order - title desc
+                checkApiCall("siAB", "title desc", getPaging(0, 2), 200, new String[] {s1, s3}, s1, s3, s2, s5, s4);
+                checkApiCall("siAB", "title desc", getPaging(2, 2), 200, new String[] {s2, s5}, s1, s3, s2, s5, s4);
+                checkApiCall("siAB", "title desc", getPaging(4, 2), 200, new String[] {s4}, s1, s3, s2, s5, s4);
+            }
+            
+            // -ve tests
+            {
+                // -ve test - invalid sort field
+                Map<String, String> params = new HashMap<>(2);
+                params.put(Queries.PARAM_TERM, "siAB");
+                params.put(Queries.PARAM_ORDERBY, "invalid asc");
+                getAll(URL_QUERIES_LSS, paging, params, 400);
+
+                // -ve test - unauthenticated - belts-and-braces ;-)
+                setRequestContext(null);
+                getAll(URL_QUERIES_LSS, paging, params, 401);
+            }
+        }
+        finally
+        {
+            // some cleanup
+            setRequestContext(user1);
+            for (String siteId : siteIds)
+            {
+                deleteSite(siteId, true, 204);
+            }
+        }
+    }
+    
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/RenditionsTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/RenditionsTest.java
new file mode 100644
index 00000000000..a8451666b90
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/RenditionsTest.java
@@ -0,0 +1,1094 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests;
+
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsString;
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import com.google.common.collect.Ordering;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.rendition2.RenditionService2Impl;
+import org.alfresco.repo.rendition2.SynchronousTransformClient;
+import org.alfresco.rest.api.model.Site;
+import org.alfresco.rest.api.nodes.NodesEntityResource;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedErrorResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.data.ContentInfo;
+import org.alfresco.rest.api.tests.client.data.DirectAccessUrlRequest;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.Rendition;
+import org.alfresco.rest.api.tests.client.data.Rendition.RenditionStatus;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder.FileData;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder.MultiPartRequest;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.cmr.thumbnail.ThumbnailService;
+import org.alfresco.util.TempFileProvider;
+import org.joda.time.DateTime;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * V1 REST API tests for Renditions
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class RenditionsTest extends AbstractBaseApiTest
+{
+    /**
+     * Test network one
+     */
+    TestNetwork networkN1;
+
+    /**
+     * User one from network one
+     */
+    private TestPerson userOneN1;
+
+    /**
+     * Private site of user one from network one
+     */
+    private Site userOneN1Site;
+    
+    private final static long DELAY_IN_MS = 500;
+
+    protected static ContentService contentService;
+    private static SynchronousTransformClient synchronousTransformClient;
+
+    @Before
+    public void setup() throws Exception
+    {
+        contentService = applicationContext.getBean("contentService", ContentService.class);
+        synchronousTransformClient = applicationContext.getBean("synchronousTransformClient", SynchronousTransformClient.class);
+        networkN1 = repoService.createNetworkWithAlias("ping", true);
+        networkN1.create();
+        userOneN1 = networkN1.createUser();
+
+        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
+
+        String siteTitle = "RandomSite" + System.currentTimeMillis();
+        userOneN1Site = createSite(siteTitle, SiteVisibility.PRIVATE);
+    }
+
+    @After
+    public void tearDown() throws Exception
+    {
+        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
+        deleteSite(userOneN1Site.getId(), true, 204);
+    }
+
+    /**
+     * Tests get node renditions.
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/renditions}
+     */
+    @Test
+    public void testListNodeRenditions() throws Exception
+    {
+        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
+        
+        // Create a folder within the site document's library
+        String folderName = "folder" + System.currentTimeMillis();
+        String folder_Id = addToDocumentLibrary(userOneN1Site, folderName, TYPE_CM_FOLDER, userOneN1.getId());
+
+        // Create multipart request
+        String fileName = "quick.pdf";
+        File file = getResourceFile(fileName);
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file));
+        MultiPartRequest reqBody = multiPartBuilder.build();
+
+        // Upload quick.pdf file into 'folder'
+        HttpResponse response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String contentNodeId = document.getId();
+
+        Paging paging = getPaging(0, 50);
+        // List all available renditions (includes those that have been created and those that are yet to be created)
+        response = getAll(getNodeRenditionsUrl(contentNodeId), paging, 200);
+        List<Rendition> renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertTrue(renditions.size() >= 5);
+        Rendition docLib = getRendition(renditions, "doclib");
+        assertNotNull(docLib);
+        assertEquals(RenditionStatus.NOT_CREATED, docLib.getStatus());
+        ContentInfo contentInfo = docLib.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_IMAGE_PNG, contentInfo.getMimeType());
+        assertEquals("PNG Image", contentInfo.getMimeTypeName());
+        assertNull(contentInfo.getEncoding());
+        assertNull(contentInfo.getSizeInBytes());
+
+        // Add a filter to select the renditions based on the given status
+        Map<String, String> params = new HashMap<>(1);
+        params.put("where", "(status='NOT_CREATED')");
+        // List only the NOT_CREATED renditions
+        response = getAll(getNodeRenditionsUrl(contentNodeId), paging, params, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertTrue(renditions.size() >= 5);
+
+        params.put("where", "(status='CREATED')");
+        // List only the CREATED renditions
+        response = getAll(getNodeRenditionsUrl(contentNodeId), paging, params, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertEquals("There is no rendition created yet.", 0, renditions.size());
+
+        // Test paging
+        // SkipCount=0,MaxItems=2
+        paging = getPaging(0, 2);
+        // List all available renditions
+        response = getAll(getNodeRenditionsUrl(contentNodeId), paging, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertEquals(2, renditions.size());
+        ExpectedPaging expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+        assertEquals(2, expectedPaging.getCount().intValue());
+        assertEquals(0, expectedPaging.getSkipCount().intValue());
+        assertEquals(2, expectedPaging.getMaxItems().intValue());
+        assertTrue(expectedPaging.getTotalItems() >= 5);
+        assertTrue(expectedPaging.getHasMoreItems());
+
+        // SkipCount=2,MaxItems=3
+        paging = getPaging(2, 3);
+        // List all available renditions
+        response = getAll(getNodeRenditionsUrl(contentNodeId), paging, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertEquals(3, renditions.size());
+        expectedPaging = RestApiUtil.parsePaging(response.getJsonResponse());
+        assertEquals(3, expectedPaging.getCount().intValue());
+        assertEquals(2, expectedPaging.getSkipCount().intValue());
+        assertEquals(3, expectedPaging.getMaxItems().intValue());
+        assertTrue(expectedPaging.getTotalItems() >= 5);
+
+        // Create 'doclib' rendition
+        createAndGetRendition(contentNodeId, docLib.getId());
+
+        // List all available renditions (includes those that have been created and those that are yet to be created)
+        paging = getPaging(0, 50);
+        response = getAll(getNodeRenditionsUrl(contentNodeId), paging, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertTrue(renditions.size() >= 5);
+        docLib = getRendition(renditions, "doclib");
+        assertNotNull(docLib);
+        assertEquals(RenditionStatus.CREATED, docLib.getStatus());
+        contentInfo = docLib.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_IMAGE_PNG, contentInfo.getMimeType());
+        assertEquals("PNG Image", contentInfo.getMimeTypeName());
+        assertNotNull(contentInfo.getEncoding());
+        assertTrue(contentInfo.getSizeInBytes() > 0);
+
+        // List only the CREATED renditions
+        response = getAll(getNodeRenditionsUrl(contentNodeId), paging, params, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertEquals("Should've only returned the 'doclib' rendition.", 1, renditions.size());
+
+        params.put("where", "(status='NOT_CREATED')");
+        // List only the NOT_CREATED renditions
+        response = getAll(getNodeRenditionsUrl(contentNodeId), paging, params, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertTrue(renditions.size() > 0);
+        docLib = getRendition(renditions, "doclib");
+        assertNull("'doclib' rendition has already been created.", docLib);
+
+        // Test returned renditions are ordered (natural sort order)
+        // List all renditions
+        response = getAll(getNodeRenditionsUrl(contentNodeId), paging, params, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertTrue(Ordering.natural().isOrdered(renditions));
+        // Try again to make sure the ordering wasn't coincidental
+        response = getAll(getNodeRenditionsUrl(contentNodeId), paging, params, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertTrue(Ordering.natural().isOrdered(renditions));
+
+        // nodeId in the path parameter does not represent a file
+        getAll(getNodeRenditionsUrl(folder_Id), paging, params, 400);
+
+        // nodeId in the path parameter does not exist
+        getAll(getNodeRenditionsUrl(UUID.randomUUID().toString()), paging, params, 404);
+
+        // Create a node without any content
+        String emptyContentNodeId = addToDocumentLibrary(userOneN1Site, "emptyDoc.txt", TYPE_CM_CONTENT, userOneN1.getId());
+        getAll(getNodeRenditionsUrl(emptyContentNodeId), paging, params, 200);
+
+        // Invalid status value
+        params.put("where", "(status='WRONG')");
+        getAll(getNodeRenditionsUrl(contentNodeId), paging, params, 400);
+
+        // Invalid filter (only 'status' is supported)
+        params.put("where", "(id='doclib')");
+        getAll(getNodeRenditionsUrl(contentNodeId), paging, params, 400);
+    }
+
+    /**
+     * Tests get node rendition.
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/renditions/<renditionId>}
+     */
+    @Test
+    public void testGetNodeRendition() throws Exception
+    {
+        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
+        
+        // Create a folder within the site document's library
+        String folderName = "folder" + System.currentTimeMillis();
+        String folder_Id = addToDocumentLibrary(userOneN1Site, folderName, TYPE_CM_FOLDER, userOneN1.getId());
+
+        // Create multipart request
+        String fileName = "quick.pdf";
+        File file = getResourceFile(fileName);
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file));
+        MultiPartRequest reqBody = multiPartBuilder.build();
+
+        // Upload quick.pdf file into 'folder'
+        HttpResponse response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String contentNodeId = document.getId();
+
+        // pause briefly
+        Thread.sleep(DELAY_IN_MS);
+
+        // Get rendition (not created yet) information for node
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), "doclib", 200);
+        Rendition rendition = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Rendition.class);
+        assertNotNull(rendition);
+        assertEquals(RenditionStatus.NOT_CREATED, rendition.getStatus());
+        ContentInfo contentInfo = rendition.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_IMAGE_PNG, contentInfo.getMimeType());
+        assertEquals("PNG Image", contentInfo.getMimeTypeName());
+        assertNull("Shouldn't have returned the encoding, as the rendition hasn't been created yet.", contentInfo.getEncoding());
+        assertNull("Shouldn't have returned the size, as the rendition hasn't been created yet.", contentInfo.getSizeInBytes());
+
+        // Create and get 'doclib' rendition
+        rendition = createAndGetRendition(contentNodeId, "doclib");
+        assertNotNull(rendition);
+        assertEquals(RenditionStatus.CREATED, rendition.getStatus());
+        contentInfo = rendition.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_IMAGE_PNG, contentInfo.getMimeType());
+        assertEquals("PNG Image", contentInfo.getMimeTypeName());
+        assertNotNull(contentInfo.getEncoding());
+        assertTrue(contentInfo.getSizeInBytes() > 0);
+
+        // nodeId in the path parameter does not represent a file
+        getSingle(getNodeRenditionsUrl(folder_Id), "doclib", 400);
+
+        // nodeId in the path parameter does not exist
+        getSingle(getNodeRenditionsUrl(UUID.randomUUID().toString()), "doclib", 404);
+
+        // renditionId in the path parameter is not registered/available
+        getSingle(getNodeRenditionsUrl(contentNodeId), ("renditionId" + System.currentTimeMillis()), 404);
+
+        // Create a node without any content. Test only if OpenOffice is available
+        if(isOpenOfficeAvailable())
+        {
+            String emptyContentNodeId = addToDocumentLibrary(userOneN1Site, "emptyDoc.txt", TYPE_CM_CONTENT, userOneN1.getId());
+            getSingle(getNodeRenditionsUrl(emptyContentNodeId), "doclib", 200);
+        }
+
+        // Create multipart request
+        String jpgFileName = "quick.jpg";
+        File jpgFile = getResourceFile(fileName);
+        reqBody = MultiPartBuilder.create()
+                    .setFileData(new FileData(jpgFileName, jpgFile))
+                    .build();
+
+        // Upload quick.jpg file into 'folder'
+        response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document jpgImage = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String jpgImageNodeId = jpgImage.getId();
+
+        // List all available renditions (includes those that have been created and those that are yet to be created)
+        response = getAll(getNodeRenditionsUrl(jpgImageNodeId), getPaging(0, 50), 200);
+        List<Rendition> renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        // Check there is no pdf rendition is available for the jpg file
+        Rendition pdf = getRendition(renditions, "pdf");
+        assertNull(pdf);
+
+        // The renditionId (pdf) is registered but it is not applicable for the node's mimeType
+        getSingle(getNodeRenditionsUrl(jpgImageNodeId), "pdf", 404);
+    }
+
+    /**
+     * Tests create rendition.
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/renditions}
+     */
+    @Test
+    public void testCreateRendition() throws Exception
+    {
+        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
+        
+        // Create a folder within the site document's library
+        String folderName = "folder" + System.currentTimeMillis();
+        String folder_Id = addToDocumentLibrary(userOneN1Site, folderName, TYPE_CM_FOLDER, userOneN1.getId());
+
+        // Create multipart request
+        String fileName = "quick.pdf";
+        File file = getResourceFile(fileName);
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file));
+        MultiPartRequest reqBody = multiPartBuilder.build();
+
+        // Upload quick.pdf file into 'folder'
+        HttpResponse response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String contentNodeId = document.getId();
+
+        // pause briefly
+        Thread.sleep(DELAY_IN_MS);
+
+        // Get rendition (not created yet) information for node
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), "imgpreview", 200);
+        Rendition rendition = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Rendition.class);
+        assertNotNull(rendition);
+        assertEquals(RenditionStatus.NOT_CREATED, rendition.getStatus());
+
+        // Try to download non-existent rendition (and no placeholder)
+        Map<String, String> params = new HashMap<>();
+        params.put("placeholder", "false");
+        getSingle(getNodeRenditionsUrl(contentNodeId), ("doclib/content"), params, 404);
+
+        // Download placeholder instead
+        params = new HashMap<>();
+        params.put("placeholder", "true");
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), ("doclib/content"), params, 200);
+        assertNotNull(response.getResponseAsBytes());
+
+        // Create and get 'imgpreview' rendition
+        rendition = createAndGetRendition(contentNodeId, "imgpreview");
+        assertNotNull(rendition);
+        assertEquals(RenditionStatus.CREATED, rendition.getStatus());
+        ContentInfo contentInfo = rendition.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_IMAGE_JPEG, contentInfo.getMimeType());
+        assertEquals("JPEG Image", contentInfo.getMimeTypeName());
+        assertNotNull(contentInfo.getEncoding());
+        assertTrue(contentInfo.getSizeInBytes() > 0);
+
+        // Create 'doclib' rendition request
+        Rendition renditionRequest = new Rendition().setId("doclib");
+
+        // Test only if OpenOffice is available
+        if (isOpenOfficeAvailable())
+        {
+        // Create a node without any content
+        String emptyContentNodeId = addToDocumentLibrary(userOneN1Site, "emptyDoc.txt", TYPE_CM_CONTENT, userOneN1.getId());
+        post(getNodeRenditionsUrl(emptyContentNodeId), toJsonAsString(renditionRequest), 202);
+
+        // Rendition for binary content
+        String content = "The quick brown fox jumps over the lazy dog.";
+        file = TempFileProvider.createTempFile(new ByteArrayInputStream(content.getBytes()), getClass().getSimpleName(), ".bin");
+        multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData("binaryFileName", file));
+        reqBody = multiPartBuilder.build();
+        response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document binaryDocument = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        post(getNodeRenditionsUrl(binaryDocument.getId()), toJsonAsString(renditionRequest), 202);
+        }
+
+        //
+        // -ve Tests
+        //
+        
+        // The rendition requested already exists
+        response = post(getNodeRenditionsUrl(contentNodeId), toJsonAsString(new Rendition().setId("imgpreview")), 409);
+        ExpectedErrorResponse errorResponse = RestApiUtil.parseErrorResponse(response.getJsonResponse());
+        assertNotNull(errorResponse);
+        assertNotNull(errorResponse.getErrorKey());
+        assertNotNull(errorResponse.getBriefSummary());
+        assertNotNull(errorResponse.getStackTrace());
+        assertNotNull(errorResponse.getDescriptionURL());
+        assertEquals(409, errorResponse.getStatusCode());
+
+        // nodeId in the path parameter does not represent a file
+        post(getNodeRenditionsUrl(folder_Id), toJsonAsString(renditionRequest), 400);
+
+        // nodeId in the path parameter does not exist
+        response = post(getNodeRenditionsUrl(UUID.randomUUID().toString()), toJsonAsString(renditionRequest), 404);
+        // EntityNotFoundException
+        errorResponse = RestApiUtil.parseErrorResponse(response.getJsonResponse());
+        assertNotNull(errorResponse);
+        assertNotNull(errorResponse.getErrorKey());
+        assertNotNull(errorResponse.getBriefSummary());
+        assertNotNull(errorResponse.getStackTrace());
+        assertNotNull(errorResponse.getDescriptionURL());
+        assertEquals(404, errorResponse.getStatusCode());
+
+        // renditionId is not registered
+        final String randomRenditionId = "renditionId" + System.currentTimeMillis();
+        post(getNodeRenditionsUrl(contentNodeId), toJsonAsString(new Rendition().setId(randomRenditionId)), 404);
+
+        // renditionId is null
+        post(getNodeRenditionsUrl(contentNodeId), toJsonAsString(new Rendition().setId(null)), 400);
+
+        // renditionId is empty
+        post(getNodeRenditionsUrl(contentNodeId), toJsonAsString(new Rendition().setId("")), 400);
+
+        // Multiple rendition request (as of ACS 6.1)
+
+        // Multiple rendition request, including an empty id
+        List<Rendition> multipleRenditionRequest = new ArrayList<>(2);
+        multipleRenditionRequest.add(new Rendition().setId(""));
+        multipleRenditionRequest.add(new Rendition().setId("medium"));
+        post(getNodeRenditionsUrl(contentNodeId), toJsonAsString(multipleRenditionRequest), 400);
+
+        // Multiple rendition request. doclib has already been done
+        multipleRenditionRequest = new ArrayList<>(3);
+        multipleRenditionRequest.add(new Rendition().setId("doclib"));
+        multipleRenditionRequest.add(new Rendition().setId("medium"));
+        multipleRenditionRequest.add(new Rendition().setId("avatar,avatar32"));
+        post(getNodeRenditionsUrl(contentNodeId), toJsonAsString(multipleRenditionRequest), 202);
+        assertRenditionCreatedWithWait(contentNodeId, "doclib", "medium", "avatar", "avatar32");
+
+        // Multiple rendition request. All have already been done.
+        multipleRenditionRequest = new ArrayList<>(2);
+        multipleRenditionRequest.add(new Rendition().setId("doclib"));
+        multipleRenditionRequest.add(new Rendition().setId("medium"));
+        multipleRenditionRequest.add(new Rendition().setId("avatar"));
+        post(getNodeRenditionsUrl(contentNodeId), toJsonAsString(multipleRenditionRequest), 409);
+
+        // Disable thumbnail generation
+        RenditionService2Impl renditionService2 = applicationContext.getBean("renditionService2", RenditionService2Impl.class);
+        renditionService2.setThumbnailsEnabled(false);
+        try
+        {
+            // Create multipart request
+            String txtFileName = "quick-1.txt";
+            File txtFile = getResourceFile(fileName);
+            reqBody = MultiPartBuilder.create().setFileData(new FileData(txtFileName, txtFile)).build();
+
+            // Upload quick-1.txt file into 'folder'
+            response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+            Document txtDocument = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+            // Thumbnail generation has been disabled
+            response = post(getNodeRenditionsUrl(txtDocument.getId()), toJsonAsString(renditionRequest), 501);
+            errorResponse = RestApiUtil.parseErrorResponse(response.getJsonResponse());
+            assertNotNull(errorResponse);
+            assertNotNull(errorResponse.getErrorKey());
+            assertNotNull(errorResponse.getBriefSummary());
+            assertNotNull(errorResponse.getStackTrace());
+            assertNotNull(errorResponse.getDescriptionURL());
+            assertEquals(501, errorResponse.getStatusCode());
+        }
+        finally
+        {
+            renditionService2.setThumbnailsEnabled(true);
+        }
+    }
+
+    /**
+     * Tests create rendition when on upload/create of a file
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/children}
+     */
+    @Test
+    public void testCreateRenditionOnUpload() throws Exception
+    {
+        String userId = userOneN1.getId();
+        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
+
+        // Create a folder within the site document's library
+        String folderName = "folder" + System.currentTimeMillis();
+        String folder_Id = addToDocumentLibrary(userOneN1Site, folderName, TYPE_CM_FOLDER, userId);
+
+        // Create multipart request - pdf file
+        String renditionName = "doclib";
+        String fileName = "quick.pdf";
+        File file = getResourceFile(fileName);
+        MultiPartRequest reqBody = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file))
+                .setRenditions(Collections.singletonList(renditionName))
+                .build();
+
+        // Upload quick.pdf file into 'folder' - including request to create 'doclib' thumbnail
+        HttpResponse response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String contentNodeId = document.getId();
+
+        // wait and check that rendition is created ...
+        Rendition rendition = waitAndGetRendition(contentNodeId, null, renditionName);
+        assertNotNull(rendition);
+        assertEquals(RenditionStatus.CREATED, rendition.getStatus());
+
+        Map<String, String> params = new HashMap<>();
+        params.put("placeholder", "false");
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), ("doclib/content"), params, 200);
+        assertNotNull(response.getResponseAsBytes());
+
+        if(isOpenOfficeAvailable())
+        {
+            // Create multipart request - Word doc file
+            renditionName = "doclib";
+            fileName = "farmers_markets_list_2003.doc";
+            file = getResourceFile(fileName);
+            reqBody = MultiPartBuilder.create()
+                    .setFileData(new FileData(fileName, file))
+                    .setRenditions(Collections.singletonList(renditionName))
+                    .build();
+
+            // Upload file into 'folder' - including request to create 'doclib' thumbnail
+            response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+            document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+            contentNodeId = document.getId();
+
+            assertRenditionCreatedWithWait(contentNodeId, renditionName);
+        }
+
+        /* RA-834: commented-out since not currently applicable for empty file
+        Document d1 = new Document();
+        d1.setName("d1.txt");
+        d1.setNodeType("cm:content");
+        ContentInfo ci = new ContentInfo();
+        ci.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+        d1.setContent(ci);
+
+        // create empty file including request to generate a thumbnail
+        renditionName = "doclib";
+        response = post(getNodeChildrenUrl(folder_Id), userId, toJsonAsStringNonNull(d1), "?renditions="+renditionName, 201);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String d1Id = documentResp.getId();
+
+        // wait and check that rendition is created ...
+        rendition = waitAndGetRendition(userId, d1Id, renditionName);
+        assertNotNull(rendition);
+        assertEquals(RenditionStatus.CREATED, rendition.getStatus());
+        */
+
+        // Multiple renditions requested
+        reqBody = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file))
+                .setAutoRename(true)
+                .setRenditions(Arrays.asList(new String[]{"doclib,imgpreview"}))
+                .build();
+        post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+
+        // Unknown rendition
+        reqBody = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file))
+                .setAutoRename(true)
+                .setRenditions(Arrays.asList(new String[]{"unknown"}))
+                .build();
+        post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 404);
+
+        // ThumbnailService is disabled
+        ThumbnailService thumbnailService = applicationContext.getBean("thumbnailService", ThumbnailService.class);
+        thumbnailService.setThumbnailsEnabled(false);
+        try
+        {
+            // Create multipart request
+            String txtFileName = "quick-1.txt";
+            File txtFile = getResourceFile(fileName);
+            reqBody = MultiPartBuilder.create()
+                    .setFileData(new FileData(txtFileName, txtFile))
+                    .setRenditions(Arrays.asList(new String[]{"doclib"}))
+                    .build();
+
+            post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        }
+        finally
+        {
+            thumbnailService.setThumbnailsEnabled(true);
+        }
+    }
+
+    protected void assertRenditionCreatedWithWait(String contentNodeId, String... renditionNames) throws Exception
+    {
+        for (String renditionName : renditionNames)
+        {
+            Rendition rendition = waitAndGetRendition(contentNodeId, null, renditionName);
+            assertNotNull(rendition);
+            assertEquals(RenditionStatus.CREATED, rendition.getStatus());
+        }
+    }
+
+    /**
+     * Tests create rendition after uploading new version(s)
+     *
+     */
+    @Test
+    public void testCreateRenditionForNewVersion() throws Exception
+    {
+        String PROP_LTM = "cm:lastThumbnailModification";
+        
+        String RENDITION_NAME = "imgpreview";
+        
+        String userId = userOneN1.getId();
+        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
+
+        // Create a folder within the site document's library
+        String folderName = "folder" + System.currentTimeMillis();
+        String folder_Id = addToDocumentLibrary(userOneN1Site, folderName, TYPE_CM_FOLDER, userId);
+
+        // Create multipart request - pdf file
+        String fileName = "quick.pdf";
+        File file = getResourceFile(fileName);
+        MultiPartRequest reqBody = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file))
+                .build();
+        Map<String, String> params = Collections.singletonMap("include", "properties");
+
+        // Upload quick.pdf file into 'folder' - do not include request to create 'doclib' thumbnail
+        HttpResponse response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), params, null, "alfresco", reqBody.getContentType(), 201);
+        Document document1 = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String contentNodeId = document1.getId();
+        assertNotNull(document1.getProperties());
+        assertNull(document1.getProperties().get(PROP_LTM));
+        
+        // pause briefly
+        Thread.sleep(DELAY_IN_MS);
+
+        // Get rendition (not created yet) information for node
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), RENDITION_NAME, 200);
+        Rendition rendition = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Rendition.class);
+        assertNotNull(rendition);
+        assertEquals(RenditionStatus.NOT_CREATED, rendition.getStatus());
+
+        params = new HashMap<>();
+        params.put("placeholder", "false");
+        getSingle(getNodeRenditionsUrl(contentNodeId), (RENDITION_NAME+"/content"), params, 404);
+        
+        // TODO add test to request creation of rendition as another user (that has read-only access on the content, not write)
+
+        // Create and get 'imgpreview' rendition
+        rendition = createAndGetRendition(contentNodeId, RENDITION_NAME);
+        assertNotNull(rendition);
+        assertEquals(RenditionStatus.CREATED, rendition.getStatus());
+        ContentInfo contentInfo = rendition.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_IMAGE_JPEG, contentInfo.getMimeType());
+        assertEquals("JPEG Image", contentInfo.getMimeTypeName());
+        assertNotNull(contentInfo.getEncoding());
+        assertTrue(contentInfo.getSizeInBytes() > 0);
+
+        params = new HashMap<>();
+        params.put("placeholder", "false");
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), (RENDITION_NAME+"/content"), params, 200);
+        
+        byte[] renditionBytes1 = response.getResponseAsBytes();
+        assertNotNull(renditionBytes1);
+        
+        // check node details ...
+        params = Collections.singletonMap("include", "properties");
+        response = getSingle(NodesEntityResource.class, contentNodeId, params, 200);
+        Document document1b = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        
+        assertEquals(document1b.getModifiedAt(), document1.getModifiedAt());
+        assertEquals(document1b.getModifiedByUser().getId(), document1.getModifiedByUser().getId());
+        assertEquals(document1b.getModifiedByUser().getDisplayName(), document1.getModifiedByUser().getDisplayName());
+        
+        assertNotEquals(document1b.getProperties().get(PROP_LTM), document1.getProperties().get(PROP_LTM));
+        
+        // upload another version of "quick.pdf" and check again
+        
+        fileName = "quick-2.pdf";
+        file = getResourceFile(fileName);
+        reqBody = MultiPartBuilder.create()
+                .setFileData(new FileData("quick.pdf", file))
+                .setOverwrite(true)
+                .build();
+
+        response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, null, "alfresco", reqBody.getContentType(), 201);
+        Document document2 = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals(contentNodeId, document2.getId());
+
+        // wait to allow new version of the rendition to be created ...
+        Thread.sleep(DELAY_IN_MS * 4);
+
+        params = new HashMap<>();
+        params.put("placeholder", "false");
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), (RENDITION_NAME+"/content"), params, 200);
+        assertNotNull(response.getResponseAsBytes());
+        
+        // check rendition binary has changed
+        assertNotEquals(renditionBytes1, response.getResponseAsBytes());
+
+        // check node details ...
+        params = Collections.singletonMap("include", "properties");
+        response = getSingle(NodesEntityResource.class, contentNodeId, params, 200);
+        Document document2b = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        assertTrue(document2b.getModifiedAt().after(document1.getModifiedAt()));
+        assertEquals(document2b.getModifiedByUser().getId(), document1.getModifiedByUser().getId());
+        assertEquals(document2b.getModifiedByUser().getDisplayName(), document1.getModifiedByUser().getDisplayName());
+        
+        // check last thumbnail modification property has changed ! (REPO-1644)
+        assertNotEquals(document2b.getProperties().get(PROP_LTM), document1b.getProperties().get(PROP_LTM));
+    }
+
+    /**
+     * Tests download rendition.
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/renditions/<renditionId>/content}
+     */
+    @Test
+    public void testDownloadRendition() throws Exception
+    {
+        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
+        
+        // Create a folder within the site document's library
+        String folderName = "folder" + System.currentTimeMillis();
+        String folder_Id = addToDocumentLibrary(userOneN1Site, folderName, TYPE_CM_FOLDER, userOneN1.getId());
+
+        // Create multipart request
+        String fileName = "quick.pdf";
+        File file = getResourceFile(fileName);
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create()
+                    .setFileData(new FileData(fileName, file));
+        MultiPartRequest reqBody = multiPartBuilder.build();
+
+        // Upload quick.pdf file into 'folder'
+        HttpResponse response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String contentNodeId = document.getId();
+
+        // pause briefly
+        Thread.sleep(DELAY_IN_MS);
+
+        // Get rendition (not created yet) information for node
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), "doclib", 200);
+        Rendition rendition = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Rendition.class);
+        assertNotNull(rendition);
+        assertEquals(RenditionStatus.NOT_CREATED, rendition.getStatus());
+
+        // Download placeholder - by default with Content-Disposition header
+        Map<String, String> params = new HashMap<>();
+        params.put("placeholder", "true");
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), ("doclib/content"), params, 200);
+        assertNotNull(response.getResponseAsBytes());
+        Map<String, String> responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        String contentDisposition = responseHeaders.get("Content-Disposition");
+        assertNotNull(contentDisposition);
+        assertTrue(contentDisposition.contains("filename=\"doclib\""));
+        String contentType = responseHeaders.get("Content-Type");
+        assertNotNull(contentType);
+        assertTrue(contentType.startsWith(MimetypeMap.MIMETYPE_IMAGE_PNG));
+
+        // Download placeholder - without Content-Disposition header (attachment=false)
+        params.put("attachment", "false");
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), ("doclib/content"), params, 200);
+        assertNotNull(response.getResponseAsBytes());
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        String cacheControl = responseHeaders.get("Cache-Control");
+        assertNotNull(cacheControl);
+        assertTrue(cacheControl.contains("must-revalidate"));
+        assertNull(responseHeaders.get("Content-Disposition"));
+        contentType = responseHeaders.get("Content-Type");
+        assertNotNull(contentType);
+        assertTrue(contentType.startsWith(MimetypeMap.MIMETYPE_IMAGE_PNG));
+
+        // Test 304 response - placeholder=true&attachment=false
+        String lastModifiedHeader = responseHeaders.get(LAST_MODIFIED_HEADER);
+        assertNotNull(lastModifiedHeader);
+        Map<String, String> headers = Collections.singletonMap(IF_MODIFIED_SINCE_HEADER, lastModifiedHeader);
+        // Currently the placeholder file is not cached.
+        // As the placeholder is not a NodeRef, so we can't get the ContentModel.PROP_MODIFIED date.
+        getSingle(getNodeRenditionsUrl(contentNodeId), "doclib/content", params, headers, 200);
+
+        // Create and get 'doclib' rendition
+        rendition = createAndGetRendition(contentNodeId, "doclib");
+        assertNotNull(rendition);
+        assertEquals(RenditionStatus.CREATED, rendition.getStatus());
+
+        // Download rendition - by default with Content-Disposition header
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), "doclib/content", 200);
+        assertNotNull(response.getResponseAsBytes());
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        contentDisposition = responseHeaders.get("Content-Disposition");
+        assertNotNull(contentDisposition);
+        assertTrue(contentDisposition.contains("filename=\"doclib\""));
+        contentType = responseHeaders.get("Content-Type");
+        assertNotNull(contentType);
+        assertTrue(contentType.startsWith(MimetypeMap.MIMETYPE_IMAGE_PNG));
+
+        // Download rendition - without Content-Disposition header (attachment=false)
+        params = Collections.singletonMap("attachment", "false");
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), "doclib/content", params, 200);
+        assertNotNull(response.getResponseAsBytes());
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertNull(responseHeaders.get("Content-Disposition"));
+        contentType = responseHeaders.get("Content-Type");
+        assertNotNull(contentType);
+        assertTrue(contentType.startsWith(MimetypeMap.MIMETYPE_IMAGE_PNG));
+
+        // Download rendition - with Content-Disposition header (attachment=true) same as default
+        params = Collections.singletonMap("attachment", "true");
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), "doclib/content", params, 200);
+        assertNotNull(response.getResponseAsBytes());
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        // Check the cache settings which have been set in the RenditionsImpl#getContent()
+        cacheControl = responseHeaders.get("Cache-Control");
+        assertNotNull(cacheControl);
+        assertFalse(cacheControl.contains("must-revalidate"));
+        assertTrue(cacheControl.contains("max-age=31536000"));
+        contentDisposition = responseHeaders.get("Content-Disposition");
+        assertNotNull(contentDisposition);
+        assertTrue(contentDisposition.contains("filename=\"doclib\""));
+        contentType = responseHeaders.get("Content-Type");
+        assertNotNull(contentType);
+        assertTrue(contentType.startsWith(MimetypeMap.MIMETYPE_IMAGE_PNG));
+
+        // Test 304 response - doclib rendition (attachment=true)
+        lastModifiedHeader = responseHeaders.get(LAST_MODIFIED_HEADER);
+        assertNotNull(lastModifiedHeader);
+        headers = Collections.singletonMap(IF_MODIFIED_SINCE_HEADER, lastModifiedHeader);
+        getSingle(getNodeRenditionsUrl(contentNodeId), "doclib/content", params, headers, 304);
+
+        // Here we want to overwrite/update the existing content in order to force a new rendition creation,
+        // so the ContentModel.PROP_MODIFIED date would be different. Hence, we use the multipart upload by providing
+        // the old fileName and setting overwrite field to true
+        file = getResourceFile("quick-2.pdf");
+        multiPartBuilder = MultiPartBuilder.create()
+                    .setFileData(new FileData(fileName, file))
+                    .setOverwrite(true);
+        reqBody = multiPartBuilder.build();
+
+        // Update quick.pdf
+        post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+
+        // The requested "If-Modified-Since" date is older than rendition modified date
+        response = getSingleWithDelayRetry(getNodeRenditionsUrl(contentNodeId), "doclib/content", params, headers, MAX_RETRY,
+                    PAUSE_TIME, 200);
+        assertNotNull(response);
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        String newLastModifiedHeader = responseHeaders.get(LAST_MODIFIED_HEADER);
+        assertNotNull(newLastModifiedHeader);
+        assertNotEquals(lastModifiedHeader, newLastModifiedHeader);
+
+        //-ve tests
+        // nodeId in the path parameter does not represent a file
+        getSingle(getNodeRenditionsUrl(folder_Id), "doclib/content", 400);
+
+        // nodeId in the path parameter does not exist
+        getSingle(getNodeRenditionsUrl(UUID.randomUUID().toString()), "doclib/content", 404);
+
+        // renditionId in the path parameter is not registered/available
+        getSingle(getNodeRenditionsUrl(contentNodeId), ("renditionId" + System.currentTimeMillis() + "/content"), 404);
+
+        InputStream inputStream = new ByteArrayInputStream("The quick brown fox jumps over the lazy dog".getBytes());
+        file = TempFileProvider.createTempFile(inputStream, "RenditionsTest-", ".abcdef");
+        reqBody = MultiPartBuilder.create()
+                    .setFileData(new FileData(file.getName(), file))
+                    .build();
+        // Upload temp file into 'folder'
+        response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        contentNodeId = document.getId();
+
+        // The content of the rendition does not exist and the placeholder parameter is not present
+        getSingle(getNodeRenditionsUrl(contentNodeId), "doclib/content", 404);
+
+        // The content of the rendition does not exist and the placeholder parameter has a value of "false"
+        params = Collections.singletonMap("placeholder", "false");
+        getSingle(getNodeRenditionsUrl(contentNodeId), "doclib/content", params, 404);
+
+        // The rendition does not exist, a placeholder is not available and the placeholder parameter has a value of "true"
+        params = Collections.singletonMap("placeholder", "true");
+        getSingle(getNodeRenditionsUrl(contentNodeId), ("renditionId" + System.currentTimeMillis() + "/content"), params, 404);
+
+        // Create a node without any content
+        String emptyContentNodeId = addToDocumentLibrary(userOneN1Site, "emptyDoc.txt", TYPE_CM_CONTENT, userOneN1.getId());
+        getSingle(getNodeRenditionsUrl(emptyContentNodeId), "doclib/content", params, 200);
+    }
+
+    private String addToDocumentLibrary(Site testSite, String name, String nodeType, String userId) throws Exception
+    {
+        String parentId = getSiteContainerNodeId(testSite.getId(), "documentLibrary");
+        return createNode(parentId, name, nodeType, null).getId();
+    }
+
+    private Rendition getRendition(List<Rendition> renditions, String renditionName)
+    {
+        for (Rendition rn : renditions)
+        {
+            if (rn.getId().equals(renditionName))
+            {
+                return rn;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+
+    /**
+     * Returns <code>true</code> if OpenOffice-based transformations are currently known to
+     * be available, else <code>false</code>.
+     */
+    protected boolean isOpenOfficeAvailable()
+    {
+        return synchronousTransformClient.isSupported(MimetypeMap.MIMETYPE_WORD, -1, null,
+                MimetypeMap.MIMETYPE_PDF, Collections.emptyMap(), null, null);
+    }
+
+    @Test
+    public void testRequestContentUrl() throws Exception
+    {
+        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
+
+        // Create a folder within the site document's library
+        String folderName = "folder" + System.currentTimeMillis();
+        String folder_Id = addToDocumentLibrary(userOneN1Site, folderName, TYPE_CM_FOLDER, userOneN1.getId());
+
+        // Create multipart request
+        String fileName = "quick.pdf";
+        File file = getResourceFile(fileName);
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create().setFileData(new FileData(fileName, file));
+        MultiPartRequest reqBody = multiPartBuilder.build();
+
+        // Upload quick.pdf file into 'folder'
+        HttpResponse response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String contentNodeId = document.getId();
+
+        // pause briefly
+        Thread.sleep(DELAY_IN_MS);
+
+        // Get rendition (not created yet) information for node
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), "doclib", 200);
+        Rendition rendition = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Rendition.class);
+        assertNotNull(rendition);
+        assertEquals(RenditionStatus.NOT_CREATED, rendition.getStatus());
+
+        // the rendition hasn't been created yet
+        post(getNodeRenditionOperationUrl(contentNodeId, rendition.getId(), "request-content-url"), null, null, 404);
+
+        // Create and get 'doclib' rendition
+        rendition = createAndGetRendition(contentNodeId, "doclib");
+        assertNotNull(rendition);
+        assertEquals(RenditionStatus.CREATED, rendition.getStatus());
+
+        // found but direct access isn't available
+        post(getNodeRenditionOperationUrl(contentNodeId, rendition.getId(), "request-content-url"), null, null, 501);
+
+        {
+            post(getNodeRenditionOperationUrl(contentNodeId, rendition.getId(), "request-content-url"), toJsonAsStringNonNull(new DirectAccessUrlRequest()), null, null, null, 501);
+
+            {
+                DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                directAccessUrlRequest.setExpiresAt(DateTime.now().plusSeconds(30).toDate());
+                directAccessUrlRequest.setValidFor(60L);
+
+                post(getNodeRenditionOperationUrl(contentNodeId, rendition.getId(), "request-content-url"), toJsonAsStringNonNull(directAccessUrlRequest), null, null, null, 400);
+            }
+
+            {
+                DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                directAccessUrlRequest.setValidFor(60L);
+
+                post(getNodeRenditionOperationUrl(contentNodeId, rendition.getId(), "request-content-url"), toJsonAsStringNonNull(directAccessUrlRequest), null, null, null, 501);
+            }
+
+            {
+                DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                directAccessUrlRequest.setValidFor(-60L);
+
+                post(getNodeRenditionOperationUrl(contentNodeId, rendition.getId(), "request-content-url"), toJsonAsStringNonNull(directAccessUrlRequest), null, null, null, 400);
+            }
+
+            {
+                DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                directAccessUrlRequest.setExpiresAt(DateTime.now().plusSeconds(30).toDate());
+                post(getNodeRenditionOperationUrl(contentNodeId, rendition.getId(), "request-content-url"), toJsonAsStringNonNull(directAccessUrlRequest), null, null, null, 501);
+            }
+
+            {
+                DirectAccessUrlRequest directAccessUrlRequest = new DirectAccessUrlRequest();
+                directAccessUrlRequest.setExpiresAt(DateTime.now().minusSeconds(30).toDate());
+                post(getNodeRenditionOperationUrl(contentNodeId, rendition.getId(), "request-content-url"), toJsonAsStringNonNull(directAccessUrlRequest), null, null, null, 400);
+            }
+        }
+
+        // nodeId in the path parameter does not represent a file
+        post(getNodeRenditionOperationUrl(folder_Id, "doclib", "request-content-url"), null, null, 400);
+
+        // nodeId in the path parameter does not exist
+        post(getNodeRenditionOperationUrl(UUID.randomUUID().toString(), "doclib", "request-content-url"), null, null, 404);
+
+        // renditionId in the path parameter is not registered/available
+        post(getNodeRenditionOperationUrl(contentNodeId, ("renditionId" + System.currentTimeMillis()), "request-content-url"), null, null, 404);
+
+        // Create a node without any content. Test only if OpenOffice is available
+        if (isOpenOfficeAvailable())
+        {
+            String emptyContentNodeId = addToDocumentLibrary(userOneN1Site, "emptyDoc.txt", TYPE_CM_CONTENT, userOneN1.getId());
+            getSingle(getNodeRenditionsUrl(emptyContentNodeId), "doclib", 200);
+        }
+
+        // Create multipart request
+        String jpgFileName = "quick.jpg";
+        File jpgFile = getResourceFile(fileName);
+        reqBody = MultiPartBuilder.create().setFileData(new FileData(jpgFileName, jpgFile)).build();
+
+        // Upload quick.jpg file into 'folder'
+        response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document jpgImage = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String jpgImageNodeId = jpgImage.getId();
+
+        // List all available renditions (includes those that have been created and
+        // those that are yet to be created)
+        response = getAll(getNodeRenditionsUrl(jpgImageNodeId), getPaging(0, 50), 200);
+        List<Rendition> renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        // Check there is no pdf rendition is available for the jpg file
+        Rendition pdf = getRendition(renditions, "pdf");
+        assertNull(pdf);
+
+        // The renditionId (pdf) is registered but it is not applicable for the node's
+        // mimeType
+        post(getNodeRenditionOperationUrl(jpgImageNodeId, "pdf", "request-content-url"), null, null, 404);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/RepoService.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/RepoService.java
new file mode 100644
index 00000000000..0a364703848
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/RepoService.java
@@ -0,0 +1,2015 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.sql.SQLException;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.opencmis.CMISConnector;
+import org.alfresco.opencmis.CMISNodeInfoImpl;
+import org.alfresco.query.PageDetails;
+import org.alfresco.query.PagingRequest;
+import org.alfresco.query.PagingResults;
+import org.alfresco.repo.activities.feed.FeedGenerator;
+import org.alfresco.repo.activities.feed.cleanup.FeedCleaner;
+import org.alfresco.repo.activities.post.lookup.PostLookup;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.content.cleanup.ContentStoreCleaner;
+import org.alfresco.repo.domain.activities.ActivityFeedEntity;
+import org.alfresco.repo.domain.activities.ActivityPostDAO;
+import org.alfresco.repo.forum.CommentService;
+import org.alfresco.repo.invitation.InvitationSearchCriteriaImpl;
+import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
+import org.alfresco.repo.model.filefolder.HiddenAspect;
+import org.alfresco.repo.model.filefolder.HiddenAspect.Visibility;
+import org.alfresco.repo.security.authentication.AuthenticationException;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.site.SiteDoesNotExistException;
+import org.alfresco.repo.tenant.Network;
+import org.alfresco.repo.tenant.NetworksService;
+import org.alfresco.repo.tenant.TenantAdminService;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.version.VersionModel;
+import org.alfresco.repo.web.scripts.invitation.InvitationWebScriptTest;
+import org.alfresco.rest.api.Activities;
+import org.alfresco.rest.api.impl.node.ratings.RatingScheme;
+import org.alfresco.rest.api.tests.client.data.Activity;
+import org.alfresco.rest.api.tests.client.data.Comment;
+import org.alfresco.rest.api.tests.client.data.Company;
+import org.alfresco.rest.api.tests.client.data.FavouriteDocument;
+import org.alfresco.rest.api.tests.client.data.FavouriteFolder;
+import org.alfresco.rest.api.tests.client.data.FavouriteSite;
+import org.alfresco.rest.api.tests.client.data.MemberOfSite;
+import org.alfresco.rest.api.tests.client.data.NetworkImpl;
+import org.alfresco.rest.api.tests.client.data.NodeRating;
+import org.alfresco.rest.api.tests.client.data.NodeRating.Aggregate;
+import org.alfresco.rest.api.tests.client.data.Person;
+import org.alfresco.rest.api.tests.client.data.PersonNetwork;
+import org.alfresco.rest.api.tests.client.data.SiteContainer;
+import org.alfresco.rest.api.tests.client.data.SiteImpl;
+import org.alfresco.rest.api.tests.client.data.SiteMember;
+import org.alfresco.rest.api.tests.client.data.SiteRole;
+import org.alfresco.rest.api.tests.client.data.Tag;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.service.cmr.coci.CheckOutCheckInService;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.favourites.FavouritesService;
+import org.alfresco.service.cmr.invitation.Invitation;
+import org.alfresco.service.cmr.invitation.InvitationSearchCriteria.InvitationType;
+import org.alfresco.service.cmr.invitation.InvitationService;
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.lock.LockType;
+import org.alfresco.service.cmr.model.FileExistsException;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.preference.PreferenceService;
+import org.alfresco.service.cmr.rating.Rating;
+import org.alfresco.service.cmr.rating.RatingService;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.cmr.tagging.TaggingService;
+import org.alfresco.service.cmr.version.Version;
+import org.alfresco.service.cmr.version.VersionHistory;
+import org.alfresco.service.cmr.version.VersionService;
+import org.alfresco.service.cmr.version.VersionType;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.FileFilterMode.Client;
+import org.alfresco.util.GUID;
+import org.alfresco.util.Pair;
+import org.alfresco.util.registry.NamedObjectRegistry;
+import org.apache.chemistry.opencmis.commons.data.CmisExtensionElement;
+import org.apache.chemistry.opencmis.commons.data.Properties;
+import org.apache.chemistry.opencmis.commons.data.PropertyData;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyStringImpl;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONException;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.quartz.CronTrigger;
+import org.quartz.JobDetail;
+import org.quartz.JobExecutionException;
+import org.quartz.Scheduler;
+import org.springframework.context.ApplicationContext;
+
+import com.google.common.collect.AbstractIterator;
+
+/**
+ * A convenient proxy into the repository services to support the tests.
+ * 
+ * @author steveglover
+ *
+ */
+public class RepoService
+{
+	private static final Log logger = LogFactory.getLog(RepoService.class);
+
+    protected static final String TEST_SITE_PRESET = "testSitePreset";
+
+    private static final String FAVOURITE_SITES_PREFIX = "org.alfresco.share.sites.favourites.";
+    private static final int FAVOURITE_SITES_PREFIX_LENGTH = FAVOURITE_SITES_PREFIX.length();
+    
+    protected ApplicationContext applicationContext;
+
+    protected MutableAuthenticationService authenticationService;
+    protected DictionaryService dictionaryService;
+    protected SiteService siteService;
+    protected ActivityService activityService;
+    protected PostLookup postLookup;
+    protected FeedGenerator feedGenerator;
+    protected FileFolderService fileFolderService;
+    protected ContentService contentService;
+    protected CommentService commentService;
+    protected NodeService nodeService;
+    protected PreferenceService preferenceService;
+    protected TaggingService taggingService;
+    protected RatingService ratingService;
+    protected TenantService tenantService;
+    protected TenantAdminService tenantAdminService;
+    protected ActivityPostDAO postDAO;
+    protected JobDetail feedGeneratorJobDetail;
+    protected JobDetail postLookupJobDetail;
+    protected JobDetail feedCleanerJobDetail;
+    protected JobDetail postCleanerJobDetail;
+    protected JobDetail feedNotifierJobDetail;
+    protected ContentStoreCleaner contentStoreCleaner;
+    protected FeedCleaner feedCleaner;
+    protected PersonService personService;
+    protected NamedObjectRegistry<RatingScheme> nodeRatingSchemeRegistry;
+	protected VersionService versionService;
+	protected CheckOutCheckInService cociService;
+	protected FavouritesService favouritesService;
+	protected InvitationService invitationService;
+	protected LockService lockService;
+	protected CMISConnector cmisConnector;
+	protected HiddenAspect hiddenAspect;
+	protected NetworksService networksService;
+	protected NamespaceService namespaceService;
+	protected RetryingTransactionHelper transactionHelper;
+
+	protected Activities activities;
+
+	protected PublicApiTestContext publicApiContext;
+	
+	protected Random random = new Random(System.currentTimeMillis());
+	
+	protected static int numNetworks = 0;
+
+	/*
+	 * Represents the "system" tenant/network
+	 */
+	protected TestNetwork systemNetwork;
+
+    /*
+     * A map of user names (stored in the map in lower case) and TestPersons
+     */
+	protected Map<String, TestPerson> allPeople = new HashMap<String, TestPerson>();
+
+	// Needed for CGLIB to create proxy, see CloudRepoService
+	public RepoService()
+	{
+	}
+
+    @SuppressWarnings("unchecked")
+	public RepoService(ApplicationContext applicationContext) throws Exception
+    {
+    	this.applicationContext = applicationContext;
+    	this.publicApiContext = new PublicApiTestContext(applicationContext);
+    	this.authenticationService = (MutableAuthenticationService)applicationContext.getBean("AuthenticationService");
+    	this.siteService = (SiteService)applicationContext.getBean("SiteService");
+    	this.activityService = (ActivityService)applicationContext.getBean("activityService");
+    	this.fileFolderService = (FileFolderService)applicationContext.getBean("FileFolderService");
+    	this.contentService = (ContentService)applicationContext.getBean("ContentService");
+    	this.commentService = (CommentService)applicationContext.getBean("CommentService");
+    	this.nodeService = (NodeService)applicationContext.getBean("NodeService");
+    	this.preferenceService = (PreferenceService)applicationContext.getBean("PreferenceService");
+    	this.taggingService = (TaggingService)applicationContext.getBean("TaggingService");
+    	this.ratingService = (RatingService)applicationContext.getBean("RatingService");
+    	this.tenantService = (TenantService)applicationContext.getBean("tenantService");
+    	this.tenantAdminService = (TenantAdminService)applicationContext.getBean("tenantAdminService");
+    	this.personService = (PersonService)applicationContext.getBean("PersonService");
+    	this.contentStoreCleaner = (ContentStoreCleaner)applicationContext.getBean("contentStoreCleaner");
+    	this.postDAO = (ActivityPostDAO)applicationContext.getBean("postDAO");
+    	this.nodeRatingSchemeRegistry = (NamedObjectRegistry<RatingScheme>)applicationContext.getBean("nodeRatingSchemeRegistry");
+    	this.cociService = (CheckOutCheckInService)applicationContext.getBean("CheckoutCheckinService");
+    	this.favouritesService = (FavouritesService)applicationContext.getBean("FavouritesService");
+    	this.dictionaryService =  (DictionaryService)applicationContext.getBean("dictionaryService");
+    	this.invitationService = (InvitationService)applicationContext.getBean("InvitationService");
+    	this.lockService = (LockService)applicationContext.getBean("LockService");
+    	this.cmisConnector = (CMISConnector)applicationContext.getBean("CMISConnector");
+    	this.activities = (Activities)applicationContext.getBean("activities");
+    	this.hiddenAspect = (HiddenAspect)applicationContext.getBean("hiddenAspect");
+    	this.networksService = (NetworksService)applicationContext.getBean("networksService");
+    	this.namespaceService = (NamespaceService)applicationContext.getBean("namespaceService"); 
+    	this.transactionHelper = (RetryingTransactionHelper)applicationContext.getBean("retryingTransactionHelper");
+
+        Scheduler scheduler = (Scheduler)applicationContext.getBean("schedulerFactory");
+
+        CronTrigger contentStoreCleanerTrigger = (CronTrigger)applicationContext.getBean("contentStoreCleanerTrigger");
+        scheduler.pauseJob(contentStoreCleanerTrigger.getJobKey());
+
+        ChildApplicationContextFactory activitiesFeed = (ChildApplicationContextFactory)applicationContext.getBean("ActivitiesFeed");
+        ApplicationContext activitiesFeedCtx = activitiesFeed.getApplicationContext();
+        this.postLookup = (PostLookup)activitiesFeedCtx.getBean("postLookup");
+        this.feedGenerator = (FeedGenerator)activitiesFeedCtx.getBean("feedGenerator");
+        this.feedGeneratorJobDetail = (JobDetail)activitiesFeedCtx.getBean("feedGeneratorJobDetail");
+        this.postLookupJobDetail = (JobDetail)activitiesFeedCtx.getBean("postLookupJobDetail");
+        this.feedCleanerJobDetail = (JobDetail)activitiesFeedCtx.getBean("feedCleanerJobDetail");
+        this.postCleanerJobDetail = (JobDetail)activitiesFeedCtx.getBean("postCleanerJobDetail");
+        this.feedNotifierJobDetail = (JobDetail)activitiesFeedCtx.getBean("feedNotifierJobDetail");
+    	this.feedCleaner = (FeedCleaner)activitiesFeedCtx.getBean("feedCleaner");
+
+        // Pause activities jobs so that we aren't competing with their scheduled versions
+        scheduler.pauseJob(feedGeneratorJobDetail.getKey());
+        scheduler.pauseJob(postLookupJobDetail.getKey());
+        scheduler.pauseJob(feedCleanerJobDetail.getKey());
+        scheduler.pauseJob(postCleanerJobDetail.getKey());
+        scheduler.pauseJob(feedNotifierJobDetail.getKey());
+
+        this.systemNetwork = new TestNetwork(TenantService.DEFAULT_DOMAIN, true);
+	}
+    
+    public TestNetwork getSystemNetwork()
+    {
+    	return systemNetwork;
+    }
+    
+	public PublicApiTestContext getPublicApiContext()
+	{
+		return publicApiContext;
+	}
+
+	public void addPerson(TestPerson person)
+	{
+		allPeople.put(person.getId().toLowerCase(), person);
+	}
+
+	public NodeService getNodeService()
+	{
+        return nodeService;
+    }
+
+    public TestPerson getPerson(String username)
+	{
+		return allPeople.get(username.toLowerCase());
+	}
+	
+    public int getClientVisibilityMask(Client client, Visibility visibility)
+    {
+        return hiddenAspect.getClientVisibilityMask(client, visibility);
+    }
+    
+	public ApplicationContext getApplicationContext()
+	{
+		return applicationContext;
+	}
+	
+	public AssociationRef createAssociation(NodeRef sourceRef, NodeRef targetRef, QName assocTypeQName)
+	{
+		return nodeService.createAssociation(sourceRef, targetRef, assocTypeQName);
+	}
+
+    public String toPrefixString(QName qname)
+    {
+    	return qname.toPrefixString(namespaceService);
+    }
+
+	public Invitation approveSiteInvitation(String personId, String siteId)
+	{
+		Invitation ret = null;
+
+		List<Invitation> invitations = invitationService.listPendingInvitationsForInvitee(personId);
+		for(Invitation invitation : invitations)
+		{
+			if(invitation.getResourceName().equals(siteId))
+			{
+				ret = invitationService.approve(invitation.getInviteId(), "I accept you");
+			}
+		}
+
+		return ret;
+	}
+	
+	public void moveNode(NodeRef nodeToMoveRef, NodeRef newParentNodeRef) throws FileExistsException, FileNotFoundException
+	{
+		fileFolderService.move(nodeToMoveRef, newParentNodeRef, GUID.generate());
+	}
+
+	public void deleteNode(NodeRef nodeRef)
+	{
+		nodeService.deleteNode(nodeRef);
+	}
+	
+	//
+	// TODO replace with V1 REST API to Lock/Unlock - except calls to includeChildren (which may not be exposed, initially
+	//
+	public void lockNode(NodeRef nodeRef)
+	{
+		lockNode(nodeRef, LockType.NODE_LOCK, 0, false);
+	}
+
+	public void lockNode(NodeRef nodeRef, LockType lockType, int timeToExpire, boolean includeChildren)
+	{
+		lockService.lock(nodeRef, lockType, timeToExpire, includeChildren);
+	}
+	
+	public void unlockNode(NodeRef nodeRef)
+	{
+		unlockNode(nodeRef, false);
+	}
+
+	public void unlockNode(NodeRef nodeRef, boolean includeChildren)
+	{
+		lockService.unlock(nodeRef, true, false);
+	}
+
+	public NodeRef addUserDescription(final String personId, final TestNetwork network, final String personDescription)
+	{
+		return AuthenticationUtil.runAsSystem(new RunAsWork<NodeRef>()
+		{
+			//@Override
+			public NodeRef doWork() throws Exception
+			{
+				NodeRef userRef = personService.getPersonOrNull(personId);
+				if (userRef == null)
+				{
+					throw new AuthenticationException("User name does not exist: " + personId);
+				}
+
+				ContentWriter writer = contentService.getWriter(userRef, ContentModel.PROP_PERSONDESC, true);
+				writer.setMimetype(MimetypeMap.MIMETYPE_HTML);
+				writer.putContent(personDescription);
+
+				log("Updated person description " + personId + (network != null ? " in network " + network : ""));
+				return userRef;
+			}
+		});
+	}
+
+	public TestPerson createUser(final PersonInfo personInfo, final String username, final TestNetwork network)
+	{
+		return getOrCreateUser(personInfo, username, network, true);
+	}
+
+    public TestPerson getOrCreateUser(final PersonInfo personInfo, final String username, final TestNetwork network)
+    {
+        return getOrCreateUser(personInfo, username, network, false);
+    }
+	
+	public final static String DEFAULT_ADMIN = "admin";
+	public final static String DEFAULT_ADMIN_PWD = "admin";
+	
+	// TODO improve admin-related API tests (including ST vs MT)
+	private boolean isDefaultAdmin(String username, TestNetwork network)
+	{
+		if ((network == null) || (TenantService.DEFAULT_DOMAIN.equals(network.getId())))
+		{
+			return (DEFAULT_ADMIN.equalsIgnoreCase(username));
+		}
+		else
+		{
+			return ((DEFAULT_ADMIN+"@"+network.getId()).equalsIgnoreCase(username));
+		}
+	}
+
+	// TODO review delete person
+	public TestPerson getOrCreateUser(final PersonInfo personInfo, final String username, final TestNetwork network, final boolean deletePerson)
+	{
+		return AuthenticationUtil.runAsSystem(new RunAsWork<TestPerson>()
+		{
+			@Override
+			public TestPerson doWork() throws Exception
+			{
+
+				final TestPerson testPerson = new TestPerson(personInfo.getFirstName(), personInfo.getLastName(), username, personInfo.getPassword(),
+						personInfo.getCompany(), network, personInfo.getSkype(), personInfo.getLocation(), personInfo.getTel(),
+						personInfo.getMob(), personInfo.getInstantmsg(), personInfo.getGoogle());
+
+				final Map<QName, Serializable> props = testPerson.toProperties();
+
+                // short-circuit for default/tenant "admin"
+                if (! isDefaultAdmin(username, network))
+                {
+                    NodeRef personNodeRef = personService.getPersonOrNull(username);
+
+                    if ((personNodeRef != null) && deletePerson)
+                    {
+                        AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
+                        {
+                            @Override
+                            public Void doWork() throws Exception
+                            {
+                                personService.deletePerson(testPerson.getId());
+                                return null;
+                            }
+                        });
+                    }
+
+                    if (personNodeRef == null)
+                    {
+                        personNodeRef = personService.createPerson(props);
+
+                        // create authentication to represent user
+                        authenticationService.createAuthentication(username, personInfo.getPassword().toCharArray());
+
+                        if (EnterpriseTestFixture.WITH_AVATAR.equals(personInfo.getInstantmsg()))
+                        {
+                            InvitationWebScriptTest.makeAvatar(nodeService, personNodeRef);
+                            log("Made avatar for " + testPerson.getId() + (network != null ? " in network " + network : ""));
+                        }
+                    }
+                }
+				log("Username " + testPerson.getId() + (network != null ? " in network " + network : ""));
+
+				publicApiContext.addUser(testPerson.getId());
+				addPerson(testPerson);
+				
+				return testPerson;
+			}
+		});
+	}
+
+	protected void deleteUser(final String username, final TestNetwork network)
+	{
+		AuthenticationUtil.runAsSystem(new RunAsWork<TestPerson>()
+		{
+			@Override
+			public TestPerson doWork() throws Exception
+			{
+				if (personService.personExists(username))
+				{
+					authenticationService.deleteAuthentication(username);
+					personService.deletePerson(username);
+				}
+				return null;
+			}
+		});
+	}
+
+	/**
+	 * @deprecated
+     */
+	public TestSite createSite(TestNetwork network, final SiteInformation siteInfoIn)
+    {
+		SiteInfo siteInfoOut = siteService.createSite(siteInfoIn.getSitePreset() != null ? siteInfoIn.getSitePreset() : TEST_SITE_PRESET, siteInfoIn.getShortName(), siteInfoIn.getTitle(), siteInfoIn.getDescription(), siteInfoIn.getSiteVisibility());
+    	siteService.createContainer(siteInfoIn.getShortName(), "documentLibrary", ContentModel.TYPE_FOLDER, null);
+		
+    	final TestSite testSite = new TestSite(network, siteInfoOut);
+
+		log("Created site " + testSite + (network != null ? " in network " + network : ""));
+
+		return testSite;
+    }
+	
+	public Invitation rejectSiteInvitation(String personId, String siteId)
+	{
+		Invitation ret = null;
+
+		List<Invitation> invitations = invitationService.listPendingInvitationsForInvitee(personId);
+		for(Invitation invitation : invitations)
+		{
+			if(invitation.getResourceName().equals(siteId))
+			{
+				ret = invitationService.reject(invitation.getInviteId(), "I reject you");
+			}
+		}
+		
+		return ret;
+	}
+
+	public List<Invitation> getModeratedSiteInvitations(String networkId, String runAsUserId, final String inviteeId, final String siteId)
+	{
+		List<Invitation> invitations = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Invitation>>()
+		{
+			@Override
+			public List<Invitation> doWork() throws Exception
+			{
+				InvitationSearchCriteriaImpl searchCriteria = new InvitationSearchCriteriaImpl();
+				searchCriteria.setInvitee(inviteeId);
+				if(siteId != null)
+				{
+					searchCriteria.setResourceName(siteId);
+				}
+				searchCriteria.setResourceType(Invitation.ResourceType.WEB_SITE);
+				searchCriteria.setInvitationType(InvitationType.MODERATED);
+				List<Invitation> invitations = invitationService.searchInvitation(searchCriteria);
+				return invitations;
+			}
+		}, runAsUserId, networkId);
+		return invitations;
+	}
+	
+	public Version getCurrentVersion(NodeRef nodeRef)
+	{
+		return versionService.getCurrentVersion(nodeRef);
+	}
+
+	protected void log(String msg)
+	{
+		if(logger.isDebugEnabled())
+		{
+			logger.debug(msg);
+		}
+	}
+	
+	public SiteInfo getSiteInfo(String siteId)
+	{
+		return siteService.getSite(siteId);
+	}
+	
+	public boolean isCheckedOut(NodeRef nodeRef)
+	{
+		return cociService.isCheckedOut(nodeRef);
+	}
+
+	public Serializable getProperty(NodeRef nodeRef, QName propertyName)
+	{
+		Serializable value = nodeService.getProperty(nodeRef, propertyName);
+		return value;
+	}
+	
+	public Set<QName> getAspects(NodeRef nodeRef)
+	{
+		Set<QName> aspects = nodeService.getAspects(nodeRef);
+		return aspects;
+	}
+
+	public ContentReader getContent(NodeRef nodeRef, QName propertyQName)
+	{
+		ContentReader reader = contentService.getReader(nodeRef, propertyQName);
+		return reader;
+	}
+	
+	private void cleanupContent()
+	{
+//        eagerCleaner.setEagerOrphanCleanup(false);
+
+		log("Cleaning up feeds...");
+		
+        // fire the cleaner
+        feedCleaner.setMaxAgeMins(1);
+        feedCleaner.setMaxFeedSize(1);
+        try
+        {
+        	feedCleaner.execute();
+        }
+        catch(JobExecutionException e)
+        {
+        	// TODO
+        }
+		
+		log("...done");
+
+		log("Cleaning up content...");
+
+        // fire the cleaner
+        contentStoreCleaner.setProtectDays(0);
+        contentStoreCleaner.execute();
+
+		log("...done");
+	}
+	
+	public void shutdown()
+	{
+		cleanupContent();
+		publicApiContext.cleanup();
+	}
+	
+	public Version createVersion(NodeRef nodeRef, String history, boolean majorVersion)
+	{
+        Map<String, Serializable> props = new HashMap<String, Serializable>(2, 1.0f);
+        props.put(Version.PROP_DESCRIPTION, history);
+        props.put(VersionModel.PROP_VERSION_TYPE, majorVersion ? VersionType.MAJOR : VersionType.MINOR);
+		return versionService.createVersion(nodeRef, props);
+	}
+	
+	public VersionHistory getVersionHistory(NodeRef nodeRef)
+	{
+		return versionService.getVersionHistory(nodeRef);
+	}
+	
+	public Pair<String, String> splitSiteNetwork(String siteNetwork)
+	{
+		int idx = siteNetwork.indexOf("@");
+		String siteId = siteNetwork;
+		String networkId = null;
+		if(idx > -1)
+		{
+			siteId = siteNetwork.substring(0, idx - 1);
+			networkId = siteNetwork.substring(idx + 1);
+		}
+		return new Pair<String, String>(siteId, networkId);
+	}
+
+	private Map<String, Object> parseActivitySummary(ActivityFeedEntity entity)
+	{
+		String activityType = entity.getActivityType();
+		String activitySummary = entity.getActivitySummary();
+		JSONObject json = (JSONObject)JSONValue.parse(activitySummary);
+		return Activity.getActivitySummary(json, activityType);
+	}
+
+	public List<Activity> getActivities(String personId, String siteId, boolean excludeUser, boolean excludeOthers)
+	{
+		List<ActivityFeedEntity> feedEntities = activityService.getUserFeedEntries(personId, siteId, excludeUser, excludeOthers, 0);
+		List<Activity> activities = new ArrayList<Activity>(feedEntities.size());
+		for(ActivityFeedEntity entity : feedEntities)
+		{
+			String siteNetwork = entity.getSiteNetwork();
+			Pair<String, String> pair = splitSiteNetwork(siteNetwork);
+			siteId = pair.getFirst();
+			String networkId = pair.getSecond();
+			String postDateStr = PublicApiDateFormat.getDateFormat().format(entity.getPostDate());
+			Activity activity = new Activity(entity.getId(), networkId, siteId, entity.getFeedUserId(), entity.getPostUserId(), postDateStr, entity.getActivityType(), parseActivitySummary(entity));
+			activities.add(activity);
+		}
+
+		return activities;
+	}
+	
+	public Rating getRating(NodeRef targetNode, String scheme)
+	{
+		return ratingService.getRatingByCurrentUser(targetNode, scheme);
+	}
+	
+	public List<Rating> getRatings(NodeRef targetNode)
+	{
+		return ratingService.getRatingsByCurrentUser(targetNode);
+	}
+
+	public RatingScheme getApiRatingScheme(String ratingSchemeName)
+	{
+		return nodeRatingSchemeRegistry.getNamedObject(ratingSchemeName);
+	}
+	
+	@SuppressWarnings("unchecked")
+	public Map<String, Object> getActivitySummary(ActivityFeedEntity entity) throws JSONException
+	{
+		Map<String, Object> activitySummary = activities.getActivitySummary(entity);
+		JSONObject json = new JSONObject();
+		for(String key : activitySummary.keySet())
+		{
+			Object value = activitySummary.get(key);
+			if(value instanceof NodeRef)
+			{
+				value = ((NodeRef)value).getId();
+			}
+			json.put(key, value);
+		}
+		return json;
+	}
+	
+    public void checkSiteMember(final TestPerson person, final TestSite site, SiteRole siteRole) throws Exception
+    {
+		assertTrue(siteService.isMember(site.getSiteId(), person.getId()));
+		assertEquals(siteRole.toString(), siteService.getMembersRole(site.getSiteId(), person.getId()));
+    }
+    
+    public void addFavouriteSite(final String username, final String siteShortName)
+    {
+    	SiteInfo siteInfo = siteService.getSite(siteShortName);
+    	if(siteInfo != null)
+    	{
+    		favouritesService.addFavourite(username, siteInfo.getNodeRef());
+    	}
+    	else
+    	{
+    		throw new SiteDoesNotExistException(siteShortName);
+    	}
+    }
+
+    private PagingResults<SiteInfo> getFavouriteSites(String userName, PagingRequest pagingRequest)
+    {
+    	final Collator collator = Collator.getInstance();
+
+        final Set<SiteInfo> sortedFavouriteSites = new TreeSet<SiteInfo>(new Comparator<SiteInfo>()
+        {
+			@Override
+			public int compare(SiteInfo o1, SiteInfo o2)
+			{
+				return collator.compare(o1.getTitle(), o2.getTitle());
+			}
+		});
+
+        Map<String, Serializable> prefs = preferenceService.getPreferences(userName, FAVOURITE_SITES_PREFIX);
+        for(String key : prefs.keySet())
+        {
+        	boolean isFavourite = false;
+        	Serializable s = prefs.get(key);
+        	if(s instanceof Boolean)
+        	{
+        		isFavourite = (Boolean)s;
+        	}
+        	if(isFavourite)
+        	{
+	        	String siteShortName = key.substring(FAVOURITE_SITES_PREFIX_LENGTH);
+	        	SiteInfo siteInfo = siteService.getSite(siteShortName);
+	        	if(siteInfo != null)
+	        	{
+	        		sortedFavouriteSites.add(siteInfo);
+	        	}
+        	}
+        }
+
+        int totalSize = sortedFavouriteSites.size();
+        final PageDetails pageDetails = PageDetails.getPageDetails(pagingRequest, totalSize);
+
+		final List<SiteInfo> page = new ArrayList<SiteInfo>(pageDetails.getPageSize());
+		Iterator<SiteInfo> it = sortedFavouriteSites.iterator();
+        for(int counter = 0; counter < pageDetails.getEnd() && it.hasNext(); counter++)
+        {
+        	SiteInfo favouriteSite = it.next();
+
+			if(counter < pageDetails.getSkipCount())
+			{
+				continue;
+			}
+			
+			if(counter > pageDetails.getEnd() - 1)
+			{
+				break;
+			}
+
+			page.add(favouriteSite);
+        }
+
+        return new PagingResults<SiteInfo>()
+        {
+			@Override
+			public List<SiteInfo> getPage()
+			{
+				return page;
+			}
+
+			@Override
+			public boolean hasMoreItems()
+			{
+				return pageDetails.hasMoreItems();
+			}
+
+			@Override
+			public Pair<Integer, Integer> getTotalResultCount()
+			{
+				Integer total = Integer.valueOf(sortedFavouriteSites.size());
+				return new Pair<Integer, Integer>(total, total);
+			}
+
+			@Override
+			public String getQueryExecutionId()
+			{
+				return null;
+			}
+        };
+    }
+    
+    public List<FavouriteSite> getFavouriteSites(TestPerson user)
+    {
+    	List<FavouriteSite> favouriteSites = new ArrayList<FavouriteSite>();
+
+    	PagingResults<SiteInfo> pagingResults = getFavouriteSites(user.getId(), new PagingRequest(0, Integer.MAX_VALUE));
+		for(SiteInfo siteInfo : pagingResults.getPage())
+		{
+			String siteId = siteInfo.getShortName();
+			String siteGuid = siteInfo.getNodeRef().getId();
+
+			TestSite site = user.getDefaultAccount().getSite(siteId);
+			FavouriteSite favouriteSite = null;
+			if(site.isMember(user.getId()))
+			{
+				favouriteSite = new FavouriteSite(site);
+			}
+			else
+			{
+				favouriteSite = new FavouriteSite(null, siteId, siteGuid, null, null, null, null, null);
+			}
+			favouriteSites.add(favouriteSite);
+		}
+
+		return favouriteSites;
+    }
+    
+    public void addPreference(final String username, final String Key, final Serializable value)
+    {
+		Map<String, Serializable> preferences = new HashMap<String, Serializable>(1);
+		preferences.put(Key, value);
+    	preferenceService.setPreferences(username, preferences);
+    }
+    
+    public List<MemberOfSite> getSiteMemberships(String personId)
+    {
+    	List<SiteInfo> sites = siteService.listSites(personId);
+    	List<MemberOfSite> memberships = new ArrayList<MemberOfSite>();
+    	for(SiteInfo siteInfo : sites)
+    	{
+    		String roleStr = siteService.getMembersRole(siteInfo.getShortName(), personId);
+    		SiteRole role = SiteRole.valueOf(roleStr);
+    		SiteImpl site = new SiteImpl(siteInfo, role, true);
+    		memberships.add(new MemberOfSite(site, role));
+    	}
+    	return memberships;
+    }
+
+    public void generateFeed() throws JobExecutionException, SQLException
+    {
+    	// process all outstanding activity posts
+        transactionHelper.doInTransaction(new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                postLookup.execute();
+                return null;
+            }
+        }, false, true);
+
+        Long maxSequence = getMaxActivitySeq();
+        while(maxSequence != null)
+        {
+        	feedGenerator.execute();
+
+            maxSequence = getMaxActivitySeq();
+        }
+    }
+    
+    private Long getMaxActivitySeq() throws SQLException
+    {
+        Long maxSequence = transactionHelper.doInTransaction(new RetryingTransactionCallback<Long>()
+        {
+            @Override
+            public Long execute() throws Throwable
+            {
+                return postDAO.getMaxActivitySeq();
+            }
+        }, true, true);
+
+        return maxSequence;
+    }
+    
+    public Tag addTag(NodeRef nodeRef, String tag)
+    {
+		NodeRef tagNodeRef = taggingService.addTag(nodeRef, tag);
+		return new Tag(nodeRef.getId(), tagNodeRef.getId(), tag);
+    }
+    
+    public List<Tag> getTags()
+    {
+    	Set<Tag> tags = new TreeSet<Tag>();
+    	for(String tag : taggingService.getTags(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE))
+    	{
+    		tags.add(new Tag(null, taggingService.getTagNodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, tag).getId(), tag));
+    	}
+    	return new ArrayList<Tag>(tags);
+    }
+    
+    public List<Tag> getTags(NodeRef nodeRef)
+    {
+    	Set<Tag> tags = new TreeSet<Tag>();
+    	for(String tag : taggingService.getTags(nodeRef))
+    	{
+    		tags.add(new Tag(null, taggingService.getTagNodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, tag).getId(), tag));
+    	}
+    	return new ArrayList<Tag>(tags);
+    }
+    
+    /*
+     * Get (CMIS) node properties
+     */
+    private Properties getProperties(NodeRef nodeRef)
+    {
+		CMISNodeInfoImpl nodeInfo = cmisConnector.createNodeInfo(nodeRef);
+		final Properties properties = cmisConnector.getNodeProperties(nodeInfo, null);
+		// fake the title property, which CMIS doesn't give us
+		String title = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_TITLE);
+		final PropertyStringImpl titleProp = new PropertyStringImpl(ContentModel.PROP_TITLE.toString(), title);
+		Properties wrapProperties = new Properties()
+		{
+			@Override
+			public List<CmisExtensionElement> getExtensions()
+			{
+				return properties.getExtensions();
+			}
+
+			@Override
+			public void setExtensions(List<CmisExtensionElement> extensions)
+			{
+				properties.setExtensions(extensions);
+			}
+
+			@Override
+			public Map<String, PropertyData<?>> getProperties()
+			{
+				Map<String, PropertyData<?>> updatedProperties = new HashMap<String, PropertyData<?>>(properties.getProperties());
+				updatedProperties.put(titleProp.getId(), titleProp);
+				return updatedProperties;
+			}
+
+			@Override
+			public List<PropertyData<?>> getPropertyList()
+			{
+				List<PropertyData<?>> propertyList = new ArrayList<PropertyData<?>>(properties.getPropertyList());
+				propertyList.add(titleProp);
+				return propertyList;
+			}
+		};
+		return wrapProperties;
+    }
+    
+    public FavouriteDocument getDocument(String networkId, final NodeRef nodeRef)
+    {
+    	return TenantUtil.runAsSystemTenant(new TenantRunAsWork<FavouriteDocument>()
+		{
+			@Override
+			public FavouriteDocument doWork() throws Exception
+			{
+				FavouriteDocument document = null;
+
+		    	QName type = nodeService.getType(nodeRef);
+		    	if(dictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT))
+		    	{
+		    		Properties properties = getProperties(nodeRef);
+		    		document = FavouriteDocument.getDocument(nodeRef.getId(), nodeRef.getId(), properties);
+		    	}
+		    	else
+		    	{
+		    		throw new IllegalArgumentException("Not a document node");
+		    	}
+
+		    	return document;
+			}
+		}, networkId);
+    }
+    
+    public FavouriteFolder getFolder(String networkId, final NodeRef nodeRef)
+    {
+    	return TenantUtil.runAsSystemTenant(new TenantRunAsWork<FavouriteFolder>()
+		{
+			@Override
+			public FavouriteFolder doWork() throws Exception
+			{
+				FavouriteFolder folder = null;
+
+		    	QName type = nodeService.getType(nodeRef);
+		    	if(dictionaryService.isSubClass(type, ContentModel.TYPE_FOLDER))
+		    	{
+		    		Properties properties = getProperties(nodeRef);
+		    		folder = FavouriteFolder.getFolder(nodeRef.getId(), nodeRef.getId(), properties);
+		    	}
+		    	else
+		    	{
+		    		throw new IllegalArgumentException("Not a folder node");
+		    	}
+
+		    	return folder;
+			}
+		}, networkId);
+    }
+
+    public List<NodeRating> getNodeRatings(String personId, String networkId, final NodeRef nodeRef)
+    {
+    	List<NodeRating> ratings = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<NodeRating>>()
+    	{
+			@Override
+			public List<NodeRating> doWork() throws Exception
+			{
+		    	List<NodeRating> ratings = new ArrayList<NodeRating>();
+
+		    	{
+			    	Rating likesRating = ratingService.getRatingByCurrentUser(nodeRef, "likesRatingScheme");
+			    	Object myRating = null;
+			    	String ratedAt = null;
+			    	if(likesRating != null)
+			    	{
+				    	myRating = likesRating.getScore() == 1.0f ? Boolean.TRUE : Boolean.FALSE;
+				    	Date rateTime = likesRating.getAppliedAt();
+			    		ratedAt = PublicApiDateFormat.getDateFormat().format(rateTime);
+			    	}
+		    		int ratingsCount = ratingService.getRatingsCount(nodeRef, "likesRatingScheme");
+			    	Aggregate aggregate = new Aggregate(ratingsCount, null);
+			    	ratings.add(new NodeRating(nodeRef.getId(), "likes", ratedAt, myRating, aggregate));
+		    	}
+
+		    	{
+		    		Rating fiveStarRating = ratingService.getRatingByCurrentUser(nodeRef, "fiveStarRatingScheme");
+			    	Object myRating = null;
+			    	String ratedAt = null;
+			    	if(fiveStarRating != null)
+			    	{
+			    		myRating = fiveStarRating.getScore();
+			    		Date rateTime = fiveStarRating.getAppliedAt();
+			    		ratedAt = PublicApiDateFormat.getDateFormat().format(rateTime);
+			    	}
+			    	int ratingsCount = ratingService.getRatingsCount(nodeRef, "fiveStarRatingScheme");
+			    	float averageRating = ratingService.getAverageRating(nodeRef, "fiveStarRatingScheme");
+			    	Aggregate aggregate = new Aggregate(ratingsCount, averageRating == -1 ? null : averageRating);
+			    	ratings.add(new NodeRating(nodeRef.getId(), "fiveStar", ratedAt, myRating, aggregate));
+		    	}
+
+		    	return ratings;
+			}
+    		
+    	}, personId, networkId);
+
+    	Collections.sort(ratings);
+
+    	return ratings;
+    }
+
+    public int numRatingSchemes()
+    {
+    	return ratingService.getRatingSchemes().size();
+    }
+    
+    public NodeRef addToDocumentLibrary(TestSite site, String name, QName type)
+    {
+		NodeRef documentLibraryContainerNodeRef = siteService.getContainer(site.getSiteId(), "documentLibrary");
+		NodeRef nodeRef = fileFolderService.create(documentLibraryContainerNodeRef, name, type).getNodeRef();
+		return nodeRef;
+    }
+
+    public String getSiteNetwork(final String siteShortName, String tenantDomain)
+    {
+		return TenantUtil.runAsTenant(new TenantRunAsWork<String>()
+		{
+			@Override
+			public String doWork() throws Exception
+			{
+		    	return tenantService.getName(siteShortName);
+			}
+		}, tenantDomain);
+    }
+
+    public void postActivity(final String activityType, final String siteId, final JSONObject activityData) throws JobExecutionException
+    {
+    	activityService.postActivity(activityType, siteId, "documentlibrary", activityData.toString());
+    }
+    
+    public NodeRef createDocument(final NodeRef parentNodeRef, final String name, final String content)
+    {
+		NodeRef nodeRef = fileFolderService.create(parentNodeRef, name, ContentModel.TYPE_CONTENT).getNodeRef();
+		ContentWriter writer = contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
+		writer.putContent(content);
+
+		return nodeRef;
+    }
+    
+    public NodeRef createDocument(final NodeRef parentNodeRef, final String name, final String title, final String description, final String content)
+    {
+		NodeRef nodeRef = fileFolderService.create(parentNodeRef, name, ContentModel.TYPE_CONTENT).getNodeRef();
+		ContentWriter writer = contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
+		writer.putContent(content);
+		nodeService.setProperty(nodeRef, ContentModel.PROP_TITLE, title);
+		nodeService.setProperty(nodeRef, ContentModel.PROP_DESCRIPTION, description);
+
+		return nodeRef;
+    }
+    
+    public NodeRef createFolder(final NodeRef parentNodeRef, final String name)
+    {
+		NodeRef nodeRef = fileFolderService.create(parentNodeRef, name, ContentModel.TYPE_FOLDER).getNodeRef();
+		return nodeRef;
+    }
+    
+    public NodeRef createFolder(final NodeRef parentNodeRef, final String name, final String title, final String description)
+    {
+		NodeRef nodeRef = fileFolderService.create(parentNodeRef, name, ContentModel.TYPE_FOLDER).getNodeRef();
+		nodeService.setProperty(nodeRef, ContentModel.PROP_TITLE, title);
+		nodeService.setProperty(nodeRef, ContentModel.PROP_DESCRIPTION, description);
+
+		return nodeRef;
+    }
+    
+    public NodeRef createCmObject(final NodeRef parentNodeRef, final String name)
+    {
+        QName assocQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName.createValidLocalName(name));
+        NodeRef nodeRef = nodeService.createNode(parentNodeRef, ContentModel.ASSOC_CONTAINS, assocQName, ContentModel.TYPE_CMOBJECT).getChildRef();
+
+        return nodeRef;
+    }
+    
+    public NodeRef createObjectOfCustomType(final NodeRef parentNodeRef, final String name, final String typeName)
+    {
+        QName assocQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName.createValidLocalName(name));
+        QName typeQName = QName.createQName(typeName);
+        NodeRef nodeRef = nodeService.createNode(parentNodeRef, ContentModel.ASSOC_CONTAINS, assocQName, typeQName).getChildRef();
+
+        return nodeRef;
+    }
+    
+    public Visibility getVisibility(Client client, NodeRef nodeRef)
+    {
+    	return hiddenAspect.getVisibility(client, nodeRef);
+    }
+
+    public void addAspect(NodeRef nodeRef, QName aspectTypeQName, Map<QName, Serializable> aspectProperties)
+    {
+    	nodeService.addAspect(nodeRef, aspectTypeQName, aspectProperties);
+    }
+    
+    public NodeRef createComment(NodeRef nodeRef, final Comment comment)
+    {
+		NodeRef commentNodeRef = commentService.createComment(nodeRef, comment.getTitle(), comment.getContent(), false);
+		comment.setId(commentNodeRef.getId());
+		Date created = (Date)nodeService.getProperty(commentNodeRef, ContentModel.PROP_CREATED);
+		comment.setCreatedAt(PublicApiDateFormat.getDateFormat().format(created));
+		TestPerson person = getPerson((String)nodeService.getProperty(commentNodeRef, ContentModel.PROP_CREATOR));
+		comment.setCreatedBy(person);
+		return commentNodeRef;
+    }
+    
+    public TestNetwork createNetworkWithAlias(String alias, boolean enabled)
+    {
+        String networkId = alias + "-" + System.currentTimeMillis();
+    	TestNetwork network = new TestNetwork(networkId, enabled);
+    	return network;
+    }
+
+    public TestNetwork createNetwork(String networkId, boolean enabled)
+    {
+    	TestNetwork network = new TestNetwork(networkId, enabled);
+    	return network;
+    }
+    
+    public class TestSite extends SiteImpl
+    {
+		private static final long serialVersionUID = 5317623044880374281L;
+
+		private TestNetwork account;
+		private SiteInfo siteInfo;
+		
+		public TestSite(TestNetwork account, SiteInfo siteInfo)
+		{
+			this(account, siteInfo.getShortName(), siteInfo.getNodeRef().getId(), siteInfo.getTitle(), siteInfo.getDescription(), siteInfo.getVisibility());
+			this.account = account;
+			this.siteInfo = siteInfo;
+		}
+		
+		public TestSite(TestNetwork account, String siteId, String guid, String title, String description, SiteVisibility siteVisibility)
+		{
+			super((account == null ? null : account.getId()), siteId, guid);
+			setTitle(title);
+			setDescription(description);
+			setVisibility(siteVisibility.toString());
+			this.siteInfo = siteService.getSite(siteId);
+		}
+		
+		public SiteInfo getSiteInfo()
+		{
+			return siteInfo;
+		}
+		public NodeRef getContainerNodeRef(String containerId)
+		{
+			return siteService.getContainer(siteId, containerId);
+		}
+
+	    public NodeRef createContainer(String containerName)
+	    {
+	    	return siteService.createContainer(getSiteId(), containerName, ContentModel.TYPE_FOLDER, null);
+	    }
+	    
+	    public void inviteToSite(final String toInvite, final SiteRole siteRole)
+	    {
+	    	siteService.setMembership(getSiteId(), toInvite, siteRole.toString());
+	    	log(toInvite + " invited to site " + getSiteId());
+	    }
+
+		public TestNetwork getAccount()
+		{
+			return account;
+		}
+
+		public Map<String, String> getMembers(final String roleFilter)
+		{
+			Map<String, String> members = TenantUtil.runAsSystemTenant(new TenantRunAsWork<Map<String, String>>()
+			{
+				@Override
+				public Map<String, String> doWork() throws Exception
+				{
+					Map<String, String> members = siteService.listMembers(getSiteId(), null, roleFilter, 0);
+					return members;
+				}
+			}, getAccount().getId());
+			return members;
+		}
+		
+		public List<SiteMember> getMembers()
+		{
+			Map<String, String> members = TenantUtil.runAsSystemTenant(new TenantRunAsWork<Map<String, String>>()
+			{
+				@Override
+				public Map<String, String> doWork() throws Exception
+				{
+					// get all site members
+					Map<String, String> members = siteService.listMembers(getSiteId(), null, null, 0);
+					return members;
+				}
+			}, getAccount().getId());
+			List<SiteMember> ret = new ArrayList<SiteMember>(members.size());
+			for(String userId : members.keySet())
+			{
+				String role = members.get(userId);
+				TestPerson person = RepoService.this.getPerson(userId);
+				SiteMember sm = new SiteMember(userId, person, getSiteId(), role);
+				ret.add(sm);
+			}
+			Collections.sort(ret);
+			return ret;
+		}
+		
+		public boolean isMember(final String personId)
+		{
+			Boolean isMember = TenantUtil.runAsSystemTenant(new TenantRunAsWork<Boolean>()
+			{
+				@Override
+				public Boolean doWork() throws Exception
+				{
+					return siteService.isMember(getSiteId(), personId);
+				}
+			}, getAccount().getId());
+			return isMember;
+		}
+
+		public SiteRole getMember(String personId)
+		{
+			return SiteRole.valueOf(siteService.getMembersRole(getSiteId(), personId));
+		}
+
+		public void updateMember(String personId, SiteRole role)
+		{
+			siteService.setMembership(getSiteId(), personId, role.toString());
+		}
+
+		public void removeMember(String personId)
+		{
+			if(siteService.isMember(getSiteId(), personId))
+			{
+				siteService.removeMembership(getSiteId(), personId);
+			}
+		}
+
+		public void setSiteVisibility(SiteVisibility siteVisibility)
+		{
+			this.visibility = siteVisibility.toString();
+			siteInfo.setVisibility(siteVisibility);
+			siteService.updateSite(siteInfo);
+		}
+
+		@Override
+		public String toString() {
+			return "TestSite [siteid=" + getSiteId() + ", title=" + getTitle()
+					+ ", description=" + getDescription() + ", siteVisibility="
+					+ getVisibility() + "]";
+		}
+    }
+    
+	public static <T extends Object> Iterator<T> getWrappingIterator(final int startIdx, final List<T> list)
+	{
+		return new AbstractIterator<T>()
+		{
+			private int idx = Math.max(0, Math.min(startIdx, list.size() - 1));
+
+			@Override
+			protected T computeNext()
+			{
+				T o = list.get(idx);
+
+				idx++;
+				if(idx >= list.size())
+				{
+					idx = 0;
+				}
+
+				return o;
+			}
+		};
+	}
+
+    public class TestNetwork extends NetworkImpl implements Comparable<TestNetwork>
+	{
+		private static final long serialVersionUID = -107881141652228471L;
+
+		protected Map<String, TestPerson> people = new TreeMap<String, TestPerson>();
+		protected TreeMap<String, TestSite> sites = new TreeMap<String, TestSite>();
+		protected Set<TestSite> publicSites = new TreeSet<TestSite>();
+
+		public TestNetwork(String domain, boolean enabled)
+		{
+			super(domain, enabled);
+		}
+
+		public void create()
+		{
+			if(!getId().equals(TenantService.DEFAULT_DOMAIN) && !tenantAdminService.existsTenant(getId()))
+			{
+				tenantAdminService.createTenant(getId(), DEFAULT_ADMIN_PWD.toCharArray());
+				numNetworks++;
+				log("Created network " + getId());
+			}
+		}
+
+		public TestSite createSite(String siteRootName, SiteVisibility siteVisibility)
+		{
+			String shortName = "TESTSITE" + (siteRootName != null ? siteRootName : "") + GUID.generate();
+			SiteInformation siteInfo = new SiteInformation(shortName, shortName, shortName, siteVisibility);
+			return createSite(siteInfo);
+	    }
+
+        public TestSite createSite(String id, String title, String description, String sitePreset, SiteVisibility visibility)
+        {
+            SiteInformation siteInfo = new SiteInformation(id, title, description, sitePreset, visibility);
+            // Used deprecated createSite method until will be allowed creating a site with sitePreset
+            return createSite(siteInfo);
+        }
+
+        public TestSite createSite(SiteVisibility siteVisibility)
+        {
+            return createSite(null, siteVisibility);
+        }
+
+		/**
+		 * @deprecated replace with AbstractBaseApiTest.createSite (or PublicApiClient.sites.createSite)
+		 */
+		public TestSite createSite(final SiteInformation site)
+	    {
+	    	TestSite testSite = RepoService.this.createSite(this, site);
+			addSite(testSite);
+
+			return testSite;
+	    }
+		
+		public TestPerson createUser()
+		{
+			long timeMillis = System.currentTimeMillis();
+			String firstname = "first" + timeMillis;
+			String lastname = "last" + timeMillis;
+			String username = "user" + timeMillis;
+			PersonInfo personInfo = new PersonInfo(firstname, lastname, username, "password", null, "skype", "location",
+					"telephone", "mob", "instant", "google");
+			TestPerson person = createUser(personInfo);
+			return person;
+		}
+
+		public NodeRef addUserDescription(final String personId, final String personDescription)
+		{
+			NodeRef personRef = TenantUtil.runAsTenant(new TenantRunAsWork<NodeRef>()
+			{
+				public NodeRef doWork() throws Exception
+				{
+					return RepoService.this.addUserDescription(personId, TestNetwork.this, personDescription);
+				}
+			}, getId());
+
+			return personRef;
+		}
+
+		public TestPerson createUser(final PersonInfo personInfo)
+		{
+			final String username = publicApiContext.createUserName(personInfo.getUsername(), getId());
+			TestPerson testPerson = TenantUtil.runAsTenant(new TenantRunAsWork<TestPerson>()
+            {
+                public TestPerson doWork() throws Exception
+                {
+                	TestPerson person = RepoService.this.createUser(personInfo, username, TestNetwork.this);
+                    
+                    return person;
+                }
+            }, getId());
+			addPerson(testPerson);
+			return testPerson;
+		}
+
+		public List<String> peopleSample(int sampleSize)
+		{
+			final List<String> p = new ArrayList<String>();
+
+			if(sampleSize < 0)
+			{
+				p.addAll(people.keySet());
+			}
+			else
+			{
+				int startIdx = random.nextInt(people.size());
+				List<String> peopleList = new ArrayList<String>(people.keySet());
+				Iterator<String> it = getWrappingIterator(startIdx, peopleList);
+
+				for(int i = 0; i < sampleSize && it.hasNext(); i++)
+				{
+					p.add(it.next());
+				}
+			}
+			
+			return p;
+		}
+
+		// Return a site of which person is not a member
+		public TestSite getSiteNonMember(final String personId)
+		{
+			return TenantUtil.runAsSystemTenant(new TenantRunAsWork<TestSite>()
+			{
+				@Override
+				public TestSite doWork() throws Exception
+				{
+					TestSite ret = null;
+					SiteInfo match = null;
+					for(SiteInfo info : siteService.listSites(null, null))
+					{
+						boolean isMember = siteService.isMember(info.getShortName(), personId);
+						if(!isMember)
+						{
+							match = info;
+							break;
+						}
+					}
+					
+					if(match != null)
+					{
+						ret = new TestSite(TestNetwork.this, match);
+					}
+					
+					return ret;
+				}
+			}, getId());
+		}
+		
+		public void addSite(TestSite site)
+		{
+			sites.put(site.getSiteId(), site);
+			if(site.getVisibility().equals(SiteVisibility.PUBLIC.toString()))
+			{
+				publicSites.add(site);
+			}
+		}
+		
+		public Set<TestSite> getPublicSites()
+		{
+			return publicSites;
+		}
+		
+		public TestSite getSite(final String siteShortName)
+		{
+			TestSite site = TenantUtil.runAsTenant(new TenantRunAsWork<TestSite>()
+			{
+				@Override
+				public TestSite doWork() throws Exception
+				{
+					SiteInfo siteInfo = siteService.getSite(siteShortName);
+					return new TestSite(TestNetwork.this, siteInfo);
+				}
+			}, getId());
+			return site;
+		}
+		
+		/*
+		 * List sites in this account that person can see
+		 */
+		public List<TestSite> getSites(String personId)
+		{
+			List<TestSite> sites = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<TestSite>>()
+			{
+				@Override
+				public List<TestSite> doWork() throws Exception
+				{
+					List<SiteInfo> results = siteService.listSites(null, null);
+					TreeMap<String, TestSite> ret = new TreeMap<String, TestSite>();
+					for(SiteInfo siteInfo : results)
+					{
+						TestSite site = new TestSite(TestNetwork.this, siteInfo/*, null*/);
+						ret.put(site.getSiteId(), site);
+					}
+
+					return new ArrayList<TestSite>(ret.values());
+				}
+			}, personId, getId());
+			return sites;
+		}
+		
+		public List<TestSite> getAllSites()
+		{
+			List<TestSite> sites = TenantUtil.runAsSystemTenant(new TenantRunAsWork<List<TestSite>>()
+			{
+				@Override
+				public List<TestSite> doWork() throws Exception
+				{
+					List<SiteInfo> results = siteService.listSites(null, null);
+					TreeMap<String, TestSite> ret = new TreeMap<String, TestSite>();
+					for(SiteInfo siteInfo : results)
+					{
+						TestSite site = new TestSite(TestNetwork.this, siteInfo/*, null*/);
+						ret.put(site.getSiteId(), site);
+					}
+
+					return new ArrayList<TestSite>(ret.values());
+				}
+			}, getId());
+			return sites;
+		}
+		
+		public List<SiteContainer> getSiteContainers(final String siteId, TestPerson runAs)
+		{
+			List<SiteContainer> siteContainers = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<SiteContainer>>()
+			{
+				@Override
+				public List<SiteContainer> doWork() throws Exception
+				{
+					PagingResults<FileInfo> results = siteService.listContainers(siteId, new PagingRequest(0, Integer.MAX_VALUE));
+					List<SiteContainer> ret = new ArrayList<SiteContainer>(results.getPage().size());
+					for(FileInfo fileInfo : results.getPage())
+					{
+						SiteContainer siteContainer = new SiteContainer(siteId, fileInfo.getName(), fileInfo.getNodeRef().getId());
+						ret.add(siteContainer);
+					}
+
+					return ret;
+				}
+			}, runAs.getId(), getId());
+
+			return siteContainers;
+		}
+
+		public Map<String, TestSite> getSitesForUser(String username)
+		{
+			if(username == null)
+			{
+				username = AuthenticationUtil.getAdminUserName();
+			}
+			List<SiteInfo> sites = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<SiteInfo>>()
+			{
+				@Override
+				public List<SiteInfo> doWork() throws Exception
+				{
+					List<SiteInfo> results = siteService.listSites(null, null);
+					return results;
+				}
+			}, username, getId());
+			TreeMap<String, TestSite> ret = new TreeMap<String, TestSite>();
+			for(SiteInfo siteInfo : sites)
+			{
+				TestSite site = new TestSite(TestNetwork.this, siteInfo/*, null*/);
+				ret.put(site.getSiteId(), site);
+			}
+			return ret;
+		}
+		
+		public List<MemberOfSite> getSiteMemberships(String username)
+		{
+			if(username == null)
+			{
+				username = AuthenticationUtil.getAdminUserName();
+			}
+			final String userId = username;
+			List<MemberOfSite> sites = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<MemberOfSite>>()
+			{
+				@Override
+				public List<MemberOfSite> doWork() throws Exception
+				{
+					List<SiteInfo> sites = siteService.listSites(userId);
+					Set<MemberOfSite> personSites = new TreeSet<MemberOfSite>();
+					for(SiteInfo siteInfo : sites)
+					{
+						TestSite site = getSite(siteInfo.getShortName());
+						String role = siteService.getMembersRole(siteInfo.getShortName(), userId);
+						MemberOfSite ms = new MemberOfSite(site, SiteRole.valueOf(role));
+						personSites.add(ms);
+					}
+
+					return new ArrayList<MemberOfSite>(personSites);
+				}
+			}, userId, getId());
+			return sites;
+		}
+		
+		public Map<String, TestSite> getSites(SiteVisibility siteVisibility)
+		{
+			Map<String, TestSite> ret = new HashMap<String, TestSite>();
+			for(String key : getSitesForUser(null).keySet())
+			{
+				TestSite site = getSitesForUser(null).get(key);
+				if(site.getVisibility().equals(siteVisibility.toString()))
+				{
+					ret.put(key, site);
+				}
+			}
+			return ret;
+		}
+		
+		public void addPerson(TestPerson person)
+		{
+			people.put(person.getId(), person);
+		}
+		
+		public List<String> getPersonIds()
+		{
+			return new ArrayList<String>(people.keySet());
+		}
+		
+		public List<TestPerson> getPeople()
+		{
+			return new ArrayList<TestPerson>(people.values());
+		}
+
+		public int compareTo(TestNetwork o)
+		{
+			return getId().compareTo(o.getId());
+		}
+
+		public void addExternalUser(String personId)
+		{
+			throw new UnsupportedOperationException();
+		}
+		
+		public TestSite homeSite(TestPerson person)
+		{
+			throw new UnsupportedOperationException();
+		}
+
+		public void inviteUser(final String user)
+		{
+			throw new UnsupportedOperationException();
+		}
+		
+		public Collection<TestSite> getHomeSites()
+		{
+			throw new UnsupportedOperationException();
+		}
+		
+		public Long getAccountId()
+		{
+			throw new UnsupportedOperationException();
+		}
+
+		public void setAccountId(Long accountId)
+		{
+			throw new UnsupportedOperationException();
+		}
+
+		public int getType()
+		{
+			throw new UnsupportedOperationException();
+		}
+
+		public void addNetworkAdmin(String email)
+		{
+			throw new UnsupportedOperationException();
+		}
+
+		public Set<String> getNetworkAdmins()
+		{
+			throw new UnsupportedOperationException();
+		}
+		
+		public Set<String> getNonNetworkAdmins()
+		{
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public int hashCode()
+		{
+			final int prime = 31;
+			int result = 1;
+			result = prime * result
+					+ ((getId() == null) ? 0 : getId().hashCode());
+			return result;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj)
+			{
+				return true;
+			}
+
+			if(obj == null)
+			{
+				return false;
+			}
+			
+			if (getClass() != obj.getClass())
+			{
+				return false;
+			}
+			
+			TestNetwork other = (TestNetwork) obj;
+			return getId().equals(other.getId());
+		}
+
+		public TestSite getSite(SiteVisibility siteVisibility)
+		{
+			TestSite ret = null;
+			for(TestSite site : getSitesForUser(null).values())
+			{
+				if(site.getVisibility().equals(siteVisibility))
+				{
+					ret = site;
+					break;
+				}
+			}
+			return ret;
+		}
+
+		@Override
+		public String toString()
+		{
+			return "TestNetwork [people=" + people + ", sites=" + sites
+					+ ", publicSites=" + publicSites + "]";
+		}
+	}
+	
+    public static class SiteMembership implements Comparable<SiteMembership>
+    {
+    	private TestSite site;
+    	private SiteRole role;
+
+		public SiteMembership(TestSite site, SiteRole role)
+		{
+			super();
+			if(site == null)
+			{
+				throw new IllegalArgumentException();
+			}
+			if(role == null)
+			{
+				throw new IllegalArgumentException();
+			}
+			this.site = site;
+			this.role = role;
+		}
+
+		public TestSite getSite() 
+		{
+			return site;
+		}
+
+		public SiteRole getRole()
+		{
+			return role;
+		}
+		
+		@Override
+		public int hashCode()
+		{
+			final int prime = 31;
+			int result = 1;
+			result = prime * result + ((role == null) ? 0 : role.hashCode());
+			result = prime * result + ((site == null) ? 0 : site.hashCode());
+			return result;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj)
+			{
+				return true;
+			}
+			
+			if (obj == null)
+			{
+				return false;
+			}
+			
+			if (getClass() != obj.getClass())
+			{
+				return false;
+			}
+			
+			SiteMembership other = (SiteMembership) obj;
+			if (role != other.role)
+			{
+				return false;
+			}
+
+			return site.equals(other.site);
+		}
+
+		@Override
+		public int compareTo(SiteMembership siteMembership)
+		{
+			int ret = site.getSiteId().compareTo(siteMembership.getSite().getSiteId());
+			if(ret == 0)
+			{
+				// arbitrary sorting on site role
+				ret = role.compareTo(siteMembership.getRole());
+			}
+			return ret;
+		}
+    }
+
+	// order by last name, first name, role
+	public class TestPerson extends Person
+    {
+		private static final long serialVersionUID = 4038390056182705588L;
+
+		protected boolean enabled;
+		protected String password;
+		protected TestNetwork defaultAccount;
+		protected TreeMap<TestSite, SiteRole> siteMemberships = new TreeMap<TestSite, SiteRole>();
+
+		public TestPerson(String firstName, String lastName, String username, String password, Company company, TestNetwork defaultAccount, String skype, String location, String tel,
+				String mob, String instantmsg, String google)
+		{
+			super(username, username, true, firstName, lastName, company, skype, location, tel, mob, instantmsg, google, null);
+			this.password = password;
+			this.enabled = true;
+			this.defaultAccount = defaultAccount;
+		}
+
+		public boolean isNetworkAdmin()
+		{
+			return false; // cloud only
+		}
+		
+		public String getDefaultDomain()
+		{
+			return defaultAccount == null ? null : defaultAccount.getId();
+		}
+
+		public Boolean isEnabled()
+		{
+			return enabled;
+		}
+
+		public void addSiteMembership(TestSite site, SiteRole siteRole)
+		{
+			siteMemberships.put(site, siteRole);
+		}
+
+		public TestNetwork getDefaultAccount()
+		{
+			return defaultAccount;
+		}
+		
+		public String getPassword()
+		{
+			return password;
+		}
+		
+		public List<PersonNetwork> getNetworkMemberships()
+		{
+			String personId = getId();
+			String runAsNetworkId = Person.getNetworkId(personId);
+			return TenantUtil.runAsUserTenant(new TenantRunAsWork<List<PersonNetwork>>()
+			{
+				@Override
+				public List<PersonNetwork> doWork() throws Exception
+				{
+					List<PersonNetwork> members = new ArrayList<PersonNetwork>();
+					PagingResults<Network> networks = networksService.getNetworks(new PagingRequest(0, Integer.MAX_VALUE));
+					for(Network network : networks.getPage())
+					{
+			            NetworkImpl restNetwork = new NetworkImpl(network);
+			            PersonNetwork personNetwork = new PersonNetwork(network.getIsHomeNetwork(), restNetwork);
+						members.add(personNetwork);
+					}
+					return members;
+				}
+			}, personId, runAsNetworkId);
+		}
+
+		@Override
+		public String toString()
+		{
+			return "TestPerson [enabled=" + enabled + ", password=" + password
+					+ ", defaultAccount=" + defaultAccount.getId() + ", siteMemberships=" + siteMemberships
+					+ ", getId()=" + getId() + ", getFirstName()="
+					+ getFirstName() + ", getCompany()=" + getCompany()
+					+ ", getLastName()=" + getLastName() + "]";
+		}
+    }
+
+    public static class SiteInformation implements Comparable<SiteInformation>
+    {
+    	private String shortName;
+    	private String title;
+    	private String sitePreset;
+    	private String description;
+    	private SiteVisibility siteVisibility;
+
+		public SiteInformation(String shortName, String title, String description, SiteVisibility siteVisibility)
+		{
+			super();
+			if(shortName == null)
+			{
+				throw new IllegalArgumentException();
+			}
+			this.shortName = shortName;
+			this.title = title;
+			this.description = description;
+			this.siteVisibility = siteVisibility;
+		}
+
+        public SiteInformation(String shortName, String title, String description, String sitePreset, SiteVisibility siteVisibility)
+        {
+            this(shortName, title, description, siteVisibility);
+            this.sitePreset = sitePreset;
+        }
+
+		public String getShortName()
+		{
+			return shortName;
+		}
+
+		public String getTitle()
+		{
+			return title;
+		}
+
+		public String getSitePreset()
+		{
+			return sitePreset;
+		}
+
+		public String getDescription()
+		{
+			return description;
+		}
+
+		public SiteVisibility getSiteVisibility()
+		{
+			return siteVisibility;
+		}
+
+		public boolean equals(Object other)
+		{
+			if(this == other)
+			{
+				return true;
+			}
+
+			if(!(other instanceof SiteInformation))
+			{
+				return false;
+			}
+			
+			SiteInformation site = (SiteInformation)other;
+			return shortName == site.getShortName();
+		}
+
+		@Override
+		public int compareTo(SiteInformation site)
+		{
+			return shortName.compareTo(site.getShortName());
+		}
+
+	    public int hashCode()
+		{
+			return getShortName().hashCode();
+		}
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/RestApiHttpClient.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/RestApiHttpClient.java
new file mode 100644
index 00000000000..a0ce8241c13
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/RestApiHttpClient.java
@@ -0,0 +1,425 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.MessageFormat;
+import java.util.Map;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.web.scripts.TenantWebScriptServlet;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.Api.SCOPE;
+import org.alfresco.rest.framework.core.ResourceInspector;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.auth.AuthScope;
+import org.apache.commons.httpclient.methods.DeleteMethod;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.methods.RequestEntity;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.apache.commons.httpclient.params.HttpClientParams;
+import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
+import org.apache.commons.httpclient.params.HttpConnectionParams;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
+import org.springframework.core.type.classreading.MetadataReader;
+import org.springframework.core.type.classreading.MetadataReaderFactory;
+
+/**
+ * A http client for talking to the rest apis.
+ * 
+ * The caller can pass in a rest api implementation class to the http method (get, post, put, delete supported)
+ * and the url will be generated.
+ * 
+ * @author steveglover
+ *
+ */
+public class RestApiHttpClient
+{
+/*    private static final Log logger = LogFactory.getLog(RestApiHttpClient.class);
+
+	private static final String INDEX_URL = "http://{0}:{1}{2}/a";
+	private static final String BASE_URL = "http://{0}:{1}{2}/a/{3}/{4}/alfresco/versions/1/";
+
+    private String host = "localhost";
+    private int port = 8081;
+    private HttpClient httpClient;
+
+    private int maxTotalConnections = 255;
+    private int maxHostConnections = 255;
+
+    private String contextPath;
+
+	private ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
+	private MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(this.resourcePatternResolver);
+
+	public RestApiHttpClient()
+	{
+	}
+
+	public RestApiHttpClient(String host, int port, String contextPath)
+	{
+		super();
+		this.host = host;
+		this.port = port;
+		this.contextPath = contextPath;
+		constructHttpClient();
+	}
+	
+	public void setHost(String host)
+	{
+		this.host = host;
+	}
+
+	public void setPort(int port)
+	{
+		this.port = port;
+	}
+	
+	public void setContextPath(String contextPath)
+	{
+		this.contextPath = contextPath;
+	}
+
+	public void init()
+	{
+		constructHttpClient();		
+	}
+
+	private void log(String msg)
+	{
+		if(logger.isDebugEnabled())
+		{
+			logger.debug(msg);
+		}
+	}
+
+    protected void constructHttpClient()
+	{
+        MultiThreadedHttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager();
+		this.httpClient = new HttpClient(connectionManager);
+        HttpClientParams params = httpClient.getParams();
+        params.setBooleanParameter(HttpConnectionParams.TCP_NODELAY, true);
+        params.setBooleanParameter(HttpConnectionParams.STALE_CONNECTION_CHECK, false);
+        HttpConnectionManagerParams connectionManagerParams = httpClient.getHttpConnectionManager().getParams();
+        connectionManagerParams.setMaxTotalConnections(maxTotalConnections);
+        connectionManagerParams.setDefaultMaxConnectionsPerHost(maxHostConnections);
+
+        httpClient.getHostConfiguration().setHost(host, port);
+        httpClient.getParams().setAuthenticationPreemptive(true);
+	}
+    
+    protected AnnotationMetadata getAnnotationMetadata(String classname) throws IOException
+    {
+		MetadataReader metadataReader = this.metadataReaderFactory.getMetadataReader(classname);
+		AnnotationMetadata annotationMetaData = metadataReader.getAnnotationMetadata();
+		return annotationMetaData;
+    }
+
+    public JSONObject submitRequest(HttpMethod req, String user, String password, int expectedStatus) throws HttpException, IOException
+    {
+		String contentAsString = null;
+
+		try
+		{
+			httpClient.getState().setCredentials(
+					new AuthScope(host, port, null),
+					new UsernamePasswordCredentials(user, password)
+			);
+
+	        httpClient.getParams().setAuthenticationPreemptive(true);
+	        
+			String requestBody = null;
+			if(req instanceof PostMethod)
+			{
+				PostMethod post = (PostMethod)req;
+				RequestEntity entity = post.getRequestEntity();
+				if(entity != null)
+				{
+					ByteArrayOutputStream bos = new ByteArrayOutputStream();
+					entity.writeRequest(bos);
+					requestBody = new String(bos.toByteArray(), "UTF-8");
+				}
+			}
+			else if(req instanceof PutMethod)
+			{
+				PutMethod put = (PutMethod)req;
+				RequestEntity entity = put.getRequestEntity();
+				if(entity != null)
+				{
+					ByteArrayOutputStream bos = new ByteArrayOutputStream();
+					entity.writeRequest(bos);
+					requestBody = new String(bos.toByteArray(), "UTF-8");
+				}
+			}
+
+			long start = System.currentTimeMillis();
+
+			int ret = httpClient.executeMethod(req);
+
+			long end = System.currentTimeMillis();
+			
+			contentAsString = req.getResponseBodyAsString();
+
+			log(req.getName() + " request " + req.getURI().toString());
+			log(requestBody != null ? " \nbody = " + requestBody + "\n" : "");
+			log("user " + user);
+			log(" returned " + ret + " and took " + (end - start) + "ms");
+			log("Response content " + contentAsString);
+			
+			assertEquals(expectedStatus, ret);
+		}
+		finally
+		{
+			if(req != null)
+			{
+				req.releaseConnection();
+			}
+		}
+
+    	JSONObject jsonRsp = (contentAsString != null ? (JSONObject)JSONValue.parse(contentAsString) : null);
+    	return jsonRsp;
+    }
+    
+    public JSONObject get(final Class<?> c, final String tenantDomain, final TestPerson runAsUser, final Object entityId, final Object relationshipEntityId, Map<String, String> params, final int expectedStatus) throws IOException
+	{
+    	RestApiEndpoint endpoint = new RestApiEndpoint(c, tenantDomain, entityId, relationshipEntityId, params);
+		String url = endpoint.getUrl();
+
+		GetMethod req = new GetMethod(url);
+    	return submitRequest(req, runAsUser.getUsername(), runAsUser.getPassword(), expectedStatus);
+	}
+	
+	public JSONObject post(final Class<?> c, final String tenantDomain, final TestPerson runAsUser, final Object entityId, final Object relationshipEntityId, final String body, final int expectedStatus) throws IOException
+	{
+		RestApiEndpoint endpoint = new RestApiEndpoint(c, tenantDomain, entityId, relationshipEntityId, null);
+		String url = endpoint.getUrl();
+		
+		PostMethod req = new PostMethod(url.toString());
+		if(body != null)
+		{
+			StringRequestEntity requestEntity = new StringRequestEntity(body, "application/json", "UTF-8");
+			req.setRequestEntity(requestEntity);
+		}
+    	return submitRequest(req, runAsUser.getUsername(), runAsUser.getPassword(), expectedStatus);
+	}
+
+	public JSONObject delete(final Class<?> c, final String tenantDomain, final TestPerson runAsUser, final Object entityId, final Object relationshipEntityId, Map<String, String> params, final int expectedStatus) throws IOException
+	{
+		RestApiEndpoint endpoint = new RestApiEndpoint(c, tenantDomain, entityId, relationshipEntityId, params);
+		String url = endpoint.getUrl();
+
+		DeleteMethod req = new DeleteMethod(url);
+    	return submitRequest(req, runAsUser.getUsername(), runAsUser.getPassword(), expectedStatus);
+	}
+
+	public JSONObject put(final Class<?> c, final String tenantDomain, final TestPerson runAsUser, final Object entityId, final Object relationshipEntityId, final String body, final int expectedStatus) throws IOException
+	{
+		RestApiEndpoint endpoint = new RestApiEndpoint(c, tenantDomain, entityId, relationshipEntityId, null);
+		String url = endpoint.getUrl();
+
+		PutMethod req = new PutMethod(url);
+		if(body != null)
+		{
+			StringRequestEntity requestEntity = new StringRequestEntity(body, "application/json", "UTF-8");
+			req.setRequestEntity(requestEntity);
+		}
+    	return submitRequest(req, runAsUser.getUsername(), runAsUser.getPassword(), expectedStatus);
+	}
+
+	
+	 * Encapsulates information relating to a rest api end point, generating and encoding urls
+	 * based on the rest api implementation class.
+	 
+    private class RestApiEndpoint
+    {
+    	private Object collectionEntityId;
+    	private Object relationEntityId;
+    	private String tenantDomain;
+    	private Class<?> resourceClass;
+    	private SCOPE scope;
+    	private Map<String, String> params;
+
+    	private String entityCollectionName;
+    	private String relationshipCollectionName;
+
+    	RestApiEndpoint(Class<?> resourceClass, String tenantDomain, Object collectionEntityId, Object relationEntityId, Map<String, String> params) throws IOException
+    	{
+    		this.tenantDomain = tenantDomain;
+    		this.resourceClass = resourceClass;
+    		this.collectionEntityId = collectionEntityId;
+    		this.relationEntityId = relationEntityId;
+    		this.params = params;
+
+    		if(resourceClass != null)
+    		{
+	    		Api api = ResourceInspector.inspectApi(resourceClass);
+	    		this.scope = api.getScope();
+	
+	    		extractRelationCollectionInfo();
+	    		extractEntityCollectionInfo();
+    		}
+    	}
+
+        private String encodeToString(Object o) throws UnsupportedEncodingException
+        {
+	    	String ret = null;
+	
+	    	if(o instanceof NodeRef)
+	    	{
+	    		NodeRef nodeRef = (NodeRef)o;
+	    		ret = (o != null ? nodeRef.getId() : null);
+	    	}
+	    	else
+	    	{
+	    		ret = (o != null ? o.toString() : null);
+	    	}
+	
+	    	return ret;
+        }
+        
+        private void extractRelationCollectionInfo() throws IOException
+        {
+    		AnnotationMetadata annotationMetaData = getAnnotationMetadata(resourceClass.getCanonicalName());
+    		if(annotationMetaData.isConcrete() && annotationMetaData.isIndependent())
+    		{
+    			if(annotationMetaData.getAnnotationTypes().contains(RelationshipResource.class.getCanonicalName()))
+    			{
+    				Map<String, Object> attrs = annotationMetaData.getAnnotationAttributes(RelationshipResource.class.getName());
+    				this.relationshipCollectionName = (String)attrs.get("name");
+    				Class<?> entityResource = (Class<?>)attrs.get("entityResource");
+
+    				extractEntityCollectionInfo(entityResource.getCanonicalName());
+    			}
+    		}
+    		else
+    		{
+    			throw new AlfrescoRuntimeException("");
+    		}
+        }
+
+        private void extractEntityCollectionInfo() throws IOException
+        {
+        	extractEntityCollectionInfo(resourceClass.getCanonicalName());
+        }
+
+        private void extractEntityCollectionInfo(String className) throws IOException
+        {
+    		AnnotationMetadata annotationMetaData = getAnnotationMetadata(className);
+    		if(annotationMetaData.isConcrete() && annotationMetaData.isIndependent())
+    		{
+    			if(annotationMetaData.getAnnotationTypes().contains(EntityResource.class.getCanonicalName()))
+    			{
+    				Map<String, Object> attrs = annotationMetaData.getAnnotationAttributes(EntityResource.class.getName());
+    				this.entityCollectionName = (String)attrs.get("name");
+    			}
+    		}
+    		else
+    		{
+    			throw new AlfrescoRuntimeException("");
+    		}
+        }
+		
+		public String getUrl() throws UnsupportedEncodingException
+		{
+			StringBuilder sb = new StringBuilder();
+
+			if(resourceClass != null)
+			{
+				sb.append(MessageFormat.format(BASE_URL, new Object[] {host, String.valueOf(port), contextPath,
+						tenantDomain == null ? TenantWebScriptServlet.DEFAULT_TENANT : tenantDomain, scope.toString()}));
+	
+				String collectionEntityIdString = encodeToString(collectionEntityId);
+				String relationEntityIdString = encodeToString(relationEntityId);
+	
+				if(entityCollectionName != null)
+				{
+					sb.append(entityCollectionName);
+					sb.append("/");
+					if(collectionEntityIdString != null)
+					{
+						sb.append(collectionEntityIdString);
+						sb.append("/");
+					}
+				}
+				
+				if(relationshipCollectionName != null)
+				{
+					sb.append(relationshipCollectionName);
+					sb.append("/");
+					if(relationEntityIdString != null)
+					{
+						sb.append(relationEntityIdString);
+						sb.append("/");
+					}
+				}
+			}
+			else
+			{
+				sb.append(MessageFormat.format(INDEX_URL, new Object[] {host, String.valueOf(port), contextPath}));				
+			}
+			
+			if(params != null && params.size() > 0)
+			{
+				sb.append("?");
+
+				for(String paramName : params.keySet())
+				{
+					sb.append(URLEncoder.encode(paramName, "UTF-8"));
+					sb.append("=");
+					sb.append(URLEncoder.encode(params.get(paramName), "UTF-8"));
+					sb.append("&");
+				}
+
+				sb.deleteCharAt(sb.length() - 1);
+			}
+
+			String url = sb.toString();
+			return url;
+		}
+    }*/
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/SharedLinkApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/SharedLinkApiTest.java
new file mode 100644
index 00000000000..9f2f0d94ca4
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/SharedLinkApiTest.java
@@ -0,0 +1,1651 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.quickshare.QuickShareLinkExpiryActionImpl;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.service.ServiceDescriptorRegistry;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.rest.api.People;
+import org.alfresco.rest.api.QuickShareLinks;
+import org.alfresco.rest.api.impl.QuickShareLinksImpl;
+import org.alfresco.rest.api.model.LockInfo;
+import org.alfresco.rest.api.model.NodePermissions;
+import org.alfresco.rest.api.model.PathInfo;
+import org.alfresco.rest.api.model.QuickShareLink;
+import org.alfresco.rest.api.model.Site;
+import org.alfresco.rest.api.nodes.NodesEntityResource;
+import org.alfresco.rest.api.quicksharelinks.QuickShareLinkEntityResource;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.Favourite;
+import org.alfresco.rest.api.tests.client.data.FavouriteDocument;
+import org.alfresco.rest.api.tests.client.data.FileFavouriteTarget;
+import org.alfresco.rest.api.tests.client.data.Folder;
+import org.alfresco.rest.api.tests.client.data.Node;
+import org.alfresco.rest.api.tests.client.data.QuickShareLinkEmailRequest;
+import org.alfresco.rest.api.tests.client.data.Rendition;
+import org.alfresco.rest.api.tests.client.data.UserInfo;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.action.scheduled.ScheduledPersistedActionService;
+import org.alfresco.service.cmr.quickshare.QuickShareLinkExpiryAction;
+import org.alfresco.service.cmr.quickshare.QuickShareLinkExpiryActionPersister;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.ResultSetRow;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.alfresco.util.testing.category.RedundantTests;
+import org.joda.time.DateTime;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * V1 REST API tests for Shared Links (aka public "quick shares")
+ *
+ * <ul>
+ * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links} </li>
+ * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links/<sharedId>} </li>
+ * </ul>
+ *
+ * @author janv
+ * @author mbhave
+ */
+@SuppressWarnings("deprecation")
+@Category(LuceneTests.class)
+public class SharedLinkApiTest extends AbstractBaseApiTest
+{
+    private static final String URL_SHARED_LINKS = "shared-links";
+
+    private QuickShareLinkExpiryActionPersister quickShareLinkExpiryActionPersister;
+    private ScheduledPersistedActionService scheduledPersistedActionService;
+
+    @Before
+    public void setup() throws Exception
+    {
+        super.setup();
+        quickShareLinkExpiryActionPersister = applicationContext.getBean("quickShareLinkExpiryActionPersister", QuickShareLinkExpiryActionPersister.class);
+        scheduledPersistedActionService = applicationContext.getBean("scheduledPersistedActionService", ScheduledPersistedActionService.class);
+    }
+
+    /**
+     * Tests shared links to file (content)
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links}
+     *
+     * <p>DELETE:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links/<sharedId>}
+     *
+     * <p>GET:</p>
+     * The following do not require authentication
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links/<sharedId>}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links/<sharedId>/content}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links/<sharedId>/renditions}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links/<sharedId>/renditions/<renditionId>}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links/<sharedId>/renditions/<renditionId>/content}
+     *
+     */
+    @Test
+    public void testSharedLinkCreateGetDelete() throws Exception
+    {
+        // As user 1 ...
+        setRequestContext(user1);
+
+        // create doc d1 - pdf
+        String sharedFolderNodeId = getSharedNodeId();
+
+        String fileName1 = "quick"+RUNID+"_1.pdf";
+        File file1 = getResourceFile("quick.pdf");
+
+        byte[] file1_originalBytes = Files.readAllBytes(Paths.get(file1.getAbsolutePath()));
+
+        String file1_MimeType = MimetypeMap.MIMETYPE_PDF;
+
+        MultiPartBuilder multiPartBuilder = MultiPartBuilder.create()
+                .setFileData(new MultiPartBuilder.FileData(fileName1, file1, file1_MimeType));
+        MultiPartBuilder.MultiPartRequest reqBody = multiPartBuilder.build();
+
+        HttpResponse response = post(getNodeChildrenUrl(sharedFolderNodeId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document doc1 = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        String d1Id = doc1.getId();
+
+        // create doc d2 - plain text
+        String myFolderNodeId = getMyNodeId();
+
+        String content2Text = "The quick brown fox jumps over the lazy dog 2.";
+        String fileName2 = "content" + RUNID + "_2.txt";
+
+        Document doc2 = createTextFile(myFolderNodeId, fileName2, content2Text);
+        String d2Id = doc2.getId();
+
+        String file2_MimeType = MimetypeMap.MIMETYPE_TEXT_PLAIN;
+
+        // As user 2 ...
+        setRequestContext(user2);
+
+        response = getSingle(NodesEntityResource.class, d1Id, null, 200);
+        Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        Date docModifiedAt = nodeResp.getModifiedAt();
+        String docModifiedBy = nodeResp.getModifiedByUser().getId();
+        assertEquals(user1, docModifiedBy);
+
+        // create shared link to document 1
+        Map<String, String> body = new HashMap<>();
+        body.put("nodeId", d1Id);
+
+        response = post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 201);
+        QuickShareLink resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+
+        String shared1Id = resp.getId();
+        assertNotNull(shared1Id);
+
+        assertEquals(d1Id, resp.getNodeId());
+        assertEquals(fileName1, resp.getName());
+        assertEquals("The quick brown fox jumps over the lazy dog", resp.getTitle());
+        assertEquals("Gym class featuring a brown fox and lazy dog", resp.getDescription());
+
+        assertEquals(file1_MimeType, resp.getContent().getMimeType());
+        assertEquals("Adobe PDF Document", resp.getContent().getMimeTypeName());
+
+        assertEquals(new Long(file1_originalBytes.length), resp.getContent().getSizeInBytes());
+        assertEquals("UTF-8", resp.getContent().getEncoding());
+
+        assertEquals(docModifiedAt.getTime(), resp.getModifiedAt().getTime()); // not changed
+        assertEquals(docModifiedBy, resp.getModifiedByUser().getId()); // not changed (ie. not user2)
+        assertEquals(UserInfo.getTestDisplayName(docModifiedBy), resp.getModifiedByUser().getDisplayName());
+
+        assertEquals(user2, resp.getSharedByUser().getId());
+        assertEquals(UserInfo.getTestDisplayName(user2), resp.getSharedByUser().getDisplayName());
+
+        // -ve test - try to create again (same user) - already exists
+        post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 409);
+
+
+        // As user 1 ...
+        setRequestContext(user1);
+
+        // create shared link to document 2
+        body = new HashMap<>();
+        body.put("nodeId", d2Id);
+
+        response = post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 201);
+        resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        String shared2Id = resp.getId();
+
+
+        // currently passing auth should make no difference (irrespective of MT vs non-MY enb)
+
+        // access to get shared link info - pass user1 (but ignore in non-MT)
+        Map<String, String> params = Collections.singletonMap("include", "allowableOperations");
+        response = getSingle(QuickShareLinkEntityResource.class, shared1Id, params, 200);
+        resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+
+        assertEquals(shared1Id, resp.getId());
+        assertEquals(fileName1, resp.getName());
+        assertEquals("The quick brown fox jumps over the lazy dog", resp.getTitle());
+        assertEquals("Gym class featuring a brown fox and lazy dog", resp.getDescription());
+        assertEquals(d1Id, resp.getNodeId());
+        assertNull(resp.getAllowableOperations()); // include is ignored
+        assertNull(resp.getAllowableOperationsOnTarget()); // include is ignored
+
+        assertNull(resp.getModifiedByUser().getId()); // userId not returned
+        assertEquals(UserInfo.getTestDisplayName(user1), resp.getModifiedByUser().getDisplayName());
+        assertNull(resp.getSharedByUser().getId()); // userId not returned
+        assertEquals(UserInfo.getTestDisplayName(user2), resp.getSharedByUser().getDisplayName());
+
+        // access to get shared link info - pass user2 (but ignore in non-MT)
+        params = Collections.singletonMap("include", "allowableOperations");
+        response = getSingle(QuickShareLinkEntityResource.class, shared1Id, params, 200);
+        resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+
+        assertEquals(shared1Id, resp.getId());
+        assertEquals(fileName1, resp.getName());
+        assertEquals(d1Id, resp.getNodeId());
+        assertNull(resp.getAllowableOperations()); // include is ignored
+        assertNull(resp.getAllowableOperationsOnTarget()); // include is ignored
+
+
+        assertNull(resp.getModifiedByUser().getId()); // userId not returned
+        assertEquals(UserInfo.getTestDisplayName(user1), resp.getModifiedByUser().getDisplayName());
+        assertNull(resp.getSharedByUser().getId()); // userId not returned
+        assertEquals(UserInfo.getTestDisplayName(user2), resp.getSharedByUser().getDisplayName());
+
+
+        // allowable operations not included - no params
+        response = getSingle(QuickShareLinkEntityResource.class, shared1Id, null, 200);
+        resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        assertNull(resp.getAllowableOperations());
+        assertNull(resp.getAllowableOperationsOnTarget());
+
+        setRequestContext(null);
+
+        // unauth access to get shared link info
+        params = Collections.singletonMap("include", "allowableOperations"); // note: this will be ignore for unauth access
+        response = getSingle(QuickShareLinkEntityResource.class, shared1Id, params, 200);
+        resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+
+        assertEquals(shared1Id, resp.getId());
+        assertEquals(fileName1, resp.getName());
+        assertEquals(d1Id, resp.getNodeId());
+        assertNull(resp.getAllowableOperations()); // include is ignored
+        assertNull(resp.getAllowableOperationsOnTarget()); // include is ignored
+
+
+        assertNull(resp.getModifiedByUser().getId()); // userId not returned
+        assertEquals(UserInfo.getTestDisplayName(user1), resp.getModifiedByUser().getDisplayName());
+        assertNull(resp.getSharedByUser().getId()); // userId not returned
+        assertEquals(UserInfo.getTestDisplayName(user2), resp.getSharedByUser().getDisplayName());
+
+        // unauth access to file 1 content (via shared link)
+        response = getSingle(QuickShareLinkEntityResource.class, shared1Id + "/content", null, 200);
+        assertArrayEquals(file1_originalBytes, response.getResponseAsBytes());
+        Map<String, String> responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertEquals(file1_MimeType+";charset=UTF-8", responseHeaders.get("Content-Type"));
+        assertNotNull(responseHeaders.get("Expires"));
+        assertEquals("attachment; filename=\"" + fileName1 + "\"; filename*=UTF-8''" + fileName1 + "", responseHeaders.get("Content-Disposition"));
+        String lastModifiedHeader = responseHeaders.get(LAST_MODIFIED_HEADER);
+        assertNotNull(lastModifiedHeader);
+        // Test 304 response
+        Map<String, String> headers = Collections.singletonMap(IF_MODIFIED_SINCE_HEADER, lastModifiedHeader);
+        getSingle(URL_SHARED_LINKS, shared1Id + "/content", null, headers, 304);
+
+        // unauth access to file 1 content (via shared link) - without Content-Disposition header (attachment=false)
+        params = new HashMap<>();
+        params.put("attachment", "false");
+        response = getSingle(QuickShareLinkEntityResource.class, shared1Id + "/content", params, 200);
+        assertArrayEquals(file1_originalBytes, response.getResponseAsBytes());
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertEquals(file1_MimeType+";charset=UTF-8", responseHeaders.get("Content-Type"));
+        assertNotNull(responseHeaders.get(LAST_MODIFIED_HEADER));
+        assertNotNull(responseHeaders.get("Expires"));
+        assertNull(responseHeaders.get("Content-Disposition"));
+
+
+        // unauth access to file 2 content (via shared link)
+        response = getSingle(QuickShareLinkEntityResource.class, shared2Id + "/content", null, 200);
+        assertArrayEquals(content2Text.getBytes(), response.getResponseAsBytes());
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertEquals(file2_MimeType+";charset=ISO-8859-1", responseHeaders.get("Content-Type"));
+        assertNotNull(responseHeaders.get("Expires"));
+        assertNotNull(responseHeaders.get(LAST_MODIFIED_HEADER));
+        assertEquals("attachment; filename=\"" + fileName2 + "\"; filename*=UTF-8''" + fileName2 + "", responseHeaders.get("Content-Disposition"));
+
+        // -ve test - unauth access to get shared link file content - without Content-Disposition header (attachment=false) - header ignored (plain text is not in white list)
+        params = new HashMap<>();
+        params.put("attachment", "false");
+        response = getSingle(QuickShareLinkEntityResource.class, shared2Id + "/content", params, 200);
+        assertEquals("attachment; filename=\"" + fileName2 + "\"; filename*=UTF-8''" + fileName2 + "", response.getHeaders().get("Content-Disposition"));
+
+        // -ve shared link rendition tests
+        {
+            // -ve test - try to get non-existent rendition content
+            getSingle(QuickShareLinkEntityResource.class, shared1Id + "/renditions/doclib/content", null, 404);
+
+            // -ve test - try to get unregistered rendition content
+            getSingle(QuickShareLinkEntityResource.class, shared1Id + "/renditions/dummy/content", null, 404);
+        }
+
+        // unauth access to get rendition info for a shared link (available => CREATED rendition only)
+        // -ve shared link rendition tests
+        {
+            // -ve test - try to get not created rendition for the given shared link
+            getSingle(QuickShareLinkEntityResource.class, shared1Id + "/renditions/doclib", null, 404);
+
+            // -ve test - try to get unregistered rendition
+            getSingle(QuickShareLinkEntityResource.class, shared1Id + "/renditions/dummy", null, 404);
+        }
+
+        // unauth access to get shared link renditions info (available => CREATED renditions only)
+        response = getAll(URL_SHARED_LINKS + "/" + shared1Id + "/renditions", null, 200);
+        List<Rendition> renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertEquals(0, renditions.size());
+
+        // create rendition of pdf doc - note: for some reason create rendition of txt doc fail on build m/c (TBC) ?
+        setRequestContext(user2);
+        
+        Rendition rendition = createAndGetRendition(d1Id, "doclib");
+        assertNotNull(rendition);
+        assertEquals(Rendition.RenditionStatus.CREATED, rendition.getStatus());
+
+        setRequestContext(null);
+
+
+        // unauth access to get shared link renditions info (available => CREATED renditions only)
+        response = getAll(URL_SHARED_LINKS + "/" + shared1Id + "/renditions", null, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertEquals(1, renditions.size());
+        assertEquals(Rendition.RenditionStatus.CREATED, renditions.get(0).getStatus());
+        assertEquals("doclib", renditions.get(0).getId());
+
+        {
+            // try to get a created rendition for the given shared link
+            getSingle(QuickShareLinkEntityResource.class, shared1Id + "/renditions/doclib", null, 200);
+        }
+
+        // unauth access to get shared link file rendition content
+        response = getSingle(QuickShareLinkEntityResource.class, shared1Id + "/renditions/doclib/content", null, 200);
+        assertTrue(response.getResponseAsBytes().length > 0);
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertEquals(MimetypeMap.MIMETYPE_IMAGE_PNG+";charset=UTF-8", responseHeaders.get("Content-Type"));
+        assertNotNull(responseHeaders.get(LAST_MODIFIED_HEADER));
+        assertNotNull(responseHeaders.get("Expires"));
+        String docName = "doclib";
+        assertEquals("attachment; filename=\"" + docName + "\"; filename*=UTF-8''" + docName + "", responseHeaders.get("Content-Disposition"));
+
+        // unauth access to get shared link file rendition content - without Content-Disposition header (attachment=false)
+        params = new HashMap<>();
+        params.put("attachment", "false");
+        response = getSingle(QuickShareLinkEntityResource.class, shared1Id + "/renditions/doclib/content", params, 200);
+        assertTrue(response.getResponseAsBytes().length > 0);
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertEquals(MimetypeMap.MIMETYPE_IMAGE_PNG+";charset=UTF-8", responseHeaders.get("Content-Type"));
+        assertNotNull(responseHeaders.get("Expires"));
+        assertNull(responseHeaders.get("Content-Disposition"));
+        lastModifiedHeader = responseHeaders.get(LAST_MODIFIED_HEADER);
+        assertNotNull(lastModifiedHeader);
+        // Test 304 response
+        headers = Collections.singletonMap(IF_MODIFIED_SINCE_HEADER, lastModifiedHeader);
+        getSingle(URL_SHARED_LINKS, shared1Id + "/renditions/doclib/content", null, headers, 304);
+
+
+        // -ve delete tests
+        {
+            // -ve test - unauthenticated
+            setRequestContext(null);
+            deleteSharedLink(shared1Id, 401);
+            
+            setRequestContext(user1);
+
+            // -ve test - user1 cannot delete shared link
+            deleteSharedLink(shared1Id, 403);
+            
+            // -ve test - delete - cannot delete non-existent link
+            deleteSharedLink("dummy", 404);
+        }
+
+
+        // -ve create tests
+        {
+            // As user 1 ...
+
+            // -ve test - try to create again (different user, that has read permission) - already exists
+            body = new HashMap<>();
+            body.put("nodeId", d1Id);
+            post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 409);
+
+            // -ve - create - missing nodeId
+            body = new HashMap<>();
+            post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 400);
+
+            // -ve - create - unknown nodeId
+            body = new HashMap<>();
+            body.put("nodeId", "dummy");
+            post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 404);
+
+            // -ve - create - try to link to folder (ie. not a file)
+            String f1Id = createFolder(myFolderNodeId, "f1 " + RUNID).getId();
+            body = new HashMap<>();
+            body.put("nodeId", f1Id);
+            post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 400);
+
+            // -ve test - cannot create if user does not have permission to read
+            setRequestContext(user2);
+            body = new HashMap<>();
+            body.put("nodeId", d2Id);
+            post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 403);
+
+            // -ve test - unauthenticated
+            setRequestContext(null);
+            body = new HashMap<>();
+            body.put("nodeId", d1Id);
+            post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 401);
+        }
+
+
+        // delete shared link
+        setRequestContext(user2);
+        deleteSharedLink(shared1Id);
+
+        // -ve test - delete - cannot delete non-existent link
+        setRequestContext(user1);
+        deleteSharedLink(shared1Id, 404);
+
+        setRequestContext(user2);
+
+        response = getSingle(NodesEntityResource.class, d1Id, null, 200);
+        nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+
+        assertEquals(docModifiedAt.getTime(), nodeResp.getModifiedAt().getTime()); // not changed
+        assertEquals(docModifiedBy, nodeResp.getModifiedByUser().getId()); // not changed (ie. not user2)
+
+
+        // -ve get tests
+        {
+            // try to get link that has been deleted (see above)
+            getSingle(QuickShareLinkEntityResource.class, shared1Id, null, 404);
+            getSingle(QuickShareLinkEntityResource.class, shared1Id + "/content", null, 404);
+
+            // try to get non-existent link
+            getSingle(QuickShareLinkEntityResource.class, "dummy", null, 404);
+            getSingle(QuickShareLinkEntityResource.class, "dummy/content", null, 404);
+        }
+
+        // TODO if and when these tests are optionally runnable via remote env then we could skip this part of the test
+        // (else need to verify test mechanism for enterprise admin via jmx ... etc)
+
+        QuickShareLinksImpl quickShareLinks = applicationContext.getBean("quickShareLinks", QuickShareLinksImpl.class);
+        try
+        {
+            quickShareLinks.setEnabled(false);
+
+            setRequestContext(user1);
+
+            // -ve - disabled service tests
+            body.put("nodeId", "dummy");
+            post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 501);
+
+            setRequestContext(null);
+            getSingle(QuickShareLinkEntityResource.class, "dummy", null, 501);
+            getSingle(QuickShareLinkEntityResource.class, "dummy/content", null, 501);
+
+            setRequestContext(user1);
+            deleteSharedLink("dummy", 501);
+        }
+        finally
+        {
+            quickShareLinks.setEnabled(true);
+        }
+    }
+
+    /**
+     * Tests find shared links to file (content)
+     *
+     * Note: relies on search service
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links}
+     */
+    @Test
+    @Category({LuceneTests.class, RedundantTests.class})
+    public void testSharedLinkFind() throws Exception
+    {
+        // As user 1 ...
+        setRequestContext(user1);
+        
+        Paging paging = getPaging(0, 100);
+
+        // Get all shared links visible to user 1 (note: for now assumes clean repo)
+        HttpResponse response = getAll(URL_SHARED_LINKS, paging, 200);
+        List<QuickShareLink> sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals(0, sharedLinks.size());
+        
+        // create doc d1 - in "My" folder
+        String myFolderNodeId = getMyNodeId();
+        String content1Text = "The quick brown fox jumps over the lazy dog 1.";
+        String docName1 = "content" + RUNID + "_1.txt";
+        Document doc1 = createTextFile(myFolderNodeId, docName1, content1Text);
+        String d1Id = doc1.getId();
+
+        // create doc2 - in "Shared" folder
+        String sharedFolderNodeId = getSharedNodeId();
+        String docName2 = "content" + RUNID + "_2.txt";
+        Document doc2 = createTextFile(sharedFolderNodeId, docName2, content1Text);
+        String d2Id = doc2.getId();
+
+        // create shared link to doc 1
+        Map<String, String> body = new HashMap<>();
+        body.put("nodeId", d1Id);
+        response = post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 201);
+        QuickShareLink resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        String shared1Id = resp.getId();
+
+        // As user 2 ...
+        setRequestContext(user2);
+
+        // create shared link to doc 2
+        body = new HashMap<>();
+        body.put("nodeId", d2Id);
+        response = post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 201);
+        resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        String shared2Id = resp.getId();
+
+
+        //
+        // find links
+        //
+
+        setRequestContext(user1);
+
+        response = getAll(URL_SHARED_LINKS, paging, 200);
+        sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals(2, sharedLinks.size());
+        assertEquals(shared2Id, sharedLinks.get(0).getId());
+        assertEquals(d2Id, sharedLinks.get(0).getNodeId());
+        assertEquals(shared1Id, sharedLinks.get(1).getId());
+        assertEquals(d1Id, sharedLinks.get(1).getNodeId());
+
+        setRequestContext(user2);
+
+        response = getAll(URL_SHARED_LINKS, paging, 200);
+        sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals(1, sharedLinks.size());
+        assertEquals(shared2Id, sharedLinks.get(0).getId());
+        assertEquals(d2Id, sharedLinks.get(0).getNodeId());
+
+        setRequestContext(user1);
+
+        // find my links
+        Map<String, String> params = new HashMap<>();
+        params.put("where", "("+ QuickShareLinks.PARAM_SHAREDBY+"='"+People.DEFAULT_USER+"')");
+
+        response = getAll(URL_SHARED_LINKS, paging, params, 200);
+        sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals(1, sharedLinks.size());
+        assertEquals(shared1Id, sharedLinks.get(0).getId());
+        assertEquals(d1Id, sharedLinks.get(0).getNodeId());
+
+        // find links shared by a given user
+        params = new HashMap<>();
+        params.put("where", "("+ QuickShareLinks.PARAM_SHAREDBY+"='"+user2+"')");
+
+        response = getAll(URL_SHARED_LINKS, paging, params, 200);
+        sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals(1, sharedLinks.size());
+        assertEquals(shared2Id, sharedLinks.get(0).getId());
+        assertEquals(d2Id, sharedLinks.get(0).getNodeId());
+
+        setRequestContext(null);
+
+        // -ve test - unauthenticated
+        getAll(URL_SHARED_LINKS, paging, params, 401);
+
+
+        // delete the shared links
+        setRequestContext(user1);
+        deleteSharedLink(shared1Id);
+
+        setRequestContext(user2);
+        deleteSharedLink(shared2Id);
+
+
+        // TODO if and when these tests are optionally runnable via remote env then we could skip this part of the test
+        // (else need to verify test mechanism for enterprise admin via jmx ... etc)
+
+        setRequestContext(user1);
+
+        QuickShareLinksImpl quickShareLinks = applicationContext.getBean("quickShareLinks", QuickShareLinksImpl.class);
+        try
+        {
+            quickShareLinks.setEnabled(false);
+
+            // -ve - disabled service tests
+            getAll(URL_SHARED_LINKS, paging, 501);
+        }
+        finally
+        {
+            quickShareLinks.setEnabled(true);
+        }
+    }
+
+    /**
+     * Tests emailing shared links.
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links/<sharedId>/email}
+     */
+    @Test
+    public void testEmailSharedLink() throws Exception
+    {
+        setRequestContext(user1);
+        
+        // Create plain text document
+        String myFolderNodeId = getMyNodeId();
+        String contentText = "The quick brown fox jumps over the lazy dog.";
+        String fileName = "file-" + RUNID + ".txt";
+        Document doc = createTextFile(myFolderNodeId, fileName, contentText);
+        String docId = doc.getId();
+
+        // Create shared link to document
+        Map<String, String> body = Collections.singletonMap("nodeId", docId);
+        HttpResponse response = post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 201);
+        QuickShareLink resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        String sharedId = resp.getId();
+        assertNotNull(sharedId);
+        assertEquals(fileName, resp.getName());
+
+        // Email request with minimal properties
+        QuickShareLinkEmailRequest request = new QuickShareLinkEmailRequest();
+        request.setClient("share");
+        List<String> recipients = new ArrayList<>(2);
+        recipients.add(user2 + "@acme.test");
+        recipients.add(user2 + "@ping.test");
+        request.setRecipientEmails(recipients);
+        post(getEmailSharedLinkUrl(sharedId), RestApiUtil.toJsonAsString(request), 202);
+
+        // Email request with all the properties
+        request = new QuickShareLinkEmailRequest();
+        request.setClient("share");
+        request.setMessage("My custom message!");
+        request.setLocale(Locale.UK.toString());
+        recipients = Collections.singletonList(user2 + "@acme.test");
+        request.setRecipientEmails(recipients);
+        post(getEmailSharedLinkUrl(sharedId), RestApiUtil.toJsonAsString(request), 202);
+
+        // -ve tests
+        // sharedId path parameter does not exist
+        post(getEmailSharedLinkUrl(sharedId + System.currentTimeMillis()), RestApiUtil.toJsonAsString(request), 404);
+
+        // Unregistered client
+        request = new QuickShareLinkEmailRequest();
+        request.setClient("VeryCoolClient" + System.currentTimeMillis());
+        List<String> user2Email = Collections.singletonList(user2 + "@acme.test");
+        request.setRecipientEmails(user2Email);
+        post(getEmailSharedLinkUrl(sharedId), RestApiUtil.toJsonAsString(request), 404);
+
+        // client is mandatory
+        request.setClient(null);
+        post(getEmailSharedLinkUrl(sharedId), RestApiUtil.toJsonAsString(request), 400);
+
+        // recipientEmails is mandatory
+        request.setClient("share");
+        request.setRecipientEmails(null);
+        post(getEmailSharedLinkUrl(sharedId), RestApiUtil.toJsonAsString(request), 400);
+
+        // TODO if and when these tests are optionally runnable via remote env then we could skip this part of the test
+        // (else need to verify test mechanism for enterprise admin via jmx ... etc)
+        QuickShareLinksImpl quickShareLinks = applicationContext.getBean("quickShareLinks", QuickShareLinksImpl.class);
+        try
+        {
+            quickShareLinks.setEnabled(false);
+            request = new QuickShareLinkEmailRequest();
+            request.setClient("share");
+            request.setRecipientEmails(user2Email);
+            post(getEmailSharedLinkUrl(sharedId), RestApiUtil.toJsonAsString(request), 501);
+        }
+        finally
+        {
+            quickShareLinks.setEnabled(true);
+        }
+    }
+
+    /**
+     * Tests shared links to file (content) in a multi-tenant system.
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links}
+     *
+     * <p>DELETE:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links/<sharedId>}
+     *
+     * <p>GET:</p>
+     * The following do not require authentication
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links/<sharedId>}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links/<sharedId>/content}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links/<sharedId>/renditions}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links/<sharedId>/renditions/<renditionId>}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links/<sharedId>/renditions/<renditionId>/content}
+     *
+     */
+    // TODO now covered by testSharedLinkCreateGetDelete ? (since base class now uses tenant context by default)
+    @Test
+    public void testSharedLinkCreateGetDelete_MultiTenant() throws Exception
+    {
+        // As user1
+        setRequestContext(user1);
+
+        String docLibNodeId = getSiteContainerNodeId(tSiteId, "documentLibrary");
+        
+        String folderName = "folder" + System.currentTimeMillis() + "_1";
+        String folderId = createFolder(docLibNodeId, folderName, null).getId();
+
+        // create doc d1 - pdf
+        String fileName1 = "quick" + RUNID + "_1.pdf";
+        File file1 = getResourceFile("quick.pdf");
+
+        byte[] file1_originalBytes = Files.readAllBytes(Paths.get(file1.getAbsolutePath()));
+
+        String file1_MimeType = MimetypeMap.MIMETYPE_PDF;
+
+        MultiPartBuilder.MultiPartRequest reqBody = MultiPartBuilder.create()
+                    .setFileData(new MultiPartBuilder.FileData(fileName1, file1, file1_MimeType))
+                    .build();
+
+        HttpResponse response = post(getNodeChildrenUrl(folderId), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document doc1 = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String d1Id = doc1.getId();
+        assertNotNull(d1Id);
+
+        // create shared link to document 1
+        Map<String, String> body = new HashMap<>();
+        body.put("nodeId", d1Id);
+        response = post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 201);
+        QuickShareLink resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        String shared1Id = resp.getId();
+        assertNotNull(shared1Id);
+        assertEquals(d1Id, resp.getNodeId());
+        assertEquals(fileName1, resp.getName());
+        assertEquals(file1_MimeType, resp.getContent().getMimeType());
+        assertEquals(user1, resp.getSharedByUser().getId());
+
+        // allowable operations not included - no params
+        response = getSingle(QuickShareLinkEntityResource.class, shared1Id, null, 200);
+        resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        assertNull(resp.getAllowableOperations());
+
+        setRequestContext(null);
+
+        // unauth access to get shared link info
+        Map<String, String> params = Collections.singletonMap("include", "allowableOperations"); // note: this will be ignore for unauth access
+        response = getSingle(QuickShareLinkEntityResource.class, shared1Id, params, 200);
+        resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals(shared1Id, resp.getId());
+        assertEquals(fileName1, resp.getName());
+        assertEquals(d1Id, resp.getNodeId());
+        assertNull(resp.getAllowableOperations()); // include is ignored
+        assertNull(resp.getAllowableOperationsOnTarget()); // include is ignored
+
+
+        // unauth access to file 1 content (via shared link)
+        response = getSingle(QuickShareLinkEntityResource.class, shared1Id + "/content", null, 200);
+        assertArrayEquals(file1_originalBytes, response.getResponseAsBytes());
+        Map<String, String> responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertEquals(file1_MimeType + ";charset=UTF-8", responseHeaders.get("Content-Type"));
+        assertNotNull(responseHeaders.get("Expires"));
+        assertEquals("attachment; filename=\"" + fileName1 + "\"; filename*=UTF-8''" + fileName1 + "", responseHeaders.get("Content-Disposition"));
+        String lastModifiedHeader = responseHeaders.get(LAST_MODIFIED_HEADER);
+        assertNotNull(lastModifiedHeader);
+        // Test 304 response
+        Map<String, String> headers = Collections.singletonMap(IF_MODIFIED_SINCE_HEADER, lastModifiedHeader);
+        getSingle(URL_SHARED_LINKS, shared1Id + "/content", null, headers, 304);
+
+        // unauth access to file 1 content (via shared link) - without Content-Disposition header (attachment=false)
+        params = new HashMap<>();
+        params.put("attachment", "false");
+        response = getSingle(QuickShareLinkEntityResource.class, shared1Id + "/content", params, 200);
+        assertArrayEquals(file1_originalBytes, response.getResponseAsBytes());
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertEquals(file1_MimeType + ";charset=UTF-8", responseHeaders.get("Content-Type"));
+        assertNotNull(responseHeaders.get(LAST_MODIFIED_HEADER));
+        assertNotNull(responseHeaders.get("Expires"));
+        assertNull(responseHeaders.get("Content-Disposition"));
+
+        // -ve shared link rendition tests
+        {
+            // -ve test - try to get non-existent rendition content
+            getSingle(QuickShareLinkEntityResource.class, shared1Id + "/renditions/doclib/content", null, 404);
+
+            // -ve test - try to get unregistered rendition content
+            getSingle(QuickShareLinkEntityResource.class, shared1Id + "/renditions/dummy/content", null, 404);
+        }
+
+        // unauth access to get rendition info for a shared link (available => CREATED rendition only)
+        // -ve shared link rendition tests
+        {
+            // -ve test - try to get not created rendition for the given shared link
+            getSingle(QuickShareLinkEntityResource.class, shared1Id + "/renditions/doclib", null, 404);
+
+            // -ve test - try to get unregistered rendition
+            getSingle(QuickShareLinkEntityResource.class, shared1Id + "/renditions/dummy", null, 404);
+        }
+
+        // unauth access to get shared link renditions info (available => CREATED renditions only)
+        response = getAll(URL_SHARED_LINKS + "/" + shared1Id + "/renditions", null, 200);
+        List<Rendition> renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertEquals(0, renditions.size());
+
+        // create rendition of pdf doc - note: for some reason create rendition of txt doc fail on build m/c (TBC) ?
+        setRequestContext(user1);
+
+        Rendition rendition = createAndGetRendition(d1Id, "doclib");
+        assertNotNull(rendition);
+        assertEquals(Rendition.RenditionStatus.CREATED, rendition.getStatus());
+
+        setRequestContext(null);
+
+        // unauth access to get shared link renditions info (available => CREATED renditions only)
+        response = getAll(URL_SHARED_LINKS + "/" + shared1Id + "/renditions", null, 200);
+        renditions = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Rendition.class);
+        assertEquals(1, renditions.size());
+        assertEquals(Rendition.RenditionStatus.CREATED, renditions.get(0).getStatus());
+        assertEquals("doclib", renditions.get(0).getId());
+
+        // unauth access to get rendition info for a shared link (available => CREATED rendition only)
+        {
+            // get a created rendition for the given shared link
+            getSingle(QuickShareLinkEntityResource.class, shared1Id + "/renditions/doclib", null, 200);
+        }
+
+        // unauth access to get shared link file rendition content
+        response = getSingle(QuickShareLinkEntityResource.class, shared1Id + "/renditions/doclib/content", null, 200);
+        assertTrue(response.getResponseAsBytes().length > 0);
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertEquals(MimetypeMap.MIMETYPE_IMAGE_PNG + ";charset=UTF-8", responseHeaders.get("Content-Type"));
+        assertNotNull(responseHeaders.get(LAST_MODIFIED_HEADER));
+        assertNotNull(responseHeaders.get("Expires"));
+        String docName = "doclib";
+        assertEquals("attachment; filename=\"" + docName + "\"; filename*=UTF-8''" + docName + "", responseHeaders.get("Content-Disposition"));
+
+        // unauth access to get shared link file rendition content - without Content-Disposition header (attachment=false)
+        params = new HashMap<>();
+        params.put("attachment", "false");
+        response = getSingle(QuickShareLinkEntityResource.class, shared1Id + "/renditions/doclib/content", params, 200);
+        assertTrue(response.getResponseAsBytes().length > 0);
+        responseHeaders = response.getHeaders();
+        assertNotNull(responseHeaders);
+        assertEquals(MimetypeMap.MIMETYPE_IMAGE_PNG + ";charset=UTF-8", responseHeaders.get("Content-Type"));
+        assertNotNull(responseHeaders.get("Expires"));
+        assertNull(responseHeaders.get("Content-Disposition"));
+        lastModifiedHeader = responseHeaders.get(LAST_MODIFIED_HEADER);
+        assertNotNull(lastModifiedHeader);
+        // Test 304 response
+        headers = Collections.singletonMap(IF_MODIFIED_SINCE_HEADER, lastModifiedHeader);
+        getSingle(URL_SHARED_LINKS, shared1Id + "/renditions/doclib/content", null, headers, 304);
+        
+        // -ve test - userTwoN1 cannot delete shared link
+        setRequestContext(user2);
+        deleteSharedLink(shared1Id, 403);
+
+        // -ve test - unauthenticated
+        setRequestContext(null);
+        deleteSharedLink(shared1Id, 401);
+
+        // delete shared link
+        setRequestContext(user1);
+        deleteSharedLink(shared1Id);
+    }
+
+    /**
+     * Tests shared links to file with expiry date.
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links}
+     */
+    @Test
+    public void testSharedLinkWithExpiryDate() throws Exception
+    {
+        // Clear any hanging security context from other tests.
+        // We add it here as getSchedules method will throw an exception.
+        AuthenticationUtil.clearCurrentSecurityContext();
+        final int numOfSchedules = getSchedules();
+        setRequestContext(user1);
+
+        // Create plain text document
+        String myFolderNodeId = getMyNodeId();
+        String contentText = "The quick brown fox jumps over the lazy dog.";
+        String fileName = "file-" + RUNID + ".txt";
+        String docId = createTextFile(myFolderNodeId, fileName, contentText).getId();
+
+        // Create shared link to document
+        QuickShareLink body = new QuickShareLink();
+        body.setNodeId(docId);
+        // Invalid time - passed time
+        body.setExpiresAt(DateTime.now().minusSeconds(20).toDate());
+        post(URL_SHARED_LINKS, RestApiUtil.toJsonAsString(body), 400);
+
+        // The default expiryDate period is DAYS (see: 'system.quickshare.expiry_date.enforce.minimum.period' property),
+        // so the expiry date must be at least 1 day from now
+        body.setExpiresAt(DateTime.now().plusMinutes(5).toDate());
+        post(URL_SHARED_LINKS, RestApiUtil.toJsonAsString(body), 400);
+
+        // Set the expiry date to be in the next 2 days
+        Date time = DateTime.now().plusDays(2).toDate();
+        body.setExpiresAt(time);
+        // Post the share request
+        HttpResponse response = post(URL_SHARED_LINKS, RestApiUtil.toJsonAsString(body), 201);
+        QuickShareLink resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        assertNotNull(resp.getId());
+        assertEquals(fileName, resp.getName());
+        assertEquals(time, resp.getExpiresAt());
+        // Check that the schedule is persisted
+        // Note: No need to check for expiry actions here, as the scheduledPersistedActionService
+        // checks that the expiry action is persisted first and if it wasn't will throw an exception.
+        assertEquals(numOfSchedules + 1, getSchedules());
+        // Delete the shared link
+        deleteSharedLink(resp.getId());
+        // Check the shred link has been deleted
+        getSingle(QuickShareLinkEntityResource.class, resp.getId(), null, 404);
+        // As we deleted the shared link, the expiry action and its related schedule should have been removed as well.
+        // Check that the schedule is deleted
+        assertEquals(numOfSchedules, getSchedules());
+
+        // Set the expiry date to be in the next 24 hours
+        time = DateTime.now().plusDays(1).toDate();
+        body.setExpiresAt(time);
+        // Post the share request
+        response = post(URL_SHARED_LINKS, RestApiUtil.toJsonAsString(body), 201);
+        resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        assertNotNull(resp.getId());
+        // Check that the schedule is persisted
+        assertEquals(numOfSchedules + 1, getSchedules());
+        // Get the shared link info
+        response = getSingle(QuickShareLinkEntityResource.class, resp.getId(), null, 200);
+        resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals(fileName, resp.getName());
+        assertEquals(time, resp.getExpiresAt());
+        // Change the expiry time to be in the next 6 seconds.
+        // Here we'll bypass the QuickShareService in order to force the new time.
+        // As the QuickShareService by default will enforce the expiry date to not be less than 24 hours.
+        forceNewExpiryTime(resp.getId(), DateTime.now().plusSeconds(6).toDate());
+        // Wait for 10 seconds - the expiry action should be triggered in the next 6 seconds.
+        Thread.sleep((10000));
+        // Check that the expiry action unshared the link
+        getSingle(QuickShareLinkEntityResource.class, resp.getId(), null, 404);
+        // The expiry action and its related schedule should have been removed after the link unshared by the action executor.
+        // Check that the schedule is deleted
+        assertEquals(numOfSchedules, getSchedules());
+
+        // Create a shared link without an expiry date
+        body.setExpiresAt(null);
+        response = post(URL_SHARED_LINKS, RestApiUtil.toJsonAsString(body), 201);
+        resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        assertNotNull(resp.getId());
+        assertNull("The 'expiryDate' property should have benn null.", resp.getExpiresAt());
+        assertEquals(numOfSchedules, getSchedules());
+
+        // Delete the share link that hasn't got an expiry date
+        deleteSharedLink(resp.getId());
+    }
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+
+    /**
+     * Tests for get /shared-links?include=path
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links?include=path}
+     */
+    @Test
+    @Category({LuceneTests.class, RedundantTests.class})
+    public void testGetSharedLinksIncludePath() throws Exception
+    {
+        String contentText = "includePathTest" + RUNID;
+        
+        Paging paging = getPaging(0, 100);
+        
+        Map<String, String> queryParams = new HashMap<>();
+        queryParams.put("include", "path");
+        
+        // As user 1: Test the backward compatibility by checking response with and without path is consistent when no shared-links
+        setRequestContext(user1);
+
+        // Get all shared links visible to user 1
+        HttpResponse response = getAll(URL_SHARED_LINKS, paging, 200);
+        List<QuickShareLink> sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        
+        // Check that the same no of items is returned with include=path
+        response = getAll(URL_SHARED_LINKS, paging, queryParams, 200);
+        List<QuickShareLink> sharedLinksWithPath = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals("get /shared-links/ API returns same no of shared-links with or without include=path, when there are no shared-links", sharedLinks, sharedLinksWithPath);
+        
+        // Create Files in various locations: My Files, SharedFiles, Sites with different visibility
+
+        // Create doc in "My Files"
+        Document myFile = createTextFile(getMyNodeId(), "MyFile" + RUNID + ".txt", contentText);
+
+        // Create doc in "Shared" folder
+        Document sharedFile = createTextFile(getSharedNodeId(), "SharedFile" + RUNID + ".txt", contentText);
+        
+        // Create Sites
+        Site publicSite = createSite ("TestSite-Public-" + RUNID, SiteVisibility.PUBLIC);
+        Site modSite = createSite ("TestSite-Moderate-" + RUNID, SiteVisibility.MODERATED);
+        Site privateSite = createSite ("TestSite-Private-" + RUNID, SiteVisibility.PRIVATE);
+        
+        // Create file in Site Public > DocumentLibrary
+        String docLibPub = getSiteContainerNodeId(publicSite.getId(), "documentLibrary");
+        Document filePublic = createTextFile(docLibPub, "filePublic.txt", contentText);
+        
+        // Create files in Site Moderated > DocumentLibrary > Folder 1 and Folder 2
+        String docLibMod = getSiteContainerNodeId(modSite.getId(), "documentLibrary");
+        Folder folder1 = createFolder(docLibMod, "1");
+        Folder folder2 = createFolder(docLibMod, "2");
+        Document fileMod = createTextFile(folder1.getId(), "fileMod.txt", contentText);
+        Document fileMod2 = createTextFile(folder2.getId(), "fileMod2.txt", contentText);
+        
+        // Create file in Site Private > DocumentLibrary
+        String docLibPvt = getSiteContainerNodeId(privateSite.getId(), "documentLibrary");
+        Document filePrivate = createTextFile(docLibPvt, "filePrivate.txt", contentText);
+        
+        // Share the files above in: My Files, SharedFiles, Sites with different visibility
+
+        String myFileLinkId = postSharedLink(myFile);
+
+        String sharedLinkId = postSharedLink(sharedFile);
+  
+        String filePublicLinkId = postSharedLink(filePublic);
+
+        String fileModLinkId = postSharedLink(fileMod);
+
+        String fileMod2LinkId = postSharedLink(fileMod2);
+
+        String filePrivateLinkId = postSharedLink(filePrivate);
+        
+        // Grant user2: Consumer Permission for Moderated Site > File1
+        List<NodePermissions.NodePermission> locallySetPermissions = new ArrayList<>();
+        locallySetPermissions.add(new NodePermissions.NodePermission(user2, PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()));
+        
+        NodePermissions nodePermissions = new NodePermissions();
+        nodePermissions.setIsInheritanceEnabled(false);
+        nodePermissions.setLocallySet(locallySetPermissions);
+        
+        Document docPermissions = new Document();
+        docPermissions.setPermissions(nodePermissions);
+
+        put(URL_NODES, fileMod.getId(), toJsonAsStringNonNull(docPermissions), null, 200);
+        
+        // Grant user2: Consumer Permission for Moderated Site > Folder 2, File2
+        put(URL_NODES, fileMod2.getId(), toJsonAsStringNonNull(docPermissions), null, 200);
+        
+        Folder folderPermissions = new Folder();
+        folderPermissions.setPermissions(nodePermissions);
+        put(URL_NODES, folder2.getId(), toJsonAsStringNonNull(folderPermissions), null, 200);
+        
+        // Get links For User1
+        setRequestContext(user1);
+        
+        response = getSingle(QuickShareLinkEntityResource.class, myFileLinkId, null, 200);
+        QuickShareLink link = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        assertNull("get /shared-links/<id> API does not return Path info by default", link.getPath());
+        
+        // Path info is not included for get shared-links/<id>
+        response = getSingle(QuickShareLinkEntityResource.class, myFileLinkId, queryParams, 200);
+        link = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        assertNull("get /shared-links/<id> API ignores Path info when requested as it is a noAuth API.", link.getPath());
+        
+        response = getAll(URL_SHARED_LINKS, paging, 200);
+        sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals("API returns correct shared-links as expected: without path info", 6, sharedLinks.size());
+        sharedLinks.forEach(sharedLink -> assertNull("API does not return Path info for any shared-links by default", sharedLink.getPath()));
+        
+        // Path info is included for get shared-links when requested
+        response = getAll(URL_SHARED_LINKS, paging, queryParams, 200);
+        sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        
+        // Complete path info is retrieved for the user with access to the complete path
+        assertEquals("API returns correct shared-links as expected: with path info", 6, sharedLinks.size());
+        sharedLinks.forEach(sharedLink -> assertTrue("API returns Complete Path info for each link when requested by content owner", sharedLink.getPath().getIsComplete()));
+
+        // Get links For User2
+        setRequestContext(user2);
+
+        response = getAll(URL_SHARED_LINKS, paging, 200);
+        sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        
+        // Path info is not included when not requested
+        assertEquals("API returns correct shared-links as expected for user2: without path info", 4, sharedLinks.size());
+        sharedLinks.forEach(sharedLink -> assertNull("get /shared-links/ API does not return Path info for any shared-links by default", sharedLink.getPath()));
+        
+        response = getAll(URL_SHARED_LINKS, paging, queryParams, 200);
+        sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        
+        // Path info is retrieved for the user with access to the complete path: Sorted as LIFO
+        assertEquals("API returns correct shared-links as expected for user2: with path info", 4, sharedLinks.size());
+        sharedLinks.forEach(sharedLink -> assertNotNull("API returns Path info for each link when requested by user2", sharedLink.getPath()));
+        
+        // Moderated Site > fileMod2: Path only includes elements where user2 has access
+        QuickShareLink sharedLink = sharedLinks.get(0);
+        assertEquals("Incorrect sort order or SharedLink ID for fileMod2: " + sharedLink, fileMod2LinkId, sharedLink.getId());
+        
+        PathInfo path = sharedLink.getPath();
+        assertEquals("Complete Path is returned even when user2 does not have appropriate permissions. SharedLink Path: " + path, false, path.getIsComplete());
+        assertEquals("Path omits immediate Parent folder Name when user has access to it. SharedLink Path: " + path, "/" + folder2.getName(), path.getName());
+        assertEquals("Path omits immediate Parent folder ID when user has access to it. SharedLink Path: " + path, folder2.getId(), path.getElements().get(0).getId());
+        
+        // Moderated Site > fileMod: Path empty when user2 does not have access to the immediate parent
+        sharedLink = sharedLinks.get(1);
+        assertEquals("Incorrect sort order or SharedLink ID for fileMod: " + sharedLink, fileModLinkId, sharedLink.getId());
+        path = sharedLink.getPath();
+        
+        assertNotNull("Path info is not included in the response when user does not have right permissions. SharedLink Path: " + path, path);
+        assertNull("Path Name is returned when user does not have right permissions. SharedLink Path: " + path, path.getName());
+        assertNull("Path info is returned when user does not have right permissions. SharedLink Path: " + path, path.getIsComplete());
+        assertNull("Path Elements are returned when user does not have right permissions. SharedLink Path: " + path, path.getElements());
+       
+        // Public Site > filePublic: Path includes all the elements when user2 has appropriate access
+        sharedLink = sharedLinks.get(2);
+        assertEquals("Incorrect sort order or SharedLink ID for filePublic: " + sharedLink, filePublicLinkId, sharedLink.getId());
+        
+        path = sharedLink.getPath();
+        
+        assertEquals("Complete Path is not returned for user2 for public files. SharedLink Path: " + path, true, path.getIsComplete());
+        assertEquals("Incorrect Path Name for Public Site Files. SharedLink Path: " + path, "/Company Home/Sites/" + publicSite.getId() + "/documentLibrary", path.getName());
+        assertEquals("Incorrect Path Elements for Public Site Files. SharedLink Path: " + path, 4, path.getElements().size());
+        assertEquals("Incorrect ID in the Path for Company Home. SharedLink Path: " + path, getRootNodeId(), path.getElements().get(0).getId());
+        assertEquals("Incorrect ID in the Path for Public Site. SharedLink Path: " + path, publicSite.getGuid(), path.getElements().get(2).getId());
+        assertEquals("Incorrect ID in the Path for Public Site DocLib. SharedLink Path: " + path, docLibPub, path.getElements().get(3).getId());
+        
+        // Shared Files > shared: Path includes all the elements when user2 has appropriate access
+        sharedLink = sharedLinks.get(3);
+        assertEquals("Incorrect sort order or SharedLink ID for sharedFiles: " + sharedLink, sharedLinkId, sharedLink.getId());
+        
+        path = sharedLink.getPath();
+        
+        assertEquals("Complete Path is not returned for user2 for shared files. SharedLink Path: " + path, true, path.getIsComplete());
+        assertEquals("Incorrect Path Name for Shared Files. SharedLink Path: " + path, "/Company Home/Shared", path.getName());
+        assertEquals("Incorrect Path Elements for Shared Files. SharedLink Path: " + path, 2, path.getElements().size());
+        assertEquals("Incorrect ID in the Path for Company Home. SharedLink Path: " + path, getRootNodeId(), path.getElements().get(0).getId());
+        assertEquals("Incorrect ID in the path for Shared Files. SharedLink Path: " + path, getSharedNodeId(), path.getElements().get(1).getId());
+
+        // Unauthorized request returns 401
+        setRequestContext(null, "UserNotKnown", DEFAULT_ADMIN_PWD);
+        queryParams = new HashMap<>();
+        getAll(URL_SHARED_LINKS, paging, queryParams, 401);
+
+        // Unauthenticated request returns 401
+        setRequestContext(user2, null, null);
+        getAll(URL_SHARED_LINKS, paging, queryParams, 401);
+
+        // Delete the shared links
+        setRequestContext(user1);
+        deleteSharedLink(myFileLinkId);
+        deleteSharedLink(sharedLinkId);
+        deleteSharedLink(filePublicLinkId);
+        deleteSharedLink(fileModLinkId);
+        deleteSharedLink(fileMod2LinkId);
+        deleteSharedLink(filePrivateLinkId);
+    }
+
+    /**
+     * Tests create shared-links with 'include' parameter.
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links?include=path}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links?include=allowableOperations}
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/shared-links?include=path,allowableOperations}
+     */
+    @Test
+    @Category({LuceneTests.class, RedundantTests.class})
+    public void testCreateSharedLinkWithIncludeParam() throws Exception
+    {
+        String content = "The quick brown fox jumps over the lazy dog.";
+        String fileName1 = "fileOne_" + RUNID + ".txt";
+        String fileName2 = "fileTwo_" + RUNID + ".txt";
+        String fileName3 = "fileThree_" + RUNID + ".txt";
+
+        // As user 1 create 3 text files in -my- folder (i.e. User's Home)
+        setRequestContext(user1);
+        String doc1Id = createTextFile(getMyNodeId(), fileName1, content).getId();
+        String doc2Id = createTextFile(getMyNodeId(), fileName2, content).getId();
+        String doc3Id = createTextFile(getMyNodeId(), fileName3, content).getId();
+
+        // Share the 'fileName1' doc and use the query parameter 'include=path' to return path information
+        QuickShareLink body = new QuickShareLink();
+        body.setNodeId(doc1Id);
+
+        HttpResponse response = post(URL_SHARED_LINKS, RestApiUtil.toJsonAsString(body), "?include=path", 201);
+        QuickShareLink quickShareLinkResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        PathInfo pathInfo = quickShareLinkResponse.getPath();
+        assertNotNull("API returns Path info when requested upon creation.", pathInfo);
+        assertTrue("IsComplete should have been true for user1.", pathInfo.getIsComplete());
+        assertEquals("Incorrect number of path elements.", 3, pathInfo.getElements().size());
+        assertEquals("Incorrect path name.", "/Company Home/User Homes/" + user1, pathInfo.getName());
+        assertEquals("Incorrect path element.", getRootNodeId(), pathInfo.getElements().get(0).getId());
+        assertEquals("Incorrect path element.", "Company Home", pathInfo.getElements().get(0).getName());
+        assertEquals("Incorrect path element", "User Homes", pathInfo.getElements().get(1).getName());
+        assertEquals("Incorrect path element.", getMyNodeId(), pathInfo.getElements().get(2).getId());
+        assertEquals("Incorrect path element.", user1, pathInfo.getElements().get(2).getName());
+
+        // Share the 'fileName2' doc and use the query parameter 'include=allowableOperations' to return allowableOperations information
+        body.setNodeId(doc2Id);
+        response = post(URL_SHARED_LINKS, RestApiUtil.toJsonAsString(body), "?include=allowableOperations", 201);
+        quickShareLinkResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        List<String> allowableOperations = quickShareLinkResponse.getAllowableOperations();
+        assertNotNull("'allowableOperations' should have been returned.", allowableOperations);
+        assertEquals("allowableOperations should only have 'Delete' as allowable operation.", 1, allowableOperations.size());
+        assertEquals("Incorrect allowable operation.", "delete", allowableOperations.get(0));
+
+        // Share the 'fileName3' doc and use the query parameter 'include=path,allowableOperations' to return path and allowableOperations information
+        body.setNodeId(doc3Id);
+        response = post(URL_SHARED_LINKS, RestApiUtil.toJsonAsString(body), "?include=path,allowableOperations", 201);
+        quickShareLinkResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        // Check Path info
+        pathInfo = quickShareLinkResponse.getPath();
+        assertNotNull("'path' should have been returned.", pathInfo);
+        assertTrue("IsComplete should have been true for user1.", pathInfo.getIsComplete());
+        assertEquals("Incorrect number of path elements.", 3, pathInfo.getElements().size());
+        assertEquals("Incorrect path name.", "/Company Home/User Homes/" + user1, pathInfo.getName());
+
+        // Check allowableOperations (i.e. the shared link)
+        allowableOperations = quickShareLinkResponse.getAllowableOperations();
+        assertNotNull("'allowableOperations' should have been returned.", allowableOperations);
+        assertEquals("allowableOperations should only have 'Delete' as allowable operation.", 1, allowableOperations.size());
+        assertEquals("Incorrect allowable operation.", "delete", allowableOperations.get(0));
+        
+        // Check allowableOperationsOnTarget (i.e. for the actual file being shared)
+        allowableOperations = quickShareLinkResponse.getAllowableOperationsOnTarget();
+        assertNotNull("'allowableOperationsOnTarget' should have been returned.", allowableOperations);
+        Collection<String> expectedOps = Arrays.asList("delete", "update", "updatePermissions");
+        assertTrue(allowableOperations.containsAll(expectedOps));
+        assertEquals(expectedOps.size(), allowableOperations.size());
+        assertEquals("Incorrect allowable operation.", "delete", allowableOperations.get(0));
+
+        // Test that listing shared links also support the include parameter.
+        Paging paging = getPaging(0, 100);
+        response = getAll(URL_SHARED_LINKS, paging, Collections.singletonMap("include", "path,allowableOperations"), 200);
+        List<QuickShareLink> sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals("Incorrect number of shared-links returned.", 3, sharedLinks.size());
+        sharedLinks.forEach(sharedLink ->
+        {
+            // Check Path info
+            PathInfo path = sharedLink.getPath();
+            assertNotNull("'path' should have been returned.", path);
+            assertTrue("IsComplete should have been true for user1.", path.getIsComplete());
+            assertEquals("Incorrect number of path elements.", 3, path.getElements().size());
+            assertEquals("Incorrect path name.", "/Company Home/User Homes/" + user1, path.getName());
+
+            // Check allowableOperations
+            List<String> operations = sharedLink.getAllowableOperations();
+            assertNotNull("'allowableOperations' should have been returned.", operations);
+            assertEquals("allowableOperations should only have 'Delete' as allowable operation.", 1, operations.size());
+            assertEquals("Incorrect allowable operation.", "delete", operations.get(0));
+
+            // Check allowableOperationsOnTarget (i.e. for the actual file being shared)
+            operations = sharedLink.getAllowableOperationsOnTarget();
+            assertNotNull("'allowableOperationsOnTarget' should have been returned.", operations);
+            assertTrue(operations.containsAll(expectedOps));
+            assertEquals(expectedOps.size(), operations.size());
+            assertEquals("Incorrect allowable operation.", "delete", operations.get(0));
+
+            // Quick check that some extended info is present. 
+            assertEquals("The quick brown fox jumps over the lazy dog", sharedLink.getTitle());
+            assertEquals("Gym class featuring a brown fox and lazy dog", sharedLink.getDescription());
+        });
+    }
+
+
+    @Test
+    public void testSharedLinkFindIncludeNodeProperties() throws Exception
+    {
+        QuickShareLinksImpl quickShareLinks = applicationContext.getBean("quickShareLinks", QuickShareLinksImpl.class);
+        ServiceDescriptorRegistry serviceRegistry = applicationContext.getBean("ServiceRegistry", ServiceDescriptorRegistry.class);
+        SearchService mockSearchService = mock(SearchService.class);
+        serviceRegistry.setMockSearchService(mockSearchService);
+
+        // As user 1 ...
+        setRequestContext(user1);
+
+        Paging paging = getPaging(0, 100);
+
+        String content = "The quick brown fox jumps over the lazy dog.";
+        String fileName1 = "fileOne_" + RUNID + ".txt";
+        String fileName2 = "fileTwo_" + RUNID + ".txt";
+
+        // As user 1 create 2 text files in -my- folder (i.e. User's Home)
+        setRequestContext(user1);
+        Map<String, String> file1Props = new HashMap<>();
+        file1Props.put("cm:title", "File one title");
+        file1Props.put("cm:lastThumbnailModification", "doclib:1549351708998");
+        String file1Id = createTextFile(getMyNodeId(), fileName1, content,"UTF-8", file1Props).getId();
+        String file2Id = createTextFile(getMyNodeId(), fileName2, content).getId();
+
+        // Create shared links to file 1 and 2
+        QuickShareLink body = new QuickShareLink();
+        body.setNodeId(file1Id);
+        HttpResponse  response = post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 201);
+        QuickShareLink resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+        String shared1Id = resp.getId();
+
+        body = new QuickShareLink();
+        body.setNodeId(file2Id);
+        post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 201);
+
+        // Lock text file 1
+        LockInfo lockInfo = new LockInfo();
+        lockInfo.setTimeToExpire(60);
+        lockInfo.setType("FULL");
+        lockInfo.setLifetime("PERSISTENT");
+        post(getNodeOperationUrl(file1Id, "lock"), toJsonAsStringNonNull(lockInfo), null, 200);
+
+        // Find shared links without include=properties
+        ResultSet mockResultSet = mockResultSet(Arrays.asList(file1Id, file2Id));
+        when(mockSearchService.query(any())).thenReturn(mockResultSet);
+        quickShareLinks.afterPropertiesSet();
+
+        response = getAll(URL_SHARED_LINKS, paging, null, 200);
+        List<QuickShareLink> sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals(2, sharedLinks.size());
+        QuickShareLink resQuickShareLink1 = sharedLinks.get(0);
+        QuickShareLink resQuickShareLink2 = sharedLinks.get(1);
+
+        assertNull("Properties were not requested therefore they should not be included", resQuickShareLink1.getProperties());
+        assertNull("Properties were not requested therefore they should not be included", resQuickShareLink2.getProperties());
+
+        // Find the shared links with include=properties
+        mockResultSet = mockResultSet(Arrays.asList(file1Id, file2Id));
+        when(mockSearchService.query(any())).thenReturn(mockResultSet);
+        quickShareLinks.afterPropertiesSet();
+
+        Map<String, String> params = new HashMap<>();
+        params.put("include", "properties,allowableOperations");
+        response = getAll(URL_SHARED_LINKS, paging, params, 200);
+        sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals(2, sharedLinks.size());
+        resQuickShareLink1 = sharedLinks.get(0);
+
+        // Check the 1st shared link and properties (properties should include a title, lastThumbnailModification and lock info)
+        assertEquals(shared1Id, resQuickShareLink1.getId());
+        assertEquals(file1Id, resQuickShareLink1.getNodeId());
+        Map<String, Object> resQuickShareLink1Props =  resQuickShareLink1.getProperties();
+        assertNotNull("Properties were requested to be included but are null.", resQuickShareLink1Props);
+        assertNotNull("Properties should include cm:lockType", resQuickShareLink1Props.get("cm:lockType"));
+        assertNotNull("Properties should include cm:lockOwner", resQuickShareLink1Props.get("cm:lockOwner"));
+        assertNotNull("Properties should include cm:lockLifetime", resQuickShareLink1Props.get("cm:lockLifetime"));
+        assertNotNull("Properties should include cm:title", resQuickShareLink1Props.get("cm:title"));
+        assertNotNull("Properties should include cm:versionType", resQuickShareLink1Props.get("cm:versionType"));
+        assertNotNull("Properties should include cm:versionLabel", resQuickShareLink1Props.get("cm:versionLabel"));
+        assertNotNull("Properties should include cm:lastThumbnailModification", resQuickShareLink1Props.get("cm:lastThumbnailModification"));
+        // Properties that should be excluded
+        assertNull("Properties should NOT include cm:name", resQuickShareLink1Props.get("cm:name"));
+        assertNull("Properties should NOT include qshare:sharedBy", resQuickShareLink1Props.get("qshare:sharedBy"));
+        assertNull("Properties should NOT include qshare:sharedId", resQuickShareLink1Props.get("qshare:sharedId"));
+        assertNull("Properties should NOT include cm:content", resQuickShareLink1Props.get("cm:content"));
+        assertNull("Properties should NOT include cm:created", resQuickShareLink1Props.get("cm:created"));
+        assertNull("Properties should NOT include cm:creator", resQuickShareLink1Props.get("cm:creator"));
+        assertNull("Properties should NOT include cm:modifier", resQuickShareLink1Props.get("cm:modifier"));
+        assertNull("Properties should NOT include cm:modified", resQuickShareLink1Props.get("cm:modified"));
+        assertNull("Properties should NOT include cm:autoVersion", resQuickShareLink1Props.get("cm:autoVersion"));
+        assertNull("Properties should NOT include cm:initialVersion", resQuickShareLink1Props.get("cm:initialVersion"));
+        assertNull("Properties should NOT include cm:autoVersionOnUpdateProps", resQuickShareLink1Props.get("cm:autoVersionOnUpdateProps"));
+        // System properties should be excluded
+        boolean foundSysProp = resQuickShareLink1Props.keySet().stream().anyMatch( (s) -> s.startsWith("sys:"));
+        assertFalse("System properties should be excluded", foundSysProp);
+
+        serviceRegistry.setMockSearchService(null);
+        quickShareLinks.afterPropertiesSet();
+    }
+
+    @Test
+    public void testSharedLinkFindIncludeIsFavorite() throws Exception
+    {
+        PublicApiClient.Favourites favouritesProxy = publicApiClient.favourites();
+        QuickShareLinksImpl quickShareLinks = applicationContext.getBean("quickShareLinks", QuickShareLinksImpl.class);
+        ServiceDescriptorRegistry serviceRegistry = applicationContext.getBean("ServiceRegistry", ServiceDescriptorRegistry.class);
+        SearchService mockSearchService = mock(SearchService.class);
+        serviceRegistry.setMockSearchService(mockSearchService);
+
+        // As user 1 ...
+        setRequestContext(user1);
+
+        Paging paging = getPaging(0, 100);
+
+        String content = "The quick brown fox jumps over the lazy dog.";
+        String fileName1 = "fileOne_" + RUNID + ".txt";
+        String fileName2 = "fileTwo_" + RUNID + ".txt";
+
+        // As user 1 create 2 text files in -my- folder (i.e. User's Home)
+        setRequestContext(user1);
+        String file1Id = createTextFile(getMyNodeId(), fileName1, content).getId();
+        String file2Id = createTextFile(getMyNodeId(), fileName2, content).getId();
+
+        // Create shared links to file 1 and 2
+        QuickShareLink body = new QuickShareLink();
+        body.setNodeId(file1Id);
+        post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 201);
+
+        body = new QuickShareLink();
+        body.setNodeId(file2Id);
+        post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 201);
+
+        // Favourite file with file1Id file as user 1
+        Favourite file1Favourite = makeFileFavourite(file1Id);
+        favouritesProxy.createFavourite(user1, file1Favourite, null);
+
+
+        // Find shared links without include=isFavorite
+        ResultSet mockResultSet = mockResultSet(Arrays.asList(file1Id, file2Id));
+        when(mockSearchService.query(any())).thenReturn(mockResultSet);
+        quickShareLinks.afterPropertiesSet();
+
+        HttpResponse  response = response = getAll(URL_SHARED_LINKS, paging, null, 200);
+        List<QuickShareLink> sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals(2, sharedLinks.size());
+        QuickShareLink resQuickShareLink1 = sharedLinks.get(0);
+        QuickShareLink resQuickShareLink2 = sharedLinks.get(1);
+
+        assertNull("isFavorite was not requested therefore it should not be included", resQuickShareLink1.getIsFavorite());
+        assertNull("isFavorite was not requested therefore it should not be included", resQuickShareLink2.getIsFavorite());
+
+        // Find shared links with include=isFavorite
+        mockResultSet = mockResultSet(Arrays.asList(file1Id, file2Id));
+        when(mockSearchService.query(any())).thenReturn(mockResultSet);
+        quickShareLinks.afterPropertiesSet();
+
+        Map<String, String> params = new HashMap<>();
+        params.put("include", "isFavorite");
+        response = getAll(URL_SHARED_LINKS, paging, params, 200);
+        sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals(2, sharedLinks.size());
+        resQuickShareLink1 = sharedLinks.get(0);
+        resQuickShareLink2 = sharedLinks.get(1);
+
+        assertTrue("Document should be marked as favorite.",resQuickShareLink1.getIsFavorite());
+        assertFalse("Document should not be marked as favorite.", resQuickShareLink2.getIsFavorite());
+
+        serviceRegistry.setMockSearchService(null);
+        quickShareLinks.afterPropertiesSet();
+    }
+
+    @Test
+    public void testSharedLinkFindIncludeAspects() throws Exception
+    {
+        PublicApiClient.Favourites favouritesProxy = publicApiClient.favourites();
+        QuickShareLinksImpl quickShareLinks = applicationContext.getBean("quickShareLinks", QuickShareLinksImpl.class);
+        ServiceDescriptorRegistry serviceRegistry = applicationContext.getBean("ServiceRegistry", ServiceDescriptorRegistry.class);
+        SearchService mockSearchService = mock(SearchService.class);
+        serviceRegistry.setMockSearchService(mockSearchService);
+
+        // As user 1 ...
+        setRequestContext(user1);
+
+        Paging paging = getPaging(0, 100);
+
+        String content = "The quick brown fox jumps over the lazy dog.";
+        String fileName1 = "fileOne_" + RUNID + ".txt";
+        String fileName2 = "fileTwo_" + RUNID + ".txt";
+
+        // As user 1 create 2 text files in -my- folder (i.e. User's Home)
+        setRequestContext(user1);
+        String file1Id = createTextFile(getMyNodeId(), fileName1, content).getId();
+        String file2Id = createTextFile(getMyNodeId(), fileName2, content).getId();
+
+        // Create shared links to file 1 and 2
+        QuickShareLink body = new QuickShareLink();
+        body.setNodeId(file1Id);
+        post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 201);
+
+        body = new QuickShareLink();
+        body.setNodeId(file2Id);
+        post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 201);
+
+        // Favourite file with file1Id file as user 1
+        Favourite file1Favourite = makeFileFavourite(file1Id);
+        favouritesProxy.createFavourite(user1, file1Favourite, null);
+
+
+        // Find shared links without include=isFavorite
+        ResultSet mockResultSet = mockResultSet(Arrays.asList(file1Id, file2Id));
+        when(mockSearchService.query(any())).thenReturn(mockResultSet);
+        quickShareLinks.afterPropertiesSet();
+
+        HttpResponse  response = getAll(URL_SHARED_LINKS, paging, null, 200);
+        List<QuickShareLink> sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals(2, sharedLinks.size());
+        QuickShareLink resQuickShareLink1 = sharedLinks.get(0);
+        QuickShareLink resQuickShareLink2 = sharedLinks.get(1);
+
+        assertNull("aspectNames was not requested therefore it should not be included", resQuickShareLink1.getAspectNames());
+        assertNull("aspectNames was not requested therefore it should not be included", resQuickShareLink2.getAspectNames());
+
+        // Find shared links with include=isFavorite
+        mockResultSet = mockResultSet(Arrays.asList(file1Id, file2Id));
+        when(mockSearchService.query(any())).thenReturn(mockResultSet);
+        quickShareLinks.afterPropertiesSet();
+
+        Map<String, String> params = new HashMap<>();
+        params.put("include", "aspectNames");
+        response = getAll(URL_SHARED_LINKS, paging, params, 200);
+        sharedLinks = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), QuickShareLink.class);
+        assertEquals(2, sharedLinks.size());
+        resQuickShareLink1 = sharedLinks.get(0);
+        resQuickShareLink2 = sharedLinks.get(1);
+
+        assertNotNull("aspectNames was not requested therefore it should not be included", resQuickShareLink1.getAspectNames());
+        assertNotNull("aspectNames was not requested therefore it should not be included", resQuickShareLink2.getAspectNames());
+
+        serviceRegistry.setMockSearchService(null);
+        quickShareLinks.afterPropertiesSet();
+    }
+
+    // A one time use ResultSet of nodes with specified node ids
+    private static ResultSet mockResultSet(List<String> nodeIds)
+    {
+        List<ResultSetRow> resultSetRows = new LinkedList<>();
+        for (String nodeId : nodeIds)
+        {
+            ResultSetRow mockResultSetRow1 = mock(ResultSetRow.class);
+            when(mockResultSetRow1.getNodeRef()).thenReturn(new NodeRef("workspace","SpacesStore" ,nodeId));
+            resultSetRows.add(mockResultSetRow1);
+        }
+
+        ResultSet mockSearchServiceQueryResultSet = mock(ResultSet.class);
+        when(mockSearchServiceQueryResultSet.hasMore()).thenReturn(false);
+        when(mockSearchServiceQueryResultSet.getNumberFound()).thenReturn(Long.valueOf(nodeIds.size()));
+        when(mockSearchServiceQueryResultSet.length()).thenReturn(nodeIds.size());
+        when(mockSearchServiceQueryResultSet.iterator()).thenReturn(resultSetRows.iterator());
+        return mockSearchServiceQueryResultSet;
+    }
+
+    private static Favourite makeFileFavourite(String targetGuid) throws ParseException
+    {
+        FavouriteDocument document = new FavouriteDocument(targetGuid);
+        FileFavouriteTarget target = new FileFavouriteTarget(document);
+        Date creationData = new Date();
+        Favourite favourite = new Favourite(creationData, null, target, null);
+        return favourite;
+    }
+
+    private String getEmailSharedLinkUrl(String sharedId)
+    {
+        return URL_SHARED_LINKS + '/' + sharedId + "/email";
+    }
+    
+    private String postSharedLink(Document file)
+    {
+        Map<String, String> body = new HashMap<>();
+        body.put("nodeId", file.getId());
+        HttpResponse response;
+        try
+        {
+            response = post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 201);
+            QuickShareLink resp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), QuickShareLink.class);
+            return resp.getId();
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("Error sharing link for File: " + file.getId(), e);
+        }
+    }
+
+    private void deleteSharedLink(String sharedId) throws Exception
+    {
+        deleteSharedLink(sharedId, 204);
+    }
+
+    private void deleteSharedLink(String sharedId, int expectedStatus) throws Exception
+    {
+        delete(URL_SHARED_LINKS, sharedId, expectedStatus);
+    }
+
+    private void forceNewExpiryTime(String sharedId, Date date)
+    {
+        TenantUtil.runAsSystemTenant(() -> {
+            // Load the expiry action and attach the schedule
+            QuickShareLinkExpiryAction linkExpiryAction = quickShareLinkExpiryActionPersister
+                        .loadQuickShareLinkExpiryAction(QuickShareLinkExpiryActionImpl.createQName(sharedId));
+            linkExpiryAction.setSchedule(scheduledPersistedActionService.getSchedule(linkExpiryAction));
+            linkExpiryAction.setScheduleStart(date);
+
+            // save the expiry action and the schedule
+            transactionHelper.doInTransaction(() -> {
+                quickShareLinkExpiryActionPersister.saveQuickShareLinkExpiryAction(linkExpiryAction);
+                scheduledPersistedActionService.saveSchedule(linkExpiryAction.getSchedule());
+                return null;
+            });
+
+            return null;
+        }, TenantUtil.getCurrentDomain());
+    }
+
+    private int getSchedules()
+    {
+        return TenantUtil.runAsSystemTenant(() -> scheduledPersistedActionService.listSchedules().size(), TenantUtil.getCurrentDomain());
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TempOutputStreamTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TempOutputStreamTest.java
new file mode 100644
index 00000000000..ae7b475f992
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TempOutputStreamTest.java
@@ -0,0 +1,252 @@
+
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+import org.alfresco.repo.content.ContentLimitViolationException;
+import org.alfresco.repo.web.scripts.TempOutputStream;
+import org.alfresco.repo.web.scripts.TempOutputStreamFactory;
+import org.alfresco.util.TempFileProvider;
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.util.StreamUtils;
+
+/**
+ * Tests basic {@link TempOutputStream} functionality
+ */
+public class TempOutputStreamTest
+{
+    private static final String TEMP_DIRECTORY_NAME = "TempOutputStreamTest";
+    private static final String FILE_PREFIX = TempOutputStream.TEMP_FILE_PREFIX;
+    private static final int MEMORY_THRESHOLD = 4 * 1024 * 1024;
+    private static final long MAX_CONTENT_SIZE = 1024 * 1024 * 1024;
+    private static final File bufferTempDirectory = TempFileProvider.getTempDir(TEMP_DIRECTORY_NAME);
+
+    @Test
+    public void testInMemoryStream() throws IOException
+    {
+        TempOutputStreamFactory streamFactory = new TempOutputStreamFactory(bufferTempDirectory, MEMORY_THRESHOLD, MAX_CONTENT_SIZE, false, false);
+
+        File file = createTextFileWithRandomContent(MEMORY_THRESHOLD - 1024L);
+        {
+            TempOutputStream outputStream = streamFactory.createOutputStream();
+
+            long countBefore = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+
+            // Copy the stream
+            StreamUtils.copy(new BufferedInputStream(new FileInputStream(file)), outputStream);
+
+            long countAfter = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+
+            Assert.assertEquals(countBefore, countAfter);
+            outputStream.destroy();
+        }
+        file.delete();
+    }
+
+    @Test
+    public void testFileBackedStream() throws IOException
+    {
+        File file = createTextFileWithRandomContent(MEMORY_THRESHOLD + 1024L);
+
+        {
+            // Create stream factory that doesn't delete temp file on stream close
+            TempOutputStreamFactory streamFactory = new TempOutputStreamFactory(bufferTempDirectory, MEMORY_THRESHOLD, MAX_CONTENT_SIZE, false, false);
+            TempOutputStream outputStream = streamFactory.createOutputStream();
+
+            long countBefore = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+
+            StreamUtils.copy(new BufferedInputStream(new FileInputStream(file)), outputStream);
+
+            // Check that temp file was created
+            long countAfter = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+            Assert.assertEquals(countBefore + 1, countAfter);
+
+            outputStream.close();
+
+            // Check that file wasn't deleted on output stream close
+            countAfter = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+            Assert.assertEquals(countBefore + 1, countAfter);
+
+            outputStream.destroy();
+
+            // Check that file was deleted
+            countAfter = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+            Assert.assertEquals(countBefore, countAfter);
+        }
+
+        {
+            // Create stream factory that deletes temp file on stream close
+            TempOutputStreamFactory streamFactory = new TempOutputStreamFactory(bufferTempDirectory, MEMORY_THRESHOLD, MAX_CONTENT_SIZE, false, true);
+            TempOutputStream outputStream = streamFactory.createOutputStream();
+
+            long countBefore = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+
+            StreamUtils.copy(new BufferedInputStream(new FileInputStream(file)), outputStream);
+
+            // Check that temp file was created
+            long countAfter = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+            Assert.assertEquals(countBefore + 1, countAfter);
+
+            outputStream.close();
+
+            // Check that file was deleted on close
+            countAfter = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+            Assert.assertEquals(countBefore, countAfter);
+        }
+
+        file.delete();
+    }
+
+    @Test
+    public void testMaxContentSize() throws IOException
+    {
+        // In memory stream
+        {
+            long contentSize = MEMORY_THRESHOLD - 512;
+            long maxContentSize = MEMORY_THRESHOLD - 1024;
+
+            File file = createTextFileWithRandomContent(contentSize);
+
+            // Create stream factory that deletes temp file on stream close
+            TempOutputStreamFactory streamFactory = new TempOutputStreamFactory(bufferTempDirectory, MEMORY_THRESHOLD, maxContentSize, false, true);
+            TempOutputStream outputStream = streamFactory.createOutputStream();
+
+            long countBefore = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+
+            try
+            {
+                StreamUtils.copy(new BufferedInputStream(new FileInputStream(file)), outputStream);
+                Assert.fail("Content size limit violation exception was expected");
+            }
+            catch (ContentLimitViolationException e)
+            {
+                // Expected
+            }
+
+            // Check that file was already deleted on close
+            long countAfter = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+            Assert.assertEquals(countBefore, countAfter);
+
+            file.delete();
+        }
+
+        // File backed stream
+        {
+            long contentSize = MEMORY_THRESHOLD + 1024;
+            long maxContentSize = MEMORY_THRESHOLD + 512;
+
+            File file = createTextFileWithRandomContent(contentSize);
+
+            // Create stream factory that deletes temp file on stream close
+            TempOutputStreamFactory streamFactory = new TempOutputStreamFactory(bufferTempDirectory, MEMORY_THRESHOLD, maxContentSize, false, true);
+            TempOutputStream outputStream = streamFactory.createOutputStream();
+
+            long countBefore = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+
+            try
+            {
+                StreamUtils.copy(new BufferedInputStream(new FileInputStream(file)), outputStream);
+                Assert.fail("Content size limit violation exception was expected");
+            }
+            catch (ContentLimitViolationException e)
+            {
+                // Expected
+            }
+
+            // Check that file was already deleted on close
+            long countAfter = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+            Assert.assertEquals(countBefore, countAfter);
+
+            file.delete();
+        }
+    }
+
+    @Test
+    public void testEncryptContent() throws IOException
+    {
+        File file = createTextFileWithRandomContent(MEMORY_THRESHOLD + 1024L);
+
+        // Create stream factory that doesn't delete temp file on stream close
+        TempOutputStreamFactory streamFactory = new TempOutputStreamFactory(bufferTempDirectory, MEMORY_THRESHOLD, MAX_CONTENT_SIZE, true, false);
+
+        TempOutputStream outputStream = streamFactory.createOutputStream();
+
+        long countBefore = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+
+        StreamUtils.copy(new BufferedInputStream(new FileInputStream(file)), outputStream);
+
+        // Check that temp file was created
+        long countAfter = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+        Assert.assertEquals(countBefore + 1, countAfter);
+
+        outputStream.close();
+
+        // Check that file wasn't deleted on output stream close
+        countAfter = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+        Assert.assertEquals(countBefore + 1, countAfter);
+
+        // Compare content
+        String contentWriten = StreamUtils.copyToString(new BufferedInputStream(new FileInputStream(file)), Charset.defaultCharset());
+        String contentRead = StreamUtils.copyToString(outputStream.getInputStream(), Charset.defaultCharset());
+        Assert.assertEquals(contentWriten, contentRead);
+
+        outputStream.destroy();
+
+        // Check that file was deleted
+        countAfter = countFilesInDirectoryWithPrefix(bufferTempDirectory);
+        Assert.assertEquals(countBefore, countAfter);
+
+        file.delete();
+    }
+
+    private File createTextFileWithRandomContent(long contentSize) throws IOException
+    {
+        File txtFile = TempFileProvider.createTempFile(getClass().getSimpleName(), ".txt");
+        txtFile.deleteOnExit();
+
+        RandomAccessFile file = new RandomAccessFile(txtFile.getPath(), "rw");
+        file.setLength(contentSize);
+        file.close();
+
+        return txtFile;
+    }
+
+    private long countFilesInDirectoryWithPrefix(File directory) throws IOException
+    {
+        Stream<File> fileStream = Arrays.stream(directory.listFiles());
+        return fileStream.filter(f -> f.getName().startsWith(FILE_PREFIX)).count();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestActions.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestActions.java
new file mode 100644
index 00000000000..b072bade6ca
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestActions.java
@@ -0,0 +1,644 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.ibatis.RetryingCallbackHelper;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.executer.AddFeaturesActionExecuter;
+import org.alfresco.repo.action.executer.CheckInActionExecuter;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.rest.api.model.ActionDefinition;
+import org.alfresco.rest.api.tests.client.Pair;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Action;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.action.ParameterizedItemDefinition;
+import org.alfresco.service.cmr.coci.CheckOutCheckInService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.OwnableService;
+import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.EmptyStackException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.naturalOrder;
+import static java.util.Comparator.nullsFirst;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class TestActions extends AbstractBaseApiTest
+{
+    private NodeService nodeService;
+    private OwnableService ownableService;
+    private ActionService actionService;
+    private PublicApiClient.Actions actions;
+    private RepoService.TestNetwork account1;
+    private Iterator<RepoService.TestNetwork> accountsIt;
+    private Iterator<String> account1PersonIt;
+    private final static Map<String, String> emptyParams = Collections.EMPTY_MAP;
+    private final static Log logger = LogFactory.getLog(TestActions.class);
+
+    @Before
+    public void setUp() throws Exception
+    {
+        nodeService = applicationContext.getBean("NodeService", NodeService.class);
+        ownableService = applicationContext.getBean("OwnableService", OwnableService.class);
+        actionService = applicationContext.getBean("ActionService", ActionService.class);
+        actions = publicApiClient.actions();
+
+        accountsIt = getTestFixture().getNetworksIt();
+        account1 = accountsIt.next();
+        account1PersonIt = account1.getPersonIds().iterator();
+        
+        // Capture authentication pre-test, so we can restore it again afterwards.
+        AuthenticationUtil.pushAuthentication();
+    }
+
+    @After
+    public void tearDown()
+    {
+        // Restore authentication to pre-test state.
+        try
+        {
+            AuthenticationUtil.popAuthentication();
+        }
+        catch(EmptyStackException e)
+        {
+            // Nothing to do.
+        }
+    }
+    
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+    
+    @Test
+    public void canGetActionDefinitions() throws PublicApiException
+    {
+        final String person1 = account1PersonIt.next();
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1));
+
+        {
+            ListResponse<ActionDefinition> actionDefs = actions.getActionDefinitions(emptyParams, 200);
+            
+            assertNotNull("Action definition list should not be null", actionDefs);
+            assertFalse("Action definition list should not be empty", actionDefs.getList().isEmpty());
+
+            // Check defaults, given that no paging params were sent in the request
+            assertEquals(Paging.DEFAULT_MAX_ITEMS, actionDefs.getPaging().getMaxItems().intValue());
+            assertEquals(Paging.DEFAULT_SKIP_COUNT, actionDefs.getPaging().getSkipCount().intValue());
+
+            // Check ActionDefinition fields
+            List<ActionDefinition> actionDefinitions = actionDefs.getList().stream().
+                    filter(ad -> ad.getName().equals("add-features")).collect(Collectors.toList());
+            assertEquals(1, actionDefinitions.size());
+
+            ActionDefinition action = actionDefinitions.get(0);
+            assertEquals("add-features", action.getId());
+            assertEquals("add-features", action.getName());
+            assertEquals("Add aspect", action.getTitle());
+            assertEquals("This will add an aspect to the matched item.", action.getDescription());
+            // Applicable types
+            assertEquals(0, action.getApplicableTypes().size());
+            assertEquals(false, action.isTrackStatus());
+            // Parameter definitions
+            assertEquals(1, action.getParameterDefinitions().size());
+            ActionDefinition.ParameterDefinition paramDefs = action.getParameterDefinitions().get(0);
+            assertEquals(AddFeaturesActionExecuter.PARAM_ASPECT_NAME, paramDefs.getName());
+            assertEquals("d:qname", paramDefs.getType());
+            assertEquals(true, paramDefs.isMandatory());
+            assertEquals("Aspect", paramDefs.getDisplayLabel());
+            assertEquals(false, paramDefs.isMultiValued());
+            assertEquals("ac-aspects", paramDefs.getParameterConstraintName());
+        }
+
+        checkBasicPagingAndSorting(
+                // Expected
+                () -> actionService.getActionDefinitions().
+                        stream().
+                        sorted(comparing(org.alfresco.service.cmr.action.ActionDefinition::getName)).
+                        map(ParameterizedItemDefinition::getName).
+                        collect(Collectors.toList()),
+                // Actual results
+                paging -> actions.getActionDefinitions(createParams(paging, null), 200));
+
+        // Explicit sorting by title
+        checkSorting(
+                // Expected
+                () -> actionService.getActionDefinitions().
+                        stream().
+                        sorted(comparing(org.alfresco.service.cmr.action.ActionDefinition::getTitle,
+                                nullsFirst(naturalOrder()))).
+                        map(act -> new Pair<>(act.getName(), act.getTitle())).
+                        collect(Collectors.toList()),
+                // Actual results
+                (paging, orderBy) -> actions.getActionDefinitions(createParams(paging, orderBy), 200),
+                "title");
+
+        // Explicit sorting by name
+        checkSorting(
+                // Expected
+                () -> actionService.getActionDefinitions().
+                        stream().
+                        sorted(comparing(org.alfresco.service.cmr.action.ActionDefinition::getName,
+                                nullsFirst(naturalOrder()))).
+                        map(act -> new Pair<>(act.getName(), act.getTitle())).
+                        collect(Collectors.toList()),
+                // Actual results
+                (paging, orderBy) -> actions.getActionDefinitions(createParams(paging, orderBy), 200),
+                "name");
+        
+        // Badly formed request -> 400
+        {
+            PublicApiClient.Paging paging = getPaging(0, -1); // -1 is not acceptable
+            actions.getActionDefinitions(createParams(paging, null), 400);
+        }
+
+        // Unauthorized -> 401
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1, "invalid-password"));
+            actions.getActionDefinitions(emptyParams, 401);
+        }
+    }
+    
+    @Test
+    public void canGetActionDefinition() throws PublicApiException
+    {
+        final String person1 = account1PersonIt.next();
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1));
+        
+        ActionDefinition actionDef = actions.getActionDefinition("add-features",200);
+
+        assertNotNull("Action definition should not be null", actionDef);
+
+        // Check ActionDefinition fields
+        assertEquals("add-features", actionDef.getId());
+        assertEquals("add-features", actionDef.getName());
+        assertEquals("Add aspect", actionDef.getTitle());
+        assertEquals("This will add an aspect to the matched item.", actionDef.getDescription());
+        // Applicable types
+        assertEquals(0, actionDef.getApplicableTypes().size());
+        assertEquals(false, actionDef.isTrackStatus());
+        // Parameter definitions
+        assertEquals(1, actionDef.getParameterDefinitions().size());
+        ActionDefinition.ParameterDefinition paramDefs = actionDef.getParameterDefinitions().get(0);
+        assertEquals(AddFeaturesActionExecuter.PARAM_ASPECT_NAME, paramDefs.getName());
+        assertEquals("d:qname", paramDefs.getType());
+        assertEquals(true, paramDefs.isMandatory());
+        assertEquals("Aspect", paramDefs.getDisplayLabel());
+        assertEquals(false, paramDefs.isMultiValued());
+        assertEquals("ac-aspects", paramDefs.getParameterConstraintName());
+
+        // Non-existing actionDefinitionId  -> 404
+        {
+            actions.getActionDefinition("some-text",404);
+        }
+        
+        // Unauthorized -> 401
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1, "invalid-password"));
+            actions.getActionDefinition(null, 401);
+        }
+        
+    }
+
+    @Test
+    public void canGetActionDefinitionsForNode() throws Exception
+    {
+        final String person1 = account1PersonIt.next();
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1));
+        
+        // Get the actions available on the -my- node-ref alias
+        {
+            ListResponse<ActionDefinition> actionDefs = actions.getActionDefinitionsForNode("-my-", emptyParams, 200);
+
+            assertNotNull("Action definition list should not be null", actionDefs);
+            assertFalse("Action definition list should not be empty", actionDefs.getList().isEmpty());
+
+            // Check defaults, given that no paging params were sent in the request
+            assertEquals(Paging.DEFAULT_MAX_ITEMS, actionDefs.getPaging().getMaxItems().intValue());
+            assertEquals(Paging.DEFAULT_SKIP_COUNT, actionDefs.getPaging().getSkipCount().intValue());
+
+            // Check ActionDefinition fields
+            List<ActionDefinition> actionDefinitions = actionDefs.getList().stream().
+                    filter(ad -> ad.getName().equals("add-features")).collect(Collectors.toList());
+            assertEquals(1, actionDefinitions.size());
+
+            ActionDefinition action = actionDefinitions.get(0);
+            assertEquals("add-features", action.getId());
+            assertEquals("add-features", action.getName());
+            assertEquals("Add aspect", action.getTitle());
+            assertEquals("This will add an aspect to the matched item.", action.getDescription());
+            // Applicable types
+            assertEquals(0, action.getApplicableTypes().size());
+            assertEquals(false, action.isTrackStatus());
+            // Parameter definitions
+            assertEquals(1, action.getParameterDefinitions().size());
+            ActionDefinition.ParameterDefinition paramDefs = action.getParameterDefinitions().get(0);
+            assertEquals(AddFeaturesActionExecuter.PARAM_ASPECT_NAME, paramDefs.getName());
+            assertEquals("d:qname", paramDefs.getType());
+            assertEquals(true, paramDefs.isMandatory());
+            assertEquals("Aspect", paramDefs.getDisplayLabel());
+            assertEquals(false, paramDefs.isMultiValued());
+            assertEquals("ac-aspects", paramDefs.getParameterConstraintName());
+        }
+
+        AuthenticationUtil.setFullyAuthenticatedUser(person1);
+        
+        // Get the actions for a "checked out" node - there should be a "check-in" action present.
+        // Inspect the fields, to make sure that they're all there. Especially applicableTypes, as
+        // this isn't available on any of the actions that appear for the "-my-" alias in the test above.
+        {   
+            NodeRef nodeForCheckout = nodeService.createNode(
+                    new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, getMyNodeId()),
+                    ContentModel.ASSOC_CONTAINS,
+                    QName.createQName("test", "test-node-checkedout"),
+                    ContentModel.TYPE_CONTENT).getChildRef();
+            CheckOutCheckInService coci = applicationContext.getBean("CheckOutCheckInService", CheckOutCheckInService.class);
+            coci.checkout(nodeForCheckout);
+
+            ListResponse<ActionDefinition> actionDefs =
+                    actions.getActionDefinitionsForNode(nodeForCheckout.getId(), emptyParams, 200);
+
+            List<ActionDefinition> actionDefinitions = actionDefs.getList().stream().
+                    filter(ad -> ad.getName().equals("check-in")).collect(Collectors.toList());
+            assertEquals(1, actionDefinitions.size());
+            
+            ActionDefinition action = actionDefinitions.get(0);
+            assertEquals("check-in", action.getId());
+            assertEquals("check-in", action.getName());
+            assertEquals("Check in", action.getTitle());
+            assertEquals("This will check in the matched content.", action.getDescription());
+            // Applicable types
+            assertEquals(1, action.getApplicableTypes().size());
+            assertEquals("cm:content", action.getApplicableTypes().get(0));
+            assertEquals(false, action.isTrackStatus());
+            // Parameter definitions
+            assertEquals(2, action.getParameterDefinitions().size());
+            //    "description"
+            ActionDefinition.ParameterDefinition paramDefs = action.getParameterDefinitions().get(0);
+            assertEquals(CheckInActionExecuter.PARAM_DESCRIPTION, paramDefs.getName());
+            assertEquals("d:text", paramDefs.getType());
+            assertEquals(false, paramDefs.isMandatory());
+            assertEquals("Description", paramDefs.getDisplayLabel());
+            assertEquals(false, paramDefs.isMultiValued());
+            assertEquals(null, paramDefs.getParameterConstraintName());
+            //    "minorChange"
+            paramDefs = action.getParameterDefinitions().get(1);
+            assertEquals(CheckInActionExecuter.PARAM_MINOR_CHANGE, paramDefs.getName());
+            assertEquals("d:boolean", paramDefs.getType());
+            assertEquals(false, paramDefs.isMandatory());
+            assertEquals("Minor change", paramDefs.getDisplayLabel());
+            assertEquals(false, paramDefs.isMultiValued());
+            assertEquals(null, paramDefs.getParameterConstraintName());
+        }
+
+        String myNode = getMyNodeId();
+        NodeRef validNode = nodeService.createNode(
+                new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, myNode),
+                ContentModel.ASSOC_CONTAINS,
+                QName.createQName("test", "test-node"),
+                ContentModel.TYPE_CONTENT).getChildRef();
+        
+        // Get the actions available using a specific node ID
+        {
+            
+            ListResponse<ActionDefinition> actionDefs = actions.getActionDefinitionsForNode(validNode.getId(), emptyParams, 200);
+            
+            assertNotNull("Action definition list should not be null", actionDefs);
+            assertFalse("Action definition list should not be empty", actionDefs.getList().isEmpty());
+        }
+
+        // Basic/default paging and sorting
+        checkBasicPagingAndSorting(
+                // Expected
+                () -> actionService.getActionDefinitions(validNode).
+                        stream().
+                        sorted(comparing(org.alfresco.service.cmr.action.ActionDefinition::getName)).
+                        map(ParameterizedItemDefinition::getName).
+                        collect(Collectors.toList()),
+                // Actual results
+                paging -> actions.getActionDefinitionsForNode(validNode.getId(), createParams(paging, null), 200));
+
+        // Test explicit sorting by title
+        checkSorting(
+                // Expected
+                () -> actionService.getActionDefinitions(validNode).
+                        stream().
+                        sorted(comparing(org.alfresco.service.cmr.action.ActionDefinition::getTitle,
+                                nullsFirst(naturalOrder()))).
+                        map(act -> new Pair<>(act.getName(), act.getTitle())).
+                        collect(Collectors.toList()),
+                // Actual results
+                (paging, orderBy) ->
+                        actions.getActionDefinitionsForNode(validNode.getId(), createParams(paging, orderBy), 200),
+                "title");
+        
+        // Test explicit sorting by name
+        checkSorting(
+                // Expected
+                () -> actionService.getActionDefinitions(validNode).
+                        stream().
+                        sorted(comparing(org.alfresco.service.cmr.action.ActionDefinition::getName,
+                                nullsFirst(naturalOrder()))).
+                        map(act -> new Pair<>(act.getName(), act.getTitle())).
+                        collect(Collectors.toList()),
+                // Actual results
+                (paging, orderBy) ->
+                        actions.getActionDefinitionsForNode(validNode.getId(), createParams(paging, orderBy), 200),
+                "name");
+        
+        // Badly formed request -> 400
+        {
+            PublicApiClient.Paging paging = getPaging(0, -1); // -1 is not acceptable
+            actions.getActionDefinitionsForNode(validNode.getId(), createParams(paging, null), 400);
+        }
+        
+        // Non-existent node ID
+        {
+            NodeRef nodeRef = new NodeRef(
+                    StoreRef.STORE_REF_WORKSPACE_SPACESSTORE,
+                    "750a2867-ecfa-478c-8343-fa0e39d27be3");
+            assertFalse("Test pre-requisite: node must not exist", nodeService.exists(nodeRef));
+            
+            actions.getActionDefinitionsForNode(nodeRef.getId(), emptyParams, 404);
+        }
+        
+        // Unauthorized -> 401
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1, "invalid-password"));
+            actions.getActionDefinitionsForNode(validNode.getId(), emptyParams, 401);
+        }
+    }
+
+    /**
+     * We could use {@link java.util.function.Function}, but that makes things messy
+     * when wanting to throw a checked exception, as the public API methods do.
+     */
+    @FunctionalInterface
+    private interface CheckedFunction<T, U, V extends Exception>
+    {
+        U apply(T t) throws V;
+    }
+
+    @FunctionalInterface
+    private interface CheckedBiFunction<T, U, V, W extends Exception>
+    {
+        V apply(T t, U u) throws W;
+    }
+    
+    private void checkBasicPagingAndSorting(
+            Supplier<List<String>> expectedNamesFun,
+            CheckedFunction<PublicApiClient.Paging, ListResponse<ActionDefinition>, PublicApiException> actionsFun)
+            throws PublicApiException
+    {
+        // Default sort order is by name ascending
+        List<String> expectedNames = expectedNamesFun.get();
+
+        // Retrieve all action defs using the REST API - then check that they match
+        // the list retrieved directly from the ActionService.
+        PublicApiClient.Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+        // Retrieve all the results, sorted, on one page
+        ListResponse<ActionDefinition> actionDefs = actionsFun.apply(paging);
+
+        // ActionService and the REST API return very different types, so mapping both lists
+        // to Strings to make a simple comparison easy.
+        List<String> actionNames = actionDefs.getList().stream().
+                map(ActionDefinition::getName).
+                collect(Collectors.toList());
+
+        // Check the whole lists match
+        assertEquals(expectedNames, actionNames);
+
+        final int pageSize = 2;
+        if (expectedNames.size() < ((pageSize * 2) + 1)) // need at least 3 pages worth
+        {
+            // By default there are plenty of actions available to the created node. If this
+            // ceases to be the case in the future, this test should be modified to make sure
+            // there are sufficient action definitions to be listed for the node.
+            fail("Cannot perform useful paging tests - too few action definitions.");
+        }
+        else
+        {
+            // Page 1
+            paging = getPaging(0, pageSize);
+            actionDefs = actionsFun.apply(paging);
+            assertEquals(pageSize, actionDefs.getList().size());
+            assertEquals(pageSize, (long) actionDefs.getPaging().getCount());
+            assertEquals(expectedNames.size(), (int) actionDefs.getPaging().getTotalItems());
+            assertTrue(actionDefs.getPaging().getHasMoreItems());
+
+            // Page 2
+            paging = getPaging(pageSize, pageSize, expectedNames.size(), expectedNames.size());
+            actionDefs = actionsFun.apply(paging);
+            assertEquals(pageSize, actionDefs.getList().size());
+            assertEquals(pageSize, (long) actionDefs.getPaging().getCount());
+            assertEquals(expectedNames.size(), (int) actionDefs.getPaging().getTotalItems());
+            assertTrue(actionDefs.getPaging().getHasMoreItems());
+
+            // Get a 'page' consisting of just the last item, regardless of pageSize 
+            paging = getPaging(expectedNames.size()-1, pageSize);
+            actionDefs = actionsFun.apply(paging);
+            assertEquals(1, actionDefs.getList().size());
+            assertEquals(1L, (long) actionDefs.getPaging().getCount());
+            assertEquals(expectedNames.size(), (int) actionDefs.getPaging().getTotalItems());
+            assertFalse(actionDefs.getPaging().getHasMoreItems());
+        }
+    }
+    
+    private void checkSorting(
+            Supplier<List<Pair<String, String>>> expectedFun,
+            CheckedBiFunction<PublicApiClient.Paging, Map<String, String>, ListResponse<ActionDefinition>, PublicApiException> actionsFun,
+            String sortField)
+            throws PublicApiException
+    {
+        // Retrieve all the actions directly using the ActionService and sorted appropriately.
+        List<Pair<String, String>> expectedActions = expectedFun.get();
+
+        // Retrieve all action defs using the REST API - then check that they match
+        // the list retrieved directly from the ActionService.
+        PublicApiClient.Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+        // Retrieve all the results, sorted, on one page
+        Map<String, String> orderBy = Collections.singletonMap("orderBy", sortField);
+        ListResponse<ActionDefinition> actionDefs = actionsFun.apply(paging, orderBy);
+
+        List<Pair<String, String>> retrievedActions = actionDefs.getList().stream().
+                map(act -> new Pair<>(act.getName(), act.getTitle())).
+                collect(Collectors.toList());
+
+        // Check the whole lists match
+        assertEquals(expectedActions, retrievedActions);
+
+        // Again, by sortField, but with explicit ascending sort order
+        orderBy = Collections.singletonMap("orderBy", sortField + " asc");
+        actionDefs = actionsFun.apply(paging, orderBy);
+
+        retrievedActions = actionDefs.getList().stream().
+                map(act -> new Pair<>(act.getName(), act.getTitle())).
+                collect(Collectors.toList());
+
+        // Check the whole lists match
+        assertEquals(expectedActions, retrievedActions);
+        
+        // Descending sort order
+        orderBy = Collections.singletonMap("orderBy", sortField + " desc");
+        actionDefs = actionsFun.apply(paging, orderBy);
+
+        retrievedActions = actionDefs.getList().stream().
+                map(act -> new Pair<>(act.getName(), act.getTitle())).
+                collect(Collectors.toList());
+
+        // Check the whole lists match
+        Collections.reverse(expectedActions);
+        assertEquals(expectedActions, retrievedActions);
+
+        // Combine paging with sorting by sortField, descending.
+        final int pageSize = 2;
+        paging = getPaging(pageSize, pageSize);
+        actionDefs = actionsFun.apply(paging, orderBy);
+
+        retrievedActions = actionDefs.getList().stream().
+                map(act -> new Pair<>(act.getName(), act.getTitle())).
+                collect(Collectors.toList());
+
+        assertEquals(expectedActions.subList(pageSize, pageSize*2), retrievedActions);
+    }
+
+    @Test
+    public void testExecuteAction() throws Throwable
+    {
+        final String person1 = account1PersonIt.next();
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1));
+
+        AuthenticationUtil.setFullyAuthenticatedUser(person1);
+
+        String myNode = getMyNodeId();
+        NodeRef validNode = nodeService.createNode(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, myNode), ContentModel.ASSOC_CONTAINS,
+                QName.createQName("test", "test-ea-node"), ContentModel.TYPE_CONTENT).getChildRef();
+
+        // actionDefinitionId missing but required by the action.
+        {
+            actions.executeAction(new Action(), emptyParams, 400);
+        }
+
+        // Non-existent actionDefinitionId
+        {
+            Action action = new Action();
+            action.setActionDefinitionId("nonExistentActionDefId");
+
+            actions.executeAction(action, emptyParams, 404);
+        }
+
+        // Non-existent targetId
+        {
+            NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, "750a2867-ecfa-478c-8343-fa0e39d27be3");
+            assertFalse("Test pre-requisite: node must not exist", nodeService.exists(nodeRef));
+
+            Action action = new Action();
+            action.setActionDefinitionId(AddFeaturesActionExecuter.NAME);
+            action.setTargetId(nodeRef.getId());
+
+            actions.executeAction(action, emptyParams, 404);
+        }
+
+        // Missing mandatory params - action not executed.
+        {
+            Action action = new Action();
+            action.setActionDefinitionId(AddFeaturesActionExecuter.NAME);
+            action.setTargetId(validNode.getId());
+
+            actions.executeAction(action, emptyParams, 202);
+
+            Thread.sleep(1000);
+
+            assertFalse("Aspect versionable wasn't expected !", nodeService.hasAspect(validNode, ContentModel.ASPECT_VERSIONABLE));
+
+        }
+
+        // Check add versionable aspect.
+        {
+            assertFalse(nodeService.hasAspect(validNode, ContentModel.ASPECT_VERSIONABLE));
+
+            Map<String, String> params = new HashMap<>();
+            params.put(AddFeaturesActionExecuter.PARAM_ASPECT_NAME, "cm:versionable");
+
+            Action action = new Action();
+            action.setActionDefinitionId(AddFeaturesActionExecuter.NAME);
+            action.setTargetId(validNode.getId());
+            action.setParams(params);
+
+            Action executedAction = actions.executeAction(action, emptyParams, 202);
+            assertNotNull(executedAction);
+            assertNotNull(executedAction.getId());
+
+            RetryingCallbackHelper retryingCallbackHelper = new RetryingCallbackHelper();
+            retryingCallbackHelper.setRetryWaitMs(500);
+
+            RetryingCallbackHelper.RetryingCallback retryingCallback = new RetryingCallbackHelper.RetryingCallback()
+            {
+                @Override
+                public Void execute() throws Throwable
+                {
+                    assertTrue("Expected aspect versionable!", nodeService.hasAspect(validNode, ContentModel.ASPECT_VERSIONABLE));
+                    return null;
+                }
+            };
+
+            retryingCallbackHelper.doWithRetry(retryingCallback);
+        }
+
+        // Unauthorized -> 401
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1, "invalid-password"));
+            actions.executeAction(new Action(), emptyParams, 401);
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestActivities.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestActivities.java
new file mode 100644
index 00000000000..528e92a2561
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestActivities.java
@@ -0,0 +1,881 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteModel;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.rest.api.Activities.ActivityWho;
+import org.alfresco.rest.api.tests.RepoService.SiteInformation;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.People;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Activity;
+import org.alfresco.rest.api.tests.client.data.SiteRole;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.apache.commons.httpclient.HttpStatus;
+import org.json.simple.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestActivities extends EnterpriseTestApi
+{
+    private SiteService siteService;
+    
+	private TestNetwork network1;
+	private TestNetwork network2;
+	private TestNetwork defaultNetwork;
+
+	private TestPerson person1; // network1
+	private TestPerson person2; // network1
+	private TestPerson person3; // network2
+	private TestPerson person4; // defaultNetwork
+	private TestPerson person5; // defaultNetwork
+
+	private TestSite testSite; // network1
+	private TestSite testSite1; // network1
+	private TestSite testSite2; // network2
+	private TestSite testSite3; // defaultNetwork
+
+	@Before
+	public void setup() throws Exception
+	{
+		// note: we don't call super.setup() since we create our own test data here !
+		
+		this.network1 = repoService.createNetworkWithAlias("activitiesNetwork1", true);
+		this.network2 = repoService.createNetworkWithAlias("activitiesNetwork2", true);
+		this.defaultNetwork = repoService.createNetwork(TenantService.DEFAULT_DOMAIN, true);
+		siteService = (SiteService) applicationContext.getBean("SiteService");
+
+		try
+		{
+			AuthenticationUtil.pushAuthentication();
+			AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+			network1.create();
+			network2.create();
+			defaultNetwork.create();
+		}
+		finally
+		{
+			AuthenticationUtil.popAuthentication();
+		}
+
+		// Create some users and sites
+		final List<TestPerson> people = new ArrayList<TestPerson>(5);
+
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+        		TestPerson person = network1.createUser();
+        		people.add(person);
+        		person = network1.createUser();
+        		people.add(person);
+
+        		return null;
+			}
+        }, network1.getId());
+
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+        		TestPerson person = network2.createUser();
+        		people.add(person);
+
+        		return null;
+        	}
+        }, network2.getId());
+
+        TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                TestPerson person = defaultNetwork.createUser();
+                people.add(person);
+                person = defaultNetwork.createUser();
+                people.add(person);
+
+                return null;
+            }
+        }, defaultNetwork.getId());
+
+		this.person1 = people.get(0);
+		this.person2 = people.get(1);
+		this.person3 = people.get(2);
+		this.person4 = people.get(3);
+		this.person5 = people.get(4);
+		
+		this.testSite = transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<TestSite>()
+        {
+        	@SuppressWarnings("synthetic-access")
+        	public TestSite execute() throws Throwable
+        	{
+				return TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+				{
+					public TestSite doWork() throws Exception
+					{
+						SiteInformation siteInfo = new SiteInformation(GUID.generate(), "", "", SiteVisibility.PUBLIC);
+						TestSite site = network1.createSite(siteInfo);
+						site.inviteToSite(person2.getId(), SiteRole.SiteCollaborator);
+						
+						return site;
+					}
+				}, person1.getId(), network1.getId());
+        	}
+        }, false, true);
+
+		this.testSite1 = transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<TestSite>()
+        {
+        	@SuppressWarnings("synthetic-access")
+        	public TestSite execute() throws Throwable
+        	{
+				return TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+				{
+					public TestSite doWork() throws Exception
+					{
+						SiteInformation siteInfo = new SiteInformation(GUID.generate(), "", "", SiteVisibility.PUBLIC);
+						return network1.createSite(siteInfo);
+					}
+				}, person1.getId(), network1.getId());
+        	}
+        }, false, true);
+
+		// create some activities against those sites
+		TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+		{
+			@SuppressWarnings("unchecked")
+			@Override
+			public Void doWork() throws Exception
+			{
+				// ensure at least 3 activities
+				JSONObject activityData = new JSONObject();
+				activityData.put("title", GUID.generate());
+				activityData.put("nodeRef", testSite.getContainerNodeRef("documentLibrary").toString());
+				repoService.postActivity("org.alfresco.documentlibrary.file-added", testSite.getSiteId(), activityData);
+				
+				activityData = new JSONObject();
+				activityData.put("title", GUID.generate());
+				activityData.put("nodeRef", testSite.getContainerNodeRef("documentLibrary").toString());
+				repoService.postActivity("org.alfresco.documentlibrary.file-added", testSite.getSiteId(), activityData);
+				
+				activityData = new JSONObject();
+				activityData.put("title", GUID.generate());
+				activityData.put("nodeRef", testSite.getContainerNodeRef("documentLibrary").toString());
+				repoService.postActivity("org.alfresco.documentlibrary.file-added", testSite.getSiteId(), activityData);
+
+				activityData = new JSONObject();
+				activityData.put("title", GUID.generate());
+				activityData.put("nodeRef", testSite1.getContainerNodeRef("documentLibrary").toString());
+				repoService.postActivity("org.alfresco.documentlibrary.file-added", testSite1.getSiteId(), activityData);
+
+				return null;
+			}
+		}, person1.getId(), network1.getId());
+
+		TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+		{
+			@SuppressWarnings("unchecked")
+			@Override
+			public Void doWork() throws Exception
+			{
+				// ensure at least 3 activities
+				JSONObject activityData = new JSONObject();
+				activityData.put("title", GUID.generate());
+				activityData.put("nodeRef", testSite.getContainerNodeRef("documentLibrary").toString());
+				repoService.postActivity("org.alfresco.documentlibrary.file-added", testSite.getSiteId(), activityData);
+				
+				activityData = new JSONObject();
+				activityData.put("title", GUID.generate());
+				activityData.put("nodeRef", testSite.getContainerNodeRef("documentLibrary").toString());
+				repoService.postActivity("org.alfresco.documentlibrary.file-added", testSite.getSiteId(), activityData);
+				
+				activityData = new JSONObject();
+				activityData.put("title", GUID.generate());
+				activityData.put("nodeRef", testSite.getContainerNodeRef("documentLibrary").toString());
+				repoService.postActivity("org.alfresco.documentlibrary.file-added", testSite.getSiteId(), activityData);
+
+				return null;
+			}
+		}, person2.getId(), network1.getId());
+
+		// user generates activities in 2 networks
+		this.testSite2 = transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<TestSite>()
+        {
+        	@SuppressWarnings("synthetic-access")
+        	public TestSite execute() throws Throwable
+        	{
+				return TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+				{
+					public TestSite doWork() throws Exception
+					{
+						SiteInformation siteInfo = new SiteInformation(GUID.generate(), "", "", SiteVisibility.PUBLIC);
+						return network2.createSite(siteInfo);
+					}
+				}, person3.getId(), network2.getId());
+        	}
+        }, false, true);
+
+		TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+		{
+			@SuppressWarnings("unchecked")
+			@Override
+			public Void doWork() throws Exception
+			{
+				// ensure at least 3 activities
+				JSONObject activityData = new JSONObject();
+				activityData.put("title", GUID.generate());
+				activityData.put("nodeRef", testSite.getContainerNodeRef("documentLibrary").toString());
+				repoService.postActivity("org.alfresco.documentlibrary.file-added", testSite.getSiteId(), activityData);
+				
+				activityData = new JSONObject();
+				activityData.put("title", GUID.generate());
+				activityData.put("nodeRef", testSite.getContainerNodeRef("documentLibrary").toString());
+				repoService.postActivity("org.alfresco.documentlibrary.file-added", testSite.getSiteId(), activityData);
+				
+				activityData = new JSONObject();
+				activityData.put("title", GUID.generate());
+				activityData.put("nodeRef", testSite.getContainerNodeRef("documentLibrary").toString());
+				repoService.postActivity("org.alfresco.documentlibrary.file-added", testSite.getSiteId(), activityData);
+
+				return null;
+			}
+		}, person3.getId(), network1.getId());
+		
+		TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+		{
+			@SuppressWarnings("unchecked")
+			@Override
+			public Void doWork() throws Exception
+			{
+				// ensure at least 3 activities
+				JSONObject activityData = new JSONObject();
+				activityData.put("title", GUID.generate());
+				activityData.put("nodeRef", testSite2.getContainerNodeRef("documentLibrary").toString());
+				repoService.postActivity("org.alfresco.documentlibrary.file-added", testSite2.getSiteId(), activityData);
+				
+				activityData = new JSONObject();
+				activityData.put("title", GUID.generate());
+				activityData.put("nodeRef", testSite2.getContainerNodeRef("documentLibrary").toString());
+				repoService.postActivity("org.alfresco.documentlibrary.file-added", testSite2.getSiteId(), activityData);
+				
+				activityData = new JSONObject();
+				activityData.put("title", GUID.generate());
+				activityData.put("nodeRef", testSite2.getContainerNodeRef("documentLibrary").toString());
+				repoService.postActivity("org.alfresco.documentlibrary.file-added", testSite2.getSiteId(), activityData);
+
+				return null;
+			}
+		}, person3.getId(), network2.getId());
+		
+        this.testSite3 = transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<TestSite>()
+        {
+            @SuppressWarnings("synthetic-access")
+            public TestSite execute() throws Throwable
+            {
+                return TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+                {
+                    public TestSite doWork() throws Exception
+                    {
+                        SiteInformation siteInfo = new SiteInformation(GUID.generate(), "", "", SiteVisibility.PUBLIC);
+                        return defaultNetwork.createSite(siteInfo);
+                    }
+                }, person4.getId(), defaultNetwork.getId());
+            }
+        }, false, true);		
+        
+        
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @SuppressWarnings("unchecked")
+            @Override
+            public Void doWork() throws Exception
+            {
+                siteService.setMembership(testSite3.getSiteId(), person5.getId(), SiteModel.SITE_CONSUMER);
+
+                return null;
+            }
+        }, person4.getId(), defaultNetwork.getId());
+
+		repoService.generateFeed();	
+	}
+
+	@Test
+	public void testPersonActivities() throws Exception
+	{
+		People peopleProxy = publicApiClient.people();
+
+        //Test with default tenant domain. see ALF-20448
+        {
+            List<Activity> expectedActivities = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Activity>>()
+            {
+                @Override
+                public List<Activity> doWork() throws Exception
+                {
+                    List<Activity> activities = repoService.getActivities(person5.getId(), null, false, true);
+                    return activities;
+                }
+            }, person5.getId(), defaultNetwork.getId());
+
+            for(Activity activity: expectedActivities)
+            {
+                if(activity.getSiteId() == null)
+                {
+                    fail("SiteId should present in user-joined activity.");
+                }
+            }
+
+            {
+                int skipCount = 0;
+                int maxItems = expectedActivities.size();
+                Paging paging = getPaging(skipCount, maxItems, expectedActivities.size(), null);
+
+                Map<String, String> params = createParams(paging, null);
+                params.put("who", String.valueOf(ActivityWho.me));
+                publicApiClient.setRequestContext(new RequestContext(defaultNetwork.getId(), person5.getId()));
+                ListResponse<Activity> response = peopleProxy.getActivities(person5.getId(), params);
+                checkList(expectedActivities.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), response);
+            }
+
+        }
+	      
+		// Test Case cloud-2204
+		// Test case cloud-1500
+		// Test Case cloud-2216
+		// paging
+		
+		// Test Case cloud-1500
+		{
+			List<Activity> expectedActivities = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Activity>>()
+			{
+				@Override
+				public List<Activity> doWork() throws Exception
+				{
+					List<Activity> activities = repoService.getActivities(person1.getId(), null, false, true);
+					return activities;
+				}
+			}, person1.getId(), network1.getId());
+	
+			{
+				int skipCount = 0;
+				int maxItems = 2;
+				Paging paging = getPaging(skipCount, maxItems, expectedActivities.size(), null);
+
+				Map<String, String> params = createParams(paging, null);
+				params.put("who", String.valueOf(ActivityWho.me));
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				ListResponse<Activity> response = peopleProxy.getActivities(person1.getId(), params);
+				checkList(expectedActivities.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), response);
+			}
+
+			{
+				int skipCount = 2;
+				int maxItems = expectedActivities.size() - 2;
+				assertTrue(maxItems > 0);
+				Paging paging = getPaging(skipCount, maxItems, expectedActivities.size(), null);
+	
+				Map<String, String> params = createParams(paging, null);
+				params.put("who", String.valueOf(ActivityWho.me));
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				ListResponse<Activity> response = peopleProxy.getActivities(person1.getId(), params);
+				checkList(expectedActivities.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), response);
+			}
+
+			// "-me-" user
+			{
+				int skipCount = 0;
+				int maxItems = 2;
+				Paging paging = getPaging(skipCount, maxItems, expectedActivities.size(), null);
+
+				Map<String, String> params = createParams(paging, null);
+				params.put("who", String.valueOf(ActivityWho.me));
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				ListResponse<Activity> response = peopleProxy.getActivities(org.alfresco.rest.api.People.DEFAULT_USER, params);
+				checkList(expectedActivities.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), response);
+			}
+		}
+		
+		// unknown user - 404
+		try
+		{
+			List<Activity> expectedActivities = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Activity>>()
+			{
+				@Override
+				public List<Activity> doWork() throws Exception
+				{
+					List<Activity> activities = repoService.getActivities(person1.getId(), null, false, true);
+					return activities;
+				}
+			}, person1.getId(), network1.getId());
+			
+			int skipCount = 0;
+			int maxItems = 2;
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			Paging paging = getPaging(skipCount, maxItems, expectedActivities.size(), null);
+			peopleProxy.getActivities(GUID.generate(), createParams(paging, null));
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+		
+		// unknown site - 404
+		try
+		{
+			List<Activity> expectedActivities = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Activity>>()
+			{
+				@Override
+				public List<Activity> doWork() throws Exception
+				{
+					List<Activity> activities = repoService.getActivities(person1.getId(), null, false, true);
+					return activities;
+				}
+			}, person1.getId(), network1.getId());
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedActivities.size(), null);
+			Map<String, String> params = createParams(paging, null);
+			params.put("siteId", GUID.generate());
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			peopleProxy.getActivities(GUID.generate(), params);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+
+		// user from another network - 404
+		try
+		{
+			List<Activity> expectedActivities = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Activity>>()
+			{
+				@Override
+				public List<Activity> doWork() throws Exception
+				{
+					List<Activity> activities = repoService.getActivities(person1.getId(), null, false, true);
+					return activities;
+				}
+			}, person1.getId(), network1.getId());
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedActivities.size(), null);
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person3.getId()));
+			peopleProxy.getActivities(person1.getId(), createParams(paging, null));
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+		}
+
+		// another user from the same network - 403
+		try
+		{
+			List<Activity> expectedActivities = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Activity>>()
+			{
+				@Override
+				public List<Activity> doWork() throws Exception
+				{
+					List<Activity> activities = repoService.getActivities(person1.getId(), null, false, true);
+					return activities;
+				}
+			}, person1.getId(), network1.getId());
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedActivities.size(), null);
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+			peopleProxy.getActivities(person1.getId(), createParams(paging, null));
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());
+		}
+		
+		try
+		{
+			List<Activity> activities = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Activity>>()
+			{
+				@Override
+				public List<Activity> doWork() throws Exception
+				{
+					List<Activity> activities = repoService.getActivities(person1.getId(), null, false, true);
+					return activities;
+				}
+			}, person1.getId(), network1.getId());
+			assertTrue(activities.size() > 0);
+			Activity activity = activities.get(0);
+
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			peopleProxy.remove("people", person1.getId(), "activities", String.valueOf(activity.getId()), "Unable to DELETE a person activity");
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+		
+		// Test Case cloud-1500
+		// other user activities
+		{
+			List<Activity> expectedActivities = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Activity>>()
+			{
+				@Override
+				public List<Activity> doWork() throws Exception
+				{
+					List<Activity> expectedActivities = repoService.getActivities(person1.getId(), null, true, false);
+					return expectedActivities;
+				}
+			}, person1.getId(), network1.getId());
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedActivities.size(), null);
+
+			Map<String, String> params = createParams(paging, null);
+			params.put("who", String.valueOf(ActivityWho.others));
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			ListResponse<Activity> response = peopleProxy.getActivities(person1.getId(), params);
+			checkList(expectedActivities.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), response);
+		}
+
+		// all activities with siteId exclusion
+		{
+			List<Activity> expectedActivities = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Activity>>()
+			{
+				@Override
+				public List<Activity> doWork() throws Exception
+				{
+					List<Activity> expectedActivities = repoService.getActivities(person1.getId(), testSite.getSiteId(), false, false);
+					return expectedActivities;
+				}
+			}, person1.getId(), network1.getId());
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedActivities.size(), null);
+
+			Map<String, String> params = createParams(paging, null);
+			params.put("siteId", testSite.getSiteId());
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			ListResponse<Activity> response = peopleProxy.getActivities(person1.getId(), params);
+			checkList(expectedActivities.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), response);
+		}
+		
+		// all activities with siteId exclusion, unknown site id
+		try
+		{
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems);
+
+			Map<String, String> params = createParams(paging, null);
+			params.put("siteId", GUID.generate());
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			peopleProxy.getActivities(person1.getId(), params);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+
+		// unknown person id
+		try
+		{
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems);
+
+			Map<String, String> params = createParams(paging, null);
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			peopleProxy.getActivities(GUID.generate(), params);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+		
+		// invalid who parameter
+		try
+		{
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems);
+
+			Map<String, String> params = createParams(paging, null);
+			params.put("who", GUID.generate());
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			peopleProxy.getActivities(person1.getId(), params);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+		}
+
+		// Test Case cloud-1970
+		// Not allowed methods
+//		try
+//		{
+//			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+//			peopleProxy.create("people", person1.getId(), "activities", null, null, "Unable to POST to person activities");
+//			fail("");
+//		}
+//		catch(PublicApiException e)
+//		{
+//			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+//		}
+//		
+//		try
+//		{
+//			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+//			peopleProxy.update("people", person1.getId(), "activities", null, null, "Unable to PUT person activities");
+//			fail("");
+//		}
+//		catch(PublicApiException e)
+//		{
+//			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+//		}
+//
+//		try
+//		{
+//			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+//			peopleProxy.remove("people", person1.getId(), "activities", null, "Unable to DELETE person activities");
+//			fail("");
+//		}
+//		catch(PublicApiException e)
+//		{
+//			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+//		}
+//
+//		try
+//		{
+//			List<Activity> activities = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Activity>>()
+//			{
+//				@Override
+//				public List<Activity> doWork() throws Exception
+//				{
+//					List<Activity> activities = repoService.getActivities(person1.getId(), null, false, true);
+//					return activities;
+//				}
+//			}, person1.getId(), network1.getId());
+//			assertTrue(activities.size() > 0);
+//			Activity activity = activities.get(0);
+//
+//			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+//			peopleProxy.create("people", person1.getId(), "activities", String.valueOf(activity.getId()), null, "Unable to POST to a person activity");
+//			fail("");
+//		}
+//		catch(PublicApiException e)
+//		{
+//			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+//		}
+//
+//		try
+//		{
+//			List<Activity> activities = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Activity>>()
+//			{
+//				@Override
+//				public List<Activity> doWork() throws Exception
+//				{
+//					List<Activity> activities = repoService.getActivities(person1.getId(), null, false, true);
+//					return activities;
+//				}
+//			}, person1.getId(), network1.getId());
+//			assertTrue(activities.size() > 0);
+//			Activity activity = activities.get(0);
+//
+//			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+//			peopleProxy.update("people", person1.getId(), "activities", String.valueOf(activity.getId()), null, "Unable to PUT a person activity");
+//			fail("");
+//		}
+//		catch(PublicApiException e)
+//		{
+//			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+//		}
+		
+		// Test Case cloud-1970
+		// not allowed methods
+		{
+			List<Activity> activities = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Activity>>()
+			{
+				@Override
+				public List<Activity> doWork() throws Exception
+				{
+					List<Activity> activities = repoService.getActivities(person1.getId(), null, false, false);
+					return activities;
+				}
+			}, person1.getId(), network1.getId());
+			assertTrue(activities.size() > 0);
+			Activity activity = activities.get(0);
+
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				peopleProxy.create("people", person1.getId(), "activities", null, null, "Unable to POST to activities");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				peopleProxy.create("people", person1.getId(), "activities", String.valueOf(activity.getId()), null, "Unable to POST to an activity");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+	
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				peopleProxy.update("people", person1.getId(), "activities", null, null, "Unable to PUT activities");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				peopleProxy.update("people", person1.getId(), "activities", String.valueOf(activity.getId()), null, "Unable to PUT an activity");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				peopleProxy.remove("people", person1.getId(), "activities", null, "Unable to DELETE activities");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				peopleProxy.remove("people", person1.getId(), "activities", String.valueOf(activity.getId()), "Unable to DELETE an activity");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+		}
+	}
+	
+	/*
+	 * Test that empty roles are not returned
+	 */
+	@Test
+	public void testPUBLICAPI23() throws Exception
+	{
+		// Add and then remove personId as a member of the public site
+		TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				testSite.updateMember(person2.getId(), SiteRole.SiteConsumer);
+				testSite.removeMember(person2.getId());
+
+				return null;
+			}
+		}, person1.getId(), network1.getId());
+
+		// make sure activities have been generated
+		repoService.generateFeed();	
+
+		// check that (empty) role is not in the response
+
+		People peopleProxy = publicApiClient.people();
+		
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+
+			int skipCount = 0;
+			int maxItems = 10;
+			Paging paging = getPaging(skipCount, maxItems);
+			ListResponse<Activity> activities = peopleProxy.getActivities(person2.getId(), createParams(paging, null));
+			for(Activity activity : activities.getList())
+			{
+				String activityType = activity.getActivityType();
+				if(activityType.equals("org.alfresco.site.user-left"))
+				{
+					String role = (String)activity.getSummary().get("role");
+					String feedPersonId = activity.getFeedPersonId();
+					if(feedPersonId.equals(person2.getId()))
+					{
+						assertTrue(role == null);
+						break;
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCMIS.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCMIS.java
new file mode 100644
index 00000000000..3b2ed25b41f
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCMIS.java
@@ -0,0 +1,3304 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.alfresco.model.ContentModel.ASSOC_ORIGINAL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+import java.io.Serializable;
+import java.io.StringWriter;
+import java.math.BigInteger;
+import java.nio.channels.Channels;
+import java.nio.channels.FileChannel;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringJoiner;
+
+import org.alfresco.cmis.client.AlfrescoDocument;
+import org.alfresco.cmis.client.AlfrescoFolder;
+import org.alfresco.cmis.client.impl.AlfrescoObjectFactoryImpl;
+import org.alfresco.cmis.client.type.AlfrescoType;
+import org.alfresco.model.ContentModel;
+import org.alfresco.model.RenditionModel;
+import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
+import org.alfresco.opencmis.PublicApiAlfrescoCmisServiceFactory;
+import org.alfresco.opencmis.dictionary.CMISStrictDictionaryService;
+import org.alfresco.opencmis.dictionary.QNameFilter;
+import org.alfresco.opencmis.dictionary.QNameFilterImpl;
+import org.alfresco.opencmis.mapping.NodeRefProperty;
+import org.alfresco.repo.action.ActionModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.content.filestore.FileContentWriter;
+import org.alfresco.repo.dictionary.DictionaryBootstrap;
+import org.alfresco.repo.dictionary.DictionaryDAO;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.version.VersionableAspectTest;
+import org.alfresco.rest.api.tests.RepoService.SiteInformation;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.CmisSession;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Comments;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Nodes;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Sites;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.CMISNode;
+import org.alfresco.rest.api.tests.client.data.Comment;
+import org.alfresco.rest.api.tests.client.data.FolderNode;
+import org.alfresco.rest.api.tests.client.data.MemberOfSite;
+import org.alfresco.rest.api.tests.client.data.NodeRating;
+import org.alfresco.rest.api.tests.client.data.NodeRating.Aggregate;
+import org.alfresco.rest.api.tests.client.data.Person;
+import org.alfresco.rest.api.tests.client.data.SiteRole;
+import org.alfresco.rest.api.tests.client.data.Tag;
+import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.lock.LockType;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.GUID;
+import org.alfresco.util.TempFileProvider;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.alfresco.util.testing.category.RedundantTests;
+import org.apache.chemistry.opencmis.client.api.CmisObject;
+import org.apache.chemistry.opencmis.client.api.Document;
+import org.apache.chemistry.opencmis.client.api.FileableCmisObject;
+import org.apache.chemistry.opencmis.client.api.Folder;
+import org.apache.chemistry.opencmis.client.api.ItemIterable;
+import org.apache.chemistry.opencmis.client.api.ObjectId;
+import org.apache.chemistry.opencmis.client.api.ObjectType;
+import org.apache.chemistry.opencmis.client.api.OperationContext;
+import org.apache.chemistry.opencmis.client.api.Property;
+import org.apache.chemistry.opencmis.client.api.Relationship;
+import org.apache.chemistry.opencmis.client.api.Repository;
+import org.apache.chemistry.opencmis.client.api.SecondaryType;
+import org.apache.chemistry.opencmis.client.api.Session;
+import org.apache.chemistry.opencmis.client.api.SessionFactory;
+import org.apache.chemistry.opencmis.client.api.Tree;
+import org.apache.chemistry.opencmis.client.runtime.OperationContextImpl;
+import org.apache.chemistry.opencmis.client.runtime.SessionFactoryImpl;
+import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.SessionParameter;
+import org.apache.chemistry.opencmis.commons.data.ContentStream;
+import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
+import org.apache.chemistry.opencmis.commons.enums.VersioningState;
+import org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException;
+import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
+import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
+import org.apache.chemistry.opencmis.commons.exceptions.CmisPermissionDeniedException;
+import org.apache.chemistry.opencmis.commons.exceptions.CmisUpdateConflictException;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.io.IOUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.surf.util.URLEncoder;
+
+public class TestCMIS extends EnterpriseTestApi
+{
+    private static final String CMIS_VERSION_10 = "1.0";
+
+    private static final String CMIS_VERSION_11 = "1.1";
+
+    private static final String TYPE_CMIS_DOCUMENT = "cmis:document";
+
+
+    private static final String DOCUMENT_LIBRARY_CONTAINER_NAME = "documentLibrary";
+
+    private static final String TEST_SITE_NAME_PATTERN = "testSite-%d";
+
+    private static final String TEST_USER_NAME_PATTERN = "testUser-%d";
+
+    private static final String TEST_DOCUMENT_NAME_PATTERN = "testDocument-%s.txt";
+
+	private static final String DOCUMENT_LIBRARY_PATH_PATTERN = "/Sites/%s/" + DOCUMENT_LIBRARY_CONTAINER_NAME;
+
+    private static final String TEST_PASSWORD = "password";
+
+    private ApplicationContext ctx;
+
+    private DictionaryDAO dictionaryDAO;
+    private LockService lockService;
+    private TenantService tenantService;
+    private CMISStrictDictionaryService cmisDictionary;
+    private QNameFilter cmisTypeExclusions;
+	private NodeService nodeService;
+    private FileFolderService fileFolderService;
+    protected ContentService contentService;
+    private PermissionService permissionService;
+	private Properties globalProperties;
+
+    private TestNetwork testNetwork;
+	private TestSite testSite;
+    private String testPersonId;
+    private String testFileIdWithTwoRenditions;
+
+    @Before
+    public void before() throws Exception
+    {
+        ctx = getTestFixture().getApplicationContext();
+        this.dictionaryDAO = (DictionaryDAO)ctx.getBean("dictionaryDAO");
+        this.lockService = (LockService) ctx.getBean("lockService");
+        this.tenantService = (TenantService)ctx.getBean("tenantService");
+        this.cmisDictionary = (CMISStrictDictionaryService)ctx.getBean("OpenCMISDictionaryService");
+        this.cmisTypeExclusions = (QNameFilter)ctx.getBean("cmisTypeExclusions");
+		this.nodeService = (NodeService) ctx.getBean("NodeService");
+        this.fileFolderService = (FileFolderService) ctx.getBean("FileFolderService");
+    	this.contentService = (ContentService)applicationContext.getBean("ContentService");
+		this.permissionService = (PermissionService) ctx.getBean("permissionService");
+        
+		this.globalProperties = (Properties) ctx.getBean("global-properties");
+		this.globalProperties.setProperty(VersionableAspectTest.AUTO_VERSION_PROPS_KEY, "true");
+    }
+    
+    @After
+    public void after()
+    {
+        this.globalProperties.setProperty(VersionableAspectTest.AUTO_VERSION_PROPS_KEY, "false");
+    }
+
+    private TestNetwork getTestNetwork() throws Exception
+    {
+        if (testNetwork == null)
+        {
+            testNetwork = getTestFixture().getRandomNetwork();
+        }
+        return testNetwork;
+    }
+
+    private String getTestPersonId() throws Exception
+    {
+        if (testPersonId == null)
+        {
+            getTestNetwork();
+
+            String username = "user" + System.currentTimeMillis();
+            PersonInfo personInfo = new PersonInfo(username, username, username, "password", null, null, null, null, null, null, null);
+            TestPerson person = testNetwork.createUser(personInfo);
+            testPersonId = person.getId();
+        }
+        return testPersonId;
+    }
+
+    private TestSite getTestSite() throws Exception
+    {
+        if (testSite == null)
+        {
+            getTestNetwork();
+            getTestPersonId();
+
+            String siteName = "site" + System.currentTimeMillis();
+            testSite = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+            {
+                @Override
+                public TestSite doWork() throws Exception
+                {
+                    SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PUBLIC);
+                    return testNetwork.createSite(siteInfo);
+                }
+            }, testPersonId, testNetwork.getId());
+        }
+        return testSite;
+    }
+
+    private NodeRef makeRenditionNode(NodeRef parent, String title, String name, String mimetype)
+    {
+        Map<QName, Serializable> props = new HashMap<QName, Serializable>();
+        props.put(ContentModel.PROP_NAME, name);
+        props.put(ContentModel.PROP_TITLE, title);
+        QName assocQName = QName.createQName(NamespaceService.RENDITION_MODEL_1_0_URI, name);
+        ChildAssociationRef assoc = nodeService.createNode(parent, RenditionModel.ASSOC_RENDITION,
+            assocQName, ContentModel.TYPE_THUMBNAIL, props);
+        NodeRef childRef = assoc.getChildRef();
+
+        if (!nodeService.hasAspect(parent, RenditionModel.ASPECT_RENDITIONED))
+        {
+            nodeService.addAspect(parent, RenditionModel.ASPECT_RENDITIONED, null);
+        }
+
+        ContentWriter writer = contentService.getWriter(childRef, ContentModel.PROP_CONTENT, true);
+        writer.setMimetype(mimetype);
+        writer.setEncoding("UTF-8");
+		writer.putContent("Dummy "+name+" content");
+
+        return childRef;
+    }
+
+    private String getTestFileIdWithTwoRenditionsOneSourceAndTwoTargetAssociations() throws Exception
+    {
+        if (testFileIdWithTwoRenditions == null)
+        {
+            getTestNetwork();
+            getTestPersonId();
+            getTestSite();
+
+            NodeRef fileNode = TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+            {
+                @Override
+                public NodeRef doWork() throws Exception
+                {
+                    NodeRef documentLibrary = testSite.getContainerNodeRef("documentLibrary");
+                    NodeRef folder = repoService.createFolder(documentLibrary, "myFoder");
+                    NodeRef testFile1 = repoService.createDocument(folder,
+                        "testdoc1.txt", "Test title 1", "Test description 1", "Test content 2");
+
+                    makeRenditionNode(testFile1,    "pdf",       "pdf", "application/pdf");
+                    makeRenditionNode(testFile1, "doclib", "thumbnail", "image/png");
+
+                    // Make three more files and associate one as the source of testFile1 and the others as a copy of it.
+                    NodeRef testFile0 = repoService.createDocument(folder,
+                        "testdoc0.txt", "Test title 0", "Test description 0", "Test content 0");
+                    NodeRef testFile2 = repoService.createDocument(folder,
+                        "testdoc2.txt", "Test title 2", "Test description 2", "Test content 2");
+                    NodeRef testFile3 = repoService.createDocument(folder,
+                        "testdoc3.txt", "Test title 3", "Test description 3", "Test content 3");
+                    nodeService.addAspect(testFile1, ContentModel.ASPECT_COPIEDFROM, null);
+                    nodeService.addAspect(testFile2, ContentModel.ASPECT_COPIEDFROM, null);
+                    nodeService.addAspect(testFile3, ContentModel.ASPECT_COPIEDFROM, null);
+                    nodeService.createAssociation(testFile1, testFile0, ASSOC_ORIGINAL);
+                    nodeService.createAssociation(testFile2, testFile1, ASSOC_ORIGINAL);
+                    nodeService.createAssociation(testFile3, testFile1, ASSOC_ORIGINAL);
+
+                    return testFile1;
+                }
+            }, testPersonId, testNetwork.getId());
+            testFileIdWithTwoRenditions = fileNode.getId();
+        }
+        return testFileIdWithTwoRenditions;
+    }
+
+    private void assertGetIdFilterParams(int expectedProperties,
+                                         int expectedRenditions,
+                                         int expecteRelationships,
+                                         int expectedAllowableActions,
+                                         int expectedPolicyIds,
+                                         int expectedAcls,
+                                         String... params) throws Exception
+    {
+        String cmisId = getTestFileIdWithTwoRenditionsOneSourceAndTwoTargetAssociations();
+
+        HashMap<String, String> reqParams = new HashMap<>();
+        reqParams.put("id", cmisId);
+        StringJoiner sj = new StringJoiner(", ");
+        for (int i=0; i<params.length; i+=2)
+        {
+            String param = params[i];
+            String value = params[i + 1];
+            reqParams.put(param, value);
+            sj.add(param+'='+value);
+        }
+
+        publicApiClient.setRequestContext(new RequestContext(testNetwork.getId(), testPersonId));
+        HttpResponse resp = publicApiClient.get(Binding.atom, CMIS_VERSION_11, "id", reqParams);
+        String xml = resp.getResponse();
+
+        String urlParams = sj.toString();
+        System.out.println(xml+"\n\n Expected props="+expectedProperties+
+            " allowed="+expectedAllowableActions+
+            " relationships="+expecteRelationships+
+            " renditions="+expectedRenditions+
+            " policies="+expectedPolicyIds+
+            " acls="+expectedAcls+
+            " URL params: "+ urlParams);
+
+        if (expectedProperties >= 0)
+        {
+            String fragment = assertSubstring("Properties", xml, expectedProperties, "cmisra:object");
+            fragment = assertSubstring("Properties", fragment, expectedProperties, "cmis:properties");
+            assertCount("Properties", fragment, expectedProperties, "propertyDefinitionId=");
+        }
+
+        if (expectedRenditions >= 0)
+        {
+            assertCount("Renditions", xml, expectedRenditions, "<cmis:rendition>");
+            assertCount("Renditions", xml, expectedRenditions, "<atom:link rel=\"alternate\"");
+        }
+
+        if (expecteRelationships >= 0)
+        {
+            assertCount("Relationships", xml, expecteRelationships, "<cmis:relationship>");
+        }
+
+        if (expectedRenditions >= 0 && expecteRelationships >= 0)
+        {
+            // The number of renditions and relationships will change this too.
+            assertCount("Links", xml, 12+expectedRenditions+expecteRelationships, "<atom:link rel=\"");
+        }
+
+        if (expectedAllowableActions >= 0)
+        {
+            String fragment = assertSubstring("Actions", xml, expectedAllowableActions, "cmis:allowableActions");
+            assertCount("Actions", fragment, expectedAllowableActions, "<cmis:can");
+        }
+
+        // When includePolicyIds=true is set we can end up with an empty tag
+        if (expectedPolicyIds == 0 && urlParams != null && urlParams.indexOf("includePolicyIds=true") != -1)
+        {
+            assertCount("Policies", xml, 1, "<cmis:policyIds/>");
+        }
+        else if (expectedPolicyIds >= 0)
+        {
+            String fragment = assertSubstring("Policies", xml, expectedPolicyIds, "cmis:policyIds");
+            // Not checked any further as it is always 0 in our test data.
+        }
+
+        if (expectedAcls >= 0)
+        {
+            String fragment = assertSubstring("ACL", xml, expectedAcls, "cmis:acl");
+            assertCount("ACL", fragment, expectedAcls, "<cmis:permission>");
+        }
+    }
+
+    private void assertCount(String message, String xml, int expected, String substring)
+    {
+        if (expected >= 0)
+        {
+            int count = 0;
+            for (int i = 0;;i++)
+            {
+                i = xml.indexOf(substring, i);
+                if (i < 0)
+                {
+                    break;
+                }
+                count++;
+            }
+            if (count != expected)
+            {
+                fail(message + ": Expected to find " + substring + " " + expected + " times, but there were " + count);
+            }
+        }
+    }
+
+    private String assertSubstring(String message, String string, int expected, String tag)
+    {
+        String substring = string;
+        if (expected >= 0)
+        {
+            String start = "<"+tag+">";
+            String end = "</"+tag+">";
+            int i = string.indexOf(start);
+            if (expected == 0)
+            {
+                if (i != -1)
+                {
+                    fail(message + ": Did not expect to find " + start);
+                }
+                substring = "";
+            }
+            else
+            {
+                if (i == -1)
+                {
+                    fail(message + ": Expected to find " + start);
+                }
+                else
+                {
+                    i += start.length();
+                    int j = string.indexOf(end, i);
+                    if (j == -1)
+                    {
+                        fail(message + ": Expected to find " + end);
+                    }
+                    substring = string.substring(i, j);
+                }
+            }
+        }
+        return substring;
+    }
+
+    private void checkSecondaryTypes(Document doc, Set<String> expectedSecondaryTypes, Set<String> expectedMissingSecondaryTypes)
+    {
+        final List<SecondaryType> secondaryTypesList = doc.getSecondaryTypes();
+        assertNotNull(secondaryTypesList);
+        List<String> secondaryTypes = new AbstractList<String>()
+        {
+            @Override
+            public String get(int index)
+            {
+                SecondaryType type = secondaryTypesList.get(index);
+                return type.getId();
+            }
+
+            @Override
+            public int size()
+            {
+                return secondaryTypesList.size();
+            }
+        };
+        if(expectedSecondaryTypes != null)
+        {
+            assertTrue("Missing secondary types: " + secondaryTypes, secondaryTypes.containsAll(expectedSecondaryTypes));
+        }
+        if(expectedMissingSecondaryTypes != null)
+        {
+            assertTrue("Expected missing secondary types but at least one is still present: " + secondaryTypes, !secondaryTypes.containsAll(expectedMissingSecondaryTypes));
+        }
+    }
+
+    /**
+     * ACE-5753 / REPO-1815 Check the return from http://localhost:8080/alfresco/api/-default-/public/cmis/versions/1.1/browser/root
+     * @throws Exception
+     */
+    @Test
+    public void testBrowserBindingRoot() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+        Iterator<String> personIt = network1.getPersonIds().iterator();
+        final String personId = personIt.next();
+        assertNotNull(personId);
+        Person person = repoService.getPerson(personId);
+        assertNotNull(person);
+
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), personId));
+
+        HttpResponse response = publicApiClient.get(network1.getId() + "/public/cmis/versions/1.1/browser/root", null);
+        assertEquals(200, response.getStatusCode());
+    }
+
+    /**
+     * REPO-2041 / MNT-16236 Upload via cmis binding atom and browser files with different maxContentSize
+     */
+    @Test
+    public void testSetMaxContentSize() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+        Iterator<String> personIt = network1.getPersonIds().iterator();
+        final String personId = personIt.next();
+        assertNotNull(personId);
+
+        // Create a site
+        final TestSite site = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+        {
+            @Override
+            public TestSite doWork() throws Exception
+            {
+                String siteName = "site" + System.currentTimeMillis();
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = network1.createSite(siteInfo);
+                return site;
+            }
+        }, personId, network1.getId());
+
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), personId));
+        CmisSession cmisSessionAtom = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_11, AlfrescoObjectFactoryImpl.class.getName());
+        CmisSession cmisSessionBrowser = publicApiClient.createPublicApiCMISSession(Binding.browser, CMIS_VERSION_11, AlfrescoObjectFactoryImpl.class.getName());
+        Folder documentLibrary = (Folder)cmisSessionAtom.getObjectByPath("/Sites/" + site.getSiteId() + "/documentLibrary");
+
+        // create file for upload
+        String fileName = "test+" + GUID.generate();
+        long fileLength = 6291456L; // 6MB
+        RandomAccessFile f = new RandomAccessFile(fileName, "rw");
+        f.setLength(fileLength);
+
+        Map<String, Serializable> properties = new HashMap<String, Serializable>();
+        properties.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+        properties.put(PropertyIds.NAME, fileName);
+
+        // change maxContentSize so that the file will be to big
+        double maxContentSize = 5.8;  // 5MB
+        PublicApiAlfrescoCmisServiceFactory publicApiAlfrescoCmisServiceFactory = (PublicApiAlfrescoCmisServiceFactory) ctx.getBean("publicApiCMISServiceFactory");
+        publicApiAlfrescoCmisServiceFactory.setMaxContentSize(maxContentSize);
+
+        // for atom
+        FileChannel fc = f.getChannel();
+        InputStream is = Channels.newInputStream(fc);
+        ContentStreamImpl contentStream = new ContentStreamImpl(fileName, BigInteger.valueOf(fileLength), MimetypeMap.MIMETYPE_TEXT_PLAIN,
+                is);
+        try
+        {
+            cmisSessionAtom.createDocument(documentLibrary.getId(), fileName, properties, contentStream, VersioningState.MAJOR);
+            fail("The file should be to big to upload via atom binding");
+        }
+        catch(CmisConstraintException e)
+        {
+
+        }
+
+        // for browser
+        fc.position(0);
+        try
+        {
+            cmisSessionBrowser.createDocument(documentLibrary.getId(), fileName, properties, contentStream, VersioningState.MAJOR);
+            fail("The file should be to big to upload via browser binding");
+        }
+        catch(CmisConstraintException e)
+        {
+
+        }
+
+        // increase maxContensize so that the file is not to big
+        maxContentSize = 10.6; // 10MB
+        publicApiAlfrescoCmisServiceFactory.setMaxContentSize(maxContentSize);
+
+        // for atom
+        fc.position(0);
+        Document result = cmisSessionAtom.createDocument(documentLibrary.getId(), fileName, properties, contentStream, VersioningState.MAJOR);
+        assertNotNull(result);
+
+        // for browser
+        fc.position(0);
+        result = cmisSessionBrowser.createDocument(documentLibrary.getId(), fileName + "2", properties, contentStream, VersioningState.MAJOR);
+        assertNotNull(result);
+
+        // ignore the size check
+        maxContentSize = -1;
+        publicApiAlfrescoCmisServiceFactory.setMaxContentSize(maxContentSize);
+
+        // for atom
+        fc.position(0);
+        result = cmisSessionAtom.createDocument(documentLibrary.getId(), fileName + "3", properties, contentStream, VersioningState.MAJOR);
+        assertNotNull(result);
+
+        // for browser
+        fc.position(0);
+        result = cmisSessionBrowser.createDocument(documentLibrary.getId(), fileName + "4", properties, contentStream, VersioningState.MAJOR);
+        assertNotNull(result);
+    }
+
+    /**
+     * Tests OpenCMIS api.
+     */
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testCMIS() throws Exception
+    {
+        // Test Case cloud-2353
+        // Test Case cloud-2354
+        // Test Case cloud-2356
+        // Test Case cloud-2378
+        // Test Case cloud-2357
+        // Test Case cloud-2358
+        // Test Case cloud-2360
+
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+        Iterator<String> personIt = network1.getPersonIds().iterator();
+        final String personId = personIt.next();
+        assertNotNull(personId);
+        Person person = repoService.getPerson(personId);
+        assertNotNull(person);
+
+        // Create a site
+        final TestSite site = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+        {
+            @Override
+            public TestSite doWork() throws Exception
+            {
+                String siteName = "site" + System.currentTimeMillis();
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = network1.createSite(siteInfo);
+                return site;
+            }
+        }, personId, network1.getId());
+
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), personId));
+		CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_10, AlfrescoObjectFactoryImpl.class.getName());
+        Nodes nodesProxy = publicApiClient.nodes();
+        Comments commentsProxy = publicApiClient.comments();
+
+        String expectedContent = "Ipsum and so on";
+        Document doc = null;
+        Folder documentLibrary = (Folder)cmisSession.getObjectByPath("/Sites/" + site.getSiteId() + "/documentLibrary");
+        FolderNode expectedDocumentLibrary = (FolderNode)CMISNode.createNode(documentLibrary);
+        Document testDoc = null;
+        Folder testFolder = null;
+        FolderNode testFolderNode = null;
+
+        // create some sub-folders and documents
+        {
+            for(int i = 0; i < 3; i++)
+            {
+                Map<String, String> properties = new HashMap<String, String>();
+                {
+                    properties.put(PropertyIds.OBJECT_TYPE_ID, "cmis:folder");
+                    properties.put(PropertyIds.NAME, "folder-" + i);
+                }
+
+                Folder f = documentLibrary.createFolder(properties);
+                FolderNode fn = (FolderNode)CMISNode.createNode(f);
+                if(testFolder == null)
+                {
+                    testFolder = f;
+                    testFolderNode = fn;
+                }
+                expectedDocumentLibrary.addFolder(fn);
+
+                for(int k = 0; k < 3; k++)
+                {
+                    properties = new HashMap<String, String>();
+                    {
+                        properties.put(PropertyIds.OBJECT_TYPE_ID, "cmis:folder");
+                        properties.put(PropertyIds.NAME, "folder-" + k);
+                    }
+
+                    Folder f1 = f.createFolder(properties);
+                    FolderNode childFolder = (FolderNode)CMISNode.createNode(f1);
+                    fn.addFolder(childFolder);
+                }
+                
+                for(int j = 0; j < 3; j++)
+                {
+                    properties = new HashMap<String, String>();
+                    {
+			        	properties.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+                        properties.put(PropertyIds.NAME, "doc-" + j);
+                    }
+
+                    ContentStreamImpl fileContent = new ContentStreamImpl();
+                    {
+                        ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+                        writer.putContent(expectedContent);
+                        ContentReader reader = writer.getReader();
+                        fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+                        fileContent.setStream(reader.getContentInputStream());
+                    }
+
+                    Document d = f.createDocument(properties, fileContent, VersioningState.MAJOR);
+                    if(testDoc == null)
+                    {
+                        testDoc = d;
+                    }
+
+                    CMISNode childDocument = CMISNode.createNode(d);
+                    fn.addNode(childDocument);
+                }
+            }
+
+            for(int i = 0; i < 10; i++)
+            {
+                Map<String, String> properties = new HashMap<String, String>();
+                {
+		        	properties.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+                    properties.put(PropertyIds.NAME, "doc-" + i);
+                }
+
+                ContentStreamImpl fileContent = new ContentStreamImpl();
+                {
+                    ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+                    writer.putContent(expectedContent);
+                    ContentReader reader = writer.getReader();
+                    fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+                    fileContent.setStream(reader.getContentInputStream());
+                }
+
+                documentLibrary.createDocument(properties, fileContent, VersioningState.MAJOR);
+            }
+        }
+
+        // try to add and remove ratings, comments, tags to folders created by CMIS
+        {
+            Aggregate aggregate = new Aggregate(1, null);
+            NodeRating expectedNodeRating = new NodeRating("likes", true, aggregate);
+            Comment expectedComment = new Comment("commenty", "commenty", false, null, person, person);
+            Tag expectedTag = new Tag("taggy");
+
+            NodeRating rating = nodesProxy.createNodeRating(testFolder.getId(), expectedNodeRating);
+            expectedNodeRating.expected(rating);
+            assertNotNull(rating.getId());
+
+            // REPO-2028 - remove lucene tests
+            //Tag tag = nodesProxy.createNodeTag(testFolder.getId(), expectedTag);
+            //expectedTag.expected(tag);
+            //assertNotNull(tag.getId());
+
+            Comment comment = commentsProxy.createNodeComment(testFolder.getId(), expectedComment);
+            expectedComment.expected(comment);
+            assertNotNull(comment.getId());
+        }
+
+        // try to add and remove ratings, comments, tags to documents created by CMIS
+        {
+            Aggregate aggregate = new Aggregate(1, null);
+            NodeRating expectedNodeRating = new NodeRating("likes", true, aggregate);
+            Comment expectedComment = new Comment("commenty", "commenty", false, null, person, person);
+            Tag expectedTag = new Tag("taggy");
+
+            NodeRating rating = nodesProxy.createNodeRating(testDoc.getId(), expectedNodeRating);
+            expectedNodeRating.expected(rating);
+            assertNotNull(rating.getId());
+
+            // REPO-2028 - remove lucene tests
+            //Tag tag = nodesProxy.createNodeTag(testDoc.getId(), expectedTag);
+            //expectedTag.expected(tag);
+            //assertNotNull(tag.getId());
+
+            Comment comment = commentsProxy.createNodeComment(testDoc.getId(), expectedComment);
+            expectedComment.expected(comment);
+            assertNotNull(comment.getId());
+        }
+
+        // descendants
+        {
+            List<Tree<FileableCmisObject>> descendants = documentLibrary.getDescendants(4);
+            expectedDocumentLibrary.checkDescendants(descendants);
+        }
+
+        // upload/setContent
+        {
+            Map<String, String> fileProps = new HashMap<String, String>();
+            {
+	            fileProps.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+                fileProps.put(PropertyIds.NAME, "mydoc-" + GUID.generate() + ".txt");
+            }
+            ContentStreamImpl fileContent = new ContentStreamImpl();
+            {
+                ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+                writer.putContent(expectedContent);
+                ContentReader reader = writer.getReader();
+                fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+                fileContent.setStream(reader.getContentInputStream());
+            }
+            doc = documentLibrary.createDocument(fileProps, fileContent, VersioningState.MAJOR);
+
+            String nodeId = stripCMISSuffix(doc.getId());
+            final NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+            ContentReader reader = TenantUtil.runAsUserTenant(new TenantRunAsWork<ContentReader>()
+            {
+                @Override
+                public ContentReader doWork() throws Exception
+                {
+                    ContentReader reader = repoService.getContent(nodeRef, ContentModel.PROP_CONTENT);
+                    return reader;
+                }
+            }, personId, network1.getId());
+
+            String actualContent = reader.getContentString();
+            assertEquals(expectedContent, actualContent);
+        }
+
+        // get content
+        {
+            ContentStream stream = doc.getContentStream();
+            StringWriter writer = new StringWriter();
+            IOUtils.copy(stream.getStream(), writer, "UTF-8");
+            String actualContent = writer.toString();
+            assertEquals(expectedContent, actualContent);
+        }
+        
+        // get children
+        {
+            Folder folder = (Folder)cmisSession.getObjectByPath("/Sites/" + site.getSiteId() + "/documentLibrary/" + testFolder.getName());
+
+            ItemIterable<CmisObject> children = folder.getChildren();
+            testFolderNode.checkChildren(children);
+        }
+
+        // REPO-2028 - remove lucene tests
+        // query
+//        {
+//            Folder folder = (Folder)cmisSession.getObjectByPath("/Sites/" + site.getSiteId() + "/documentLibrary/" + testFolder.getName());
+//            String folderId = folder.getId();
+//
+//            Set<String> expectedFolderNames = new HashSet<String>();
+//            for(CMISNode n : testFolderNode.getFolderNodes().values())
+//            {
+//                expectedFolderNames.add((String)n.getProperty("cmis:name"));
+//            }
+//            int expectedNumFolders = expectedFolderNames.size();
+//            int numMatchingFoldersFound = 0;
+//            List<CMISNode> results = cmisSession.query("SELECT * FROM cmis:folder WHERE IN_TREE('" + folderId + "')", false, 0, Integer.MAX_VALUE);
+//            for(CMISNode node : results)
+//            {
+//                String name = (String)node.getProperties().get("cmis:name");
+//                if(expectedFolderNames.contains(name))
+//                {
+//                    numMatchingFoldersFound++;
+//                }
+//            }
+//            assertEquals(expectedNumFolders, numMatchingFoldersFound);
+//
+//            Set<String> expectedDocNames = new HashSet<String>();
+//            for(CMISNode n : testFolderNode.getDocumentNodes().values())
+//            {
+//                expectedDocNames.add((String)n.getProperty("cmis:name"));
+//            }
+//            int expectedNumDocs = expectedDocNames.size();
+//            int numMatchingDocsFound = 0;
+//            results = cmisSession.query("SELECT * FROM cmis:document where IN_TREE('" + folderId + "')", false, 0, Integer.MAX_VALUE);
+//            for(CMISNode node : results)
+//            {
+//                String name = (String)node.getProperties().get("cmis:name");
+//                if(expectedDocNames.contains(name))
+//                {
+//                    numMatchingDocsFound++;
+//                }
+//            }
+//            assertEquals(expectedNumDocs, numMatchingDocsFound);
+//        }
+
+        // versioning
+        {
+            String nodeId = stripCMISSuffix(doc.getId());
+            final NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+
+            // checkout
+            ObjectId pwcId = doc.checkOut();
+            Document pwc = (Document)cmisSession.getObject(pwcId.getId());
+            Boolean isCheckedOut = TenantUtil.runAsUserTenant(new TenantRunAsWork<Boolean>()
+            {
+                @Override
+                public Boolean doWork() throws Exception
+                {
+                    Boolean isCheckedOut = repoService.isCheckedOut(nodeRef);
+                    return isCheckedOut;
+                }
+            }, personId, network1.getId());
+            assertTrue(isCheckedOut);
+
+            // checkin with new content
+            expectedContent = "Big bad wolf";
+
+            ContentStreamImpl fileContent = new ContentStreamImpl();
+            {
+                ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+                writer.putContent(expectedContent);
+                ContentReader reader = writer.getReader();
+                fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+                fileContent.setStream(reader.getContentInputStream());
+            }
+            ObjectId checkinId = pwc.checkIn(true, Collections.EMPTY_MAP, fileContent, "checkin 1");
+            doc = (Document)cmisSession.getObject(checkinId.getId());
+            isCheckedOut = TenantUtil.runAsUserTenant(new TenantRunAsWork<Boolean>()
+            {
+                @Override
+                public Boolean doWork() throws Exception
+                {
+                    Boolean isCheckedOut = repoService.isCheckedOut(nodeRef);
+                    return isCheckedOut;
+                }
+            }, personId, network1.getId());
+            assertFalse(isCheckedOut);
+
+            // check that the content has been updated
+            ContentStream stream = doc.getContentStream();
+            StringWriter writer = new StringWriter();
+            IOUtils.copy(stream.getStream(), writer, "UTF-8");
+            String actualContent = writer.toString();
+            assertEquals(expectedContent, actualContent);
+            
+            List<Document> allVersions = doc.getAllVersions();
+            assertEquals(2, allVersions.size());
+            assertEquals("2.0", allVersions.get(0).getVersionLabel());
+			assertEquals(CMIS_VERSION_10, allVersions.get(1).getVersionLabel());
+        }
+        
+        {
+            // https://issues.alfresco.com/jira/browse/PUBLICAPI-95
+            // Test that documents are created with autoVersion=true
+
+            Map<String, String> fileProps = new HashMap<String, String>();
+            {
+	            fileProps.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+                fileProps.put(PropertyIds.NAME, "mydoc-" + GUID.generate() + ".txt");
+            }
+            ContentStreamImpl fileContent = new ContentStreamImpl();
+            {
+                ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+                writer.putContent("Ipsum and so on");
+                ContentReader reader = writer.getReader();
+                fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+                fileContent.setStream(reader.getContentInputStream());
+            }
+
+            {
+                // a versioned document
+                
+                Document autoVersionedDoc = documentLibrary.createDocument(fileProps, fileContent, VersioningState.MAJOR);
+                String objectId = autoVersionedDoc.getId();
+                String bareObjectId = stripCMISSuffix(objectId);
+                final NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, bareObjectId);
+                Boolean autoVersion = TenantUtil.runAsUserTenant(new TenantRunAsWork<Boolean>()
+                {
+                    @Override
+                    public Boolean doWork() throws Exception
+                    {
+                        Boolean autoVersion = (Boolean)repoService.getProperty(nodeRef, ContentModel.PROP_AUTO_VERSION);
+                        return autoVersion;
+                    }
+                }, personId, network1.getId());
+                assertEquals(Boolean.TRUE, autoVersion);
+            }
+
+            // https://issues.alfresco.com/jira/browse/PUBLICAPI-92
+            // Test that a get on an objectId without a version suffix returns the current version of the document
+            {
+                // do a few checkout, checkin cycles to create some versions
+                fileProps = new HashMap<String, String>();
+                {
+		            fileProps.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+                    fileProps.put(PropertyIds.NAME, "mydoc-" + GUID.generate() + ".txt");
+                }
+
+                Document autoVersionedDoc = documentLibrary.createDocument(fileProps, fileContent, VersioningState.MAJOR);
+                String objectId = autoVersionedDoc.getId();
+                String bareObjectId = stripCMISSuffix(objectId);
+
+                for(int i = 0; i < 3; i++)
+                {
+                    Document doc1 = (Document)cmisSession.getObject(bareObjectId);
+
+                    ObjectId pwcId = doc1.checkOut();
+                    Document pwc = (Document)cmisSession.getObject(pwcId.getId());
+                    
+                    ContentStreamImpl contentStream = new ContentStreamImpl();
+                    {
+                        ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+                        expectedContent = GUID.generate();
+                        writer.putContent(expectedContent);
+                        ContentReader reader = writer.getReader();
+                        contentStream.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+                        contentStream.setStream(reader.getContentInputStream());
+                    }
+                    pwc.checkIn(true, Collections.EMPTY_MAP, contentStream, "checkin " + i);
+                }
+                
+                // get the object, supplying an objectId without a version suffix
+                Document doc1 = (Document)cmisSession.getObject(bareObjectId);
+                String versionLabel = doc1.getVersionLabel();
+                ContentStream cs = doc1.getContentStream();
+                String content = IOUtils.toString(cs.getStream());
+                
+                assertEquals("4.0", versionLabel);
+                assertEquals(expectedContent, content);
+            }
+        }
+    }
+
+    /**
+     * Tests CMIS and non-CMIS public api interactions
+     */
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testScenario1() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+        Iterator<String> personIt = network1.getPersonIds().iterator();
+        final String person = personIt.next();
+        assertNotNull(person);
+
+        Sites sitesProxy = publicApiClient.sites();
+        Comments commentsProxy = publicApiClient.comments();
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person));
+		CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_10, AlfrescoObjectFactoryImpl.class.getName());
+        
+        ListResponse<MemberOfSite> sites = sitesProxy.getPersonSites(person, null);
+        assertTrue(sites.getList().size() > 0);
+        MemberOfSite siteMember = sites.getList().get(0);
+        String siteId = siteMember.getSite().getSiteId();
+
+        Folder documentLibrary = (Folder)cmisSession.getObjectByPath("/Sites/" + siteId + "/documentLibrary");
+        
+        System.out.println("documentLibrary id = " + documentLibrary.getId());
+
+        Map<String, String> fileProps = new HashMap<String, String>();
+        {
+            fileProps.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+            fileProps.put(PropertyIds.NAME, "mydoc-" + GUID.generate() + ".txt");
+        }
+        ContentStreamImpl fileContent = new ContentStreamImpl();
+        {
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+            writer.putContent("Ipsum and so on");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            fileContent.setStream(reader.getContentInputStream());
+        }
+        Document doc = documentLibrary.createDocument(fileProps, fileContent, VersioningState.MAJOR);
+
+        System.out.println("Document id = " + doc.getId());
+
+        Comment c = commentsProxy.createNodeComment(doc.getId(), new Comment("comment title 1", "comment 1"));
+        
+        System.out.println("Comment = " + c);
+        
+        // Now lock the document
+        String nodeRefStr = (String) doc.getPropertyValue("alfcmis:nodeRef");
+        final NodeRef nodeRef = new NodeRef(nodeRefStr);
+        final TenantRunAsWork<Void> runAsWork = new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                lockService.lock(nodeRef, LockType.WRITE_LOCK);
+                return null;
+            }
+        };
+        RetryingTransactionCallback<Void> txnWork = new RetryingTransactionCallback<Void>()
+        {
+            @Override
+            public Void execute() throws Throwable
+            {
+                TenantUtil.runAsUserTenant(runAsWork, "bob", network1.getId());
+                return null;
+            }
+        };
+        transactionHelper.doInTransaction(txnWork);
+        
+        // Now attempt to update the document's metadata
+        try
+        {
+            doc.delete();
+        }
+        catch (CmisUpdateConflictException e)
+        {
+            // Expected: ACE-762 BM-0012: NodeLockedException not handled by CMIS 
+        }
+    }
+
+    //@Test
+    public void testInvalidMethods() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+        Iterator<String> personIt = network1.getPersonIds().iterator();
+        final String person = personIt.next();
+        assertNotNull(person);
+
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person));
+
+			publicApiClient.post(Binding.atom, CMIS_VERSION_10, null, null);
+            
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+        
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person));
+            
+			publicApiClient.head(Binding.atom, CMIS_VERSION_10, null, null);
+            
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+        
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person));
+            
+			publicApiClient.options(Binding.atom, CMIS_VERSION_10, null, null);
+            
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+        
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person));
+            
+			publicApiClient.trace(Binding.atom, CMIS_VERSION_10, null, null);
+            
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+        
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person));
+            
+			publicApiClient.patch(Binding.atom, CMIS_VERSION_10, null, null);
+            
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+    }
+    
+    @Test
+    public void testPublicApi110() throws Exception
+    {
+        Iterator<TestNetwork> networksIt = getTestFixture().networksIterator();
+        final TestNetwork network1 = networksIt.next();
+        Iterator<String> personIt = network1.getPersonIds().iterator();
+        final String person1Id = personIt.next();
+        final String person2Id = personIt.next();
+
+        final List<NodeRef> nodes = new ArrayList<NodeRef>(5);
+        
+        // Create some favourite targets, sites, files and folders
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                String siteName1 = "site" + GUID.generate();
+                SiteInformation siteInfo1 = new SiteInformation(siteName1, siteName1, siteName1, SiteVisibility.PUBLIC);
+                TestSite site1 = network1.createSite(siteInfo1);
+                
+                String siteName2 = "site" + GUID.generate();
+                SiteInformation siteInfo2 = new SiteInformation(siteName2, siteName2, siteName2, SiteVisibility.PRIVATE);
+                TestSite site2 = network1.createSite(siteInfo2);
+
+				NodeRef nodeRef1 = repoService.createDocument(site1.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), "Test Doc1", "Test Doc1 Title", "Test Doc1 Description", "Test Content");
+                nodes.add(nodeRef1);
+				NodeRef nodeRef2 = repoService.createDocument(site1.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), "Test Doc2", "Test Doc2 Title", "Test Doc2 Description", "Test Content");
+                nodes.add(nodeRef2);
+				NodeRef nodeRef3 = repoService.createDocument(site2.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), "Test Doc2", "Test Doc2 Title", "Test Doc2 Description", "Test Content");
+                nodes.add(nodeRef3);
+                repoService.createAssociation(nodeRef2, nodeRef1, ASSOC_ORIGINAL);
+                repoService.createAssociation(nodeRef3, nodeRef1, ASSOC_ORIGINAL);
+
+                site1.inviteToSite(person2Id, SiteRole.SiteCollaborator);
+
+                return null;
+            }
+        }, person1Id, network1.getId());
+
+        {
+            OperationContext cmisOperationCtxOverride = new OperationContextImpl();
+            cmisOperationCtxOverride.setIncludeRelationships(IncludeRelationships.BOTH);
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2Id, cmisOperationCtxOverride));
+    		CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_10, AlfrescoObjectFactoryImpl.class.getName());
+
+            CmisObject o1 = cmisSession.getObject(nodes.get(0).getId());
+            List<Relationship> relationships = o1.getRelationships();
+            assertEquals(1, relationships.size());
+            Relationship r = relationships.get(0);
+            CmisObject source = r.getSource();
+            CmisObject target = r.getTarget();
+            String sourceVersionSeriesId = (String)source.getProperty(PropertyIds.VERSION_SERIES_ID).getFirstValue();
+            String targetVersionSeriesId = (String)target.getProperty(PropertyIds.VERSION_SERIES_ID).getFirstValue();
+            assertEquals(nodes.get(1).getId(), sourceVersionSeriesId);
+            assertEquals(nodes.get(0).getId(), targetVersionSeriesId);
+        }
+    }
+
+    /*
+     * This test requires lucene, and needs to probably be moved to the repository project or in a system test
+     * See REPO-2028 and follow up : REPO-3019
+     */
+    @Test
+    @Category({LuceneTests.class, RedundantTests.class})
+    public void testObjectIds() throws Exception
+    {
+        String username = "enterpriseuser" + System.currentTimeMillis();
+		PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person = repoService.createUser(personInfo, username, null);
+        String personId = person.getId();
+
+        final List<NodeRef> folders = new ArrayList<NodeRef>();
+        final List<NodeRef> documents = new ArrayList<NodeRef>();
+
+        AuthenticationUtil.runAs(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                String siteName = "site" + System.currentTimeMillis();
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = repoService.createSite(null, siteInfo);
+                
+                String name = GUID.generate();
+				NodeRef folderNodeRef = repoService.createFolder(site.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), name);
+                folders.add(folderNodeRef);
+
+                name = GUID.generate();
+                NodeRef docNodeRef = repoService.createDocument(folderNodeRef, name, "test content");
+                documents.add(docNodeRef);
+
+                return null;
+            }
+        }, personId);
+        
+        NodeRef folderNodeRef = folders.get(0);
+        NodeRef docNodeRef = documents.get(0);
+
+        publicApiClient.setRequestContext(new RequestContext(personId));
+
+        // use cmisatom endpoint
+        List<Repository> repositories = publicApiClient.getCMISRepositories();
+        CmisSession cmisSession = publicApiClient.getCMISSession(repositories.get(0));
+
+        // test CMIS accepts NodeRefs and guids as input
+        // if input is NodeRef, return NodeRef. If input is guid, return guid.
+        {
+            String nodeRefStr = docNodeRef.toString();
+            CmisObject o = cmisSession.getObject(nodeRefStr);
+            assertEquals(docNodeRef.toString(), stripCMISSuffix(o.getId()));
+    
+            nodeRefStr = folderNodeRef.toString();
+            o = cmisSession.getObject(nodeRefStr);
+            assertEquals(folderNodeRef.toString(), stripCMISSuffix(o.getId()));
+            
+            String objectId = docNodeRef.getId();
+            o = cmisSession.getObject(objectId);
+            assertEquals(objectId, stripCMISSuffix(o.getId()));
+    
+            objectId = folderNodeRef.getId();
+            o = cmisSession.getObject(objectId);
+            assertEquals(objectId, stripCMISSuffix(o.getId()));
+        }
+
+        // query
+        {
+            // searching by NodeRef, expect result objectIds to be Noderefs
+            Set<String> expectedObjectIds = new HashSet<String>();
+            expectedObjectIds.add(docNodeRef.toString());
+            int numMatchingDocs = 0;
+
+            // NodeRef input
+            List<CMISNode> results = cmisSession.query("SELECT * FROM cmis:document WHERE IN_TREE('" + folderNodeRef.toString() + "')", false, 0, Integer.MAX_VALUE);
+            assertEquals(expectedObjectIds.size(), results.size());
+            for(CMISNode node : results)
+            {
+                String objectId = stripCMISSuffix((String)node.getProperties().get(PropertyIds.OBJECT_ID));
+                if(expectedObjectIds.contains(objectId))
+                {
+                    numMatchingDocs++;
+                }
+            }
+            assertEquals(expectedObjectIds.size(), numMatchingDocs);
+
+            // searching by guid, expect result objectIds to be NodeRefs
+            numMatchingDocs = 0;
+
+            // node guid input
+            results = cmisSession.query("SELECT * FROM cmis:document WHERE IN_TREE('" + folderNodeRef.getId() + "')", false, 0, Integer.MAX_VALUE);
+            assertEquals(expectedObjectIds.size(), results.size());
+            for(CMISNode node : results)
+            {
+                String objectId = stripCMISSuffix((String)node.getProperties().get(PropertyIds.OBJECT_ID));
+                System.out.println("objectId = " + objectId);
+                if(expectedObjectIds.contains(objectId))
+                {
+                    numMatchingDocs++;
+                }
+            }
+            assertEquals(expectedObjectIds.size(), numMatchingDocs);
+        }
+
+        // public api
+        
+        Iterator<TestNetwork> networksIt = getTestFixture().networksIterator();
+        final TestNetwork network1 = networksIt.next();
+        Iterator<String> personIt = network1.getPersonIds().iterator();
+        final String person1Id = personIt.next();
+
+        final List<NodeRef> folders1 = new ArrayList<NodeRef>();
+        final List<NodeRef> documents1 = new ArrayList<NodeRef>();
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                String siteName = "site" + System.currentTimeMillis();
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = repoService.createSite(null, siteInfo);
+                
+                String name = GUID.generate();
+				NodeRef folderNodeRef = repoService.createFolder(site.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), name);
+                folders1.add(folderNodeRef);
+
+                name = GUID.generate();
+                NodeRef docNodeRef = repoService.createDocument(folderNodeRef, name, "test content");
+                documents1.add(docNodeRef);
+
+                return null;
+            }
+        }, person1Id, network1.getId());
+        
+        folderNodeRef = folders1.get(0);
+        docNodeRef = documents1.get(0);
+
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+        
+		cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_10, AlfrescoObjectFactoryImpl.class.getName());
+
+        // test CMIS accepts NodeRefs and guids as input
+        // objectIds returned from public api CMIS are always the guid
+        {
+            String nodeRefStr = docNodeRef.toString();
+            CmisObject o = cmisSession.getObject(nodeRefStr);
+            String objectId = docNodeRef.getId();
+            assertEquals(objectId, stripCMISSuffix(o.getId()));
+    
+            nodeRefStr = folderNodeRef.toString();
+            o = cmisSession.getObject(nodeRefStr);
+            objectId = folderNodeRef.getId();
+            assertEquals(objectId, stripCMISSuffix(o.getId()));
+
+            o = cmisSession.getObject(objectId);
+            assertEquals(objectId, stripCMISSuffix(o.getId()));
+    
+            objectId = folderNodeRef.getId();
+            o = cmisSession.getObject(objectId);
+            assertEquals(objectId, stripCMISSuffix(o.getId()));
+        }
+
+        // query
+        {
+            // searching by NodeRef, expect result objectIds to be objectId
+            Set<String> expectedObjectIds = new HashSet<String>();
+            expectedObjectIds.add(docNodeRef.getId());
+            int numMatchingDocs = 0;
+
+            // NodeRef input
+            List<CMISNode> results = cmisSession.query("SELECT * FROM cmis:document WHERE IN_TREE('" + folderNodeRef.toString() + "')", false, 0, Integer.MAX_VALUE);
+            assertEquals(expectedObjectIds.size(), results.size());
+            for(CMISNode node : results)
+            {
+                String objectId = stripCMISSuffix((String)node.getProperties().get(PropertyIds.OBJECT_ID));
+                if(expectedObjectIds.contains(objectId))
+                {
+                    numMatchingDocs++;
+                }
+            }
+            assertEquals(expectedObjectIds.size(), numMatchingDocs);
+
+            // searching by guid, expect result objectIds to be objectId
+            numMatchingDocs = 0;
+
+            // node guid input
+            results = cmisSession.query("SELECT * FROM cmis:document WHERE IN_TREE('" + folderNodeRef.getId() + "')", false, 0, Integer.MAX_VALUE);
+            assertEquals(expectedObjectIds.size(), results.size());
+            for(CMISNode node : results)
+            {
+                String objectId = stripCMISSuffix((String)node.getProperties().get(PropertyIds.OBJECT_ID));
+                System.out.println("objectId = " + objectId);
+                if(expectedObjectIds.contains(objectId))
+                {
+                    numMatchingDocs++;
+                }
+            }
+            assertEquals(expectedObjectIds.size(), numMatchingDocs);
+        }
+    }
+    
+    @Test
+    @Ignore("Quarantined since 24 Sep 2018. TestCMIS.testAspects:1546->checkSecondaryTypes:492 Missing secondary types: [P:cm:titled, P:sys:localized]")
+    public void testAspects() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+        String username = "user" + System.currentTimeMillis();
+		PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person1 = network1.createUser(personInfo);
+        String person1Id = person1.getId();
+
+        final List<NodeRef> folders = new ArrayList<NodeRef>();
+        final List<NodeRef> documents = new ArrayList<NodeRef>();
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                String siteName = "site" + System.currentTimeMillis();
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = repoService.createSite(null, siteInfo);
+
+                String name = GUID.generate();
+				NodeRef folderNodeRef = repoService.createFolder(site.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), name);
+                folders.add(folderNodeRef);
+
+                for(int i = 0; i < 3; i++)
+                {
+                    name = GUID.generate();
+                    NodeRef docNodeRef = repoService.createDocument(folderNodeRef, name, "test content");
+                    assertFalse(repoService.getAspects(docNodeRef).contains(ContentModel.ASPECT_TITLED));
+                    documents.add(docNodeRef);
+                }
+
+                return null;
+            }
+        }, person1Id, network1.getId());
+
+        final NodeRef doc1NodeRef = documents.get(0);
+        final NodeRef doc2NodeRef = documents.get(1);
+        final NodeRef doc3NodeRef = documents.get(2);
+
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+		CmisSession atomCmisSession10 = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_10, AlfrescoObjectFactoryImpl.class.getName());
+		CmisSession atomCmisSession11 = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_11);
+		CmisSession browserCmisSession11 = publicApiClient.createPublicApiCMISSession(Binding.browser, CMIS_VERSION_11);
+
+        // Test that adding aspects works for both 1.0 and 1.1
+
+        // 1.0
+        {
+            AlfrescoDocument doc = (AlfrescoDocument)atomCmisSession10.getObject(doc1NodeRef.getId());
+
+            doc = (AlfrescoDocument)doc.addAspect("P:cm:titled");
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    Set<QName> aspects = repoService.getAspects(doc1NodeRef);
+                    assertTrue("Missing aspect in current set " + aspects, aspects.contains(ContentModel.ASPECT_TITLED));
+    
+                    return null;
+                }
+            }, person1Id, network1.getId());
+
+            doc.removeAspect("P:cm:titled");
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    Set<QName> aspects = repoService.getAspects(doc1NodeRef);
+                    assertFalse("Unexpected aspect in current set " + aspects, aspects.contains(ContentModel.ASPECT_TITLED));
+    
+                    return null;
+                }
+            }, person1Id, network1.getId());
+        }
+
+        // 1.1 atom (secondary types)
+        {
+            final Document doc = (Document)atomCmisSession11.getObject(doc2NodeRef.getId());
+
+            final List<SecondaryType> secondaryTypesList = doc.getSecondaryTypes();
+            final List<String> secondaryTypes = new ArrayList<String>();
+            if (secondaryTypesList != null)
+            {
+                for(SecondaryType secondaryType : secondaryTypesList)
+                {
+                    secondaryTypes.add(secondaryType.getId());
+                }
+            }
+
+            secondaryTypes.add("P:sys:temporary");
+            secondaryTypes.add("P:cm:titled");
+            Map<String, Object> properties = new HashMap<String, Object>();
+            {
+                // create a document with 2 secondary types
+                properties.put(PropertyIds.SECONDARY_OBJECT_TYPE_IDS, secondaryTypes);
+            }
+            Document doc1 = (Document)doc.updateProperties(properties);
+            checkSecondaryTypes(doc1, new HashSet<String>(Arrays.asList(new String[] {"P:sys:temporary", "P:cm:titled"})), null);
+
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    Set<QName> aspects = repoService.getAspects(doc2NodeRef);
+                    assertTrue("Missing aspects in current set " + aspects, aspects.contains(ContentModel.ASPECT_TITLED));
+                    assertTrue("Missing aspects in current set " + aspects, aspects.contains(ContentModel.ASPECT_TEMPORARY));
+
+                    return null;
+                }
+            }, person1Id, network1.getId());
+
+            secondaryTypes.add("P:cm:author");
+            properties = new HashMap<String, Object>();
+            {
+                // create a document with 2 secondary types
+                properties.put(PropertyIds.SECONDARY_OBJECT_TYPE_IDS, secondaryTypes);
+            }
+            Document doc2 = (Document)doc1.updateProperties(properties);
+            checkSecondaryTypes(doc2, new HashSet<String>(Arrays.asList(new String[] {"P:sys:temporary", "P:cm:titled", "P:cm:author"})), null);
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    Set<QName> aspects = repoService.getAspects(doc2NodeRef);
+                    String title = (String)repoService.getProperty(doc2NodeRef, ContentModel.PROP_TITLE);
+                    assertTrue("Missing aspects in current set " + aspects, aspects.contains(ContentModel.ASPECT_AUTHOR));
+                    assertTrue("Missing aspects in current set " + aspects, aspects.contains(ContentModel.ASPECT_TEMPORARY));
+                    assertTrue("Missing aspects in current set " + aspects, aspects.contains(ContentModel.ASPECT_TITLED));
+                    assertEquals(null, title);
+
+                    return null;
+                }
+            }, person1Id, network1.getId());
+
+            // remove a secondary type
+            secondaryTypes.remove("P:cm:titled");
+            properties = new HashMap<String, Object>();
+            {
+                properties.put(PropertyIds.SECONDARY_OBJECT_TYPE_IDS, secondaryTypes);
+            }
+            Document doc3 = (Document)doc2.updateProperties(properties);
+            checkSecondaryTypes(doc3, new HashSet<String>(Arrays.asList(new String[] {"P:sys:temporary", "P:cm:author"})),
+                    new HashSet<String>(Arrays.asList(new String[] {"P:cm:titled"})));
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    Set<QName> aspects = repoService.getAspects(doc2NodeRef);
+                    String title = (String)repoService.getProperty(doc2NodeRef, ContentModel.PROP_TITLE);
+                    assertTrue("Missing aspects in current set " + aspects, aspects.contains(ContentModel.ASPECT_AUTHOR));
+                    assertTrue("Missing aspects in current set " + aspects, aspects.contains(ContentModel.ASPECT_TEMPORARY));
+                    assertFalse("Unexpected aspect in current set " + aspects, aspects.contains(ContentModel.ASPECT_TITLED));
+                    assertEquals(null, title);
+
+                    return null;
+                }
+            }, person1Id, network1.getId());
+        }
+
+        // 1.1 browser (secondary types)
+        {
+            Document doc = (Document)browserCmisSession11.getObject(doc3NodeRef.getId());
+            final List<SecondaryType> secondaryTypesList = doc.getSecondaryTypes();
+            final List<String> secondaryTypes = new ArrayList<String>();
+            if (secondaryTypesList != null)
+            {
+                for (SecondaryType secondaryType : secondaryTypesList)
+                {
+                    secondaryTypes.add(secondaryType.getId());
+                }
+            }
+
+            secondaryTypes.add("P:sys:temporary");
+            secondaryTypes.add("P:cm:titled");
+            Map<String, Object> properties = new HashMap<String, Object>();
+            {
+                // create a document with 2 secondary types
+                properties.put(PropertyIds.SECONDARY_OBJECT_TYPE_IDS, secondaryTypes);
+            }
+            Document doc1 = (Document)doc.updateProperties(properties);
+            checkSecondaryTypes(doc1, new HashSet<String>(Arrays.asList(new String[] {"P:sys:temporary", "P:cm:titled"})), null);
+
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    Set<QName> aspects = repoService.getAspects(doc3NodeRef);
+                    assertTrue("Missing aspects in current set " + aspects, aspects.contains(ContentModel.ASPECT_TITLED));
+                    assertTrue("Missing aspects in current set " + aspects, aspects.contains(ContentModel.ASPECT_TEMPORARY));
+                    return null;
+                }
+            }, person1Id, network1.getId());
+
+            secondaryTypes.add("P:cm:author");
+            properties = new HashMap<String, Object>();
+            {
+                // create a document with 2 secondary types
+                properties.put(PropertyIds.SECONDARY_OBJECT_TYPE_IDS, secondaryTypes);
+            }
+            Document doc2 = (Document)doc1.updateProperties(properties);
+            checkSecondaryTypes(doc2, new HashSet<String>(Arrays.asList(new String[] {"P:sys:temporary", "P:cm:titled", "P:cm:author"})), null);
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    Set<QName> aspects = repoService.getAspects(doc3NodeRef);
+                    assertTrue("Missing aspects in current set " + aspects, aspects.contains(ContentModel.ASPECT_TITLED));
+                    assertTrue("Missing aspects in current set " + aspects, aspects.contains(ContentModel.ASPECT_TEMPORARY));
+                    assertTrue("Missing aspects in current set " + aspects, aspects.contains(ContentModel.ASPECT_AUTHOR));
+
+                    return null;
+                }
+            }, person1Id, network1.getId());
+
+            secondaryTypes.remove("P:cm:titled");
+            properties = new HashMap<String, Object>();
+            {
+                // create a document with 2 secondary types
+                properties.put(PropertyIds.SECONDARY_OBJECT_TYPE_IDS, secondaryTypes);
+            }
+            Document doc3 = (Document)doc2.updateProperties(properties);
+            checkSecondaryTypes(doc3, new HashSet<String>(Arrays.asList(new String[] {"P:sys:temporary", "P:cm:author"})),
+                    new HashSet<String>(Arrays.asList(new String[] {"P:cm:titled"})));
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    Set<QName> aspects = repoService.getAspects(doc3NodeRef);
+                    assertTrue("Missing aspects in current set " + aspects, aspects.contains(ContentModel.ASPECT_AUTHOR));
+                    assertTrue("Missing aspects in current set " + aspects, aspects.contains(ContentModel.ASPECT_TEMPORARY));
+                    assertFalse("Unexpected aspect in current set " + aspects, aspects.contains(ContentModel.ASPECT_TITLED));
+
+                    return null;
+                }
+            }, person1Id, network1.getId());
+        }
+    }
+
+    /**
+     * ALF-18968
+     * 
+     * @see QNameFilterImpl#listOfHardCodedExcludedTypes()
+     */
+    @Test
+    public void testTypeFiltering() throws Exception
+    {
+        // Force an exclusion in order to test the exclusion inheritance
+        cmisTypeExclusions.setExcluded(ActionModel.TYPE_ACTION_BASE, true);
+        // Quick check
+        assertTrue(cmisTypeExclusions.isExcluded(ActionModel.TYPE_ACTION_BASE));
+
+        // Test that a type defined with this excluded parent type does not break the CMIS dictionary
+        DictionaryBootstrap bootstrap = new DictionaryBootstrap();
+        List<String> bootstrapModels = new ArrayList<String>();
+        bootstrapModels.add("publicapi/test-model.xml");
+        bootstrap.setModels(bootstrapModels);
+        bootstrap.setDictionaryDAO(dictionaryDAO);
+        bootstrap.setTenantService(tenantService);
+        bootstrap.bootstrap();
+        cmisDictionary.afterDictionaryInit();
+
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+        String username = "user" + System.currentTimeMillis();
+		PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person1 = network1.createUser(personInfo);
+        String person1Id = person1.getId();
+
+        // test that this type is excluded; the 'action' model (act prefix) is in the list of hardcoded exclusions
+        QName type = QName.createQName("{http://www.alfresco.org/test/testCMIS}type1");
+        assertTrue(cmisTypeExclusions.isExcluded(type));
+
+        // and that we can't get to it through CMIS
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+		CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_10, AlfrescoObjectFactoryImpl.class.getName());
+        try
+        {
+            cmisSession.getTypeDefinition("D:testCMIS:type1");
+            fail("Type should not be available");
+        }
+        catch(CmisObjectNotFoundException e)
+        {
+            // ok
+        }
+    }
+
+    /**
+     * MNT-12680 
+     * The creation date of version should be the same as creation date of the original node
+     * @throws Exception
+     */
+    @Test
+    public void testCreationDate() throws Exception
+    {
+        // create a site
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+        String username = "user" + System.currentTimeMillis();
+        PersonInfo personInfo = new PersonInfo(username, username, username, "password", null, null, null, null, null, null, null);
+        TestPerson person1 = network1.createUser(personInfo);
+        String person1Id = person1.getId();
+
+        final String siteName = "site" + System.currentTimeMillis();
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+        {
+
+            @Override
+            public NodeRef doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PUBLIC);
+                final TestSite site = network1.createSite(siteInfo);
+                final NodeRef resNode = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "testdoc.txt", "Test Doc1 Title", "Test Doc1 Description",
+                        "Test Content");
+                return resNode;
+            }
+        }, person1Id, network1.getId());
+
+        // create a document
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+        CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_10, AlfrescoObjectFactoryImpl.class.getName());
+        AlfrescoFolder docLibrary = (AlfrescoFolder) cmisSession.getObjectByPath("/Sites/" + siteName + "/documentLibrary");
+        Map<String, String> properties = new HashMap<String, String>();
+        {
+            properties.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+            properties.put(PropertyIds.NAME, "mydoc-" + GUID.generate() + ".txt");
+        }
+        ContentStreamImpl fileContent = new ContentStreamImpl();
+        {
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+            writer.putContent("some content");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            fileContent.setStream(reader.getContentInputStream());
+        }
+
+        Document autoVersionedDoc = docLibrary.createDocument(properties, fileContent, VersioningState.MAJOR);
+        String objectId = autoVersionedDoc.getId();
+        String bareObjectId = stripCMISSuffix(objectId);
+        // create versions
+        for (int i = 0; i < 3; i++)
+        {
+            Document doc1 = (Document) cmisSession.getObject(bareObjectId);
+
+            ObjectId pwcId = doc1.checkOut();
+            Document pwc = (Document) cmisSession.getObject(pwcId.getId());
+
+            ContentStreamImpl contentStream = new ContentStreamImpl();
+            {
+                ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+                writer.putContent(GUID.generate());
+                ContentReader reader = writer.getReader();
+                contentStream.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+                contentStream.setStream(reader.getContentInputStream());
+            }
+            pwc.checkIn(true, Collections.EMPTY_MAP, contentStream, "checkin " + i);
+        }
+        
+        GregorianCalendar cDateFirst = cmisSession.getAllVersions(bareObjectId).get(0).getCreationDate();
+        GregorianCalendar cDateSecond = cmisSession.getAllVersions(bareObjectId).get(2).getCreationDate();
+        
+        if (cDateFirst.before(cDateSecond) || cDateFirst.after(cDateSecond))
+        {
+            fail("The creation date of version should be the same as creation date of the original node");
+        }
+    }
+
+    /**
+	 * Test that updating properties does not automatically create a new version.
+	 * Test that updating content creates a new version automatically.
+     * 
+     */
+    @Test
+    public void testVersioning() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+        String username = "user" + System.currentTimeMillis();
+		PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person1 = network1.createUser(personInfo);
+        String person1Id = person1.getId();
+
+        final String siteName = "site" + System.currentTimeMillis();
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+        {
+            @Override
+            public NodeRef doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = repoService.createSite(null, siteInfo);
+
+                String name = GUID.generate();
+				NodeRef folderNodeRef = repoService.createFolder(site.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), name);
+                return folderNodeRef;
+            }
+        }, person1Id, network1.getId());
+
+        // Create a document...
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+		CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_10, AlfrescoObjectFactoryImpl.class.getName());
+        AlfrescoFolder docLibrary = (AlfrescoFolder)cmisSession.getObjectByPath("/Sites/" + siteName + "/documentLibrary");
+        Map<String, String> properties = new HashMap<String, String>();
+        {
+        	properties.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+            properties.put(PropertyIds.NAME, "mydoc-" + GUID.generate() + ".txt");
+        }
+        ContentStreamImpl fileContent = new ContentStreamImpl();
+        {
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+            writer.putContent("Ipsum and so on");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            fileContent.setStream(reader.getContentInputStream());
+        }
+        AlfrescoDocument doc = (AlfrescoDocument)docLibrary.createDocument(properties, fileContent, VersioningState.MAJOR);
+        String versionLabel = doc.getVersionLabel();
+
+		// ...and check that updating its properties does not create a new version 
+        properties = new HashMap<String, String>();
+        {
+            properties.put(PropertyIds.DESCRIPTION, GUID.generate());
+        }
+        AlfrescoDocument doc1 = (AlfrescoDocument)doc.updateProperties(properties);
+        doc1 = (AlfrescoDocument)doc1.getObjectOfLatestVersion(false);
+        String versionLabel1 = doc1.getVersionLabel();
+
+        assertTrue(Float.parseFloat(versionLabel) < Float.parseFloat(versionLabel1));
+
+		// ...and check that updating its content creates a new version
+        fileContent = new ContentStreamImpl();
+        {
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+            writer.putContent("Ipsum and so on and so on");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            fileContent.setStream(reader.getContentInputStream());
+        }
+
+        doc1.setContentStream(fileContent, true);
+        AlfrescoDocument doc2 = (AlfrescoDocument)doc1.getObjectOfLatestVersion(false);
+        @SuppressWarnings("unused")
+        String versionLabel2 = doc2.getVersionLabel();
+
+        assertTrue("Set content stream should create a new version automatically", Float.parseFloat(versionLabel1) < Float.parseFloat(versionLabel2));
+	}
+	
+	/**
+	 * Test that updating properties does automatically create a new version if
+	 * <b>autoVersion</b>, <b>initialVersion</b> and <b>autoVersionOnUpdateProps</b> are TRUE
+	 */
+	@Test
+	public void testVersioningUsingUpdateProperties() throws Exception
+	{
+		final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+		String username = "user" + System.currentTimeMillis();
+		PersonInfo personInfo = new PersonInfo(username, username, username, "password", null, null, null, null, null, null, null);
+		TestPerson person1 = network1.createUser(personInfo);
+		String person1Id = person1.getId();
+
+		final String siteName = "site" + System.currentTimeMillis();
+
+		TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+		{
+			@Override
+			public NodeRef doWork() throws Exception
+			{
+				SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+				TestSite site = repoService.createSite(null, siteInfo);
+
+				String name = GUID.generate();
+				NodeRef folderNodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), name);
+				return folderNodeRef;
+			}
+		}, person1Id, network1.getId());
+
+		// Create a document...
+		publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+		CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, "1.0", AlfrescoObjectFactoryImpl.class.getName());
+		AlfrescoFolder docLibrary = (AlfrescoFolder)cmisSession.getObjectByPath("/Sites/" + siteName + "/documentLibrary");
+        Map<String, String> properties = new HashMap<String, String>();
+        {
+        	properties.put(PropertyIds.OBJECT_TYPE_ID, "cmis:document");
+        	properties.put(PropertyIds.NAME, "mydoc-" + GUID.generate() + ".txt");
+        }
+		ContentStreamImpl fileContent = new ContentStreamImpl();
+		{
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+            writer.putContent("Ipsum and so on");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            fileContent.setStream(reader.getContentInputStream());
+		}
+		AlfrescoDocument doc = (AlfrescoDocument)docLibrary.createDocument(properties, fileContent, VersioningState.MAJOR);
+		String versionLabel = doc.getVersionLabel();
+		
+		String nodeRefStr = doc.getPropertyValue(NodeRefProperty.NodeRefPropertyId).toString();
+		final NodeRef nodeRef = new NodeRef(nodeRefStr);
+		
+		TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+		{
+			@Override
+			public NodeRef doWork() throws Exception
+			{
+				// ensure autoversioning is enabled
+				assertTrue(nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE));
+				
+				Map<QName, Serializable> versionProperties = new HashMap<QName, Serializable>();
+				versionProperties.put(ContentModel.PROP_AUTO_VERSION, true);
+				versionProperties.put(ContentModel.PROP_INITIAL_VERSION, true);
+				versionProperties.put(ContentModel.PROP_AUTO_VERSION_PROPS, true);
+				
+				nodeService.addProperties(nodeRef, versionProperties);
+				
+				return null;
+			}
+		}, person1Id, network1.getId());
+
+		// ...and check that updating its properties creates a new minor version...
+		properties = new HashMap<String, String>();
+        {
+        	properties.put(PropertyIds.DESCRIPTION, GUID.generate());
+        }
+		AlfrescoDocument doc1 = (AlfrescoDocument)doc.getObjectOfLatestVersion(false).updateProperties(properties);
+		doc1 = (AlfrescoDocument)doc.getObjectOfLatestVersion(false);
+		String versionLabel1 = doc1.getVersionLabel();
+		
+        assertTrue(Double.parseDouble(versionLabel) < Double.parseDouble(versionLabel1));
+
+		// ...and check that updating its content creates a new version
+		fileContent = new ContentStreamImpl();
+		{
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+            writer.putContent("Ipsum and so on and so on");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            fileContent.setStream(reader.getContentInputStream());
+		}
+
+		doc1.setContentStream(fileContent, true);
+		
+		AlfrescoDocument doc2 = (AlfrescoDocument)doc1.getObjectOfLatestVersion(false);
+		String versionLabel2 = doc2.getVersionLabel();
+		
+		assertTrue("Set content stream should create a new version automatically", Double.parseDouble(versionLabel1) < Double.parseDouble(versionLabel2));
+		assertTrue("It should be latest version : " + versionLabel2, doc2.isLatestVersion());
+		
+		doc2.deleteContentStream();
+		AlfrescoDocument doc3 = (AlfrescoDocument)doc2.getObjectOfLatestVersion(false);
+		String versionLabel3 = doc3.getVersionLabel();
+		
+		assertTrue("Delete content stream should create a new version automatically", Double.parseDouble(versionLabel1) < Double.parseDouble(versionLabel3));
+		assertTrue("It should be latest version : " + versionLabel3, doc3.isLatestVersion());
+	}
+    
+	
+	/**
+    * 1) Creating a file with incorrect char in description property
+    * 2) Get xml with incorrect char in description
+    * 3) Check xml
+    * @throws Exception
+    */
+   @Test
+   public void testGetXmlWithIncorrectDescription() throws Exception
+   {
+       final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+       String username = "user" + System.currentTimeMillis();
+       PersonInfo personInfo = new PersonInfo(username, username, username, "password", null, null, null, null, null, null, null);
+       TestPerson person1 = network1.createUser(personInfo);
+       String person1Id = person1.getId();
+
+       final String siteName = "site" + System.currentTimeMillis();
+       
+       NodeRef fileNode = TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+               {
+                   @Override
+                   public NodeRef doWork() throws Exception
+                   {
+                       SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PUBLIC);
+                       final TestSite site = network1.createSite(siteInfo);
+                       
+                       NodeRef resNode = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "testdoc \u0010.txt", "Test Doc1 Title \u0010", "d\u0010", "Test Content");
+                       return resNode;
+                   }
+               }, person1Id, network1.getId());
+       
+       String cmisId = fileNode.getId();
+       HashMap<String, String> reqParams = new HashMap<String, String>();
+       reqParams.put("id", cmisId+";1.0");
+       reqParams.put("filter", "*");
+       reqParams.put("includeAllowableActions", "true");
+       reqParams.put("includeACL", "true");
+       reqParams.put("includePolicyIds", "true");
+       reqParams.put("includeRelationships", "both");
+       reqParams.put("renditionFilter", "*");
+       
+       publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+       HttpResponse resp = publicApiClient.get(Binding.atom, CMIS_VERSION_11, "id", reqParams);
+       String xml = resp.getResponse();
+       // Response hasn't full info at error - writer just stops at incorrect character.
+       // Therefore we can check end tag of root element
+       assertTrue("No end tag was found", xml.endsWith("</atom:entry>"));
+   }
+   
+   /**
+    * 1) Creating a file with currency symbols in the name, title and description (MNT-15044)
+    * 2) Get the document with correct chars in the properties.
+    * @throws Exception
+    */
+   @Test
+   public void testGetXmlWithCorrectCurrencySymbols() throws Exception
+   {
+       final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+       String username = "user" + System.currentTimeMillis();
+       PersonInfo personInfo = new PersonInfo(username, username, username, "password", null, null, null, null, null, null, null);
+       TestPerson person1 = network1.createUser(personInfo);
+       String person1Id = person1.getId();
+
+       final String siteName = "site" + System.currentTimeMillis();
+
+       NodeRef fileNode = TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+               {
+           @Override
+           public NodeRef doWork() throws Exception
+           {
+               SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PUBLIC);
+               final TestSite site = network1.createSite(siteInfo);
+
+               NodeRef resNode = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), 
+                                                            "Euro \u20AC Pound \u00A3 Franc \u20A3.txt", 
+                                                            "Euro \u20AC Pound \u00A3 Franc \u20A3 File", 
+                                                            "\u20A3 \u00A3 \u20A3", 
+                                                            "\u20A3 \u00A3 \u20A3");
+               return resNode;
+           }
+               }, person1Id, network1.getId());
+
+       publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+       CmisSession atomCmisSession10 = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_10, AlfrescoObjectFactoryImpl.class.getName());
+
+       String objectId = fileNode.getId();
+       Document doc = (Document)atomCmisSession10.getObject(objectId);
+
+       String name = (String)doc.getProperty(PropertyIds.NAME).getFirstValue();
+       String title = (String)doc.getProperty("cm:title").getFirstValue();
+       String description = (String)doc.getProperty("cm:description").getFirstValue();
+
+       assertEquals("Euro \u20AC Pound \u00A3 Franc \u20A3.txt", name);
+       assertEquals("Euro \u20AC Pound \u00A3 Franc \u20A3 File", title);
+       assertEquals("\u20A3 \u00A3 \u20A3", description);
+   }
+
+    /*
+     * Test that creating a document with a number of initial aspects does not create lots of initial versions
+     */
+    @Test
+    public void testALF19320() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+        String username = "user" + System.currentTimeMillis();
+		PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person1 = network1.createUser(personInfo);
+        String person1Id = person1.getId();
+
+        final String siteName = "site" + System.currentTimeMillis();
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+        {
+            @Override
+            public NodeRef doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = repoService.createSite(null, siteInfo);
+
+                String name = GUID.generate();
+				NodeRef folderNodeRef = repoService.createFolder(site.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), name);
+                return folderNodeRef;
+            }
+        }, person1Id, network1.getId());
+
+        // Create a document...
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+		CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_10, AlfrescoObjectFactoryImpl.class.getName());
+        AlfrescoFolder docLibrary = (AlfrescoFolder)cmisSession.getObjectByPath("/Sites/" + siteName + "/documentLibrary");
+        Map<String, String> properties = new HashMap<String, String>();
+        {
+            // create a document with 2 aspects
+            properties.put(PropertyIds.OBJECT_TYPE_ID, "cmis:document,P:cm:titled,P:cm:author");
+            properties.put(PropertyIds.NAME, "mydoc-" + GUID.generate() + ".txt");
+        }
+        ContentStreamImpl fileContent = new ContentStreamImpl();
+        {
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+            writer.putContent("Ipsum and so on");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            fileContent.setStream(reader.getContentInputStream());
+        }
+        
+        AlfrescoDocument doc = (AlfrescoDocument)docLibrary.createDocument(properties, fileContent, VersioningState.MAJOR);
+        String versionLabel = doc.getVersionLabel();
+		assertEquals(CMIS_VERSION_10, versionLabel);
+
+        AlfrescoDocument doc1 = (AlfrescoDocument)doc.getObjectOfLatestVersion(false);
+        String versionLabel1 = doc1.getVersionLabel();
+		assertEquals(CMIS_VERSION_10, versionLabel1);
+    }
+    
+    /* MNT-10175 test */
+    @Test
+    public void testAppendContentVersioning() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+        String username = "user" + System.currentTimeMillis();
+        PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person1 = network1.createUser(personInfo);
+        String person1Id = person1.getId();
+
+        final String siteName = "site" + System.currentTimeMillis();
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+        {
+            @Override
+            public NodeRef doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = repoService.createSite(null, siteInfo);
+
+                String name = GUID.generate();
+                NodeRef folderNodeRef = repoService.createFolder(site.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), name);
+                return folderNodeRef;
+            }
+        }, person1Id, network1.getId());
+
+        // Create a document
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+        // Use CMIS 1.1 to test content appending
+        CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_11);
+        Folder docLibrary = (Folder)cmisSession.getObjectByPath("/Sites/" + siteName + "/documentLibrary");
+        String name = GUID.generate() + ".txt";
+        Map<String, String> properties = new HashMap<String, String>();
+        {
+            properties.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+            properties.put(PropertyIds.NAME, name);
+        }
+        // Create content to append
+        ContentStreamImpl fileContent = new ContentStreamImpl();
+        {
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+            writer.putContent("Ipsum and so on");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            fileContent.setStream(reader.getContentInputStream());
+        }
+
+        Document doc = docLibrary.createDocument(properties, fileContent, VersioningState.MAJOR);
+        String versionLabel1 = doc.getObjectOfLatestVersion(false).getVersionLabel();
+
+        // append a few times
+        for(int i = 0; i < 5; i++)
+        {
+            doc.appendContentStream(fileContent, false);
+        }
+        
+        String versionLabel2 = doc.getObjectOfLatestVersion(false).getVersionLabel();
+        
+        // Version label should not be incremented by appending with isLustChunk = false
+        assertEquals(versionLabel1, versionLabel2);
+
+        doc.appendContentStream(fileContent, true);    
+        
+        String versionLabel3 = doc.getObjectOfLatestVersion(false).getVersionLabel();
+        Integer majorVer1 = Integer.valueOf(versionLabel2.substring(0, 1));
+        Integer majorVer2 = Integer.valueOf(versionLabel3.substring(0, 1));
+        
+        Integer minorVer1 = Integer.valueOf(versionLabel2.substring(2, 3));
+        Integer minorVer2 = Integer.valueOf(versionLabel3.substring(2, 3));
+        
+        // Only one MINOR version should be created
+        assertEquals(majorVer1, majorVer2);
+        assertEquals(Integer.valueOf(minorVer1 + 1), minorVer2);
+    }
+    
+    @Test
+    public void testAppendContentStream() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+        String username = "user" + System.currentTimeMillis();
+        PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person1 = network1.createUser(personInfo);
+        String person1Id = person1.getId();
+
+        final String siteName = "site" + System.currentTimeMillis();
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+        {
+            @Override
+            public NodeRef doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = repoService.createSite(null, siteInfo);
+
+                String name = GUID.generate();
+                NodeRef folderNodeRef = repoService.createFolder(site.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), name);
+                return folderNodeRef;
+            }
+        }, person1Id, network1.getId());
+
+        // Create a document...
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+        CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_11);
+        Folder docLibrary = (Folder)cmisSession.getObjectByPath("/Sites/" + siteName + "/documentLibrary");
+        String name = "mydoc-" + GUID.generate() + ".txt";
+        Map<String, String> properties = new HashMap<String, String>();
+        {
+            // create a document with 2 aspects
+            properties.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+            properties.put(PropertyIds.NAME, name);
+        }
+        ContentStreamImpl fileContent = new ContentStreamImpl();
+        {
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+            writer.putContent("Ipsum and so on");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            fileContent.setStream(reader.getContentInputStream());
+        }
+
+        Document doc = docLibrary.createDocument(properties, fileContent, VersioningState.MAJOR);
+
+        // append a few times
+        for(int i = 0; i < 5; i++)
+        {
+            fileContent = new ContentStreamImpl();
+            {
+                ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+                writer.putContent("Ipsum and so on");
+                ContentReader reader = writer.getReader();
+                fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+                fileContent.setStream(reader.getContentInputStream());
+            }
+            doc.appendContentStream(fileContent, false);
+        }
+        fileContent = new ContentStreamImpl();
+        {
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+            writer.putContent("Ipsum and so on");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            fileContent.setStream(reader.getContentInputStream());
+        }
+        doc.appendContentStream(fileContent, true);
+
+        // check the appends
+        String path = "/Sites/" + siteName + "/documentLibrary/" + name;
+        Document doc1 = (Document)cmisSession.getObjectByPath(path);
+        ContentStream contentStream = doc1.getContentStream();
+        InputStream in = contentStream.getStream();
+        StringWriter writer = new StringWriter();
+        IOUtils.copy(in, writer, "UTF-8");
+        String content = writer.toString();
+        assertEquals("Ipsum and so onIpsum and so onIpsum and so onIpsum and so onIpsum and so onIpsum and so onIpsum and so on", content);
+    }
+
+    @Test
+    public void testSecondaryTypes() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+        String username = "user" + System.currentTimeMillis();
+	    PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person1 = network1.createUser(personInfo);
+        String person1Id = person1.getId();
+
+        final String siteName = "site" + System.currentTimeMillis();
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+                {
+            @Override
+            public NodeRef doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = repoService.createSite(null, siteInfo);
+
+                String name = GUID.generate();
+	            NodeRef folderNodeRef = repoService.createFolder(site.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), name);
+                return folderNodeRef;
+            }
+                }, person1Id, network1.getId());
+
+        // Create a document...
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+	    CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_11);
+        Folder docLibrary = (Folder)cmisSession.getObjectByPath("/Sites/" + siteName + "/documentLibrary");
+        String name = "mydoc-" + GUID.generate() + ".txt";
+        final List<String> secondaryTypes = new ArrayList<String>();
+        secondaryTypes.add("P:cm:summarizable");
+        Map<String, Object> properties = new HashMap<String, Object>();
+        {
+            // create a document with 2 aspects
+	        properties.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+            properties.put(PropertyIds.SECONDARY_OBJECT_TYPE_IDS, secondaryTypes);
+            properties.put("cm:summary", "My summary");
+            properties.put(PropertyIds.NAME, name);
+        }
+        ContentStreamImpl fileContent = new ContentStreamImpl();
+        {
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+            writer.putContent("Ipsum and so on");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            fileContent.setStream(reader.getContentInputStream());
+        }
+
+        Document doc = docLibrary.createDocument(properties, fileContent, VersioningState.MAJOR);
+
+        {
+            // check that the secondary types and properties are present
+            {
+                checkSecondaryTypes(doc, Collections.singleton("P:cm:summarizable"), null);
+                String summary = (String)doc.getProperty("cm:summary").getFirstValue();
+                assertEquals("My summary", summary);
+            }
+    
+            {
+                doc = (Document)cmisSession.getObjectByPath("/Sites/" + siteName + "/documentLibrary/" + name);
+                checkSecondaryTypes(doc, Collections.singleton("P:cm:summarizable"), null);
+                String summary = (String)doc.getProperty("cm:summary").getFirstValue();
+                assertEquals("My summary", summary);
+            }
+        }
+        
+        // update property and check
+        {
+            properties = new HashMap<String, Object>();
+            {
+                properties.put("cm:summary", "My updated summary");
+            }
+            doc.updateProperties(properties);
+
+            {
+                doc = (Document)cmisSession.getObjectByPath("/Sites/" + siteName + "/documentLibrary/" + name);
+                checkSecondaryTypes(doc, Collections.singleton("P:cm:summarizable"), null);
+                String summary = (String)doc.getProperty("cm:summary").getFirstValue();
+                assertEquals("My updated summary", summary);
+            }
+    
+            {
+                checkSecondaryTypes(doc, Collections.singleton("P:cm:summarizable"), null);
+                String summary = (String)doc.getProperty("cm:summary").getFirstValue();
+                assertEquals("My updated summary", summary);
+            }
+        }
+    }
+
+    /* MNT-10161 related test - mapping of cmis:description for CMIS 1.1 */
+    @Test
+    public void testMNT_10161() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+        String username = "user" + System.currentTimeMillis();
+        PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person1 = network1.createUser(personInfo);
+        String person1Id = person1.getId();
+
+        final String siteName = "site" + System.currentTimeMillis();
+        final String nodeDescription = "Test description";
+
+        final String nodeName = GUID.generate();
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+        {
+            @Override
+            public NodeRef doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = repoService.createSite(null, siteInfo);
+
+                NodeRef folderNodeRef = repoService.createFolder(site.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), nodeName);
+                /* create node with property description */
+                return repoService.createDocument(folderNodeRef, nodeName, "title", nodeDescription, "content");
+            }
+        }, person1Id, network1.getId());
+
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+        CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_11);
+        Document doc = 
+                (Document)cmisSession.getObjectByPath("/Sites/" + siteName + "/documentLibrary/" + nodeName + "/" + nodeName);
+
+        /* ensure we got the node */
+        assertNotNull(doc);
+
+        /* get mapped cmis:description */
+        Property<?> descrProperty = doc.getProperty(PropertyIds.DESCRIPTION);
+
+        /* ensure that cmis:description is set properly */
+        assertTrue(nodeDescription.equals(descrProperty.getValue()));
+    }
+    
+    /* MNT-10687 related test - appendContent to PWC CMIS 1.1 */
+    @Test
+    public void testMNT_10687() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+        String username = "user" + System.currentTimeMillis();
+        PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person1 = network1.createUser(personInfo);
+        String person1Id = person1.getId();
+
+        final String siteName = "site" + System.currentTimeMillis();
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+        {
+            @Override
+            public NodeRef doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = repoService.createSite(null, siteInfo);
+
+                String name = GUID.generate();
+                NodeRef folderNodeRef = repoService.createFolder(site.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), name);
+                return folderNodeRef;
+            }
+        }, person1Id, network1.getId());
+
+        // Create a document...
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+        CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_11);
+        Folder docLibrary = (Folder)cmisSession.getObjectByPath("/Sites/" + siteName + "/documentLibrary");
+        String name = "mydoc-" + GUID.generate() + ".txt";
+        Map<String, Object> properties = new HashMap<String, Object>();
+        {
+            properties.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+            properties.put(PropertyIds.NAME, name);
+        }
+        ContentStreamImpl fileContent = new ContentStreamImpl();
+        {
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+            writer.putContent("Ipsum");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            fileContent.setStream(reader.getContentInputStream());
+        }
+
+        /* Create document */
+        Document doc = docLibrary.createDocument(properties, fileContent, VersioningState.MAJOR);
+        
+        /* Checkout document */
+        ObjectId pwcId = doc.checkOut();
+        Document pwc = (Document)cmisSession.getObject(pwcId.getId());
+        
+        /* append content to PWC */
+        fileContent = new ContentStreamImpl();
+        {
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+            writer.putContent(" and so on");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            fileContent.setStream(reader.getContentInputStream());
+        }
+        pwc.appendContentStream(fileContent, true);
+        
+        pwc.checkIn(false, null, null, "Check In");
+
+        ContentStream contentStream = doc.getObjectOfLatestVersion(false).getContentStream();
+        InputStream in = contentStream.getStream();
+        StringWriter writer = new StringWriter();
+        IOUtils.copy(in, writer, "UTF-8");
+        String content = writer.toString();
+        assertEquals("Ipsum and so on", content);
+    }
+    
+    @Test
+    public void testMNT_13057() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+        String username = "user" + System.currentTimeMillis();
+        PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person1 = network1.createUser(personInfo);
+        String person1Id = person1.getId();
+        
+        String guid = GUID.generate();
+        String name = guid + "_KRUIS_LOGO_100%_PMS.txt";
+        String urlFileName = guid + "_KRUIS_LOGO_100%25_PMS.txt";
+        
+        final String siteName = "site" + System.currentTimeMillis();
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+        {
+            @Override
+            public NodeRef doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = repoService.createSite(null, siteInfo);
+
+                String name = GUID.generate();
+                NodeRef folderNodeRef = repoService.createFolder(site.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), name);
+                return folderNodeRef;
+            }
+        }, person1Id, network1.getId());
+        
+        // Create a document...
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+        CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_11);
+        Folder docLibrary = (Folder)cmisSession.getObjectByPath("/Sites/" + siteName + "/documentLibrary");
+        
+        Map<String, Object> properties = new HashMap<String, Object>();
+        {
+            properties.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+            properties.put(PropertyIds.NAME, name);
+        }
+        
+        ContentStreamImpl fileContent = new ContentStreamImpl();
+        {
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+            writer.putContent("Ipsum");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+            fileContent.setStream(reader.getContentInputStream());
+        }
+
+        /* Create document */
+        Document doc = docLibrary.createDocument(properties, fileContent, VersioningState.MAJOR);
+        
+        String id = doc.getId();
+        assertNotNull(id);
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("id", URLEncoder.encode(id));
+        
+        urlFileName += "?id=" + URLEncoder.encode(id);
+
+        HttpResponse response = publicApiClient.get(network1.getId() + "/public/cmis/versions/1.1/atom/content/" + urlFileName, null);
+        assertEquals(200, response.getStatusCode());
+    }
+    
+    @Test
+    public void testMNT10430() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+        String username = "user" + System.currentTimeMillis();
+        PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null,
+        		null, null, null, null, null);
+        TestPerson person1 = network1.createUser(personInfo);
+        String person1Id = person1.getId();
+
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+        CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.browser, CMIS_VERSION_11, AlfrescoObjectFactoryImpl.class.getName());
+
+		ObjectType objectType = cmisSession.getTypeDefinition("D:testcmis:maDoc");
+
+		// try and get the mandatory aspects
+		List<String> mandatoryAspects = ((AlfrescoType)objectType).getMandatoryAspects();
+		System.out.println("Mandatory Aspects");
+		for(String mandatoryAspect : mandatoryAspects)
+		{ 
+			System.out.println(mandatoryAspect); 
+		}
+		assertTrue("The aspects should have P:cm:generalclassifiable", mandatoryAspects.contains("P:cm:generalclassifiable"));
+    }
+
+    @Test
+    public void testContentDisposition_MNT_17477() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+        String username = "user" + System.currentTimeMillis();
+        PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person1 = network1.createUser(personInfo);
+        String person1Id = person1.getId();
+
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+        CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.browser, CMIS_VERSION_11, AlfrescoObjectFactoryImpl.class.getName());
+
+        Folder folder = (Folder)cmisSession.getObjectByPath("/Shared");
+
+        //
+        // Upload test JPG document
+        //
+        String name = GUID.generate() + ".jpg";
+
+        Map<String, Object> properties = new HashMap<>();
+        {
+            properties.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+            properties.put(PropertyIds.NAME, name);
+        }
+
+        ContentStreamImpl fileContent = new ContentStreamImpl();
+        {
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_IMAGE_JPEG);
+            fileContent.setStream(this.getClass().getResourceAsStream("/test.jpg"));
+        }
+
+        Document doc = folder.createDocument(properties, fileContent, VersioningState.MAJOR);
+        String docId = doc.getId();
+
+        // note: Content-Disposition can be "inline or "attachment" for content types that are white-listed (eg. specific image types & pdf)
+
+        HttpResponse response = publicApiClient.get(network1.getId()+"/public/cmis/versions/1.1/browser/root/Shared/"+name, null);
+		assertEquals(200, response.getStatusCode());
+        assertTrue(response.getHeaders().get("Content-Disposition").startsWith("inline"));
+
+        response = publicApiClient.get(network1.getId()+"/public/cmis/versions/1.1/browser/root/Shared/"+name+"?download=inline", null);
+		assertEquals(200, response.getStatusCode());
+		assertTrue(response.getHeaders().get("Content-Disposition").startsWith("inline"));
+
+        response = publicApiClient.get(network1.getId()+"/public/cmis/versions/1.1/browser/root/Shared/"+name+"?download=attachment", null);
+		assertEquals(200, response.getStatusCode());
+        assertTrue(response.getHeaders().get("Content-Disposition").startsWith("attachment"));
+
+        // note: AtomPub binding (via OpenCMIS) does not support "download" query parameter
+        response = publicApiClient.get(network1.getId()+"/public/cmis/versions/1.1/atom/content?id="+docId, null);
+		assertEquals(200, response.getStatusCode());
+        assertTrue(response.getHeaders().get("Content-Disposition").startsWith("attachment"));
+
+        //
+        // Create test HTML document
+        //
+        name = GUID.generate() + ".html";
+
+        properties = new HashMap<>();
+        {
+            properties.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+            properties.put(PropertyIds.NAME, name);
+        }
+
+        fileContent = new ContentStreamImpl();
+        {
+            ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".html"));
+            writer.putContent("<html><script>alert(123);</script><body>Hello <b>world</b></body</html>");
+            ContentReader reader = writer.getReader();
+            fileContent.setMimeType(MimetypeMap.MIMETYPE_HTML);
+            fileContent.setStream(reader.getContentInputStream());
+        }
+
+        doc = folder.createDocument(properties, fileContent, VersioningState.MAJOR);
+        docId = doc.getId();
+
+        // note: Content-Disposition will always be "attachment" for content types that are not white-listed
+
+        response = publicApiClient.get(network1.getId()+"/public/cmis/versions/1.1/browser/root/Shared/"+name, null);
+		assertEquals(200, response.getStatusCode());
+        assertTrue(response.getHeaders().get("Content-Disposition").startsWith("attachment;"));
+
+        response = publicApiClient.get(network1.getId()+"/public/cmis/versions/1.1/browser/root/Shared/"+name+"?download=inline", null);
+		assertEquals(200, response.getStatusCode());
+        assertTrue(response.getHeaders().get("Content-Disposition").startsWith("attachment;"));
+
+        // note: AtomPub binding (via OpenCMIS) does not support "download" query parameter
+        response = publicApiClient.get(network1.getId()+"/public/cmis/versions/1.1/atom/content?id="+docId, null);
+		assertEquals(200, response.getStatusCode());
+        assertTrue(response.getHeaders().get("Content-Disposition").startsWith("attachment;"));
+    }
+
+    /**
+     * Test delete version on versions other than latest (most recent) version (MNT-17228)
+     */
+    @Test
+    public void testDeleteNonCurrentVersion() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+        String username = "user" + System.currentTimeMillis();
+        PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null,
+                null, null, null, null, null);
+        TestPerson person = network1.createUser(personInfo);
+        String personId = person.getId();
+
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), personId));
+        CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.browser, CMIS_VERSION_11, AlfrescoObjectFactoryImpl.class.getName());
+
+        Folder homeFolder = (Folder)cmisSession.getObjectByPath("/User Homes/" + personId);
+        assertNotNull(homeFolder.getId());
+
+        // Create a document
+        String name = String.format(TEST_DOCUMENT_NAME_PATTERN, GUID.generate());
+
+        Map<String, Object> properties = new HashMap<String, Object>();
+        properties.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+        properties.put(PropertyIds.NAME, name);
+
+        ContentStreamImpl fileContent = new ContentStreamImpl();
+        ByteArrayInputStream stream = new ByteArrayInputStream(GUID.generate().getBytes());
+        fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+        fileContent.setStream(stream);
+
+        Document doc = homeFolder.createDocument(properties, fileContent, VersioningState.MAJOR);
+        
+        String versionLabel = doc.getVersionLabel();
+        assertEquals("1.0", versionLabel);
+
+        Document docVersionToDelete = null;
+        Document latestDoc = doc;
+                
+        int cnt = 4;
+        for (int i = 1; i <= cnt; i++)
+        {
+            // Update content to create new versions (1.1, 1.2, 1.3, 1.4)
+            fileContent = new ContentStreamImpl();
+            {
+                ContentWriter writer = new FileContentWriter(TempFileProvider.createTempFile(GUID.generate(), ".txt"));
+                writer.putContent("Ipsum and so on and so on "+i);
+                ContentReader reader = writer.getReader();
+                fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+                fileContent.setStream(reader.getContentInputStream());
+            }
+
+            latestDoc.setContentStream(fileContent, true);
+
+            latestDoc = latestDoc.getObjectOfLatestVersion(false);
+            versionLabel = latestDoc.getVersionLabel();
+            assertEquals("1."+i, versionLabel);
+
+            assertEquals(1+i, cmisSession.getAllVersions(latestDoc.getId()).size());
+            
+            if (i == 2)
+            {
+                docVersionToDelete = latestDoc; // ie. 1.2
+            }
+        }
+        
+        // Test delete with a user without permissions
+        String username2 = "user" + System.currentTimeMillis();
+        PersonInfo person2Info = new PersonInfo(username2, username2, username2, TEST_PASSWORD, null, null,
+                                                null, null, null, null, null);
+        TestPerson person2 = network1.createUser(person2Info);
+        String person2Id = person2.getId();
+        
+        TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                String nodeId = stripCMISSuffix(doc.getId());
+                NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+                // Give user person2 READ permissions to access the node
+                permissionService.setPermission(nodeRef, person2Id, PermissionService.READ, true);
+                return null;
+            }
+        }, network1.getId());
+
+        // Connect with person2
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2Id));
+        CmisSession cmisSession2 = publicApiClient.createPublicApiCMISSession(Binding.browser, CMIS_VERSION_11, AlfrescoObjectFactoryImpl.class.getName());
+
+        CmisObject docVersionToDeleteBy2 = cmisSession2.getObject(docVersionToDelete.getId());
+        
+        try
+    	{
+        	// (-) Delete v 1.2 (without DELETE permission)
+        	docVersionToDeleteBy2.delete(false);
+        	fail("Node version was deleted without permissions.");
+    	}
+        catch (CmisPermissionDeniedException ex)
+    	{
+        	// expected
+    	}
+        
+        // (+) Delete v 1.2 (with permission)
+        docVersionToDelete.delete(false);
+ 
+        // eg. 1.0, 1.2, 1.3, 1.4 (not 1.1)
+        assertEquals(cnt, cmisSession.getAllVersions(doc.getId()).size());
+    }
+
+    @Test
+    public void testMnt11631() throws Exception
+    {
+        final TestNetwork network = getTestFixture().getRandomNetwork();
+
+        String username = String.format(TEST_USER_NAME_PATTERN, System.currentTimeMillis());
+        PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person = network.createUser(personInfo);
+        String personId = person.getId();
+
+        final String siteName = String.format(TEST_SITE_NAME_PATTERN, System.currentTimeMillis());
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+        {
+            @Override
+            public NodeRef doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = repoService.createSite(null, siteInfo);
+
+                String name = GUID.generate();
+                NodeRef folderNodeRef = repoService.createFolder(site.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), name);
+                return folderNodeRef;
+            }
+        }, personId, network.getId());
+
+        publicApiClient.setRequestContext(new RequestContext(network.getId(), personId));
+        CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_11);
+        Folder docLibrary = (Folder) cmisSession.getObjectByPath(String.format(DOCUMENT_LIBRARY_PATH_PATTERN, siteName));
+        String name = String.format(TEST_DOCUMENT_NAME_PATTERN, GUID.generate());
+
+        Map<String, Object> properties = new HashMap<String, Object>();
+        properties.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+        properties.put(PropertyIds.NAME, name);
+
+        ContentStreamImpl fileContent = new ContentStreamImpl();
+        ByteArrayInputStream stream = new ByteArrayInputStream(GUID.generate().getBytes());
+        fileContent.setMimeType(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+        fileContent.setStream(stream);
+
+        Document doc = docLibrary.createDocument(properties, fileContent, VersioningState.MAJOR);
+
+        ObjectId pwcId = doc.checkOut();
+        Document pwc = (Document) cmisSession.getObject(pwcId.getId());
+
+        assertIsPwcProperty(pwc, false);
+
+        cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_10);
+        CmisObject pwc10 = cmisSession.getObject(pwc.getId());
+        assertIsPwcProperty(pwc10, true);
+    }
+
+    private void assertIsPwcProperty(CmisObject pwc, boolean nullExpected)
+    {
+        boolean isPwcFound = false;
+        Boolean isPwcValueTrue = null;
+        for (Property<?> property : pwc.getProperties())
+        {
+            if ((null != property) && PropertyIds.IS_PRIVATE_WORKING_COPY.equals(property.getId()))
+            {
+                isPwcFound = true;
+                isPwcValueTrue = property.getValue();
+                break;
+            }
+        }
+
+        if (nullExpected)
+        {
+            assertTrue(("'" + PropertyIds.IS_PRIVATE_WORKING_COPY + "' property is not null!"), !isPwcFound || (null == isPwcValueTrue));
+            return;
+        }
+
+        assertTrue(("'" + PropertyIds.IS_PRIVATE_WORKING_COPY + "' property has not been found!"), isPwcFound);
+        assertNotNull(("'" + PropertyIds.IS_PRIVATE_WORKING_COPY + "' property value must not be null!"), isPwcValueTrue);
+        assertTrue(("'" + PropertyIds.IS_PRIVATE_WORKING_COPY + "' property value must be equal to 'true'!"), isPwcValueTrue);
+    }
+    
+    @Test
+    public void testCanConnectCMISUsingDefaultTenant() throws Exception
+    {
+        testCanConnectCMISUsingDefaultTenantImpl(Binding.atom, CMIS_VERSION_11);
+        testCanConnectCMISUsingDefaultTenantImpl(Binding.atom, CMIS_VERSION_10);
+        testCanConnectCMISUsingDefaultTenantImpl(Binding.browser, CMIS_VERSION_11);
+    }
+    
+    private void testCanConnectCMISUsingDefaultTenantImpl(Binding binding, String cmisVersion)
+    {
+        String url = httpClient.getPublicApiCmisUrl(TenantUtil.DEFAULT_TENANT, binding, cmisVersion, null);
+        
+        Map<String, String> parameters = new HashMap<String, String>();
+        
+        // user credentials
+        parameters.put(SessionParameter.USER, "admin");
+        parameters.put(SessionParameter.PASSWORD, "admin");
+        
+        parameters.put(SessionParameter.ATOMPUB_URL, url);
+        parameters.put(SessionParameter.BROWSER_URL, url);
+        parameters.put(SessionParameter.BINDING_TYPE, binding.getOpenCmisBinding().value());
+        
+        SessionFactory factory = SessionFactoryImpl.newInstance();
+        // perform request : http://host:port/alfresco/api/-default-/public/cmis/versions/${cmisVersion}/${binding}
+        List<Repository> repositories = factory.getRepositories(parameters);
+        
+        assertTrue(repositories.size() > 0);
+        
+        parameters.put(SessionParameter.REPOSITORY_ID, TenantUtil.DEFAULT_TENANT);
+        Session session = factory.createSession(parameters);
+        // perform request : http://host:port/alfresco/api/-default-/public/cmis/versions/${cmisVersion}/${binding}/type?id=cmis:document
+        ObjectType objectType = session.getTypeDefinition("cmis:document");
+        
+        assertNotNull(objectType);
+    }
+
+    @Test
+    public void testACE3433() throws Exception
+    {
+        final TestNetwork network = getTestFixture().getRandomNetwork();
+
+        NodeRef rootNodeRef = TenantUtil.runAsSystemTenant(new TenantRunAsWork<NodeRef>()
+        {
+            @Override
+            public NodeRef doWork() throws Exception
+            {
+                NodeRef rootNodeRef = repoService.getNodeService().getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+                List<ChildAssociationRef> childAssocs = repoService.getNodeService().getChildAssocsByPropertyValue(rootNodeRef,
+                        ContentModel.PROP_TITLE, "Company Home");
+                assertEquals(1, childAssocs.size());
+                NodeRef companyHomeNodeRef = childAssocs.get(0).getChildRef();
+                return companyHomeNodeRef;
+            }
+
+        }, network.getId());
+        assertNotNull(rootNodeRef);
+
+        // atom
+        {
+            Binding binding = Binding.atom;
+            String url = httpClient.getPublicApiCmisUrl(TenantUtil.DEFAULT_TENANT, binding, "1.1", null);
+    
+            Map<String, String> parameters = new HashMap<String, String>();
+    
+            // user credentials
+            parameters.put(SessionParameter.USER, "admin@" + network.getId());
+            parameters.put(SessionParameter.PASSWORD, "admin");
+            parameters.put(SessionParameter.ATOMPUB_URL, url);
+            parameters.put(SessionParameter.BINDING_TYPE, binding.getOpenCmisBinding().value());
+    
+            SessionFactory factory = SessionFactoryImpl.newInstance();
+            Repository repository = factory.getRepositories(parameters).get(0);
+            String rootFolderId = repository.getRootFolderId();
+    
+            assertEquals(rootNodeRef.getId(), rootFolderId);
+        }
+
+        {
+            Binding binding = Binding.browser;
+            String url = httpClient.getPublicApiCmisUrl(TenantUtil.DEFAULT_TENANT, binding, "1.1", null);
+    
+            Map<String, String> parameters = new HashMap<String, String>();
+    
+            // user credentials
+            parameters.put(SessionParameter.USER, "admin@" + network.getId());
+            parameters.put(SessionParameter.PASSWORD, "admin");
+            parameters.put(SessionParameter.BROWSER_URL, url);
+            parameters.put(SessionParameter.BINDING_TYPE, binding.getOpenCmisBinding().value());
+    
+            SessionFactory factory = SessionFactoryImpl.newInstance();
+            Repository repository = factory.getRepositories(parameters).get(0);
+            String rootFolderId = repository.getRootFolderId();
+    
+            assertEquals(rootNodeRef.getId(), rootFolderId);
+        }
+    }
+
+    @Test
+    public void testMNT12956QueryingCMIS11UsesDictionary11() throws Exception
+    {
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+        
+        String username = "user" + System.currentTimeMillis();
+        PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person = network1.createUser(personInfo);
+        String personId = person.getId();
+
+        final List<NodeRef> documents = new ArrayList<NodeRef>();
+        final String filename = GUID.generate();
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                String siteName = "site" + System.currentTimeMillis();
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = repoService.createSite(null, siteInfo);
+                NodeRef docNodeRef = repoService.createDocument(site.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), filename, "test content");
+                documents.add(docNodeRef);
+
+                return null;
+            }
+        }, personId, network1.getId());
+
+        NodeRef docNodeRef = documents.get(0);
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), personId));
+        CmisSession atomCmisSession10 = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_10, AlfrescoObjectFactoryImpl.class.getName());
+        CmisSession atomCmisSession11 = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_11);
+
+        // query
+        {
+            // searching by NodeRef, expect result objectIds to be objectId
+            Set<String> expectedObjectIds = new HashSet<String>();
+            expectedObjectIds.add(docNodeRef.getId());
+            int numMatchingDocs = 0;
+
+            // NodeRef input
+            List<CMISNode> results = atomCmisSession11.query("SELECT cmis:objectId,cmis:name,cmis:secondaryObjectTypeIds FROM cmis:document WHERE cmis:name LIKE '" + filename + "'", false, 0, Integer.MAX_VALUE);
+            assertEquals(expectedObjectIds.size(), results.size());
+            for(CMISNode node : results)
+            {
+                String objectId = stripCMISSuffix((String)node.getProperties().get(PropertyIds.OBJECT_ID));
+                if(expectedObjectIds.contains(objectId))
+                {
+                    numMatchingDocs++;
+                }
+            }
+            assertEquals(expectedObjectIds.size(), numMatchingDocs);
+
+            try
+            {
+                results = atomCmisSession10.query("SELECT cmis:objectId,cmis:name,cmis:secondaryObjectTypeIds FROM cmis:document WHERE cmis:name LIKE '" + filename + "'", false, 0, Integer.MAX_VALUE);
+                fail("OpenCMIS 1.0 knows nothing about cmis:secondaryObjectTypeIds");
+            }
+            catch (CmisInvalidArgumentException expectedException)
+            {
+                // ok
+            }
+        }
+    }
+
+    // Parameter               Optional?  Default value       Description
+    // filter                  Yes        Repository specific A comma-separated list of query names that defines which
+    //                                                        properties must be returned by the repository.
+    // renditionFilter         Yes        cmis:none           A filter describing the set of renditions that must be
+    //                                                        returned in the response.
+    // includeRelationships    Yes        NONE                The relationships in which the node participates that must
+    //                                                        be returned in the response.
+    // includeAllowableActions Yes        false               A boolean value. A value of true specifies that the
+    //                                                        repository must return the allowable actions for the node.
+    // includePolicyIds        Yes        false               A boolean value. A value of true specifies the repository
+    //                                                        must return the policy ids for the node.
+    // includeAcl              Yes        false               A boolean value. A value of true specifies the repository
+    //                                                        must return the Access Control List (ACL) for the node.
+
+    @Test
+    public void testGetIdParamsMaximum() throws Exception
+    {
+        assertGetIdFilterParams(45, 2, 3,  18, 0, 11,
+//          "filter", "none",
+            "renditionFilter", "*",
+            "includeRelationships", "both",
+            "includeAllowableActions", "true",
+            "includePolicyIds", "true",
+            "includeACL", "true");
+    }
+
+    @Test
+    public void testGetIdParamsDefault() throws Exception
+    {
+        assertGetIdFilterParams(45, 0, 0,   0, 0, 0);
+    }
+
+    @Test
+    public void testGetIdParamsMinimum() throws Exception
+    {
+        assertGetIdFilterParams( 6, 0, 0,   0, 0, 0, "filter", "none");
+    }
+
+    @Test
+    public void testGetIdParamsProperties() throws Exception
+    {
+        // A comma-separated list of query names that defines which properties must be returned by the repository.
+        // If not supplied it is repo specific and in Alfresco's case we return them all.
+
+        // This test identifies a bug. 6 properties are always returned even if none are requested.
+        // Not planing on fixing this at the moment as the problem is in Chemistry method:
+        // XMLConverter#writeObject(XMLStreamWriter, CmisVersion, boolean, String, String, ObjectData).
+        // It might be possible for the Alfresco code to not return any properties or aspects, but this likely to
+        // break quite a lot of stuff.
+
+        assertGetIdFilterParams( 45, 0, 0,   0, 0, 0);
+        assertGetIdFilterParams(  6, 0, 0,   0, 0, 0, "filter", "none");
+        assertGetIdFilterParams(6+2, 0, 0,   0, 0, 0, "filter", "cmis:isMajorVersion,cmis:isPrivateWorkingCopy");
+        assertGetIdFilterParams(6+0, 0, 0,   0, 0, 0, "filter", "doesNotExist");
+    }
+
+    @Test
+    public void testGetIdParamsRenditions() throws Exception
+    {
+        // A filter on mimetypes (including wildcards) or declared kinds
+        // (rendition names such as doclib/pdf/preview - not set up in test env).
+
+        assertGetIdFilterParams(45, 0, 0,   0, 0, 0); // default is cmis:none
+        assertGetIdFilterParams(45, 0, 0,   0, 0, 0, "renditionFilter", "cmis:none");
+        assertGetIdFilterParams(45, 2, 0,   0, 0, 0, "renditionFilter", "*");
+        assertGetIdFilterParams(45, 1, 0,   0, 0, 0, "renditionFilter", "application/pdf");
+        assertGetIdFilterParams(45, 1, 0,   0, 0, 0, "renditionFilter", "image/p*");
+    }
+
+    @Test
+    public void testGetIdParamsRelationships() throws Exception
+    {
+        assertGetIdFilterParams(45, 0, 0,   0, 0, 0);
+        assertGetIdFilterParams(45, 0, 3,   0, 0, 0, "includeRelationships", "both");
+        assertGetIdFilterParams(45, 0, 1,   0, 0, 0, "includeRelationships", "source");
+        assertGetIdFilterParams(45, 0, 2,   0, 0, 0, "includeRelationships", "target");
+        assertGetIdFilterParams(45, 0, 0,   0, 0, 0, "includeRelationships", "none");
+    }
+
+    @Test
+    public void testGetIdParamsActions() throws Exception
+    {
+        assertGetIdFilterParams(45, 0, 0,   0, 0, 0);
+        assertGetIdFilterParams(45, 0, 0,   0, 0, 0, "includeAllowableActions", "false");
+        assertGetIdFilterParams(45, 0, 0,  18, 0, 0, "includeAllowableActions", "true");
+    }
+
+    @Test
+    public void testGetIdParamsPolicies() throws Exception
+    {
+        // TODO We don't have any policies in the test data, so this test simply checks elements are not created.
+        // As the other include* parameters are working, I decided not to invest further time on policies at the moment.
+
+        assertGetIdFilterParams(45, 0, 0,   0, 0, 0);
+        assertGetIdFilterParams(45, 0, 0,   0, 0, 0, "includePolicyIds", "false");
+        assertGetIdFilterParams(45, 0, 0,   0, 0, 0, "includePolicyIds", "true");
+    }
+
+    @Test
+    public void testGetIdParamsACLs() throws Exception
+    {
+        assertGetIdFilterParams(45, 0, 0,   0, 0, 0);
+        assertGetIdFilterParams(45, 0, 0,   0, 0, 0, "includeACL", "false");
+        assertGetIdFilterParams(45, 0, 0,   0, 0,11, "includeACL", "true");
+    }
+
+    // The following property names were repeated: alfcmis:nodeRef, cmis:description, cmis:changeToken
+    // Not planing on fixing this at the moment as it will be having little effect.
+    @Ignore
+    @Test()
+    public void testGetIdParamsPropertiesAreUnique() throws Exception
+    {
+        String cmisId = getTestFileIdWithTwoRenditionsOneSourceAndTwoTargetAssociations();
+
+        HashMap<String, String> reqParams = new HashMap<>();
+        reqParams.put("id", cmisId);
+
+        publicApiClient.setRequestContext(new RequestContext(testNetwork.getId(), testPersonId));
+        HttpResponse resp = publicApiClient.get(Binding.atom, CMIS_VERSION_11, "id", reqParams);
+        String xml = resp.getResponse();
+
+        System.out.println(xml);
+
+        String tmp1 = xml.split("cmis:properties")[1];
+        String tmp2 = tmp1.substring(0, tmp1.indexOf("<e1:aspects"));
+        String[] tmp3 =  tmp2.split("queryName=\"");
+        List<String> names = new ArrayList<>();
+        for (int j=1; j<tmp3.length; j+=2)
+        {
+            String tmp4 = tmp3[j];
+            String name = tmp4.substring(0, tmp4.indexOf('"'));
+            names.add(name);
+        }
+        final Set<String> duplicates = new HashSet();
+        final Set<String> uniqueNames = new HashSet();
+        for (String name : names)
+        {
+            if (!uniqueNames.add(name))
+            {
+                duplicates.add(name);
+            }
+        }
+        if (!duplicates.isEmpty())
+        {
+            StringJoiner sj = new StringJoiner((", "));
+            for (String duplicate : duplicates)
+            {
+                sj.add(duplicate);
+            }
+            fail("The following property names were repeated: "+sj);
+        }
+    }
+
+    /**
+     * <p>Related to REPO-4613.</p>
+     * <p>A checkout should not lock the private working copy.</p>
+     * <p>Adding aspects or properties to a pwc should remain possible after a checkout.</p>
+     * @throws Exception
+     */
+    @Test
+    public void aPrivateCopyShouldAllowTheAdditionOfAspects_CMIS_1_1_Version() throws Exception
+    {
+        final String aspectName = "P:cm:summarizable";
+        final String propertyName = "cm:summary";
+        final String propertyValue = "My summary";
+
+        final TestNetwork network1 = getTestFixture().getRandomNetwork();
+
+        String username = "user" + System.currentTimeMillis();
+        PersonInfo personInfo = new PersonInfo(username, username, username, TEST_PASSWORD, null, null, null, null, null, null, null);
+        TestPerson person1 = network1.createUser(personInfo);
+        String person1Id = person1.getId();
+
+        final String siteName = "site" + System.currentTimeMillis();
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+        {
+            @Override
+            public NodeRef doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                TestSite site = repoService.createSite(null, siteInfo);
+
+                String name = GUID.generate();
+                NodeRef folderNodeRef = repoService.createFolder(site.getContainerNodeRef(DOCUMENT_LIBRARY_CONTAINER_NAME), name);
+                return folderNodeRef;
+            }
+        }, person1Id, network1.getId());
+
+        // Create a document...
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+
+        CmisSession cmisSession = publicApiClient.createPublicApiCMISSession(Binding.atom, CMIS_VERSION_11);
+        Folder folder = (Folder) cmisSession.getObjectByPath(String.format(DOCUMENT_LIBRARY_PATH_PATTERN, siteName));
+        String fileName = String.format(TEST_DOCUMENT_NAME_PATTERN, GUID.generate());
+
+        // Create a document...
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+
+        HashMap<String, Object> props = new HashMap<>();
+        props.put(PropertyIds.OBJECT_TYPE_ID, TYPE_CMIS_DOCUMENT);
+        props.put(PropertyIds.NAME, fileName);
+
+        final ContentStream cs = new ContentStreamImpl(fileName, "text/plain",
+                "This is just a test");
+
+        final Document document = folder.createDocument(props, cs, VersioningState.MAJOR);
+
+        ObjectId pwcObjectId = document.checkOut();
+
+        CmisObject cmisObject = cmisSession.getObject(pwcObjectId.getId());
+        final Document pwc = (Document) cmisObject;
+
+        List<Object> aspects = pwc.getProperty(PropertyIds.SECONDARY_OBJECT_TYPE_IDS).getValues();
+
+        // asserts that we have the right aspect for the private working copy
+        assertTrue(aspects.contains("P:cm:workingcopy"));
+
+        aspects.add(aspectName);
+
+        props = new HashMap<>();
+        props.put(PropertyIds.SECONDARY_OBJECT_TYPE_IDS, aspects);
+        props.put(propertyName, propertyValue);
+
+
+        pwc.updateProperties(props);
+
+        final ObjectId id = pwc.checkIn(true, null, null, "CheckIn comment");
+        Document checkedInDocument = (Document) cmisSession.getObject(id.getId());
+
+        List<String> secondaryTypeIds = checkedInDocument.getPropertyValue(PropertyIds.SECONDARY_OBJECT_TYPE_IDS);
+
+        // asserts the new aspect has been added to the original copy, via the check in from the private copy
+        assertTrue(secondaryTypeIds.contains(aspectName));
+        assertEquals(checkedInDocument.getPropertyValue(propertyName),  propertyValue);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCMISAPI.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCMISAPI.java
new file mode 100644
index 00000000000..d3080173f67
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCMISAPI.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.junit.AfterClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * Public CMIS API tests.
+ * 
+ * @author steveglover
+ *
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        
+    TestCMIS.class,
+    TestRemovePermissions.class,
+        
+    TestEnterpriseAtomPubTCK.class,
+    TestPublicApiAtomPub10TCK.class,
+    TestPublicApiAtomPub11TCK.class,
+    TestPublicApiBrowser11TCK.class
+        
+})
+public class TestCMISAPI
+{
+    @AfterClass
+    public static void after() throws Exception
+    {
+//        EnterprisePublicApiTestFixture.cleanup();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomConstraint.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomConstraint.java
new file mode 100644
index 00000000000..559f9cee3e3
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomConstraint.java
@@ -0,0 +1,1041 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.dictionary.constraint.AbstractConstraint;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.rest.api.model.CustomAspect;
+import org.alfresco.rest.api.model.CustomModel;
+import org.alfresco.rest.api.model.CustomModelConstraint;
+import org.alfresco.rest.api.model.CustomModelNamedValue;
+import org.alfresco.rest.api.model.CustomModelProperty;
+import org.alfresco.rest.api.model.CustomType;
+import org.alfresco.rest.api.model.CustomModel.ModelStatus;
+import org.alfresco.rest.api.tests.RepoService.SiteInformation;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.dictionary.ConstraintException;
+import org.alfresco.service.cmr.dictionary.CustomModelService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.junit.Test;
+
+/**
+ * Tests the REST API of the constraints of the {@link CustomModelService}.
+ * 
+ * @author Jamal Kaabi-Mofrad
+ */
+public class TestCustomConstraint extends BaseCustomModelApiTest
+{
+
+    @Test
+    public void testCreateConstraints() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        final Paging paging = getPaging(0, Integer.MAX_VALUE);
+
+        String modelName = "testModelConstraint" + System.currentTimeMillis();
+        final Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+
+        // Create RegEx constraint
+        {
+            String regExConstraintName = "testFileNameRegEx" + System.currentTimeMillis();
+            CustomModelConstraint regExConstraint = new CustomModelConstraint();
+            regExConstraint.setName(regExConstraintName);
+            regExConstraint.setType("REGEX");
+            regExConstraint.setTitle("test RegEx title");
+            regExConstraint.setDescription("test RegEx desc");
+            // Create the RegEx constraint's parameters
+            List<CustomModelNamedValue> parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("expression", "(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$)"));
+            parameters.add(buildNamedValue("requiresMatch", "false"));
+            // Add the parameters into the constraint
+            regExConstraint.setParameters(parameters);
+            
+            setRequestContext(nonAdminUserName);
+            
+            // Try to create constraint as a non Admin user
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(regExConstraint), 403);
+
+            setRequestContext(customModelAdmin);
+
+            // Create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(regExConstraint), 201);
+
+            // Retrieve the created RegEx constraint
+            HttpResponse response = getSingle("cmm/" + modelName + "/constraints", regExConstraintName, 200);
+            CustomModelConstraint returnedConstraint = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModelConstraint.class);
+            compareCustomModelConstraints(regExConstraint, returnedConstraint, "prefixedName");
+
+            // Try to create a duplicate constraint
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(regExConstraint), 409);
+
+            // Retrieve all the model's constraints
+            response = getAll("cmm/" + modelName + "/constraints", paging, 200);
+            List<CustomModelConstraint> constraints = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), CustomModelConstraint.class);
+            assertEquals(1, constraints.size());
+        }
+
+        setRequestContext(customModelAdmin);
+
+        // Try to create invalid RegEx constraint
+        {
+            String regExConstraintName = "testFileNameInvalidRegEx" + System.currentTimeMillis();
+            CustomModelConstraint regExConstraint = new CustomModelConstraint();
+            regExConstraint.setName(regExConstraintName);
+            regExConstraint.setType("REGEX");
+            // Create the RegEx constraint's parameters
+            List<CustomModelNamedValue> parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("expression", "*******"));
+            parameters.add(buildNamedValue("requiresMatch", "false"));
+            // Add the parameters into the constraint
+            regExConstraint.setParameters(parameters);
+            
+            // Try to create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(regExConstraint), 400);
+        }
+
+        // Create MINMAX constraint
+        {
+            String minMaxConstraintName = "testMinMaxConstraint" + System.currentTimeMillis();
+            CustomModelConstraint minMaxConstraint = new CustomModelConstraint();
+            minMaxConstraint.setName(minMaxConstraintName);
+            minMaxConstraint.setTitle("test MinMax title");
+            minMaxConstraint.setDescription("test MinMax desc");
+            // Create the MinMax constraint's parameters
+            List<CustomModelNamedValue> parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("maxValue", "100.0"));
+            parameters.add(buildNamedValue("minValue", "0.0"));
+            // Add the parameters into the constraint
+            minMaxConstraint.setParameters(parameters);
+            
+            // Try to create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(minMaxConstraint), 400); // constraint's type is mandatory
+
+            minMaxConstraint.setType("MINMAX");
+            parameters.clear();
+            parameters.add(buildNamedValue("maxValue", "abc")); // invalid number
+            parameters.add(buildNamedValue("minValue", "0.0"));
+            // Add the parameters into the constraint
+            minMaxConstraint.setParameters(parameters);
+            // Try to create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(minMaxConstraint), 400);
+
+            parameters.clear();
+            parameters.add(buildNamedValue("maxValue", "100"));
+            parameters.add(buildNamedValue("minValue", "text")); // invalid number
+            // Add the parameters into the constraint
+            minMaxConstraint.setParameters(parameters);
+            // Try to create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(minMaxConstraint), 400);
+
+            parameters.clear();
+            parameters.add(buildNamedValue("maxValue", "100.0"));
+            parameters.add(buildNamedValue("minValue", "0.0"));
+            // Add the parameters into the constraint
+            minMaxConstraint.setParameters(parameters);
+            // Create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(minMaxConstraint), 201);
+
+            // Retrieve the created MINMAX constraint
+            HttpResponse response = getSingle("cmm/" + modelName + "/constraints", minMaxConstraintName, 200);
+            CustomModelConstraint returnedConstraint = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModelConstraint.class);
+            compareCustomModelConstraints(minMaxConstraint, returnedConstraint, "prefixedName");
+
+            // Retrieve all the model's constraints
+            response = getAll("cmm/" + modelName + "/constraints", paging, 200);
+            List<CustomModelConstraint> constraints = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), CustomModelConstraint.class);
+            assertEquals(2, constraints.size());
+        }
+
+        // Create LENGTH constraint
+        {
+            String lengthConstraintName = "testLengthConstraint" + System.currentTimeMillis();
+            CustomModelConstraint lengthConstraint = new CustomModelConstraint();
+            lengthConstraint.setName(lengthConstraintName);
+            lengthConstraint.setType("LENGTH");
+            lengthConstraint.setTitle("test Length title");
+            lengthConstraint.setDescription("test Length desc");
+            // Create the Length constraint's parameters
+            List<CustomModelNamedValue> parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("maxLength", "text")); // invalid number
+            parameters.add(buildNamedValue("minLength", "0"));
+            // Add the parameters into the constraint
+            lengthConstraint.setParameters(parameters);
+            
+            // Try to create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(lengthConstraint), 400);
+
+            parameters.clear();
+            parameters.add(buildNamedValue("maxLength", "256"));
+            parameters.add(buildNamedValue("minLength", "1.0")); // double number
+            // Add the parameters into the constraint
+            lengthConstraint.setParameters(parameters);
+            // Try to create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(lengthConstraint), 400);
+
+            parameters.clear();
+            parameters.add(buildNamedValue("maxLength", "256"));
+            parameters.add(buildNamedValue("minLength", "0"));
+            // Add the parameters into the constraint
+            lengthConstraint.setParameters(parameters);
+            // Create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(lengthConstraint), 201);
+
+            // Retrieve the created LENGTH constraint
+            HttpResponse response = getSingle("cmm/" + modelName + "/constraints", lengthConstraintName, 200);
+            CustomModelConstraint returnedConstraint = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModelConstraint.class);
+            compareCustomModelConstraints(lengthConstraint, returnedConstraint, "prefixedName");
+
+            // Retrieve all the model's constraints
+            response = getAll("cmm/" + modelName + "/constraints", paging, 200);
+            List<CustomModelConstraint> constraints = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), CustomModelConstraint.class);
+            assertEquals(3, constraints.size());
+        }
+
+        // Create LIST constraint
+        {
+            String listConstraintName = "testListConstraint" + System.currentTimeMillis();
+            CustomModelConstraint listConstraint = new CustomModelConstraint();
+            listConstraint.setName(listConstraintName);
+            listConstraint.setType("LIST");
+            listConstraint.setTitle("test List title");
+            listConstraint.setDescription("test List desc");
+            // Create the List constraint's parameters
+            List<CustomModelNamedValue> parameters = new ArrayList<>(3);
+            parameters.add(buildNamedValue("allowedValues", null, "High", "Normal", "Low"));// list value
+            parameters.add(buildNamedValue("sorted", "false"));
+            // Add the parameters into the constraint
+            listConstraint.setParameters(parameters);
+            
+            // Create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(listConstraint), 201);
+
+            // Retrieve the created List constraint
+            HttpResponse response = getSingle("cmm/" + modelName + "/constraints", listConstraintName, 200);
+            CustomModelConstraint returnedConstraint = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModelConstraint.class);
+            compareCustomModelConstraints(listConstraint, returnedConstraint, "prefixedName", "parameters");
+            String sorted = getParameterSimpleValue(returnedConstraint.getParameters(), "sorted");
+            assertEquals("false", sorted);
+            List<String> listValues = getParameterListValue(returnedConstraint.getParameters(), "allowedValues");
+            assertNotNull(listValues);
+            assertEquals(3, listValues.size());
+            assertEquals("High", listValues.get(0));
+            assertEquals("Normal", listValues.get(1));
+            assertEquals("Low", listValues.get(2));
+
+            // Retrieve all the model's constraints
+            response = getAll("cmm/" + modelName + "/constraints", paging, 200);
+            List<CustomModelConstraint> constraints = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), CustomModelConstraint.class);
+            assertEquals(4, constraints.size());
+        }
+
+        // Create authorityName constraint
+        {
+            String authorityNameConstraintName = "authorityNameConstraint" + System.currentTimeMillis();
+            CustomModelConstraint authorityNameConstraint = new CustomModelConstraint();
+            authorityNameConstraint.setName(authorityNameConstraintName);
+            authorityNameConstraint.setType("org.alfresco.repo.dictionary.constraint.AuthorityNameConstraint");
+            
+            // Create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(authorityNameConstraint), 201);
+
+            // Retrieve the created authorityName constraint
+            HttpResponse response = getSingle("cmm/" + modelName + "/constraints", authorityNameConstraintName, 200);
+            CustomModelConstraint returnedConstraint = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModelConstraint.class);
+            compareCustomModelConstraints(authorityNameConstraint, returnedConstraint, "prefixedName");
+
+            // Retrieve all the model's constraints
+            response = getAll("cmm/" + modelName + "/constraints", paging, 200);
+            List<CustomModelConstraint> constraints = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), CustomModelConstraint.class);
+            assertEquals(5, constraints.size());
+        }
+
+        // Create Invalid constraint
+        {
+            String invalidConstraintName = "testInvalidConstraint" + System.currentTimeMillis();
+            CustomModelConstraint invalidConstraint = new CustomModelConstraint();
+            invalidConstraint.setName(invalidConstraintName);
+            invalidConstraint.setType("InvalidConstraintType"+ System.currentTimeMillis());
+            invalidConstraint.setTitle("test Invalid title");
+            invalidConstraint.setDescription("test Invalid desc");
+            // Create the MinMax constraint's parameters
+            List<CustomModelNamedValue> parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("maxValue", "100.0"));
+            parameters.add(buildNamedValue("minValue", "0.0"));
+            // Add the parameters into the constraint
+            invalidConstraint.setParameters(parameters);
+            
+            // Try to create an invalid constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(invalidConstraint), 400);
+
+            // Retrieve all the model's constraints
+            HttpResponse response = getAll("cmm/" + modelName + "/constraints", paging, 200);
+            List<CustomModelConstraint> constraints = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), CustomModelConstraint.class);
+            assertEquals(5, constraints.size());
+        }
+        
+        // Activate the model
+        CustomModel updatePayload = new CustomModel();
+        updatePayload.setStatus(ModelStatus.ACTIVE);
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), SELECT_STATUS_QS, 200);
+
+        // Retrieve all the model's constraints
+        HttpResponse response = getAll("cmm/" + modelName + "/constraints", paging, 200);
+        List<CustomModelConstraint> constraints = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), CustomModelConstraint.class);
+        assertEquals(5, constraints.size());
+
+        // Deactivate the model
+        updatePayload = new CustomModel();
+        updatePayload.setStatus(ModelStatus.DRAFT);
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), SELECT_STATUS_QS, 200);
+
+        // Retrieve all the model's constraints
+        response = getAll("cmm/" + modelName + "/constraints", paging, 200);
+        constraints = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), CustomModelConstraint.class);
+        assertEquals(5, constraints.size());
+    }
+
+    @Test
+    public void testCreateConstraintAndAddToProperty() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModelConstraint" + System.currentTimeMillis();
+        final Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+
+        // Create RegEx constraint
+        String regExConstraintName = "testFileNameRegEx" + System.currentTimeMillis();
+        CustomModelConstraint regExConstraint = new CustomModelConstraint();
+        regExConstraint.setName(regExConstraintName);
+        regExConstraint.setType("REGEX");
+        regExConstraint.setTitle("test RegEx title");
+        regExConstraint.setDescription("test RegEx desc");
+        // Create the RegEx constraint's parameters
+        List<CustomModelNamedValue> parameters= new ArrayList<>(2);
+        parameters.add(buildNamedValue("expression", "(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$)"));
+        parameters.add(buildNamedValue("requiresMatch", "false"));
+        // Add the parameters into the constraint
+        regExConstraint.setParameters(parameters);
+        
+        // Create constraint as a Model Administrator
+        post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(regExConstraint), 201);
+
+        // Retrieve the created constraint
+        HttpResponse response = getSingle("cmm/" + modelName + "/constraints", regExConstraintName, 200);
+        CustomModelConstraint returnedConstraint = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModelConstraint.class);
+
+        // Retrieve all the model's constraints
+        Paging paging = getPaging(0, Integer.MAX_VALUE);
+        response = getAll("cmm/" + modelName + "/constraints", paging, 200);
+        List<CustomModelConstraint> constraints = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), CustomModelConstraint.class);
+        assertEquals(1, constraints.size());
+
+        // Create aspect
+        String aspectName = "testAspect1" + System.currentTimeMillis();
+        createTypeAspect(CustomAspect.class, modelName, aspectName, "title", "desc", null);
+
+        // Update the Aspect by adding property
+        CustomAspect payload = new CustomAspect();
+        payload.setName(aspectName);
+        final String aspectPropName = "testAspect1Prop1" + System.currentTimeMillis();
+        CustomModelProperty aspectProp = new CustomModelProperty();
+        aspectProp.setName(aspectPropName);
+        aspectProp.setTitle("property title");
+        aspectProp.setDataType("d:text");
+        aspectProp.setConstraintRefs(Arrays.asList(returnedConstraint.getPrefixedName()));// Add the constraint ref
+        List<CustomModelProperty> props = new ArrayList<>(1);
+        props.add(aspectProp);
+        payload.setProperties(props);
+
+        // Create the property
+        put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(payload), SELECT_PROPS_QS, 200);
+
+        // Activate the model 
+        CustomModel updatePayload = new CustomModel();
+        updatePayload.setStatus(ModelStatus.ACTIVE);
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), SELECT_STATUS_QS, 200);
+
+        // Retrieve all the model's constraints
+        // Test to see if the API took care of duplicate constraints when referencing a constraint within a property.
+        response = getAll("cmm/" + modelName + "/constraints", paging, 200);
+        constraints = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), CustomModelConstraint.class);
+        assertEquals(1, constraints.size());
+
+        // Test RegEx constrain enforcement
+        {
+            final NodeService nodeService = repoService.getNodeService();
+            final QName aspectQName = QName.createQName("{" + namespacePair.getFirst() + "}" + aspectName);
+
+            TestNetwork testNetwork = getTestFixture().getRandomNetwork();
+            TestPerson person = testNetwork.createUser();
+            final String siteName = "site" + System.currentTimeMillis();
+
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                    TestSite site = repoService.createSite(null, siteInfo);
+
+                    NodeRef nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc", "Test Content");
+
+                    nodeService.addAspect(nodeRef, aspectQName, null);
+                    assertTrue(nodeService.hasAspect(nodeRef, aspectQName));
+
+                    try
+                    {
+                        QName propQName = QName.createQName("{" + namespacePair.getFirst() + "}" + aspectPropName);
+                        nodeService.setProperty(nodeRef, propQName, "Invalid$Char.");
+                        fail("Invalid property value. Should have caused integrity violations.");
+                    }
+                    catch (Exception e)
+                    {
+                        // Expected
+                    }
+
+                    // Permanently remove model from repository
+                    nodeService.addAspect(nodeRef, ContentModel.ASPECT_TEMPORARY, null);
+                    nodeService.deleteNode(nodeRef);
+
+                    return null;
+                }
+            }, person.getId(), testNetwork.getId());
+        }
+
+        setRequestContext(customModelAdmin);
+
+        // Deactivate the model 
+        updatePayload = new CustomModel();
+        updatePayload.setStatus(ModelStatus.DRAFT);
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), SELECT_STATUS_QS, 200);
+
+        // Test update the namespace prefix (test to see if the API updates the constraints refs with this new prefix)
+        CustomModel updateModelPayload = new CustomModel();
+        String modifiedPrefix = namespacePair.getSecond() + "Modified";
+        updateModelPayload.setNamespacePrefix(modifiedPrefix);
+        updateModelPayload.setNamespaceUri(namespacePair.getFirst());
+        response = put("cmm", modelName, RestApiUtil.toJsonAsString(updateModelPayload), null, 200);
+        CustomModel returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        assertEquals(modifiedPrefix, returnedModel.getNamespacePrefix());
+        assertEquals("The namespace URI shouldn't have changed.", namespacePair.getFirst(), returnedModel.getNamespaceUri());
+
+        // Test update the namespace URI
+        updateModelPayload = new CustomModel();
+        updateModelPayload.setNamespacePrefix(modifiedPrefix);
+        String modifiedURI = namespacePair.getFirst() + "Modified";
+        updateModelPayload.setNamespaceUri(modifiedURI);
+        response = put("cmm", modelName, RestApiUtil.toJsonAsString(updateModelPayload), null, 200);
+        returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        assertEquals(modifiedURI, returnedModel.getNamespaceUri());
+        assertEquals("The namespace prefix shouldn't have changed.", modifiedPrefix, returnedModel.getNamespacePrefix());
+    }
+
+    @Test
+    public void testCreateInlineConstraint() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModelInlineConstraint" + System.currentTimeMillis();
+        final Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+        
+        String regExConstraintName = "testInlineFileNameRegEx" + System.currentTimeMillis();
+        {
+            // Create RegEx constraint
+            CustomModelConstraint inlineRegExConstraint = new CustomModelConstraint();
+            inlineRegExConstraint.setName(regExConstraintName);
+            inlineRegExConstraint.setType("REGEX");
+            // Create the inline RegEx constraint's parameters
+            List<CustomModelNamedValue> parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("expression", "(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$)"));
+            parameters.add(buildNamedValue("requiresMatch", "false"));
+            // Add the parameters into the constraint
+            inlineRegExConstraint.setParameters(parameters);
+
+            // Create aspect
+            String aspectName = "testAspect1" + System.currentTimeMillis();
+            createTypeAspect(CustomAspect.class, modelName, aspectName, "title", "desc", null);
+
+            // Update the Aspect by adding property
+            CustomAspect aspectPayload = new CustomAspect();
+            aspectPayload.setName(aspectName);
+            final String aspectPropName = "testAspect1Prop1" + System.currentTimeMillis();
+            CustomModelProperty aspectProp = new CustomModelProperty();
+            aspectProp.setName(aspectPropName);
+            aspectProp.setTitle("property title");
+            aspectProp.setDataType("d:text");
+            aspectProp.setConstraints(Arrays.asList(inlineRegExConstraint));// Add inline constraint
+            List<CustomModelProperty> props = new ArrayList<>(1);
+            props.add(aspectProp);
+            aspectPayload.setProperties(props);
+
+            // Create the property
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 200);
+
+            // Retrieve all the model's constraints
+            Paging paging = getPaging(0, Integer.MAX_VALUE);
+            HttpResponse response = getAll("cmm/" + modelName + "/constraints", paging, 200);
+            List<CustomModelConstraint> constraints = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), CustomModelConstraint.class);
+            assertEquals("Inline constraints should not be included with the model defined constraints.", 0, constraints.size());
+
+            // Retrieve the updated aspect
+            response = getSingle("cmm/" + modelName + "/aspects", aspectName, 200);
+            CustomAspect returnedAspect = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomAspect.class);
+
+            // Check the aspect's added property
+            assertEquals(1, returnedAspect.getProperties().size());
+            CustomModelProperty customModelProperty = returnedAspect.getProperties().get(0);
+            assertEquals(aspectPropName, customModelProperty.getName());
+
+            assertEquals(0, customModelProperty.getConstraintRefs().size());
+            List<CustomModelConstraint> inlineConstraints = customModelProperty.getConstraints();
+            assertEquals(1, inlineConstraints.size());
+            compareCustomModelConstraints(inlineRegExConstraint, inlineConstraints.get(0), "prefixedName");
+        }
+
+        // Create inline and referenced constraint
+        {
+            // Create RegEx constraint
+            CustomModelConstraint regExConstraint = new CustomModelConstraint();
+            regExConstraint.setName(regExConstraintName); // duplicate name
+            regExConstraint.setType("REGEX");
+            regExConstraint.setTitle("test RegEx title");
+            // Create the RegEx constraint's parameters
+            List<CustomModelNamedValue> parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("expression", "(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$)"));
+            parameters.add(buildNamedValue("requiresMatch", "false"));
+            // Add the parameters into the constraint
+            regExConstraint.setParameters(parameters);
+
+            // Try to create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(regExConstraint), 409); // duplicate name
+
+            String newRegExConstraintName = "testFileNameRegEx" + System.currentTimeMillis();
+            regExConstraint.setName(newRegExConstraintName);
+            // Create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(regExConstraint), 201);
+            // Retrieve the created RegEx constraint
+            HttpResponse response = getSingle("cmm/" + modelName + "/constraints", newRegExConstraintName, 200);
+            CustomModelConstraint returnedRegExConstraint = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModelConstraint.class);
+
+            // Create inline anonymous LENGTH constraint
+            CustomModelConstraint inlineAnonymousLengthConstraint = new CustomModelConstraint();
+            inlineAnonymousLengthConstraint.setType("LENGTH");
+            inlineAnonymousLengthConstraint.setTitle("test Length title");
+            // Create the Length constraint's parameters
+            parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("maxLength", "256"));
+            parameters.add(buildNamedValue("minLength", "0"));
+            // Add the parameters into the constraint
+            inlineAnonymousLengthConstraint.setParameters(parameters);
+
+            // Create type
+            String typeName = "testType1" + System.currentTimeMillis();
+            CustomType type = createTypeAspect(CustomType.class, modelName, typeName, "test type1 title", "test type1 Desc", "cm:content");
+
+            // Update the Type by adding property
+            CustomType typePayload = new CustomType();
+            typePayload.setName(typeName);
+            String typePropName = "testType1Prop1" + System.currentTimeMillis();
+            CustomModelProperty typeProp = new CustomModelProperty();
+            typeProp.setName(typePropName);
+            typeProp.setTitle("property title");
+            typeProp.setDataType("d:int");
+            typeProp.setConstraintRefs(Arrays.asList(returnedRegExConstraint.getPrefixedName())); // Constraint Ref
+            typeProp.setConstraints(Arrays.asList(inlineAnonymousLengthConstraint)); // inline constraint
+            List<CustomModelProperty> props = new ArrayList<>(1);
+            props.add(typeProp);
+            typePayload.setProperties(props);
+
+            // Try to create the property - LENGTH constraint can only be used with textual data type
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), SELECT_PROPS_QS, 400);
+
+            typeProp.setDataType("d:double");
+            // CTry to create the property - LENGTH constraint can only be used with textual data type
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), SELECT_PROPS_QS, 400);
+
+            typeProp.setDataType("d:text");
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), SELECT_PROPS_QS, 200);
+
+            // Retrieve the updated type
+            response = getSingle("cmm/" + modelName + "/types", type.getName(), 200);
+            CustomType returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+
+            // Check the type's added property
+            assertEquals(1, returnedType.getProperties().size());
+            CustomModelProperty customModelProperty = returnedType.getProperties().get(0);
+            assertEquals(typePropName, customModelProperty.getName());
+
+            assertEquals(1, customModelProperty.getConstraintRefs().size());
+            assertEquals(returnedRegExConstraint.getPrefixedName(), customModelProperty.getConstraintRefs().get(0));
+
+            assertEquals(1, customModelProperty.getConstraints().size());
+            assertNotNull(customModelProperty.getConstraints().get(0).getName()); // M2PropertyDefinition will add a name
+            compareCustomModelConstraints(inlineAnonymousLengthConstraint, customModelProperty.getConstraints().get(0), "prefixedName", "name");
+        }
+    }
+
+    @Test
+    public void testCreateListConstraintInvalid() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModelConstraintInvalid" + System.currentTimeMillis();
+        final Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+        
+        // Create aspect
+        String aspectName = "testAspect" + System.currentTimeMillis();
+        createTypeAspect(CustomAspect.class, modelName, aspectName, "title", "desc", null);
+
+        // Update the Aspect by adding property
+        CustomAspect aspectPayload = new CustomAspect();
+        aspectPayload.setName(aspectName);
+        final String aspectPropName = "testAspect1Prop" + System.currentTimeMillis();
+        CustomModelProperty aspectProp = new CustomModelProperty();
+        aspectProp.setName(aspectPropName);
+        aspectProp.setTitle("property title");
+        aspectProp.setDataType("d:int");
+
+        //Create LIST constraint
+        String inlineListConstraintName = "testListConstraint" + System.currentTimeMillis();
+        CustomModelConstraint inlineListConstraint = new CustomModelConstraint();
+        inlineListConstraint.setName(inlineListConstraintName);
+        inlineListConstraint.setType("LIST");
+        inlineListConstraint.setTitle("test List title");
+        inlineListConstraint.setDescription("test List desc");
+        // Create the List constraint's parameters
+        List<CustomModelNamedValue> parameters = new ArrayList<>(3);
+        parameters.add(buildNamedValue("allowedValues", null, "a", "b", "c"));// text list value, but the the property data type is d:int
+        parameters.add(buildNamedValue("sorted", "false"));
+        // Add the parameters into the constraint
+        inlineListConstraint.setParameters(parameters);
+        aspectProp.setConstraints(Arrays.asList(inlineListConstraint));// Add inline constraint
+        List<CustomModelProperty> props = new ArrayList<>(1);
+        props.add(aspectProp);
+        aspectPayload.setProperties(props);
+
+        // Try to create the property - Invalid LIST values
+        put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 400);
+
+        // Test d:double LIST values with d:int property data type
+        parameters = new ArrayList<>(3);
+        parameters.add(buildNamedValue("allowedValues", null, "1.0", "2.0", "3.0"));// double list value, but the the property data type is d:int
+        parameters.add(buildNamedValue("sorted", "false"));
+        // Add the parameters into the constraint
+        inlineListConstraint.setParameters(parameters);
+        aspectProp.setConstraints(Arrays.asList(inlineListConstraint));// Add inline constraint
+        props = new ArrayList<>(1);
+        props.add(aspectProp);
+        aspectPayload.setProperties(props);
+
+        // Try to create the property - Invalid LIST values
+        put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 400);
+    }
+
+    @Test
+    public void testCreateMinMaxConstraintInvalid() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModelMinMaxInvalid" + System.currentTimeMillis();
+        final Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+
+        // Create aspect
+        String aspectName = "testAspect" + System.currentTimeMillis();
+        createTypeAspect(CustomAspect.class, modelName, aspectName, "title", "desc", null);
+
+        // Update the Aspect by adding property
+        CustomAspect aspectPayload = new CustomAspect();
+        aspectPayload.setName(aspectName);
+        final String aspectPropName = "testAspect1Prop" + System.currentTimeMillis();
+        CustomModelProperty aspectProp = new CustomModelProperty();
+        aspectProp.setName(aspectPropName);
+        aspectProp.setTitle("property title");
+        aspectProp.setDataType("d:text");
+
+        String minMaxConstraintName = "testMinMaxConstraint" + System.currentTimeMillis();
+        CustomModelConstraint minMaxConstraint = new CustomModelConstraint();
+        minMaxConstraint.setType("MINMAX");
+        minMaxConstraint.setName(minMaxConstraintName);
+        minMaxConstraint.setTitle("test MinMax title");
+        minMaxConstraint.setDescription("test MinMax desc");
+        // Create the MinMax constraint's parameters
+        List<CustomModelNamedValue> parameters = new ArrayList<>(2);
+        parameters.add(buildNamedValue("maxValue", "100.0"));
+        parameters.add(buildNamedValue("minValue", "0.0"));
+        // Add the parameters into the constraint
+        minMaxConstraint.setParameters(parameters);
+
+        aspectProp.setConstraints(Arrays.asList(minMaxConstraint));// Add inline constraint
+        List<CustomModelProperty> props = new ArrayList<>(1);
+        props.add(aspectProp);
+        aspectPayload.setProperties(props);
+
+        // Try to create constraint as a Model Administrator
+        // MINMAX constraint can only be used with numeric data type.
+        put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 400);
+
+        // Change type
+        aspectProp.setDataType("d:datetime");
+        // MINMAX constraint can only be used with numeric data type.
+        put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 400);
+
+        // SHA-1126
+        { 
+            //Change type
+            aspectProp.setDataType("d:double");
+            parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("maxValue", "0.0"));
+            parameters.add(buildNamedValue("minValue", "-5.0"));
+            // Add the parameters into the constraint
+            minMaxConstraint.setParameters(parameters);
+
+            aspectProp.setConstraints(Arrays.asList(minMaxConstraint));// Add inline constraint
+            props = new ArrayList<>(1);
+            props.add(aspectProp);
+            aspectPayload.setProperties(props);
+            // Maximum value of the MINMAX constraint must be a positive nonzero value.
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 400);
+        }
+    }
+
+    @Test
+    public void testPropDefaultValueWithInlineConstraint() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModelInlineConstraint" + System.currentTimeMillis();
+        final Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+
+        {
+            // Create RegEx constraint
+            String regExConstraintName = "testInlineFileNameRegEx" + System.currentTimeMillis();
+            CustomModelConstraint inlineRegExConstraint = new CustomModelConstraint();
+            inlineRegExConstraint.setName(regExConstraintName);
+            inlineRegExConstraint.setType("REGEX");
+            // Create the inline RegEx constraint's parameters
+            List<CustomModelNamedValue> parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("expression", "(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$)"));
+            parameters.add(buildNamedValue("requiresMatch", "false"));
+            // Add the parameters into the constraint
+            inlineRegExConstraint.setParameters(parameters);
+
+            // Create aspect
+            String aspectName = "testAspect1" + System.currentTimeMillis();
+            createTypeAspect(CustomAspect.class, modelName, aspectName, "title", "desc", null);
+
+            // Update the Aspect by adding property
+            CustomAspect aspectPayload = new CustomAspect();
+            aspectPayload.setName(aspectName);
+            final String aspectPropName = "testAspect1Prop1" + System.currentTimeMillis();
+            CustomModelProperty aspectProp = new CustomModelProperty();
+            aspectProp.setName(aspectPropName);
+            aspectProp.setTitle("property with REGEX constraint");
+            aspectProp.setDataType("d:text");
+            aspectProp.setDefaultValue("invalid<defaultValue"); // invalid value
+            aspectProp.setConstraints(Arrays.asList(inlineRegExConstraint));// Add inline constraint
+            List<CustomModelProperty> props = new ArrayList<>(1);
+            props.add(aspectProp);
+            aspectPayload.setProperties(props);
+
+            // Try to create the property - constraint violation
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 409);
+        }
+
+        {
+            // Create inline anonymous LENGTH constraint
+            CustomModelConstraint inlineAnonymousLengthConstraint = new CustomModelConstraint();
+            inlineAnonymousLengthConstraint.setType("LENGTH");
+            // Create the Length constraint's parameters
+            List<CustomModelNamedValue>parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("maxLength", "4"));
+            parameters.add(buildNamedValue("minLength", "0"));
+            // Add the parameters into the constraint
+            inlineAnonymousLengthConstraint.setParameters(parameters);
+
+            // Create type
+            String typeName = "testType1" + System.currentTimeMillis();
+            createTypeAspect(CustomType.class, modelName, typeName, "test type1 title", "test type1 Desc", "cm:content");
+
+            // Update the Type by adding property
+            CustomType typePayload = new CustomType();
+            typePayload.setName(typeName);
+            String typePropName = "testType1Prop1" + System.currentTimeMillis();
+            CustomModelProperty typeProp = new CustomModelProperty();
+            typeProp.setName(typePropName);
+            typeProp.setTitle("property with LENGTH constraint");
+            typeProp.setDataType("d:text");
+            typeProp.setDefaultValue("abcdef"); // Invalid length
+            typeProp.setConstraints(Arrays.asList(inlineAnonymousLengthConstraint)); // inline constraint
+            List<CustomModelProperty> props = new ArrayList<>(1);
+            props.add(typeProp);
+            typePayload.setProperties(props);
+
+            // Try to create the property - constraint violation
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), SELECT_PROPS_QS, 409);
+        }
+
+        {
+            // Create inline anonymous MINMAX constraint
+            CustomModelConstraint inlineAnonymousMinMaxConstraint = new CustomModelConstraint();
+            inlineAnonymousMinMaxConstraint.setType("MINMAX");
+            // Create the MinMax constraint's parameters
+            List<CustomModelNamedValue>parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("maxValue", "10"));
+            parameters.add(buildNamedValue("minValue", "0"));
+            // Add the parameters into the constraint
+            inlineAnonymousMinMaxConstraint.setParameters(parameters);
+
+            // Create type
+            String typeName = "testType1" + System.currentTimeMillis();
+            createTypeAspect(CustomType.class, modelName, typeName, "test type1 title", "test type1 Desc", "cm:content");
+
+            // Update the Type by adding property
+            CustomType typePayload = new CustomType();
+            typePayload.setName(typeName);
+            String typePropName = "testType1Prop1" + System.currentTimeMillis();
+            CustomModelProperty typeProp = new CustomModelProperty();
+            typeProp.setName(typePropName);
+            typeProp.setTitle("property with MINMAX constraint");
+            typeProp.setDataType("d:int");
+            typeProp.setDefaultValue("20"); // Not in the defined range [0,10]
+            typeProp.setConstraints(Arrays.asList(inlineAnonymousMinMaxConstraint)); // inline constraint
+            List<CustomModelProperty> props = new ArrayList<>(1);
+            props.add(typeProp);
+            typePayload.setProperties(props);
+
+            // Try to create the property - constraint violation
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), SELECT_PROPS_QS, 409);
+        }
+
+        {
+            // Create LIST constraint
+            String listConstraintName = "testListConstraint" + System.currentTimeMillis();
+            CustomModelConstraint inlineListConstraint = new CustomModelConstraint();
+            inlineListConstraint.setName(listConstraintName);
+            inlineListConstraint.setType("LIST");
+            // Create the List constraint's parameters
+            List<CustomModelNamedValue> parameters = new ArrayList<>(3);
+            parameters.add(buildNamedValue("allowedValues", null, "one", "two", "three"));
+            parameters.add(buildNamedValue("sorted", "false"));
+            // Add the parameters into the constraint
+            inlineListConstraint.setParameters(parameters);
+
+            // Create aspect
+            String aspectName = "testAspect" + System.currentTimeMillis();
+            createTypeAspect(CustomAspect.class, modelName, aspectName, "title", "desc", null);
+
+            // Update the Aspect by adding property
+            CustomAspect aspectPayload = new CustomAspect();
+            aspectPayload.setName(aspectName);
+            final String aspectPropName = "testAspect1Prop" + System.currentTimeMillis();
+            CustomModelProperty aspectProp = new CustomModelProperty();
+            aspectProp.setName(aspectPropName);
+            aspectProp.setTitle("property with LIST constraint");
+            aspectProp.setDataType("d:text");
+            aspectProp.setDefaultValue("four"); // Not in the list
+            aspectProp.setConstraints(Arrays.asList(inlineListConstraint));// Add inline constraint
+            List<CustomModelProperty> props = new ArrayList<>(1);
+            props.add(aspectProp);
+            aspectPayload.setProperties(props);
+
+            // Try to create the property - constraint violation
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 409);
+        }
+
+        {
+            // Create Java Class constraint
+            String inlineJavaClassConstraintName = "testJavaClassConstraint" + System.currentTimeMillis();
+            CustomModelConstraint inlineListConstraint = new CustomModelConstraint();
+            inlineListConstraint.setName(inlineJavaClassConstraintName);
+            inlineListConstraint.setType("org.alfresco.rest.api.tests.TestCustomConstraint$DummyJavaClassConstraint");
+
+            // Create aspect
+            String aspectName = "testAspect" + System.currentTimeMillis();
+            createTypeAspect(CustomAspect.class, modelName, aspectName, "title", "desc", null);
+
+            // Update the Aspect by adding property
+            CustomAspect aspectPayload = new CustomAspect();
+            aspectPayload.setName(aspectName);
+            final String aspectPropName = "testAspect1Prop" + System.currentTimeMillis();
+            CustomModelProperty aspectProp = new CustomModelProperty();
+            aspectProp.setName(aspectPropName);
+            aspectProp.setTitle("property with Java Class constraint");
+            aspectProp.setDataType("d:text");
+            aspectProp.setDefaultValue("invalid#value"); // Invalid default value
+            aspectProp.setConstraints(Arrays.asList(inlineListConstraint));// Add inline constraint
+            List<CustomModelProperty> props = new ArrayList<>(1);
+            props.add(aspectProp);
+            aspectPayload.setProperties(props);
+
+            // Try to create the property - constraint violation
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 409);
+        }
+    }
+
+    @Test
+    public void testPropDefaultValueWithConstraintRef() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModelConstraintRef" + System.currentTimeMillis();
+        final Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+
+        {
+            // Create List constraint
+            String listConstraintName = "testListConstraint" + System.currentTimeMillis();
+            CustomModelConstraint listConstraint = new CustomModelConstraint();
+            listConstraint.setName(listConstraintName);
+            listConstraint.setType("LIST");
+            // Create the List constraint's parameters
+            List<CustomModelNamedValue> parameters = new ArrayList<>(3);
+            parameters.add(buildNamedValue("allowedValues", null, "London", "Paris", "New York"));// list value
+            parameters.add(buildNamedValue("sorted", "false"));
+            // Add the parameters into the constraint
+            listConstraint.setParameters(parameters);
+
+            // Create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(listConstraint), 201);
+            // Retrieve the created List constraint
+            HttpResponse response = getSingle("cmm/" + modelName + "/constraints", listConstraintName, 200);
+            CustomModelConstraint returnedConstraint = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModelConstraint.class);
+
+            // Create aspect
+            String aspectName = "testAspect" + System.currentTimeMillis();
+            createTypeAspect(CustomAspect.class, modelName, aspectName, "title", "desc", null);
+
+            // Update the Aspect by adding property
+            CustomAspect aspectPayload = new CustomAspect();
+            aspectPayload.setName(aspectName);
+            final String aspectPropName = "testAspect1Prop" + System.currentTimeMillis();
+            CustomModelProperty aspectProp = new CustomModelProperty();
+            aspectProp.setName(aspectPropName);
+            aspectProp.setTitle("property with LIST constraint ref");
+            aspectProp.setDataType("d:text");
+            aspectProp.setDefaultValue("Berlin"); // Not in the list
+            aspectProp.setConstraintRefs(Arrays.asList(returnedConstraint.getPrefixedName())); // constrain ref
+            List<CustomModelProperty> props = new ArrayList<>(1);
+            props.add(aspectProp);
+            aspectPayload.setProperties(props);
+
+            // Try to create the property - constraint violation
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 409);
+        }
+
+        {
+            // Create MINMAX constraint
+            String minMaxConstraintName = "testMinMaxConstraint" + System.currentTimeMillis();
+            CustomModelConstraint minMaxConstraint = new CustomModelConstraint();
+            minMaxConstraint.setName(minMaxConstraintName);
+            minMaxConstraint.setType("MINMAX");
+            // Create the MinMax constraint's parameters
+            List<CustomModelNamedValue> parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("maxValue", "100"));
+            parameters.add(buildNamedValue("minValue", "50"));
+            // Add the parameters into the constraint
+            minMaxConstraint.setParameters(parameters);
+
+            // Create constraint as a Model Administrator
+            post("cmm/" + modelName + "/constraints", RestApiUtil.toJsonAsString(minMaxConstraint), 201);
+            // Retrieve the created MinMax constraint
+            HttpResponse response = getSingle("cmm/" + modelName + "/constraints", minMaxConstraintName, 200);
+            CustomModelConstraint returnedConstraint = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModelConstraint.class);
+
+            // Create type
+            String typeName = "testType1" + System.currentTimeMillis();
+            createTypeAspect(CustomType.class, modelName, typeName, "test type1 title", "test type1 Desc", "cm:content");
+
+            // Update the Type by adding property
+            CustomType typePayload = new CustomType();
+            typePayload.setName(typeName);
+            String typePropName = "testType1Prop1" + System.currentTimeMillis();
+            CustomModelProperty typeProp = new CustomModelProperty();
+            typeProp.setName(typePropName);
+            typeProp.setTitle("property with MINMAX constraint ref");
+            typeProp.setDataType("d:int");
+            typeProp.setDefaultValue("35"); // Not in the defined range [50,100]
+            typeProp.setConstraintRefs(Arrays.asList(returnedConstraint.getPrefixedName())); // constrain ref
+            List<CustomModelProperty> props = new ArrayList<>(1);
+            props.add(typeProp);
+            typePayload.setProperties(props);
+
+            // Try to create the property - constraint violation
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), SELECT_PROPS_QS, 409);
+        }
+    }
+
+    public static class DummyJavaClassConstraint extends AbstractConstraint
+    {
+        @Override
+        protected void evaluateSingleValue(Object value)
+        {
+            String checkValue = DefaultTypeConverter.INSTANCE.convert(String.class, value);
+
+            if (checkValue.contains("#"))
+            {
+                throw new ConstraintException("The value must not contain '#'");
+            }
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomModel.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomModel.java
new file mode 100644
index 00000000000..3ee3acf3e20
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomModel.java
@@ -0,0 +1,705 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.alfresco.rest.api.model.CustomAspect;
+import org.alfresco.rest.api.model.CustomModel;
+import org.alfresco.rest.api.model.CustomModel.ModelStatus;
+import org.alfresco.rest.api.model.CustomType;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.dictionary.CustomModelService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.junit.Test;
+
+/**
+ * Tests the REST API of the models of the {@link CustomModelService}.
+ * 
+ * @author Jamal Kaabi-Mofrad
+ */
+public class TestCustomModel extends BaseCustomModelApiTest
+{
+
+    @Test
+    public void testCreateBasicModel() throws Exception
+    {
+        String modelName = "testModel" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+
+        CustomModel customModel = new CustomModel();
+        customModel.setName(modelName);
+        customModel.setNamespaceUri(namespacePair.getFirst());
+        customModel.setNamespacePrefix(namespacePair.getSecond());
+        customModel.setDescription("Test model description");
+        customModel.setStatus(CustomModel.ModelStatus.DRAFT);
+
+        setRequestContext(nonAdminUserName);
+
+        // Try to create the model as a non Admin user
+        post("cmm", RestApiUtil.toJsonAsString(customModel), 403);
+
+        setRequestContext(customModelAdmin);
+
+        // Create the model as a Model Administrator
+        post("cmm", RestApiUtil.toJsonAsString(customModel), 201);
+
+        // Retrieve the created model
+        HttpResponse response = getSingle("cmm", modelName, 200);
+        CustomModel returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        // Check the retrieved model is the expected model.
+        // Note: since we didn't specify the Author when created the Model,
+        // we have to exclude it from the objects comparison. Because,
+        // the system will add the current authenticated user as the author
+        // of the model, if the Author hasn't been set.
+        compareCustomModels(customModel, returnedModel, "author");
+    }
+
+    @Test
+    public void testCreateBasicModel_Invalid() throws Exception
+    {
+        String modelName = "testModel" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+
+        CustomModel customModel = new CustomModel();
+        customModel.setName(modelName);
+        customModel.setNamespaceUri(namespacePair.getFirst());
+        customModel.setNamespacePrefix(namespacePair.getSecond());
+
+        setRequestContext(customModelAdmin);
+
+        // Test invalid inputs
+        {
+            customModel.setName(modelName + "<script>alert('oops')</script>");
+            post("cmm", RestApiUtil.toJsonAsString(customModel), 400);
+
+            customModel.setName("prefix:" + modelName);
+            post("cmm", RestApiUtil.toJsonAsString(customModel), 400); // Invalid name. Contains ':'
+
+            customModel.setName("prefix " + modelName);
+            post("cmm", RestApiUtil.toJsonAsString(customModel), 400); // Invalid name. Contains space
+
+            customModel.setName(modelName);
+            customModel.setNamespacePrefix(namespacePair.getSecond()+" space");
+            post("cmm", RestApiUtil.toJsonAsString(customModel), 400); // Invalid prefix. Contains space
+
+            customModel.setNamespacePrefix(namespacePair.getSecond()+"invalid/");
+            post("cmm", RestApiUtil.toJsonAsString(customModel), 400); // Invalid prefix. Contains '/'
+
+            customModel.setNamespacePrefix(namespacePair.getSecond());
+            customModel.setNamespaceUri(namespacePair.getFirst()+" space");
+            post("cmm", RestApiUtil.toJsonAsString(customModel), 400); // Invalid URI. Contains space
+
+            customModel.setNamespaceUri(namespacePair.getFirst()+"\\");
+            post("cmm", RestApiUtil.toJsonAsString(customModel), 400); // Invalid URI. Contains '\'
+        }
+
+        // Test mandatory properties of the model
+        {
+            customModel.setName("");
+            customModel.setNamespacePrefix(namespacePair.getSecond());
+            customModel.setNamespaceUri(namespacePair.getFirst());
+            post("cmm", RestApiUtil.toJsonAsString(customModel), 400); // name is mandatory
+
+            customModel.setName(modelName);
+            customModel.setNamespaceUri(null);
+            post("cmm", RestApiUtil.toJsonAsString(customModel), 400); // namespaceUri is mandatory
+
+            customModel.setName(modelName);
+            customModel.setNamespaceUri(namespacePair.getFirst());
+            customModel.setNamespacePrefix(null);
+            post("cmm", RestApiUtil.toJsonAsString(customModel), 400); // namespacePrefix is mandatory
+        }
+
+        // Test duplicate model name
+        {
+            // Test create a model with the same name as the bootstrapped model
+            customModel.setName("contentmodel");
+            customModel.setNamespaceUri(namespacePair.getFirst());
+            customModel.setNamespacePrefix(namespacePair.getSecond());
+            post("cmm", RestApiUtil.toJsonAsString(customModel), 409);
+
+            // Create the model
+            customModel.setName(modelName);
+            post("cmm", RestApiUtil.toJsonAsString(customModel), 201);
+
+            // Create a duplicate model
+            // Set a new namespace to make sure the 409 status code is returned
+            // because of a name conflict rather than namespace URI
+            namespacePair = getTestNamespaceUriPrefixPair();
+            customModel.setNamespaceUri(namespacePair.getFirst());
+            customModel.setNamespacePrefix(namespacePair.getSecond());
+            post("cmm", RestApiUtil.toJsonAsString(customModel), 409);
+        }
+
+        // Test duplicate namespaceUri
+        {
+            String modelNameTwo = "testModelTwo" + System.currentTimeMillis();
+            Pair<String, String> namespacePairTwo = getTestNamespaceUriPrefixPair();
+
+            CustomModel customModelTwo = new CustomModel();
+            customModelTwo.setName(modelNameTwo);
+            customModelTwo.setNamespaceUri(namespacePairTwo.getFirst());
+            customModelTwo.setNamespacePrefix(namespacePairTwo.getSecond());
+            post("cmm", RestApiUtil.toJsonAsString(customModelTwo), 201);
+
+            String modelNameThree = "testModelThree" + System.currentTimeMillis();
+            Pair<String, String> namespacePairThree = getTestNamespaceUriPrefixPair();
+            CustomModel customModelThree = new CustomModel();
+            customModelThree.setName(modelNameThree);
+            customModelThree.setNamespaceUri(namespacePairTwo.getFirst()); // duplicate URI
+            customModelThree.setNamespacePrefix(namespacePairThree.getSecond());
+
+            // Try to create a model with a namespace uri which has already been used.
+            post("cmm", RestApiUtil.toJsonAsString(customModelThree), 409);
+            
+            customModelThree.setNamespaceUri(namespacePairThree.getFirst());
+            customModelThree.setNamespacePrefix(namespacePairTwo.getSecond()); // duplicate prefix
+
+            // Try to create a model with a namespace prefix which has already been used.
+            post("cmm", RestApiUtil.toJsonAsString(customModelThree), 409);
+        }
+    }
+
+    @Test
+    public void testListBasicModels() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName_1 = "testModel1" + System.currentTimeMillis();
+        // Create the model as a Model Administrator
+        CustomModel customModel_1 = createCustomModel(modelName_1, getTestNamespaceUriPrefixPair(), ModelStatus.DRAFT);
+
+        String modelName_2 = "testModel2" + System.currentTimeMillis();
+        CustomModel customModel_2 = createCustomModel(modelName_2, getTestNamespaceUriPrefixPair(), ModelStatus.DRAFT);
+
+        String modelName_3 = "testModel3" + System.currentTimeMillis();
+        CustomModel customModel_3 = createCustomModel(modelName_3, getTestNamespaceUriPrefixPair(), ModelStatus.DRAFT);
+ 
+        Paging paging = getPaging(0, Integer.MAX_VALUE);
+        HttpResponse response = getAll("cmm", paging, 200);
+        List<CustomModel> models = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), CustomModel.class);
+
+        assertTrue(models.size() >= 3);
+        assertTrue(models.contains(customModel_1));
+        assertTrue(models.contains(customModel_2));
+        assertTrue(models.contains(customModel_3));
+    }
+
+    @Test
+    public void testActivateCustomModel() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelNameOne = "testActivateModelOne" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        CustomModel customModelOne = createCustomModel(modelNameOne, namespacePair, ModelStatus.DRAFT, "Test model description", "Jane Doe");
+
+        // Retrieve the created model and check its status (the default is DRAFT)
+        HttpResponse response = getSingle("cmm", modelNameOne, 200);
+        CustomModel returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        assertEquals(ModelStatus.DRAFT, returnedModel.getStatus());
+
+        // We only want to update the status, so ignore the other properties
+        CustomModel updatePayload = new CustomModel();
+        updatePayload.setStatus(ModelStatus.ACTIVE);
+
+        setRequestContext(nonAdminUserName);
+
+        // Try to activate the model as a non Admin user
+        put("cmm", modelNameOne, RestApiUtil.toJsonAsString(updatePayload), SELECT_STATUS_QS, 403);
+
+        setRequestContext(customModelAdmin);
+        
+        // Activate the model as a Model Administrator
+        put("cmm", modelNameOne, RestApiUtil.toJsonAsString(updatePayload), SELECT_STATUS_QS, 200);
+
+        response = getSingle("cmm", modelNameOne, 200);
+        returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        assertEquals(ModelStatus.ACTIVE, returnedModel.getStatus());
+        // Check other properties have not been modified
+        compareCustomModels(customModelOne, returnedModel, "status");
+
+        // Try to activate the already activated model as a Model Administrator
+        put("cmm", modelNameOne, RestApiUtil.toJsonAsString(updatePayload), SELECT_STATUS_QS, 500);
+
+        // Create another Model
+        String modelNameTwo = "testActivateModelTwo" + System.currentTimeMillis();
+        Pair<String, String> namespacePairTwo = getTestNamespaceUriPrefixPair();
+        CustomModel customModelTwo = createCustomModel(modelNameTwo, namespacePairTwo, ModelStatus.DRAFT, null, "John Doe");
+
+        // Activate the model as a Model Administrator
+        customModelTwo.setStatus(ModelStatus.ACTIVE);
+        put("cmm", modelNameTwo, RestApiUtil.toJsonAsString(customModelTwo), SELECT_STATUS_QS, 200);
+
+        response = getSingle("cmm", modelNameTwo, 200);
+        returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        assertEquals(ModelStatus.ACTIVE, returnedModel.getStatus());
+        // Check other properties have not been modified
+        compareCustomModels(customModelTwo, returnedModel, "status");
+    }
+
+    @Test
+    public void testDeactivateCustomModel() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelNameOne = "testDeactivateModelOne" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+         // Create the model as a Model Administrator
+        CustomModel customModelOne =  createCustomModel(modelNameOne, namespacePair, ModelStatus.ACTIVE, null, "Mark Moe");
+
+        // Retrieve the created model and check its status
+        HttpResponse response = getSingle("cmm", modelNameOne, 200);
+        CustomModel returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        assertEquals(ModelStatus.ACTIVE, returnedModel.getStatus());
+
+        // We only want to update the status (Deactivate), so ignore the other properties
+        CustomModel updatePayload = new CustomModel();
+        updatePayload.setStatus(ModelStatus.DRAFT);
+
+        setRequestContext(nonAdminUserName);
+
+        // Try to deactivate the model as a non Admin user
+        put("cmm", modelNameOne, RestApiUtil.toJsonAsString(updatePayload), SELECT_STATUS_QS, 403);
+
+        setRequestContext(customModelAdmin);
+        
+        // Deactivate the model as a Model Administrator
+        put("cmm", modelNameOne, RestApiUtil.toJsonAsString(updatePayload), SELECT_STATUS_QS, 200);
+
+        response = getSingle("cmm", modelNameOne, 200);
+        returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        assertEquals(ModelStatus.DRAFT, returnedModel.getStatus());
+        // Check other properties have not been modified
+        compareCustomModels(customModelOne, returnedModel, "status");
+
+        // Try to deactivate the already deactivated model as a Model Administrator
+        put("cmm", modelNameOne, RestApiUtil.toJsonAsString(updatePayload), SELECT_STATUS_QS, 500);
+
+        // Activate/Deactivate a model with an aspect 
+        {
+            // Create another Model
+            final String modelNameTwo = "testDeactivateModelTwo" + System.currentTimeMillis();
+            Pair<String, String> namespacePairTwo = getTestNamespaceUriPrefixPair();
+            CustomModel customModelTwo = createCustomModel(modelNameTwo, namespacePairTwo, ModelStatus.DRAFT, null, "Mark Moe");
+
+            // Aspect
+            CustomAspect aspect = new CustomAspect();
+            aspect.setName("testMarkerAspect");
+            post("cmm/" + modelNameTwo + "/aspects", RestApiUtil.toJsonAsString(aspect), 201);
+            // Retrieve the created aspect
+            getSingle("cmm/" + modelNameTwo + "/aspects", aspect.getName(), 200);
+
+            // Activate the model as a Model Administrator
+            customModelTwo.setStatus(ModelStatus.ACTIVE);
+            put("cmm", modelNameTwo, RestApiUtil.toJsonAsString(customModelTwo), SELECT_STATUS_QS, 200);
+
+            response = getSingle("cmm", modelNameTwo, 200);
+            returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+            assertEquals(ModelStatus.ACTIVE, returnedModel.getStatus());
+
+            updatePayload = new CustomModel();
+            updatePayload.setStatus(ModelStatus.DRAFT);
+            // Deactivate the model as a Model Administrator
+            put("cmm", modelNameTwo, RestApiUtil.toJsonAsString(updatePayload), SELECT_STATUS_QS, 200);
+
+            response = getSingle("cmm", modelNameTwo, 200);
+            returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+            assertEquals(ModelStatus.DRAFT, returnedModel.getStatus());
+        }
+    }
+
+    @Test
+    public void testDeleteCustomModel() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testDeleteModel" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        CustomModel customModel = createCustomModel(modelName, namespacePair, ModelStatus.DRAFT, null, "Joe Bloggs");
+
+        // Retrieve the created model
+        HttpResponse response = getSingle("cmm", modelName, 200);
+        CustomModel returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        compareCustomModels(customModel, returnedModel);
+
+        setRequestContext(nonAdminUserName);
+        
+        // Try to delete the model as a non Admin user
+        delete("cmm", modelName, 403);
+
+        setRequestContext(customModelAdmin);
+
+        // Delete the model as a Model Administrator
+        delete("cmm", modelName, 204);
+
+        // Create the model again
+        post("cmm", RestApiUtil.toJsonAsString(customModel), 201);
+        
+        // Activated the model
+        CustomModel updatePayload = new CustomModel();
+        updatePayload.setStatus(ModelStatus.ACTIVE);
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), SELECT_STATUS_QS, 200);
+        
+        // Try to delete the active model
+        delete("cmm", modelName, 409);
+        
+        // Deactivate and then delete the model
+        updatePayload = new CustomModel();
+        updatePayload.setStatus(ModelStatus.DRAFT);
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), SELECT_STATUS_QS, 200);
+        delete("cmm", modelName, 204);
+    }
+
+    @Test
+    public void testUpdateBasicModel() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModel" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT, "Test model description", null);
+
+        //Test update name
+        CustomModel updatePayload = new CustomModel();
+        String newName = modelName + "Modified";
+        updatePayload.setName(newName);
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), null, 400); // Cannot update the model name
+
+        // Test update the namespace URI (already in-use)
+        updatePayload = new CustomModel();
+        updatePayload.setNamespaceUri("http://www.alfresco.org/model/content/1.0");
+        updatePayload.setNamespacePrefix("newPrefix");
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), null, 409); // The namespace uri has already been used
+
+        // Test update the namespace Prefix (already in-use)
+        updatePayload = new CustomModel();
+        updatePayload.setNamespaceUri(getTestNamespaceUriPrefixPair().getFirst());
+        updatePayload.setNamespacePrefix("cm");
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), null, 409); // The namespace prefix has already been used
+
+        // Test update the namespace URI (without sending the namespace prefix)
+        updatePayload = new CustomModel();
+        updatePayload.setNamespaceUri(getTestNamespaceUriPrefixPair().getFirst());
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), null, 400); // The namespace prefix is mandatory
+
+        // Test update the namespace URI only
+        updatePayload = new CustomModel();
+        updatePayload.setNamespacePrefix( namespacePair.getSecond());
+        Pair<String, String> newURI = getTestNamespaceUriPrefixPair();
+        updatePayload.setNamespaceUri(newURI.getFirst());
+        HttpResponse response = put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), null, 200);
+        CustomModel returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        assertEquals(newURI.getFirst(), returnedModel.getNamespaceUri());
+        assertEquals("The namespace prefix shouldn't have changed.", namespacePair.getSecond(), returnedModel.getNamespacePrefix());
+
+        // Test update the namespace prefix (without sending the namespace URI)
+        updatePayload = new CustomModel();
+        updatePayload.setNamespacePrefix("newPrefix");
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), null, 400); // The namespce uri is mandatory
+        
+        // Test update the namespace prefix only
+        updatePayload = new CustomModel();
+        updatePayload.setNamespaceUri(namespacePair.getFirst());
+        Pair<String, String> newPrefix = getTestNamespaceUriPrefixPair();
+        updatePayload.setNamespacePrefix( newPrefix.getSecond());
+        response = put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), null, 200);
+        returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        assertEquals(newPrefix.getSecond(), returnedModel.getNamespacePrefix());
+        assertEquals("The namespace URI shouldn't have changed.", namespacePair.getFirst(), returnedModel.getNamespaceUri());
+
+        // Test a valid update
+        updatePayload = new CustomModel();
+        Pair<String, String> newNamespacePair = getTestNamespaceUriPrefixPair();
+        updatePayload.setNamespaceUri(newNamespacePair.getFirst());
+        updatePayload.setNamespacePrefix(newNamespacePair.getSecond());
+        updatePayload.setDescription("Test model description Modified");
+        updatePayload.setAuthor("John Moe");
+        updatePayload.setStatus(ModelStatus.ACTIVE); // This should be ignored
+
+        setRequestContext(nonAdminUserName);
+        
+        // Try to update the model as a non Admin user
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), null, 403);
+
+        setRequestContext(customModelAdmin);
+        
+        // Update the model as a Model Administrator
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), null, 200);
+
+        // Retrieve the updated model
+        response = getSingle("cmm", modelName, 200);
+        returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        compareCustomModels(updatePayload, returnedModel, "name", "status");
+        assertEquals("The model status should only be updated via '?select=status' request.", ModelStatus.DRAFT, returnedModel.getStatus());
+
+        // Activate the model as a Model Administrator
+        updatePayload = new CustomModel();
+        updatePayload.setStatus(ModelStatus.ACTIVE);
+        response = put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), SELECT_STATUS_QS, 200);
+        returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        assertEquals(ModelStatus.ACTIVE, returnedModel.getStatus());
+
+        // Try to update the ACTIVE model's namespace URI
+        updatePayload = new CustomModel();
+        newNamespacePair = getTestNamespaceUriPrefixPair();
+        updatePayload.setNamespaceUri(newNamespacePair.getFirst());
+        updatePayload.setNamespacePrefix(returnedModel.getNamespacePrefix());
+        // Cannot update the namespace uri and/or namespace prefix when the model is Active.
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), null, 409);
+
+        // Try to update the ACTIVE model's namespace Prefix
+        updatePayload = new CustomModel();
+        updatePayload.setNamespaceUri(returnedModel.getNamespaceUri());
+        updatePayload.setNamespacePrefix("myNewPrefix");
+        // Cannot update the namespace uri and/or namespace prefix when the model is Active.
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), null, 409);
+
+        // Test a valid update of an Active model (you can only update desc and author)
+        updatePayload = new CustomModel();
+        updatePayload.setNamespaceUri(returnedModel.getNamespaceUri());
+        updatePayload.setNamespacePrefix(returnedModel.getNamespacePrefix());
+        updatePayload.setDescription("Test modifying active model description");
+        updatePayload.setAuthor("Mark Miller");
+        put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), null, 200);
+
+        // Retrieve the updated active model
+        response = getSingle("cmm", modelName, 200);
+        returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        compareCustomModels(updatePayload, returnedModel, "name", "status");
+    }
+
+    @Test
+    //SHA-726
+    public void testUpdateModel_WithAspectsAndTypes() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModel" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+
+        // Add type
+        String typeBaseName = "testTypeBase" + System.currentTimeMillis();
+        final String typeBaseNameWithPrefix = namespacePair.getSecond() + QName.NAMESPACE_PREFIX + typeBaseName;
+        createTypeAspect(CustomType.class, modelName, typeBaseName, "test typeBase title", null, "cm:content");
+
+        // Add aspect
+        final String aspectName = "testAspect" + System.currentTimeMillis();
+        final String aspectNameWithPrefix = namespacePair.getSecond() + QName.NAMESPACE_PREFIX + aspectName;
+        createTypeAspect(CustomAspect.class, modelName, aspectName, null, null, null);
+
+        // Activate the model
+        CustomModel modelOneStatusPayload = new CustomModel();
+        modelOneStatusPayload.setStatus(ModelStatus.ACTIVE);
+        put("cmm", modelName, RestApiUtil.toJsonAsString(modelOneStatusPayload), SELECT_STATUS_QS, 200);
+
+        // Add another type with 'typeBaseName' as its parent
+        String childTypeName = "testTypeChild" + System.currentTimeMillis();
+        createTypeAspect(CustomType.class, modelName, childTypeName, "test typeChild title", "test typeChild Desc", typeBaseNameWithPrefix);
+
+        // Add another aspect with 'aspectName' as its parent
+        final String childAspectName = "testChildAspect" + System.currentTimeMillis();
+        createTypeAspect(CustomAspect.class, modelName, childAspectName, "test child aspect title", null, aspectNameWithPrefix);
+
+         // Deactivate the model
+        modelOneStatusPayload = new CustomModel();
+        modelOneStatusPayload.setStatus(ModelStatus.DRAFT);
+        put("cmm", modelName, RestApiUtil.toJsonAsString(modelOneStatusPayload), SELECT_STATUS_QS, 200);
+
+        // Test update the namespace prefix
+        CustomModel updatePayload = new CustomModel();
+        String modifiedPrefix = namespacePair.getSecond() + "Modified";
+        updatePayload.setNamespacePrefix(modifiedPrefix);
+        updatePayload.setNamespaceUri(namespacePair.getFirst());
+        HttpResponse response = put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), null, 200);
+        CustomModel returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        assertEquals(modifiedPrefix, returnedModel.getNamespacePrefix());
+        assertEquals("The namespace URI shouldn't have changed.", namespacePair.getFirst(), returnedModel.getNamespaceUri());
+
+        // Test update the namespace URI
+        updatePayload = new CustomModel();
+        updatePayload.setNamespacePrefix(modifiedPrefix);
+        String modifiedURI = namespacePair.getFirst() + "Modified";
+        updatePayload.setNamespaceUri(modifiedURI);
+        response = put("cmm", modelName, RestApiUtil.toJsonAsString(updatePayload), null, 200);
+        returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        assertEquals(modifiedURI, returnedModel.getNamespaceUri());
+        assertEquals("The namespace prefix shouldn't have changed.", modifiedPrefix, returnedModel.getNamespacePrefix());
+
+        // Retrieve the child type
+        response = getSingle("cmm/" + modelName + "/types", childTypeName,  200);
+        CustomType returnedChildType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+        final String newTypeParentName = modifiedPrefix + QName.NAMESPACE_PREFIX + typeBaseName;
+        assertEquals("The parent name prefix should have been updated.", newTypeParentName, returnedChildType.getParentName());
+
+        // Retrieve the child aspect
+        response = getSingle("cmm/" + modelName + "/aspects", childAspectName,  200);
+        CustomAspect returnedChildAspect = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomAspect.class);
+        final String newAspectParentName = modifiedPrefix + QName.NAMESPACE_PREFIX + aspectName;
+        assertEquals("The parent name prefix should have been updated.", newAspectParentName, returnedChildAspect.getParentName());
+    }
+
+    // SHA-808
+    @Test
+    public void testModelsCircularDependency() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        // Model One
+        String modelNameOne = "testModelOne" + System.currentTimeMillis();
+        Pair<String, String> namespacePairOne = getTestNamespaceUriPrefixPair();
+        // Create the modelOne as a Model Administrator
+        createCustomModel(modelNameOne, namespacePairOne, ModelStatus.DRAFT);
+
+        // Add typeA_M1 into modelOne
+        String typeA_M1 = "testTypeA_M1" + System.currentTimeMillis();
+        final String typeA_M1_WithPrefix = namespacePairOne.getSecond() + QName.NAMESPACE_PREFIX + typeA_M1;
+        createTypeAspect(CustomType.class, modelNameOne, typeA_M1, "test typeA_M1 title", null, "cm:content");
+
+        // Activate modelOne
+        CustomModel modelOneStatusPayload = new CustomModel();
+        modelOneStatusPayload.setStatus(ModelStatus.ACTIVE);
+        put("cmm", modelNameOne, RestApiUtil.toJsonAsString(modelOneStatusPayload), SELECT_STATUS_QS, 200);
+
+        // Add another type into modelOne with 'typeA_M1' as its parent
+        String typeB_M1 = "testTypeB_M1" + System.currentTimeMillis();
+        final String typeB_M1_WithPrefix = namespacePairOne.getSecond() + QName.NAMESPACE_PREFIX + typeB_M1;
+        createTypeAspect(CustomType.class, modelNameOne, typeB_M1, "test typeB_M1 title", "test typeB_M1 Desc", typeA_M1_WithPrefix);
+
+        // Model Two
+        String modelNameTwo = "testModelTwo" + System.currentTimeMillis();
+        Pair<String, String> namespacePairTwo = getTestNamespaceUriPrefixPair();
+        // Create the modelTwo as a Model Administrator
+        createCustomModel(modelNameTwo, namespacePairTwo, ModelStatus.DRAFT);
+
+        // Add type1_M2 into modelTwo with 'typeB_M1' (from modelOne) as its parent
+        String type1_M2 = "testType1_M2" + System.currentTimeMillis();
+        final String type1_M2_WithPrefix = namespacePairTwo.getSecond() + QName.NAMESPACE_PREFIX + type1_M2;
+        createTypeAspect(CustomType.class, modelNameTwo, type1_M2, "test type1_M2 title", null, typeB_M1_WithPrefix );
+
+        // Activate modelTwo
+        CustomModel modelTwoStatusPayload = new CustomModel();
+        modelTwoStatusPayload.setStatus(ModelStatus.ACTIVE);
+        put("cmm", modelNameTwo, RestApiUtil.toJsonAsString(modelTwoStatusPayload), SELECT_STATUS_QS, 200);
+
+        // Test that the API can handle "circular dependency" - (modelOne depends on modelTwo)
+        {
+            // Add another type into modelOne with 'type1_M2' (from modelTwo) as its parent
+            String typeC_M1 = "testTypeC_M1" + System.currentTimeMillis();
+            CustomType typeC_M1_Payload = new CustomType();
+            typeC_M1_Payload.setName(typeC_M1);
+            typeC_M1_Payload.setTitle("test typeC_M1 title");
+            typeC_M1_Payload.setParentName(type1_M2_WithPrefix); // => 'type1_M2' (from modelTwo)
+
+            // Try to create typeC_M1 which has 'circular dependency'
+            post("cmm/" + modelNameOne + "/types", RestApiUtil.toJsonAsString(typeC_M1_Payload), 409); //Constraint violation 
+        }
+
+        // Model Three
+        String modelNameThree = "testModelThree" + System.currentTimeMillis();
+        Pair<String, String> namespacePairThree = getTestNamespaceUriPrefixPair();
+        // Create the modelThree as a Model Administrator
+        createCustomModel(modelNameThree, namespacePairThree, ModelStatus.DRAFT);
+
+        // Add type1_M3 into modelThree with 'type1_M2' (from modelTwo) as its parent
+        String type1_M3 = "testType1_M3" + System.currentTimeMillis();
+        final String type1_M3_WithPrefix = namespacePairThree.getSecond() + QName.NAMESPACE_PREFIX + type1_M3;
+        createTypeAspect(CustomType.class, modelNameThree, type1_M3, "test type1_M3 title", null, type1_M2_WithPrefix );
+
+        // Activate modelThree
+        CustomModel modelThreeStatusPayload = new CustomModel();
+        modelThreeStatusPayload.setStatus(ModelStatus.ACTIVE);
+        put("cmm", modelNameThree, RestApiUtil.toJsonAsString(modelThreeStatusPayload), SELECT_STATUS_QS, 200);
+
+        // Test that the API can handle "circular dependency" - (modelOne depends on modelThree)
+        {
+            // Add another type into modelOne with 'type1_M3' (from modelThree) as its parent
+            String typeC_M1 = "testTypeC_M1" + System.currentTimeMillis();
+            CustomType typeC_M1_Payload = new CustomType();
+            typeC_M1_Payload.setName(typeC_M1);
+            typeC_M1_Payload.setTitle("test typeC_M1 title");
+            typeC_M1_Payload.setParentName(type1_M3_WithPrefix); // => 'type1_M3' (from modelThree)
+
+            // Try to create typeC_M1 which has 'circular dependency'
+            post("cmm/" + modelNameOne + "/types", RestApiUtil.toJsonAsString(typeC_M1_Payload), 409); //Constraint violation 
+        }
+
+        // Model Three
+        String modelNameFour = "testModelFour" + System.currentTimeMillis();
+        Pair<String, String> namespacePairFour = getTestNamespaceUriPrefixPair();
+        // Create the modelFour as a Model Administrator
+        createCustomModel(modelNameFour, namespacePairFour, ModelStatus.DRAFT);
+
+        // Add type1_M4 into modelFour with 'type1_M3' (from modelThree) as its parent
+        String type1_M4 = "testType1_M4" + System.currentTimeMillis();
+        final String type1_M4_WithPrefix = namespacePairFour.getSecond() + QName.NAMESPACE_PREFIX + type1_M4;
+        createTypeAspect(CustomType.class, modelNameFour, type1_M4, "test type1_M4 title", null, type1_M3_WithPrefix );
+
+        // Activate modelFour
+        CustomModel modelFourStatusPayload = new CustomModel();
+        modelFourStatusPayload.setStatus(ModelStatus.ACTIVE);
+        put("cmm", modelNameFour, RestApiUtil.toJsonAsString(modelFourStatusPayload), SELECT_STATUS_QS, 200);
+
+        // Test that the API can handle "circular dependency" - (modelOne depends on modelFour)
+        {
+            // Add another type into modelOne with 'type1_M4' (from modelFour) as its parent
+            String typeC_M1 = "testTypeC_M1" + System.currentTimeMillis();
+            CustomType typeC_M1_Payload = new CustomType();
+            typeC_M1_Payload.setName(typeC_M1);
+            typeC_M1_Payload.setTitle("test typeC_M1 title");
+            typeC_M1_Payload.setParentName(type1_M4_WithPrefix); // => 'type1_M4' (from modelFour)
+
+            // Try to create typeC_M1 which has 'circular dependency'
+            post("cmm/" + modelNameOne + "/types", RestApiUtil.toJsonAsString(typeC_M1_Payload), 409); //Constraint violation 
+        }
+
+        // Test that the API can handle "circular dependency" - (modelTwo depends on modelFour)
+        {
+            // Add another type into modelTwo with 'type1_M4' (from modelFour) as its parent
+            String type2_M2 = "testType2_M2" + System.currentTimeMillis();
+            CustomType type2_M2_Payload = new CustomType();
+            type2_M2_Payload.setName(type2_M2);
+            type2_M2_Payload.setTitle("test type2_M2 title");
+            type2_M2_Payload.setParentName(type1_M4_WithPrefix); // => 'type1_M4' (from modelFour)
+
+            // Try to create type2_M2 which has 'circular dependency'
+            post("cmm/" + modelNameTwo + "/types", RestApiUtil.toJsonAsString(type2_M2_Payload), 409); //Constraint violation 
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomModelExport.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomModelExport.java
new file mode 100644
index 00000000000..b2f316865b3
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomModelExport.java
@@ -0,0 +1,150 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Set;
+
+import org.alfresco.repo.dictionary.CMMDownloadTestUtil;
+import org.alfresco.rest.api.model.CustomModelDownload;
+import org.alfresco.rest.api.model.CustomType;
+import org.alfresco.rest.api.model.CustomModel.ModelStatus;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.dictionary.CustomModelService;
+import org.alfresco.service.cmr.download.DownloadStatus;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.util.Pair;
+import org.junit.Test;
+
+/**
+ * Tests REST API download of the {@link CustomModelService}.
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class TestCustomModelExport extends BaseCustomModelApiTest
+{
+
+    private static final long PAUSE_TIME = 1000;
+
+    private CMMDownloadTestUtil downloadTestUtil;
+
+    @Override
+    public void setup() throws Exception
+    {
+        super.setup();
+        this.downloadTestUtil = new CMMDownloadTestUtil(applicationContext);
+    }
+
+    @Override
+    public void tearDown() throws Exception
+    {
+        this.downloadTestUtil.cleanup();
+        super.tearDown();
+    }
+
+    @Test
+    public void testCreateDownload() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        final String modelName = "testModel" + System.currentTimeMillis();
+        final String modelExportFileName = modelName + ".xml";
+        final String shareExtExportFileName = "CMM_" + modelName + "_module.xml";
+
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT, null, "Mark Moe");
+
+        // Add type
+        String typeBaseName = "testTypeBase" + System.currentTimeMillis();
+        createTypeAspect(CustomType.class, modelName, typeBaseName, "test typeBase title", "test typeBase Desc", "cm:content");
+
+        // Create Share extension module
+        downloadTestUtil.createShareExtModule(modelName);
+
+        setRequestContext(nonAdminUserName);
+
+        // Try to create download the model as a non Admin user
+        post("cmm/" + modelName + "/download", RestApiUtil.toJsonAsString(new CustomModelDownload()), getExtModuleQS(false), 403);
+
+        setRequestContext(customModelAdmin);
+        
+        // Create download for custom model only
+        HttpResponse response = post("cmm/" + modelName + "/download", RestApiUtil.toJsonAsString(new CustomModelDownload()), getExtModuleQS(false), 201);
+        CustomModelDownload returnedDownload = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModelDownload.class);
+        assertNotNull(returnedDownload);
+        assertNotNull(returnedDownload.getNodeRef());
+
+        NodeRef downloadNode = new NodeRef(returnedDownload.getNodeRef()); 
+
+        DownloadStatus status = downloadTestUtil.getDownloadStatus(downloadNode);
+        while (status.getStatus() == DownloadStatus.Status.PENDING)
+        {
+            Thread.sleep(PAUSE_TIME);
+            status = downloadTestUtil.getDownloadStatus(downloadNode);
+        }
+
+        Set<String> entries = downloadTestUtil.getDownloadEntries(downloadNode);
+        assertEquals(1, entries.size());
+        String modelEntry = downloadTestUtil.getDownloadEntry(entries, modelExportFileName);
+        assertNotNull(modelEntry);
+        assertEquals(modelEntry, modelExportFileName);
+
+        // Create download for custom model and its share extension module
+        response = post("cmm/" + modelName + "/download", RestApiUtil.toJsonAsString(new CustomModelDownload()), getExtModuleQS(true), 201);
+        returnedDownload = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModelDownload.class);
+        assertNotNull(returnedDownload);
+        assertNotNull(returnedDownload.getNodeRef());
+
+        downloadNode = new NodeRef(returnedDownload.getNodeRef()); 
+
+        status = downloadTestUtil.getDownloadStatus(downloadNode);
+        while (status.getStatus() == DownloadStatus.Status.PENDING)
+        {
+            Thread.sleep(PAUSE_TIME);
+            status = downloadTestUtil.getDownloadStatus(downloadNode);
+        }
+
+        entries = downloadTestUtil.getDownloadEntries(downloadNode);
+        assertEquals(2, entries.size());
+
+        modelEntry = downloadTestUtil.getDownloadEntry(entries, modelExportFileName);
+        assertNotNull(modelEntry);
+        assertEquals(modelEntry, modelExportFileName);
+        
+        String shareExtEntry = downloadTestUtil.getDownloadEntry(entries, shareExtExportFileName);
+        assertNotNull(shareExtEntry);
+        assertEquals(shareExtEntry, shareExtExportFileName);
+    }
+
+    private String getExtModuleQS(boolean withShareExtModule)
+    {
+        return "?extModule=" + withShareExtModule;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomProperty.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomProperty.java
new file mode 100644
index 00000000000..c9f73eb824e
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomProperty.java
@@ -0,0 +1,784 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.alfresco.repo.dictionary.Facetable;
+import org.alfresco.repo.dictionary.IndexTokenisationMode;
+import org.alfresco.rest.api.model.CustomAspect;
+import org.alfresco.rest.api.model.CustomModel;
+import org.alfresco.rest.api.model.CustomModelConstraint;
+import org.alfresco.rest.api.model.CustomModelNamedValue;
+import org.alfresco.rest.api.model.CustomModelProperty;
+import org.alfresco.rest.api.model.CustomType;
+import org.alfresco.rest.api.model.CustomModel.ModelStatus;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.dictionary.CustomModelService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.junit.Test;
+
+/**
+ * Tests the REST API of the properties of the {@link CustomModelService}.
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class TestCustomProperty extends BaseCustomModelApiTest
+{
+    @Test
+    public void testCreateProperties() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModel" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+
+        {
+            // Create aspect
+            String aspectName = "testAspect1" + System.currentTimeMillis();
+            CustomAspect aspect = createTypeAspect(CustomAspect.class, modelName, aspectName, null, null, null);
+
+            // Update the Aspect by adding property
+            CustomAspect payload = new CustomAspect();
+            String aspectPropName = "testAspect1Prop1" + System.currentTimeMillis();
+            CustomModelProperty aspectProp = new CustomModelProperty();
+            aspectProp.setName(aspectPropName);
+            aspectProp.setTitle("property title");
+            aspectProp.setMultiValued(true);
+            aspectProp.setIndexed(true);
+            aspectProp.setFacetable(Facetable.TRUE);
+            aspectProp.setIndexTokenisationMode(IndexTokenisationMode.BOTH);
+            List<CustomModelProperty> props = new ArrayList<>(1);
+            props.add(aspectProp);
+            payload.setProperties(props);
+
+            setRequestContext(nonAdminUserName);
+            
+            // Try to update the aspect as a non Admin user
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(payload), SELECT_PROPS_QS, 403);
+
+            setRequestContext(customModelAdmin);
+            
+            // Try to update the aspect as a Model Administrator
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(payload), SELECT_PROPS_QS, 400); // Type name is mandatory
+
+            // Add the mandatory aspect name to the payload
+            payload.setName(aspectName);
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(payload), SELECT_PROPS_QS, 200);
+
+            // Retrieve the updated aspect
+            HttpResponse response = getSingle("cmm/" + modelName + "/aspects", aspect.getName(), 200);
+            CustomAspect returnedAspect = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomAspect.class);
+            // Check the aspect's added property
+            assertEquals(1, returnedAspect.getProperties().size());
+            CustomModelProperty customModelProperty = returnedAspect.getProperties().get(0);
+            assertEquals(aspectPropName, customModelProperty.getName());
+            assertEquals("property title", customModelProperty.getTitle());
+            assertEquals(namespacePair.getSecond() + QName.NAMESPACE_PREFIX + aspectPropName, customModelProperty.getPrefixedName());
+            assertEquals("Default data type is 'd:text'.", "d:text", customModelProperty.getDataType());
+            assertNull(customModelProperty.getDescription());
+            assertTrue(customModelProperty.isMultiValued());
+            assertFalse(customModelProperty.isMandatory());
+            assertFalse(customModelProperty.isMandatoryEnforced());
+            assertNull(customModelProperty.getDefaultValue());
+            assertTrue(customModelProperty.isIndexed());
+            assertEquals(Facetable.TRUE, customModelProperty.getFacetable());
+            assertEquals(IndexTokenisationMode.BOTH, customModelProperty.getIndexTokenisationMode());
+
+            // Test duplicate property name
+            aspectProp = new CustomModelProperty();
+            aspectProp.setName(aspectPropName); // Existing name
+            aspectProp.setTitle("new property title");
+            props = new ArrayList<>(1);
+            props.add(aspectProp);
+            payload.setProperties(props);
+            // Try to update the aspect as a Model Administrator
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(payload), SELECT_PROPS_QS, 409); // property name already exists
+        }
+
+        {
+            // Create type
+            String typeName = "testType1" + System.currentTimeMillis();
+            CustomType type = createTypeAspect(CustomType.class, modelName, typeName, "test type1 title", "test type1 Desc", "cm:content");
+
+            // Update the Type by adding property
+            CustomType payload = new CustomType();
+            String typePropName = "testType1Prop1" + System.currentTimeMillis();
+            CustomModelProperty typeProp = new CustomModelProperty();
+            typeProp.setName(typePropName);
+            typeProp.setTitle("property title");
+            typeProp.setDataType("d:int");
+            typeProp.setIndexed(false);
+            typeProp.setFacetable(Facetable.FALSE);
+            typeProp.setIndexTokenisationMode(IndexTokenisationMode.FALSE);
+            List<CustomModelProperty> props = new ArrayList<>(1);
+            props.add(typeProp);
+            payload.setProperties(props);
+
+            setRequestContext(nonAdminUserName);
+            
+            // Try to update the type as a non Admin user
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(payload), SELECT_PROPS_QS, 403);
+
+            setRequestContext(customModelAdmin);
+            
+            // Try to update the type as a Model Administrator
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(payload), SELECT_PROPS_QS, 400); // Type name is mandatory
+
+            // Add the mandatory type name to the payload
+            payload.setName(typeName);
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(payload), SELECT_PROPS_QS, 200);
+
+            // Retrieve the updated type
+            HttpResponse response = getSingle("cmm/" + modelName + "/types", type.getName(), 200);
+            CustomType returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+            // Check the type's added property
+            assertEquals(1, returnedType.getProperties().size());
+            CustomModelProperty customModelProperty = returnedType.getProperties().get(0);
+            assertEquals(typePropName, customModelProperty.getName());
+            assertEquals("property title", customModelProperty.getTitle());
+            assertEquals(namespacePair.getSecond() + QName.NAMESPACE_PREFIX + typePropName, customModelProperty.getPrefixedName());
+            assertEquals("d:int", customModelProperty.getDataType());
+            assertNull(customModelProperty.getDescription());
+            assertFalse(customModelProperty.isMultiValued());
+            assertFalse(customModelProperty.isMandatory());
+            assertFalse(customModelProperty.isMandatoryEnforced());
+            assertNull(customModelProperty.getDefaultValue());
+            assertFalse(customModelProperty.isIndexed());
+            assertEquals(Facetable.FALSE, customModelProperty.getFacetable());
+            assertEquals(IndexTokenisationMode.FALSE, customModelProperty.getIndexTokenisationMode());
+
+            // Retrieve the updated type with all the properties (include inherited)
+            response = getSingle("cmm/" + modelName + "/types", type.getName()+SELECT_ALL_PROPS, 200);
+            returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+            assertEquals(3, returnedType.getProperties().size());
+            // Check for the inherited properties
+            assertNotNull(getProperty(returnedType.getProperties(), "content")); // cm:content
+            assertNotNull(getProperty(returnedType.getProperties(), "name")); // cm:name
+   
+            // Create another property and set all of its attributes
+            payload = new CustomType();
+            payload.setName(typeName);
+            String typePropName2 = "testType1Prop2" + System.currentTimeMillis();
+            typeProp = new CustomModelProperty();
+            typeProp.setName(typePropName2);
+            typeProp.setTitle("property2 title");
+            typeProp.setDescription("property2 desciption");
+            typeProp.setDataType("d:int");
+            typeProp.setDefaultValue("0");
+            typeProp.setMultiValued(false);
+            typeProp.setMandatory(true);
+            typeProp.setMandatoryEnforced(true);
+            props = new ArrayList<>(1);
+            props.add(typeProp);
+            payload.setProperties(props);
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(payload), SELECT_PROPS_QS, 200);
+
+            // Retrieve the updated type
+            response = getSingle("cmm/" + modelName + "/types", type.getName(), 200);
+            returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+            // Check the type's added property
+            assertEquals(2, returnedType.getProperties().size());
+            customModelProperty = getProperty(returnedType.getProperties(), typePropName2);
+            assertNotNull(customModelProperty);
+            assertEquals(typePropName2, customModelProperty.getName());
+            assertEquals("property2 title", customModelProperty.getTitle());
+            assertEquals(namespacePair.getSecond() + QName.NAMESPACE_PREFIX + typePropName2, customModelProperty.getPrefixedName());
+            assertEquals("d:int", customModelProperty.getDataType());
+            assertEquals("property2 desciption", customModelProperty.getDescription());
+            assertFalse(customModelProperty.isMultiValued());
+            assertTrue(customModelProperty.isMandatory());
+            assertTrue(customModelProperty.isMandatoryEnforced());
+            assertEquals("0", customModelProperty.getDefaultValue());
+
+            // Test duplicate property name
+            typeProp = new CustomModelProperty();
+            typeProp.setName(typePropName2); // Existing name
+            typeProp.setTitle("new property title");
+            typeProp.setDataType("d:text");
+            props = new ArrayList<>(1);
+            props.add(typeProp);
+            payload.setProperties(props);
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(payload), SELECT_PROPS_QS, 409); // property name already exists
+        }
+    }
+
+    @Test
+    public void testDeleteProperty() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModelDeleteProp" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+
+        /*
+         * Create aspect and update it by adding two properties
+         */
+        String aspectName = "testAspect1" + System.currentTimeMillis();
+        createTypeAspect(CustomAspect.class, modelName, aspectName, null, null, null);
+        // Update the Aspect by adding property - property one
+        CustomAspect aspectPayload = new CustomAspect();
+        aspectPayload.setName(aspectName);
+
+        String aspectPropNameOne = "testAspect1Prop1" + System.currentTimeMillis();
+        CustomModelProperty aspectPropOne = new CustomModelProperty();
+        aspectPropOne.setName(aspectPropNameOne);
+        aspectPropOne.setTitle("aspect property one title");
+        aspectPropOne.setMultiValued(true);
+        List<CustomModelProperty> props = new ArrayList<>(1);
+        props.add(aspectPropOne);
+        aspectPayload.setProperties(props);
+        // create property one
+        put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 200);
+
+        // Update the Aspect by adding another property - property two
+        aspectPayload = new CustomAspect();
+        aspectPayload.setName(aspectName);
+
+        String aspectPropNameTwo = "testAspect1Prop2" + System.currentTimeMillis();
+        CustomModelProperty aspectPropTwo = new CustomModelProperty();
+        aspectPropTwo.setName(aspectPropNameTwo);
+        aspectPropTwo.setTitle("aspect property two title");
+        aspectPropTwo.setMandatory(true);
+        aspectPropTwo.setDataType("d:int");
+        aspectPropTwo.setDefaultValue("1");
+        props = new ArrayList<>(1);
+        props.add(aspectPropTwo);
+        aspectPayload.setProperties(props);
+        // create property two
+        put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 200);
+
+        // Retrieve the updated aspect
+        HttpResponse response = getSingle("cmm/" + modelName + "/aspects", aspectName, 200);
+        CustomAspect returnedAspect = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomAspect.class);
+        // Check the aspect's added properties
+        assertEquals(2, returnedAspect.getProperties().size());
+
+        /*
+         * Create type and update it by adding two properties
+         */
+        String typeName = "testType1" + System.currentTimeMillis();
+        createTypeAspect(CustomType.class, modelName, typeName, "test type1 title", null, "cm:content");
+
+        // Update the Type by adding property - property one
+        CustomType typePayload = new CustomType();
+        typePayload.setName(typeName);
+
+        String typePropNameOne = "testType1Prop1" + System.currentTimeMillis();
+        CustomModelProperty typePropOne = new CustomModelProperty();
+        typePropOne.setName(typePropNameOne);
+        typePropOne.setTitle("type property one title");
+        props = new ArrayList<>(1);
+        props.add(typePropOne);
+        typePayload.setProperties(props);
+        // create property one
+        put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), SELECT_PROPS_QS, 200);
+
+        // Update the Type by adding another property - property two
+        typePayload = new CustomType();
+        typePayload.setName(typeName);
+
+        // Create inline MINMAX constraint
+        CustomModelConstraint inlineMinMaxConstraint = new CustomModelConstraint();
+        inlineMinMaxConstraint.setType("MINMAX");
+        inlineMinMaxConstraint.setTitle("test MINMAX title");
+        // Create the MinMax constraint's parameters
+        List<CustomModelNamedValue> parameters = new ArrayList<>(2);
+        parameters.add(buildNamedValue("maxValue", "100.0"));
+        parameters.add(buildNamedValue("minValue", "0.0"));
+        // Add the parameters into the constraint
+        inlineMinMaxConstraint.setParameters(parameters);
+
+        String typePropNameTwo = "testType1Prop2" + System.currentTimeMillis();
+        CustomModelProperty typePropTwo = new CustomModelProperty();
+        typePropTwo.setName(typePropNameTwo);
+        typePropTwo.setTitle("type property two title");
+        typePropTwo.setDataType("d:int");
+        typePropTwo.setConstraints(Arrays.asList(inlineMinMaxConstraint)); // add the inline constraint
+        props = new ArrayList<>(1);
+        props.add(typePropTwo);
+        typePayload.setProperties(props);
+        // create property one
+        put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), SELECT_PROPS_QS, 200);
+
+        // Retrieve the updated type
+        response = getSingle("cmm/" + modelName + "/types", typeName, 200);
+        CustomType returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+        // Check the type's added properties
+        assertEquals(2, returnedType.getProperties().size());
+
+        // Delete aspect's property one - model is inactive
+        {
+            final String deletePropOneAspectQS = getPropDeleteUpdateQS(aspectPropNameOne, true);
+            // Try to delete propertyOne from aspect
+            put("cmm/" + modelName + "/aspects", aspectName, null, deletePropOneAspectQS, 400); // missing payload
+
+            CustomAspect deletePropAspectPayload = new CustomAspect();
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(deletePropAspectPayload), deletePropOneAspectQS, 400); // missing aspect name
+
+            setRequestContext(nonAdminUserName);
+            
+            deletePropAspectPayload.setName(aspectName);
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(deletePropAspectPayload), deletePropOneAspectQS, 403); // unauthorised
+
+            setRequestContext(customModelAdmin);
+            
+            // Delete as a Model Administrator
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(deletePropAspectPayload), deletePropOneAspectQS, 200);
+
+            // Check the property has been deleted
+            response = getSingle("cmm/" + modelName + "/aspects", aspectName, 200);
+            returnedAspect = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomAspect.class);
+            assertEquals(1, returnedAspect.getProperties().size());
+            assertFalse("Property one should have been deleted.", aspectPropNameOne.equals(returnedAspect.getProperties().get(0).getName()));
+
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(deletePropAspectPayload), deletePropOneAspectQS, 404); //Not found
+        }
+
+        // Delete type's property two - model is inactive
+        {
+            final String deletePropTwoTypeQS = getPropDeleteUpdateQS(typePropNameTwo, true);
+            // Try to delete propertyOne from type
+            put("cmm/" + modelName + "/types", typeName, null, deletePropTwoTypeQS, 400); // missing payload
+
+            CustomType deletePropTypePayload = new CustomType();
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(deletePropTypePayload), deletePropTwoTypeQS,
+                        400); // missing type name
+
+            setRequestContext(nonAdminUserName);
+            
+            deletePropTypePayload.setName(typeName);
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(deletePropTypePayload), deletePropTwoTypeQS, 403); // unauthorised
+
+            setRequestContext(customModelAdmin);
+            
+            // Delete as a Model Administrator
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(deletePropTypePayload), deletePropTwoTypeQS, 200);
+
+            // Check the property has been deleted
+            response = getSingle("cmm/" + modelName + "/types", typeName, 200);
+            returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+            assertEquals(1, returnedType.getProperties().size());
+            assertFalse("Property two should have been deleted.", typePropNameTwo.equals(returnedType.getProperties().get(0).getName()));
+
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(deletePropTypePayload), deletePropTwoTypeQS, 404); //Not found
+        }
+
+        /*
+         * APPSREPO-59: delete the last property of a Type / Aspect for an active model
+         */
+        // Activate the model
+        CustomModel statusPayload = new CustomModel();
+        statusPayload.setStatus(ModelStatus.ACTIVE);
+        put("cmm", modelName, RestApiUtil.toJsonAsString(statusPayload), SELECT_STATUS_QS, 200);
+
+        // Delete aspect's property two - model is active
+        {
+            setRequestContext(customModelAdmin);
+            final String deletePropTwoAspectQS = getPropDeleteUpdateQS(aspectPropNameTwo, true);
+            CustomAspect deletePropAspectPayload = new CustomAspect();
+            deletePropAspectPayload.setName(aspectName);
+
+            // Delete as a Model Administrator
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(deletePropAspectPayload), deletePropTwoAspectQS, 200);
+
+            // Check the property has been deleted
+            response = getSingle("cmm/" + modelName + "/aspects", aspectName, 200);
+            returnedAspect = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomAspect.class);
+            assertEquals("Property two should have been deleted.", 0, returnedAspect.getProperties().size());
+
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(deletePropAspectPayload), deletePropTwoAspectQS, 404); //Not found
+        }
+
+        // Delete type's property one - model is active
+        {
+            final String deletePropOneTypeQS = getPropDeleteUpdateQS(typePropNameOne, true);
+
+            CustomType deletePropTypePayload = new CustomType();
+            deletePropTypePayload.setName(typeName);
+
+            // Delete as a Model Administrator
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(deletePropTypePayload), deletePropOneTypeQS, 200);
+
+            // Check the property has been deleted
+            response = getSingle("cmm/" + modelName + "/types", typeName, 200);
+            returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+            assertEquals("Property one should have been deleted.", 0, returnedType.getProperties().size());
+
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(deletePropTypePayload), deletePropOneTypeQS, 404); //Not found
+        }
+    }
+
+    @Test
+    public void testUpdateProperty() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModelUpdateProp" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+
+        /*
+         * Create aspect and update it by adding a property
+         */
+        String aspectName = "testAspect1" + System.currentTimeMillis();
+        createTypeAspect(CustomAspect.class, modelName, aspectName, null, null, null);
+        // Update the Aspect by adding property
+        CustomAspect aspectPayload = new CustomAspect();
+        aspectPayload.setName(aspectName);
+
+        String aspectPropName = "testAspect1Prop" + System.currentTimeMillis();
+        CustomModelProperty aspectProp = new CustomModelProperty();
+        aspectProp.setName(aspectPropName);
+        aspectProp.setTitle("aspect property title");
+        aspectProp.setMultiValued(true);
+        List<CustomModelProperty> props = new ArrayList<>(1);
+        props.add(aspectProp);
+        aspectPayload.setProperties(props);
+        // create property
+        put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 200);
+
+        // Retrieve the updated aspect
+        HttpResponse response = getSingle("cmm/" + modelName + "/aspects", aspectName, 200);
+        CustomAspect returnedAspect = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomAspect.class);
+        // Check the aspect's added property
+        assertEquals(1, returnedAspect.getProperties().size());
+
+        /*
+         * Create type and update it by adding a property
+         */
+        String typeName = "testType1" + System.currentTimeMillis();
+        createTypeAspect(CustomType.class, modelName, typeName, "test type1 title", null, "cm:content");
+
+        // Update the Type by adding property - property one
+        CustomType typePayload = new CustomType();
+        typePayload.setName(typeName);
+
+        // Create inline MINMAX constraint
+        CustomModelConstraint inlineMinMaxConstraint = new CustomModelConstraint();
+        inlineMinMaxConstraint.setType("MINMAX");
+        inlineMinMaxConstraint.setTitle("test MINMAX title");
+        // Create the MinMax constraint's parameters
+        List<CustomModelNamedValue> parameters = new ArrayList<>(2);
+        parameters.add(buildNamedValue("maxValue", "100.0"));
+        parameters.add(buildNamedValue("minValue", "0.0"));
+        // Add the parameters into the constraint
+        inlineMinMaxConstraint.setParameters(parameters);
+
+        String typePropName = "testType1Prop" + System.currentTimeMillis();
+        CustomModelProperty typeProp = new CustomModelProperty();
+        typeProp.setName(typePropName);
+        typeProp.setDataType("d:int");
+        typeProp.setTitle("type property title");
+        typeProp.setDefaultValue("0");
+        typeProp.setConstraints(Arrays.asList(inlineMinMaxConstraint)); // add the inline constraint
+        props = new ArrayList<>(1);
+        props.add(typeProp);
+        typePayload.setProperties(props);
+        // create property
+        put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), SELECT_PROPS_QS, 200);
+
+        // Retrieve the updated type
+        response = getSingle("cmm/" + modelName + "/types", typeName, 200);
+        CustomType returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+        // Check the type's added property
+        assertEquals(1, returnedType.getProperties().size());
+
+        // Update aspect's property - model is inactive
+        {
+            final String updatePropOneAspectQS = getPropDeleteUpdateQS(aspectPropName, false);
+            // Try to update property from aspect
+            put("cmm/" + modelName + "/aspects", aspectName, null, updatePropOneAspectQS, 400); // missing payload
+
+            CustomAspect updatePropAspectPayload = new CustomAspect();
+            CustomModelProperty propertyAspect = new CustomModelProperty();
+            propertyAspect.setTitle("new Title");
+            propertyAspect.setDescription("new Desc");
+            propertyAspect.setDataType("d:int"); // the original value was d:text
+            propertyAspect.setMultiValued(false); // the original value was true
+            propertyAspect.setMandatory(true); // the original value was false
+            propertyAspect.setDefaultValue("10");
+            List<CustomModelProperty> modifiedProp = new ArrayList<>(1);
+            modifiedProp.add(propertyAspect);
+            updatePropAspectPayload.setProperties(modifiedProp);
+ 
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(updatePropAspectPayload), updatePropOneAspectQS, 400); // missing aspect name
+
+            // set a random name
+            updatePropAspectPayload.setName(aspectName + System.currentTimeMillis());
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(updatePropAspectPayload), updatePropOneAspectQS, 404); // Aspect not found
+
+            // set the correct name
+            updatePropAspectPayload.setName(aspectName);
+            // the requested property name dose not match the payload
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(updatePropAspectPayload), updatePropOneAspectQS, 400);
+
+            // set the property name that matches the requested property
+            propertyAspect.setName(aspectPropName);
+            
+            setRequestContext(nonAdminUserName);
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(updatePropAspectPayload), updatePropOneAspectQS, 403); // unauthorised
+
+            setRequestContext(customModelAdmin);
+            // Update as a Model Administrator
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(updatePropAspectPayload), updatePropOneAspectQS, 200);
+
+            // Check the property has been updated
+            response = getSingle("cmm/" + modelName + "/aspects", aspectName, 200);
+            returnedAspect = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomAspect.class);
+            assertEquals(1, returnedAspect.getProperties().size());
+            CustomModelProperty modifiedAspectProperty = returnedAspect.getProperties().get(0);
+            compareCustomModelProperties(propertyAspect, modifiedAspectProperty, "prefixedName", "indexTokenisationMode");
+        }
+
+        // Activate the model
+        CustomModel statusPayload = new CustomModel();
+        statusPayload.setStatus(ModelStatus.ACTIVE);
+        put("cmm", modelName, RestApiUtil.toJsonAsString(statusPayload), SELECT_STATUS_QS, 200);
+
+        // Update type's property - model is active
+        {
+            final String updatePropTwoTypeQS = getPropDeleteUpdateQS(typePropName, false);
+            CustomType updatePropTypePayload = new CustomType();
+            updatePropTypePayload.setName(typeName);
+            CustomModelProperty propertyType = new CustomModelProperty();
+            propertyType.setName(typePropName);
+            propertyType.setTitle("new Title");
+            propertyType.setDescription("new Desc");
+            propertyType.setDataType("d:long"); // the original value was d:int
+            propertyType.setDefaultValue("5");
+            List<CustomModelProperty> modifiedProp = new ArrayList<>(1);
+            modifiedProp.add(propertyType);
+            updatePropTypePayload.setProperties(modifiedProp);
+
+            setRequestContext(nonAdminUserName);
+            
+            // Unauthorised
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(updatePropTypePayload), updatePropTwoTypeQS, 403);
+
+            setRequestContext(customModelAdmin);
+            
+            // Try to update an active model as a Model Administrator - Cannot change the data type of the property of an active model
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(updatePropTypePayload), updatePropTwoTypeQS, 409);
+
+            // Set the data type with its original value
+            propertyType.setDataType("d:int");
+            propertyType.setMultiValued(true);// the original value was false
+            // Cannot change the multi-valued option of the property of an active model
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(updatePropTypePayload), updatePropTwoTypeQS, 409);
+
+            propertyType.setMultiValued(false);
+            propertyType.setMandatory(true);// the original value was false
+            // Cannot change the mandatory option of the property of an active model
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(updatePropTypePayload), updatePropTwoTypeQS, 409);
+
+            propertyType.setMandatory(false);
+            propertyType.setMandatoryEnforced(true);// the original value was false
+            // Cannot change the mandatory-enforced option of the property of an active model
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(updatePropTypePayload), updatePropTwoTypeQS, 409);
+
+            // Set the mandatory-enforced with its original value
+            propertyType.setMandatoryEnforced(false);
+            // Update the MinMax constraint's parameters
+            parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("maxValue", "120.0")); // the original value was 100.0
+            parameters.add(buildNamedValue("minValue", "20.0")); // the original value was 0.0
+            // Add the parameters into the constraint
+            inlineMinMaxConstraint.setParameters(parameters);
+            propertyType.setConstraints(Arrays.asList(inlineMinMaxConstraint)); // add the updated inline constraint
+
+            // Try to Update - constraint violation. The default value is 5 which is not in the MinMax range [20, 120]
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(updatePropTypePayload), updatePropTwoTypeQS, 409);
+
+            propertyType.setDefaultValue("25"); // we changed the MinMax constraint to be [20, 120]
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(updatePropTypePayload), updatePropTwoTypeQS, 200);
+
+            // Check the property has been updated
+            response = getSingle("cmm/" + modelName + "/types", typeName, 200);
+            returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+            assertEquals(1, returnedType.getProperties().size());
+            CustomModelProperty modifiedTypeProperty = returnedType.getProperties().get(0);
+            assertEquals("new Title", modifiedTypeProperty.getTitle());
+            assertEquals("new Desc", modifiedTypeProperty.getDescription());
+            assertEquals("25", modifiedTypeProperty.getDefaultValue());
+            assertEquals("Shouldn't be able to change the data type of the property of an active model." ,"d:int", modifiedTypeProperty.getDataType());
+            assertFalse(modifiedTypeProperty.isMandatory());
+            assertFalse(modifiedTypeProperty.isMultiValued());
+            assertFalse(modifiedTypeProperty.isMandatoryEnforced());
+            assertEquals(1, modifiedTypeProperty.getConstraints().size());
+            CustomModelConstraint modifiedConstraint = modifiedTypeProperty.getConstraints().get(0);
+            assertEquals("MINMAX", modifiedConstraint.getType());
+            assertEquals("120.0", getParameterSimpleValue(modifiedConstraint.getParameters(), "maxValue"));
+            assertEquals("20.0", getParameterSimpleValue(modifiedConstraint.getParameters(), "minValue"));
+
+            // Change the constraint type and parameter
+            inlineMinMaxConstraint.setType("LENGTH");
+            inlineMinMaxConstraint.setTitle("test LENGTH title");
+            parameters = new ArrayList<>(2);
+            parameters.add(buildNamedValue("maxLength", "256"));
+            parameters.add(buildNamedValue("minLength", "0"));
+            // Add the parameters into the constraint
+            inlineMinMaxConstraint.setParameters(parameters);
+            propertyType.setConstraints(Arrays.asList(inlineMinMaxConstraint));
+            // LENGTH can only be used with textual data type
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(updatePropTypePayload), updatePropTwoTypeQS, 400);
+
+            //update the property by removing the constraint
+            propertyType.setConstraints(Collections.<CustomModelConstraint>emptyList());
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(updatePropTypePayload), updatePropTwoTypeQS, 200);
+
+            response = getSingle("cmm/" + modelName + "/types", typeName, 200);
+            returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+            assertEquals(1, returnedType.getProperties().size());
+            modifiedTypeProperty = returnedType.getProperties().get(0);
+            assertEquals(0, modifiedTypeProperty.getConstraints().size());
+        }
+    }
+
+    @Test
+    public void testValidatePropertyDefaultValue() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModelPropDefaultValue" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+
+        /*
+         * Create aspect and update it by adding a property
+         */
+        String aspectName = "testAspect1" + System.currentTimeMillis();
+        createTypeAspect(CustomAspect.class, modelName, aspectName, null, null, null);
+        // Update the Aspect by adding property
+        CustomAspect aspectPayload = new CustomAspect();
+        aspectPayload.setName(aspectName);
+
+        String aspectPropName = "testAspectProp" + System.currentTimeMillis();
+        final String updatePropAspectQS = getPropDeleteUpdateQS(aspectPropName, false);
+
+        CustomModelProperty aspectProp = new CustomModelProperty();
+        aspectProp.setName(aspectPropName);
+        aspectProp.setTitle("aspect property title");
+        List<CustomModelProperty> props = new ArrayList<>(1);
+        props.add(aspectProp);
+        aspectPayload.setProperties(props);
+
+        // d:int tests
+        {
+            aspectProp.setDataType("d:int");
+            aspectProp.setDefaultValue(" ");// space
+
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 400);
+
+            aspectProp.setDefaultValue("abc"); // text
+            // create property
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 400);
+
+            aspectProp.setDefaultValue("1.0"); // double
+            // create property
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 400);
+
+            aspectProp.setDefaultValue("1,2,3"); // text
+            // create property
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 400);
+        }
+
+        // d:float tests
+        {
+            aspectProp.setDataType("d:float");
+            aspectProp.setDefaultValue(" ");// space
+
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 400);
+
+            aspectProp.setDefaultValue("abc"); // text
+            // create property
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 400);
+
+            aspectProp.setDefaultValue("1,2,3"); // text
+            // create property
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 400);
+
+            aspectProp.setDefaultValue("1.0"); // float
+            // create property
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), SELECT_PROPS_QS, 200);
+
+            aspectProp.setDefaultValue("1.0f"); // float - update
+            // create property
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), updatePropAspectQS, 200);
+
+            aspectProp.setDefaultValue("1.0d"); // double - update
+            // create property
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), updatePropAspectQS, 200);
+        }
+
+        // d:boolean tests
+        {
+            aspectProp.setDataType("d:boolean");
+            aspectProp.setDefaultValue(" ");// space
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), updatePropAspectQS, 400);
+
+            aspectProp.setDefaultValue("abc"); // text
+            // create property
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), updatePropAspectQS, 400);
+
+            aspectProp.setDefaultValue("1"); // number
+            // create property
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), updatePropAspectQS, 400);
+            
+            aspectProp.setDefaultValue("true"); // valid value
+            // create property
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), updatePropAspectQS, 200);
+ 
+            aspectProp.setDefaultValue("false"); // valid value
+            // create property
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), updatePropAspectQS, 200);
+        }
+    }
+
+    private String getPropDeleteUpdateQS(String propName, boolean isDelete)
+    {
+        String req = (isDelete ? "&delete=" : "&update=");
+        return SELECT_PROPS_QS + req + propName;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomTypeAspect.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomTypeAspect.java
new file mode 100644
index 00000000000..6f02f89034f
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestCustomTypeAspect.java
@@ -0,0 +1,685 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.alfresco.repo.dictionary.Facetable;
+import org.alfresco.repo.dictionary.IndexTokenisationMode;
+import org.alfresco.rest.api.model.CustomAspect;
+import org.alfresco.rest.api.model.CustomModel;
+import org.alfresco.rest.api.model.CustomModelProperty;
+import org.alfresco.rest.api.model.CustomType;
+import org.alfresco.rest.api.model.CustomModel.ModelStatus;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.dictionary.CustomModelDefinition;
+import org.alfresco.service.cmr.dictionary.CustomModelService;
+import org.alfresco.service.cmr.dictionary.NamespaceDefinition;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
+import org.junit.Test;
+
+/**
+ * Tests the REST API of the types and aspects of the {@link CustomModelService}.
+ * 
+ * @author Jamal Kaabi-Mofrad
+ */
+public class TestCustomTypeAspect extends BaseCustomModelApiTest
+{
+
+    @Test
+    public void testCreateAspectsAndTypes_ExistingModel() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModel" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+
+        final String aspectName = "testAspect1" + System.currentTimeMillis();
+        {
+            // Add aspect
+            CustomAspect aspect = new CustomAspect();
+            aspect.setName(aspectName);
+
+            setRequestContext(nonAdminUserName);
+
+            // Try to create aspect as a non Admin user
+            post("cmm/" + modelName + "/aspects", RestApiUtil.toJsonAsString(aspect), 403);
+
+            setRequestContext(customModelAdmin);
+
+            // Set the aspect's parent with a type name!
+            aspect.setParentName("cm:content");
+            // Try to create an invalid aspect as a Model Administrator
+            post("cmm/" + modelName + "/aspects", RestApiUtil.toJsonAsString(aspect), 409);
+
+            // Create aspect as a Model Administrator
+            aspect.setParentName(null);
+            post("cmm/" + modelName + "/aspects", RestApiUtil.toJsonAsString(aspect), 201);
+
+            // Create the aspect again - duplicate name
+            post("cmm/" + modelName + "/aspects", RestApiUtil.toJsonAsString(aspect), 409);
+
+            // Retrieve the created aspect
+            HttpResponse response = getSingle("cmm/" + modelName + "/aspects", aspect.getName(), 200);
+            CustomAspect returnedAspect = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomAspect.class);
+            compareCustomTypesAspects(aspect, returnedAspect, "prefixedName");
+            assertEquals(namespacePair.getSecond() + QName.NAMESPACE_PREFIX + aspectName, returnedAspect.getPrefixedName());
+        }
+
+        String typeName = "testType" + System.currentTimeMillis();
+        {
+            // Add type
+            CustomType type = new CustomType();
+            type.setName(typeName);
+            type.setDescription("test type Desc");
+            type.setTitle("test type title");
+            type.setParentName("cm:content");
+
+            setRequestContext(nonAdminUserName);
+
+            // Try to create type as a non Admin user
+            post("cmm/" + modelName + "/types", RestApiUtil.toJsonAsString(type), 403);
+
+            setRequestContext(customModelAdmin);
+
+            // Set the type's parent with an aspect name!
+            type.setParentName("cm:titled");
+            // Try to create an invalid type as a Model Administrator
+            post("cmm/" + modelName + "/types", RestApiUtil.toJsonAsString(type), 409);
+
+            // Create type as a Model Administrator
+            type.setParentName("cm:content");
+            post("cmm/" + modelName + "/types", RestApiUtil.toJsonAsString(type), 201);
+
+            // Create the type again - duplicate name
+            post("cmm/" + modelName + "/types", RestApiUtil.toJsonAsString(type), 409);
+
+            // Retrieve the created type
+            HttpResponse response = getSingle("cmm/" + modelName + "/types", type.getName(), 200);
+            CustomType returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+            compareCustomTypesAspects(type, returnedType, "prefixedName");
+            assertEquals(namespacePair.getSecond() + QName.NAMESPACE_PREFIX + typeName, returnedType.getPrefixedName());
+
+            // for now this is the simplest way to check for the imported namespaces
+            CustomModelDefinition modelDef = getModelDefinition(modelName);
+            assertNotNull(modelDef);
+            Collection<NamespaceDefinition> importedNamespaces = modelDef.getImportedNamespaces();
+
+            assertTrue(hasNamespaceUri(importedNamespaces, "http://www.alfresco.org/model/content/1.0"));
+            assertTrue(hasNamespacePrefix(importedNamespaces, "cm"));
+        }
+
+        // Existing name
+        {
+            // Add aspect
+            CustomAspect aspect = new CustomAspect();
+            // Set the aspect name with an existing type name. The model
+            // cannot have a type and an aspect with the same name.
+            aspect.setName(typeName);
+            post("cmm/" + modelName + "/aspects", RestApiUtil.toJsonAsString(aspect), 409);
+
+            CustomType type = new CustomType();
+            // Set the type name with an existing aspect name
+            type.setName(aspectName);
+            type.setParentName("cm:content");
+            post("cmm/" + modelName + "/types", RestApiUtil.toJsonAsString(type), 409);
+        }
+    }
+
+    @Test
+    public void testCreateModel_WithAspectsAndTypes_Invalid() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModel" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+
+        // Add type
+        {
+            final String typeURL = "cmm/" + modelName + "/types";
+            CustomType type = new CustomType();
+            type.setName(null);
+            type.setDescription("test type Desc");
+
+            // Try to create a model with an invalid type name (null)
+            post(typeURL, RestApiUtil.toJsonAsString(type), 400);
+
+            // Try to create a model with an invalid type name (name contains ':')
+            type.setName("prefix:someTypename");
+            post(typeURL, RestApiUtil.toJsonAsString(type), 400);
+
+            // Try to create a model with an invalid type name (name is empty)
+            type.setName("");
+            post(typeURL, RestApiUtil.toJsonAsString(type), 400);
+
+            // Try to create a model with an invalid type name (name contains '<')
+            type.setName("testType<name");
+            post(typeURL, RestApiUtil.toJsonAsString(type), 400);
+        }
+
+        // Add aspect
+        {
+            final String aspectURL = "cmm/" + modelName + "/aspects";
+            CustomAspect aspect = new CustomAspect();
+            aspect.setName(null);
+            aspect.setTitle("test aspect title");
+
+            // Try to create a model with an invalid aspect name (null)
+            post(aspectURL, RestApiUtil.toJsonAsString(aspect), 400);
+
+            // Try to create a model with an invalid aspect name (name contains ':')
+            aspect.setName("prefix:someAspectname");
+            post(aspectURL, RestApiUtil.toJsonAsString(aspect), 400);
+
+            // Try to create a model with an invalid aspect name (name is empty)
+            aspect.setName("");
+            post(aspectURL, RestApiUtil.toJsonAsString(aspect), 400);
+
+            // Try to create a model with an invalid aspect name (name contains '>')
+            aspect.setName("testType>name");
+            post(aspectURL, RestApiUtil.toJsonAsString(aspect), 400);
+        }
+    }
+
+    @Test
+    public void testCreateAspectsAndTypesWithProperties() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModel" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+
+        {
+            // Add aspect with property
+            String aspectName = "testAspect1" + System.currentTimeMillis();
+            CustomAspect aspect = new CustomAspect();
+            aspect.setName(aspectName);
+
+            String aspectPropName = "testAspect1Prop1" + System.currentTimeMillis();
+            CustomModelProperty aspectProp = new CustomModelProperty();
+            aspectProp.setName(aspectPropName);
+            aspectProp.setTitle("property title");
+            List<CustomModelProperty> props = new ArrayList<>(1);
+            props.add(aspectProp);
+            aspect.setProperties(props);
+
+            // Create aspect as a Model Administrator
+            post("cmm/" + modelName + "/aspects", RestApiUtil.toJsonAsString(aspect), 201);
+            // Retrieve the created aspect
+            HttpResponse response = getSingle("cmm/" + modelName + "/aspects", aspect.getName(), 200);
+            CustomAspect returnedAspect = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomAspect.class);
+            compareCustomTypesAspects(aspect, returnedAspect, "prefixedName", "dataType", "indexTokenisationMode");
+            assertEquals(1, returnedAspect.getProperties().size());
+            CustomModelProperty customModelProperty = returnedAspect.getProperties().get(0);
+            assertEquals(aspectPropName, customModelProperty.getName());
+            assertEquals("property title", customModelProperty.getTitle());
+            assertEquals(namespacePair.getSecond() + QName.NAMESPACE_PREFIX + aspectPropName, customModelProperty.getPrefixedName());
+            assertEquals("Default data type is 'd:text'.", "d:text", customModelProperty.getDataType());
+            // Test default indexing options
+            assertTrue(customModelProperty.isIndexed());
+            assertEquals(Facetable.UNSET, customModelProperty.getFacetable());
+            assertEquals(IndexTokenisationMode.TRUE, customModelProperty.getIndexTokenisationMode());
+        }
+
+        {
+            // Add type with properties
+            String typeName = "testType1" + System.currentTimeMillis();
+            CustomType type = new CustomType();
+            type.setName(typeName);
+            type.setDescription("test type1 Desc");
+            type.setTitle("test type1 title");
+            type.setParentName("cm:content");
+
+            String typePropName = "testType1Prop1" + System.currentTimeMillis();
+            CustomModelProperty typeProp = new CustomModelProperty();
+            typeProp.setName(typePropName);
+            typeProp.setDataType("int"); // data type without dictionary prefix
+            List<CustomModelProperty> props = new ArrayList<>(1);
+            props.add(typeProp);
+            type.setProperties(props);
+
+            // Create type as a Model Administrator
+            post("cmm/" + modelName + "/types", RestApiUtil.toJsonAsString(type), 400);
+
+            typeProp.setDataType("d:int");
+            post("cmm/" + modelName + "/types", RestApiUtil.toJsonAsString(type), 201);
+
+            // Retrieve the created type
+            HttpResponse response = getSingle("cmm/" + modelName + "/types", type.getName(), 200);
+            CustomType returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+            compareCustomTypesAspects(type, returnedType, "prefixedName", "indexTokenisationMode");
+            assertEquals("Shouldn't list the inherited properties from 'cm:content'.", 1, returnedType.getProperties().size());
+            CustomModelProperty customModelProperty = returnedType.getProperties().get(0);
+            assertEquals(typePropName, customModelProperty.getName());
+            assertEquals("d:int", customModelProperty.getDataType());
+            assertEquals(namespacePair.getSecond() + QName.NAMESPACE_PREFIX + typePropName, customModelProperty.getPrefixedName());
+            // Test default indexing options
+            assertTrue(customModelProperty.isIndexed());
+            assertEquals(Facetable.UNSET, customModelProperty.getFacetable());
+            assertEquals(IndexTokenisationMode.TRUE, customModelProperty.getIndexTokenisationMode());
+        }
+
+        {
+            // Add more types with the same parent
+            // Test to make sure the inherited properties are excluded properly.
+            // As without parent’s property exclusion, we won’t be able to
+            // create multiple types|aspects with the same parent.
+            String typeName2 = "testType2" + System.currentTimeMillis();
+            CustomType type2 = new CustomType();
+            type2.setName(typeName2);
+            type2.setDescription("test type2 Desc");
+            type2.setTitle("test type2 title");
+            type2.setParentName("cm:content");
+            post("cmm/" + modelName + "/types", RestApiUtil.toJsonAsString(type2), 201);
+
+            String typeName3 = "testType3" + System.currentTimeMillis();
+            CustomType type3 = new CustomType();
+            type3.setName(typeName3);
+            type3.setDescription("test type3 Desc");
+            type3.setTitle("test type3 title");
+            type3.setParentName("cm:content");
+            post("cmm/" + modelName + "/types", RestApiUtil.toJsonAsString(type3), 201);
+        }
+
+        {
+            // Retrieve the created model
+            HttpResponse response = getSingle("cmm", modelName, 200);
+            CustomModel returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+            assertNull(returnedModel.getTypes());
+            assertNull(returnedModel.getAspects());
+            
+            // Retrieve the created model with its types and aspects
+            response = getSingle("cmm", modelName + SELECT_ALL, 200);
+            returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+            assertNotNull(returnedModel.getTypes());
+            assertEquals(3, returnedModel.getTypes().size());
+            assertNotNull(returnedModel.getAspects());
+            assertEquals(1, returnedModel.getAspects().size());
+        }
+    }
+
+    @Test
+    //SHA-679
+    public void testCustomModelTypesAspectsDependencies() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelNameOne = "testModel" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelNameOne, namespacePair, ModelStatus.DRAFT, null, "Mark Moe");
+
+        // Add type
+        String typeBaseName = "testTypeBase" + System.currentTimeMillis();
+        final String typeBaseNameWithPrefix = namespacePair.getSecond() + QName.NAMESPACE_PREFIX + typeBaseName;
+        createTypeAspect(CustomType.class, modelNameOne, typeBaseName, "test typeBase title", "test typeBase Desc", "cm:content");
+
+        // Activate the model
+        CustomModel modelOneStatusPayload = new CustomModel();
+        modelOneStatusPayload.setStatus(ModelStatus.ACTIVE);
+        put("cmm", modelNameOne, RestApiUtil.toJsonAsString(modelOneStatusPayload), SELECT_STATUS_QS, 200);
+
+        HttpResponse response = getSingle("cmm", modelNameOne, 200);
+        CustomModel returnedModel = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomModel.class);
+        assertEquals(ModelStatus.ACTIVE, returnedModel.getStatus());
+
+        // Add another type with 'typeBaseName' as its parent
+        String typeName2 = "testTypeChild" + System.currentTimeMillis();
+        createTypeAspect(CustomType.class, modelNameOne, typeName2, "test typeChild title", "test typeChild Desc", typeBaseNameWithPrefix);
+
+        Paging paging = getPaging(0, Integer.MAX_VALUE);
+        response = getAll("cmm/" + modelNameOne + "/types", paging, 200);
+        List<CustomType> returnedTypes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), CustomType.class);
+        assertEquals(2, returnedTypes.size());
+
+        // Create another model
+        String modelNameTwo = "testModelTwo" + System.currentTimeMillis();
+        Pair<String, String> modelTwoNamespacePair = getTestNamespaceUriPrefixPair();
+        createCustomModel(modelNameTwo, modelTwoNamespacePair, ModelStatus.DRAFT, null, "Admin");
+
+        // Add a type with 'typeBaseName' from the modelOne as its parent
+        String modelTwoTypeName = "testModelTwoChild" + System.currentTimeMillis();
+        createTypeAspect(CustomType.class, modelNameTwo, modelTwoTypeName, "test model two type child title", null, typeBaseNameWithPrefix);
+
+        // Try to deactivate modelOne
+        modelOneStatusPayload = new CustomModel();
+        modelOneStatusPayload.setStatus(ModelStatus.DRAFT);
+        put("cmm", modelNameOne, RestApiUtil.toJsonAsString(modelOneStatusPayload), SELECT_STATUS_QS, 409); // ModelTwo depends on ModelOne
+
+        // Activate modelTwo
+        CustomModel modelTwoStatusPayload = new CustomModel();
+        modelTwoStatusPayload.setStatus(ModelStatus.ACTIVE);
+        put("cmm", modelNameTwo, RestApiUtil.toJsonAsString(modelTwoStatusPayload), SELECT_STATUS_QS, 200);
+  
+        // Try to deactivate modelOne again. The dependent model is Active now, however, the result should be the same.
+        put("cmm", modelNameOne, RestApiUtil.toJsonAsString(modelOneStatusPayload), SELECT_STATUS_QS, 409); // ModelTwo depends on ModelOne
+
+        // Deactivate modelTwo
+        modelTwoStatusPayload = new CustomModel();
+        modelTwoStatusPayload.setStatus(ModelStatus.DRAFT);
+        put("cmm", modelNameTwo, RestApiUtil.toJsonAsString(modelTwoStatusPayload), SELECT_STATUS_QS, 200);
+
+        // Delete the modelTwo's type as a Model Administrator
+        delete("cmm/" + modelNameTwo + "/types", modelTwoTypeName, 204);
+
+        // Try to deactivate modelOne again. There is no dependency
+        put("cmm", modelNameOne, RestApiUtil.toJsonAsString(modelOneStatusPayload), SELECT_STATUS_QS, 200);
+
+    }
+
+    @Test
+    public void testDeleteTypeAspect() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        final String modelName = "testDeleteTypeModel" + System.currentTimeMillis();
+        Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT, null, "Joe Bloggs");
+
+        // Add type
+        final String typeName = "testType" + System.currentTimeMillis();
+        final String typeNameWithPrefix = namespacePair.getSecond() + QName.NAMESPACE_PREFIX + typeName;
+        CustomType type = createTypeAspect(CustomType.class, modelName, typeName, "test type title", "test type Desc", "cm:content");
+
+        // Add aspect
+        final String aspectName = "testAspect" + System.currentTimeMillis();
+        final String aspectNameWithPrefix = namespacePair.getSecond() + QName.NAMESPACE_PREFIX + aspectName;
+        CustomAspect aspect = createTypeAspect(CustomAspect.class, modelName, aspectName, null, null, null);
+
+        // Delete type
+        {
+            setRequestContext(nonAdminUserName);
+            
+            // Try to delete the model's type as a non Admin user
+            delete("cmm/" + modelName + "/types", typeName, 403);
+
+            setRequestContext(customModelAdmin);
+            
+            // Delete the model's type as a Model Administrator
+            delete("cmm/" + modelName + "/types", typeName, 204);
+            // Try to retrieve the deleted type
+            getSingle("cmm/" + modelName + "/types", typeName, 404);
+        }
+        // Delete Aspect
+        {
+            setRequestContext(nonAdminUserName);
+            
+            // Try to delete the model's aspect as a non Admin user
+            delete("cmm/" + modelName + "/aspects", aspectName, 403);
+
+            setRequestContext(customModelAdmin);
+            
+            // Delete the model's aspect as a Model Administrator
+            delete("cmm/" + modelName + "/aspects", aspectName, 204);
+            // Try to retrieve the deleted aspect
+            getSingle("cmm/" + modelName + "/aspects", aspectName, 404);
+        }
+
+        setRequestContext(customModelAdmin);
+
+        // Create the type again
+        post("cmm/" + modelName + "/types", RestApiUtil.toJsonAsString(type), 201);
+        // Retrieve the created type
+        HttpResponse response = getSingle("cmm/" + modelName + "/types", type.getName(), 200);
+        CustomType returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+        compareCustomTypesAspects(type, returnedType, "prefixedName");
+
+        // Create the aspect again
+        post("cmm/" + modelName + "/aspects", RestApiUtil.toJsonAsString(aspect), 201);
+        // Retrieve the created aspect
+        response = getSingle("cmm/" + modelName + "/aspects", aspect.getName(), 200);
+        CustomAspect returnedAspect = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomAspect.class);
+        compareCustomTypesAspects(aspect, returnedAspect, "prefixedName");
+
+        // Update the Type by adding property
+        CustomType payload = new CustomType();
+        payload.setName(typeName);
+
+        String typePropName = "testType1Prop1" + System.currentTimeMillis();
+        CustomModelProperty typeProp = new CustomModelProperty();
+        typeProp.setName(typePropName);
+        typeProp.setTitle("property title");
+        typeProp.setDataType("d:int");
+        List<CustomModelProperty> props = new ArrayList<>(1);
+        props.add(typeProp);
+        payload.setProperties(props);
+        put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(payload), SELECT_PROPS_QS, 200);
+
+        // Activate the model
+        CustomModel statusPayload = new CustomModel();
+        statusPayload.setStatus(ModelStatus.ACTIVE);
+        // Activate the model as a Model Administrator
+        put("cmm", modelName, RestApiUtil.toJsonAsString(statusPayload), SELECT_STATUS_QS, 200);
+
+        // Test for SHA-703
+        // Add another type with 'typeName' as its parent
+        final String childTypeName = "testChildType" + System.currentTimeMillis();
+        createTypeAspect(CustomType.class, modelName, childTypeName, "test child type title", null, typeNameWithPrefix);
+
+        // Add another aspect with 'aspectName' as its parent
+        final String childAspectName = "testChildAspect" + System.currentTimeMillis();
+        createTypeAspect(CustomAspect.class, modelName, childAspectName, "test child aspect title", null, aspectNameWithPrefix);
+
+        // Delete the model's type as a Model Administrator
+        delete("cmm/" + modelName + "/types", typeName, 409); // Cannot delete a type of an active model
+
+        // Delete the model's aspect as a Model Administrator
+        delete("cmm/" + modelName + "/aspects", childAspectName, 409); // Cannot delete an aspect of an active model
+
+        // Deactivate the model
+        statusPayload = new CustomModel();
+        statusPayload.setStatus(ModelStatus.DRAFT);
+        // Deactivate the model as a Model Administrator
+        put("cmm", modelName, RestApiUtil.toJsonAsString(statusPayload), SELECT_STATUS_QS, 200);
+
+        // Delete type
+        {
+            // Try to delete the model's type (parent) as a Model Administrator
+            delete("cmm/" + modelName + "/types", typeName, 409); // conflict: childTypeName depends on typeName
+
+            // Delete the child type first
+            delete("cmm/" + modelName + "/types", childTypeName, 204); 
+            // Try to retrieve the deleted child type
+            getSingle("cmm/" + modelName + "/types", childTypeName, 404);
+
+            // Now delete the parent type
+            delete("cmm/" + modelName + "/types", typeName, 204); 
+            // Try to retrieve the deleted parent type
+            getSingle("cmm/" + modelName + "/types", typeName, 404);
+            
+        }
+
+        // Delete Aspect
+        {
+            // Try to delete the model's aspect (parent) as a Model Administrator
+            delete("cmm/" + modelName + "/aspects", aspectName, 409); // conflict: childAspectName depends on aspectName
+            
+            // Delete the child aspect first
+            delete("cmm/" + modelName + "/aspects", childAspectName, 204);
+            // Try to retrieve the deleted child aspect
+            getSingle("cmm/" + modelName + "/aspects", childAspectName, 404);
+
+            // Now delete the parent aspect
+            delete("cmm/" + modelName + "/aspects", aspectName, 204);
+            // Try to retrieve the deleted parent aspect
+            getSingle("cmm/" + modelName + "/aspects", aspectName, 404);
+        }
+    }
+
+    @Test
+    public void testUpdateAspectsTypes() throws Exception
+    {
+        setRequestContext(customModelAdmin);
+        
+        String modelName = "testModeEditAspectType" + System.currentTimeMillis();
+        final Pair<String, String> namespacePair = getTestNamespaceUriPrefixPair();
+        // Create the model as a Model Administrator
+        createCustomModel(modelName, namespacePair, ModelStatus.DRAFT);
+
+        // Test update aspect
+        {
+            // Create aspect
+            String aspectName = "testAspect" + System.currentTimeMillis();
+            createTypeAspect(CustomAspect.class, modelName, aspectName, "title", "desc", null);
+            // Update the aspect
+            CustomAspect aspectPayload = new CustomAspect();
+            aspectPayload.setDescription(null);
+            aspectPayload.setTitle("title modified");
+            aspectPayload.setParentName("cm:titled");
+
+            setRequestContext(nonAdminUserName);
+
+            // Try to update the aspect as a non Admin user
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), null, 403);
+
+            setRequestContext(customModelAdmin);
+            
+            // Modify the name
+            aspectPayload.setName(aspectName + "Modified");
+            // Try to update the aspect as a Model Administrator
+            // Note: aspect/type name cannot be modified
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), null, 404);
+
+            aspectPayload.setName(aspectName);
+            // Update the aspect as a Model Administrator
+            HttpResponse response = put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), null, 200);
+            CustomAspect returnedAspect = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomAspect.class);
+            compareCustomTypesAspects(aspectPayload, returnedAspect, "prefixedName");
+
+            // Update the aspect with an invalid parent
+            aspectPayload.setParentName("cm:titled" + System.currentTimeMillis());
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), null, 409);
+
+            // Activate the model
+            CustomModel statusPayload = new CustomModel();
+            statusPayload.setStatus(ModelStatus.ACTIVE);
+            put("cmm", modelName, RestApiUtil.toJsonAsString(statusPayload), SELECT_STATUS_QS, 200);
+
+            // Remove the aspect's parent
+            // Note: cannot update the parent of an ACTIVE type/aspect.
+            aspectPayload.setParentName(null);
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), null, 409);
+
+            statusPayload = new CustomModel();
+            statusPayload.setStatus(ModelStatus.DRAFT);
+            put("cmm", modelName, RestApiUtil.toJsonAsString(statusPayload), SELECT_STATUS_QS, 200);
+
+            // now update the aspect's parent - model is inactive
+            put("cmm/" + modelName + "/aspects", aspectName, RestApiUtil.toJsonAsString(aspectPayload), null, 200);
+        }
+        
+        // Test update type
+        { 
+            // Create type
+            String typeName = "testType" + System.currentTimeMillis();
+            createTypeAspect(CustomType.class, modelName, typeName, "title", "desc", "cm:content");
+
+            // Add property
+            CustomType addPropertyPayload = new CustomType();
+            addPropertyPayload.setName(typeName);
+            String typePropName = "testTypeProp1" + System.currentTimeMillis();
+            CustomModelProperty typeProp = new CustomModelProperty();
+            typeProp.setName(typePropName);
+            typeProp.setTitle("property title");
+            typeProp.setDataType("d:text");
+            List<CustomModelProperty> props = new ArrayList<>(1);
+            props.add(typeProp);
+            addPropertyPayload.setProperties(props);
+            // Create the property
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(addPropertyPayload), SELECT_PROPS_QS, 200);
+
+            // Update the type
+            CustomType typePayload = new CustomType();
+            typePayload.setDescription("desc modified");
+            typePayload.setTitle("title modified");
+
+            setRequestContext(nonAdminUserName);
+
+            // Try to update the type as a non Admin user
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), null, 403);
+
+            setRequestContext(customModelAdmin);
+            
+            // Modify the name
+            typePayload.setName(typeName + "Modified");
+            // Try to update the type as a Model Administrator
+            // Note: type/type name cannot be modified
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), null, 404);
+
+            typePayload.setName(typeName);
+            // Update the type as a Model Administrator
+            HttpResponse response = put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), null, 200);
+            CustomType returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+            assertEquals(typePayload.getDescription(), returnedType.getDescription());
+            assertEquals(typePayload.getTitle(), returnedType.getTitle());
+            // Check that properties are unmodified
+            assertNotNull(returnedType.getProperties());
+            assertEquals(1, returnedType.getProperties().size());
+            assertEquals(typePropName, returnedType.getProperties().iterator().next().getName());
+
+            // Update the type with an invalid parent
+            typePayload.setParentName("cm:folder" + System.currentTimeMillis());
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), null, 409);
+
+            // Activate the model
+            CustomModel statusPayload = new CustomModel();
+            statusPayload.setStatus(ModelStatus.ACTIVE);
+            put("cmm", modelName, RestApiUtil.toJsonAsString(statusPayload), SELECT_STATUS_QS, 200);
+
+            // Remove the type's parent
+            // Note: cannot update the parent of an ACTIVE type/type.
+            typePayload.setParentName("cm:folder");
+            put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), null, 409);
+
+            statusPayload = new CustomModel();
+            statusPayload.setStatus(ModelStatus.DRAFT);
+            put("cmm", modelName, RestApiUtil.toJsonAsString(statusPayload), SELECT_STATUS_QS, 200);
+
+            // now update the type's parent - model is inactive
+            response = put("cmm/" + modelName + "/types", typeName, RestApiUtil.toJsonAsString(typePayload), null, 200);
+            returnedType = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), CustomType.class);
+            assertEquals(typePayload.getParentName(), returnedType.getParentName());
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestDownloads.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestDownloads.java
new file mode 100644
index 00000000000..a114d1b01c7
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestDownloads.java
@@ -0,0 +1,579 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
+import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static org.alfresco.rest.api.impl.DownloadsImpl.DEFAULT_ARCHIVE_EXTENSION;
+import static org.alfresco.rest.api.impl.DownloadsImpl.DEFAULT_ARCHIVE_NAME;
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.rest.api.model.AssocChild;
+import org.alfresco.rest.api.model.Download;
+import org.alfresco.rest.api.nodes.NodesEntityResource;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.Folder;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.rest.framework.core.exceptions.ApiException;
+import org.alfresco.service.cmr.download.DownloadStatus;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.simple.JSONObject;
+import org.junit.Before;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+
+/**
+ * Tests the /downloads API
+ * 
+ * @author cpopa
+ *
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestDownloads extends AbstractBaseApiTest
+{     
+    private static Log logger = LogFactory.getLog(TestDownloads.class);
+    
+    private static final int NUMBER_OF_TIMES_TO_RETRY_TEST_CANCEL_STATUS = 5;
+
+    private static final int STATUS_CHECK_SLEEP_TIME = 5;
+
+    private static final int NUMBER_OF_TIMES_TO_CHECK_STATUS = 200;
+
+    public static final String NODES_SECONDARY_CHILDREN = "nodes/%s/secondary-children";
+
+    public static final String API_DOWNLOADS = "downloads";
+    
+    private static final String DOC4_NAME = "docTest4.txt";
+    private static final String SUB_FOLDER1_NAME = "subFolder1";
+    private static final String DOC3_NAME = "docTest3.txt";
+    private static final String FOLDER1_NAME = "folder1";
+    private static final String FOLDER3_NAME = "folder3";
+    private static final String ZIPPABLE_DOC1_NAME = "docTest1.txt";
+    private static final String DUMMY_CONTENT = "dummy content";
+    private org.alfresco.rest.api.Nodes nodesApi;
+    private String zippableDocId1;
+    private String zippableDocId2;
+    private String zippableDocId3_InFolder1;
+    private String zippableFolderId1;
+    private String zippableFolderId2_InFolder1;
+    private String zippableDocId4_InFolder2;
+    private String zippableFolderId3;
+    private String zippableDoc_user2;
+    
+    @Before
+    public void setupTest() throws IOException, Exception{
+        nodesApi = applicationContext.getBean("Nodes", org.alfresco.rest.api.Nodes.class);
+        
+        setRequestContext(user1);
+        
+        Document zippableDoc1 = createTextFile(tDocLibNodeId, ZIPPABLE_DOC1_NAME, DUMMY_CONTENT);
+        zippableDocId1 = zippableDoc1.getId();
+        zippableDocId2 = createTextFile(tDocLibNodeId, "docTest2", DUMMY_CONTENT).getId();
+        
+        Folder zippableFolder1 = createFolder(tDocLibNodeId, FOLDER1_NAME);
+        zippableFolderId1 = zippableFolder1.getId();
+        zippableDocId3_InFolder1 = createTextFile(zippableFolderId1, DOC3_NAME, DUMMY_CONTENT).getId();
+        
+        Folder zippableFolder2_InFolder1 = createFolder(zippableFolderId1, SUB_FOLDER1_NAME);
+        zippableFolderId2_InFolder1 = zippableFolder2_InFolder1.getId();
+        
+        zippableDocId4_InFolder2 = createTextFile(zippableFolderId2_InFolder1, DOC4_NAME, DUMMY_CONTENT).getId();
+        
+        Folder zippableFolder3 = createFolder(tDocLibNodeId, FOLDER3_NAME);
+        zippableFolderId3 = zippableFolder3.getId();
+        
+        setRequestContext(user2);
+        String user2Site = createSite ("TestSite B - " + RUNID, SiteVisibility.PRIVATE).getId();
+        String user2DocLib = getSiteContainerNodeId(user2Site, "documentLibrary");
+        zippableDoc_user2 = createTextFile(user2DocLib, "user2doc", DUMMY_CONTENT).getId();
+        
+        setRequestContext(user1);
+        AssocChild secChild = new AssocChild(zippableDoc1.getId(), ASSOC_TYPE_CM_CONTAINS);
+        post(format(NODES_SECONDARY_CHILDREN, zippableFolder3.getId()), toJsonAsStringNonNull(secChild), HttpServletResponse.SC_CREATED);
+    }
+    
+    
+    /**
+     * Tests the creation of download nodes.
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/private/alfresco/versions/1/downloads}
+     *
+     */
+	@Test
+	public void test001CreateDownload() throws Exception
+	{   
+	    //test creating a download with a single file
+        Download download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableDocId1);
+        
+        assertPendingDownloadProps(download);
+        
+        assertValidZipNodeid(download);
+        
+        assertDoneDownload(download, 1, 13);
+       
+        //test creating a multiple file archive
+        download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableDocId1, zippableDocId2);
+        
+        assertPendingDownloadProps(download);
+        
+        assertValidZipNodeid(download);
+        
+        assertDoneDownload(download, 2, 26);
+        
+        //test creating a zero file archive
+        createDownload(HttpServletResponse.SC_BAD_REQUEST);
+        
+        //test creating an archive with the same file twice
+        download = createDownload(HttpServletResponse.SC_BAD_REQUEST, zippableDocId1, zippableDocId1);
+        
+        //test creating an archive with a folder and a file which is contained in the folder
+        download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableFolderId1, zippableDocId3_InFolder1);
+        
+        assertPendingDownloadProps(download);
+        
+        assertValidZipNodeid(download);
+        
+        assertDoneDownload(download, 3, 39);
+        
+        //test creating an archive with a file and a folder containing that file but only as a secondary parent child association
+        download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableDocId1, zippableFolderId3);
+        
+        assertPendingDownloadProps(download);
+        
+        assertValidZipNodeid(download);
+        
+        assertDoneDownload(download, 2, 26);
+        
+        //test creating an archive with two files, one of which user1 does not have permissions for
+        download = createDownload(HttpServletResponse.SC_FORBIDDEN, zippableDocId1, zippableDoc_user2);
+	}   
+	
+	/**
+     * Tests retrieving info about a download node
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/private/alfresco/versions/1/downloads/<download_id>}
+     *
+     */
+    @Test
+    public void test002GetDownloadInfo() throws Exception
+    {  
+        Download download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableFolderId1, zippableFolderId2_InFolder1, zippableDocId4_InFolder2);
+        
+        //test retrieving information about an ongoing download
+        assertInProgressDownload(download, 4, 52);
+             
+        //test retrieving information about a finished download
+        assertDoneDownload(download, 4, 52);
+        
+        //test retrieving the status of a cancelled download
+        cancelWithRetry(() -> 
+        {
+            Download downloadToBeCancelled = createDownload(HttpServletResponse.SC_ACCEPTED, zippableFolderId1, zippableDocId3_InFolder1);            
+            cancel(downloadToBeCancelled.getId());            
+            assertCancelledDownload(downloadToBeCancelled, 3, 39);
+        });
+    }
+    
+    /**
+     * Tests canceling a download.
+     *
+     * <p>DELETE:</p>
+     * {@literal <host>:<port>/alfresco/api/-default-/private/alfresco/versions/1/downloads/<download_id>}
+     * 
+     */
+    @Test
+    public void test003CancelDownload() throws Exception
+    {
+        //cancel a running download operation.
+        cancelWithRetry(()->{
+            Download download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableFolderId1, zippableDocId3_InFolder1, zippableDocId1, zippableDocId2);            
+            cancel(download.getId());            
+            assertCancelledDownload(download, 5, 65);
+        });
+        
+        //cancel a completed download - should have no effect
+        Download download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableDocId1, zippableDocId2);
+        
+        assertDoneDownload(download, 2, 26);
+        
+        cancel(download.getId());
+        
+        Thread.sleep(500);
+        
+        Download downloadStatus = getDownload(download.getId());
+        
+        assertTrue("A cancel operation on a DONE download has no effect.", downloadStatus.getStatus().equals(DownloadStatus.Status.DONE));
+        
+        //cancel a node which is not of a download type
+        cancel(HttpServletResponse.SC_BAD_REQUEST, zippableDocId1);
+        
+        //user2 canceling user1 download operation - should not be allowed
+        download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableDocId1);
+        
+        setRequestContext(user2);
+        
+        cancel(HttpServletResponse.SC_FORBIDDEN, download.getId());
+    }
+    
+    /**
+     * Tests downloading the content of a download node(a zip) using the /nodes API:
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>/content}
+     * 
+     */
+    @Test
+    public void test004GetDownloadContent() throws Exception{
+        
+        //test downloading the content of a 1 file zip
+        Download download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableDocId1);
+        
+        assertDoneDownload(download, 1, 13);
+        
+        HttpResponse response = downloadContent(download);
+          
+        ZipInputStream zipStream = getZipStreamFromResponse(response);
+        
+        ZipEntry zipEntry = zipStream.getNextEntry();
+        
+        assertEquals("Zip entry name is not correct", ZIPPABLE_DOC1_NAME, zipEntry.getName());
+        
+        assertTrue("Zip entry size is not correct", zipEntry.getCompressedSize() <= 13);
+        
+        assertTrue("No more entries should be in this zip", zipStream.getNextEntry() == null);
+        zipStream.close();        
+        
+        Map<String, String> responseHeaders = response.getHeaders();
+        
+        assertNotNull(responseHeaders);
+        
+        assertEquals(format("attachment; filename=\"%s\"; filename*=UTF-8''%s", ZIPPABLE_DOC1_NAME + DEFAULT_ARCHIVE_EXTENSION,
+                                                                                ZIPPABLE_DOC1_NAME + DEFAULT_ARCHIVE_EXTENSION), 
+                                                                        responseHeaders.get("Content-Disposition"));
+        
+        //test downloading the content of a multiple file zip
+        download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableFolderId1, zippableDocId3_InFolder1);
+        
+        assertDoneDownload(download, 3, 39);
+        
+        response = downloadContent(download);
+        
+        zipStream = getZipStreamFromResponse(response);
+        
+        assertEquals("Zip entry name is not correct", FOLDER1_NAME + "/", zipStream.getNextEntry().getName());
+        assertEquals("Zip entry name is not correct", FOLDER1_NAME + "/" + DOC3_NAME, zipStream.getNextEntry().getName());
+        assertEquals("Zip entry name is not correct", FOLDER1_NAME + "/" + SUB_FOLDER1_NAME + "/", zipStream.getNextEntry().getName());
+        assertEquals("Zip entry name is not correct", FOLDER1_NAME + "/" + SUB_FOLDER1_NAME + "/" + DOC4_NAME, zipStream.getNextEntry().getName());
+        assertEquals("Zip entry name is not correct", DOC3_NAME, zipStream.getNextEntry().getName());
+        
+        assertTrue("No more entries should be in this zip", zipStream.getNextEntry() == null);
+        zipStream.close();       
+        
+        responseHeaders = response.getHeaders();
+        
+        assertNotNull(responseHeaders);
+        
+        assertEquals(format("attachment; filename=\"%s\"; filename*=UTF-8''%s", DEFAULT_ARCHIVE_NAME,
+                                                                                DEFAULT_ARCHIVE_NAME), 
+                                                                        responseHeaders.get("Content-Disposition"));
+        
+        //test download the content of a zip which has a secondary child
+        download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableDocId1, zippableFolderId3);
+        assertDoneDownload(download, 2, 26);
+        
+        response = downloadContent(download);
+        
+        zipStream = getZipStreamFromResponse(response);
+        
+        assertEquals("Zip entry name is not correct", ZIPPABLE_DOC1_NAME, zipStream.getNextEntry().getName());
+        assertEquals("Zip entry name is not correct", FOLDER3_NAME + "/", zipStream.getNextEntry().getName());
+        assertEquals("Zip entry name is not correct", FOLDER3_NAME + "/" + ZIPPABLE_DOC1_NAME, zipStream.getNextEntry().getName());
+        assertTrue("No more entries should be in this zip", zipStream.getNextEntry() == null);
+    }
+    
+    /**
+     * Tests deleting a download node using the /nodes API:
+     *
+     * <p>DELETE:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/nodes/<nodeId>}
+     * 
+     */
+    @Test 
+    public void test005DeleteDownloadNode() throws Exception{
+        
+        //test deleting a download node
+        Download download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableDocId1);
+        
+        assertDoneDownload(download, 1, 13);
+        
+        deleteNode(download.getId(), true, HttpServletResponse.SC_NO_CONTENT);
+        
+        getDownload(download.getId(), HttpServletResponse.SC_NOT_FOUND);
+        
+        //test user2 deleting a download node created by user1
+        download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableDocId1);
+        
+        assertDoneDownload(download, 1, 13);
+        
+        setRequestContext(user2);
+        
+        deleteNode(download.getId(), true, HttpServletResponse.SC_FORBIDDEN);
+
+        setRequestContext(user1);
+        assertDoneDownload(download, 1, 13);
+
+        // user2 should not be able to read information about downloads started by other users
+        setRequestContext(user2);
+        getDownload(download.getId(), HttpServletResponse.SC_FORBIDDEN);
+    }
+    
+    protected ZipInputStream getZipStreamFromResponse(HttpResponse response)
+    {
+        return new ZipInputStream(new ByteArrayInputStream(response.getResponseAsBytes()));
+    }
+
+    protected HttpResponse downloadContent(Download download) throws Exception
+    {
+        return getSingle(NodesEntityResource.class, download.getId() + "/content", null, HttpServletResponse.SC_OK);
+    }
+    
+    /**
+     * It may happen that a download is already done before getting a chance to call cancel(). Hence retry a couple of times.
+     * @param cancelAction
+     * @throws Exception
+     */
+    private void cancelWithRetry(CancelAction cancelAction) throws Exception{
+        for(int i = 0; i<=NUMBER_OF_TIMES_TO_RETRY_TEST_CANCEL_STATUS; i++)
+        {
+            if (i == NUMBER_OF_TIMES_TO_RETRY_TEST_CANCEL_STATUS)
+            {
+                logger.error("Did not manage to test the cancel status, the download node gets to the DONE status too fast.");
+            }
+            try
+            {
+                cancelAction.run();
+            }catch(DownloadAlreadyDoneException e)
+            {
+                continue;
+            }
+        }
+    }
+    
+    private void assertDoneDownload(Download download, int expectedFilesAdded, int expectedTotal) throws Exception, InterruptedException
+    {
+        assertExpectedStatus(DownloadStatus.Status.DONE, download, "Download should be DONE by now.", downloadStatus -> 
+        {
+            assertTrue("The number of bytes added in the archive does not match the total", downloadStatus.getBytesAdded() == downloadStatus.getTotalBytes());
+            assertEquals("The number of files added in the archive should be " + expectedFilesAdded, expectedFilesAdded, downloadStatus.getFilesAdded());
+            assertEquals("The total number of bytes should be " + expectedTotal, expectedTotal, downloadStatus.getTotalBytes());
+            assertEquals("The total number of files of the final archive should be " + expectedFilesAdded, expectedFilesAdded, downloadStatus.getTotalFiles());
+        }, null, null);
+    }
+
+    protected void assertCancelledDownload(Download download, int expectedTotalFiles, int expectedTotal) throws PublicApiException, Exception, InterruptedException
+    {
+        assertExpectedStatus(DownloadStatus.Status.CANCELLED, download, "Download should be CANCELLED by now.", downloadStatus -> 
+        {
+            assertTrue("The total bytes added to the archive by now should be greater than 0", downloadStatus.getBytesAdded() > 0 && downloadStatus.getBytesAdded() <= downloadStatus.getTotalBytes());
+            assertTrue("The download has been cancelled, there should still be files to be added.", downloadStatus.getFilesAdded() < downloadStatus.getTotalFiles());
+            assertEquals("The total number of bytes should be " + expectedTotal, expectedTotal, downloadStatus.getTotalBytes());
+            assertEquals("The total number of files to be added to the archive should be " + expectedTotalFiles, expectedTotalFiles, downloadStatus.getTotalFiles());
+        }, DownloadStatus.Status.DONE, downloadStatus->
+        {
+            throw new DownloadAlreadyDoneException();
+        });
+    }
+
+    private void assertInProgressDownload(Download download, int expectedTotalFiles, int expectedTotal) throws Exception, InterruptedException
+    {
+        assertExpectedStatus(DownloadStatus.Status.IN_PROGRESS, download, "Download creation is taking too long.Download status should be at least IN_PROGRESS by now.", downloadStatus -> 
+        {
+            //'done' can be equal to the 'total' even though the status is IN_PROGRESS. See ZipDownloadExporter line 239
+            assertTrue("The total bytes added to the archive by now should be greater than 0", downloadStatus.getBytesAdded() > 0 && downloadStatus.getBytesAdded() <= downloadStatus.getTotalBytes());
+            assertTrue("The download is in progress, there should still be files to be added.", downloadStatus.getFilesAdded() < downloadStatus.getTotalFiles());
+            assertEquals("The total number of bytes should be " + expectedTotal, expectedTotal, downloadStatus.getTotalBytes());
+            assertEquals("The total number of files to be added to the archive should be " + expectedTotalFiles, expectedTotalFiles, downloadStatus.getTotalFiles());
+        }, DownloadStatus.Status.DONE, downloadStatus ->
+        {
+            try
+            {
+                assertDoneDownload(download, expectedTotalFiles, expectedTotal);
+            }
+            catch (Exception e)
+            { 
+                throw new RuntimeException(e);
+            }
+        });
+    }
+    
+    private void assertExpectedStatus(DownloadStatus.Status expectedStatus, Download download, String failMessage, Consumer<Download> assertionsToDo, 
+                                      DownloadStatus.Status alternateExpectedStatus, Consumer<Download> alternateAssertionsToDo) throws Exception{
+        for(int i = 0; i<=NUMBER_OF_TIMES_TO_CHECK_STATUS; i++){
+            if (i == NUMBER_OF_TIMES_TO_CHECK_STATUS)
+            {
+                fail(failMessage);
+            }
+            Download downloadStatus = getDownload(download.getId());
+            if (alternateExpectedStatus != null && downloadStatus.getStatus().equals(alternateExpectedStatus))
+            {
+                alternateAssertionsToDo.accept(downloadStatus);
+                break;
+            }
+            else if (!downloadStatus.getStatus().equals(expectedStatus))
+            {
+                Thread.sleep(STATUS_CHECK_SLEEP_TIME);
+            }else
+            {
+                assertionsToDo.accept(downloadStatus);
+                break;
+            }
+        }
+    }
+
+    protected void setRequestContext(String user)
+    {
+        setRequestContext(networkOne.getId(), user, null);
+    }
+
+    private void assertValidZipNodeid(Download download)
+    {
+        try{
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+
+                @Override
+                public Void doWork() throws Exception
+                {
+                    nodesApi.validateNode(download.getId());
+                    return null;
+                }
+            }, user1, networkOne.getId());
+            
+        }catch(ApiException ex){
+            org.junit.Assert.fail("The download nodeid is not valid." + ex.getMessage());
+        }
+    }
+
+    private void assertPendingDownloadProps(Download download)
+    {
+        assertEquals("The download request hasn't been processed yet, the status is not correct", DownloadStatus.Status.PENDING, download.getStatus());
+        assertEquals("Should be 0, the download req hasn't been processed yet", 0, download.getBytesAdded());
+        assertEquals("Should be 0, the download req hasn't been processed yet", 0, download.getFilesAdded());
+        assertEquals("Should be 0, the download req hasn't been processed yet", 0, download.getTotalBytes());
+        assertEquals("Should be 0, the download req hasn't been processed yet", 0, download.getTotalFiles());
+    }
+
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }    
+    
+    private Download createDownload(int expectedStatus, String ... nodeIds) throws Exception
+    {
+        Download downloadRequest = new Download();
+        downloadRequest.setNodeIds(Arrays.asList(nodeIds));
+        
+        setRequestContext(user1);
+        
+        Download download = create(downloadRequest, expectedStatus);
+        return download;
+    }
+
+    public Download create(Download download, int expectedStatus) throws Exception
+    {
+        HttpResponse response  = post(API_DOWNLOADS, RestApiUtil.toJsonAsStringNonNull(download), expectedStatus);
+        return getDownloadFromResponse(response);
+    }
+    
+    public Download getDownload(String downloadId, int expectedStatus) throws Exception
+    {
+        HttpResponse response = getSingle(API_DOWNLOADS, downloadId, expectedStatus);
+
+        return getDownloadFromResponse(response);
+    }
+
+    public Download getDownload(String downloadId) throws Exception
+    {
+        return getDownload(downloadId, HttpServletResponse.SC_OK);
+    }
+    
+    public void cancel(String downloadId) throws Exception
+    {
+        cancel(HttpServletResponse.SC_ACCEPTED, downloadId);
+    }
+    
+    public void cancel(int expectedStatusCode, String downloadId) throws Exception
+    {
+        delete(API_DOWNLOADS, downloadId, expectedStatusCode);
+    }
+    
+    protected Download getDownloadFromResponse(HttpResponse response) throws Exception
+    {
+        if (asList(SC_ACCEPTED, SC_OK).contains(response.getStatusCode()))
+        {
+            return RestApiUtil.parseRestApiEntry((JSONObject) response.getJsonResponse(), Download.class);
+        }
+        return null;
+    }
+    
+    private static class DownloadAlreadyDoneException extends RuntimeException
+    {        
+    }
+    
+    private interface CancelAction{
+        void run() throws Exception;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestEnterpriseAtomPubTCK.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestEnterpriseAtomPubTCK.java
new file mode 100644
index 00000000000..8f2ac3b546f
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestEnterpriseAtomPubTCK.java
@@ -0,0 +1,207 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.opencmis.OpenCMISClientContext;
+import org.alfresco.opencmis.tck.tests.query.QueryForObjectCustom;
+import org.alfresco.opencmis.tck.tests.query.QueryInFolderTestCustom;
+import org.alfresco.opencmis.tck.tests.query.QueryLikeTestCustom;
+import org.alfresco.repo.dictionary.DictionaryDAO;
+import org.alfresco.repo.dictionary.M2Aspect;
+import org.alfresco.repo.dictionary.M2Model;
+import org.alfresco.repo.dictionary.M2Property;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.web.util.JettyComponent;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.alfresco.util.testing.category.RedundantTests;
+import org.apache.chemistry.opencmis.commons.enums.BindingType;
+import org.apache.chemistry.opencmis.tck.impl.AbstractSessionTestGroup;
+import org.apache.chemistry.opencmis.tck.impl.JUnitHelper;
+import org.apache.chemistry.opencmis.tck.impl.TestParameters;
+import org.apache.chemistry.opencmis.tck.tests.basics.BasicsTestGroup;
+import org.apache.chemistry.opencmis.tck.tests.control.ControlTestGroup;
+import org.apache.chemistry.opencmis.tck.tests.crud.CRUDTestGroup;
+import org.apache.chemistry.opencmis.tck.tests.filing.FilingTestGroup;
+import org.apache.chemistry.opencmis.tck.tests.query.ContentChangesSmokeTest;
+import org.apache.chemistry.opencmis.tck.tests.query.QuerySmokeTest;
+import org.apache.chemistry.opencmis.tck.tests.types.TypesTestGroup;
+import org.apache.chemistry.opencmis.tck.tests.versioning.CheckedOutTest;
+import org.apache.chemistry.opencmis.tck.tests.versioning.VersionDeleteTest;
+import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningSmokeTest;
+import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningStateCreateTest;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+/**
+ * OpenCMIS TCK unit tests.
+ * 
+ * @author steveglover
+ *
+ */
+public class TestEnterpriseAtomPubTCK extends AbstractEnterpriseOpenCMIS10TCKTest
+{
+	private static final String CMIS_URL = "http://{0}:{1}/{2}/cmisatom";
+	protected static final Log logger = LogFactory.getLog(TestEnterpriseAtomPubTCK.class);
+
+	@Before
+	public void setup() throws Exception
+	{
+		JettyComponent jetty = getTestFixture().getJettyComponent();
+		
+		final SearchService searchService = (SearchService)jetty.getApplicationContext().getBean("searchService");;
+		final NodeService nodeService = (NodeService)jetty.getApplicationContext().getBean("nodeService");
+		final FileFolderService fileFolderService = (FileFolderService)jetty.getApplicationContext().getBean("fileFolderService");
+		final NamespaceService namespaceService = (NamespaceService)jetty.getApplicationContext().getBean("namespaceService");
+		final TransactionService transactionService = (TransactionService)jetty.getApplicationContext().getBean("transactionService");
+		final String name = "abc" + System.currentTimeMillis();
+
+		transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
+		{
+			@Override
+			public Void execute() throws Throwable
+			{
+				AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+                Repository repositoryHelper = (Repository)jetty.getApplicationContext().getBean("repositoryHelper");
+				NodeRef companyHome = repositoryHelper.getCompanyHome();
+				fileFolderService.create(companyHome, name, ContentModel.TYPE_FOLDER).getNodeRef();
+
+				return null;
+			}
+		}, false, true);
+
+    	int port = jetty.getPort();
+    	Map<String, String> cmisParameters = new HashMap<String, String>();
+    	cmisParameters.put(TestParameters.DEFAULT_RELATIONSHIP_TYPE, "R:cm:replaces");
+    	cmisParameters.put(TestParameters.DEFAULT_TEST_FOLDER_PARENT, "/" + name);
+    	clientContext = new OpenCMISClientContext(BindingType.ATOMPUB,
+    			MessageFormat.format(CMIS_URL, "localhost", String.valueOf(port), "alfresco"), "admin", "admin", cmisParameters, jetty.getApplicationContext());
+
+        overrideVersionableAspectProperties(jetty.getApplicationContext());
+	}
+
+// Commented out: See https://issues.alfresco.com/jira/browse/MNT-11123?focusedCommentId=339130&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-339130
+//    @Test
+//    public void testCMISTCKBasics() throws Exception
+//    {
+//        BasicsTestGroup basicsTestGroup = new BasicsTestGroup();
+//        JUnitHelper.run(basicsTestGroup);
+//    }
+    
+    @Test
+    public void testCMISTCKCRUD() throws Exception
+    {
+        CRUDTestGroup crudTestGroup = new CRUDTestGroup();
+        JUnitHelper.run(crudTestGroup);
+    }
+
+    @Test
+    public void testCMISTCKVersioning() throws Exception
+    {
+        OverrideVersioningTestGroup versioningTestGroup = new OverrideVersioningTestGroup();
+        JUnitHelper.run(versioningTestGroup);
+    }
+    
+    @Test
+    public void testCMISTCKFiling() throws Exception
+    {
+        FilingTestGroup filingTestGroup = new FilingTestGroup();
+        JUnitHelper.run(filingTestGroup);
+    }
+    
+    @Test
+    public void testCMISTCKControl() throws Exception
+    {
+        ControlTestGroup controlTestGroup = new ControlTestGroup();
+        JUnitHelper.run(controlTestGroup);
+    }
+
+    @Test
+    @Category({LuceneTests.class, RedundantTests.class})
+    public void testCMISTCKQuery() throws Exception
+    {
+        OverrideQueryTestGroup queryTestGroup = new OverrideQueryTestGroup();
+        JUnitHelper.run(queryTestGroup);
+    }
+
+    private class OverrideVersioningTestGroup extends AbstractSessionTestGroup
+    {
+        @Override
+        public void init(Map<String, String> parameters) throws Exception
+        {
+            super.init(parameters);
+
+            setName("Versioning Test Group");
+            setDescription("Versioning tests.");
+
+            addTest(new VersioningSmokeTest());
+            addTest(new VersionDeleteTest());
+            addTest(new VersioningStateCreateTest());
+            // relies on Solr being available
+            addTest(new CheckedOutTest());
+        }
+    }
+
+    private class OverrideQueryTestGroup extends AbstractSessionTestGroup
+    {
+        @Override
+        public void init(Map<String, String> parameters) throws Exception
+        {
+            super.init(parameters);
+
+            setName("Query Test Group");
+            setDescription("Query and content changes tests.");
+
+            addTest(new QuerySmokeTest());
+            // The test fails on Lucene see MNT-11223
+            // addTest(new QueryRootFolderTest());
+            addTest(new QueryForObjectCustom());
+            addTest(new QueryLikeTestCustom());
+            addTest(new QueryInFolderTestCustom());
+            addTest(new ContentChangesSmokeTest());
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestFavouriteSites.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestFavouriteSites.java
new file mode 100644
index 00000000000..1e01c60352e
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestFavouriteSites.java
@@ -0,0 +1,546 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.rest.api.tests.RepoService.SiteInformation;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Sites;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.FavouriteSite;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.apache.commons.httpclient.HttpStatus;
+import org.junit.Test;
+
+public class TestFavouriteSites extends EnterpriseTestApi
+{
+	@Test
+	public void testFavouriteSites() throws Exception
+	{
+		Iterator<TestNetwork> networksIt = getTestFixture().getNetworksIt();
+		assertTrue(networksIt.hasNext());
+		final TestNetwork network1 = networksIt.next();
+		assertTrue(networksIt.hasNext());
+		final TestNetwork network2 = networksIt.next();
+
+		// Create some users and sites
+		final List<TestPerson> people = new ArrayList<TestPerson>();
+
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+        		TestPerson person = network1.createUser();
+        		people.add(person);
+        		person = network1.createUser();
+        		people.add(person);
+        		person = network1.createUser();
+        		people.add(person);
+
+        		return null;
+			}
+        }, network1.getId());
+
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+        		TestPerson person = network2.createUser();
+        		people.add(person);
+        		person = network2.createUser();
+        		people.add(person);
+
+        		return null;
+        	}
+        }, network2.getId());
+
+		final TestPerson person1 = people.get(0);
+		final TestPerson person2 = people.get(1);
+		final TestPerson person3 = people.get(2);
+		final TestPerson person4 = people.get(3);
+		final TestPerson person5 = people.get(3);
+
+		TestSite testSite = transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<TestSite>()
+        {
+        	@SuppressWarnings("synthetic-access")
+        	public TestSite execute() throws Throwable
+        	{
+				return TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+				{
+					public TestSite doWork() throws Exception
+					{
+						SiteInformation siteInfo = new SiteInformation(GUID.generate(), "", "", SiteVisibility.PUBLIC);
+						return network1.createSite(siteInfo);
+					}
+				}, person1.getId(), network1.getId());
+        	}
+        }, false, true);
+
+		TestSite testSite1 = transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<TestSite>()
+        {
+        	@SuppressWarnings("synthetic-access")
+        	public TestSite execute() throws Throwable
+        	{
+				return TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+				{
+					public TestSite doWork() throws Exception
+					{
+						SiteInformation siteInfo = new SiteInformation(GUID.generate(), "", "", SiteVisibility.PUBLIC);
+						return network1.createSite(siteInfo);
+					}
+				}, person1.getId(), network1.getId());
+        	}
+        }, false, true);
+
+		TestSite testSite3 = transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<TestSite>()
+        {
+        	@SuppressWarnings("synthetic-access")
+        	public TestSite execute() throws Throwable
+        	{
+				return TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+				{
+					public TestSite doWork() throws Exception
+					{
+						SiteInformation siteInfo = new SiteInformation(GUID.generate(), "", "", SiteVisibility.PUBLIC);
+						return network1.createSite(siteInfo);
+					}
+				}, person1.getId(), network1.getId());
+        	}
+        }, false, true);
+		
+		TestSite testSite4 = transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<TestSite>()
+        {
+        	@SuppressWarnings("synthetic-access")
+        	public TestSite execute() throws Throwable
+        	{
+				return TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+				{
+					public TestSite doWork() throws Exception
+					{
+						SiteInformation siteInfo = new SiteInformation(GUID.generate(), "", "", SiteVisibility.PUBLIC);
+						return network1.createSite(siteInfo);
+					}
+				}, person5.getId(), network2.getId());
+        	}
+        }, false, true);
+
+		Sites sitesProxy = publicApiClient.sites();
+
+		// invalid methods
+		try
+		{
+			FavouriteSite fs = new FavouriteSite(testSite.getSiteId());
+
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			sitesProxy.create("people", person1.getId(), "favorite-sites", testSite.getSiteId(), fs.toJSON().toString(), "Unable to POST to a favorite-site");
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+		
+		try
+		{
+			FavouriteSite fs = new FavouriteSite(testSite.getSiteId());
+
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			sitesProxy.update("people", person1.getId(), "favorite-sites", null, fs.toJSON().toString(), "Unable to PUT favorite-sites");
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+
+		try
+		{
+			FavouriteSite fs = new FavouriteSite(testSite.getSiteId());
+
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			sitesProxy.update("people", person1.getId(), "favorite-sites", testSite.getSiteId(), fs.toJSON().toString(), "Unable to PUT a favorite-site");
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+		
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			sitesProxy.remove("people", person1.getId(), "favorite-sites", null, "Unable to DELETE favorite-sites");
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+
+		// Create favourite site
+
+		// unknown user - 404
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			FavouriteSite fs = new FavouriteSite(testSite.getSiteId());
+			sitesProxy.createFavouriteSite("invalid.user", fs);
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+		
+		// user from another network - 401 (not able to auth against tenant)
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person4.getId()));
+			FavouriteSite fs = new FavouriteSite(testSite.getSiteId());
+			sitesProxy.createFavouriteSite(person1.getId(), fs);
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+		}
+
+		// another user from the same network
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			FavouriteSite fs = new FavouriteSite(testSite.getSiteId());
+			sitesProxy.createFavouriteSite(person2.getId(), fs);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());
+		}
+
+		// a member of this site
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			FavouriteSite fs = new FavouriteSite(testSite.getSiteId());
+			FavouriteSite resp = sitesProxy.createFavouriteSite(person1.getId(), fs);
+			fs.expected(resp);
+		}
+
+		// add same favourite site
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			sitesProxy.createFavouriteSite(person1.getId(), new FavouriteSite(testSite.getSiteId()));
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(409, e.getHttpResponse().getStatusCode());
+		}
+
+		// "-me" user
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+			FavouriteSite fs = new FavouriteSite(testSite.getSiteId());
+			FavouriteSite resp = sitesProxy.createFavouriteSite(org.alfresco.rest.api.People.DEFAULT_USER, fs);
+			fs.expected(resp);
+
+			final List<FavouriteSite> expectedFavouriteSites = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<FavouriteSite>>()
+			{
+				@Override
+				public List<FavouriteSite> doWork() throws Exception
+				{
+					return repoService.getFavouriteSites(person2);
+				}
+			}, person2.getId(), network1.getId());
+			
+			// check it's there
+			int skipCount = 0;
+			int maxItems = Integer.MAX_VALUE;
+			Paging paging = getPaging(skipCount, maxItems, expectedFavouriteSites.size(), expectedFavouriteSites.size());
+
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+			sitesProxy.getFavouriteSites(person2.getId(), createParams(paging, null));
+		}
+
+		// not a member of this site
+		{
+			FavouriteSite fs = new FavouriteSite(testSite1.getSiteId());
+
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			FavouriteSite ret = sitesProxy.createFavouriteSite(person1.getId(), fs);
+			fs.expected(ret);
+		}
+
+		// GET favourite sites
+		{
+			final List<FavouriteSite> expectedFavouriteSites = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<FavouriteSite>>()
+			{
+				@Override
+				public List<FavouriteSite> doWork() throws Exception
+				{
+					return repoService.getFavouriteSites(person1);
+				}
+			}, person1.getId(), network1.getId());
+
+			// Test Case cloud-1490
+			// unknown user
+			try
+			{
+				int skipCount = 0;
+				int maxItems = Integer.MAX_VALUE;
+				Paging paging = getPaging(skipCount, maxItems, expectedFavouriteSites.size(), expectedFavouriteSites.size());
+	
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				sitesProxy.getFavouriteSites(GUID.generate(), createParams(paging, null));
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+	
+			// authentication: unknown user
+			try
+			{
+				int skipCount = 0;
+				int maxItems = Integer.MAX_VALUE;
+				Paging paging = getPaging(skipCount, maxItems, expectedFavouriteSites.size(), expectedFavouriteSites.size());
+	
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), GUID.generate(), "password"));
+				sitesProxy.getFavouriteSites(person1.getId(), createParams(paging, null));
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+			}
+	
+			// another user from the same network - 403
+			try
+			{
+				int skipCount = 0;
+				int maxItems = 2;
+				Paging paging = getPaging(skipCount, maxItems, expectedFavouriteSites.size(), expectedFavouriteSites.size());
+	
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+				ListResponse<FavouriteSite> response = sitesProxy.getFavouriteSites(person1.getId(), createParams(paging, null));
+				checkList(expectedFavouriteSites, paging.getExpectedPaging(), response);
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());
+			}
+			
+			// another user from another network - 401
+			try
+			{
+				int skipCount = 0;
+				int maxItems = Integer.MAX_VALUE;
+				Paging paging = getPaging(skipCount, maxItems, expectedFavouriteSites.size(), expectedFavouriteSites.size());
+	
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person4.getId()));
+				sitesProxy.getFavouriteSites(person1.getId(), createParams(paging, null));
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+			}
+			
+			// successful GET
+			{
+				int skipCount = 0;
+				int maxItems = Integer.MAX_VALUE;
+				Paging paging = getPaging(skipCount, maxItems, expectedFavouriteSites.size(), expectedFavouriteSites.size());
+	
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				ListResponse<FavouriteSite> response = sitesProxy.getFavouriteSites(person1.getId(), createParams(paging, null));
+				checkList(expectedFavouriteSites, paging.getExpectedPaging(), response);
+			}
+	
+			// skipCount is greater than the number of favourite sites
+			{
+				int skipCount = expectedFavouriteSites.size() + 100;
+				Paging paging = getPaging(skipCount, null, expectedFavouriteSites.size(), expectedFavouriteSites.size());
+				List<FavouriteSite> expected = Collections.emptyList();
+				ListResponse<FavouriteSite> response = sitesProxy.getFavouriteSites(person1.getId(), createParams(paging, null));
+				checkList(expected, paging.getExpectedPaging(), response);
+			}
+			
+	    	// "-me-" user
+	    	{
+				int skipCount = 0;
+				int maxItems = Integer.MAX_VALUE;
+				Paging paging = getPaging(skipCount, maxItems, expectedFavouriteSites.size(), expectedFavouriteSites.size());
+	
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				ListResponse<FavouriteSite> response = sitesProxy.getFavouriteSites(org.alfresco.rest.api.People.DEFAULT_USER, createParams(paging, null));
+				checkList(expectedFavouriteSites, paging.getExpectedPaging(), response);
+	    	}
+		}
+
+		// user is a member of the site which he has favourited
+		{
+			publicApiClient.setRequestContext(new RequestContext(network2.getId(), person5.getId()));
+
+			List<FavouriteSite> expectedFavouriteSites = new ArrayList<FavouriteSite>(1);
+			FavouriteSite fs = new FavouriteSite(testSite4.getSiteId());
+			expectedFavouriteSites.add(fs);
+
+			FavouriteSite ret = sitesProxy.createFavouriteSite(person5.getId(), fs);
+			fs.expected(ret);
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedFavouriteSites.size(), expectedFavouriteSites.size());
+			ListResponse<FavouriteSite> response = sitesProxy.getFavouriteSites(person5.getId(), createParams(paging, null));
+			checkList(expectedFavouriteSites, paging.getExpectedPaging(), response);
+		}
+
+		// remove
+		{
+			// create some favourite sites
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person3.getId()));
+				FavouriteSite fs = new FavouriteSite(testSite);
+				sitesProxy.createFavouriteSite(person3.getId(), fs);
+				fs = new FavouriteSite(testSite1);
+				sitesProxy.createFavouriteSite(person3.getId(), fs);
+			}
+
+			// known user
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				FavouriteSite fs = new FavouriteSite(testSite);
+				sitesProxy.removeFavouriteSite(person1.getId(), fs);
+	
+				List<FavouriteSite> expectedFavouriteSites = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<FavouriteSite>>()
+				{
+					@Override
+					public List<FavouriteSite> doWork() throws Exception
+					{
+						return repoService.getFavouriteSites(person1);
+					}
+				}, person1.getId(), network1.getId());
+	
+				// check removed
+				int skipCount = 0;
+				int maxItems = Integer.MAX_VALUE;
+				Paging paging = getPaging(skipCount, maxItems, expectedFavouriteSites.size(), expectedFavouriteSites.size());
+	
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				ListResponse<FavouriteSite> response = sitesProxy.getFavouriteSites(person1.getId(), createParams(paging, null));
+				assertFalse(response.getList().contains(fs));
+			}
+			
+			// unknown user
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				FavouriteSite fs = new FavouriteSite(testSite);
+				sitesProxy.removeFavouriteSite(GUID.generate(), fs);
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+
+			// unknown site
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				FavouriteSite fs = new FavouriteSite(GUID.generate());
+				sitesProxy.removeFavouriteSite(person1.getId(), fs);
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+
+			// try to remove a favourite site that is not a favourite site
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				FavouriteSite fs = new FavouriteSite(testSite3);
+				sitesProxy.removeFavouriteSite(person1.getId(), fs);
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+
+			// "-me-" user
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person3.getId()));
+				FavouriteSite fs = new FavouriteSite(testSite1);
+				sitesProxy.removeFavouriteSite(org.alfresco.rest.api.People.DEFAULT_USER, fs);
+
+				List<FavouriteSite> expectedFavouriteSites = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<FavouriteSite>>()
+				{
+					@Override
+					public List<FavouriteSite> doWork() throws Exception
+					{
+						return repoService.getFavouriteSites(person3);
+					}
+				}, person3.getId(), network1.getId());
+	
+				// check removed
+				int skipCount = 0;
+				int maxItems = Integer.MAX_VALUE;
+				Paging paging = getPaging(skipCount, maxItems, expectedFavouriteSites.size(), expectedFavouriteSites.size());
+	
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person3.getId()));
+				ListResponse<FavouriteSite> response = sitesProxy.getFavouriteSites(person3.getId(), createParams(paging, null));
+				assertFalse(response.getList().contains(fs));
+			}
+		}
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestFavourites.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestFavourites.java
new file mode 100644
index 00000000000..5bf32cee022
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestFavourites.java
@@ -0,0 +1,2098 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.tests.RepoService.SiteInformation;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Favourites;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.SiteMembershipRequests;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Comment;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.Favourite;
+import org.alfresco.rest.api.tests.client.data.FavouriteDocument;
+import org.alfresco.rest.api.tests.client.data.FavouriteFolder;
+import org.alfresco.rest.api.tests.client.data.FavouriteNode;
+import org.alfresco.rest.api.tests.client.data.FavouritesTarget;
+import org.alfresco.rest.api.tests.client.data.FileFavouriteTarget;
+import org.alfresco.rest.api.tests.client.data.FolderFavouriteTarget;
+import org.alfresco.rest.api.tests.client.data.InvalidFavouriteTarget;
+import org.alfresco.rest.api.tests.client.data.JSONAble;
+import org.alfresco.rest.api.tests.client.data.Node;
+import org.alfresco.rest.api.tests.client.data.PathInfo;
+import org.alfresco.rest.api.tests.client.data.Site;
+import org.alfresco.rest.api.tests.client.data.SiteFavouriteTarget;
+import org.alfresco.rest.api.tests.client.data.SiteImpl;
+import org.alfresco.rest.api.tests.client.data.SiteMembershipRequest;
+import org.alfresco.rest.api.tests.client.data.SiteRole;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.favourites.FavouritesService;
+import org.alfresco.service.cmr.favourites.FavouritesService.Type;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.alfresco.util.Pair;
+import org.apache.commons.httpclient.HttpStatus;
+import org.json.simple.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Lists;
+
+/**
+ * 
+ * @author steveglover
+ * @since publicapi1.0
+ */
+public class TestFavourites extends AbstractBaseApiTest
+{
+    private static enum TARGET_TYPE
+    {
+        file, folder, site;
+    };
+
+    private TestNetwork network1;
+    private TestPerson person10;
+    private String person10Id;
+    private TestPerson person11;
+    private String person11Id;
+    private TestPerson person12;
+    private String person12Id;
+    private TestPerson person14;
+    private String person14Id;
+    private TestPerson person15;
+    private String person15Id;
+
+    private TestNetwork network2;
+    private TestPerson person21;
+    private String person21Id;
+
+    private List<TestSite> personSites = new ArrayList<TestSite>();
+    private List<TestSite> person1PublicSites = new ArrayList<TestSite>();
+    private List<TestSite> person1PrivateSites = new ArrayList<TestSite>();
+
+    private List<NodeRef> personDocs = new ArrayList<NodeRef>();
+    private List<NodeRef> personFolders = new ArrayList<NodeRef>();
+    private List<NodeRef> person1PublicDocs = new ArrayList<NodeRef>();
+    private List<NodeRef> person1PublicFolders = new ArrayList<NodeRef>();
+    private List<NodeRef> person1PrivateDocs = new ArrayList<NodeRef>();
+    private List<NodeRef> person1PrivateFolders = new ArrayList<NodeRef>();
+
+    private Favourites favouritesProxy;
+    private SiteMembershipRequests siteMembershipRequestsProxy;
+
+    @Override
+    @Before
+    public void setup() throws Exception
+    {
+        // init networks
+        super.setup();
+
+        final Iterator<TestNetwork> networksIt = getTestFixture().networksIterator();
+
+        transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+        {
+            @SuppressWarnings("synthetic-access")
+            public Void execute() throws Throwable
+            {
+                try
+                {
+                    AuthenticationUtil.pushAuthentication();
+                    AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+                    // create some users
+                    TestFavourites.this.network1 = networksIt.next();
+
+                    String name = GUID.generate();
+                    PersonInfo personInfo = new PersonInfo(name, name, name, "password", null, null, null, null, null, null, null);
+                    TestFavourites.this.person10 = network1.createUser(personInfo);
+                    assertNotNull(TestFavourites.this.person10);
+                    TestFavourites.this.person10Id = TestFavourites.this.person10.getId();
+                    name = GUID.generate();
+                    personInfo = new PersonInfo(name, name, name, "password", null, null, null, null, null, null, null);
+                    TestFavourites.this.person11 = network1.createUser(personInfo);
+                    assertNotNull(TestFavourites.this.person11);
+                    TestFavourites.this.person11Id = TestFavourites.this.person11.getId();
+                    name = GUID.generate();
+                    personInfo = new PersonInfo(name, name, name, "password", null, null, null, null, null, null, null);
+                    TestFavourites.this.person12 = network1.createUser(personInfo);
+                    assertNotNull(TestFavourites.this.person12);
+                    TestFavourites.this.person12Id = TestFavourites.this.person12.getId();
+                    name = GUID.generate();
+                    personInfo = new PersonInfo(name, name, name, "password", null, null, null, null, null, null, null);
+                    TestFavourites.this.person14 = network1.createUser(personInfo);
+                    assertNotNull(TestFavourites.this.person14);
+                    TestFavourites.this.person14Id = TestFavourites.this.person14.getId();
+                    name = GUID.generate();
+                    personInfo = new PersonInfo(name, name, name, "password", null, null, null, null, null, null, null);
+                    TestFavourites.this.person15 = network1.createUser(personInfo);
+                    assertNotNull(TestFavourites.this.person15);
+                    TestFavourites.this.person15Id = TestFavourites.this.person15.getId();
+
+                    TestFavourites.this.network2 = networksIt.next();
+                    name = GUID.generate();
+                    personInfo = new PersonInfo(name, name, name, "password", null, null, null, null, null, null, null);
+                    TestFavourites.this.person21 = network2.createUser(personInfo);
+                    assertNotNull(TestFavourites.this.person21);
+                    TestFavourites.this.person21Id = TestFavourites.this.person21.getId();
+
+                    return null;
+                }
+                finally
+                {
+                    AuthenticationUtil.popAuthentication();
+                }
+            }
+        }, false, true);
+
+        // Create some favourite targets, sites, files and folders
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                String siteName = "site" + GUID.generate();
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PUBLIC);
+                TestSite site = network1.createSite(siteInfo);
+                person1PublicSites.add(site);
+
+                NodeRef nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc1", "Test Doc1 Title", "Test Doc1 Description", "Test Content");
+                person1PublicDocs.add(nodeRef);
+                nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder1", "Test Folder1 Title", "Test Folder1 Description");
+                person1PublicFolders.add(nodeRef);
+                nodeRef = repoService.createDocument(nodeRef, "Test Doc2",  "Test Doc2 Title", "Test Doc2 Description", "Test Content");
+                person1PublicDocs.add(nodeRef);
+                nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder2", "Test Folder2 Title", "Test Folder2 Description");
+                person1PublicFolders.add(nodeRef);
+                nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc3",  "Test Doc3 Title", "Test Doc3 Description", "Test Content");
+                person1PublicDocs.add(nodeRef);
+                nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder3", "Test Folder3 Title", "Test Folder3 Description");
+                person1PublicFolders.add(nodeRef);
+
+                siteName = "site" + GUID.generate();
+                siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PUBLIC);
+                site = network1.createSite(siteInfo);
+                person1PublicSites.add(site);
+
+                siteName = "site" + GUID.generate();
+                siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+                site = network1.createSite(siteInfo);
+                person1PrivateSites.add(site);
+
+                nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc1", "Test Doc1 Title", "Test Doc1 Description", "Test Content");
+                person1PrivateDocs.add(nodeRef);
+                nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder1", "Test Folder1 Title", "Test Folder1 Description");
+                person1PrivateFolders.add(nodeRef);
+                nodeRef = repoService.createDocument(nodeRef, "Test Doc2",  "Test Doc2 Title", "Test Doc2 Description", "Test Content");
+                person1PrivateDocs.add(nodeRef);
+                nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder2", "Test Folder2 Title", "Test Folder2 Description");
+                person1PrivateFolders.add(nodeRef);
+                nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc3",  "Test Doc3 Title", "Test Doc3 Description", "Test Content");
+                person1PrivateDocs.add(nodeRef);
+                nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder3", "Test Folder3 Title", "Test Folder3 Description");
+                person1PrivateFolders.add(nodeRef);
+
+                return null;
+            }
+        }, person11Id, network1.getId());
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                String siteName = "site" + System.currentTimeMillis();
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PUBLIC);
+                TestSite site = network1.createSite(siteInfo);
+                person1PublicSites.add(site);
+
+                NodeRef nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc1", "Test Content");
+                personDocs.add(nodeRef);
+                nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder1");
+                personFolders.add(nodeRef);
+                nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc2", "Test Content");
+                personDocs.add(nodeRef);
+                nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder2");
+                personFolders.add(nodeRef);
+                nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc3", "Test Content");
+                personDocs.add(nodeRef);
+                nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder3");
+                personFolders.add(nodeRef);
+
+                return null;
+            }
+        }, person10Id, network1.getId());
+
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                String siteName = "site" + GUID.generate();
+                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PUBLIC);
+                TestSite site = network1.createSite(siteInfo);
+                personSites.add(site);
+
+                site.inviteToSite(person11Id, SiteRole.SiteCollaborator);
+
+                siteName = "site" + GUID.generate();
+                siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PUBLIC);
+                site = network1.createSite(siteInfo);
+                personSites.add(site);
+
+                return null;
+            }
+        }, person10Id, network1.getId());
+
+        this.favouritesProxy = publicApiClient.favourites();
+        this.siteMembershipRequestsProxy = publicApiClient.siteMembershipRequests();
+    }
+
+    private void sort(List<Favourite> favourites, final List<Pair<FavouritesService.SortFields, Boolean>> sortProps)
+    {
+        Comparator<Favourite> comparator = new Comparator<Favourite>()
+        {
+            @Override
+            public int compare(Favourite o1, Favourite o2)
+            {
+                int ret = 0;
+                for(Pair<FavouritesService.SortFields, Boolean> sort : sortProps)
+                {
+                    FavouritesService.SortFields field = sort.getFirst();
+                    Boolean ascending = sort.getSecond();
+                    if(field.equals(FavouritesService.SortFields.username))
+                    {
+                        if(ascending)
+                        {
+                            if(o1.getUsername() != null && o2.getUsername() != null)
+                            {
+                                ret = collator.compare(o1.getUsername(), o2.getUsername());
+                            }
+                        }
+                        else
+                        {
+                            if(o1.getUsername() != null && o2.getUsername() != null)
+                            {
+                                ret = o2.getUsername().compareTo(o1.getUsername());
+                            }
+                        }
+
+                        if(ret != 0)
+                        {
+                            break;
+                        }
+                    }
+                    else if(field.equals(FavouritesService.SortFields.type))
+                    {
+                        if(ascending)
+                        {
+                            ret = o1.getType().compareTo(o2.getType());
+                        }
+                        else
+                        {
+                            ret = o2.getType().compareTo(o1.getType());
+                        }
+
+                        if(ret != 0)
+                        {
+                            break;
+                        }
+                    }
+                    else if(field.equals(FavouritesService.SortFields.createdAt))
+                    {
+                        if(ascending)
+                        {
+                            ret = o1.getCreatedAt().compareTo(o2.getCreatedAt());
+                        }
+                        else
+                        {
+                            ret = o2.getCreatedAt().compareTo(o1.getCreatedAt());
+                        }
+
+                        if(ret != 0)
+                        {
+                            break;
+                        }
+                    }
+                }
+
+                return ret;
+            }
+        };
+        Collections.sort(favourites, comparator);
+    }
+
+    /**
+     * Returns a new list.
+     *
+     * @param favourites List<Favourite>
+     * @param types Set<Type>
+     * @return ArrayList<Favourite>
+     */
+    private ArrayList<Favourite> filter(List<Favourite> favourites, final Set<Type> types)
+    {
+        Predicate<Favourite> predicate = new Predicate<Favourite>()
+        {
+            @Override
+            public boolean apply(Favourite other)
+            {
+                Type type = null;
+                if(other.getTarget() instanceof FileFavouriteTarget)
+                {
+                    type = Type.FILE;
+                }
+                else if(other.getTarget() instanceof FolderFavouriteTarget)
+                {
+                    type = Type.FOLDER;
+                }
+                else if(other.getTarget() instanceof SiteFavouriteTarget)
+                {
+                    type = Type.SITE;
+                }
+
+                boolean ret = (type != null && types.contains(type));
+                return ret;
+            }
+        };
+        ArrayList<Favourite> ret = Lists.newArrayList(Collections2.filter(favourites, predicate));
+        return ret;
+    }
+
+    private void updateFavourite(String networkId, String runAsUserId, String personId, TARGET_TYPE type) throws Exception
+    {
+        {
+            int size = 0;
+
+            try
+            {
+                // get a favourite id
+                ListResponse<Favourite> resp = getFavourites(networkId, runAsUserId, personId, 0, Integer.MAX_VALUE, null, null, type);
+                List<Favourite> favourites = resp.getList();
+                size = favourites.size();
+                assertTrue(size > 0);
+                Favourite favourite = favourites.get(0);
+
+                favouritesProxy.update("people", personId, "favorites", favourite.getTargetGuid(), favourite.toJSON().toString(), "Unable to update favourite");
+
+                fail();
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+            }
+
+            // check nothing has changed
+            ListResponse<Favourite> resp = getFavourites(networkId, runAsUserId, personId, 0, Integer.MAX_VALUE, null, null, type);
+            List<Favourite> favourites = resp.getList();
+            assertEquals(size, favourites.size());
+        }
+    }
+
+    private Favourite deleteFavourite(String networkId, String runAsUserId, String personId, TARGET_TYPE type) throws Exception
+    {
+        Exception e = null;
+
+        publicApiClient.setRequestContext(new RequestContext(networkId, runAsUserId));
+
+        // get a favourite id
+        ListResponse<Favourite> resp = getFavourites(networkId, runAsUserId, personId, 0, Integer.MAX_VALUE, null, null, type);
+        List<Favourite> favourites = resp.getList();
+        int size = favourites.size();
+        assertTrue(size > 0);
+        Favourite favourite = favourites.get(0);
+
+        try
+        {
+            // catch 404's
+            favouritesProxy.removeFavourite(personId, favourite.getTargetGuid());
+        }
+        catch(PublicApiException exc)
+        {
+            e = exc;
+        }
+
+        // check favourite has been removed
+        resp = getFavourites(networkId, runAsUserId, personId, 0, Integer.MAX_VALUE, null, null, type);
+        favourites = resp.getList();
+        boolean stillExists = false;
+        for(Favourite f : favourites)
+        {
+            if(f.getTargetGuid().equals(favourite.getTargetGuid()))
+            {
+                stillExists = true;
+                break;
+            }
+        }
+        assertFalse(stillExists);
+
+        if(e != null)
+        {
+            throw e;
+        }
+
+        return favourite;
+    }
+
+    private ListResponse<Favourite> getFavourites(String networkId, String runAsUserId, String personId, int skipCount, int maxItems, Integer total,
+            Integer expectedTotal, TARGET_TYPE type) throws PublicApiException, ParseException
+    {
+        publicApiClient.setRequestContext(new RequestContext(networkId, runAsUserId));
+
+        Paging paging = null;
+        if(total == null && expectedTotal == null)
+        {
+            paging = getPaging(skipCount, maxItems);
+        }
+        else
+        {
+            paging = getPaging(skipCount, maxItems, total, expectedTotal);
+        }
+        Map<String, String> params = null;
+        if(type != null)
+        {
+            params = Collections.singletonMap("where", "(EXISTS(target/" + type + "))");
+        }
+        ListResponse<Favourite> resp = favouritesProxy.getFavourites(personId, createParams(paging, params));
+        return resp;
+    }
+
+    private Favourite makeFolderFavourite(String targetGuid) throws ParseException
+    {
+        FavouriteFolder folder = new FavouriteFolder(targetGuid);
+        FolderFavouriteTarget target = new FolderFavouriteTarget(folder);
+        Date creationData = new Date();
+        Favourite favourite = new Favourite(creationData, null, target, null);
+        return favourite;
+    }
+
+    private Favourite makeFileFavourite(String targetGuid) throws ParseException
+    {
+        FavouriteDocument document = new FavouriteDocument(targetGuid);
+        FileFavouriteTarget target = new FileFavouriteTarget(document);
+        Date creationData = new Date();
+        Favourite favourite = new Favourite(creationData, null, target, null);
+        return favourite;
+    }
+
+    private Favourite makeSiteFavourite(Site site) throws ParseException
+    {
+        SiteFavouriteTarget target = new SiteFavouriteTarget(site);
+        Date creationDate = new Date();
+        Favourite favourite = new Favourite(creationDate, null, target, null);
+        return favourite;
+    }
+
+    @Test
+    public void testInvalidRequests() throws Exception
+    {
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            Favourite favourite = makeSiteFavourite(person1PublicSites.get(0));
+            Favourite ret = favouritesProxy.createFavourite(person11Id, favourite);
+            favourite.expected(ret);
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            // Note: un-authorized comes back as 404
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // cloud-2468
+        // invalid type
+        // NOTE: The test below has swapped to attempt to favorite a comment rather than a
+        //       a wiki page as the WikiService has moved to the Share Services AMP in 5.1
+
+        try
+        {
+            log("cloud-2468");
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            final NodeRef document = personDocs.get(0);
+            final NodeRef comment = TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+            {
+                @Override
+                public NodeRef doWork() throws Exception
+                {
+                    NodeRef comment = repoService.createComment(document, new Comment("Title", "Content"));
+                    return comment;
+                }
+            }, person10Id, network1.getId());
+
+            final String guid = comment.getId();
+            JSONAble commentJSON = new JSONAble()
+            {
+                @SuppressWarnings("unchecked")
+                @Override
+                public JSONObject toJSON()
+                {
+                    JSONObject json = new JSONObject();
+                    json.put("guid", guid);
+                    return json;
+                }
+            };
+
+            FavouritesTarget target = new InvalidFavouriteTarget("comment", commentJSON, guid);
+            Favourite favourite = new Favourite(target);
+
+            favouritesProxy.createFavourite(person10Id, favourite);
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+        }
+
+        try
+        {
+            log("cloud-2468");
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            Site site = person1PublicSites.get(0);
+            FavouritesTarget target = new InvalidFavouriteTarget(GUID.generate(), site, site.getGuid());
+            Favourite favourite = new Favourite(target);
+
+            favouritesProxy.createFavourite(person10Id, favourite);
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+        }
+
+        // type = file, target is a site
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            String siteGuid = person1PublicSites.get(0).getGuid();
+            FavouriteDocument document = new FavouriteDocument(siteGuid);
+            Favourite favourite = makeFileFavourite(document.getGuid());
+            Favourite ret = favouritesProxy.createFavourite(person10Id, favourite);
+            favourite.expected(ret);
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // type = folder, target is a site
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            String siteGuid = person1PublicSites.get(0).getGuid();
+            FavouriteFolder folder = new FavouriteFolder(siteGuid);
+            Favourite favourite = makeFolderFavourite(folder.getGuid());
+            Favourite ret = favouritesProxy.createFavourite(person10Id, favourite);
+            favourite.expected(ret);
+
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // type = folder, target is a file
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            FavouriteFolder folder = new FavouriteFolder(person1PublicDocs.get(0).getId());
+            Favourite favourite = makeFolderFavourite(folder.getGuid());
+            Favourite ret = favouritesProxy.createFavourite(person10Id, favourite);
+            favourite.expected(ret);
+
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // type = file, target is a folder
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            FavouriteDocument document = new FavouriteDocument(person1PublicFolders.get(0).getId());
+            Favourite favourite = makeFileFavourite(document.getGuid());
+            Favourite ret = favouritesProxy.createFavourite(person10Id, favourite);
+            favourite.expected(ret);
+
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // make sure that a user can't favourite on behalf of another user
+        // 2471
+        {
+            log("cloud-2471");
+
+            try
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                FavouriteDocument document = new FavouriteDocument(person1PublicDocs.get(0).getId());
+                Favourite favourite = makeFileFavourite(document.getGuid());
+                favouritesProxy.createFavourite(person11Id, favourite);
+
+                fail();
+            }
+            catch(PublicApiException e)
+            {
+                // Note: un-authorized comes back as 404
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+
+            // person1 should have no favourites
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+            ListResponse<Favourite> response = favouritesProxy.getFavourites(person11Id, createParams(null, null));
+            assertEquals(0, response.getList().size());
+        }
+
+        // invalid/non-existent user
+        // 2469
+        try
+        {
+            log("cloud-2469");
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            Favourite favourite = makeSiteFavourite(personSites.get(0));
+            Favourite ret = favouritesProxy.createFavourite(GUID.generate(), favourite);
+            favourite.expected(ret);
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // make sure that a user can't see other user's favourites.
+        // 2465
+        try
+        {
+            log("cloud-2465");
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+            favouritesProxy.getFavourites(person11Id, null);
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            // Note: un-authorized comes back as 404
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // 2464, unknown user
+        try
+        {
+            log("cloud-2464");
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+            favouritesProxy.getFavourites(GUID.generate(), null);
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // non-existent entity for a given type
+        // 2480
+        {
+            log("cloud-2480");
+
+            try
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                SiteImpl site = new SiteImpl();
+                site.setGuid(GUID.generate());
+                Favourite favourite = makeSiteFavourite((Site)site);
+                favouritesProxy.createFavourite(person10Id, favourite);
+
+                fail();
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+
+            ListResponse<Favourite> response = favouritesProxy.getFavourites(person10Id, createParams(null, null));
+            assertEquals(0, response.getList().size());
+        }
+
+        {
+            try
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                FavouriteDocument document = new FavouriteDocument(GUID.generate());
+                Favourite favourite = makeFileFavourite(document.getGuid());
+                favouritesProxy.createFavourite(person10Id, favourite);
+
+                fail();
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+
+            ListResponse<Favourite> response = favouritesProxy.getFavourites(person10Id, createParams(null, null));
+            assertEquals(0, response.getList().size());
+        }
+
+        {
+            try
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                FavouriteFolder folder = new FavouriteFolder(GUID.generate());
+                Favourite favourite = makeFolderFavourite(folder.getGuid());
+                favouritesProxy.createFavourite(person10Id, favourite);
+
+                fail();
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+
+            ListResponse<Favourite> response = favouritesProxy.getFavourites(person10Id, createParams(null, null));
+            assertEquals(0, response.getList().size());
+        }
+
+        // 2470
+        // incorrect type for a given favourite target
+        {
+            log("cloud-2470");
+
+            try
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Site site = person1PublicSites.get(0);
+                FavouritesTarget target = new InvalidFavouriteTarget("folder", site, site.getGuid());
+                Favourite favourite = new Favourite(target);
+
+                favouritesProxy.createFavourite(person10Id, favourite);
+
+                fail();
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+
+            try
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Site site = person1PublicSites.get(0);
+                FavouritesTarget target = new InvalidFavouriteTarget("file", site, site.getGuid());
+                Favourite favourite = new Favourite(target);
+
+                favouritesProxy.createFavourite(person10Id, favourite);
+
+                fail();
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+
+            FavouriteDocument document = new FavouriteDocument(person1PublicDocs.get(0).getId());
+
+            try
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                FavouritesTarget target = new InvalidFavouriteTarget("site", document, document.getGuid());
+                Favourite favourite = new Favourite(target);
+
+                favouritesProxy.createFavourite(person10Id, favourite);
+
+                fail();
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+
+            try
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                FavouritesTarget target = new InvalidFavouriteTarget("folder", document, document.getGuid());
+                Favourite favourite = new Favourite(target);
+
+                favouritesProxy.createFavourite(person10Id, favourite);
+
+                fail();
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+
+            FavouriteFolder folder = new FavouriteFolder(person1PublicFolders.get(0).getId());
+
+            try
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                FavouritesTarget target = new InvalidFavouriteTarget("site", folder, folder.getGuid());
+                Favourite favourite = new Favourite(target);
+
+                favouritesProxy.createFavourite(person10Id, favourite);
+
+                fail();
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+
+            try
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                FavouritesTarget target = new InvalidFavouriteTarget("file", folder, folder.getGuid());
+                Favourite favourite = new Favourite(target);
+
+                favouritesProxy.createFavourite(person10Id, favourite);
+
+                fail();
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            // none of these POSTs should have resulted in favourites being created...
+            ListResponse<Favourite> response = favouritesProxy.getFavourites(person10Id, createParams(null, null));
+            assertEquals(0, response.getList().size());
+        }
+
+        // invalid methods
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            try
+            {
+                Favourite favourite = new Favourite(null);
+                favouritesProxy.update("people", "-me-", "favorites", null, favourite.toJSON().toString(), "Unable to PUT favourites");
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+            }
+        }
+
+        // invalid orderBy param
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            try
+            {
+                Map<String, String> params = new HashMap<>();
+                params.put("orderBy", "invalid ASC");
+                favouritesProxy.getFavourites(person10Id, createParams(null, params));
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+        }
+    }
+
+    @Test
+    public void testValidRequests() throws Exception
+    {
+        List<Favourite> expectedFavourites = new ArrayList<Favourite>();
+
+        {
+            // add some favourites
+            // 2467
+
+            log("cloud-2467");
+
+            Favourite siteFavourite1 = makeSiteFavourite(person1PublicSites.get(0));
+
+            FavouriteDocument document = repoService.getDocument(network1.getId(), person1PublicDocs.get(0));
+            Favourite fileFavourite1 = makeFileFavourite(document.getGuid());
+
+            FavouriteFolder folder = repoService.getFolder(network1.getId(), person1PublicFolders.get(0));
+            Favourite folderFavourite1 = makeFolderFavourite(folder.getGuid());
+
+            Favourite siteFavourite2 = makeSiteFavourite(person1PublicSites.get(1));
+
+            document = repoService.getDocument(network1.getId(), person1PublicDocs.get(1));
+            Favourite fileFavourite2 = makeFileFavourite(document.getGuid());
+
+            folder = repoService.getFolder(network1.getId(), person1PublicFolders.get(1));
+            Favourite folderFavourite2 = makeFolderFavourite(folder.getGuid());
+
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Favourite ret = favouritesProxy.createFavourite(person10Id, siteFavourite1);
+                expectedFavourites.add(ret);
+                siteFavourite1.expected(ret);
+            }
+
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Favourite ret = favouritesProxy.createFavourite(person10Id, fileFavourite1);
+                expectedFavourites.add(ret);
+                fileFavourite1.expected(ret);
+            }
+
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Favourite ret = favouritesProxy.createFavourite(person10Id, folderFavourite1);
+                expectedFavourites.add(ret);
+                folderFavourite1.expected(ret);
+            }
+
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Favourite ret = favouritesProxy.createFavourite(person10Id, siteFavourite2);
+                expectedFavourites.add(ret);
+                siteFavourite2.expected(ret);
+            }
+
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Favourite ret = favouritesProxy.createFavourite(person10Id, fileFavourite2);
+                expectedFavourites.add(ret);
+                fileFavourite2.expected(ret);
+            }
+
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Favourite ret = favouritesProxy.createFavourite(person10Id, folderFavourite2);
+                expectedFavourites.add(ret);
+                folderFavourite2.expected(ret);
+            }
+
+            // already a favourite - 201
+            {
+                log("cloud-2472");
+
+                {
+                    publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                    Favourite ret = favouritesProxy.createFavourite(person10Id, siteFavourite1);
+                    siteFavourite1.expected(ret);
+                }
+
+                {
+                    publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                    Favourite ret = favouritesProxy.createFavourite(person10Id, folderFavourite1);
+                    folderFavourite1.expected(ret);
+                }
+
+                {
+                    publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                    Favourite ret = favouritesProxy.createFavourite(person10Id, fileFavourite1);
+                    fileFavourite1.expected(ret);
+                }
+            }
+
+            {
+                // cloud-2498
+                // cloud-2499
+                // create and list favourites across networks
+
+                List<Favourite> person21ExpectedFavourites = new ArrayList<Favourite>();
+
+                log("cloud-2498");
+                log("cloud-2499");
+
+                {
+                    // favourite a site in another network
+
+                    publicApiClient.setRequestContext(new RequestContext(network1.getId(), person21Id));
+
+                    Favourite favourite = makeSiteFavourite(person1PrivateSites.get(0));
+                    try
+                    {
+                        favouritesProxy.createFavourite("-me-", favourite);
+                        fail();
+                    }
+                    catch(PublicApiException e)
+                    {
+                        assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+                    }
+
+                    int skipCount = 0;
+                    int maxItems = 10;
+                    Paging paging = getPaging(skipCount, maxItems, person21ExpectedFavourites.size(), person21ExpectedFavourites.size());
+                    try
+                    {
+                        favouritesProxy.getFavourites("-me-", createParams(paging, null));
+                        fail();
+                    }
+                    catch(PublicApiException e)
+                    {
+                        assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+                    }
+                }
+
+                // favourite a document in another network
+                {
+                    publicApiClient.setRequestContext(new RequestContext(network1.getId(), person21Id));
+
+                    FavouriteDocument document1 = new FavouriteDocument(person1PrivateDocs.get(0).getId());
+                    Favourite favourite = makeFileFavourite(document1.getGuid());
+                    try
+                    {
+                        favouritesProxy.createFavourite("-me-", favourite);
+                        fail();
+                    }
+                    catch(PublicApiException e)
+                    {
+                        assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+                    }
+
+                    sort(person21ExpectedFavourites, FavouritesService.DEFAULT_SORT_PROPS);
+
+                    int skipCount = 0;
+                    int maxItems = 10;
+                    Paging paging = getPaging(skipCount, maxItems, person21ExpectedFavourites.size(), person21ExpectedFavourites.size());
+                    try
+                    {
+                        favouritesProxy.getFavourites("-me-", createParams(paging, null));
+                        fail();
+                    }
+                    catch(PublicApiException e)
+                    {
+                        assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+                    }
+                }
+
+                // favourite a folder in another network
+                {
+                    publicApiClient.setRequestContext(new RequestContext(network1.getId(), person21Id));
+
+                    FavouriteFolder folder1 = new FavouriteFolder(person1PrivateFolders.get(0).getId());
+                    Favourite favourite = makeFolderFavourite(folder1.getGuid());
+                    try
+                    {
+                        favouritesProxy.createFavourite("-me-", favourite);
+                        fail();
+                    }
+                    catch(PublicApiException e)
+                    {
+                        assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+                    }
+
+                    sort(person21ExpectedFavourites, FavouritesService.DEFAULT_SORT_PROPS);
+
+                    int skipCount = 0;
+                    int maxItems = 10;
+                    Paging paging = getPaging(skipCount, maxItems, person21ExpectedFavourites.size(), person21ExpectedFavourites.size());
+                    try
+                    {
+                        favouritesProxy.getFavourites("-me-", createParams(paging, null));
+                        fail();
+                    }
+                    catch(PublicApiException e)
+                    {
+                        assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+                    }
+                }
+            }
+        }
+
+        // GET favourites
+        // test paging and sorting
+        {
+            // cloud-2458
+            // cloud-2462
+            // cloud-2461
+            {
+                log("cloud-2458");
+                log("cloud-2461");
+                log("cloud-2462");
+
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                List<Favourite> expected = new ArrayList<Favourite>(expectedFavourites);
+                sort(expected, FavouritesService.DEFAULT_SORT_PROPS);
+
+                int skipCount = 0;
+                int maxItems = 2;
+                Paging paging = getPaging(skipCount, maxItems, expectedFavourites.size(), expectedFavourites.size());
+                ListResponse<Favourite> resp = favouritesProxy.getFavourites(person10Id, createParams(paging, null));
+                checkList(expected.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            }
+
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                List<Favourite> expected = new ArrayList<Favourite>(expectedFavourites);
+                sort(expected, FavouritesService.DEFAULT_SORT_PROPS);
+
+                int skipCount = 2;
+                int maxItems = 4;
+                Paging paging = getPaging(skipCount, maxItems, expectedFavourites.size(), expectedFavourites.size());
+                ListResponse<Favourite> resp = favouritesProxy.getFavourites(person10Id, createParams(paging, null));
+                checkList(expected.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            }
+
+            // 2466
+            // GET favourites for "-me-"
+            {
+                log("cloud-2466");
+
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                List<Favourite> expected = new ArrayList<Favourite>(expectedFavourites);
+                sort(expected, FavouritesService.DEFAULT_SORT_PROPS);
+
+                int skipCount = 0;
+                int maxItems = Integer.MAX_VALUE;
+                Paging paging = getPaging(skipCount, maxItems, expectedFavourites.size(), expectedFavourites.size());
+                ListResponse<Favourite> resp = favouritesProxy.getFavourites("-me-", createParams(paging, null));
+                checkList(expected.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            }
+        }
+
+        // 2459
+        {
+            log("cloud-2459");
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+            int skipCount = 0;
+            int maxItems = Integer.MAX_VALUE;
+            Paging paging = getPaging(skipCount, maxItems, 0, 0);
+            ListResponse<Favourite> resp = favouritesProxy.getFavourites(person11Id, createParams(paging, null));
+            List<Favourite> empty = Collections.emptyList();
+            checkList(empty, paging.getExpectedPaging(), resp);
+        }
+
+        // cloud-2460: filtering by target type
+        {
+            log("cloud-2460");
+
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Set<Type> types = new HashSet<Type>(Arrays.asList(Type.FILE));
+                List<Favourite> expected = filter(expectedFavourites, types);
+                sort(expected, FavouritesService.DEFAULT_SORT_PROPS);
+
+                int skipCount = 0;
+                int maxItems = Integer.MAX_VALUE;
+                Paging paging = getPaging(skipCount, maxItems, expected.size(), expected.size());
+                Map<String, String> params = Collections.singletonMap("where", "(EXISTS(target/file))");
+                ListResponse<Favourite> resp = favouritesProxy.getFavourites(person10Id, createParams(paging, params));
+                checkList(expected.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            }
+
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Set<Type> types = new HashSet<Type>(Arrays.asList(Type.FOLDER));
+                List<Favourite> expected = filter(expectedFavourites, types);
+                sort(expected, FavouritesService.DEFAULT_SORT_PROPS);
+
+                int skipCount = 0;
+                int maxItems = Integer.MAX_VALUE;
+                Paging paging = getPaging(skipCount, maxItems, expected.size(), expected.size());
+                Map<String, String> params = Collections.singletonMap("where", "(EXISTS(target/folder))");
+                ListResponse<Favourite> resp = favouritesProxy.getFavourites(person10Id, createParams(paging, params));
+                checkList(expected.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            }
+
+            // target/file
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Set<Type> types = new HashSet<Type>(Arrays.asList(Type.FILE));
+                List<Favourite> expected = filter(expectedFavourites, types);
+                sort(expected, FavouritesService.DEFAULT_SORT_PROPS);
+
+                int skipCount = 0;
+                int maxItems = Integer.MAX_VALUE;
+                Paging paging = getPaging(skipCount, maxItems, expected.size(), expected.size());
+                Map<String, String> params = Collections.singletonMap("where", "(EXISTS(target/file))");
+                ListResponse<Favourite> resp = favouritesProxy.getFavourites(person10Id, createParams(paging, params));
+                checkList(expected.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            }
+
+            // target/folder
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Set<Type> types = new HashSet<Type>(Arrays.asList(Type.FOLDER));
+                List<Favourite> expected = filter(expectedFavourites, types);
+                sort(expected, FavouritesService.DEFAULT_SORT_PROPS);
+
+                int skipCount = 0;
+                int maxItems = Integer.MAX_VALUE;
+                Paging paging = getPaging(skipCount, maxItems, expected.size(), expected.size());
+                Map<String, String> params = Collections.singletonMap("where", "(EXISTS(target/folder))");
+                ListResponse<Favourite> resp = favouritesProxy.getFavourites(person10Id, createParams(paging, params));
+                checkList(expected.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            }
+
+            // target/site
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Set<Type> types = new HashSet<Type>(Arrays.asList(Type.SITE));
+                List<Favourite> expected = filter(expectedFavourites, types);
+                sort(expected, FavouritesService.DEFAULT_SORT_PROPS);
+
+                int skipCount = 0;
+                int maxItems = Integer.MAX_VALUE;
+                Paging paging = getPaging(skipCount, maxItems, expected.size(), expected.size());
+                Map<String, String> params = Collections.singletonMap("where", "(EXISTS(target/site))");
+                ListResponse<Favourite> resp = favouritesProxy.getFavourites(person10Id, createParams(paging, params));
+                checkList(expected.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            }
+
+            // target/folder OR target/file.
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Set<Type> types = new HashSet<Type>(Arrays.asList(Type.FOLDER, Type.FILE));
+                List<Favourite> expected = filter(expectedFavourites, types);
+                sort(expected, FavouritesService.DEFAULT_SORT_PROPS);
+
+                int skipCount = 0;
+                int maxItems = Integer.MAX_VALUE;
+                Paging paging = getPaging(skipCount, maxItems, expected.size(), expected.size());
+                Map<String, String> params = Collections.singletonMap("where", "(EXISTS(target/file) OR EXISTS(target/folder))");
+                ListResponse<Favourite> resp = favouritesProxy.getFavourites(person10Id, createParams(paging, params));
+                checkList(expected.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            }
+
+            // target/site OR target/file.
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Set<Type> types = new HashSet<Type>(Arrays.asList(Type.SITE, Type.FILE));
+                List<Favourite> expected = filter(expectedFavourites, types);
+                sort(expected, FavouritesService.DEFAULT_SORT_PROPS);
+
+                int skipCount = 0;
+                int maxItems = Integer.MAX_VALUE;
+                Paging paging = getPaging(skipCount, maxItems, expected.size(), expected.size());
+                Map<String, String> params = Collections.singletonMap("where", "(EXISTS(target/file) OR EXISTS(target/site))");
+                ListResponse<Favourite> resp = favouritesProxy.getFavourites(person10Id, createParams(paging, params));
+                checkList(expected.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            }
+
+            // target/site OR target/folder.
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+                Set<Type> types = new HashSet<Type>(Arrays.asList(Type.SITE, Type.FOLDER));
+                List<Favourite> expected = filter(expectedFavourites, types);
+                sort(expected, FavouritesService.DEFAULT_SORT_PROPS);
+
+                int skipCount = 0;
+                int maxItems = Integer.MAX_VALUE;
+                Paging paging = getPaging(skipCount, maxItems, expected.size(), expected.size());
+                Map<String, String> params = Collections.singletonMap("where", "(EXISTS(target/site) OR EXISTS(target/folder))");
+                ListResponse<Favourite> resp = favouritesProxy.getFavourites(person10Id, createParams(paging, params));
+                checkList(expected.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            }
+        }
+
+        // GET a favourite
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            favouritesProxy.getFavourite(person10Id, GUID.generate());
+
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            Favourite favourite = expectedFavourites.get(0);
+
+            favouritesProxy.getFavourite(GUID.generate(), favourite.getTargetGuid());
+
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            Favourite favourite = expectedFavourites.get(0);
+
+            Favourite resp = favouritesProxy.getFavourite(person10Id, favourite.getTargetGuid());
+            favourite.expected(resp);
+        }
+
+        // cloud-2479, PUT case
+        {
+            log("cloud-2479.1");
+            updateFavourite(network1.getId(), person10Id, person10Id, TARGET_TYPE.site);
+
+            log("cloud-2479.2");
+            updateFavourite(network1.getId(), person10Id, person10Id, TARGET_TYPE.file);
+
+            log("cloud-2479.3");
+            updateFavourite(network1.getId(), person10Id, person10Id, TARGET_TYPE.folder);
+        }
+
+        try
+        {
+            // cloud-2474
+            // non-existent personId
+            log("cloud-2474");
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            favouritesProxy.removeFavourite(GUID.generate(), GUID.generate());
+
+            fail();
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // cloud-2475
+        // try delete a non-existent favourite for a node that exists
+        {
+            log("cloud-2475");
+
+            NodeRef doc = TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+            {
+                @Override
+                public NodeRef doWork() throws Exception
+                {
+                    NodeRef containerNodeRef = person1PublicSites.get(0).getContainerNodeRef("documentLibrary");
+                    NodeRef doc = repoService.createDocument(containerNodeRef, GUID.generate(), "");
+                    return doc;
+                }
+            }, person11Id, network1.getId());
+
+            String favouriteId = doc.getId();
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+
+            ListResponse<Favourite> before = getFavourites(network1.getId(), person10Id, person10Id, 0, Integer.MAX_VALUE, null, null, null);
+            List<Favourite> beforeList = before.getList();
+            assertTrue(beforeList.size() > 0);
+
+            try
+            {
+                favouritesProxy.removeFavourite(person10Id, favouriteId);
+                fail("Should be a 404");
+            }
+            catch(PublicApiException e)
+            {
+                // expected
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+
+            // check no favourites have been removed
+            ListResponse<Favourite> after = getFavourites(network1.getId(), person10Id, person10Id, 0, Integer.MAX_VALUE, null, null, null);
+            assertEquals(beforeList.size(), after.getList().size());
+        }
+
+        // cloud-2473, DELETE case
+        {
+            log("cloud-2473.1");
+            deleteFavourite(network1.getId(), person10Id, person10Id, TARGET_TYPE.site);
+
+            log("cloud-2473.2");
+            deleteFavourite(network1.getId(), person10Id, person10Id, TARGET_TYPE.file);
+
+            log("cloud-2473.3");
+            Favourite favourite = deleteFavourite(network1.getId(), person10Id, person10Id, TARGET_TYPE.folder);
+
+            // try to delete non-existent favourite
+            try
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
+                favouritesProxy.removeFavourite(person10Id, favourite.getTargetGuid());
+
+                fail();
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+        }
+
+        // cloud-2476
+        // try delete another user's favourite
+        {
+            log("cloud-2476");
+
+            // make sure there are favourites to delete
+//			publicApiClient.setRequestContext(new RequestContext(network1.getId(), personId));
+//			SiteFavouriteTarget target = new SiteFavouriteTarget(person1Sites.get(0));
+//			Favourite favourite = new Favourite(target);
+//			favouritesProxy.createFavourite(personId, favourite);
+
+            ListResponse<Favourite> before = getFavourites(network1.getId(), person10Id, person10Id, 0, Integer.MAX_VALUE, null, null, null);
+            assertTrue(before.getList().size() > 0);
+            Favourite favourite = before.getList().get(0);
+
+            try
+            {
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+                favouritesProxy.removeFavourite(person10Id, favourite.getTargetGuid());
+
+                fail();
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+
+            ListResponse<Favourite> after = getFavourites(network1.getId(), person10Id, person10Id, 0, Integer.MAX_VALUE, null, null, null);
+            assertEquals(before.getList().size(), after.getList().size());
+        }
+    }
+
+    @Test
+    public void testPUBLICAPI141() throws Exception
+    {
+        final TestSite publicSite = person1PublicSites.get(0); // person1's public site
+        final TestSite publicSite1 = person1PublicSites.get(1); // person1's public site
+        final TestSite privateSite = person1PrivateSites.get(0); // person1's private site
+        final NodeRef folderNodeRef = person1PublicFolders.get(0); // person1's folder
+        final NodeRef nodeRef = person1PublicDocs.get(1); // a file in the folder
+        final List<Favourite> expectedFavourites = new ArrayList<Favourite>();
+
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person12Id));
+
+            // invite to another user's public site
+            SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+            siteMembershipRequest.setId(publicSite.getSiteId());
+            siteMembershipRequest.setMessage("Please can I join your site?");
+            siteMembershipRequestsProxy.createSiteMembershipRequest(person12Id, siteMembershipRequest);
+
+            // favourite other users site, folder and file
+            Favourite folderFavourite = makeFolderFavourite(folderNodeRef.getId());
+            favouritesProxy.createFavourite(person12Id, folderFavourite);
+
+            Favourite fileFavourite = makeFileFavourite(nodeRef.getId());
+            favouritesProxy.createFavourite(person12Id, fileFavourite);
+
+            final Favourite siteFavourite = makeSiteFavourite(publicSite);
+            favouritesProxy.createFavourite(person12Id, siteFavourite);
+            expectedFavourites.add(siteFavourite);
+
+            final Favourite siteFavourite1 = makeSiteFavourite(publicSite1);
+            favouritesProxy.createFavourite(person12Id, siteFavourite1);
+            expectedFavourites.add(siteFavourite1);
+
+            sort(expectedFavourites, FavouritesService.DEFAULT_SORT_PROPS);
+
+            // move the folder and file to person1's private site
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    NodeRef documentLibraryNodeRef = privateSite.getContainerNodeRef("documentLibrary");
+                    repoService.moveNode(folderNodeRef, documentLibraryNodeRef);
+
+                    return null;
+                }
+            }, person11Id, network1.getId());
+
+            try
+            {
+                favouritesProxy.getFavourite(person12Id, folderFavourite.getTargetGuid());
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+
+            try
+            {
+                favouritesProxy.getFavourite(person12Id, fileFavourite.getTargetGuid());
+            }
+            catch(PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+
+            {
+                int skipCount = 0;
+                int maxItems = Integer.MAX_VALUE;
+                Paging paging = getPaging(skipCount, maxItems, expectedFavourites.size(), expectedFavourites.size());
+                ListResponse<Favourite> resp = favouritesProxy.getFavourites(person12Id, createParams(paging, null));
+                checkList(sublist(expectedFavourites, skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            }
+
+            // make the public sites private
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    publicSite.setSiteVisibility(SiteVisibility.PRIVATE);
+                    publicSite1.setSiteVisibility(SiteVisibility.PRIVATE);
+
+                    return null;
+                }
+            }, person11Id, network1.getId());
+            expectedFavourites.remove(siteFavourite1);
+
+            // Given that person2Id is still a member of 'publicSite', they should still have access and therefore
+            // it should show up in their favourites. But person2Id is not a member of 'publicSite1', they should
+            // not have access and therefore it should not show up in their favourites.
+            {
+                Favourite actual = favouritesProxy.getFavourite(person12Id, siteFavourite.getTargetGuid());
+                siteFavourite.expected(actual);
+
+                try
+                {
+                    favouritesProxy.getFavourite(person12Id, siteFavourite1.getTargetGuid());
+                }
+                catch(PublicApiException e)
+                {
+                    assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+                }
+
+                int skipCount = 0;
+                int maxItems = Integer.MAX_VALUE;
+                Paging paging = getPaging(skipCount, maxItems, expectedFavourites.size(), expectedFavourites.size());
+                ListResponse<Favourite> resp = favouritesProxy.getFavourites(person12Id, createParams(paging, null));
+                checkList(sublist(expectedFavourites, skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            }
+        }
+    }
+
+    @Test
+    public void testPUBLICAPI156() throws Exception
+    {
+        final TestSite publicSite = person1PublicSites.get(0); // person1's public site
+        final TestSite publicSite1 = person1PublicSites.get(1); // person1's public site
+        final NodeRef folderNodeRef = person1PublicFolders.get(0); // person1's folder
+        final NodeRef nodeRef = person1PublicDocs.get(1); // a file in the folder
+        final List<Favourite> expectedFavourites = new ArrayList<Favourite>();
+
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person14Id));
+
+            // invite to another user's public site
+            SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+            siteMembershipRequest.setId(publicSite.getSiteId());
+            siteMembershipRequest.setMessage("Please can I join your site?");
+            siteMembershipRequestsProxy.createSiteMembershipRequest(person14Id, siteMembershipRequest);
+
+            // favourite other users site, folder and file
+            Favourite folderFavourite = makeFolderFavourite(folderNodeRef.getId());
+            favouritesProxy.createFavourite(person14Id, folderFavourite);
+            expectedFavourites.add(folderFavourite);
+
+            Favourite fileFavourite = makeFileFavourite(nodeRef.getId());
+            favouritesProxy.createFavourite(person14Id, fileFavourite);
+            expectedFavourites.add(fileFavourite);
+
+            final Favourite siteFavourite = makeSiteFavourite(publicSite);
+            favouritesProxy.createFavourite(person14Id, siteFavourite);
+            expectedFavourites.add(siteFavourite);
+
+            final Favourite siteFavourite1 = makeSiteFavourite(publicSite1);
+            favouritesProxy.createFavourite(person14Id, siteFavourite1);
+            expectedFavourites.add(siteFavourite1);
+
+            sort(expectedFavourites, FavouritesService.DEFAULT_SORT_PROPS);
+
+            // remove the folder and file
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    repoService.deleteNode(nodeRef);
+                    repoService.deleteNode(folderNodeRef);
+
+                    return null;
+                }
+            }, person11Id, network1.getId());
+
+            expectedFavourites.remove(folderFavourite);
+            expectedFavourites.remove(fileFavourite);
+            sort(expectedFavourites, FavouritesService.DEFAULT_SORT_PROPS);
+
+            // GETs should not return the favourites nor error
+            {
+                try
+                {
+                    favouritesProxy.getFavourite(person14Id, folderFavourite.getTargetGuid());
+                }
+                catch(PublicApiException e)
+                {
+                    assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+                }
+
+                try
+                {
+                    favouritesProxy.getFavourite(person14Id, fileFavourite.getTargetGuid());
+                }
+                catch(PublicApiException e)
+                {
+                    assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+                }
+
+                int skipCount = 0;
+                int maxItems = Integer.MAX_VALUE;
+                Paging paging = getPaging(skipCount, maxItems, expectedFavourites.size(), expectedFavourites.size());
+                ListResponse<Favourite> resp = favouritesProxy.getFavourites(person14Id, createParams(paging, null));
+                checkList(sublist(expectedFavourites, skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            }
+        }
+    }
+
+    /**
+     * Tests get favourites with 'include' parameter.
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/people/<userName>/favorites?include=path}
+     */
+    @Test
+    public void testGetFavouritesWithPath() throws Exception
+    {
+        // As person12 user
+        setRequestContext(network1.getId(), person12Id, "password");
+
+        final NodeRef folderNodeRef = person1PublicFolders.get(0); // person1's folder (Test Folder1)
+        final NodeRef nodeRef = person1PublicDocs.get(1); // a file (Test Doc2) in the folder (Test Folder1)
+        final TestSite publicSite = person1PublicSites.get(0); // person1's public site
+
+        // Favourite the doc (Test Doc2)
+        Favourite fileFavourite = makeFileFavourite(nodeRef.getId());
+        favouritesProxy.createFavourite(person12Id, fileFavourite);
+
+        //Favourite the folder (Test Folder1)
+        Favourite folderFavourite = makeFolderFavourite(folderNodeRef.getId());
+        favouritesProxy.createFavourite(person12Id, folderFavourite);
+
+        // Favourite the public site
+        final Favourite siteFavourite = makeSiteFavourite(publicSite);
+        favouritesProxy.createFavourite(person12Id, siteFavourite);
+
+        Paging paging = getPaging(0, 100);
+        Map<String, String> otherParams = Collections.singletonMap("include", "path");
+
+        ListResponse<Favourite> resp = favouritesProxy.getFavourites(person12Id, createParams(paging, otherParams));
+        List<Favourite> actualFavouritesList = resp.getList();
+        assertEquals("Incorrect number of entries returned", 3, actualFavouritesList.size());
+
+        actualFavouritesList.forEach(fav ->
+        {
+            FavouriteNode node;
+            switch (fav.getType())
+            {
+                case FILE:
+                {
+                    node = ((FileFavouriteTarget) fav.getTarget()).getDocument();
+                    assertNotNull("node is null.", node);
+                    assertPathInfo(node.getPath(), "/Company Home/Sites/" + publicSite.getSiteId() + "/documentLibrary/Test Folder1", true);
+                    break;
+                }
+                case FOLDER:
+                {
+                    node = ((FolderFavouriteTarget) fav.getTarget()).getFolder();
+                    assertNotNull("node is null.", node);
+                    assertPathInfo(node.getPath(), "/Company Home/Sites/" + publicSite.getSiteId() + "/documentLibrary", true);
+                    break;
+                }
+                case SITE:
+                {
+                    JSONObject siteJsonObject = fav.getTarget().toJSON();
+                    assertNotNull("There should be a site JSON object.", siteJsonObject);
+                    assertNull("Path info should not be returned for sites.", siteJsonObject.get("path"));
+                    break;
+                }
+            }
+        });
+
+        // Get favourites without 'include' option
+        resp = favouritesProxy.getFavourites(person12Id, createParams(paging, null));
+        actualFavouritesList = resp.getList();
+        assertEquals("Incorrect number of entries returned", 3, actualFavouritesList.size());
+
+        actualFavouritesList.forEach(fav ->
+        {
+            FavouriteNode node;
+            switch (fav.getType())
+            {
+                case FILE:
+                {
+                    node = ((FileFavouriteTarget) fav.getTarget()).getDocument();
+                    assertNotNull("node is null.", node);
+                    assertNull("Path info should not be returned by default", node.getPath());
+                    break;
+                }
+                case FOLDER:
+                {
+                    node = ((FolderFavouriteTarget) fav.getTarget()).getFolder();
+                    assertNotNull("node is null.", node);
+                    assertNull("Path info should not be returned by default", node.getPath());
+                    break;
+                }
+                case SITE:
+                {
+                    JSONObject siteJsonObject = fav.getTarget().toJSON();
+                    assertNotNull("There should be a site JSON object.", siteJsonObject);
+                    assertNull("Path info should not be returned for sites.", siteJsonObject.get("path"));
+                    break;
+                }
+            }
+        });
+    }
+
+    /**
+     * REPO-1147 Tests create and get favourite with 'include' parameter and properties.
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/people/<userName>/favorites?include=properties}
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/people/<userName>/favorites/<targetId>?include=properties}
+     */
+    @Test
+    public void testCreateAndGetFavouriteWithIncludeProperties() throws Exception
+    {
+        setRequestContext(network1.getId(), person11Id, "password");
+        final NodeRef nodeRef1= person1PublicDocs.get(0); // a file in the site's document library (Test Doc1)
+
+        // Favourite the doc (Test Doc1) using POST
+        Favourite file1Favourite = makeFileFavourite(nodeRef1.getId());
+        Favourite file1FavouriteResponse = favouritesProxy.createFavourite(person11Id, file1Favourite, null);
+        assertNull("Properties should be null because they wasn't requested via include=properties", file1FavouriteResponse.getProperties());
+        // Same results for GET
+        file1FavouriteResponse = favouritesProxy.getFavourite(person11Id, file1FavouriteResponse.getTargetGuid(), null);
+        assertNull("Properties should be null because they wasn't requested via include=properties", file1FavouriteResponse.getProperties());
+
+        // create Favourite with include=properties in the result using POST
+        Map<String, String> include = Collections.singletonMap("include", "properties");
+        file1FavouriteResponse = favouritesProxy.createFavourite(person11Id, file1Favourite, include);
+        assertNull("Properties should be null because all of the properties are already in the favourite target and will not be listed twice!", file1FavouriteResponse.getProperties());
+        // Same results for GET
+        file1FavouriteResponse = favouritesProxy.getFavourite(person11Id, file1FavouriteResponse.getTargetGuid(), include);
+        assertNull("Properties should be null because all of the properties are already in the favourite target and will not be listed twice!", file1FavouriteResponse.getProperties());
+
+        // Lock node for creating lock properties
+        TenantUtil.runAsUserTenant((TenantRunAsWork<Void>) () -> {
+            repoService.lockNode(nodeRef1);
+            return null;
+        }, person11Id, network1.getId());
+
+        // create Favourite with include=properties in the result using POST
+        file1FavouriteResponse = favouritesProxy.createFavourite(person11Id, file1Favourite, include);
+        assertNotNull("Properties shouldn't be null because we created some properties while locking the file", file1FavouriteResponse.getProperties());
+        // Same results for GET
+        file1FavouriteResponse = favouritesProxy.getFavourite(person11Id, file1FavouriteResponse.getTargetGuid(), include);
+        assertNotNull("Properties shouldn't be null because we created some properties while locking the file", file1FavouriteResponse.getProperties());
+    }
+
+    /**
+     * REPO-4772 Tests NPE thrown when getting favourites with 'include' properties parameter.
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/people/<userName>/favorites?include=properties}
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/people/<userName>/favorites/<targetId>?include=properties}
+     */
+    @Test
+    public void testCreateAndGetFavouriteWithIncludeEmptyPropertiesFile() throws Exception
+    {
+        setRequestContext(networkOne.getId(), networkAdmin, "admin");
+        Map<String, String> include = Collections.singletonMap("include", "properties");
+
+        String f0Id = createFolder(Nodes.PATH_ROOT, "f0-testCreateEmptyFile-"+RUNID).getId();
+        String postUrl = getNodeChildrenUrl(f0Id);
+        Document d1 = new Document();
+        d1.setName("d1.txt");
+        d1.setNodeType(TYPE_CM_CONTENT);
+        HttpResponse response = post(postUrl, toJsonAsStringNonNull(d1), 201);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        // Favourite the doc (Test Doc1) using POST
+        Favourite file1Favourite = makeFileFavourite(documentResp.getId());
+        Favourite file1FavouriteResponse = favouritesProxy.createFavourite(networkAdmin, file1Favourite, null);
+
+        // Get the favourited doc using GET and include = properties
+        file1FavouriteResponse = favouritesProxy.getFavourite(networkAdmin, file1FavouriteResponse.getTargetGuid(), include);
+        assertNull("Properties should be null, created document is empty", file1FavouriteResponse.getProperties());
+
+        // Get the favourited doc using GET and include = properties, further test to assert on response code range
+        int favouriteStatusCode = favouritesProxy.getSingle("people", networkAdmin, "favorites", file1FavouriteResponse.getTargetGuid(), include, "Failed to get favourite " + file1FavouriteResponse.getTargetGuid(), 200).getStatusCode();
+        assertTrue("Status code should be within the success range", 200 <= favouriteStatusCode && favouriteStatusCode <= 299);
+    }
+
+    /**
+     * Tests create and get favourite with 'include' parameter.
+     *
+     * <p>POST:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/people/<userName>/favorites?include=path}
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/people/<userName>/favorites/<targetId>?include=path}
+     */
+    @Test
+    public void testCreateAndGetFavouriteWithPath() throws Exception
+    {
+        Map<String, String> includePath = Collections.singletonMap("include", "path");
+
+        // As person12 user
+        setRequestContext(network1.getId(), person12Id, "password");
+
+        final NodeRef folderNodeRef = person1PublicFolders.get(0); // person1's folder (Test Folder1)
+        final NodeRef nodeRef1= person1PublicDocs.get(0); // a file in the site's document library (Test Doc1)
+        final NodeRef nodeRef2 = person1PublicDocs.get(1); // a file (Test Doc2) in the folder (Test Folder1)
+        final TestSite publicSite = person1PublicSites.get(0); // person1's public site
+
+        // Favourite the doc (Test Doc1)
+        Favourite file1Favourite = makeFileFavourite(nodeRef1.getId());
+        file1Favourite = favouritesProxy.createFavourite(person12Id, file1Favourite, includePath);
+        FavouriteNode node = ((FileFavouriteTarget) file1Favourite.getTarget()).getDocument();
+        assertPathInfo(node.getPath(), "/Company Home/Sites/" + publicSite.getSiteId() + "/documentLibrary", true);
+        // Check the basic properties (REPO-2827)
+        assertEquals("Test Doc1", node.getName());
+        assertEquals("Test Doc1 Title", node.getTitle());
+        assertEquals("Test Doc1 Description", node.getDescription());
+
+
+        // Favourite the doc (Test Doc2)
+        Favourite file2Favourite = makeFileFavourite(nodeRef2.getId());
+        file2Favourite = favouritesProxy.createFavourite(person12Id, file2Favourite);
+        node = ((FileFavouriteTarget) file2Favourite.getTarget()).getDocument();
+        assertNull("Path info should not be returned by default", node.getPath());
+
+        //Favourite the folder (Test Folder1)
+        Favourite folderFavourite = makeFolderFavourite(folderNodeRef.getId());
+        folderFavourite = favouritesProxy.createFavourite(person12Id, folderFavourite, includePath);
+        node = ((FolderFavouriteTarget) folderFavourite.getTarget()).getFolder();
+        assertPathInfo(node.getPath(), "/Company Home/Sites/" + publicSite.getSiteId() + "/documentLibrary", true);
+
+        // Favourite the public site
+        Favourite siteFavourite = makeSiteFavourite(publicSite);
+        siteFavourite = favouritesProxy.createFavourite(person12Id, siteFavourite);
+        JSONObject siteJsonObject = siteFavourite.getTarget().toJSON();
+        assertNotNull("There should be a site JSON object.", siteJsonObject);
+        assertNull("Path info should not be returned for sites.", siteJsonObject.get("path"));
+
+        // Get single favourite (Test Doc2) with include path
+        Favourite favouriteResp = favouritesProxy.getFavourite(person12Id, file2Favourite.getTargetGuid(), includePath);
+        node = ((FileFavouriteTarget) favouriteResp.getTarget()).getDocument();
+        assertPathInfo(node.getPath(), "/Company Home/Sites/" + publicSite.getSiteId() + "/documentLibrary/Test Folder1", true);
+
+        favouriteResp = favouritesProxy.getFavourite(person12Id, folderFavourite.getTargetGuid(), includePath);
+        node = ((FolderFavouriteTarget) favouriteResp.getTarget()).getFolder();
+        assertPathInfo(node.getPath(), "/Company Home/Sites/" + publicSite.getSiteId() + "/documentLibrary", true);
+
+        favouriteResp = favouritesProxy.getFavourite(person12Id, siteFavourite.getTargetGuid(), includePath);
+        siteJsonObject = favouriteResp.getTarget().toJSON();
+        assertNotNull("There should be a site JSON object.", siteJsonObject);
+        assertNull("Path info should not be returned for sites.", siteJsonObject.get("path"));
+    }
+        
+    @Test
+    public void testVerifyFavorite() throws Exception
+    {
+        setRequestContext(network1.getId(), person12Id, "password");
+
+        final NodeRef folderNodeRef = person1PublicFolders.get(0); // person1's folder (Test Folder1)
+        final NodeRef nodeRef1= person1PublicDocs.get(0); // a file in the site's document library (Test Doc1)
+        final NodeRef nodeRef2 = person1PublicDocs.get(1); // a file (Test Doc2) in the folder (Test Folder1)
+
+        // Favourite the doc (Test Doc1)
+        Favourite file1Favourite = makeFileFavourite(nodeRef1.getId());
+        favouritesProxy.createFavourite(person12Id, file1Favourite);
+
+        // Favourite the doc (Test Doc2)
+        Favourite file2Favourite = makeFileFavourite(nodeRef2.getId());
+        favouritesProxy.createFavourite(person12Id, file2Favourite);
+
+        Map<String, String> params = new HashMap<>();
+        params.put("include", "isFavorite");
+
+        HttpResponse response = getAll(getNodeChildrenUrl(folderNodeRef.getId()), null, params, 200);
+        List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
+        assertTrue(nodes.size() == 1);
+        assertTrue(nodes.get(0).getIsFavorite());
+        response = getAll(getNode(nodeRef1.getId()), null, params, 200);
+        Node node1 = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
+        assertTrue(node1.getIsFavorite());
+    }
+
+    /**
+     * Test sort favourites using 'orderBy' parameter.
+     *
+     * <p>GET:</p>
+     * {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/people/<userName>/favorites?orderBy}
+     */
+    @Test
+    public void testSortFavourites() throws Exception
+    {
+        setRequestContext(network1.getId(), person15Id, "password");
+
+        final NodeRef folderNodeRef1 = person1PublicFolders.get(0); // person1's folder (Test Folder1)
+        final NodeRef folderNodeRef2 = person1PublicFolders.get(1); // person1's folder (Test Folder2)
+        final NodeRef folderNodeRef3 = person1PublicFolders.get(2); // person1's folder (Test Folder3)
+        final NodeRef nodeRef1= person1PublicDocs.get(0); // a file (Test Doc1)
+        final NodeRef nodeRef2 = person1PublicDocs.get(1); // a file (Test Doc2)
+
+        // Favourite the docs and folders
+        Favourite folder1Favourite = makeFolderFavourite(folderNodeRef1.getId());
+        favouritesProxy.createFavourite(person15Id, folder1Favourite);
+        Favourite folder2Favourite = makeFolderFavourite(folderNodeRef2.getId());
+        favouritesProxy.createFavourite(person15Id, folder2Favourite);
+        Favourite folder3Favourite = makeFolderFavourite(folderNodeRef3.getId());
+        favouritesProxy.createFavourite(person15Id, folder3Favourite);
+        Favourite file1Favourite = makeFileFavourite(nodeRef1.getId());
+        favouritesProxy.createFavourite(person15Id, file1Favourite);
+        Favourite file2Favourite = makeFileFavourite(nodeRef2.getId());
+        favouritesProxy.createFavourite(person15Id, file2Favourite);
+
+        // Order by title ASC
+        Map<String, String> params = new HashMap<>();
+        params.put("orderBy", "title ASC");
+
+        List<Favourite> favourites = favouritesProxy.getFavourites(person15Id, createParams(null,params)).getList();
+        assertTrue(favourites.size() == 5);
+        assertTrue(favourites.get(0).getTargetGuid().equals(nodeRef1.getId()));
+        assertTrue(favourites.get(1).getTargetGuid().equals(nodeRef2.getId()));
+        assertTrue(favourites.get(2).getTargetGuid().equals(folderNodeRef1.getId()));
+        assertTrue(favourites.get(3).getTargetGuid().equals(folderNodeRef2.getId()));
+        assertTrue(favourites.get(4).getTargetGuid().equals(folderNodeRef3.getId()));
+
+        // Order by type ASC, title DESC
+        params = new HashMap<>();
+        params.put("orderBy", "type DESC, title DESC");
+
+        favourites = favouritesProxy.getFavourites(person15Id, createParams(null,params)).getList();
+        assertTrue(favourites.size() == 5);
+        assertTrue(favourites.get(0).getTargetGuid().equals(folderNodeRef3.getId()));
+        assertTrue(favourites.get(1).getTargetGuid().equals(folderNodeRef2.getId()));
+        assertTrue(favourites.get(2).getTargetGuid().equals(folderNodeRef1.getId()));
+        assertTrue(favourites.get(3).getTargetGuid().equals(nodeRef2.getId()));
+        assertTrue(favourites.get(4).getTargetGuid().equals(nodeRef1.getId()));
+    }
+
+    private void assertPathInfo(PathInfo expectedPathInfo, String expectedPathName, boolean expectedIsComplete)
+    {
+        assertNotNull("Path info was requested.", expectedPathInfo);
+        assertEquals("IsComplete should have been true.", expectedIsComplete, expectedPathInfo.getIsComplete());
+        assertEquals("Incorrect path name.", expectedPathName, expectedPathInfo.getName());
+
+        // substring(1) -> so we can ignore the first '/'
+        List<String> expectedPathElements = Arrays.asList(expectedPathName.substring(1).split("/"));
+        assertEquals("Incorrect number of path elements.", expectedPathElements.size(), expectedPathInfo.getElements().size());
+
+        AtomicInteger i = new AtomicInteger(0);
+        expectedPathElements.forEach(path -> assertEquals("Incorrect path element.", path,
+                    expectedPathInfo.getElements().get(i.getAndIncrement()).getName()));
+    }
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestFixture.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestFixture.java
new file mode 100644
index 00000000000..160bd152f55
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestFixture.java
@@ -0,0 +1,48 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import java.util.Iterator;
+
+import org.alfresco.repo.web.util.JettyComponent;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.springframework.context.ApplicationContext;
+
+public interface TestFixture
+{
+	public final static String HOST = "localhost";
+	public final static int PORT = 8765;
+	public final static String CONTEXT_PATH = "/alfresco";
+	public final static String PUBLIC_API_SERVLET_NAME = "api";
+	
+	ApplicationContext getApplicationContext();
+	RepoService getRepoService();
+	Iterator<TestNetwork> getNetworksIt();
+	TestNetwork getRandomNetwork();
+	Iterator<TestNetwork> networksIterator();
+	JettyComponent getJettyComponent();
+	TestNetwork getNetwork(String name);
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestNetworks.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestNetworks.java
new file mode 100644
index 00000000000..de03870e7ba
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestNetworks.java
@@ -0,0 +1,468 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.People;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Person;
+import org.alfresco.rest.api.tests.client.data.PersonNetwork;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.util.GUID;
+import org.apache.commons.httpclient.HttpStatus;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+
+public class TestNetworks extends EnterpriseTestApi
+{
+	private List<TestPerson> people = new ArrayList<TestPerson>(3);
+	private List<TestNetwork> networks = new ArrayList<TestNetwork>();
+	
+	private  TestNetwork network1;
+	private  TestNetwork network2;
+	private  TestNetwork network3;
+	
+	private TestPerson person11;
+	private TestPerson person12;
+	private TestPerson person21;
+	private TestPerson person31;
+	
+	@Before
+	public void setup()
+	{
+		// note: we don't call super.setup() since we create our own test data here !
+		
+		// create some networks
+		for(int i = 0; i < 2; i++)
+		{
+			final TestNetwork network = repoService.createNetworkWithAlias("network" + i, true);
+			network.create();
+			networks.add(network);
+		}
+
+		final TestNetwork network = repoService.createNetworkWithAlias("cmisnew.test", true);
+		network.create();
+		networks.add(network);
+
+		// do we have all the networks created?
+		assertEquals(3, networks.size());
+
+		this.network1 = networks.get(0);
+		this.network2 = networks.get(1);
+		this.network3 = networks.get(2);
+
+		// create a couple of users in one of the networks
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				TestPerson person = network1.createUser();
+				people.add(person);
+				person = network1.createUser();
+				people.add(person);
+				return null;
+			}
+		}, network1.getId());
+		
+		// create a user in another network
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				TestPerson person = network2.createUser();
+				people.add(person);
+				return null;
+			}
+		}, network2.getId());
+
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				TestPerson person = network3.createUser();
+				people.add(person);
+				return null;
+			}
+		}, network3.getId());
+
+		Iterator<TestPerson> peopleIt = people.iterator();
+		this.person11 = peopleIt.next();
+		this.person12 = peopleIt.next();
+		this.person21 = peopleIt.next();
+		this.person31 = peopleIt.next();
+	}
+	
+	@Test
+	public void testPersonNetworks() throws Exception
+	{
+		People peopleProxy = publicApiClient.people();
+
+		{
+			/**
+			 * Test http://<host>:<port>/alfresco/a i.e. tenant servlet root - should return user's networks
+			 *
+			 */
+
+			final TestNetwork testAccount = getTestFixture().getRandomNetwork();
+	    	Iterator<TestPerson> personIt = testAccount.getPeople().iterator();
+	    	final TestPerson person = personIt.next();
+
+	    	RequestContext rc = new RequestContext(null, person.getId());
+	    	publicApiClient.setRequestContext(rc);
+
+			HttpResponse response = publicApiClient.delete(null, null, null, null, null);
+			//url /null/alfresco/versions/1 does not map to a Web Script
+			assertEquals(404, response.getStatusCode());
+			PublicApiClient.ExpectedErrorResponse errorResponse = RestApiUtil.parseErrorResponse(response.getJsonResponse());
+			assertNotNull(errorResponse);
+			assertNotNull(errorResponse.getErrorKey());
+			assertNotNull(errorResponse.getBriefSummary());
+
+
+			response = publicApiClient.put(null, null, null, null, null, null, null);
+			assertEquals(404, response.getStatusCode());
+			errorResponse = RestApiUtil.parseErrorResponse(response.getJsonResponse());
+			assertNotNull(errorResponse);
+			assertNotNull(errorResponse.getErrorKey());
+			assertNotNull(errorResponse.getBriefSummary());
+
+
+			response = publicApiClient.post(null, null, null, null, null, null);
+			assertEquals(404, response.getStatusCode());
+			errorResponse = RestApiUtil.parseErrorResponse(response.getJsonResponse());
+			assertNotNull(errorResponse);
+			assertNotNull(errorResponse.getErrorKey());
+			assertNotNull(errorResponse.getBriefSummary());
+			
+			List<PersonNetwork> expectedNetworkMembers = person.getNetworkMemberships();
+
+			int expectedTotal = expectedNetworkMembers.size();
+
+			{
+				// GET / - users networks
+				Paging paging = getPaging(0, Integer.MAX_VALUE, expectedTotal, expectedTotal);
+				publicApiClient.setRequestContext(new RequestContext("-default-", person.getId()));
+				response = publicApiClient.index(createParams(paging, null));
+				ListResponse<PersonNetwork> resp = PersonNetwork.parseNetworkMembers(response.getJsonResponse());
+				assertEquals(200, response.getStatusCode());
+		
+				checkList(new ArrayList<PersonNetwork>(expectedNetworkMembers), paging.getExpectedPaging(), resp);
+			}
+		}
+
+		// user from another network
+		{
+			publicApiClient.setRequestContext(new RequestContext("-default-", person21.getId()));
+			
+			List<PersonNetwork> networksMemberships = Collections.emptyList();
+			
+			try
+			{
+				int skipCount = 0;
+				int maxItems = 2;
+				Paging paging = getPaging(skipCount, maxItems, networksMemberships.size(), networksMemberships.size());
+				peopleProxy.getNetworkMemberships(person11.getId(), createParams(paging, null));
+				
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+		}
+
+		// user from the same network
+		try
+		{
+			List<PersonNetwork> networksMemberships = person12.getNetworkMemberships();
+
+			publicApiClient.setRequestContext(new RequestContext("-default-", person12.getId()));
+			
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, networksMemberships.size(), networksMemberships.size());
+			peopleProxy.getNetworkMemberships(person11.getId(), createParams(paging, null));
+
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+		
+		List<PersonNetwork> networksMemberships = person11.getNetworkMemberships();
+
+		// Test Case cloud-2203
+		// Test Case cloud-1498
+		// test paging
+		{
+			publicApiClient.setRequestContext(new RequestContext("-default-", person11.getId()));
+			
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, networksMemberships.size(), networksMemberships.size());
+			ListResponse<PersonNetwork> resp = peopleProxy.getNetworkMemberships(person11.getId(), createParams(paging, null));
+			checkList(networksMemberships.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+		}
+		
+		// "-me-" user
+		{
+			publicApiClient.setRequestContext(new RequestContext("-default-", person11.getId()));
+
+			int skipCount = 0;
+			int maxItems = Integer.MAX_VALUE;
+			Paging paging = getPaging(skipCount, maxItems, networksMemberships.size(), networksMemberships.size());
+			ListResponse<PersonNetwork> resp = peopleProxy.getNetworkMemberships(org.alfresco.rest.api.People.DEFAULT_USER, createParams(paging, null));
+			checkList(networksMemberships.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+		}
+		
+		// unknown person id
+		try
+		{
+			List<PersonNetwork> networkMemberships = person11.getNetworkMemberships();
+
+			publicApiClient.setRequestContext(new RequestContext("-default-", person11.getId()));
+			
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging expectedPaging = getPaging(skipCount, maxItems, networkMemberships.size(), networkMemberships.size());
+			peopleProxy.getNetworkMemberships("invalidUser", createParams(expectedPaging, null));
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+		
+		// invalid caller authentication
+		try
+		{
+			List<PersonNetwork> networkMemberships = person11.getNetworkMemberships();
+
+			publicApiClient.setRequestContext(new RequestContext("-default-", person11.getId(), GUID.generate()));
+			
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging expectedPaging = getPaging(skipCount, maxItems, networkMemberships.size(), networkMemberships.size());
+			peopleProxy.getNetworkMemberships(person11.getId(), createParams(expectedPaging, null));
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+		}
+		
+		// Test Case cloud-1499
+		// unknown person id
+		try
+		{
+			List<PersonNetwork> networkMemberships = person11.getNetworkMemberships();
+			
+			assertTrue(networkMemberships.size() > 0);
+			PersonNetwork network = networkMemberships.get(0);
+
+			publicApiClient.setRequestContext(new RequestContext("-default-", person11.getId()));
+			peopleProxy.getNetworkMembership("invalidUser", network.getId());
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+		
+		// invalid caller authentication
+		try
+		{
+			List<PersonNetwork> networkMemberships = person11.getNetworkMemberships();
+			
+			assertTrue(networkMemberships.size() > 0);
+			PersonNetwork network = networkMemberships.get(0);
+
+			publicApiClient.setRequestContext(new RequestContext("-default-", person11.getId(), GUID.generate()));
+			peopleProxy.getNetworkMembership(person11.getId(), network.getId());
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+		}
+		
+		// incorrect network id
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext("-default-", person11.getId()));
+			peopleProxy.getNetworkMembership(person11.getId(), GUID.generate());
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+		
+		// 1969
+		// not allowed methods
+		// POST, POST networkId, PUT, PUT networkId, DELETE, DELETE networkId
+		try
+		{
+			PersonNetwork pn = new PersonNetwork(GUID.generate());
+
+			publicApiClient.setRequestContext(new RequestContext("-default-", person11.getId()));
+			peopleProxy.create("people", person11.getId(), "networks", null, pn.toJSON().toString(), "Unable to POST to person networks");
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+		
+		try
+		{
+			PersonNetwork pn = networksMemberships.get(0);
+
+			publicApiClient.setRequestContext(new RequestContext("-default-", person11.getId()));
+			peopleProxy.create("people", person11.getId(), "networks", pn.getId(), pn.toJSON().toString(), "Unable to POST to a person network");
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+
+		try
+		{
+			PersonNetwork pn = new PersonNetwork(GUID.generate());
+
+			publicApiClient.setRequestContext(new RequestContext("-default-", person11.getId()));
+			peopleProxy.update("people", person11.getId(), "networks", null, pn.toJSON().toString(), "Unable to PUT person networks");
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+		
+		try
+		{
+			PersonNetwork pn = networksMemberships.get(0);
+
+			publicApiClient.setRequestContext(new RequestContext("-default-", person11.getId()));
+			peopleProxy.update("people", person11.getId(), "networks", pn.getId(), pn.toJSON().toString(), "Unable to PUT a person network");
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+		
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext("-default-", person11.getId()));
+			peopleProxy.remove("people", person11.getId(), "networks", null, "Unable to DELETE person networks");
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+		
+		try
+		{
+			PersonNetwork pn = networksMemberships.get(0);
+
+			publicApiClient.setRequestContext(new RequestContext("-default-", person11.getId()));
+			peopleProxy.remove("people", person11.getId(), "networks", pn.getId(), "Unable to DELETE a person network");
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+
+		// user not a member of the network
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person21.getId()));
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging expectedPaging = getPaging(skipCount, maxItems);
+			peopleProxy.getNetworkMemberships(person11.getId(), createParams(expectedPaging, null));
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+		}
+	}
+	
+	/*
+	 * CLOUD-1856: test that a network id of the form "cmis*" works
+	 */
+	@Test
+	public void testCLOUD1856() throws Exception
+	{
+		People peopleProxy = publicApiClient.people();
+
+		publicApiClient.setRequestContext(new RequestContext(network3.getId(), person31.getId()));
+		Person ret = peopleProxy.getPerson(person31.getId());
+		person31.expected(ret);
+	}
+	
+	// ALF-20216, ALF-20217, ALF-20098
+	// http://localhost:8080/alfresco/api/-default-
+	@Test
+	public void testALF20098() throws Exception
+	{
+        final TestNetwork testAccount = getTestFixture().getRandomNetwork();
+        Iterator<TestPerson> personIt = testAccount.getPeople().iterator();
+        final TestPerson person = personIt.next();
+
+        RequestContext rc = new RequestContext("-default-", person.getId());
+        publicApiClient.setRequestContext(rc);
+
+        HttpResponse response = publicApiClient.get("-default-", null);
+        assertEquals(200, response.getStatusCode());
+	}
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestNodeComments.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestNodeComments.java
new file mode 100644
index 00000000000..d7b0ae58c9d
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestNodeComments.java
@@ -0,0 +1,1058 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.activities.ActivityType;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Comments;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Nodes;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.People;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Activity;
+import org.alfresco.rest.api.tests.client.data.Comment;
+import org.alfresco.rest.api.tests.client.data.SiteRole;
+import org.alfresco.rest.api.tests.client.data.Tag;
+import org.alfresco.service.cmr.lock.LockType;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * V1 REST API tests for Node Comments
+ *
+ */
+public class TestNodeComments extends EnterpriseTestApi
+{
+	private TestNetwork network1;
+	private TestNetwork network2;
+
+	private List<TestPerson> people = new ArrayList<TestPerson>();
+	private List<TestSite> sites = new ArrayList<TestSite>();
+
+	private TestPerson person11;
+	private TestPerson person12;
+	private TestPerson person13;
+	private TestPerson person14;
+
+	private TestPerson person21;
+	private TestPerson person22;
+	
+	private NodeRef nodeRef1;
+	private NodeRef folderNodeRef1;
+	private NodeRef nodeRef2;
+	private NodeRef nodeRef3;
+	private NodeRef nodeRef4;
+	private NodeRef cmObjectNodeRef;
+	private NodeRef customTypeObject;
+	private NodeRef nodeRef5;
+	
+	@Override
+	@Before
+	public void setup() throws Exception
+	{
+		// init networks
+		super.setup();
+		
+		Iterator<TestNetwork> accountsIt = getTestFixture().getNetworksIt();
+		this.network1 = accountsIt.next();
+		this.network2 = accountsIt.next();
+
+		// Create users in different networks and a site
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				TestPerson person = network1.createUser();
+				people.add(person);
+				person = network1.createUser();
+				people.add(person);
+				person = network1.createUser();
+				people.add(person);
+				person = network1.createUser();
+				people.add(person);
+
+				return null;
+			}
+		}, network1.getId());
+
+		this.person11 = people.get(0);
+		this.person12 = people.get(1);
+		this.person13 = people.get(2);
+		this.person14 = people.get(3);
+
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				TestPerson person = network2.createUser();
+				people.add(person);
+				person = network2.createUser();
+				people.add(person);
+
+				return null;
+			}
+		}, network2.getId());
+
+		this.person21 = people.get(4);
+		this.person22 = people.get(5);
+
+		TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				TestSite site = network1.createSite(SiteVisibility.PRIVATE);
+				sites.add(site);
+
+				site.updateMember(person13.getId(), SiteRole.SiteCollaborator);
+				site.updateMember(person14.getId(), SiteRole.SiteCollaborator);
+				
+				return null;
+			}
+		}, person11.getId(), network1.getId());
+
+		final TestSite site1 = sites.get(0);
+		
+		final List<NodeRef> nodes = new ArrayList<NodeRef>();
+		
+		TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				NodeRef nodeRef = repoService.createDocument(site1.getContainerNodeRef("documentLibrary"), "Test Doc", "Test Content");
+				nodes.add(nodeRef);
+				NodeRef folderNodeRef = repoService.createFolder(site1.getContainerNodeRef("documentLibrary"), "Test Folder");
+				nodeRef = folderNodeRef;
+				nodes.add(nodeRef);
+				nodeRef = repoService.createDocument(site1.getContainerNodeRef("documentLibrary"), "Test Doc 1", "Test Content 1");
+				nodes.add(nodeRef);
+				nodeRef = repoService.createDocument(site1.getContainerNodeRef("documentLibrary"), "Test Doc 2", "Test Content 2");
+				nodes.add(nodeRef);
+				nodeRef = repoService.createDocument(site1.getContainerNodeRef("documentLibrary"), "Test Doc 3", "Test Content 3");
+				nodes.add(nodeRef);
+				nodeRef = repoService.createCmObject(site1.getContainerNodeRef("documentLibrary"), "CM Object");
+				nodes.add(nodeRef);
+				nodeRef = repoService.createObjectOfCustomType(site1.getContainerNodeRef("documentLibrary"), "Custom type object", "{custom.model}sop");
+				nodes.add(nodeRef);
+				nodeRef = repoService.createDocument(folderNodeRef, "Test Doc 4", "Test Content 4 - in Test Folder");
+				nodes.add(nodeRef);
+
+				return null;
+			}
+		}, person11.getId(), network1.getId());
+		
+		this.nodeRef1 = nodes.get(0);
+		this.folderNodeRef1 = nodes.get(1);
+		this.nodeRef2 = nodes.get(2);
+		this.nodeRef3 = nodes.get(3);
+		this.nodeRef4 = nodes.get(4);
+		this.cmObjectNodeRef = nodes.get(5);
+		this.customTypeObject = nodes.get(6);
+		this.nodeRef5 = nodes.get(7);
+	}
+
+	@Test
+	// TODO test embedded entity createdBy full visibility e.g. view comment by another user who's full details the caller can't see
+	// TODO test update comment and modifiedBy in result is a person object
+	public void testNodeComments() throws Exception
+	{
+		Comments commentsProxy = publicApiClient.comments();
+		Nodes nodesProxy = publicApiClient.nodes();
+		People peopleProxy = publicApiClient.people();
+
+		// Test Case cloud-1518
+		// Create comments
+
+		// invalid node id
+		try
+		{
+			Comment comment = new Comment("Test Comment 4", "Test Comment 4");
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			commentsProxy.createNodeComment(GUID.generate(), comment);
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+		
+		// person from the same network - no permission
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person12.getId()));
+			Comment comment = new Comment("Test Comment 4", "Test Comment 4");
+			commentsProxy.createNodeComment(nodeRef1.getId(), comment);
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());
+		}
+		
+		// Test Case cloud-2196
+		// multi-byte characters, create and update comments
+		{
+			Comment[] multiByteComments = new Comment[]
+			{
+					new Comment("ڠڡڢ", "ڠڡڢ"),
+					new Comment("\u67e5\u770b\u5168\u90e8", "\u67e5\u770b\u5168\u90e8")
+			};
+
+			Map<String, Comment> createdComments = new HashMap<String, Comment>();
+			for(Comment comment : multiByteComments)
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+				Comment ret = commentsProxy.createNodeComment(nodeRef2.getId(), comment);
+				createdComments.put(ret.getId(), ret);
+			}
+			
+			// test that it is possible to add comment to custom type node
+			commentsProxy.createNodeComment(customTypeObject.getId(), new Comment("Custom type node comment", "The Comment"));
+			
+			try
+			{
+				// test that it is not possible to add comment to cm:object node
+				commentsProxy.createNodeComment(cmObjectNodeRef.getId(),  new Comment("CM Object node comment", "The Comment"));
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+			
+			// get comments of the non-folder/non-document nodeRef
+			try
+			{
+				int skipCount = 0;
+				int maxItems = 2;
+				Paging paging = getPaging(skipCount, maxItems);
+				commentsProxy.getNodeComments(cmObjectNodeRef.getId(), createParams(paging, null));
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+			}
+			
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems);
+			ListResponse<Comment> resp = commentsProxy.getNodeComments(nodeRef2.getId(), createParams(paging, null));
+			List<Comment> retComments = resp.getList();
+			assertEquals(2, retComments.size());
+			for(Comment comment : retComments)
+			{
+				String commentId = comment.getId();
+				Comment expectedComment = createdComments.get(commentId);
+				expectedComment.expected(comment);
+			}
+
+			Comment[] multiByteCommentUpdates = new Comment[]
+  			{
+  					new Comment("ӉӋӐӞ", "ӉӋӐӞ"),
+  					new Comment("\u4e00\u4e01\u4e02\u4e03", "\u4e00\u4e01\u4e02\u4e03")
+  			};
+			
+			Map<String, Comment> updatedComments = new HashMap<String, Comment>();
+			for(Comment comment : multiByteCommentUpdates)
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+				Comment ret = commentsProxy.createNodeComment(nodeRef2.getId(), comment);
+				updatedComments.put(ret.getId(), ret);
+			}
+
+			skipCount = 0;
+			maxItems = 2;
+			paging = getPaging(skipCount, maxItems);
+			resp = commentsProxy.getNodeComments(nodeRef2.getId(), createParams(paging, null));
+			retComments = resp.getList();
+			assertEquals(2, retComments.size());
+			for(Comment comment : retComments)
+			{
+				String commentId = comment.getId();
+				Comment expectedComment = updatedComments.get(commentId);
+				expectedComment.expected(comment);
+			}
+		}
+
+		{
+			// special characters
+			Comment comment = new Comment("", "?*^&*(,");
+			List<Comment> expectedComments = new ArrayList<Comment>(1);
+			expectedComments.add(comment);
+
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			commentsProxy.createNodeComment(nodeRef3.getId(), comment);
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedComments.size(), expectedComments.size());
+			ListResponse<Comment> resp = commentsProxy.getNodeComments(nodeRef3.getId(), createParams(paging, null));
+			checkList(expectedComments.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+		}
+
+		try
+		{
+			Comment comment = new Comment("", "");
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			commentsProxy.createNodeComment(nodeRef2.getId(), comment);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+		}
+
+		DateFormat format = PublicApiDateFormat.getDateFormat();
+		final List<Comment> expectedComments = new ArrayList<Comment>(10);
+		final List<Comment> comments = new ArrayList<Comment>(10);
+		comments.add(new Comment("Test Comment 4", "Test Comment 4"));
+		comments.add(new Comment("Test Comment 1", "Test Comment 1"));
+		comments.add(new Comment("Test Comment 3", "Test Comment 3"));
+		comments.add(new Comment("Test Comment 2", "Test Comment 2"));
+
+		{
+			Date time = new Date();
+			for(Comment comment : comments)
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+				Comment resp = commentsProxy.createNodeComment(nodeRef1.getId(), comment);
+				// check response
+				assertEquals(comment.getContent(), resp.getContent());
+				assertFalse(StringUtils.isEmpty(resp.getCreatedBy().getDisplayName()));
+				assertEquals(resp.getCreatedBy().getDisplayName(), person11.getDisplayName());
+				assertTrue(format.parse(resp.getCreatedAt()).after(time));
+				person11.expected(resp.getCreatedBy());
+				assertNotNull(resp.getId());
+
+				expectedComments.add(resp);
+			}
+			
+			// check activities have been raised
+			repoService.generateFeed();
+
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+				Paging paging = getPaging(0, Integer.MAX_VALUE);
+				ListResponse<Activity> activities = peopleProxy.getActivities(person11.getId(), createParams(paging, null));
+
+				boolean found = false;
+				for(Activity activity : activities.getList())
+				{
+					String activityType = activity.getActivityType();
+					if(activityType.equals(ActivityType.COMMENT_CREATED))
+					{
+						Map<String, Object> summary = activity.getSummary();
+						assertNotNull(summary);
+						String objectId = (String)summary.get("objectId");
+						assertNotNull(objectId);
+						if(nodeRef1.getId().equals(objectId))
+						{
+							found = true;
+							break;
+						}
+					}
+				}
+
+				assertTrue(found);
+			}
+		}
+
+		// try to add a comment to a comment
+		try
+		{
+			Comment comment = comments.get(0);
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			Comment newComment = commentsProxy.createNodeComment(nodeRef1.getId(), comment);
+			expectedComments.add(newComment);
+
+			commentsProxy.createNodeComment(newComment.getId(), comment);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+		
+		// try to add a comment to a tag
+		try
+		{
+			Comment comment = comments.get(0);
+			Tag tag = new Tag("taggification");
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			Tag addedTag = nodesProxy.createNodeTag(nodeRef1.getId(), tag);
+			commentsProxy.createNodeComment(addedTag.getId(), comment);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+		
+		// add a comment to a folder
+		{
+			Date time = new Date();
+
+			Comment comment = comments.get(0);
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			Comment resp = commentsProxy.createNodeComment(folderNodeRef1.getId(), comment);
+
+			// check response
+			assertEquals(comment.getContent(), resp.getContent());
+			assertTrue(format.parse(resp.getCreatedAt()).after(time));
+			person11.expected(resp.getCreatedBy());
+			assertNotNull(resp.getId());
+		}
+
+		Collections.sort(expectedComments);
+
+		// Test Case cloud-2205
+		// Test Case cloud-2217
+		// Test Case cloud-1517
+		// pagination
+		{
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedComments.size(), expectedComments.size());
+			ListResponse<Comment> resp = commentsProxy.getNodeComments(nodeRef1.getId(), createParams(paging, null));
+			checkList(expectedComments.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+		}
+		
+		{
+			int skipCount = 2;
+			int maxItems = 10;
+			Paging paging = getPaging(skipCount, maxItems, expectedComments.size(), expectedComments.size());
+			ListResponse<Comment> resp = commentsProxy.getNodeComments(nodeRef1.getId(), createParams(paging, null));
+			checkList(expectedComments.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+		}
+		
+		// invalid node id - 404
+		try
+		{
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging expectedPaging = getPaging(skipCount, maxItems, expectedComments.size(), expectedComments.size());
+			commentsProxy.getNodeComments("invalid", createParams(expectedPaging, null));
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+
+		try
+		{
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedComments.size(), expectedComments.size());
+			commentsProxy.getNodeComments(nodeRef1.getId() + ";pwc", createParams(paging, null));
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+		
+		// suffix the node id with a version number
+		{
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedComments.size(), expectedComments.size());
+			ListResponse<Comment> resp = commentsProxy.getNodeComments(nodeRef1.getId() + ";3.0", createParams(paging, null));
+			checkList(expectedComments.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+		}
+
+		// view comments of a document created by another person in the same network, who is not a member of the site
+		// in which the comment resides
+		try
+		{
+			int skipCount = 0;
+			int maxItems = 2;
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person12.getId()));
+			Paging expectedPaging = getPaging(skipCount, maxItems, expectedComments.size(), expectedComments.size());
+			commentsProxy.getNodeComments(nodeRef1.getId(), createParams(expectedPaging, null));
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());
+		}
+
+		// document owned by another person in another network, the user is not a member of that network
+		try
+		{
+			int skipCount = 0;
+			int maxItems = 2;
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person21.getId()));
+			Paging expectedPaging = getPaging(skipCount, maxItems, expectedComments.size(), expectedComments.size());
+			commentsProxy.getNodeComments(nodeRef1.getId(), createParams(expectedPaging, null));
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+		}
+
+		// Test Case cloud-1971
+		// invalid methods
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging expectedPaging = getPaging(skipCount, maxItems, expectedComments.size(), expectedComments.size());
+			ListResponse<Comment> resp = commentsProxy.getNodeComments(nodeRef1.getId(), createParams(expectedPaging, null));
+			List<Comment> nodeComments = resp.getList();
+			assertTrue(nodeComments.size() > 0);
+			Comment comment = nodeComments.get(0);
+
+			try
+			{
+				commentsProxy.create("nodes", nodeRef1.getId(), "comments", comment.getId(), null, "Unable to POST to a node comment");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode()); 
+			}
+	
+			try
+			{
+				commentsProxy.update("nodes", nodeRef1.getId(), "comments", null, null, "Unable to PUT node comments");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+	
+			try
+			{
+				commentsProxy.getSingle("nodes", nodeRef1.getId(), "comments", comment.getId(), "Unable to GET a node comment");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+			
+			try
+			{
+				commentsProxy.remove("nodes", nodeRef1.getId(), "comments", null, "Unable to DELETE node comments");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+		}
+
+		// Test Case cloud-2184
+		// update comments
+		{
+			Comment[] testComments = new Comment[]
+			{
+					new Comment("ӉӋӐӞ", "ӉӋӐӞ"),
+					new Comment("\u4e00\u4e01\u4e02\u4e03", "\u4e00\u4e01\u4e02\u4e03")
+			};
+	
+			List<Comment> mlComments = new ArrayList<Comment>();
+			mlComments.add(new Comment("ӉӋӐӞ", "ӉӋӐӞ"));
+			mlComments.add(new Comment("\u4e00\u4e01\u4e02\u4e03", "\u4e00\u4e01\u4e02\u4e03"));
+
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+			// create some comments
+			Map<String, Comment> createdComments = new HashMap<String, Comment>();
+			for(Comment comment : testComments)
+			{
+
+				Comment ret = commentsProxy.createNodeComment(nodeRef4.getId(), comment);
+				createdComments.put(ret.getId(), ret);
+			}
+
+			// update them with multi-byte content
+			int i = 0;
+			List<Comment> updatedComments = new ArrayList<Comment>();
+			for(Comment comment : createdComments.values())
+			{
+				Comment updateComment = mlComments.get(i);
+				Comment ret = commentsProxy.updateNodeComment(nodeRef4.getId(), comment.getId(), updateComment);
+				updatedComments.add(ret);
+				i++;
+			}
+			Collections.sort(updatedComments);
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, mlComments.size(), mlComments.size());
+			ListResponse<Comment> resp = commentsProxy.getNodeComments(nodeRef4.getId(), createParams(paging, null));
+			checkList(updatedComments, paging.getExpectedPaging(), resp);
+		}
+		                                    			
+		// invalid node id
+		try
+		{
+			Comment comment = expectedComments.get(1);
+			Comment update = new Comment("Test Comment 4", "Test Comment 4");
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			commentsProxy.updateNodeComment(GUID.generate(), comment.getId(), update);
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+		
+		// invalid comment id
+		try
+		{
+			Comment update = new Comment("Test Comment 4", "Test Comment 4");
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			commentsProxy.updateNodeComment(nodeRef1.getId(), GUID.generate(), update);
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+
+		// person from the same network, not comment creator
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person12.getId()));
+			Comment comment = expectedComments.get(1);
+			Comment update = new Comment("Test Comment 4", "Test Comment 4");
+			commentsProxy.updateNodeComment(nodeRef1.getId(), comment.getId(), update);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());
+		}
+
+		// person from a different network
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person22.getId()));
+			Comment comment = expectedComments.get(1);
+			Comment update = new Comment("Test Comment 4", "Test Comment 4");
+			commentsProxy.updateNodeComment(nodeRef1.getId(), comment.getId(), update);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+		}
+
+		// successful update
+		{
+			Date time = new Date();
+
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			Comment comment = expectedComments.get(1);
+			Comment update = new Comment("Updated comment", "Updated comment");
+			Comment resp = commentsProxy.updateNodeComment(nodeRef1.getId(), comment.getId(), update);
+
+			Thread.sleep(100); // simulate a user edit to a comment
+
+			Comment expected = new Comment(comment);
+			expected.setTitle("Updated comment");
+			expected.setEdited(true);
+			expected.setContent("Updated comment");
+			expected.setModifiedBy(repoService.getPerson(person11.getId()));
+			expected.setModifiedAt(PublicApiDateFormat.getDateFormat().format(time));
+			expected.expected(resp);
+		}
+
+		// delete comments
+
+		// invalid node ref
+		try
+		{
+			Comment comment = expectedComments.get(1);
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			commentsProxy.removeNodeComment(GUID.generate(), comment.getId());
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+		
+		// invalid comment id
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			commentsProxy.removeNodeComment(nodeRef1.getId(), GUID.generate());
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+
+		// successful delete
+		{
+			Comment toDelete = expectedComments.get(1);
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			commentsProxy.removeNodeComment(nodeRef1.getId(), toDelete.getId());
+
+			// check it's been removed
+			int skipCount = 0;
+			int maxItems = Integer.MAX_VALUE;
+			Paging expectedPaging = getPaging(skipCount, maxItems, expectedComments.size(), expectedComments.size());
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			ListResponse<Comment> resp = commentsProxy.getNodeComments(nodeRef1.getId(), createParams(expectedPaging, null));
+			List<Comment> actualComments = resp.getList();
+			assertFalse(actualComments.contains(toDelete));
+		}
+		
+		// PUT: test update with null/empty comment
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+			Comment comment = new Comment();
+			comment.setContent("my comment");
+			Comment createdComment = commentsProxy.createNodeComment(nodeRef1.getId(), comment);
+
+			Comment updatedComment = new Comment();
+			updatedComment.setContent(null);
+			commentsProxy.updateNodeComment(nodeRef1.getId(), createdComment.getId(), updatedComment);
+			
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+		}
+		
+        // ACE-5463
+        testSkipCountHighValue(expectedComments, commentsProxy);
+	}
+	
+	@Test
+	public void testNodeCommentsAndLocking() throws Exception
+	{
+		Comments commentsProxy = publicApiClient.comments();
+
+		// locked node - cannot add/edit/delete comments (MNT-14945, MNT-16446)
+		// only the lock owner can (ALF-21907)
+
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    TestSite site = sites.get(0);
+                    site.updateMember(person13.getId(), SiteRole.SiteManager);
+                    site.updateMember(person14.getId(), SiteRole.SiteManager);
+
+                    return null;
+                }
+            }, person11.getId(), network1.getId());
+
+			Comment comment = new Comment();
+			comment.setContent("my comment");
+			Comment createdComment = commentsProxy.createNodeComment(nodeRef1.getId(), comment);
+
+			TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+			{
+				@Override
+				public Void doWork() throws Exception
+				{
+					repoService.lockNode(nodeRef1);
+					return null;
+				}
+			}, person13.getId(), network1.getId());
+
+			// change to not lock owner and not node owner
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person14.getId()));
+
+			// test GET for a locked node
+            int skipCount = 0;
+            int maxItems = Integer.MAX_VALUE;
+            Paging paging = getPaging(skipCount, maxItems);
+			commentsProxy.getNodeComments(nodeRef1.getId(), createParams(paging, null));
+
+			// test POST for a locked node
+			try
+			{
+				comment = new Comment();
+				comment.setContent("my other comment");
+				createdComment = commentsProxy.createNodeComment(nodeRef1.getId(), comment);
+
+				fail("");
+			}
+			catch (PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
+			}
+
+			// test PUT for a locked node
+			try
+			{
+				Comment updatedComment = new Comment();
+				updatedComment.setContent("my comment");
+				commentsProxy.updateNodeComment(nodeRef1.getId(), createdComment.getId(), updatedComment);
+
+				fail("");
+			}
+			catch (PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
+			}
+
+			// test DELETE for a locked node
+			try
+			{
+				commentsProxy.removeNodeComment(nodeRef1.getId(), createdComment.getId());
+
+				fail("");
+			}
+			catch (PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
+			}
+
+            // change to node creator
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+            // test POST for a locked node
+            try
+            {
+                comment = new Comment();
+                comment.setContent("my other comment");
+                createdComment = commentsProxy.createNodeComment(nodeRef1.getId(), comment);
+
+                fail("");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
+            }
+
+            // test PUT for a locked node
+            try
+            {
+                Comment updatedComment = new Comment();
+                updatedComment.setContent("my comment");
+                commentsProxy.updateNodeComment(nodeRef1.getId(), createdComment.getId(), updatedComment);
+
+                fail("");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
+            }
+
+            // test DELETE for a locked node
+            try
+            {
+                commentsProxy.removeNodeComment(nodeRef1.getId(), createdComment.getId());
+
+                fail("");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
+            }
+
+			// change to lock owner
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person13.getId()));
+
+			// test GET for a locked node
+            commentsProxy.getNodeComments(nodeRef1.getId(), createParams(paging, null));
+
+			// test POST for a locked node
+			comment = new Comment();
+			comment.setContent("my other comment");
+			createdComment = commentsProxy.createNodeComment(nodeRef1.getId(), comment);
+
+			// test PUT for a locked node
+			Comment updatedComment = new Comment();
+			updatedComment.setContent("my comment");
+			commentsProxy.updateNodeComment(nodeRef1.getId(), createdComment.getId(), updatedComment);
+
+			// test DELETE for a locked node
+			commentsProxy.removeNodeComment(nodeRef1.getId(), createdComment.getId());
+		}
+		finally
+		{
+		    // undo the lock
+			TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+			{
+				@Override
+				public Void doWork() throws Exception
+				{
+					repoService.unlockNode(nodeRef1);
+					return null;
+				}
+			}, person13.getId(), network1.getId());
+
+            // put the other members back to SiteCollaborator
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    TestSite site = sites.get(0);
+                    site.updateMember(person13.getId(), SiteRole.SiteCollaborator);
+                    site.updateMember(person14.getId(), SiteRole.SiteCollaborator);
+
+                    return null;
+                }
+            }, person11.getId(), network1.getId());
+		}
+	}
+
+	// lock recursively (MNT-14945, MNT-16446, REPO-1150)
+	@Test
+	public void testNodeCommentsAndLockingIncludingChildren() throws Exception
+	{
+		Comments commentsProxy = publicApiClient.comments();
+
+		// TODO push-down to future CommentServiceImplTest (see ACE-5437) - since includeChildren is via LockService api only
+
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+			Comment comment = new Comment();
+			comment.setContent("my comment");
+			Comment createdComment = commentsProxy.createNodeComment(nodeRef5.getId(), comment);
+
+			// recursive lock (folderRef1, nodeRef5)
+			TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+			{
+				@Override
+				public Void doWork() throws Exception
+				{
+					repoService.lockNode(folderNodeRef1, LockType.WRITE_LOCK, 0, true);
+					return null;
+				}
+			}, person11.getId(), network1.getId());
+
+		}
+		finally
+		{
+			TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+			{
+				@Override
+				public Void doWork() throws Exception
+				{
+					repoService.unlockNode(folderNodeRef1, true);
+					return null;
+				}
+			}, network1.getId());
+		}
+	}
+
+	@Test
+	public void test_MNT_16446() throws Exception
+	{
+		Comments commentsProxy = publicApiClient.comments();
+
+		// in a site
+
+		publicApiClient.setRequestContext(new RequestContext(network1.getId(), person13.getId()));
+		Comment comment = new Comment("Test Comment 1", "Test Comment 1");
+		Comment resp = commentsProxy.createNodeComment(nodeRef1.getId(), comment);
+		String commentId = resp.getId();
+
+		// MNT-16446: another site collaborator should not be able to edit
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person14.getId()));
+			Comment update = new Comment("Test Comment 4", "Test Comment 4");
+			commentsProxy.updateNodeComment(nodeRef1.getId(), commentId, update);
+			fail();
+		}
+		catch (PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());
+		}
+
+		publicApiClient.setRequestContext(new RequestContext(network1.getId(), person13.getId()));
+
+		Comment update = new Comment("Updated comment", "Updated comment");
+		commentsProxy.updateNodeComment(nodeRef1.getId(), commentId, update);
+
+		commentsProxy.removeNodeComment(nodeRef1.getId(), commentId);
+	}
+
+    // test for retrieving the list of comments with high value of skipCount(e.g. 10)
+    public void testSkipCountHighValue(List<Comment> expectedComments, Comments commentsProxy) throws PublicApiException
+    {
+        try
+        {
+            int skipCount = 10;
+            int maxItems = 2;
+            Paging paging = getPaging(skipCount, maxItems, expectedComments.size(), expectedComments.size());
+            commentsProxy.getNodeComments(nodeRef1.getId(), createParams(paging, null));
+
+        }
+        catch (IllegalStateException e)
+        {
+            fail();
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestNodeRatings.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestNodeRatings.java
new file mode 100644
index 00000000000..41b8cf7c180
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestNodeRatings.java
@@ -0,0 +1,566 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.activities.ActivityType;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Comments;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Nodes;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.People;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Activity;
+import org.alfresco.rest.api.tests.client.data.Comment;
+import org.alfresco.rest.api.tests.client.data.NodeRating;
+import org.alfresco.rest.api.tests.client.data.Site;
+import org.alfresco.rest.api.tests.client.data.SiteContainer;
+import org.alfresco.rest.api.tests.client.data.SiteImpl;
+import org.alfresco.rest.api.tests.client.data.Tag;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.apache.commons.httpclient.HttpStatus;
+import org.json.simple.JSONArray;
+import org.junit.Test;
+
+public class TestNodeRatings extends AbstractBaseApiTest
+{
+	@Test
+	public void testNodeRatings() throws Exception
+	{
+		Iterator<TestNetwork> networksIt = getTestFixture().getNetworksIt();
+		assertTrue(networksIt.hasNext());
+		final TestNetwork network1 = networksIt.next();
+		assertTrue(networksIt.hasNext());
+		final TestNetwork network2 = networksIt.next();
+
+		final List<TestPerson> people = new ArrayList<TestPerson>(3);
+
+		// create users
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				TestPerson person = network1.createUser();
+				people.add(person);
+				person = network1.createUser();
+				people.add(person);
+				return null;
+			}
+		}, network1.getId());
+		
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				TestPerson person = network2.createUser();
+				people.add(person);
+				return null;
+			}
+		}, network2.getId());
+
+		final TestPerson person11 = people.get(0);
+		final TestPerson person12 = people.get(1);
+		final TestPerson person21 = people.get(2);
+		
+		PublicApiClient.Sites sitesProxy = publicApiClient.sites();
+		Comments commentsProxy = publicApiClient.comments();
+		People peopleProxy = publicApiClient.people();
+		Nodes nodesProxy = publicApiClient.nodes();
+		DateFormat format = PublicApiDateFormat.getDateFormat();
+
+		// Create site and document
+
+		publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+		String siteId = "TESTSITE" + GUID.generate();
+		Site site = new SiteImpl(siteId, siteId, siteId, SiteVisibility.PRIVATE.toString());
+		site = sitesProxy.createSite(site);
+
+		SiteContainer sc = sitesProxy.getSingleSiteContainer(site.getSiteId(), "documentLibrary");
+		final String node1Id = createTextFile(sc.getId(), "Test Doc 1.txt", "Test Content").getId();
+
+		// TEMP - pending remote api to list node ratings
+		NodeRef nodeRef1 = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, node1Id);
+
+		// Test Case cloud-1976
+		// Create node ratings
+		// try to add a rating to a comment
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+			Comment comment = new Comment("Test Comment", "Test Comment");
+			Comment newComment = commentsProxy.createNodeComment(node1Id, comment);
+			NodeRating rating = new NodeRating("likes", true);
+			nodesProxy.createNodeRating(newComment.getId(), rating);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+		
+		// invalid node id
+		try
+		{
+			NodeRating rating = new NodeRating("likes", true);
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			nodesProxy.createNodeRating(GUID.generate(), rating);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+		
+		// try to add a rating to a tag
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+			Tag tag = new Tag("testTag");
+			Tag newTag = nodesProxy.createNodeTag(node1Id, tag);
+			NodeRating rating = new NodeRating("likes", true);
+			nodesProxy.createNodeRating(newTag.getId(), rating);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+
+		// invalid rating scheme
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			nodesProxy.createNodeRating(node1Id, new NodeRating("missingRatingScheme", Double.valueOf(1.0f)));
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+		}
+
+		// invalid rating
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			nodesProxy.createNodeRating(node1Id, new NodeRating("likes", Double.valueOf(2.0f)));
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+		}
+		
+		// invalid rating
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			nodesProxy.createNodeRating(node1Id, new NodeRating("fiveStar", true));
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+		}
+		
+		// invalid rating - can't rate own content for fiveStar
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			nodesProxy.createNodeRating(node1Id, new NodeRating("fiveStar", 5));
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+		}
+
+		// valid ratings
+		{
+			NodeRating rating = new NodeRating("likes", true);
+
+			Date time = new Date();
+
+			// rate by multiple users in more than 1 network
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			NodeRating ret = nodesProxy.createNodeRating(node1Id, rating);
+			assertEquals(rating.getMyRating(), ret.getMyRating());
+			assertTrue(format.parse(ret.getRatedAt()).after(time));
+			assertEquals(rating.getId(), ret.getId());
+			assertEquals(new NodeRating.Aggregate(1, null), ret.getAggregate());
+
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person12.getId()));
+			ret = nodesProxy.createNodeRating(node1Id, rating);
+			assertEquals(rating.getMyRating(), ret.getMyRating());
+			assertTrue(format.parse(ret.getRatedAt()).after(time));
+			assertEquals(rating.getId(), ret.getId());
+			assertEquals(new NodeRating.Aggregate(2, null), ret.getAggregate());
+			
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person12.getId()));
+			ret = nodesProxy.createNodeRating(node1Id, rating);
+			assertEquals(rating.getMyRating(), ret.getMyRating());
+			assertTrue(format.parse(ret.getRatedAt()).after(time));
+			assertEquals(rating.getId(), ret.getId());
+			assertEquals(new NodeRating.Aggregate(2, null), ret.getAggregate());
+			
+			// different network - unauthorized
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person21.getId()));
+				nodesProxy.createNodeRating(node1Id, rating);
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+			}
+			
+			// Test Case cloud-2209
+			// Test Case cloud-2220
+			// Test Case cloud-1520
+			// check that the node ratings are there, test paging
+
+			{
+				// person11
+				
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+				
+				List<NodeRating> expectedRatings = repoService.getNodeRatings(person11.getId(), network1.getId(), nodeRef1);
+				
+				{
+					int skipCount = 0;
+					int maxItems = 1;
+					Paging paging = getPaging(skipCount, maxItems, expectedRatings.size(), expectedRatings.size());
+	 				ListResponse<NodeRating> resp = nodesProxy.getNodeRatings(node1Id, createParams(paging, null));
+					checkList(expectedRatings.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+				}
+	
+				{
+					int skipCount = 1;
+					int maxItems = Integer.MAX_VALUE;
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+					Paging paging = getPaging(skipCount, maxItems, expectedRatings.size(), expectedRatings.size());
+					ListResponse<NodeRating> resp = nodesProxy.getNodeRatings(node1Id, createParams(paging, null));
+					checkList(expectedRatings.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+				}
+	
+				{
+					int skipCount = 1;
+					int maxItems = expectedRatings.size();
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+					Paging paging = getPaging(skipCount, maxItems, expectedRatings.size(), expectedRatings.size());
+					ListResponse<NodeRating> resp = nodesProxy.getNodeRatings(node1Id, createParams(paging, null));
+					checkList(expectedRatings.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+				}
+			}
+			
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person12.getId()));
+
+				// person12
+				List<NodeRating> expectedRatings = repoService.getNodeRatings(person12.getId(), network1.getId(), nodeRef1);
+	
+				{
+					int skipCount = 0;
+					int maxItems = 1;
+					Paging paging = getPaging(skipCount, maxItems, expectedRatings.size(), expectedRatings.size());
+					ListResponse<NodeRating> resp = nodesProxy.getNodeRatings(node1Id, createParams(paging, null));
+					checkList(expectedRatings.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+				}
+	
+				{
+					int skipCount = 1;
+					int maxItems = Integer.MAX_VALUE;
+					Paging paging = getPaging(skipCount, maxItems, expectedRatings.size(), expectedRatings.size());
+					ListResponse<NodeRating> resp = nodesProxy.getNodeRatings(node1Id, createParams(paging, null));
+					checkList(expectedRatings.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+				}
+			}
+
+			{
+				// person21
+				
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person21.getId()));
+
+				List<NodeRating> expectedRatings = Collections.emptyList();
+
+				try
+				{
+					int skipCount = 0;
+					int maxItems = 1;
+
+					Paging paging = getPaging(skipCount, maxItems, expectedRatings.size(), expectedRatings.size());
+					nodesProxy.getNodeRatings(node1Id, createParams(paging, null));
+					fail();
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+				}
+			}
+			
+			// invalid node id
+			try
+			{
+				int skipCount = 1;
+				int maxItems = Integer.MAX_VALUE;
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+				Paging paging = getPaging(skipCount, maxItems);
+				nodesProxy.getNodeRatings(GUID.generate(), createParams(paging, null));
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+			
+			// check activities have been raised for the created ratings
+			repoService.generateFeed();
+			
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+				Paging paging = getPaging(0, Integer.MAX_VALUE);
+				ListResponse<Activity> activities = peopleProxy.getActivities(person11.getId(), createParams(paging, null));
+
+				boolean found = false;
+				for(Activity activity : activities.getList())
+				{
+					String activityType = activity.getActivityType();
+					if(activityType.equals(ActivityType.FILE_LIKED))
+					{
+						Map<String, Object> summary = activity.getSummary();
+						assertNotNull(summary);
+						String objectId = (String)summary.get("objectId");
+						assertNotNull(objectId);
+						if(node1Id.equals(objectId))
+						{
+							found = true;
+							break;
+						}
+					}
+				}
+
+				assertTrue(found);
+			}
+		}
+
+		{
+			// remove node rating
+			
+			NodeRating rating = new NodeRating("likes", null);
+
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person21.getId()));
+				nodesProxy.removeNodeRating(node1Id, rating);
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+			}
+
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person12.getId()));
+				nodesProxy.removeNodeRating(node1Id, rating);
+			}
+
+			// check list
+			{
+				List<NodeRating> ratings = repoService.getNodeRatings(person11.getId(), network1.getId(), nodeRef1);
+
+				int skipCount = 0;
+				int maxItems = Integer.MAX_VALUE;
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+				Paging paging = getPaging(skipCount, maxItems, ratings.size(), ratings.size());
+				ListResponse<NodeRating> resp = nodesProxy.getNodeRatings(node1Id, createParams(paging, null));
+				checkList(ratings.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+			}
+		}
+
+		// get a node rating
+		// 1977
+		{
+			NodeRating rating = new NodeRating("likes", true);
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+			NodeRating expected = nodesProxy.createNodeRating(node1Id, rating);
+			NodeRating actual = nodesProxy.getNodeRating(node1Id, "likes");
+			expected.expected(actual);
+		}
+
+		{
+			// update node rating
+			NodeRating rating = new NodeRating("fiveStar", 2);
+
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person12.getId()));
+
+			// create initial rating
+			NodeRating createdRating = nodesProxy.createNodeRating(node1Id, rating);
+			NodeRating updateRating = new NodeRating(createdRating.getId(), 5);
+
+			// update - not supported
+			try
+			{
+				nodesProxy.updateNodeRating(node1Id, updateRating);
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+		}
+
+		// Test Case cloud-1977
+		// invalid methods
+		{
+			try
+			{
+				// -ve test - cannot create multiple ratings in single POST call (unsupported)
+				List<NodeRating> ratings = new ArrayList<>(2);
+				ratings.add(new NodeRating("likes", true));
+				ratings.add(new NodeRating("likes", false));
+                
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+				nodesProxy.create("nodes", node1Id, "ratings", null, JSONArray.toJSONString(ratings), "Unable to POST to multiple ratings");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+
+			// get an arbitrary rating
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+			ListResponse<NodeRating> resp = nodesProxy.getNodeRatings(node1Id, createParams(getPaging(0, Integer.MAX_VALUE), null));
+			List<NodeRating> nodeRatings = resp.getList();
+			assertTrue(nodeRatings.size() > 0);
+
+			try
+			{
+				NodeRating rating = new NodeRating("likes", true);
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+				nodesProxy.create("nodes", node1Id, "ratings", "likes", rating.toJSON().toString(), "Unable to POST to a node rating");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+				nodesProxy.update("nodes", node1Id, "ratings", null, null, "Unable to PUT node ratings");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+			
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+				nodesProxy.remove("nodes", node1Id, "ratings", null, "Unable to DELETE node ratings");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+			
+			try
+			{
+				NodeRating rating = nodeRatings.get(0);
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+				nodesProxy.update("nodes", node1Id, "ratings", rating.getId(), null, "Unable to PUT a node rating");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+		}
+		
+        // Test case ACE-5453
+        {
+            try
+            {
+                testSkipCountLargeValue(person11, network1, nodeRef1, nodesProxy);
+            }
+            catch (PublicApiException e)
+            {
+                fail();
+            }
+        }
+    }
+
+    // test for retrieving the list of ratings with high value of skipCount(e.g. 10)
+    public void testSkipCountLargeValue(TestPerson person11, TestNetwork network1, NodeRef nodeRef1, Nodes nodesProxy) throws PublicApiException
+    {
+        List<NodeRating> expectedRatings = repoService.getNodeRatings(person11.getId(), network1.getId(), nodeRef1);
+        int skipCount = 10;
+        int maxItems = Integer.MAX_VALUE;
+        Paging paging = getPaging(skipCount, maxItems, expectedRatings.size(), expectedRatings.size());
+        nodesProxy.getNodeRatings(nodeRef1.getId(), createParams(paging, null));
+    }
+
+	@Override
+	public String getScope()
+	{
+		return "public";
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java
new file mode 100644
index 00000000000..560c1c182e2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java
@@ -0,0 +1,2374 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.ContentLimitProvider;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.ResetPasswordServiceImpl;
+import org.alfresco.rest.api.Renditions;
+import org.alfresco.rest.api.model.Client;
+import org.alfresco.rest.api.model.LoginTicket;
+import org.alfresco.rest.api.model.LoginTicketResponse;
+import org.alfresco.rest.api.model.PasswordReset;
+import org.alfresco.rest.api.model.Rendition;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.Pair;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.People;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Company;
+import org.alfresco.rest.api.tests.client.data.JSONAble;
+import org.alfresco.rest.api.tests.client.data.Person;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.preference.PreferenceService;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.MutableAuthenticationService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.thumbnail.ThumbnailService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.GUID;
+import org.alfresco.util.email.EmailUtil;
+import org.apache.commons.httpclient.HttpStatus;
+import org.json.simple.JSONObject;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.core.io.ClassPathResource;
+
+import javax.mail.internet.MimeMessage;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.EmptyStackException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import static java.lang.Thread.sleep;
+import static org.alfresco.repo.security.authentication.ResetPasswordServiceImplTest.getWorkflowIdAndKeyFromUrl;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class TestPeople extends AbstractBaseApiTest
+{
+    private static final String URL_PEOPLE = "people";
+    private static final QName ASPECT_COMMS = QName.createQName("test.people.api", "comms");
+    private static final QName PROP_TELEHASH = QName.createQName("test.people.api", "telehash");
+    private static final QName ASPECT_LUNCHABLE = QName.createQName("test.people.api", "lunchable");
+    private static final QName PROP_LUNCH = QName.createQName("test.people.api", "lunch");
+    private static final QName PROP_LUNCH_COMMENTS = QName.createQName("test.people.api", "lunchcomments");
+    private People people;
+    private Iterator<TestNetwork> accountsIt;
+    private TestNetwork account1;
+    private TestNetwork account2;
+    private static TestNetwork account3;
+    private static TestNetwork account4;
+    private Iterator<String> account1PersonIt;
+    private Iterator<String> account2PersonIt;
+    private String account1Admin;
+    private String account2Admin;
+    private String account3Admin;
+    private static String account4Admin;
+    private static Person personAlice;
+    private static Person personAliceD;
+    private static Person personBen;
+    private Person personBob;
+    private NodeService nodeService;
+    private PersonService personService;
+
+    @Before
+    public void setUp() throws Exception
+    {
+        people = publicApiClient.people();
+        accountsIt = getTestFixture().getNetworksIt();
+        account1 = accountsIt.next();
+        account2 = accountsIt.next();
+        // Networks are very expensive to create, so do this once only and store statically.
+        if (account3 == null)
+        {
+            account3 = createNetwork("account3");
+        }
+        if (account4 == null)
+        {
+            // Use account 4 only for the sorting and paging tests, so that the data doesn't change between tests.
+            account4 = createNetwork("account4");
+
+            account4Admin = "admin@" + account4.getId();
+            
+            publicApiClient.setRequestContext(new RequestContext(account4.getId(), account4Admin, "admin"));
+            personAlice = new Person();
+            personAlice.setUserName("alice@" + account4.getId());
+            personAlice.setId("alice@" + account4.getId());
+            personAlice.setFirstName("Alice");
+            personAlice.setLastName("Smith");
+            personAlice.setEmail("alison.smith@example.com");
+            personAlice.setPassword("password");
+            personAlice.setEnabled(true);
+            personAlice.setProperties(Collections.singletonMap("papi:lunch", "Magical sandwich"));
+            people.create(personAlice);
+            
+            personAliceD = new Person();
+            personAliceD.setUserName("aliced@" + account4.getId());
+            personAliceD.setId("aliced@" + account4.getId());
+            personAliceD.setFirstName("Alice");
+            personAliceD.setLastName("Davis");
+            personAliceD.setEmail("alison.davis@example.com");
+            personAliceD.setPassword("password");
+            personAliceD.setEnabled(true);
+            people.create(personAliceD);
+
+            personBen = new Person();
+            personBen.setUserName("ben@" + account4.getId());
+            personBen.setId("ben@" + account4.getId());
+            personBen.setFirstName("Ben");
+            personBen.setLastName("Carson");
+            personBen.setEmail("ben.smythe@example.com");
+            personBen.setPassword("password");
+            personBen.setEnabled(true);
+            people.create(personBen);
+        }
+        account1Admin = "admin@" + account1.getId();
+        account2Admin = "admin@" + account2.getId();
+        account3Admin = "admin@" + account3.getId();
+        account1PersonIt = account1.getPersonIds().iterator();
+        account2PersonIt = account2.getPersonIds().iterator();
+        
+        nodeService = applicationContext.getBean("NodeService", NodeService.class);
+        personService = applicationContext.getBean("PersonService", PersonService.class);
+
+        // Capture authentication pre-test, so we can restore it again afterwards.
+        AuthenticationUtil.pushAuthentication();
+    }
+    
+    @After
+    public void tearDown()
+    {
+        // Restore authentication to pre-test state.
+        try
+        {
+            AuthenticationUtil.popAuthentication();
+        }
+        catch(EmptyStackException e)
+        {
+            // Nothing to do.
+        }
+    }
+
+    private TestNetwork createNetwork(String networkPrefix)
+    {
+        TestNetwork network = getRepoService().createNetwork(networkPrefix + GUID.generate(), true);
+        network.create();
+
+        return network;
+    }
+
+    @Test
+    public void testGetPerson() throws Exception
+    {
+        final String person1 = account1PersonIt.next();
+        final String person2 = account1PersonIt.next();
+        final String person3 = account2PersonIt.next();
+
+        // Test Case cloud-2192
+        // should be able to see oneself
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1));
+            Person resp = people.getPerson(person1);
+            Person person1Entity = repoService.getPerson(person1);
+            check(person1Entity, resp);
+        }
+        
+        // should be able to see another user in the same domain, and be able to see full profile
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), person2));
+            Person resp = people.getPerson(person1);
+            Person person1Entity = repoService.getPerson(person1);
+
+            Map<String, Boolean> respCapabilities = resp.getCapabilities();
+            assertNotNull("Check if capabilities are present", respCapabilities);
+
+            check(person1Entity, resp);
+        }
+        
+        // "-me-" user
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1));
+            Person resp = people.getPerson(org.alfresco.rest.api.People.DEFAULT_USER);
+            Person person1Entity = repoService.getPerson(person1);
+
+            Map<String, Boolean> respCapabilities = resp.getCapabilities();
+            assertNotNull("Check if capabilities are present", respCapabilities);
+            assertTrue("Check if -me- user is mutable", respCapabilities.get("isMutable"));
+
+            check(person1Entity, resp);
+        }
+
+        // shouldn't be able to see another user in another domain
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), person3));
+        try
+        {
+            people.getPerson(person1);
+            fail("");
+        }
+        catch(PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+        }
+
+        RepoService.TestPerson testP = account1.createUser();
+        String personId = testP.getId();
+        String desc = "<B>Nice person</B>";
+        account1.addUserDescription(personId, desc);
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), personId));
+        Person resp = publicApiClient.people().getPerson(personId);
+        assertEquals(resp.getId(), personId);
+        assertEquals(resp.getDescription(), desc);
+    }
+
+    @Test
+    public void testCreatePerson() throws Exception
+    {
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "admin"));
+
+        Person person = new Person();
+        person.setUserName("myUserName00@"+account1.getId());
+        person.setFirstName("Firstname");
+        person.setLastName("Lastname");
+        person.setDescription("my description");
+        person.setEmail("email@example.com");
+        person.setSkypeId("my.skype.id");
+        person.setGoogleId("google");
+        person.setInstantMessageId("jabber@im.example.com");
+        person.setJobTitle("International Man of Mystery");
+        person.setLocation("location");
+        person.setCompany(new Company("Org", "addr1", "addr2", "addr3", "AB1 1BA", "111 12312123", "222 345345345", "company.email@example.com"));
+        person.setMobile("5657 567567 34543");
+        person.setTelephone("1234 5678 9012");
+        person.setUserStatus("userStatus");
+        person.setEnabled(true);
+        person.setEmailNotificationsEnabled(true);
+        person.setPassword("password");
+
+        Person p = people.create(person);
+
+        assertEquals("myUserName00@"+account1.getId(), p.getId());
+        assertEquals("Firstname", p.getFirstName());
+        assertEquals("Lastname", p.getLastName());
+        assertEquals("Firstname Lastname", p.getDisplayName());
+        assertEquals("my description", p.getDescription());
+        assertEquals("email@example.com", p.getEmail());
+        assertEquals("my.skype.id", p.getSkypeId());
+        assertEquals("google", p.getGoogleId());
+        assertEquals("jabber@im.example.com", p.getInstantMessageId());
+        assertEquals("International Man of Mystery", p.getJobTitle());
+        assertEquals("location", p.getLocation());
+
+        // Check embedded "company" document
+        org.alfresco.rest.api.model.Company co = p.getCompany();
+        assertEquals("Org", co.getOrganization());
+        assertEquals("addr1", co.getAddress1());
+        assertEquals("addr2", co.getAddress2());
+        assertEquals("addr3", co.getAddress3());
+        assertEquals("AB1 1BA", co.getPostcode());
+        assertEquals("111 12312123", co.getTelephone());
+        assertEquals("222 345345345", co.getFax());
+        assertEquals("company.email@example.com", co.getEmail());
+
+        assertEquals("5657 567567 34543", p.getMobile());
+        assertEquals("1234 5678 9012", p.getTelephone());
+        assertEquals("userStatus", p.getUserStatus());
+        assertEquals(true, p.isEnabled());
+        assertEquals(true, p.isEmailNotificationsEnabled());
+
+        // -ve tests
+        // create person with username too long
+        person.setUserName("myUserName11111111111111111111111111111111111111111111111111111111111111111111111111111111@" + account1.getId());
+        people.create(person, 400);
+
+        // create person with invalid characters {'/', '\\', '\n', '\r', '"'}
+        {
+            char[] invalidCharacters = {'/', '\\', '\n', '\r', '"'};
+
+            for (char invalidCharacter : invalidCharacters)
+            {
+                person.setUserName("myUser" + invalidCharacter + "Name@" + account1.getId());
+                people.create(person, 400);
+            }
+        }
+
+
+        // check for reserved authority prefixes
+        person.setUserName("GROUP_EVERYONE");
+        people.create(person, 400);
+
+        person.setUserName("GROUP_mygroup");
+        people.create(person, 400);
+
+        person.setUserName("ROLE_ANYTHING");
+        people.create(person, 400);
+
+        // lower case
+        person.setUserName("role_whatever");
+        people.create(person, 400);
+    }
+
+    @Test
+    public void testCreatePerson_canCreateDisabledPerson() throws PublicApiException
+    {
+        // Person disabled
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "admin"));
+            
+            Person person = new Person();
+            person.setUserName("myUserName04@"+account1.getId());
+            person.setFirstName("Firstname");
+            person.setEmail("myUserName04@"+account1.getId());
+            person.setEnabled(false);
+            person.setPassword("hello");
+
+            Person p = people.create(person);
+            assertEquals(false, p.isEnabled());
+            // It's very important that the password isn't exposed over the REST API.
+            assertNull(p.getPassword());
+            // Check that a freshly retrieved person exhibits the same result
+            p = people.getPerson(person.getUserName());
+            assertEquals(false, p.isEnabled());
+            assertNull(p.getPassword());
+            
+            // Can the new user account be used?
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), person.getUserName(), "hello"));
+            try
+            {
+                people.getPerson(person.getUserName());
+                fail("It should not be possible to use a disabled account.");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(401, e.getHttpResponse().getStatusCode());
+            }
+        }
+
+        // Person enabled
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "admin"));
+            
+            Person person = new Person();
+            person.setUserName("myUserName05@"+account1.getId());
+            person.setFirstName("Firstname");
+            person.setEmail("myUserName05@"+account1.getId());
+            person.setEnabled(true);
+            person.setPassword("banana");
+
+            Person p = people.create(person);
+            assertEquals(true, p.isEnabled());
+            // It's very important that the password isn't exposed over the REST API.
+            assertNull(p.getPassword());
+            // Check that a freshly retrieved person exhibits the same result
+            p = people.getPerson(person.getUserName());
+            assertEquals(true, p.isEnabled());
+            assertNull(p.getPassword());
+
+            // Can the new user account be used?
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), person.getUserName(), "banana"));
+            p = people.getPerson(person.getUserName());
+            assertNotNull(p);
+            assertNull(p.getPassword());
+        }
+    }
+    
+    @Test
+    public void testCreatePerson_notAllFieldsRequired() throws Exception
+    {
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "admin"));
+
+        // +ve: a random subset of fields should succeed.
+        {
+            Person person = new Person();
+            person.setUserName("joe.bloggs@" + account1.getId());
+            person.setFirstName("Joe");
+            person.setLastName("Bloggs");
+            person.setEmail("joe.bloggs@example.com");
+            person.setSkypeId("jb.skype.id");
+            person.setTelephone("1234 5678 9012");
+            person.setEnabled(false);
+            person.setEmailNotificationsEnabled(false);
+            person.setPassword("password123");
+
+            Person p = people.create(person);
+
+            assertEquals("joe.bloggs@" + account1.getId(), p.getId());
+            assertEquals("Joe", p.getFirstName());
+            assertEquals("Bloggs", p.getLastName());
+            assertEquals("Joe Bloggs", p.getDisplayName());
+            assertEquals(null, p.getDescription());
+            assertEquals("joe.bloggs@example.com", p.getEmail());
+            assertEquals("jb.skype.id", p.getSkypeId());
+            assertEquals(null, p.getGoogleId());
+            assertEquals(null, p.getInstantMessageId());
+            assertEquals(null, p.getJobTitle());
+            assertEquals(null, p.getLocation());
+
+            // note: empty company object is returned for backwards compatibility (with pre-existing getPerson API <= 5.1)
+            assertNotNull(p.getCompany());
+            assertNull(p.getCompany().getOrganization());
+            assertNull(p.getCompany().getAddress1());
+            assertNull(p.getCompany().getAddress2());
+            assertNull(p.getCompany().getAddress3());
+            assertNull(p.getCompany().getPostcode());
+            assertNull(p.getCompany().getFax());
+            assertNull(p.getCompany().getEmail());
+            assertNull(p.getCompany().getTelephone());
+
+            assertEquals(null, p.getMobile());
+            assertEquals("1234 5678 9012", p.getTelephone());
+            assertEquals(null, p.getUserStatus());
+            assertEquals(false, p.isEnabled());
+            assertEquals(false, p.isEmailNotificationsEnabled());
+        }
+
+        // +ve: absolute minimum
+        {
+            Person person = new Person();
+            person.setUserName("joe.bloggs.2@"+account1.getId());
+            person.setFirstName("Joe");
+            person.setEmail("joe.bloggs.2@example.com");
+            person.setPassword("password-is-secret");
+
+            Person p = people.create(person);
+
+            assertEquals("joe.bloggs.2@" + account1.getId(), p.getId());
+            assertEquals("Joe", p.getFirstName());
+            assertEquals(null, p.getLastName());
+            assertEquals("Joe", p.getDisplayName());
+            assertEquals(null, p.getDescription());
+            assertEquals("joe.bloggs.2@example.com", p.getEmail());
+            assertEquals(null, p.getSkypeId());
+            assertEquals(null, p.getGoogleId());
+            assertEquals(null, p.getInstantMessageId());
+            assertEquals(null, p.getJobTitle());
+            assertEquals(null, p.getLocation());
+
+            // note: empty company object is returned for backwards compatibility (with pre-existing getPerson API <= 5.1)
+            assertNotNull(p.getCompany());
+            assertNull(p.getCompany().getOrganization());
+            assertNull(p.getCompany().getAddress1());
+            assertNull(p.getCompany().getAddress2());
+            assertNull(p.getCompany().getAddress3());
+            assertNull(p.getCompany().getPostcode());
+            assertNull(p.getCompany().getFax());
+            assertNull(p.getCompany().getEmail());
+            assertNull(p.getCompany().getTelephone());
+
+            assertEquals(null, p.getMobile());
+            assertEquals(null, p.getTelephone());
+            assertEquals(null, p.getUserStatus());
+            assertEquals(true, p.isEnabled());
+            assertEquals(true, p.isEmailNotificationsEnabled());
+        }
+
+        // -ve: not enough fields!
+        {
+            // Create a person with no fields other than user ID set.
+            Person person = new Person();
+            person.setUserName("joe.bloggs.2@"+account1.getId());
+            people.create(person, 400);
+
+            // Missing ID
+            person.setUserName(null);
+            people.create(person, 400);
+        }
+    }
+
+    @Test
+    public void testCreatePerson_extraFieldsCauseError() throws Exception {
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "admin"));
+
+        String username = "joe.bloggs@"+account1.getId();
+
+        String[] illegalFields = new String[] {
+                "\"avatarId\": \"workspace://SpacesStore/\"",
+                "\"statusUpdatedAt\": \"2016-10-25T09:12:58.621Z\"",
+                "\"quota\": \"123\"",
+                "\"quotaUsed\": \"80\""
+        };
+
+        for (String badField : illegalFields)
+        {
+            String json =
+                    "{\n" +
+                            "  \"id\": \"" + username + "\",\n" +
+                            "  \"firstName\": \"Joe\",\n" +
+                            "  \"lastName\": \"Bloggs\",\n" +
+                            badField +
+                            "}";
+            people.create("people", null, null, null, json, "Illegal field test:"+badField, 400);
+        }
+    }
+
+    /**
+     * General error conditions not covered by other "create person" tests.
+     */
+    @Test
+    public void testCreatePerson_errorResponses() throws Exception {
+        // -ve: authorisation required
+        {
+            // Invalid auth details
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), GUID.generate(), "password"));
+            Person person = new Person();
+            person.setUserName("myUserName01@"+account1.getId());
+            person.setFirstName("Caroline");
+            person.setEmail("caroline.smithson@example.com");
+            person.setEnabled(true);
+            people.create(person, 401);
+        }
+
+        // -ve: API user does not have permission to create user.
+        {
+            String apiUser = account2PersonIt.next();
+            publicApiClient.setRequestContext(new RequestContext(account2.getId(), apiUser));
+            Person person = new Person();
+            person.setUserName("myUserName02@"+account2.getId());
+            person.setFirstName("Kieth");
+            person.setEmail("keith.smith@example.com");
+            person.setEnabled(true);
+            person.setPassword("password");
+            people.create(person, 403);
+
+            publicApiClient.setRequestContext(new RequestContext(account2.getId(), account2Admin, "admin"));
+            // Should succeed this time.
+            people.create(person, 201);
+        }
+
+        // -ve: person already exists
+        {
+            String username = "myUserName03@"+account1.getId();
+            String password = "secret";
+
+            Person person = new Person();
+            person.setUserName(username);
+            person.setFirstName("Alison");
+            person.setEmail("alison.smythe@example.com");
+            person.setEnabled(true);
+            person.setPassword(password);
+
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "admin"));
+            people.create(person);
+
+            // Attempt to create the person a second time - as admin expect 409
+            people.create(person, 409);
+
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), username, password));
+            // Attempt to create the person a second time - as non-admin expect 403
+            people.create(person, 403);
+        }
+
+        // -ve: cannot set built-in/non-custom props
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "admin"));
+            Person person = new Person();
+            String personId = UUID.randomUUID().toString()+"@"+account1.getId();
+            person.setUserName(personId);
+            person.setFirstName("Joe");
+            person.setEmail(personId);
+            person.setEnabled(true);
+            person.setPassword("password123");
+            
+            person.setProperties(Collections.singletonMap("usr:enabled", false));
+            people.create(person, 400);
+            
+            person.setProperties(Collections.singletonMap("cm:title", "hello-world"));
+            people.create(person, 400);
+            
+            person.setProperties(Collections.singletonMap("sys:locale", "en_GB"));
+            people.create(person, 400);
+        }
+    }
+
+    @Test
+    public void testGetPerson_withCustomProps() throws PublicApiException
+    {
+        // Create the person directly using the Java services - we don't want to test
+        // the REST API's "create person" function here, so we're isolating this test from it.
+        MutableAuthenticationService authService = applicationContext.getBean("AuthenticationService", MutableAuthenticationService.class);
+        PreferenceService prefService = applicationContext.getBean("PreferenceService", PreferenceService.class);
+        Map<QName, Serializable> nodeProps = new HashMap<>();
+        // The papi:lunchable aspect should be auto-added for the papi:lunch property
+        nodeProps.put(PROP_LUNCH, "Falafel wrap");
+        nodeProps.put(PROP_LUNCH_COMMENTS, "");
+        
+        // These properties should not be present when a person is retrieved
+        // since they are present as top-level fields.
+        String userName = "docbrown@" + account1.getId();
+        nodeProps.put(ContentModel.PROP_USERNAME, userName);
+        nodeProps.put(ContentModel.PROP_FIRSTNAME, "Doc");
+        nodeProps.put(ContentModel.PROP_LASTNAME, "Brown");
+        nodeProps.put(ContentModel.PROP_JOBTITLE, "Inventor");
+        nodeProps.put(ContentModel.PROP_LOCATION, "Location");
+        nodeProps.put(ContentModel.PROP_TELEPHONE, "123345");
+        nodeProps.put(ContentModel.PROP_MOBILE, "456456");
+        nodeProps.put(ContentModel.PROP_EMAIL, "doc.brown@example.com");
+        nodeProps.put(ContentModel.PROP_ORGANIZATION, "Acme");
+        nodeProps.put(ContentModel.PROP_COMPANYADDRESS1, "123 Acme Crescent");
+        nodeProps.put(ContentModel.PROP_COMPANYADDRESS2, "Cholsey");
+        nodeProps.put(ContentModel.PROP_COMPANYADDRESS3, "Oxfordshire");
+        nodeProps.put(ContentModel.PROP_COMPANYPOSTCODE, "OX10 1AB");
+        nodeProps.put(ContentModel.PROP_COMPANYTELEPHONE, "098876234");
+        nodeProps.put(ContentModel.PROP_COMPANYFAX, "098234876");
+        nodeProps.put(ContentModel.PROP_COMPANYEMAIL, "info@example.com");
+        nodeProps.put(ContentModel.PROP_SKYPE, "doc.brown");
+        nodeProps.put(ContentModel.PROP_INSTANTMSG, "doc.brown.instmsg");
+        nodeProps.put(ContentModel.PROP_USER_STATUS, "status");
+        nodeProps.put(ContentModel.PROP_USER_STATUS_TIME, new Date());
+        nodeProps.put(ContentModel.PROP_GOOGLEUSERNAME, "doc.brown.google");
+        nodeProps.put(ContentModel.PROP_SIZE_QUOTA, 12345000);
+        nodeProps.put(ContentModel.PROP_SIZE_CURRENT, 1230);
+        nodeProps.put(ContentModel.PROP_EMAIL_FEED_DISABLED, false);
+        // TODO: PROP_PERSON_DESCRIPTION?
+        
+        // Namespaces that should be filtered
+        nodeProps.put(ContentModel.PROP_ENABLED, true);
+        nodeProps.put(ContentModel.PROP_SYS_NAME, "name-value");
+        
+        // Create a password and enable the user so that we can check the usr:* props aren't present later.
+        AuthenticationUtil.setFullyAuthenticatedUser("admin@"+account1.getId());
+        authService.createAuthentication(userName, "password".toCharArray());
+        authService.setAuthenticationEnabled(userName, true);
+        personService.createPerson(nodeProps);
+
+        // Set a preference, so that we can test that we're filtering this property correctly.
+        prefService.setPreferences(userName, Collections.singletonMap("olives", "green"));
+        
+        // Get the person using the REST API
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "admin"));
+        Person person = people.getPerson(userName);
+        
+        // Did we get the correct aspects/properties?
+        assertEquals(userName, person.getId());
+        assertEquals("Doc", person.getFirstName());
+        assertEquals("Falafel wrap", person.getProperties().get("papi:lunch"));
+        assertTrue(person.getAspectNames().contains("papi:lunchable"));
+
+        // Empty (zero length) string values are considered to be
+        // null values, and will be represented the same as null
+        // values (i.e. by non-existence of the property).
+        assertNull(person.getProperties().get("papi:lunchcomments"));
+        
+        // Check that no properties are present that should have been filtered by namespace.
+        for (String key : person.getProperties().keySet())
+        {
+            if (key.startsWith("cm:") || key.startsWith("sys:") || key.startsWith("usr:"))
+            {
+                Object value = person.getProperties().get(key);
+                String keyValueStr = String.format("(key=%s, value=%s)", key, value);
+                fail("Property " + keyValueStr +
+                        " found with namespace that should have been excluded.");
+            }
+        }
+    }
+    
+    @Test
+    public void testCreatePerson_withCustomProps() throws Exception
+    {
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "admin"));
+        Person person = new Person();
+        person.setUserName("jbloggs@"+account1.getId());
+        person.setFirstName("Joe");
+        person.setEmail("jbloggs@"+account1.getId());
+        person.setEnabled(true);
+        person.setPassword("password123");
+        
+        Map<String, Object> props = new HashMap<>();
+        props.put("papi:telehash", "724332b5796a8");
+        person.setProperties(props);
+
+        // Explicitly add an aspect
+        List<String> aspectNames = new ArrayList<>();
+        aspectNames.add("papi:lunchable");
+        person.setAspectNames(aspectNames);
+        
+        // REST API call to create person
+        Person retPerson = people.create(person);
+        
+        // Check that the response contains the expected aspects and properties
+        assertEquals(2, retPerson.getAspectNames().size());
+        assertTrue(retPerson.getAspectNames().contains("papi:comms"));
+        assertEquals(1, retPerson.getProperties().size());
+        assertEquals("724332b5796a8", retPerson.getProperties().get("papi:telehash"));
+        
+        // Get the NodeRef
+        AuthenticationUtil.setFullyAuthenticatedUser("admin@"+account1.getId());
+        NodeRef nodeRef = personService.getPerson("jbloggs@"+account1.getId(), false);
+
+        // Check the node has the properties and aspects we expect
+        assertTrue(nodeService.hasAspect(nodeRef, ASPECT_COMMS));
+        assertTrue(nodeService.hasAspect(nodeRef, ASPECT_LUNCHABLE));
+        
+        Map<QName, Serializable> retProps = nodeService.getProperties(nodeRef);
+        assertEquals("724332b5796a8", retProps.get(PROP_TELEHASH));
+        assertEquals(null, retProps.get(PROP_LUNCH));
+    }
+
+    // Create a person for use in the testing of updating custom aspects/props
+    private Person createTestUpdatePerson() throws PublicApiException
+    {
+        Person person = new Person();
+        String personId = UUID.randomUUID().toString()+"@"+account1.getId();
+        person.setUserName(personId);
+        person.setFirstName("Joe");
+        person.setEmail(personId);
+        person.setEnabled(true);
+        person.setPassword("password123");
+        person.setDescription("This is a very short bio.");
+        person.setProperties(Collections.singletonMap("papi:jabber", "jbloggs@example.com"));
+        person.setAspectNames(Collections.singletonList("papi:dessertable"));
+
+        person = people.create(person);
+
+        AuthenticationUtil.setFullyAuthenticatedUser("admin@"+account1.getId());
+        NodeRef nodeRef = personService.getPerson(person.getId());
+        // Add some non-custom aspects, these should be untouched by the people API.
+        nodeService.addAspect(nodeRef, ContentModel.ASPECT_AUDITABLE, null);
+        nodeService.setProperty(nodeRef, ContentModel.PROP_TITLE, "This is a title");
+        
+        assertEquals("jbloggs@example.com", person.getProperties().get("papi:jabber"));
+        assertEquals(2, person.getAspectNames().size());
+        assertTrue(person.getAspectNames().contains("papi:comms"));
+        assertTrue(person.getAspectNames().contains("papi:dessertable"));
+        return person;
+    }
+
+    @Test
+    public void testUpdatePerson_withCustomProps() throws Exception
+    {
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "admin"));
+        
+        // Add a property
+        {
+            Person person = createTestUpdatePerson();
+            assertNull(person.getProperties().get("papi:lunch"));
+            assertFalse(person.getAspectNames().contains("papi:lunchable"));
+            String json = qjson(
+                    "{" +
+                            "    `properties`: {" +
+                            "        `papi:lunch`: `Tomato soup`" +
+                            "    }" +
+                            "}"
+            );
+            person = people.update(person.getId(), json, 200);
+
+            // Property added
+            assertEquals("Tomato soup", person.getProperties().get("papi:lunch"));
+            assertTrue(person.getAspectNames().contains("papi:lunchable"));
+            // Aspects untouched
+            assertTrue(person.getAspectNames().contains("papi:comms"));
+            assertTrue(person.getAspectNames().contains("papi:dessertable"));
+        }
+        
+        // Simple update of properties
+        {
+            Person person = createTestUpdatePerson();
+            person = people.update(person.getId(), qjson("{`properties`: {`papi:jabber`: `updated@example.com`}}"), 200);
+            
+            // Property updated
+            assertEquals("updated@example.com", person.getProperties().get("papi:jabber"));
+            // Aspects untouched
+            assertEquals(2, person.getAspectNames().size());
+            assertTrue(person.getAspectNames().contains("papi:comms"));
+            assertTrue(person.getAspectNames().contains("papi:dessertable"));
+        }
+        
+        // Update with zero aspects - clear them all, except for protected items.
+        {
+            Person person = createTestUpdatePerson();
+            assertEquals(2, person.getAspectNames().size());
+            assertTrue(person.getAspectNames().contains("papi:comms"));
+            assertTrue(person.getAspectNames().contains("papi:dessertable"));
+            
+            person = people.update(person.getId(), qjson("{`aspectNames`: []}"), 200);
+            
+            // Aspects should no longer be present.
+            assertNull(person.getAspectNames());
+            
+            // Check for the protected (but filtered) sys:* properties
+            NodeRef nodeRef = personService.getPerson(person.getId());
+            Set<QName> aspects = nodeService.getAspects(nodeRef);
+            assertTrue(aspects.contains(ContentModel.ASPECT_REFERENCEABLE));
+            assertTrue(aspects.contains(ContentModel.ASPECT_LOCALIZED));
+        }
+        
+        // Set aspects - all "custom" aspects will be replaced with those presented.
+        {
+            Person person = createTestUpdatePerson();
+
+            assertEquals(2, person.getAspectNames().size());
+            assertTrue(person.getAspectNames().contains("papi:comms"));
+            assertTrue(person.getAspectNames().contains("papi:dessertable"));
+            
+            String json = qjson("{ `aspectNames`: [`papi:lunchable`] }");
+            person = people.update(person.getId(), json, 200);
+            
+            // Get the person's NodeRef
+            AuthenticationUtil.setFullyAuthenticatedUser("admin@"+account1.getId());
+            NodeRef nodeRef = personService.getPerson(person.getId(), false);
+            // Aspects from non-custom models should still be present.
+            nodeService.hasAspect(nodeRef, ContentModel.ASPECT_AUDITABLE);
+            nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TITLED);
+            
+            // Newly added aspect should be the only one exposed by the people API.
+            List<String> aspectNames = person.getAspectNames();
+            assertEquals(1, aspectNames.size());
+            assertTrue(aspectNames.contains("papi:lunchable"));
+            assertNull(person.getProperties());
+        }
+
+        // Aspects and properties together
+        {
+            Person person = new Person();
+            String personId = UUID.randomUUID().toString()+"@"+account1.getId();
+            person.setUserName(personId);
+            person.setFirstName("Joe");
+            person.setEmail(personId);
+            person.setEnabled(true);
+            person.setPassword("password123");
+            // Start with no custom props/aspects
+            person.setProperties(null);
+            person.setAspectNames(null);
+
+            person = people.create(person);
+            
+            assertNull(person.getAspectNames());
+            assertNull(person.getProperties());
+
+            // Auto-add the papi:comms aspect, by setting its papi:jabber property,
+            // but explicitly add the papi:lunchable aspect.
+            String json = qjson(
+                    "{" +
+                            "    `aspectNames`: [ " +
+                            "        `papi:lunchable` " +
+                            "    ], " +
+                            "    `properties`: { " +
+                            "        `papi:jabber`: `another@jabber.example.com`, " +
+                            "        `papi:lunch`: `sandwich` " +
+                            "     }" +
+                            "}"
+            );
+            
+            person = people.update(person.getId(), json, 200);
+
+            // Were both aspects set?
+            List<String> aspectNames = person.getAspectNames();
+            assertEquals(2, aspectNames.size());
+            assertTrue(aspectNames.contains("papi:lunchable"));
+            assertTrue(aspectNames.contains("papi:comms"));
+            assertEquals(2, person.getProperties().size());
+            assertEquals("another@jabber.example.com", person.getProperties().get("papi:jabber"));
+            assertEquals("sandwich", person.getProperties().get("papi:lunch"));
+        }
+        
+        // Remove a property by setting it to null
+        {
+            Person person = createTestUpdatePerson();
+            
+            assertEquals(2, person.getAspectNames().size());
+            assertTrue(person.getAspectNames().contains("papi:comms"));
+            assertTrue(person.getAspectNames().contains("papi:dessertable"));
+            assertEquals(1, person.getProperties().size());
+            assertTrue(person.getProperties().containsKey("papi:jabber"));
+            
+            person = people.update(person.getId(), qjson("{`properties`: {`papi:jabber`: null}}"), 200);
+
+            // No properties == null
+            assertNull(person.getProperties());
+            // The aspect will still be there, I don't think we can easily remove the aspect automatically
+            // just because the associated properties have all been removed.
+            assertEquals(2, person.getAspectNames().size());
+            assertTrue(person.getAspectNames().contains("papi:comms"));
+            assertTrue(person.getAspectNames().contains("papi:dessertable"));
+        }
+
+        // Cannot set built-in/non-custom props
+        {
+            Person person = createTestUpdatePerson();
+            final String personId = person.getId();
+
+            assertEquals(2, person.getAspectNames().size());
+            assertTrue(person.getAspectNames().contains("papi:comms"));
+            assertTrue(person.getAspectNames().contains("papi:dessertable"));
+
+            String json = qjson("{ `properties`: {`usr:enabled`: false} }");
+            people.update(person.getId(), json, 400);
+
+            json = qjson("{ `properties`: {`cm:title`: `hello-world`} }");
+            people.update(person.getId(), json, 400);
+
+            json = qjson("{ `properties`: {`sys:locale`: `en_GB`} }");
+            people.update(person.getId(), json, 400);
+            
+            // Get the person's NodeRef
+            AuthenticationUtil.setFullyAuthenticatedUser("admin@"+account1.getId());
+            NodeRef nodeRef = personService.getPerson(person.getId(), false);
+            // Aspects from non-custom models should still be present.
+            nodeService.hasAspect(nodeRef, ContentModel.ASPECT_AUDITABLE);
+            nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TITLED);
+
+            // Custom aspects should be undisturbed
+            person = people.getPerson(personId);
+            assertEquals(2, person.getAspectNames().size());
+            assertTrue(person.getAspectNames().contains("papi:comms"));
+            assertTrue(person.getAspectNames().contains("papi:dessertable"));
+            assertEquals("jbloggs@example.com", person.getProperties().get("papi:jabber"));
+        }
+    }
+
+    /**
+     * Simple helper to make JSON literals a little easier to read in test code,
+     * by allowing values that would normally be quoted with double quotes, to be
+     * quoted with <strong>backticks</strong> instead.
+     * <p>
+     * Double and single quotes may still be used as normal, if required.
+     * 
+     * @param raw    The untreated JSON string to munge
+     * @return JSON String with <strong>backticks</strong> replaced with double quotes.   
+     */
+    private String qjson(String raw)
+    {
+        return raw.replace("`", "\"");
+    }
+    
+    public static class PersonJSONSerializer implements JSONAble
+    {
+        private final Person personUpdate;
+
+        public PersonJSONSerializer(Person personUpdate)
+        {
+            this.personUpdate = personUpdate;
+        }
+
+        @Override
+        public JSONObject toJSON()
+        {
+            JSONObject personJson = new JSONObject();
+
+            if (personUpdate.getUserName() != null)
+            {
+                personJson.put("id", personUpdate.getUserName());
+            }
+            personJson.put("firstName", personUpdate.getFirstName());
+            personJson.put("lastName", personUpdate.getLastName());
+
+            personJson.put("description", personUpdate.getDescription());
+            personJson.put("email", personUpdate.getEmail());
+            personJson.put("skypeId", personUpdate.getSkypeId());
+            personJson.put("googleId", personUpdate.getGoogleId());
+            personJson.put("instantMessageId", personUpdate.getInstantMessageId());
+            personJson.put("jobTitle", personUpdate.getJobTitle());
+            personJson.put("location", personUpdate.getLocation());
+            org.alfresco.rest.api.model.Company co = personUpdate.getCompany();
+            if (co == null)
+            {
+                co = new org.alfresco.rest.api.model.Company();
+            }
+            personJson.put("company", new Company(co).toJSON());
+            personJson.put("mobile", personUpdate.getMobile());
+            personJson.put("telephone", personUpdate.getTelephone());
+            personJson.put("userStatus", personUpdate.getUserStatus());
+            personJson.put("enabled", personUpdate.isEnabled());
+            personJson.put("emailNotificationsEnabled", personUpdate.isEmailNotificationsEnabled());
+            personJson.put("password", personUpdate.getPassword());
+            personJson.put("properties", personUpdate.getProperties());
+            personJson.put("aspectNames", personUpdate.getAspectNames());
+            return personJson;
+        }
+    }
+
+    @Test
+    public void testUpdatePersonAuthenticationFailed() throws PublicApiException
+    {
+        final String personId = account2PersonIt.next();
+
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), personId));
+
+        people.update("people", personId, null, null, "{\n" + "  \"firstName\": \"Updated firstName\"\n" + "}", null, "Expected 401 response when updating " + personId, 401);
+    }
+    
+    @Test
+    public  void testUpdatePersonNonSelfAndNonAdminDisallowed() throws PublicApiException
+    {
+        // TODO: this is bad, it seems that the test fixture isn't unique per test!?
+        final String personId = account1PersonIt.next();
+        final String personToUpdateId = account1PersonIt.next();
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), personId));
+        
+        people.update(personToUpdateId, qjson("{ `firstName`:`Updated firstName` }"), 403);
+
+        // TODO: temp fix, set back to orig firstName
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "admin"));
+        people.update(personToUpdateId, qjson("{ `firstName`:`Bob` }"), 200);
+    }
+
+    @Test
+    public  void testUpdatePersonCanUpdateThemself() throws PublicApiException
+    {
+        final String personId = account1PersonIt.next();
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), personId));
+
+        // Explicitly using the person's ID
+        {
+            Person updatedPerson = people.update(personId, qjson("{ `firstName`: `Matt` }"), 200);
+            assertEquals("Matt", updatedPerson.getFirstName());
+        }
+        
+        // "-me-" user
+        {
+            Person updatedPerson = people.update("-me-", qjson("{ `firstName`: `John` }"), 200);
+            assertEquals("John", updatedPerson.getFirstName());
+        }
+
+        // TODO: temp fix, set back to orig firstName
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "admin"));
+        people.update(personId, qjson("{ `firstName`:`Bill` }"), 200);
+        
+        // -ve test: check that required/mandatory/non-null fields cannot be unset (or empty string)
+        {
+            people.update("people", personId, null, null, qjson("{ `firstName`:`` }"), null, "Expected 400 response when updating " + personId, 400);
+            people.update("people", personId, null, null, qjson("{ `email`:`` }"), null, "Expected 400 response when updating " + personId, 400);
+            people.update("people", personId, null, null, qjson("{ `emailNotificationsEnabled`:`` }"), null, "Expected 400 response when updating " + personId, 400);
+        }
+    }
+
+    @Test
+    public  void testUpdatePersonNonexistentPerson() throws PublicApiException
+    {
+        final String personId = "non-existent";
+        publicApiClient.setRequestContext(new RequestContext(account3.getId(), account3Admin, "admin"));
+
+        people.update("people", personId, null, null, "{\n" + "  \"firstName\": \"Updated firstName\"\n" + "}", null, "Expected 404 response when updating " + personId, 404);
+    }
+
+    @Test
+    public void testUpdatePersonUsingPartialUpdate() throws PublicApiException
+    {
+        final String personId = account3.createUser().getId();
+
+        publicApiClient.setRequestContext(new RequestContext(account3.getId(), account3Admin, "admin"));
+
+        String updatedFirstName = "Updated firstName";
+
+        HttpResponse response = people.update("people", personId, null, null, "{\n" + "  \"firstName\": \"" + updatedFirstName + "\"\n" + "}", null,
+                "Expected 200 response when updating " + personId, 200);
+
+        Person updatedPerson = Person.parsePerson((JSONObject) response.getJsonResponse().get("entry"));
+
+        assertEquals(updatedFirstName, updatedPerson.getFirstName());
+    }
+
+    @Test
+    public  void testUpdatePersonWithRestrictedResponseFields() throws PublicApiException
+    {
+        final String personId = account3.createUser().getId();
+
+        publicApiClient.setRequestContext(new RequestContext(account3.getId(), account3Admin, "admin"));
+
+        String updatedFirstName = "Updated firstName";
+
+        Map<String, String> params = new HashMap<>();
+        params.put("fields", "id,firstName");
+
+        HttpResponse response = people.update("people", personId, null, null, "{\n" + "  \"firstName\": \"" + updatedFirstName + "\"\n" + "}", params,
+                "Expected 200 response when updating " + personId, 200);
+
+        Person updatedPerson = Person.parsePerson((JSONObject) response.getJsonResponse().get("entry"));
+
+        assertNotNull(updatedPerson.getId());
+        assertEquals(updatedFirstName, updatedPerson.getFirstName());
+        assertNull(updatedPerson.getEmail());
+    }
+
+    @Test
+    public void testUpdatePersonUpdateAsAdmin() throws Exception
+    {
+        final String personId = account3.createUser().getId();
+
+        publicApiClient.setRequestContext(new RequestContext(account3.getId(), account3Admin, "admin"));
+
+        String firstName = "updatedFirstName";
+        String lastName = "updatedLastName";
+        String description = "updatedDescription";
+        String email = "updated@example.com";
+        String skypeId = "updated.skype.id";
+        String googleId = "googleId";
+        String instantMessageId = "updated.user@example.com";
+        String jobTitle = "updatedJobTitle";
+        String location = "updatedLocation";
+
+        Company company = new Company("updatedOrganization", "updatedAddress1", "updatedAddress2", "updatedAddress3", "updatedPostcode", "updatedTelephone", "updatedFax", "updatedEmail");
+
+        String mobile = "mobile";
+        String telephone = "telephone";
+        String userStatus = "userStatus";
+        Boolean enabled = true;
+        Boolean emailNotificationsEnabled = false;
+
+        Map<String, String> params = new HashMap<>();
+        params.put("fields", "id,firstName,lastName,description,avatarId,email,skypeId,googleId,instantMessageId,jobTitle,location,mobile,telephone,userStatus,emailNotificationsEnabled,enabled,company");
+
+        HttpResponse response = people.update("people", personId, null, null,
+                "{\n"
+                        + "  \"firstName\": \"" + firstName + "\",\n"
+                        + "  \"lastName\": \"" + lastName + "\",\n"
+                        + "  \"description\": \"" + description + "\",\n"
+                        + "  \"email\": \"" + email + "\",\n"
+                        + "  \"skypeId\": \"" + skypeId + "\",\n"
+                        + "  \"googleId\": \"" + googleId + "\",\n"
+                        + "  \"instantMessageId\": \"" + instantMessageId + "\",\n"
+                        + "  \"jobTitle\": \"" + jobTitle + "\",\n"
+                        + "  \"location\": \"" + location + "\",\n"
+
+                        + "  \"company\": {\n"
+                        + "    \"organization\": \"" + company.getOrganization() + "\",\n"
+                        + "    \"address1\": \"" + company.getAddress1() + "\",\n"
+                        + "    \"address2\": \"" + company.getAddress2() + "\",\n"
+                        + "    \"address3\": \"" + company.getAddress3() + "\",\n"
+                        + "    \"postcode\": \"" + company.getPostcode() + "\",\n"
+                        + "    \"telephone\": \"" + company.getTelephone() + "\",\n"
+                        + "    \"fax\": \"" + company.getFax() + "\",\n"
+                        + "    \"email\": \"" + company.getEmail() + "\"\n"
+                        + "  },\n"
+
+                        + "  \"mobile\": \"" + mobile + "\",\n"
+                        + "  \"telephone\": \"" + telephone + "\",\n"
+                        + "  \"userStatus\": \"" + userStatus + "\",\n"
+                        + "  \"emailNotificationsEnabled\": \"" + emailNotificationsEnabled + "\",\n"
+                        + "  \"enabled\": \"" + enabled + "\"\n"
+
+                        + "}", params,
+                "Expected 200 response when updating " + personId, 200);
+
+        Person updatedPerson = Person.parsePerson((JSONObject) response.getJsonResponse().get("entry"));
+
+        assertNotNull(updatedPerson.getId());
+        assertEquals(firstName, updatedPerson.getFirstName());
+        assertEquals(lastName, updatedPerson.getLastName());
+        assertEquals(firstName + " " + lastName, updatedPerson.getDisplayName());
+        assertEquals(description, updatedPerson.getDescription());
+        assertEquals(email, updatedPerson.getEmail());
+        assertEquals(skypeId, updatedPerson.getSkypeId());
+        assertEquals(googleId, updatedPerson.getGoogleId());
+        assertEquals(instantMessageId, updatedPerson.getInstantMessageId());
+        assertEquals(jobTitle, updatedPerson.getJobTitle());
+        assertEquals(location, updatedPerson.getLocation());
+
+        assertNotNull(updatedPerson.getCompany());
+        company.expected(updatedPerson.getCompany());
+
+        assertEquals(mobile, updatedPerson.getMobile());
+        assertEquals(telephone, updatedPerson.getTelephone());
+        assertEquals(userStatus, updatedPerson.getUserStatus());
+        assertEquals(emailNotificationsEnabled, updatedPerson.isEmailNotificationsEnabled());
+        assertEquals(enabled, updatedPerson.isEnabled());
+        
+        // test ability to unset optional fields (could be one or more - here all) including individual company fields
+        response = people.update("people", personId, null, null,
+                "{\n"
+                        + "  \"lastName\":null,\n"
+                        + "  \"description\":null,\n"
+                        + "  \"skypeId\":null,\n"
+                        + "  \"googleId\":null,\n"
+                        + "  \"instantMessageId\":null,\n"
+                        + "  \"jobTitle\":null,\n"
+                        + "  \"location\":null,\n"
+
+                        + "  \"company\": {\n"
+                        + "    \"address1\":null,\n"
+                        + "    \"address2\":null,\n"
+                        + "    \"address3\":null,\n"
+                        + "    \"postcode\":null,\n"
+                        + "    \"telephone\":null,\n"
+                        + "    \"fax\":null,\n"
+                        + "    \"email\":null\n"
+                        + "  },\n"
+
+                        + "  \"mobile\":null,\n"
+                        + "  \"telephone\":null,\n"
+                        + "  \"userStatus\":null\n"
+                        + "}", params,
+                "Expected 200 response when updating " + personId, 200);
+
+        updatedPerson = Person.parsePerson((JSONObject) response.getJsonResponse().get("entry"));
+
+        assertNotNull(updatedPerson.getId());
+        assertNull(updatedPerson.getLastName());
+        assertEquals(updatedPerson.getFirstName(), updatedPerson.getDisplayName());
+        assertNull(updatedPerson.getDescription());
+        assertNull(updatedPerson.getSkypeId());
+        assertNull(updatedPerson.getGoogleId());
+        assertNull(updatedPerson.getInstantMessageId());
+        assertNull(updatedPerson.getJobTitle());
+        assertNull(updatedPerson.getLocation());
+
+        assertNotNull(updatedPerson.getCompany());
+        assertNotNull(updatedPerson.getCompany().getOrganization());
+
+        assertNull(updatedPerson.getCompany().getAddress1());
+        assertNull(updatedPerson.getCompany().getAddress2());
+        assertNull(updatedPerson.getCompany().getAddress3());
+        assertNull(updatedPerson.getCompany().getPostcode());
+        assertNull(updatedPerson.getCompany().getFax());
+        assertNull(updatedPerson.getCompany().getEmail());
+        assertNull(updatedPerson.getCompany().getTelephone());
+
+        assertNull(updatedPerson.getMobile());
+        assertNull(updatedPerson.getTelephone());
+        assertNull(updatedPerson.getUserStatus());
+
+        // test ability to unset company fields as a whole
+        response = people.update("people", personId, null, null,
+                "{\n"
+                        + "  \"company\": {} \n"
+                        + "}", params,
+                "Expected 200 response when updating " + personId, 200);
+
+        updatedPerson = Person.parsePerson((JSONObject) response.getJsonResponse().get("entry"));
+
+        // note: empty company object is returned for backwards compatibility (with pre-existing getPerson API <= 5.1)
+        assertNotNull(updatedPerson.getCompany());
+        assertNull(updatedPerson.getCompany().getOrganization());
+
+        // set at least one company field
+        String updatedOrgName = "another org";
+
+        response = people.update("people", personId, null, null,
+                "{\n"
+                        + "  \"company\": {\n"
+                        + "    \"organization\":\""+updatedOrgName+"\"\n"
+                        + "  }\n"
+                        + "}", params,
+                "Expected 200 response when updating " + personId, 200);
+
+        updatedPerson = Person.parsePerson((JSONObject) response.getJsonResponse().get("entry"));
+
+        assertNotNull(updatedPerson.getCompany());
+        assertEquals(updatedOrgName, updatedPerson.getCompany().getOrganization());
+
+        // test ability to unset company fields as a whole
+        response = people.update("people", personId, null, null,
+                "{\n"
+                        + "  \"company\": null\n"
+                        + "}", params,
+                "Expected 200 response when updating " + personId, 200);
+
+        updatedPerson = Person.parsePerson((JSONObject) response.getJsonResponse().get("entry"));
+
+        // note: empty company object is returned for backwards compatibility (with pre-existing getPerson API <= 5.1)
+        assertNotNull(updatedPerson.getCompany());
+        assertNull(updatedPerson.getCompany().getOrganization());
+    }
+
+    @Test
+    public  void testUpdatePersonEnabledNonAdminNotAllowed() throws PublicApiException
+    {
+        final String personId = account3.createUser().getId();
+        publicApiClient.setRequestContext(new RequestContext(account3.getId(), personId));
+
+        people.update("people", personId, null, null, "{\n" + "  \"enabled\": \"false\"\n" + "}", null, "Expected 403 response when updating " + personId, 403);
+    }
+
+    @Test
+    public  void testUpdatePersonEnabled() throws PublicApiException
+    {
+        // Non-admin user ID
+        final String personId = account3.createUser().getId();
+
+        // Use admin user credentials
+        publicApiClient.setRequestContext(new RequestContext(account3.getId(), account3Admin, "admin"));
+        
+        // Admin can toggle enabled flag: false
+        {
+            Boolean enabled = false;
+            Map<String, String> params = Collections.singletonMap("fields", "enabled");
+            Person updatedPerson = people.update(personId, qjson("{`enabled`:"+enabled+"}"), params, 200);
+
+            assertEquals(enabled, updatedPerson.isEnabled());
+        }
+
+        // Admin can toggle enabled flag: true
+        {
+            Boolean enabled = true;
+            Map<String, String> params = Collections.singletonMap("fields", "enabled");
+            Person updatedPerson = people.update(personId, qjson("{`enabled`:"+enabled+"}"), params, 200);
+
+            assertEquals(enabled, updatedPerson.isEnabled());
+        }
+
+        // -ve test: enabled flag cannot be null/empty
+        people.update("people", personId, null, null, qjson("{ `enabled`: null }"), null, "Expected 400 response when updating " + personId, 400);
+        people.update("people", personId, null, null, qjson("{ `enabled`: `` }"), null, "Expected 400 response when updating " + personId, 400);
+
+        // Use non-admin user's own credentials
+        publicApiClient.setRequestContext(new RequestContext(account3.getId(), personId, "password"));
+        
+        // Non-admin cannot set enabled flag
+        {
+            boolean origEnabled = people.getPerson(personId).isEnabled();
+            Boolean enabled = false;
+            // The test should change that we can't change this, otherwise it isn't effective
+            assertNotEquals(origEnabled, enabled);
+            
+            Map<String, String> params = Collections.singletonMap("fields", "enabled");
+            people.update(personId, qjson("{`enabled`:"+enabled+"}"), params, 403);
+
+            Person me = people.getPerson(personId);
+            assertEquals("Enabled state shouldn't have changed, but did", origEnabled, me.isEnabled());
+        }
+    }
+
+    @Test
+    public void testUpdatePersonAdminCannotBeDisabled() throws PublicApiException
+    {
+        publicApiClient.setRequestContext(new RequestContext(account3.getId(), account3Admin, "admin"));
+
+        Map<String, String> params = new HashMap<>();
+        params.put("fields", "enabled");
+
+        people.update("people", account3Admin, null, null, "{\n" + "  \"enabled\": \"" + false + "\"\n" + "}", params, "Expected 403 response when updating " + account3Admin, 403);
+    }
+
+    @Test
+    public void testUpdatePersonPasswordByThemself() throws PublicApiException
+    {
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "admin"));
+        Person me = new Person();
+        me.setId(UUID.randomUUID().toString()+"@"+account1.getId());
+        me.setUserName(me.getId());
+        me.setFirstName("Jo");
+        me.setEmail(me.getId());
+        me.setEnabled(true);
+        me.setPassword("password123");
+        me = people.create(me);
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), me.getId(), "password123"));
+
+        // update with correct oldPassword
+        people.update(me.getId(), qjson("{ `oldPassword`:`password123`, `password`:`newpassword456` }"), 200);
+
+        // The old password should no longer work - therefore they are "unauthorized".
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), me.getId(), "password123"));
+        people.getPerson(me.getId(), 401);
+        // The new password should work.
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), me.getId(), "newpassword456"));
+        people.getPerson(me.getId());
+
+        // update with wrong oldPassword
+        people.update(me.getId(), qjson("{ `oldPassword`:`password123`, `password`:`newpassword456` }"), 403);
+
+        // update with no oldPassword
+        people.update(me.getId(), qjson("{ `password`:`newpassword456` }"), 400);
+        people.update(me.getId(), qjson("{ `oldPassword`:``, `password`:`newpassword456` }"), 400);
+        people.update(me.getId(), qjson("{ `oldPassword`:null, `password`:`newpassword456` }"), 400);
+
+        // update with no new password
+        people.update(me.getId(), qjson("{ `oldPassword`:`newpassword456` }"), 400);
+        people.update(me.getId(), qjson("{ `oldPassword`:`newpassword456`, `password`:`` }"), 400);
+        people.update(me.getId(), qjson("{ `oldPassword`:`newpassword456`, `password`:null }"), 400);
+    }
+
+    @Test
+    public  void testUpdatePersonPasswordByAdmin() throws PublicApiException
+    {
+        final String personId = account3.createUser().getId();
+        final String networkId = account3.getId();
+
+        publicApiClient.setRequestContext(new RequestContext(networkId, account3Admin, "admin"));
+
+        String invalidPassword = "invalidPassword";
+        String updatedPassword = "newPassword";
+
+        people.update("people", personId, null, null, "{\n" + "  \"password\": \"" + updatedPassword + "\"\n" + "}", null,
+                "Expected 200 response when updating " + personId, 200);
+
+        publicApiClient.setRequestContext(new RequestContext(networkId, personId, invalidPassword));
+        try
+        {
+            this.people.getPerson(personId);
+            fail("");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+        }
+
+        publicApiClient.setRequestContext(new RequestContext(networkId, personId, updatedPassword));
+        this.people.getPerson(personId);
+
+        publicApiClient.setRequestContext(new RequestContext(networkId, account3Admin, "admin"));
+
+        // update with another new password but note that oldPassword is ignored (even if sent by admin)
+        String updatedPassword2 = "newPassword2";
+        people.update(personId, qjson("{ `password`:`" + updatedPassword2 + "`, `oldPassword`:`rubbish` }"), 200);
+
+        publicApiClient.setRequestContext(new RequestContext(networkId, personId, updatedPassword));
+        try
+        {
+            this.people.getPerson(personId);
+            fail("");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+        }
+
+        publicApiClient.setRequestContext(new RequestContext(networkId, personId, updatedPassword2));
+        this.people.getPerson(personId);
+
+        // -ve: update with no new password
+        people.update(personId, qjson("{ `password`:`` }"), 400);
+        people.update(personId, qjson("{ `password`:null }"), 400);
+    }
+
+    @Test
+    public void testUpdatePersonWithNotUpdatableFields() throws PublicApiException
+    {
+        final String personId = account3.createUser().getId();
+
+        publicApiClient.setRequestContext(new RequestContext(account3.getId(), account3Admin, "admin"));
+
+        List<Pair<String, String>> notUpdatableFields = new ArrayList<>();
+        notUpdatableFields.add(new Pair("userName", "userName"));
+        notUpdatableFields.add(new Pair("avatarId", "avatarId"));
+        notUpdatableFields.add(new Pair("statusUpdatedAt", "statusUpdatedAt"));
+        notUpdatableFields.add(new Pair("quota", "quota"));
+        notUpdatableFields.add(new Pair("quotaUsed", "quotaUsed"));
+
+        for (Pair<String, String> notUpdatableField : notUpdatableFields)
+        {
+            people.update("people", personId, null, null, "{\n" + "\"" + notUpdatableField.getFirst() + "\": \"" + notUpdatableField.getSecond() + "\"\n" + "}", null,
+                    "Expected 400 response when updating " + personId, 400);
+        }
+    }
+
+    private PublicApiClient.ListResponse<Person> listPeople(final PublicApiClient.Paging paging, String sortColumn, boolean asc, int statusCode) throws Exception
+    {
+        // sort params
+        final Map<String, String> params = new HashMap<>();
+        if (sortColumn != null)
+        {
+            params.put("orderBy", sortColumn + " " + (asc ? "ASC" : "DESC"));
+        }
+        
+        return listPeople(createParams(paging, params), statusCode);
+    }
+
+    private PublicApiClient.ListResponse<Person> listPeople(Map<String, String> parameters, int expectedStatusCode) throws PublicApiException
+    {
+        HttpResponse response = people.getAll("people", null, null, null, parameters, "Failed to get people", expectedStatusCode);
+        JSONObject jsonList = (JSONObject) response.getJsonResponse().get("list");
+        if (jsonList == null)
+        {
+            return null;
+        }
+
+        return Person.parsePeople(response.getJsonResponse());
+    }
+
+    @Test
+    public void testListPeopleWithAspectNamesAndProperties() throws PublicApiException
+    {
+        publicApiClient.setRequestContext(new RequestContext(account3.getId(), account3Admin, "admin"));
+        personBob = new Person();
+        personBob.setId("bob@" + account3.getId());
+        personBob.setUserName(personBob.getId());
+        personBob.setFirstName("Bob");
+        personBob.setLastName("Cratchit");
+        personBob.setEmail("bob.cratchit@example.com");
+        personBob.setPassword("password");
+        personBob.setEnabled(true);
+        personBob.setProperties(Collections.singletonMap("papi:lunch", "Magical sandwich"));
+        people.create(personBob);
+
+        // Are aspectNames and properties left absent when not required?
+        {
+            PublicApiClient.ListResponse<Person> resp = listPeople(Collections.emptyMap(), 200);
+            assertNull(resp.getList().get(0).getAspectNames());
+            assertNull(resp.getList().get(0).getProperties());
+        }
+        
+        // Are aspectNames and properties populated when requested?
+        {
+            Map<String, String> parameters = Collections.singletonMap("include", "aspectNames,properties");
+            PublicApiClient.ListResponse<Person> resp = listPeople(parameters, 200);
+            Person bob = resp.getList().stream().
+                    filter(p -> p.getUserName().equals(personBob.getId()))
+                    .findFirst().get();
+            assertNotNull(bob.getAspectNames());
+            assertTrue(bob.getAspectNames().contains("papi:lunchable"));
+            assertNotNull(bob.getProperties());
+            assertEquals("Magical sandwich", bob.getProperties().get("papi:lunch"));
+        }
+    }
+    
+    /**
+     * Tests the capability to sort and paginate the list of people orderBy =
+     * firstName ASC skip = 1, count = 3
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testPagingAndSortingByFirstNameAsc() throws Exception
+    {
+        publicApiClient.setRequestContext(new RequestContext(account4.getId(), account4Admin, "admin"));
+
+        // paging
+        int skipCount = 1;
+        int maxItems = 3;
+        int totalResults = 5;
+        PublicApiClient.Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // orderBy=firstName ASC
+        PublicApiClient.ListResponse<Person> resp = listPeople(paging, "firstName", true, 200);
+
+        List<Person> expectedList = new LinkedList<>();
+        expectedList.add(personAlice);
+        expectedList.add(personAliceD);
+        expectedList.add(personBen);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the list of people orderBy =
+     * firstName DESC skip = 1, count = 3
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testPagingAndSortingByFirstNameDesc() throws Exception
+    {
+        publicApiClient.setRequestContext(new RequestContext(account4.getId(), account4Admin, "admin"));
+
+        // paging
+        int skipCount = 1;
+        int maxItems = 3;
+        int totalResults = 5;
+        PublicApiClient.Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // orderBy=firstName DESC
+        PublicApiClient.ListResponse<Person> resp = listPeople(paging, "firstName", false, 200);
+
+        List<Person> expectedList = new LinkedList<>();
+        expectedList.add((Person) personBen);
+        expectedList.add((Person) personAlice);
+        expectedList.add((Person) personAliceD);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability paginate the list of people verifies default
+     * sorting, skip = 1, count = 3
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testPagingAndDefaultSorting() throws Exception
+    {
+        publicApiClient.setRequestContext(new RequestContext(account4.getId(), account4Admin, "admin"));
+
+        // paging
+        int skipCount = 1;
+        int maxItems = 3;
+        int totalResults = 5;
+        PublicApiClient.Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        PublicApiClient.ListResponse<Person> resp = listPeople(paging, null, false, 200);
+
+        List<Person> expectedList = new LinkedList<>();
+        expectedList.add((Person) personAlice);
+        expectedList.add((Person) personAliceD);
+        expectedList.add((Person) personBen);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the list of people orderBy =
+     * username DESC skip = 1, count = 3
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testPagingAndSortingByIdDesc() throws Exception
+    {
+        publicApiClient.setRequestContext(new RequestContext(account4.getId(), account4Admin, "admin"));
+
+        // paging
+        int skipCount = 1;
+        int maxItems = 3;
+        int totalResults = 5;
+        PublicApiClient.Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // orderBy=userName DESC
+        PublicApiClient.ListResponse<Person> resp = listPeople(paging, "id", false, 200);
+
+        List<Person> expectedList = new LinkedList<>();
+        expectedList.add((Person) personBen);
+        expectedList.add((Person) personAliceD);
+        expectedList.add((Person) personAlice);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the list of people orderBy =
+     * invalid sort key ASC skip = 1, count = 3
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testPagingAndSortingByInvalidSortKey() throws Exception
+    {
+        publicApiClient.setRequestContext(new RequestContext(account4.getId(), account4Admin, "admin"));
+
+        // paging
+        int skipCount = 1;
+        int maxItems = 3;
+        int totalResults = 5;
+        PublicApiClient.Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // orderBy=invalidSortKey ASC
+        listPeople(paging, "invalidSortKey", true, 400);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the list of people orderBy =
+     * lastName ASC skip = 2, count = 3
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testPagingAndSortingByLastName() throws Exception
+    {
+        publicApiClient.setRequestContext(new RequestContext(account4.getId(), account4Admin, "admin"));
+
+        // paging
+        int skipCount = 2;
+        int maxItems = 3;
+        int totalResults = 5;
+        PublicApiClient.Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // orderBy=lastName ASC
+        PublicApiClient.ListResponse<Person> resp = listPeople(paging, "lastName", true, 200);
+
+        List<Person> expectedList = new LinkedList<>();
+        expectedList.add((Person) personBen);
+        expectedList.add((Person) personAliceD);
+        expectedList.add((Person) personAlice);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the list of people orderBy =
+     * both firstName and lastName ASC skip = 1, count = 3
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testPagingAndSortingByFirstNameAndLastName() throws Exception
+    {
+        publicApiClient.setRequestContext(new RequestContext(account4.getId(), account4Admin, "admin"));
+
+        // paging
+        int skipCount = 1;
+        int maxItems = 3;
+        int totalResults = 5;
+        PublicApiClient.Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // orderBy=firstName,lastName ASC
+        PublicApiClient.ListResponse<Person> resp = listPeople(paging, "firstName,lastName", true, 200);
+
+        List<Person> expectedList = new LinkedList<>();
+        expectedList.add((Person) personAliceD);
+        expectedList.add((Person) personAlice);
+        expectedList.add((Person) personBen);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests reset password.
+     * <p>POST:</p>
+     * <ul>
+     * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/people/<userId>/request-password-reset} </li>
+     * <li> {@literal <host>:<port>/alfresco/api/<networkId>/public/alfresco/versions/1/people/<userId>/reset-password} </li>
+     * </ul>
+     */
+    @Test
+    public void testResetPassword() throws Exception
+    {
+        // As Admin, create a user
+        setRequestContext(account1.getId(), account1Admin, "admin");
+
+        Person person = new Person();
+        person.setUserName("john.doe@" + account1.getId());
+        person.setFirstName("John");
+        person.setLastName("Doe");
+        person.setEmail("john.doe@alfresco.com");
+        person.setEnabled(true);
+        person.setEmailNotificationsEnabled(true);
+        person.setPassword("password");
+        people.create(person);
+
+        // un-authenticated API
+        setRequestContext(account1.getId(), null, null);
+        // Just try to login, to test the new created user credential
+        LoginTicket loginRequest = new LoginTicket();
+        loginRequest.setUserId(person.getUserName());
+        loginRequest.setPassword(person.getPassword());
+        // Authenticate and create a ticket
+        HttpResponse response = post("tickets", RestApiUtil.toJsonAsString(loginRequest), null, null, "authentication", 201);
+        LoginTicketResponse loginResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), LoginTicketResponse.class);
+        assertNotNull(loginResponse.getId());
+        assertNotNull(loginResponse.getUserId());
+
+        /**
+         * Reset Password
+         */
+        // First make the service to send a synchronous email
+        ResetPasswordServiceImpl passwordService = applicationContext.getBean("resetPasswordService", ResetPasswordServiceImpl.class);
+        passwordService.setSendEmailAsynchronously(false);
+        // Get the 'mail' bean in a test mode.
+        EmailUtil emailUtil = new EmailUtil(applicationContext);
+        try
+        {
+            // Un-authenticated API
+            setRequestContext(account1.getId(), null, null);
+            // Reset email (just in case other tests didn't clean up...)
+            emailUtil.reset();
+
+            // Request reset password
+            Client client = new Client().setClient("share");
+            post(getRequestResetPasswordUrl(person.getUserName()), RestApiUtil.toJsonAsString(client), 202);
+            assertEquals("A reset password email should have been sent.", 1, emailUtil.getSentCount());
+
+            MimeMessage msg = emailUtil.getLastEmail();
+            assertNotNull("There should be an email.", msg);
+            assertEquals("Should've been only one email recipient.", 1, msg.getAllRecipients().length);
+            // Check the recipient is the person who requested the reset password
+            assertEquals(person.getEmail(), msg.getAllRecipients()[0].toString());
+            // There should be a subject
+            assertNotNull("There should be a subject.", msg.getSubject());
+
+            // Check the reset password url.
+            String resetPasswordUrl = (String) emailUtil.getLastEmailTemplateModelValue("reset_password_url");
+            assertNotNull("Wrong email is sent.", resetPasswordUrl);
+            // Get the workflow id and key
+            org.alfresco.util.Pair<String, String> pair = getWorkflowIdAndKeyFromUrl(resetPasswordUrl);
+            assertNotNull("Workflow Id can't be null.", pair.getFirst());
+            assertNotNull("Workflow Key can't be null.", pair.getSecond());
+
+            // Reset the email helper, to get rid of the request reset password email
+            emailUtil.reset();
+            // Un-authenticated APIs as we are still using the 'setRequestContext(account1.getId(), null, null)' set above.
+            // Reset the password
+            PasswordReset passwordReset = new PasswordReset()
+                    .setPassword("changed")
+                    .setId(pair.getFirst())
+                    .setKey(pair.getSecond());
+            post(getResetPasswordUrl(person.getUserName()), RestApiUtil.toJsonAsString(passwordReset), 202);
+            assertEquals("A reset password confirmation email should have been sent.", 1, emailUtil.getSentCount());
+            msg = emailUtil.getLastEmail();
+            assertNotNull("There should be an email.", msg);
+            assertEquals("Should've been only one email recipient.", 1, msg.getAllRecipients().length);
+            assertEquals(person.getEmail(), msg.getAllRecipients()[0].toString());
+            // There should be a subject
+            assertNotNull("There should be a subject.", msg.getSubject());
+
+            // Try to login with old credential
+            post("tickets", RestApiUtil.toJsonAsString(loginRequest), null, null, "authentication", 403);
+
+            // Set the new password
+            loginRequest.setPassword(passwordReset.getPassword());
+            response = post("tickets", RestApiUtil.toJsonAsString(loginRequest), null, null, "authentication", 201);
+            loginResponse = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), LoginTicketResponse.class);
+            assertNotNull(loginResponse.getId());
+            assertNotNull(loginResponse.getUserId());
+
+
+            /*
+             * Negative tests
+             */
+            // First, reset the email helper
+            emailUtil.reset();
+
+            // Try reset with the used workflow
+            // Note: we still return 202 response for security reasons
+            passwordReset.setPassword("changedAgain");
+            post(getResetPasswordUrl(person.getUserName()), RestApiUtil.toJsonAsString(passwordReset), 202);
+            assertEquals("No email should have been sent.", 0, emailUtil.getSentCount());
+
+            // Request reset password - Invalid user (user does not exist)
+            post(getRequestResetPasswordUrl(System.currentTimeMillis() + "noUser"), RestApiUtil.toJsonAsString(client), 202);
+            assertEquals("No email should have been sent.", 0, emailUtil.getSentCount());
+
+            // As Admin disable the user
+            setRequestContext(account1.getId(), account1Admin, "admin");
+            Map<String, String> params = Collections.singletonMap("fields", "enabled");
+            Person updatedPerson = people.update(person.getUserName(), qjson("{`enabled`:" + false + "}"), params, 200);
+            assertFalse(updatedPerson.isEnabled());
+
+            // Un-authenticated API
+            setRequestContext(account1.getId(), null, null);
+            // Request reset password - Invalid user (user is disabled)
+            post(getRequestResetPasswordUrl(person.getUserName()), RestApiUtil.toJsonAsString(client), 202);
+            assertEquals("No email should have been sent.", 0, emailUtil.getSentCount());
+
+            // Client is not specified
+            client = new Client();
+            post(getRequestResetPasswordUrl(person.getUserName()), RestApiUtil.toJsonAsString(client), 400);
+
+            // Reset password
+            // First, reset the email helper and enable the user
+            emailUtil.reset();
+            // As Admin enable the user
+            setRequestContext(account1.getId(), account1Admin, "admin");
+            params = Collections.singletonMap("fields", "enabled");
+            updatedPerson = people.update(person.getUserName(), qjson("{`enabled`:" + true + "}"), params, 200);
+            assertTrue(updatedPerson.isEnabled());
+
+            // Un-authenticated API
+            setRequestContext(account1.getId(), null, null);
+            client = new Client().setClient("share");
+            post(getRequestResetPasswordUrl(person.getUserName()), RestApiUtil.toJsonAsString(client), 202);
+            assertEquals("A reset password email should have been sent.", 1, emailUtil.getSentCount());
+
+            resetPasswordUrl = (String) emailUtil.getLastEmailTemplateModelValue("reset_password_url");
+            // Check the reset password url.
+            assertNotNull("Wrong email is sent.", resetPasswordUrl);
+            // Get the workflow id and key
+            pair = getWorkflowIdAndKeyFromUrl(resetPasswordUrl);
+            assertNotNull("Workflow Id can't be null.", pair.getFirst());
+            assertNotNull("Workflow Key can't be null.", pair.getSecond());
+
+            // Reset the email helper, to get rid of the request reset password email
+            emailUtil.reset();
+            // Invalid request - password is not provided
+            PasswordReset passwordResetInvalid = new PasswordReset()
+                    .setId(pair.getFirst())
+                    .setKey(pair.getSecond());
+            post(getResetPasswordUrl(person.getUserName()), RestApiUtil.toJsonAsString(passwordResetInvalid), 400);
+
+            // Invalid request - workflow id is not provided
+            passwordResetInvalid.setPassword("changedAgain")
+                    .setId(null);
+            post(getResetPasswordUrl(person.getUserName()), RestApiUtil.toJsonAsString(passwordResetInvalid), 400);
+
+            // Invalid request - workflow key is not provided
+            passwordResetInvalid.setId(pair.getFirst())
+                    .setKey(null);
+            post(getResetPasswordUrl(person.getUserName()), RestApiUtil.toJsonAsString(passwordResetInvalid), 400);
+
+            // Invalid request - Invalid workflow id
+            // Note: we still return 202 response for security reasons
+            passwordResetInvalid = new PasswordReset()
+                    .setPassword("changedAgain")
+                    .setId("activiti$" + System.currentTimeMillis()) // Invalid Id
+                    .setKey(pair.getSecond());
+            post(getResetPasswordUrl(person.getUserName()), RestApiUtil.toJsonAsString(passwordResetInvalid), 202);
+            assertEquals("No email should have been sent.", 0, emailUtil.getSentCount());
+
+            // Invalid request - Invalid workflow key
+            // Note: we still return 202 response for security reasons
+            passwordResetInvalid = new PasswordReset()
+                    .setPassword("changedAgain")
+                    .setId(pair.getFirst())
+                    .setKey(GUID.generate()); // Invalid Key
+            post(getResetPasswordUrl(person.getUserName()), RestApiUtil.toJsonAsString(passwordResetInvalid), 202);
+            assertEquals("No email should have been sent.", 0, emailUtil.getSentCount());
+
+            // Invalid request (not the same user) - The given user id 'user1' does not match the person's user id who requested the password reset.
+            // Note: we still return 202 response for security reasons
+            passwordResetInvalid = new PasswordReset()
+                    .setPassword("changedAgain")
+                    .setId(pair.getFirst())
+                    .setKey(pair.getSecond());
+            post(getResetPasswordUrl(user1), RestApiUtil.toJsonAsString(passwordResetInvalid), 202);
+            assertEquals("No email should have been sent.", 0, emailUtil.getSentCount());
+        }
+        finally
+        {
+            passwordService.setSendEmailAsynchronously(true);
+            emailUtil.reset();
+        }
+    }
+
+    private String getRequestResetPasswordUrl(String userId)
+    {
+        return URL_PEOPLE + '/' + userId + "/request-password-reset";
+    }
+
+    private String getResetPasswordUrl(String userId)
+    {
+        return URL_PEOPLE + '/' + userId + "/reset-password";
+    }
+
+
+    @Test
+    public void retrieveAvatar() throws Exception
+    {
+        final String person1 = account1PersonIt.next();
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1));
+        AuthenticationUtil.setFullyAuthenticatedUser(person1);
+        NodeRef person1Ref = personService.getPerson(person1, false);
+
+        // No avatar, but valid person
+        {
+            deleteAvatarDirect(person1Ref);
+            assertNotNull(people.getPerson(person1)); // Pre-condition of test case
+            people.getAvatar(person1, false, 404);
+        }
+
+        // No avatar, but person exists and placeholder requested
+        {
+            assertNotNull(people.getPerson(person1)); // Pre-condition of test case
+            people.getAvatar(person1, true, 200);
+        }
+
+        // Non-existent person
+        {
+            String nonPerson = "i-do-not-exist";
+            people.getPerson(nonPerson, 404); // Pre-condition of test case
+            people.getAvatar(nonPerson, false, 404);
+        }
+
+        // Placeholder requested, but non-existent person
+        {
+            String nonPerson = "i-do-not-exist";
+            people.getPerson(nonPerson, 404); // Pre-condition of test case
+            people.getAvatar(nonPerson, true, 404);
+        }
+
+        // Avatar exists
+        {
+            // Create avatar - direct (i.e. not using the API, so that tests for get avatar can be separated from upload)
+            // There's no significance to the image being used here, it was the most suitable I could find.
+            ClassPathResource thumbRes = new ClassPathResource("test.jpg");
+            deleteAvatarDirect(person1Ref);
+            createAvatarDirect(person1Ref, thumbRes.getFile());
+
+            // Get avatar - API call
+            people.getAvatar(person1, false, 200);
+        }
+
+        // -me- alias
+        {
+            people.getAvatar("-me-", false, 200);
+        }
+
+        // If-Modified-Since behaviour
+        {
+            HttpResponse response = people.getAvatar(person1, false, 200);
+            Map<String, String> responseHeaders = response.getHeaders();
+
+            // Test 304 response
+            String lastModified = responseHeaders.get(LAST_MODIFIED_HEADER);
+            assertNotNull(lastModified);
+
+            // Has it been modified since the time it was last modified - no!
+            people.getAvatar(person1, lastModified, 304);
+
+            // Create an updated avatar
+            waitMillis(2000); // ensure time has passed between updates
+            ClassPathResource thumbRes = new ClassPathResource("publicapi/upload/quick.jpg");
+            deleteAvatarDirect(person1Ref);
+            createAvatarDirect(person1Ref, thumbRes.getFile());
+
+            people.getAvatar(person1, lastModified, 200);
+        }
+
+        // Attachment param
+        {
+            // No attachment parameter (default true)
+            Boolean attachmentParam = null;
+            HttpResponse response = people.getAvatar(person1, attachmentParam, false, null, 200);
+            Map<String, String> responseHeaders = response.getHeaders();
+            String contentDisposition = responseHeaders.get("Content-Disposition");
+            assertNotNull(contentDisposition);
+            assertTrue(contentDisposition.startsWith("attachment;"));
+
+            // attachment=true
+            attachmentParam = true;
+            response = people.getAvatar(person1, attachmentParam, false, null, 200);
+            responseHeaders = response.getHeaders();
+            contentDisposition = responseHeaders.get("Content-Disposition");
+            assertNotNull(contentDisposition);
+            assertTrue(contentDisposition.startsWith("attachment;"));
+
+            // attachment=false
+            attachmentParam = false;
+            response = people.getAvatar(person1, attachmentParam, false, null, 200);
+            responseHeaders = response.getHeaders();
+            contentDisposition = responseHeaders.get("Content-Disposition");
+            assertNull(contentDisposition);
+        }
+    }
+
+    private void waitMillis(int requiredDelay)
+    {
+        long startTime = System.currentTimeMillis();
+        long currTime = startTime;
+        while (currTime < (startTime + requiredDelay))
+        {
+            try
+            {
+                sleep(requiredDelay);
+            }
+            catch (InterruptedException e)
+            {
+                System.out.println(":>>> " + e.getMessage());
+            }
+            finally
+            {
+                currTime = System.currentTimeMillis();
+                System.out.println(":>>> waited "+(currTime-startTime) + "ms");
+            }
+        }
+    }
+
+    private void deleteAvatarDirect(NodeRef personRef)
+    {
+
+        List<ChildAssociationRef> assocs = nodeService.getChildAssocs(personRef).
+                stream().
+                filter(x -> x.getTypeQName().equals(ContentModel.ASSOC_PREFERENCE_IMAGE)).
+                collect(Collectors.toList());
+        if (assocs.size() > 0)
+        {
+            nodeService.deleteNode(assocs.get(0).getChildRef());
+        }
+
+        // remove old association if it exists
+        List<AssociationRef> refs = nodeService.getTargetAssocs(personRef, ContentModel.ASSOC_AVATAR);
+        if (refs.size() == 1)
+        {
+            NodeRef existingRef = refs.get(0).getTargetRef();
+            nodeService.removeAssociation(
+                    personRef, existingRef, ContentModel.ASSOC_AVATAR);
+        }
+
+        if (assocs.size() > 1 || refs.size() > 1)
+        {
+            fail(String.format("Pref images: %d, Avatar assocs: %d", assocs.size(), refs.size()));
+        }
+    }
+
+    private NodeRef createAvatarDirect(NodeRef personRef, File avatarFile)
+    {
+        // create new avatar node
+        nodeService.addAspect(personRef, ContentModel.ASPECT_PREFERENCES, null);
+        ChildAssociationRef assoc = nodeService.createNode(
+                personRef,
+                ContentModel.ASSOC_PREFERENCE_IMAGE,
+                QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "origAvatar"),
+                ContentModel.TYPE_CONTENT);
+        final NodeRef avatarRef = assoc.getChildRef();
+
+        // JSF client compatibility?
+        nodeService.createAssociation(personRef, avatarRef, ContentModel.ASSOC_AVATAR);
+
+        // upload the avatar content
+        ContentService contentService = applicationContext.getBean("ContentService", ContentService.class);
+        ContentWriter writer = contentService.getWriter(avatarRef, ContentModel.PROP_CONTENT, true);
+        writer.guessMimetype(avatarFile.getName());
+        writer.putContent(avatarFile);
+
+        Rendition avatarR = new Rendition();
+        avatarR.setId("avatar");
+        Renditions renditions = applicationContext.getBean("Renditions", Renditions.class);
+        renditions.createRendition(avatarRef, avatarR, false, null);
+
+        return avatarRef;
+    }
+
+    @Test
+    public void updateAvatar() throws PublicApiException, IOException, InterruptedException
+    {
+        final String person1 = account1PersonIt.next();
+        final String person2 = account1PersonIt.next();
+
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), person2));
+
+        AuthenticationUtil.setFullyAuthenticatedUser(person2);
+
+        // Update allowed when no existing avatar
+        {
+            // Pre-condition: no avatar exists
+            NodeRef personRef = personService.getPerson(person2, false);
+            deleteAvatarDirect(personRef);
+            people.getAvatar(person2, false, 404);
+
+            // TODO: What do we expect the 200 response body to be? Currently it's the person JSON - doesn't seem right.
+            ClassPathResource avatar = new ClassPathResource("publicapi/upload/quick.jpg");
+            HttpResponse response = people.updateAvatar(person2, avatar.getFile(), 200);
+
+            // TODO: ideally, this should be a "direct" retrieval to isolate update from get
+            people.getAvatar(person2, false, 200);
+        }
+
+        // Update existing avatar
+        {
+            // Pre-condition: avatar exists
+            people.getAvatar(person2, false, 200);
+
+            ClassPathResource avatar = new ClassPathResource("test.jpg");
+            HttpResponse response = people.updateAvatar(person2, avatar.getFile(), 200);
+            people.getAvatar(person2, false, 200);
+
+            // -me- alias
+            people.updateAvatar(person2, avatar.getFile(), 200);
+            people.getAvatar("-me-", false, 200);
+        }
+
+        // 400: invalid user ID
+        {
+            ClassPathResource avatar = new ClassPathResource("publicapi/upload/quick.jpg");
+            people.updateAvatar("joe@@bloggs.example.com", avatar.getFile(), 404);
+        }
+
+        // 401: authentication failure
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "Wr0ngP4ssw0rd!"));
+            ClassPathResource avatar = new ClassPathResource("publicapi/upload/quick.jpg");
+            people.updateAvatar(account1Admin, avatar.getFile(), 401);
+        }
+
+        // 403: permission denied
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1));
+            ClassPathResource avatar = new ClassPathResource("publicapi/upload/quick.jpg");
+            people.updateAvatar(person2, avatar.getFile(), 403);
+
+            // Person can update themself
+            people.updateAvatar(person1, avatar.getFile(), 200);
+
+            // Admin can update someone else
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), account1Admin, "admin"));
+            people.updateAvatar(person1, avatar.getFile(), 200);
+        }
+
+        // 404: non-existent person
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1));
+            // Pre-condition: non-existent person
+            String nonPerson = "joebloggs@"+account1.getId();
+            people.getPerson(nonPerson, 404);
+
+            ClassPathResource avatar = new ClassPathResource("publicapi/upload/quick.jpg");
+            people.updateAvatar(nonPerson, avatar.getFile(), 404);
+        }
+
+        // 413: content exceeds individual file size limit
+        {
+            // Test content size limit
+            final ContentLimitProvider.SimpleFixedLimitProvider limitProvider = applicationContext.
+                    getBean("defaultContentLimitProvider", ContentLimitProvider.SimpleFixedLimitProvider.class);
+            final long defaultSizeLimit = limitProvider.getSizeLimit();
+            limitProvider.setSizeLimitString("20000"); //20 KB
+
+            try
+            {
+                ClassPathResource avatar = new ClassPathResource("publicapi/upload/quick.jpg"); // ~26K
+                people.updateAvatar(person1, avatar.getFile(), 413);
+            }
+            finally
+            {
+                limitProvider.setSizeLimitString(Long.toString(defaultSizeLimit));
+            }
+        }
+
+        // 501: thumbnails disabled
+        {
+            ThumbnailService thumbnailService = applicationContext.getBean("thumbnailService", ThumbnailService.class);
+            // Disable thumbnail generation
+            thumbnailService.setThumbnailsEnabled(false);
+            try
+            {
+                ClassPathResource avatar = new ClassPathResource("publicapi/upload/quick.jpg");
+                people.updateAvatar(person1, avatar.getFile(), 501);
+            }
+            finally
+            {
+                thumbnailService.setThumbnailsEnabled(true);
+            }
+        }
+    }
+
+
+    @Test
+    public void removeAvatar() throws IOException, PublicApiException, InterruptedException
+    {
+        
+        final String person1 = account1PersonIt.next();
+        final String person2 = account1PersonIt.next();
+
+        publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1));
+        
+        // Avatar exists
+        {
+            AuthenticationUtil.setFullyAuthenticatedUser("admin@"+account1.getId());
+
+            // Create avatar - direct (i.e. not using the API, so that tests for get avatar can be separated from upload)
+            // There's no significance to the image being used here, it was the most suitable I could find.
+            ClassPathResource thumbRes = new ClassPathResource("publicapi/upload/quick.jpg");
+            NodeRef personRef = personService.getPerson(person1, false);
+            deleteAvatarDirect(personRef);
+            createAvatarDirect(personRef, thumbRes.getFile());
+
+            // Get avatar - API call
+            people.getAvatar(person1, false, 200);
+            
+            //remove avatar avatar exists
+            people.deleteAvatarImage(person1,204);
+            
+        }
+        
+       
+        // Non-existent person
+        {
+            String nonPerson = "i-do-not-exist";
+            people.getPerson(nonPerson, 404); // Pre-condition of test case
+            people.deleteAvatarImage(nonPerson, 404);
+        }
+        
+        //Authentication failed 401
+        {
+            setRequestContext(account1.getId(), networkAdmin, "wrongPassword");
+            people.deleteAvatarImage(person1,HttpServletResponse.SC_UNAUTHORIZED);
+        }
+        
+        //No permission
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1));
+            
+            AuthenticationUtil.setFullyAuthenticatedUser("admin@"+account1.getId());
+
+            // Create avatar - direct (i.e. not using the API, so that tests for get avatar can be separated from upload)
+            // There's no significance to the image being used here, it was the most suitable I could find.
+            ClassPathResource thumbRes = new ClassPathResource("test.jpg");
+            NodeRef personRef = personService.getPerson(person1, false);
+            deleteAvatarDirect(personRef);
+            createAvatarDirect(personRef, thumbRes.getFile());
+            
+            people.deleteAvatarImage(person2, 403);
+
+        }
+        
+
+        
+    }
+
+    @Test
+    public void testListPeopleWithCapabilities() throws Exception
+    {
+        String personGuestId = "guest@" + account3.getId();
+        publicApiClient
+                .setRequestContext(new RequestContext(account3.getId(), account3Admin, "admin"));
+
+        // Are capabilities left absent when not required?
+        {
+            PublicApiClient.ListResponse<Person> resp = listPeople(Collections.emptyMap(), 200);
+            assertNull(resp.getList().get(0).getCapabilities());
+        }
+
+        // Are capabilities populated when requested?
+        {
+            // Test user admin, non-guest and mutable account
+            Map<String, String> parameters = Collections.singletonMap("include", "capabilities");
+            PublicApiClient.ListResponse<Person> resp = listPeople(parameters, 200);
+            Person personAdmin = resp.getList().stream()
+                    .filter(p -> p.getUserName().equals(account3Admin)).findFirst().get();
+            assertNotNull(personAdmin.getCapabilities());
+            assertTrue(personAdmin.getCapabilities().get("isAdmin").booleanValue());
+            assertFalse(personAdmin.getCapabilities().get("isGuest").booleanValue());
+            assertTrue(personAdmin.getCapabilities().get("isMutable").booleanValue());
+
+            // Test user non-admin, guest and non-mutable account
+            System.out.println(resp.getList());
+            Person personGuest = resp.getList().stream()
+                    .filter(p -> p.getUserName().equals(personGuestId)).findFirst().get();
+            assertNotNull(personGuest.getCapabilities());
+            assertFalse(personGuest.getCapabilities().get("isAdmin").booleanValue());
+            assertTrue(personGuest.getCapabilities().get("isGuest").booleanValue());
+            assertFalse(personGuest.getCapabilities().get("isMutable").booleanValue());
+        }
+    }
+
+    @Test
+    public void testDisplayName()
+    {
+        Person person = new Person();
+        assertNull(person.getDisplayName());
+
+        String firstName = "First";
+        person.setFirstName(firstName);
+        assertEquals(firstName, person.getDisplayName());
+
+        String lastName = "Last";
+        person.setLastName(lastName);
+        assertEquals(firstName + " " + lastName, person.getDisplayName());
+
+        person = new Person();
+        person.setLastName(lastName);
+        assertEquals(lastName, person.getDisplayName());
+    }
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPersonSites.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPersonSites.java
new file mode 100644
index 00000000000..6a06ec4f637
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPersonSites.java
@@ -0,0 +1,1004 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.rest.api.tests.RepoService.SiteInformation;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Sites;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.MemberOfSite;
+import org.alfresco.rest.api.tests.client.data.SiteRole;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.apache.commons.httpclient.HttpStatus;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestPersonSites extends EnterpriseTestApi
+{
+    private TestNetwork network1;
+    private TestNetwork network2;
+    private TestNetwork network4;
+
+    private TestPerson person11;
+    private TestPerson person12;
+    private TestPerson person21;
+    private TestPerson person41;
+    private TestPerson person42;
+
+    private List<TestSite> sites = new ArrayList<>(10);
+
+    /* Sites and users used to test the site sorting */
+    private TestPerson person31;
+    private TestPerson person32;
+    private TestSite site1;
+    private TestSite site2;
+    private TestSite site3;
+    private String site1_id = "a_" + GUID.generate();
+    private String site1_title = "c_" + GUID.generate();
+    private SiteRole site1_role = SiteRole.SiteContributor;
+    private String site2_id = "b_" + GUID.generate();
+    private String site2_title = "a_" + GUID.generate();
+    private SiteRole site2_role = SiteRole.SiteManager;
+    private String site3_id = "c_" + GUID.generate();
+    private String site3_title = "b_" + GUID.generate();
+    private SiteRole site3_role = SiteRole.SiteConsumer;
+
+    private TestSite site41;
+    private TestSite site42;
+    private TestSite site43;
+    private TestSite site44;
+
+    @Override
+    @Before
+    public void setup() throws Exception
+    {
+        // init networks
+        super.setup();
+
+        Iterator<TestNetwork> networksIt = getTestFixture().getNetworksIt();
+
+        assertTrue(networksIt.hasNext());
+        this.network1 = networksIt.next();
+
+        assertTrue(networksIt.hasNext());
+        this.network2 = networksIt.next();
+
+        // create a user
+
+        final List<TestPerson> people = new ArrayList<TestPerson>(1);
+
+        // Create some users
+        TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                TestPerson person = network1.createUser();
+                people.add(person);
+                person = network1.createUser();
+                people.add(person);
+
+                return null;
+            }
+        }, network1.getId());
+
+        TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                TestPerson person = network2.createUser();
+                people.add(person);
+
+                return null;
+            }
+        }, network2.getId());
+
+        this.person11 = people.get(0);
+        this.person12 = people.get(1);
+        this.person21 = people.get(2);
+
+        // ...and some sites
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                TestSite site = network1.createSite(SiteVisibility.PUBLIC);
+                site.inviteToSite(person11.getId(), SiteRole.SiteContributor);
+                sites.add(site);
+
+                site = network1.createSite(SiteVisibility.MODERATED);
+                site.inviteToSite(person11.getId(), SiteRole.SiteContributor);
+                sites.add(site);
+
+                site = network1.createSite(SiteVisibility.PRIVATE);
+                site.inviteToSite(person11.getId(), SiteRole.SiteConsumer);
+                sites.add(site);
+
+                site = network1.createSite(SiteVisibility.PUBLIC);
+                site.inviteToSite(person11.getId(), SiteRole.SiteManager);
+                sites.add(site);
+
+                site = network1.createSite(SiteVisibility.PRIVATE);
+                site.inviteToSite(person11.getId(), SiteRole.SiteCollaborator);
+                sites.add(site);
+
+                //Special site for person removal
+                site = network1.createSite(SiteVisibility.PRIVATE);
+                site.inviteToSite(person11.getId(), SiteRole.SiteConsumer);
+                sites.add(site);
+                return null;
+            }
+        }, person12.getId(), network1.getId());
+    }
+
+    // TODO switch to use V1 createSite (instead of RepoService) 
+    private void initializeSites() throws Exception
+    {
+        /*
+         * Create data for testing the site sorting. We create the sites as
+         * person31 and assign roles to person32. The list requests will be
+         * performed as person32.
+         */
+        TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                person31 = network1.createUser();
+                person32 = network1.createUser();
+                return null;
+            }
+        }, network1.getId());
+
+        this.site1 = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+        {
+            @Override
+            public TestSite doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(site1_id, site1_title, site1_title, SiteVisibility.PRIVATE);
+                TestSite site = network1.createSite(siteInfo);
+                site.inviteToSite(person32.getId(), site1_role);
+                return site;
+            }
+        }, person31.getId(), network1.getId());
+
+        this.site2 = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+        {
+            @Override
+            public TestSite doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(site2_id, site2_title, site2_title, SiteVisibility.PRIVATE);
+                TestSite site = network1.createSite(siteInfo);
+                site.inviteToSite(person32.getId(), site2_role);
+                return site;
+            }
+        }, person31.getId(), network1.getId());
+
+        this.site3 = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+        {
+            @Override
+            public TestSite doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(site3_id, site3_title, site3_title, SiteVisibility.PRIVATE);
+                TestSite site = network1.createSite(siteInfo);
+                site.inviteToSite(person32.getId(), site3_role);
+                return site;
+            }
+        }, person31.getId(), network1.getId());
+    }
+
+    private void initializePersonAndNetwork4WithSites() throws Exception
+    {
+        if (network4 == null)
+        {
+            network4 = getRepoService().createNetwork(this.getClass().getSimpleName().toLowerCase() + "-3-" + GUID.generate(), true);
+            network4.create();
+
+            // Create some users
+            TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    person41 = network4.createUser();
+                    person42 = network4.createUser();
+                    return null;
+                }
+            }, network4.getId());
+
+            // ...and some sites
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    site41 = network4.createSite("A", SiteVisibility.PRIVATE);
+                    site41.inviteToSite(person41.getId(), SiteRole.SiteContributor);
+
+                    site42 = network4.createSite("B", SiteVisibility.PUBLIC);
+                    site42.inviteToSite(person41.getId(), SiteRole.SiteContributor);
+
+                    site43 = network4.createSite("C", SiteVisibility.PUBLIC);
+                    site43.inviteToSite(person41.getId(), SiteRole.SiteContributor);
+
+                    site44 = network4.createSite("D", SiteVisibility.MODERATED);
+                    site44.inviteToSite(person41.getId(), SiteRole.SiteContributor);
+                    return null;
+                }
+            }, person42.getId(), network4.getId());
+        }
+    }
+
+    @Test
+    public void testPersonSites() throws Exception
+    {
+        Set<MemberOfSite> personSites = new TreeSet<MemberOfSite>();
+
+        //Get last site for use with personRemoveSite
+        TestSite personRemoveSite = sites.get(sites.size() - 1);
+        sites.remove(sites.size() - 1);
+
+        personSites.addAll(network1.getSiteMemberships(person11.getId()));
+
+        // Create some sites
+        personSites.addAll(TenantUtil.runAsUserTenant(new TenantRunAsWork<List<MemberOfSite>>()
+        {
+            @Override
+            public List<MemberOfSite> doWork() throws Exception
+            {
+                List<MemberOfSite> expectedSites = new ArrayList<MemberOfSite>();
+
+                TestSite site = network1.createSite(SiteVisibility.PRIVATE);
+                expectedSites.add(new MemberOfSite(site, SiteRole.SiteManager));
+
+                site = network1.createSite(SiteVisibility.PUBLIC);
+                expectedSites.add(new MemberOfSite(site, SiteRole.SiteManager));
+
+                site = network1.createSite(SiteVisibility.MODERATED);
+                expectedSites.add(new MemberOfSite(site, SiteRole.SiteManager));
+
+                return expectedSites;
+            }
+        }, person11.getId(), network1.getId()));
+
+        personSites.addAll(TenantUtil.runAsUserTenant(new TenantRunAsWork<List<MemberOfSite>>()
+        {
+            @Override
+            public List<MemberOfSite> doWork() throws Exception
+            {
+                List<MemberOfSite> expectedSites = new ArrayList<MemberOfSite>();
+
+                TestSite site = network1.createSite(SiteVisibility.PRIVATE);
+                site.inviteToSite(person11.getId(), SiteRole.SiteConsumer);
+                expectedSites.add(new MemberOfSite(site, SiteRole.SiteConsumer));
+
+                site = network1.createSite(SiteVisibility.PUBLIC);
+                site.inviteToSite(person11.getId(), SiteRole.SiteConsumer);
+                expectedSites.add(new MemberOfSite(site, SiteRole.SiteConsumer));
+
+                site = network1.createSite(SiteVisibility.MODERATED);
+                site.inviteToSite(person11.getId(), SiteRole.SiteConsumer);
+                expectedSites.add(new MemberOfSite(site, SiteRole.SiteConsumer));
+
+                return expectedSites;
+            }
+        }, person12.getId(), network1.getId()));
+
+        final List<MemberOfSite> expectedSites = new ArrayList<MemberOfSite>(personSites);
+        Sites sitesProxy = publicApiClient.sites();
+
+        // Test Case cloud-1487
+
+        // unknown user
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+            sitesProxy.getPersonSites(GUID.generate(), null);
+            fail("");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // Test Case cloud-2200
+        // Test Case cloud-2213
+        // user should be able to list their sites
+        {
+            int skipCount = 0;
+            int maxItems = 2;
+            Paging paging = getPaging(skipCount, maxItems, expectedSites.size(), expectedSites.size());
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+            ListResponse<MemberOfSite> resp = sitesProxy.getPersonSites(person11.getId(), createParams(paging, null));
+            checkList(expectedSites.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+        }
+
+        {
+            int skipCount = 2;
+            int maxItems = 8;
+            Paging paging = getPaging(skipCount, maxItems, expectedSites.size(), expectedSites.size());
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+            ListResponse<MemberOfSite> resp = sitesProxy.getPersonSites(person11.getId(), createParams(paging, null));
+            checkList(expectedSites.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+        }
+
+        // "-me-" user
+        {
+            int skipCount = 0;
+            int maxItems = 2;
+            Paging paging = getPaging(skipCount, maxItems, expectedSites.size(), expectedSites.size());
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+            ListResponse<MemberOfSite> resp = sitesProxy.getPersonSites(org.alfresco.rest.api.People.DEFAULT_USER, createParams(paging, null));
+            checkList(expectedSites.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+        }
+
+        // a user in another tenant should not be able to list a user's sites
+        try
+        {
+            int skipCount = 0;
+            int maxItems = 2;
+            Paging paging = getPaging(skipCount, maxItems, expectedSites.size(), null);
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person21.getId()));
+            sitesProxy.getPersonSites(person11.getId(), createParams(paging, null));
+            fail("");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+        }
+
+        // Test case cloud-1488
+        {
+            MemberOfSite memberOfSite = expectedSites.get(0);
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+            MemberOfSite ret = sitesProxy.getPersonSite(person11.getId(), memberOfSite.getSiteId());
+            memberOfSite.expected(ret);
+        }
+
+        try
+        {
+            MemberOfSite memberOfSite = expectedSites.get(0);
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+            sitesProxy.getPersonSite(GUID.generate(), memberOfSite.getSiteId());
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+            sitesProxy.getPersonSite(person11.getId(), GUID.generate());
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // Test Case cloud-1487
+        // unknown person id
+        try
+        {
+            MemberOfSite memberOfSite = expectedSites.get(0);
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+            sitesProxy.getPersonSite(GUID.generate(), memberOfSite.getSiteId());
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+            sitesProxy.getPersonSite(person11.getId(), GUID.generate());
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        {
+            //Tests removing a person from the site
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+            sitesProxy.remove("people", person11.getId(), "sites", personRemoveSite.getSiteId(), "Unable to DELETE a person site");
+
+            try
+            {
+                sitesProxy.getPersonSite(person11.getId(), personRemoveSite.getSiteId());
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+        }
+
+        // TODO
+        // person from external network listing user sites
+
+        // Test Case cloud-1966
+        // Not allowed methods
+        try
+        {
+            MemberOfSite memberOfSite = expectedSites.get(0);
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+            sitesProxy.create("people", person11.getId(), "sites", memberOfSite.getSiteId(), null, "Unable to POST to a person site");
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+            sitesProxy.create("people", person11.getId(), "sites", null, null, "Unable to POST to person sites");
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+
+        try
+        {
+            MemberOfSite memberOfSite = expectedSites.get(0);
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+            sitesProxy.update("people", person11.getId(), "sites", memberOfSite.getSiteId(), null, "Unable to PUT a person site");
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+            sitesProxy.update("people", person11.getId(), "sites", null, null, "Unable to PUT person sites");
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+
+        try
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+            sitesProxy.remove("people", person11.getId(), "sites", null, "Unable to DELETE person sites");
+            fail();
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+    }
+
+    /**
+     * Retrieves the site memberships associated to a user
+     *
+     * @param sortColumn
+     * @param asc
+     * @return
+     * @throws Exception
+     */
+    private ListResponse<MemberOfSite> getSiteMembershipsForPerson32(final Paging paging, String sortColumn, boolean asc) throws Exception
+    {
+        final Sites sitesProxy = publicApiClient.sites();
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person32.getId()));
+
+        // sort params
+        final Map<String, String> params = new HashMap<String, String>();
+        if (sortColumn != null)
+        {
+            params.put("orderBy", sortColumn + " " + (asc ? "ASC" : "DESC"));
+        }
+
+        // get memberships
+        ListResponse<MemberOfSite> resp = TenantUtil.runAsUserTenant(new TenantRunAsWork<ListResponse<MemberOfSite>>()
+        {
+            @Override
+            public ListResponse<MemberOfSite> doWork() throws Exception
+            {
+                ListResponse<MemberOfSite> resp = sitesProxy.getPersonSites(person32.getId(), createParams(paging, params));
+
+                return resp;
+            }
+        }, person32.getId(), network1.getId());
+
+        return resp;
+    }
+
+    /**
+     * Tests the capability to sort and paginate the site memberships associated
+     * to a user orderBy = title ASC skip = 1, count = 2
+     *
+     * @throws Exception
+     */
+    public void testSortingAndPagingByTitleAsc() throws Exception
+    {
+        // paging
+        int skipCount = 1;
+        int maxItems = 2;
+        int totalResults = 3;
+        Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // get memberships
+        ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "title", true);
+
+        // check results
+        List<MemberOfSite> expectedList = new LinkedList<>();
+        expectedList.add(new MemberOfSite(site3, site3_role));
+        expectedList.add(new MemberOfSite(site1, site1_role));
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+
+    }
+
+    /**
+     * Tests the capability to sort and paginate the site memberships associated
+     * to a user orderBy = title DESC skip = 1, count = 2
+     *
+     * @throws Exception
+     */
+    public void testSortingAndPagingByTitleDesc() throws Exception
+    {
+        // paging
+        int skipCount = 1;
+        int maxItems = 2;
+        int totalResults = 3;
+        Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // get memberships
+        ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "title", false);
+
+        // check results
+        List<MemberOfSite> expectedList = new LinkedList<>();
+        expectedList.add(new MemberOfSite(site3, site3_role));
+        expectedList.add(new MemberOfSite(site2, site2_role));
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the site memberships associated
+     * to a user orderBy = role ASC skip = 1, count = 2
+     *
+     * @throws Exception
+     */
+    public void testSortingAndPagingByRoleAsc() throws Exception
+    {
+        // paging
+        int skipCount = 1;
+        int maxItems = 2;
+        int totalResults = 3;
+        Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // get memberships
+        ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "role", true);
+
+        // check results
+        List<MemberOfSite> expectedList = new LinkedList<>();
+        expectedList.add(new MemberOfSite(site1, site1_role));
+        expectedList.add(new MemberOfSite(site2, site2_role));
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the site memberships associated
+     * to a user orderBy = role DESC skip = 1, count = 2
+     *
+     * @throws Exception
+     */
+    public void testSortingAndPagingByRoleDesc() throws Exception
+    {
+        // paging
+        int skipCount = 1;
+        int maxItems = 2;
+        int totalResults = 3;
+        Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // get memberships
+        ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "role", false);
+
+        // check results
+        List<MemberOfSite> expectedList = new LinkedList<>();
+        expectedList.add(new MemberOfSite(site1, site1_role));
+        expectedList.add(new MemberOfSite(site3, site3_role));
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the site memberships associated
+     * to a user orderBy = id ASC skip = 1, count = 2
+     *
+     * @throws Exception
+     */
+    public void testSortingAndPagingBySiteIdAsc() throws Exception
+    {
+        // paging
+        int skipCount = 1;
+        int maxItems = 2;
+        int totalResults = 3;
+        Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // get memberships
+        ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "id", true);
+
+        // check results
+        List<MemberOfSite> expectedList = new LinkedList<>();
+        expectedList.add(new MemberOfSite(site2, site2_role));
+        expectedList.add(new MemberOfSite(site3, site3_role));
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the site memberships associated
+     * to a user orderBy = id DESC skip = 1, count = 2
+     *
+     * @throws Exception
+     */
+    public void testSortingAndPagingBySiteIdDesc() throws Exception
+    {
+        // paging
+        int skipCount = 1;
+        int maxItems = 2;
+        int totalResults = 3;
+        Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // get memberships
+        ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "id", false);
+
+        // check results
+        List<MemberOfSite> expectedList = new LinkedList<>();
+        expectedList.add(new MemberOfSite(site2, site2_role));
+        expectedList.add(new MemberOfSite(site1, site1_role));
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the site memberships associated
+     * default sorting (title asc), all results
+     *
+     * @throws Exception
+     */
+    public void testSortingAndPagingDefault() throws Exception
+    {
+        // paging
+        int totalResults = 3;
+        Paging paging = getPaging(null, null, totalResults, totalResults);
+
+        // get memberships
+        ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(null, null, false);
+
+        // check results
+        List<MemberOfSite> expectedList = new LinkedList<>();
+        expectedList.add(new MemberOfSite(site2, site2_role));
+        expectedList.add(new MemberOfSite(site3, site3_role));
+        expectedList.add(new MemberOfSite(site1, site1_role));
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+
+    }
+
+    // see also TestSites.testSortingAndPaging
+    @Test
+    public void testSortingAndPaging() throws Exception
+    {
+        initializeSites();
+
+        testSortingAndPagingByTitleAsc();
+        testSortingAndPagingByTitleDesc();
+        testSortingAndPagingByRoleAsc();
+        testSortingAndPagingByRoleDesc();
+        testSortingAndPagingBySiteIdAsc();
+        testSortingAndPagingBySiteIdDesc();
+        testSortingAndPagingDefault();
+    }
+
+    // ACE-4823
+    @Test
+    public void testSitesWithSameTitles() throws Exception
+    {
+        // Creates 3 sites
+        initializeSites();
+
+        final String site4_name = "d_" + GUID.generate();
+        final String site4_title = site3_title; // Same title as site3
+        final SiteRole site4_role = SiteRole.SiteCollaborator;
+
+        TestSite site4 = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+        {
+            @Override
+            public TestSite doWork() throws Exception
+            {
+                SiteInformation siteInfo = new SiteInformation(site4_name, site4_title, site4_title, SiteVisibility.PRIVATE);
+                TestSite site = network1.createSite(siteInfo);
+                site.inviteToSite(person32.getId(), site4_role);
+                return site;
+            }
+        }, person31.getId(), network1.getId());
+        assertNotNull(site4);
+
+        // paging
+        int totalResults = 4;
+        Paging paging = getPaging(null, null, totalResults, totalResults);
+
+        // get memberships
+        ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(null, null, false);
+
+        // check results
+        List<MemberOfSite> expectedList = new LinkedList<>();
+        expectedList.add(new MemberOfSite(site2, site2_role));
+        expectedList.add(new MemberOfSite(site3, site3_role));
+        expectedList.add(new MemberOfSite(site4, site4_role));
+        expectedList.add(new MemberOfSite(site1, site1_role));
+
+        try
+        {
+            checkList(expectedList, paging.getExpectedPaging(), resp);
+        }
+        catch (AssertionError error)
+        {
+            // Site3 and Site4 have a same title, and as we are sorting on titles (default sorting),
+            // we can't guarantee the order in which the sites will
+            // return, hence swap the sites and compare again.
+            Collections.swap(expectedList, 1, 2);
+            checkList(expectedList, paging.getExpectedPaging(), resp);
+        }
+    }
+
+    /**
+     * Retrieves the site memberships associated to a user.
+     *
+     * @param paging
+     *            The paging object
+     * @param params
+     *            Public api parameters map.
+     * @param person
+     *            The test person.
+     * @param network
+     *            The test network.
+     * @return The site memberships associated to the give user.
+     * @throws Exception
+     */
+    private ListResponse<MemberOfSite> getSiteMembershipsForPersonAndNetwork(final Paging paging, Map<String, String> params, TestPerson person, TestNetwork network, boolean runAsUserTenant)
+            throws Exception
+    {
+        final Sites sitesProxy = publicApiClient.sites();
+        publicApiClient.setRequestContext(new RequestContext(network.getId(), person.getId()));
+
+        ListResponse<MemberOfSite> resp;
+        if (runAsUserTenant)
+        {
+            // get memberships
+            resp = TenantUtil.runAsUserTenant(new TenantRunAsWork<ListResponse<MemberOfSite>>()
+            {
+                @Override
+                public ListResponse<MemberOfSite> doWork() throws Exception
+                {
+                    ListResponse<MemberOfSite> resp = sitesProxy.getPersonSites(person.getId(), createParams(paging, params));
+                    return resp;
+                }
+            }, person.getId(), network.getId());
+        }
+        else
+        {
+            resp = sitesProxy.getPersonSites(person.getId(), createParams(paging, params));
+        }
+
+        return resp;
+    }
+
+    private List<MemberOfSite> getPersonSites(TestPerson person, TestSite... sites) throws PublicApiException
+    {
+        Sites sitesProxy = publicApiClient.sites();
+
+        List<MemberOfSite> memberOfSiteList = new ArrayList<>();
+        for (TestSite site : sites)
+        {
+            memberOfSiteList.add(sitesProxy.getPersonSite(person.getId(), site.getSiteId()));
+        }
+
+        return memberOfSiteList;
+    }
+
+    private ListResponse<MemberOfSite> getSiteMembershipsForPerson41(final Paging paging, String siteVisibility, boolean runAsUserTenant) throws Exception
+    {
+        final Map<String, String> params = new HashMap<>();
+        params.put("orderBy", "title" + " " + "ASC");
+
+        if (siteVisibility != null)
+        {
+            params.put("where", "(visibility=" + siteVisibility + ")");
+        }
+
+        return getSiteMembershipsForPersonAndNetwork(paging, params, person41, network4, runAsUserTenant);
+    }
+    private ListResponse<MemberOfSite> getSiteMembershipsForPerson41NOTWhere(final Paging paging, String siteVisibility, boolean runAsUserTenant) throws Exception
+    {
+        final Map<String, String> params = new HashMap<>();
+        params.put("orderBy", "title" + " " + "ASC");
+
+        if (siteVisibility != null)
+        {
+            params.put("where", "(NOT visibility=" + siteVisibility + ")");
+        }
+
+        return getSiteMembershipsForPersonAndNetwork(paging, params, person41, network4, runAsUserTenant);
+    }
+    
+    private ListResponse<MemberOfSite> getSiteMembershipsForPerson41(final Paging paging, String siteVisibility) throws Exception
+    {
+        return getSiteMembershipsForPerson41(paging, siteVisibility, true);
+    }
+
+    public void testGetSiteMembershipsWhereSiteVisibilityPrivate() throws Exception
+    {
+        // paging
+        int totalResults = 1;
+        Paging paging = getPaging(null, null, totalResults, totalResults);
+
+        // list sites
+        ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson41(null, SiteVisibility.PRIVATE.name());
+
+        // check results
+        List<MemberOfSite> expectedList = getPersonSites(person41, site41);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    public void testGetSiteMembershipsWhereSiteVisibilityPublic() throws Exception
+    {
+        // paging
+        int totalResults = 2;
+        Paging paging = getPaging(null, null, totalResults, totalResults);
+
+        // list sites
+        ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson41(null, SiteVisibility.PUBLIC.name());
+
+        // check results
+        List<MemberOfSite> expectedList = getPersonSites(person41, site42, site43);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    public void testGetSiteMembershipsWhereSiteVisibilityPublicAndSkipCount() throws Exception
+    {
+        // paging
+        Integer skipCount = 1;
+        int maxItems = 2;
+        int totalResults = 2;
+        Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // list sites
+        ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson41(paging, SiteVisibility.PUBLIC.name());
+
+        // check results
+        List<MemberOfSite> expectedList = getPersonSites(person41, site43);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    public void testGetSiteMembershipsWhereSiteVisibilityModerated() throws Exception
+    {
+        // paging
+        int totalResults = 1;
+        Paging paging = getPaging(null, null, totalResults, totalResults);
+
+        // list sites
+        ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson41(null, SiteVisibility.MODERATED.name());
+
+        // check results
+        List<MemberOfSite> expectedList = getPersonSites(person41, site44);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    public void testGetSiteMembershipsWhereSiteVisibilityInvalid() throws Exception
+    {
+        try
+        {
+            getSiteMembershipsForPerson41(null, "invalidVisibility", false);
+            fail("");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+        }
+    }
+
+    public void testGetSiteMembershipsWhereSiteVisibilityNOTIncluded() throws Exception
+    {
+        try
+        {
+        	getSiteMembershipsForPerson41NOTWhere(null, SiteVisibility.MODERATED.name(), false);
+            fail("");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+        }
+    }
+    
+    @Test
+    public void testGetSiteMembershipsWithWhereClause() throws Exception
+    {
+        initializePersonAndNetwork4WithSites();
+        publicApiClient.setRequestContext(new RequestContext(network4.getId(), person41.getId()));
+
+        testGetSiteMembershipsWhereSiteVisibilityPrivate();
+        testGetSiteMembershipsWhereSiteVisibilityPublic();
+        testGetSiteMembershipsWhereSiteVisibilityPublicAndSkipCount();
+        testGetSiteMembershipsWhereSiteVisibilityModerated();
+        testGetSiteMembershipsWhereSiteVisibilityInvalid();
+        testGetSiteMembershipsWhereSiteVisibilityNOTIncluded();
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApi128.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApi128.java
new file mode 100644
index 00000000000..1f462eed407
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApi128.java
@@ -0,0 +1,187 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.People;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Case sensitivity public api tests.
+ * 
+ * @author steveglover
+ *
+ */
+public class TestPublicApi128 extends EnterpriseTestApi
+{
+	private long time;
+
+	private static final String userId = "bOb.Jones";
+	private static final String networkPrefix = "MiXeDCasE";
+	private static final String networkDomain = "coM";
+
+	private String networkId;
+	private TestNetwork mixedCaseNetwork;
+	@SuppressWarnings("unused")
+	private TestPerson person1;
+	
+	private String getNetworkId(String networkIdPrefix, String networkIdDomain)
+	{
+		return networkIdPrefix + time + "." + networkIdDomain;
+	}
+	
+	private String getUserName(String username, String networkIdPrefix, String networkIdDomain)
+	{
+		return username + "@" + getNetworkId(networkIdPrefix, networkIdDomain);
+	}
+
+	@Before
+	public void setup()
+	{
+		// note: we don't call super.setup() since we create our own test data here !
+		
+		// mixed case network
+		this.time = System.currentTimeMillis();
+		this.networkId = getNetworkId(networkPrefix, networkDomain);
+
+        transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+        {
+        	@SuppressWarnings("synthetic-access")
+        	public Void execute() throws Throwable
+        	{
+    	        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+    	        TestPublicApi128.this.mixedCaseNetwork = repoService.createNetwork(TestPublicApi128.this.networkId, true);
+    	        TestPublicApi128.this.mixedCaseNetwork.create();
+
+				// mixed case user
+				PersonInfo personInfo = new PersonInfo("Bob", "Jones", TestPublicApi128.userId, "password", null, null, null, null, null, null, null);
+				TestPublicApi128.this.person1 = mixedCaseNetwork.createUser(personInfo);
+
+				return null;
+        	}
+        }, false, true);
+	}
+
+	@Test
+	public void testPublicApi128() throws Exception
+	{
+		People peopleProxy = publicApiClient.people();
+
+		// try to get person activities given a mixture of cases for networkId and user id
+		{
+			publicApiClient.setRequestContext(new RequestContext(networkId, getUserName("BOB.JONES", networkPrefix, networkDomain)));
+
+			int skipCount = 0;
+			int maxItems = 10;
+			Paging paging = getPaging(skipCount, maxItems);
+			peopleProxy.getActivities("-me-", createParams(paging, null));
+
+			publicApiClient.setRequestContext(new RequestContext(networkId, getUserName("BOB.JONES", "MIXEDCASE", "COM")));
+
+			skipCount = 0;
+			maxItems = 10;
+			paging = getPaging(skipCount, maxItems);
+			peopleProxy.getActivities("-me-", createParams(paging, null));
+			
+			publicApiClient.setRequestContext(new RequestContext(networkId.toUpperCase(), getUserName("BOB.JONES", "MIXEDCASE", "COM")));
+
+			skipCount = 0;
+			maxItems = 10;
+			paging = getPaging(skipCount, maxItems);
+			peopleProxy.getActivities("-me-", createParams(paging, null));
+			
+			publicApiClient.setRequestContext(new RequestContext(networkId.toUpperCase(), getUserName("Bob.JONES", "MIXEDCASE", "COM")));
+
+			skipCount = 0;
+			maxItems = 10;
+			paging = getPaging(skipCount, maxItems);
+			peopleProxy.getActivities("-me-", createParams(paging, null));
+			
+			publicApiClient.setRequestContext(new RequestContext(networkId, getUserName("BOB.JONES", networkPrefix, networkDomain)));
+
+			skipCount = 0;
+			maxItems = 10;
+			paging = getPaging(skipCount, maxItems);
+			peopleProxy.getActivities(getUserName("BOB.JONES", networkPrefix, networkDomain), createParams(paging, null));
+
+			publicApiClient.setRequestContext(new RequestContext(networkId, getUserName("BOB.JONES", "MIXEDCASE", "CoM")));
+
+			skipCount = 0;
+			maxItems = 10;
+			paging = getPaging(skipCount, maxItems);
+			peopleProxy.getActivities(getUserName("BOB.JONES", "MIXEDCASE", networkDomain), createParams(paging, null));
+			
+			publicApiClient.setRequestContext(new RequestContext(networkId.toUpperCase(), getUserName("BOB.JONES", "MIXEDCASE", "coM")));
+
+			skipCount = 0;
+			maxItems = 10;
+			paging = getPaging(skipCount, maxItems);
+			peopleProxy.getActivities(getUserName("BOB.JONES", "MIXEDCASE", "CoM"), createParams(paging, null));
+			
+			publicApiClient.setRequestContext(new RequestContext(networkId.toUpperCase(), getUserName("Bob.JONES", "MIXEDCASE", "COM")));
+
+			skipCount = 0;
+			maxItems = 10;
+			paging = getPaging(skipCount, maxItems);
+			peopleProxy.getActivities(getUserName("Bob.JONES", "MIXEDCASE", networkDomain), createParams(paging, null));
+			
+			publicApiClient.setRequestContext(new RequestContext(networkId, getUserName("BOB.JONES", networkPrefix, networkDomain)));
+			
+			skipCount = 0;
+			maxItems = 10;
+			paging = getPaging(skipCount, maxItems);
+			peopleProxy.getActivities(getUserName("Bob.JONES", networkPrefix, networkDomain), createParams(paging, null));
+
+			publicApiClient.setRequestContext(new RequestContext(networkId, getUserName("BOB.JONES", "MIXEDCASE", "COm")));
+
+			skipCount = 0;
+			maxItems = 10;
+			paging = getPaging(skipCount, maxItems);
+			peopleProxy.getActivities(getUserName("BOB.JONES", "MixEDCASE", networkDomain), createParams(paging, null));
+			
+			publicApiClient.setRequestContext(new RequestContext(networkId.toUpperCase(), getUserName("BOB.JONES", "MIXEDCASE", "COM")));
+
+			skipCount = 0;
+			maxItems = 10;
+			paging = getPaging(skipCount, maxItems);
+			peopleProxy.getActivities(getUserName("BOB.joNES", "MIXEDcasE", networkDomain), createParams(paging, null));
+			
+			publicApiClient.setRequestContext(new RequestContext(networkId.toUpperCase(), getUserName("Bob.JONES", "MIXEDCASE", "coM")));
+
+			skipCount = 0;
+			maxItems = 10;
+			paging = getPaging(skipCount, maxItems);
+			peopleProxy.getActivities(getUserName("BOB.joNES", networkPrefix, "cOM"), createParams(paging, null));
+		}		
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiAtomPub10TCK.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiAtomPub10TCK.java
new file mode 100644
index 00000000000..752a9a26bb9
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiAtomPub10TCK.java
@@ -0,0 +1,175 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assume.assumeFalse;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.opencmis.OpenCMISClientContext;
+import org.alfresco.opencmis.tck.tests.query.QueryForObjectCustom;
+import org.alfresco.opencmis.tck.tests.query.QueryInFolderTestCustom;
+import org.alfresco.opencmis.tck.tests.query.QueryLikeTestCustom;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.alfresco.util.testing.category.RedundantTests;
+import org.apache.chemistry.opencmis.commons.enums.BindingType;
+import org.apache.chemistry.opencmis.tck.impl.AbstractSessionTestGroup;
+import org.apache.chemistry.opencmis.tck.impl.JUnitHelper;
+import org.apache.chemistry.opencmis.tck.impl.TestParameters;
+import org.apache.chemistry.opencmis.tck.tests.basics.BasicsTestGroup;
+import org.apache.chemistry.opencmis.tck.tests.control.ControlTestGroup;
+import org.apache.chemistry.opencmis.tck.tests.crud.CRUDTestGroup;
+import org.apache.chemistry.opencmis.tck.tests.filing.FilingTestGroup;
+import org.apache.chemistry.opencmis.tck.tests.query.ContentChangesSmokeTest;
+import org.apache.chemistry.opencmis.tck.tests.query.QuerySmokeTest;
+import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningTestGroup;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+/**
+ * OpenCMIS TCK unit tests.
+ * 
+ * @author steveglover
+ *
+ */
+public class TestPublicApiAtomPub10TCK extends AbstractEnterpriseOpenCMIS10TCKTest
+{
+	private static final String CMIS_URL = "http://{0}:{1}/{2}/api/{3}/{4}/cmis/versions/1.0/atom";
+	protected static final Log logger = LogFactory.getLog(TestPublicApiAtomPub10TCK.class);
+
+	@Before
+	public void before() throws Exception
+	{
+        // see REPO-1524
+        // the tests are always run on PostgreSQL only
+//        Dialect dialect = (Dialect) applicationContext.getBean("dialect");
+//        assumeFalse(dialect instanceof Oracle9Dialect);
+
+		int port = getTestFixture().getJettyComponent().getPort();
+		TestNetwork network = getTestFixture().getRandomNetwork();
+    	Map<String, String> cmisParameters = new HashMap<String, String>();
+    	cmisParameters.put(TestParameters.DEFAULT_RELATIONSHIP_TYPE, "R:cm:replaces");
+    	clientContext = new OpenCMISClientContext(BindingType.ATOMPUB,
+    			MessageFormat.format(CMIS_URL, "localhost", String.valueOf(port), "alfresco", network.getId(), "public"),
+    			"admin@" + network.getId(), "admin", cmisParameters, getTestFixture().getJettyComponent().getApplicationContext());
+        overrideVersionableAspectProperties(getTestFixture().getJettyComponent().getApplicationContext());
+	}
+
+	@AfterClass
+	public static void shutdown() throws Exception
+	{
+	}
+	
+    @Test
+    public void testCMISTCKBasics() throws Exception
+    {
+        BasicsTestGroup basicsTestGroup = new BasicsTestGroup();
+        JUnitHelper.run(basicsTestGroup);
+    }
+    
+    @Test
+    public void testCMISTCKCRUD() throws Exception
+    {
+        CRUDTestGroup crudTestGroup = new CRUDTestGroup();
+        JUnitHelper.run(crudTestGroup);
+    }
+
+    @Test
+    public void testCMISTCKVersioning() throws Exception
+    {
+        VersioningTestGroup versioningTestGroup = new VersioningTestGroup();
+        JUnitHelper.run(versioningTestGroup);
+    }
+    
+    @Test
+    public void testCMISTCKFiling() throws Exception
+    {
+        FilingTestGroup filingTestGroup = new FilingTestGroup();
+        JUnitHelper.run(filingTestGroup);
+    }
+    
+    @Test
+    public void testCMISTCKControl() throws Exception
+    {
+        ControlTestGroup controlTestGroup = new ControlTestGroup();
+        JUnitHelper.run(controlTestGroup);
+    }
+
+    @Test
+    @Category({LuceneTests.class, RedundantTests.class})
+    public void testCMISTCKQuery() throws Exception
+    {
+        OverrideQueryTestGroup queryTestGroup = new OverrideQueryTestGroup();
+        JUnitHelper.run(queryTestGroup);
+    }
+    
+//    private class OverrideVersioningTestGroup extends AbstractSessionTestGroup
+//    {
+//        @Override
+//        public void init(Map<String, String> parameters) throws Exception
+//        {
+//            super.init(parameters);
+//
+//            setName("Versioning Test Group");
+//            setDescription("Versioning tests.");
+//
+//            addTest(new VersioningSmokeTest());
+//            addTest(new VersionDeleteTest());
+//            addTest(new VersioningStateCreateTest());
+//            // relies on Solr being available
+//            addTest(new CheckedOutTest());
+//        }
+//    }
+
+    private class OverrideQueryTestGroup extends AbstractSessionTestGroup
+    {
+        @Override
+        public void init(Map<String, String> parameters) throws Exception
+        {
+            super.init(parameters);
+
+            setName("Query Test Group");
+            setDescription("Query and content changes tests.");
+
+            // this is failing because of an MT issue (the thread is a specific tenant but the DB metadata query is searching
+            // against the workspace://SpacesStore)
+            addTest(new QuerySmokeTest());
+            // The test fails on Lucene see MNT-11223
+//            addTest(new QueryRootFolderTest());
+            addTest(new QueryForObjectCustom());
+            addTest(new QueryLikeTestCustom());
+            addTest(new QueryInFolderTestCustom());
+            addTest(new ContentChangesSmokeTest());
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiAtomPub11TCK.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiAtomPub11TCK.java
new file mode 100644
index 00000000000..f6b16b63664
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiAtomPub11TCK.java
@@ -0,0 +1,78 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assume.assumeFalse;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.opencmis.OpenCMISClientContext;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.apache.chemistry.opencmis.commons.enums.BindingType;
+import org.apache.chemistry.opencmis.tck.impl.TestParameters;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.AfterClass;
+import org.junit.Before;
+
+/**
+ * OpenCMIS TCK unit tests.
+ * 
+ * @author steveglover
+ *
+ */
+public class TestPublicApiAtomPub11TCK extends AbstractEnterpriseOpenCMIS11TCKTest
+{
+	private static final String CMIS_URL = "http://{0}:{1}/{2}/api/{3}/{4}/cmis/versions/1.1/atom";
+	protected static final Log logger = LogFactory.getLog(TestPublicApiAtomPub11TCK.class);
+
+	@Before
+	public void before() throws Exception
+	{
+        // see REPO-1524
+        // the tests are always run on PostgreSQL only
+//        Dialect dialect = (Dialect) applicationContext.getBean("dialect");
+//        assumeFalse(dialect instanceof Oracle9Dialect);
+
+		int port = getTestFixture().getJettyComponent().getPort();
+		TestNetwork network = getTestFixture().getRandomNetwork();
+    	Map<String, String> cmisParameters = new HashMap<String, String>();
+    	cmisParameters.put(TestParameters.DEFAULT_RELATIONSHIP_TYPE, "R:cm:replaces");
+        cmisParameters.put(TestParameters.DEFAULT_SECONDARY_TYPE, "P:cm:author");
+        cmisParameters.put(TestParameters.DEFAULT_ITEM_TYPE, "I:cm:cmobject");
+    	clientContext = new OpenCMISClientContext(BindingType.ATOMPUB,
+    			MessageFormat.format(CMIS_URL, "localhost", String.valueOf(port), "alfresco", network.getId(), "public"),
+    			"admin@" + network.getId(), "admin", cmisParameters, getTestFixture().getJettyComponent().getApplicationContext());
+        overrideVersionableAspectProperties(getTestFixture().getJettyComponent().getApplicationContext());
+	}
+
+	@AfterClass
+	public static void shutdown() throws Exception
+	{
+	}
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiBrowser11TCK.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiBrowser11TCK.java
new file mode 100644
index 00000000000..1025aa7a9f1
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiBrowser11TCK.java
@@ -0,0 +1,72 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assume.assumeFalse;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.opencmis.OpenCMISClientContext;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.apache.chemistry.opencmis.commons.enums.BindingType;
+import org.apache.chemistry.opencmis.tck.impl.TestParameters;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+
+/**
+ * OpenCMIS TCK unit tests.
+ * 
+ * @author steveglover
+ *
+ */
+public class TestPublicApiBrowser11TCK extends AbstractEnterpriseOpenCMIS11TCKTest
+{
+	private static final String CMIS_URL = "http://{0}:{1}/{2}/api/{3}/{4}/cmis/versions/1.1/browser";
+	protected static final Log logger = LogFactory.getLog(TestPublicApiBrowser11TCK.class);
+
+	@Before
+	public void before() throws Exception
+	{
+        // see REPO-1524
+        // the tests are always run on PostgreSQL only
+//        Dialect dialect = (Dialect) applicationContext.getBean("dialect");
+//        assumeFalse(dialect instanceof Oracle9Dialect);
+
+		int port = getTestFixture().getJettyComponent().getPort();
+		TestNetwork network = getTestFixture().getRandomNetwork();
+    	Map<String, String> cmisParameters = new HashMap<String, String>();
+    	cmisParameters.put(TestParameters.DEFAULT_RELATIONSHIP_TYPE, "R:cm:replaces");
+        cmisParameters.put(TestParameters.DEFAULT_SECONDARY_TYPE, "P:cm:author");
+        cmisParameters.put(TestParameters.DEFAULT_ITEM_TYPE, "I:cm:cmobject");
+    	clientContext = new OpenCMISClientContext(BindingType.BROWSER,
+    			MessageFormat.format(CMIS_URL, "localhost", String.valueOf(port), "alfresco", network.getId(), "public"),
+    			"admin@" + network.getId(), "admin", cmisParameters, getTestFixture().getJettyComponent().getApplicationContext());
+        overrideVersionableAspectProperties(getTestFixture().getJettyComponent().getApplicationContext());
+	}
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiCaching.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiCaching.java
new file mode 100644
index 00000000000..3036c368362
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestPublicApiCaching.java
@@ -0,0 +1,85 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.junit.Test;
+
+/**
+ * HTTP cache header public api tests.
+ * 
+ * @author Gavin Cornwell
+ *
+ */
+public class TestPublicApiCaching extends EnterpriseTestApi
+{
+    @Test
+    public void testMNT13938() throws Exception
+    {
+        Iterator<TestNetwork> accountsIt = getTestFixture().getNetworksIt();
+        final TestNetwork account1 = accountsIt.next();
+        Iterator<String> personIt1 = account1.getPersonIds().iterator();
+        final String person1 = personIt1.next();
+
+        // make a request to any API (we'll get our own profile)
+        {
+            publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1));
+            HttpResponse response = publicApiClient.get("public", "people", person1, null, null, null);
+            
+            int responseCode = response.getStatusCode();
+            // make sure request was successful
+            assertTrue("Response code should be 200", responseCode == HttpServletResponse.SC_OK);
+            
+            Map<String, String> headers = response.getHeaders();
+            // assert headers are present
+            assertNotNull("HTTP headers should be present on response", headers);
+            
+            // assert the cache headers are present
+            String cacheControlHeader = headers.get("Cache-Control");
+            assertNotNull("Cache-Control header should be present", cacheControlHeader);
+            assertTrue("Cache-Control header should be set to no-cache but it was: " + cacheControlHeader, 
+                        cacheControlHeader.equals("no-cache"));
+            
+            String pragmaHeader = headers.get("Pragma");
+            assertNotNull("Pragma header should be present", pragmaHeader);
+            assertTrue("Pragma header should be set to no-cache but it was: " + pragmaHeader, 
+                        pragmaHeader.equals("no-cache"));
+            
+            String expiresHeader = headers.get("Expires");
+            assertNotNull("Expires header should be present", expiresHeader);
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestRemovePermissions.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestRemovePermissions.java
new file mode 100644
index 00000000000..c00188e7fc7
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestRemovePermissions.java
@@ -0,0 +1,423 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.chemistry.opencmis.client.api.Folder;
+import org.apache.chemistry.opencmis.client.api.Session;
+import org.apache.chemistry.opencmis.client.api.SessionFactory;
+import org.apache.chemistry.opencmis.client.runtime.SessionFactoryImpl;
+import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.SessionParameter;
+import org.apache.chemistry.opencmis.commons.data.Ace;
+import org.apache.chemistry.opencmis.commons.data.Acl;
+import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
+import org.apache.chemistry.opencmis.commons.enums.BindingType;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
+
+public class TestRemovePermissions extends EnterpriseTestApi
+{
+    private static Log logger = LogFactory.getLog(TestRemovePermissions.class);
+
+    static public final String ADMIN_USER = "admin";
+    static public final String ADMIN_PASSWORD = "admin";
+    static public final String DEFAULT_HOSTNAME = "localhost";
+
+    static public final String ATOMPUB_URL_OC = "http://{0}:{1}/alfresco/cmisatom";
+    static public final String ATOMPUB_URL_11 = "http://{0}:{1}/alfresco/api/-default-/public/cmis/versions/1.1/atom";
+
+    static public final String REPOSITORYSERVICE_URL = "http://{0}:{1}/alfresco/cmis/RepositoryService?wsdl";
+    static public final String NAVIGATIONSERVICE_URL = "http://{0}:{1}/alfresco/cmis/NavigationService?wsdl";
+    static public final String OBJECTSERVICE_URL = "http://{0}:{1}/alfresco/cmis/ObjectService?wsdl";
+    static public final String VERSIONINGSERVICE_URL = "http://{0}:{1}/alfresco/cmis/VersioningService?wsdl";
+    static public final String DISCOVERYSERVICE_URL = "http://{0}:{1}/alfresco/cmis/DiscoveryService?wsdl";
+    static public final String MULTIFILINGSERVICE_URL = "http://{0}:{1}/alfresco/cmis/MultiFilingService?wsdl";
+    static public final String RELATIONSHIPSERVICE_URL = "http://{0}:{1}/alfresco/cmis/RelationshipService?wsdl";
+    static public final String ACLSERVICE_URL = "http://{0}:{1}/alfresco/cmis/ACLService?wsdl";
+    static public final String POLICYSERVICE_URL = "http://{0}:{1}/alfresco/cmis/PolicyService?wsdl";
+
+    static public final String REPOSITORYSERVICE_OC_URL = "http://{0}:{1}/alfresco/cmisws/cmis?wsdl";
+    static public final String NAVIGATIONSERVICE_OC_URL = "http://{0}:{1}/alfresco/cmisws/NavigationService?wsdl";
+    static public final String OBJECTSERVICE_OC_URL = "http://{0}:{1}/alfresco/cmisws/ObjectService?wsdl";
+    static public final String VERSIONINGSERVICE_OC_URL = "http://{0}:{1}/alfresco/cmisws/VersioningService?wsdl";
+    static public final String DISCOVERYSERVICE_OC_URL = "http://{0}:{1}/alfresco/cmisws/DiscoveryService?wsdl";
+    static public final String MULTIFILINGSERVICE_OC_URL = "http://{0}:{1}/alfresco/cmisws/MultiFilingService?wsdl";
+    static public final String RELATIONSHIPSERVICE_OC_URL = "http://{0}:{1}/alfresco/cmisws/RelationshipService?wsdl";
+    static public final String ACLSERVICE_OC_URL = "http://{0}:{1}//alfresco/cmisws/ACLService?wsdl";
+    static public final String POLICYSERVICE_OC_URL = "http://{0}:{1}/alfresco/cmisws/PolicyService?wsdl";
+
+    static public final String BROWSE_URL_11 = "http://{0}:{1}/alfresco/api/-default-/public/cmis/versions/1.1/browser";
+
+    protected Session getATOMPUB_10_Session()
+    {
+        try
+        {
+            Map<String, String> parameters = new HashMap<String, String>();
+            int port = getTestFixture().getJettyComponent().getPort();
+
+            parameters.put(SessionParameter.USER, ADMIN_USER);
+            parameters.put(SessionParameter.PASSWORD, ADMIN_PASSWORD);
+            parameters.put(SessionParameter.ATOMPUB_URL, MessageFormat.format(ATOMPUB_URL_OC, DEFAULT_HOSTNAME, String.valueOf(port)));
+            parameters.put(SessionParameter.BINDING_TYPE, BindingType.ATOMPUB.value());
+
+            SessionFactory sessionFactory = SessionFactoryImpl.newInstance();
+
+            parameters.put(SessionParameter.REPOSITORY_ID, sessionFactory.getRepositories(parameters).get(0).getId());
+            return sessionFactory.createSession(parameters);
+        }
+        catch (Exception ex)
+        {
+            logger.error(ex);
+        }
+        return null;
+    }
+
+    protected Session getATOMPUB_11_Session()
+    {
+        try
+        {
+            Map<String, String> parameters = new HashMap<String, String>();
+            int port = getTestFixture().getJettyComponent().getPort();
+
+            parameters.put(SessionParameter.USER, ADMIN_USER);
+            parameters.put(SessionParameter.PASSWORD, ADMIN_PASSWORD);
+            parameters.put(SessionParameter.ATOMPUB_URL, MessageFormat.format(ATOMPUB_URL_11, DEFAULT_HOSTNAME, String.valueOf(port)));
+            parameters.put(SessionParameter.BINDING_TYPE, BindingType.ATOMPUB.value());
+
+            SessionFactory sessionFactory = SessionFactoryImpl.newInstance();
+
+            parameters.put(SessionParameter.REPOSITORY_ID, sessionFactory.getRepositories(parameters).get(0).getId());
+            return sessionFactory.createSession(parameters);
+        }
+        catch (Exception ex)
+        {
+            logger.error(ex);
+
+        }
+        return null;
+    }
+
+    protected Session getBROWSER_11_Session()
+    {
+        try
+        {
+            Map<String, String> parameter = new HashMap<String, String>();
+            int port = getTestFixture().getJettyComponent().getPort();
+
+            parameter.put(SessionParameter.BINDING_TYPE, BindingType.BROWSER.value());
+            parameter.put(SessionParameter.BROWSER_URL, MessageFormat.format(BROWSE_URL_11, DEFAULT_HOSTNAME, String.valueOf(port)));
+            parameter.put(SessionParameter.COOKIES, "true");
+
+            parameter.put(SessionParameter.USER, ADMIN_USER);
+            parameter.put(SessionParameter.PASSWORD, ADMIN_PASSWORD);
+
+            SessionFactory sessionFactory = SessionFactoryImpl.newInstance();
+
+            parameter.put(SessionParameter.REPOSITORY_ID, sessionFactory.getRepositories(parameter).get(0).getId());
+            return sessionFactory.createSession(parameter);
+        }
+        catch (Exception ex)
+        {
+            logger.error(ex);
+
+        }
+        return null;
+    }
+
+    protected Session getWEBSERVICE_10_Session()
+    {
+        try
+        {
+            SessionFactory sessionFactory = SessionFactoryImpl.newInstance();
+            int port = 8080;
+
+            Map<String, String> parameters = new HashMap<String, String>();
+
+            parameters.put(SessionParameter.USER, ADMIN_USER);
+            parameters.put(SessionParameter.PASSWORD, ADMIN_PASSWORD);
+            parameters.put(SessionParameter.BINDING_TYPE, BindingType.WEBSERVICES.value());
+
+            parameters.put(SessionParameter.WEBSERVICES_ACL_SERVICE,
+                    MessageFormat.format(ACLSERVICE_OC_URL, DEFAULT_HOSTNAME, String.valueOf(port)));
+            parameters.put(SessionParameter.WEBSERVICES_DISCOVERY_SERVICE,
+                    MessageFormat.format(DISCOVERYSERVICE_OC_URL, DEFAULT_HOSTNAME, String.valueOf(port)));
+            parameters.put(SessionParameter.WEBSERVICES_MULTIFILING_SERVICE,
+                    MessageFormat.format(MULTIFILINGSERVICE_OC_URL, DEFAULT_HOSTNAME, String.valueOf(port)));
+            parameters.put(SessionParameter.WEBSERVICES_NAVIGATION_SERVICE,
+                    MessageFormat.format(NAVIGATIONSERVICE_OC_URL, DEFAULT_HOSTNAME, String.valueOf(port)));
+            parameters.put(SessionParameter.WEBSERVICES_OBJECT_SERVICE,
+                    MessageFormat.format(OBJECTSERVICE_OC_URL, DEFAULT_HOSTNAME, String.valueOf(port)));
+            parameters.put(SessionParameter.WEBSERVICES_POLICY_SERVICE,
+                    MessageFormat.format(POLICYSERVICE_OC_URL, DEFAULT_HOSTNAME, String.valueOf(port)));
+            parameters.put(SessionParameter.WEBSERVICES_RELATIONSHIP_SERVICE,
+                    MessageFormat.format(RELATIONSHIPSERVICE_OC_URL, DEFAULT_HOSTNAME, String.valueOf(port)));
+            parameters.put(SessionParameter.WEBSERVICES_REPOSITORY_SERVICE,
+                    MessageFormat.format(REPOSITORYSERVICE_OC_URL, DEFAULT_HOSTNAME, String.valueOf(port)));
+            parameters.put(SessionParameter.WEBSERVICES_VERSIONING_SERVICE,
+                    MessageFormat.format(REPOSITORYSERVICE_OC_URL, DEFAULT_HOSTNAME, String.valueOf(port)));
+            parameters.put(SessionParameter.REPOSITORY_ID, sessionFactory.getRepositories(parameters).get(0).getId());
+
+            return sessionFactory.createSession(parameters);
+        }
+        catch (Exception ex)
+        {
+            logger.error(ex);
+        }
+        return null;
+    }
+
+    /**
+     * cmisws?wsdl is not available using jetty in automated test suite should
+     * be runned using an external alfresco server
+     * 
+     */
+    // @Test
+    public void testRemoveAllPermissions_WEBSERVICE_10()
+    {
+        Folder testFolder = null;
+        try
+        {
+            Session session = getWEBSERVICE_10_Session();
+            if (session == null)
+            {
+                fail("WEBSERVICE 1.0 session cannot be null");
+            }
+            testFolder = createFolder(session, "testRemoveAllPermissions_WEBSERVICE_10");
+            List<Ace> acl = create2TestACLs(session);
+
+            // adding new ACE
+            testFolder.addAcl(acl, AclPropagation.PROPAGATE);
+
+            Acl allacl = session.getAcl(session.createObjectId(testFolder.getId()), false);
+            int oldSize = allacl.getAces().size();
+
+            // Removing ALL ACEs
+            Acl newAcl = testFolder.removeAcl(allacl.getAces(), AclPropagation.PROPAGATE);
+
+            int newsize = newAcl.getAces().size();
+
+            System.out.println("Old ace size -->" + oldSize);
+            System.out.println("New ace size --> " + newsize);
+
+            assertTrue(newsize == oldSize - acl.size());
+        }
+        catch (Exception ex)
+        {
+            fail(ex.getMessage());
+        }
+        finally
+        {
+            if (testFolder != null)
+            {
+                testFolder.delete();
+            }
+        }
+    }
+
+    @Test
+    public void testRemoveAllPermissions_ATOMPUB_10()
+    {
+        Folder testFolder = null;
+        try
+        {
+            Session session = getATOMPUB_10_Session();
+            if (session == null)
+            {
+                fail("ATOMPUB 1.0 session cannot be null");
+            }
+            testFolder = createFolder(session, "testRemoveAllPermissions_ATOMPUB_10");
+            List<Ace> acl = create2TestACLs(session);
+
+            // adding new ACE
+            testFolder.addAcl(acl, AclPropagation.PROPAGATE);
+
+            Acl allacl = session.getAcl(session.createObjectId(testFolder.getId()), false);
+            int oldSize = allacl.getAces().size();
+
+            // Removing ALL ACEs
+            Acl newAcl = testFolder.removeAcl(allacl.getAces(), AclPropagation.PROPAGATE);
+
+            int newsize = newAcl.getAces().size();
+
+            System.out.println("Old ace size -->" + oldSize);
+            System.out.println("New ace size --> " + newsize);
+
+            assertTrue(newsize == oldSize - acl.size());
+        }
+        catch (Exception ex)
+        {
+            fail(ex.getMessage());
+        }
+        finally
+        {
+            if (testFolder != null)
+            {
+                testFolder.delete();
+            }
+        }
+    }
+
+    @Test
+    public void testRemoveAllPermissions_ATOMPUB_11()
+    {
+        Folder testFolder = null;
+        try
+        {
+            Session session = getATOMPUB_11_Session();
+            if (session == null)
+            {
+                fail("ATOMPUB 1.1 session cannot be null");
+            }
+            testFolder = createFolder(session, "testRemoveAllPermissions_ATOMPUB_11");
+            List<Ace> acl = create2TestACLs(session);
+
+            // adding new ACE
+            testFolder.addAcl(acl, AclPropagation.PROPAGATE);
+
+            Acl allacl = session.getAcl(session.createObjectId(testFolder.getId()), false);
+            int oldSize = allacl.getAces().size();
+
+            // Removing ALL ACEs
+            Acl newAcl = testFolder.removeAcl(allacl.getAces(), AclPropagation.PROPAGATE);
+
+            int newsize = newAcl.getAces().size();
+
+            System.out.println("Old ace size -->" + oldSize);
+            System.out.println("New ace size --> " + newsize);
+
+            assertTrue(newsize == oldSize - acl.size());
+        }
+        catch (Exception ex)
+        {
+            fail(ex.getMessage());
+        }
+        finally
+        {
+            if (testFolder != null)
+            {
+                testFolder.delete();
+            }
+        }
+
+    }
+
+    @Test
+    public void testRemoveAllPermissions_BROWSER_11()
+    {
+        Folder testFolder = null;
+        try
+        {
+            Session session = getBROWSER_11_Session();
+            if (session == null)
+            {
+                fail("ATOMPUB 1.1 session cannot be null");
+            }
+            testFolder = createFolder(session, "testRemoveAllPermissions_BROWSER_11");
+            List<Ace> acl = create2TestACLs(session);
+
+            // adding new ACE
+            testFolder.addAcl(acl, AclPropagation.PROPAGATE);
+
+            Acl allacl = session.getAcl(session.createObjectId(testFolder.getId()), false);
+            int oldSize = allacl.getAces().size();
+
+            // Removing ALL ACEs
+
+            Acl newAcl = testFolder.removeAcl(allacl.getAces(), AclPropagation.PROPAGATE);
+            int newsize = newAcl.getAces().size();
+
+            System.out.println("Old ace size -->" + oldSize);
+            System.out.println("New ace size --> " + newsize);
+
+            assertTrue(newsize == oldSize - acl.size());
+        }
+        catch (Exception ex)
+        {
+            fail(ex.getMessage());
+        }
+        finally
+        {
+            if (testFolder != null)
+            {
+                testFolder.delete();
+            }
+        }
+
+    }
+
+    /**
+     * 
+     * @param session Session
+     * @param name String
+     * @return Folder
+     */
+    private Folder createFolder(Session session, String name)
+    {
+        Folder testFolder;
+        Folder folder = session.getRootFolder();
+        Map<String, Object> properties = new HashMap<String, Object>();
+        properties.put(PropertyIds.OBJECT_TYPE_ID, "cmis:folder");
+        properties.put(PropertyIds.NAME, name);
+
+        testFolder = folder.createFolder(properties);
+
+        return testFolder;
+    }
+
+    /**
+     * 
+     * @param session Session
+     * @return List<Ace>
+     */
+    private List<Ace> create2TestACLs(Session session)
+    {
+        List<Ace> newACE = new ArrayList<Ace>();
+        LinkedList<String> permissions1 = new LinkedList<String>();
+        permissions1.add("{http://www.alfresco.org/model/system/1.0}base.ReadPermissions");
+
+        LinkedList<String> permissions2 = new LinkedList<String>();
+        permissions2.add("{http://www.alfresco.org/model/system/1.0}base.Unlock");
+
+        Ace ace1 = session.getObjectFactory().createAce("testUser1", permissions1);
+        Ace ace2 = session.getObjectFactory().createAce("testUser2", permissions2);
+        newACE.add(ace1);
+        newACE.add(ace2);
+        return newACE;
+
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteContainers.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteContainers.java
new file mode 100644
index 00000000000..57c24f7b5e9
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteContainers.java
@@ -0,0 +1,353 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Sites;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.SiteContainer;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.apache.commons.httpclient.HttpStatus;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestSiteContainers extends EnterpriseTestApi
+{
+	private TestNetwork network1;
+	private TestNetwork network2;
+
+	private List<TestPerson> people1 = new ArrayList<TestPerson>(2);
+	private List<TestPerson> people2 = new ArrayList<TestPerson>(2);
+	
+	private TestPerson person11; // site creator
+	private TestPerson person12; // same network, not invited to site
+	private TestPerson person13; // same network, invited to site
+	private TestPerson person21; // different network, not invited to site
+	
+	private TestSite site1;
+	
+	@Override
+	@Before
+	public void setup() throws Exception
+	{
+		// init networks
+		super.setup();
+		
+		Iterator<TestNetwork> networksIt = getTestFixture().getNetworksIt();
+
+		assertTrue(networksIt.hasNext());
+		this.network1 = networksIt.next();
+
+		assertTrue(networksIt.hasNext());
+		this.network2 = networksIt.next();
+
+		// Create some users in different networks
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				// add as external user
+				TestPerson person1 = network1.createUser();
+				people1.add(person1);
+				TestPerson person2 = network1.createUser();
+				people1.add(person2);
+				TestPerson person3 = network1.createUser();
+				people1.add(person3);
+
+				return null;
+			}
+		}, network1.getId());
+
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				TestPerson person1 = network2.createUser();
+				people2.add(person1);
+
+				return null;
+			}
+		}, network2.getId());
+
+		this.person11 = people1.get(0); // site creator
+		this.person12 = people1.get(1); // same network, not invited to site
+		this.person21 = people2.get(0); // different network, not invited to site
+		this.person13 = people1.get(2); // same network, invited to site
+		
+//		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+//		{
+//			@Override
+//			public Void doWork() throws Exception
+//			{
+//				// add as external user
+//				TestPerson person1 = network2.createUser();
+//				network2People.add(person1);
+//
+//				return null;
+//			}
+//		}, network2.getId());
+//		
+//		final TestPerson person3 = network2People.get(0);
+		
+		// Create a public site
+		this.site1 = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+		{
+			@Override
+			public TestSite doWork() throws Exception
+			{
+				TestSite testSite = network1.createSite(SiteVisibility.PUBLIC);
+				return testSite;
+			}
+		}, person11.getId(), network1.getId());
+
+		TenantUtil.runAsUserTenant(new TenantRunAsWork<Map<String, NodeRef>>()
+		{
+			@Override
+			public Map<String, NodeRef> doWork() throws Exception
+			{
+				Map<String, NodeRef> containers = new HashMap<String, NodeRef>();
+				containers.put("test1", site1.createContainer("test1"));
+				containers.put("test2", site1.createContainer("test2"));
+				containers.put("test3", site1.createContainer("test3"));
+				return containers;
+			}
+		}, person11.getId(), network1.getId());
+	}
+	
+	@Test
+	public void testSiteContainers() throws Exception
+	{
+		Sites sitesProxy = publicApiClient.sites();
+		
+		List<SiteContainer> expectedSiteContainers = network1.getSiteContainers(site1.getSiteId(), person11);
+
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+	
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedSiteContainers.size(), expectedSiteContainers.size());
+			ListResponse<SiteContainer> resp = sitesProxy.getSiteContainers(site1.getSiteId(), createParams(paging, null));
+			checkList(expectedSiteContainers.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+	
+			skipCount = 2;
+			maxItems = expectedSiteContainers.size();
+			paging = getPaging(skipCount, maxItems, expectedSiteContainers.size(), expectedSiteContainers.size());
+			resp = sitesProxy.getSiteContainers(site1.getSiteId(), createParams(paging, null));
+			checkList(expectedSiteContainers.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+	
+			skipCount = 2;
+			maxItems = expectedSiteContainers.size() + 2;
+			paging = getPaging(skipCount, maxItems, expectedSiteContainers.size(), expectedSiteContainers.size());
+			resp = sitesProxy.getSiteContainers(site1.getSiteId(), createParams(paging, null));
+			checkList(expectedSiteContainers.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+		}
+
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+			SiteContainer expectedSiteContainer = new SiteContainer(site1.getSiteId(), "test2", null);
+			SiteContainer sc = sitesProxy.getSingleSiteContainer(site1.getSiteId(), "test2");
+			check(expectedSiteContainer, sc);
+		}
+
+		// site does not exist
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+			sitesProxy.getSingleSiteContainer("gfyuosfgsf8y7s", "documentLibrary");
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+
+		// container does not exist
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+			sitesProxy.getSingleSiteContainer(site1.getSiteId(), "container1");
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+
+		// site containers - site does not exist
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11.getId()));
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedSiteContainers.size(), expectedSiteContainers.size());
+			sitesProxy.getSiteContainers(GUID.generate(), createParams(paging, null));
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+		
+		// a user in the same network, not invited to the site
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person12.getId()));
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedSiteContainers.size(), expectedSiteContainers.size());
+			ListResponse<SiteContainer> ret = sitesProxy.getSiteContainers(site1.getSiteId(), createParams(paging, null));
+			checkList(expectedSiteContainers.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), ret);
+		}
+
+		// a user in a different network
+		try
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person21.getId()));
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedSiteContainers.size(), expectedSiteContainers.size());
+			sitesProxy.getSiteContainers(site1.getSiteId(), createParams(paging, null));
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+		}
+
+		// TODO a user in the same network, invited to the site
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person12.getId()));
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedSiteContainers.size(), expectedSiteContainers.size());
+			ListResponse<SiteContainer> ret = sitesProxy.getSiteContainers(site1.getSiteId(), createParams(paging, null));
+			checkList(expectedSiteContainers.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), ret);
+		}
+
+		// person invited to site
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person13.getId()));
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedSiteContainers.size(), expectedSiteContainers.size());
+			ListResponse<SiteContainer> resp = sitesProxy.getSiteContainers(site1.getSiteId(), createParams(paging, null));
+			checkList(expectedSiteContainers.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+		}
+
+		// invalid methods
+		try
+		{
+			sitesProxy.create("sites", site1.getSiteId(), "containers", null, null, "Unable to POST to site containers");
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+
+		try
+		{
+			sitesProxy.create("sites", site1.getSiteId(), "containers", "documentLibrary", null, "Unable to POST to a site container");
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+
+		try
+		{
+			sitesProxy.update("sites", site1.getSiteId(), "containers", null, null, "Unable to PUT site containers");
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+
+		try
+		{
+			sitesProxy.update("sites", site1.getSiteId(), "containers", "documentLibrary", null, "Unable to PUT a site container");
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+		
+		try
+		{
+			sitesProxy.remove("sites", site1.getSiteId(), "containers", null, "Unable to DELETE site containers");
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+
+		try
+		{
+			sitesProxy.remove("sites", site1.getSiteId(), "containers", "documentLibrary", "Unable to DELETE a site container");
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+		
+		// 1481
+		// user in external network, list site containers
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteGroups.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteGroups.java
new file mode 100644
index 00000000000..7cf6cc23c33
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteGroups.java
@@ -0,0 +1,286 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Sites;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.data.SiteGroup;
+import org.alfresco.rest.api.tests.client.data.SiteMember;
+import org.alfresco.rest.api.tests.client.data.SiteRole;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.apache.commons.httpclient.HttpStatus;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+public class TestSiteGroups extends AbstractBaseApiTest
+{
+    protected AuthorityService authorityService;
+    private String groupName = null;
+    private PublicApiClient.Paging paging = getPaging(0, 10);
+    private PublicApiClient.ListResponse<SiteMember> siteMembers = null;
+
+    @Before
+    public void setup() throws Exception
+    {
+        super.setup();
+        authorityService = (AuthorityService) applicationContext.getBean("AuthorityService");
+    }
+
+    @Test
+    public void shouldCrudSiteGroups() throws Exception
+    {
+        Sites sitesProxy = publicApiClient.sites();
+        try
+        {
+            groupName = createAuthorityContext(user1);
+            setRequestContext(networkOne.getId(), DEFAULT_ADMIN, DEFAULT_ADMIN_PWD);
+
+            TestSite site = TenantUtil.runAsUserTenant(() -> networkOne.createSite(SiteVisibility.PRIVATE), DEFAULT_ADMIN, networkOne.getId());
+
+
+            SiteGroup response = sitesProxy.addGroup(site.getSiteId(), new SiteGroup(groupName, SiteRole.SiteCollaborator.name()));
+            assertEquals(response.getGroup().getId(), groupName);
+            assertEquals(response.getRole(), SiteRole.SiteCollaborator.name());
+
+            response = sitesProxy.getGroup(site.getSiteId(), groupName);
+            assertEquals(response.getGroup().getId(), groupName);
+            assertEquals(response.getRole(), SiteRole.SiteCollaborator.name());
+
+            siteMembers = sitesProxy.getSiteMembers(site.getSiteId(), createParams(paging, null));
+            assertEquals(siteMembers.getList().size(), 3);
+
+            Map<String, String> params = new HashMap<>(1);
+            params.put("where", "(isMemberOfGroup=false)");
+            siteMembers = sitesProxy.getSiteMembers(site.getSiteId(), createParams(paging, params));
+            assertFalse(siteMembers.getList().get(0).isMemberOfGroup());
+            assertEquals(siteMembers.getList().size(), 1);
+
+            params = new HashMap<>(1);
+            params.put("where", "(isMemberOfGroup=true)");
+            siteMembers = sitesProxy.getSiteMembers(site.getSiteId(), createParams(paging, params));
+            assertEquals(siteMembers.getList().size(), 3);
+
+            PublicApiClient.ListResponse<SiteGroup> groups = sitesProxy.getGroups(site.getSiteId(), createParams(paging, null));
+            assertEquals(groups.getList().size(), 1);
+            assertEquals(groups.getList().get(0).getRole(), SiteRole.SiteCollaborator.name());
+
+            response = sitesProxy.updateGroup(site.getSiteId(), new SiteGroup(groupName, SiteRole.SiteContributor.name()));
+            groups = sitesProxy.getGroups(site.getSiteId(), createParams(paging, null));
+            assertEquals(groups.getList().size(), 1);
+            assertEquals(groups.getList().get(0).getRole(), SiteRole.SiteContributor.name());
+
+            sitesProxy.deleteGroup(site.getSiteId(), response.getId());
+            groups = sitesProxy.getGroups(site.getSiteId(), createParams(paging, null));
+            assertEquals(groups.getList().size(), 0);
+
+            siteMembers = sitesProxy.getSiteMembers(site.getSiteId(), createParams(paging, null));
+            assertEquals(siteMembers.getList().size(), 1);
+        }
+        finally
+        {
+            clearAuthorityContext(groupName);
+        }
+    }
+
+    @Test
+    public void shouldAddGroup()  throws Exception
+    {
+        Sites sitesProxy = publicApiClient.sites();
+        try
+        {
+            groupName = createAuthorityContext(user1);
+            setRequestContext(networkOne.getId(), DEFAULT_ADMIN, DEFAULT_ADMIN_PWD);
+
+            TestSite site = TenantUtil.runAsUserTenant(() -> networkOne.createSite(SiteVisibility.PRIVATE), DEFAULT_ADMIN, networkOne.getId());
+
+            // Should throw 404 error
+            try
+            {
+                sitesProxy.addGroup(site.getSiteId(), new SiteGroup(GUID.generate(), SiteRole.SiteCollaborator.name()));
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            }
+
+            SiteGroup response = sitesProxy.addGroup(site.getSiteId(), new SiteGroup(groupName, SiteRole.SiteCollaborator.name()));
+            assertEquals(response.getGroup().getId(), groupName);
+            assertEquals(response.getRole(), SiteRole.SiteCollaborator.name());
+
+            // Should throw 409 error
+            try
+            {
+                sitesProxy.addGroup(site.getSiteId(), new SiteGroup(groupName, SiteRole.SiteCollaborator.name()));
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
+            }
+
+            siteMembers = sitesProxy.getSiteMembers(site.getSiteId(), createParams(paging, null));
+            assertEquals(siteMembers.getList().size(), 3);
+
+            PublicApiClient.ListResponse<SiteGroup> groups = sitesProxy.getGroups(site.getSiteId(), createParams(paging, null));
+            assertEquals(groups.getList().size(), 1);
+            assertEquals(groups.getList().get(0).getRole(), SiteRole.SiteCollaborator.name());
+
+        }
+        finally
+        {
+            clearAuthorityContext(groupName);
+        }
+    }
+
+    @Test
+    public void shouldUpdateGroup() throws Exception
+    {
+        Sites sitesProxy = publicApiClient.sites();
+        try
+        {
+            groupName = createAuthorityContext(user1);
+            setRequestContext(networkOne.getId(), DEFAULT_ADMIN, DEFAULT_ADMIN_PWD);
+
+            TestSite site = TenantUtil.runAsUserTenant(() -> networkOne.createSite(SiteVisibility.PRIVATE), DEFAULT_ADMIN, networkOne.getId());
+
+            // Should throw 400 error
+            try
+            {
+                sitesProxy.updateGroup(site.getSiteId(), new SiteGroup(GUID.generate(), SiteRole.SiteCollaborator.name()));
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+
+            SiteGroup response = sitesProxy.addGroup(site.getSiteId(), new SiteGroup(groupName, SiteRole.SiteCollaborator.name()));
+            assertEquals(response.getGroup().getId(), groupName);
+            assertEquals(response.getRole(), SiteRole.SiteCollaborator.name());
+
+            response = sitesProxy.updateGroup(site.getSiteId(), new SiteGroup(groupName, SiteRole.SiteContributor.name()));
+            assertEquals(response.getGroup().getId(), groupName);
+            assertEquals(response.getRole(), SiteRole.SiteContributor.name());
+
+            siteMembers = sitesProxy.getSiteMembers(site.getSiteId(), createParams(paging, null));
+            assertEquals(siteMembers.getList().size(), 3);
+            assertEquals(siteMembers.getList().get(1).getRole(), SiteRole.SiteContributor.name());
+            assertEquals(siteMembers.getList().get(2).getRole(), SiteRole.SiteContributor.name());
+
+        }
+        finally
+        {
+            clearAuthorityContext(groupName);
+        }
+    }
+
+    @Test
+    public void shouldDeleteGroup() throws Exception
+    {
+        Sites sitesProxy = publicApiClient.sites();
+        try
+        {
+            groupName = createAuthorityContext(user1);
+            setRequestContext(networkOne.getId(), DEFAULT_ADMIN, DEFAULT_ADMIN_PWD);
+
+            TestSite site = TenantUtil.runAsUserTenant(() -> networkOne.createSite(SiteVisibility.PRIVATE), DEFAULT_ADMIN, networkOne.getId());
+
+            // Should throw 400 error
+            try
+            {
+                sitesProxy.updateGroup(site.getSiteId(), new SiteGroup(GUID.generate(), SiteRole.SiteCollaborator.name()));
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+
+            SiteGroup response = sitesProxy.addGroup(site.getSiteId(), new SiteGroup(groupName, SiteRole.SiteCollaborator.name()));
+            assertEquals(response.getGroup().getId(), groupName);
+            assertEquals(response.getRole(), SiteRole.SiteCollaborator.name());
+
+            siteMembers = sitesProxy.getSiteMembers(site.getSiteId(), createParams(paging, null));
+            assertEquals(siteMembers.getList().size(), 3);
+
+            sitesProxy.deleteGroup(site.getSiteId(), response.getId());
+
+            siteMembers = sitesProxy.getSiteMembers(site.getSiteId(), createParams(paging, null));
+            assertEquals(siteMembers.getList().size(), 1);
+        }
+        finally
+        {
+            clearAuthorityContext(groupName);
+        }
+    }
+
+    private String createAuthorityContext(String userName) throws PublicApiException
+    {
+        String groupName = "Test_GroupA" + GUID.generate();
+        AuthenticationUtil.setRunAsUser(userName);
+
+        groupName = authorityService.getName(AuthorityType.GROUP, groupName);
+
+        if (!authorityService.authorityExists(groupName))
+        {
+            AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+
+            groupName = authorityService.createAuthority(AuthorityType.GROUP, groupName);
+            authorityService.setAuthorityDisplayName(groupName, "Test Group A");
+        }
+
+
+        authorityService.addAuthority(groupName, user1);
+        authorityService.addAuthority(groupName, user2);
+
+        return groupName;
+    }
+
+    private void clearAuthorityContext(String groupName)
+    {
+        if (groupName != null && authorityService.authorityExists(groupName))
+        {
+            AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();
+            authorityService.deleteAuthority(groupName, true);
+        }
+    }
+
+    @Override
+    public String getScope()
+    {
+        return "public";
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteMembers.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteMembers.java
new file mode 100644
index 00000000000..33b0cedbe80
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteMembers.java
@@ -0,0 +1,669 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Sites;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Person;
+import org.alfresco.rest.api.tests.client.data.Site;
+import org.alfresco.rest.api.tests.client.data.SiteImpl;
+import org.alfresco.rest.api.tests.client.data.SiteMember;
+import org.alfresco.rest.api.tests.client.data.SiteRole;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.apache.commons.httpclient.HttpStatus;
+import org.json.simple.JSONObject;
+import org.junit.Test;
+
+public class TestSiteMembers extends EnterpriseTestApi
+{
+	// TODO set create member for a user who is a member of the site (not the creator)
+	// TODO split into more manageable test methods
+	@Test
+	public void testSiteMembers() throws Exception
+	{
+		Iterator<TestNetwork> networksIt = getTestFixture().getNetworksIt();
+		final TestNetwork testNetwork = networksIt.next();
+		final List<String> networkPeople = testNetwork.getPersonIds();
+		String personId = networkPeople.get(0);
+
+    	Sites sitesProxy = publicApiClient.sites();
+
+    	{
+    		final List<SiteMember> expectedSiteMembers = new ArrayList<SiteMember>();
+
+    		// Create a private site and invite some users
+    		// TODO create site members using public api rather than directly using the services
+    		TestSite testSite = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+    		{
+    			@Override
+    			public TestSite doWork() throws Exception
+    			{
+    				TestSite testSite = testNetwork.createSite(SiteVisibility.PRIVATE);
+    				for(int i = 1; i <= 5; i++)
+    				{
+    					String inviteeId = networkPeople.get(i);
+    					testSite.inviteToSite(inviteeId, SiteRole.SiteConsumer);
+    					SiteMember sm = new SiteMember(inviteeId, repoService.getPerson(inviteeId), testSite.getSiteId(), SiteRole.SiteConsumer.toString());
+    					expectedSiteMembers.add(sm);
+    				}
+
+    				return testSite;
+    			}
+    		}, personId, testNetwork.getId());
+    		
+    		{
+    			SiteMember sm = new SiteMember(personId, repoService.getPerson(personId), testSite.getSiteId(), SiteRole.SiteManager.toString());
+    			expectedSiteMembers.add(sm);
+    			Collections.sort(expectedSiteMembers);
+    		}
+    		
+	    	// Test Case cloud-1482
+	    	{
+		    	int skipCount = 0;
+				int maxItems = 2;
+				Paging paging = getPaging(skipCount, maxItems, expectedSiteMembers.size(), 6);
+				publicApiClient.setRequestContext(new RequestContext(testNetwork.getId(), personId));
+				ListResponse<SiteMember> siteMembers = sitesProxy.getSiteMembers(testSite.getSiteId(), createParams(paging, null));
+				checkList(expectedSiteMembers.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), siteMembers);
+	    	}
+	
+	    	{
+				int skipCount = 2;
+				int maxItems = 10;
+				Paging paging = getPaging(skipCount, maxItems, expectedSiteMembers.size(), 6);
+				publicApiClient.setRequestContext(new RequestContext(testNetwork.getId(), personId));
+				ListResponse<SiteMember> siteMembers = sitesProxy.getSiteMembers(testSite.getSiteId(), createParams(paging, null));
+				checkList(expectedSiteMembers.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), siteMembers);
+
+				HttpResponse response = sitesProxy.getAll("sites", testSite.getSiteId(), "members", null, createParams(paging,Collections.singletonMap("includeSource", "true")), "Failed to get all site members");
+				checkList(expectedSiteMembers.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), SiteMember.parseSiteMembers(testSite.getSiteId(), response.getJsonResponse()));
+				JSONObject source = sitesProxy.parseListSource(response.getJsonResponse());
+				Site sourceSite = SiteImpl.parseSite(source);
+				assertNotNull(sourceSite);
+				testSite.expected(sourceSite);
+	    	}
+	    	
+	    	// invalid site id
+	    	try
+	    	{
+				int skipCount = 2;
+				int maxItems = 10;
+				Paging paging = getPaging(skipCount, maxItems, expectedSiteMembers.size(), 6);
+				publicApiClient.setRequestContext(new RequestContext(testNetwork.getId(), personId));
+				sitesProxy.getSiteMembers(GUID.generate(), createParams(paging, null));
+				fail();
+	    	}
+	    	catch(PublicApiException e)
+	    	{
+	    		assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+	    	}
+	
+	    	// invalid methods
+			try
+			{
+	    		SiteMember siteMember = expectedSiteMembers.get(0);
+	
+				publicApiClient.setRequestContext(new RequestContext(testNetwork.getId(), personId));
+				sitesProxy.update("sites", testSite.getSiteId(), "members", null, siteMember.toJSON().toString(), "Unable to PUT site members");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+	    	
+	    	// Test Case cloud-1965
+	    	try
+	    	{
+	    		SiteMember siteMember1 = expectedSiteMembers.get(0);
+				publicApiClient.setRequestContext(new RequestContext(testNetwork.getId(), personId));
+	    		sitesProxy.create("sites", testSite.getSiteId(), "members", siteMember1.getMemberId(), siteMember1.toJSON().toString(), "Unable to POST to a site member");
+				fail();
+	    	}
+	    	catch(PublicApiException e)
+	    	{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+	    	}
+	
+	    	try
+	    	{
+	    		SiteMember siteMember1 = expectedSiteMembers.get(0);
+				publicApiClient.setRequestContext(new RequestContext(testNetwork.getId(), personId));
+	    		sitesProxy.update("sites", testSite.getSiteId(), "members", null, siteMember1.toJSON().toString(), "Unable to PUT site members");
+				fail();
+	    	}
+	    	catch(PublicApiException e)
+	    	{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+	    	}
+	
+	    	try
+	    	{
+				publicApiClient.setRequestContext(new RequestContext(testNetwork.getId(), personId));
+	    		sitesProxy.remove("sites", testSite.getSiteId(), "members", null, "Unable to DELETE site members");
+				fail();
+	    	}
+	    	catch(PublicApiException e)
+	    	{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+	    	}
+	    	
+	    	// update site member
+	    	{
+	    		SiteMember siteMember1 = expectedSiteMembers.get(0);
+				publicApiClient.setRequestContext(new RequestContext(testNetwork.getId(), personId));
+	    		SiteMember ret = sitesProxy.updateSiteMember(testSite.getSiteId(), siteMember1);
+	    		assertEquals(siteMember1.getRole(), ret.getRole());
+	    		Person expectedSiteMember = repoService.getPerson(siteMember1.getMemberId());
+	    		expectedSiteMember.expected(ret.getMember());
+	    	}
+	
+	    	// GET single site member
+			{
+	    		SiteMember siteMember1 = expectedSiteMembers.get(0);
+				publicApiClient.setRequestContext(new RequestContext(testNetwork.getId(), personId));
+				SiteMember ret = sitesProxy.getSingleSiteMember(testSite.getSiteId(), siteMember1.getMemberId());
+				siteMember1.expected(ret);
+			}
+		}
+
+		// test: user is member of different tenant, but has site membership(s) in common with the http request user
+		{
+			Iterator<TestNetwork> accountsIt = getTestFixture().getNetworksIt();
+	
+			assertTrue(accountsIt.hasNext());
+			final TestNetwork network1 = accountsIt.next();
+			
+			assertTrue(accountsIt.hasNext());
+			final TestNetwork network2 = accountsIt.next();
+	
+			final List<TestPerson> people = new ArrayList<TestPerson>();
+	
+			// Create users
+			TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+			{
+				@Override
+				public Void doWork() throws Exception
+				{
+					TestPerson person = network1.createUser();
+					people.add(person);
+					person = network1.createUser();
+					people.add(person);
+					person = network1.createUser();
+					people.add(person);
+	
+					return null;
+				}
+			}, network1.getId());
+
+			final TestPerson person1 = people.get(0);
+			final TestPerson person2 = people.get(1);
+			final TestPerson person3 = people.get(2);
+	
+			TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+			{
+				@Override
+				public Void doWork() throws Exception
+				{
+					TestPerson person = network2.createUser();
+					people.add(person);
+	
+					return null;
+				}
+			}, network2.getId());
+			
+			final TestPerson person4 = people.get(3);
+			
+			// Create site
+			final TestSite site = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+			{
+				@Override
+				public TestSite doWork() throws Exception
+				{
+					TestSite site = network1.createSite(SiteVisibility.PUBLIC);
+					return site;
+				}
+			}, person2.getId(), network1.getId());
+	
+			// invalid role - 400
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+				sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(person1.getId(), "dodgyRole"));
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+			}
+	
+			// user in network but not site member, try to create site member
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(person3.getId(), SiteRole.SiteContributor.toString()));
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());
+			}
+	
+			// unknown invitee - 404
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+				sitesProxy.createSiteMember(site.getSiteId(), new SiteMember("dodgyUser", SiteRole.SiteContributor.toString()));
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+			
+			// unknown site - 404
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+				sitesProxy.createSiteMember("dodgySite", new SiteMember(person1.getId(), SiteRole.SiteContributor.toString()));
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+			
+			// inviter is not a member of the site
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(person1.getId(), SiteRole.SiteContributor.toString()));
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(e.getMessage(), HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());
+			}
+	
+			// inviter is not a member of the site nor a member of the tenant
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person4.getId()));
+				sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(person1.getId(), SiteRole.SiteContributor.toString()));
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode()); // TODO check that 404 is correct here - external user of network can't see public site??
+			}
+	
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+				SiteMember sm = new SiteMember(person1.getId(), SiteRole.SiteConsumer.toString());
+				SiteMember siteMember = sitesProxy.createSiteMember(site.getSiteId(), sm);
+				assertEquals(person1.getId(), siteMember.getMemberId());
+				assertEquals(SiteRole.SiteConsumer.toString(), siteMember.getRole());
+			}
+			
+			// already invited
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+				sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(person1.getId(), SiteRole.SiteContributor.toString()));
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_CONFLICT, e.getHttpResponse().getStatusCode());
+			}
+	
+			// inviter is consumer member of the site, should not be able to add site member
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(person4.getId(), SiteRole.SiteContributor.toString()));
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(e.getMessage(), HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+			
+			// invitee from another network
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(person4.getId(), SiteRole.SiteContributor.toString()));
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(e.getMessage(), HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+            
+			// missing person id
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+				sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(null, SiteRole.SiteContributor.toString()));
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+			}
+
+			// missing role
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+				sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(person1.getId(), null));
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+			}
+	
+			// check site membership in GET
+			List<SiteMember> expectedSiteMembers = site.getMembers();
+	
+			{
+		    	int skipCount = 0;
+				int maxItems = Integer.MAX_VALUE;
+				Paging paging = getPaging(skipCount, maxItems, expectedSiteMembers.size(), 2);
+				ListResponse<SiteMember> siteMembers = sitesProxy.getSiteMembers(site.getSiteId(), createParams(paging, null));
+				checkList(expectedSiteMembers.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), siteMembers);
+			}
+		}
+
+		// test: create site membership, remove it, get list of site memberships
+		{
+			Iterator<TestNetwork> accountsIt = getTestFixture().getNetworksIt();
+	
+			assertTrue(accountsIt.hasNext());
+			final TestNetwork network1 = accountsIt.next();
+			
+			assertTrue(accountsIt.hasNext());
+	
+			final List<TestPerson> people = new ArrayList<TestPerson>();
+	
+			// Create user
+			TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+			{
+				@Override
+				public Void doWork() throws Exception
+				{
+					TestPerson person = network1.createUser();
+					people.add(person);
+					person = network1.createUser();
+					people.add(person);
+					person = network1.createUser();
+					people.add(person);
+					
+					return null;
+				}
+			}, network1.getId());
+			
+			TestPerson person1 = people.get(0);
+			TestPerson person2 = people.get(1);
+			TestPerson person3 = people.get(2);
+			
+			// Create site
+			TestSite site = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+			{
+				@Override
+				public TestSite doWork() throws Exception
+				{
+					TestSite site = network1.createSite(SiteVisibility.PRIVATE);
+					return site;
+				}
+			}, person2.getId(), network1.getId());
+			
+			// remove site membership
+	
+			// for -me- user (PUBLICAPI-90)
+			{
+				// create a site member
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+				SiteMember siteMember = sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(person1.getId(), SiteRole.SiteContributor.toString()));
+				assertEquals(person1.getId(), siteMember.getMemberId());
+				assertEquals(SiteRole.SiteContributor.toString(), siteMember.getRole());
+	
+				SiteMember toRemove = new SiteMember("-me-");
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				sitesProxy.removeSiteMember(site.getSiteId(), toRemove);
+			}
+			
+			{
+				// create a site member
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+				SiteMember siteMember = sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(person1.getId(), SiteRole.SiteContributor.toString()));
+				assertEquals(person1.getId(), siteMember.getMemberId());
+				assertEquals(SiteRole.SiteContributor.toString(), siteMember.getRole());
+				siteMember.setSiteId(site.getSiteId()); // note: needed for contains check below, ugh
+
+				// create another site member
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+				SiteMember siteMemberAno = sitesProxy.createSiteMember(site.getSiteId(), new SiteMember(person3.getId(), SiteRole.SiteCollaborator.toString()));
+				assertEquals(person3.getId(), siteMemberAno.getMemberId());
+				assertEquals(SiteRole.SiteCollaborator.toString(), siteMemberAno.getRole());
+				siteMemberAno.setSiteId(site.getSiteId()); // note: needed for contains check below, ugh
+	
+				// unknown site
+				try
+				{
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+					sitesProxy.removeSiteMember(GUID.generate(), siteMember);
+					fail();
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+				}
+		
+				// unknown user
+				try
+				{
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+					sitesProxy.removeSiteMember(site.getSiteId(), new SiteMember(GUID.generate()));
+					fail();
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+				}
+
+				// ACE-5444
+				// cannot update site member (without appropriate site "permission" - see SiteService)
+				try
+				{
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+					sitesProxy.updateSiteMember(site.getSiteId(), new SiteMember(person1.getId(), SiteRole.SiteCollaborator.toString()));
+					fail();
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_UNPROCESSABLE_ENTITY, e.getHttpResponse().getStatusCode());
+				}
+
+				// ACE-5444
+				// cannot remove another site member (without appropriate site "permission" - see SiteService)
+				try
+				{
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+					sitesProxy.removeSiteMember(site.getSiteId(), new SiteMember(person3.getId()));
+					fail();
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_UNPROCESSABLE_ENTITY, e.getHttpResponse().getStatusCode());
+				}
+
+
+				// remove site member
+				{
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+					sitesProxy.removeSiteMember(site.getSiteId(), siteMember);
+				}
+		
+				// check site membership in GET
+				List<SiteMember> expectedSiteMembers = site.getMembers();
+				assertFalse(expectedSiteMembers.contains(siteMember));
+				assertTrue(expectedSiteMembers.contains(siteMemberAno));
+		
+				{
+			    	int skipCount = 0;
+					int maxItems = Integer.MAX_VALUE;
+					Paging paging = getPaging(skipCount, maxItems, expectedSiteMembers.size(), 2);
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+					ListResponse<SiteMember> siteMembers = sitesProxy.getSiteMembers(site.getSiteId(), createParams(paging, null));
+					checkList(expectedSiteMembers.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), siteMembers);
+				}
+				
+				// update site membership
+		
+				// unknown site
+				try
+				{
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+					sitesProxy.updateSiteMember(GUID.generate(), siteMember);
+					fail();
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+				}
+		
+				// unknown user
+				try
+				{
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+					sitesProxy.updateSiteMember(site.getSiteId(), new SiteMember(GUID.generate()));
+					fail();
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+				}
+				
+				// invalid role
+				try
+				{
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+					sitesProxy.updateSiteMember(site.getSiteId(), new SiteMember(person1.getId(), "invalidRole"));
+					fail();
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+				}
+				
+				// user is not a member of the site - 400
+				try
+				{
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+					sitesProxy.updateSiteMember(site.getSiteId(), new SiteMember(person1.getId(), SiteRole.SiteContributor.toString()));
+					fail();
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+				}
+
+				// cannot update last member of site to be a non-manager
+				try
+				{
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+					sitesProxy.updateSiteMember(site.getSiteId(), new SiteMember(person2.getId(), SiteRole.SiteContributor.toString()));
+					fail();
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_UNPROCESSABLE_ENTITY, e.getHttpResponse().getStatusCode());
+				}
+				
+				// successful update
+				{
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+		
+					SiteMember sm = new SiteMember(person1.getId(), SiteRole.SiteContributor.toString());
+					SiteMember ret = sitesProxy.createSiteMember(site.getSiteId(), sm);
+					assertEquals(SiteRole.SiteContributor.toString(), ret.getRole());
+					person1.expected(ret.getMember());
+		
+					sm = new SiteMember(person1.getId(), SiteRole.SiteCollaborator.toString());
+					ret = sitesProxy.updateSiteMember(site.getSiteId(), sm);
+					assertEquals(SiteRole.SiteCollaborator.toString(), ret.getRole());
+					person1.expected(ret.getMember());
+		
+					// check site membership in GET
+					SiteMember smToCheck = sitesProxy.getSingleSiteMember(site.getSiteId(), person1.getId());
+					assertNotNull(smToCheck); // check that the update site membership is present
+					assertEquals(sm.getRole(), smToCheck.getRole()); // check that the role is correct
+					
+					
+					expectedSiteMembers = new ArrayList<>();
+					SiteMember sm1 = new SiteMember(person1.getId(), person1, site.getSiteId(), SiteRole.SiteCollaborator.toString());
+					expectedSiteMembers.add(sm1);
+					SiteMember sm2 = new SiteMember(person2.getId(), person2, site.getSiteId(), SiteRole.SiteManager.toString());
+					expectedSiteMembers.add(sm2);
+					SiteMember sm3 = new SiteMember(person3.getId(), person3, site.getSiteId(), SiteRole.SiteCollaborator.toString());
+					expectedSiteMembers.add(sm3);
+					Collections.sort(expectedSiteMembers);
+
+					int skipCount = 0;
+					int maxItems = Integer.MAX_VALUE;
+					Paging paging = getPaging(skipCount, maxItems, expectedSiteMembers.size(), 3);
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+					ListResponse<SiteMember> siteMembers = sitesProxy.getSiteMembers(site.getSiteId(), createParams(paging, null));
+					checkList(expectedSiteMembers.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), siteMembers);
+				}
+			}
+		}
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteMembershipRequests.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteMembershipRequests.java
new file mode 100644
index 00000000000..ce5a2b61ae0
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSiteMembershipRequests.java
@@ -0,0 +1,1986 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.rest.api.tests.RepoService.SiteInformation;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.SiteMembershipRequests;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.MemberOfSite;
+import org.alfresco.rest.api.tests.client.data.SiteMembershipApproval;
+import org.alfresco.rest.api.tests.client.data.SiteMembershipRejection;
+import org.alfresco.rest.api.tests.client.data.SiteMembershipRequest;
+import org.alfresco.rest.api.tests.client.data.SiteRole;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.invitation.Invitation;
+import org.alfresco.service.cmr.invitation.ModeratedInvitation;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.apache.commons.httpclient.HttpStatus;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("unused")
+public class TestSiteMembershipRequests extends EnterpriseTestApi
+{
+	private static final String URL_SITES = "sites";
+	
+	private TestNetwork network1;
+	private TestNetwork network2;
+
+	private String person11Id; // network1
+	private String person12Id; // network1
+	private String person13Id; // network1
+	private String person14Id; // network1
+	private String person15Id; // network1
+	
+	private String person24Id; // network2
+
+	private List<TestSite> personModeratedSites = new ArrayList<TestSite>();
+	private List<TestSite> personPublicSites = new ArrayList<TestSite>();
+	private List<TestSite> person1PrivateSites = new ArrayList<TestSite>();
+	private List<TestSite> person1ModeratedSites = new ArrayList<TestSite>();
+	private List<TestSite> person1MixedCaseModeratedSites = new ArrayList<TestSite>();
+	private List<TestSite> person1PublicSites = new ArrayList<TestSite>();
+	private List<TestSite> person4ModeratedSites = new ArrayList<TestSite>();
+	private List<NodeRef> personDocs = new ArrayList<NodeRef>();
+	private List<NodeRef> personFolders = new ArrayList<NodeRef>();
+	private List<NodeRef> person1Docs = new ArrayList<NodeRef>();
+	private List<NodeRef> person1Folders = new ArrayList<NodeRef>();
+	
+	private SiteMembershipRequests siteMembershipRequestsProxy;
+	
+	private Random random = new Random(System.currentTimeMillis());
+
+	@Override
+	@Before
+	public void setup() throws Exception
+	{
+		// init networks
+		super.setup();
+		
+		Iterator<TestNetwork> networksIt = getTestFixture().networksIterator();
+		this.network1 = networksIt.next();
+		Iterator<String> personIt = network1.getPersonIds().iterator();
+    	this.person11Id = personIt.next();
+    	assertNotNull(person11Id);
+    	this.person12Id = personIt.next();
+    	assertNotNull(person12Id);
+    	this.person13Id = personIt.next();
+    	assertNotNull(person13Id);
+    	this.person14Id = personIt.next();
+    	assertNotNull(person14Id);
+    	this.person15Id = personIt.next();
+    	assertNotNull(person15Id);
+
+		this.network2 = networksIt.next();
+		Iterator<String> person1It = network2.getPersonIds().iterator();
+    	this.person24Id = person1It.next();
+    	assertNotNull(person24Id);
+
+    	// Create some sites, files and folders
+    	TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				String guid = GUID.generate();
+				String[] siteNames = new String[] {"sitex" + guid, "sitea" + guid, "sitef" + guid, "site234" + guid,
+						"sitey" + guid, "siteb" + guid, "site643" + guid, "site24" + guid, "site8d6sc" + guid};
+
+				String siteName = siteNames[0];
+				SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.MODERATED);
+				TestSite site = network1.createSite(siteInfo);
+				person1ModeratedSites.add(site);
+				
+				for(int i = 1; i < siteNames.length; i++)
+				{
+					siteName = siteNames[i];
+					siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.MODERATED);
+					site = network1.createSite(siteInfo);
+					person1ModeratedSites.add(site);
+				}
+
+				String[] mixedCaseSiteNames = new String[] {"MixedCase" + guid, "mixedCaseA" + guid};
+
+				for(int i = 0; i < mixedCaseSiteNames.length; i++)
+				{
+					siteName = mixedCaseSiteNames[i];
+					siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.MODERATED);
+					site = network1.createSite(siteInfo);
+					person1MixedCaseModeratedSites.add(site);
+				}
+
+				for(int i = 0; i < 1; i++)
+				{
+					siteName = "privatesite" + GUID.generate();
+					siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PRIVATE);
+					site = network1.createSite(siteInfo);
+					person1PrivateSites.add(site);
+				}
+
+				NodeRef nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc1", "Test Content");
+				person1Docs.add(nodeRef);
+				nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder1");
+				person1Folders.add(nodeRef);
+				nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc2", "Test Content");
+				person1Docs.add(nodeRef);
+				nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder2");
+				person1Folders.add(nodeRef);
+				nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc3", "Test Content");
+				person1Docs.add(nodeRef);
+				nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder3");
+				person1Folders.add(nodeRef);
+
+				siteName = "site" + GUID.generate();
+				siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PUBLIC);
+				site = network1.createSite(siteInfo);
+				person1PublicSites.add(site);
+
+				return null;
+			}
+		}, person12Id, network1.getId());
+		
+		TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				String siteName = "site" + System.currentTimeMillis();
+				SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PUBLIC);
+				TestSite site = network1.createSite(siteInfo);
+
+				NodeRef nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc1", "Test Content");
+				personDocs.add(nodeRef);
+				nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder1");
+				personFolders.add(nodeRef);
+				nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc2", "Test Content");
+				personDocs.add(nodeRef);
+				nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder2");
+				personFolders.add(nodeRef);
+				nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc3", "Test Content");
+				personDocs.add(nodeRef);
+				nodeRef = repoService.createFolder(site.getContainerNodeRef("documentLibrary"), "Test Folder3");
+				personFolders.add(nodeRef);
+
+				return null;
+			}
+		}, person11Id, network1.getId());
+
+    	TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				String siteName = "site" + GUID.generate();
+				SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PUBLIC);
+				TestSite site = network1.createSite(siteInfo);
+				personPublicSites.add(site);
+
+		    	site.inviteToSite(person12Id, SiteRole.SiteCollaborator);
+
+				siteName = "site" + GUID.generate();
+				siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PUBLIC);
+				site = network1.createSite(siteInfo);
+				personPublicSites.add(site);
+
+				return null;
+			}
+		}, person11Id, network1.getId());
+    	
+    	TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				String siteName = "site" + GUID.generate();
+				SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.MODERATED);
+				TestSite site = network1.createSite(siteInfo);
+				person4ModeratedSites.add(site);
+
+				return null;
+			}
+		}, person24Id, network2.getId());
+
+		this.siteMembershipRequestsProxy = publicApiClient.siteMembershipRequests();
+	}
+
+	private SiteMembershipRequest getSiteMembershipRequest(String networkId, String runAsUserId, String personId) throws PublicApiException, ParseException
+	{
+		publicApiClient.setRequestContext(new RequestContext(networkId, runAsUserId));
+
+		int skipCount = 0;
+		int maxItems = Integer.MAX_VALUE;
+		Paging paging = getPaging(skipCount, maxItems);
+		ListResponse<SiteMembershipRequest> resp = siteMembershipRequestsProxy.getSiteMembershipRequests(personId, createParams(paging, null));
+		List<SiteMembershipRequest> list = resp.getList();
+		int size = list.size();
+		assertTrue(size > 0);
+		int idx = random.nextInt(size);
+		SiteMembershipRequest request = list.get(idx);
+		return request;
+	}
+
+	@Test
+	public void testInvalidRequests() throws Exception
+	{
+		{
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person12Id));
+				
+				// unknown invitee
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(person1ModeratedSites.get(0).getSiteId());
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				siteMembershipRequestsProxy.createSiteMembershipRequest(GUID.generate(), siteMembershipRequest);
+
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+			
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person12Id));
+				
+				// unknown siteId
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(GUID.generate());
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				siteMembershipRequestsProxy.createSiteMembershipRequest(person11Id, siteMembershipRequest);
+
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+			}
+
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person12Id));
+
+				// create site membership for another user
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(person1ModeratedSites.get(0).getSiteId());
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				siteMembershipRequestsProxy.createSiteMembershipRequest(person11Id, siteMembershipRequest);
+
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+			}
+
+			// cloud-2506
+			// get requests for another user
+			try
+			{
+				log("cloud-2506");
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				// get site membership requests for another user
+				int skipCount = 0;
+				int maxItems = 4;
+				Paging paging = getPaging(skipCount, maxItems);
+				siteMembershipRequestsProxy.getSiteMembershipRequests(person12Id, createParams(paging, null));
+
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+			}
+			
+			// get site membership requests for unknown user
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+				
+				int skipCount = 0;
+				int maxItems = 4;
+				Paging paging = getPaging(skipCount, maxItems);
+				siteMembershipRequestsProxy.getSiteMembershipRequests(GUID.generate(), createParams(paging, null));
+
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+			}
+
+			// ACE-2409 / ACE-5442
+			// get site membership request for unknown site
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+				
+				siteMembershipRequestsProxy.getSiteMembershipRequest(person11Id, GUID.generate());
+
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+			
+			// DELETEs
+			{
+				{
+					// cloud-2524
+					// runAs user != target user
+					log("cloud-2524");
+					
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person14Id));
+
+					// create moderated site invitation to delete
+					SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+					siteMembershipRequest.setId(person1ModeratedSites.get(0).getSiteId());
+					siteMembershipRequest.setMessage("Please can I join your site?");
+					siteMembershipRequestsProxy.createSiteMembershipRequest(person14Id, siteMembershipRequest);
+	
+					SiteMembershipRequest request = getSiteMembershipRequest(network1.getId(), person14Id, person14Id);
+	
+					// user from another network
+					try
+					{
+						publicApiClient.setRequestContext(new RequestContext(network1.getId(), person24Id));
+						
+						siteMembershipRequestsProxy.cancelSiteMembershipRequest(person14Id, request.getId());
+						
+						fail("");
+					}
+					catch(PublicApiException e)
+					{
+						assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());				
+					}
+					
+					// cloud-2525
+					// unknown personId
+					try
+					{
+						log("cloud-2525");
+
+						publicApiClient.setRequestContext(new RequestContext(network1.getId(), person14Id));
+						
+						siteMembershipRequestsProxy.cancelSiteMembershipRequest(GUID.generate(), request.getId());
+						
+						fail("");
+					}
+					catch(PublicApiException e)
+					{
+						assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+					}
+				}
+				
+				// cloud-2526
+				// cloud-2527
+				// unknown siteId
+				try
+				{
+					log("cloud-2526");
+					log("cloud-2527");
+
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person14Id));
+					
+					SiteMembershipRequest request = new SiteMembershipRequest();
+					request.setId(GUID.generate());
+
+					siteMembershipRequestsProxy.cancelSiteMembershipRequest(person14Id, request.getId());
+
+					fail("");
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+				}
+
+				// unknown request id
+				try
+				{
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person14Id));
+					
+					siteMembershipRequestsProxy.cancelSiteMembershipRequest(person14Id, GUID.generate());
+
+					fail("");
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+				}
+			}
+			
+			// PUTs
+
+			// cloud-2519 - PUT to site membership requests
+			try
+			{
+				log("cloud-2519");
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				SiteMembershipRequest request = new SiteMembershipRequest();
+				request.setId(GUID.generate());
+				request.setMessage("Please can I join your site?");
+				siteMembershipRequestsProxy.update("people", person11Id, "favorites", null, request.toJSON().toString(), "Unable to PUT site membership requests");
+
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());				
+			}
+
+			// cloud-2520 - unknown request/site id
+			try
+			{
+				log("cloud-2516");
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				SiteMembershipRequest request = new SiteMembershipRequest();
+				request.setId(GUID.generate());
+				request.setMessage("Please can I join your site?");
+				siteMembershipRequestsProxy.updateSiteMembershipRequest(person11Id, request);
+				
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+			}
+		}
+	}
+	
+	@Test
+	public void testValidRequests() throws Exception
+	{
+		final List<SiteMembershipRequest> expectedSiteMembershipRequests = new ArrayList<SiteMembershipRequest>();
+
+		{
+			// GET
+			// cloud-2531
+			// user has no site membership requests
+			{
+				log("cloud-2531");
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				int skipCount = 0;
+				int maxItems = 2;
+				Paging paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+				ListResponse<SiteMembershipRequest> resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person11Id, createParams(paging, null));
+				checkList(expectedSiteMembershipRequests.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+			}
+			
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				int skipCount = 0;
+				Paging paging = getPaging(skipCount, null, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+				ListResponse<SiteMembershipRequest> resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person11Id, createParams(paging, null));
+				checkList(expectedSiteMembershipRequests.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+			}
+
+			// POSTs
+			// cloud-2502
+			// cloud-2510
+			{
+				log("cloud-2502");
+				log("cloud-2510");
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				// moderated site
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(person1ModeratedSites.get(0).getSiteId());
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				final SiteMembershipRequest moderatedSiteResponse = siteMembershipRequestsProxy.createSiteMembershipRequest("-me-", siteMembershipRequest);
+				expectedSiteMembershipRequests.add(moderatedSiteResponse);
+				siteMembershipRequest.expected(moderatedSiteResponse);
+
+				// public site
+				siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(person1PublicSites.get(0).getSiteId());
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				SiteMembershipRequest ret = siteMembershipRequestsProxy.createSiteMembershipRequest(person11Id, siteMembershipRequest);
+				siteMembershipRequest.expected(ret);
+
+				// test we have a moderated site request only
+				// cloud-2532
+				{
+					log("cloud-2532");
+
+					int skipCount = 0;
+					int maxItems = 4;
+					Paging paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+					ListResponse<SiteMembershipRequest> resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person11Id, createParams(paging, null));
+					checkList(expectedSiteMembershipRequests, paging.getExpectedPaging(), resp);
+				}
+
+				// test against the underlying invitation service
+				List<Invitation> invitations = repoService.getModeratedSiteInvitations(network1.getId(), person11Id, person11Id, null);
+				assertEquals(1, invitations.size());
+				Invitation invitation = invitations.get(0);
+				assertTrue(invitation instanceof ModeratedInvitation);
+				ModeratedInvitation moderatedInvitation = (ModeratedInvitation)invitation;
+				String siteId = moderatedInvitation.getResourceName();
+				Invitation.InvitationType invitationType = moderatedInvitation.getInvitationType();
+				Invitation.ResourceType resourceType = moderatedInvitation.getResourceType();
+				String inviteeId = moderatedInvitation.getInviteeUserName();
+				assertEquals(person11Id, inviteeId);
+				assertEquals(Invitation.ResourceType.WEB_SITE, resourceType);
+				assertEquals(Invitation.InvitationType.MODERATED, invitationType);
+				assertEquals(person1ModeratedSites.get(0).getSiteId(), siteId);
+
+				// test that personId is a member of the public site
+				assertTrue(person1PublicSites.get(0).isMember(person11Id));
+
+				// cloud-2534
+				// approve the moderated site invitation and check that it is gone from the list
+				{
+					log("cloud-2534");
+
+					TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+					{
+						@Override
+						public Void doWork() throws Exception
+						{
+							repoService.approveSiteInvitation(person11Id, moderatedSiteResponse.getId());
+							expectedSiteMembershipRequests.remove(0);
+							return null;
+						}
+					}, person12Id, network1.getId());
+	
+					// make sure the outstanding request has gone
+					int skipCount = 0;
+					int maxItems = 4;
+					Paging paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+					ListResponse<SiteMembershipRequest> resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person11Id, createParams(paging, null));
+					checkList(expectedSiteMembershipRequests, paging.getExpectedPaging(), resp);
+				}
+			}
+			
+			// user from another network - un-authorised
+			try
+			{
+				log("cloud-2511");
+				
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person24Id));
+
+				// moderated site
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(person1ModeratedSites.get(0).getSiteId());
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				siteMembershipRequestsProxy.createSiteMembershipRequest(person24Id, siteMembershipRequest);
+
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());				
+			}
+
+			// cloud-2512
+			// cloud-2535
+			// invitee from another network
+			{
+				log("cloud-2512");
+				log("cloud-2535");
+				log("cloud-2536");
+
+				final List<SiteMembershipRequest> person4ExpectedSiteMembershipRequests = new ArrayList<SiteMembershipRequest>();
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person24Id));
+
+				{
+					// public site
+					try
+					{
+						SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+						siteMembershipRequest.setId(person1PublicSites.get(0).getSiteId());
+						siteMembershipRequest.setMessage("Please can I join your site?");
+						siteMembershipRequestsProxy.createSiteMembershipRequest(person24Id, siteMembershipRequest);
+						
+						fail();
+					}
+					catch(PublicApiException e)
+					{
+						assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());				
+					}
+				}
+				
+				{
+					// moderated site
+					try
+					{
+						SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+						siteMembershipRequest.setId(person1ModeratedSites.get(0).getSiteId());
+						siteMembershipRequest.setMessage("Please can I join your site?");
+						siteMembershipRequestsProxy.createSiteMembershipRequest(person24Id, siteMembershipRequest);
+						
+						fail();
+					}
+					catch(PublicApiException e)
+					{
+						assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());				
+					}
+					
+					try
+					{
+						int skipCount = 0;
+						int maxItems = 2;
+						Paging paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+						siteMembershipRequestsProxy.getSiteMembershipRequests(person24Id, createParams(paging, null));
+						fail();
+					}
+					catch(PublicApiException e)
+					{
+						assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());				
+					}
+				}
+
+				{
+					// private site
+					try
+					{
+						SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+						siteMembershipRequest.setId(person1PrivateSites.get(0).getSiteId());
+						siteMembershipRequest.setMessage("Please can I join your site?");
+						siteMembershipRequestsProxy.createSiteMembershipRequest(person24Id, siteMembershipRequest);
+						
+						fail();
+					}
+					catch(PublicApiException e)
+					{
+						assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());				
+					}
+
+					try
+					{
+						int skipCount = 0;
+						int maxItems = 2;
+						Paging paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+						siteMembershipRequestsProxy.getSiteMembershipRequests(person24Id, createParams(paging, null));
+						fail();
+					}
+					catch(PublicApiException e)
+					{
+						assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());				
+					}
+				}
+			}
+			
+			// cloud-2513
+			try
+			{
+				log("cloud-2513");
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				// unknown site
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(GUID.generate());
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				siteMembershipRequestsProxy.createSiteMembershipRequest(person11Id, siteMembershipRequest);
+				
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+			}
+
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				// private site
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(person1PrivateSites.get(0).getSiteId());
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				siteMembershipRequestsProxy.createSiteMembershipRequest(person11Id, siteMembershipRequest);
+				
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+			}
+			
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				// moderated site in another network
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(person4ModeratedSites.get(0).getSiteId());
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				siteMembershipRequestsProxy.createSiteMembershipRequest(person11Id, siteMembershipRequest);
+				
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+			}
+			
+			// cloud-2514
+			try
+			{
+				log("cloud-2514");
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				// already joined the site
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(person1ModeratedSites.get(0).getSiteId());
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				siteMembershipRequestsProxy.createSiteMembershipRequest(person11Id, siteMembershipRequest);
+
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());				
+			}
+			
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				// already requested to join the site but not yet joined
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(person1ModeratedSites.get(0).getSiteId());
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				siteMembershipRequestsProxy.createSiteMembershipRequest(person11Id, siteMembershipRequest);
+
+				siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(person1ModeratedSites.get(0).getSiteId());
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				siteMembershipRequestsProxy.createSiteMembershipRequest(person11Id, siteMembershipRequest);
+
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());				
+			}
+
+			// cloud-2538
+			// blank message
+			{
+				log("cloud-2538");
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(person1ModeratedSites.get(1).getSiteId());
+				siteMembershipRequest.setMessage("");
+				SiteMembershipRequest ret = siteMembershipRequestsProxy.createSiteMembershipRequest(person11Id, siteMembershipRequest);
+				expectedSiteMembershipRequests.add(ret);
+			}
+
+			// GETs
+
+			// cloud-2501
+			// cloud-2509
+			// test paging
+			{
+				log("cloud-2501");
+				log("cloud-2509");
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				// add some more site membership requests to moderated sites
+				for(int i = 1; i < person1ModeratedSites.size(); i++)
+				{
+					SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+					siteMembershipRequest.setId(person1ModeratedSites.get(i).getSiteId());
+					siteMembershipRequest.setMessage("Please can I join your site?");
+					try
+					{
+						SiteMembershipRequest ret = siteMembershipRequestsProxy.createSiteMembershipRequest(person11Id, siteMembershipRequest);
+						expectedSiteMembershipRequests.add(ret);
+						siteMembershipRequest.expected(ret);
+					}
+					catch(PublicApiException e)
+					{
+						// this is ok, already created
+					}
+
+				}
+
+				Collections.sort(expectedSiteMembershipRequests);
+
+				{
+					int skipCount = 0;
+					int maxItems = 2;
+					Paging paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+					ListResponse<SiteMembershipRequest> resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person11Id, createParams(paging, null));
+					checkList(expectedSiteMembershipRequests.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+
+					skipCount = 2;
+					maxItems = 5;
+					paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+					resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person11Id, createParams(paging, null));
+					checkList(expectedSiteMembershipRequests.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+					
+					skipCount = 5;
+					maxItems = 10;
+					paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+					resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person11Id, createParams(paging, null));
+					checkList(expectedSiteMembershipRequests.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+					
+					skipCount = 0;
+					maxItems = expectedSiteMembershipRequests.size();
+					paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+					resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person11Id, createParams(paging, null));
+					checkList(expectedSiteMembershipRequests.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+				}
+
+				// skipCount is greater than the number of site membership requests in the list
+				{
+					int skipCount = 1000;
+					int maxItems = 2;
+					Paging paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+					ListResponse<SiteMembershipRequest> resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person11Id, createParams(paging, null));
+					checkList(sublist(expectedSiteMembershipRequests, skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+				}
+
+				// cloud-2537
+				// -me- user
+				{
+					log("cloud-2537");
+
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+	
+					int skipCount = 0;
+					int maxItems = 2;
+					Paging paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+					ListResponse<SiteMembershipRequest> resp = siteMembershipRequestsProxy.getSiteMembershipRequests("-me-", createParams(paging, null));
+					checkList(expectedSiteMembershipRequests.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+				}
+			}
+
+			// DELETEs
+			// cloud-2504
+			{
+				log("cloud-2504");
+				
+				SiteMembershipRequest request = getSiteMembershipRequest(network1.getId(), person11Id, person11Id);
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				siteMembershipRequestsProxy.cancelSiteMembershipRequest(person11Id, request.getId());
+				expectedSiteMembershipRequests.remove(request);
+				Collections.sort(expectedSiteMembershipRequests);
+
+				// cloud-2533
+				// check that the site membership request has gone
+				log("cloud-2533");
+
+				int skipCount = 0;
+				int maxItems = Integer.MAX_VALUE;
+				Paging paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+				ListResponse<SiteMembershipRequest> resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person11Id, createParams(paging, null));
+				checkList(expectedSiteMembershipRequests, paging.getExpectedPaging(), resp);
+
+				// cloud-2528
+				// try to cancel the same request
+				try
+				{
+					log("cloud-2528");
+
+					siteMembershipRequestsProxy.cancelSiteMembershipRequest(person11Id, request.getId());
+					
+					fail("");
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+				}
+			}
+			
+			// cloud-2529
+			// cancel a site membership request that has been rejected
+			{
+				log("cloud-2529");
+
+				final String siteId = person1ModeratedSites.get(1).getSiteId();
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person14Id));
+
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(siteId);
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				SiteMembershipRequest moderatedSiteResponse = siteMembershipRequestsProxy.createSiteMembershipRequest(person14Id, siteMembershipRequest);
+				expectedSiteMembershipRequests.add(moderatedSiteResponse);
+				Collections.sort(expectedSiteMembershipRequests);
+				siteMembershipRequest.expected(moderatedSiteResponse);
+
+				TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+				{
+					@Override
+					public Void doWork() throws Exception
+					{
+						Invitation invitation = repoService.rejectSiteInvitation(person14Id, siteId);
+						assertNotNull(invitation);
+
+						return null;
+					}
+				}, person12Id, network1.getId());
+
+				// try to cancel the request
+				try
+				{
+					siteMembershipRequestsProxy.cancelSiteMembershipRequest(person14Id, siteId);
+					
+					fail("");
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+				}
+			}
+
+			// cloud-2530
+			// cancel a site membership request that has been approved
+			{
+				log("cloud-2530");
+
+				final String siteId = person1ModeratedSites.get(2).getSiteId();
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person14Id));
+
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(siteId);
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				SiteMembershipRequest moderatedSiteResponse = siteMembershipRequestsProxy.createSiteMembershipRequest(person14Id, siteMembershipRequest);
+				expectedSiteMembershipRequests.add(moderatedSiteResponse);
+				Collections.sort(expectedSiteMembershipRequests);
+				siteMembershipRequest.expected(moderatedSiteResponse);
+
+				TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+				{
+					@Override
+					public Void doWork() throws Exception
+					{
+						Invitation invitation = repoService.approveSiteInvitation(person14Id, siteId);
+						assertNotNull(invitation);
+
+						return null;
+					}
+				}, person12Id, network1.getId());
+
+				// try to cancel the request
+				try
+				{
+					siteMembershipRequestsProxy.cancelSiteMembershipRequest(person14Id, siteId);
+					
+					fail("");
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+				}
+			}
+
+			// PUTs
+
+			// cloud-2503
+			// cloud-2517
+			// cloud-2518
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person14Id));
+
+				// merged these tests
+				// cloud-2503: use -me- pseudo user
+				// cloud-2517: initially no message
+				log("cloud-2503");
+				log("cloud-2517");
+
+				// create a request without a message
+				String siteId = person1ModeratedSites.get(7).getSiteId();
+
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(siteId);
+				SiteMembershipRequest request = siteMembershipRequestsProxy.createSiteMembershipRequest(person14Id, siteMembershipRequest);
+				assertNotNull(request);
+				
+				// update it, with a message
+				request.setMessage("Please can I join your site?");
+				SiteMembershipRequest updated = siteMembershipRequestsProxy.updateSiteMembershipRequest(person14Id, request);
+				request.expected(updated);
+
+				// check it's updated
+				int skipCount = 0;
+				int maxItems = 2;
+				Paging paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+				ListResponse<SiteMembershipRequest> resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person14Id, createParams(paging, null));
+				List<SiteMembershipRequest> requests = resp.getList();
+				assertTrue(requests.size() > 0);
+				int idx = requests.indexOf(request);
+				SiteMembershipRequest toCheck = requests.get(idx);
+				updated.expected(toCheck);
+				
+				// cloud-2518
+				// update it again, with ammended message
+				
+				log("cloud-2518");
+
+				request.setMessage("Please can I join your site, pretty please?");
+				updated = siteMembershipRequestsProxy.updateSiteMembershipRequest(person14Id, request);
+				request.expected(updated);
+
+				// check it's updated
+				skipCount = 0;
+				maxItems = 2;
+				paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+				resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person14Id, createParams(paging, null));
+				requests = resp.getList();
+				assertTrue(requests.size() > 0);
+				idx = requests.indexOf(request);
+				toCheck = requests.get(idx);
+				updated.expected(toCheck);
+			}
+			
+			// cloud-2515 - no changes
+			{
+				log("cloud-2515");
+				
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person14Id));
+
+				// create a request
+				String siteId = person1ModeratedSites.get(8).getSiteId();
+
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(siteId);
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				SiteMembershipRequest request = siteMembershipRequestsProxy.createSiteMembershipRequest(person14Id, siteMembershipRequest);
+				assertNotNull(request);
+				
+				// update it, with no changes
+				SiteMembershipRequest updated = siteMembershipRequestsProxy.updateSiteMembershipRequest(person14Id, request);
+				request.expected(updated); // should not have changed
+			}
+
+			// cloud-2516 - unknown person id
+			try
+			{
+				log("cloud-2516");
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				// get an outstanding request
+				int skipCount = 0;
+				int maxItems = 2;
+				Paging paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+				ListResponse<SiteMembershipRequest> resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person11Id, createParams(paging, null));
+				List<SiteMembershipRequest> requests = resp.getList();
+				assertTrue(requests.size() > 0);
+				SiteMembershipRequest request = requests.get(0);
+				siteMembershipRequestsProxy.updateSiteMembershipRequest(GUID.generate(), request);
+				
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+			}
+
+			// cloud-2521 - unknown site membership request
+			try
+			{
+				log("cloud-2521");
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person11Id));
+
+				SiteMembershipRequest request = new SiteMembershipRequest();
+				request.setId(GUID.generate());
+				siteMembershipRequestsProxy.updateSiteMembershipRequest(person11Id, request);
+				
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+			}
+
+			
+			// cloud-2522
+			// update a site membership request that has been rejected
+			{
+				log("cloud-2522");
+
+				String siteId = person1ModeratedSites.get(5).getSiteId();
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person14Id));
+
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(siteId);
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				SiteMembershipRequest moderatedSiteResponse = siteMembershipRequestsProxy.createSiteMembershipRequest(person14Id, siteMembershipRequest);
+				expectedSiteMembershipRequests.add(moderatedSiteResponse);
+				Collections.sort(expectedSiteMembershipRequests);
+				siteMembershipRequest.expected(moderatedSiteResponse);
+
+				repoService.rejectSiteInvitation(person14Id, siteId);
+
+				// try to update the request
+				try
+				{
+					siteMembershipRequestsProxy.updateSiteMembershipRequest(siteId, moderatedSiteResponse);
+					
+					fail("");
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+				}
+			}
+			
+			// cloud-2523
+			// update a site membership request that has been approved
+			{
+				log("cloud-2523");
+
+				String siteId = person1ModeratedSites.get(6).getSiteId();
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person14Id));
+
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(siteId);
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				SiteMembershipRequest moderatedSiteResponse = siteMembershipRequestsProxy.createSiteMembershipRequest(person14Id, siteMembershipRequest);
+				expectedSiteMembershipRequests.add(moderatedSiteResponse);
+				Collections.sort(expectedSiteMembershipRequests);
+				siteMembershipRequest.expected(moderatedSiteResponse);
+
+				repoService.approveSiteInvitation(person14Id, siteId);
+
+				// try to update the request
+				try
+				{
+					siteMembershipRequestsProxy.updateSiteMembershipRequest(siteId, moderatedSiteResponse);
+					
+					fail("");
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+				}
+			}
+			
+			{
+				// cloud-2539 - probing attack tests
+				
+				log("cloud-2539");
+				
+				// i) create site membership request to a moderated site
+				// ii) site owner changes the site to a private site
+				// iii) re-issue create site membership request should be a 404
+				{
+					final List<SiteMembershipRequest> person2ExpectedSiteMembershipRequests = new ArrayList<SiteMembershipRequest>();
+
+					final TestSite site = person1ModeratedSites.get(0);
+
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person13Id));
+
+					SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+					siteMembershipRequest.setId(site.getSiteId());
+					siteMembershipRequest.setMessage("Please can I join your site?");
+					siteMembershipRequestsProxy.createSiteMembershipRequest(person13Id, siteMembershipRequest);
+
+					TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+					{
+						@Override
+						public Void doWork() throws Exception
+						{
+							site.setSiteVisibility(SiteVisibility.PRIVATE);
+							return null;
+						}
+					}, person12Id, network1.getId());
+
+					// Can we still GET it? Should be a 404 (private site)
+					try
+					{
+						siteMembershipRequestsProxy.getSiteMembershipRequest(person13Id, siteMembershipRequest.getId());
+					}
+					catch(PublicApiException e)
+					{
+						assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+					}
+					
+					// GET should not contain the site
+					{
+						int skipCount = 0;
+						int maxItems = 10;
+						assertEquals(0, person2ExpectedSiteMembershipRequests.size());
+						Paging paging = getPaging(skipCount, maxItems, person2ExpectedSiteMembershipRequests.size(), person2ExpectedSiteMembershipRequests.size());
+						ListResponse<SiteMembershipRequest> resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person13Id, createParams(paging, null));
+						checkList(sublist(person2ExpectedSiteMembershipRequests, skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+					}
+
+					try
+					{
+						siteMembershipRequestsProxy.createSiteMembershipRequest(person13Id, siteMembershipRequest);
+
+						fail("");
+					}
+					catch(PublicApiException e)
+					{
+						assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+					}
+				}
+
+				// i) create site membership request to a public site
+				// ii) site owner changes the site to a private site
+				// iii) re-issue create site membership request should be a 404
+				{
+					final TestSite site = person1PublicSites.get(0);
+
+					publicApiClient.setRequestContext(new RequestContext(network1.getId(), person13Id));
+
+					SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+					siteMembershipRequest.setId(site.getSiteId());
+					siteMembershipRequest.setMessage("Please can I join your site?");
+					siteMembershipRequestsProxy.createSiteMembershipRequest(person13Id, siteMembershipRequest);
+
+					TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+					{
+						@Override
+						public Void doWork() throws Exception
+						{
+							site.setSiteVisibility(SiteVisibility.PRIVATE);
+							return null;
+						}
+					}, person12Id, network1.getId());
+					
+					try
+					{
+						siteMembershipRequestsProxy.createSiteMembershipRequest(person13Id, siteMembershipRequest);
+
+						fail("");
+					}
+					catch(PublicApiException e)
+					{
+						assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+					}
+					
+					try
+					{
+						siteMembershipRequestsProxy.updateSiteMembershipRequest(person13Id, siteMembershipRequest);
+
+						fail("");
+					}
+					catch(PublicApiException e)
+					{
+						assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+					}
+					
+					try
+					{
+						siteMembershipRequestsProxy.cancelSiteMembershipRequest(person13Id, siteMembershipRequest.getId());
+
+						fail("");
+					}
+					catch(PublicApiException e)
+					{
+						assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+					}
+				}
+			}
+
+			// i) create site membership request to a moderated site
+			// ii) site owner accepts the request -> user is now a member of the site
+			// iii) site owner changes the site to a private site
+			// iv) re-issue create site membership request should be a 404
+			{
+				final TestSite site = person1ModeratedSites.get(1);
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person13Id));
+
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(site.getSiteId());
+				siteMembershipRequest.setMessage("Please can I join your site?");
+				siteMembershipRequestsProxy.createSiteMembershipRequest(person13Id, siteMembershipRequest);
+
+				// approve the site invitation request and convert the site to a private site
+				TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+				{
+					@Override
+					public Void doWork() throws Exception
+					{
+						repoService.approveSiteInvitation(person13Id, site.getSiteId());
+
+						site.setSiteVisibility(SiteVisibility.PRIVATE);
+						return null;
+					}
+				}, person12Id, network1.getId());
+				
+				try
+				{
+					siteMembershipRequestsProxy.createSiteMembershipRequest(person13Id, siteMembershipRequest);
+
+					fail("");
+				}
+				catch(PublicApiException e)
+				{
+					assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());				
+				}
+			}
+
+			// blank message in POST and PUT
+			{
+				final TestSite site = person1ModeratedSites.get(2);
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person13Id));
+
+				SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+				siteMembershipRequest.setId(site.getSiteId());
+				siteMembershipRequest.setMessage("");
+				SiteMembershipRequest created = siteMembershipRequestsProxy.createSiteMembershipRequest(person13Id, siteMembershipRequest);
+				SiteMembershipRequest updated = siteMembershipRequestsProxy.updateSiteMembershipRequest(person13Id, siteMembershipRequest);
+
+				assertTrue(updated.getModifiedAt().after(created.getCreatedAt()));
+			}
+		}
+	}
+	
+	// PUBLICAPI-126, PUBLICAPI-132
+	@Test
+	public void testMixedCase() throws Exception
+	{
+		final List<SiteMembershipRequest> expectedSiteMembershipRequests = new ArrayList<SiteMembershipRequest>();
+
+		{
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person15Id));
+			
+			// moderated site
+			String siteId = person1MixedCaseModeratedSites.get(0).getSiteId().toLowerCase();
+			
+			SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+			siteMembershipRequest.setId(siteId); // lower case to test mixed case
+			siteMembershipRequest.setMessage("Please can I join your site?");
+			final SiteMembershipRequest moderatedSiteResponse = siteMembershipRequestsProxy.createSiteMembershipRequest("-me-", siteMembershipRequest);
+			expectedSiteMembershipRequests.add(moderatedSiteResponse);
+			Collections.sort(expectedSiteMembershipRequests);
+			siteMembershipRequest.expected(moderatedSiteResponse);
+
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems, expectedSiteMembershipRequests.size(), expectedSiteMembershipRequests.size());
+			ListResponse<SiteMembershipRequest> resp = siteMembershipRequestsProxy.getSiteMembershipRequests(person15Id, createParams(paging, null));
+			checkList(expectedSiteMembershipRequests.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+
+			SiteMembershipRequest ret = siteMembershipRequestsProxy.getSiteMembershipRequest(person15Id, siteId);
+			siteMembershipRequest.expected(ret);
+
+			siteMembershipRequestsProxy.cancelSiteMembershipRequest(person15Id, ret.getId());
+
+			try
+			{
+				siteMembershipRequestsProxy.getSiteMembershipRequest(person15Id, siteId);
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+		}
+	}
+
+	@Test
+	public void testALF19332() throws Exception
+	{
+		String networkId = network1.getId();
+		
+		final TestNetwork systemNetwork = getRepoService().getSystemNetwork();
+		long time = System.currentTimeMillis();
+		// note: username for site creator is of the form user@network
+		PersonInfo personInfo = new PersonInfo("test", "test", "test" + time, "password", null, "test", "test", "test", "test", "test", "test");
+		TestPerson person = network1.createUser(personInfo);
+		personInfo = new PersonInfo("test", "test", "test1" + time, "password", null, "test", "test", "test", "test", "test", "test");
+		TestPerson person1 = network1.createUser(personInfo);
+
+		TestSite site = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+		{
+			@Override
+			public TestSite doWork() throws Exception
+			{
+				TestSite site = systemNetwork.createSite(SiteVisibility.PUBLIC);
+				return site;
+			}
+		}, person.getId(), networkId);
+
+		publicApiClient.setRequestContext(new RequestContext("-default-", person1.getId()));		
+		SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+		siteMembershipRequest.setId(site.getSiteId());
+		siteMembershipRequest.setMessage("Please can I join your site?");
+		SiteMembershipRequest ret = siteMembershipRequestsProxy.createSiteMembershipRequest(person1.getId(), siteMembershipRequest);
+	}
+
+    @Test
+    public void testGetSiteMembershipRequests() throws Exception
+    {
+        String networkId = network1.getId();
+
+        final TestNetwork systemNetwork = getRepoService().getSystemNetwork();
+
+        // note: username for site creator is of the form user@network
+        TestPerson siteManager = network1.createUser();
+        TestPerson person1 = network1.createUser();
+        TestPerson person2 = network1.createUser();
+
+        TestSite sitePublic = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+        {
+            @Override
+            public TestSite doWork() throws Exception
+            {
+                TestSite site = systemNetwork.createSite(SiteVisibility.PUBLIC);
+                return site;
+            }
+        }, siteManager.getId(), networkId);
+
+        TestSite site = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+        {
+            @Override
+            public TestSite doWork() throws Exception
+            {
+                TestSite site = systemNetwork.createSite(SiteVisibility.MODERATED);
+                return site;
+            }
+        }, siteManager.getId(), networkId);
+
+        TestSite site2 = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>()
+        {
+            @Override
+            public TestSite doWork() throws Exception
+            {
+                TestSite site = systemNetwork.createSite(SiteVisibility.MODERATED);
+                return site;
+            }
+        }, siteManager.getId(), networkId);
+
+        // Public site.
+        publicApiClient.setRequestContext(new RequestContext("-default-", person1.getId()));
+        SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+        siteMembershipRequest.setId(sitePublic.getSiteId());
+        siteMembershipRequest.setMessage("Please can I join your site?");
+        SiteMembershipRequest ret = siteMembershipRequestsProxy.createSiteMembershipRequest(person1.getId(), siteMembershipRequest);
+
+        assertNotNull(ret);
+
+        // Moderated site.
+        publicApiClient.setRequestContext(new RequestContext("-default-", person1.getId()));
+        siteMembershipRequest = new SiteMembershipRequest();
+        siteMembershipRequest.setId(site.getSiteId());
+        siteMembershipRequest.setMessage("Please can I join your site?");
+        ret = siteMembershipRequestsProxy.createSiteMembershipRequest(person1.getId(), siteMembershipRequest);
+
+        assertNotNull(ret);
+
+        int skipCount = 0;
+        int maxItems = Integer.MAX_VALUE;
+        Paging paging = getPaging(skipCount, maxItems);
+
+        // Test that we have a moderated site request only.
+        {
+            publicApiClient.setRequestContext(new RequestContext(networkId, siteManager.getId()));
+
+            ListResponse<SiteMembershipRequest> resp = getSiteMembershipRequests(paging, null);
+            List<SiteMembershipRequest> list = resp.getList();
+
+            assertEquals(1, list.size());
+
+            SiteMembershipRequest smr = list.get(0);
+
+            // Check if the person details is retrieved.
+            assertNotNull(smr.getPerson());
+            assertNotNull(smr.getPerson().getUserName());
+        }
+
+        // Test that the user has no site membership requests.
+
+        {
+            publicApiClient.setRequestContext(new RequestContext(networkId, person2.getId()));
+
+            ListResponse<SiteMembershipRequest> resp = getSiteMembershipRequests(paging, null);
+            List<SiteMembershipRequest> list = resp.getList();
+
+            assertEquals(0, list.size());
+        }
+
+        // Test retrieve site membership request using where clause.
+
+        {
+            // Prepare test data.
+
+            publicApiClient.setRequestContext(new RequestContext("-default-", person2.getId()));
+            ret = createSiteMembershipRequest(site.getSiteId(), person2.getId());
+            assertNotNull(ret);
+
+            publicApiClient.setRequestContext(new RequestContext("-default-", person1.getId()));
+            ret = createSiteMembershipRequest(site2.getSiteId(), person1.getId());
+            assertNotNull(ret);
+
+            publicApiClient.setRequestContext(new RequestContext(networkId, siteManager.getId()));
+
+            ListResponse<SiteMembershipRequest> resp = getSiteMembershipRequests(paging, null);
+            List<SiteMembershipRequest> list = resp.getList();
+
+            assertEquals(3, list.size());
+
+            // Test filter by site id.
+
+            Map<String, String> otherParams = new HashMap<>();
+            otherParams.put("where", "(siteId='" + site.getSiteId() + "')");
+
+            resp = getSiteMembershipRequests(paging, otherParams);
+            list = resp.getList();
+
+            assertEquals(2, list.size());
+
+            // Test filter by person id.
+
+            otherParams = new HashMap<>();
+            otherParams.put("where", "(personId='" + person2.getId() + "')");
+
+            resp = getSiteMembershipRequests(paging, otherParams);
+            list = resp.getList();
+
+            assertEquals(1, list.size());
+
+            // Test filter by site and personId
+
+            otherParams = new HashMap<>();
+            otherParams.put("where", "(siteId='" + site.getSiteId() + "' and personId='" + person2.getId() + "')");
+
+            resp = getSiteMembershipRequests(paging, otherParams);
+            list = resp.getList();
+
+            assertEquals(1, list.size());
+        }
+
+        {
+            TestPerson person3 = network1.createUser();
+
+            publicApiClient.setRequestContext(new RequestContext("-default-", person3.getId()));
+            ret = createSiteMembershipRequest(site.getSiteId(), person3.getId());
+            assertNotNull(ret);
+
+            publicApiClient.setRequestContext(new RequestContext(networkId, siteManager.getId()));
+
+            approve(site.getSiteId(), person3.getId(), new SiteMembershipApproval(), HttpServletResponse.SC_OK, null);
+
+            publicApiClient.setRequestContext(new RequestContext(networkId, person3.getId()));
+
+            ListResponse<SiteMembershipRequest> resp = getSiteMembershipRequests(paging, null);
+            List<SiteMembershipRequest> list = resp.getList();
+
+            assertEquals(0, list.size());
+        }
+    }
+    
+    @Test
+    public void testApproveSiteMembershipRequests() throws Exception {
+		String networkId = network1.getId();
+
+		final TestNetwork systemNetwork = getRepoService().getSystemNetwork();
+
+		TestPerson siteManager = network1.createUser();
+
+		TestSite site = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>() {
+			@Override
+			public TestSite doWork() throws Exception {
+				TestSite site = systemNetwork.createSite(SiteVisibility.MODERATED);
+				return site;
+			}
+		}, siteManager.getId(), networkId);
+
+		TestPerson person1 = network1.createUser();
+		TestPerson person2 = network1.createUser();
+
+		publicApiClient.setRequestContext(new RequestContext("-default-", person1.getId()));
+		SiteMembershipRequest ret = createSiteMembershipRequest(site.getSiteId(), person1.getId());
+		assertNotNull(ret);
+
+		publicApiClient.setRequestContext(new RequestContext(networkId, siteManager.getId()));
+
+		// Site not found.
+		approve("siteId", person1.getId(), new SiteMembershipApproval(), HttpServletResponse.SC_NOT_FOUND, null);
+
+		// Invitee not found.
+		approve(site.getSiteId(), null, new SiteMembershipApproval(), HttpServletResponse.SC_NOT_FOUND, null);
+
+		// Invitation not found.
+		approve(site.getSiteId(), person2.getId(), new SiteMembershipApproval(), HttpServletResponse.SC_NOT_FOUND, null);
+
+        {
+        	// Create moderated site.
+			TestSite tempSite = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>() {
+				@Override
+				public TestSite doWork() throws Exception {
+					TestSite site = systemNetwork.createSite(SiteVisibility.MODERATED);
+					return site;
+				}
+			}, siteManager.getId(), networkId);
+
+            // Create site membership request
+            publicApiClient.setRequestContext(new RequestContext("-default-", person1.getId()));
+            ret = createSiteMembershipRequest(tempSite.getSiteId(), person1.getId());
+            assertNotNull(ret);
+
+            // Change site visibility to private.
+
+            publicApiClient.setRequestContext(new RequestContext(networkId, siteManager.getId()));
+
+            SiteInfo tempSiteInfo = tempSite.getSiteInfo();
+            assertEquals(SiteVisibility.MODERATED, tempSiteInfo.getVisibility());
+
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    tempSite.setSiteVisibility(SiteVisibility.PRIVATE);
+                    assertEquals(SiteVisibility.PRIVATE, tempSiteInfo.getVisibility());
+                    return null;
+                }
+            }, siteManager.getId(), networkId);
+
+            // Site private so not found error.
+            approve(tempSite.getSiteId(), person1.getId(), new SiteMembershipApproval(), HttpServletResponse.SC_NOT_FOUND, null);
+        }
+
+		// User tries to approve another user request without having permissions.
+		{
+			publicApiClient.setRequestContext(new RequestContext(networkId, person2.getId()));
+
+			approve(site.getSiteId(), person1.getId(), new SiteMembershipApproval(), HttpServletResponse.SC_NOT_FOUND, null);
+		}
+
+        // User from same site tries to approve another user request without having
+        // permissions.
+        {
+            TestPerson person3 = network1.createUser();
+
+            // Create site membership request
+            publicApiClient.setRequestContext(new RequestContext("-default-", person3.getId()));
+            ret = createSiteMembershipRequest(site.getSiteId(), person3.getId());
+            assertNotNull(ret);
+
+            publicApiClient.setRequestContext(new RequestContext(networkId, siteManager.getId()));
+
+            approve(site.getSiteId(), person3.getId(), new SiteMembershipApproval(), HttpServletResponse.SC_OK, null);
+
+            publicApiClient.setRequestContext(new RequestContext(networkId, person3.getId()));
+
+            MemberOfSite memberOfSite = publicApiClient.sites().getPersonSite(person3.getId(), site.getSiteId());
+            assertNotNull(memberOfSite);
+            assertEquals(SiteRole.SiteConsumer, memberOfSite.getRole());
+
+            approve(site.getSiteId(), person1.getId(), new SiteMembershipApproval(), HttpServletResponse.SC_NOT_FOUND, null);
+        }
+
+        // User tries to approve his own request.
+        {
+            publicApiClient.setRequestContext(new RequestContext(networkId, person1.getId()));
+
+            approve(site.getSiteId(), person1.getId(), new SiteMembershipApproval(), HttpServletResponse.SC_FORBIDDEN, null);
+
+            // null body (see REPO-3344 for details)
+            approve(site.getSiteId(), person1.getId(), null, HttpServletResponse.SC_FORBIDDEN, null);
+        }
+
+        // Valid request.
+        {
+            publicApiClient.setRequestContext(new RequestContext(networkId, siteManager.getId()));
+
+            approve(site.getSiteId(), person1.getId(), new SiteMembershipApproval(), HttpServletResponse.SC_OK, null);
+
+            publicApiClient.setRequestContext(new RequestContext(networkId, person1.getId()));
+
+            MemberOfSite memberOfSite = publicApiClient.sites().getPersonSite(person1.getId(), site.getSiteId());
+            assertNotNull(memberOfSite);
+            assertEquals(SiteRole.SiteConsumer, memberOfSite.getRole());
+        }
+
+        // Approve again.
+		approve(site.getSiteId(), person1.getId(), new SiteMembershipApproval(), HttpServletResponse.SC_NOT_FOUND, null);
+
+		{
+			TestSite tempSite = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>() {
+				@Override
+				public TestSite doWork() throws Exception {
+					TestSite site = systemNetwork.createSite(SiteVisibility.MODERATED);
+					return site;
+                }
+            }, siteManager.getId(), networkId);
+
+            // Create site membership request
+            publicApiClient.setRequestContext(new RequestContext("-default-", person1.getId()));
+            ret = createSiteMembershipRequest(tempSite.getSiteId(), person1.getId());
+            assertNotNull(ret);
+
+            publicApiClient.setRequestContext(new RequestContext(networkId, siteManager.getId()));
+
+            // Invalid role.
+            approve(tempSite.getSiteId(), person1.getId(), new SiteMembershipApproval("invalidRole"), HttpServletResponse.SC_BAD_REQUEST, null);
+
+            approve(tempSite.getSiteId(), person1.getId(), new SiteMembershipApproval(SiteRole.SiteCollaborator.toString()), HttpServletResponse.SC_OK, null);
+
+            publicApiClient.setRequestContext(new RequestContext(networkId, person1.getId()));
+
+            MemberOfSite memberOfSite = publicApiClient.sites().getPersonSite(person1.getId(), tempSite.getSiteId());
+            assertNotNull(memberOfSite);
+            assertEquals(SiteRole.SiteCollaborator, memberOfSite.getRole());
+		}
+	}
+
+	@Test
+	public void testRejectSiteMembershipRequests() throws Exception {
+		String networkId = network1.getId();
+
+		final TestNetwork systemNetwork = getRepoService().getSystemNetwork();
+
+		TestPerson siteManager = network1.createUser();
+
+		TestSite site = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>() {
+			@Override
+			public TestSite doWork() throws Exception {
+				TestSite site = systemNetwork.createSite(SiteVisibility.MODERATED);
+				return site;
+			}
+		}, siteManager.getId(), networkId);
+
+		TestPerson person1 = network1.createUser();
+		TestPerson person2 = network1.createUser();
+
+		publicApiClient.setRequestContext(new RequestContext("-default-", person1.getId()));
+		SiteMembershipRequest ret = createSiteMembershipRequest(site.getSiteId(), person1.getId());
+		assertNotNull(ret);
+
+		publicApiClient.setRequestContext(new RequestContext(networkId, siteManager.getId()));
+
+		// Site not found.
+		reject("siteId", person1.getId(), new SiteMembershipRejection(), HttpServletResponse.SC_NOT_FOUND, null);
+
+		// Invitee not found.
+		reject(site.getSiteId(), null, new SiteMembershipRejection(), HttpServletResponse.SC_NOT_FOUND, null);
+
+		// Invitation not found.
+		reject(site.getSiteId(), person2.getId(), new SiteMembershipRejection(), HttpServletResponse.SC_NOT_FOUND, null);
+
+		{
+			// Create moderated site.
+			TestSite tempSite = TenantUtil.runAsUserTenant(new TenantRunAsWork<TestSite>() {
+				@Override
+				public TestSite doWork() throws Exception {
+					TestSite site = systemNetwork.createSite(SiteVisibility.MODERATED);
+					return site;
+				}
+			}, siteManager.getId(), networkId);
+
+			// Create site membership request
+			publicApiClient.setRequestContext(new RequestContext("-default-", person1.getId()));
+			ret = createSiteMembershipRequest(tempSite.getSiteId(), person1.getId());
+			assertNotNull(ret);
+
+			// Change site visibility to private.
+
+			publicApiClient.setRequestContext(new RequestContext(networkId, siteManager.getId()));
+
+			SiteInfo tempSiteInfo = tempSite.getSiteInfo();
+			assertEquals(SiteVisibility.MODERATED, tempSiteInfo.getVisibility());
+
+			TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+			{
+				@Override
+				public Void doWork() throws Exception
+				{
+					tempSite.setSiteVisibility(SiteVisibility.PRIVATE);
+					assertEquals(SiteVisibility.PRIVATE, tempSiteInfo.getVisibility());
+					return null;
+				}
+			}, siteManager.getId(), networkId);
+
+			// Site private so not found error.
+			reject(tempSite.getSiteId(), person1.getId(), new SiteMembershipRejection(), HttpServletResponse.SC_NOT_FOUND, null);
+		}
+
+		// User tries to reject his own request.
+		{
+			publicApiClient.setRequestContext(new RequestContext(networkId, person1.getId()));
+
+			reject(site.getSiteId(), person1.getId(), new SiteMembershipRejection(), HttpServletResponse.SC_FORBIDDEN, null);
+
+			// null body (see REPO-3344 for details)
+			reject(site.getSiteId(), person1.getId(), null, HttpServletResponse.SC_FORBIDDEN, null);
+		}
+
+        // User tries to reject another user request without having permissions.
+        {
+            publicApiClient.setRequestContext(new RequestContext(networkId, person2.getId()));
+
+            reject(site.getSiteId(), person1.getId(), new SiteMembershipRejection(), HttpServletResponse.SC_NOT_FOUND, null);
+        }
+
+        // User from same site tries to reject another user request without having
+        // permissions.
+        {
+            TestPerson person3 = network1.createUser();
+
+            // Create site membership request
+            publicApiClient.setRequestContext(new RequestContext("-default-", person3.getId()));
+            ret = createSiteMembershipRequest(site.getSiteId(), person3.getId());
+            assertNotNull(ret);
+
+            publicApiClient.setRequestContext(new RequestContext(networkId, siteManager.getId()));
+
+            approve(site.getSiteId(), person3.getId(), new SiteMembershipApproval(), HttpServletResponse.SC_OK, null);
+
+            publicApiClient.setRequestContext(new RequestContext(networkId, person3.getId()));
+
+            MemberOfSite memberOfSite = publicApiClient.sites().getPersonSite(person3.getId(), site.getSiteId());
+            assertNotNull(memberOfSite);
+            assertEquals(SiteRole.SiteConsumer, memberOfSite.getRole());
+
+            reject(site.getSiteId(), person1.getId(), new SiteMembershipRejection(), HttpServletResponse.SC_NOT_FOUND, null);
+        }
+
+        // Valid request.
+        {
+            publicApiClient.setRequestContext(new RequestContext(networkId, siteManager.getId()));
+
+            reject(site.getSiteId(), person1.getId(), new SiteMembershipRejection(), HttpServletResponse.SC_OK, null);
+
+            int skipCount = 0;
+            int maxItems = Integer.MAX_VALUE;
+            Paging paging = getPaging(skipCount, maxItems);
+
+            Map<String, String> otherParams = new HashMap<>();
+            otherParams.put("where", "(siteId='" + site.getSiteId() + "')");
+
+            ListResponse<SiteMembershipRequest> resp = getSiteMembershipRequests(paging, otherParams);
+            List<SiteMembershipRequest> list = resp.getList();
+
+            assertEquals(0, list.size());
+        }
+
+		// Reject again.
+		reject(site.getSiteId(), person1.getId(), new SiteMembershipRejection(), HttpServletResponse.SC_NOT_FOUND, null);
+    }
+
+    private ListResponse<SiteMembershipRequest> getSiteMembershipRequests(final Paging paging, Map<String, String> otherParams) throws Exception
+    {
+        return siteMembershipRequestsProxy.getSiteMembershipRequests(createParams(paging, otherParams), "Failed to get site membership requests", HttpServletResponse.SC_OK);
+    }
+
+    private SiteMembershipRequest createSiteMembershipRequest(String siteId, String personId) throws ParseException, PublicApiException
+    {
+        SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+        siteMembershipRequest.setId(siteId);
+        siteMembershipRequest.setMessage("Please can I join your site?");
+
+        return siteMembershipRequestsProxy.createSiteMembershipRequest(personId, siteMembershipRequest);
+    }
+
+    private void approve(String siteId, String inviteeId, SiteMembershipApproval siteMembershipApproval, int expectedStatus, Map<String, String> parameters) throws Exception
+    {
+        String scope = "public";
+        String url = getMembershipRequestApprovalUrl(siteId, inviteeId);
+        String body = siteMembershipApproval != null ? RestApiUtil.toJsonAsString(siteMembershipApproval) : null;
+
+        HttpResponse response = publicApiClient.post(scope, url, null, null, null, body);
+        checkStatus(expectedStatus, response.getStatusCode());
+    }
+
+    private void reject(String siteId, String inviteeId, SiteMembershipRejection siteMembershipRejection, int expectedStatus, Map<String, String> parameters) throws Exception
+    {
+        String scope = "public";
+        String url = getMembershipRequestRejectionUrl(siteId, inviteeId);
+        String body = siteMembershipRejection != null ? RestApiUtil.toJsonAsString(siteMembershipRejection) : null;
+
+        HttpResponse response = publicApiClient.post(scope, url, null, null, null, body);
+        checkStatus(expectedStatus, response.getStatusCode());
+    }
+
+    private String getMembershipRequestApprovalUrl(String siteId, String inviteeId)
+    {
+        return getMembershipRequestUrlByAction(siteId, inviteeId, "approve");
+    }
+
+    private String getMembershipRequestRejectionUrl(String siteId, String inviteeId)
+    {
+        return getMembershipRequestUrlByAction(siteId, inviteeId, "reject");
+    }
+
+    private String getMembershipRequestUrlByAction(String siteId, String inviteeId, String action)
+    {
+        return URL_SITES + '/' + siteId + "/site-membership-requests/" + inviteeId + "/" + action;
+    }
+
+    private void checkStatus(int expectedStatus, int actualStatus)
+    {
+        if (expectedStatus > 0 && expectedStatus != actualStatus)
+        {
+            fail("Status code " + actualStatus + " returned, but expected " + expectedStatus);
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSites.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSites.java
new file mode 100644
index 00000000000..e5023aa9c1c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestSites.java
@@ -0,0 +1,1256 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.util.*;
+
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.rest.api.model.SiteUpdate;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Sites;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.*;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.apache.commons.httpclient.HttpStatus;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * V1 REST API tests for managing Sites
+ * 
+ * @author sglover
+ * @author janv
+ */
+public class TestSites extends EnterpriseTestApi
+{
+    private static final String RUNID = System.currentTimeMillis()+"";
+    
+    // test network 1
+	private TestNetwork network1;
+	private String person1Id;
+	private String person2Id;
+
+    private Site site1;
+    private Site site2;
+    private Site site3;
+
+    // test network 2
+    private TestNetwork network2;
+    private String person3Id;
+
+    private Site site4;
+    private Site site5;
+    private Site site6;
+
+    // test network 3
+    private TestNetwork network3;
+    private String person4Id;
+
+    private Site site7;
+    private Site site8;
+    private Site site9;
+    private Site site10;
+
+    private String site4_id = "a-" + GUID.generate();
+    private String site4_title = "c_" + GUID.generate();
+    private String site4_description = "b_" + GUID.generate();
+    private String site5_id = "b-" + GUID.generate();
+    private String site5_title = "a_" + GUID.generate();
+    private String site5_description = "c_" + GUID.generate();
+    private String site6_id = "c-" + GUID.generate();
+    private String site6_title = "b_" + GUID.generate();
+    private String site6_description = "a_" + GUID.generate();
+
+    private String preset = "sitePreset";
+    private static final String AND_PREDICATE = " AND ";
+    private static final String OR_PREDICATE = " OR ";
+
+    @Override
+	@Before
+	public void 
+    setup() throws Exception
+	{
+        initializeNetwork1();
+	}
+
+    private void initializeNetwork1() throws Exception
+    {
+        if (network1 == null)
+        {
+            network1 = getRepoService().createNetwork(this.getClass().getName().toLowerCase()+"-1-"+RUNID, true);
+            network1.create();
+
+            TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    person1Id = network1.createUser().getId();
+                    person2Id = network1.createUser().getId();
+                    return null;
+                }
+            }, network1.getId());
+        }
+    }
+    
+    private void initializeNetwork2WithSites() throws Exception
+    {
+        if (network2 == null)
+        {
+            network2 = getRepoService().createNetwork(this.getClass().getName().toLowerCase()+"-2-"+RUNID, true);
+            network2.create();
+
+            TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    person3Id = network2.createUser().getId();
+                    return null;
+                }
+            }, network2.getId());
+            
+            publicApiClient.setRequestContext(new RequestContext(network2.getId(), person3Id));
+
+            Sites sitesProxy = publicApiClient.sites();
+            
+            Site site = new SiteImpl(site4_id, site4_title, site4_description, SiteVisibility.PRIVATE.toString());
+            site4 = sitesProxy.createSite(site);
+
+            site = new SiteImpl(site5_id, site5_title, site5_description, SiteVisibility.PRIVATE.toString());
+            site5 = sitesProxy.createSite(site);
+
+            site = new SiteImpl(site6_id, site6_title, site6_description, SiteVisibility.PRIVATE.toString());
+            site6 = sitesProxy.createSite(site);
+        }
+    }
+
+    private void initializeNetwork3WithSites() throws Exception
+    {
+        String siteDescription = "description";
+
+        if (network3 == null)
+        {
+            network3 = getRepoService().createNetwork(this.getClass().getName().toLowerCase() + "-3-" + RUNID, true);
+            network3.create();
+
+            TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    person4Id = network3.createUser().getId();
+                    return null;
+                }
+            }, network3.getId());
+
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    // Temporary solution for testing as for now creating a site
+                    // with site preset is not allowed (please see REPO-194)
+                    site7 = network3.createSite("a-" + GUID.generate(), "site A" + GUID.generate(), siteDescription, preset, SiteVisibility.PRIVATE);
+                    site8 = network3.createSite("b-" + GUID.generate(), "site B" + GUID.generate(), siteDescription, preset, SiteVisibility.PUBLIC);
+                    site9 = network3.createSite("c-" + GUID.generate(), "site C" + GUID.generate(), siteDescription, preset, SiteVisibility.PUBLIC);
+                    site10 = network3.createSite("d-" + GUID.generate(), "site D" + GUID.generate(), siteDescription, "site-dashboard", SiteVisibility.MODERATED);
+                    return null;
+                }
+            }, person4Id, network3.getId());
+        }
+    }
+
+	@Test
+	public void testGetSiteAndListSites() throws Exception
+    {
+        Sites sitesProxy = publicApiClient.sites();
+
+        // create & get sites (as person 2)
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2Id));
+
+            String siteTitle = "site 1 " + System.currentTimeMillis();
+            Site site = new SiteImpl(siteTitle, SiteVisibility.PRIVATE.toString());
+            site1 = sitesProxy.createSite(site);
+
+            Site ret = sitesProxy.getSite(site1.getSiteId());
+            site1.expected(ret);
+
+            siteTitle = "site 2 " + System.currentTimeMillis();
+            site = new SiteImpl(siteTitle, SiteVisibility.PUBLIC.toString());
+            site2 = sitesProxy.createSite(site);
+
+            ret = sitesProxy.getSite(site2.getSiteId());
+            site2.expected(ret);
+
+            siteTitle = "site 3 " + System.currentTimeMillis();
+            site = new SiteImpl(siteTitle, SiteVisibility.MODERATED.toString());
+            site3 = sitesProxy.createSite(site);
+
+            ret = sitesProxy.getSite(site3.getSiteId());
+            site3.expected(ret);
+        }
+
+        List<TestSite> expectedSites = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<TestSite>>()
+        {
+            @Override
+            public List<TestSite> doWork() throws Exception
+            {
+                List<TestSite> sites = network1.getSites(person1Id);
+                return sites;
+            }
+        }, person1Id, network1.getId());
+
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+
+            int skipCount = 0;
+            int maxItems = 2;
+            Paging paging = getPaging(skipCount, maxItems, expectedSites.size(), expectedSites.size());
+            ListResponse<Site> resp = sitesProxy.getSites(createParams(paging, null));
+            checkList(expectedSites.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+        }
+
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+
+            int skipCount = 2;
+            int maxItems = Integer.MAX_VALUE;
+            Paging paging = getPaging(skipCount, maxItems, expectedSites.size(), expectedSites.size());
+            ListResponse<Site> resp = sitesProxy.getSites(createParams(paging, null));
+            checkList(expectedSites.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+        }
+    }
+
+    @Test
+    public void testCreateAndDeleteSite() throws Exception
+    {
+        Sites sitesProxy = publicApiClient.sites();
+        
+		// test create and delete site
+		{
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+
+            String siteTitle = "my site !*#$ 123";
+            String siteDescription = "my site description";
+
+			SiteImpl site = new SiteImpl(siteTitle, SiteVisibility.PRIVATE.toString());
+            site.setDescription(siteDescription);
+
+			Site ret = sitesProxy.createSite(site);
+			String siteId = ret.getSiteId();
+
+			String expectedSiteId = "my-site-123";
+			Site siteExp = new SiteImpl(null, expectedSiteId, ret.getGuid(), siteTitle, siteDescription,  SiteVisibility.PRIVATE.toString(), null, SiteRole.SiteManager);
+			siteExp.expected(ret);
+
+            ret = sitesProxy.getSite(siteId);
+            siteExp.expected(ret);
+
+            sitesProxy.removeSite(siteId);
+
+            // -ve test - ie. cannot get site after it has been deleted
+            sitesProxy.getSite(siteId, 404);
+        }
+
+        // test create + permanent delete + create
+        {
+
+            String siteId = "bbb";
+            String siteTitle = "BBB site";
+
+            Site site = new SiteImpl(null, siteId, null, siteTitle, null, SiteVisibility.PUBLIC.toString(), null, null);
+
+            sitesProxy.createSite(site);
+
+            // permanent site delete (bypass trashcan/archive)
+            sitesProxy.removeSite(siteId, true, 204);
+
+            sitesProxy.createSite(site);
+
+            sitesProxy.removeSite(siteId); // cleanup
+        }
+
+        // test create using site id = "true" (RA-1101)
+        {
+
+            String siteId = "true";
+            String siteTitle = "string";
+            String siteDescription = "string";
+
+            Site site = new SiteImpl(null, siteId, null, siteTitle, siteDescription, SiteVisibility.PUBLIC.toString(), null, null);
+
+            sitesProxy.createSite(site);
+
+            sitesProxy.removeSite(siteId); // cleanup
+        }
+
+        // -ve tests
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2Id));
+            
+            SiteImpl site = new SiteImpl("a private site", SiteVisibility.PRIVATE.toString());
+            String siteIdOfPrivateSite = sitesProxy.createSite(site, 201).getSiteId();
+
+            site = new SiteImpl("a public site", SiteVisibility.PUBLIC.toString());
+            String siteIdOfPublicSite = sitesProxy.createSite(site, 201).getSiteId();
+            
+            // invalid auth
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), GUID.generate(), "password"));
+            sitesProxy.getSite(siteIdOfPrivateSite, 401);
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+
+            // -ve - cannot view or delete a private site
+            sitesProxy.getSite(siteIdOfPrivateSite, 404);
+            sitesProxy.removeSite(siteIdOfPrivateSite, false, 404);
+            
+            // -ve - test cannot delete a public site (but can view it)
+            sitesProxy.getSite(siteIdOfPublicSite, 200);
+            sitesProxy.removeSite(siteIdOfPublicSite, false, 403);
+
+            // cleanup
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2Id));
+            sitesProxy.removeSite(siteIdOfPrivateSite, false, 204);
+            sitesProxy.removeSite(siteIdOfPublicSite, false, 204);
+            
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+
+            // -ve - try to get unknown site
+            sitesProxy.getSite(GUID.generate(), 404);
+
+            site = new SiteImpl("my site 123", "invalidsitevisibility");
+            sitesProxy.createSite(site, 400);
+
+            site = new SiteImpl(null, "invalid site id", null, "my site 123", null, SiteVisibility.PRIVATE.toString(), null, null);
+            sitesProxy.createSite(site, 400);
+
+            site = new SiteImpl(null, "invalidsiteid*", null, "my site 123", null, SiteVisibility.PRIVATE.toString(), null, null);
+            sitesProxy.createSite(site, 400);
+
+            site = new SiteImpl();
+            site.setSiteId(new String(new char[72]).replace('\0', 'a'));
+            site.setTitle(new String(new char[256]).replace('\0', 'a'));
+            site.setDescription(new String(new char[512]).replace('\0', 'a'));
+            site.setVisibility(SiteVisibility.PUBLIC.toString());
+            sitesProxy.createSite(site, 201);
+
+            // -ve - site id too long
+            site = new SiteImpl();
+            site.setSiteId(new String(new char[73]).replace('\0', 'a'));
+            site.setTitle("ok");
+            site.setDescription("ok");
+            site.setVisibility(SiteVisibility.PUBLIC.toString());
+            sitesProxy.createSite(site, 400);
+
+            // -ve - site title too long
+            site = new SiteImpl();
+            site.setSiteId("ok");
+            site.setTitle(new String(new char[257]).replace('\0', 'a'));
+            site.setDescription("ok");
+            site.setVisibility(SiteVisibility.PUBLIC.toString());
+            sitesProxy.createSite(site, 400);
+
+            // -ve - site description too long
+            site = new SiteImpl();
+            site.setSiteId("ok");
+            site.setTitle("ok");
+            site.setDescription(new String(new char[513]).replace('\0', 'a'));
+            site.setVisibility(SiteVisibility.PUBLIC.toString());
+            sitesProxy.createSite(site, 400);
+
+            // site already exists (409)
+            String siteTitle = "my site 456";
+            site = new SiteImpl(siteTitle, SiteVisibility.PRIVATE.toString());
+            String siteId = sitesProxy.createSite(site, 201).getSiteId();
+            sitesProxy.createSite(site, 409);
+            sitesProxy.removeSite(siteId); // cleanup
+
+            sitesProxy.removeSite(GUID.generate(), false, 404);
+        }
+
+        // -ve - cannot create site with same site id as an existing site (even if it is in the trashcan/archive)
+        {
+            String siteId = "aaa";
+            String siteTitle = "AAA site";
+
+            Site site = new SiteImpl(null, siteId, null, siteTitle, null, SiteVisibility.PUBLIC.toString(), null, null);
+
+            String siteNodeId = sitesProxy.createSite(site).getGuid();
+
+            // -ve - duplicate site id
+            sitesProxy.createSite(site, 409);
+
+            sitesProxy.removeSite(siteId);
+
+            // -ve - duplicate site id (even if site is in trashcan)
+            sitesProxy.createSite(site, 409);
+
+            // now purge the site
+            sitesProxy.remove("deleted-nodes", siteNodeId, null, null, "Cannot purge site");
+
+            sitesProxy.createSite(site);
+        }
+
+        // -ve - minor: error code if updating via nodes api (REPO-512)
+        {
+            String siteId = "zzz";
+            String siteTitle = "ZZZ site";
+
+            Site site = new SiteImpl(null, siteId, null, siteTitle, null, SiteVisibility.PRIVATE.toString(), null, null);
+            String siteNodeId = sitesProxy.createSite(site).getGuid();
+
+            // try to update to invalid site visibility
+            JSONObject prop = new JSONObject();
+            prop.put("st:siteVisibility","INVALID");
+            JSONObject properties = new JSONObject();
+            properties.put("properties", new JSONObject(prop));
+            try
+            {
+                sitesProxy.update("nodes", siteNodeId, null, null, properties.toJSONString(), null);
+                fail();
+            } catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+
+            sitesProxy.removeSite(siteId); // cleanup
+        }
+        
+        // -ve test - cannot create multiple sites in single POST call (unsupported)
+        {
+            List<Site> sites = new ArrayList<>(2);
+            sites.add(new SiteImpl(null, "siteA1", null, "siteA1", null, SiteVisibility.PRIVATE.toString(), null, null));
+            sites.add(new SiteImpl(null, "siteB1", null, "siteB1", null, SiteVisibility.PRIVATE.toString(), null, null));
+            
+            sitesProxy.create("sites", null, null, null, JSONArray.toJSONString(sites), null, 405);
+        }
+
+        // -ve tests - belts-and-braces for unsupported methods
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+
+            // -ve - cannot call POST method on /sites/siteId
+            try
+            {
+                sitesProxy.create("sites", "site", null, null, null, "Unable to POST to a site");
+                fail();
+            } catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+            }
+
+            // -ve - cannot call DELETE method on /sites
+            try
+            {
+                sitesProxy.remove("sites", null, null, null, "Unable to DELETE sites");
+                fail();
+            } catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+            }
+        }
+
+        // -ve test - create site with a given preset (REPO-194 and REPO-1523)
+        {
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+
+            Site site = new SiteImpl().withPreset("testSitePreset");
+            sitesProxy.createSite(site, 400);
+        }
+        // Test Case cloud-1478
+		// Test Case cloud-1479
+		// user invited to network and user invited to site
+		// user invited to network and user not invited to site
+	}
+
+    @Test
+    public void testUpdateSite() throws PublicApiException
+    {
+        Sites sitesProxy = publicApiClient.sites();
+        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+
+
+        // +ve test: simple happy path with successful update.
+        {
+            SiteImpl siteToCreate = new SiteImpl("Initial Title", SiteVisibility.PRIVATE.toString());
+            siteToCreate.setRole(SiteRole.SiteManager);
+            siteToCreate.setDescription("This is the initial description for the site");
+            Site site = sitesProxy.createSite(siteToCreate, 201);
+
+            // Testing with the actual JSON reveals more than testing with rich POJOs.
+            // It shows us exactly what the input is and is easy to compare to the Open API spec.
+            String updateJSON = "{\n" +
+                    "  \"title\": \"Updated Title\",\n" +
+                    "  \"description\": \"This is an updated description for the site\",\n" +
+                    "  \"visibility\": \"PUBLIC\"\n" +
+                    "}";
+            // Update the site details
+            HttpResponse response = sitesProxy.update("sites", site.getSiteId(), null, null, updateJSON, "Failed to update site " + site.getSiteId());
+
+            Site updatedSite = SiteImpl.parseSite((JSONObject) response.getJsonResponse().get("entry"));
+            Site expectedUpdate = new SiteImpl(null, "initial-title", site.getGuid(), "Updated Title", "This is an updated description for the site", SiteVisibility.PUBLIC.toString(), null, SiteRole.SiteManager);
+            // Check the updated site is as expected.
+            expectedUpdate.expected(updatedSite);
+
+            // Double check by do a fresh get of the details, since the details returned by updateSite()
+            // aren't necessarily retrieved from the DB.
+            Site fresh = sitesProxy.getSite(site.getSiteId(), 200);
+            expectedUpdate.expected(fresh);
+
+            removeSiteQuietly(site.getSiteId());
+        }
+
+        // +ve test: remove the description.
+        // This is a workaround for being unable to explicitly null the field (see REPO-1409)
+        {
+            Site site = sitesProxy.createSite(new SiteImpl(null, "NoDescriptionTest", "Initial description", SiteVisibility.PUBLIC.toString()), 201);
+
+            Site updatedSite = sitesProxy.updateSite(
+                    site.getSiteId(),
+                    new SiteUpdate("title", "", SiteVisibility.PUBLIC),
+                    200);
+
+            // Note the null value for description, as the framework
+            // treats empty strings and null as equivalent in responses, and does not return
+            // those fields (as per API guidelines)
+            Site expectedUpdate = new SiteImpl(
+                    null,
+                    "nodescriptiontest",
+                    site.getGuid(),
+                    "title",
+                    null,
+                    SiteVisibility.PUBLIC.toString(),
+                    null,
+                    SiteRole.SiteManager);
+
+            // Check the return from updateSite(...)
+            expectedUpdate.expected(updatedSite);
+
+            // TODO improve expected (and/or AssertUtil) and affected test cases
+            Assert.assertNull(updatedSite.getDescription());
+
+            // Double check a fresh retrieval matches.
+            Site fresh = sitesProxy.getSite(site.getSiteId(), 200);
+            expectedUpdate.expected(fresh);
+
+            // TODO improve expected (and/or AssertUtil) and affected test cases
+            Assert.assertNull(fresh.getDescription());
+
+            removeSiteQuietly(site.getSiteId());
+        }
+
+        // +ve test: partial updates must be allowed
+        {
+            Site site = sitesProxy.createSite(new SiteImpl(
+                    "partial-updates-test",
+                    "title-v1",
+                    "description-v1",
+                    SiteVisibility.PUBLIC.toString()),
+                    201);
+
+            // Check we can update just the title
+            Site updatedSite = sitesProxy.updateSite(
+                    site.getSiteId(),
+                    new SiteUpdate("title-v2", null, null),
+                    200);
+
+            Site expectedUpdate = new SiteImpl(
+                    null,
+                    "partial-updates-test",
+                    site.getGuid(),
+                    "title-v2",
+                    "description-v1",
+                    SiteVisibility.PUBLIC.toString(),
+                    null,
+                    SiteRole.SiteManager);
+
+            expectedUpdate.expected(updatedSite);
+
+            // Check we can update just the description
+            updatedSite = sitesProxy.updateSite(
+                    site.getSiteId(),
+                    new SiteUpdate(null, "description-v2", null),
+                    200);
+
+            expectedUpdate = new SiteImpl(
+                    null,
+                    "partial-updates-test",
+                    site.getGuid(),
+                    "title-v2",
+                    "description-v2",
+                    SiteVisibility.PUBLIC.toString(),
+                    null,
+                    SiteRole.SiteManager);
+
+            expectedUpdate.expected(updatedSite);
+
+
+            // Check we can update just the visibility
+            updatedSite = sitesProxy.updateSite(
+                    site.getSiteId(),
+                    new SiteUpdate(null, null, SiteVisibility.PRIVATE),
+                    200);
+
+            expectedUpdate = new SiteImpl(
+                    null,
+                    "partial-updates-test",
+                    site.getGuid(),
+                    "title-v2",
+                    "description-v2",
+                    SiteVisibility.PRIVATE.toString(),
+                    null,
+                    SiteRole.SiteManager);
+
+            expectedUpdate.expected(updatedSite);
+
+            removeSiteQuietly(site.getSiteId());
+        }
+
+        // -ve test: 400, bad requests
+        {
+            Site site = sitesProxy.createSite(new SiteImpl("Site Update Bad Request Tests", SiteVisibility.PRIVATE.toString()), 201);
+
+            // long title
+            sitesProxy.updateSite(
+                    site.getSiteId(),
+                    new SiteUpdate(new String(new char[257]).replace('\0', 'a'), "description", SiteVisibility.PUBLIC),
+                    400);
+
+            // long description
+            sitesProxy.updateSite(
+                    site.getSiteId(),
+                    new SiteUpdate("title", new String(new char[513]).replace('\0', 'a'), SiteVisibility.PUBLIC),
+                    400);
+
+            // Invalid visibility
+            sitesProxy.update(
+                    "sites",
+                    site.getSiteId(),
+                    null,
+                    null,
+                    "{\n" +
+                    "  \"title\": \"Updated Title\",\n" +
+                    "  \"description\": \"This is an updated description for the site\",\n" +
+                    "  \"visibility\": \"INVALID_VISIBILITY\"\n" +
+                    "}",
+                    null,
+                    "Expected 400 response when updating "+site.getSiteId(), 400);
+
+            // Invalid fields
+            // Check that id, guid and role are not silently ignored. This is until REPO-110
+            // is implemented, since we currently have to bind to Site rather than SiteUpdate in
+            // SiteEntityResource.update
+            sitesProxy.update(
+                    "sites",
+                    site.getSiteId(),
+                    null,
+                    null,
+                    "{\n" +
+                    "  \"id\": \"a-new-id\"," +
+                    "  \"title\": \"Updated Title\"\n" +
+                    "}",
+                    null,
+                    "Expected 400 response when updating "+site.getSiteId(), 400);
+
+            sitesProxy.update(
+                    "sites",
+                    site.getSiteId(),
+                    null,
+                    null,
+                    "{\n" +
+                    "  \"guid\": \"76ba60c1-f05b-406a-86a4-4eeb1bb49aaa\"" +
+                    "}",
+                    null,
+                    "Expected 400 response when updating "+site.getSiteId(), 400);
+
+            sitesProxy.update(
+                    "sites",
+                    site.getSiteId(),
+                    null,
+                    null,
+                    "{\n" +
+                    "  \"role\": \"SiteConsumer\"" +
+                    "}",
+                    null,
+                    "Expected 400 response when updating "+site.getSiteId(), 400);
+
+            sitesProxy.update(
+                    "sites",
+                    site.getSiteId(),
+                    null,
+                    null,
+                    "{\n" +
+                            "  \"preset\": \"sitePreset\"" +
+                            "}",
+                    null,
+                    "Expected 400 response when updating "+site.getSiteId(), 400);
+
+            // Details should not have changed.
+            Site fresh = sitesProxy.getSite(site.getSiteId(), 200);
+            site.expected(fresh);
+
+            removeSiteQuietly(site.getSiteId());
+        }
+
+        // -ve test: 404 for non-existent site
+        {
+            // Attempt to update site details using an invalid site ID.
+            sitesProxy.updateSite(
+                    UUID.randomUUID().toString(), // Non-existent site.
+                    new SiteUpdate("Updated title", "Updated description", SiteVisibility.PUBLIC),
+                    HttpStatus.SC_NOT_FOUND);
+        }
+
+        // -ve test: 401 authorization failure
+        {
+            Site site = sitesProxy.createSite(new SiteImpl("SiteUpdate401", SiteVisibility.PRIVATE.toString()), 201);
+
+            // Invalid auth details
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), GUID.generate(), "password"));
+
+            // Update the site details
+            sitesProxy.updateSite(
+                    site.getSiteId(),
+                    new SiteUpdate("Updated Title", "Updated description", SiteVisibility.PUBLIC),
+                    HttpStatus.SC_UNAUTHORIZED);
+
+            // Valid authentication again
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+
+            // Check the details haven't changed.
+            Site fresh = sitesProxy.getSite(site.getSiteId(), 200);
+            site.expected(fresh);
+
+            removeSiteQuietly(site.getSiteId());
+        }
+
+        // -ve test: 403 for incorrect permissions
+        {
+            Site site = sitesProxy.createSite(new SiteImpl("SiteUpdate403", SiteVisibility.PUBLIC.toString()), 201);
+
+            // Update as person2
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2Id));
+
+            // Update the site details
+            sitesProxy.updateSite(
+                    site.getSiteId(),
+                    new SiteUpdate("Updated Title", "Updated description", SiteVisibility.PUBLIC),
+                    HttpStatus.SC_FORBIDDEN);
+
+            // Check details haven't changed as original creator.
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1Id));
+            Site fresh = sitesProxy.getSite(site.getSiteId(), 200);
+            site.expected(fresh);
+
+            removeSiteQuietly(site.getSiteId());
+        }
+    }
+
+    private void removeSiteQuietly(String siteId) throws PublicApiException
+    {
+        Sites sitesProxy = publicApiClient.sites();
+        try
+        {
+            sitesProxy.removeSite(siteId, true, 204);
+        }
+        catch(PublicApiException e)
+        {
+            // If it doesn't exist currently, that's fine.
+            if (e.getHttpResponse().getStatusCode() != 404)
+            {
+                throw e;
+            }
+        }
+    }
+
+    /**
+     * Tests the capability to sort and paginate the sites list
+     * orderBy = title ASC skip = 1, count = 2
+     *
+     * @throws Exception
+     */
+    public void testSortingAndPagingByTitleAsc() throws Exception
+    {
+        // paging
+        int skipCount = 1;
+        int maxItems = 2;
+        int totalResults = 3;
+        Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // list sites
+        ListResponse<Site> resp = listSites(paging, "title", true);
+
+        // check results
+        List<SiteImpl> expectedList = new LinkedList<>();
+        expectedList.add((SiteImpl)site6);
+        expectedList.add((SiteImpl)site4);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+
+    }
+
+    /**
+     * Tests the capability to sort and paginate the sites list
+     * orderBy = title DESC skip = 1, count = 2
+     *
+     * @throws Exception
+     */
+    public void testSortingAndPagingByTitleDesc() throws Exception
+    {
+        // paging
+        int skipCount = 1;
+        int maxItems = 2;
+        int totalResults = 3;
+        Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // list sites
+        ListResponse<Site> resp = listSites(paging, "title", false);
+
+        // check results
+        List<SiteImpl> expectedList = new LinkedList<>();
+        expectedList.add((SiteImpl)site6);
+        expectedList.add((SiteImpl)site5);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the sites list
+     * orderBy = description ASC skip = 1, count = 2
+     *
+     * @throws Exception
+     */
+    public void testSortingAndPagingByDescriptionAsc() throws Exception
+    {
+        // paging
+        int skipCount = 1;
+        int maxItems = 2;
+        int totalResults = 3;
+        Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // list sites
+        ListResponse<Site> resp = listSites(paging, "description", true);
+
+        // check results
+        List<SiteImpl> expectedList = new LinkedList<>();
+        expectedList.add((SiteImpl)site4);
+        expectedList.add((SiteImpl)site5);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the sites list
+     * orderBy = description DESC skip = 1, count = 2
+     *
+     * @throws Exception
+     */
+    public void testSortingAndPagingByDescriptionDesc() throws Exception
+    {
+        // paging
+        int skipCount = 1;
+        int maxItems = 2;
+        int totalResults = 3;
+        Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // list sites
+        ListResponse<Site> resp = listSites(paging, "description", false);
+
+        // check results
+        List<SiteImpl> expectedList = new LinkedList<>();
+        expectedList.add((SiteImpl)site4);
+        expectedList.add((SiteImpl)site6);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the sites list
+     * orderBy = id ASC skip = 1, count = 2
+     *
+     * @throws Exception
+     */
+    public void testSortingAndPagingBySiteIdAsc() throws Exception
+    {
+        // paging
+        int skipCount = 1;
+        int maxItems = 2;
+        int totalResults = 3;
+        Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // list sites
+        ListResponse<Site> resp = listSites(paging, "id", true);
+
+        // check results
+        List<SiteImpl> expectedList = new LinkedList<>();
+        expectedList.add((SiteImpl)site5);
+        expectedList.add((SiteImpl)site6);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the sites list
+     * orderBy = id DESC skip = 1, count = 2
+     *
+     * @throws Exception
+     */
+    public void testSortingAndPagingBySiteIdDesc() throws Exception
+    {
+        // paging
+        int skipCount = 1;
+        int maxItems = 2;
+        int totalResults = 3;
+        Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        // list sites
+        ListResponse<Site> resp = listSites(paging, "id", false);
+
+        // check results
+        List<SiteImpl> expectedList = new LinkedList<>();
+        expectedList.add((SiteImpl)site5);
+        expectedList.add((SiteImpl)site4);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    /**
+     * Tests the capability to sort and paginate the sites list
+     * default sorting (id asc), all results
+     *
+     * @throws Exception
+     */
+    public void testSortingAndPagingDefault() throws Exception
+    {
+        // paging
+        int totalResults = 3;
+        Paging paging = getPaging(null, null, totalResults, totalResults);
+
+        // list sites
+        ListResponse<Site> resp = listSites(null, null, false);
+
+        // check results
+        List<SiteImpl> expectedList = new LinkedList<>();
+        expectedList.add((SiteImpl)site5);
+        expectedList.add((SiteImpl)site6);
+        expectedList.add((SiteImpl)site4);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+
+    }
+
+    // based on TestPersonSites.testSortingAndPaging
+    @Test
+    public void testSortingAndPaging() throws Exception
+    {
+        initializeNetwork2WithSites();
+        
+        publicApiClient.setRequestContext(new RequestContext(network2.getId(), person3Id));
+
+        testSortingAndPagingByTitleAsc();
+        testSortingAndPagingByTitleDesc();
+        testSortingAndPagingByDescriptionAsc();
+        testSortingAndPagingByDescriptionDesc();
+        testSortingAndPagingBySiteIdAsc();
+        testSortingAndPagingBySiteIdDesc();
+        testSortingAndPagingDefault();
+    }
+
+    private ListResponse<Site> listSites(final Paging paging, String sortColumn, boolean asc) throws Exception
+    {
+        final Sites sitesProxy = publicApiClient.sites();
+        
+        // sort params
+        final Map<String, String> params = new HashMap<String, String>();
+        if (sortColumn != null)
+        {
+            params.put("orderBy", sortColumn + " " + (asc ? "ASC" : "DESC"));
+        }
+
+       return sitesProxy.getSites(createParams(paging, params));
+    }
+
+    private ListResponse<Site> listSitesWithWhere(final Paging paging, Map<String, String> filters, String predicate) throws Exception
+    {
+        final Sites sitesProxy = publicApiClient.sites();
+
+        String visibility = filters.get("visibility");
+        String preset = filters.get("preset");
+        String pred = predicate;
+
+        final Map<String, String> params = new HashMap<>();
+        StringBuilder sb = new StringBuilder();
+        if (visibility != null || preset != null)
+        {
+            sb.append("(");
+            sb.append(visibility != null ? "visibility=" + visibility : "");
+            sb.append(pred != null ? pred : "");
+            sb.append(preset != null ? "preset='" + preset + "'" : "");
+            sb.append(")");
+        }
+        params.put("where", sb.toString());
+
+        return sitesProxy.getSites(createParams(paging, params));
+    }
+
+    public void testListSitesWhereSiteVisibilityPrivate() throws Exception
+    {
+        // paging
+        int totalResults = 1;
+        Paging paging = getPaging(null, null, totalResults, totalResults);
+
+        Map<String, String> filters = new HashMap<String, String>();
+        filters.put("visibility", SiteVisibility.PRIVATE.name());
+
+        // list sites
+        ListResponse<Site> resp =  listSitesWithWhere(null, filters, null);
+
+        // check results
+        List<SiteImpl> expectedList = new LinkedList<>();
+        expectedList.add((SiteImpl) site7);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    public void testListSitesWhereSiteVisibilityPublic() throws Exception
+    {
+        // paging
+        int totalResults = 2;
+        Paging paging = getPaging(null, null, totalResults, totalResults);
+
+        Map<String, String> filters = new HashMap<String, String>();
+        filters.put("visibility", SiteVisibility.PUBLIC.name());
+
+        // list sites
+        ListResponse<Site> resp = listSitesWithWhere(null, filters, null);
+
+        // check results
+        List<SiteImpl> expectedList = new LinkedList<>();
+        expectedList.add((SiteImpl) site8);
+        expectedList.add((SiteImpl) site9);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    public void testListSitesWhereSiteVisibilityPublicAndSkipCount() throws Exception
+    {
+        // paging
+        Integer skipCount = 1;
+        int maxItems = 2;
+        int totalResults = 2;
+        Paging paging = getPaging(skipCount, maxItems, totalResults, totalResults);
+
+        Map<String, String> filters = new HashMap<String, String>();
+        filters.put("visibility", SiteVisibility.PUBLIC.name());
+
+        // list sites
+        ListResponse<Site> resp = listSitesWithWhere(paging, filters, null);
+
+        // check results
+        List<SiteImpl> expectedList = new LinkedList<>();
+        expectedList.add((SiteImpl) site9);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    public void testListSitesWhereSiteVisibilityModerated() throws Exception
+    {
+        // paging
+        int totalResults = 1;
+        Paging paging = getPaging(null, null, totalResults, totalResults);
+
+        Map<String, String> filters = new HashMap<String, String>();
+        filters.put("visibility", SiteVisibility.MODERATED.name());
+
+        // list sites
+        ListResponse<Site> resp = listSitesWithWhere(null, filters, null);
+
+        // check results
+        List<SiteImpl> expectedList = new LinkedList<>();
+        expectedList.add((SiteImpl) site10);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    public void testListSitesWhereSiteVisibilityInvalid() throws Exception
+    {
+        try
+        {
+            Map<String, String> filters = new HashMap<String, String>();
+            filters.put("visibility", "invalidVisibility");
+
+            listSitesWithWhere(null, filters, null);
+            fail("");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+        }
+    }
+
+    public void testListSitesWhereByVisibilityORPreset() throws Exception
+    {
+        // paging
+        int totalResults = 2;
+        Paging paging = getPaging(null, null, totalResults, totalResults);
+
+        Map<String, String> filters = new HashMap<String, String>();
+        filters.put("visibility", SiteVisibility.PRIVATE.name());
+        filters.put("preset", "site-dashboard");
+
+        ListResponse<Site> resp =  listSitesWithWhere(null, filters, OR_PREDICATE);
+
+        // check results
+        List<SiteImpl> expectedList = new LinkedList<>();
+        expectedList.add((SiteImpl) site7);
+        expectedList.add((SiteImpl) site10);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    public void testListSitesWherePreset() throws Exception
+    {
+        // paging
+        int totalResults = 1;
+        Paging paging = getPaging(null, null, totalResults, totalResults);
+
+        Map<String, String> filters = new HashMap<String, String>();
+        filters.put("preset", "site-dashboard");
+        ListResponse<Site> resp = listSitesWithWhere(null, filters, null);
+        // check results
+        List<SiteImpl> expectedList = new LinkedList<>();
+        expectedList.add((SiteImpl) site10);
+
+        checkList(expectedList, paging.getExpectedPaging(), resp);
+    }
+
+    public void testListSitesWherePresetNonexistent() throws Exception
+    {
+        Map<String, String> filters = new HashMap<String, String>();
+        filters.put("preset", "nonexistentPreset");
+        listSitesWithWhere(null, filters, null);
+    }
+
+    public void testListSitesWhereVisibilityANDPreset() throws Exception
+    {
+        try
+        {
+            Map<String, String> filters = new HashMap<String, String>();
+            filters.put("visibility", SiteVisibility.PUBLIC.name());
+            filters.put("preset", "sitePreset");
+            listSitesWithWhere(null, filters, AND_PREDICATE);
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+        }
+    }
+    @Test
+    public void testListSitesWhereExpected() throws Exception
+    {
+        initializeNetwork3WithSites();
+        publicApiClient.setRequestContext(new RequestContext(network3.getId(), person4Id));
+
+        testListSitesWhereSiteVisibilityPrivate();
+        testListSitesWhereSiteVisibilityPublic();
+        testListSitesWhereSiteVisibilityPublicAndSkipCount();
+        testListSitesWhereSiteVisibilityModerated();
+        testListSitesWhereSiteVisibilityInvalid();
+
+        testListSitesWherePreset();
+        testListSitesWherePresetNonexistent();
+        testListSitesWhereVisibilityANDPreset();
+        testListSitesWhereByVisibilityORPreset();
+    }
+
+
+    public static class SiteUpdateJSONSerializer implements JSONAble
+    {
+        private SiteUpdate siteUpdate;
+
+        public SiteUpdateJSONSerializer(SiteUpdate siteUpdate)
+        {
+            this.siteUpdate = siteUpdate;
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public JSONObject toJSON()
+        {
+            JSONObject json = new JSONObject();
+
+            if (siteUpdate.getTitle() != null)
+            {
+                json.put("title", siteUpdate.getTitle());
+            }
+            if (siteUpdate.getDescription() != null)
+            {
+                json.put("description", siteUpdate.getDescription());
+            }
+            if (siteUpdate.getVisibility() != null)
+            {
+                // JSONObject bug: if we don't toString() the visibility, it won't put quotes around it.
+                json.put("visibility", siteUpdate.getVisibility().toString());
+            }
+
+            return json;
+        }
+
+        public static SiteUpdate parseSiteUpdate(JSONObject jsonObject)
+        {
+            String title = (String) jsonObject.get("title");
+            String description = (String) jsonObject.get("description");
+            SiteVisibility visibility = SiteVisibility.valueOf((String) jsonObject.get("visibility"));
+
+            return new SiteUpdate(title, description, visibility);
+        }
+    }
+
+    public static class SiteUpdateAssertions
+    {
+        public static void assertEquals(SiteUpdate expected, SiteUpdate actual)
+        {
+            // Could separate these out into discreet field assertions.
+            assertEquals(expected, actual);
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestTags.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestTags.java
new file mode 100644
index 00000000000..607e22a4688
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestTags.java
@@ -0,0 +1,615 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Comments;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Nodes;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Tags;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Comment;
+import org.alfresco.rest.api.tests.client.data.Tag;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.alfresco.util.testing.category.RedundantTests;
+import org.apache.commons.httpclient.HttpStatus;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category({LuceneTests.class, RedundantTests.class})
+public class TestTags extends EnterpriseTestApi
+{
+	@Test
+	@Category({LuceneTests.class, RedundantTests.class})
+	public void testTags() throws Exception
+	{
+		Iterator<TestNetwork> networksIt = getTestFixture().getNetworksIt();
+		assertTrue(networksIt.hasNext());
+		final TestNetwork network1 = networksIt.next();
+		assertTrue(networksIt.hasNext());
+		final TestNetwork network2 = networksIt.next();
+
+		final List<TestPerson> people = new ArrayList<TestPerson>(3);
+
+		// create users and some preferences
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				TestPerson person = network1.createUser();
+				people.add(person);
+				person = network1.createUser();
+				people.add(person);
+				return null;
+			}
+		}, network1.getId());
+		
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				TestPerson person = network2.createUser();
+				people.add(person);
+				return null;
+			}
+		}, network2.getId());
+		
+		final TestPerson person1 = people.get(0);
+		final TestPerson person2 = people.get(1);
+		final TestPerson person3 = people.get(2);
+		
+		final List<NodeRef> nodes = new ArrayList<NodeRef>();
+		final List<TestSite> sites = new ArrayList<TestSite>();
+
+		// Create site
+		TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				TestSite site = network1.createSite(SiteVisibility.PRIVATE);
+				sites.add(site);
+
+				NodeRef nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc", "Test Content");
+				nodes.add(nodeRef);
+				
+				nodeRef = repoService.createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc 1", "Test Content 1");
+				nodes.add(nodeRef);
+
+				return null;
+			}
+		}, person1.getId(), network1.getId());
+
+		final NodeRef nodeRef1 = nodes.get(0);
+		final NodeRef nodeRef2 = nodes.get(1);
+
+		Nodes nodesProxy = publicApiClient.nodes();
+		Comments commentsProxy = publicApiClient.comments();
+		Tags tagsProxy = publicApiClient.tags();
+
+		final List<Tag> tags = new ArrayList<Tag>();
+		tags.add(new Tag("tag 1"));
+		tags.add(new Tag("tag 9"));
+		tags.add(new Tag("other tag 3"));
+		tags.add(new Tag("my tag 1"));
+		tags.add(new Tag("tag 5"));
+		
+		// try to add a tag to a comment
+		try
+		{
+			Comment comment = new Comment("Test Comment", "Test Comment");
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			Comment newComment = commentsProxy.createNodeComment(nodeRef1.getId(), comment);
+			Tag tag = new Tag("testTag");
+			nodesProxy.createNodeTag(newComment.getId(), tag);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+
+		// try to add a tag to a tag
+		try
+		{
+			Tag tag = new Tag("testTag");
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			Tag newTag = nodesProxy.createNodeTag(nodeRef1.getId(), tag);
+			nodesProxy.createNodeTag(newTag.getId(), tag);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+		}
+
+		// Test Case cloud-2221
+		// Test Case cloud-2222
+		// multi-byte characters, special characters, create and update tags
+		{
+			Tag[] multiByteTags = new Tag[]
+			{
+					new Tag("\u67e5\u770b\u5168\u90e8"),
+					new Tag("\u67e5\u770b\u5168\u91e8"),
+					new Tag("%^&%&$^£@")
+			};
+
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+
+			// first, create tags
+			Map<String, Tag> createdTags = new HashMap<String, Tag>();
+			for(Tag tag : multiByteTags)
+			{
+				Tag ret = nodesProxy.createNodeTag(nodeRef2.getId(), tag);
+				createdTags.put(ret.getId(), ret);
+			}
+
+			int skipCount = 0;
+			int maxItems = Integer.MAX_VALUE;
+			Paging paging = getPaging(skipCount, maxItems);
+			ListResponse<Tag> resp = nodesProxy.getNodeTags(nodeRef2.getId(), createParams(paging, null));
+			List<Tag> retTags = resp.getList();
+			assertEquals(createdTags.size(), retTags.size());
+			for(Tag tag : retTags)
+			{
+				String tagId = tag.getId();
+				Tag expectedTag = createdTags.get(tagId);
+				expectedTag.expected(tag);
+			}
+
+			// special characters and update tags
+//			{
+//				Tag[] specialCharacterTags = new Tag[]
+//				{
+//						new Tag("\u67e5\u770b\u5168\u90e8"),
+//						new Tag("\u67e5\u770b\u5168\u91e8")
+//				};
+//				
+//				createdTags = new HashMap<String, Tag>();
+//				for(Tag tag : specialCharacterTags)
+//				{
+//					Tag ret = nodesProxy.createNodeTag(nodeRef2.getId(), tag);
+//					createdTags.put(ret.getId(), ret);
+//				}
+//				
+//				
+//				Tag tag = new Tag("%^&%&$^£@");
+//				Tag ret = nodesProxy.createNodeTag(nodeRef2.getId(), tag);
+//				createdTags.put(ret.getId(), ret);
+//			}
+
+			// update tags
+			
+			try
+			{
+				// update with an empty tag i.e. "" -> bad request
+				Tag tag = new Tag("");
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				nodesProxy.createNodeTag(nodeRef2.getId(), tag);
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+			}
+			
+			List<Tag> tagUpdates = new ArrayList<Tag>(createdTags.values());
+			tagUpdates.get(0).setTag("\u4e00\u4e01\u4e02\u4e10");
+			tagUpdates.get(1).setTag("\u4e00\u4e01\u4e12\u4e11");
+			tagUpdates.get(2).setTag("\u4e00\u4e01\u4e12\u4e12");
+			Map<String, Tag> updatedTags = new HashMap<String, Tag>();
+			for(Tag tag : tagUpdates)
+			{
+				Tag ret = tagsProxy.update(tag);
+				assertNotNull(ret.getId());
+				assertNotNull(ret.getTag());
+//				tag.expected(ret); disabled because tag id changes
+				updatedTags.put(ret.getId(), ret);
+			}
+
+			// get updated tags
+			List<Tag> expectedNodeTags = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Tag>>()
+			{
+				@Override
+				public List<Tag> doWork() throws Exception
+				{
+					List<Tag> tags = repoService.getTags(nodeRef2);
+					return tags;
+				}
+			}, person1.getId(), network1.getId());
+			
+			skipCount = 0;
+			maxItems = tagUpdates.size();
+			paging = getPaging(skipCount, maxItems, tagUpdates.size(), tagUpdates.size());
+			resp = nodesProxy.getNodeTags(nodeRef2.getId(), createParams(paging, null));
+			checkList(expectedNodeTags.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+		}
+
+		{
+			List<Tag> createdTags = new ArrayList<Tag>();
+
+			// Test Case cloud-1975
+			for(Tag tag : tags)
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				Tag ret = nodesProxy.createNodeTag(nodeRef1.getId(), tag);
+				assertEquals(tag.getTag(), ret.getTag());
+				assertNotNull(ret.getId());
+				createdTags.add(ret);
+			}
+
+			// update tag, empty string
+			try
+			{
+				Tag tag = new Tag(createdTags.get(0).getId(), "");
+				tagsProxy.update(tag);
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+			}
+			
+			// invalid node id
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				nodesProxy.createNodeTag(GUID.generate(), tags.get(0));
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+
+			// Test Case cloud-1973
+			// Test Case cloud-2208
+			// Test Case cloud-2219
+			// check that the tags are there in the node tags, test paging
+			List<Tag> expectedNodeTags = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Tag>>()
+			{
+				@Override
+				public List<Tag> doWork() throws Exception
+				{
+					List<Tag> tags = repoService.getTags(nodeRef1);
+					return tags;
+				}
+			}, person1.getId(), network1.getId());
+			
+			{
+				int skipCount = 0;
+				int maxItems = 2;
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				Paging paging = getPaging(skipCount, maxItems, expectedNodeTags.size(), expectedNodeTags.size());
+				ListResponse<Tag> resp = nodesProxy.getNodeTags(nodeRef1.getId(), createParams(paging, null));
+				checkList(expectedNodeTags.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+			}
+
+			{
+				int skipCount = 2;
+				int maxItems = Integer.MAX_VALUE;
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				Paging paging = getPaging(skipCount, maxItems, expectedNodeTags.size(), expectedNodeTags.size());
+				ListResponse<Tag> resp = nodesProxy.getNodeTags(nodeRef1.getId(), createParams(paging, null));
+				checkList(expectedNodeTags.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+			}
+			
+			// invalid node
+			try
+			{
+				int skipCount = 0;
+				int maxItems = 2;
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				Paging paging = getPaging(skipCount, maxItems, expectedNodeTags.size(), expectedNodeTags.size());
+				ListResponse<Tag> allTags = nodesProxy.getNodeTags("invalidNode", createParams(paging, null));
+				checkList(expectedNodeTags.subList(skipCount, paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), allTags);
+				fail("");
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+			}
+
+			// user from another account - 403
+			try
+	        {
+		        int skipCount = 0;
+		        int maxItems = 2;
+		        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person3.getId()));
+		        Paging expectedPaging = getPaging(skipCount, maxItems, expectedNodeTags.size(), expectedNodeTags.size());
+		        nodesProxy.getNodeTags(nodeRef1.getId(), createParams(expectedPaging, null));
+		        fail("");
+	        }
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_UNAUTHORIZED, e.getHttpResponse().getStatusCode());
+			}
+
+			// another user from the same account
+			try
+	        {
+		        int skipCount = 0;
+		        int maxItems = 2;
+		        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+		        Paging paging = getPaging(skipCount, maxItems, expectedNodeTags.size(), expectedNodeTags.size());
+		        ListResponse<Tag> resp = nodesProxy.getNodeTags(nodeRef1.getId(), createParams(paging, null));
+		        checkList(expectedNodeTags.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+				fail();
+	        }
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());
+			}
+			
+			// Test Case cloud-1519
+			// Test Case cloud-2206
+			// Test Case cloud-2218
+			// check that the tags are there in the network tags, test paging
+			// TODO for user from another network who is invited to this network
+			List<Tag> expectedNetworkTags = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Tag>>()
+			{
+				@Override
+				public List<Tag> doWork() throws Exception
+				{
+					List<Tag> tags = repoService.getTags();
+					return tags;
+				}
+			}, person1.getId(), network1.getId());
+
+			{
+				int skipCount = 0;
+				int maxItems = 2;
+				Paging paging = getPaging(skipCount, maxItems, expectedNetworkTags.size(), null);
+				ListResponse<Tag> allTags = tagsProxy.getTags(createParams(paging, null));
+				checkList(expectedNetworkTags.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), allTags);
+			}
+
+			{
+				int skipCount = 2;
+				int maxItems = Integer.MAX_VALUE;
+				Paging paging = getPaging(skipCount, maxItems, expectedNetworkTags.size(), null);
+				ListResponse<Tag> allTags = tagsProxy.getTags(createParams(paging, null));
+				checkList(expectedNetworkTags.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), allTags);
+			}
+		}
+
+		{
+			// Try a create with the same tag value
+			Tag tag = tags.get(0);
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			nodesProxy.createNodeTag(nodeRef1.getId(), tag);
+		}
+
+		try
+		{
+			// Invalid node id
+			Tag tag = tags.get(0);
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			nodesProxy.createNodeTag(GUID.generate(), tag);
+			fail("");
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+
+		// Test Case cloud-2183
+		// update tags
+		{
+			// get a network tag
+			int skipCount = 0;
+			int maxItems = 2;
+			Paging paging = getPaging(skipCount, maxItems);
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			ListResponse<Tag> allTags = tagsProxy.getTags(createParams(paging, null));
+			assertTrue(allTags.getList().size() > 0);
+
+			// and update it
+			Tag tag = allTags.getList().get(0);
+			String newTagValue = GUID.generate();
+			Tag newTag = new Tag(tag.getId(), newTagValue);
+			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+			Tag ret = tagsProxy.update(newTag);
+			assertEquals(newTagValue, ret.getTag());
+//			assertNotEquals(tag.getId, ret.getId()); // disabled due to CLOUD-628
+		}
+		
+		// update invalid/unknown tag id
+		try
+		{
+			Tag unknownTag = new Tag(GUID.generate(), GUID.generate());
+			tagsProxy.update(unknownTag);
+			fail();
+		}
+		catch(PublicApiException e)
+		{
+			assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+		}
+		
+
+		// Test Case cloud-1972
+		// Test Case cloud-1974
+		// not allowed methods
+		{
+			List<Tag> networkTags = TenantUtil.runAsUserTenant(new TenantRunAsWork<List<Tag>>()
+			{
+				@Override
+				public List<Tag> doWork() throws Exception
+				{
+					List<Tag> tags = repoService.getTags();
+					return tags;
+				}
+			}, person1.getId(), network1.getId());
+			assertTrue(networkTags.size() > 0);
+
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				nodesProxy.update("nodes", nodeRef1.getId(), "tags", null, null, "Unable to PUT node tags");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+			
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				nodesProxy.remove("nodes", nodeRef1.getId(), "tags", null, "Unable to DELETE node tags");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+
+			try
+			{
+				Tag tag = networkTags.get(0);
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				nodesProxy.update("nodes", nodeRef1.getId(), "tags", tag.getId(), null, "Unable to PUT node tag");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+
+			try
+			{
+				Tag tag = networkTags.get(0);
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				nodesProxy.create("tags", null, null, null, tag.toJSON().toString(), "Unable to POST to tags");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+			
+			try
+			{
+				Tag tag = networkTags.get(0);
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				nodesProxy.update("tags", null, null, null, tag.toJSON().toString(), "Unable to PUT tags");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+
+			try
+			{
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				nodesProxy.remove("tags", null, null, null, "Unable to DELETE tags");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+
+			try
+			{
+				Tag tag = networkTags.get(0);
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				nodesProxy.create("tags", tag.getId(), null, null, tag.toJSON().toString(), "Unable to POST to a tag");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+			
+			try
+			{
+				Tag tag = networkTags.get(0);
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				nodesProxy.remove("tags", tag.getId(), null, null, "Unable to DELETE a tag");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+			
+			// delete node tag
+			{
+				Tag tag = networkTags.get(0);
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				nodesProxy.removeNodeTag(nodeRef1.getId(), tag.getId());
+
+				// check that the tag is gone
+				ListResponse<Tag> resp = nodesProxy.getNodeTags(nodeRef1.getId(), createParams(getPaging(0, Integer.MAX_VALUE), null));
+				List<Tag> nodeTags = resp.getList();
+				assertTrue(!nodeTags.contains(tag));
+			}
+
+			try
+			{
+				Tag tag = networkTags.get(0);
+
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				nodesProxy.getSingle("nodes", nodeRef1.getId(), "tags", tag.getId(), "Unable to GET node tag");
+				fail();
+			}
+			catch(PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+			}
+		}
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/TestUserPreferences.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestUserPreferences.java
new file mode 100644
index 00000000000..94d19555e05
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/TestUserPreferences.java
@@ -0,0 +1,416 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.*;
+
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.People;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Preference;
+import org.alfresco.util.GUID;
+import org.apache.commons.httpclient.HttpStatus;
+import org.junit.Test;
+
+public class TestUserPreferences extends EnterpriseTestApi
+{
+	@Test
+	public void testUserPreferences() throws Exception
+	{
+		Iterator<TestNetwork> networksIt = getTestFixture().getNetworksIt();
+		assertTrue(networksIt.hasNext());
+		final TestNetwork network1 = networksIt.next();
+		assertTrue(networksIt.hasNext());
+		final TestNetwork network2 = networksIt.next();
+
+		final List<TestPerson> people = new ArrayList<TestPerson>(3);
+
+		// create users and some preferences
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				TestPerson person = network1.createUser();
+				people.add(person);
+				person = network1.createUser();
+				people.add(person);
+				return null;
+			}
+		}, network1.getId());
+		
+		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				TestPerson person = network2.createUser();
+				people.add(person);
+				return null;
+			}
+		}, network2.getId());
+		
+		final TestPerson person1 = people.get(0);
+		final TestPerson person2 = people.get(1);
+		final TestPerson person3 = people.get(2);
+
+        final List<Preference> expectedPreferences = new ArrayList<Preference>();
+        expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference2", String.valueOf(true)));
+        expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference1", String.valueOf(true)));
+        expectedPreferences.add(new Preference("org.alfresco.share.documentList.sortAscending", String.valueOf(true)));
+        expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference3", String.valueOf(true)));
+		// new preference name for issue REPO-855
+		expectedPreferences.add(new Preference("org.alfresco.ext.folders.favourites.workspace://SpacesStore/4e3d0779-388a-4b94-91e1-eab588a7da3d.createdAt", String.valueOf(true)));
+
+		TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+		{
+			@Override
+			public Void doWork() throws Exception
+			{
+				for(Preference pref : expectedPreferences)
+				{
+					// TODO add preferences thru api
+					repoService.addPreference(person1.getId(), pref.getId(), pref.getValue());
+				}
+
+	    		return null;
+			}
+		}, person1.getId(), network1.getId());
+
+        Collections.sort(expectedPreferences);
+
+        People peopleProxy = publicApiClient.people();
+        
+        // GET preferences
+        // Test case: cloud-1492
+
+        // unknown user
+        try
+        {
+	        int skipCount = 0;
+	        int maxItems = 2;
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+	        peopleProxy.getPreferences(GUID.generate(), createParams(paging, null));
+
+        	fail();
+        }
+        catch(PublicApiException e)
+        {
+        	assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+        // test paging
+        {
+	        int skipCount = 0;
+	        int maxItems = 2;
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+	        ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+	        checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+        }
+
+        {
+	        int skipCount = 2;
+	        int maxItems = 10;
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+	        ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+	        checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+        }
+        
+        // "-me-" user
+        {
+	        int skipCount = 0;
+	        int maxItems = 2;
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+	        ListResponse<Preference> resp = peopleProxy.getPreferences(org.alfresco.rest.api.People.DEFAULT_USER, createParams(paging, null));
+	        checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+        }
+
+		// invalid user - 404
+        try
+        {
+	        int skipCount = 2;
+	        int maxItems = 10;
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+	        peopleProxy.getPreferences("invalid.user", createParams(paging, null));
+			fail("");
+        }
+        catch(PublicApiException e)
+        {
+        	assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+
+		// user from another account - 401
+        try
+        {
+	        int skipCount = 0;
+	        int maxItems = 2;
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person3.getId()));
+	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+//	        ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+//	        checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+	        peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+	        fail();
+        }
+        catch(PublicApiException e)
+        {
+        	assertEquals(e.getHttpResponse().getStatusCode(), HttpStatus.SC_UNAUTHORIZED);
+        }
+
+		// another user from the same account - 403
+        try
+        {
+	        int skipCount = 0;
+	        int maxItems = 2;
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+	        peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+	        fail();
+        }
+        catch(PublicApiException e)
+        {
+        	assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());        	
+        }
+
+        // get a single preference
+        // Test Case: cloud-1493
+        
+        {
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+	        Preference pref = expectedPreferences.get(0);
+        	Preference ret = peopleProxy.getPreference(person1.getId(), pref.getId());
+        	pref.expected(ret);
+        }
+        
+        // unknown person id
+        try
+        {
+	        Preference pref = expectedPreferences.get(0);
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+        	peopleProxy.getPreference(GUID.generate(), pref.getId());
+        	fail();
+        }
+        catch(PublicApiException e)
+        {
+        	assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+        
+        // unknown preference id
+        try
+        {
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+        	peopleProxy.getPreference(person1.getId(), GUID.generate());
+        	fail();
+        }
+        catch(PublicApiException e)
+        {
+        	assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+        }
+        
+        // Invalid methods
+        // Test case: cloud-1968
+        try
+        {
+	        Preference pref = expectedPreferences.get(0);
+
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+        	peopleProxy.create("people", person1.getId(), "preferences", pref.getId(), pref.toJSON().toString(), "Unable to POST to a preference");
+        	fail();
+        }
+        catch(PublicApiException e)
+        {
+        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+        
+        try
+        {
+	        Preference pref = expectedPreferences.get(0);
+
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+        	peopleProxy.update("people", person1.getId(), "preferences", pref.getId(), pref.toJSON().toString(), "Unable to PUT a preference");
+        	fail();
+        }
+        catch(PublicApiException e)
+        {
+        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+        
+        try
+        {
+	        Preference pref = expectedPreferences.get(0);
+
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+        	peopleProxy.remove("people", person1.getId(), "preferences", pref.getId(), "Unable to DELETE a preference");
+        	fail();
+        }
+        catch(PublicApiException e)
+        {
+        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+        
+        try
+        {
+	        Preference pref = expectedPreferences.get(0);
+
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+        	peopleProxy.create("people", person1.getId(), "preferences", null, pref.toJSON().toString(), "Unable to POST to preferences");
+        	fail();
+        }
+        catch(PublicApiException e)
+        {
+        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+
+        try
+        {
+	        Preference pref = expectedPreferences.get(0);
+
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+        	peopleProxy.update("people", person1.getId(), "preferences", null, pref.toJSON().toString(), "Unable to PUT preferences");
+        	fail();
+        }
+        catch(PublicApiException e)
+        {
+        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+        
+        try
+        {
+	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+        	peopleProxy.remove("people", person1.getId(), "preferences", null, "Unable to DELETE preferences");
+        	fail();
+        }
+        catch(PublicApiException e)
+        {
+        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+
+		{
+			// REPO-1061, REPO-890
+			try
+			{
+				String skipCount = "a";
+				String maxItems = "hi";
+				HashMap<String, String> params = new HashMap<String, String>();
+				params.put("skipCount", skipCount);
+				params.put("maxItems", maxItems);
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				peopleProxy.getPreferences(person1.getId(), params);
+				fail();
+			}
+			catch (PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+			}
+
+			try
+			{
+				String skipCount = "a";
+				String maxItems = "null";
+				HashMap<String, String> params = new HashMap<String, String>();
+				params.put("skipCount", skipCount);
+				params.put("maxItems", maxItems);
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				peopleProxy.getPreferences(person1.getId(), params);
+				fail();
+			}
+			catch (PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+			}
+
+			try
+			{
+				String maxItems = "Red";
+				HashMap<String, String> params = new HashMap<String, String>();
+				params.put("maxItems", maxItems);
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+                peopleProxy.getPreferences(person1.getId(), params);
+				fail();
+			}
+			catch (PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+			}
+
+			try
+			{
+				String skipCount = "yuck";
+				HashMap<String, String> params = new HashMap<String, String>();
+				params.put("skipCount", skipCount);
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				peopleProxy.getPreferences(person1.getId(), params);
+				fail();
+			}
+			catch (PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+			}
+
+			try
+			{
+				String skipCount = "-1";
+				HashMap<String, String> params = new HashMap<String, String>();
+				params.put("skipCount", skipCount);
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				peopleProxy.getPreferences(person1.getId(), params);
+				fail();
+			}
+			catch (PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+			}
+
+			try
+			{
+				String maxItems = "0";
+				HashMap<String, String> params = new HashMap<String, String>();
+				params.put("maxItems", maxItems);
+				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+				peopleProxy.getPreferences(person1.getId(), params);
+				fail();
+			}
+			catch (PublicApiException e)
+			{
+				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+			}
+		}
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/WherePredicateApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/WherePredicateApiTest.java
new file mode 100644
index 00000000000..b9ac9633834
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/WherePredicateApiTest.java
@@ -0,0 +1,309 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.QuickShareLinks;
+import org.alfresco.rest.api.Renditions;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(LuceneTests.class)
+public class WherePredicateApiTest extends AbstractSingleNetworkSiteTest
+{
+    private static final boolean NOT = true;
+    private String folder0Id;
+    private String file0Id;
+    private Paging paging;
+
+    @Before
+    public void setup() throws Exception
+    {
+        super.setup();
+        
+        setRequestContext(user1);
+        
+        String myNodeId = getMyNodeId();
+
+        String folder0Name = "folder " + RUNID;
+        folder0Id = createFolder(myNodeId, folder0Name, null).getId();
+        
+        String file0Name = "file " + RUNID;
+        file0Id = createEmptyTextFile(folder0Id, file0Name).getId();
+
+        paging = getPaging(0, 100);
+    }
+    
+    @After
+    public void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+    
+    /**
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<node>/children}
+     */
+    @Test
+    public void testLogicalOperatorsGetChildren() throws Exception
+    {
+        String childrenUrl = getNodeChildrenUrl(folder0Id);
+        // SIMPLE (+ve)
+        String clause = new WhereClauseBuilder()
+                                .predicate(Nodes.PARAM_ISFOLDER + "=true")
+                                .build();
+        getAll(childrenUrl, paging, getWhereClause(clause), 200);
+        //AND (+ve)
+        clause = new WhereClauseBuilder()
+                        .predicate(Nodes.PARAM_ISFOLDER + "=true")
+                        .and(Nodes.PARAM_ISFILE + "=false")
+                        .build();
+        getAll(childrenUrl, paging, getWhereClause(clause), 200);
+        //NOT (-ve)
+        clause = new WhereClauseBuilder()
+                   .predicate(Nodes.PARAM_ISFOLDER + "=true", NOT)
+                   .build();
+        getAll(childrenUrl, paging, getWhereClause(clause), 400);
+        // OR (-ve)
+        clause = new WhereClauseBuilder()
+                         .predicate(Nodes.PARAM_ISFOLDER + "=true")
+                         .or(Nodes.PARAM_ISFILE + "=false")
+                         .build();
+        getAll(childrenUrl, paging, getWhereClause(clause), 400);
+        // NOT + AND (-ve)
+        clause = new WhereClauseBuilder()
+                .predicate(Nodes.PARAM_ISFOLDER + "=true", NOT)
+                .and(Nodes.PARAM_ISFILE + "=false")
+                .build();
+        getAll(childrenUrl, paging, getWhereClause(clause), 400);
+    }
+    
+    /**
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<node>/secondary-children}
+     */
+    @Test
+    public void testLogicalOperatorsGetSecondaryChildren() throws Exception
+    {
+        // SIMPLE (+ve)
+        String clause = new WhereClauseBuilder()
+                .predicate(Nodes.PARAM_ASSOC_TYPE + "=cm:contains")
+                .build();
+        getAll(getNodeSecondaryChildrenUrl(folder0Id), paging, getWhereClause(clause), 200);
+        // NOT (-ve)
+        clause = new WhereClauseBuilder()
+                .predicate(Nodes.PARAM_ASSOC_TYPE + "=cm:contains", NOT)
+                .build();
+        getAll(getNodeSecondaryChildrenUrl(folder0Id), paging, getWhereClause(clause), 400);
+    }
+
+    /**
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/nodes/<node>/renditions}
+     */
+    @Test
+    public void testLogicalOperatorsGetRenditions() throws Exception
+    {
+        // SIMPLE (+ve)
+        String clause = new WhereClauseBuilder()
+                .predicate(Renditions.PARAM_STATUS + "=CREATED")
+                .build();
+        getAll(getNodeRenditionsUrl(file0Id), paging, getWhereClause(clause), 200);
+        // NOT (-ve)
+        clause = new WhereClauseBuilder()
+                .predicate(Renditions.PARAM_STATUS + "=CREATED", NOT)
+                .build();
+        getAll(getNodeRenditionsUrl(file0Id), paging, getWhereClause(clause), 400);
+    }
+    
+    /**
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/shared-links}
+     */
+    @Test
+    public void testLogicalOperatorsGetShareLinks() throws Exception
+    {
+        // SIMPLE (+ve)
+        String clause = new WhereClauseBuilder()
+                .predicate(QuickShareLinks.PARAM_SHAREDBY + "='-me-'")
+                .build();
+        getAll("shared-links", paging, getWhereClause(clause), 200);
+        // NOT (-ve)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+        clause = new WhereClauseBuilder()
+                .predicate(QuickShareLinks.PARAM_SHAREDBY + "='-me-'", NOT)
+                .build();
+        getAll("shared-links", paging, getWhereClause(clause), 400);
+    }
+    
+    /**
+     * {@literal <host>:<port>/alfresco/api/-default-/public/alfresco/versions/1/people/<personId>/favorites}
+     */
+    @Test
+    public void testLogicalOperatorsGetFavorites() throws Exception
+    {
+        String favoritesUrl = getFavoritesUrl("-me-");
+        // SIMPLE (+ve)
+        String clause = new WhereClauseBuilder()
+                                .predicate("EXISTS(target/file)")
+                                .build();
+        getAll(favoritesUrl, paging, getWhereClause(clause), 200);
+        // OR (+ve)
+        clause = new WhereClauseBuilder()
+                .predicate("EXISTS(target/file)").or("EXISTS(target/folder)")
+                .build();
+        getAll(favoritesUrl, paging, getWhereClause(clause), 200);
+        // AND (-ve)
+        clause = new WhereClauseBuilder()
+                .predicate("EXISTS(target/file)").and("EXISTS(target/folder)")
+                .build();
+        getAll(favoritesUrl, paging, getWhereClause(clause), 400);
+        
+        // NOT (-ve): uncomment when REPO-1249 is done
+        /*clause = new WhereClauseBuilder()
+                .predicate("EXISTS(target/file)", NOT)
+                .build();
+        getAll(favoritesUrl, paging, getWhereClause(clause), 400);*/
+    }
+    
+    private Map<String, String> getWhereClause(String whereparams)
+    {
+        Map<String, String> params = new HashMap<>();
+        params.put("where", whereparams);
+        
+        return params;
+    }
+    
+    private class WhereClauseBuilder
+    {
+        private WhereClause whereClause;
+
+        public WhereClauseBuilder predicate(String predicate, boolean negated)
+        {
+            whereClause = new WhereClause(predicate, negated);
+            return this;
+        }
+        public WhereClauseBuilder predicate(String predicate)
+        {
+            return this.predicate(predicate, false);
+        }
+
+        public WhereClauseBuilder and(String predicate, boolean negated)
+        {
+            whereClause.and(new WhereClause(predicate, negated));
+            return this;
+        }
+        public WhereClauseBuilder and(String predicate)
+        {
+            return and(predicate, false);
+        }
+
+        public WhereClauseBuilder or(String predicate, boolean negated)
+        {
+            whereClause.or(new WhereClause(predicate, negated));
+            return this;
+        }
+        public WhereClauseBuilder or(String predicate)
+        {
+            return or(predicate, false);
+        }
+
+        public WhereClauseBuilder not()
+        {
+            whereClause.negate();
+            return this;
+        }
+
+        public String build()
+        {
+            whereClause.group();
+            return whereClause.toString();
+        }
+
+        private class WhereClause
+        {
+            private final String[] operators = new String[] { "MATCHES", "IN", "BETWEEN" };
+
+            private String clause;
+
+            public WhereClause(String clause, boolean negated)
+            {
+                this.clause = clause;
+                if (negated)
+                {
+                    negate();
+                }
+            }
+
+            private void group()
+            {
+                clause = "(" + clause + ")";
+            }
+
+            private void and(WhereClause otherClause)
+            {
+                this.clause += " AND " + otherClause;
+            }
+
+            private void or(WhereClause otherClause)
+            {
+                this.clause += " OR " + otherClause;
+            }
+
+            public void negate()
+            {
+                for (String op : operators)
+                {
+                    if (clause.contains(op))
+                    {
+                        clause.replace(op, "NOT " + op);
+                        return;
+                    }
+                }
+                clause = "NOT " + clause;
+            }
+
+            @Override
+            public String toString()
+            {
+                return clause;
+            }
+        }
+    }
+    
+    private String getNodeSecondaryChildrenUrl(String nodeId)
+    {
+        return URL_NODES + "/" + nodeId + "/" + "secondary-children";
+    }
+    
+    private String getFavoritesUrl(String nodeId)
+    {
+        return "people" + "/" + nodeId + "/" + "favorites";
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/AbstractHttp.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/AbstractHttp.java
new file mode 100644
index 00000000000..f5fc4749756
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/AbstractHttp.java
@@ -0,0 +1,169 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+
+import org.apache.commons.httpclient.HttpMethod;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+public class AbstractHttp
+{
+    public static final String JSON_DATA = "data";
+
+    /**
+     * Extract the "data" JSON-object from the method's response.
+     * @param method the method containing the response
+     * @return the "data" object. Returns null if response is not JSON or no data-object
+     *         is present.
+     */
+    public JSONObject getDataFromResponse(HttpMethod method)
+    {
+        JSONObject result = null;
+        Object object = getObjectFromResponse(method);
+        
+        // Extract object for "data" property
+        object = ((JSONObject) object).get(JSON_DATA);
+        if(object instanceof JSONObject)
+        {
+            result = (JSONObject) object;
+        }
+        return result;
+    }
+    
+    /**
+     * Extract the "data" JSON-array from the method's response.
+     * @param method the method containing the response
+     * @return the "data" object. Returns null if response is not JSON or no data-object
+     *         is present.
+     */
+    public JSONArray getDataArrayFromResponse(HttpMethod method)
+    {
+        JSONArray result = null;
+        Object object = getObjectFromResponse(method);
+        if(object != null)
+        {
+            // Extract object for "data" property
+            object = ((JSONObject) object).get(JSON_DATA);
+            if(object instanceof JSONArray)
+            {
+                result = (JSONArray) object;
+            }
+        }
+        return result;
+    }
+    
+    /**
+     * Extract JSON-object from the method's response.
+     * @param method the method containing the response
+     * @return the json object. Returns null if response is not JSON or no data-object
+     *         is present.
+     */
+    public JSONObject getObjectFromResponse(HttpMethod method)
+    {
+        JSONObject result = null;
+
+        try
+        {
+            InputStream response = method.getResponseBodyAsStream();
+            if(response != null)
+            {
+                Object object = new JSONParser().parse(new InputStreamReader(response, Charset.forName("UTF-8")));
+                if(object instanceof JSONObject)
+                {
+                   return (JSONObject) object;
+                }
+            }
+        }
+        catch (IOException error)
+        {
+            // Ignore errors, returning null
+        }
+        catch (ParseException error)
+        {
+            // Ignore errors, returning null
+        }
+       
+        return result;
+    }
+    
+    /**
+     * Gets a string-value from the given JSON-object for the given key.
+     * @param json the json object
+     * @param key key pointing to the value
+     * @param defaultValue if value is not set or if value is not of type "String", this value is returned
+     */
+    public String getString(JSONObject json, String key, String defaultValue)
+    {
+        String result = defaultValue;
+        
+        if(json != null)
+        {
+            Object value = json.get(key);
+            if(value instanceof String)
+            {
+                result = (String) value;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * @param json JSON to extract array from
+     * @param key key under which array is present on JSON
+     * @return the {@link JSONArray}. Returns null, if the value is null or not an array.
+     */
+    public JSONArray getArray(JSONObject json, String key)
+    {
+        Object object = json.get(key);
+        if(object instanceof JSONArray)
+        {
+            return (JSONArray) object;
+        }
+        return null;
+    }
+
+    /**
+     * @param json JSON to extract object from
+     * @param key key under which object is present on JSON
+     * @return the {@link JSONObject}. Returns null, if the value is null or not an object.
+     */
+    public JSONObject getObject(JSONObject json, String key)
+    {
+        Object object = json.get(key);
+        if(object instanceof JSONArray)
+        {
+            return (JSONObject) object;
+        }
+        return null;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/AuthenticatedHttp.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/AuthenticatedHttp.java
new file mode 100644
index 00000000000..fbd6709144b
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/AuthenticatedHttp.java
@@ -0,0 +1,453 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.HttpState;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.URIException;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.auth.AuthScope;
+import org.apache.commons.httpclient.methods.EntityEnclosingMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.json.simple.JSONObject;
+
+public class AuthenticatedHttp extends AbstractHttp
+{
+    private static final String JSON_TICKET_KEY = "ticket";
+    private static final String TICKET_CREDENTIAL_PLACEHOLDER = "ROLE_TICKET";
+    
+    /**
+     * URL for obtaining an alfresco-ticket
+     */
+    private String LOGIN_URL = "/alfresco/service/api/login";
+    
+    private String LOGIN_JSON_USERNAME = "username";
+    private String LOGIN_JSON_PASSWORD = "password";
+    
+    public static final String MIME_TYPE_JSON = "application/json";
+    public static final String HEADER_ACCEPT = "Accept";
+
+    private HttpClientProvider httpProvider;
+    private AuthenticationDetailsProvider authDetailProvider;
+    private boolean ticketBasedAuthentication;
+    
+    /**
+     * @param httpProvider provider class for http-client
+     * @param authenticationDetailsProvider provider for authentication details
+     */
+    public AuthenticatedHttp(HttpClientProvider httpProvider, AuthenticationDetailsProvider authenticationDetailsProvider)
+    {
+        this.httpProvider = httpProvider;
+        this.authDetailProvider = authenticationDetailsProvider;
+        this.ticketBasedAuthentication = false;
+    }
+    
+    /**
+     * Enable ticket-based authentication. If set to false, BASIC Authentication will
+     * be used instead. Defaults to false.
+     * 
+     * @param ticketBasedAuthentication whether or not to use ticket for authentication
+     */
+    public void setTicketBasedAuthentication(boolean ticketBasedAuthentication)
+    {
+        this.ticketBasedAuthentication = ticketBasedAuthentication;
+    }
+    
+    /**
+     * @return the {@link HttpClientProvider} used by this class.
+     */
+    public HttpClientProvider getHttpProvider()
+    {
+        return this.httpProvider;
+    }
+    
+    /**
+     * @return the {@link AuthenticationDetailsProvider} used by this class.
+     */
+    public AuthenticationDetailsProvider getAuthDetailProvider()
+    {
+        return this.authDetailProvider;
+    }
+    
+    /**
+     * Execute the given method, authenticated as the given user. Automatically closes the 
+     * response-stream to release the connection. If response should be extracted, this should be done
+     * in the {@link HttpRequestCallback}.
+     * 
+     * @param method method to execute
+     * @param userName name of user to authenticate
+     * @param callback called after http-call is executed. When callback returns, the 
+     *  response stream is closed, so all respose-related operations should be done in the callback. Can be null.
+     * @return result returned by the callback or status-code if no callback is given.
+     */
+    public <T extends Object> T executeHttpMethodAuthenticated(HttpMethod method, String userName, HttpRequestCallback<T> callback)
+    {
+        if(ticketBasedAuthentication)
+        {
+            return executeWithTicketAuthentication(method, userName, authDetailProvider.getPasswordForUser(userName), callback);
+        }
+        else
+        {
+            return executeWithBasicAuthentication(method, userName, authDetailProvider.getPasswordForUser(userName), callback);
+        }
+    }
+    
+    public <T extends Object> T executeHttpMethodAuthenticated(HttpMethod method, String userName, String password, HttpRequestCallback<T> callback)
+    {
+        if(ticketBasedAuthentication)
+        {
+            return executeWithTicketAuthentication(method, userName, password, callback);
+        }
+        else
+        {
+            return executeWithBasicAuthentication(method, userName, password, callback);
+        }
+    }
+
+    public <T extends Object> T executeHttpMethodUnauthenticated(HttpMethod method, HttpRequestCallback<T> callback)
+    {
+        try
+        {
+            // Try executing the method
+            httpProvider.getHttpClient().executeMethod(null, method);
+            if (callback != null)
+            {
+                return callback.onCallSuccess(method);
+            }
+            return null;
+        }
+        catch (Throwable t)
+        {
+            boolean handled = false;
+            // Delegate to callback to handle error. If not available, throw exception
+            if (callback != null)
+            {
+                handled = callback.onError(method, t);
+            }
+
+            if (!handled)
+            {
+                throw new RuntimeException("Error while executing an un-authenticated HTTP-call (" + method.getPath() + ")", t);
+            }
+            return null;
+
+        }
+        finally
+        {
+            method.releaseConnection();
+        }
+    }
+
+    /**
+     * Execute the given method, authenticated as the Alfresco Administrator.
+     * 
+     * @param method method to execute
+     * @param callback called after http-call is executed. When callback returns, the 
+     *  response stream is closed, so all respose-related operations should be done in the callback. Can be null.
+     * @return result returned by the callback or null if no callback is given.
+     */
+    public <T extends Object> T executeHttpMethodAsAdmin(HttpMethod method, HttpRequestCallback<T> callback)
+    {
+        if(ticketBasedAuthentication)
+        {
+            return executeWithTicketAuthentication(method, authDetailProvider.getAdminUserName(), authDetailProvider.getAdminPassword(), callback);
+        }
+        else
+        {
+            return executeWithBasicAuthentication(method, authDetailProvider.getAdminUserName(), authDetailProvider.getAdminPassword(), callback);
+        }
+    }
+    
+    /**
+     * Execute the given method, authenticated as the given user using Basic Authentication.
+     * @param method method to execute
+     * @param userName name of user to authenticate (note: if null then attempts to run with no authentication - eq. Quick/Shared Link test)
+     * @param callback called after http-call is executed. When callback returns, the 
+     *  response stream is closed, so all respose-related operations should be done in the callback. Can be null.
+     * @return result returned by the callback or null if no callback is given.
+     */
+    private <T extends Object> T executeWithBasicAuthentication(HttpMethod method, String userName, String password, HttpRequestCallback<T> callback)
+    {
+        try
+        {
+            HttpState state = new HttpState();
+
+            if (userName != null)
+            {
+                state.setCredentials(
+                        new AuthScope(null, AuthScope.ANY_PORT),
+                        new UsernamePasswordCredentials(userName, password));
+            }
+            
+            httpProvider.getHttpClient().executeMethod(null, method, state);
+            
+            if(callback != null)
+            {
+                return callback.onCallSuccess(method);
+            }
+            
+            // No callback used, return null
+            return null;
+        }
+        catch(Throwable t)
+        {
+            boolean handled = false;
+            
+            // Delegate to callback to handle error. If not available, throw exception
+            if(callback != null)
+            {
+                handled = callback.onError(method, t);
+            }
+            
+            if(!handled)
+            {
+                throw new RuntimeException("Error while executing HTTP-call (" + method.getPath() +")", t);
+            }
+            
+            return null;
+        }
+        finally
+        {
+            method.releaseConnection();
+        }
+    }
+    
+    /**
+     * Execute the given method, authenticated as the given user using ticket-based authentication.
+     * @param method method to execute
+     * @param userName name of user to authenticate
+     * @return status-code resulting from the request
+     */
+    private <T extends Object> T executeWithTicketAuthentication(HttpMethod method, String userName, String password, HttpRequestCallback<T> callback)
+    {
+        String ticket = authDetailProvider.getTicketForUser(userName);
+        if(ticket == null)
+        {
+           ticket = fetchLoginTicket(userName, password);
+           authDetailProvider.updateTicketForUser(userName, ticket);
+        }
+        
+        
+        
+        try
+        {
+            HttpState state = applyTicketToMethod(method, ticket);
+            
+           // Try executing the method
+            int result = httpProvider.getHttpClient().executeMethod(null, method, state);
+            
+            if(result == HttpStatus.SC_UNAUTHORIZED || result == HttpStatus.SC_FORBIDDEN)
+            {
+                method.releaseConnection();
+                if(!method.validate())
+                {
+                    throw new RuntimeException("Ticket re-authentication failed for user " + userName + " (HTTPMethod not reusable)");
+                }
+                // Fetch new ticket, store and apply to HttpMethod
+                ticket = fetchLoginTicket(userName, userName);
+                authDetailProvider.updateTicketForUser(userName, ticket);
+                
+                state = applyTicketToMethod(method, ticket);
+                
+                // Run method agian with new ticket
+                result = httpProvider.getHttpClient().executeMethod(null, method, state);
+            }
+           
+            if(callback != null)
+            {
+                return callback.onCallSuccess(method);
+            }
+            
+            return null;
+        }
+        catch(Throwable t)
+        {
+            boolean handled = false;
+            // Delegate to callback to handle error. If not available, throw exception
+            if(callback != null)
+            {
+                handled = callback.onError(method, t);
+            }
+            
+            if(!handled)
+            {
+                throw new RuntimeException("Error while executing HTTP-call (" + method.getPath() +")", t);
+            }
+            return null;
+            
+        }
+        finally
+        {
+            method.releaseConnection();
+        }
+        
+    }
+    
+    /**
+     * Add the ticket to the method. In case of {@link EntityEnclosingMethod}s (which don't 
+     * support Query-parameters), the ticket is added as Username in BASIC Authentication, 
+     * this is a supported way of passing in ticket into Alfresco.
+     * 
+     * @param method method to apply
+     * @param ticket ticket to apply
+     * 
+     * @return a {@link HttpState} object to use. Null, if no specific state should be used.
+     */
+    private HttpState applyTicketToMethod(HttpMethod method, String ticket) throws URIException
+    {
+        // POST and PUT methods don't support Query-params, use Basic Authentication to pass
+        // in the ticket (ROLE_TICKET) for all methods.
+        HttpState state = new HttpState();
+        state.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(TICKET_CREDENTIAL_PLACEHOLDER, ticket));
+        return state;
+        
+    }
+
+    /**
+     * Adds the JSON as request-body the the method and sets the correct
+     * content-type.
+     * @param method EntityEnclosingMethod
+     * @param object JSONObject
+     */
+    private void populateRequestBody(EntityEnclosingMethod method, JSONObject object)
+    {
+        try
+        {
+            method.setRequestEntity(new StringRequestEntity(object.toJSONString(), MIME_TYPE_JSON, "UTF-8"));
+        }
+        catch (UnsupportedEncodingException error)
+        {
+            // This will never happen!
+            throw new RuntimeException("All hell broke loose, a JVM that doesn't have UTF-8 encoding...");
+        }
+    }
+
+    /**
+     * Perform the login-call to obtain a ticket.
+     * 
+     * @param userName user to log in
+     * @return ticket to use for authentication.
+     * @throws RuntimeException when no ticket can be obtained for the user.
+     */
+    @SuppressWarnings("unchecked")
+    private String fetchLoginTicket(String userName, String password)
+    {
+        String url = httpProvider.getFullAlfrescoUrlForPath(LOGIN_URL);
+        PostMethod loginMethod = null;
+        try
+        {
+            loginMethod = new PostMethod(url);
+            loginMethod.setRequestHeader(HEADER_ACCEPT, MIME_TYPE_JSON);
+
+            // Populate resuest body
+            JSONObject requestBody = new JSONObject();
+            requestBody.put(LOGIN_JSON_USERNAME, userName);
+            requestBody.put(LOGIN_JSON_PASSWORD, password);
+            
+            populateRequestBody(loginMethod, requestBody);
+            
+            HttpClient client = httpProvider.getHttpClient();
+            
+            // Since no authentication info is available yet, no need to use a
+            // custom HostConfiguration for the login-call
+            client.executeMethod(loginMethod);
+            
+            if(loginMethod.getStatusCode() == HttpStatus.SC_OK)
+            {
+                // Extract the ticket
+                JSONObject data = getDataFromResponse(loginMethod);
+                if(data == null)
+                {
+                    throw new RuntimeException("Failed to login to Alfresco with user " + userName +
+                    		" (No JSON-data found in response)");
+                }
+                
+                // Extract the actual ticket
+                String ticket = getString(data, JSON_TICKET_KEY, null);
+                if(ticket == null)
+                {
+                    throw new RuntimeException("Failed to login to Alfresco with user " + userName +
+                                " (No ticket found in JSON-response)");
+                }
+                return ticket;
+            }
+            else
+            {
+                // Unable to login
+                throw new RuntimeException("Failed to login to Alfresco with user " + userName +
+                            " (" + loginMethod.getStatusCode() + loginMethod.getStatusLine().getReasonPhrase() + ")");
+            }
+        }
+        catch (IOException ioe)
+        {
+            // Something went wrong when sending request
+            throw new RuntimeException("Failed to login to Alfresco with user " + userName, ioe);
+        }
+        finally
+        {
+            if(loginMethod != null)
+            {
+                try
+                {
+                    loginMethod.releaseConnection();
+                }
+                catch(Throwable t)
+                {
+                    // Ignore this to prevent swallowing potential original exception
+                }
+            }
+        }
+    }
+    
+    /**
+     * Callback used when executing HTTP-request. After this has been called,
+     * the response-stream is closed automatically.
+     * 
+     * @author Frederik Heremans
+     */
+    public interface HttpRequestCallback<T extends Object>
+    {
+        /**
+         * Called when call was successful.
+         * @param method the method executed which can be used to extract response from.
+         * @return any result extracted from the response body.
+         */
+        T onCallSuccess(HttpMethod method) throws Exception;
+        /**
+         * Called when an error occurs when sending the request.
+         * @param method the method executed
+         * @param t optional exception that caused the error
+         * @return true, if error is handled. False, if an exception should be thrown.
+         */
+        boolean onError(HttpMethod method, Throwable t);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/AuthenticationDetailsProvider.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/AuthenticationDetailsProvider.java
new file mode 100644
index 00000000000..0d9a1be70a2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/AuthenticationDetailsProvider.java
@@ -0,0 +1,69 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+/**
+ * Provides details to allow users to authenticate against alfresco.
+ *
+ * @author Frederik Heremans
+ */
+public interface AuthenticationDetailsProvider
+{
+
+    /**
+     * @param userName String
+     * @return the password for the given user. Returns null, if user doesn't exist.
+     */
+    String getPasswordForUser(String userName);
+    
+    /**
+     * @param userName String
+     * @return the password for the given user. Returns null, if no ticket has been stored for
+     * this user or if the user doesn't exist.
+     */
+    String getTicketForUser(String userName);
+    
+    /**
+     * Update the value of the ticket for the given user.
+     * @param userName String
+     * @param ticket String
+     * @throws IllegalArgumentException when the user does not exist.
+     */
+    void updateTicketForUser(String userName, String ticket) throws IllegalArgumentException;
+    
+    
+    /**
+     * @return the Alfresco administrator username
+     */
+    String getAdminUserName();
+    
+    
+    /**
+     * @return the Alfresco administrator password
+     */
+    String getAdminPassword();
+    
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/HttpClientProvider.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/HttpClientProvider.java
new file mode 100644
index 00000000000..63d1f80c8a2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/HttpClientProvider.java
@@ -0,0 +1,47 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+import org.apache.commons.httpclient.HttpClient;
+
+/**
+ * Provides {@link HttpClient} instance to be used to perform HTTP-calls.
+ *
+ * @author Frederik Heremans
+ */
+public interface HttpClientProvider
+{
+    /**
+     * @return the {@link HttpClient} instance to use for the next HTTP-call.
+     */
+    HttpClient getHttpClient();
+    
+    /**
+     * @param path relative path of the URL from alfresco host.
+     * @return full URL including hostname and port for the given path.
+     */
+    String getFullAlfrescoUrlForPath(String path);
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/HttpResponse.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/HttpResponse.java
new file mode 100644
index 00000000000..4050f1ffa93
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/HttpResponse.java
@@ -0,0 +1,198 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+import java.util.Map;
+
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.URIException;
+import org.apache.commons.httpclient.methods.ByteArrayRequestEntity;
+import org.apache.commons.httpclient.methods.DeleteMethod;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.methods.RequestEntity;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.apache.commons.httpclient.util.EncodingUtil;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+public class HttpResponse
+{
+	protected HttpMethod method;
+	private String user;
+	private byte[] responseBytes;
+	private Map<String,String> headers;
+	private long time;
+
+	public HttpResponse(HttpMethod method, String user, byte[] responseBytes, Map<String,String> headers, long time)
+	{
+		this.method = method;
+		this.user = user;
+		this.time = time;
+		this.headers = headers;
+		this.responseBytes = responseBytes;
+	}
+
+	public int getStatusCode()
+	{
+		return method.getStatusCode();
+	}
+
+	public String getResponse()
+	{
+		if (responseBytes != null)
+		{
+			if (method instanceof HttpMethodBase)
+			{
+				// mimic method.getResponseBodyAsString
+				return EncodingUtil.getString(responseBytes, ((HttpMethodBase)method).getResponseCharSet());
+			}
+			else
+			{
+				return new String(responseBytes);
+			}
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public byte[] getResponseAsBytes()
+	{
+		return responseBytes;
+	}
+	
+	public Map<String,String> getHeaders()
+	{
+	    return headers;
+	}
+	
+	public String toString()
+	{
+		StringBuilder sb = new StringBuilder();
+
+		String requestType = null;
+        RequestEntity requestEntity = null;
+
+		if (method instanceof GetMethod)
+		{
+			requestType = "GET";
+		}
+        else if (method instanceof PutMethod)
+        {
+            requestType = "PUT";
+            requestEntity = ((PutMethod) method).getRequestEntity();
+        }
+        else if (method instanceof PostMethod)
+		{
+			requestType = "POST";
+            requestEntity = ((PostMethod)method).getRequestEntity();
+		}
+		else if (method instanceof DeleteMethod)
+		{
+			requestType = "DELETE";
+		}
+
+		try
+		{
+			sb.append(requestType).append(" request ").append(method.getURI()).append("\n");
+		}
+		catch (URIException e)
+		{
+		}
+
+        if (requestEntity != null)
+        {
+            sb.append("\nRequest body: ");
+            if (requestEntity instanceof StringRequestEntity)
+            {
+                sb.append(((StringRequestEntity)requestEntity).getContent());
+            }
+            else if (requestEntity instanceof ByteArrayRequestEntity)
+            {
+                sb.append(" << ").append(((ByteArrayRequestEntity)requestEntity).getContent().length).append(" bytes >>");
+            }
+            sb.append("\n");
+        }
+
+		sb.append("user ").append(user).append("\n");
+		sb.append("returned ").append(method.getStatusCode()).append(" and took ").append(time).append("ms").append("\n");
+
+        String contentType = null;
+        Header hdr = method.getResponseHeader("Content-Type");
+        if (hdr != null)
+        {
+            contentType = hdr.getValue();
+        }
+        sb.append("Response content type: ").append(contentType).append("\n");
+
+        if (contentType != null)
+        {
+            sb.append("\nResponse body: ");
+            if (contentType.startsWith("text/plain") || contentType.startsWith("application/json"))
+            {
+                sb.append(getResponse());
+                sb.append("\n");
+            }
+            else if(getResponseAsBytes() != null)
+            {
+                sb.append(" << ").append(getResponseAsBytes().length).append(" bytes >>");
+                sb.append("\n");
+            }
+        }
+
+		return sb.toString();
+	}
+	
+	public JSONObject getJsonResponse()
+	{
+        JSONObject result = null;
+
+        try
+        {
+			String response = getResponse();
+            if (response != null)
+            {
+                Object object = new JSONParser().parse(response);
+                if(object instanceof JSONObject)
+                {
+                   return (JSONObject) object;
+                }
+            }
+        }
+        catch (ParseException error)
+        {
+            // Ignore errors, returning null
+        }
+       
+        return result;
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/Pair.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/Pair.java
new file mode 100644
index 00000000000..f4cff997740
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/Pair.java
@@ -0,0 +1,85 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+public class Pair<T1, T2>
+{
+	private T1 first;
+	private T2 second;
+	
+	public Pair(T1 first, T2 second)
+	{
+		super();
+		this.first = first;
+		this.second = second;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((first == null) ? 0 : first.hashCode());
+		result = prime * result
+				+ ((second == null) ? 0 : second.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Pair other = (Pair) obj;
+		if (first == null) {
+			if (other.first != null)
+				return false;
+		} else if (!first.equals(other.first))
+			return false;
+		if (second == null) {
+			if (other.second != null)
+				return false;
+		} else if (!second.equals(other.second))
+			return false;
+		return true;
+	}
+
+	public T1 getFirst() {
+		return first;
+	}
+
+	public T2 getSecond() {
+		return second;
+	}
+
+	@Override
+	public String toString()
+	{
+		return String.format("Pair<%s,%s>", first, second);
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/PublicApiClient.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/PublicApiClient.java
new file mode 100644
index 00000000000..c72398ba152
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/PublicApiClient.java
@@ -0,0 +1,2883 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.cmis.client.impl.AlfrescoObjectFactoryImpl;
+import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
+import org.alfresco.rest.api.model.ActionDefinition;
+import org.alfresco.rest.api.model.SiteUpdate;
+import org.alfresco.rest.api.tests.TestPeople;
+import org.alfresco.rest.api.tests.TestSites;
+import org.alfresco.rest.api.tests.client.PublicApiHttpClient.BinaryPayload;
+import org.alfresco.rest.api.tests.client.PublicApiHttpClient.RequestBuilder;
+import org.alfresco.rest.api.tests.client.data.Action;
+import org.alfresco.rest.api.tests.client.data.Activities;
+import org.alfresco.rest.api.tests.client.data.Activity;
+import org.alfresco.rest.api.tests.client.data.AuditApp;
+import org.alfresco.rest.api.tests.client.data.AuditEntry;
+import org.alfresco.rest.api.tests.client.data.CMISNode;
+import org.alfresco.rest.api.tests.client.data.Comment;
+import org.alfresco.rest.api.tests.client.data.ContentData;
+import org.alfresco.rest.api.tests.client.data.Favourite;
+import org.alfresco.rest.api.tests.client.data.FavouriteSite;
+import org.alfresco.rest.api.tests.client.data.FolderNode;
+import org.alfresco.rest.api.tests.client.data.Group;
+import org.alfresco.rest.api.tests.client.data.GroupMember;
+import org.alfresco.rest.api.tests.client.data.JSONAble;
+import org.alfresco.rest.api.tests.client.data.MemberOfSite;
+import org.alfresco.rest.api.tests.client.data.NodeRating;
+import org.alfresco.rest.api.tests.client.data.Person;
+import org.alfresco.rest.api.tests.client.data.PersonNetwork;
+import org.alfresco.rest.api.tests.client.data.Preference;
+import org.alfresco.rest.api.tests.client.data.Site;
+import org.alfresco.rest.api.tests.client.data.SiteContainer;
+import org.alfresco.rest.api.tests.client.data.SiteImpl;
+import org.alfresco.rest.api.tests.client.data.SiteMember;
+import org.alfresco.rest.api.tests.client.data.SiteGroup;
+import org.alfresco.rest.api.tests.client.data.SiteMembershipRequest;
+import org.alfresco.rest.api.tests.client.data.Tag;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.apache.chemistry.opencmis.client.api.CmisObject;
+import org.apache.chemistry.opencmis.client.api.Document;
+import org.apache.chemistry.opencmis.client.api.FileableCmisObject;
+import org.apache.chemistry.opencmis.client.api.Folder;
+import org.apache.chemistry.opencmis.client.api.ItemIterable;
+import org.apache.chemistry.opencmis.client.api.ObjectId;
+import org.apache.chemistry.opencmis.client.api.ObjectType;
+import org.apache.chemistry.opencmis.client.api.OperationContext;
+import org.apache.chemistry.opencmis.client.api.QueryResult;
+import org.apache.chemistry.opencmis.client.api.Repository;
+import org.apache.chemistry.opencmis.client.api.Session;
+import org.apache.chemistry.opencmis.client.api.SessionFactory;
+import org.apache.chemistry.opencmis.client.api.Tree;
+import org.apache.chemistry.opencmis.client.runtime.OperationContextImpl;
+import org.apache.chemistry.opencmis.client.runtime.SessionFactoryImpl;
+import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.SessionParameter;
+import org.apache.chemistry.opencmis.commons.data.AllowableActions;
+import org.apache.chemistry.opencmis.commons.data.ContentStream;
+import org.apache.chemistry.opencmis.commons.definitions.FolderTypeDefinition;
+import org.apache.chemistry.opencmis.commons.enums.BindingType;
+import org.apache.chemistry.opencmis.commons.enums.UnfileObject;
+import org.apache.chemistry.opencmis.commons.enums.VersioningState;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * A client for interacting with the public api and returning Java objects.
+ * 
+ * @author steveglover
+ *
+ */
+public class PublicApiClient
+{
+    private static final Log logger = LogFactory.getLog(PublicApiClient.class);
+
+    private UserDataService userDataService;
+    private PublicApiHttpClient client;
+
+    private Sites sites;
+    private Tags tags;
+    private Comments comments;
+    private Nodes nodes;
+    private People people;
+    private Favourites favourites;
+    private SiteMembershipRequests siteMembershipRequests;
+    private Groups groups;
+    private RawProxy rawProxy;
+    private AuditApps auditApps;
+    private Actions actions;
+    
+
+    private ThreadLocal<RequestContext> rc = new ThreadLocal<RequestContext>();
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+    public PublicApiClient(PublicApiHttpClient client, UserDataService userDataService)
+    {
+        this.client = client;
+        this.userDataService = userDataService;
+
+        init();
+    }
+
+    public void init()
+    {
+        sites = new Sites();
+        tags = new Tags();
+        comments = new Comments();
+        nodes = new Nodes();
+        people = new People();
+        favourites = new Favourites();
+        siteMembershipRequests = new SiteMembershipRequests();
+        groups = new Groups();
+        rawProxy = new RawProxy();
+        auditApps = new AuditApps();
+        actions = new Actions();
+    }
+
+    public void setRequestContext(RequestContext rc)
+    {
+        this.rc.set(rc);
+    }
+
+    public RequestContext getRequestContext()
+    {
+        RequestContext context = rc.get();
+        if(context == null)
+        {
+            throw new RuntimeException("Must set a request context");
+        }
+        return context;
+    }
+
+    protected UserData findUser(String userName)
+    {
+        return userDataService.findUserByUserName(userName);
+    }
+
+    public RawProxy rawProxy()
+    {
+        return rawProxy;
+    }
+
+    public People people()
+    {
+        return people;
+    }
+
+    public Nodes nodes()
+    {
+        return nodes;
+    }
+
+    public Sites sites()
+    {
+        return sites;
+    }
+
+    public Favourites favourites()
+    {
+        return favourites;
+    }
+
+    public SiteMembershipRequests siteMembershipRequests()
+    {
+        return siteMembershipRequests;
+    }
+
+    public Tags tags()
+    {
+        return tags;
+    }
+
+    public Comments comments()
+    {
+        return comments;
+    }
+
+    public Groups groups()
+    {
+        return groups;
+    }
+    
+    public AuditApps auditApps(){
+        return auditApps;
+    }
+
+    public Actions actions()
+    {
+        return actions;
+    }
+    
+    public CmisSession createPublicApiCMISSession(Binding binding, String version)
+    {
+       return createPublicApiCMISSession(binding, version, null);
+    }
+
+    public CmisSession createPublicApiCMISSession(Binding binding, String version, String objectFactoryName)
+    {
+        CmisSession cmisSession = null;
+
+        RequestContext rc = getRequestContext();
+        if(rc == null)
+        {
+            throw new RuntimeException("Must set a request context");
+        }
+
+        String networkId = rc.getNetworkId();
+        String username = rc.getRunAsUser();
+        UserData userData = findUser(rc.getRunAsUser());
+        if(userData != null)
+        {
+            String password = userData.getPassword();
+
+            // default factory implementation
+            SessionFactory factory = SessionFactoryImpl.newInstance();
+            Map<String, String> parameters = new HashMap<String, String>();
+
+            // user credentials
+            parameters.put(SessionParameter.USER, username);
+            parameters.put(SessionParameter.PASSWORD, password);
+
+            // connection settings
+            if(binding == Binding.atom)
+            {
+                parameters.put(SessionParameter.ATOMPUB_URL, client.getPublicApiCmisUrl(networkId, binding, version, null));
+                parameters.put(SessionParameter.BINDING_TYPE, binding.getOpenCmisBinding().value());
+            }
+            else if(binding == Binding.browser)
+            {
+                parameters.put(SessionParameter.BROWSER_URL, client.getPublicApiCmisUrl(networkId, binding, version, null));
+                parameters.put(SessionParameter.BINDING_TYPE, binding.getOpenCmisBinding().value());
+            }
+            if(networkId != null)
+            {
+                parameters.put(SessionParameter.REPOSITORY_ID, networkId);
+            }
+            if(objectFactoryName != null)
+            {
+                parameters.put(SessionParameter.OBJECT_FACTORY_CLASS, objectFactoryName);
+            }
+
+            // create session
+            Session session = factory.createSession(parameters);
+
+            cmisSession = new CmisSession(session);
+        }
+
+        return cmisSession;
+    }
+
+    public CmisSession createCMISSession(String repositoryId, RequestContext rc)
+    {
+        CmisSession session = null;
+
+        UserData userData = findUser(rc.getRunAsUser());
+        if(userData != null)
+        {
+            session = createCMISSession(repositoryId, rc.getRunAsUser(), userData.getPassword());
+        }
+
+        return session;
+    }
+
+    /**
+     * Get CMIS repositories (Enterprise AtomPub CMIS binding)
+     *
+     * @return List<Repository>
+     */
+    public List<Repository> getCMISRepositories()
+    {
+        List<Repository> repositories = null;
+
+        RequestContext rc = getRequestContext();
+        if(rc == null)
+        {
+            throw new RuntimeException("Must set a request context");
+        }
+
+        UserData userData = findUser(rc.getRunAsUser());
+        if(userData != null)
+        {
+            // default factory implementation
+            SessionFactory factory = SessionFactoryImpl.newInstance();
+            Map<String, String> parameters = new HashMap<String, String>();
+
+            // user credentials
+            parameters.put(SessionParameter.USER, rc.getRunAsUser());
+            parameters.put(SessionParameter.PASSWORD, userData.getPassword());
+
+            // connection settings
+            parameters.put(SessionParameter.ATOMPUB_URL, client.getCmisUrl(null, null));
+            parameters.put(SessionParameter.BINDING_TYPE, BindingType.ATOMPUB.value());
+
+            repositories = factory.getRepositories(parameters);
+        }
+
+        return repositories;
+    }
+
+    /**
+     * Create a CMIS session using Enterprise AtomPub binding.
+     *
+     * @param repositoryId String
+     * @param username String
+     * @param password String
+     * @return CmisSession
+     */
+    public CmisSession createCMISSession(String repositoryId, String username, String password)
+    {
+        // default factory implementation
+        SessionFactory factory = SessionFactoryImpl.newInstance();
+        Map<String, String> parameters = new HashMap<String, String>();
+
+        // user credentials
+        parameters.put(SessionParameter.USER, username);
+        parameters.put(SessionParameter.PASSWORD, password);
+
+        // connection settings
+        parameters.put(SessionParameter.ATOMPUB_URL, client.getCmisUrl(repositoryId, null));
+        parameters.put(SessionParameter.BINDING_TYPE, BindingType.ATOMPUB.value());
+        if(repositoryId != null)
+        {
+            parameters.put(SessionParameter.REPOSITORY_ID, repositoryId);
+        }
+        parameters.put(SessionParameter.OBJECT_FACTORY_CLASS, AlfrescoObjectFactoryImpl.class.getName());
+
+        // create session
+        Session session = factory.createSession(parameters);
+
+        CmisSession cmisSession = new CmisSession(session);
+        return cmisSession;
+    }
+
+    public CmisSession getCMISSession(Repository respository)
+    {
+        RequestContext rc = getRequestContext();
+        if(rc == null)
+        {
+            throw new RuntimeException("Must set a request context");
+        }
+
+        CmisSession session = createCMISSession(respository.getId(), rc);
+        return session;
+    }
+
+    public HttpResponse post(Binding cmisBinding, String version, String cmisOperation, String body) throws PublicApiException
+    {
+        try
+        {
+            HttpResponse response = client.post(getRequestContext(), cmisBinding, version, cmisOperation, body);
+
+            logger.debug(response.toString());
+
+            return response;
+        }
+        catch(IOException e)
+        {
+            throw new PublicApiException(e);
+        }
+    }
+
+    public HttpResponse put(Binding cmisBinding, String version, String cmisOperation, String body) throws PublicApiException
+    {
+        try
+        {
+            HttpResponse response = client.put(getRequestContext(), cmisBinding, version, cmisOperation, body);
+
+            logger.debug(response.toString());
+
+            return response;
+        }
+        catch(IOException e)
+        {
+            throw new PublicApiException(e);
+        }
+    }
+
+    public HttpResponse get(Binding cmisBinding, String version, String cmisOperation, Map<String, String> parameters) throws PublicApiException
+    {
+        try
+        {
+            HttpResponse response = client.get(getRequestContext(), cmisBinding, version, cmisOperation, parameters);
+
+            logger.debug(response.toString());
+
+            return response;
+        }
+        catch(IOException e)
+        {
+            throw new PublicApiException(e);
+        }
+    }
+
+    public HttpResponse patch(Binding cmisBinding, String version, String cmisOperation, Map<String, String> parameters) throws PublicApiException
+    {
+        try
+        {
+            HttpResponse response = client.patch(getRequestContext(), cmisBinding, version, cmisOperation);
+
+            logger.debug(response.toString());
+
+            return response;
+        }
+        catch(IOException e)
+        {
+            throw new PublicApiException(e);
+        }
+    }
+
+    public HttpResponse trace(Binding cmisBinding, String version, String cmisOperation, Map<String, String> parameters) throws PublicApiException
+    {
+        try
+        {
+            HttpResponse response = client.trace(getRequestContext(), cmisBinding, version, cmisOperation);
+
+            logger.debug(response.toString());
+
+            return response;
+        }
+        catch(IOException e)
+        {
+            throw new PublicApiException(e);
+        }
+    }
+
+    public HttpResponse options(Binding cmisBinding, String version, String cmisOperation, Map<String, String> parameters) throws PublicApiException
+    {
+        try
+        {
+            HttpResponse response = client.options(getRequestContext(), cmisBinding, version, cmisOperation);
+
+            logger.debug(response.toString());
+
+            return response;
+        }
+        catch(IOException e)
+        {
+            throw new PublicApiException(e);
+        }
+    }
+
+    public HttpResponse head(Binding cmisBinding, String version, String cmisOperation, Map<String, String> parameters) throws PublicApiException
+    {
+        try
+        {
+            HttpResponse response = client.head(getRequestContext(), cmisBinding, version, cmisOperation);
+
+            logger.debug(response.toString());
+
+            return response;
+        }
+        catch(IOException e)
+        {
+            throw new PublicApiException(e);
+        }
+    }
+
+    public HttpResponse post(String scope, String entityCollectionName, Object entityId, String relationCollectionName, Object relationshipEntityId, String body) throws IOException
+    {
+        HttpResponse response = client.post(getRequestContext(), scope, entityCollectionName, entityId, relationCollectionName, relationshipEntityId != null ? relationshipEntityId.toString() : null, body);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse post(String scope, String entityCollectionName, Object entityId, String relationCollectionName, Object relationshipEntityId, String body,
+            final Map<String, String> params) throws IOException
+    {
+        HttpResponse response = client.post(getRequestContext(), scope, entityCollectionName, entityId, relationCollectionName,
+                relationshipEntityId != null ? relationshipEntityId.toString() : null, body, params);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse post(String scope, String entityCollectionName, Object entityId, String relationCollectionName, Object relationshipEntityId,
+                String body, String contentType) throws IOException
+    {
+        HttpResponse response = client.post(getRequestContext(), scope, entityCollectionName, entityId, relationCollectionName,
+                    relationshipEntityId != null ? relationshipEntityId.toString() : null, body, contentType);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+
+    public HttpResponse post(String scope, String entityCollectionName, Object entityId, String relationCollectionName, Object relationshipEntityId,
+                             byte[] body, String contentType) throws IOException
+    {
+        HttpResponse response = client.post(getRequestContext(), scope, entityCollectionName, entityId, relationCollectionName,
+                relationshipEntityId != null ? relationshipEntityId.toString() : null, body, contentType);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse post(String urlSuffix, String body) throws IOException
+    {
+        HttpResponse response = client.post(getRequestContext(), urlSuffix, body);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse post(final Class<?> c, Object entityId, Object relationshipEntityId, String body) throws IOException
+    {
+        HttpResponse response = client.post(c, getRequestContext(), entityId, relationshipEntityId, body);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse get(String scope, String entityCollectionName, Object entityId, String relationCollectionName, Object relationshipEntityId, Map<String, String> params, Map<String, String> headers) throws IOException
+    {
+        HttpResponse response = client.get(getRequestContext(), scope, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, params, headers);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse get(String scope, String entityCollectionName, Object entityId, String relationCollectionName, Object relationshipEntityId, Map<String, String> params) throws IOException
+    {
+        return get(scope, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, params, null);
+    }
+
+    public HttpResponse getWithPassword(String scope, String password, String entityCollectionName, Object entityId, String relationCollectionName, Object relationshipEntityId, Map<String, String> params) throws IOException
+    {
+        HttpResponse response = client.get(getRequestContext(), scope, password, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, params);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse get(String url, Map<String, String> params) throws IOException
+    {
+        RequestContext rc = getRequestContext();
+        HttpResponse response = client.get(url, rc, params);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse get(final Class<?> c, final Object entityId, final Object relationshipEntityId, Map<String, String> params) throws IOException
+    {
+        HttpResponse response = client.get(c, getRequestContext(), entityId, relationshipEntityId, params);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse put(String scope, String entityCollectionName, Object entityId, String relationCollectionName, Object relationshipEntityId, String body, Map<String, String> params) throws IOException
+    {
+        HttpResponse response = client.put(getRequestContext(), scope, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, body, params);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse put(final Class<?> c, Object entityId, Object relationshipEntityId, String body) throws IOException
+    {
+        HttpResponse response = client.put(c, getRequestContext(), entityId, relationshipEntityId, body);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse putBinary(String scope, int version, String entityCollectionName, Object entityId, String relationCollectionName,
+                Object relationshipEntityId, BinaryPayload payload, Map<String, String> params) throws IOException
+    {
+        HttpResponse response = client.putBinary(getRequestContext(), scope, version, entityCollectionName, entityId, relationCollectionName, relationshipEntityId,
+                                payload, params);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse delete(String scope, String entityCollectionName, Object entityId, String relationCollectionName, Object relationshipEntityId) throws IOException
+    {
+        return delete(scope, 1, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, null);
+    }
+
+    public HttpResponse delete(String scope, int version, String entityCollectionName, Object entityId, String relationCollectionName, Object relationshipEntityId, Map<String, String> params) throws IOException
+    {
+        HttpResponse response = client.delete(getRequestContext(), scope, version, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, params);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse put(final Class<?> c, Object entityId, Object relationshipEntityId) throws IOException
+    {
+        HttpResponse response = client.delete(c, getRequestContext(), entityId, relationshipEntityId);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse execute(RequestBuilder requestBuilder) throws IOException
+    {
+        if (requestBuilder.getRequestContext() == null)
+        {
+            throw new RuntimeException("Must set a request context");
+        }
+        HttpResponse response = client.execute(requestBuilder);
+
+        logger.debug(response.toString());
+
+        return response;
+    }
+
+    public HttpResponse index(Map<String, String> params) throws IOException
+    {
+        HttpResponse response = get("", params);
+        return response;
+    }
+
+    public List<String> getNetworkIds(String version)
+    {
+        RequestContext rc = getRequestContext();
+
+        UserData userData = findUser(rc.getRunAsUser());
+        if(userData == null)
+        {
+            throw new RuntimeException("Must provide a valid username");
+        }
+
+        SessionFactory factory = SessionFactoryImpl.newInstance();
+
+        Map<String, String> parameters = new HashMap<String, String>();
+
+        // connection settings
+        parameters.put(SessionParameter.ATOMPUB_URL, client.getPublicApiCmisUrl(null, Binding.atom, version, null));
+        parameters.put(SessionParameter.BINDING_TYPE, BindingType.ATOMPUB.value());
+
+        // user credentials
+        parameters.put(SessionParameter.USER, rc.getRunAsUser());
+        parameters.put(SessionParameter.PASSWORD, userData.getPassword());
+        List<Repository> repositories = factory.getRepositories(parameters);
+
+        List<String> repositoryIds = new ArrayList<String>(repositories.size());
+        for(Repository repository : repositories)
+        {
+            repositoryIds.add(repository.getId());
+        }
+
+        return repositoryIds;
+    }
+
+    public class AbstractProxy
+    {
+        public HttpResponse getAll(String entityCollectionName, String entityId, String relationCollectionName, String relationId, Map<String, String> params, String errorMessage)
+                throws PublicApiException
+        {
+            return getAll(entityCollectionName, entityId, relationCollectionName, relationId, params, errorMessage, HttpServletResponse.SC_OK);
+        }
+
+        public HttpResponse getAll(String entityCollectionName, String entityId, String relationCollectionName, String relationId, Map<String, String> params, String errorMessage,
+                int expectedStatus) throws PublicApiException
+        {
+            try
+            {
+                HttpResponse response = get("public", entityCollectionName, entityId, relationCollectionName, relationId, params);
+                checkStatus(errorMessage, expectedStatus, response);
+                return response;
+            }
+            catch (IOException e)
+            {
+                throw new PublicApiException(e);
+            }
+        }
+
+        public HttpResponse getSingle(String entityCollectionName, String entityId, String relationCollectionName, String relationId, String errorMessage) throws PublicApiException
+        {
+            return getSingle(entityCollectionName, entityId, relationCollectionName, relationId, errorMessage, HttpServletResponse.SC_OK);
+        }
+
+        public HttpResponse getSingle(String entityCollectionName, String entityId, String relationCollectionName, String relationId, String errorMessage, int expectedStatus) throws PublicApiException
+        {
+            try
+            {
+                HttpResponse response = get("public", entityCollectionName, entityId, relationCollectionName, relationId, null);
+                checkStatus(errorMessage, expectedStatus, response);
+                return response;
+            }
+            catch(IOException e)
+            {
+                throw new PublicApiException(e);
+            }
+        }
+
+        public HttpResponse getSingle(String entityCollectionName, String entityId, String relationCollectionName, String relationId, Map<String, String> params,
+                                      Map<String, String> headers, String errorMessage, int expectedStatus) throws PublicApiException
+        {
+            try
+            {
+                HttpResponse response = get("public", entityCollectionName, entityId, relationCollectionName, relationId, params, headers);
+                checkStatus(errorMessage, expectedStatus, response);
+                return response;
+            }
+            catch (IOException e)
+            {
+                throw new PublicApiException(e);
+            }
+        }
+
+        public HttpResponse getSingle(String entityCollectionName, String entityId, String relationCollectionName, String relationId, Map<String, String> params,
+                String errorMessage, int expectedStatus) throws PublicApiException
+        {
+            try
+            {
+                HttpResponse response = get("public", entityCollectionName, entityId, relationCollectionName, relationId, params);
+                checkStatus(errorMessage, expectedStatus, response);
+                return response;
+            }
+            catch (IOException e)
+            {
+                throw new PublicApiException(e);
+            }
+        }
+
+        public HttpResponse update(String entityCollectionName, String entityId, String relationCollectionName, String relationId, String body, String errorMessage) throws PublicApiException
+        {
+            return update(entityCollectionName, entityId, relationCollectionName, relationId, body, null, errorMessage, 200);
+        }
+
+        public HttpResponse update(String entityCollectionName, String entityId, String relationCollectionName, String relationId, String body, Map<String, String> params, String errorMessage, int expectedStatus) throws PublicApiException
+        {
+            try
+            {
+                HttpResponse response = put("public", entityCollectionName, entityId, relationCollectionName, relationId, body, params);
+                checkStatus(errorMessage, expectedStatus, response);
+                return response;
+            }
+            catch(IOException e)
+            {
+                throw new PublicApiException(e);
+            }
+        }
+
+        public HttpResponse create(String entityCollectionName, String entityId, String relationCollectionName, String relationId, String body, String errorMessage) throws PublicApiException
+        {
+            return create(entityCollectionName, entityId, relationCollectionName, relationId, body, errorMessage, HttpServletResponse.SC_CREATED);
+        }
+
+        public HttpResponse create(String entityCollectionName, String entityId, String relationCollectionName, String relationId, String body, String errorMessage,
+                int expectedStatus) throws PublicApiException
+        {
+            return create(entityCollectionName, entityId, relationCollectionName, relationId, body, errorMessage, expectedStatus, null);
+        }
+
+        public HttpResponse create(String entityCollectionName, String entityId, String relationCollectionName, String relationId, String body, String errorMessage,
+                int expectedStatus, Map<String, String> params) throws PublicApiException
+        {
+            try
+            {
+                HttpResponse response = post("public", entityCollectionName, entityId, relationCollectionName, relationId, body, params);
+                checkStatus(errorMessage, expectedStatus, response);
+                return response;
+            }
+            catch (IOException e)
+            {
+                throw new PublicApiException(e);
+            }
+        }
+
+        public HttpResponse remove(String entityCollectionName, String entityId, String relationCollectionName, String relationId, String errorMessage) throws PublicApiException
+        {
+            return remove(entityCollectionName, entityId, relationCollectionName, relationId, null, errorMessage, HttpServletResponse.SC_NO_CONTENT);
+        }
+
+        public HttpResponse remove(String entityCollectionName, String entityId, String relationCollectionName, String relationId, Map<String,String> params, String errorMessage, int expectedStatus) throws PublicApiException
+        {
+            try
+            {
+                HttpResponse response = delete("public", 1, entityCollectionName, entityId, relationCollectionName, relationId, params);
+                checkStatus(errorMessage, expectedStatus, response);
+                return response;
+            }
+            catch(IOException e)
+            {
+                throw new PublicApiException(e);
+            }
+        }
+
+        public JSONObject parseListSource(JSONObject jsonResponse)
+        {
+            JSONObject jsonList = (JSONObject)jsonResponse.get("list");
+            assertNotNull(jsonList);
+
+            JSONObject source = (JSONObject)jsonList.get("source");
+            assertNotNull(source);
+            return source;
+        }
+        
+        /**
+         * Used for validation of status code on rest response
+         */
+        public void checkStatus(String errorMessage, int expectedStatus, HttpResponse response) throws PublicApiException
+        {
+            int actualStatus = response.getStatusCode();
+            if ((expectedStatus > 0) && (expectedStatus != actualStatus))
+            {
+                String msg = "Status code " + actualStatus + " returned, but expected " + expectedStatus + ": \n" + errorMessage + ": \n"
+                        + "   Response: " + response;
+                throw new PublicApiException(msg, response);
+            }
+            /// in case of Status.SC_UNAUTHORIZED no response is returned
+            if (expectedStatus >= 400 && expectedStatus != 401)
+            {
+                checkErrorKeyResponse(errorMessage, expectedStatus, response);
+            }
+        }
+
+        /**
+         * Used for validation on field errorKey on Error rest response
+         */
+        public void checkErrorKeyResponse(String errorMessage, int expectedStatus, HttpResponse response) throws PublicApiException
+        {
+            PublicApiClient.ExpectedErrorResponse error;
+            // the error response must have a valid format in conformity with
+            // the
+            // ErrorResponse model
+            try
+            {
+                error = RestApiUtil.parseErrorResponse(response.getJsonResponse());
+            }
+            catch (Exception e)
+            {
+                throw new PublicApiException(e.getMessage(), response);
+            }
+
+            String errorKey = error.errorKey;
+            // validate the errorKey which have default message exception
+            if (errorKey != null && errorKey.contains("exception"))
+            {
+                boolean validErrorKey = false;
+
+                List<RestErrorResponseDefault> httpErrorsFilteredByStatusCode = Arrays.asList(RestErrorResponseDefault.values()).stream()
+                        .filter(t -> t.getStatusCode() == expectedStatus && t.getDefaultMessage() != null).collect(Collectors.toList());
+
+                httpErrorsFilteredByStatusCode.add(RestErrorResponseDefault.DEFAULT_API_EXCEPTION);
+
+                for (RestErrorResponseDefault errorResponseDefault : httpErrorsFilteredByStatusCode)
+                {
+                    if (errorResponseDefault.getDefaultMessage().equals(errorKey))
+                    {
+                        validErrorKey = true;
+                    }
+                }
+
+                if (validErrorKey == false)
+                {
+                    String msg = "Error key " + errorKey + " returned is not valid " + "\n" + errorMessage + ": \n" + "   Response: " + response;
+                    throw new PublicApiException(msg, response);
+                }
+
+            }
+        }
+
+    }
+
+    public static class ListResponse<T>
+    {
+        private ExpectedPaging paging;
+        private List<T> list;
+
+        public ListResponse(ExpectedPaging paging, List<T> list)
+        {
+            super();
+            this.paging = paging;
+            this.list = list;
+        }
+
+        public ExpectedPaging getPaging()
+        {
+            return paging;
+        }
+
+        public List<T> getList()
+        {
+            return list;
+        }
+    }
+
+    public class Sites extends AbstractProxy
+    {
+        public ListResponse<Site> getSites(Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("sites", null, null, null, params, "Failed to get sites");
+            return SiteImpl.parseSites(response.getJsonResponse());
+        }
+
+        public Site getSite(String siteId) throws PublicApiException
+        {
+            return getSite(siteId, 200);
+        }
+
+        public Site getSite(String siteId, int expectedStatus) throws PublicApiException
+        {
+            HttpResponse response = getSingle("sites", siteId, null, null, "Failed to get site " + siteId, expectedStatus);
+            if ((response != null) && (response.getJsonResponse() != null))
+            {
+                return SiteImpl.parseSite((JSONObject)response.getJsonResponse().get("entry"));
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public Site createSite(Site site) throws PublicApiException
+        {
+            return createSite(site, 201);
+        }
+
+        public Site createSite(Site site, int expectedStatus) throws PublicApiException
+        {
+            HttpResponse response = create("sites", null, null, null, site.toJSON().toString(), "Failed to create site "+site.getTitle(), expectedStatus);
+            return SiteImpl.parseSite((JSONObject)response.getJsonResponse().get("entry"));
+        }
+
+        public void removeSite(String siteId) throws PublicApiException
+        {
+            removeSite(siteId, false, 204);
+        }
+
+        public void removeSite(String siteId, boolean permanent, int expectedStatus) throws PublicApiException
+        {
+            Map<String, String> params = null;
+            if (permanent)
+            {
+                params = Collections.singletonMap("permanent", "true");
+            }
+            remove("sites", siteId, null, null, params, "Failed to remove site", expectedStatus);
+        }
+
+        public Site updateSite(String siteId, SiteUpdate update, int expectedStatus) throws PublicApiException
+        {
+            JSONAble jsonizer = new TestSites.SiteUpdateJSONSerializer(update);
+            HttpResponse response = update("sites", siteId, null, null, jsonizer.toJSON().toString(), null, "Failed to update site " + update.getTitle(), expectedStatus);
+            if (response.getJsonResponse() != null)
+            {
+                return SiteImpl.parseSite((JSONObject) response.getJsonResponse().get("entry"));
+            }
+            // No JSON response to parse.
+            return null;
+        }
+
+        public ListResponse<SiteContainer> getSiteContainers(String siteId, Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("sites", siteId, "containers", null, params, "Failed to get site containers");
+            return SiteContainer.parseSiteContainers(response.getJsonResponse());
+        }
+
+        public SiteContainer getSingleSiteContainer(String siteId, String containerId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("sites", siteId, "containers", containerId, "Failed to get site container");
+            SiteContainer siteContainer = SiteContainer.parseSiteContainer(siteId, (JSONObject)response.getJsonResponse().get("entry"));
+            return siteContainer;
+        }
+
+        public SiteContainer updateSiteContainer(SiteContainer siteContainer) throws PublicApiException
+        {
+            HttpResponse response = update("sites", siteContainer.getSiteId(), "containers", siteContainer.getId(), siteContainer.toJSON().toString(), "Failed to update site container");
+            SiteContainer retSiteContainer = SiteContainer.parseSiteContainer(siteContainer.getSiteId(), (JSONObject)response.getJsonResponse().get("entry"));
+            return retSiteContainer;
+        }
+
+        public SiteContainer createSiteContainer(SiteContainer siteContainer) throws PublicApiException
+        {
+            HttpResponse response = create("sites", siteContainer.getSiteId(), "containers", null, siteContainer.toJSON().toString(), "Failed to create site container");
+            SiteContainer retSiteContainer = SiteContainer.parseSiteContainer(siteContainer.getSiteId(), (JSONObject)response.getJsonResponse().get("entry"));
+            return retSiteContainer;
+        }
+
+        public void removeSiteContainer(SiteContainer siteContainer) throws PublicApiException
+        {
+            remove("sites", siteContainer.getSiteId(), "containers", siteContainer.getId(), "Failed to remove site container");
+        }
+
+        public ListResponse<SiteMember> getSiteMembers(String siteId, Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("sites", siteId, "members", null, params, "Failed to get all site members");
+            return SiteMember.parseSiteMembers(siteId, response.getJsonResponse());
+        }
+
+        public SiteMember getSingleSiteMember(String siteId, String personId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("sites", siteId, "members", personId, "Failed to get site member");
+            SiteMember retSiteMember = SiteMember.parseSiteMember(siteId, (JSONObject)response.getJsonResponse().get("entry"));
+            return retSiteMember;
+        }
+
+        public SiteMember updateSiteMember(String siteId, SiteMember siteMember) throws PublicApiException
+        {
+            HttpResponse response = update("sites", siteId, "members", siteMember.getMemberId(), siteMember.toJSON().toString(), "Failed to update site member");
+            SiteMember retSiteMember = SiteMember.parseSiteMember(siteMember.getSiteId(), (JSONObject)response.getJsonResponse().get("entry"));
+            return retSiteMember;
+        }
+
+        public SiteMember createSiteMember(String siteId, SiteMember siteMember) throws PublicApiException
+        {
+            HttpResponse response = create("sites", siteId, "members", null, siteMember.toJSON().toString(), "Failed to create site member");
+            SiteMember retSiteMember = SiteMember.parseSiteMember(siteMember.getSiteId(), (JSONObject)response.getJsonResponse().get("entry"));
+            return retSiteMember;
+        }
+
+        public void removeSiteMember(String siteId, SiteMember siteMember) throws PublicApiException
+        {
+            remove("sites", siteId, "members", siteMember.getMemberId(), "Failed to remove site member");
+        }
+
+        public ListResponse<MemberOfSite> getPersonSites(String personId, Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("people", personId, "sites", null, params, "Failed to get person sites");
+            return MemberOfSite.parseMemberOfSites(response.getJsonResponse());
+        }
+
+        public MemberOfSite getPersonSite(String personId, String siteId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("people", personId, "sites", siteId, "Failed to get person site" + siteId);
+            return MemberOfSite.parseMemberOfSite((JSONObject)response.getJsonResponse().get("entry"));
+        }
+
+        public MemberOfSite updatePersonSite(String personId, SiteMember siteMember) throws PublicApiException
+        {
+            HttpResponse response = update("people", personId, "sites", siteMember.getSiteId(), siteMember.toJSON().toString(), "Failed to update person site");
+            MemberOfSite retSiteMember = MemberOfSite.parseMemberOfSite((JSONObject)response.getJsonResponse().get("entry"));
+            return retSiteMember;
+        }
+
+        public MemberOfSite createPersonSite(String personId, SiteMember siteMember) throws PublicApiException
+        {
+            HttpResponse response = create("people", personId, "sites", null, siteMember.toJSON().toString(), "Failed to create person site");
+            MemberOfSite retSiteMember = MemberOfSite.parseMemberOfSite((JSONObject)response.getJsonResponse().get("entry"));
+            return retSiteMember;
+        }
+
+        public void removePersonSite(String personId, SiteMember siteMember) throws PublicApiException
+        {
+            remove("people", personId, "sites", siteMember.getSiteId(), "Failed to remove person site");
+        }
+
+        public ListResponse<FavouriteSite> getFavouriteSites(String personId, Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("people", personId, "favorite-sites", null, params, "Failed to get favourite sites");
+            return FavouriteSite.parseFavouriteSites(response.getJsonResponse());
+        }
+
+        public FavouriteSite getSingleFavouriteSite(String personId, String siteId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("people", personId, "favorite-sites", siteId, "Failed to get favourite site");
+            FavouriteSite favouriteSite = FavouriteSite.parseFavouriteSite((JSONObject)response.getJsonResponse().get("entry"));
+            return favouriteSite;
+        }
+
+        public FavouriteSite updateFavouriteSite(String personId, FavouriteSite site) throws PublicApiException
+        {
+            HttpResponse response = update("people", personId, "favorite-sites", site.getSiteId(), site.toJSON().toString(), "Failed to update favourite site");
+            FavouriteSite favouriteSite = FavouriteSite.parseFavouriteSite((JSONObject)response.getJsonResponse().get("entry"));
+            return favouriteSite;
+        }
+
+        public FavouriteSite createFavouriteSite(String personId, FavouriteSite site) throws PublicApiException
+        {
+            HttpResponse response = create("people", personId, "favorite-sites", null, site.toJSON().toString(), "Failed to create favourite site");
+            FavouriteSite favouriteSite = FavouriteSite.parseFavouriteSite((JSONObject)response.getJsonResponse().get("entry"));
+            return favouriteSite;
+        }
+
+        public void removeFavouriteSite(String personId, FavouriteSite site) throws PublicApiException
+        {
+            remove("people", personId, "favorite-sites", site.getSiteId(), "Failed to remove favourite site");
+        }
+
+        public SiteGroup addGroup(String siteId, SiteGroup group) throws PublicApiException
+        {
+            HttpResponse response = create("sites", siteId, "group-members", null, group.toJSON().toString() , "Failed to add site groups");
+            return SiteGroup.parseSiteGroup(siteId, (JSONObject)response.getJsonResponse().get("entry"));
+        }
+
+        public ListResponse<SiteGroup> getGroups(String siteId, Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("sites", siteId, "group-members", null, params, "Failed to fetch all site groups");
+            return SiteGroup.parseGroupMemberOfSites(siteId, response.getJsonResponse());
+        }
+
+        public SiteGroup getGroup(String siteId, String groupId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("sites", siteId, "group-members", groupId.toString() , "Failed to get a site group");
+            return SiteGroup.parseSiteGroup(siteId, (JSONObject)response.getJsonResponse().get("entry"));
+        }
+
+        public SiteGroup updateGroup(String siteId, SiteGroup group) throws PublicApiException
+        {
+            HttpResponse response = update("sites", siteId, "group-members", group.getId(), group.toJSON().toString() , "Failed to update a site group");
+            return SiteGroup.parseSiteGroup(siteId, (JSONObject)response.getJsonResponse().get("entry"));
+        }
+
+        public void deleteGroup(String siteId, String groupId) throws PublicApiException
+        {
+            remove("sites", siteId, "group-members", groupId , "Failed to delete site group");
+        }
+    }
+
+    public class SiteMembershipRequests extends AbstractProxy
+    {
+        public SiteMembershipRequest getSiteMembershipRequest(String personId, String siteId) throws PublicApiException, ParseException
+        {
+            HttpResponse response = getSingle("people", personId, "site-membership-requests", siteId, "Failed to get siteMembershipRequest");
+            return SiteMembershipRequest.parseSiteMembershipRequest((JSONObject) response.getJsonResponse().get("entry"));
+        }
+
+        public ListResponse<SiteMembershipRequest> getSiteMembershipRequests(String personId, Map<String, String> params) throws PublicApiException, ParseException
+        {
+            HttpResponse response = getAll("people", personId, "site-membership-requests", null, params, "Failed to get siteMembershipRequests");
+            return SiteMembershipRequest.parseSiteMembershipRequests(response.getJsonResponse());
+        }
+
+        public SiteMembershipRequest createSiteMembershipRequest(String personId, SiteMembershipRequest siteMembershipRequest) throws PublicApiException, ParseException
+        {
+            HttpResponse response = create("people", personId, "site-membership-requests", null, siteMembershipRequest.toJSON().toString(), "Failed to create siteMembershipRequest");
+            SiteMembershipRequest ret = SiteMembershipRequest.parseSiteMembershipRequest((JSONObject) response.getJsonResponse().get("entry"));
+            return ret;
+        }
+
+        public SiteMembershipRequest updateSiteMembershipRequest(String personId, SiteMembershipRequest siteMembershipRequest) throws PublicApiException, ParseException
+        {
+            HttpResponse response = update("people", personId, "site-membership-requests", siteMembershipRequest.getId(), siteMembershipRequest.toJSON().toString(), "Failed to update siteMembershipRequest");
+            SiteMembershipRequest ret = SiteMembershipRequest.parseSiteMembershipRequest((JSONObject) response.getJsonResponse().get("entry"));
+            return ret;
+        }
+
+        public void cancelSiteMembershipRequest(String personId, String siteMembershipRequestId) throws PublicApiException
+        {
+            remove("people", personId, "site-membership-requests", siteMembershipRequestId, "Failed to cancel siteMembershipRequest");
+        }
+
+        public ListResponse<SiteMembershipRequest> getSiteMembershipRequests(Map<String, String> params, String errorMessage, int expectedStatus) throws PublicApiException, ParseException
+        {
+            HttpResponse response = getAll("site-membership-requests", null, null, null, params, errorMessage, expectedStatus);
+
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject jsonList = (JSONObject) response.getJsonResponse().get("list");
+                if (jsonList != null)
+                {
+                    return SiteMembershipRequest.parseSiteMembershipRequests(response.getJsonResponse());
+                }
+            }
+            return null;
+        }
+    }
+
+    public class RawProxy extends AbstractProxy
+    {
+    }
+
+    public class Favourites extends AbstractProxy
+    {
+        public ListResponse<Favourite> getFavourites(String personId, Map<String, String> params) throws PublicApiException, ParseException
+        {
+            HttpResponse response = getAll("people", personId, "favorites", null, params, "Failed to get favourites");
+            return Favourite.parseFavourites(response.getJsonResponse());
+        }
+
+        public Favourite getFavourite(String personId, String favouriteId) throws PublicApiException, ParseException
+        {
+            HttpResponse response = getSingle("people", personId, "favorites", favouriteId, "Failed to get favourite " + favouriteId);
+            return Favourite.parseFavourite((JSONObject)response.getJsonResponse().get("entry"));
+        }
+
+        public Favourite getFavourite(String personId, String favouriteId, Map<String, String> params) throws PublicApiException, ParseException
+        {
+            HttpResponse response = getSingle("people", personId, "favorites", favouriteId, params, "Failed to get favourite " + favouriteId, 200);
+            return Favourite.parseFavourite((JSONObject) response.getJsonResponse().get("entry"));
+        }
+
+        public Favourite createFavourite(String personId, Favourite favourite) throws PublicApiException, ParseException
+        {
+            HttpResponse response = create("people", personId, "favorites", null, favourite.toJSON().toString(), "Failed to create favourite");
+            Favourite ret = Favourite.parseFavourite((JSONObject)response.getJsonResponse().get("entry"));
+            return ret;
+        }
+
+        public Favourite createFavourite(String personId, Favourite favourite, Map<String, String> params) throws PublicApiException, ParseException
+        {
+            HttpResponse response = create("people", personId, "favorites", null, favourite.toJSON().toString(), "Failed to create favourite", 201, params);
+            Favourite ret = Favourite.parseFavourite((JSONObject)response.getJsonResponse().get("entry"));
+            return ret;
+        }
+
+        public void removeFavourite(String personId, String favouriteId) throws PublicApiException
+        {
+            remove("people", personId, "favorites", favouriteId, "Failed to remove favourite");
+        }
+    }
+
+    public class People extends AbstractProxy
+    {
+        public ListResponse<Person> getPeople(Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("people", null, null, null, params, "Failed to get people");
+            return Person.parsePeople(response.getJsonResponse());
+        }
+
+        public Person getPerson(String personId) throws PublicApiException
+        {
+            return getPerson(personId, 200);
+        }
+
+        public Person getPerson(String personId, int expectedStatus) throws PublicApiException
+        {
+            HttpResponse response = getSingle("people", personId, null, null, "Failed to get person", expectedStatus);
+
+            if(logger.isDebugEnabled())
+            {
+                logger.debug(response);
+            }
+            System.out.println(response);
+
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject entry = (JSONObject) response.getJsonResponse().get("entry");
+                if (entry != null)
+                {
+                    return Person.parsePerson(entry);
+                }
+            }
+            return null;
+        }
+
+        public Person update(String personId, Person person) throws PublicApiException
+        {
+            return update(personId, person, 200);
+        }
+
+        public Person update(String personId, Person person, int expectedStatus) throws PublicApiException
+        {
+            return update(personId, person.toJSON(true).toString(), expectedStatus);
+        }
+
+        public Person update(String personId, String json, int expectedStatus) throws PublicApiException
+        {
+            return update(personId, json, null, expectedStatus);
+        }
+
+        public Person update(String personId, String json, Map<String,String> params, int expectedStatus) throws PublicApiException
+        {
+            HttpResponse response = update("people", personId, null, null, json, params, "Failed to update person", expectedStatus);
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject entry = (JSONObject) response.getJsonResponse().get("entry");
+                if (entry != null)
+                {
+                    return Person.parsePerson(entry);
+                }
+            }
+            return null;
+        }
+
+        public Person create(Person person) throws PublicApiException
+        {
+            return create(person, 201);
+        }
+
+        public Person create(Person person, int expectedStatus) throws PublicApiException
+        {
+            TestPeople.PersonJSONSerializer jsonizer = new TestPeople.PersonJSONSerializer(person) ;
+            HttpResponse response = create("people", null, null, null, jsonizer.toJSON().toString(), "Failed to create person", expectedStatus);
+            if ((response != null) && (response.getJsonResponse() != null))
+            {
+                JSONObject entry = (JSONObject) response.getJsonResponse().get("entry");
+                if (entry != null)
+                {
+                    return Person.parsePerson(entry);
+                }
+            }
+            return null;
+        }
+
+        public void remove(Person person) throws PublicApiException
+        {
+            remove("people", person.getId(), null, null, "Failed to remove person");
+        }
+
+        public ListResponse<Preference> getPreferences(String personId, Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("people", personId, "preferences", null, params, "Failed to get person preferences");
+            return Preference.parsePreferences(response.getJsonResponse());
+        }
+
+        public Preference getPreference(String personId, String preferenceId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("people", personId, "preferences", preferenceId, "Failed to get person preference");
+            Preference pref = Preference.parsePreference((JSONObject)response.getJsonResponse().get("entry"));
+            return pref;
+        }
+
+        public Person updatePreference(String personId, Preference preference) throws PublicApiException
+        {
+            HttpResponse response = update("people", personId, "preferences", preference.getId(), preference.toJSON().toString(), "Failed to update person preference");
+            Person retSite = Person.parsePerson((JSONObject)response.getJsonResponse().get("entry"));
+            return retSite;
+        }
+
+        public Person createPreference(String personId, Preference preference) throws PublicApiException
+        {
+            HttpResponse response = create("people", personId, "preferences", null, preference.toJSON().toString(), "Failed to create person preference");
+            Person retSite = Person.parsePerson((JSONObject)response.getJsonResponse().get("entry"));
+            return retSite;
+        }
+
+        public void removePreference(String personId, Preference preference) throws PublicApiException
+        {
+            remove("people", personId, "preferences", preference.getId(), "Failed to remove person preference");
+        }
+
+        public ListResponse<PersonNetwork> getNetworkMemberships(String personId, Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("people", personId, "networks", null, params, "Failed to get network members");
+            return PersonNetwork.parseNetworkMembers(response.getJsonResponse());
+        }
+
+        public PersonNetwork getNetworkMembership(String personId, String networkId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("people", personId, "networks", networkId, "Failed to get network member");
+            PersonNetwork networkMember = PersonNetwork.parseNetworkMember((JSONObject)response.getJsonResponse().get("entry"));
+            return networkMember;
+        }
+
+        public PersonNetwork updateNetworkMembership(String personId, PersonNetwork networkMember) throws PublicApiException
+        {
+            HttpResponse response = update("people", personId, "networks", networkMember.getId(), networkMember.toJSON().toString(), "Failed to update network member");
+            PersonNetwork retNetwork = PersonNetwork.parseNetworkMember((JSONObject)response.getJsonResponse().get("entry"));
+            return retNetwork;
+        }
+
+        public PersonNetwork createNetworkMembership(String personId, PersonNetwork network) throws PublicApiException
+        {
+            HttpResponse response = create("people", personId, "networks", null, network.toJSON().toString(), "Failed to create network member");
+            PersonNetwork retNetwork = PersonNetwork.parseNetworkMember((JSONObject)response.getJsonResponse().get("entry"));
+            return retNetwork;
+        }
+
+        public void removeNetworkMembership(String personId, PersonNetwork networkMember) throws PublicApiException
+        {
+            remove("people", personId, "networks", networkMember.getId(), "Failed to remove network member");
+        }
+
+        public ListResponse<Activity> getActivities(String personId, Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("people", personId, "activities", null, params, "Failed to get activities");
+            return Activities.parseActivities(response.getJsonResponse());
+        }
+
+        public Activity getSingleActivity(String personId, String activityId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("people", personId, "activities", activityId, "Failed to get activities");
+            Activity activity = Activity.parseActivity((JSONObject)response.getJsonResponse().get("entry"));
+            return activity;
+        }
+
+        public Activity update(String personId, Activity activity) throws PublicApiException
+        {
+            HttpResponse response = update("people", personId, "activities", String.valueOf(activity.getId()), activity.toJSON().toString(), "Failed to update activity");
+            Activity retActivity = Activity.parseActivity((JSONObject)response.getJsonResponse().get("entry"));
+            return retActivity;
+        }
+
+        public Activity create(String personId, Activity activity) throws PublicApiException
+        {
+            HttpResponse response = create("people", personId, "activities", String.valueOf(activity.getId()), activity.toJSON().toString(), "Failed to create activity");
+            Activity retActivity = Activity.parseActivity((JSONObject)response.getJsonResponse().get("entry"));
+            return retActivity;
+        }
+
+        public void remove(String personId, Activity activity) throws PublicApiException
+        {
+            remove("people", personId, "activities", String.valueOf(activity.getId()), "Failed to remove activity");
+        }
+
+        public HttpResponse getAvatar(String personId, boolean placeholder, int expectedStatus) throws PublicApiException, InterruptedException
+        {
+            return getAvatar(personId, null, placeholder, null, expectedStatus);
+        }
+
+        public HttpResponse getAvatar(String personId, String ifModifiedSince, int expectedStatus) throws PublicApiException, InterruptedException
+        {
+            return getAvatar(personId, null, false, ifModifiedSince, expectedStatus);
+        }
+
+        public HttpResponse getAvatar(String personId, Boolean attachment, boolean placeholder, String ifModifiedSince, int expectedStatus) throws PublicApiException, InterruptedException
+        {
+            // Binary response expected
+            Map<String, String> params = new HashMap<>();
+            params.put("placeholder", Boolean.toString(placeholder));
+            // Optional attachment parameter
+            if (attachment != null)
+            {
+                params.put("attachment", attachment.toString());
+            }
+
+            Map<String, String> headers = new HashMap<>();
+            if (ifModifiedSince != null)
+            {
+                headers.put("If-Modified-Since", ifModifiedSince);
+            }
+
+            // As renditions are now done async, we generally need to wait.
+            HttpResponse response = getSingleWithDelayRetry("people", personId, "avatar",
+                    null, params, headers, "Failed to get avatar", 40, 2500, expectedStatus);
+            checkStatus("Unexpected response", expectedStatus, response);
+
+            return response;
+        }
+
+        private HttpResponse getSingleWithDelayRetry(String entityCollectionName, String entityId, String relationCollectionName, String relationId, Map<String, String> params,
+                                      Map<String, String> headers, String errorMessage, int repeat, long pauseInMillisecond, int expectedStatus) throws PublicApiException, InterruptedException
+        {
+            int retryCount = 0;
+            while (retryCount < repeat)
+            {
+                try
+                {
+                    return getSingle(entityCollectionName, entityId, relationCollectionName, relationId, params, headers, errorMessage, expectedStatus);
+                }
+                catch (PublicApiException ex)
+                {
+                    retryCount++;
+                    Thread.sleep(pauseInMillisecond);
+                }
+            }
+            return null;
+        }
+
+        public HttpResponse updateAvatar(String personId, File avatar, int expectedStatus) throws PublicApiException
+        {
+            try
+            {
+                Map<String, String> params = new HashMap<>();
+                BinaryPayload payload = new BinaryPayload(avatar);
+                HttpResponse response = client.putBinary(getRequestContext(), "public", 1, "people", personId, "avatar", null, payload, params);
+                checkStatus("Unexpected status", expectedStatus, response);
+                return response;
+            }
+            catch(IOException e)
+            {
+                throw new PublicApiException(e);
+            }
+        }
+
+        public void deleteAvatarImage(String personId, int expectedStatus) throws PublicApiException{
+            remove("people", personId, "avatar", null, null, "Failed to remove avatar image", expectedStatus);
+        }
+    }
+
+    public class Comments extends AbstractProxy
+    {
+        public ListResponse<Comment> getTenantComments(Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("comments", null, null, null, params, "Failed to get comments");
+            return Comment.parseComments(null, response.getJsonResponse());
+        }
+
+        public Comment getTenantComment(String commentId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("comments", commentId, null, null, "Failed to get comment");
+            Comment comment = Comment.parseComment(null, (JSONObject)response.getJsonResponse().get("entry"));
+            return comment;
+        }
+
+        public Comment updateTenantComment(Comment comment) throws PublicApiException
+        {
+            HttpResponse response = update("comments", comment.getId(), null, null, comment.toJSON(true).toString(), "Failed to update comment");
+            Comment retComment = Comment.parseComment(null, (JSONObject)response.getJsonResponse().get("entry"));
+            return retComment;
+        }
+
+        public Comment createTenantComment(Comment comment) throws PublicApiException
+        {
+            HttpResponse response = create("comments", null, null, null, comment.toJSON(true).toString(), "Failed to create comment");
+            Comment retComment = Comment.parseComment(null, (JSONObject)response.getJsonResponse().get("entry"));
+            return retComment;
+        }
+
+        public void removeTenantComment(Comment comment) throws PublicApiException
+        {
+            remove("comments", comment.getId(), null, null, "Failed to remove comment");
+        }
+
+        public ListResponse<Comment> getNodeComments(String nodeId, Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("nodes", nodeId, "comments", null, params, "Failed to get comments");
+            return Comment.parseComments(nodeId, response.getJsonResponse());
+        }
+
+        public Comment getNodeComment(String nodeId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("nodes", nodeId, null, null, "Failed to get comment");
+            Comment comment = Comment.parseComment(nodeId, (JSONObject)response.getJsonResponse().get("entry"));
+            return comment;
+        }
+
+        public Comment updateNodeComment(String nodeId, String commentId, Comment comment) throws PublicApiException
+        {
+            HttpResponse response = update("nodes", nodeId, "comments", commentId, comment.toJSON(true).toString(), "Failed to update comment");
+            Comment retComment = Comment.parseComment(nodeId, (JSONObject)response.getJsonResponse().get("entry"));
+            return retComment;
+        }
+
+        public Comment createNodeComment(String nodeId, Comment comment) throws PublicApiException
+        {
+            HttpResponse response = create("nodes", nodeId, "comments", null, comment.toJSON(true).toString(), "Failed to create comment");
+            Comment retComment = Comment.parseComment(nodeId, (JSONObject)response.getJsonResponse().get("entry"));
+            return retComment;
+        }
+
+        public void removeNodeComment(String nodeId, String commentId) throws PublicApiException
+        {
+            remove("nodes", nodeId, "comments", commentId, "Failed to remove comment");
+        }
+    }
+
+    public class Tags extends AbstractProxy
+    {
+        public ListResponse<Tag> getTags(Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("tags", null, null, null, params, "Failed to get tags");
+            return Tag.parseTags(null, response.getJsonResponse());
+        }
+
+        public Tag getSingle(String tagId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("tags", tagId, null, null, "Failed to get tag");
+            Tag tag = Tag.parseTag(null, (JSONObject)response.getJsonResponse().get("entry"));
+            return tag;
+        }
+
+        public Tag update(Tag tag) throws PublicApiException
+        {
+            HttpResponse response = update("tags", tag.getId(), null, null, tag.toJSON().toString(), "Failed to update tag");
+            Tag retTag = Tag.parseTag(null, (JSONObject)response.getJsonResponse().get("entry"));
+            return retTag;
+        }
+
+//		public Tag create(Tag tag) throws PublicApiException
+//		{
+//			HttpResponse response = create("tags", tag.getTagId(), null, null, tag.toJSON().toString(), "Failed to create tag");
+//			Tag retTag = Tag.parseTag(null, (JSONObject)response.getJsonResponse().get("entry"));
+//			return retTag;
+//		}
+
+        public void remove(Tag tag) throws PublicApiException
+        {
+            remove("tags", tag.getId(), null, null, "Failed to remove tag");
+        }
+    }
+
+    public class Nodes extends AbstractProxy
+    {
+        public ListResponse<Tag> getNodeTags(String nodeId, Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("nodes", nodeId, "tags", null, params, "Failed to get node tags");
+            return Tag.parseTags(nodeId, response.getJsonResponse());
+        }
+
+        public void removeNodeTag(String nodeId, String tagId) throws PublicApiException
+        {
+            remove("nodes", nodeId, "tags", tagId, "Failed to remove node tag");
+        }
+
+        public Tag createNodeTag(String nodeId, Tag tag) throws PublicApiException
+        {
+            HttpResponse response = create("nodes", nodeId, "tags", null, tag.toJSON().toString(), "Failed to create node tag");
+            Tag tagRet = Tag.parseTag(nodeId, (JSONObject)response.getJsonResponse().get("entry"));
+            return tagRet;
+        }
+
+        public NodeRating getNodeRating(String nodeId, String ratingId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("nodes", nodeId, "ratings", ratingId, "Failed to get node ratings");
+            return NodeRating.parseNodeRating(nodeId, (JSONObject)response.getJsonResponse().get("entry"));
+        }
+
+        public ListResponse<NodeRating> getNodeRatings(String nodeId, Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("nodes", nodeId, "ratings", null, params, "Failed to get node ratings");
+            return NodeRating.parseNodeRatings(nodeId, response.getJsonResponse());
+        }
+
+        public NodeRating updateNodeRating(String nodeId, NodeRating nodeRating) throws PublicApiException
+        {
+            HttpResponse response = update("nodes", nodeId, "ratings", nodeRating.getId(), nodeRating.toJSON().toString(), "Failed to update node rating");
+            NodeRating nodeRatingRet = NodeRating.parseNodeRating(nodeId, (JSONObject)response.getJsonResponse().get("entry"));
+            return nodeRatingRet;
+        }
+
+        public NodeRating createNodeRating(String nodeId, NodeRating nodeRating) throws PublicApiException
+        {
+            HttpResponse response = create("nodes", nodeId, "ratings", null, nodeRating.toJSON().toString(), "Failed to create node rating");
+            NodeRating nodeRatingRet = NodeRating.parseNodeRating(nodeId, (JSONObject)response.getJsonResponse().get("entry"));
+            return nodeRatingRet;
+        }
+
+        public void removeNodeRating(String nodeId, NodeRating rating) throws PublicApiException
+        {
+            remove("nodes", nodeId, "ratings", rating.getId(), "Failed to remove node rating");
+        }
+    }
+
+    public static class ExpectedPaging
+    {
+        private int skipCount;
+        private int maxItems;
+        private Integer totalItems;
+        private boolean hasMoreItems;
+        private int count;
+
+        public ExpectedPaging()
+        {
+        }
+
+        public ExpectedPaging(int skipCount, int maxItems, Integer totalItems, boolean hasMoreItems, int count)
+        {
+            super();
+            this.skipCount = skipCount;
+            this.maxItems = maxItems;
+            this.totalItems = totalItems;
+            this.hasMoreItems = hasMoreItems;
+            this.count = count;
+        }
+
+        public Integer getSkipCount()
+        {
+            return skipCount;
+        }
+
+        public Integer getMaxItems()
+        {
+            return maxItems;
+        }
+
+        public Integer getTotalItems()
+        {
+            return totalItems;
+        }
+
+        public Boolean getHasMoreItems()
+        {
+            return hasMoreItems;
+        }
+
+        public Integer getCount()
+        {
+            return count;
+        }
+
+        public void setCount(Integer count)
+        {
+            this.count = count;
+        }
+
+        public void setHasMoreItems(Boolean hasMoreItems)
+        {
+            this.hasMoreItems = hasMoreItems;
+        }
+
+        public void setTotalItems(Integer totalItems)
+        {
+            this.totalItems = totalItems;
+        }
+
+        public void setSkipCount(Integer skipCount)
+        {
+            this.skipCount = skipCount;
+        }
+
+        public void setMaxItems(Integer maxItems)
+        {
+            this.maxItems = maxItems;
+        }
+
+        @Override
+        public int hashCode()
+        {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + count;
+            result = prime * result + (hasMoreItems ? 1231 : 1237);
+            result = prime * result + maxItems;
+            result = prime * result + skipCount;
+            result = prime * result
+                    + ((totalItems == null) ? 0 : totalItems.hashCode());
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj)
+        {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            ExpectedPaging other = (ExpectedPaging) obj;
+            if (count != other.count)
+                return false;
+            if (hasMoreItems != other.hasMoreItems)
+                return false;
+            if (maxItems != other.maxItems)
+                return false;
+            if (skipCount != other.skipCount)
+                return false;
+            if (totalItems == null) {
+                if (other.totalItems != null)
+                    return false;
+            } else if (!totalItems.equals(other.totalItems))
+                return false;
+            return true;
+        }
+
+        @Override
+        public String toString()
+        {
+            return "ExpectedPaging [skipCount="
+                    + skipCount
+                    + ", maxItems="
+                    + maxItems
+                    + ", "
+                    + (totalItems != null ? "totalItems=" + totalItems + ", "
+                            : "") + "hasMoreItems=" + hasMoreItems + ", count="
+                    + count + "]";
+        }
+
+        public static ExpectedPaging parsePagination(JSONObject jsonList)
+        {
+            ExpectedPaging paging = new ExpectedPaging();
+            JSONObject jsonPagination = (JSONObject)jsonList.get("pagination");
+            if(jsonPagination != null)
+            {
+                Long count = (Long)jsonPagination.get("count");
+                paging.setCount(count.intValue());
+
+                Boolean hasMoreItems = (Boolean)jsonPagination.get("hasMoreItems");
+                paging.setHasMoreItems(hasMoreItems);
+
+                Long totalItems = (Long)jsonPagination.get("totalItems");
+                if(totalItems != null)
+                {
+                    paging.setTotalItems(totalItems.intValue());
+                }
+
+                Long maxItems = (Long)jsonPagination.get("maxItems");
+                paging.setMaxItems(maxItems.intValue());
+
+                Long skipCount = (Long)jsonPagination.get("skipCount");
+                paging.setSkipCount(skipCount.intValue());
+            }
+            return paging;
+        }
+
+        public static ExpectedPaging getExpectedPaging(Integer skipCount, Integer maxItems, int total, Integer expectedTotal)
+        {
+            int skip = skipCount != null ? skipCount : org.alfresco.rest.framework.resource.parameters.Paging.DEFAULT_SKIP_COUNT;
+            int max = maxItems != null ? maxItems : org.alfresco.rest.framework.resource.parameters.Paging.DEFAULT_MAX_ITEMS;
+            int expectedCount = -1;
+            int end = skip + max;
+            if(end < 0 || end > total)
+            {
+                // overflow or greater than the total
+                expectedCount = total - skip;
+                end = total;
+            }
+            else
+            {
+                expectedCount = max;
+            }
+            if(expectedCount < 0)
+            {
+                expectedCount = 0;
+            }
+            boolean hasMore = end < total;
+            ExpectedPaging expectedPaging = new ExpectedPaging(skip, max, expectedTotal, hasMore, expectedCount);
+            return expectedPaging;
+        }
+    }
+
+    public class CmisSession
+    {
+        private Session session;
+
+        public CmisSession(Session session)
+        {
+            this.session = session;
+        }
+
+        public Session getCMISSession()
+        {
+            return session;
+        }
+
+        public CmisObject getObject(String objectId)
+        {
+            RequestContext rc = getRequestContext();
+            OperationContext ctx = rc.getCmisOperationCtxOverride();
+            if(ctx == null)
+            {
+                 ctx = new OperationContextImpl();
+            }
+
+            CmisObject res = session.getObject(objectId, ctx);
+            return res;
+        }
+
+        public CmisObject getObjectByPath(String path)
+        {
+            OperationContextImpl ctx = new OperationContextImpl();
+            CmisObject res = session.getObjectByPath(path, ctx);
+            return res;
+        }
+
+        public List<Folder> getObjectParents(String objectId)
+        {
+            CmisObject o = session.getObject(objectId);
+            if(o instanceof FileableCmisObject)
+            {
+                FileableCmisObject f = (FileableCmisObject)o;
+
+                OperationContextImpl ctx = new OperationContextImpl();
+                List<Folder> res = f.getParents(ctx);
+                return res;
+            }
+            else
+            {
+                throw new IllegalArgumentException("Object does not exist or is not a fileable cmis object");
+            }
+        }
+
+        public void deleteContent(String objectId, boolean refresh)
+        {
+            CmisObject o = getObject(objectId);
+
+            if(o instanceof Document)
+            {
+                Document d = (Document)o;
+                d.deleteContentStream(refresh);
+            }
+            else
+            {
+                throw new IllegalArgumentException("Object does not exists or is not a document");
+            }
+        }
+
+        public ContentData getContent(String objectId) throws IOException
+        {
+            CmisObject o = getObject(objectId);
+            if(o instanceof Document)
+            {
+                Document d = (Document)o;
+                ContentStream res = d.getContentStream();
+                ContentData c = new ContentData(res);
+                return c;
+            }
+            else
+            {
+                throw new IllegalArgumentException("Object does not exist or is not a document");
+            }
+        }
+
+        public void putContent(String objectId, String filename, BigInteger length, String mimetype, InputStream content, boolean overwrite)
+        {
+            CmisObject o = getObject(objectId);
+            if(o instanceof Document)
+            {
+                Document d = (Document)o;
+                ContentStream contentStream = new ContentStreamImpl(filename, length, mimetype, content);
+                try
+                {
+                    d.setContentStream(contentStream, overwrite);
+                }
+                finally
+                {
+                    try
+                    {
+                        contentStream.getStream().close();
+                    }
+                    catch (Exception e)
+                    {
+                    }
+                }
+            }
+            else
+            {
+                throw new IllegalArgumentException("Object does not exist or is not a document");
+            }
+        }
+
+        public void addChildren(FolderNode f, Tree<FileableCmisObject> t)
+        {
+            FileableCmisObject fco = t.getItem();
+            CMISNode child = CMISNode.createNode(fco);
+
+            if(child instanceof FolderNode)
+            {
+                f.addFolder((FolderNode)child);
+                for(Tree<FileableCmisObject> c : t.getChildren())
+                {
+                    addChildren((FolderNode)child, c);
+                }
+            }
+            else
+            {
+                f.addNode(child);
+            }
+        }
+
+        public boolean objectExists(String objectId)
+        {
+            CmisObject o = getObject(objectId);
+            return(o != null);
+        }
+
+        public FolderNode getRootFolder()
+        {
+            Folder rootFolder = session.getRootFolder();
+
+            FolderNode ret = (FolderNode)CMISNode.createNode(rootFolder);
+            return ret;
+        }
+
+        public FolderNode getDescendants(String folderId, int depth)
+        {
+            Session session = getCMISSession();
+
+            CmisObject o = session.getObject(folderId);
+            if(o instanceof Folder)
+            {
+                Folder f = (Folder)o;
+
+                OperationContextImpl ctx = new OperationContextImpl();
+                List<Tree<FileableCmisObject>> res = f.getDescendants(depth, ctx);
+                FolderNode ret = (FolderNode)CMISNode.createNode(f);
+                for(Tree<FileableCmisObject> t : res)
+                {
+                    addChildren(ret, t);
+                }
+
+                return ret;
+            }
+            else
+            {
+                throw new IllegalArgumentException("Folder does not exist or is not a folder");
+            }
+        }
+
+        public ItemIterable<ObjectType> getTypeChildren(String typeId, boolean includePropertyDefinitions)
+        {
+            ItemIterable<ObjectType> res = session.getTypeChildren(typeId, includePropertyDefinitions);
+            return res;
+        }
+
+        public List<Tree<ObjectType>> getTypeDescendants(String typeId, int depth, boolean includePropertyDefinitions)
+        {
+            List<Tree<ObjectType>> res = session.getTypeDescendants(typeId, depth, includePropertyDefinitions);
+            return res;
+        }
+
+        public ObjectType getTypeDefinition(String typeId)
+        {
+            ObjectType res = session.getTypeDefinition(typeId);
+            return res;
+        }
+
+        public void removeAllVersions(String objectId)
+        {
+            CmisObject o = getObject(objectId);
+            if(o instanceof Document)
+            {
+                Document d = (Document)o;
+                d.deleteAllVersions();
+            }
+            else
+            {
+                throw new IllegalArgumentException("Object does not exist or is not a document");
+            }
+        }
+
+        public List<CMISNode> query(String query, boolean searchAllVersions, long skipCount, int maxItems)
+        {
+            OperationContext ctx = new OperationContextImpl();
+            ItemIterable<QueryResult> res = session.query(query, searchAllVersions, ctx);
+            res = res.skipTo(skipCount);
+            res = res.getPage(maxItems);
+
+            List<CMISNode> results = new ArrayList<CMISNode>((int)res.getPageNumItems());
+
+            for(QueryResult r : res)
+            {
+                CMISNode n = CMISNode.createNode(r);
+                results.add(n);
+            }
+
+            return results;
+        }
+
+        public void removeObject(String objectId, boolean allVersions)
+        {
+            CmisObject o = getObject(objectId);
+            if(o != null)
+            {
+                o.delete(allVersions);
+            }
+            else
+            {
+                throw new IllegalArgumentException("Object does not exist");
+            }
+        }
+
+        public List<String> removeTree(String objectId, boolean allVersions, UnfileObject unfile, boolean continueOnFailure)
+        {
+            CmisObject o = getObject(objectId);
+            if(o instanceof Folder)
+            {
+                Folder f = (Folder)o;
+                List<String> res = f.deleteTree(allVersions, unfile, continueOnFailure);
+                return res;
+            }
+            else
+            {
+                throw new IllegalArgumentException("Object does not exist or is not a folder");
+            }
+        }
+
+        public void updateProperties(String objectId, Map<String, ?> properties, boolean refresh)
+        {
+            CmisObject o = getObject(objectId);
+            if(o != null)
+            {
+                o.updateProperties(properties, refresh);
+            }
+            else
+            {
+                throw new IllegalArgumentException("Object does not exist");
+            }
+        }
+
+        public List<Tree<FileableCmisObject>> getFolderTree(String folderId, int depth)
+        {
+            CmisObject o = session.getObject(folderId);
+            if(o instanceof Folder)
+            {
+                Folder f = (Folder)o;
+
+                OperationContextImpl ctx = new OperationContextImpl();
+                List<Tree<FileableCmisObject>> res = f.getFolderTree(depth, ctx);
+                return res;
+            }
+            else
+            {
+                throw new IllegalArgumentException("Object does not exist or is not a folder");
+            }
+        }
+
+        public FolderNode getChildren(String folderId, int skipCount, int maxItems)
+        {
+            CmisObject o = session.getObject(folderId);
+            if(o instanceof Folder)
+            {
+                Folder f = (Folder)o;
+                FolderNode ret = (FolderNode)CMISNode.createNode(f);
+
+                OperationContextImpl ctx = new OperationContextImpl();
+                ItemIterable<CmisObject> res = f.getChildren(ctx);
+                res.skipTo(skipCount);
+                ItemIterable<CmisObject> l = res.getPage(maxItems);
+                for(CmisObject c : l)
+                {
+                    CMISNode child = null;
+                    if(c.getBaseType() instanceof FolderTypeDefinition)
+                    {
+                        child = (FolderNode)CMISNode.createNode(c);
+                        ret.addFolder((FolderNode)child);
+                    }
+                    else
+                    {
+                        child = CMISNode.createNode(c);
+                        ret.addNode(child);
+                    }
+                }
+
+                return ret;
+            }
+            else
+            {
+                throw new IllegalArgumentException("Folder does not exist or is not a folder");
+            }
+        }
+
+        public ItemIterable<Document> getCheckedOutDocs()
+        {
+            OperationContextImpl ctx = new OperationContextImpl();
+            ItemIterable<Document> res = session.getCheckedOutDocs(ctx);
+            return res;
+        }
+
+        public List<Document> getAllVersions(String objectId)
+        {
+            CmisObject o = getObject(objectId);
+            if(o instanceof Document)
+            {
+                Document d = (Document)o;
+                OperationContext ctx = new OperationContextImpl();
+                List<Document> res = d.getAllVersions(ctx);
+                return res;
+            }
+            else
+            {
+                throw new IllegalArgumentException("Object does not exist or is not a document");
+            }
+        }
+
+        public AllowableActions getAllowableActions(String objectId)
+        {
+            CmisObject o = getObject(objectId);
+            AllowableActions res = o.getAllowableActions();
+            return res;
+        }
+
+        public Document createDocument(String parentId, String name, Map<String, Serializable> properties, ContentStream contentStream, VersioningState versioningState)
+        {
+            CmisObject o = getObject(parentId);
+
+            if(o instanceof Folder)
+            {
+                Folder f = (Folder)o;
+
+                if(properties == null)
+                {
+                    properties = new HashMap<String, Serializable>();
+                }
+                String objectTypeId = (String)properties.get(PropertyIds.OBJECT_TYPE_ID);
+                String type = "cmis:document";
+                if(objectTypeId == null)
+                {
+                    objectTypeId = type;
+                }
+                if(objectTypeId.indexOf(type) == -1)
+                {
+                    StringBuilder sb = new StringBuilder(objectTypeId);
+                    if(sb.length() > 0)
+                    {
+                        sb.append(",");
+                    }
+                    sb.append(type);
+                    objectTypeId = sb.toString();
+                }
+
+                properties.put(PropertyIds.NAME, name);
+                properties.put(PropertyIds.OBJECT_TYPE_ID, objectTypeId);
+
+                Document res = f.createDocument(properties, contentStream, versioningState);
+                return res;
+            }
+            else
+            {
+                throw new IllegalArgumentException("Parent does not exists or is not a folder");
+            }
+        }
+
+        public Folder createFolder(String folderId, String name, Map<String, Serializable> properties)
+        {
+            CmisObject o = getObject(folderId);
+
+            if(o instanceof Folder)
+            {
+                Folder f = (Folder)o;
+
+                if(properties == null)
+                {
+                    properties = new HashMap<String, Serializable>();
+                }
+                String objectTypeId = (String)properties.get(PropertyIds.OBJECT_TYPE_ID);
+                String type = "cmis:folder";
+                if(objectTypeId == null)
+                {
+                    objectTypeId = type;
+                }
+                if(objectTypeId.indexOf(type) == -1)
+                {
+                    StringBuilder sb = new StringBuilder(objectTypeId);
+                    if(sb.length() > 0)
+                    {
+                        sb.append(",");
+                    }
+                    sb.append(type);
+                    objectTypeId = sb.toString();
+                }
+
+                properties.put(PropertyIds.NAME, name);
+                properties.put(PropertyIds.OBJECT_TYPE_ID, objectTypeId);
+
+                Folder res = f.createFolder(properties);
+                return res;
+            }
+            else
+            {
+                throw new IllegalArgumentException("Parent does not exist or is not a folder");
+            }
+        }
+
+        public ObjectId createRelationship(String sourceObjectId, String targetObjectId)
+        {
+            Map<String, Serializable> relProps = new HashMap<String, Serializable>();
+            relProps.put("cmis:sourceId", sourceObjectId);
+            relProps.put("cmis:targetId", targetObjectId);
+            relProps.put("cmis:objectTypeId", "cmis:relationship");
+            ObjectId res = session.createRelationship(relProps);
+            return res;
+        }
+
+        public ObjectId checkoutObject(String objectId)
+        {
+            CmisObject o = getObject(objectId);
+            if(o instanceof Document)
+            {
+                Document d = (Document)o;
+                ObjectId res = d.checkOut();
+                return res;
+            }
+            else
+            {
+                throw new IllegalArgumentException("Object does not exist or is not a document");
+            }
+        }
+    }
+
+    public static class Paging
+    {
+        private Integer skipCount;
+        private Integer maxItems;
+        private ExpectedPaging expectedPaging;
+
+        public Paging()
+        {
+        }
+
+        public Paging(Integer skipCount, Integer maxItems, ExpectedPaging expectedPaging)
+        {
+            super();
+            this.skipCount = skipCount;
+            this.maxItems = maxItems;
+            this.expectedPaging = expectedPaging;
+        }
+
+        public ExpectedPaging getExpectedPaging()
+        {
+            return expectedPaging;
+        }
+
+        public void setExpectedPaging(ExpectedPaging expectedPaging)
+        {
+            this.expectedPaging = expectedPaging;
+        }
+
+        public Integer getSkipCount()
+        {
+            return skipCount;
+        }
+
+        public Integer getMaxItems()
+        {
+            return maxItems;
+        }
+
+        public void setSkipCount(Integer skipCount)
+        {
+            this.skipCount = skipCount;
+        }
+
+        public void setMaxItems(Integer maxItems)
+        {
+            this.maxItems = maxItems;
+        }
+
+        @Override
+        public int hashCode()
+        {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result
+                    + ((maxItems == null) ? 0 : maxItems.hashCode());
+            result = prime * result
+                    + ((skipCount == null) ? 0 : skipCount.hashCode());
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj)
+        {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            Paging other = (Paging) obj;
+            if (maxItems == null) {
+                if (other.maxItems != null)
+                    return false;
+            } else if (!maxItems.equals(other.maxItems))
+                return false;
+            if (skipCount == null) {
+                if (other.skipCount != null)
+                    return false;
+            } else if (!skipCount.equals(other.skipCount))
+                return false;
+            return true;
+        }
+
+        @Override
+        public String toString()
+        {
+            return "Paging ["
+                    + (skipCount != null ? "skipCount=" + skipCount + ", " : "")
+                    + (maxItems != null ? "maxItems=" + maxItems : "") + "]";
+        }
+    }
+
+    /**
+     * Representation of an error response.
+     *
+     * @author Jamal Kaabi-Mofrad
+     */
+    public static class ExpectedErrorResponse
+    {
+        private String errorKey;
+        private int statusCode;
+        private String briefSummary;
+        private String stackTrace;
+        private Map<String, Object> additionalState;
+        private String descriptionURL;
+        private String logId;
+
+        public ExpectedErrorResponse()
+        {
+        }
+
+        public ExpectedErrorResponse(String errorKey, int statusCode, String briefSummary, StackTraceElement[] stackTrace,
+                    Map<String, Object> additionalState, String logId)
+        {
+            super();
+            this.errorKey = errorKey;
+            this.statusCode = statusCode;
+            this.briefSummary = briefSummary;
+            this.stackTrace = Arrays.toString(stackTrace);
+            this.additionalState = additionalState;
+            this.logId = logId;
+        }
+
+        public String getErrorKey()
+        {
+            return errorKey;
+        }
+
+        public ExpectedErrorResponse setErrorKey(String errorKey)
+        {
+            this.errorKey = errorKey;
+            return this;
+        }
+
+        public int getStatusCode()
+        {
+            return statusCode;
+        }
+
+        public ExpectedErrorResponse setStatusCode(int statusCode)
+        {
+            this.statusCode = statusCode;
+            return this;
+        }
+
+        public String getBriefSummary()
+        {
+            return briefSummary;
+        }
+
+        public ExpectedErrorResponse setBriefSummary(String briefSummary)
+        {
+            this.briefSummary = briefSummary;
+            return this;
+        }
+
+        public String getLogId() {
+            return logId;
+        }
+
+        public void setLogId(String logId) {
+            this.logId = logId;
+        }
+
+        public String getStackTrace()
+        {
+            return stackTrace;
+        }
+
+        public ExpectedErrorResponse setStackTrace(String stackTrace)
+        {
+            this.stackTrace = stackTrace;
+            return this;
+        }
+
+        public Map<String, Object> getAdditionalState()
+        {
+            return additionalState;
+        }
+
+        public ExpectedErrorResponse setAdditionalState(Map<String, Object> additionalState)
+        {
+            this.additionalState = additionalState;
+            return this;
+        }
+
+        public String getDescriptionURL()
+        {
+            return descriptionURL;
+        }
+
+        public ExpectedErrorResponse setDescriptionURL(String descriptionURL)
+        {
+            this.descriptionURL = descriptionURL;
+            return this;
+        }
+
+        @Override
+        public String toString()
+        {
+            final StringBuilder sb = new StringBuilder(250);
+            sb.append("ExpectedErrorResponse [errorKey='").append(errorKey)
+                        .append(", statusCode=").append(statusCode)
+                        .append(", briefSummary='").append(briefSummary)
+                        .append(", logId='").append(logId)
+                        .append(", stackTrace='").append(stackTrace)
+                        .append(", additionalState=").append(additionalState)
+                        .append(", descriptionURL='").append(descriptionURL)
+                        .append(']');
+            return sb.toString();
+        }
+    }
+
+    public class Groups extends AbstractProxy
+    {
+
+        public Group createGroup(Group group, Map<String, String> params, int expectedStatus) throws PublicApiException
+        {
+            HttpResponse response = create("groups", null, null, null, group.toJSON().toString(), "Failed to create group " + group.getId(), expectedStatus, params);
+            return parseGroupEntity(response);
+        }
+
+        public GroupMember createGroupMember(String groupId, GroupMember groupMember) throws PublicApiException
+        {
+            return createGroupMember(groupId, groupMember, HttpServletResponse.SC_OK);
+        }
+
+        public GroupMember createGroupMember(String groupId, GroupMember groupMember, int expectedStatus) throws PublicApiException
+        {
+            HttpResponse response = create("groups", groupId, "members", null, groupMember.toJSON().toString(), "Failed to create group membership", expectedStatus);
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject jsonEntity = (JSONObject) response.getJsonResponse().get("entry");
+                if (jsonEntity != null)
+                {
+                    return GroupMember.parseGroupMember(response.getJsonResponse());
+                }
+            }
+            return null;
+        }
+
+        public Group updateGroup(String groupId, Group group, Map<String, String> params, int expectedStatus) throws PublicApiException
+        {
+            HttpResponse response = update("groups", groupId, null, null, group.toJSON().toString(), params, "Failed to update group " + group.getId(), expectedStatus);
+            return parseGroupEntity(response);
+        }
+
+        public Group getGroup(String groupId) throws PublicApiException
+        {
+            return getGroup(groupId, HttpServletResponse.SC_OK);
+        }
+
+        public Group getGroup(String groupId, int expectedStatus) throws PublicApiException
+        {
+            return getGroup(groupId, null, expectedStatus);
+        }
+
+        public Group getGroup(String groupId, Map<String, String> params, int expectedStatus) throws PublicApiException
+        {
+            HttpResponse response = getSingle("groups", groupId, null, null, params, "Failed to get group " + groupId, expectedStatus);
+            return parseGroupEntity(response);
+        }
+
+        public void deleteGroup(String groupId, boolean cascade, int expectedStatus) throws PublicApiException
+        {
+            Map<String, String> params = null;
+            if (cascade)
+            {
+                params = Collections.singletonMap("cascade", "true");
+            }
+            remove("groups", groupId, null, null, params, "Failed to remove group", expectedStatus);
+        }
+
+        public void deleteGroupMembership(String groupId, String groupMemberId, int expectedStatus) throws PublicApiException
+        {
+            remove("groups", groupId, "members", groupMemberId, null, "Failed to remove group member", expectedStatus);
+        }
+
+        private Group parseGroupEntity(HttpResponse response)
+        {
+            if ((response != null) && (response.getJsonResponse() != null))
+            {
+                JSONObject jsonEntity = (JSONObject) response.getJsonResponse().get("entry");
+                if (jsonEntity != null)
+                {
+                    return Group.parseGroup(jsonEntity);
+                }
+            }
+
+            return null;
+        }
+
+        public ListResponse<Group> getGroups(Map<String, String> params, String errorMessage, int expectedStatus) throws PublicApiException, ParseException
+        {
+            HttpResponse response = getAll("groups", null, null, null, params, errorMessage, expectedStatus);
+
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject jsonList = (JSONObject) response.getJsonResponse().get("list");
+                if (jsonList != null)
+                {
+                    return Group.parseGroups(response.getJsonResponse());
+                }
+            }
+            return null;
+        }
+
+        public ListResponse<GroupMember> getGroupMembers(String groupId, Map<String, String> params) throws PublicApiException, ParseException
+        {
+            return getGroupMembers(groupId, params, "Failed to get groups", HttpServletResponse.SC_OK);
+        }
+
+        public ListResponse<GroupMember> getGroupMembers(String groupId, Map<String, String> params, String errorMessage, int expectedStatus)
+                throws PublicApiException, ParseException
+        {
+            HttpResponse response = getAll("groups", groupId, "members", null, params, errorMessage, expectedStatus);
+
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject jsonList = (JSONObject) response.getJsonResponse().get("list");
+                if (jsonList != null)
+                {
+                    return GroupMember.parseGroupMembers(response.getJsonResponse());
+                }
+            }
+            return null;
+        }
+
+        public ListResponse<Group> getGroupsByPersonId(String userId, Map<String, String> params, String errorMessage, int expectedStatus)
+                throws PublicApiException, ParseException
+        {
+            HttpResponse response = getAll("people", userId, "groups", null, params, errorMessage, expectedStatus);
+
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject jsonList = (JSONObject) response.getJsonResponse().get("list");
+                if (jsonList != null)
+                {
+                    return Group.parseGroups(response.getJsonResponse());
+                }
+            }
+            return null;
+        }
+
+    }
+
+    public class AuditApps extends AbstractProxy
+    {
+
+        public ListResponse<AuditApp> getAuditApps(Map<String, String> params, String errorMessage, int expectedStatus) throws PublicApiException
+        {
+            HttpResponse response = getAll("audit-applications", null, null, null, params, errorMessage, expectedStatus);
+
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject jsonList = (JSONObject) response.getJsonResponse().get("list");
+                if (jsonList != null)
+                {
+                    return AuditApp.parseAuditApps(response.getJsonResponse());
+                }
+            }
+            return null;
+        }
+
+        public AuditApp getAuditApp(String applicationId) throws PublicApiException
+        {
+            return getAuditApp(applicationId, HttpServletResponse.SC_OK);
+        }
+
+        public AuditApp getAuditApp(String applicationId, int expectedStatus) throws PublicApiException
+        {
+            return getAuditApp(applicationId, null, expectedStatus);
+        }
+
+        public AuditApp getAuditApp(String applicationId, Map<String, String> params, int expectedStatus) throws PublicApiException
+        {
+            HttpResponse response = getSingle("audit-applications", applicationId, null, null, params, "Failed to get Audit Application " + applicationId,
+                    expectedStatus);
+
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject jsonEntry = (JSONObject) response.getJsonResponse().get("entry");
+                if (jsonEntry != null)
+                {
+                    return AuditApp.parseAuditApp(jsonEntry);
+                }
+            }
+            return null;
+        }
+
+        public AuditApp updateAuditApp(String applicationId, AuditApp auditApp, Map<String, String> params,  int expectedStatus) throws PublicApiException
+        {
+            HttpResponse response = update("audit-applications", applicationId,null,null, auditApp.toJSON().toString(), params, "Failed to update Audit Application", expectedStatus);
+
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject jsonEntry = (JSONObject) response.getJsonResponse().get("entry");
+                if (jsonEntry != null)
+                {
+                    return AuditApp.parseAuditApp(jsonEntry);
+                }
+            }
+            return null;
+        }
+
+        public ListResponse<AuditEntry> getAuditAppEntries(String applicationId, Map<String, String> params, int expectedStatus)
+                throws PublicApiException, ParseException
+        {
+            HttpResponse response = getAll("audit-applications", applicationId, "audit-entries", null, params,
+                    "Failed to get audit entries for " + applicationId, expectedStatus);
+
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject jsonList = (JSONObject) response.getJsonResponse().get("list");
+                if (jsonList != null)
+                {
+                    return AuditEntry.parseAuditEntries(response.getJsonResponse());
+                }
+            }
+            return null;
+        }
+
+        public AuditEntry getAuditEntry(String applicationId, String entryId, Map<String, String> param, int expectedStatus)
+                throws PublicApiException, ParseException
+        {
+            HttpResponse response = getSingle("audit-applications", applicationId, "audit-entries",entryId,
+                    param, "Failed to get Audit Application " + applicationId, expectedStatus);
+
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject jsonList = (JSONObject) response.getJsonResponse().get("entry");
+                if (jsonList != null)
+                {
+                    return AuditEntry.parseAuditEntry(jsonList);
+                }
+            }
+            return null;
+        }
+
+        public void deleteAuditEntry(String applicationId, String entryId, Map<String, String> param, int expectedStatus)
+                throws PublicApiException
+        {
+            remove("audit-applications", applicationId, "audit-entries", entryId, param,"Failed to delete entry " + entryId, expectedStatus);
+        }
+
+        public void deleteAuditEntries(String applicationId, Map<String, String> param, int expectedStatus)
+                throws PublicApiException
+        {
+            remove("audit-applications", applicationId, "audit-entries", null, param,"Failed to delete entries for audit application " + applicationId, expectedStatus);
+        }
+        
+        public ListResponse<AuditEntry> getAuditAppEntriesByNodeRefId(String nodeId, Map<String, String> params, int expectedStatus)
+                throws PublicApiException, ParseException
+        {
+            HttpResponse response = getAll("nodes", nodeId, "audit-entries", null, params, "Failed to get audit entries for " + nodeId,
+                    expectedStatus);
+
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject jsonList = (JSONObject) response.getJsonResponse().get("list");
+                if (jsonList != null)
+                {
+                    return AuditEntry.parseAuditEntries(response.getJsonResponse());
+                }
+            }
+            return null;
+        }
+
+    }
+    
+    public class Actions extends AbstractProxy
+    {
+        public ListResponse<ActionDefinition> getActionDefinitionsForNode(String nodeId,
+                                                                          Map<String, String> params,
+                                                                          int expectedStatus)
+                throws PublicApiException
+        {
+            HttpResponse response = getAll("nodes", nodeId, "action-definitions",
+                    null, params, "Unexpected response", expectedStatus);
+
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject jsonList = (JSONObject) response.getJsonResponse().get("list");
+                if (jsonList != null)
+                {
+                    return parseActionDefinitions(response.getJsonResponse());
+                }
+            }
+            return null;
+        }
+
+        public ListResponse<ActionDefinition> getActionDefinitions(Map<String, String> params,
+                                                                   int expectedStatus)
+                throws PublicApiException
+        {
+            HttpResponse response = getAll("action-definitions", null, null,
+                    null, params, "Unexpected response", expectedStatus);
+
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject jsonList = (JSONObject) response.getJsonResponse().get("list");
+                if (jsonList != null)
+                {
+                    return parseActionDefinitions(response.getJsonResponse());
+                }
+            }
+            return null;
+        }
+
+        public Action executeAction(Action action, Map<String, String> params, int expectedStatus) throws PublicApiException
+        {
+            HttpResponse response = create("action-executions", null, null, null, action.toJSON().toString(), "Failed to create action for action def " + action.getActionDefinitionId(), expectedStatus, params);
+            return parseActionEntity(response);
+        }
+        
+        private ListResponse<ActionDefinition> parseActionDefinitions(JSONObject jsonResponse)
+        {
+            List<ActionDefinition> actionDefinitions = new ArrayList<>();
+
+
+            JSONObject jsonList = (JSONObject) jsonResponse.get("list");
+            assertNotNull(jsonList);
+
+            JSONArray jsonEntries = (JSONArray) jsonList.get("entries");
+            assertNotNull(jsonEntries);
+
+            for (int i = 0; i < jsonEntries.size(); i++)
+            {
+                JSONObject jsonEntry = (JSONObject) jsonEntries.get(i);
+                JSONObject entry = (JSONObject) jsonEntry.get("entry");
+                actionDefinitions.add(parseActionDefinition(entry));
+            }
+
+            ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+            return new ListResponse<>(paging, actionDefinitions);
+        }
+
+        private ActionDefinition parseActionDefinition(JSONObject entry)
+        {
+            ActionDefinition def = null;
+            try
+            {
+                def = objectMapper.readValue(entry.toString(), ActionDefinition.class);
+            }
+            catch (IOException e)
+            {
+                throw new RuntimeException("Unable to parse ActionDefinition JSON", e);
+            }
+            
+            return def;
+        }
+
+        private Action parseActionEntity(HttpResponse response)
+        {
+            if ((response != null) && (response.getJsonResponse() != null))
+            {
+                JSONObject jsonEntity = (JSONObject) response.getJsonResponse().get("entry");
+                if (jsonEntity != null)
+                {
+                    return Action.parseAction(jsonEntity);
+                }
+            }
+
+            return null;
+        }
+        
+        public ActionDefinition getActionDefinition(String actionDefinitionId, int expectedStatus) throws PublicApiException
+        {
+            HttpResponse response = getSingle("action-definitions", actionDefinitionId, null,
+                    null, null, "Unexpected response", expectedStatus);
+
+            if (response != null && response.getJsonResponse() != null)
+            {
+                JSONObject jsonEntity = (JSONObject) response.getJsonResponse().get("entry");
+                if (jsonEntity != null)
+                {
+                    return parseActionDefinition(jsonEntity);
+                }                
+            }
+            
+            return null;
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/PublicApiException.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/PublicApiException.java
new file mode 100644
index 00000000000..9a6a9088b7c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/PublicApiException.java
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+public class PublicApiException extends Exception
+{
+	private static final long serialVersionUID = 2622686430090577966L;
+
+	private HttpResponse httpResponse;
+
+	public PublicApiException(Exception e)
+	{
+		super(e);
+	}
+	
+	public PublicApiException(String message, HttpResponse httpResponse)
+	{
+		super(message + "/n" + httpResponse.toString());
+		this.httpResponse = httpResponse;
+	}
+
+	public HttpResponse getHttpResponse()
+	{
+		return httpResponse;
+	}
+	
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java
new file mode 100644
index 00000000000..74c7f01e0a3
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java
@@ -0,0 +1,1343 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.web.scripts.BaseWebScriptTest.PatchMethod;
+import org.alfresco.rest.api.tests.TestFixture;
+import org.alfresco.rest.api.tests.client.AuthenticatedHttp.HttpRequestCallback;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.Api.SCOPE;
+import org.alfresco.rest.framework.core.ResourceInspector;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.util.Pair;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.apache.commons.httpclient.methods.ByteArrayRequestEntity;
+import org.apache.commons.httpclient.methods.DeleteMethod;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.HeadMethod;
+import org.apache.commons.httpclient.methods.OptionsMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.methods.RequestEntity;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.apache.commons.httpclient.methods.TraceMethod;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
+import org.springframework.core.type.classreading.MetadataReader;
+import org.springframework.core.type.classreading.MetadataReaderFactory;
+
+/**
+ * A http client for talking to the rest apis. The caller can pass in a rest api
+ * implementation class to the http method (get, post, put, delete supported)
+ * and the url will be generated.
+ *
+ * @author steveglover
+ */
+public class PublicApiHttpClient
+{
+    private static final Log logger = LogFactory.getLog(PublicApiHttpClient.class);
+
+    private static final String OLD_BASE_URL = "{0}://{1}:{2}{3}{4}{5}/api/";
+    private static final String INDEX_URL = "{0}://{1}:{2}{3}{4}";
+    private static final String BASE_URL = "{0}://{1}:{2}{3}{4}{5}/{6}/{7}/versions/{8}";
+    private static final String PUBLICAPI_CMIS_SERVICE_URL = "{0}://{1}:{2}{3}{4}cmis/versions/{5}/{6}";
+    private static final String PUBLICAPI_CMIS_URL = "{0}://{1}:{2}{3}{4}{5}/{6}/cmis/versions/{7}/{8}";
+    private static final String PUBLICAPI_CMIS_URL_SUFFIX = "{0}/{1}/cmis/versions/{2}/{3}";
+    private static final String ATOM_PUB_URL = "{0}://{1}:{2}{3}cmisatom";
+    
+    private String scheme = "http";
+    private String host = TestFixture.HOST;
+    private int port = TestFixture.PORT;
+
+    private String contextPath;
+    private String servletName;
+    private AuthenticatedHttp authenticatedHttp;
+
+    private ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
+    private MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(this.resourcePatternResolver);
+
+    // can be overriden by other clients like the workflow client
+    protected String apiName = "alfresco";
+
+    public PublicApiHttpClient(String host, int port, String contextPath, String servletName, AuthenticatedHttp authenticatedHttp)
+    {
+        this("http", host, port, contextPath, servletName, authenticatedHttp);
+    }
+
+    public PublicApiHttpClient(String scheme, String host, int port, String contextPath, String servletName, AuthenticatedHttp authenticatedHttp)
+    {
+        super();
+        this.scheme = scheme;
+        this.host = host;
+        this.port = port;
+        this.contextPath = contextPath;
+        if (this.contextPath != null && !this.contextPath.isEmpty() && !this.contextPath.endsWith("/"))
+        {
+            this.contextPath = this.contextPath + "/";
+        }
+        if (this.contextPath != null && !this.contextPath.startsWith("/"))
+        {
+            this.contextPath = "/" + this.contextPath;
+        }
+        this.servletName = servletName;
+        if (this.servletName != null && !this.servletName.isEmpty() && !this.servletName.endsWith("/"))
+        {
+            this.servletName = this.servletName + "/";
+        }
+        this.authenticatedHttp = authenticatedHttp;
+    }
+
+    public String getCmisUrl(String repositoryId, String operation)
+    {
+        StringBuilder url = new StringBuilder();
+        if (repositoryId == null)
+        {
+            url.append(MessageFormat.format(ATOM_PUB_URL, new Object[] { scheme, host, String.valueOf(port), contextPath }));
+        }
+        else
+        {
+            url.append(MessageFormat.format(ATOM_PUB_URL, new Object[] { scheme, host, String.valueOf(port), contextPath }));
+            url.append("/");
+            url.append(repositoryId);
+        }
+
+        if (operation != null)
+        {
+            url.append("/");
+            url.append(operation);
+        }
+
+        return url.toString();
+    }
+
+    public String getPublicApiCmisUrl(String networkId, Binding binding, String version, String operation)
+    {
+        StringBuilder url = new StringBuilder();
+        if (networkId == null)
+        {
+            url.append(MessageFormat.format(PUBLICAPI_CMIS_SERVICE_URL,
+                        new Object[] { scheme, host, String.valueOf(port), contextPath, servletName, version, binding.toString().toLowerCase() }));
+        }
+        else
+        {
+            url.append(MessageFormat.format(PUBLICAPI_CMIS_URL, new Object[] { scheme, host, String.valueOf(port), contextPath, servletName,
+                        networkId, "public", version, binding.toString().toLowerCase() }));
+        }
+
+        if (operation != null)
+        {
+            url.append("/");
+            url.append(operation);
+        }
+
+        return url.toString();
+    }
+
+    public String getPublicApiCmisUrlSuffix(String networkId, Binding binding, String version, String operation)
+    {
+        StringBuilder url = new StringBuilder();
+
+        url.append(MessageFormat.format(PUBLICAPI_CMIS_URL_SUFFIX, new Object[] { networkId, "public", version, binding.toString().toLowerCase() }));
+
+        if (operation != null)
+        {
+            url.append("/");
+            url.append(operation);
+        }
+
+        return url.toString();
+    }
+
+    public void setHost(String host)
+    {
+        this.host = host;
+    }
+
+    public void setPort(int port)
+    {
+        this.port = port;
+    }
+
+    public void setContextPath(String contextPath)
+    {
+        this.contextPath = contextPath;
+    }
+
+    public void init()
+    {
+    }
+
+    private void log(String msg)
+    {
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(msg);
+        }
+    }
+
+    protected AnnotationMetadata getAnnotationMetadata(String classname) throws IOException
+    {
+        MetadataReader metadataReader = this.metadataReaderFactory.getMetadataReader(classname);
+        AnnotationMetadata annotationMetaData = metadataReader.getAnnotationMetadata();
+        return annotationMetaData;
+    }
+
+    public HttpResponse submitRequest(HttpMethod req, final RequestContext rq) throws HttpException, IOException
+    {
+        try
+        {
+            final long start = System.currentTimeMillis();
+
+            final HttpRequestCallback<HttpResponse> callback = new HttpRequestCallback<HttpResponse>()
+            {
+                @Override
+                public HttpResponse onCallSuccess(HttpMethod method) throws Exception
+                {
+                    long end = System.currentTimeMillis();
+
+                    Map<String, String> headersMap = null;
+                    Header[] headers = method.getResponseHeaders();
+                    if (headers != null)
+                    {
+                        headersMap = new HashMap<String, String>(headers.length);
+                        for (Header header : headers)
+                        {
+                            headersMap.put(header.getName(), header.getValue());
+                        }
+                    }
+
+                    return new HttpResponse(method, rq.getRunAsUser(), method.getResponseBody(), headersMap, (end - start));
+                }
+
+                @Override
+                public boolean onError(HttpMethod method, Throwable t)
+                {
+                    return false;
+                }
+            };
+
+            HttpResponse response = null;
+            if (rq.getPassword() != null)
+            {
+                response = authenticatedHttp.executeHttpMethodAuthenticated(req, rq.getRunAsUser(), rq.getPassword(), callback);
+            }
+            else if (rq.getRunAsUser() != null)
+            {
+                response = authenticatedHttp.executeHttpMethodAuthenticated(req, rq.getRunAsUser(), callback);
+            }
+            else
+            {
+                response = authenticatedHttp.executeHttpMethodUnauthenticated(req, callback);
+            }
+            return response;
+        }
+        finally
+        {
+            if (req != null)
+            {
+                req.releaseConnection();
+            }
+        }
+    }
+
+    public HttpResponse get(final RequestContext rq, final String urlSuffix, Map<String, String> params) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), urlSuffix, params);
+        String url = endpoint.getUrl();
+
+        GetMethod req = new GetMethod(url);
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse get(final Class<?> c, final RequestContext rq, final Object entityId, final Object relationshipEntityId,
+                Map<String, String> params) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(c, rq.getNetworkId(), entityId, relationshipEntityId, params);
+        String url = endpoint.getUrl();
+
+        GetMethod req = new GetMethod(url);
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse get(final RequestContext rq, String scope, final String entityCollectionName, final Object entityId,
+                final String relationCollectionName, final Object relationshipEntityId, Map<String, String> params) throws IOException
+    {
+        return get(rq, scope, 1, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, params, null);
+    }
+
+    public HttpResponse get(final RequestContext rq, String scope, final String entityCollectionName, final Object entityId,
+                            final String relationCollectionName, final Object relationshipEntityId, Map<String, String> params, Map<String, String> headers) throws IOException
+    {
+        return get(rq, scope, 1, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, params, headers);
+    }
+
+    public HttpResponse get(final RequestContext rq, final String scope, final int version, final String entityCollectionName, final Object entityId,
+                final String relationCollectionName, final Object relationshipEntityId, Map<String, String> params, Map<String, String> headers) throws IOException
+    {
+        if (headers == null)
+        {
+            headers = Collections.emptyMap();
+        }
+
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), scope, version, entityCollectionName, entityId, relationCollectionName,
+                    relationshipEntityId, params);
+        String url = endpoint.getUrl();
+
+        GetMethod req = new GetMethod(url);
+
+        for (Entry<String, String> header : headers.entrySet())
+        {
+            req.addRequestHeader(header.getKey(), header.getValue());
+        }
+
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse get(final RequestContext rq, String scope, String password, final String entityCollectionName, final Object entityId,
+                final String relationCollectionName, final Object relationshipEntityId, Map<String, String> params) throws IOException
+    {
+        return get(rq, scope, 1, password, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, params);
+    }
+
+    public HttpResponse get(final RequestContext rq, final String scope, final int version, final String password, final String entityCollectionName, final Object entityId,
+                final String relationCollectionName, final Object relationshipEntityId, Map<String, String> params) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), scope, version, entityCollectionName, entityId, relationCollectionName,
+                    relationshipEntityId, params);
+        String url = endpoint.getUrl();
+
+        GetMethod req = new GetMethod(url);
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse get(final String urlSuffix, final RequestContext rq, Map<String, String> params) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(urlSuffix, params);
+        String url = endpoint.getUrl();
+
+        GetMethod req = new GetMethod(url);
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse getWithPassword(final String urlSuffix, final RequestContext rq, Map<String, String> params) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(urlSuffix, params);
+        String url = endpoint.getUrl();
+
+        GetMethod req = new GetMethod(url);
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse post(final Class<?> c, final RequestContext rq, final Object entityId, final Object relationshipEntityId, final String body)
+                throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(c, rq.getNetworkId(), entityId, relationshipEntityId, null);
+        String url = endpoint.getUrl();
+
+        PostMethod req = new PostMethod(url.toString());
+        if (body != null)
+        {
+            StringRequestEntity requestEntity = new StringRequestEntity(body, "application/json", "UTF-8");
+            req.setRequestEntity(requestEntity);
+        }
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse post(final RequestContext rq, final String urlSuffix, String body) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), urlSuffix, null);
+        String url = endpoint.getUrl();
+
+        PostMethod req = new PostMethod(url.toString());
+        if (body != null)
+        {
+            StringRequestEntity requestEntity = new StringRequestEntity(body, "application/json", "UTF-8");
+            req.setRequestEntity(requestEntity);
+        }
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse post(final RequestContext rq, Binding cmisBinding, String version, String cmisOperation, final String body) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), cmisBinding, version, cmisOperation, null);
+        String url = endpoint.getUrl();
+
+        PostMethod req = new PostMethod(url.toString());
+        if (body != null)
+        {
+            StringRequestEntity requestEntity = null;
+            if (cmisBinding.equals(Binding.atom))
+            {
+                requestEntity = new StringRequestEntity(body, "text/xml", "UTF-8");
+            }
+            else if (cmisBinding.equals(Binding.browser))
+            {
+                requestEntity = new StringRequestEntity(body, "application/json", "UTF-8");
+            }
+            req.setRequestEntity(requestEntity);
+        }
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse put(final RequestContext rq, Binding cmisBinding, String version, String cmisOperation, final String body) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), cmisBinding, version, cmisOperation, null);
+        String url = endpoint.getUrl();
+
+        PutMethod req = new PutMethod(url.toString());
+        if (body != null)
+        {
+            StringRequestEntity requestEntity = null;
+            if (cmisBinding.equals(Binding.atom))
+            {
+                requestEntity = new StringRequestEntity(body, "text/xml", "UTF-8");
+            }
+            else if (cmisBinding.equals(Binding.browser))
+            {
+                requestEntity = new StringRequestEntity(body, "application/json", "UTF-8");
+            }
+            req.setRequestEntity(requestEntity);
+        }
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse get(final RequestContext rq, Binding cmisBinding, String version, String cmisOperation, Map<String, String> parameters)
+                throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), cmisBinding, version, cmisOperation, parameters);
+        String url = endpoint.getUrl();
+
+        GetMethod req = new GetMethod(url.toString());
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse delete(final RequestContext rq, Binding cmisBinding, String version, String cmisOperation) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), cmisBinding, version, cmisOperation, null);
+        String url = endpoint.getUrl();
+
+        DeleteMethod req = new DeleteMethod(url.toString());
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse head(final RequestContext rq, Binding cmisBinding, String version, String cmisOperation) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), cmisBinding, version, cmisOperation, null);
+        String url = endpoint.getUrl();
+
+        HeadMethod req = new HeadMethod(url.toString());
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse options(final RequestContext rq, Binding cmisBinding, String version, String cmisOperation) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), cmisBinding, version, cmisOperation, null);
+        String url = endpoint.getUrl();
+
+        OptionsMethod req = new OptionsMethod(url.toString());
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse trace(final RequestContext rq, Binding cmisBinding, String version, String cmisOperation) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), cmisBinding, version, cmisOperation, null);
+        String url = endpoint.getUrl();
+
+        TraceMethod req = new TraceMethod(url.toString());
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse patch(final RequestContext rq, Binding cmisBinding, String version, String cmisOperation) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), cmisBinding, version, cmisOperation, null);
+        String url = endpoint.getUrl();
+
+        PatchMethod req = new PatchMethod(url.toString());
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse post(final RequestContext rq, final String scope, final String entityCollectionName, final Object entityId,
+                final String relationCollectionName, final Object relationshipEntityId, final String body) throws IOException
+    {
+        return post(rq, scope, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, body, "application/json");
+    }
+
+    public HttpResponse post(final RequestContext rq, final String scope, final String entityCollectionName, final Object entityId,
+            final String relationCollectionName, final Object relationshipEntityId, final String body, final Map<String, String> params) throws IOException
+    {
+        return post(rq, scope, 1, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, body, "application/json", params);
+    }
+
+    public HttpResponse post(final RequestContext rq, final String scope, final String entityCollectionName, final Object entityId,
+                final String relationCollectionName, final Object relationshipEntityId, final String body, String contentType) throws IOException
+    {
+        return post(rq, scope, 1, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, body, contentType);
+    }
+
+    public HttpResponse post(final RequestContext rq, final String scope, final int version, final String entityCollectionName, final Object entityId,
+            final String relationCollectionName, final Object relationshipEntityId, final String body, String contentType) throws IOException
+    {
+        return post(rq, scope, version, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, body, contentType, null);
+    }
+
+    public HttpResponse post(final RequestContext rq, final String scope, final int version, final String entityCollectionName, final Object entityId,
+                final String relationCollectionName, final Object relationshipEntityId, final String body, String contentType, final Map<String, String> params) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), scope, version, entityCollectionName, entityId, relationCollectionName,
+                    relationshipEntityId, params);
+        String url = endpoint.getUrl();
+
+        PostMethod req = new PostMethod(url.toString());
+        if (body != null)
+        {
+            if (contentType == null || contentType.isEmpty())
+            {
+                contentType = "application/json";
+            }
+            StringRequestEntity requestEntity = new StringRequestEntity(body, contentType, "UTF-8");
+            req.setRequestEntity(requestEntity);
+        }
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse post(final RequestContext rq, final String scope, final String entityCollectionName, final Object entityId,
+                             final String relationCollectionName, final Object relationshipEntityId, final byte[] body, String contentType) throws IOException
+    {
+        return post(rq, scope, 1, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, body, contentType);
+    }
+
+    public HttpResponse post(final RequestContext rq, final String scope, final int version, final String entityCollectionName, final Object entityId,
+                             final String relationCollectionName, final Object relationshipEntityId, final byte[] body, String contentType) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), scope, version, entityCollectionName, entityId, relationCollectionName,
+                relationshipEntityId, null);
+        String url = endpoint.getUrl();
+
+        PostMethod req = new PostMethod(url.toString());
+        if (body != null)
+        {
+            if (contentType == null || contentType.isEmpty())
+            {
+                contentType = "application/octet-stream";
+            }
+            ByteArrayRequestEntity requestEntity = new ByteArrayRequestEntity(body, contentType);
+            req.setRequestEntity(requestEntity);
+        }
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse delete(final Class<?> c, final RequestContext rq, final Object entityId, final Object relationshipEntityId) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(c, rq.getNetworkId(), entityId, relationshipEntityId, null);
+        String url = endpoint.getUrl();
+
+        DeleteMethod req = new DeleteMethod(url);
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse delete(final RequestContext rq, final String scope, final String entityCollectionName, final Object entityId,
+                final String relationCollectionName, final Object relationshipEntityId) throws IOException
+    {
+        return delete(rq, scope, 1, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, null);
+    }
+
+    public HttpResponse delete(final RequestContext rq, final String scope, final int version, final String entityCollectionName, final Object entityId,
+                final String relationCollectionName, final Object relationshipEntityId, final Map<String, String> params) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), scope, version, entityCollectionName, entityId, relationCollectionName,
+                    relationshipEntityId, params);
+        String url = endpoint.getUrl();
+
+        DeleteMethod req = new DeleteMethod(url);
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse put(final Class<?> c, final RequestContext rq, final Object entityId, final Object relationshipEntityId, final String body)
+                throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(c, rq.getNetworkId(), entityId, relationshipEntityId, null);
+        String url = endpoint.getUrl();
+
+        PutMethod req = new PutMethod(url);
+        if (body != null)
+        {
+            StringRequestEntity requestEntity = new StringRequestEntity(body, "application/json", "UTF-8");
+            req.setRequestEntity(requestEntity);
+        }
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse put(final RequestContext rq, final String scope, final String entityCollectionName, final Object entityId,
+                final String relationCollectionName, final Object relationshipEntityId, final String body, final Map<String, String> params) throws IOException
+    {
+        return put(rq, scope, 1, entityCollectionName, entityId, relationCollectionName, relationshipEntityId, body, params);
+    }
+
+    public HttpResponse put(final RequestContext rq, final String scope, final int version, final String entityCollectionName, final Object entityId,
+                final String relationCollectionName, final Object relationshipEntityId, final String body, Map<String, String> params) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), scope, version, entityCollectionName, entityId, relationCollectionName,
+                    relationshipEntityId, params);
+        String url = endpoint.getUrl();
+
+        PutMethod req = new PutMethod(url);
+        if (body != null)
+        {
+            StringRequestEntity requestEntity = new StringRequestEntity(body, "application/json", "UTF-8");
+            req.setRequestEntity(requestEntity);
+        }
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse putBinary(final RequestContext rq, final String scope, final int version, final String entityCollectionName,
+                final Object entityId, final String relationCollectionName, final Object relationshipEntityId, final BinaryPayload payload,
+                final Map<String, String> params) throws IOException
+    {
+        RestApiEndpoint endpoint = new RestApiEndpoint(rq.getNetworkId(), scope, version, entityCollectionName, entityId, relationCollectionName,
+                    relationshipEntityId, params);
+        String url = endpoint.getUrl();
+
+        PutMethod req = new PutMethod(url);
+        if (payload != null)
+        {
+            BinaryRequestEntity requestEntity = new BinaryRequestEntity(payload.getFile(), payload.getMimeType(), payload.getCharset());
+            req.setRequestEntity(requestEntity);
+        }
+        return submitRequest(req, rq);
+    }
+
+    public HttpResponse execute(RequestBuilder requestBuilder) throws IOException
+    {
+        return submitRequest(requestBuilder.getHttpMethod(), requestBuilder.getRequestContext());
+    }
+
+    /*
+     * Encapsulates information relating to a rest api end point, generating and
+     * encoding urls based on the rest api implementation class.
+     */
+    private class RestApiEndpoint
+    {
+        private String url;
+
+        RestApiEndpoint(String url, Map<String, String> params) throws IOException
+        {
+            StringBuilder sb = new StringBuilder(
+                        MessageFormat.format(INDEX_URL, new Object[] { scheme, host, String.valueOf(port), contextPath, servletName }));
+            if (url != null)
+            {
+                sb.append(url);
+            }
+
+            addParams(sb, params);
+
+            this.url = sb.toString();
+        }
+
+        RestApiEndpoint(String tenantDomain, String url, Map<String, String> params) throws IOException
+        {
+            StringBuilder sb = new StringBuilder(MessageFormat.format(OLD_BASE_URL, new Object[] { scheme, host, String.valueOf(port), contextPath,
+                        servletName, tenantDomain == null ? TenantUtil.DEFAULT_TENANT : tenantDomain }));
+            sb.append("/");
+            sb.append(url);
+
+            addParams(sb, params);
+
+            this.url = sb.toString();
+        }
+
+        RestApiEndpoint(Class<?> resourceClass, String tenantDomain, Object collectionEntityId, Object relationEntityId, Map<String, String> params)
+                    throws IOException
+        {
+            StringBuilder sb = new StringBuilder();
+
+            Api api = ResourceInspector.inspectApi(resourceClass);
+            SCOPE scope = api.getScope();
+            int version = api.getVersion();
+            String name = api.getName();
+            if (StringUtils.isEmpty(name))
+            {
+                name = apiName;
+            }
+
+            Pair<String, String> relationshipCollectionInfo = getRelationCollectionInfo(resourceClass);
+
+            sb.append(MessageFormat.format(BASE_URL, new Object[] { scheme, host, String.valueOf(port), contextPath, servletName,
+                        tenantDomain == null ? TenantUtil.DEFAULT_TENANT : tenantDomain, scope.toString(), name, version }));
+
+            if (relationshipCollectionInfo != null)
+            {
+                String entityCollectionName = relationshipCollectionInfo.getFirst();
+                String relationshipCollectionName = relationshipCollectionInfo.getSecond();
+                String relationEntityIdString = encodeToString(relationEntityId);
+                String collectionEntityIdString = encodeToString(collectionEntityId);
+
+                sb.append('/');
+                sb.append(entityCollectionName);
+                sb.append('/');
+                if (collectionEntityIdString != null)
+                {
+                    sb.append(collectionEntityIdString);
+                    sb.append('/');
+                }
+
+                sb.append(relationshipCollectionName);
+                sb.append('/');
+                if (relationEntityIdString != null)
+                {
+                    sb.append(relationEntityIdString);
+                    sb.append('/');
+                }
+            }
+            else
+            {
+                String entityCollectionName = getEntityCollectionInfo(resourceClass);
+                if (entityCollectionName != null)
+                {
+                    String collectionEntityIdString = encodeToString(collectionEntityId);
+
+                    sb.append('/');
+                    sb.append(entityCollectionName);
+                    sb.append('/');
+                    if (collectionEntityIdString != null)
+                    {
+                        sb.append(collectionEntityIdString);
+                        sb.append('/');
+                    }
+                }
+                else
+                {
+                    throw new RuntimeException();
+                }
+            }
+
+            addParams(sb, params);
+
+            this.url = sb.toString();
+        }
+
+        RestApiEndpoint(String networkId, Binding cmisBinding, String version, String cmisOperation, Map<String, String> params) throws IOException
+        {
+            StringBuilder sb = new StringBuilder();
+
+            if (networkId != null)
+            {
+                sb.append(getPublicApiCmisUrl(networkId, cmisBinding, version, cmisOperation));
+            }
+            else
+            {
+                throw new IllegalArgumentException();
+            }
+
+            addParams(sb, params);
+
+            this.url = sb.toString();
+        }
+
+        RestApiEndpoint(String tenantDomain, String scope, int version, String collectionName, Object collectionEntityId, String relationName,
+                    Object relationEntityId, Map<String, String> params) throws IOException
+        {
+            this(tenantDomain, scope, apiName, version, collectionName, collectionEntityId, relationName, relationEntityId, params);
+        }
+
+        RestApiEndpoint(String tenantDomain, String scope, String apiName, int version, String collectionName, Object collectionEntityId,
+                    String relationName, Object relationEntityId, Map<String, String> params) throws IOException
+        {
+            StringBuilder sb = new StringBuilder();
+
+            if (tenantDomain == null || tenantDomain.equals(TenantService.DEFAULT_DOMAIN))
+            {
+                tenantDomain = TenantUtil.DEFAULT_TENANT;
+            }
+
+            if (StringUtils.isEmpty(apiName))
+            {
+                apiName = PublicApiHttpClient.this.apiName;
+            }
+
+            sb.append(MessageFormat.format(BASE_URL,
+                        new Object[] { scheme, host, String.valueOf(port), contextPath, servletName, tenantDomain, scope, apiName, version }));
+
+            if (collectionName != null)
+            {
+                sb.append('/');
+                sb.append(collectionName);
+                if (collectionEntityId != null)
+                {
+                    sb.append('/');
+                    sb.append(collectionEntityId);
+                }
+            }
+
+            if (relationName != null)
+            {
+                sb.append('/');
+                sb.append(relationName);
+                if (relationEntityId != null)
+                {
+                    sb.append('/');
+                    sb.append(relationEntityId);
+                }
+            }
+
+            addParams(sb, params);
+
+            this.url = sb.toString();
+        }
+
+        RestApiEndpoint(String tenantDomain, String scope, String collectionName, Object collectionEntityId, String relationName,
+                    Object relationEntityId, Map<String, String> params) throws IOException
+        {
+            this(tenantDomain, scope, 1, collectionName, collectionEntityId, relationName, relationEntityId, params);
+        }
+
+        private void addParams(StringBuilder sb, Map<String, String> params) throws UnsupportedEncodingException
+        {
+            if (params != null && params.size() > 0)
+            {
+                sb.append("?");
+
+                for (String paramName : params.keySet())
+                {
+                    sb.append(URLEncoder.encode(paramName, "UTF-8"));
+                    sb.append("=");
+                    sb.append(URLEncoder.encode(params.get(paramName), "UTF-8"));
+                    sb.append("&");
+                }
+
+                sb.deleteCharAt(sb.length() - 1);
+            }
+        }
+
+        private String encodeToString(Object o) throws UnsupportedEncodingException
+        {
+            String ret = null;
+
+            if (o instanceof NodeRef)
+            {
+                NodeRef nodeRef = (NodeRef) o;
+                ret = (o != null ? nodeRef.getId() : null);
+            }
+            else
+            {
+                ret = (o != null ? o.toString() : null);
+            }
+
+            return ret;
+        }
+
+        private Pair<String, String> getRelationCollectionInfo(Class<?> resourceClass) throws IOException
+        {
+            AnnotationMetadata annotationMetaData = getAnnotationMetadata(resourceClass.getCanonicalName());
+            if (annotationMetaData.isConcrete() && annotationMetaData.isIndependent())
+            {
+                if (annotationMetaData.getAnnotationTypes().contains(RelationshipResource.class.getCanonicalName()))
+                {
+                    Map<String, Object> attrs = annotationMetaData.getAnnotationAttributes(RelationshipResource.class.getName());
+                    String relationshipCollectionName = (String) attrs.get("name");
+                    Class<?> entityResource = (Class<?>) attrs.get("entityResource");
+
+                    String entityCollectionName = getEntityCollectionInfo(entityResource.getCanonicalName());
+
+                    Pair<String, String> ret = new Pair<String, String>(entityCollectionName, relationshipCollectionName);
+                    return ret;
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            else
+            {
+                throw new AlfrescoRuntimeException("");
+            }
+        }
+
+        private String getEntityCollectionInfo(Class<?> resourceClass) throws IOException
+        {
+            return getEntityCollectionInfo(resourceClass.getCanonicalName());
+        }
+
+        private String getEntityCollectionInfo(String className) throws IOException
+        {
+            AnnotationMetadata annotationMetaData = getAnnotationMetadata(className);
+            if (annotationMetaData.isConcrete() && annotationMetaData.isIndependent())
+            {
+                if (annotationMetaData.getAnnotationTypes().contains(EntityResource.class.getCanonicalName()))
+                {
+                    Map<String, Object> attrs = annotationMetaData.getAnnotationAttributes(EntityResource.class.getName());
+                    return (String) attrs.get("name");
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            else
+            {
+                throw new AlfrescoRuntimeException("");
+            }
+        }
+
+        public String getUrl() throws UnsupportedEncodingException
+        {
+            return url;
+        }
+    }
+
+    /**
+     * @author Jamal Kaabi-Mofrad
+     */
+    public static class BinaryRequestEntity implements RequestEntity
+    {
+        private final File file;
+        private final String mimeType;
+        private final String charset;
+
+        public BinaryRequestEntity(File file, String mimeType, String charset)
+        {
+            this.file = file;
+            this.mimeType = mimeType;
+            this.charset = charset;
+        }
+
+        @Override
+        public boolean isRepeatable()
+        {
+            return true;
+        }
+
+        @Override
+        public void writeRequest(OutputStream out) throws IOException
+        {
+            InputStream inputStream = new BufferedInputStream(new FileInputStream(file));
+            try
+            {
+                int len;
+                byte[] buffer = new byte[8190];
+                while ((len = inputStream.read(buffer)) != -1)
+                {
+                    out.write(buffer, 0, len);
+                }
+            }
+            finally
+            {
+                inputStream.close();
+            }
+        }
+
+        @Override
+        public long getContentLength()
+        {
+            return file.length();
+        }
+
+        @Override
+        public String getContentType()
+        {
+            if (charset == null)
+            {
+                return mimeType;
+            }
+            if (mimeType == null)
+            {
+                return null;
+            }
+            return mimeType + "; charset=" + charset;
+        }
+    }
+
+    /**
+     * @author Jamal Kaabi-Mofrad
+     */
+    public static class BinaryPayload
+    {
+        private File file;
+        private String mimeType;
+        private String charset;
+
+        public BinaryPayload(File file, String mimeType, String charset)
+        {
+            this.file = file;
+            this.mimeType = mimeType;
+            this.charset = charset;
+        }
+
+        public BinaryPayload(File file, String mimeType)
+        {
+            this(file, mimeType, null);
+        }
+
+        public BinaryPayload(File file)
+        {
+            this(file, null, null);
+        }
+
+        public File getFile()
+        {
+            return file;
+        }
+
+        public String getMimeType()
+        {
+            return mimeType;
+        }
+
+        public String getCharset()
+        {
+            return charset;
+        }
+    }
+
+    /**
+     * @author Jamal Kaabi-Mofrad
+     */
+    public abstract class RequestBuilder<T extends HttpMethod>
+    {
+        private RequestContext requestContext;
+        private String scope;
+        private String apiName = "alfresco"; // default api namespace
+        private int version = 1;
+        private String entityCollectionName;
+        private Object entityId;
+        private String relationCollectionName;
+        private Object relationshipEntityId;
+        private Map<String, String> params;
+        private Map<String, String> headers;
+
+        public abstract T getHttpMethod() throws IOException;
+
+        protected void setRequestHeaderIfAny(T methodBase)
+        {
+            if (headers != null)
+            {
+                for (Entry<String, String> headerNameValue : headers.entrySet())
+                {
+                    methodBase.addRequestHeader(headerNameValue.getKey(), headerNameValue.getValue());
+                }
+            }
+        }
+
+        public RequestContext getRequestContext()
+        {
+            return requestContext;
+        }
+
+        public RequestBuilder setRequestContext(RequestContext requestContext)
+        {
+            this.requestContext = requestContext;
+            return this;
+        }
+
+        public String getScope()
+        {
+            return scope;
+        }
+
+        public RequestBuilder setScope(String scope)
+        {
+            this.scope = scope;
+            return this;
+        }
+
+        public String getApiName()
+        {
+            return apiName;
+        }
+
+        public RequestBuilder setApiName(String apiName)
+        {
+            this.apiName = apiName;
+            return this;
+        }
+
+        public int getVersion()
+        {
+            return version;
+        }
+
+        public RequestBuilder setVersion(int version)
+        {
+            this.version = version;
+            return this;
+        }
+
+        public String getEntityCollectionName()
+        {
+            return entityCollectionName;
+        }
+
+        public RequestBuilder setEntityCollectionName(String entityCollectionName)
+        {
+            this.entityCollectionName = entityCollectionName;
+            return this;
+        }
+
+        public Object getEntityId()
+        {
+            return entityId;
+        }
+
+        public RequestBuilder setEntityId(Object entityId)
+        {
+            this.entityId = entityId;
+            return this;
+        }
+
+        public String getRelationCollectionName()
+        {
+            return relationCollectionName;
+        }
+
+        public RequestBuilder setRelationCollectionName(String relationCollectionName)
+        {
+            this.relationCollectionName = relationCollectionName;
+            return this;
+        }
+
+        public Object getRelationshipEntityId()
+        {
+            return relationshipEntityId;
+        }
+
+        public RequestBuilder setRelationshipEntityId(Object relationshipEntityId)
+        {
+            this.relationshipEntityId = relationshipEntityId;
+            return this;
+        }
+
+        public Map<String, String> getParams()
+        {
+            return params;
+        }
+
+        public RequestBuilder setParams(Map<String, String> params)
+        {
+            this.params = params;
+            return this;
+        }
+
+        public Map<String, String> getHeaders()
+        {
+            return headers;
+        }
+
+        public RequestBuilder setHeaders(Map<String, String> headers)
+        {
+            this.headers = headers;
+            return this;
+        }
+    }
+
+    public class GetRequestBuilder extends RequestBuilder<GetMethod>
+    {
+        private String password;
+
+        public String getPassword()
+        {
+            return password;
+        }
+
+        public GetRequestBuilder setPassword(String password)
+        {
+            this.password = password;
+            return this;
+        }
+
+        @Override
+        public GetMethod getHttpMethod() throws IOException
+        {
+            RestApiEndpoint endpoint = new RestApiEndpoint(getRequestContext().getNetworkId(),
+                        getScope(), getApiName(), getVersion(), getEntityCollectionName(),
+                        getEntityId(), getRelationCollectionName(), getRelationshipEntityId(), getParams());
+            String url = endpoint.getUrl();
+
+            GetMethod req = new GetMethod(url);
+            setRequestHeaderIfAny(req);
+            return req;
+        }
+    }
+
+    public class DeleteRequestBuilder extends RequestBuilder<DeleteMethod>
+    {
+        @Override
+        public DeleteMethod getHttpMethod() throws IOException
+        {
+            RestApiEndpoint endpoint = new RestApiEndpoint(getRequestContext().getNetworkId(),
+                        getScope(), getApiName(), getVersion(), getEntityCollectionName(),
+                        getEntityId(), getRelationCollectionName(), getRelationshipEntityId(), getParams());
+            String url = endpoint.getUrl();
+
+            DeleteMethod req = new DeleteMethod(url);
+            setRequestHeaderIfAny(req);
+            return req;
+        }
+    }
+
+    public abstract class PostPutRequestBuilder<T extends HttpMethodBase> extends RequestBuilder<T>
+    {
+        private String bodyAsString;
+        private byte[] bodyAsByteArray;
+        private String contentType;
+
+        public String getBodyAsString()
+        {
+            return bodyAsString;
+        }
+
+        public PostPutRequestBuilder setBodyAsString(String bodyAsString)
+        {
+            this.bodyAsString = bodyAsString;
+            return this;
+        }
+
+        public byte[] getBodyAsByteArray()
+        {
+            return bodyAsByteArray;
+        }
+
+        public PostPutRequestBuilder setBodyAsByteArray(byte[] bodyAsByteArray)
+        {
+            this.bodyAsByteArray = bodyAsByteArray;
+            return this;
+        }
+
+        public String getContentType()
+        {
+            return contentType;
+        }
+
+        public PostPutRequestBuilder setContentType(String contentType)
+        {
+            this.contentType = contentType;
+            return this;
+        }
+    }
+
+    public class PostRequestBuilder extends PostPutRequestBuilder<PostMethod>
+    {
+
+        @Override
+        public PostMethod getHttpMethod() throws IOException
+        {
+            RestApiEndpoint endpoint = new RestApiEndpoint(getRequestContext().getNetworkId(),
+                        getScope(), getApiName(), getVersion(), getEntityCollectionName(),
+                        getEntityId(), getRelationCollectionName(), getRelationshipEntityId(), getParams());
+            String url = endpoint.getUrl();
+
+            PostMethod req = new PostMethod(url.toString());
+            String contentType = getContentType();
+            if (getBodyAsString() != null)
+            {
+
+                if (contentType == null || contentType.isEmpty())
+                {
+                    contentType = "application/json";
+                }
+                StringRequestEntity requestEntity = new StringRequestEntity(getBodyAsString(), contentType, "UTF-8");
+                req.setRequestEntity(requestEntity);
+            }
+            else if (getBodyAsByteArray() != null)
+            {
+                if (contentType == null || contentType.isEmpty())
+                {
+                    contentType = "application/octet-stream";
+                }
+                ByteArrayRequestEntity requestEntity = new ByteArrayRequestEntity(getBodyAsByteArray(), contentType);
+                req.setRequestEntity(requestEntity);
+            }
+            setRequestHeaderIfAny(req);
+            return req;
+        }
+    }
+
+    public class PutRequestBuilder extends PostPutRequestBuilder<PutMethod>
+    {
+        private BinaryPayload binaryPayload;
+
+        public BinaryPayload getBinaryPayload()
+        {
+            return binaryPayload;
+        }
+
+        public PutRequestBuilder setBinaryPayload(BinaryPayload binaryPayload)
+        {
+            this.binaryPayload = binaryPayload;
+            return this;
+        }
+
+        @Override
+        public PutMethod getHttpMethod() throws IOException
+        {
+            RestApiEndpoint endpoint = new RestApiEndpoint(getRequestContext().getNetworkId(),
+                        getScope(), getApiName(), getVersion(), getEntityCollectionName(),
+                        getEntityId(), getRelationCollectionName(), getRelationshipEntityId(), getParams());
+            String url = endpoint.getUrl();
+
+            PutMethod req = new PutMethod(url);
+            if (getBodyAsString() != null)
+            {
+                StringRequestEntity requestEntity = new StringRequestEntity(getBodyAsString(), "application/json", "UTF-8");
+                req.setRequestEntity(requestEntity);
+            }
+            else if (binaryPayload != null)
+            {
+                BinaryRequestEntity requestEntity = new BinaryRequestEntity(binaryPayload.getFile(), binaryPayload.getMimeType(),
+                            binaryPayload.getCharset());
+                req.setRequestEntity(requestEntity);
+            }
+            setRequestHeaderIfAny(req);
+            return req;
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/RequestContext.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/RequestContext.java
new file mode 100644
index 00000000000..aac81a83457
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/RequestContext.java
@@ -0,0 +1,100 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+import org.apache.chemistry.opencmis.client.api.OperationContext;
+
+public class RequestContext
+{
+	private String networkId;
+	private String runAsUser;
+	private String password;
+	private OperationContext cmisOperationCtxOverride = null;
+	
+	public RequestContext(String runAsUser)
+	{
+		super();
+		this.runAsUser = runAsUser;
+	}
+
+	public RequestContext(String networkId, String runAsUser)
+	{
+		this(runAsUser);
+		this.networkId = networkId;
+		this.password = null;
+	}
+	
+	public RequestContext(String networkId, String runAsUser, OperationContext cmisOperationCtxOverride)
+	{
+		this(runAsUser);
+		this.networkId = networkId;
+		this.password = null;
+		this.cmisOperationCtxOverride = cmisOperationCtxOverride;
+	}
+
+	public RequestContext(String networkId, String runAsUser, String password)
+	{
+		this(runAsUser);
+		this.networkId = networkId;
+		this.password = password;
+	}
+
+	public void setOperationContext(OperationContext ctx)
+	{
+		this.cmisOperationCtxOverride = ctx;
+	}
+	
+	public OperationContext getCmisOperationCtxOverride()
+	{
+		return cmisOperationCtxOverride;
+	}
+
+	public String getPassword()
+	{
+		return password;
+	}
+
+	public String getNetworkId()
+	{
+		return networkId;
+	}
+
+	public String getRunAsUser()
+	{
+		return runAsUser;
+	}
+
+	public void setNetworkId(String networkId)
+	{
+		this.networkId = networkId;
+	}
+
+	public void setRunAsUser(String runAsUser)
+	{
+		this.runAsUser = runAsUser;
+	}
+	
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/RestErrorResponseDefault.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/RestErrorResponseDefault.java
new file mode 100644
index 00000000000..4999ca17e90
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/RestErrorResponseDefault.java
@@ -0,0 +1,89 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.DefaultExceptionResolver;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.RequestEntityTooLargeException;
+import org.alfresco.rest.framework.core.exceptions.StaleEntityException;
+import org.alfresco.rest.framework.core.exceptions.ServiceUnavailableException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedMediaTypeException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.resource.parameters.InvalidSelectException;
+import org.alfresco.rest.framework.resource.parameters.where.InvalidQueryException;
+import org.springframework.extensions.webscripts.Status;
+
+public enum RestErrorResponseDefault {
+	    
+    DEFAULT_API_EXCEPTION("org.alfresco.rest.framework.core.exceptions.ApiException",  Status.STATUS_EXPECTATION_FAILED, DefaultExceptionResolver.DEFAULT_MESSAGE_ID),
+    INVALID_QUERY_EXCEPTION("org.alfresco.rest.framework.core.exceptions.InvalidArgumentException", Status.STATUS_BAD_REQUEST, InvalidQueryException.DEFAULT_MESSAGE_ID),
+    INVALID_SELECT_EXCEPTION("org.alfresco.rest.framework.core.exceptions.InvalidArgumentException", Status.STATUS_BAD_REQUEST, InvalidSelectException.DEFAULT_MESSAGE_ID),
+    INVALID_ARGUMENT_EXCEPTION("org.alfresco.rest.framework.core.exceptions.InvalidArgumentException", Status.STATUS_BAD_REQUEST, InvalidArgumentException.DEFAULT_MESSAGE_ID),
+    NOT_FOUND_EXCEPTION("org.alfresco.rest.framework.core.exceptions.NotFoundException", Status.STATUS_NOT_FOUND, NotFoundException.DEFAULT_MESSAGE_ID),
+    ENTITY_NOT_FOUND_EXCEPTION("org.alfresco.rest.framework.core.exceptions.EntityNotFoundException", Status.STATUS_NOT_FOUND, EntityNotFoundException.DEFAULT_MESSAGE_ID),
+    RELATIONSHIP_RESOURCE_NOT_FOUND_EXCEPTION("org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException", Status.STATUS_NOT_FOUND, RelationshipResourceNotFoundException.DEFAULT_MESSAGE_ID),
+    PERMISSION_DENIED_EXCEPTION("org.alfresco.rest.framework.core.exceptions.PermissionDeniedException",Status.STATUS_FORBIDDEN,PermissionDeniedException.DEFAULT_MESSAGE_ID),
+    UNSUPPORTED_RESOURCE_OPERATION_EXCEPTION("org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException",Status.STATUS_METHOD_NOT_ALLOWED,UnsupportedResourceOperationException.DEFAULT_MESSAGE_ID),
+    CONSTRAINT_VIOLATED_EXCEPTION("org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException", Status.STATUS_CONFLICT,ConstraintViolatedException.DEFAULT_MESSAGE_ID),
+    STALE_ENTITY_EXCEPTION("org.alfresco.rest.framework.core.exceptions.StaleEntityException",Status.STATUS_CONFLICT,StaleEntityException.DEFAULT_MESSAGE_ID ),
+    REQUEST_ENTITY_TOO_LARGE_EXCEPTION("org.alfresco.rest.framework.core.exceptions.RequestEntityTooLargeException", Status.STATUS_REQUEST_ENTITY_TOO_LARGE, RequestEntityTooLargeException.DEFAULT_MESSAGE_ID),
+    UNSUPPORTED_MEDIA_TYPE_EXCEPTION("org.alfresco.rest.framework.core.exceptions.UnsupportedMediaTypeException", Status.STATUS_UNSUPPORTED_MEDIA_TYPE,UnsupportedMediaTypeException.DEFAULT_MESSAGE_ID),
+    SERVICE_UNAVAILABLE_EXCEPTION("org.alfresco.rest.framework.core.exceptions.ServiceUnavailableException", Status.STATUS_SERVICE_UNAVAILABLE,ServiceUnavailableException.DEFAULT_MESSAGE_ID);
+
+    private String exceptionClass;
+    private int statusCode;
+    private String defaultMessage;
+
+    public String getDefaultMessage()
+    {
+        return defaultMessage;
+    }
+
+    private RestErrorResponseDefault(String exceptionClass, int statusCode, String defaultMessage)
+    {
+
+        this.exceptionClass = exceptionClass;
+        this.statusCode = statusCode;
+        this.defaultMessage = defaultMessage;
+    }
+
+    public int getStatusCode()
+    {
+        return this.statusCode;
+    }
+
+    public String getExceptionClass()
+    {
+        return exceptionClass;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/SharedHttpClientProvider.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/SharedHttpClientProvider.java
new file mode 100644
index 00000000000..e6373eb7f49
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/SharedHttpClientProvider.java
@@ -0,0 +1,100 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+import org.apache.commons.httpclient.HostConfiguration;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
+
+/**
+ *
+ * A class responsible for managing one shared {@link HttpClient} instance. This uses a
+ * thread-safe connection-manager instead of creating a new istance on every call.
+ * 
+ * This is done for the folowing reasons:
+ * <br> 
+ * <ul>
+ *   <li>Creating new HTTPClient instances for each request has memory-overhead and most 
+ *   important, opens a new connection for each request. Even though the connection is released
+ *   they are kept in 'CLOSE_WAIT' state by the OS. This can, on high usage, empty out available outgoing TCP-ports and
+ *   influence the testing on the client, having impact on the results.</li>
+ *   <li>Using a single HTTPClient allows creating a pool of connections that can be kept alive to
+ *   a certain route (route = combination of host and port) for a max number of time. This eliminates connection 
+ *   setup and additional server round-trips, raising the overall throughput of http-calls (Browsers use 
+ *   this mechanism all the time to lower loading-times).</li>
+ * </ul>
+ * 
+ * @author Frederik Heremans
+ */
+public final class SharedHttpClientProvider implements HttpClientProvider
+{
+    private HttpClient client;
+    private String alfrescoUrl;
+    
+    // Private constructor to prevent instantiation
+    public SharedHttpClientProvider(String alfrescoUrl, int maxNumberOfConnections)
+    {
+        setAlfrescoUrl(alfrescoUrl);
+        
+        // Initialize manager
+        MultiThreadedHttpConnectionManager manager = new MultiThreadedHttpConnectionManager();
+        HttpConnectionManagerParams params = new HttpConnectionManagerParams();
+        params.setMaxTotalConnections(maxNumberOfConnections);
+        params.setMaxConnectionsPerHost(HostConfiguration.ANY_HOST_CONFIGURATION, maxNumberOfConnections);
+
+        // Create the client
+        client = new HttpClient(manager);
+        client.getParams().setAuthenticationPreemptive(true);
+    }
+    
+    /**
+     * @param alfrescoUrl the URL where alfresco repo is running on.
+     */
+    private void setAlfrescoUrl(String alfrescoUrl)
+    {
+        this.alfrescoUrl = alfrescoUrl;
+        // Ensure path ends with forward slash
+        if(alfrescoUrl != null && !alfrescoUrl.endsWith("/"))
+        {
+            this.alfrescoUrl = alfrescoUrl.concat("/");
+        }
+    }
+    
+    public String getFullAlfrescoUrlForPath(String path)
+    {
+        if(path.startsWith("/"))
+        {
+            return alfrescoUrl.concat(path.substring(1, path.length()));
+        }
+        return alfrescoUrl.concat(path);
+    }
+
+    public HttpClient getHttpClient()
+    {
+        return client;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/UserAuthenticationDetailsProviderImpl.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/UserAuthenticationDetailsProviderImpl.java
new file mode 100644
index 00000000000..85904f2d47b
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/UserAuthenticationDetailsProviderImpl.java
@@ -0,0 +1,98 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+
+public class UserAuthenticationDetailsProviderImpl implements AuthenticationDetailsProvider
+{
+    private String adminUserName;
+    private String adminPassword;
+    
+    private UserDataService userDataService;
+    
+    /**
+     * @param userDataService service to use for {@link UserData} related operations
+     */
+    public UserAuthenticationDetailsProviderImpl(UserDataService userDataService, String adminUserName, String adminPassword)
+    {
+        this.userDataService = userDataService;
+        this.adminUserName = adminUserName;
+        this.adminPassword = adminPassword;
+    }
+
+    
+    public String getPasswordForUser(String userName)
+    {
+        if (userName != null)
+        {
+            UserData user = userDataService.findUserByUserName(userName);
+            if (user != null)
+            {
+                return user.getPassword();
+            }
+        }
+        return null;
+    }
+
+    public String getTicketForUser(String userName)
+    {
+        if (userName != null)
+        {
+            UserData user = userDataService.findUserByUserName(userName);
+            if (user != null)
+            {
+                return user.getTicket();
+            }
+        }
+        return null;
+    }
+
+    public String getAdminUserName()
+    {
+        return this.adminUserName;
+    }
+
+    public String getAdminPassword()
+    {
+        return this.adminPassword;
+    }
+
+
+	@Override
+	public void updateTicketForUser(String userName, String ticket) throws IllegalArgumentException
+	{
+        UserData user = userDataService.findUserByUserName(userName);
+        if(user != null)
+        {
+            user.setTicket(ticket);
+        }
+        else
+        {
+        	// TODO
+        }
+	}
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/UserData.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/UserData.java
new file mode 100644
index 00000000000..88d9fdc9489
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/UserData.java
@@ -0,0 +1,105 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+import java.io.Serializable;
+
+/**
+ * Data representing a single user.
+ * 
+ * @author Frederik Heremans
+ * @since 1.1
+ */
+public class UserData implements Serializable
+{
+    private static final long serialVersionUID = -4741893659787720414L;
+    
+    public static final String FIELD_ID = "id";
+    public static final String FIELD_USERNAME = "userName";
+    public static final String FIELD_PASSWORD = "password";
+    public static final String FIELD_TICKET = "ticket";
+    public static final String FIELD_DOMAIN = "domain";
+
+    private String id;
+    private String userName;
+    private String domain;
+    private String password;
+    private String ticket;
+    
+    public UserData()
+    {
+    }
+
+    public String getDomain()
+    {
+		return domain;
+	}
+
+	public String getUserName()
+    {
+        return this.userName;
+    }
+
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+        int idx = userName.indexOf("@");
+        if(idx != -1)
+        {
+        	this.domain = userName.substring(idx + 1);
+        }
+    }
+
+    public String getPassword()
+    {
+        return this.password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getTicket()
+    {
+        return this.ticket;
+    }
+
+    public void setTicket(String ticket)
+    {
+        this.ticket = ticket;
+    }
+    
+    public String getId()
+    {
+        return this.id;
+    }
+    
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/UserDataService.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/UserDataService.java
new file mode 100644
index 00000000000..1583d3ea815
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/UserDataService.java
@@ -0,0 +1,32 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client;
+
+
+public interface UserDataService
+{
+    public UserData findUserByUserName(String userName);
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Action.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Action.java
new file mode 100644
index 00000000000..d9bac3f5bfc
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Action.java
@@ -0,0 +1,92 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.json.simple.JSONObject;
+
+public class Action extends org.alfresco.rest.api.model.Action implements Serializable, ExpectedComparison
+{
+
+    @Override
+    public void expected(Object o)
+    {
+        assertTrue("o is an instance of " + o.getClass(), o instanceof Action);
+
+        Action other = (Action) o;
+
+        AssertUtil.assertEquals("id", getId(), other.getId());
+        AssertUtil.assertEquals("actionDefinitionId", getActionDefinitionId(), other.getActionDefinitionId());
+        AssertUtil.assertEquals("targetId", getTargetId(), other.getTargetId());
+        AssertUtil.assertEquals("params", getParams(), other.getParams());
+    }
+
+    @SuppressWarnings("unchecked")
+    public JSONObject toJSON()
+    {
+        JSONObject jsonObject = new JSONObject();
+        if (getId() != null)
+        {
+            jsonObject.put("id", getId());
+        }
+
+        jsonObject.put("actionDefinitionId", getActionDefinitionId());
+
+        if (getTargetId() != null)
+        {
+            jsonObject.put("targetId", getTargetId());
+        }
+
+        if (getParams() != null)
+        {
+            jsonObject.put("params", getParams());
+        }
+
+        return jsonObject;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static Action parseAction(JSONObject jsonObject)
+    {
+        String id = (String) jsonObject.get("id");
+        String actionDefinitionId = (String) jsonObject.get("actionDefinitionId");
+        String targetId = (String) jsonObject.get("targetId");
+        Map<String, String> params = (Map<String, String>) jsonObject.get("params");
+
+        Action action = new Action();
+        action.setId(id);
+        action.setActionDefinitionId(actionDefinitionId);
+        action.setTargetId(targetId);
+        action.setParams(params);
+
+        return action;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Activities.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Activities.java
new file mode 100644
index 00000000000..990796ac3ae
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Activities.java
@@ -0,0 +1,112 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class Activities implements Serializable
+{
+	private static final long serialVersionUID = -6280142299994200394L;
+
+	private String userId;
+	private ActivitiesParameters activitiesParams;
+
+	public Activities()
+	{
+	}
+
+	public Activities(String userId, ActivitiesParameters activitiesParams)
+	{
+		super();
+		if(userId == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.userId = userId;
+		this.activitiesParams = activitiesParams;
+	}
+
+	public void setUserId(String userId)
+	{
+		this.userId = userId;
+	}
+
+	public String getUserId()
+	{
+		return userId;
+	}
+
+	public ActivitiesParameters getActivitiesParams()
+	{
+		return activitiesParams;
+	}
+
+	public void setActivitiesParams(ActivitiesParameters activitiesParams)
+	{
+		this.activitiesParams = activitiesParams;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Activities [userId=" + userId + ", activitiesParams="
+				+ activitiesParams + "]";
+	}
+	
+	public static ListResponse<Activity> parseActivities(JSONObject jsonObject)
+	{
+		List<Activity> activities = new ArrayList<Activity>();
+
+		JSONObject jsonList = (JSONObject)jsonObject.get("list");
+		assertNotNull(jsonList);
+
+		JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+		assertNotNull(jsonEntries);
+
+		for(int i = 0; i < jsonEntries.size(); i++)
+		{
+			JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+			JSONObject entry = (JSONObject)jsonEntry.get("entry");
+			activities.add(Activity.parseActivity(entry));
+		}
+
+		ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+		return new ListResponse<Activity>(paging, activities);
+	}
+	
+	
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/ActivitiesParameters.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/ActivitiesParameters.java
new file mode 100644
index 00000000000..1d761875498
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/ActivitiesParameters.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import java.io.Serializable;
+
+public class ActivitiesParameters implements Serializable
+{
+	private static final long serialVersionUID = 13166440680499285L;
+
+	private String siteId;
+	private String who;
+
+	public ActivitiesParameters(String siteId, String who)
+	{
+		super();
+		this.siteId = siteId;
+		this.who = who;
+	}
+
+	public String getSiteId()
+	{
+		return siteId;
+	}
+
+	public String getWho()
+	{
+		return who;
+	}
+	
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Activity.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Activity.java
new file mode 100644
index 00000000000..8659d252f55
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Activity.java
@@ -0,0 +1,219 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.json.simple.JSONObject;
+
+public class Activity implements Serializable, ExpectedComparison
+{
+	private static final long serialVersionUID = 1869724448167732060L;
+
+	private Long id;
+    private String networkId;
+	private String siteId;
+    private String feedPersonId;
+    private String postPersonId;
+    private String postedAt;
+    private String activityType;
+    private Map<String, Object> summary;
+    
+	public Activity(Long id, String networkId, String siteId, String feedPersonId,
+			String postPersonId, String postedAt, String activityType,
+			Map<String, Object> summary) {
+		super();
+		this.id = id;
+		this.networkId = networkId;
+		this.siteId = siteId;
+		this.feedPersonId = feedPersonId;
+		this.postPersonId = postPersonId;
+		this.postedAt = postedAt;
+		this.activityType = activityType;
+		this.summary = summary;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public String getSiteId() {
+		return siteId;
+	}
+
+	public String getFeedPersonId() {
+		return feedPersonId;
+	}
+
+	public String getPostPersonId() {
+		return postPersonId;
+	}
+
+	public String getPostedAt() {
+		return postedAt;
+	}
+
+	public String getActivityType() {
+		return activityType;
+	}
+
+	public Map<String, Object> getSummary() {
+		return summary;
+	}
+
+	public String getNetworkId()
+	{
+		return networkId;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Activity [id=" + id + ", networkId=" + networkId + ", siteId="
+				+ siteId + ", feedPersonId=" + feedPersonId + ", postPersonId="
+				+ postPersonId + ", postedAt=" + postedAt + ", activityType="
+				+ activityType + ", summary=" + summary + "]";
+	}
+
+	@SuppressWarnings("unchecked")
+	public static Activity parseActivity(JSONObject jsonObject)
+	{
+		Long id = (Long)jsonObject.get("id");
+		String networkId = (String)jsonObject.get("networkId");
+		String siteId = (String)jsonObject.get("siteId");
+		String feedPersonId = (String)jsonObject.get("feedPersonId");
+		String postPersonId = (String)jsonObject.get("postPersonId");
+		String postedAt = (String)jsonObject.get("postedAt");
+		String activityType = (String)jsonObject.get("activityType");
+		JSONObject summary = (JSONObject)jsonObject.get("activitySummary");
+		Activity activity = new Activity(id, networkId, siteId, feedPersonId, postPersonId, postedAt, activityType, summary);
+		return activity;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("id", String.valueOf(getId()));
+		jsonObject.put("networkId", getNetworkId());
+		jsonObject.put("siteId", getSiteId());
+		jsonObject.put("feedPersonId", getFeedPersonId());
+		jsonObject.put("postPersonId", getPostPersonId());
+		jsonObject.put("postedAt", getPostedAt());
+		jsonObject.put("activityType", getActivityType());
+		jsonObject.put("activitySummary", getSummary());
+		return jsonObject;
+	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Activity other = (Activity) obj;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		return true;
+	}
+
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof Activity);
+		
+		Activity other = (Activity)o;
+		AssertUtil.assertEquals("id", id, other.getId());
+		AssertUtil.assertEquals("siteId", networkId, other.getNetworkId());
+		AssertUtil.assertEquals("siteId", siteId, other.getSiteId());
+		AssertUtil.assertEquals("feedPersonId", feedPersonId, other.getFeedPersonId());
+		AssertUtil.assertEquals("postPersonId", postPersonId, other.getPostPersonId());
+		AssertUtil.assertEquals("postedAt", postedAt, other.getPostedAt());
+		AssertUtil.assertEquals("activityType", activityType, other.getActivityType());
+		AssertUtil.assertEquals("summary", summary, other.getSummary());
+	}
+
+	public static Map<String, Object> getActivitySummary(JSONObject activitySummary, String activityType)
+	{
+		Map<String, Object> summary = new HashMap<String, Object>();
+
+		if(activityType.equals("org.alfresco.documentlibrary.file-added"))
+		{
+			String nodeRefStr = (String)activitySummary.remove("nodeRef");
+			if(NodeRef.isNodeRef(nodeRefStr))
+			{
+				summary.put("objectId", new NodeRef(nodeRefStr).getId());
+			}
+			else
+			{
+				throw new RuntimeException("nodeRef " + nodeRefStr + " in activity feed is not a valid NodeRef");
+			}
+			String parentNodeRefStr = (String)activitySummary.remove("parentNodeRef");
+			if(NodeRef.isNodeRef(parentNodeRefStr))
+			{
+				summary.put("parentObjectId", new NodeRef(parentNodeRefStr).getId());
+			}
+			else
+			{
+				throw new RuntimeException("parentNodeRef " + parentNodeRefStr + " in activity feed is not a valid NodeRef");
+			}
+			summary.put("lastName", activitySummary.get("lastName"));
+			summary.put("firstName", activitySummary.get("firstName"));
+			summary.put("title", activitySummary.get("title"));
+		} else if(activityType.equals("org.alfresco.site.user-joined"))
+		{
+			summary.put("lastName", activitySummary.get("lastName"));
+			summary.put("firstName", activitySummary.get("firstName"));
+			summary.put("memberLastName", activitySummary.get("memberLastName"));
+			summary.put("memberFirstName", activitySummary.get("memberFirstName"));
+			summary.put("memberPersonId", activitySummary.get("memberUserName"));
+			summary.put("role", activitySummary.get("role"));
+			summary.put("title", activitySummary.get("title"));
+		}
+
+		return summary;
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/AssertUtil.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/AssertUtil.java
new file mode 100644
index 00000000000..6e00897fe5d
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/AssertUtil.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Assert;
+
+public class AssertUtil
+{
+	private AssertUtil()
+	{		
+	}
+
+	public static void assertEquals(String propertyName, String expected, String actual)
+	{
+		if(expected != null)
+		{
+			if(!expected.equals(""))
+			{
+				assertNotNull(propertyName + " expected " + expected + ", but was null", actual);
+				Assert.assertEquals(expected, actual);
+			}
+		}
+	}
+
+	public static void assertEquals(String propertyName, Object expected, Object actual)
+	{
+		if(expected != null)
+		{
+			assertNotNull(propertyName + " expected " + expected + ", but was null", actual);
+			Assert.assertEquals(propertyName + " expected " + expected + ", but was " + actual, expected, actual);
+		}
+	}
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Association.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Association.java
new file mode 100644
index 00000000000..a504183fcca
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Association.java
@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+public class Association
+{
+    // assoc type (child or peer)
+    private String assocType;
+
+    public String getAssocType()
+    {
+        return assocType;
+    }
+
+    public void setAssocType(String assocType)
+    {
+        this.assocType = assocType;
+    }
+
+    // child assoc
+    private Boolean isPrimary;
+
+    public Boolean getIsPrimary()
+    {
+        return isPrimary;
+    }
+
+    public void setIsPrimary(Boolean isPrimary)
+    {
+        this.isPrimary = isPrimary;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/AuditApp.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/AuditApp.java
new file mode 100644
index 00000000000..05cfe6282c9
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/AuditApp.java
@@ -0,0 +1,120 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+/**
+ * A representation of a Audit App in JUnit Test
+ * 
+ * @author Andreea Nechifor
+ *
+ */
+public class AuditApp extends org.alfresco.rest.api.model.AuditApp implements Serializable, ExpectedComparison
+{
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public void expected(Object o)
+    {
+        assertTrue("o is an instance of " + o.getClass(), o instanceof AuditApp);
+
+        AuditApp other = (AuditApp) o;
+
+        AssertUtil.assertEquals("id", getId(), other.getId());
+        AssertUtil.assertEquals("name", getName(), other.getName());
+        AssertUtil.assertEquals("isEnabled", getIsEnabled(), other.getIsEnabled());
+    }
+
+    public JSONObject toJSON()
+    {
+        JSONObject auditAppJson = new JSONObject();
+        if (getId() != null)
+        {
+            auditAppJson.put("id", getId());
+        }
+
+        auditAppJson.put("name", getName());
+        auditAppJson.put("isEnabled", getIsEnabled());
+
+        return auditAppJson;
+    }
+
+    public static AuditApp parseAuditApp(JSONObject jsonObject)
+    {
+        String id = (String) jsonObject.get("id");
+        String name = (String) jsonObject.get("name");
+        Boolean isEnabled = (Boolean) jsonObject.get("isEnabled");
+        Long maxEntryId = (Long) jsonObject.get("maxEntryId");
+        Long minEntryId = (Long) jsonObject.get("minEntryId");
+
+        AuditApp auditApp = new AuditApp();
+        auditApp.setId(id);
+        auditApp.setName(name);
+        auditApp.setIsEnabled(isEnabled);
+        auditApp.setMaxEntryId(maxEntryId);
+        auditApp.setMinEntryId(minEntryId);
+
+        return auditApp;
+    }
+
+    public static ListResponse<AuditApp> parseAuditApps(JSONObject jsonObject)
+    {
+        List<AuditApp> groups = new ArrayList<>();
+
+        JSONObject jsonList = (JSONObject) jsonObject.get("list");
+        assertNotNull(jsonList);
+
+        JSONArray jsonEntries = (JSONArray) jsonList.get("entries");
+        assertNotNull(jsonEntries);
+
+        for (int i = 0; i < jsonEntries.size(); i++)
+        {
+            JSONObject jsonEntry = (JSONObject) jsonEntries.get(i);
+            JSONObject entry = (JSONObject) jsonEntry.get("entry");
+            groups.add(parseAuditApp(entry));
+        }
+
+        ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+        ListResponse<AuditApp> resp = new ListResponse<AuditApp>(paging, groups);
+        return resp;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/AuditEntry.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/AuditEntry.java
new file mode 100644
index 00000000000..c4b5ac4a0db
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/AuditEntry.java
@@ -0,0 +1,134 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.util.ISO8601DateFormat;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+/**
+ * A representation of an Audit Application Entry in JUnit Test
+ * 
+ * @author Andrei Forascu
+ *
+ */
+public class AuditEntry extends org.alfresco.rest.api.model.AuditEntry implements Serializable, ExpectedComparison
+{
+
+    private static final long serialVersionUID = 1L;
+
+    public AuditEntry(Long id, String auditApplicationId, org.alfresco.rest.api.model.UserInfo createdByUser, Date createdAt, Map<String, Serializable> values)
+    {
+        super(id, auditApplicationId, createdByUser, createdAt, values);
+    }
+
+    @Override
+    public void expected(Object o)
+    {
+        assertTrue("o is an instance of " + o.getClass(), o instanceof AuditEntry);
+
+        AuditEntry other = (AuditEntry) o;
+
+        AssertUtil.assertEquals("id", getId(), other.getId());
+        AssertUtil.assertEquals("auditApplicationId", getAuditApplicationId(), other.getAuditApplicationId());
+        AssertUtil.assertEquals("values", getValues(), other.getValues());
+        AssertUtil.assertEquals("createdByUser", getCreatedByUser().getId(), other.getCreatedByUser().getId());
+        AssertUtil.assertEquals("createdAt", getCreatedAt(), other.getCreatedAt());
+    }
+
+    @SuppressWarnings("unchecked")
+    public JSONObject toJSON()
+    {
+        JSONObject auditEntryJson = new JSONObject();
+        if (getId() != null)
+        {
+            auditEntryJson.put("id", getId());
+        }
+        auditEntryJson.put("auditApplicationId", getAuditApplicationId());
+        if (createdByUser != null)
+        {
+            auditEntryJson.put("createdByUser", new UserInfo(createdByUser.getId(), createdByUser.getDisplayName()).toJSON());
+        }
+        auditEntryJson.put("values", getValues());
+        auditEntryJson.put("createdAt", getCreatedAt());
+
+        return auditEntryJson;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static AuditEntry parseAuditEntry(JSONObject jsonObject)
+    {
+        Long id = (Long) jsonObject.get("id");
+        String auditApplicationId = (String) jsonObject.get("auditApplicationId");
+        Map<String, Serializable> values = (Map<String, Serializable>) jsonObject.get("values");
+        org.alfresco.rest.api.model.UserInfo createdByUser = null;
+        JSONObject createdByUserJson = (JSONObject) jsonObject.get("createdByUser");
+        if (createdByUserJson != null)
+        {
+            String userId = (String) createdByUserJson.get("id");
+            String displayName = (String) createdByUserJson.get("displayName");
+            createdByUser = new  org.alfresco.rest.api.model.UserInfo(userId,displayName,displayName);   
+        }
+        Date createdAt = ISO8601DateFormat.parse((String) jsonObject.get("createdAt"));
+
+        AuditEntry auditEntry = new AuditEntry(id, auditApplicationId, createdByUser, createdAt, values);
+        return auditEntry;
+    }
+
+    public static ListResponse<AuditEntry> parseAuditEntries(JSONObject jsonObject)
+    {
+        List<AuditEntry> entries = new ArrayList<>();
+
+        JSONObject jsonList = (JSONObject) jsonObject.get("list");
+        assertNotNull(jsonList);
+
+        JSONArray jsonEntries = (JSONArray) jsonList.get("entries");
+        assertNotNull(jsonEntries);
+
+        for (int i = 0; i < jsonEntries.size(); i++)
+        {
+            JSONObject jsonEntry = (JSONObject) jsonEntries.get(i);
+            JSONObject entry = (JSONObject) jsonEntry.get("entry");
+            entries.add(parseAuditEntry(entry));
+        }
+
+        ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+        ListResponse<AuditEntry> resp = new ListResponse<AuditEntry>(paging, entries);
+        return resp;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Avatar.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Avatar.java
new file mode 100644
index 00000000000..b56aafb637f
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Avatar.java
@@ -0,0 +1,44 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import org.json.simple.JSONObject;
+
+import java.io.Serializable;
+
+public class Avatar implements Serializable, ExpectedComparison
+{
+    @Override
+    public void expected(Object other)
+    {
+
+    }
+
+    public static Avatar parseAvatar(JSONObject entry)
+    {
+        return new Avatar();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/CMISNode.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/CMISNode.java
new file mode 100644
index 00000000000..11ccfbb3237
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/CMISNode.java
@@ -0,0 +1,246 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.namespace.QName;
+import org.apache.chemistry.opencmis.client.api.CmisObject;
+import org.apache.chemistry.opencmis.client.api.Property;
+import org.apache.chemistry.opencmis.client.api.QueryResult;
+import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.data.Properties;
+import org.apache.chemistry.opencmis.commons.data.PropertyData;
+import org.apache.chemistry.opencmis.commons.definitions.FolderTypeDefinition;
+import org.json.simple.JSONObject;
+
+public class CMISNode implements Serializable, ExpectedComparison
+{
+	private static final long serialVersionUID = -5027938359868278498L;
+
+	protected String nodeId;
+	protected String guid;
+	protected Map<String, Serializable> properties;
+
+	/**
+	 * For POSTs
+	 * @param guid String
+	 */
+	public CMISNode(String guid)
+	{
+		this.guid = guid;
+	}
+	
+	public CMISNode(String id, String guid)
+	{
+		this.nodeId = id;
+		this.guid = guid;
+	}
+
+	public CMISNode(String nodeId, String guid, Map<String, Serializable> properties)
+	{
+		this.nodeId = nodeId;
+		this.guid = nodeId;
+		this.properties = properties;
+	}
+
+	public void setGuid(String guid)
+	{
+		this.guid = guid;
+	}
+
+	public String getGuid()
+	{
+		return guid;
+	}
+
+	public String getRawNodeId()
+	{
+		return nodeId;
+	}
+
+	public String getNodeId()
+	{
+		return nodeId;
+	}
+
+	public boolean isFolder()
+	{
+		return false;
+	}
+
+	public static Map<String, Serializable> getProperties(Map<QName, Serializable> properties)
+	{
+		Map<String, Serializable> propertiesMap = new HashMap<String, Serializable>();
+		for(QName propName : properties.keySet())
+		{
+			propertiesMap.put(propName.toPrefixString(), properties.get(propName));
+		}
+		return propertiesMap;
+	}
+	
+	public static Map<String, Serializable> getProperties(List<Property<?>> properties)
+	{
+		Map<String, Serializable> propertiesMap = new HashMap<String, Serializable>();
+		for(Property<?> p : properties)
+		{
+			propertiesMap.put(p.getId(), p.getValueAsString());
+		}
+		return propertiesMap;
+	}
+	
+	public static Map<String, Serializable> getProperties(Properties properties)
+	{
+		Map<String, Serializable> propertiesMap = new HashMap<String, Serializable>();
+		for(PropertyData<?> p : properties.getPropertyList())
+		{
+			propertiesMap.put(p.getId(), p.getFirstValue().toString());
+		}
+		return propertiesMap;
+	}
+
+	public Serializable getProperty(String name)
+	{
+		return properties.get(name);
+	}
+
+	public Map<String, Serializable> getProperties()
+	{
+		return properties;
+	}
+	
+	// TODO getFirstValue replace with getValues
+	// how to determine type of result to choose Node or FolderNode
+	public static CMISNode createNode(QueryResult qr)
+	{
+		List<PropertyData<?>> props = qr.getProperties();
+		Map<String, Serializable> properties = new HashMap<String, Serializable>();
+
+		for(PropertyData<?> p : props)
+		{
+			properties.put(p.getId(), (Serializable)p.getFirstValue());
+		}
+
+		String objectId = (String)qr.getPropertyById(PropertyIds.OBJECT_ID).getFirstValue();
+		CMISNode n = new CMISNode(objectId, objectId, properties);
+		return n;
+	}
+
+	public static CMISNode createNode(CmisObject o)
+	{
+		CMISNode n = null;
+
+		Map<String, Serializable> properties = CMISNode.getProperties(o.getProperties());
+
+		if(o.getBaseType() instanceof FolderTypeDefinition)
+		{
+			n = new FolderNode(o.getId(), o.getId(), properties);
+		}
+		else
+		{
+			n = new CMISNode(o.getId(), o.getId(), properties);
+		}
+
+		return n;
+	}
+	
+	public static CMISNode createNode(String objectId)
+	{
+		Map<String, Serializable> properties = new HashMap<String, Serializable>();
+		CMISNode n = new CMISNode(objectId, objectId, properties);
+		return n;
+	}
+	
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((nodeId == null) ? 0 : nodeId.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		CMISNode other = (CMISNode) obj;
+		if (nodeId == null) {
+			if (other.nodeId != null)
+				return false;
+		} else if (!nodeId.equals(other.nodeId))
+			return false;
+		if (properties == null) {
+			if (other.properties != null)
+				return false;
+		} else if (!properties.equals(other.properties))
+			return false;
+		return true;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject json = new JSONObject();
+		json.put("guid", getGuid());
+		json.put("id", getNodeId());
+		return json;
+	}
+	
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof CMISNode);
+		
+		CMISNode other = (CMISNode)o;
+
+		AssertUtil.assertEquals("id", nodeId, other.getNodeId());
+		AssertUtil.assertEquals("guid", guid, other.getGuid());
+		for(String propertyName : properties.keySet())
+		{
+			Serializable expected = properties.get(propertyName);
+			Serializable actual = other.getProperty(propertyName);
+			AssertUtil.assertEquals(propertyName, expected, actual);
+		}
+	}
+
+	@Override
+	public String toString()
+	{
+		return "CMISNode [nodeId=" + nodeId + ", guid=" + guid + ", properties="
+				+ properties + "]";
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Comment.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Comment.java
new file mode 100644
index 00000000000..437bd5fb26c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Comment.java
@@ -0,0 +1,359 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.PublicApiDateFormat;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class Comment implements Serializable, ExpectedComparison, Comparable<Comment>
+{
+	private static final long serialVersionUID = -1804591941972808543L;
+
+	private String nodeId;
+	private String id;
+	private String title;
+	private String content;
+	private Boolean edited;
+	private Person createdBy;
+	private String createdAt;
+	private String modifiedAt;
+	private Person modifiedBy;
+	private Boolean updated;
+//	private Boolean canEdit;
+//	private Boolean canDelete;
+
+	public Comment()
+	{
+	}
+	
+	public Comment(Comment c)
+	{
+		this(c.getNodeId(), c.getId(), c.getTitle(), c.getContent(), c.getCreatedBy(), c.getCreatedAt(), c.getModifiedBy(), c.getModifiedAt(), c.getUpdated(), c.getEdited());
+	}
+
+	public Comment(String title, String content, Boolean edited, Boolean updated, Person createdBy, Person modifiedBy)
+	{
+		this.title = title;
+		this.content = content;
+		this.edited = edited;
+		this.updated = updated;
+		this.createdBy = createdBy;
+		this.modifiedBy = modifiedBy;
+		
+		DateFormat format = PublicApiDateFormat.getDateFormat();
+		this.createdAt = format.format(new Date());
+		this.modifiedAt = format.format(new Date());
+		
+	}
+
+	public Comment(String title, String content)
+	{
+		this.title = title;
+		this.content = content;
+	}
+
+	public Comment(String nodeId, String id, String title, String content, Person createdBy, String createdAt, Person modifiedBy, String modifiedAt, Boolean updated, Boolean edited)
+	{
+		this.nodeId = nodeId;
+		this.id = id;
+		this.title = title;
+		this.content = content;
+		this.createdBy = createdBy;
+		this.createdAt = createdAt;
+		this.modifiedBy = modifiedBy;
+		this.modifiedAt = modifiedAt;
+		this.updated = updated;
+		this.edited = edited;
+	}
+
+	public Boolean getEdited()
+	{
+		return edited;
+	}
+
+	public String getNodeId()
+	{
+		return nodeId;
+	}
+
+	public String getId()
+	{
+		return id;
+	}
+
+	public String getTitle()
+	{
+		return title;
+	}
+
+	public String getContent()
+	{
+		return content;
+	}
+	
+	public void setId(String id)
+	{
+		this.id = id;
+	}
+
+	public void setTitle(String title)
+	{
+		this.title = title;
+	}
+
+	public void setContent(String content)
+	{
+		this.content = content;
+	}
+
+	public Person getCreatedBy() {
+		return createdBy;
+	}
+
+	public void setCreatedBy(Person createdBy) {
+		this.createdBy = createdBy;
+	}
+
+	public String getCreatedAt() {
+		return createdAt;
+	}
+
+	public void setCreatedAt(String createdAt) {
+		this.createdAt = createdAt;
+	}
+
+	public String getModifiedAt() {
+		return modifiedAt;
+	}
+
+	public void setModifiedAt(String modifiedAt) {
+		this.modifiedAt = modifiedAt;
+	}
+
+	public Person getModifiedBy() {
+		return modifiedBy;
+	}
+
+	public void setModifiedBy(Person modifiedBy) {
+		this.modifiedBy = modifiedBy;
+	}
+
+	public Boolean getUpdated() {
+		return updated;
+	}
+
+	public void setUpdated(Boolean updated) {
+		this.updated = updated;
+	}
+
+	public void setNodeId(String nodeId) {
+		this.nodeId = nodeId;
+	}
+	
+	public Boolean isEdited() {
+		return edited;
+	}
+
+	public void setEdited(Boolean edited) {
+		this.edited = edited;
+	}
+
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON(boolean createdByVisibility)
+	{
+		JSONObject commentJson = new JSONObject();
+//		commentJson.put("id", getId());
+		commentJson.put("title", getTitle());
+		commentJson.put("content", getContent());
+//		if(createdBy != null)
+//		{
+//			commentJson.put("createdBy", createdBy.toJSON(createdByVisibility));
+//		}
+//		commentJson.put("createdAt", getCreatedAt());
+//		if(modifiedBy != null)
+//		{
+//			commentJson.put("modifiedBy", modifiedBy.toJSON(createdByVisibility));
+//		}
+//		commentJson.put("modifiedAt", getModifiedAt());
+//		commentJson.put("edited", isEdited());
+		return commentJson;
+	}
+	
+	@Override
+	public String toString()
+	{
+		return "Comment [nodeId=" + nodeId + ", id=" + id + ", title=" + title
+				+ ", content=" + content + ", createdBy=" + createdBy
+				+ ", createdAt=" + createdAt + ", modifiedAt=" + modifiedAt
+				+ ", modifiedBy=" + modifiedBy + ", updated=" + updated + "]";
+	}
+
+	public static Comment parseComment(String nodeId, JSONObject jsonObject)
+	{
+		String id = (String)jsonObject.get("id");
+		String title = (String)jsonObject.get("title");
+		String content = (String)jsonObject.get("content");
+		JSONObject createdByJson = (JSONObject)jsonObject.get("createdBy");
+		Person createdBy = null;
+		if(createdByJson != null)
+		{
+			createdBy = Person.parsePerson(createdByJson);
+		}
+		String createdAt = (String)jsonObject.get("createdAt");
+		JSONObject modifiedByJson = (JSONObject)jsonObject.get("modifiedBy");
+		Person modifiedBy = null;
+		if(modifiedByJson != null)
+		{
+			modifiedBy = Person.parsePerson(modifiedByJson);
+		}
+		String modifiedAt = (String)jsonObject.get("modifiedAt");
+		Boolean edited = (Boolean)jsonObject.get("edited");
+		Boolean updated = (Boolean)jsonObject.get("updated");
+		Comment comment = new Comment(nodeId, id, title, content, createdBy, createdAt, modifiedBy, modifiedAt, updated, edited);
+		return comment;
+	}
+
+	public static ListResponse<Comment> parseComments(String nodeId, JSONObject jsonObject)
+	{
+		List<Comment> comments = new ArrayList<Comment>();
+
+		JSONObject jsonList = (JSONObject)jsonObject.get("list");
+		assertNotNull(jsonList);
+
+		JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+		assertNotNull(jsonEntries);
+
+		for(int i = 0; i < jsonEntries.size(); i++)
+		{
+			JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+			JSONObject entry = (JSONObject)jsonEntry.get("entry");
+			comments.add(Comment.parseComment(nodeId, entry));
+		}
+
+		ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+		return new ListResponse<Comment>(paging, comments);
+	}
+	
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof Comment);
+		
+		Comment other = (Comment)o;
+		
+		AssertUtil.assertEquals("content", content, other.getContent());
+		AssertUtil.assertEquals("id", id, other.getId());
+		AssertUtil.assertEquals("title", title, other.getTitle());
+		AssertUtil.assertEquals("edited", edited, other.isEdited());
+		if(createdBy != null)
+		{
+			createdBy.expected(other.getCreatedBy());
+		}
+
+		String modifiedAtStr = getModifiedAt();
+		if(modifiedAtStr != null)
+		{
+			try
+			{
+				Date modifiedAt = PublicApiDateFormat.getDateFormat().parse(modifiedAtStr);
+				Date otherModifiedAt = PublicApiDateFormat.getDateFormat().parse(other.getModifiedAt());
+				assertTrue(otherModifiedAt.after(modifiedAt) || otherModifiedAt.equals(modifiedAt));
+			}
+			catch(ParseException e)
+			{
+				throw new RuntimeException(e);
+			}
+		}
+
+		String createdAtStr = getCreatedAt();
+		if(createdAtStr != null)
+		{
+			try
+			{
+				Date createdAt = PublicApiDateFormat.getDateFormat().parse(createdAtStr);
+				Date otherCreatedAt = PublicApiDateFormat.getDateFormat().parse(other.getCreatedAt());
+				assertTrue(otherCreatedAt.after(createdAt) || otherCreatedAt.equals(createdAt));
+			}
+			catch(ParseException e)
+			{
+				throw new RuntimeException(e);
+			}
+		}
+
+		if(modifiedBy != null)
+		{
+			modifiedBy.expected(other.getModifiedBy());
+		}
+		AssertUtil.assertEquals("updated", updated, other.getUpdated());
+	}
+
+	@Override
+	public int compareTo(Comment o)
+	{
+		// reverse chronological order
+		return o.getCreatedAt().compareTo(createdAt);
+	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Comment other = (Comment) obj;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		return true;
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Company.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Company.java
new file mode 100644
index 00000000000..6e65526e24e
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Company.java
@@ -0,0 +1,79 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import org.json.simple.JSONObject;
+
+public class Company extends org.alfresco.rest.api.model.Company implements ExpectedComparison
+{
+	public Company()
+	{
+	}
+
+	public Company(org.alfresco.rest.api.model.Company company)
+	{
+		super(company.getOrganization(), company.getAddress1(), company.getAddress2(), company.getAddress3(), company.getPostcode(), company.getTelephone(), company.getFax(), company.getEmail());
+	}
+
+	public Company(String organization, String address1, String address2, String address3, String postcode, String telephone, String fax, String email)
+	{
+		super(organization, address1, address2, address3, postcode, telephone, fax, email);
+	}
+
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject companyJson = new JSONObject();
+		companyJson.put("organization", getOrganization());
+		companyJson.put("address1", getAddress1());
+		companyJson.put("address2", getAddress2());
+		companyJson.put("address3", getAddress3());
+		companyJson.put("postcode", getPostcode());
+		companyJson.put("telephone", getTelephone());
+		companyJson.put("fax", getFax());
+		companyJson.put("email", getEmail());
+		return companyJson;
+	}
+
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof Company);
+
+		Company other = (Company)o;
+
+		AssertUtil.assertEquals("organization", getOrganization(), other.getOrganization());
+		AssertUtil.assertEquals("address1", getAddress1(), other.getAddress1());
+		AssertUtil.assertEquals("address2", getAddress2(), other.getAddress2());
+		AssertUtil.assertEquals("address3", getAddress3(), other.getAddress3());
+		AssertUtil.assertEquals("postcode", getPostcode(), other.getPostcode());
+		AssertUtil.assertEquals("telephone", getTelephone(), other.getTelephone());
+		AssertUtil.assertEquals("fax", getFax(), other.getFax());
+		AssertUtil.assertEquals("email", getEmail(), other.getEmail());
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/ContentData.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/ContentData.java
new file mode 100644
index 00000000000..1406642aa74
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/ContentData.java
@@ -0,0 +1,103 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import java.io.IOException;
+import java.io.Serializable;
+
+import org.apache.chemistry.opencmis.commons.data.ContentStream;
+import org.springframework.util.FileCopyUtils;
+
+public class ContentData implements Serializable
+{
+	private static final long serialVersionUID = 5757465330657144283L;
+
+	private long length;
+	private String mimeType;
+    private String fileName;
+    private byte[] bytes;
+
+    public ContentData(ContentStream cs) throws IOException
+    {
+    	length = cs.getLength();
+    	mimeType = cs.getMimeType();
+    	fileName = cs.getFileName();
+    	bytes = FileCopyUtils.copyToByteArray(cs.getStream());
+    }
+
+//	public ContentData(long length, String mimeType, String fileName,
+//			InputStream inputStream)
+//	{
+//		super();
+//		this.length = length;
+//		this.mimeType = mimeType;
+//		this.fileName = fileName;
+//		this.inputStream = inputStream;
+//	}
+
+	public long getLength()
+	{
+		return length;
+	}
+
+    /**
+     * Returns the MIME type of the stream.
+     * 
+     * @return the MIME type of the stream or <code>null</code> if the MIME type
+     *         is unknown
+     */
+    public String getMimeType()
+    {
+    	return mimeType;
+    }
+
+    /**
+     * Returns the file name of the stream.
+     * 
+     * @return the file name of the stream or <code>null</code> if the file name
+     *         is unknown
+     */
+    public String getFileName()
+    {
+    	return fileName;
+    }
+
+    /**
+     * Returns the stream.
+     * 
+     * It is important to close this stream properly!
+     */
+    public byte[] getBytes()
+    {
+    	return bytes;
+    }
+    
+//    public static ContentData getContentData(ContentStream contentStream) throws IOException
+//    {
+//    	ContentData contentData = new ContentData(contentStream);
+//    	return contentData;
+//    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/ContentInfo.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/ContentInfo.java
new file mode 100644
index 00000000000..105ce4b85c0
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/ContentInfo.java
@@ -0,0 +1,103 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Representation of content info (initially for client tests for File Folder API)
+ *
+ * @author janv
+ *
+ */
+public class ContentInfo
+{
+    private String mimeType;
+    private String mimeTypeName;
+    private Long sizeInBytes;
+    private String encoding;
+
+    public ContentInfo()
+    {
+    }
+
+    public String getMimeType() {
+        return mimeType;
+    }
+
+    public void setMimeType(String mimeType) {
+        this.mimeType = mimeType;
+    }
+
+    public String getMimeTypeName() {
+        return mimeTypeName;
+    }
+
+    public void setMimeTypeName(String mimeTypeName) {
+        this.mimeTypeName = mimeTypeName;
+    }
+
+    public Long getSizeInBytes() {
+        return sizeInBytes;
+    }
+
+    public void setSizeInBytes(Long sizeInBytes) {
+        this.sizeInBytes = sizeInBytes;
+    }
+
+    public String getEncoding() {
+        return encoding;
+    }
+
+    public void setEncoding(String encoding) {
+        this.encoding = encoding;
+    }
+
+    public void expected(Object o)
+    {
+        assertTrue(o instanceof ContentInfo);
+
+        ContentInfo other = (ContentInfo) o;
+
+        AssertUtil.assertEquals("mimeType", mimeType, other.getMimeType());
+        AssertUtil.assertEquals("mimeTypeName", mimeTypeName, other.getMimeTypeName());
+        AssertUtil.assertEquals("sizeInBytes", sizeInBytes, other.getSizeInBytes());
+        AssertUtil.assertEquals("encoding", encoding, other.getEncoding());
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder(150);
+        sb.append("ContentInfo [mimeType=").append(mimeType)
+                    .append(", mimeTypeName=").append(mimeTypeName)
+                    .append(", sizeInBytes=").append(sizeInBytes)
+                    .append(", encoding=").append(encoding)
+                    .append(']');
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/DirectAccessUrl.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/DirectAccessUrl.java
new file mode 100644
index 00000000000..38297d459f2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/DirectAccessUrl.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+
+/**
+ * Represents a direct access content url.
+ *
+ */
+public class DirectAccessUrl extends org.alfresco.service.cmr.repository.DirectAccessUrl implements Serializable, ExpectedComparison
+{
+
+    @Override
+    public void expected(Object o)
+    {
+        assertTrue("o is an instance of " + o.getClass(), o instanceof DirectAccessUrl);
+
+        DirectAccessUrl other = (DirectAccessUrl) o;
+
+        AssertUtil.assertEquals("contentUrl", getContentUrl(), other.getContentUrl());
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/DirectAccessUrlRequest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/DirectAccessUrlRequest.java
new file mode 100644
index 00000000000..90694c9ae6d
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/DirectAccessUrlRequest.java
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+
+/**
+ * Represents a direct access url request.
+ *
+ */
+public class DirectAccessUrlRequest extends org.alfresco.rest.api.model.DirectAccessUrlRequest implements Serializable, ExpectedComparison
+{
+
+    @Override
+    public void expected(Object o)
+    {
+        assertTrue("o is an instance of " + o.getClass(), o instanceof DirectAccessUrlRequest);
+
+        DirectAccessUrlRequest other = (DirectAccessUrlRequest) o;
+
+        AssertUtil.assertEquals("expiresAt", getExpiresAt(), other.getExpiresAt());
+        AssertUtil.assertEquals("validFor", getValidFor(), other.getValidFor());
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Document.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Document.java
new file mode 100644
index 00000000000..114fa7a5310
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Document.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Representation of a document node - initially for client tests for Nodes (aka File Folder) API
+ *
+ * @author janv
+ *
+ */
+public class Document extends Node
+{
+    public Document() {
+        super();
+    }
+
+    @Override
+    public void expected(Object o)
+    {
+        super.expected(o);
+
+        assertTrue(o instanceof Document);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/ExpectedComparison.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/ExpectedComparison.java
new file mode 100644
index 00000000000..c1fabbcacdb
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/ExpectedComparison.java
@@ -0,0 +1,31 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+public interface ExpectedComparison
+{
+	public void expected(Object other);
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Favourite.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Favourite.java
new file mode 100644
index 00000000000..dfad84f6ff4
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Favourite.java
@@ -0,0 +1,305 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.Serializable;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.rest.api.tests.PublicApiDateFormat;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.alfresco.service.cmr.favourites.FavouritesService.Type;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class Favourite implements Serializable, ExpectedComparison, Comparable<Favourite>
+{
+	private static final long serialVersionUID = 2812585719477560349L;
+
+	private String username;
+	private String targetGuid;
+	private Date createdAt;
+	private Date modifiedAt;
+	private FavouritesTarget target;
+	private Type type;
+	private Map<String, Object> properties;
+
+	public Favourite(FavouritesTarget target) throws ParseException
+	{
+		this((Date)null, (Date)null, target, null);
+	}
+
+	public Favourite(Date createdAt, Date modifiedAt, FavouritesTarget target, Map<String, Object> properties) throws ParseException
+	{
+		if(target != null)
+		{
+			this.targetGuid = target.getTargetGuid();
+		}
+		this.username = null;
+		this.createdAt = createdAt;
+		this.modifiedAt = modifiedAt;
+		this.target = target;
+		this.properties = properties;
+		if(target instanceof FileFavouriteTarget)
+		{
+			this.type = Type.FILE;
+		}
+		else if(target instanceof FolderFavouriteTarget)
+		{
+			this.type = Type.FOLDER;
+		}
+		else if(target instanceof SiteFavouriteTarget)
+		{
+			this.type = Type.SITE;
+		}
+		else
+		{
+			this.type = null;
+		}
+	}
+	
+	public Favourite(String createdAt, String modifiedAt, FavouritesTarget target, Map<String, Object> properties) throws ParseException
+	{
+		this(getDate(createdAt), getDate(modifiedAt), target, properties);
+	}
+	
+	private static Date getDate(String dateStr) throws ParseException
+	{
+		Date date = (dateStr != null ? PublicApiDateFormat.getDateFormat().parse(dateStr) : null);
+		return date;
+	}
+
+	public String getTargetGuid()
+	{
+		return targetGuid;
+	}
+
+	public String getUsername()
+	{
+		return username;
+	}
+
+	public Date getCreatedAt()
+	{
+		return createdAt;
+	}
+
+	public FavouritesTarget getTarget()
+	{
+		return target;
+	}
+
+	public Map<String, Object> getProperties()
+	{
+		return properties;
+	}
+
+	public void setProperties(Map<String, Object> properties)
+	{
+		this.properties = properties;
+	}
+	
+	public Date getModifiedAt()
+	{
+		return modifiedAt;
+	}
+
+	public Type getType()
+	{
+		Type type = null;
+		if(target instanceof FileFavouriteTarget)
+		{
+			type = Type.FILE;
+		}
+		else if(target instanceof FolderFavouriteTarget)
+		{
+			type = Type.FOLDER;
+		}
+		else if(target instanceof SiteFavouriteTarget)
+		{
+			type = Type.SITE;
+		}
+		return type;
+	}
+
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject favouriteJson = new JSONObject();
+		if(target != null)
+		{
+			favouriteJson.put("target", target.toJSON());
+		}
+		return favouriteJson;
+	}
+
+	public static FavouritesTarget parseTarget(JSONObject jsonObject) throws ParseException
+	{
+		FavouritesTarget ret = null;
+
+		if(jsonObject.containsKey("site"))
+		{
+			JSONObject siteJSON = (JSONObject)jsonObject.get("site");
+			Site site = SiteImpl.parseSite(siteJSON);
+			ret = new SiteFavouriteTarget(site);
+			
+		}
+		else if(jsonObject.containsKey("file"))
+		{
+			JSONObject documentJSON = (JSONObject)jsonObject.get("file");
+			FavouriteDocument document = FavouriteDocument.parseDocument(documentJSON);
+			ret = new FileFavouriteTarget(document);
+			
+		}
+		else if(jsonObject.containsKey("folder"))
+		{
+			JSONObject folderJSON = (JSONObject)jsonObject.get("folder");
+			FavouriteFolder folder = FavouriteFolder.parseFolder(folderJSON);
+			ret = new FolderFavouriteTarget(folder);
+		}
+
+		return ret;
+	}
+
+	public static Favourite parseFavourite(JSONObject jsonObject) throws ParseException
+	{
+		String createdAt = (String)jsonObject.get("createdAt");
+		String modifiedAt = (String)jsonObject.get("modifiedAt");
+		JSONObject jsonTarget = (JSONObject)jsonObject.get("target");
+		Map properties = null;
+		try
+		{
+			properties = RestApiUtil.parsePojo("properties", jsonObject, Map.class);
+		}
+		catch (Exception e)
+		{
+			// ignore
+		}
+		FavouritesTarget target = parseTarget(jsonTarget);
+		Favourite favourite = new Favourite(createdAt, modifiedAt, target, properties);
+		return favourite;
+	}
+
+	public static ListResponse<Favourite> parseFavourites(JSONObject jsonObject) throws ParseException
+	{
+		List<Favourite> favourites = new ArrayList<Favourite>();
+
+		JSONObject jsonList = (JSONObject)jsonObject.get("list");
+		assertNotNull(jsonList);
+
+		JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+		assertNotNull(jsonEntries);
+
+		for(int i = 0; i < jsonEntries.size(); i++)
+		{
+			JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+			JSONObject entry = (JSONObject)jsonEntry.get("entry");
+			favourites.add(Favourite.parseFavourite(entry));
+		}
+
+		ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+		return new ListResponse<Favourite>(paging, favourites);
+	}
+	
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof Favourite);
+		
+		Favourite other = (Favourite)o;
+
+		if(target == null)
+		{
+			fail();
+		}
+		target.expected(other.getTarget());
+		if(createdAt != null)
+		{
+			assertTrue(other.getCreatedAt().equals(createdAt) || other.getCreatedAt().after(createdAt));
+		}
+		if(modifiedAt != null)
+		{
+			AssertUtil.assertEquals("modifiedAt", modifiedAt, other.getModifiedAt());
+		}
+		AssertUtil.assertEquals("targetGuid", targetGuid, other.getTargetGuid());
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Favourite [username=" + username + ", targetGuid=" + targetGuid
+				+ ", createdAt=" + createdAt + ", modifiedAt = " + modifiedAt + ", target=" + target + "]";
+	}
+	
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result
+				+ ((targetGuid == null) ? 0 : targetGuid.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Favourite other = (Favourite) obj;
+		if (targetGuid == null) {
+			if (other.targetGuid != null)
+				return false;
+		} else if (!targetGuid.equals(other.targetGuid))
+			return false;
+		return true;
+	}
+
+	@Override
+	public int compareTo(Favourite o)
+	{
+		int idx = (type != null ? type.compareTo(o.getType()) : 0);
+		if(idx == 0)
+		{
+			idx = o.getCreatedAt().compareTo(createdAt);			
+		}
+		
+		return idx;
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouriteDocument.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouriteDocument.java
new file mode 100644
index 00000000000..bef239b6404
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouriteDocument.java
@@ -0,0 +1,198 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import java.math.BigInteger;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.rest.api.tests.PublicApiDateFormat;
+import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.data.Properties;
+import org.apache.chemistry.opencmis.commons.data.PropertyData;
+import org.json.simple.JSONObject;
+
+/**
+ * Representation of a document node (as returned by Favourites API)
+ * 
+ * @author steveglover
+ *
+ */
+public class FavouriteDocument extends FavouriteNode implements ExpectedComparison, JSONAble
+{
+    private static final long serialVersionUID = -5890002728061039516L;
+
+    private String mimeType;
+    private BigInteger sizeInBytes;
+    private String versionLabel;
+
+    /**
+     * For POSTs
+     * @param guid String
+     */
+    public FavouriteDocument(String guid)
+    {
+        super(guid);
+    }
+
+    public FavouriteDocument(String id, String guid)
+    {
+        super(id, guid);
+    }
+
+// public Document(String id, String guid, Map<String, Serializable> properties)
+// {
+//     super(id, guid, properties);
+// }
+
+    public static FavouriteDocument getDocument(String id, String guid, Properties props)
+    {
+        FavouriteDocument document = new FavouriteDocument(id, guid);
+
+        Map<String, PropertyData<?>> properties = props.getProperties();
+        document.setName((String)properties.get(PropertyIds.NAME).getFirstValue());
+        document.setTitle((String)properties.get(ContentModel.PROP_TITLE.toString()).getFirstValue());
+        document.setCreatedBy((String)properties.get(PropertyIds.CREATED_BY).getFirstValue());
+        document.setModifiedBy((String)properties.get(PropertyIds.LAST_MODIFIED_BY).getFirstValue());
+        GregorianCalendar modifiedAt = (GregorianCalendar)properties.get(PropertyIds.LAST_MODIFICATION_DATE).getFirstValue();
+        document.setModifiedAt(modifiedAt.getTime());
+        GregorianCalendar createdAt = (GregorianCalendar)properties.get(PropertyIds.CREATION_DATE).getFirstValue();
+        document.setCreatedAt(createdAt.getTime());
+        //document.setDescription((String)props.get(PropertyIds.DE).getFirstValue());
+        document.setMimeType((String)properties.get(PropertyIds.CONTENT_STREAM_MIME_TYPE).getFirstValue());
+        document.setSizeInBytes((BigInteger)properties.get(PropertyIds.CONTENT_STREAM_LENGTH).getFirstValue());
+        document.setVersionLabel((String)properties.get(PropertyIds.VERSION_LABEL).getFirstValue());
+        return document;
+    }
+
+    public String getMimeType()
+    {
+        return mimeType;
+    }
+
+    public BigInteger getSizeInBytes()
+    {
+        return sizeInBytes;
+    }
+
+    public String getVersionLabel()
+    {
+        return versionLabel;
+    }
+
+    public void setMimeType(String mimeType)
+    {
+        this.mimeType = mimeType;
+    }
+
+    public void setSizeInBytes(BigInteger sizeInBytes)
+    {
+        this.sizeInBytes = sizeInBytes;
+    }
+
+    public void setVersionLabel(String versionLabel)
+    {
+        this.versionLabel = versionLabel;
+    }
+
+    public JSONObject toJSON()
+    {
+        JSONObject json = super.toJSON();
+        return json;
+    }
+
+    @Override
+    public void expected(Object o)
+    {
+        super.expected(o);
+
+        assertTrue(o instanceof FavouriteDocument);
+
+        FavouriteDocument other = (FavouriteDocument)o;
+
+        AssertUtil.assertEquals("mimeType", mimeType, other.getMimeType());
+        AssertUtil.assertEquals("sizeInBytes", sizeInBytes, other.getSizeInBytes());
+        AssertUtil.assertEquals("versionLabel", versionLabel, other.getVersionLabel());
+    }
+
+    public static FavouriteDocument parseDocument(JSONObject jsonObject) throws ParseException
+    {
+        String id = (String)jsonObject.get("id");
+        String guid = (String)jsonObject.get("guid");
+        String name = (String)jsonObject.get("name");
+        String title = (String)jsonObject.get("title");
+        String description = (String)jsonObject.get("description");
+        Date createdAt = PublicApiDateFormat.getDateFormat().parse((String)jsonObject.get("createdAt"));
+        Date modifiedAt = PublicApiDateFormat.getDateFormat().parse((String)jsonObject.get("modifiedAt"));
+        String createdBy = (String)jsonObject.get("createdBy");
+        String modifiedBy = (String)jsonObject.get("modifiedBy");
+        String mimeType = (String)jsonObject.get("mimeType");
+        Long sizeInBytes = (Long)jsonObject.get("sizeInBytes");
+        String versionLabel = (String)jsonObject.get("versionLabel");
+
+        FavouriteDocument document = new FavouriteDocument(id, guid);
+        document.setName(name);
+        document.setTitle(title);
+        document.setCreatedBy(createdBy);
+        document.setModifiedBy(modifiedBy);
+        document.setModifiedAt(modifiedAt);
+        document.setCreatedAt(createdAt);
+        document.setDescription(description);
+        document.setMimeType(mimeType);
+        document.setSizeInBytes(BigInteger.valueOf(sizeInBytes));
+        document.setVersionLabel(versionLabel);
+        // set path if available
+        document.parseAndSetPath(jsonObject);
+        return document;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder(250);
+        sb.append("FavouriteDocument [nodeId=").append(nodeId)
+                    .append(", guid=").append(guid)
+                    .append(", name=").append(name)
+                    .append(", title=").append(title)
+                    .append(", description=").append(description)
+                    .append(", createdAt=").append(createdAt)
+                    .append(", modifiedAt=").append(modifiedAt)
+                    .append(", createdBy=").append(createdBy)
+                    .append(", modifiedBy=").append(modifiedBy)
+                    .append(", mimeType=").append(mimeType)
+                    .append(", sizeInBytes=").append(sizeInBytes)
+                    .append(", versionLabel=").append(versionLabel)
+                    .append(", path=").append(path)
+                    .append(']');
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouriteFolder.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouriteFolder.java
new file mode 100644
index 00000000000..afdd7cf3cdb
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouriteFolder.java
@@ -0,0 +1,141 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+ 
+package org.alfresco.rest.api.tests.client.data;
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.rest.api.tests.PublicApiDateFormat;
+import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.data.Properties;
+import org.apache.chemistry.opencmis.commons.data.PropertyData;
+import org.json.simple.JSONObject;
+
+/**
+ * Representation of a folder node (as returned by Favourites API)
+ * 
+ * @author steveglover
+ *
+ */
+public class FavouriteFolder extends FavouriteNode implements ExpectedComparison, JSONAble
+{
+    private static final long serialVersionUID = 5020819866533183524L;
+
+    /**
+     * For POSTs
+     * @param guid String
+     */
+    public FavouriteFolder(String guid)
+    {
+        super(guid);
+    }
+
+    public FavouriteFolder(String id, String guid)
+    {
+        super(id, guid);
+    }
+
+// public Folder(String id, String guid, Map<String, Serializable> properties)
+// {
+//     super(id, guid, properties);
+// }
+
+    public static FavouriteFolder getFolder(String id, String guid, Properties props)
+    {
+        FavouriteFolder folder = new FavouriteFolder(id, guid);
+
+        Map<String, PropertyData<?>> properties = props.getProperties();
+        folder.setName((String)properties.get(PropertyIds.NAME).getFirstValue());
+        folder.setTitle((String)properties.get(ContentModel.PROP_TITLE.toString()).getFirstValue());
+        folder.setCreatedBy((String)properties.get(PropertyIds.CREATED_BY).getFirstValue());
+        folder.setModifiedBy((String)properties.get(PropertyIds.LAST_MODIFIED_BY).getFirstValue());
+        GregorianCalendar modifiedAt = (GregorianCalendar)properties.get(PropertyIds.LAST_MODIFICATION_DATE).getFirstValue();
+        folder.setModifiedAt(modifiedAt.getTime());
+        GregorianCalendar createdAt = (GregorianCalendar)properties.get(PropertyIds.CREATION_DATE).getFirstValue();
+        folder.setCreatedAt(createdAt.getTime());
+        //document.setDescription((String)props.get(PropertyIds.DE).getFirstValue());
+        return folder;
+    }
+
+    public JSONObject toJSON()
+    {
+        JSONObject json = super.toJSON();
+        return json;
+    }
+
+    public static FavouriteFolder parseFolder(JSONObject jsonObject) throws ParseException
+    {
+        String id = (String)jsonObject.get("id");
+        String guid = (String)jsonObject.get("guid");
+        String name = (String)jsonObject.get("name");
+        String title = (String)jsonObject.get("title");
+        String description = (String)jsonObject.get("description");
+        Date createdAt = PublicApiDateFormat.getDateFormat().parse((String)jsonObject.get("createdAt"));
+        Date modifiedAt = PublicApiDateFormat.getDateFormat().parse((String)jsonObject.get("modifiedAt"));
+        String createdBy = (String)jsonObject.get("createdBy");
+        String modifiedBy = (String)jsonObject.get("modifiedBy");
+
+        FavouriteFolder folder = new FavouriteFolder(id, guid);
+        folder.setName(name);
+        folder.setTitle(title);
+        folder.setCreatedBy(createdBy);
+        folder.setModifiedBy(modifiedBy);
+        folder.setModifiedAt(modifiedAt);
+        folder.setCreatedAt(createdAt);
+        folder.setDescription(description);
+        // set path if available
+        folder.parseAndSetPath(jsonObject);
+        return folder;
+    }
+
+    @Override
+    public void expected(Object o)
+    {
+        super.expected(o);
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder(250);
+        sb.append("FavouriteFolder [nodeId=").append(nodeId)
+                    .append(", guid=").append(guid)
+                    .append(", name=").append(name)
+                    .append(", title=").append(title)
+                    .append(", description=").append(description)
+                    .append(", createdAt=").append(createdAt)
+                    .append(", modifiedAt=").append(modifiedAt)
+                    .append(", createdBy=").append(createdBy)
+                    .append(", modifiedBy=").append(modifiedBy)
+                    .append(", path=").append(path)
+                    .append(']');
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouriteNode.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouriteNode.java
new file mode 100644
index 00000000000..643ab517e5e
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouriteNode.java
@@ -0,0 +1,284 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+ 
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.text.ParseException;
+import java.util.Date;
+
+import org.alfresco.rest.api.tests.util.RestApiUtil;
+import org.json.simple.JSONObject;
+
+/**
+ * Alfresco API - Favourite node representation.
+ * 
+ * @author steveglover
+ *
+ */
+public class FavouriteNode implements Serializable, ExpectedComparison
+{
+    private static final long serialVersionUID = -6881545732441221372L;
+
+    protected String nodeId;
+    protected String guid;
+    protected String name;
+    protected String title;
+    protected String description;
+    protected Date createdAt;
+    protected Date modifiedAt;
+    protected String createdBy;
+    protected String modifiedBy;
+    protected PathInfo path;
+
+    public FavouriteNode()
+    {
+    }
+
+    /**
+     * For POSTs
+     *
+     * @param guid String
+     */
+    public FavouriteNode(String guid)
+    {
+        this.guid = guid;
+    }
+
+    public FavouriteNode(String id, String guid)
+    {
+        this.nodeId = id;
+        this.guid = guid;
+    }
+
+    public void setGuid(String guid)
+    {
+        this.guid = guid;
+    }
+
+    public String getGuid()
+    {
+        return guid;
+    }
+
+    public String getRawNodeId()
+    {
+        return nodeId;
+    }
+
+    public String getNodeId()
+    {
+        return nodeId;
+    }
+
+    public boolean isFolder()
+    {
+        return false;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    public Date getCreatedAt()
+    {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt)
+    {
+        this.createdAt = createdAt;
+    }
+
+    public Date getModifiedAt()
+    {
+        return modifiedAt;
+    }
+
+    public void setModifiedAt(Date modifiedAt)
+    {
+        this.modifiedAt = modifiedAt;
+    }
+
+    public String getCreatedBy()
+    {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy)
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getModifiedBy()
+    {
+        return modifiedBy;
+    }
+
+    public void setModifiedBy(String modifiedBy)
+    {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public void setNodeId(String nodeId)
+    {
+        this.nodeId = nodeId;
+    }
+
+    public PathInfo getPath()
+    {
+        return path;
+    }
+
+    public void setPath(PathInfo pathInfo)
+    {
+        this.path = pathInfo;
+    }
+
+    protected void parseAndSetPath(JSONObject jsonObject) throws ParseException
+    {
+        if (jsonObject.get("path") != null)
+        {
+            try
+            {
+                PathInfo pathInfo = RestApiUtil.parsePojo("path", jsonObject, PathInfo.class);
+                this.setPath(pathInfo);
+            }
+            catch (Exception e)
+            {
+                throw new ParseException(e.getMessage(), -1);
+            }
+        }
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((nodeId == null) ? 0 : nodeId.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        FavouriteNode other = (FavouriteNode) obj;
+        if (nodeId == null)
+        {
+            if (other.nodeId != null)
+                return false;
+        } else if (!nodeId.equals(other.nodeId))
+            return false;
+        return true;
+    }
+
+    @SuppressWarnings("unchecked")
+    public JSONObject toJSON()
+    {
+        JSONObject json = new JSONObject();
+        json.put("guid", getGuid());
+        json.put("id", getNodeId());
+        return json;
+    }
+
+    @Override
+    public void expected(Object o)
+    {
+        assertTrue(o instanceof FavouriteNode);
+
+        FavouriteNode other = (FavouriteNode) o;
+
+        AssertUtil.assertEquals("id", nodeId, other.getNodeId());
+        AssertUtil.assertEquals("guid", guid, other.getGuid());
+        AssertUtil.assertEquals("name", name, other.getName());
+        AssertUtil.assertEquals("title", title, other.getTitle());
+        AssertUtil.assertEquals("description", description, other.getDescription());
+        AssertUtil.assertEquals("createdAt", createdAt, other.getCreatedAt());
+        if(modifiedAt != null)
+        {
+            assertTrue(modifiedAt.before(other.getModifiedAt()) || modifiedAt.equals(other.getModifiedAt()));
+        }
+        AssertUtil.assertEquals("createdBy", createdBy, other.getCreatedBy());
+        AssertUtil.assertEquals("modifiedBy", modifiedBy, other.getModifiedBy());
+        if(path != null)
+        {
+            path.expected(other.path);
+        }
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder(250);
+        sb.append("FavouriteNode [nodeId=").append(nodeId)
+                    .append(", guid=").append(guid)
+                    .append(", name=").append(name)
+                    .append(", title=").append(title)
+                    .append(", description=").append(description)
+                    .append(", createdAt=").append(createdAt)
+                    .append(", modifiedAt=").append(modifiedAt)
+                    .append(", createdBy=").append(createdBy)
+                    .append(", modifiedBy=").append(modifiedBy)
+                    .append(", path=").append(path)
+                    .append(']');
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouriteSite.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouriteSite.java
new file mode 100644
index 00000000000..91d3247ff74
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouriteSite.java
@@ -0,0 +1,98 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class FavouriteSite extends SiteImpl implements Serializable
+{
+	private static final long serialVersionUID = 6106140056062813842L;
+
+	public FavouriteSite(String siteId)
+	{
+		this.siteId = siteId;
+	}
+
+	public FavouriteSite(Site site)
+	{
+		super(null, site.getSiteId(), site.getGuid(), site.getTitle(), site.getDescription(), site.getVisibility(), site.getType(), site.getRole());
+	}
+
+	public FavouriteSite(String networkId, String siteId, String siteGuid, String title, String description,
+			String visibility, String type, SiteRole role)
+	{
+		super(networkId, siteId, siteGuid, title, description, visibility, type, role);
+	}
+	
+	public static FavouriteSite parseFavouriteSite(JSONObject entry)
+	{
+		Site site = SiteImpl.parseSite(entry);
+		FavouriteSite favouriteSite = new FavouriteSite(site);
+		return favouriteSite;
+	}
+	
+	public static ListResponse<FavouriteSite> parseFavouriteSites(JSONObject jsonObject)
+	{
+		JSONObject jsonList = (JSONObject)jsonObject.get("list");
+		List<FavouriteSite> favouriteSites = new ArrayList<FavouriteSite>(jsonList.size());
+		if(jsonList != null)
+		{
+			JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+			if(jsonEntries != null)
+			{
+				for(int i = 0; i < jsonEntries.size(); i++)
+				{
+					JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+					JSONObject entry = (JSONObject)jsonEntry.get("entry");
+					favouriteSites.add(parseFavouriteSite(entry));
+				}
+			}
+		}
+
+		ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+		return new ListResponse<FavouriteSite>(paging, favouriteSites);
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		FavouriteSite other = (FavouriteSite) obj;
+		return getSiteId().equals(other.getSiteId());
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouritesTarget.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouritesTarget.java
new file mode 100644
index 00000000000..2bae9a17c64
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FavouritesTarget.java
@@ -0,0 +1,34 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import org.json.simple.JSONObject;
+
+public interface FavouritesTarget extends ExpectedComparison
+{
+	JSONObject toJSON();
+	String getTargetGuid();
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FileFavouriteTarget.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FileFavouriteTarget.java
new file mode 100644
index 00000000000..3ce27488593
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FileFavouriteTarget.java
@@ -0,0 +1,76 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import org.json.simple.JSONObject;
+
+public class FileFavouriteTarget implements FavouritesTarget
+{
+	private FavouriteDocument document;
+
+	public FileFavouriteTarget(FavouriteDocument document)
+	{
+		super();
+		this.document = document;
+	}
+
+	public FavouriteDocument getDocument()
+	{
+		return document;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "FileFavouriteTarget [document=" + document + "]";
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public JSONObject toJSON()
+	{
+		JSONObject favouriteJson = new JSONObject();
+		favouriteJson.put("file", getDocument().toJSON());
+		return favouriteJson;
+	}
+
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof FileFavouriteTarget);
+		
+		FileFavouriteTarget other = (FileFavouriteTarget)o;
+		
+		document.expected(other.getDocument());
+	}
+	
+	public String getTargetGuid()
+	{
+		return document.getGuid();
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Folder.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Folder.java
new file mode 100644
index 00000000000..9d711fa4eb5
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Folder.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Representation of a folder node - initially for client tests for Nodes (aka File Folder) API
+ *
+ * @author janv
+ */
+public class Folder extends Node
+{
+    public Folder()
+    {
+        super();
+    }
+
+    @Override
+    public void expected(Object o)
+    {
+        super.expected(o);
+
+        assertTrue(o instanceof Folder);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FolderFavouriteTarget.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FolderFavouriteTarget.java
new file mode 100644
index 00000000000..594cd8e11b1
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FolderFavouriteTarget.java
@@ -0,0 +1,75 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import org.json.simple.JSONObject;
+
+public class FolderFavouriteTarget implements FavouritesTarget
+{
+	private FavouriteFolder folder;
+
+	public FolderFavouriteTarget(FavouriteFolder folder)
+	{
+		super();
+		this.folder = folder;
+	}
+
+	public FavouriteFolder getFolder()
+	{
+		return folder;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "FolderFavouriteTarget [folder=" + folder + "]";
+	}
+
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject json = new JSONObject();
+		json.put("folder", getFolder().toJSON());
+		return json;
+	}
+	
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof FolderFavouriteTarget);
+		
+		FolderFavouriteTarget other = (FolderFavouriteTarget)o;
+		
+		folder.expected(other.getFolder());
+	}
+
+	public String getTargetGuid()
+	{
+		return folder.getGuid();
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FolderNode.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FolderNode.java
new file mode 100644
index 00000000000..eb86cd0c0cb
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/FolderNode.java
@@ -0,0 +1,248 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.chemistry.opencmis.client.api.CmisObject;
+import org.apache.chemistry.opencmis.client.api.FileableCmisObject;
+import org.apache.chemistry.opencmis.client.api.ItemIterable;
+import org.apache.chemistry.opencmis.client.api.Tree;
+
+public class FolderNode extends CMISNode implements Serializable
+{
+	private static final long serialVersionUID = -7069586854942264572L;
+
+	private Map<String, FolderNode> folderNodes = new HashMap<String, FolderNode>();
+	private Map<String, CMISNode> documentNodes = new HashMap<String, CMISNode>();
+
+	private Random random = new Random();
+
+	public FolderNode(String nodeId, String guid, Map<String, Serializable> properties)
+	{
+		super(nodeId, guid, properties);
+	}
+
+	public boolean isFolder()
+	{
+		return true;
+	}
+	
+	public void addFolder(FolderNode folder)
+	{
+		folderNodes.put(getBareObjectId(folder.getNodeId()), folder);
+	}
+	
+	public void addNode(CMISNode node)
+	{
+		documentNodes.put(getBareObjectId(node.getNodeId()), node);
+	}
+	
+	public Map<String, FolderNode> getFolderNodes()
+	{
+		return folderNodes;
+	}
+
+	public Map<String, CMISNode> getDocumentNodes()
+	{
+		return documentNodes;
+	}
+
+	private FolderNode getFolderNode(String objectId)
+	{
+		FolderNode n = folderNodes.get(getBareObjectId(objectId));
+		return n;
+	}
+
+	private CMISNode getDocumentNode(String objectId)
+	{
+		CMISNode n = documentNodes.get(getBareObjectId(objectId));
+		return n;
+	}
+	
+	public CMISNode selectRandomFolderNode()
+	{
+		int idx = random.nextInt(folderNodes.size());
+		return folderNodes.get(idx);
+	}
+	
+	public CMISNode selectRandomDocumentNode()
+	{
+		int idx = random.nextInt(documentNodes.size());
+		return documentNodes.get(idx);
+	}
+
+	@Override
+	public String toString()
+	{
+		return "FolderNode [folderNodes=" + folderNodes + ", documentNodes="
+				+ documentNodes + ", nodeId=" + nodeId + ", properties="
+				+ properties + "]";
+	}
+	
+	private String getBareObjectId(String objectId)
+	{
+		int idx = objectId.indexOf(";");
+		String bareObjectId = null;
+		if(idx == -1)
+		{
+			bareObjectId = objectId;
+		}
+		else
+		{
+			bareObjectId = objectId.substring(0, idx);
+		}
+		return bareObjectId;
+	}
+
+	private Tree<FileableCmisObject> findTree(String nodeId, List<Tree<FileableCmisObject>> nodes)
+	{
+		Tree<FileableCmisObject> ret = null;
+
+		for(Tree<FileableCmisObject> tree : nodes)
+		{
+			FileableCmisObject item = tree.getItem();
+			// compare only the "bare" object id i.e. without the version suffix
+			if(getBareObjectId(nodeId).equals(getBareObjectId(item.getId())))
+			{
+				ret = tree;
+				break;
+			}
+		}
+
+		return ret;
+	}
+
+	private void checkChildrenImpl(Map<String, FolderNode> expectedFolderNodes, Map<String, CMISNode> expectedDocumentNodes)
+	{
+		for(FolderNode expectedFolderNode : expectedFolderNodes.values())
+		{
+			FolderNode actualFolderNode = getFolderNode(expectedFolderNode.getNodeId());
+			assertNotNull("Unable to find node " + expectedFolderNode, actualFolderNode);
+
+			// check a few basic properties
+			Map<String, Serializable> expectedProperties = expectedFolderNode.getProperties();
+			Map<String, Serializable> actualProperties = actualFolderNode.getProperties();
+			AssertUtil.assertEquals("cmis:objectTypeId", expectedProperties.get("cmis:objectTypeId"), actualProperties.get("cmis:objectTypeId"));
+			AssertUtil.assertEquals("cmis:path", expectedProperties.get("cmis:path"), actualProperties.get("cmis:path"));
+			AssertUtil.assertEquals("cmis:name", expectedProperties.get("cmis:name"), actualProperties.get("cmis:name"));
+		}
+
+		for(CMISNode expectedDocumentNode : expectedDocumentNodes.values())
+		{
+			CMISNode actualDocumentNode = getDocumentNode(expectedDocumentNode.getNodeId());
+			assertNotNull("Unable to find node " + expectedDocumentNode.getNodeId(), actualDocumentNode);
+
+			// check a few basic properties
+			Map<String, Serializable> expectedProperties = expectedDocumentNode.getProperties();
+			Map<String, Serializable> actualProperties = actualDocumentNode.getProperties();
+			AssertUtil.assertEquals("cmis:objectTypeId", expectedProperties.get("cmis:objectTypeId"), actualProperties.get("cmis:objectTypeId"));
+			AssertUtil.assertEquals("cmis:path", expectedProperties.get("cmis:path"), actualProperties.get("cmis:path"));
+			AssertUtil.assertEquals("cmis:name", expectedProperties.get("cmis:name"), actualProperties.get("cmis:name"));
+		}
+	}
+
+	public void checkChildren(ItemIterable<CmisObject> expectedChildren)
+	{
+		Map<String, FolderNode> expectedFolderNodes = new HashMap<String, FolderNode>();
+		Map<String, CMISNode> expectedDocumentNodes = new HashMap<String, CMISNode>();
+		for(CmisObject child : expectedChildren)
+		{
+			CMISNode dn = CMISNode.createNode(child);
+			if(dn instanceof FolderNode)
+			{
+				expectedFolderNodes.put(getBareObjectId(dn.getNodeId()), (FolderNode)dn);
+			}
+			else
+			{
+				expectedDocumentNodes.put(getBareObjectId(dn.getNodeId()), dn);
+			}
+		}
+		checkChildrenImpl(expectedFolderNodes, expectedDocumentNodes);
+	}
+	
+	public void checkChildren(List<String> expectedChildFolderIds, List<String> expectedChildDocumentIds)
+	{
+		Map<String, FolderNode> expectedFolderNodes = new HashMap<String, FolderNode>();
+		for(String childObjectId : expectedChildFolderIds)
+		{
+			CMISNode n = CMISNode.createNode(getBareObjectId(childObjectId));
+			if(n instanceof FolderNode)
+			{
+				FolderNode node = (FolderNode)n;
+				expectedFolderNodes.put(getBareObjectId(node.getNodeId()), node);
+			}
+		}
+		Map<String, CMISNode> expectedDocumentNodes = new HashMap<String, CMISNode>();
+		for(String childObjectId : expectedChildDocumentIds)
+		{
+			CMISNode node = CMISNode.createNode(getBareObjectId(childObjectId));
+			expectedDocumentNodes.put(getBareObjectId(node.getNodeId()), node);
+		}
+
+		checkChildrenImpl(expectedFolderNodes, expectedDocumentNodes);
+	}
+
+	public void checkDescendants(List<Tree<FileableCmisObject>> descendants)
+	{
+		for(FolderNode expectedFolderNode : folderNodes.values())
+		{
+			Tree<FileableCmisObject> item = findTree(expectedFolderNode.getNodeId(), descendants);
+			assertNotNull(item);
+			FolderNode actualFolderNode = (FolderNode)CMISNode.createNode(item.getItem());
+			
+			// check a few basic properties
+			Map<String, Serializable> expectedProperties = expectedFolderNode.getProperties();
+			Map<String, Serializable> actualProperties = actualFolderNode.getProperties();
+			assertEquals(expectedProperties.get("cmis:objectTypeId"), actualProperties.get("cmis:objectTypeId"));
+			assertEquals(expectedProperties.get("cmis:path"), actualProperties.get("cmis:path"));
+			assertEquals(expectedProperties.get("cmis:name"), actualProperties.get("cmis:name"));
+
+			expectedFolderNode.checkDescendants(item.getChildren());
+		}
+
+		for(CMISNode expectedDocumentNode : documentNodes.values())
+		{
+			Tree<FileableCmisObject> item = findTree(expectedDocumentNode.getNodeId(), descendants);
+			assertNotNull(item);
+			CMISNode actualNode = CMISNode.createNode(item.getItem());
+
+			// check a few basic properties
+			Map<String, Serializable> expectedProperties = expectedDocumentNode.getProperties();
+			Map<String, Serializable> actualProperties = actualNode.getProperties();
+			assertEquals(expectedProperties.get("cmis:objectTypeId"), actualProperties.get("cmis:objectTypeId"));
+			assertEquals(expectedProperties.get("cmis:path"), actualProperties.get("cmis:path"));
+			assertEquals(expectedProperties.get("cmis:name"), actualProperties.get("cmis:name"));
+		}
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java
new file mode 100644
index 00000000000..f8109d4f75d
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java
@@ -0,0 +1,134 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+/**
+ * Represents a group.
+ *
+ * @author cturlica
+ *
+ */
+public class Group extends org.alfresco.rest.api.model.Group implements Serializable, ExpectedComparison
+{
+
+    private static final long serialVersionUID = -3580248429177260831L;
+
+    @Override
+    public void expected(Object o)
+    {
+        assertTrue("o is an instance of " + o.getClass(), o instanceof Group);
+
+        Group other = (Group) o;
+
+        AssertUtil.assertEquals("id", getId(), other.getId());
+        AssertUtil.assertEquals("displayName", getDisplayName(), other.getDisplayName());
+        AssertUtil.assertEquals("isRoot", getIsRoot(), other.getIsRoot());
+        AssertUtil.assertEquals("parentIds", getParentIds(), other.getParentIds());
+        AssertUtil.assertEquals("zones", getZones(), other.getZones());
+    }
+
+    public JSONObject toJSON()
+    {
+        JSONObject groupJson = new JSONObject();
+        if (getId() != null)
+        {
+            groupJson.put("id", getId());
+        }
+
+        groupJson.put("displayName", getDisplayName());
+
+        if (getIsRoot() != null)
+        {
+            groupJson.put("isRoot", getIsRoot());
+        }
+
+        if (getParentIds() != null)
+        {
+            groupJson.put("parentIds", new ArrayList(getParentIds()));
+        }
+
+        if (getZones() != null)
+        {
+            groupJson.put("zones", new ArrayList(getZones()));
+        }
+
+        return groupJson;
+    }
+
+    public static Group parseGroup(JSONObject jsonObject)
+    {
+        String id = (String) jsonObject.get("id");
+        String displayName = (String) jsonObject.get("displayName");
+        Boolean isRoot = (Boolean) jsonObject.get("isRoot");
+        List<String> parentIds = (List<String>) jsonObject.get("parentIds");
+        List<String> zones = (List<String>) jsonObject.get("zones");
+
+        Group group = new Group();
+        group.setId(id);
+        group.setDisplayName(displayName);
+        group.setIsRoot(isRoot);
+        group.setParentIds(parentIds != null ? new HashSet<String>(parentIds) : null);
+        group.setZones(zones != null ? new HashSet<String>(zones) : null);
+
+        return group;
+    }
+
+    public static ListResponse<Group> parseGroups(JSONObject jsonObject)
+    {
+        List<Group> groups = new ArrayList<>();
+
+        JSONObject jsonList = (JSONObject) jsonObject.get("list");
+        assertNotNull(jsonList);
+
+        JSONArray jsonEntries = (JSONArray) jsonList.get("entries");
+        assertNotNull(jsonEntries);
+
+        for (int i = 0; i < jsonEntries.size(); i++)
+        {
+            JSONObject jsonEntry = (JSONObject) jsonEntries.get(i);
+            JSONObject entry = (JSONObject) jsonEntry.get("entry");
+            groups.add(parseGroup(entry));
+        }
+
+        ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+        ListResponse<Group> resp = new ListResponse<>(paging, groups);
+        return resp;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/GroupMember.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/GroupMember.java
new file mode 100644
index 00000000000..c145a5712e2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/GroupMember.java
@@ -0,0 +1,107 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+/**
+ * Represents a group member.
+ *
+ * @author cturlica
+ *
+ */
+public class GroupMember extends org.alfresco.rest.api.model.GroupMember implements Serializable, ExpectedComparison
+{
+
+    @Override
+    public void expected(Object o)
+    {
+        assertTrue("o is an instance of " + o.getClass(), o instanceof GroupMember);
+
+        GroupMember other = (GroupMember) o;
+
+        AssertUtil.assertEquals("id", getId(), other.getId());
+        AssertUtil.assertEquals("displayName", getDisplayName(), other.getDisplayName());
+        AssertUtil.assertEquals("memberType", getMemberType(), other.getMemberType());
+    }
+
+    public JSONObject toJSON()
+    {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("id", getId());
+        jsonObject.put("displayName", getDisplayName());
+        jsonObject.put("memberType", getMemberType());
+
+        return jsonObject;
+    }
+
+    public static GroupMember parseGroupMember(JSONObject jsonObject)
+    {
+        String id = (String) jsonObject.get("id");
+        String displayName = (String) jsonObject.get("displayName");
+        String memberType = (String) jsonObject.get("memberType");
+
+        GroupMember group = new GroupMember();
+        group.setId(id);
+        group.setDisplayName(displayName);
+        group.setMemberType(memberType);
+
+        return group;
+    }
+
+    public static ListResponse<GroupMember> parseGroupMembers(JSONObject jsonObject)
+    {
+        List<GroupMember> groupMembers = new ArrayList<>();
+
+        JSONObject jsonList = (JSONObject) jsonObject.get("list");
+        assertNotNull(jsonList);
+
+        JSONArray jsonEntries = (JSONArray) jsonList.get("entries");
+        assertNotNull(jsonEntries);
+
+        for (int i = 0; i < jsonEntries.size(); i++)
+        {
+            JSONObject jsonEntry = (JSONObject) jsonEntries.get(i);
+            JSONObject entry = (JSONObject) jsonEntry.get("entry");
+            groupMembers.add(parseGroupMember(entry));
+        }
+
+        ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+        ListResponse<GroupMember> resp = new ListResponse<>(paging, groupMembers);
+        return resp;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/InvalidFavouriteTarget.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/InvalidFavouriteTarget.java
new file mode 100644
index 00000000000..d7d943aa5aa
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/InvalidFavouriteTarget.java
@@ -0,0 +1,135 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import org.json.simple.JSONObject;
+
+public class InvalidFavouriteTarget implements FavouritesTarget
+{
+	private String name;
+	private Object entity;
+	private String targetGuid;
+
+	public static class GenericFavourite
+	{
+		private String guid;
+
+		public String getGuid()
+		{
+			return guid;
+		}
+
+		public void setGuid(String guid)
+		{
+			this.guid = guid;
+		}
+		
+		@SuppressWarnings("unchecked")
+		public JSONObject toJSON()
+		{
+			JSONObject json = new JSONObject();
+			json.put("guid", guid);
+			return json;
+		}
+
+		@Override
+		public String toString()
+		{
+			return "GenericFavourite [guid=" + guid + "]";
+		}
+	}
+
+	public InvalidFavouriteTarget(String name, Object entity, String targetGuid)
+	{
+		super();
+		this.name = name;
+		this.entity = entity;
+		this.targetGuid = targetGuid;
+	}
+
+	public Object getEntity()
+	{
+		return entity;
+	}
+
+	public void setEntity(Object entity)
+	{
+		this.entity = entity;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "InvalidFavouriteTarget [entity=" + entity + "]";
+	}
+
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof InvalidFavouriteTarget);
+
+		InvalidFavouriteTarget other = (InvalidFavouriteTarget) o;
+		Object entity1 = getEntity();
+		Object entity2 = other.getEntity();
+		if(entity1 instanceof ExpectedComparison && entity2 instanceof ExpectedComparison)
+		{
+			ExpectedComparison expected1 = (ExpectedComparison)entity1;
+			ExpectedComparison expected2 = (ExpectedComparison)entity2;
+			expected1.expected(expected2);
+		}
+		else
+		{
+			throw new RuntimeException("Entities cannot be compared");
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public JSONObject toJSON()
+	{
+		JSONObject json = new JSONObject();
+
+		if(entity instanceof JSONAble)
+		{
+			JSONAble jsonAble = (JSONAble)entity;
+			JSONObject entityJSON = jsonAble.toJSON();
+			json.put(name, entityJSON);
+		}
+		else
+		{
+			throw new RuntimeException("Favourite target cannot be converted to JSON");
+		}
+
+		return json;
+	}
+	
+	public String getTargetGuid()
+	{
+		return targetGuid;
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/JSONAble.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/JSONAble.java
new file mode 100644
index 00000000000..811bfabb45c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/JSONAble.java
@@ -0,0 +1,33 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import org.json.simple.JSONObject;
+
+public interface JSONAble
+{
+	JSONObject toJSON();
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/MemberOfSite.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/MemberOfSite.java
new file mode 100644
index 00000000000..4c3467a947a
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/MemberOfSite.java
@@ -0,0 +1,240 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class MemberOfSite implements Serializable, ExpectedComparison, Comparable<MemberOfSite>
+{
+	private static final long serialVersionUID = -5834300883854366123L;
+
+	private SiteRole role;
+	private String siteId;
+	private String siteGuid;
+	private Site site;
+
+	public MemberOfSite()
+	{
+	}
+
+    public MemberOfSite(String siteId, String siteGuid, SiteRole role)
+    {
+		super();
+		if(siteId == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		if(siteGuid == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		if(role == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.role = role;
+		this.siteId = siteId;
+		this.siteGuid = siteGuid;
+	}
+
+    public MemberOfSite(Site site, SiteRole role)
+    {
+		super();
+		if(site == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		if(role == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.role = role;
+		this.site = site;
+		this.siteId = site.getSiteId();
+		this.siteGuid = site.getGuid();
+	}
+
+    public String getSiteId()
+    {
+		return siteId;
+	}
+
+	public String getGuid()
+	{
+		return siteGuid;
+	}
+
+	public Site getSite()
+	{
+		return site;
+	}
+
+	public SiteRole getRole()
+	{
+		return role;
+	}
+	
+	public void setRole(SiteRole role)
+	{
+		if(role == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.role = role;
+	}
+
+	public void setSite(SiteImpl site)
+	{
+		if(site == null)
+		{
+			throw new IllegalArgumentException();
+		}
+		this.site = site;
+	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((role == null) ? 0 : role.hashCode());
+		result = prime * result
+				+ site.getSiteId().hashCode();
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+		{
+			return true;
+		}
+		
+		if (obj == null)
+		{
+			return false;
+		}
+		
+		if (getClass() != obj.getClass())
+		{
+			return false;
+		}
+		
+		MemberOfSite other = (MemberOfSite) obj;
+		if (role != other.role)
+		{
+			return false;
+		}
+
+		return site.equals(other.site);
+	}
+
+	public static MemberOfSite parseMemberOfSite(JSONObject jsonObject)
+	{
+		String role = (String)jsonObject.get("role");
+		JSONObject siteJSON = (JSONObject)jsonObject.get("site");
+		Site site = SiteImpl.parseSite(siteJSON);
+		MemberOfSite siteMember = new MemberOfSite(site, SiteRole.valueOf(role));
+		return siteMember;
+	}
+
+	public static ListResponse<MemberOfSite> parseMemberOfSites(JSONObject jsonObject)
+	{
+		List<MemberOfSite> siteMembers = new ArrayList<MemberOfSite>();
+
+		JSONObject jsonList = (JSONObject)jsonObject.get("list");
+		assertNotNull(jsonList);
+
+		JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+		assertNotNull(jsonEntries);
+
+		for(int i = 0; i < jsonEntries.size(); i++)
+		{
+			JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+			JSONObject entry = (JSONObject)jsonEntry.get("entry");
+			siteMembers.add(parseMemberOfSite(entry));
+		}
+		
+		ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+
+		ListResponse<MemberOfSite> resp = new ListResponse<MemberOfSite>(paging, siteMembers);
+		return resp;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject memberOfSiteJson = new JSONObject();
+		memberOfSiteJson.put("role", getRole());
+		memberOfSiteJson.put("id", getSiteId());
+		memberOfSiteJson.put("guid", getGuid());
+		return memberOfSiteJson;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "MemberOfSite [role=" + role + ", siteShortName="
+				+ site + "]";
+	}
+
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof MemberOfSite);
+		
+		MemberOfSite other = (MemberOfSite)o;
+		
+		if(siteId != null)
+		{
+			AssertUtil.assertEquals("siteId", siteId, other.getSiteId());
+		}
+		AssertUtil.assertEquals("role", role, other.getRole());
+		site.expected(other.getSite());
+	}
+
+	@Override
+	public int compareTo(MemberOfSite o)
+	{
+        int i = site.getTitle().compareTo(o.getSite().getTitle());
+        if(i == 0)
+        {
+        	i = role.compareTo(o.getRole());
+        }
+        return i;
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Network.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Network.java
new file mode 100644
index 00000000000..b827183158d
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Network.java
@@ -0,0 +1,38 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import java.util.List;
+
+public interface Network
+{
+	String getId();
+	Boolean getIsEnabled();
+	String getCreatedAt();
+	List<Quota> getQuotas();
+	String getSubscriptionLevel();
+    Boolean isPaidNetwork();
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/NetworkImpl.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/NetworkImpl.java
new file mode 100644
index 00000000000..a15067f95e7
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/NetworkImpl.java
@@ -0,0 +1,240 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.PublicApiDateFormat;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class NetworkImpl implements Network, Serializable, ExpectedComparison
+{
+	private static final long serialVersionUID = -5748677903173568273L;
+
+	protected String id;
+	protected Boolean isEnabled;
+	protected String createdAt;
+	protected List<Quota> quotas = new LinkedList<Quota>();
+	protected String subscriptionLevel;
+    protected Boolean paidNetwork;
+
+    public NetworkImpl(org.alfresco.repo.tenant.Network network)
+    {
+    	this.id = network.getTenantDomain();
+    	this.createdAt = (network.getCreatedAt() != null ? PublicApiDateFormat.getDateFormat().format(network.getCreatedAt()) : null);
+    	this.isEnabled = network.isEnabled();
+    	this.paidNetwork = network.getPaidNetwork();
+    	this.subscriptionLevel = network.getSubscriptionLevel();
+    }
+    
+	public NetworkImpl(String id, Boolean isEnabled)
+	{
+		super();
+		this.id = id;
+		this.isEnabled = isEnabled;
+	}
+	
+	public NetworkImpl(String id, Boolean isEnabled, String createdAt,
+			List<Quota> quotas, String subscriptionLevel, Boolean paidNetwork)
+	{
+		super();
+		this.id = id;
+		this.isEnabled = isEnabled;
+		this.createdAt = createdAt;
+		this.quotas = quotas;
+		this.subscriptionLevel = subscriptionLevel;
+		this.paidNetwork = paidNetwork;
+	}
+
+	public String getId()
+	{
+		return id;
+	}
+
+	public void setId(String id)
+	{
+		this.id = id;
+	}
+
+	public Boolean getIsEnabled()
+	{
+		return isEnabled;
+	}
+
+	public void setIsEnabled(Boolean isEnabled)
+	{
+		this.isEnabled = isEnabled;
+	}
+	
+	public Boolean getPaidNetwork()
+	{
+		return paidNetwork;
+	}
+
+	public void setPaidNetwork(Boolean paidNetwork)
+	{
+		this.paidNetwork = paidNetwork;
+	}
+
+	public void setCreatedAt(String createdAt)
+	{
+		this.createdAt = createdAt;
+	}
+
+	public void setQuotas(List<Quota> quotas)
+	{
+		this.quotas = quotas;
+	}
+
+	public void setSubscriptionLevel(String subscriptionLevel)
+	{
+		this.subscriptionLevel = subscriptionLevel;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static NetworkImpl parseNetwork(JSONObject jsonObject)
+	{
+		String id = (String)jsonObject.get("id");
+		Boolean isEnabled = (Boolean)jsonObject.get("isEnabled");
+		Boolean paidNetwork = (Boolean)jsonObject.get("paidNetwork");
+		String createdAt = (String)jsonObject.get("createdAt");
+		String subscriptionLevel = (String)jsonObject.get("subscriptionLevel");
+		JSONArray quotasJSON = (JSONArray)jsonObject.get("quotas");
+		List<org.alfresco.rest.api.tests.client.data.Quota> quotas = new ArrayList<org.alfresco.rest.api.tests.client.data.Quota>(quotasJSON.size());
+		Iterator it = quotasJSON.iterator();
+		while(it.hasNext())
+		{
+			JSONObject quotaJSON = (JSONObject)it.next();
+			org.alfresco.rest.api.tests.client.data.Quota quota = org.alfresco.rest.api.tests.client.data.Quota.parseQuota(quotaJSON);
+			quotas.add(quota);
+		}
+		NetworkImpl network = new NetworkImpl(id, isEnabled, createdAt, quotas, subscriptionLevel, paidNetwork);
+		return network;
+	}
+	
+	public String getCreatedAt()
+	{
+		return createdAt;
+	}
+
+	public List<Quota> getQuotas()
+	{
+		return quotas;
+	}
+
+	public String getSubscriptionLevel()
+	{
+		return subscriptionLevel;
+	}
+
+	public Boolean isPaidNetwork()
+	{
+		return paidNetwork;
+	}
+
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject networkJson = new JSONObject();
+		networkJson.put("id", getId());
+		networkJson.put("isEnabled", getIsEnabled());
+		
+		return networkJson;
+	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		NetworkImpl other = (NetworkImpl) obj;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		return true;
+	}
+
+	
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof NetworkImpl);
+		
+		NetworkImpl other = (NetworkImpl)o;
+
+		AssertUtil.assertEquals("id", id, other.getId());
+		AssertUtil.assertEquals("isEnabled", isEnabled, other.isEnabled);
+		AssertUtil.assertEquals("paidNetwork", paidNetwork, other.paidNetwork);
+		AssertUtil.assertEquals("subscriptionLevel", subscriptionLevel, other.subscriptionLevel);
+		
+		if(createdAt != null)
+		{
+			try
+			{
+				Date created = PublicApiDateFormat.getDateFormat().parse(createdAt);
+				Date otherCreatedAt = PublicApiDateFormat.getDateFormat().parse(other.getCreatedAt());
+				assertTrue(otherCreatedAt.after(created) || otherCreatedAt.equals(created));
+			}
+			catch(ParseException e)
+			{
+				throw new RuntimeException(e);
+			}
+		}
+	}
+
+	@Override
+	public String toString()
+	{
+		return "NetworkImpl [id=" + id + ", isEnabled=" + isEnabled
+				+ ", createdAt=" + createdAt + ", quotas=" + quotas
+				+ ", subscriptionLevel=" + subscriptionLevel + ", paidNetwork="
+				+ paidNetwork + "]";
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Node.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Node.java
new file mode 100644
index 00000000000..91bd1cd73de
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Node.java
@@ -0,0 +1,508 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import org.alfresco.rest.api.model.AssocChild;
+import org.alfresco.rest.api.model.AssocTarget;
+import org.alfresco.rest.api.model.NodeDefinition;
+import org.alfresco.rest.api.model.NodePermissions;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Representation of a node - initially for client tests for Nodes (aka File Folder) API
+ *
+ * TODO push null check down into AssertUtil (making sure that no other existing tests break)
+ *
+ * @author janv
+ */
+public class Node
+{
+    protected String id;
+    protected String name;
+
+    protected Date createdAt;
+    protected Date modifiedAt;
+    protected UserInfo createdByUser;
+    protected UserInfo modifiedByUser;
+
+    // Archived info - specifically for archive (deleted) node - see Trashcan API
+    protected Date archivedAt;
+    protected UserInfo archivedByUser;
+
+    // Version info - specifically for version node - see Version History API
+    protected String versionComment;
+
+    protected Boolean isFolder;
+    protected Boolean isFile;
+    protected Boolean isLink;
+    protected Boolean isLocked;
+
+    protected String parentId;
+    protected PathInfo path;
+    protected String nodeType;
+
+    protected List<String> aspectNames;
+
+    protected Map<String, Object> properties;
+
+    protected ContentInfo contentInfo;
+
+    protected List<String> allowableOperations;
+    protected NodePermissions nodePermissions;
+    protected NodeDefinition definition;
+
+    // please note: these are currently only used (optionally) for node create request
+    protected String relativePath;
+    protected List<AssocChild> secondaryChildren;
+    protected List<AssocTarget> targets;
+
+    protected SearchResultEntry search;
+    
+    protected Boolean isFavorite;
+
+    public Node()
+    {
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public Date getCreatedAt()
+    {
+        return createdAt;
+    }
+
+    public Date getModifiedAt()
+    {
+        return modifiedAt;
+    }
+
+    public UserInfo getCreatedByUser()
+    {
+        return createdByUser;
+    }
+
+    public void setCreatedByUser(UserInfo createdByUser)
+    {
+        this.createdByUser = createdByUser;
+    }
+
+    public UserInfo getModifiedByUser()
+    {
+        return modifiedByUser;
+    }
+
+    public void setModifiedByUser(UserInfo modifiedByUser)
+    {
+        this.modifiedByUser = modifiedByUser;
+    }
+
+    public Date getArchivedAt()
+    {
+        return archivedAt;
+    }
+
+    public void setArchivedAt(Date archivedAt)
+    {
+        this.archivedAt = archivedAt;
+    }
+
+    public UserInfo getArchivedByUser()
+    {
+        return archivedByUser;
+    }
+
+    public void setArchivedByUser(UserInfo archivedByUser)
+    {
+        this.archivedByUser = archivedByUser;
+    }
+
+    public String getVersionComment()
+    {
+        return versionComment;
+    }
+
+    public void setVersionComment(String versionComment)
+    {
+        this.versionComment = versionComment;
+    }
+
+    public Boolean getIsFolder()
+    {
+        return isFolder;
+    }
+
+    public void setIsFolder(Boolean isFolder)
+    {
+        this.isFolder = isFolder;
+    }
+
+    public Boolean getIsFile()
+    {
+        return isFile;
+    }
+
+    public void setIsFile(Boolean isFile)
+    {
+        this.isFile = isFile;
+    }
+
+    public Boolean getIsLink()
+    {
+        return isLink;
+    }
+
+    public void setIsLink(Boolean link)
+    {
+        isLink = link;
+    }
+
+    public Boolean getIsLocked()
+    {
+        return isLocked;
+    }
+
+    public void setIsLocked(Boolean locked)
+    {
+        isLocked = locked;
+    }
+
+    public String getParentId()
+    {
+        return parentId;
+    }
+
+    public void setParentId(String parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    public PathInfo getPath()
+    {
+        return path;
+    }
+
+    public void setPath(PathInfo path)
+    {
+        this.path = path;
+    }
+
+    public String getNodeType()
+    {
+        return nodeType;
+    }
+
+    public void setNodeType(String nodeType)
+    {
+        this.nodeType = nodeType;
+    }
+
+    public List<String> getAspectNames()
+    {
+        return aspectNames;
+    }
+
+    public void setAspectNames(List<String> aspectNames)
+    {
+        this.aspectNames = aspectNames;
+    }
+
+    public Map<String, Object> getProperties()
+    {
+        return properties;
+    }
+
+    public void setProperties(Map<String, Object> properties)
+    {
+        this.properties = properties;
+    }
+
+    public void setContent(ContentInfo contentInfo)
+    {
+        this.contentInfo = contentInfo;
+    }
+
+    public ContentInfo getContent()
+    {
+        return this.contentInfo;
+    }
+
+    public List<String> getAllowableOperations()
+    {
+        return allowableOperations;
+    }
+
+    public void setAllowableOperations(List<String> allowableOperations)
+    {
+        this.allowableOperations = allowableOperations;
+    }
+
+    public NodePermissions getPermissions()
+    {
+        return nodePermissions;
+    }
+
+    public void setPermissions(NodePermissions nodePermissions)
+    {
+        this.nodePermissions = nodePermissions;
+    }
+
+    public String getRelativePath()
+    {
+        return relativePath;
+    }
+
+    public void setRelativePath(String relativePath)
+    {
+        this.relativePath = relativePath;
+    }
+
+    public List<AssocChild> getSecondaryChildren()
+    {
+        return secondaryChildren;
+    }
+
+    public void setSecondaryChildren(List<AssocChild> secondaryChildren)
+    {
+        this.secondaryChildren = secondaryChildren;
+    }
+
+    public List<AssocTarget> getTargets()
+    {
+        return targets;
+    }
+
+    public void setTargets(List<AssocTarget> targets)
+    {
+        this.targets = targets;
+    }
+
+    public NodeDefinition getDefinition() 
+    {
+        return definition;
+    }
+
+    public void setDefinition(NodeDefinition definition) 
+    {
+        this.definition = definition;
+    }
+
+    // note: can be child or peer (latter has assocType only)
+    protected Association association;
+
+    public Association getAssociation()
+    {
+        return association;
+    }
+
+    public void setAssociation(Association association)
+    {
+        this.association = association;
+    }
+
+    public SearchResultEntry getSearch()
+    {
+        return search;
+    }
+
+    public void setSearch(SearchResultEntry search)
+    {
+        this.search = search;
+    }
+    
+    public Boolean getIsFavorite()
+    {
+        return isFavorite;
+    }
+
+    public void setIsFavorite(Boolean isFavorite)
+    {
+        this.isFavorite = isFavorite;
+    }
+
+    public void expected(Object o)
+    {
+        Node other = (Node) o;
+
+        if (id != null)
+        {
+            AssertUtil.assertEquals("id", id, other.getId());
+        }
+        else
+        {
+            assertNotNull(other.id);
+        }
+
+        AssertUtil.assertEquals("parentId", parentId, other.getParentId());
+        AssertUtil.assertEquals("name", name, other.getName());
+        AssertUtil.assertEquals("nodeType", nodeType, other.getNodeType());
+
+        if (createdAt != null)
+        {
+            AssertUtil.assertEquals("createdAt", createdAt, other.getCreatedAt());
+        }
+        else
+        {
+            assertNotNull(other.createdAt);
+        }
+
+        if (createdByUser != null)
+        {
+            createdByUser.expected(other.getCreatedByUser());
+        }
+        else
+        {
+            assertNotNull(other.createdByUser);
+        }
+
+        if (modifiedAt != null)
+        {
+            assertTrue(modifiedAt.before(other.getModifiedAt()) || modifiedAt.equals(other.getModifiedAt()));
+        }
+        else
+        {
+            assertNotNull(other.modifiedAt);
+        }
+
+        if (modifiedByUser != null)
+        {
+            modifiedByUser.expected(other.getModifiedByUser());
+        }
+        else
+        {
+            assertNotNull(other.modifiedByUser);
+        }
+
+        if (aspectNames != null)
+        {
+            assertNotNull(other.getAspectNames());
+            assertEquals("Expected: "+aspectNames+", actual: "+other.getAspectNames(), aspectNames.size(), other.getAspectNames().size());
+            for (String aspectName : aspectNames)
+            {
+                assertTrue(other.getAspectNames().contains(aspectName));
+            }
+        }
+        else
+        {
+            assertNull(other.getAspectNames());
+        }
+
+        if (properties != null)
+        {
+            assertNotNull(other.getProperties());
+            assertEquals(properties.size(), other.getProperties().size());
+            for (Map.Entry<String,Object> e : properties.entrySet())
+            {
+                Object otherObj = other.getProperties().get(e.getKey());
+                assertEquals(e.getValue(), otherObj); // TODO fix !
+            }
+        }
+        else
+        {
+            assertNull(other.getProperties());
+        }
+
+        AssertUtil.assertEquals("isFolder", isFolder, other.getIsFolder());
+        AssertUtil.assertEquals("isFile", isFile, other.getIsFile());
+        AssertUtil.assertEquals("isLink", isLink, other.getIsLink());
+        AssertUtil.assertEquals("isLocked", isLocked, other.getIsLocked());
+
+        if (path != null)
+        {
+            path.expected(other.getPath());
+        }
+        else
+        {
+            assertNull(other.getPath());
+        }
+
+        if (contentInfo != null)
+        {
+            contentInfo.expected(other.getContent());
+        }
+        else
+        {
+            assertNull(other.getContent());
+        }
+
+        if (search != null)
+        {
+            search.expected(other.getSearch());
+        }
+        else
+        {
+            assertNull(other.getSearch());
+        }
+
+        if (allowableOperations != null)
+        {
+            assertNotNull(other.getAllowableOperations());
+            assertEquals("Expected: "+allowableOperations+", actual: "+other.getAllowableOperations(), allowableOperations.size(), other.getAllowableOperations().size());
+            for (String allowableOperation : allowableOperations)
+            {
+                assertTrue(other.getAllowableOperations().contains(allowableOperation));
+            }
+        }
+        else
+        {
+            assertNull(other.getAllowableOperations());
+        }
+
+        if (relativePath != null)
+        {
+            assertEquals(relativePath, other.getRelativePath());
+        }
+        else
+        {
+            assertNull(other.getRelativePath());
+        }
+    }
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/NodeRating.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/NodeRating.java
new file mode 100644
index 00000000000..aa46d32ad91
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/NodeRating.java
@@ -0,0 +1,289 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.PublicApiDateFormat;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class NodeRating implements Serializable, Comparable<NodeRating>, ExpectedComparison
+{
+	private static final long serialVersionUID = 2855422270577730898L;
+
+	private String nodeId;
+	private String ratingScheme;
+	private String ratedAt;
+	private Object myRating;
+	private Aggregate aggregate;
+
+	public NodeRating(String ratingScheme, Object myRating)
+	{
+		this.ratingScheme = ratingScheme;
+		this.myRating = myRating;
+	}
+
+	public NodeRating(String ratingScheme, Object myRating, Aggregate aggregate)
+	{
+		this.ratingScheme = ratingScheme;
+		this.myRating = myRating;
+		this.aggregate = aggregate;
+	}
+
+	public NodeRating(String nodeId, String ratingScheme, String ratedAt, Object myRating, Aggregate aggregate)
+	{
+		this.nodeId = nodeId;
+		this.ratingScheme = ratingScheme;
+		this.ratedAt = ratedAt;
+		this.myRating = myRating;
+		this.aggregate = aggregate;
+	}
+	
+	public Aggregate getAggregate()
+	{
+		return aggregate;
+	}
+
+	public Object getMyRating()
+	{
+		return myRating;
+	}
+
+	public String getNodeId()
+	{
+		return nodeId;
+	}
+
+	public String getId()
+	{
+		return ratingScheme;
+	}
+	
+	public String getRatedAt()
+	{
+		return ratedAt;
+	}
+	
+	@Override
+	public String toString()
+	{
+		return "NodeRating [ratingScheme=" + ratingScheme + ", ratedAt="
+				+ ratedAt + "]";
+	}
+	
+	public static NodeRating parseNodeRating(String nodeId, JSONObject jsonObject)
+	{
+		String ratingScheme = (String)jsonObject.get("id");
+		String ratedAt = (String)jsonObject.get("ratedAt");
+		Object myRating = jsonObject.get("myRating");
+		
+		JSONObject aggregateJSON = (JSONObject)jsonObject.get("aggregate");
+		Long numRatings = (Long)aggregateJSON.get("numberOfRatings");
+		Double average = (Double)aggregateJSON.get("average");
+		Aggregate aggregate = new Aggregate(numRatings != null ? numRatings.intValue() : null, average != null ? average.floatValue(): null);
+		NodeRating nodeRating = new NodeRating(nodeId, ratingScheme, ratedAt, myRating, aggregate);
+		return nodeRating;
+	}
+
+	public static ListResponse<NodeRating> parseNodeRatings(String nodeId, JSONObject jsonObject)
+	{
+		List<NodeRating> nodeRatings = new ArrayList<NodeRating>();
+
+		JSONObject jsonList = (JSONObject)jsonObject.get("list");
+		assertNotNull(jsonList);
+
+		JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+		assertNotNull(jsonEntries);
+
+		for(int i = 0; i < jsonEntries.size(); i++)
+		{
+			JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+			JSONObject entry = (JSONObject)jsonEntry.get("entry");
+			nodeRatings.add(NodeRating.parseNodeRating(nodeId, entry));
+		}
+
+		ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+
+		ListResponse<NodeRating> resp = new ListResponse<NodeRating>(paging, nodeRatings);
+		return resp;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject nodeRatingJSON = new JSONObject();
+
+		nodeRatingJSON.put("myRating", getMyRating());
+		nodeRatingJSON.put("id", getId());
+
+		return nodeRatingJSON;
+	}
+
+	public static class Aggregate implements ExpectedComparison
+	{
+		private Integer numberOfRatings;
+		private Float average;
+
+		public Aggregate(Integer numberOfRatings, Float average)
+		{
+			super();
+			this.numberOfRatings = numberOfRatings;
+			this.average = average;
+		}
+
+		public Integer getNumberOfRatings()
+		{
+			return numberOfRatings;
+		}
+
+		public Float getAverage()
+		{
+			return average;
+		}
+		
+		@Override
+		public String toString()
+		{
+			return "Aggregate [numberOfRatings=" + numberOfRatings
+					+ ", average=" + average + "]";
+		}
+
+		@Override
+		public void expected(Object o)
+		{
+			assertTrue(o instanceof Aggregate);
+			
+			Aggregate other = (Aggregate)o;
+
+			AssertUtil.assertEquals("numberOfRatings", numberOfRatings, other.getNumberOfRatings());
+			AssertUtil.assertEquals("average", average, other.getAverage());
+		}
+
+		@Override
+		public boolean equals(Object obj)
+		{
+			if (this == obj)
+				return true;
+			if (obj == null)
+				return false;
+			if (getClass() != obj.getClass())
+				return false;
+			Aggregate other = (Aggregate) obj;
+			if (average == null) {
+				if (other.average != null)
+					return false;
+			} else if (!average.equals(other.average))
+				return false;
+			if (numberOfRatings == null) {
+				if (other.numberOfRatings != null)
+					return false;
+			} else if (!numberOfRatings.equals(other.numberOfRatings))
+				return false;
+			return true;
+		}
+	}
+	
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((nodeId == null) ? 0 : nodeId.hashCode());
+		result = prime * result
+				+ ((ratingScheme == null) ? 0 : ratingScheme.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		NodeRating other = (NodeRating) obj;
+		if (nodeId == null) {
+			if (other.nodeId != null)
+				return false;
+		} else if (!nodeId.equals(other.nodeId))
+			return false;
+		if (ratingScheme == null) {
+			if (other.ratingScheme != null)
+				return false;
+		} else if (!ratingScheme.equals(other.ratingScheme))
+			return false;
+		return true;
+	}
+
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof NodeRating);
+		
+		NodeRating other = (NodeRating)o;
+		
+		AssertUtil.assertEquals("nodeId", nodeId, other.getNodeId());
+		AssertUtil.assertEquals("ratingScheme", ratingScheme, other.getId());
+
+		DateFormat dateFormat = PublicApiDateFormat.getDateFormat();
+		try
+		{
+			if(getRatedAt() != null)
+			{
+				Date date1 = dateFormat.parse(getRatedAt());
+				Date date2 = dateFormat.parse(other.getRatedAt());
+				assertTrue(date2.equals(date1) || date2.after(date1));
+			}
+		}
+		catch (ParseException e)
+		{
+			throw new RuntimeException(e);
+		}
+
+		AssertUtil.assertEquals("myRating", myRating, other.getMyRating());
+		if(aggregate != null)
+		{
+			aggregate.expected(other.getAggregate());
+		}
+	}
+
+	@Override
+	public int compareTo(NodeRating other) 
+	{
+		return ratingScheme.compareTo(other.getId());
+	}
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/PathInfo.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/PathInfo.java
new file mode 100644
index 00000000000..1a8796c0124
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/PathInfo.java
@@ -0,0 +1,176 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+/**
+ * Representation of a path info (initially for client tests for File Folder API)
+ *
+ * @author janv
+ */
+public class PathInfo
+{
+    private String name;
+    private Boolean isComplete;
+    private String relativePath;
+    private List<ElementInfo> elements;
+
+    public PathInfo()
+    {
+    }
+
+    public PathInfo(String name, Boolean isComplete, List<ElementInfo> elements)
+    {
+        this.name = name;
+        this.isComplete = isComplete;
+        this.elements = elements;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public Boolean getIsComplete()
+    {
+        return isComplete;
+    }
+    
+    public String getRelativePath()
+    {
+        return relativePath;
+    }
+
+    public List<ElementInfo> getElements()
+    {
+        return elements;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder(120);
+        sb.append("PathInfo [name=").append(name)
+                    .append(", isComplete=").append(isComplete)
+                    .append(", elements=").append(elements)
+                    .append(']');
+        return sb.toString();
+    }
+
+    public static class ElementInfo
+    {
+        private String id;
+        private String name;
+        private String nodeType;
+        private List<String> aspectNames;
+
+        /**
+         * Required by jackson deserialisation.
+         */
+        public ElementInfo()
+        {
+        }
+
+        public ElementInfo(String id, String name)
+        {
+            this(id, name, null, null);
+        }
+        
+        public ElementInfo(String id, String name, String nodeType, List<String> aspectNames)
+        {
+            this.id = id;
+            this.name = name;
+            this.nodeType = nodeType;
+            this.aspectNames = aspectNames;
+        }
+
+        public String getName()
+        {
+            return name;
+        }
+
+        public String getId()
+        {
+            return id;
+        }
+
+        public String getNodeType()
+        {
+            return nodeType;
+        }
+
+        public List<String> getAspectNames()
+        {
+            return aspectNames;
+        }
+
+        @Override
+        public String toString()
+        {
+            final StringBuilder sb = new StringBuilder(250);
+            sb.append("PathElement [id=").append(id)
+                    .append(", name=").append(name)
+                    .append(", nodeType=").append(nodeType)
+                    .append(", aspectNames=").append(aspectNames)
+                    .append(']');
+            return sb.toString();
+        }
+        
+        public void expected(Object o)
+        {
+            assertTrue(o instanceof ElementInfo);
+
+            ElementInfo other = (ElementInfo) o;
+            assertEquals(id, other.getName());
+            assertEquals(name, other.getName());
+            assertEquals(nodeType, other.getNodeType());
+        }
+    }
+
+    public void expected(Object o)
+    {
+        assertTrue(o instanceof PathInfo);
+
+        PathInfo other = (PathInfo) o;
+
+        assertEquals(getIsComplete(), other.getIsComplete());
+        assertEquals(getName(), other.getName());
+
+        int idx = 0;
+        for (ElementInfo element : elements)
+        {
+            ElementInfo otherElement = other.getElements().get(idx);
+
+            assertEquals("Expected: "+element.getId()+", actual: "+otherElement.getId(), element.getId(), otherElement.getId());
+            assertEquals("Expected: "+element.getName()+", actual: "+otherElement.getName(), element.getName(), otherElement.getName());
+            idx++;
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Person.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Person.java
new file mode 100644
index 00000000000..5e55325ba7c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Person.java
@@ -0,0 +1,394 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.text.Collator;
+import java.util.*;
+
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.rest.api.tests.QueriesPeopleApiTest;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class Person
+    extends org.alfresco.rest.api.model.Person
+        implements Serializable, Comparable<Person>, ExpectedComparison
+{
+    private static final long serialVersionUID = 3185698391792389751L;
+
+    private String id;
+
+    private static Collator collator = Collator.getInstance();
+
+    public Person()
+    {
+        super();
+    }
+    
+    public Person(String id, String username, Boolean enabled, String firstName, String lastName,
+            Company company, String skype, String location, String tel,
+            String mob, String instantmsg, String google, String description)
+    {
+        super(username, enabled, null, firstName, lastName, null, location, tel, mob, null, skype, instantmsg, null, null, google, null, null, null, description, company);
+        this.id = id;
+    }
+
+    public Person(String userName,
+                  Boolean enabled,
+                  NodeRef avatarId,
+                  String firstName,
+                  String lastName,
+                  String jobTitle,
+                  String location,
+                  String telephone,
+                  String mobile,
+                  String email,
+                  String skypeId,
+                  String instantMessageId,
+                  String userStatus,
+                  Date statusUpdatedAt,
+                  String googleId,
+                  Long quota,
+                  Long quotaUsed,
+                  Boolean emailNotificationsEnabled,
+                  String description,
+                  org.alfresco.rest.api.model.Company company,
+                  Map<String, Object> properties,
+                  List<String> aspectNames,
+                  Map<String, Boolean> capabilities)
+    {
+        super(userName,
+                enabled,
+                avatarId,
+                firstName,
+                lastName,
+                jobTitle,
+                location,
+                telephone,
+                mobile,
+                email,
+                skypeId,
+                instantMessageId,
+                userStatus,
+                statusUpdatedAt,
+                googleId,
+                quota,
+                quotaUsed,
+                emailNotificationsEnabled,
+                description,
+                company);
+        this.id = userName;
+        this.properties = properties;
+        this.aspectNames = aspectNames;
+        this.capabilities = capabilities;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    /**
+     * Note: used for string comparisons in tests.
+     *
+     * @see QueriesPeopleApiTest#checkApiCall(java.lang.String, java.lang.String, java.lang.String, org.alfresco.rest.api.tests.client.PublicApiClient.Paging, int, java.lang.String[])
+     */
+    @Override
+    public String toString()
+    {
+        return "Person [" + (id != null ? "id=" + id + ", " : "")
+                + (enabled != null ? "enabled=" + enabled + ", " : "")
+                + (firstName != null ? "firstName=" + firstName + ", " : "")
+                + (lastName != null ? "lastName=" + lastName + ", " : "")
+                + (company != null ? "company=" + company + ", " : "company=" + new Company().toString() + ", ")
+                + (skypeId != null ? "skype=" + skypeId + ", " : "")
+                + (location != null ? "location=" + location + ", " : "")
+                + (telephone != null ? "tel=" + telephone + ", " : "")
+                + (mobile != null ? "mob=" + mobile + ", " : "")
+                + (instantMessageId != null ? "instantmsg=" + instantMessageId + ", " : "")
+                + (googleId != null ? "google=" + googleId + ", " : "")
+                + (description != null ? "description=" + description + ", " : "")
+                + "]";
+    }
+
+    @SuppressWarnings("unchecked")
+    public JSONObject toJSON(boolean fullVisibility)
+    {
+        JSONObject personJson = new JSONObject();
+
+        if (getUserName() != null)
+        {
+            personJson.put("id", getUserName());
+        }
+        personJson.put("firstName", getFirstName());
+        personJson.put("lastName", getLastName());
+
+        if(fullVisibility)
+        {
+            personJson.put("description", getDescription());
+            personJson.put("email", getEmail());
+            personJson.put("skypeId", getSkypeId());
+            personJson.put("googleId", getGoogleId());
+            personJson.put("instantMessageId", getInstantMessageId());
+            personJson.put("jobTitle", getJobTitle());
+            personJson.put("location", getLocation());
+            if (company != null)
+            {
+                personJson.put("company", new Company(company).toJSON());
+            }
+            personJson.put("mobile", getMobile());
+            personJson.put("telephone", getTelephone());
+            personJson.put("userStatus", getUserStatus());
+            personJson.put("enabled", isEnabled());
+            personJson.put("emailNotificationsEnabled", isEmailNotificationsEnabled());
+            personJson.put("properties", getProperties());
+            personJson.put("aspectNames", getAspectNames());
+            personJson.put("capabilities", getCapabilities());
+        }
+        return personJson;
+    }
+    
+    public static Person parsePerson(JSONObject jsonObject)
+    {
+        String userId = (String)jsonObject.get("id");
+        String firstName = (String)jsonObject.get("firstName");
+        String lastName = (String)jsonObject.get("lastName");
+
+        String description = (String)jsonObject.get("description");
+        String email = (String) jsonObject.get("email");
+        String skypeId = (String)jsonObject.get("skypeId");
+        String googleId = (String)jsonObject.get("googleId");
+        String instantMessageId = (String)jsonObject.get("instantMessageId");
+        String jobTitle = (String) jsonObject.get("jobTitle");
+        String location = (String)jsonObject.get("location");
+
+        Company company = null;
+        JSONObject companyJSON = (JSONObject)jsonObject.get("company");
+        if(companyJSON != null)
+        {
+            String organization = (String)companyJSON.get("organization");
+            String address1 = (String)companyJSON.get("address1");
+            String address2 = (String)companyJSON.get("address2");
+            String address3 = (String)companyJSON.get("address3");
+            String postcode = (String)companyJSON.get("postcode");
+            String companyTelephone = (String)companyJSON.get("telephone");
+            String fax = (String)companyJSON.get("fax");
+            String companyEmail = (String)companyJSON.get("email");
+            if (organization != null ||
+                    address2 != null ||
+                    address3 != null ||
+                    postcode != null ||
+                    companyTelephone != null ||
+                    fax != null ||
+                    companyEmail != null)
+            {
+                company = new Company(organization, address1, address2, address3, postcode, companyTelephone, fax, companyEmail);
+            }
+            else
+            {
+                company = new Company();
+            }
+        }
+
+        String mobile = (String)jsonObject.get("mobile");
+        String telephone = (String)jsonObject.get("telephone");
+        String userStatus = (String) jsonObject.get("userStatus");
+        Boolean enabled = (Boolean)jsonObject.get("enabled");
+        Boolean emailNotificationsEnabled = (Boolean) jsonObject.get("emailNotificationsEnabled");
+        List<String> aspectNames = (List<String>) jsonObject.get("aspectNames");
+        Map<String, Object> properties = (Map<String, Object>) jsonObject.get("properties");
+        Map<String, Boolean> capabilities = (Map<String, Boolean>) jsonObject.get("capabilities");
+        
+        Person person = new Person(
+                userId,
+                enabled,
+                null, // avatarId is not accepted by "create person"
+                firstName,
+                lastName,
+                jobTitle,
+                location,
+                telephone,
+                mobile,
+                email,
+                skypeId,
+                instantMessageId,
+                userStatus,
+                null, // userStatusUpdateAt is read only - not used in create person
+                googleId,
+                null, // quota - not used in create person
+                null, // quotaUsers - not used
+                emailNotificationsEnabled,
+                description,
+                company,
+                properties,
+                aspectNames,
+                capabilities
+        );
+        return person;
+    }
+
+
+    private static class UserContext
+    {
+        private String networkId;
+        private String personId;
+
+        UserContext(String networkId, String personId)
+        {
+            super();
+            this.networkId = networkId;
+            this.personId = personId;
+        }
+
+        String getNetworkId()
+        {
+            return networkId;
+        }
+
+        String getPersonId()
+        {
+            return personId;
+        }
+    }
+
+    private static ThreadLocal<UserContext> userContext = new ThreadLocal<UserContext>();
+    public static void setUserContext(String personId)
+    {
+        String networkId = Person.getNetworkId(personId);
+        userContext.set(new UserContext(networkId, personId));
+    }
+    
+    public static void clearUserContext()
+    {
+        userContext.set(null);
+    }
+    
+    public static UserContext gettUserContext()
+    {
+        return userContext.get();
+    }
+    
+    public static String getNetworkId(String personId)
+    {
+        int idx = personId.indexOf("@");
+        return(idx == -1 ? TenantService.DEFAULT_DOMAIN : personId.substring(idx + 1));
+    }
+
+    private String getNetworkId()
+    {
+        return Person.getNetworkId(id);
+    }
+    
+    public boolean isVisible()
+    {
+        boolean ret = true;
+
+        UserContext uc = gettUserContext();
+        String networkId = getNetworkId();
+        if(uc != null)
+        {
+            if(!networkId.equals(uc.getNetworkId()))
+            {
+                ret = false;
+            }
+        }
+
+        return ret;
+    }
+    
+    @Override
+    public void expected(Object o)
+    {
+        assertTrue("o is an instance of " + o.getClass(), o instanceof Person);
+
+        Person other = (Person)o;
+        
+        AssertUtil.assertEquals("userId", getId(), other.getId());
+        AssertUtil.assertEquals("firstName", firstName, other.getFirstName());
+        AssertUtil.assertEquals("lastName", lastName, other.getLastName());
+        AssertUtil.assertEquals("enabled", enabled, other.isEnabled());
+
+        if(isVisible())
+        {
+            AssertUtil.assertEquals("skype", getSkypeId(), other.getSkypeId());
+            AssertUtil.assertEquals("location", getLocation(), other.getLocation());
+            AssertUtil.assertEquals("tel", getTelephone(), other.getTelephone());
+            AssertUtil.assertEquals("mobile", getMobile(), other.getMobile());
+            AssertUtil.assertEquals("instanceMessageId", getInstantMessageId(), other.getInstantMessageId());
+            AssertUtil.assertEquals("googleId", getGoogleId(), other.getGoogleId());
+            if(company != null)
+            {
+                new Company(company).expected(getCompany());
+            }
+        }
+    }
+
+    @Override
+    public int compareTo(Person o)
+    {
+        int ret = Person.collator.compare(lastName, o.getLastName());
+        if(ret == 0)
+        {
+            ret = Person.collator.compare(firstName, o.getFirstName());
+        }
+        return ret;
+    }
+
+    public static ListResponse<Person> parsePeople(JSONObject jsonObject)
+    {
+        List<Person> people = new ArrayList<Person>();
+
+        JSONObject jsonList = (JSONObject)jsonObject.get("list");
+        assertNotNull(jsonList);
+
+        JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+        assertNotNull(jsonEntries);
+
+        for(int i = 0; i < jsonEntries.size(); i++)
+        {
+            JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+            JSONObject entry = (JSONObject)jsonEntry.get("entry");
+            people.add(parsePerson(entry));
+        }
+
+        ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+        ListResponse<Person> resp = new ListResponse<Person>(paging, people);
+        return resp;
+    }
+    
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/PersonNetwork.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/PersonNetwork.java
new file mode 100644
index 00000000000..001806c4401
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/PersonNetwork.java
@@ -0,0 +1,198 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class PersonNetwork implements Network, Comparable<PersonNetwork>, ExpectedComparison
+{
+	private String networkId;
+	private Boolean homeNetwork;
+	private NetworkImpl network;
+	
+	public PersonNetwork(String networkId)
+	{
+		super();
+	}
+
+	public PersonNetwork(Boolean homeNetwork, NetworkImpl network)
+	{
+		super();
+		this.homeNetwork = homeNetwork;
+		this.network = network;
+		this.networkId = network.getId();
+	}
+	
+	public String getId()
+	{
+		return networkId;
+	}
+	
+	public Boolean isHomeNetwork()
+	{
+		return homeNetwork;
+	}
+	
+	public NetworkImpl getNetwork()
+	{
+		return network;
+	}
+	
+	public static PersonNetwork parseNetworkMember(JSONObject jsonObject)
+	{
+		Boolean homeNetwork = (Boolean)jsonObject.get("homeNetwork");
+		PersonNetwork networkMember = new PersonNetwork(homeNetwork, NetworkImpl.parseNetwork(jsonObject));
+		return networkMember;
+	}
+	
+	public static ListResponse<PersonNetwork> parseNetworkMembers(JSONObject jsonObject)
+	{
+		List<PersonNetwork> networkMembers = new ArrayList<PersonNetwork>();
+
+		JSONObject jsonList = (JSONObject)jsonObject.get("list");
+		assertNotNull(jsonList);
+
+		JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+		assertNotNull(jsonEntries);
+
+		for(int i = 0; i < jsonEntries.size(); i++)
+		{
+			JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+			JSONObject entry = (JSONObject)jsonEntry.get("entry");
+			networkMembers.add(PersonNetwork.parseNetworkMember(entry));
+		}
+
+		ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+		ListResponse<PersonNetwork> resp = new ListResponse<PersonNetwork>(paging, networkMembers);
+		return resp;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "NetworkMember [id=" + getId() + ", homeNetwork=" + homeNetwork
+				+ ", network=" + network + "]";
+	}
+
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject networkMemberJson = new JSONObject();
+		networkMemberJson.put("id", getId());
+		networkMemberJson.put("homeNetwork", isHomeNetwork());
+		networkMemberJson.put("network", getNetwork());
+		return networkMemberJson;
+	}
+	
+	@Override
+	public int compareTo(PersonNetwork member)
+	{
+		int ret = -1 * isHomeNetwork().compareTo(member.isHomeNetwork());
+		if(ret == 0)
+		{
+			ret = getId().compareTo(member.getId());
+		}
+		return ret;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((network == null) ? 0 : network.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		PersonNetwork other = (PersonNetwork) obj;
+		if (network == null) {
+			if (other.network != null)
+				return false;
+		} else if (!network.equals(other.network))
+			return false;
+		return true;
+	}
+
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof PersonNetwork);
+		
+		PersonNetwork other = (PersonNetwork)o;
+		
+		AssertUtil.assertEquals("homeNetwork", homeNetwork, other.isHomeNetwork());
+		if(network != null)
+		{
+			network.expected(other.getNetwork());
+		}
+	}
+
+	@Override
+	public Boolean getIsEnabled()
+	{
+		return network.getIsEnabled();
+	}
+
+	@Override
+	public String getCreatedAt()
+	{
+		return network.getCreatedAt();
+	}
+
+	@Override
+	public List<Quota> getQuotas()
+	{
+		return network.getQuotas();
+	}
+
+	@Override
+	public String getSubscriptionLevel()
+	{
+		return network.getSubscriptionLevel();
+	}
+
+	@Override
+	public Boolean isPaidNetwork()
+	{
+		return network.isPaidNetwork();
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Preference.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Preference.java
new file mode 100644
index 00000000000..1cd2808b275
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Preference.java
@@ -0,0 +1,157 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class Preference	implements Serializable, ExpectedComparison, Comparable<Preference>
+{
+	private static final long serialVersionUID = -4187479305268687836L;
+	
+	private String id;
+	private String value;
+	
+	public Preference(String id, String value)
+	{
+		super();
+		this.id = id;
+		this.value = value;
+	}
+
+	public String getId()
+	{
+		return id;
+	}
+
+	public String getValue()
+	{
+		return value;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Preference [id=" + id + ", value=" + value + "]";
+	}
+	
+	public static Preference parsePreference(JSONObject jsonObject)
+	{
+		String id = (String)jsonObject.get("id");
+		String value = jsonObject.get("value").toString();
+		Preference preference = new Preference(id, value);
+		return preference;
+	}
+	
+	public static ListResponse<Preference> parsePreferences(JSONObject jsonObject)
+	{
+		List<Preference> preferences = new ArrayList<Preference>();
+
+		JSONObject jsonList = (JSONObject)jsonObject.get("list");
+		assertNotNull(jsonList);
+
+		JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+		assertNotNull(jsonEntries);
+
+		for(int i = 0; i < jsonEntries.size(); i++)
+		{
+			JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+			JSONObject entry = (JSONObject)jsonEntry.get("entry");
+			preferences.add(Preference.parsePreference(entry));
+		}
+
+		ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+		ListResponse<Preference> resp = new ListResponse<Preference>(paging, preferences);
+		return resp;
+	}
+
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject entry = new JSONObject();
+		entry.put("id", getId());
+		entry.put("value", getValue());
+		return entry;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		result = prime * result + ((value == null) ? 0 : value.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Preference other = (Preference) obj;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		if (value == null) {
+			if (other.value != null)
+				return false;
+		} else if (!value.equals(other.value))
+			return false;
+		return true;
+	}
+	
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof Preference);
+		
+		Preference other = (Preference)o;
+		
+		AssertUtil.assertEquals("id", id, other.getId());
+		AssertUtil.assertEquals("value", value, other.getValue());
+	}
+
+	@Override
+	public int compareTo(Preference o)
+	{
+		return id.compareTo(o.getId());
+	}
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/QuickShareLinkEmailRequest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/QuickShareLinkEmailRequest.java
new file mode 100644
index 00000000000..0ff86059117
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/QuickShareLinkEmailRequest.java
@@ -0,0 +1,95 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests.client.data;
+
+import java.util.List;
+
+/**
+ * Representation of an email request for the quick share link
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class QuickShareLinkEmailRequest
+{
+    private String client;
+    private String message;
+    private String locale;
+    private List<String> recipientEmails;
+
+    public String getClient()
+    {
+        return client;
+    }
+
+    public QuickShareLinkEmailRequest setClient(String client)
+    {
+        this.client = client;
+        return this;
+    }
+
+    public String getMessage()
+    {
+        return message;
+    }
+
+    public void setMessage(String message)
+    {
+        this.message = message;
+    }
+
+    public String getLocale()
+    {
+        return locale;
+    }
+
+    public void setLocale(String locale)
+    {
+        this.locale = locale;
+    }
+
+    public List<String> getRecipientEmails()
+    {
+        return recipientEmails;
+    }
+
+    public void setRecipientEmails(List<String> recipientEmails)
+    {
+        this.recipientEmails = recipientEmails;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder(250);
+        sb.append("QuickShareLinkEmailRequest [client=").append(client)
+                    .append(", message=").append(message)
+                    .append(", locale=").append(locale)
+                    .append(", recipientEmails=").append(recipientEmails)
+                    .append(']');
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Quota.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Quota.java
new file mode 100644
index 00000000000..00a436a68d5
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Quota.java
@@ -0,0 +1,81 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import org.json.simple.JSONObject;
+
+public class Quota
+{
+	private String id;
+	private Object limit;
+	private Object quota;
+
+	public Quota(String id, Object limit, Object quota)
+	{
+		super();
+		this.id = id;
+		this.limit = limit;
+		this.quota = quota;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public Object getLimit() {
+		return limit;
+	}
+
+	public Object getQuota() {
+		return quota;
+	}
+
+	public static Quota parseQuota(JSONObject jsonObject)
+	{
+		String id = (String)jsonObject.get("id");
+		Object limit = jsonObject.get("limit");
+		Object quota = jsonObject.get("quota");
+		Quota ret = new Quota(id, limit, quota);
+		return ret;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject quotaJson = new JSONObject();
+		quotaJson.put("id", getId());
+		quotaJson.put("quota", getQuota().toString());
+		quotaJson.put("limit", getLimit().toString());
+		return quotaJson;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Quota [id=" + id + ", limit=" + limit + ", quota=" + quota
+				+ "]";
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Rendition.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Rendition.java
new file mode 100644
index 00000000000..86515c692ad
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Rendition.java
@@ -0,0 +1,127 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Representation of a rendition.
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class Rendition implements ExpectedComparison, Comparable<Rendition>
+{
+    public enum RenditionStatus
+    {
+        CREATED,
+        NOT_CREATED
+    }
+
+    private String id;
+    private RenditionStatus status;
+    private ContentInfo contentInfo;
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public Rendition setId(String id)
+    {
+        this.id = id;
+        return this;
+    }
+
+    public RenditionStatus getStatus()
+    {
+        return status;
+    }
+
+    public Rendition setStatus(RenditionStatus status)
+    {
+        this.status = status;
+        return this;
+    }
+
+    public ContentInfo getContent()
+    {
+        return contentInfo;
+    }
+
+    public Rendition setContent(ContentInfo contentInfo)
+    {
+        this.contentInfo = contentInfo;
+        return this;
+    }
+
+    @Override
+    public void expected(Object obj)
+    {
+        assertTrue(obj instanceof Rendition);
+
+        Rendition other = (Rendition) obj;
+        if (this.id == null)
+        {
+            assertNotNull(other.getId());
+        }
+        else
+        {
+            assertEquals("id", this.id, other.getId());
+        }
+        if (this.status == null)
+        {
+            assertNotNull(other.getStatus());
+        }
+        else
+        {
+            assertEquals("status", this.status, other.getStatus());
+        }
+        if (this.contentInfo != null)
+        {
+            this.contentInfo.expected(other.getContent());
+        }
+    }
+
+    @Override
+    public int compareTo(Rendition other)
+    {
+        return this.id.compareTo(other.getId());
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder(150);
+        sb.append("Rendition [id=").append(id)
+                    .append(", status=").append(status)
+                    .append(", contentInfo=").append(contentInfo)
+                    .append(']');
+        return sb.toString();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SearchResultEntry.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SearchResultEntry.java
new file mode 100644
index 00000000000..4aaea41315a
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SearchResultEntry.java
@@ -0,0 +1,60 @@
+/*-
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * POJO class representing the extra information that comes back from Search.
+ **/
+public class SearchResultEntry
+{
+    Float score;
+
+    public SearchResultEntry()
+    {
+    }
+
+    public void setScore(Float score)
+    {
+        this.score = score;
+    }
+
+    public Float getScore()
+    {
+        return score;
+    }
+
+    //In future highlighting.
+
+    public void expected(Object o)
+    {
+        assertTrue(o instanceof SearchResultEntry);
+
+        SearchResultEntry other = (SearchResultEntry) o;
+        AssertUtil.assertEquals("score", score, other.getScore());
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Site.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Site.java
new file mode 100644
index 00000000000..fc9493319bd
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Site.java
@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import org.json.simple.JSONObject;
+
+public interface Site extends JSONAble
+{
+    Boolean getCreated();
+    Site withCreated(Boolean created);
+    String getGuid();
+    Site withGuid(String guid);
+    String getNetworkId();
+    Site withNetworkId(String networkId);
+    Boolean isCreated();
+    String getSiteId();
+    Site withSiteId(String siteId);
+    String getTitle();
+    Site withTitle(String title);
+    String getDescription();
+    Site withDescription(String description);
+    String getVisibility();
+    Site withVisibility(String visibility);
+    String getPreset();
+    Site withPreset(String preset);
+    String getType();
+    Site withType(String type);
+    SiteRole getRole();
+    Site withRole(SiteRole role);
+    void expected(Object o);
+    JSONObject toJSON();
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteContainer.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteContainer.java
new file mode 100644
index 00000000000..7e0d2c56bc5
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteContainer.java
@@ -0,0 +1,139 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class SiteContainer implements Serializable, ExpectedComparison, Comparable<SiteContainer>
+{
+	private static final long serialVersionUID = 535206187221924534L;
+
+	private String siteId;
+	private String id;
+	private String folderId;
+
+	public SiteContainer(String siteId, String folderId, String id)
+	{
+		super();
+		this.siteId = siteId;
+		this.folderId = folderId;
+		this.id = id;
+	}
+	
+	public String getSiteId()
+	{
+		return siteId;
+	}
+
+	public String getFolderId()
+	{
+		return folderId;
+	}
+
+	public String getId()
+	{
+		return id;
+	}
+	
+	@Override
+	public String toString()
+	{
+		return "SiteContainer [siteId=" + siteId + ", folderId=" + folderId
+				+ ", id=" + id + "]";
+	}
+
+	public static SiteContainer parseSiteContainer(String siteId, JSONObject json)
+	{
+		SiteContainer siteContainer = null;
+
+		if(json != null)
+		{
+			siteContainer = new SiteContainer(siteId, (String)json.get("folderId"), (String)json.get("id"));
+		}
+
+		return siteContainer;
+	}
+
+	public static ListResponse<SiteContainer> parseSiteContainers(JSONObject jsonObject)
+	{
+		List<SiteContainer> siteContainers = new ArrayList<SiteContainer>();
+
+		JSONObject jsonList = (JSONObject)jsonObject.get("list");
+		assertNotNull(jsonList);
+
+		JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+		assertNotNull(jsonEntries);
+
+		for(int i = 0; i < jsonEntries.size(); i++)
+		{
+			JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+			JSONObject entry = (JSONObject)jsonEntry.get("entry");
+			siteContainers.add(SiteContainer.parseSiteContainer(null, entry));
+		}
+
+		ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+
+		ListResponse<SiteContainer> resp = new ListResponse<SiteContainer>(paging, siteContainers);
+		return resp;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject siteContainerJson = new JSONObject();
+		siteContainerJson.put("id", id);
+		siteContainerJson.put("folderId", folderId);
+		return siteContainerJson;
+	}
+
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof SiteContainer);
+		
+		SiteContainer other = (SiteContainer)o;
+
+		AssertUtil.assertEquals("id", id, other.getId());
+		AssertUtil.assertEquals("folderId", folderId, other.getFolderId());
+	}
+
+	@Override
+	public int compareTo(SiteContainer o)
+	{
+		return folderId.compareTo(o.getFolderId());
+	}
+	
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteFavouriteTarget.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteFavouriteTarget.java
new file mode 100644
index 00000000000..876b64bc832
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteFavouriteTarget.java
@@ -0,0 +1,75 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import org.json.simple.JSONObject;
+
+public class SiteFavouriteTarget implements FavouritesTarget
+{
+	private Site site;
+
+	public SiteFavouriteTarget(Site site)
+	{
+		super();
+		this.site = site;
+	}
+
+	public Site getSite()
+	{
+		return site;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public JSONObject toJSON()
+	{
+		JSONObject favouriteJson = new JSONObject();
+		favouriteJson.put("site", getSite().toJSON());
+		return favouriteJson;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "SiteFavouritesTarget [site=" + site + "]";
+	}
+
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof SiteFavouriteTarget);
+
+		SiteFavouriteTarget other = (SiteFavouriteTarget) o;
+		site.expected(other.getSite());
+	}
+	
+	public String getTargetGuid()
+	{
+		return site.getGuid();
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteGroup.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteGroup.java
new file mode 100644
index 00000000000..862cc4c834c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteGroup.java
@@ -0,0 +1,208 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests.client.data;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+import java.io.Serializable;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class SiteGroup implements Serializable, ExpectedComparison, Comparable<SiteGroup>
+{
+	private static final long serialVersionUID = 505331886661880399L;
+
+	private String role;
+	private String id; // group id (aka authority name)
+	private Group group;
+
+	public SiteGroup()
+	{
+		super();
+	}
+
+	public SiteGroup(String id, String role)
+	{
+		this.role = role;
+		this.id = id;
+	}
+
+	public SiteGroup(String id, Group group, String role)
+	{
+		this.role = role;
+		this.id = id;
+		this.group = group;
+	}
+
+	public String getRole()
+	{
+		return role;
+	}
+
+	public void setRole(String role)
+	{
+		this.role = role;
+	}
+
+	public String getId()
+	{
+		return id;
+	}
+
+	public void setId(String id)
+	{
+		this.id = id;
+	}
+
+	public Group getGroup()
+	{
+		return group;
+	}
+
+	public void setGroup(Group group)
+	{
+		this.group = group;
+	}
+
+	public Collator getCollator()
+	{
+		return collator;
+	}
+
+	public void setCollator(Collator collator)
+	{
+		this.collator = collator;
+	}
+
+	public static SiteGroup parseSiteGroup(String siteId, JSONObject jsonObject)
+	{
+		String id = (String)jsonObject.get("id");
+		String role = (String)jsonObject.get("role");
+		JSONObject personJSON = (JSONObject)jsonObject.get("group");
+		Group group = Group.parseGroup(personJSON);
+		SiteGroup siteMember = new SiteGroup(id, group, role);
+		return siteMember;
+	}
+
+	public static PublicApiClient.ListResponse<SiteGroup> parseGroupMemberOfSites(String siteId, JSONObject jsonObject)
+	{
+		List<SiteGroup> groups = new ArrayList<SiteGroup>();
+
+		JSONObject jsonList = (JSONObject)jsonObject.get("list");
+		assertNotNull(jsonList);
+
+		JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+		assertNotNull(jsonEntries);
+
+		for(int i = 0; i < jsonEntries.size(); i++)
+		{
+			JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+			JSONObject entry = (JSONObject)jsonEntry.get("entry");
+			groups.add(parseSiteGroup(siteId, entry));
+		}
+
+		PublicApiClient.ExpectedPaging paging = PublicApiClient.ExpectedPaging.parsePagination(jsonList);
+		return new PublicApiClient.ListResponse<SiteGroup>(paging, groups);
+	}
+
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject entry = new JSONObject();
+
+		if (getId() != null)
+		{
+			entry.put("id", getId());
+		}
+
+		if (getRole() != null)
+		{
+			entry.put("role", getRole());
+		}
+
+		return entry;
+	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result;
+		result = prime * result + ((role == null) ? 0 : role.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		SiteGroup other = (SiteGroup) obj;
+		if (getId() == null)
+		{
+			if (other.getId() != null)
+				return false;
+		} else if (!getId().equals(other.getId()))
+			return false;
+		if (role == null)
+		{
+			if (other.role != null)
+				return false;
+		} else if (!role.equals(other.role))
+			return false;
+		return true;
+	}
+
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof SiteGroup);
+		SiteGroup other = (SiteGroup)o;
+		AssertUtil.assertEquals("id", getId(), other.getId());
+	}
+
+	private Collator collator = Collator.getInstance();
+
+	@Override
+	public int compareTo(SiteGroup o)
+	{
+		String displayName = group.getDisplayName();
+		return collator.compare(displayName, o.getGroup().getDisplayName());
+	}
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteImpl.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteImpl.java
new file mode 100644
index 00000000000..d8aeda0f9d8
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteImpl.java
@@ -0,0 +1,446 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class SiteImpl implements Serializable, Site, Comparable<SiteImpl>, ExpectedComparison
+{
+    private static final long serialVersionUID = -3774392026234649419L;
+
+    public static final String FIELD_SITE_ID = "siteId";
+    public static final String FIELD_CREATED = "created";
+    public static final String FIELD_HAS_MEMBERS = "hasMembers";
+
+    protected Boolean created = false;
+    protected String networkId;
+    protected String siteId;
+    protected String guid;
+    protected String title;
+    protected String description;
+    protected SiteRole role;
+    protected String visibility; // one of (PUBLIC,MODERATED,PRIVATE), defaults to PUBLIC
+    protected String preset;
+    protected String type;
+    
+    public SiteImpl()
+    {
+    }
+
+    public SiteImpl(String title, String visibility)
+    {
+        if (title == null)
+        {
+            throw new java.lang.IllegalArgumentException();
+        }
+
+        if (visibility == null)
+        {
+            throw new java.lang.IllegalArgumentException();
+        }
+        this.title = title;
+        this.visibility = visibility;
+    }
+
+    public SiteImpl(String networkId, String siteId, String guid)
+    {
+        if (siteId == null)
+        {
+            throw new java.lang.IllegalArgumentException();
+        }
+
+        if (guid == null)
+        {
+            throw new java.lang.IllegalArgumentException();
+        }
+        this.networkId = networkId;
+        this.siteId = siteId;
+        this.guid = guid;
+    }
+
+    public SiteImpl(SiteInfo siteInfo, SiteRole siteRole, Boolean created)
+    {
+        this.siteId = siteInfo.getShortName();
+        this.description = siteInfo.getDescription();
+        this.title = siteInfo.getTitle();
+        this.visibility = siteInfo.getVisibility().toString();
+        this.created = created;
+        this.guid = siteInfo.getNodeRef().getId();
+    }
+
+    public SiteImpl(String siteId, String title, String description, String visibility)
+    {
+        super();
+        this.siteId = siteId;
+        this.title = title;
+        this.description = description;
+        this.visibility = visibility;
+    }
+
+    public SiteImpl(String networkId, String siteId, String guid, String title, String description,
+                    String visibility, String type, SiteRole siteRole)
+    {
+        super();
+        this.networkId = networkId;
+        this.siteId = siteId;
+        this.title = title;
+        this.description = description;
+        this.visibility = visibility;
+        this.type = type;
+        this.role = siteRole;
+        this.guid = guid;
+    }
+
+    @Override
+    public Site withCreated(Boolean created)
+    {
+        this.setCreated(created);
+        return this;
+    }
+
+    @Override
+    public SiteImpl withNetworkId(String networkId)
+    {
+        this.setNetworkId(networkId);
+        return this;
+    }
+
+    @Override
+    public SiteImpl withSiteId(String siteId)
+    {
+        this.setSiteId(siteId);
+        return this;
+    }
+
+    @Override
+    public SiteImpl withGuid(String guid)
+    {
+        this.setGuid(guid);
+        return this;
+    }
+
+    @Override
+    public SiteImpl withTitle(String title)
+    {
+        this.setTitle(title);
+        return this;
+    }
+
+    @Override
+    public SiteImpl withDescription(String description)
+    {
+        this.setDescription(description);
+        return this;
+    }
+
+    @Override
+    public SiteImpl withRole(SiteRole role)
+    {
+        this.setRole(role);
+        return this;
+    }
+
+    @Override
+    public SiteImpl withVisibility(String visibility)
+    {
+        this.setVisibility(visibility);
+        return this;
+    }
+
+    @Override
+    public SiteImpl withPreset(String preset)
+    {
+        this.setPreset(preset);
+        return this;
+    }
+
+    @Override
+    public SiteImpl withType(String type)
+    {
+        this.setType(type);
+        return this;
+    }
+
+    @Override
+    public void expected(Object o)
+    {
+        assertTrue(o instanceof SiteImpl);
+
+        SiteImpl site = (SiteImpl)o;
+
+        AssertUtil.assertEquals("siteId", getSiteId(), site.getSiteId());
+        AssertUtil.assertEquals("guid", getGuid(), site.getGuid());
+        AssertUtil.assertEquals("title", getTitle(), site.getTitle());
+        AssertUtil.assertEquals("description", getDescription(), site.getDescription());
+        AssertUtil.assertEquals("visibility", getVisibility(), site.getVisibility());
+        AssertUtil.assertEquals("role", getRole(), site.getRole());
+    }
+
+
+    public Boolean getCreated()
+    {
+        return created;
+    }
+
+    public String getGuid()
+    {
+        return guid;
+    }
+
+    public String getNetworkId()
+    {
+        return networkId;
+    }
+
+    public Boolean isCreated()
+    {
+        return created;
+    }
+
+    public void setCreated(Boolean created)
+    {
+        this.created = created;
+    }
+
+    public String getSiteId()
+    {
+        return siteId;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public String getVisibility()
+    {
+        return visibility;
+    }
+
+    public String getPreset()
+    {
+        return preset;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+
+    public void setNetworkId(String networkId)
+    {
+        this.networkId = networkId;
+    }
+
+    public void setSiteId(String siteId)
+    {
+        this.siteId = siteId;
+    }
+
+    public void setGuid(String guid)
+    {
+        this.guid = guid;
+    }
+
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    public void setVisibility(String visibility)
+    {
+        this.visibility = visibility;
+    }
+
+    public void setPreset(String preset)
+    {
+        this.preset = preset;
+    }
+
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+
+    public static Site parseSite(JSONObject jsonObject)
+    {
+        if (jsonObject == null)
+        {
+            return null;
+        }
+
+        String id = (String)jsonObject.get("id");
+        String guid = (String)jsonObject.get("guid");
+        String title = (String)jsonObject.get("title");
+        String description = (String)jsonObject.get("description");
+        String visibility = (String)jsonObject.get("visibility");
+        String roleStr = (String)jsonObject.get("role");
+        SiteRole role = null;
+        if(roleStr != null)
+        {
+            role = SiteRole.valueOf(roleStr);
+        }
+        SiteImpl site = new SiteImpl(null, id, guid, title, description, visibility, "st:site", role);
+        return site;
+    }
+
+    public static ListResponse<Site> parseSites(JSONObject jsonObject)
+    {
+        List<Site> sites = new ArrayList<Site>();
+
+        JSONObject jsonList = (JSONObject)jsonObject.get("list");
+        assertNotNull(jsonList);
+
+        JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+        assertNotNull(jsonEntries);
+
+        for(int i = 0; i < jsonEntries.size(); i++)
+        {
+            JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+            JSONObject entry = (JSONObject)jsonEntry.get("entry");
+            sites.add(parseSite(entry));
+        }
+
+        ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+
+        ListResponse<Site> resp = new ListResponse<Site>(paging, sites);
+        return resp;
+    }
+
+    @Override
+    public SiteRole getRole()
+    {
+        return role;
+    }
+
+    public void setRole(SiteRole role)
+    {
+        this.role = role;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "Site [created=" + created + ", networkId=" + networkId
+                + ", siteId=" + siteId + ", guid=" + guid + ", title=" + title
+                + ", description=" + description + ", role=" + role
+                + ", visibility=" + visibility + ", type=" + type + "]";
+    }
+
+    @SuppressWarnings("unchecked")
+    public JSONObject toJSON()
+    {
+        JSONObject siteJson = new JSONObject();
+        if (getSiteId() != null)
+        {
+            siteJson.put("id", getSiteId());
+        }
+        if (getGuid() != null)
+        {
+            siteJson.put("guid", getGuid());
+        }
+        if (getTitle() != null)
+        {
+            siteJson.put("title", getTitle());
+        }
+        if (getDescription() != null)
+        {
+            siteJson.put("description", getDescription());
+        }
+        if (getVisibility() != null)
+        {
+            siteJson.put("visibility", getVisibility());
+        }
+        if (getPreset() != null)
+        {
+            siteJson.put("preset", getPreset());
+        }
+        return siteJson;
+    }
+
+    @Override
+    public int compareTo(SiteImpl site)
+    {
+        return siteId.compareTo(site.getSiteId());
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+                + ((networkId == null) ? 0 : networkId.hashCode());
+        result = prime * result + ((siteId == null) ? 0 : siteId.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        SiteImpl other = (SiteImpl) obj;
+        if (networkId == null)
+        {
+            if (other.networkId != null)
+                return false;
+        } else if (!networkId.equals(other.networkId))
+            return false;
+        if (siteId == null)
+        {
+            if (other.siteId != null)
+                return false;
+        } else if (!siteId.equals(other.siteId))
+            return false;
+        return true;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteMember.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteMember.java
new file mode 100644
index 00000000000..d5ae8299bb0
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteMember.java
@@ -0,0 +1,279 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class SiteMember implements Serializable, ExpectedComparison, Comparable<SiteMember>
+{
+	private static final long serialVersionUID = 505331886661880389L;
+
+	public static final String FIELD_USERNAME = "username";
+    public static final String FIELD_SITE_ID = "siteId";
+    public static final String FIELD_STATE = "status.state";
+
+    private String memberId;
+    private Person member;
+    private String siteId;
+	private String role;
+	private Status status;
+	private boolean isMemberOfGroup;
+
+	public SiteMember()
+	{
+	}
+	
+	public SiteMember(String memberId)
+	{
+		this.memberId = memberId;
+	}
+
+	public SiteMember(String memberId, String role)
+	{
+		this.memberId = memberId;
+		this.role = role;
+	}
+
+	public SiteMember(String memberId, Person member, String siteId, String role)
+	{
+		this.memberId = memberId;
+		this.member = member;
+		this.siteId = siteId;
+		this.role = role;
+	}
+    
+	public SiteMember(String memberId, Person member, String siteId, String role, boolean isMemberOfGroup)
+	{
+		this.memberId = memberId;
+		this.member = member;
+		this.siteId = siteId;
+		this.role = role;
+		this.isMemberOfGroup = isMemberOfGroup;
+	}
+
+    public String getMemberId()
+    {
+		return memberId;
+	}
+
+	public Person getMember()
+    {
+		return member;
+	}
+
+	public void setMember(Person member)
+	{
+		this.member = member;
+	}
+
+	public void setRole(String role)
+	{
+		this.role = role;
+	}
+
+	public String getSiteId()
+	{
+		return siteId;
+	}
+
+	public void setSiteId(String siteId)
+	{
+		this.siteId = siteId;
+	}
+
+	public Status getStatus()
+	{
+		return status;
+	}
+
+	public void setStatus(Status status)
+	{
+		this.status = status;
+	}
+
+	public String getRole()
+	{
+		return role;
+	}
+
+	public boolean isMemberOfGroup()
+	{
+		return isMemberOfGroup;
+	}
+
+	public void setMemberOfGroup(boolean memberOfGroup)
+	{
+		isMemberOfGroup = memberOfGroup;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "SiteMember [memberId=" + memberId + ", member=" + member
+				+ ", siteId=" + siteId + ", role=" + role + ", status="
+				+ status + ", isMemberOfGroup=" + isMemberOfGroup + "]";
+	}
+
+	public static SiteMember parseSiteMember(String siteId, JSONObject jsonObject)
+	{
+		String id = (String)jsonObject.get("id");
+		String role = (String)jsonObject.get("role");
+		boolean isMemberOfGroup = (boolean)jsonObject.get("isMemberOfGroup");
+		JSONObject personJSON = (JSONObject)jsonObject.get("person");
+		Person member = Person.parsePerson(personJSON);
+		return new SiteMember(id, member, siteId, role, isMemberOfGroup);
+	}
+
+	public static ListResponse<SiteMember> parseSiteMembers(String siteId, JSONObject jsonObject)
+	{
+		List<SiteMember> siteMembers = new ArrayList<SiteMember>();
+
+		JSONObject jsonList = (JSONObject)jsonObject.get("list");
+		assertNotNull(jsonList);
+
+		JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+		assertNotNull(jsonEntries);
+
+		for(int i = 0; i < jsonEntries.size(); i++)
+		{
+			JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+			JSONObject entry = (JSONObject)jsonEntry.get("entry");
+			siteMembers.add(parseSiteMember(siteId, entry));
+		}
+		
+		ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+
+		ListResponse<SiteMember> resp = new ListResponse<SiteMember>(paging, siteMembers);
+		return resp;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject entry = new JSONObject();
+        
+		if (getMemberId() != null)
+		{
+            entry.put("id", getMemberId());
+		}
+        
+		if (getRole() != null) 
+		{
+            entry.put("role", getRole());
+		}
+        
+		return entry;
+	}
+	
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result
+				+ ((memberId == null) ? 0 : memberId.hashCode());
+		result = prime * result + ((role == null) ? 0 : role.hashCode());
+		result = prime * result + ((siteId == null) ? 0 : siteId.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		SiteMember other = (SiteMember) obj;
+		if (memberId == null) {
+			if (other.memberId != null)
+				return false;
+		} else if (!memberId.equals(other.memberId))
+			return false;
+		if (role == null) {
+			if (other.role != null)
+				return false;
+		} else if (!role.equals(other.role))
+			return false;
+		if (siteId == null) {
+			if (other.siteId != null)
+				return false;
+		} else if (!siteId.equals(other.siteId))
+			return false;
+		return true;
+	}
+
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof SiteMember);
+		
+		SiteMember other = (SiteMember)o;
+		
+		AssertUtil.assertEquals("memberId", memberId, other.getMemberId());
+		if(member != null)
+		{
+			member.expected(other.getMember());
+		}
+		AssertUtil.assertEquals("siteId", siteId, other.getSiteId());
+		AssertUtil.assertEquals("role", role, other.getRole());
+		if(status != null)
+		{
+			status.expected(other.getStatus());
+		}
+	}
+
+	private Collator collator = Collator.getInstance();
+
+	@Override
+	public int compareTo(SiteMember o)
+	{
+		String firstName = member.getFirstName();
+		String lastName = member.getLastName();
+		int ret = collator.compare(lastName, o.getMember().getLastName());
+		if(ret == 0)
+		{
+			ret = collator.compare(firstName, o.getMember().getFirstName());
+		}
+		if(ret == 0)
+		{
+			ret = SiteRole.valueOf(role).compareTo(SiteRole.valueOf(o.getRole()));
+		}
+		return ret;
+	}
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteMembershipApproval.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteMembershipApproval.java
new file mode 100644
index 00000000000..84f75c7d3cc
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteMembershipApproval.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import org.json.simple.JSONObject;
+
+public class SiteMembershipApproval extends org.alfresco.rest.api.model.SiteMembershipApproval
+{
+
+    public SiteMembershipApproval()
+    {
+    }
+
+    public SiteMembershipApproval(String role)
+    {
+        setRole(role);
+    }
+
+    @SuppressWarnings("unchecked")
+    public JSONObject toJSON()
+    {
+        JSONObject siteMembershipRequestJson = new JSONObject();
+        siteMembershipRequestJson.put("role", getRole());
+        return siteMembershipRequestJson;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteMembershipRejection.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteMembershipRejection.java
new file mode 100644
index 00000000000..4147e9f331a
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteMembershipRejection.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import org.json.simple.JSONObject;
+
+public class SiteMembershipRejection extends org.alfresco.rest.api.model.SiteMembershipRejection
+{
+
+    public SiteMembershipRejection()
+    {
+    }
+
+    public SiteMembershipRejection(String comment)
+    {
+        setComment(comment);
+    }
+
+    @SuppressWarnings("unchecked")
+    public JSONObject toJSON()
+    {
+        JSONObject siteMembershipRequestJson = new JSONObject();
+        siteMembershipRequestJson.put("comment", getComment());
+        return siteMembershipRequestJson;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteMembershipRequest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteMembershipRequest.java
new file mode 100644
index 00000000000..e4033a55b26
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteMembershipRequest.java
@@ -0,0 +1,262 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.text.Collator;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.PublicApiDateFormat;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class SiteMembershipRequest implements ExpectedComparison, Comparable<SiteMembershipRequest>
+{
+	private Collator collator = Collator.getInstance();
+
+    private String id; // site id
+    private String message;
+    private Date createdAt;
+    private Date modifiedAt;
+    private String title;
+    private Site site;
+    private Person person;
+    
+    public SiteMembershipRequest()
+    {
+    }
+
+    public String getTitle()
+	{
+		return title;
+	}
+
+	public void setTitle(String title)
+	{
+		this.title = title;
+	}
+
+	public String getId()
+    {
+		return id;
+    }
+	
+    public void setId(String id)
+    {
+		this.id = id;
+    }
+    
+	public Site getSite()
+	{
+		return site;
+	}
+
+	public void setSite(Site site)
+	{
+		this.site = site;
+	}
+
+	public Date getCreatedAt()
+	{
+		return createdAt;
+	}
+
+	public void setCreatedAt(Date createdAt)
+	{
+		this.createdAt = createdAt;
+	}
+
+	public Date getModifiedAt()
+	{
+		return modifiedAt;
+	}
+
+	public void setModifiedAt(Date modifiedAt)
+	{
+		this.modifiedAt = modifiedAt;
+	}
+
+	public String getMessage()
+	{
+		return message;
+	}
+
+	public void setMessage(String message)
+	{
+		this.message = message;
+	}
+
+	public Person getPerson() {
+		return person;
+	}
+
+	public void setPerson(Person person) {
+		this.person = person;
+	}
+
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject siteMembershipRequestJson = new JSONObject();
+		siteMembershipRequestJson.put("id", getId());
+		siteMembershipRequestJson.put("message", getMessage());
+		return siteMembershipRequestJson;
+	}
+
+	public static SiteMembershipRequest parseSiteMembershipRequest(JSONObject jsonObject) throws ParseException
+	{
+		String id = (String)jsonObject.get("id");
+		String createdAt = (String)jsonObject.get("createdAt");
+		String message = (String)jsonObject.get("message");
+		String modifiedAt = (String)jsonObject.get("modifiedAt");
+		JSONObject siteJSON = (JSONObject)jsonObject.get("site");
+		JSONObject personJSON = (JSONObject)jsonObject.get("person");
+		
+		SiteMembershipRequest siteMembershipRequest = new SiteMembershipRequest();
+		siteMembershipRequest.setId(id);
+		siteMembershipRequest.setCreatedAt(PublicApiDateFormat.getDateFormat().parse(createdAt));
+		siteMembershipRequest.setMessage(message);
+		if(modifiedAt != null)
+		{
+			siteMembershipRequest.setModifiedAt(PublicApiDateFormat.getDateFormat().parse(modifiedAt));
+		}
+		if(siteJSON != null)
+		{
+			Site site = SiteImpl.parseSite(siteJSON);
+			siteMembershipRequest.setSite(site);
+		}
+		if (personJSON != null)
+		{
+			Person person = Person.parsePerson(personJSON);
+			siteMembershipRequest.setPerson(person);
+		}
+
+		return siteMembershipRequest;
+	}
+
+	public static ListResponse<SiteMembershipRequest> parseSiteMembershipRequests(JSONObject jsonObject) throws ParseException
+	{
+		List<SiteMembershipRequest> siteMembershipRequests = new ArrayList<SiteMembershipRequest>();
+
+		JSONObject jsonList = (JSONObject)jsonObject.get("list");
+		assertNotNull(jsonList);
+
+		JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+		assertNotNull(jsonEntries);
+
+		for(int i = 0; i < jsonEntries.size(); i++)
+		{
+			JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+			JSONObject entry = (JSONObject)jsonEntry.get("entry");
+			siteMembershipRequests.add(SiteMembershipRequest.parseSiteMembershipRequest(entry));
+		}
+
+		ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+		return new ListResponse<>(paging, siteMembershipRequests);
+	}
+	
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof SiteMembershipRequest);
+		
+		SiteMembershipRequest other = (SiteMembershipRequest)o;
+
+		assertNotNull(other.getCreatedAt());
+
+		if(other.getModifiedAt() != null)
+		{
+			assertFalse(other.getModifiedAt().before(other.getCreatedAt()));
+		}
+
+		if(modifiedAt != null)
+		{
+			// check that the modifiedAt is higher in the RHS
+			assertFalse(other.getModifiedAt().before(modifiedAt));
+		}
+
+		if(createdAt != null)
+		{
+			AssertUtil.assertEquals("createdAt", createdAt, other.getCreatedAt());
+		}
+
+		AssertUtil.assertEquals("createdAt", createdAt, other.getCreatedAt());
+		// ignore case when comparing site (membership request) id
+		AssertUtil.assertEquals("id", id.toLowerCase(), other.getId().toLowerCase());
+		AssertUtil.assertEquals("message", message, other.getMessage());
+	}
+	
+	@Override
+	public String toString()
+	{
+		return "SiteMembershipRequest [id=" + id + ", message=" + message
+				+ ", createdAt=" + createdAt + ", modifiedAt=" + modifiedAt
+				+ ", title=" + title + "]";
+	}
+
+	@Override
+	public int compareTo(SiteMembershipRequest o)
+	{
+		int ret = collator.compare(site.getTitle(), o.getSite().getTitle());
+		return ret;
+	}
+
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		SiteMembershipRequest other = (SiteMembershipRequest) obj;
+		if (id == null)
+		{
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		return true;
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteRole.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteRole.java
new file mode 100644
index 00000000000..4d03cd4e662
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/SiteRole.java
@@ -0,0 +1,32 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+public enum SiteRole
+{
+	// note: lexical ordering
+	SiteCollaborator, SiteConsumer, SiteContributor, SiteManager;
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Status.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Status.java
new file mode 100644
index 00000000000..0eb031a756a
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Status.java
@@ -0,0 +1,114 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+
+public class Status implements Serializable, ExpectedComparison
+{
+	private static final long serialVersionUID = 7187248670785910438L;
+
+	public static enum State
+	{
+		OK, ERROR;
+	};
+
+	private State state;
+	private String error;
+
+	public Status(State state)
+	{
+		this.state = state;
+	}
+
+	public Status(String error)
+	{
+		this.state = State.ERROR;
+		this.error = error;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+
+	public State getState()
+	{
+		return state;
+	}
+
+	public String getError()
+	{
+		return error;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Status [state=" + state + ", error=" + error + "]";
+	}
+	
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((error == null) ? 0 : error.hashCode());
+		result = prime * result + ((state == null) ? 0 : state.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Status other = (Status) obj;
+		if (error == null) {
+			if (other.error != null)
+				return false;
+		} else if (!error.equals(other.error))
+			return false;
+		if (state != other.state)
+			return false;
+		return true;
+	}
+
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof Status);
+		
+		Status other = (Status)o;
+		AssertUtil.assertEquals("state", state, other.getState());
+		AssertUtil.assertEquals("error", error, other.getError());
+	}
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Tag.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Tag.java
new file mode 100644
index 00000000000..5a30e3a5937
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Tag.java
@@ -0,0 +1,188 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class Tag implements Serializable, ExpectedComparison, Comparable<Tag>
+{
+	private static final long serialVersionUID = -5730063374759199632L;
+
+	private String nodeId;
+	private String id;
+	private String tag;
+
+	public Tag(String tag)
+	{
+		super();
+		this.tag = tag;
+	}
+
+	public Tag(String id, String tag)
+	{
+		super();
+		this.id = id;
+		this.tag = tag;
+	}
+
+	public Tag(String nodeId, String id, String tag)
+	{
+		super();
+		this.nodeId = nodeId;
+		this.id = id;
+		this.tag = tag;
+	}
+
+	public void setTag(String tag)
+	{
+		this.tag = tag;
+	}
+
+	public String getNodeId()
+	{
+		return nodeId;
+	}
+
+	public void setNodeId(String nodeId)
+	{
+		this.nodeId = nodeId;
+	}
+
+	public void setId(String id)
+	{
+		this.id = id;
+	}
+
+	public String getId()
+	{
+		return id;
+	}
+	
+	public String getTag()
+	{
+		return tag;
+	}
+	
+	@Override
+	public String toString()
+	{
+		return "Tag [nodeId=" + nodeId + ", id=" + id + ", tag=" + tag
+				+ "]";
+	}
+
+	public static Tag parseTag(String nodeId, JSONObject jsonObject)
+	{
+		String id = (String)jsonObject.get("id");
+		String value = (String)jsonObject.get("tag");
+		Tag tag = new Tag(nodeId, id, value);
+		return tag;
+	}
+	
+	public static ListResponse<Tag> parseTags(String nodeId, JSONObject jsonObject)
+	{
+		List<Tag> tags = new ArrayList<Tag>();
+
+		JSONObject jsonList = (JSONObject)jsonObject.get("list");
+		assertNotNull(jsonList);
+
+		JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+		assertNotNull(jsonEntries);
+
+		for(int i = 0; i < jsonEntries.size(); i++)
+		{
+			JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+			JSONObject entry = (JSONObject)jsonEntry.get("entry");
+			tags.add(parseTag(nodeId, entry));
+		}
+		
+		ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+		ListResponse<Tag> resp = new ListResponse<Tag>(paging, tags);
+		return resp;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public JSONObject toJSON()
+	{
+		JSONObject entry = new JSONObject();
+//		entry.put("id", getId());
+		entry.put("tag", getTag());
+		return entry;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Tag other = (Tag) obj;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		return true;
+	}
+
+	@Override
+	public int compareTo(Tag o)
+	{
+		return tag.compareTo(o.getTag());
+	}
+
+	@Override
+	public void expected(Object o)
+	{
+		assertTrue(o instanceof Tag);
+		
+		Tag other = (Tag)o;
+		
+		AssertUtil.assertEquals("id", id, other.getId());
+		// case insensitive comparison
+		AssertUtil.assertEquals("tag", tag.toUpperCase(), other.getTag().toUpperCase());
+	}
+	
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/UserInfo.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/UserInfo.java
new file mode 100644
index 00000000000..beb972d45d4
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/UserInfo.java
@@ -0,0 +1,110 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests.client.data;
+
+import static org.junit.Assert.assertTrue;
+
+import org.json.simple.JSONObject;
+
+/**
+ * Representation of a user info (initially for client tests for File Folder API)
+ *
+ * @author janv
+ */
+public class UserInfo implements ExpectedComparison
+{
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+    private String displayName;
+
+    public UserInfo()
+    {
+    }
+
+    public UserInfo(String id)
+    {
+        this(id, getTestDisplayName(id));
+    }
+
+    public UserInfo(String id, String displayName)
+    {
+        this.id = id;
+        this.displayName = displayName;
+    }
+
+    /*
+     * Builds a test display name from a test user id. The display name is normally
+     * make up of the first and last name and in the case of test users the user id
+     * is also used for both first and last name. With the addition of a network to
+     * the user id, the display name looks rather strange. This method simply strips
+     * the network (if it exists) from the user id and uses that for both first and
+     * last names.
+     */
+    public static String getTestDisplayName(String id)
+    {
+        int i = id.lastIndexOf('@');
+        if (i != -1)
+        {
+            id = id.substring(0, i);
+        }
+        return id+' '+id;
+    }
+
+    public String getDisplayName()
+    {
+        return displayName;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void expected(Object o)
+    {
+        assertTrue(o instanceof UserInfo);
+
+        UserInfo other = (UserInfo) o;
+
+        AssertUtil.assertEquals("id", id, other.getId());
+        AssertUtil.assertEquals("displayName", displayName, other.getDisplayName());
+    }
+
+    public JSONObject toJSON()
+    {
+        JSONObject userInfoJson = new JSONObject();
+        if (getId() != null)
+        {
+            userInfoJson.put("id", getId());
+        }
+
+        userInfoJson.put("displayName", getDisplayName());
+
+        return userInfoJson;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/util/JacksonUtil.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/util/JacksonUtil.java
new file mode 100644
index 00000000000..9dd31edc9a6
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/util/JacksonUtil.java
@@ -0,0 +1,85 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests.util;
+
+import static org.junit.Assert.assertNotNull;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+public class JacksonUtil
+{
+    private JacksonHelper jsonHelper;
+
+    public JacksonUtil(JacksonHelper jsonHelper)
+    {
+        this.jsonHelper = jsonHelper;
+    }
+
+    public <T> List<T> parseEntries(JSONObject jsonObject, Class<T> clazz) throws IOException
+    {
+        assertNotNull(jsonObject);
+        assertNotNull(clazz);
+
+        List<T> models = new ArrayList<>();
+
+        JSONObject jsonList = (JSONObject) jsonObject.get("list");
+        assertNotNull(jsonList);
+
+        JSONArray jsonEntries = (JSONArray) jsonList.get("entries");
+        assertNotNull(jsonEntries);
+
+        for (Object entry : jsonEntries)
+        {
+            JSONObject jsonEntry = (JSONObject) entry;
+            T pojoModel = parseEntry(jsonEntry, clazz);
+            models.add(pojoModel);
+        }
+
+        return models;
+    }
+
+    public <T> T parseEntry(JSONObject jsonObject, Class<T> clazz) throws IOException
+    {
+        assertNotNull(jsonObject);
+        assertNotNull(clazz);
+
+        JSONObject entry = (JSONObject) jsonObject.get("entry");
+        T pojoModel = jsonHelper.construct(new StringReader(entry.toJSONString()), clazz);
+        assertNotNull(pojoModel);
+
+        return pojoModel;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/util/MultiPartBuilder.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/util/MultiPartBuilder.java
new file mode 100644
index 00000000000..527d5fa3d91
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/util/MultiPartBuilder.java
@@ -0,0 +1,330 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests.util;
+
+
+
+import org.apache.commons.httpclient.methods.multipart.FilePart;
+import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
+import org.apache.commons.httpclient.methods.multipart.Part;
+import org.apache.commons.httpclient.methods.multipart.StringPart;
+import org.apache.commons.httpclient.params.HttpMethodParams;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * <i><b>multipart/form-data</b></i> builder.
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class MultiPartBuilder
+{
+    private FileData fileData;
+    private String relativePath;
+    private String updateNodeRef;
+    private String description;
+    private String contentTypeQNameStr;
+    private List<String> aspects = Collections.emptyList();
+    private Boolean majorVersion;
+    private Boolean overwrite;
+    private Boolean autoRename;
+    private String nodeType;
+    private List<String> renditionIds = Collections.emptyList(); // initially single rendition name/id (in the future we may support multiple)
+    private Map<String, String> properties = Collections.emptyMap();
+
+    private MultiPartBuilder()
+    {
+    }
+
+    private MultiPartBuilder(MultiPartBuilder that)
+    {
+        this.fileData = that.fileData;
+        this.relativePath = that.relativePath;
+        this.updateNodeRef = that.updateNodeRef;
+        this.description = that.description;
+        this.contentTypeQNameStr = that.contentTypeQNameStr;
+        this.aspects = new ArrayList<>(that.aspects);
+        this.majorVersion = that.majorVersion;
+        this.overwrite = that.overwrite;
+        this.autoRename = that.autoRename;
+        this.nodeType = that.nodeType;
+        this.renditionIds = that.renditionIds;
+        this.properties = new HashMap<>(that.properties);
+    }
+
+    public static MultiPartBuilder create()
+    {
+        return new MultiPartBuilder();
+    }
+
+    public static MultiPartBuilder copy(MultiPartBuilder copy)
+    {
+        return new MultiPartBuilder(copy);
+    }
+
+    public MultiPartBuilder setFileData(FileData fileData)
+    {
+        this.fileData = fileData;
+        return this;
+    }
+
+    public MultiPartBuilder setRelativePath(String relativePath)
+    {
+        this.relativePath = relativePath;
+        return this;
+    }
+
+    public MultiPartBuilder setUpdateNoderef(String updateNodeRef)
+    {
+        this.updateNodeRef = updateNodeRef;
+        return this;
+    }
+
+    public MultiPartBuilder setDescription(String description)
+    {
+        this.description = description;
+        return this;
+    }
+
+    public MultiPartBuilder setContentTypeQNameStr(String contentTypeQNameStr)
+    {
+        this.contentTypeQNameStr = contentTypeQNameStr;
+        return this;
+    }
+
+    public MultiPartBuilder setAspects(List<String> aspects)
+    {
+        this.aspects = aspects;
+        return this;
+    }
+
+    public MultiPartBuilder setMajorVersion(boolean majorVersion)
+    {
+        this.majorVersion = Boolean.valueOf(majorVersion);
+        return this;
+    }
+
+    public MultiPartBuilder setOverwrite(boolean overwrite)
+    {
+        this.overwrite = Boolean.valueOf(overwrite);
+        return this;
+    }
+
+    public MultiPartBuilder setAutoRename(boolean autoRename)
+    {
+        this.autoRename = Boolean.valueOf(autoRename);
+        return this;
+    }
+
+    public MultiPartBuilder setNodeType(String nodeType)
+    {
+        this.nodeType = nodeType;
+        return this;
+    }
+
+    public MultiPartBuilder setProperties(Map<String, String> properties)
+    {
+        this.properties = properties;
+        return this;
+    }
+
+    public MultiPartBuilder setRenditions(List<String> renditionIds)
+    {
+        this.renditionIds = renditionIds;
+        return this;
+    }
+
+    private String getCommaSeparated(List<String> names)
+    {
+        if (! names.isEmpty())
+        {
+            StringBuilder sb = new StringBuilder(names.size() * 2);
+            for (String str : names)
+            {
+                sb.append(str).append(',');
+            }
+
+            sb.deleteCharAt(sb.length() - 1); // remove leading separator
+
+            return sb.toString();
+
+        }
+        return null;
+    }
+
+    public static class FileData
+    {
+        private final String fileName;
+        private final File file;
+        private final String mimetype;
+        private final String encoding;
+
+        public FileData(String fileName, File file)
+        {
+            this(fileName, file, null, null);
+        }
+
+        public FileData(String fileName, File file, String mimetype)
+        {
+            this(fileName, file, mimetype, null);
+        }
+
+        public FileData(String fileName, File file, String mimetype, String encoding)
+        {
+            this.fileName = fileName;
+            this.file = file;
+            this.mimetype = mimetype;
+            this.encoding = encoding;
+        }
+
+        public String getFileName()
+        {
+            return fileName;
+        }
+
+        public File getFile()
+        {
+            return file;
+        }
+
+        public String getMimetype()
+        {
+            return mimetype;
+        }
+
+        public String getEncoding()
+        {
+            return encoding;
+        }
+    }
+
+    public static class MultiPartRequest
+    {
+        private final byte[] body;
+        private final String contentType;
+        private final long contentLength;
+
+        public MultiPartRequest(byte[] body, String contentType, long contentLength)
+        {
+            this.body = body;
+            this.contentType = contentType;
+            this.contentLength = contentLength;
+        }
+
+        public byte[] getBody()
+        {
+            return body;
+        }
+
+        public String getContentType()
+        {
+            return contentType;
+        }
+
+        public long getContentLength()
+        {
+            return contentLength;
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    public MultiPartRequest build() throws IOException
+    {
+        List<Part> parts = new ArrayList<>();
+
+        if (fileData != null)
+        {
+            FilePart fp = new FilePart("filedata", fileData.getFileName(), fileData.getFile(), fileData.getMimetype(), null);
+            // Get rid of the default values added upon FilePart instantiation
+            fp.setCharSet(fileData.getEncoding());
+            fp.setContentType(fileData.getMimetype());
+            parts.add(fp);
+            addPartIfNotNull(parts, "name", fileData.getFileName());
+        }
+        addPartIfNotNull(parts, "relativepath", relativePath);
+        addPartIfNotNull(parts, "updatenoderef", updateNodeRef);
+        addPartIfNotNull(parts, "description", description);
+        addPartIfNotNull(parts, "contenttype", contentTypeQNameStr);
+        addPartIfNotNull(parts, "aspects", getCommaSeparated(aspects));
+        addPartIfNotNull(parts, "majorversion", majorVersion);
+        addPartIfNotNull(parts, "overwrite", overwrite);
+        addPartIfNotNull(parts, "autorename", autoRename);
+        addPartIfNotNull(parts, "nodetype", nodeType);
+        addPartIfNotNull(parts, "renditions", getCommaSeparated(renditionIds));
+
+        HttpMethodParams params = new HttpMethodParams();
+
+        if (!properties.isEmpty())
+        {
+            for (String propertyName : properties.keySet())
+            {
+
+                Serializable expected = properties.get(propertyName);
+                if (expected instanceof List)
+                {
+
+                    List<String> multipleValues = (List<String>) expected;
+                    for (String value : multipleValues)
+                    {
+                        {
+                            parts.add(new StringPart(propertyName, value));
+                        }
+                    }
+                }
+                else
+                {
+                    parts.add(new StringPart(propertyName, (String) expected));
+                }
+
+            }
+        }
+
+        MultipartRequestEntity req = new MultipartRequestEntity(parts.toArray(new Part[parts.size()]), new HttpMethodParams());
+
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        req.writeRequest(os);
+
+        return new MultiPartRequest(os.toByteArray(), req.getContentType(), req.getContentLength());
+    }
+
+    private void addPartIfNotNull(List<Part> list, String partName, Object partValue)
+    {
+        if (partValue != null)
+        {
+            list.add(new StringPart(partName, partValue.toString()));
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/util/RestApiUtil.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/util/RestApiUtil.java
new file mode 100644
index 00000000000..918da502049
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/util/RestApiUtil.java
@@ -0,0 +1,173 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.api.tests.util;
+
+import static org.junit.Assert.assertNotNull;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A utility class for Rest API tests
+ * 
+ * @author Jamal Kaabi-Mofrad
+ */
+public class RestApiUtil
+{
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    private RestApiUtil()
+    {
+    }
+
+    /**
+     * Parses the alfresco REST API response for a collection of entries.
+     * Basically, it looks for the {@code list} JSON object, then it uses
+     * {@literal Jackson} to convert the list's entries to their corresponding
+     * POJOs based on the given {@code clazz}.
+     * 
+     * @param jsonObject the {@code JSONObject} derived from the response
+     * @param clazz the class which represents the JSON payload
+     * @return list of POJOs of the given {@code clazz} type
+     * @throws Exception
+     */
+    public static <T> List<T> parseRestApiEntries(JSONObject jsonObject, Class<T> clazz) throws Exception
+    {
+        assertNotNull(jsonObject);
+        assertNotNull(clazz);
+
+        List<T> models = new ArrayList<>();
+
+        JSONObject jsonList = (JSONObject) jsonObject.get("list");
+        assertNotNull(jsonList);
+
+        JSONArray jsonEntries = (JSONArray) jsonList.get("entries");
+        assertNotNull(jsonEntries);
+
+        for (int i = 0; i < jsonEntries.size(); i++)
+        {
+            JSONObject jsonEntry = (JSONObject) jsonEntries.get(i);
+            T pojoModel = parseRestApiEntry(jsonEntry, clazz);
+            models.add(pojoModel);
+        }
+
+        return models;
+    }
+
+    /**
+     * Parses the alfresco REST API response for a single entry. Basically, it
+     * looks for the {@code entry} JSON object, then it uses {@literal Jackson}
+     * to convert it to its corresponding POJO based on the given {@code clazz}.
+     * 
+     * @param jsonObject the {@code JSONObject} derived from the response
+     * @param clazz the class which represents the JSON payload
+     * @return the POJO of the given {@code clazz} type
+     * @throws Exception
+     */
+    public static <T> T parseRestApiEntry(JSONObject jsonObject, Class<T> clazz) throws Exception
+    {
+        return parsePojo("entry",jsonObject, clazz);
+    }
+
+    /**
+     * Parses the alfresco REST API response object and extracts the paging information.
+     * @param jsonObject the {@code JSONObject} derived from the response
+     * @return ExpectedPaging the paging
+     * @throws Exception
+     */
+    public static PublicApiClient.ExpectedPaging parsePaging(JSONObject jsonObject) throws Exception
+    {
+        assertNotNull(jsonObject);
+        JSONObject jsonList = (JSONObject) jsonObject.get("list");
+        assertNotNull(jsonList);
+        return parsePojo("pagination", jsonList, PublicApiClient.ExpectedPaging.class);
+    }
+
+    /**
+     * Parses the alfresco REST API response, uses {@literal Jackson}
+     * to convert it to its corresponding POJO based on the given {@code clazz}.
+     *
+     * @param jsonObject the {@code JSONObject} derived from the response
+     * @param clazz the class which represents the JSON payload
+     * @return the POJO of the given {@code clazz} type
+     * @throws Exception
+     */
+    public static <T> T parsePojo(String key, JSONObject jsonObject, Class<T> clazz) throws Exception
+    {
+        assertNotNull(jsonObject);
+        assertNotNull(clazz);
+
+        JSONObject pojo = (JSONObject) jsonObject.get(key);
+        T pojoModel = OBJECT_MAPPER.readValue(pojo.toJSONString(), clazz);
+        assertNotNull(pojoModel);
+
+        return pojoModel;
+    }
+
+    /**
+     * Parses the alfresco REST API error response.
+     *
+     * @param jsonObject the {@code JSONObject} derived from the response
+     * @return ExpectedErrorResponse the error object
+     * @throws Exception
+     */
+    public static PublicApiClient.ExpectedErrorResponse parseErrorResponse(JSONObject jsonObject) throws Exception
+    {
+        return parsePojo("error", jsonObject, PublicApiClient.ExpectedErrorResponse.class);
+    }
+
+    /**
+     * Converts the POJO which represents the JSON payload into a JSON string
+     */
+    public static String toJsonAsString(Object object) throws Exception
+    {
+        assertNotNull(object);
+        return OBJECT_MAPPER.writeValueAsString(object);
+    }
+
+    /**
+     * Converts the POJO which represents the JSON payload into a JSON string.
+     * null values will be ignored.
+     */
+    public static String toJsonAsStringNonNull(Object object) throws IOException
+    {
+        assertNotNull(object);
+        ObjectMapper om = new ObjectMapper();
+        om.setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL);
+        // keep null values in maps (like 'properties' for example) since these are part of the partial update/delete payload
+        om.configOverride(java.util.Map.class)
+                .setIncludeAsProperty(JsonInclude.Value.construct(JsonInclude.Include.ALWAYS, JsonInclude.Include.ALWAYS));
+        return om.writeValueAsString(object);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Animal.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Animal.java
new file mode 100644
index 00000000000..8f8e4f25a81
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Animal.java
@@ -0,0 +1,36 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks;
+
+/**
+ * Simple mock pojo for serialization for relationships
+ *
+ * @author Gethin James
+ */
+public interface Animal
+{
+    public String getName();
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/BadEntityResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/BadEntityResource.java
new file mode 100644
index 00000000000..de940272284
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/BadEntityResource.java
@@ -0,0 +1,59 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+ 
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import org.alfresco.repo.node.integrity.IntegrityException;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.WebApiParameters;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.springframework.extensions.webscripts.Status;
+
+@EntityResource(name= BadEntityResource.ENTITY_KEY,title="bad resource that does bad things")
+public class BadEntityResource implements EntityResourceAction.Read<Sheep>,EntityResourceAction.ReadById<Sheep>
+{
+    public static final String ENTITY_KEY = "bad";
+
+
+    @Override
+    public Sheep readById(String id, Parameters parameters)
+    {
+        throw new IntegrityException("bad integrity", null);
+    }
+
+    @Override
+    @WebApiDescription(title = "Gets all the Sheep", successStatus = Status.STATUS_ACCEPTED)
+    public CollectionWithPagingInfo<Sheep> readAll(Parameters params)
+    {
+        throw new RuntimeException("read all");
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/CalfRelationshipResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/CalfRelationshipResource.java
new file mode 100644
index 00000000000..240b9054af2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/CalfRelationshipResource.java
@@ -0,0 +1,118 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+ 
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.Operation;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+
+@RelationshipResource(name = "calf", entityResource=CowEntityResource.class, title = "Muma")
+public class CalfRelationshipResource implements RelationshipResourceAction.ReadByIdWithResponse<Goat>,
+        RelationshipResourceAction.ReadWithResponse<Goat>,
+        RelationshipResourceAction.CreateWithResponse<Goat>,
+        RelationshipResourceAction.UpdateWithResponse<Goat>,
+        RelationshipResourceAction.DeleteWithResponse,
+        RelationshipResourceBinaryAction.ReadWithResponse,
+        RelationshipResourceBinaryAction.DeleteWithResponse,
+        RelationshipResourceBinaryAction.UpdateWithResponse {
+
+    @Override
+    public List<Goat> create(String entityResourceId, List<Goat> entities, Parameters parameters, WithResponse withResponse)
+    {
+        return entities;
+    }
+
+    @Override
+    public void delete(String entityResourceId, String id, Parameters parameters, WithResponse withResponse)
+    {
+
+    }
+
+    @Override
+    public Goat readById(String entityResourceId, String id, Parameters parameters, WithResponse withResponse) throws RelationshipResourceNotFoundException
+    {
+        return null;
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Goat> readAll(String entityResourceId, Parameters params, WithResponse withResponse)
+    {
+        return CollectionWithPagingInfo.asPaged(params.getPaging(), Arrays.asList(new Goat("Cow1")));
+    }
+
+    @Override
+    public Goat update(String entityResourceId, Goat entity, Parameters parameters, WithResponse withResponse)
+    {
+        return entity;
+    }
+
+    @Operation("chew")
+    public String chewTheGrass(String entityId, String id, Void notused, Parameters parameters, WithResponse withResponse) {
+        return "Yum";
+    }
+
+
+    @Override
+    @WebApiDescription(title = "Reads a photo")
+    @BinaryProperties("photo")
+    public BinaryResource readProperty(String entityId, String id, Parameters parameters, WithResponse withResponse) throws EntityNotFoundException
+    {
+        return null;
+    }
+
+    @Override
+    @WebApiDescription(title = "Deletes a photo")
+    @BinaryProperties("photo")
+    public void deleteProperty(String entityId, String entityResourceId, Parameters parameters, WithResponse withResponse)
+    {
+
+    }
+
+    @Override
+    @WebApiDescription(title = "Updates a photo")
+    @BinaryProperties("photo")
+    public Object updateProperty(String entityId, String entityResourceId, BasicContentInfo contentInfo, InputStream stream, Parameters params, WithResponse withResponse)
+    {
+        return null;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/CowEntityResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/CowEntityResource.java
new file mode 100644
index 00000000000..94d357cd902
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/CowEntityResource.java
@@ -0,0 +1,132 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+ 
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Description;
+import org.springframework.extensions.webscripts.Status;
+
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+
+@EntityResource(name="cow", title="Cow")
+public class CowEntityResource implements EntityResourceAction.ReadByIdWithResponse<Goat>,
+                                            EntityResourceAction.ReadWithResponse<Goat>,
+                                            EntityResourceAction.CreateWithResponse<Goat>,
+                                            EntityResourceAction.UpdateWithResponse<Goat>,
+                                            EntityResourceAction.DeleteWithResponse,
+        BinaryResourceAction.ReadWithResponse,
+        BinaryResourceAction.DeleteWithResponse,
+        BinaryResourceAction.UpdateWithResponse<Goat>
+{
+    public final static Cache CACHE_COW = new Cache(new Description.RequiredCache()
+    {
+        @Override
+        public boolean getNeverCache()
+        {
+            return false;
+        }
+
+        @Override
+        public boolean getIsPublic()
+        {
+            return true;
+        }
+
+        @Override
+        public boolean getMustRevalidate()
+        {
+            return false;
+        }
+    });
+
+    @Override
+    public Goat readById(String id, Parameters parameters, WithResponse withResponse)
+    {
+        withResponse.setCache(CACHE_COW);
+        return new Goat("Goat"+id);
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Goat> readAll(Parameters params, WithResponse withResponse)
+    {
+        return CollectionWithPagingInfo.asPaged(params.getPaging(), Arrays.asList(new Goat("Cow1")));
+    }
+
+    @Override
+    public List<Goat> create(List<Goat> entities, Parameters parameters, WithResponse withResponse)
+    {
+        withResponse.setStatus(Status.STATUS_ACCEPTED);
+        return entities;
+    }
+
+    @Override
+    public void delete(String id, Parameters parameters, WithResponse withResponse)
+    {
+
+    }
+
+    @Override
+    public Goat update(String id, Goat entity, Parameters parameters, WithResponse withResponse)
+    {
+        return entity;
+    }
+
+    
+    @Override
+    @BinaryProperties("photo")
+    public void deleteProperty(String entityId, Parameters parameters, WithResponse withResponse)
+    {
+
+    }
+
+    @Override
+    @BinaryProperties("photo")
+    public BinaryResource readProperty(String entityId, Parameters parameters, WithResponse withResponse) throws EntityNotFoundException
+    {
+        return null;
+    }
+
+    @Override
+    @BinaryProperties("photo")
+    public Goat updateProperty(String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params, WithResponse withResponse)
+    {
+        return null;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Farmer.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Farmer.java
new file mode 100644
index 00000000000..43f6600e2ae
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Farmer.java
@@ -0,0 +1,137 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.Date;
+
+import org.alfresco.rest.framework.resource.EmbeddedEntityResource;
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Simple mock pojo for serialization
+ *
+ * @author Gethin James
+ */
+public class Farmer
+{
+    public enum size {LARGE,SMALL, MEDIUM}
+    
+    private String name = "Giles";
+    private Date created = new Date();
+    private int age = 54;
+    private String id;
+    private size farm = size.LARGE;
+    private String sheepId;
+    private String goatId;
+    
+    public Farmer()
+    {
+        super();
+    }
+
+    public Farmer(String id)
+    {
+        this.id = id;
+    }
+
+    public String getName()
+    {
+        return this.name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public Date getCreated()
+    {
+        return this.created;
+    }
+
+    public void setCreated(Date created)
+    {
+        this.created = created;
+    }
+
+    public int getAge()
+    {
+        return this.age;
+    }
+
+    public void setAge(int age)
+    {
+        this.age = age;
+    }
+
+    @UniqueId
+    public String getId()
+    {
+        return this.id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public size getFarm()
+    {
+        return this.farm;
+    }
+
+    public void setFarm(size farm)
+    {
+        this.farm = farm;
+    }
+
+    @EmbeddedEntityResource(propertyName = "sheep", entityResource=SheepEntityResource.class)
+    @JsonIgnore
+    public String getSheepId()
+    {
+        return this.sheepId;
+    }
+
+    public void setSheepId(String sheepId)
+    {
+        this.sheepId = sheepId;
+    }
+
+    @EmbeddedEntityResource(propertyName = "goat", entityResource=GoatEntityResource.class)
+    @JsonIgnore
+    public String getGoatId()
+    {
+        return this.goatId;
+    }
+
+    public void setGoatId(String goatId)
+    {
+        this.goatId = goatId;
+    }
+    
+    
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Goat.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Goat.java
new file mode 100644
index 00000000000..502a5fff321
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Goat.java
@@ -0,0 +1,109 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Arrays;
+import java.util.List;
+
+import org.alfresco.rest.framework.resource.EmbeddedEntityResource;
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Simple mock pojo for serialization for relationships
+ *
+ * @author Gethin James
+ */
+public class Goat implements Animal
+{
+    public enum DEMEANOR {ANGRY,CRAZY,MELLOW}
+    private String name = "Billy";
+    private int age = 2;
+    private DEMEANOR mood = DEMEANOR.MELLOW;
+    private String grassId = "3";
+    private List<String> favourites = Arrays.asList("front","back","over the road");
+    
+    public Goat()
+    {
+        super();
+    }
+    
+    public Goat(String grassId)
+    {
+        super();
+        this.grassId = grassId;
+    }
+
+    @JsonProperty("goatId")
+    @UniqueId(name="goatId")
+    public String getName()
+    {
+        return this.name;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+    public int getAge()
+    {
+        return this.age;
+    }
+    public void setAge(int age)
+    {
+        this.age = age;
+    }
+    public DEMEANOR getMood()
+    {
+        return this.mood;
+    }
+    public void setMood(DEMEANOR mood)
+    {
+        this.mood = mood;
+    }
+
+    @EmbeddedEntityResource(propertyName = "grass", entityResource=GrassEntityResource.class)
+    @JsonIgnore
+    public String getGrassId()
+    {
+        return this.grassId;
+    }
+
+    public void setGrassId(String grassId)
+    {
+        this.grassId = grassId;
+    }
+
+    public List<String> getFavourites()
+    {
+        return this.favourites;
+    }
+
+    public void setFavourites(List<String> favourites)
+    {
+        this.favourites = favourites;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/GoatEntityResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/GoatEntityResource.java
new file mode 100644
index 00000000000..106699e9efc
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/GoatEntityResource.java
@@ -0,0 +1,41 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+@EntityResource(name="goat", title="Goat")
+public class GoatEntityResource implements EntityResourceAction.ReadById<Goat>{
+
+    @Override
+    public Goat readById(String id, Parameters parameters)
+    {
+        return new Goat("Goat"+id);
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Grass.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Grass.java
new file mode 100644
index 00000000000..d071cfb5f6c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Grass.java
@@ -0,0 +1,64 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.tests.api.mocks;
+
+/**
+ * Simple mock pojo for serialization for relationships
+ * 
+ * @author Gethin James
+ */
+public class Grass
+{
+    final private String id;
+    private String color = "green";
+
+    public Grass()
+    {
+        this.id = null;
+    }
+
+    public Grass(String id)
+    {
+        super();
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return this.id;
+    }
+
+    public String getColor()
+    {
+        return this.color;
+    }
+
+    public void setColor(String color)
+    {
+        this.color = color;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/GrassEntityResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/GrassEntityResource.java
new file mode 100644
index 00000000000..7659970f0c6
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/GrassEntityResource.java
@@ -0,0 +1,91 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import org.alfresco.rest.framework.Operation;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiNoAuth;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.springframework.extensions.webscripts.Status;
+
+import java.util.List;
+
+@EntityResource(name = "grass", title="Grass")
+public class GrassEntityResource implements EntityResourceAction.ReadById<Grass>, EntityResourceAction.Create<Grass>, EntityResourceAction.Delete, EntityResourceAction.DeleteSet {
+
+    @Override
+    @WebApiDescription(title = "Gets grass by id")
+    @WebApiParam(name = "justone", title = "Only 1 param and its required.",required=true)
+    public Grass readById(String id, Parameters parameters)
+    {
+        return new Grass(id);
+    }
+
+    @Operation("cut")
+    @WebApiDescription(title = "Cut the grass",successStatus = Status.STATUS_NOT_IMPLEMENTED)
+    public String cutLawn(String id, Void notused, Parameters parameters, WithResponse withResponse) {
+        return "All done";
+    }
+
+    @Operation("grow")
+    @WebApiDescription(title = "Grow the grass",successStatus = Status.STATUS_ACCEPTED)
+    @WebApiParam(name = "Grass", title = "The grass.",required=true, kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
+    public String growTheLawn(String id, Grass grass, Parameters parameters, WithResponse withResponse) {
+        return "Growing well";
+    }
+
+    @Override
+    @WebApiDescription(title = "Create some grass")
+    @WebApiParam(name = "entity", title = "The grass.", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT, required=false, allowMultiple = false)
+    public List<Grass> create(List<Grass> entity, Parameters parameters)
+    {
+        return entity;
+    }
+    
+    @Override
+    public void delete(String id, Parameters parameters)
+    {
+        // I did a delete
+    }
+
+    @Override
+    public void deleteSet(Parameters parameters)
+    {
+        // I did delete
+    }
+
+    @Operation("cut-noAuth")
+    @WebApiNoAuth
+    @WebApiDescription(title = "Cut the grass",successStatus = Status.STATUS_NOT_IMPLEMENTED)
+    public String cutLawnWithoutAuth(String id, Void notused, Parameters parameters, WithResponse withResponse) {
+        return "All done without Auth";
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestEntityResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestEntityResource.java
new file mode 100644
index 00000000000..a6aef493f09
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestEntityResource.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.servlet.FormData;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+@EntityResource(name = "multiparttest", title = "multi-part upload test")
+public class MultiPartTestEntityResource
+            implements MultiPartResourceAction.Create<MultiPartTestResponse>
+{
+
+    @Override
+    @WebApiDescription(title = "Creates a multipart", successStatus = Status.STATUS_ACCEPTED)
+    public MultiPartTestResponse create(FormData formData, Parameters parameters, WithResponse withResponse)
+    {
+        return new MultiPartTestResponse(formData.getParameters().get("name")[0]);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestRelationshipResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestRelationshipResource.java
new file mode 100644
index 00000000000..3ba20a74d04
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestRelationshipResource.java
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartRelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.springframework.extensions.webscripts.servlet.FormData;
+
+/**
+ * @author Jamal Kaabi-Mofrad
+ */
+@RelationshipResource(name = "sheepUpload", entityResource = SheepEntityResource.class, title = "Sheep mulitpart upload")
+public class MultiPartTestRelationshipResource
+            implements MultiPartRelationshipResourceAction.Create<MultiPartTestResponse>
+{
+
+    @Override
+    public MultiPartTestResponse create(String entityResourceId, FormData formData,
+                                        Parameters parameters, WithResponse withResponse)
+    {
+        return new MultiPartTestResponse(formData.getParameters().get("filename")[0]);
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestResponse.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestResponse.java
new file mode 100644
index 00000000000..f772009f333
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/MultiPartTestResponse.java
@@ -0,0 +1,48 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.tests.api.mocks;
+
+/**
+ * Simple mock pojo for MultiPart response.
+ *
+ * @author Jamal Kaabi-Mofrad
+ */
+public class MultiPartTestResponse
+{
+
+    private String fileName;
+
+    public MultiPartTestResponse(String fileName)
+    {
+        this.fileName = fileName;
+    }
+
+    public String getFileName()
+    {
+        return this.fileName;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Sheep.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Sheep.java
new file mode 100644
index 00000000000..adc0da9777b
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/Sheep.java
@@ -0,0 +1,79 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Simple mock pojo for serialization for relationships
+ *
+ * @author Gethin James
+ */
+public class Sheep implements Animal
+{
+    private String id;
+    private String name = "Dolly";
+    private int age = 3;
+    
+    public Sheep(String id)
+    {
+        super();
+        this.id = id;
+    }
+
+    @JsonProperty("sheepGuid")
+    @UniqueId(name="sheepGuid")
+    public String getId()
+    {
+        return this.id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getName()
+    {
+        return this.name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public int getAge()
+    {
+        return this.age;
+    }
+
+    public void setAge(int age)
+    {
+        this.age = age;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepBaaaahResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepBaaaahResource.java
new file mode 100644
index 00000000000..65bceaa4a30
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepBaaaahResource.java
@@ -0,0 +1,97 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.Operation;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+
+/**
+ * Implements Get
+ *
+ * @author Gethin James
+ */
+@RelationshipResource(name = "baaahh", entityResource=SheepEntityResource.class, title = "Sheep baaah")
+public class SheepBaaaahResource implements RelationshipResourceAction.Read<Sheep>, RelationshipResourceAction.ReadById<Sheep>, RelationshipResourceBinaryAction.Read, RelationshipResourceBinaryAction.Delete,RelationshipResourceBinaryAction.Update
+{
+
+    @Override
+    public Sheep readById(String entityResourceId, String id, Parameters parameters)
+    {
+        return new Sheep("Z2");
+    }
+
+    @Override
+    public CollectionWithPagingInfo<Sheep> readAll(String entityResourceId, Parameters params)
+    {
+        List<Sheep> toReturn = Arrays.asList(new Sheep("D1"), new Sheep("Z2"), new Sheep("4X"));
+        toReturn = toReturn.subList(0, params.getPaging().getMaxItems()>toReturn.size()?toReturn.size():params.getPaging().getMaxItems());
+        return CollectionWithPagingInfo.asPaged(params.getPaging(),toReturn,toReturn.size()!=3 ,3);
+    }
+
+    @Override
+    @WebApiDescription(title = "Reads a photo")
+    @BinaryProperties("photo")
+    public BinaryResource readProperty(String entityId, String id, Parameters parameters) throws EntityNotFoundException
+    {
+        return null;
+    }
+
+    @Override
+    @WebApiDescription(title = "Deletes a photo")
+    @BinaryProperties("photo")
+    public void deleteProperty(String entityId, String entityResourceId, Parameters parameters)
+    {
+
+    }
+
+    @Override
+    @WebApiDescription(title = "Updates a photo")
+    @BinaryProperties("photo")
+    public Object updateProperty(String entityId, String entityResourceId, BasicContentInfo contentInfo, InputStream stream, Parameters params)
+    {
+        return null;
+    }
+
+    @Operation("chew")
+    public String chewTheGrass(String entityId, String id, Void notused, Parameters parameters, WithResponse withResponse) {
+        return "All done";
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepBaahResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepBaahResource.java
new file mode 100644
index 00000000000..cbb27af50cf
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepBaahResource.java
@@ -0,0 +1,38 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import org.alfresco.rest.framework.resource.RelationshipResource;
+
+/**
+ * Does not implement any actions
+ *
+ * @author Gethin James
+ */
+@RelationshipResource(name = "baah", entityResource=SheepEntityResource.class, title = "Sheep baah")
+public class SheepBaahResource{
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepBlackSheepResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepBlackSheepResource.java
new file mode 100644
index 00000000000..67f46d9dc07
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepBlackSheepResource.java
@@ -0,0 +1,85 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.springframework.extensions.webscripts.Status;
+
+/**
+ * Implements Get
+ * 
+ * @author Gethin James
+ */
+@RelationshipResource(name = "blacksheep",entityResource=SheepEntityResource.class, title = "BlackSheep")
+public class SheepBlackSheepResource implements RelationshipResourceAction.Read<Sheep>,
+            RelationshipResourceAction.Update<Sheep>, RelationshipResourceAction.Delete,
+            RelationshipResourceAction.Create<Sheep>, RelationshipResourceAction.DeleteSet
+{
+
+
+    @Override
+    public CollectionWithPagingInfo<Sheep> readAll(String entityResourceId, Parameters params)
+    {
+        return CollectionWithPagingInfo.asPaged(params.getPaging(),Arrays.asList(new Sheep("D1"), new Sheep("Z2"), new Sheep("4X"), new Sheep("S4")));
+    }
+
+    @Override
+    @WebApiDescription(title = "Deletes only black Sheep", successStatus = Status.STATUS_CONFLICT)
+    public void delete(String entityResourceId, String id, Parameters parameters)
+    {
+    }
+
+    @Override
+    @WebApiDescription(title = "Deletes only black Sheep", successStatus = Status.STATUS_CONFLICT)
+    public void deleteSet(String entityResourceId, Parameters parameters)
+    {
+    }
+
+    @Override
+    public Sheep update(String entityResourceId, Sheep entity, Parameters parameters)
+    {
+        return entity;
+    }
+
+    @Override
+    @WebApiParam(name="entity", title="A single sheep", description="A single sheep, multiples are not supported.", 
+    kind=ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple=false)
+    public List<Sheep> create(String entityResourceId, List<Sheep> entity, Parameters parameters)
+    {
+        return entity;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepEntityResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepEntityResource.java
new file mode 100644
index 00000000000..635c50e1637
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepEntityResource.java
@@ -0,0 +1,77 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.WebApiParameters;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.springframework.extensions.webscripts.Status;
+
+@EntityResource(name=SheepEntityResource.ENTITY_KEY,title="Sheep")
+public class SheepEntityResource implements EntityResourceAction.Read<Sheep>,EntityResourceAction.ReadById<Sheep>, 
+        EntityResourceAction.Update<Sheep>, EntityResourceAction.Delete, EntityResourceAction.DeleteSet
+{
+    public static final String ENTITY_KEY = "sheep";
+
+    @Override
+    public void delete(String id, Parameters parameters)
+    {
+    }
+
+    @Override
+    public void deleteSet(Parameters parameters)
+    {
+    }
+
+    @Override
+    public Sheep update(String id, Sheep entity, Parameters parameters)
+    {
+        return entity;
+    }
+
+    @Override
+    public Sheep readById(String id, Parameters parameters)
+    {
+        return new Sheep(id);
+    }
+
+    @Override
+    @WebApiDescription(title = "Gets all the Sheep", successStatus = Status.STATUS_ACCEPTED)
+    @WebApiParameters({
+                @WebApiParam(name = "siteId", title = "Site id", description="What ever."),
+                @WebApiParam(name = "who", title = "Who", kind=ResourceParameter.KIND.HTTP_HEADER),
+                @WebApiParam(name = "body", title = "aintnobody", kind=ResourceParameter.KIND.HTTP_BODY_OBJECT),
+                @WebApiParam(name = "requiredParam", title = "",required=true, kind=ResourceParameter.KIND.QUERY_STRING)})
+    public CollectionWithPagingInfo<Sheep> readAll(Parameters params)
+    {
+        return CollectionWithPagingInfo.asPagedCollection(new Sheep("paged"));
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepNoActionEntityResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepNoActionEntityResource.java
new file mode 100644
index 00000000000..32609a8ddec
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/SheepNoActionEntityResource.java
@@ -0,0 +1,34 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import org.alfresco.rest.framework.resource.EntityResource;
+
+@EntityResource(name="sheepnoaction",title="No action")
+public class SheepNoActionEntityResource
+{
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/UniqueIdMethodButNoSetter.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/UniqueIdMethodButNoSetter.java
new file mode 100644
index 00000000000..af3a1ab4f19
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/UniqueIdMethodButNoSetter.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Simple mock pojo for serialization testing.
+ * 
+ * This is an invalid class. It has a uniqueId getter method but no setter.
+ *
+ * @author Gethin James
+ */
+public class UniqueIdMethodButNoSetter
+{
+
+    private String name;
+
+    @JsonProperty("id")
+    @UniqueId
+    public String getName()
+    {
+        return this.name;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/package-info.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/package-info.java
new file mode 100644
index 00000000000..21d090aeab1
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="alfrescomock", scope=Api.SCOPE.PRIVATE, version=1)
+package org.alfresco.rest.framework.tests.api.mocks;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/FarmersDaughter.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/FarmersDaughter.java
new file mode 100644
index 00000000000..9bd3b9838fc
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/FarmersDaughter.java
@@ -0,0 +1,84 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks2;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.resource.EmbeddedEntityResource;
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.rest.framework.tests.api.mocks.Farmer;
+import org.alfresco.rest.framework.tests.api.mocks.GrassEntityResource;
+
+/**
+ * This inherits all Farmer's properties and ANNOTATIONS
+ * It adds a new embedded entity which is fine, but it adds another @UniqueId annotation
+ * which is invalid because its already on Farmer
+ *
+ * @author Gethin James
+ */
+public class FarmersDaughter extends Farmer
+{
+    private boolean likesFlowers;
+    String grassId;
+
+    public FarmersDaughter(String id)
+    {
+        super(id);
+        likesFlowers = true;
+    }
+    
+    @EmbeddedEntityResource(propertyName = "specialgrass", entityResource=GrassEntityResource.class)
+    public String getGrassId()
+    {
+        return this.grassId;
+    }
+
+    /**
+     * @return the likesFlowers
+     */
+    @JsonProperty("id")
+    @UniqueId
+    public boolean getLikesFlowers()
+    {
+        return this.likesFlowers;
+    }
+
+    /**
+     * @param likesFlowers the likesFlowers to set
+     */
+    public void setLikesFlowers(boolean likesFlowers)
+    {
+        this.likesFlowers = likesFlowers;
+    }
+
+    /**
+     * @param grassId the grassId to set
+     */
+    public void setGrassId(String grassId)
+    {
+        this.grassId = grassId;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/FarmersGrandson.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/FarmersGrandson.java
new file mode 100644
index 00000000000..dae91fc6551
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/FarmersGrandson.java
@@ -0,0 +1,75 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks2;
+
+import org.alfresco.rest.framework.resource.EmbeddedEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks.GoatEntityResource;
+
+
+/**
+ * This inherits all Farmer's son's properties and ANNOTATIONS
+ *
+ * getSheepId is overidden but no annotation specified (OK)
+ * getGoatId is overidden, a new annotation key is specified (THIS IS NOT RECOMMENDED)
+ * getId is overidden but no annotation specified (OK)
+ * @author Gethin James
+ */
+public class FarmersGrandson extends FarmersSon
+{
+    public FarmersGrandson(String id)
+    {
+        super(id);
+    }
+
+    /*
+     * @see org.alfresco.rest.framework.tests.api.mocks.Farmer#getSheepId()
+     */
+    @Override
+    public String getSheepId()
+    {
+        return super.getSheepId();
+    }
+
+    /*
+     * @see org.alfresco.rest.framework.tests.api.mocks.Farmer#getGoatId()
+     */
+    @Override
+    @EmbeddedEntityResource(propertyName = "grandgoat", entityResource=GoatEntityResource.class)
+    public String getGoatId()
+    {
+        return super.getGoatId();
+    }
+
+    /*
+     * @see org.alfresco.rest.framework.tests.api.mocks2.FarmersSon#getId()
+     */
+    @Override
+    public String getId()
+    {
+        return super.getId();
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/FarmersSon.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/FarmersSon.java
new file mode 100644
index 00000000000..bdcf02c1804
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/FarmersSon.java
@@ -0,0 +1,75 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks2;
+
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.rest.framework.tests.api.mocks.Farmer;
+
+/**
+ * This inherits all Farmer's properties and ANNOTATIONS and just adds
+ * 1 field.
+ * 
+ * It overrides the farmer's getId method (which has a @UniqueId annotation)
+ * specifying the annotation on this class is optional     
+ *
+ * @author Gethin James
+ */
+public class FarmersSon extends Farmer
+{
+    private boolean wearsGlasses;
+
+    public FarmersSon(String id)
+    {
+        super(id);
+        wearsGlasses = true;
+    }
+
+    /**
+     * @return the wearsGlasses
+     */
+    public boolean isWearsGlasses()
+    {
+        return this.wearsGlasses;
+    }
+
+    /**
+     * @param wearsGlasses the wearsGlasses to set
+     */
+    public void setWearsGlasses(boolean wearsGlasses)
+    {
+        this.wearsGlasses = wearsGlasses;
+    }
+
+    /*
+     * @see org.alfresco.rest.framework.tests.api.mocks.Farmer#getId()
+     */
+    @Override
+    @UniqueId
+    public String getId()
+    {
+        return super.getId();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/SheepWasNoActionEntityResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/SheepWasNoActionEntityResource.java
new file mode 100644
index 00000000000..8aef0351df2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/SheepWasNoActionEntityResource.java
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks2;
+
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.tests.api.mocks.Sheep;
+
+/**
+ * A mock version 2 that now does an action
+ * 
+ * @author Gethin James
+ */
+@EntityResource(name="sheepnoaction",title="Sheep No Action has been deprecated.")
+@Deprecated
+public class SheepWasNoActionEntityResource implements EntityResourceAction.ReadById<Sheep> 
+{
+
+    @Override
+    @Deprecated
+    public Sheep readById(String id, Parameters parameters)
+    {
+        return new Sheep(id);
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/package-info.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/package-info.java
new file mode 100644
index 00000000000..a0e045bb918
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks2/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="alfrescomock", scope=Api.SCOPE.PRIVATE, version=2)
+package org.alfresco.rest.framework.tests.api.mocks2;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/CameraShyFlocket.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/CameraShyFlocket.java
new file mode 100755
index 00000000000..6dea43b2b1a
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/CameraShyFlocket.java
@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks3;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.alfresco.rest.framework.resource.content.BinaryProperty;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+
+/**
+ * A small Flock that doesn't want to have a Photo.
+ *
+ * @author Gethinjames
+ */
+public class CameraShyFlocket extends Flocket
+{
+
+    @Override
+    @JsonIgnore
+    public BinaryProperty getPhoto()
+    {
+        return super.getPhoto();
+    }
+
+    @Override
+    @JsonIgnore
+    public CollectionWithPagingInfo<BinaryProperty> getPhotoAlbum()
+    {
+        return super.getPhotoAlbum();
+    }
+    
+    
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/Flock.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/Flock.java
new file mode 100755
index 00000000000..45e7fdbc994
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/Flock.java
@@ -0,0 +1,92 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks3;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.rest.framework.resource.content.BinaryProperty;
+import org.alfresco.rest.framework.tests.api.mocks.Sheep;
+/*
+ * A Flock of Sheep
+ */
+public class Flock
+{
+    String name;
+    int quantity = 25;
+    List<Sheep> sheep;
+    BinaryProperty photo;
+ 
+    public Flock()
+    {
+        super();
+    }
+    
+    public Flock(String name, int quantity, List<Sheep> sheep, BinaryProperty photo)
+    {
+        super();
+        this.name = name;
+        this.quantity = quantity;
+        this.sheep = sheep;
+        this.photo = photo;
+    }
+
+    @JsonProperty("id")
+    @UniqueId
+    public String getName()
+    {
+        return this.name;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+    public int getQuantity()
+    {
+        return this.quantity;
+    }
+    public void setQuantity(int quantity)
+    {
+        this.quantity = quantity;
+    }
+    public List<Sheep> getSheep()
+    {
+        return this.sheep;
+    }
+    public void setSheep(List<Sheep> sheep)
+    {
+        this.sheep = sheep;
+    }
+    public BinaryProperty getPhoto()
+    {
+        return this.photo;
+    }
+    public void setPhoto(BinaryProperty photo)
+    {
+        this.photo = photo;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/FlockEntityResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/FlockEntityResource.java
new file mode 100755
index 00000000000..99b42018e50
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/FlockEntityResource.java
@@ -0,0 +1,75 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks3;
+
+import java.io.File;
+import java.io.InputStream;
+
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.content.FileBinaryResource;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.TempFileProvider;
+import org.springframework.extensions.webscripts.Status;
+
+@EntityResource(name="flock",title="A resource used for testing binary properties")
+public class FlockEntityResource implements BinaryResourceAction.Read, BinaryResourceAction.Delete, BinaryResourceAction.Update<Flock>
+{
+
+    //versions/1/flock/xyz/photo PUT
+    @Override
+    @WebApiDescription(title = "Updates a photo")
+    @BinaryProperties("photo")
+    public Flock updateProperty(String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params)
+    {
+        return null;
+    }
+
+    //versions/1/flock/xyz/photo DELETE
+    @Override
+    @WebApiDescription(title = "Deletes a photo")
+    @BinaryProperties("photo")
+    public void deleteProperty(String entityId, Parameters parameters)
+    {
+    }
+
+    //versions/1/flock/xyz/photo GET
+    @Override
+    @WebApiDescription(title = "Reads a photo as a Stream", successStatus = Status.STATUS_FOUND)
+    @BinaryProperties("photo")
+    public BinaryResource readProperty(String entityId, Parameters parameters) throws EntityNotFoundException
+    {
+        
+        File file = TempFileProvider.createTempFile("doesn't matter", ".txt");
+        return new FileBinaryResource(file);
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/Flocket.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/Flocket.java
new file mode 100755
index 00000000000..f64afc23591
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/Flocket.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks3;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.resource.content.BinaryProperty;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+
+/**
+ * A small Flock
+ *
+ * @author Gethinjames
+ */
+public class Flocket extends Flock
+{
+    @JsonProperty(value="album")
+    CollectionWithPagingInfo<BinaryProperty> photoAlbum;
+    
+    public Flocket()
+    {
+        super();
+        setQuantity(6);
+    }
+
+    public CollectionWithPagingInfo<BinaryProperty> getPhotoAlbum()
+    {
+        return this.photoAlbum;
+    }
+
+    public void setPhotoAlbum(CollectionWithPagingInfo<BinaryProperty> photoAlbum)
+    {
+        this.photoAlbum = photoAlbum;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/FlocketEntityResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/FlocketEntityResource.java
new file mode 100755
index 00000000000..63f18563afc
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/FlocketEntityResource.java
@@ -0,0 +1,66 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks3;
+
+import java.io.InputStream;
+
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.content.BasicContentInfo;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+@EntityResource(name="flocket",title="A resource used for testing binary properties with lost of properties")
+public class FlocketEntityResource implements BinaryResourceAction.Read, BinaryResourceAction.Delete, BinaryResourceAction.Update<Flocket>
+{
+
+    @Override
+    @WebApiDescription(title = "Updates a flocket")
+    @BinaryProperties({"photo","album"})
+    public Flocket updateProperty(String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params)
+    {
+        return null;
+    }
+
+    @Override
+    @WebApiDescription(title = "Deletes a photo")
+    @BinaryProperties("photo")
+    public void deleteProperty(String entityId, Parameters parameters)
+    {
+    }
+
+    @Override
+    @WebApiDescription(title = "Reads a photo as a Stream")
+    @BinaryProperties({"photo","album", "madeUpProp"})
+    public BinaryResource readProperty(String entityId, Parameters parameters) throws EntityNotFoundException
+    {
+        return null;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/GoatEntityResourceForV3.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/GoatEntityResourceForV3.java
new file mode 100644
index 00000000000..4c6b7bd7827
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/GoatEntityResourceForV3.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks3;
+
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+/**
+ * A mock version 3 Goat Entity resource.
+ * 
+ * This replaces the Goat Entity resource for version 1.  Instead of returning a Goat it now
+ * returns a Slim Goat with only 2 properties instead of the original 5
+ * 
+ * @author Gethin James
+ */
+@EntityResource(name="goat",title="This replaces the Goat Entity resource for version 1")
+public class GoatEntityResourceForV3 implements EntityResourceAction.ReadById<SlimGoat>{
+
+    @Override
+    public SlimGoat readById(String id, Parameters parameters)
+    {
+        return new SlimGoat();
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/GoatRelationshipResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/GoatRelationshipResource.java
new file mode 100644
index 00000000000..df803e5394f
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/GoatRelationshipResource.java
@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks3;
+
+import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
+import org.alfresco.rest.framework.resource.content.BinaryResource;
+import org.alfresco.rest.framework.resource.content.FileBinaryResource;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.util.TempFileProvider;
+
+import java.io.File;
+
+/**
+ * The goat has a herd
+ * 
+ * @author Gethin James
+ */
+@RelationshipResource(name = "herd",entityResource=GoatEntityResourceForV3.class, title = "Goat Herd")
+public class GoatRelationshipResource implements RelationshipResourceAction.Read<Herd>,  RelationshipResourceBinaryAction.Read, RelationshipResourceBinaryAction.Delete
+{
+    @Override
+    public CollectionWithPagingInfo<Herd> readAll(String entityResourceId, Parameters params)
+    {
+        return CollectionWithPagingInfo.asPagedCollection(new Herd("bigun"));
+    }
+
+    @WebApiDescription(title = "Download content", description = "Download content")
+    @BinaryProperties({"content"})
+    public BinaryResource readProperty(String herdId, String entityResourceId, Parameters parameters) throws EntityNotFoundException
+    {
+        File file = TempFileProvider.createTempFile("Its a goat", ".txt");
+        return new FileBinaryResource(file);
+    }
+
+    @Override
+    @BinaryProperties({"content"})
+    public void deleteProperty(String entityId, String entityResourceId, Parameters parameters)
+    {
+        //Its deleted
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/GrassEntityResourceNowDeleted.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/GrassEntityResourceNowDeleted.java
new file mode 100644
index 00000000000..557197dbba1
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/GrassEntityResourceNowDeleted.java
@@ -0,0 +1,41 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks3;
+
+import org.alfresco.rest.framework.WebApiDeleted;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.tests.api.mocks.GrassEntityResource;
+
+/**
+ * Marks this entity resource as deleted.
+ * @author Gethin James
+ */
+@WebApiDeleted
+@EntityResource(name = "grass",title="Marked this Grass entity resource as deleted.")
+public class GrassEntityResourceNowDeleted extends GrassEntityResource 
+{
+    
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/Herd.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/Herd.java
new file mode 100644
index 00000000000..705abac6cdd
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/Herd.java
@@ -0,0 +1,76 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks3;
+
+/**
+ * A goat has a herd
+ *
+ * @author Gethin James
+ */
+public class Herd
+{
+    String name;
+    int quantity = 56;
+    
+    public Herd(String name)
+    {
+        super();
+        this.name = name;
+    }
+
+    /**
+     * @return the name
+     */
+    public String getName()
+    {
+        return this.name;
+    }
+
+    /**
+     * @param name the name to set
+     */
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    /**
+     * @return the quantity
+     */
+    public int getQuantity()
+    {
+        return this.quantity;
+    }
+
+    /**
+     * @param quantity the quantity to set
+     */
+    public void setQuantity(int quantity)
+    {
+        this.quantity = quantity;
+    }
+    
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/SheepBaaaahResourceV3.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/SheepBaaaahResourceV3.java
new file mode 100644
index 00000000000..411e9e4093a
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/SheepBaaaahResourceV3.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks3;
+
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.tests.api.mocks.Sheep;
+import org.alfresco.rest.framework.tests.api.mocks.SheepNoActionEntityResource;
+
+/**
+ * A mock version 3 relationship resource.  This is attached to the SheepNoActionEntityResource action (version 1).
+ * In version 1, SheepNoActionEntityResource did no action.
+ * In version 2, SheepNoActionEntityResource was overridden by SheepWasNoActionEntityResource and given an action
+ * In this version (3) - a relationship resource is being added to the ORIGNAL entity (which has been overridden).
+ * 
+ * It is expected that this is correct behavior.  This relationship resource could have been attached to either
+ * the SheepNoActionEntityResource or the SheepWasNoActionEntityResource with the same result.  This is because
+ * they both use the same entity key (name="sheepnoaction")
+ * 
+ * @author Gethin James
+ */
+@RelationshipResource(name = "v3isaresource", entityResource=SheepNoActionEntityResource.class, title = "Sheep Version 3 resource")
+public class SheepBaaaahResourceV3 implements RelationshipResourceAction.ReadById<Sheep>
+{
+
+    @Override
+    public Sheep readById(String entityResourceId, String id, Parameters parameters)
+    {
+        return new Sheep("Z2");
+    }
+
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/SheepBlackSheepResourceIsNoMore.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/SheepBlackSheepResourceIsNoMore.java
new file mode 100644
index 00000000000..2c21cda8bb2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/SheepBlackSheepResourceIsNoMore.java
@@ -0,0 +1,41 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks3;
+
+import org.alfresco.rest.framework.WebApiDeleted;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.tests.api.mocks.SheepEntityResource;
+
+/**
+ * This relationship has been deleted
+ * 
+ * @author Gethin James
+ */
+@WebApiDeleted
+@RelationshipResource(name = "blacksheep",entityResource=SheepEntityResource.class, title = "blacksheep NOW DELETED relationship")
+public class SheepBlackSheepResourceIsNoMore {
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/SheepEntityResourceWithDeletedMethods.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/SheepEntityResourceWithDeletedMethods.java
new file mode 100644
index 00000000000..24811a929b7
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/SheepEntityResourceWithDeletedMethods.java
@@ -0,0 +1,83 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks3;
+
+import org.alfresco.rest.framework.WebApiDeleted;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.tests.api.mocks.Sheep;
+import org.alfresco.rest.framework.tests.api.mocks.SheepEntityResource;
+
+/**
+ * This no longer does all the actions.
+ * 
+ * The original SheepEntityResource has actions: update, readById, readAll, delete, deleteSet
+ * update, delete and deleteSet methods are marked as deleted
+ * readAll is untouched - (only present in SheepEntityResource);
+ * readById is overridden.
+ *
+ * @author Gethin James
+ */
+public class SheepEntityResourceWithDeletedMethods extends SheepEntityResource 
+{
+    /**
+     * @see org.alfresco.rest.framework.tests.api.mocks.SheepEntityResource#update(java.lang.String, org.alfresco.rest.framework.tests.api.mocks.Sheep)
+     */
+    @Override
+    @WebApiDeleted
+    public Sheep update(String id, Sheep entity, Parameters parameters)
+    {
+        return null; //No implementation because its deleted
+    }
+
+    /**
+     * @see org.alfresco.rest.framework.tests.api.mocks.SheepEntityResource#readById(java.lang.String)
+     */
+    @Override
+    public Sheep readById(String id, Parameters parameters)
+    {
+        return new Sheep("v3_"+id);
+    }
+
+    /**
+     * @see org.alfresco.rest.framework.tests.api.mocks.SheepEntityResource#delete(java.lang.String)
+     */
+    @Override
+    @WebApiDeleted
+    public void delete(String id, Parameters parameters)
+    {
+        //No implementation because its deleted
+    }
+
+    /**
+     * @see org.alfresco.rest.framework.tests.api.mocks.SheepEntityResource#deleteSet(java.lang.String)
+     */
+    @Override
+    @WebApiDeleted
+    public void deleteSet(Parameters parameters)
+    {
+        //No implementation because its deleted
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/SlimGoat.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/SlimGoat.java
new file mode 100644
index 00000000000..e30f4c3251e
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/SlimGoat.java
@@ -0,0 +1,68 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks3;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.rest.framework.tests.api.mocks.Animal;
+import org.alfresco.rest.framework.tests.api.mocks.Goat;
+
+/**
+ * Simple mock pojo for serialization for relationships
+ *
+ * @author Gethin James
+ */
+public class SlimGoat implements Animal
+{
+    String name = "Betty";
+    Goat.DEMEANOR mood = Goat.DEMEANOR.ANGRY;
+    
+    public SlimGoat()
+    {
+        super();
+    }
+
+    @JsonProperty("id")
+    @UniqueId
+    public String getName()
+    {
+        return this.name;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+ 
+    public Goat.DEMEANOR getMood()
+    {
+        return this.mood;
+    }
+    public void setMood(Goat.DEMEANOR mood)
+    {
+        this.mood = mood;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/package-info.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/package-info.java
new file mode 100644
index 00000000000..6942fb9b301
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks3/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="alfrescomock", scope=Api.SCOPE.PRIVATE, version=3)
+package org.alfresco.rest.framework.tests.api.mocks3;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeA1.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeA1.java
new file mode 100644
index 00000000000..ec31327615d
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeA1.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks4;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.rest.framework.tests.api.mocks.Animal;
+import org.alfresco.rest.framework.tests.api.mocks.Goat;
+
+/**
+ * Simple mock pojo for TypeA1
+ *
+ * @author janv
+ */
+public class TypeA1
+{
+    String name;
+
+    public TypeA1(String id)
+    {
+        super();
+        name = id;
+    }
+
+    @JsonProperty("id")
+    @UniqueId
+    public String getName()
+    {
+        return this.name;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeA1EntityResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeA1EntityResource.java
new file mode 100644
index 00000000000..6c2e060d5ec
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeA1EntityResource.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks4;
+
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+/**
+ * Simple mock for EntityResource for TypeA1
+ *
+ * @author janv
+ */
+@EntityResource(name="type-a1", title="TypeA")
+public class TypeA1EntityResource implements EntityResourceAction.ReadById<TypeA1>{
+
+    // GET /type-a1/a1
+    @Override
+    public TypeA1 readById(String id, Parameters parameters)
+    {
+        return new TypeA1("a1");
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeA1toB1RelationshipResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeA1toB1RelationshipResource.java
new file mode 100644
index 00000000000..02598ca5a46
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeA1toB1RelationshipResource.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks4;
+
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+/**
+ * Simple mock for RelationshipResource for relation TypeA1 to TypeB1
+ *
+ * @author janv
+ */
+@RelationshipResource(name = "relation-a1-b1", entityResource=TypeA1EntityResource.class, title = "Relation Type A1 to Type B1")
+public class TypeA1toB1RelationshipResource implements RelationshipResourceAction.ReadById<TypeB1>
+{
+    // GET /type-a1/a1/relation-a1-b1/b1
+    @Override
+    public TypeB1 readById(String typeA1EntityResourceId, String typeB1EntityResourceId, Parameters parameters)
+    {
+        return new TypeB1("b1");
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeA1toB2RelationshipResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeA1toB2RelationshipResource.java
new file mode 100644
index 00000000000..6968b5e1f40
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeA1toB2RelationshipResource.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks4;
+
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+/**
+ * Simple mock for RelationshipResource for relation TypeA1 to TypeB2
+ *
+ * @author janv
+ */
+@RelationshipResource(name = "relation-a1-b2", entityResource=TypeA1EntityResource.class, title = "Relation Type A1 to Type B2")
+public class TypeA1toB2RelationshipResource implements RelationshipResourceAction.ReadById<TypeB2>
+{
+    // GET /type-a1/a1/relation-a1-b2/b2
+    @Override
+    public TypeB2 readById(String typeA1EntityResourceId, String typeB2EntityResourceId, Parameters parameters)
+    {
+        return new TypeB2("b2");
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB1.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB1.java
new file mode 100644
index 00000000000..0c32a0a050e
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB1.java
@@ -0,0 +1,56 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks4;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Simple mock pojo for TypeB1
+ *
+ * @author janv
+ */
+public class TypeB1
+{
+    String name;
+
+    public TypeB1(String id)
+    {
+        super();
+        name = id;
+    }
+
+    @JsonProperty("id")
+    @UniqueId
+    public String getName()
+    {
+        return this.name;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB1EntityResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB1EntityResource.java
new file mode 100644
index 00000000000..27895662b60
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB1EntityResource.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks4;
+
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+/**
+ * Simple mock for EntityResource for TypeB1
+ *
+ * @author janv
+ */
+@EntityResource(name="type-b1", title="TypeB1")
+public class TypeB1EntityResource implements EntityResourceAction.ReadById<TypeB1>{
+
+    // GET /type-b1/b1
+    @Override
+    public TypeB1 readById(String id, Parameters parameters)
+    {
+        return new TypeB1("b1");
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB1toC1RelationshipResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB1toC1RelationshipResource.java
new file mode 100644
index 00000000000..a94fc327c68
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB1toC1RelationshipResource.java
@@ -0,0 +1,48 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks4;
+
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+/**
+ * Simple mock for RelationshipResource for relation TypeB1 to TypeC1
+ *
+ * note: with entityResource = TypeA1toB1RelationshipResource (rather than just TypeBEntityResource)
+ *
+ * @author janv
+ */
+@RelationshipResource(name = "relation-b1-c1", entityResource= TypeA1toB1RelationshipResource.class, title = "Relation Type B1 to Type C1")
+public class TypeB1toC1RelationshipResource implements RelationshipResourceAction.ReadById<TypeC1>
+{
+    // GET /type-a1/a1/type-b1/b1/relation-b1-c1/c1
+    @Override
+    public TypeC1 readById(String typeBEntityResourceId, String typeCEntityResourceId, Parameters parameters)
+    {
+        return new TypeC1("c1");
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB2.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB2.java
new file mode 100644
index 00000000000..2e42b6bfcdf
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB2.java
@@ -0,0 +1,56 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks4;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Simple mock pojo for TypeB2
+ *
+ * @author janv
+ */
+public class TypeB2
+{
+    String name;
+
+    public TypeB2(String id)
+    {
+        super();
+        name = id;
+    }
+
+    @JsonProperty("id")
+    @UniqueId
+    public String getName()
+    {
+        return this.name;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB2EntityResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB2EntityResource.java
new file mode 100644
index 00000000000..b3ce67bea74
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeB2EntityResource.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks4;
+
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+/**
+ * Simple mock for EntityResource for TypeB2
+ *
+ * @author janv
+ */
+@EntityResource(name="type-b2", title="TypeB2")
+public class TypeB2EntityResource implements EntityResourceAction.ReadById<TypeB2>{
+
+    // GET /type-b2/b2
+    @Override
+    public TypeB2 readById(String id, Parameters parameters)
+    {
+        return new TypeB2("b2");
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeC1.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeC1.java
new file mode 100644
index 00000000000..8f8c029c828
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeC1.java
@@ -0,0 +1,56 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks4;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.alfresco.rest.framework.resource.UniqueId;
+
+/**
+ * Simple mock pojo for TypeC1
+ *
+ * @author janv
+ */
+public class TypeC1
+{
+    String name;
+
+    public TypeC1(String id)
+    {
+        super();
+        name = id;
+    }
+
+    @JsonProperty("id")
+    @UniqueId
+    public String getName()
+    {
+        return this.name;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeC1EntityResource.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeC1EntityResource.java
new file mode 100644
index 00000000000..213c05e00d2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/TypeC1EntityResource.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.api.mocks4;
+
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+
+/**
+ * Simple mock for EntityResource for TypeC1
+ *
+ * @author janv
+ */
+@EntityResource(name="type-c1", title="TypeC1")
+public class TypeC1EntityResource implements EntityResourceAction.ReadById<TypeC1>{
+
+    // GET /type-c/c1
+    @Override
+    public TypeC1 readById(String id, Parameters parameters)
+    {
+        return new TypeC1("c1");
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/package-info.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/package-info.java
new file mode 100644
index 00000000000..69beba675ff
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/api/mocks4/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+@WebApi(name="alfrescomockabc", scope=Api.SCOPE.PRIVATE, version=1)
+package org.alfresco.rest.framework.tests.api.mocks4;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.WebApi;
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/AbstractContextTest.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/AbstractContextTest.java
new file mode 100644
index 00000000000..28d927da276
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/AbstractContextTest.java
@@ -0,0 +1,132 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.core;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.ResourceDictionaryBuilder;
+import org.alfresco.rest.framework.core.ResourceLookupDictionary;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.tools.ApiAssistant;
+import org.alfresco.rest.framework.tools.ResponseWriter;
+import org.alfresco.rest.framework.webscripts.AbstractResourceWebScript;
+import org.alfresco.rest.framework.webscripts.ApiWebScript;
+import org.alfresco.rest.framework.webscripts.ResourceWebScriptHelper;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.service.transaction.TransactionService;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.Map;
+
+/**
+ * Uses a test context and sets up some data.
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:test-rest-context.xml" })
+public abstract class AbstractContextTest
+{
+    @Autowired
+    ResourceLookupDictionary locator;
+
+    @Autowired
+    ApplicationContext applicationContext;
+
+    @Autowired
+    ResourceWebScriptHelper helper;
+
+    @Autowired
+    JacksonHelper jsonHelper;
+
+    @Autowired
+    ApiAssistant apiAssistant;
+
+    static Params NOT_USED = Params.valueOf("notUsed", null, mock(WebScriptRequest.class));
+    static final Params.RecognizedParams NULL_PARAMS = new Params.RecognizedParams(null, null, null, null, null, null, null, null, false);
+    static final WithResponse callBack = new WithResponse(Status.STATUS_OK, ResponseWriter.DEFAULT_JSON_CONTENT,ResponseWriter.CACHE_NEVER);
+    static Api api = Api.valueOf("alfrescomock", "private", "1");
+
+    @SuppressWarnings("unchecked")
+    @Before
+    public void setUp() throws Exception
+    {
+        Map<String, Object> entityResourceBeans = applicationContext.getBeansWithAnnotation(EntityResource.class);
+        Map<String, Object> relationResourceBeans = applicationContext.getBeansWithAnnotation(RelationshipResource.class);
+        locator.setDictionary(ResourceDictionaryBuilder.build(entityResourceBeans.values(), relationResourceBeans.values()));
+        AbstractResourceWebScript executor = (AbstractResourceWebScript) applicationContext.getBean("executorOfGets");
+        AbstractResourceWebScript postExecutor = (AbstractResourceWebScript) applicationContext.getBean("executorOfPost");
+        AbstractResourceWebScript putExecutor = (AbstractResourceWebScript) applicationContext.getBean("executorOfPut");
+        AbstractResourceWebScript deleteExecutor = (AbstractResourceWebScript) applicationContext.getBean("executorOfDelete");
+
+        //Mock transaction service
+        TransactionService transerv = mock(TransactionService.class);
+        RetryingTransactionHelper tHelper = mock(RetryingTransactionHelper.class);
+        when(transerv.getRetryingTransactionHelper()).thenReturn(tHelper);
+        when(tHelper.doInTransaction(any(RetryingTransactionHelper.RetryingTransactionCallback.class), anyBoolean(), anyBoolean())).thenAnswer(new Answer<Object>() {
+            @SuppressWarnings("rawtypes")
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                RetryingTransactionHelper.RetryingTransactionCallback cb = (RetryingTransactionHelper.RetryingTransactionCallback) args[0];
+                return cb.execute();
+            }
+        });
+        executor.setTransactionService(transerv);
+        postExecutor.setTransactionService(transerv);
+        putExecutor.setTransactionService(transerv);
+        deleteExecutor.setTransactionService(transerv);
+    }
+
+    protected AbstractResourceWebScript getExecutor()
+    {
+        return getExecutor("executorOfGets");
+    }
+
+    protected AbstractResourceWebScript getExecutor(String beanName)
+    {
+        AbstractResourceWebScript executor = (AbstractResourceWebScript) applicationContext.getBean(beanName);
+        executor.setLocator(locator);
+        executor.setAssistant(apiAssistant);
+        return executor;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/AllRestFrameworkTest.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/AllRestFrameworkTest.java
new file mode 100644
index 00000000000..397c9807b81
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/AllRestFrameworkTest.java
@@ -0,0 +1,45 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.core;
+
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractorTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * Runs all the tests for the Public Rest Framework
+ * @author Gethin James
+ */
+@RunWith(Suite.class)
+@SuiteClasses({ InspectorTests.class, JsonJacksonTests.class, ParamsExtractorTests.class,
+            ResourceLocatorTests.class, SerializeTests.class,
+            WhereTests.class, ExecutionTests.class, WithResponseTest.class,
+            ExceptionResolverTests.class, RecognizedParamsExtractorTest.class})
+public class AllRestFrameworkTest
+{
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ExceptionResolverTests.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ExceptionResolverTests.java
new file mode 100644
index 00000000000..0aedab08acb
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ExceptionResolverTests.java
@@ -0,0 +1,125 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import org.alfresco.repo.forms.FormNotFoundException;
+import org.alfresco.repo.node.integrity.IntegrityException;
+import org.alfresco.rest.framework.core.exceptions.ApiException;
+import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
+import org.alfresco.rest.framework.core.exceptions.DeletedResourceException;
+import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.ErrorResponse;
+import org.alfresco.rest.framework.core.exceptions.InsufficientStorageException;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException;
+import org.alfresco.rest.framework.core.exceptions.StaleEntityException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.resource.parameters.where.InvalidQueryException;
+import org.alfresco.rest.framework.tools.ApiAssistant;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.extensions.webscripts.WebScriptException;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import javax.servlet.http.HttpServletResponse;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:test-rest-context.xml" })
+public class ExceptionResolverTests
+{
+    @Autowired
+    ApiAssistant assistant;
+
+    @Test
+    public void testWebscriptException()
+    {
+        ErrorResponse response = assistant.resolveException(new WebScriptException(null));
+        assertNotNull(response);
+        assertEquals(500, response.getStatusCode());  //default to INTERNAL_SERVER_ERROR
+
+        response = assistant.resolveException(new WebScriptException(HttpServletResponse.SC_UNAUTHORIZED, "Authentication failed for Web Script "));
+        assertNotNull(response);
+        assertEquals(HttpServletResponse.SC_UNAUTHORIZED, response.getStatusCode());  //default to INTERNAL_SERVER_ERROR
+    }
+
+    //04180006 Authentication failed for Web Script org/alfresco/api/ResourceWebScript.get
+    @Test
+    public void testMatchException()
+    {
+        ErrorResponse response = assistant.resolveException(new ApiException(null));
+        assertNotNull(response);
+        assertEquals(500, response.getStatusCode());  //default to INTERNAL_SERVER_ERROR
+       
+        response = assistant.resolveException(new InvalidArgumentException(null));
+        assertEquals(400, response.getStatusCode());  //default to STATUS_BAD_REQUEST
+
+        response = assistant.resolveException(new InvalidQueryException(null));
+        assertEquals(400, response.getStatusCode());  //default to STATUS_BAD_REQUEST
+        
+        response = assistant.resolveException(new NotFoundException(null));
+        assertEquals(404, response.getStatusCode());  //default to STATUS_NOT_FOUND
+        
+        response = assistant.resolveException(new EntityNotFoundException(null));
+        assertEquals(404, response.getStatusCode());  //default to STATUS_NOT_FOUND
+
+        response = assistant.resolveException(new RelationshipResourceNotFoundException(null, null));
+        assertEquals(404, response.getStatusCode());  //default to STATUS_NOT_FOUND
+
+        response = assistant.resolveException(new PermissionDeniedException(null));
+        assertEquals(403, response.getStatusCode());  //default to STATUS_FORBIDDEN
+
+        response = assistant.resolveException(new UnsupportedResourceOperationException(null));
+        assertEquals(405, response.getStatusCode());  //default to STATUS_METHOD_NOT_ALLOWED
+
+        response = assistant.resolveException(new DeletedResourceException(null));
+        assertEquals(405, response.getStatusCode());  //default to STATUS_METHOD_NOT_ALLOWED
+        
+        response = assistant.resolveException(new ConstraintViolatedException(null));
+        assertEquals(409, response.getStatusCode());  //default to STATUS_CONFLICT    
+        
+        response = assistant.resolveException(new StaleEntityException(null));
+        assertEquals(409, response.getStatusCode());  //default to STATUS_CONFLICT    
+
+        //Try a random exception
+        response = assistant.resolveException(new FormNotFoundException(null));
+        assertEquals(500, response.getStatusCode());  //default to INTERNAL_SERVER_ERROR
+
+        response = assistant.resolveException(new InsufficientStorageException(null));
+        assertEquals(507, response.getStatusCode());
+
+        response = assistant.resolveException(new IntegrityException(null));
+        assertEquals(422, response.getStatusCode());
+        
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ExecutionTests.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ExecutionTests.java
new file mode 100644
index 00000000000..4d11f8f8814
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ExecutionTests.java
@@ -0,0 +1,364 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+ 
+package org.alfresco.rest.framework.tests.core;
+
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.ResourceLocator;
+import org.alfresco.rest.framework.core.ResourceLookupDictionary;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.core.exceptions.*;
+import org.alfresco.rest.framework.jacksonextensions.ExecutionResult;
+import org.alfresco.rest.framework.resource.actions.ActionExecutor;
+import org.alfresco.rest.framework.resource.content.ContentInfo;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.tests.api.mocks.CowEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks.Goat;
+import org.alfresco.rest.framework.tests.api.mocks.Grass;
+import org.alfresco.rest.framework.tests.api.mocks.Sheep;
+import org.alfresco.rest.framework.tests.api.mocks3.FlockEntityResource;
+import org.alfresco.rest.framework.tools.ApiAssistant;
+import org.alfresco.rest.framework.tools.ResponseWriter;
+import org.alfresco.rest.framework.webscripts.AbstractResourceWebScript;
+import org.alfresco.rest.framework.webscripts.ApiWebScript;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.http.HttpMethod;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Tests the execution of resources
+ */
+
+public class ExecutionTests extends AbstractContextTest implements ResponseWriter
+{
+    static final Api api3 = Api.valueOf("alfrescomock", "private", "3");
+
+    @Autowired
+    SimpleMappingExceptionResolver simpleMappingExceptionResolver;
+
+    @Test
+    public void testInvokeGet() throws IOException
+    {
+        ResourceWithMetadata entityResource = locator.locateEntityResource(api,"sheep", HttpMethod.GET);
+        AbstractResourceWebScript executor = getExecutor();
+        Object result = executor.execute(entityResource, Params.valueOf((String)null, null, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), true);
+        assertNotNull(result);
+
+        WebScriptResponse response = mock(WebScriptResponse.class);
+        entityResource = locator.locateEntityResource(api,"cow", HttpMethod.GET);
+        result = executor.execute(entityResource, Params.valueOf((String)null, null, mock(WebScriptRequest.class)), response, true);
+        assertNotNull(result);
+        verify(response, times(1)).setCache((Cache) ResponseWriter.CACHE_NEVER);
+
+        response = mock(WebScriptResponse.class);
+        result = executor.execute(entityResource, Params.valueOf("543", null, mock(WebScriptRequest.class)),  response, true);
+        assertNotNull(result);
+        verify(response, times(1)).setCache((Cache) CowEntityResource.CACHE_COW);
+
+        ResourceWithMetadata baa = locator.locateRelationResource(api,"sheep", "baaahh", HttpMethod.GET);
+        result = executor.execute(baa, Params.valueOf("4", null, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), true);
+        assertNotNull(result);
+
+        executor.execute(baa, Params.valueOf("4", "45", mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), true);
+        assertNotNull(result);
+
+        ResourceWithMetadata cowResource = locator.locateRelationResource(api,"cow","photo", HttpMethod.GET);
+        result = executor.execute(cowResource, Params.valueOf("4", null, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), true);
+        assertNull(result);
+
+        ResourceWithMetadata calf = locator.locateRelationResource(api,"cow", "calf", HttpMethod.GET);
+        result = executor.execute(calf, Params.valueOf("4", null, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), true);
+        assertNotNull(result);
+
+        executor.execute(calf, Params.valueOf("4", "45", mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), true);
+        assertNotNull(result);
+
+        calf = locator.locateRelationResource(api,"cow/{entityId}/calf", "photo", HttpMethod.GET);
+        executor.execute(calf, Params.valueOf("4", "45", mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), true);
+        assertNotNull(result);
+
+        ResourceWithMetadata baaPhoto = locator.locateRelationResource(api,"sheep/{entityId}/baaahh", "photo", HttpMethod.GET);
+        executor.execute(baaPhoto, Params.valueOf("4", "45", mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), true);
+        assertNotNull(result);
+    }
+
+    @Test
+    public void testInvokePost() throws IOException
+    {
+        AbstractResourceWebScript executor = getExecutor("executorOfPost");
+
+        ResourceWithMetadata resource = locator.locateRelationResource(api, "sheep", "blacksheep", HttpMethod.POST);
+        final Sheep aSheep = new Sheep("xyz");
+
+        Object result = executor.execute(resource, Params.valueOf("654", null, NULL_PARAMS, Arrays.asList(aSheep), mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNotNull(result);
+        assertEquals(aSheep,((ExecutionResult)result).getRoot());
+
+        ResourceWithMetadata grassResource = locator.locateEntityResource(api,"grass", HttpMethod.POST);
+        final Grass grr = new Grass("grr");
+        result = executor.execute(grassResource, Params.valueOf("654", null, NULL_PARAMS, Arrays.asList(grr), mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertEquals(grr,((ExecutionResult)result).getRoot());
+
+        final Goat goat = new Goat("xyz");
+        ResourceWithMetadata cowresource = locator.locateEntityResource(api,"cow", HttpMethod.POST);
+        WebScriptResponse response = mock(WebScriptResponse.class);
+        result = executor.execute(cowresource, Params.valueOf("654", null, NULL_PARAMS, Arrays.asList(goat), mock(WebScriptRequest.class)),  response, false);
+        assertEquals(goat,((ExecutionResult)result).getRoot());
+        verify(response, times(1)).setStatus(Status.STATUS_ACCEPTED);
+
+        ResourceWithMetadata entityResource = locator.locateRelationResource(api,"grass", "grow", HttpMethod.POST);
+        result = executor.execute(entityResource,  Params.valueOf("654", null, NULL_PARAMS, grr, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertEquals("Growing well",result);
+
+        ResourceWithMetadata calfResource = locator.locateRelationResource(api,"cow", "calf", HttpMethod.POST);
+        result = executor.execute(calfResource,  Params.valueOf("654", null, NULL_PARAMS, Arrays.asList(goat), mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertEquals(goat,((ExecutionResult)result).getRoot());
+
+        Map<String, String> templateVars = new HashMap();
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "sheep");
+        templateVars.put(ResourceLocator.ENTITY_ID, "sheepId");
+        templateVars.put(ResourceLocator.RELATIONSHIP_RESOURCE, "baaahh");
+        templateVars.put(ResourceLocator.PROPERTY, "chew");
+        ResourceWithMetadata collResource = locator.locateResource(api, templateVars, HttpMethod.POST);
+        result = executor.execute(collResource, Params.valueOf("654", "345", NULL_PARAMS, null, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertEquals("All done",result);
+    }
+
+    @Test
+    public void testInvokeDelete() throws IOException
+    {
+        ResourceWithMetadata grassResource = locator.locateEntityResource(api,"grass", HttpMethod.DELETE);
+        AbstractResourceWebScript executor = getExecutor("executorOfDelete");
+        Object result = executor.execute(grassResource,  Params.valueOf("4", null, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNull(result);
+
+        ResourceWithMetadata cowResource = locator.locateEntityResource(api,"cow", HttpMethod.DELETE);
+        result = executor.execute(cowResource,  Params.valueOf("4", null, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNull(result);
+
+        cowResource = locator.locateRelationResource(api,"cow","photo", HttpMethod.DELETE);
+        result = executor.execute(cowResource,  Params.valueOf("4", null, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNull(result);
+
+        ResourceWithMetadata resource = locator.locateRelationResource(api, "sheep", "blacksheep", HttpMethod.DELETE);
+        result = executor.execute(resource,  Params.valueOf("4", null, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNull(result);
+
+        ResourceWithMetadata calf = locator.locateRelationResource(api,"cow", "calf", HttpMethod.DELETE);
+        result = executor.execute(calf,  Params.valueOf("4", null, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNull(result);
+
+        ResourceWithMetadata flockEntityResource = locator.locateRelationResource(api3,"flock","photo", HttpMethod.DELETE);
+        result = executor.execute(flockEntityResource,  Params.valueOf("4", null, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNull(result);
+
+        calf = locator.locateRelationResource(api,"cow/{entityId}/calf", "photo", HttpMethod.DELETE);
+        result = executor.execute(calf,  Params.valueOf("4", null, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNull(result);
+
+        ResourceWithMetadata goatDelete = locator.locateRelationResource(api3,"goat/{entityId}/herd", "content", HttpMethod.DELETE);
+        result = executor.execute(goatDelete,  Params.valueOf("4", "56", mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNull(result);
+    }
+
+
+    @Test
+    public void testInvokePut() throws IOException
+    {
+        ResourceWithMetadata entityResource = locator.locateEntityResource(api,"sheep", HttpMethod.PUT);
+        AbstractResourceWebScript executor = getExecutor("executorOfPut");
+        final Sheep aSheep = new Sheep("xyz");
+        Object result = executor.execute(entityResource, Params.valueOf("654", null, NULL_PARAMS, aSheep, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNotNull(result);
+        assertEquals(aSheep,((ExecutionResult)result).getRoot());
+
+        final Goat goat = new Goat("xyz");
+        ResourceWithMetadata cowResource = locator.locateEntityResource(api,"cow", HttpMethod.PUT);
+        result = executor.execute(cowResource, Params.valueOf("654", null, NULL_PARAMS, goat, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNotNull(result);
+        assertEquals(goat,((ExecutionResult)result).getRoot());
+
+        ResourceWithMetadata resource = locator.locateRelationResource(api, "sheep", "blacksheep", HttpMethod.PUT);
+        result = executor.execute(resource, Params.valueOf("654", null, NULL_PARAMS, aSheep, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNotNull(result);
+        assertEquals(aSheep,((ExecutionResult)result).getRoot());
+
+        ResourceWithMetadata baaPhoto = locator.locateRelationResource(api,"sheep/{entityId}/baaahh", "photo", HttpMethod.PUT);
+        result = executor.execute(baaPhoto,  Params.valueOf("4", "56", mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNull(result);
+
+        ResourceWithMetadata flockEntityResource = locator.locateRelationResource(api3,"flock","photo", HttpMethod.PUT);
+        result = executor.execute(flockEntityResource, Params.valueOf("654", null, NULL_PARAMS, goat, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNull(result);
+
+        ResourceWithMetadata calf = locator.locateRelationResource(api,"cow", "calf", HttpMethod.PUT);
+        result = executor.execute(calf, Params.valueOf("654", null, NULL_PARAMS, goat, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNotNull(result);
+        assertEquals(goat,((ExecutionResult)result).getRoot());
+
+        cowResource = locator.locateRelationResource(api,"cow","photo", HttpMethod.PUT);
+        result = executor.execute(cowResource, Params.valueOf("654", null, NULL_PARAMS, goat, mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNull(result);
+
+        calf = locator.locateRelationResource(api,"cow/{entityId}/calf", "photo", HttpMethod.PUT);
+        result = executor.execute(calf,  Params.valueOf("4", "56", mock(WebScriptRequest.class)),  mock(WebScriptResponse.class), false);
+        assertNull(result);
+    }
+
+    @Test
+    public void testInvokeAbstract() throws IOException
+    {
+        AbstractResourceWebScript executor = getExecutor();
+        Map<String, String> templateVars = new HashMap();
+        templateVars.put("apiScope", "private");
+        templateVars.put("apiVersion", "1");
+        templateVars.put("apiName", "alfrescomock");
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "sheep");
+        executor.execute(ApiAssistant.determineApi(templateVars), mockRequest(templateVars,new HashMap<String, List<String>>(1)), mock(WebScriptResponse.class));
+
+        WebScriptResponse response = mockResponse();
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "bad");
+        executor.execute(api, mockRequest(templateVars,new HashMap<String, List<String>>(1)), response);
+        //throws a runtime exception so INTERNAL_SERVER_ERROR
+        verify(response, times(1)).setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+
+        response = mockResponse();
+        templateVars.put(ResourceLocator.ENTITY_ID, "badId");
+        executor.execute(api, mockRequest(templateVars,new HashMap<String, List<String>>(1)), response);
+        //throws a IntegrityException so 422
+        verify(response, times(1)).setStatus(422);
+
+    }
+
+    @Test
+    public void testInvalidUrls() throws IOException
+    {
+        AbstractResourceWebScript executor = getExecutor();
+
+        Map<String, String> templateVars = new HashMap();
+        templateVars.put("apiScope", "private");
+        templateVars.put("apiVersion", "1");
+        templateVars.put("apiName", "alfrescomock");
+
+        WebScriptResponse response = mockResponse();
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "blah:");
+        executor.execute(api, mockRequest(templateVars, new HashMap<String, List<String>>(1)), response);
+        //Can't find it so a 404
+        verify(response, times(1)).setStatus(HttpServletResponse.SC_NOT_FOUND);
+    }
+
+    @Test
+    public void testRenderError() throws IOException
+    {
+        AbstractResourceWebScript executor = getExecutor();
+
+        ErrorResponse defaultError = new DefaultExceptionResolver().resolveException(new NullPointerException());
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        renderErrorResponse(defaultError, mockResponse(out), apiAssistant.getJsonHelper());
+        String errorMessage = out.toString();
+//        System.out.println(errorMessage);
+        assertTrue(errorMessage.contains("\"errorKey\":\"framework.exception.ApiDefault\""));
+        assertTrue(errorMessage.contains("\"statusCode\":500"));
+        assertTrue(errorMessage.contains("\"logId\":\""));
+        assertTrue(errorMessage.contains("\"stackTrace\":\"For security reasons the stack trace is no longer displayed"));
+        assertTrue(errorMessage.contains("\"descriptionURL\":\""+DefaultExceptionResolver.ERROR_URL+"\""));
+
+        ErrorResponse anError = simpleMappingExceptionResolver.resolveException(new ApiException("nothing"));
+        out = new ByteArrayOutputStream();
+        renderErrorResponse(anError, mockResponse(out),apiAssistant.getJsonHelper());
+        errorMessage = out.toString();
+ //       System.out.println(errorMessage);
+        assertTrue(errorMessage.contains("\"errorKey\":\"nothing\""));
+        assertTrue(errorMessage.contains("\"statusCode\":500"));
+        assertTrue(errorMessage.contains("\"stackTrace\":\"For security reasons the stack trace is no longer displayed"));
+        assertTrue(errorMessage.contains("\"logId\":\""));
+
+        anError = simpleMappingExceptionResolver.resolveException(new EntityNotFoundException("2"));
+        out = new ByteArrayOutputStream();
+        renderErrorResponse(anError, mockResponse(out),apiAssistant.getJsonHelper());
+        errorMessage = out.toString();
+        System.out.println(errorMessage);
+        assertTrue(errorMessage.contains("\"errorKey\":\"framework.exception.EntityNotFound\""));
+        assertTrue(errorMessage.contains("\"statusCode\":404"));
+        assertFalse("Only 500 errors should have a logId", errorMessage.contains("\"logId\":\" \""));
+    }
+
+    private WebScriptResponse mockResponse() throws IOException
+    {
+        return mockResponse(new ByteArrayOutputStream());
+    }
+    private WebScriptResponse mockResponse(ByteArrayOutputStream byteArrayOutputStream) throws IOException
+    {
+        WebScriptResponse res = mock(WebScriptResponse.class);
+        when(res.getOutputStream()).thenReturn(byteArrayOutputStream);
+        return res;
+    }
+
+    private WebScriptRequest mockRequest(Map<String, String> templateVars, final Map<String, List<String>> params)
+    {
+        final String[] paramNames = params.keySet().toArray(new String[]{});
+        WebScriptRequest request = mock(WebScriptRequest.class);
+        when(request.getServiceMatch()).thenReturn(new Match(null, templateVars,null));
+        when(request.getParameterNames()).thenReturn(paramNames);
+        when(request.getParameterValues(anyString())).thenAnswer(new Answer<String[]>() {
+            @Override
+            public String[] answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                return params.get((String) args[0]).toArray(new String[]{});
+            }
+        });
+        return request;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/InspectorTests.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/InspectorTests.java
new file mode 100644
index 00000000000..646bae13b8c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/InspectorTests.java
@@ -0,0 +1,645 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.tests.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.rest.api.model.Comment;
+import org.alfresco.rest.api.nodes.NodeCommentsRelation;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.OperationResourceMetaData;
+import org.alfresco.rest.framework.core.ResourceInspector;
+import org.alfresco.rest.framework.core.ResourceInspectorUtil;
+import org.alfresco.rest.framework.core.ResourceMetadata;
+import org.alfresco.rest.framework.core.ResourceOperation;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.resource.actions.interfaces.BinaryResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.tests.api.mocks.Farmer;
+import org.alfresco.rest.framework.tests.api.mocks.GoatEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks.Grass;
+import org.alfresco.rest.framework.tests.api.mocks.GrassEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks.MultiPartTestEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks.MultiPartTestRelationshipResource;
+import org.alfresco.rest.framework.tests.api.mocks.MultiPartTestResponse;
+import org.alfresco.rest.framework.tests.api.mocks.Sheep;
+import org.alfresco.rest.framework.tests.api.mocks.SheepBaaaahResource;
+import org.alfresco.rest.framework.tests.api.mocks.SheepBlackSheepResource;
+import org.alfresco.rest.framework.tests.api.mocks.SheepEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks.SheepNoActionEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks2.FarmersDaughter;
+import org.alfresco.rest.framework.tests.api.mocks2.FarmersGrandson;
+import org.alfresco.rest.framework.tests.api.mocks2.FarmersSon;
+import org.alfresco.rest.framework.tests.api.mocks3.Flock;
+import org.alfresco.rest.framework.tests.api.mocks3.FlockEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks3.FlocketEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks3.GoatRelationshipResource;
+import org.alfresco.rest.framework.tests.api.mocks3.GrassEntityResourceNowDeleted;
+import org.alfresco.rest.framework.tests.api.mocks3.SheepBlackSheepResourceIsNoMore;
+import org.alfresco.rest.framework.tests.api.mocks3.SheepEntityResourceWithDeletedMethods;
+import org.alfresco.rest.framework.tests.api.mocks3.SlimGoat;
+import org.alfresco.rest.framework.tools.ResponseWriter;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.util.Pair;
+import org.junit.Test;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.http.HttpMethod;
+
+/**
+ * Looks at resources to see what they can do
+ * 
+ * @author Gethin James
+ */
+public class InspectorTests
+{
+
+    @Test
+    public void testInspectEntity()
+    {
+        List<ResourceMetadata> metainfo = ResourceInspector.inspect(SheepEntityResource.class);
+        assertTrue("Must be one ResourceMetadata",metainfo.size()==1);
+        ResourceMetadata metaData = metainfo.get(0);
+        assertNotNull(metaData);
+        assertNotNull("SheepEntityResource supports GET", metaData.getOperation(HttpMethod.GET));
+        assertNotNull("SheepEntityResource supports PUT", metaData.getOperation(HttpMethod.PUT));
+        assertNotNull("SheepEntityResource supports DELETE", metaData.getOperation(HttpMethod.DELETE));
+        assertNull("SheepEntityResource does not support POST", metaData.getOperation(HttpMethod.POST));
+        ResourceOperation op = metaData.getOperation(HttpMethod.GET);
+        assertEquals("Sheep ReadALL should return ACCEPTED", Status.STATUS_ACCEPTED, op.getSuccessStatus());
+        op = metaData.getOperation(HttpMethod.PUT);
+        assertTrue("SheepEntityResource must support Sheep", Sheep.class.equals(metaData.getObjectType(op)));
+        
+        metainfo = ResourceInspector.inspect(SheepNoActionEntityResource.class);
+        assertTrue("SheepNoActionEntityResource has no actions.",metainfo.isEmpty());
+
+        metainfo = ResourceInspector.inspect(GoatEntityResource.class);
+        assertTrue("Must be one ResourceMetadata",metainfo.size()==1);
+        metaData = metainfo.get(0);
+        assertNotNull(metaData);
+        assertNotNull("GoatEntityResource supports GET", metaData.getOperation(HttpMethod.GET));
+        op = metaData.getOperation(HttpMethod.GET);
+        List<ResourceParameter> params = op.getParameters();
+        assertTrue("readById method should have 1 url param", params.size() == 1);
+        
+        metainfo = ResourceInspector.inspect(FlockEntityResource.class);
+        assertTrue("Must be one ResourceMetadata",metainfo.size()==1);
+        metaData = metainfo.get(0);
+        assertNotNull(metaData);
+        assertNotNull("FlockEntityResource supports GET", metaData.getOperation(HttpMethod.GET));
+        assertNotNull("FlockEntityResource supports PUT", metaData.getOperation(HttpMethod.PUT));
+        assertNotNull("FlockEntityResource supports DELETE", metaData.getOperation(HttpMethod.DELETE));
+        assertNull("FlockEntityResource does not support POST", metaData.getOperation(HttpMethod.POST));
+        metainfo = ResourceInspector.inspect(MultiPartTestEntityResource.class);
+        assertTrue("Must be one ResourceMetadata",metainfo.size()==1);
+        metaData = metainfo.get(0);
+        assertNotNull(metaData);
+        assertNotNull("MultiPartTestEntityResource support POST", metaData.getOperation(HttpMethod.POST));
+        assertNull("MultiPartTestEntityResource does not supports GET", metaData.getOperation(HttpMethod.GET));
+        assertNull("MultiPartTestEntityResource does not supports PUT", metaData.getOperation(HttpMethod.PUT));
+        assertNull("MultiPartTestEntityResource does not supports DELETE", metaData.getOperation(HttpMethod.DELETE));
+        op = metaData.getOperation(HttpMethod.POST);
+        assertTrue("MultiPartTestEntityResource must support MultiPartTestResponse", MultiPartTestResponse.class.equals(metaData.getObjectType(op)));
+        assertEquals("MultiPartTestEntityResource should return ACCEPTED", Status.STATUS_ACCEPTED, op.getSuccessStatus());
+
+    }
+
+    @Test
+    public void testInspectRelationship()
+    {
+        List<ResourceMetadata> metainfo = ResourceInspector.inspect(SheepBlackSheepResource.class);
+        assertTrue("Must be one ResourceMetadata",metainfo.size()==1);
+        ResourceMetadata metaData = metainfo.get(0);
+        assertNotNull(metaData);
+        assertNotNull("SheepBlackSheepResource supports GET", metaData.getOperation(HttpMethod.GET));
+        ResourceOperation op = metaData.getOperation(HttpMethod.GET);
+        List<ResourceParameter> params = op.getParameters();
+        assertTrue("readAll method should have 1 url param and 3 query params", params.size() == 4);
+        assertNotNull("SheepBlackSheepResource supports PUT", metaData.getOperation(HttpMethod.PUT));
+        op = metaData.getOperation(HttpMethod.PUT);
+        params = op.getParameters();
+        assertTrue("update method should have 2 url params and 1 HTTP_OBJECT param ", params.size() == 3);
+        assertNotNull("SheepBlackSheepResource supports POST", metaData.getOperation(HttpMethod.POST));
+        op = metaData.getOperation(HttpMethod.POST);
+        params = op.getParameters();
+        assertTrue("SheepBlackSheepResource must support Sheep", Sheep.class.equals(metaData.getObjectType(op)));
+        assertTrue("create method should have 1 url param and 1 HTTP_OBJECT param ", params.size() == 2);
+        assertNotNull(params);
+        for (ResourceParameter resourceParameter : params)
+        {
+           if (ResourceParameter.KIND.HTTP_BODY_OBJECT.equals(resourceParameter.getParamType()))
+           {
+               assertFalse(resourceParameter.isAllowMultiple());  //set to not allow multiple
+           }
+        }
+        assertNotNull("SheepBlackSheepResource supports DELETE", metaData.getOperation(HttpMethod.DELETE));
+        op = metaData.getOperation(HttpMethod.DELETE);
+        assertEquals("SheepBlackSheepResource should return STATUS_CONFLICT", Status.STATUS_CONFLICT, op.getSuccessStatus());
+        params = op.getParameters();
+        assertTrue("DELETE method on a relations should have 2 url params.", params.size() == 2);
+        
+        metainfo = ResourceInspector.inspect(MultiPartTestRelationshipResource.class);
+        assertTrue("Must be one ResourceMetadata",metainfo.size()==1);
+        metaData = metainfo.get(0);
+        assertNotNull(metaData);
+        assertNotNull("MultiPartTestRelationshipResource support POST", metaData.getOperation(HttpMethod.POST));
+        assertNull("MultiPartTestRelationshipResource does not supports GET", metaData.getOperation(HttpMethod.GET));
+        assertNull("MultiPartTestRelationshipResource does not supports PUT", metaData.getOperation(HttpMethod.PUT));
+        assertNull("MultiPartTestRelationshipResource does not supports DELETE", metaData.getOperation(HttpMethod.DELETE));
+        op = metaData.getOperation(HttpMethod.POST);
+        assertTrue("MultiPartTestRelationshipResource must support MultiPartTestResponse", MultiPartTestResponse.class.equals(metaData.getObjectType(op)));
+    }
+
+    @Test
+    public void testInspectApi()
+    {
+        Api api = ResourceInspector.inspectApi(SheepBlackSheepResource.class);
+        assertNotNull(api);
+        assertEquals(Api.SCOPE.PRIVATE,api.getScope());
+        assertEquals(1,api.getVersion());
+        
+        api = ResourceInspector.inspectApi(String.class);
+        assertNull(api);
+        
+        api = ResourceInspector.inspectApi(NodeCommentsRelation.class);
+        assertNotNull(api);
+        assertEquals(Api.SCOPE.PUBLIC,api.getScope());
+        assertEquals(1,api.getVersion());
+    }
+    
+    @Test
+    public void testNodesCommentsRelation()
+    {
+        List<ResourceMetadata> metainfo = ResourceInspector.inspect(NodeCommentsRelation.class);
+        assertTrue("Must be one ResourceMetadata",metainfo.size()==1);
+        ResourceMetadata metaData = metainfo.get(0);
+        assertNotNull(metaData);
+        ResourceOperation op = metaData.getOperation(HttpMethod.POST);
+        assertTrue("NodeCommentsRelation must support Comment", Comment.class.equals(metaData.getObjectType(op)));
+    }
+    
+    @Test
+    public void testUniqueIdAnnotation()
+    {
+        String uniqueId = ResourceInspector.findUniqueId(new Grass("34"));
+        assertNull(uniqueId);
+
+        uniqueId = ResourceInspector.findUniqueId(new Farmer("345"));
+        assertNotNull(uniqueId);
+        assertTrue("345".equals(uniqueId));
+        
+        //inherited classes are ok (with overidden unique id method)
+        uniqueId = ResourceInspector.findUniqueId(new FarmersSon("567"));
+        assertNotNull(uniqueId);
+        assertTrue("567".equals(uniqueId));
+        
+        //inherited classes are ok (with overidden unique id method but @UniqueId annotation not specified)
+        uniqueId = ResourceInspector.findUniqueId(new FarmersGrandson("12"));
+        assertNotNull(uniqueId);
+        assertTrue("12".equals(uniqueId));
+        
+        //More than 1 annotation should throw IllegalArgumentException
+        try
+        {
+            uniqueId = ResourceInspector.findUniqueId(new FarmersDaughter("21"));
+            fail("Should throw an InvalidArgumentException");
+        }
+        catch (IllegalArgumentException error)
+        {
+            //this is correct
+        }
+
+    }
+    
+    @Test
+    public void testEmbeddedAnnotation()
+    {
+        Map<String,Pair<String,Method>> embeds = ResourceInspector.findEmbeddedResources(Farmer.class);
+        assertNotNull(embeds);
+        assertTrue(embeds.size() == 2);
+        assertTrue("sheep".equals(embeds.get("sheep").getFirst()));
+        assertTrue("goat".equals(embeds.get("goat").getFirst()));
+        
+        //inherited annotations on classes are ok.
+        embeds = ResourceInspector.findEmbeddedResources(FarmersSon.class);
+        assertNotNull(embeds);
+        assertTrue(embeds.size() == 2);
+        assertTrue("sheep".equals(embeds.get("sheep").getFirst()));
+        assertTrue("goat".equals(embeds.get("goat").getFirst()));
+        
+        //inherited annotations on classes are ok, with another added embedded
+        embeds = ResourceInspector.findEmbeddedResources(FarmersDaughter.class);
+        assertNotNull(embeds);
+        assertTrue(embeds.size() == 3);
+        assertTrue("sheep".equals(embeds.get("sheep").getFirst()));
+        assertTrue("goat".equals(embeds.get("goat").getFirst()));
+        assertTrue("grass".equals(embeds.get("specialgrass").getFirst()));
+        
+        //inherited annotations on classes are ok, 
+        //Sheep is overridden but no annotation specified
+        //Goat is overridden and new annotation key is specified (THIS IS NOT RECOMMENDED)
+        embeds = ResourceInspector.findEmbeddedResources(FarmersGrandson.class);
+        assertNotNull(embeds);
+        assertTrue(embeds.size() == 2);
+        assertTrue("sheep".equals(embeds.get("sheep").getFirst()));
+        assertTrue("goat".equals(embeds.get("grandgoat").getFirst()));
+        
+        embeds = ResourceInspector.findEmbeddedResources(Sheep.class);
+        assertNotNull(embeds);
+        assertTrue("Sheep has no embedded entities", embeds.isEmpty());
+        
+        embeds = ResourceInspector.findEmbeddedResources(Grass.class);
+        assertNotNull(embeds);
+        assertTrue("Grass has no embedded entities", embeds.isEmpty());
+        
+        embeds = ResourceInspector.findEmbeddedResources(SlimGoat.class);
+        assertNotNull(embeds);
+        assertTrue("SlimGoat has no embedded entities", embeds.isEmpty());
+    }
+    
+    @Test
+    public void testWebDeletedAnnotationOnMethods()
+    {
+       Method aMethod = ResourceInspector.findMethod(EntityResourceAction.Read.class, SheepEntityResourceWithDeletedMethods.class);
+       assertNotNull("This method is untouched so should be found.",aMethod);
+       assertTrue("readAll".equals(aMethod.getName()));
+       
+       aMethod = ResourceInspector.findMethod(EntityResourceAction.ReadById.class, SheepEntityResourceWithDeletedMethods.class);
+       assertNotNull("This method is overriden but not deleted so should be found.",aMethod);
+       assertTrue("readById".equals(aMethod.getName()));
+       
+       aMethod = ResourceInspector.findMethod(EntityResourceAction.Update.class, SheepEntityResourceWithDeletedMethods.class);
+       assertTrue("Update method has been marketed as deleted.",ResourceInspector.isDeleted(aMethod));
+       
+       aMethod = ResourceInspector.findMethod(EntityResourceAction.Delete.class, SheepEntityResourceWithDeletedMethods.class);
+       assertTrue("Delete method has been marketed as deleted.",ResourceInspector.isDeleted(aMethod));
+       
+       aMethod = ResourceInspector.findMethod(EntityResourceAction.DeleteSet.class, SheepEntityResourceWithDeletedMethods.class);
+       assertTrue("Delete method has been marketed as deleted.",ResourceInspector.isDeleted(aMethod));
+    }
+    
+    @Test
+    public void testInspectOperation()
+    {
+        Method aMethod = ResourceInspector.findMethod(EntityResourceAction.Read.class, SheepEntityResource.class);
+        ResourceOperation op = ResourceInspector.inspectOperation(SheepEntityResource.class, aMethod, HttpMethod.GET);
+        assertNotNull(op);
+        assertTrue(HttpMethod.GET.equals(op.getHttpMethod()));
+        assertTrue("Gets all the Sheep".equals(op.getTitle()));
+        assertEquals("Sheep ReadALL should return ACCEPTED", Status.STATUS_ACCEPTED, op.getSuccessStatus());
+        assertTrue("".equals(op.getDescription()));
+        assertNotNull(op.getParameters());
+        assertTrue(op.getParameters().size() == 7);
+        
+        for (ResourceParameter aParam : op.getParameters())
+        { 
+            assertNotNull(aParam.getName());
+            assertNotNull(aParam.getDescription());
+            assertNotNull(aParam.getTitle());
+            
+            switch (aParam.getParamType()) {
+                case QUERY_STRING:
+                    if (("requiredParam".equals(aParam.getName())))
+                    {
+                        assertTrue(aParam.isRequired());
+                    }
+                    break;
+                case URL_PATH:
+                    assertTrue(("siteId".equals(aParam.getName())));
+                    assertFalse(aParam.isRequired());
+                    break;
+                case HTTP_BODY_OBJECT:
+                    assertTrue(("body".equals(aParam.getName())));
+                    assertFalse(aParam.isRequired());
+                    break;
+                case HTTP_HEADER:
+                    assertTrue(("who".equals(aParam.getName())));
+                    assertFalse(aParam.isRequired());
+                    
+            }
+
+        }
+        
+        //No @WebApiDescription or param (in future WebApiDescription will be mandatory)
+        aMethod = ResourceInspector.findMethod(EntityResourceAction.ReadById.class, SheepEntityResource.class);
+        op = ResourceInspector.inspectOperation(SheepEntityResource.class, aMethod, HttpMethod.GET);
+        assertNotNull(op);
+        assertTrue(op.getTitle().startsWith("Missing @WebApiDescription annotation"));
+
+        aMethod = ResourceInspector.findMethod(EntityResourceAction.ReadById.class, GrassEntityResource.class);
+        op = ResourceInspector.inspectOperation(GrassEntityResource.class, aMethod, HttpMethod.GET);
+        assertNotNull(op);
+        assertTrue(op.getTitle().startsWith("Gets grass by id"));
+        assertTrue("readById method should have 1 url param", op.getParameters().size() == 1);
+        ResourceParameter singleParam = op.getParameters().get(0);
+        assertTrue(ResourceParameter.KIND.URL_PATH.equals(singleParam.getParamType()));
+        assertFalse("URL paths can never suport multiple params, its always FALSE", singleParam.isAllowMultiple());
+        assertNotNull(singleParam.getDescription());
+        assertNotNull(singleParam.getTitle());
+        assertNotNull(singleParam.getName());
+        assertTrue(singleParam.isRequired());
+        
+        aMethod = ResourceInspector.findMethod(BinaryResourceAction.Read.class, FlockEntityResource.class);
+        op = ResourceInspector.inspectOperation(FlockEntityResource.class, aMethod, HttpMethod.GET);
+        assertNotNull(op);
+        assertTrue(op.getTitle().startsWith("Reads a photo as a Stream"));
+          
+        aMethod = ResourceInspector.findMethod(BinaryResourceAction.Delete.class, FlockEntityResource.class);
+        op = ResourceInspector.inspectOperation(FlockEntityResource.class, aMethod, HttpMethod.DELETE);
+        assertNotNull(op);
+        assertTrue(op.getTitle().startsWith("Deletes a photo"));
+
+        aMethod = ResourceInspector.findMethod(BinaryResourceAction.Update.class, FlockEntityResource.class);
+        op = ResourceInspector.inspectOperation(FlockEntityResource.class, aMethod, HttpMethod.PUT);
+        assertNotNull(op);
+        assertTrue(op.getTitle().startsWith("Updates a photo"));
+
+        aMethod = ResourceInspector.findMethod(BinaryResourceAction.Read.class, SheepBaaaahResource.class);
+        op = ResourceInspector.inspectOperation(SheepBaaaahResource.class, aMethod, HttpMethod.GET);
+        assertNotNull(op);
+        assertTrue(op.getTitle().startsWith("Reads a photo"));
+
+        aMethod = ResourceInspector.findMethod(BinaryResourceAction.Delete.class, SheepBaaaahResource.class);
+        op = ResourceInspector.inspectOperation(SheepBaaaahResource.class, aMethod, HttpMethod.DELETE);
+        assertNotNull(op);
+        assertTrue(op.getTitle().startsWith("Deletes a photo"));
+
+        aMethod = ResourceInspector.findMethod(BinaryResourceAction.Update.class, SheepBaaaahResource.class);
+        op = ResourceInspector.inspectOperation(SheepBaaaahResource.class, aMethod, HttpMethod.PUT);
+        assertNotNull(op);
+        assertTrue(op.getTitle().startsWith("Updates a photo"));
+    }
+
+    @Test
+    public void testInspectBodyParam()
+    {
+        Method aMethod = ResourceInspector.findMethod(BinaryResourceAction.Update.class, FlockEntityResource.class);
+        ResourceOperation op = ResourceInspector.inspectOperation(FlockEntityResource.class, aMethod, HttpMethod.PUT);
+        assertNotNull(op);
+        List<ResourceParameter> params  = op.getParameters();
+        assertTrue(params.size()==2);
+        for (ResourceParameter param:params)
+        {
+            if (ResourceParameter.KIND.HTTP_BODY_OBJECT.equals(param.getParamType()))
+            {
+                assertEquals(Flock.class, param.getDataType());
+            }
+        }
+
+        aMethod = ResourceInspector.findMethod(RelationshipResourceAction.Create.class, SheepBlackSheepResource.class);
+        op = ResourceInspector.inspectOperation(SheepBlackSheepResource.class, aMethod, HttpMethod.POST);
+        assertNotNull(op);
+        params  = op.getParameters();
+        assertTrue(params.size()==2);
+        for (ResourceParameter param:params)
+        {
+            if (ResourceParameter.KIND.HTTP_BODY_OBJECT.equals(param.getParamType()))
+            {
+                assertEquals(Sheep.class, param.getDataType());
+            }
+        }
+
+        aMethod = ResourceInspector.findMethod(EntityResourceAction.Update.class, SheepEntityResourceWithDeletedMethods.class);
+        op = ResourceInspector.inspectOperation(SheepEntityResourceWithDeletedMethods.class, aMethod, HttpMethod.POST);
+        assertNotNull(op);
+        params  = op.getParameters();
+        assertNotNull(params);
+        for (ResourceParameter param:params)
+        {
+            if (ResourceParameter.KIND.HTTP_BODY_OBJECT.equals(param.getParamType()))
+            {
+                assertEquals(Sheep.class, param.getDataType());
+            }
+        }
+    }
+
+    @Test
+    public void testInspectOperations() throws IllegalAccessException, InstantiationException, Throwable
+    {
+        Api api = Api.valueOf("alfrescomock", "private", "1");
+        List<ResourceMetadata> metainfo = new ArrayList<ResourceMetadata>();
+
+        GrassEntityResource grassEntityResource = new GrassEntityResource();
+        ResourceInspector.inspectOperations(api, GrassEntityResource.class,"-root-", metainfo);
+        assertEquals(3, metainfo.size());
+
+        for (ResourceMetadata resourceMetadata : metainfo)
+        {
+            assertEquals(ResourceMetadata.RESOURCE_TYPE.OPERATION, resourceMetadata.getType());
+            OperationResourceMetaData operationResourceMetaData = (OperationResourceMetaData) resourceMetadata;
+            Method actionMethod = operationResourceMetaData.getOperationMethod();
+            String result = null;
+            final WithResponse wr = new WithResponse(Status.STATUS_OK, ResponseWriter.DEFAULT_JSON_CONTENT, ResponseWriter.CACHE_NEVER);
+
+            switch (resourceMetadata.getUniqueId())
+            {
+                case "/-root-/{id}/grow":
+                    assertNotNull("GrassEntityResource supports POST", resourceMetadata.getOperation(HttpMethod.POST));
+                    assertNull("GrassEntityResource does not support DELETE", resourceMetadata.getOperation(HttpMethod.DELETE));
+                    ResourceOperation op = resourceMetadata.getOperation(HttpMethod.POST);
+                    assertEquals("grow should return ACCEPTED", Status.STATUS_ACCEPTED, op.getSuccessStatus());
+                    Class paramType = resourceMetadata.getObjectType(op);
+                    Object paramObj = paramType.newInstance();
+                    result = (String) ResourceInspectorUtil.invokeMethod(actionMethod,grassEntityResource, "xyz", paramObj, Params.valueOf("notUsed", null, mock(WebScriptRequest.class)), wr);
+                    assertEquals("Growing well",result);
+                    assertFalse(operationResourceMetaData.isNoAuth(null));
+                    break;
+                case "/-root-/{id}/cut":
+                    assertNotNull("GrassEntityResource supports POST", resourceMetadata.getOperation(HttpMethod.POST));
+                    assertNull("GrassEntityResource does not support GET", resourceMetadata.getOperation(HttpMethod.GET));
+                    op = resourceMetadata.getOperation(HttpMethod.POST);
+                    assertNull(resourceMetadata.getObjectType(op));
+                    assertEquals("cut should return ACCEPTED", Status.STATUS_NOT_IMPLEMENTED, op.getSuccessStatus());
+                    result = (String) ResourceInspectorUtil.invokeMethod(actionMethod,grassEntityResource, "xyz", null, Params.valueOf("notUsed", null, mock(WebScriptRequest.class)), wr);
+                    assertEquals("All done",result);
+                    assertFalse(operationResourceMetaData.isNoAuth(null));
+                    break;
+                case "/-root-/{id}/cut-noAuth":
+                    assertNotNull("GrassEntityResource supports POST", resourceMetadata.getOperation(HttpMethod.POST));
+                    op = resourceMetadata.getOperation(HttpMethod.POST);
+                    assertNull(resourceMetadata.getObjectType(op));
+                    assertEquals("cut should return ACCEPTED", Status.STATUS_NOT_IMPLEMENTED, op.getSuccessStatus());
+                    result = (String) ResourceInspectorUtil.invokeMethod(actionMethod,grassEntityResource, "xyz", null, Params.valueOf("notUsed", null, mock(WebScriptRequest.class)), wr);
+                    assertEquals("All done without Auth",result);
+                    assertTrue(operationResourceMetaData.isNoAuth(null));
+                    break;
+                default:
+                    fail("Invalid action information.");
+            }
+
+        }
+    }
+
+
+
+    @Test
+    public void testInspectRelationshipProperties()
+    {
+        List<ResourceMetadata> metainfo = ResourceInspector.inspect(GoatRelationshipResource.class);
+        assertTrue(metainfo.size()==2);
+        for (ResourceMetadata resourceMetadata : metainfo)
+        {
+            switch (resourceMetadata.getUniqueId())
+            {
+                case "/goat/{entityId}/herd":
+                    assertNotNull("GoatRelationshipResource supports GET", resourceMetadata.getOperation(HttpMethod.GET));
+                    break;
+                case "/goat/{entityId}/herd/{id}/content":
+                    assertNotNull("GoatRelationshipResource supports GET", resourceMetadata.getOperation(HttpMethod.GET));
+                    break;
+                default:
+                    fail("Invalid information.");
+            }
+        }
+    }
+
+    @Test
+    public void testInspectAddressedProperties()
+    {
+        
+        Api api = Api.valueOf("alfrescomock", "private", "1");
+        List<ResourceMetadata> metainfo = new ArrayList<ResourceMetadata>();
+        ResourceInspector.inspectAddressedProperties(api, FlockEntityResource.class, "myroot", metainfo);
+        assertTrue(metainfo.size()==1);
+        ResourceMetadata metaData = metainfo.get(0);
+        assertEquals("/myroot/{id}/photo",metaData.getUniqueId());
+        assertTrue(metaData.getOperations().size()==3);
+        assertNotNull("FlockEntityResource supports GET", metaData.getOperation(HttpMethod.GET));
+        assertNotNull("FlockEntityResource supports PUT", metaData.getOperation(HttpMethod.PUT));
+        assertNotNull("FlockEntityResource supports DELETE", metaData.getOperation(HttpMethod.DELETE));
+        
+        metainfo.clear();
+        ResourceInspector.inspectAddressedProperties(api, FlocketEntityResource.class, "myroot", metainfo);
+        assertTrue(metainfo.size()==3);
+        for (ResourceMetadata resourceMetadata : metainfo)
+        {
+            //If this code is running on a Java 7 or above then please use the switch statement instead of an if.
+//            switch (resourceMetadata.getUniqueId())
+//            {
+//                case "/myroot/photo":
+//                    assertTrue("FlocketEntityResource supports GET", resourcemetaData.getOperation(HttpMethod.GET));
+//                    assertTrue("FlocketEntityResource supports PUT", resourcemetaData.getOperation(HttpMethod.PUT));
+//                    assertTrue("FlocketEntityResource supports DELETE", resourcemetaData.getOperation(HttpMethod.DELETE));
+//                    break;
+//                case "/myroot/album":
+//                    assertTrue("FlocketEntityResource supports GET", resourcemetaData.getOperation(HttpMethod.GET));
+//                    assertTrue("FlocketEntityResource supports PUT", resourcemetaData.getOperation(HttpMethod.PUT));
+//                    assertTrue("FlocketEntityResource does not support DELETE", !resourcemetaData.getOperation(HttpMethod.DELETE));
+//                    break;
+//                case "/myroot/madeUpProp":
+//                    assertTrue("FlocketEntityResource supports GET", resourcemetaData.getOperation(HttpMethod.GET));
+//                    assertTrue("FlocketEntityResource does not supports PUT", !resourcemetaData.getOperation(HttpMethod.PUT));
+//                    assertTrue("FlocketEntityResource does not support DELETE", !resourcemetaData.getOperation(HttpMethod.DELETE));
+//                    break;
+//                default:
+//                    fail("Invalid address property information.");
+//            }
+          
+            if ("/myroot/{id}/photo".equals(resourceMetadata.getUniqueId()))
+            {
+                assertNotNull("FlocketEntityResource supports GET", resourceMetadata.getOperation(HttpMethod.GET));
+                assertNotNull("FlocketEntityResource supports PUT", resourceMetadata.getOperation(HttpMethod.PUT));
+                assertNotNull("FlocketEntityResource supports DELETE", resourceMetadata.getOperation(HttpMethod.DELETE));
+            }
+            else
+            {
+                if ("/myroot/{id}/album".equals(resourceMetadata.getUniqueId()))
+                {
+                    assertNotNull("FlocketEntityResource supports GET", resourceMetadata.getOperation(HttpMethod.GET));
+                    assertNotNull("FlocketEntityResource supports PUT", resourceMetadata.getOperation(HttpMethod.PUT));
+                    assertNull("FlocketEntityResource does not support DELETE", resourceMetadata.getOperation(HttpMethod.DELETE));
+                }
+                else
+                {
+                    if ("/myroot/{id}/madeUpProp".equals(resourceMetadata.getUniqueId()))
+                    {
+                        assertNotNull("FlocketEntityResource supports GET", resourceMetadata.getOperation(HttpMethod.GET));
+                        assertNull("FlocketEntityResource does not supports PUT", resourceMetadata.getOperation(HttpMethod.PUT));
+                        assertNull("FlocketEntityResource does not support DELETE", resourceMetadata.getOperation(HttpMethod.DELETE));
+                    }
+                    else
+                    {
+                        fail("Invalid address property information.");
+                    }
+                }
+            }
+   
+        }
+    }
+    
+    @Test
+    public void testWebDeletedAnnotationOnClass()
+    {
+        List<ResourceMetadata> metainfo = ResourceInspector.inspect(GrassEntityResourceNowDeleted.class);
+        assertTrue("Must be at least one ResourceMetadata",metainfo.size()>0);
+        ResourceMetadata metaData = metainfo.get(0);
+        assertNotNull(metaData);
+        assertNull("GrassEntityResourceNowDeleted all methods deleted", metaData.getOperation(HttpMethod.GET));
+        assertNull("GrassEntityResourceNowDeleted all methods deleted", metaData.getOperation(HttpMethod.PUT));
+        assertNull("GrassEntityResourceNowDeleted all methods deleted", metaData.getOperation(HttpMethod.DELETE));
+        assertNull("GrassEntityResourceNowDeleted all methods deleted", metaData.getOperation(HttpMethod.POST));
+        
+        metainfo = ResourceInspector.inspect(SheepBlackSheepResourceIsNoMore.class);
+        assertTrue("Must be at least one ResourceMetadata",metainfo.size()>0);
+        metaData = metainfo.get(0);
+        assertNotNull(metaData);
+        assertNull("SheepBlackSheepResourceIsNoMore all methods deleted", metaData.getOperation(HttpMethod.GET));
+        assertNull("SheepBlackSheepResourceIsNoMore all methods deleted", metaData.getOperation(HttpMethod.PUT));
+        assertNull("SheepBlackSheepResourceIsNoMore all methods deleted", metaData.getOperation(HttpMethod.DELETE));
+        assertNull("SheepBlackSheepResourceIsNoMore all methods deleted", metaData.getOperation(HttpMethod.POST));
+
+    }
+
+    @Test
+    public void testValidSuccessCode()
+    {
+        //Test defaults
+        assertEquals(Status.STATUS_OK,ResourceInspector.validSuccessCode(HttpMethod.GET, ResourceOperation.UNSET_STATUS));
+        assertEquals(Status.STATUS_CREATED,ResourceInspector.validSuccessCode(HttpMethod.POST, ResourceOperation.UNSET_STATUS));
+        assertEquals(Status.STATUS_OK,ResourceInspector.validSuccessCode(HttpMethod.PUT, ResourceOperation.UNSET_STATUS));
+        assertEquals(Status.STATUS_NO_CONTENT,ResourceInspector.validSuccessCode(HttpMethod.DELETE, ResourceOperation.UNSET_STATUS));
+
+        //Test custom values
+        assertEquals(Status.STATUS_ACCEPTED,ResourceInspector.validSuccessCode(HttpMethod.GET, Status.STATUS_ACCEPTED));
+        assertEquals(Status.STATUS_FOUND,ResourceInspector.validSuccessCode(HttpMethod.POST, Status.STATUS_FOUND));
+        assertEquals(Status.STATUS_ACCEPTED,ResourceInspector.validSuccessCode(HttpMethod.PUT, Status.STATUS_ACCEPTED));
+        assertEquals(Status.STATUS_NOT_MODIFIED,ResourceInspector.validSuccessCode(HttpMethod.DELETE, Status.STATUS_NOT_MODIFIED));
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/JsonJacksonTests.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/JsonJacksonTests.java
new file mode 100644
index 00000000000..10bb2d9a2e5
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/JsonJacksonTests.java
@@ -0,0 +1,230 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.tests.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ser.FilterProvider;
+import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
+import org.alfresco.rest.api.model.Comment;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper.ReturnAllBeanProperties;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper.Writer;
+import org.alfresco.rest.framework.jacksonextensions.RestJsonModule;
+import org.alfresco.rest.framework.tests.api.mocks.Farmer;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Tests Jackson Json logic
+ * 
+ * @author Gethin James
+ */
+public class JsonJacksonTests
+{
+
+    static JacksonHelper jsonHelper = null;
+
+    public static final String FARMER_JSON = "{\"name\":\"Giles\",\"created\":\"2012-03-23T15:56:18.552+0000\",\"age\":54,\"id\":\"1234A3\",\"farm\":\"LARGE\"}";
+    public static final String GRASS_JSON = "{\"id\":\"grass\",\"color\":\"green\"}";
+    public static final String COLLECTION_START = "[ ";
+    public static final String COLLECTION_END = " ]";
+    public static final String FARMERS_COLLECTION_JSON = COLLECTION_START + FARMER_JSON + "," + FARMER_JSON + "," + FARMER_JSON + COLLECTION_END;
+    
+    
+    @BeforeClass
+    public static void setupTests() throws Exception
+    {
+        jsonHelper = new JacksonHelper();
+        RestJsonModule module = new RestJsonModule();
+        jsonHelper.setModule(module);
+        jsonHelper.afterPropertiesSet();
+    }
+    
+    @Test
+    public void testDeserializeFarmer() throws IOException
+    {
+        Farmer aFarmer = jsonHelper.construct(new StringReader(FARMER_JSON), Farmer.class);
+        assertEquals(Farmer.class, aFarmer.getClass());
+        assertEquals("Giles", aFarmer.getName());
+        assertEquals(54, aFarmer.getAge());
+        assertEquals(Farmer.size.LARGE, aFarmer.getFarm());
+        
+        try
+        {
+            aFarmer = jsonHelper.construct(new StringReader(""), Farmer.class);
+            fail("Should not get here.");
+        }
+        catch (InvalidArgumentException iae)
+        {
+            assertNotNull(iae); // Must throw this exception
+        }
+    }
+    
+    @Test
+    public void testDeserializeFarmersAsList() throws IOException
+    {
+        List<Farmer> aFarmer = jsonHelper.constructList(new StringReader(COLLECTION_START+FARMER_JSON+COLLECTION_END), Farmer.class);
+        assertTrue(Collection.class.isAssignableFrom(aFarmer.getClass()));
+        assertEquals(1, aFarmer.size());
+        
+        aFarmer = jsonHelper.constructList(new StringReader(FARMERS_COLLECTION_JSON), Farmer.class);
+        assertTrue(Collection.class.isAssignableFrom(aFarmer.getClass()));
+        assertEquals(3, aFarmer.size());
+        
+        aFarmer = jsonHelper.constructList(new StringReader(FARMER_JSON), Farmer.class);
+        assertTrue(Collection.class.isAssignableFrom(aFarmer.getClass()));
+        assertEquals(1, aFarmer.size());
+        
+        try
+        {
+            aFarmer = jsonHelper.constructList(new StringReader(""), Farmer.class);
+            fail("Should not get here.");
+        }
+        catch (InvalidArgumentException iae)
+        {
+            assertNotNull(iae); // Must throw this exception
+        }
+        
+        try
+        {
+            aFarmer = jsonHelper.constructList(new StringReader("rubbish"), Farmer.class);
+            fail("Should not get here.");
+        }
+        catch (InvalidArgumentException iae)
+        {
+            assertNotNull(iae); // Must throw this exception
+        }
+        
+        try
+        {
+            aFarmer = jsonHelper.constructList(new StringReader("[]"), Farmer.class);
+            fail("Should not get here.");
+        }
+        catch (InvalidArgumentException iae)
+        {
+            assertNotNull(iae); // Must throw this exception
+        }
+        
+    }
+    
+    @Test
+    public void testDeserializeComment() throws IOException
+    {
+        String json = "{\"title\":\"fred\", \"content\":\"lots of noise\"}";
+        Comment aComment = jsonHelper.construct(new StringReader(json), Comment.class);
+        assertEquals(Comment.class, aComment.getClass());
+        assertEquals("fred", aComment.getTitle());
+        assertEquals("lots of noise", aComment.getContent());
+    }
+
+    @Test
+    public void testSerializeComment() throws IOException
+    {
+        final Comment aComment = new Comment();
+        aComment.setContent("<b>There it is</b>");
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        jsonHelper.withWriter(out, new Writer()
+        {
+            @Override
+            public void writeContents(JsonGenerator generator, ObjectMapper objectMapper)
+                        throws JsonGenerationException, JsonMappingException, IOException
+            {
+                FilterProvider fp = new SimpleFilterProvider().addFilter(
+                            JacksonHelper.DEFAULT_FILTER_NAME, new ReturnAllBeanProperties());
+                objectMapper.writer(fp).writeValue(generator, aComment);
+            }
+        });
+        assertTrue(out.toString().contains("{\"content\":\"<b>There it is</b>\""));
+    }
+
+    @Test
+    public void testSerializeMultipleObjects() throws IOException
+    {
+        final Collection<Comment> allComments = new ArrayList<Comment>();
+        Comment aComment = new Comment();
+        aComment.setContent("<b>There it is</b>");
+        allComments.add(aComment);
+        aComment = new Comment();
+        aComment.setContent("<p>I agree with the author</p>");
+        allComments.add(aComment);
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        jsonHelper.withWriter(out, new Writer()
+        {
+            @Override
+            public void writeContents(JsonGenerator generator, ObjectMapper objectMapper)
+                        throws JsonGenerationException, JsonMappingException, IOException
+            {
+                FilterProvider fp = new SimpleFilterProvider().addFilter(
+                            JacksonHelper.DEFAULT_FILTER_NAME, new ReturnAllBeanProperties());
+                objectMapper.writer(fp).writeValue(generator, allComments);
+            }
+        });
+        assertTrue(out.toString().contains("content\":\"<b>There it is</b>"));
+        assertTrue(out.toString().contains("content\":\"<p>I agree with the author</p>"));
+    }
+
+    @Test
+    public void testNullInComment() throws IOException
+    {
+        final Comment aComment = new Comment();
+        aComment.setContent(null);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        jsonHelper.withWriter(out, new Writer()
+        {
+            @Override
+            public void writeContents(JsonGenerator generator, ObjectMapper objectMapper)
+                        throws JsonGenerationException, JsonMappingException, IOException
+            {
+                FilterProvider fp = new SimpleFilterProvider().addFilter(
+                            JacksonHelper.DEFAULT_FILTER_NAME, new ReturnAllBeanProperties());
+                objectMapper.writer(fp).writeValue(generator, aComment);
+            }
+        });
+        assertEquals("Null values should not be output.", "{\"canEdit\":false,\"canDelete\":false}",
+                    out.toString());
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ParamsExtender.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ParamsExtender.java
new file mode 100755
index 00000000000..2d6ba9229b6
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ParamsExtender.java
@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.core;
+
+import static org.mockito.Mockito.mock;
+
+import java.io.InputStream;
+import java.util.Map;
+
+import org.alfresco.rest.framework.jacksonextensions.BeanPropertiesFilter;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+/**
+ * Just extends the Params class for testing purposes
+ *
+ * @author Gethin James
+ */
+public class ParamsExtender extends Params
+{
+
+    private ParamsExtender(String entityId, String relationshipId, Object passedIn, InputStream stream, String addressedProperty, RecognizedParams recognizedParams)
+    {
+        super(null,entityId, relationshipId, null, passedIn, stream, addressedProperty, recognizedParams, null, mock(WebScriptRequest.class));
+    }
+    
+    public static Params valueOf(Map<String, BeanPropertiesFilter> rFilter, String entityId)
+    {
+        return new ParamsExtender(entityId, null, null, null, null, new Params.RecognizedParams(null, null, null, rFilter, null, null, null, null, false));
+    }
+
+    public static Params valueOf(boolean includeSource, String entityId)
+    {
+        return new ParamsExtender(entityId, null, null, null, null, new Params.RecognizedParams(null, null, null, null, null, null, null, null, includeSource));
+    }
+
+    public static Params valueOf(Paging paging, String entityId)
+    {
+        return new ParamsExtender(entityId, null, null, null, null, new Params.RecognizedParams(null, paging, null, null, null, null, null, null, false));
+    }
+
+    public static Params valueOf(Map<String, String[]> params)
+    {
+        return new ParamsExtender(null, null, null, null, null, new Params.RecognizedParams(params, null, null, null, null, null, null, null, false));
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ParamsExtractorTests.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ParamsExtractorTests.java
new file mode 100644
index 00000000000..2d0b7c8b4ec
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ParamsExtractorTests.java
@@ -0,0 +1,565 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.notNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder.FileData;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder.MultiPartRequest;
+import org.alfresco.rest.framework.core.ResourceDictionary;
+import org.alfresco.rest.framework.core.ResourceInspector;
+import org.alfresco.rest.framework.core.ResourceLocator;
+import org.alfresco.rest.framework.core.ResourceLookupDictionary;
+import org.alfresco.rest.framework.core.ResourceMetadata;
+import org.alfresco.rest.framework.core.ResourceOperation;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.jacksonextensions.BeanPropertiesFilter;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
+import org.alfresco.rest.framework.jacksonextensions.RestJsonModule;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.tests.api.mocks.Farmer;
+import org.alfresco.rest.framework.tests.api.mocks.GrassEntityResource;
+import org.alfresco.rest.framework.tools.ApiAssistant;
+import org.alfresco.rest.framework.webscripts.ParamsExtractor;
+import org.alfresco.rest.framework.webscripts.ResourceWebScriptDelete;
+import org.alfresco.rest.framework.webscripts.ResourceWebScriptGet;
+import org.alfresco.rest.framework.webscripts.ResourceWebScriptPost;
+import org.alfresco.rest.framework.webscripts.ResourceWebScriptPut;
+import org.alfresco.util.TempFileProvider;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.extensions.surf.util.Content;
+import org.springframework.extensions.webscripts.Match;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.servlet.FormData;
+import org.springframework.http.HttpMethod;
+import org.springframework.mock.web.MockHttpServletRequest;
+
+
+/**
+ * Tests extracting of params from req
+ * 
+ * @author Gethin James
+ */
+public class ParamsExtractorTests
+{
+    static JacksonHelper jsonHelper = null;
+    static ApiAssistant assistant = null;
+
+    static ResourceLocator locator;
+
+    @BeforeClass
+    public static void setupTests() throws Exception
+    {
+        jsonHelper = new JacksonHelper();
+        RestJsonModule module = new RestJsonModule();
+        jsonHelper.setModule(module);
+        jsonHelper.afterPropertiesSet();
+
+        assistant = new ApiAssistant();
+        assistant.setJsonHelper(jsonHelper);
+
+        locator = new ResourceLookupDictionary();
+    }
+
+    @Test
+    public void testGetExtractor()
+    {
+        ResourceWebScriptGet extractor = new ResourceWebScriptGet();
+        extractor.setLocator(locator);
+
+        Map<String, String> templateVars = new HashMap<String, String>();
+        WebScriptRequest request = mock(WebScriptRequest.class);
+        when(request.getServiceMatch()).thenReturn(new Match(null, templateVars, null));
+        
+        Params params = extractor.extractParams(mockEntity(), request);
+        assertNull("For getting a Collection there should be no entity params.",params.getEntityId());
+        assertNull("For getting a Collection there should be no passed params.",params.getPassedIn());
+        assertNull("For getting a Collection there should be no relationshipId params.",params.getRelationshipId());
+        assertEquals(Paging.DEFAULT_SKIP_COUNT, params.getPaging().getSkipCount());
+        assertEquals(Paging.DEFAULT_MAX_ITEMS, params.getPaging().getMaxItems());
+        assertNotNull(params.getFilter());
+        assertTrue("Default filter is BeanPropertiesFilter.AllProperties", BeanPropertiesFilter.AllProperties.class.equals(params.getFilter().getClass()));
+        
+        templateVars.put(ResourceLocator.ENTITY_ID, "1234");
+        params = extractor.extractParams(mockEntity(), request);
+        assertNotNull(params);
+        assertNotNull(params.getRelationsFilter());
+        assertFalse(params.includeSource());
+
+        templateVars.put(ResourceLocator.RELATIONSHIP_RESOURCE, "codfish");
+        params = extractor.extractParams(mockRelationship(), request);
+        assertNotNull(params);
+        assertNull("For getting a Collection there should be no relationshipId params.",params.getRelationshipId());
+
+        templateVars.put(ResourceLocator.RELATIONSHIP_ID, "45678");
+        params = extractor.extractParams(mockRelationship(), request);
+        assertNotNull(params);
+        assertEquals("1234", params.getEntityId());
+        assertEquals("45678", params.getRelationshipId());
+        assertFalse(params.includeSource());
+
+        testExtractAddressedParams(templateVars, request, extractor);
+    }
+
+    private Params testExtractAddressedParams(Map<String, String> templateVars, WebScriptRequest request, ParamsExtractor extractor)
+    {
+        templateVars.clear();
+        templateVars.put(ResourceLocator.ENTITY_ID, "1234");
+        templateVars.put(ResourceLocator.RELATIONSHIP_RESOURCE, "codfish");
+        Params params = extractor.extractParams(mockProperty(), request);
+        assertNotNull(params);
+        assertTrue(params.hasBinaryProperty("codfish"));
+        assertFalse(params.hasBinaryProperty("something"));
+        assertEquals("codfish", params.getBinaryProperty());
+
+        templateVars.put(ResourceLocator.RELATIONSHIP_ID, "9865");
+        templateVars.put(ResourceLocator.PROPERTY, "monkFish");
+        params = extractor.extractParams(mockProperty(), request);
+        assertNotNull(params);
+        assertEquals("1234", params.getEntityId());
+        assertEquals("9865", params.getRelationshipId());
+        assertTrue(params.hasBinaryProperty("monkFish"));
+        return params;
+    }
+    
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testPostExtractor() throws IOException
+    {
+        //Put together the stubs
+        ResourceWebScriptPost extractor = new ResourceWebScriptPost();
+        extractor.setAssistant(assistant);
+        extractor.setLocator(locator);
+
+        Map<String, String> templateVars = new HashMap<String, String>();
+
+        Content content = mock(Content.class);
+        when(content.getReader()).thenReturn(new StringReader(JsonJacksonTests.FARMER_JSON));
+        WebScriptRequest request = mock(WebScriptRequest.class);
+        when(request.getServiceMatch()).thenReturn(new Match(null, templateVars, null));
+        when(request.getContent()).thenReturn(content);
+        
+        Params params = extractor.extractParams(mockEntity(), request);
+        assertNotNull(params);
+        
+        assertNotNull(params.getFilter());
+        assertTrue("Default filter is BeanPropertiesFilter.AllProperties", BeanPropertiesFilter.AllProperties.class.equals(params.getFilter().getClass()));
+        
+        Object passed =  params.getPassedIn();
+        assertNotNull(passed);
+        
+        assertTrue(List.class.isAssignableFrom(passed.getClass()));
+        List<Object> passedObjs = (List<Object>) passed;
+        assertTrue(passedObjs.size() == 1);
+        assertTrue("A Farmer was passed in.", Farmer.class.equals(passedObjs.get(0).getClass()));    
+        
+        //No entity id for POST
+        templateVars.put(ResourceLocator.ENTITY_ID, "1234");
+        try
+        {
+            params = extractor.extractParams(mockEntity(), request);
+            fail("Should not get here. No entity id for POST");
+        }
+        catch (UnsupportedResourceOperationException uoe)
+        {
+            assertNotNull(uoe);  //Must throw this exception
+        }
+    
+        when(content.getReader()).thenReturn(new StringReader(JsonJacksonTests.FARMER_JSON));  //reset the reader
+        params = extractor.extractParams(mockRelationship(), request);
+        assertNotNull(params);
+        assertEquals("1234", params.getEntityId());
+        passed =  params.getPassedIn();
+        assertNotNull(passed);
+        passedObjs = (List<Object>) passed;
+        assertTrue(passedObjs.size() == 1);
+        assertTrue("A Farmer was passed in.", Farmer.class.equals(passedObjs.get(0).getClass()));      
+        
+        try
+        {
+            when(content.getReader()).thenReturn(new StringReader(JsonJacksonTests.FARMER_JSON));  //reset the reader
+            templateVars.put(ResourceLocator.RELATIONSHIP_ID, "45678");
+            params = extractor.extractParams(mockRelationship(), request);
+            fail("Should not get here.");
+        }
+        catch (UnsupportedResourceOperationException iae)
+        { 
+            assertNotNull("POSTING to a relationship collection by id is not correct.",iae);  //Must throw this exception
+        }
+
+        templateVars.clear();
+        when(content.getReader()).thenReturn(new StringReader(JsonJacksonTests.FARMER_JSON));  //reset the reader
+        templateVars.put(ResourceLocator.ENTITY_ID, "1234");
+        templateVars.put(ResourceLocator.RELATIONSHIP_ID, "codfish");
+        try
+        {
+            //POST does not support addressed parameters.
+            params = extractor.extractParams(mockEntity(), request);
+            fail("Should not get here.");
+        }
+        catch (UnsupportedResourceOperationException uoe)
+        {
+            assertNotNull(uoe);  //Must throw this exception
+        }
+        testExtractOperationParams(templateVars, request, extractor);
+        
+        templateVars.clear();
+        Method aMethod = ResourceInspector.findMethod(EntityResourceAction.Create.class, GrassEntityResource.class);
+        ResourceOperation op = ResourceInspector.inspectOperation(GrassEntityResource.class, aMethod, HttpMethod.POST);
+        List<ResourceMetadata> metainfo = ResourceInspector.inspect(GrassEntityResource.class);
+        assertNotNull(op);
+        assertTrue("Create method should have two params", op.getParameters().size() == 2);
+        ResourceParameter singleParam = op.getParameters().get(0);
+        assertTrue(ResourceParameter.KIND.HTTP_BODY_OBJECT.equals(singleParam.getParamType()));
+        assertFalse("Create grass does not support multiple grass creations", singleParam.isAllowMultiple());
+        assertFalse(singleParam.isRequired());
+
+        // Test context when the request body is null and 'required' webApiParam is false
+        when(request.getHeader("content-length")).thenReturn("0");
+        params = extractor.extractParams(metainfo.get(0), request);
+        assertNotNull(params);
+
+        // Test context when the request body is provided and 'required' property is false
+        when(content.getReader()).thenReturn(new StringReader(JsonJacksonTests.GRASS_JSON));
+        params = extractor.extractParams(metainfo.get(0), request);
+        assertNotNull(params);
+    }
+
+    private Params testExtractOperationParams(Map<String, String> templateVars, WebScriptRequest request, ParamsExtractor extractor)
+    {
+        templateVars.clear();
+        templateVars.put(ResourceLocator.ENTITY_ID, "1234");
+        templateVars.put(ResourceLocator.RELATIONSHIP_RESOURCE, "codfish");
+        Params params = extractor.extractParams(mockOperation(), request);
+        assertNotNull(params);
+        assertNull("For a Collection there should be no relationshipId params.",params.getRelationshipId());
+
+        templateVars.put(ResourceLocator.RELATIONSHIP_ID, "9865");
+        templateVars.put(ResourceLocator.PROPERTY, "monkFish");
+        params = extractor.extractParams(mockOperation(), request);
+        assertNotNull(params);
+        assertEquals("1234", params.getEntityId());
+        assertEquals("9865", params.getRelationshipId());
+        return params;
+    }
+
+    @Test
+    public void testMultiPartPostExtractor() throws Exception
+    {
+        ResourceWebScriptPost extractor = new ResourceWebScriptPost();
+        extractor.setAssistant(assistant);
+        extractor.setLocator(locator);
+
+        Map<String, String> templateVars = new HashMap<String, String>();
+
+        WebScriptRequest request = mock(WebScriptRequest.class);
+        when(request.getServiceMatch()).thenReturn(new Match(null, templateVars, null));
+
+        File file = TempFileProvider.createTempFile("ParamsExtractorTests-", ".txt");
+        PrintWriter writer = new PrintWriter(file);
+        writer.println("Multipart Mock test.");
+        writer.close();
+
+        MultiPartRequest reqBody = MultiPartBuilder.create()
+                    .setFileData(new FileData(file.getName(), file, MimetypeMap.MIMETYPE_TEXT_PLAIN))
+                    .build();
+
+        MockHttpServletRequest mockRequest = new MockHttpServletRequest("POST", "");
+        mockRequest.setContent(reqBody.getBody());
+        mockRequest.setContentType(reqBody.getContentType());
+
+        when(request.getContentType()).thenReturn("multipart/form-data");
+        when(request.parseContent()).thenReturn(new FormData(mockRequest));
+
+        Params params = extractor.extractParams(mockEntity(), request);
+        assertNotNull(params);
+        Object passed = params.getPassedIn();
+        assertNotNull(passed);
+        assertTrue(FormData.class.isAssignableFrom(passed.getClass()));
+        FormData formData = (FormData) passed;
+        assertTrue(formData.getIsMultiPart());
+
+        // No entity id for POST
+        templateVars.put(ResourceLocator.ENTITY_ID, "1234");
+        try
+        {
+            params = extractor.extractParams(mockEntity(), request);
+            fail("Should not get here. No entity id for POST");
+        }
+        catch (UnsupportedResourceOperationException uoe)
+        {
+            assertNotNull(uoe);
+        }
+
+        params = extractor.extractParams(mockRelationship(), request);
+        assertNotNull(params);
+        assertEquals("1234", params.getEntityId());
+        passed = params.getPassedIn();
+        assertNotNull(passed);
+        assertTrue(FormData.class.isAssignableFrom(passed.getClass()));
+        formData = (FormData) passed;
+        assertTrue(formData.getIsMultiPart());
+    }
+
+    @Test
+    public void testPutExtractor() throws IOException
+    {
+        //Put together the stubs
+        ResourceWebScriptPut extractor = new ResourceWebScriptPut();
+        extractor.setAssistant(assistant);
+        extractor.setLocator(locator);
+
+        Map<String, String> templateVars = new HashMap<String, String>();
+
+        Content content = mock(Content.class);
+        when(content.getReader()).thenReturn(new StringReader(JsonJacksonTests.FARMER_JSON));
+        WebScriptRequest request = mock(WebScriptRequest.class);
+        when(request.getServiceMatch()).thenReturn(new Match(null, templateVars, null));
+        when(request.getContent()).thenReturn(content);
+        when(request.getContentType()).thenReturn("application/pdf; charset=UTF-16BE");
+
+        Params params = null;
+        try
+        {
+            params = extractor.extractParams(mockEntity(), request);
+            fail("Should not get here. PUT is executed against the instance URL");
+        }
+        catch (UnsupportedResourceOperationException uoe)
+        {
+            assertNotNull(uoe);  //Must throw this exception
+        }
+        
+        templateVars.put(ResourceLocator.ENTITY_ID, "1234");
+        try
+        {
+            params = extractor.extractParams(mockRelationship(), request);
+            fail("Should not get here. PUT is executed against the instance URL");
+        }
+        catch (UnsupportedResourceOperationException uoe)
+        {
+            assertNotNull(uoe);  //Must throw this exception
+        }
+        
+        
+        templateVars.put(ResourceLocator.ENTITY_ID, "1234");
+        //Put single entity wrapped in array
+        params = extractor.extractParams(mockEntity(), request);
+        assertNotNull(params);
+        Object passed =  params.getPassedIn();
+        assertNotNull(passed);
+        assertTrue("A Farmer was passed in.", Farmer.class.equals(passed.getClass()));
+        
+        assertNotNull(params.getFilter());
+        assertTrue("Default filter is BeanPropertiesFilter.AllProperties", BeanPropertiesFilter.AllProperties.class.equals(params.getFilter().getClass()));
+        
+        when(content.getReader()).thenReturn(new StringReader(JsonJacksonTests.FARMER_JSON));  //reset the reader
+        params = extractor.extractParams(mockEntity(), request);
+        assertNotNull(params);
+        assertEquals("1234", params.getEntityId());
+        passed =  params.getPassedIn();
+        assertNotNull(passed);
+        
+        when(content.getReader()).thenReturn(new StringReader(JsonJacksonTests.FARMER_JSON));  //reset the reader
+        templateVars.put(ResourceLocator.RELATIONSHIP_ID, "67890");
+        params = extractor.extractParams(mockRelationship(), request);
+        assertNotNull(params);
+        assertEquals("1234", params.getEntityId());
+        passed =  params.getPassedIn();
+        assertNotNull(passed);
+        assertTrue("A Farmer was passed in.", Farmer.class.equals(passed.getClass()));
+        Farmer aFarmer = (Farmer) passed;
+        assertEquals("Relationship id should be automatically set on the object passed in.", aFarmer.getId(), "67890");
+        
+        when(content.getReader()).thenReturn(new StringReader(JsonJacksonTests.FARMER_JSON));  //reset the reader
+        params = testExtractAddressedParams(templateVars, request, extractor);
+        assertEquals("UTF-16BE", params.getContentInfo().getEncoding());
+        assertEquals(MimetypeMap.MIMETYPE_PDF, params.getContentInfo().getMimeType());
+    }
+    
+    @Test
+    public void testDeleteExtractor() throws IOException
+    {
+        ResourceWebScriptDelete extractor = new ResourceWebScriptDelete();
+        extractor.setLocator(locator);
+
+        Map<String, String> templateVars = new HashMap<String, String>();
+        
+        WebScriptRequest request = mock(WebScriptRequest.class);
+        when(request.getServiceMatch()).thenReturn(new Match(null, templateVars, null));
+
+        Params params = null;
+        params = extractor.extractParams(mockEntity(), request);
+        assertNotNull(params);
+        assertNull(params.getEntityId());
+        assertNull(params.getRelationshipId());
+        assertNotNull(params.getFilter());
+        assertTrue("Default filter is BeanPropertiesFilter.AllProperties", BeanPropertiesFilter.AllProperties.class.equals(params.getFilter().getClass()));
+        
+        templateVars.put(ResourceLocator.ENTITY_ID, "1234");
+        params = extractor.extractParams(mockRelationship(), request);
+        assertNotNull(params);
+        assertEquals("1234", params.getEntityId());
+        assertNull(params.getRelationshipId());
+        assertNotNull(params.getFilter());
+        assertTrue("Default filter is BeanPropertiesFilter.AllProperties", BeanPropertiesFilter.AllProperties.class.equals(params.getFilter().getClass()));
+        
+        templateVars.put(ResourceLocator.RELATIONSHIP_ID, "45678");
+        params = extractor.extractParams(mockRelationship(), request);
+        assertNotNull(params);
+        assertEquals("1234", params.getEntityId());
+        assertEquals("45678", params.getRelationshipId());
+        assertNotNull(params.getFilter());
+        assertTrue("Default filter is BeanPropertiesFilter.AllProperties", BeanPropertiesFilter.AllProperties.class.equals(params.getFilter().getClass()));
+        
+        testExtractAddressedParams(templateVars, request, extractor);
+    }
+    
+    @Test
+    public void testHeaderParsing() throws IOException
+    {
+    	
+    }
+    
+    @Test
+    public void testSpecialChars() throws IOException
+    {
+       String specialChars = new String(new char[] { (char) '香' }) + " 香蕉";
+       ResourceWebScriptPost extractor = new ResourceWebScriptPost();
+       extractor.setAssistant(assistant);
+       extractor.setLocator(locator);
+
+       Map<String, String> templateVars = new HashMap<String, String>();
+       String mockMe = "{\"name\":\""+specialChars+"\",\"created\":\"2012-03-23T15:56:18.552+0000\",\"age\":54,\"id\":\"1234A3\",\"farm\":\"LARGE\"}";
+       Content content = mock(Content.class);
+       when(content.getReader()).thenReturn(new StringReader(mockMe));
+       WebScriptRequest request = mock(WebScriptRequest.class);
+       when(request.getServiceMatch()).thenReturn(new Match(null, templateVars, null));
+       when(request.getContent()).thenReturn(content);
+       
+       Params params = extractor.extractParams(mockEntity(), request);
+       assertNotNull(params);
+       Object passed =  params.getPassedIn();
+       assertTrue(List.class.isAssignableFrom(passed.getClass()));
+       @SuppressWarnings("unchecked")
+       List<Object> passedObjs = (List<Object>) passed;
+       assertTrue(passedObjs.size() == 1);
+       assertTrue("A Farmer was passed in.", Farmer.class.equals(passedObjs.get(0).getClass()));   
+       Farmer f = (Farmer)passedObjs.get(0);
+       assertTrue(f.getName().equals("香 香蕉"));
+       
+       //Test passing in special characters as a param.
+       ResourceWebScriptGet getExtractor = new ResourceWebScriptGet();
+       getExtractor.setAssistant(assistant);
+       getExtractor.setLocator(locator);
+
+       Map<String, String> getTemplateVars = new HashMap<String, String>();
+       WebScriptRequest getRequest = mock(WebScriptRequest.class);
+       when(getRequest.getServiceMatch()).thenReturn(new Match(null, getTemplateVars, null));
+       when(getRequest.getParameterNames()).thenReturn(new String[] { "aParam" });
+       when(getRequest.getParameterValues("aParam")).thenReturn(new String[] { specialChars });
+       Params pGet = getExtractor.extractParams(mockEntity(), getRequest);
+       assertNotNull(pGet);
+       String pVal = pGet.getParameter("aParam");
+       assertTrue(pVal.equals("香 香蕉"));
+       
+    }
+    /**
+     * Mocks a Entity Resource
+     * @return ResourceMetadata a Entity
+     */
+    private static ResourceMetadata mockEntity()
+    {
+        ResourceMetadata resourceMock = mock(ResourceMetadata.class);
+        ResourceOperation resourceOperation = mock(ResourceOperation.class);
+        when(resourceMock.getType()).thenReturn(ResourceMetadata.RESOURCE_TYPE.ENTITY);
+        when(resourceMock.getOperation(notNull(HttpMethod.class))).thenReturn(resourceOperation);
+        when(resourceMock.getObjectType(notNull(ResourceOperation.class))).thenReturn(Farmer.class);
+        return resourceMock;
+    }
+ 
+    /**
+     * Mocks a Property Resource
+     * @return ResourceMetadata a Entity
+     */
+    private static ResourceMetadata mockProperty()
+    {
+        ResourceMetadata resourceMock = mock(ResourceMetadata.class);
+        when(resourceMock.getType()).thenReturn(ResourceMetadata.RESOURCE_TYPE.PROPERTY);
+        //when(resourceMock.getObjectType(HttpMethod.PUT)).thenReturn(Farmer.class);
+        //when(resourceMock.getObjectType(HttpMethod.POST)).thenReturn(Farmer.class);
+        return resourceMock;
+    }
+
+    /**
+     * Mocks an operation
+     * @return ResourceMetadata a Entity
+     */
+    private static ResourceMetadata mockOperation()
+    {
+        ResourceMetadata resourceMock = mock(ResourceMetadata.class);
+        when(resourceMock.getType()).thenReturn(ResourceMetadata.RESOURCE_TYPE.OPERATION);
+        return resourceMock;
+    }
+
+    /**
+     * Mocks a Relationship Resource
+     * @return ResourceMetadata a Relationship
+     */
+    private static ResourceMetadata mockRelationship()
+    {
+        ResourceMetadata resourceMock = mock(ResourceMetadata.class);
+        ResourceOperation resourceOperation = mock(ResourceOperation.class);
+        when(resourceMock.getOperation(notNull(HttpMethod.class))).thenReturn(resourceOperation);
+        when(resourceMock.getType()).thenReturn(ResourceMetadata.RESOURCE_TYPE.RELATIONSHIP);
+        when(resourceMock.getObjectType(notNull(ResourceOperation.class))).thenReturn(Farmer.class);
+        return resourceMock;
+    }
+    
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ResourceLocatorTests.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ResourceLocatorTests.java
new file mode 100644
index 00000000000..98f3ad8e46d
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/ResourceLocatorTests.java
@@ -0,0 +1,490 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.tests.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.ResourceDictionaryBuilder;
+import org.alfresco.rest.framework.core.ResourceInspector;
+import org.alfresco.rest.framework.core.ResourceLocator;
+import org.alfresco.rest.framework.core.ResourceLookupDictionary;
+import org.alfresco.rest.framework.core.ResourceMetadata;
+import org.alfresco.rest.framework.core.ResourceOperation;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.tests.api.mocks.Farmer;
+import org.alfresco.rest.framework.tests.api.mocks.GoatEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks.GrassEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks.SheepBaaaahResource;
+import org.alfresco.rest.framework.tests.api.mocks.SheepBlackSheepResource;
+import org.alfresco.rest.framework.tests.api.mocks.SheepEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks3.FlockEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks3.FlocketEntityResource;
+import org.alfresco.util.Pair;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.http.HttpMethod;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Test rest resource setup / locating
+ * 
+ * @author Gethin James
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:test-rest-context.xml" })
+public class ResourceLocatorTests
+{
+    @Autowired
+    ResourceLookupDictionary locator;
+
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    private static Api api = Api.valueOf("alfrescomock", "private", "1");
+    
+    @Before
+    public void setUp() throws Exception
+    {
+        Map<String, Object> entityResourceBeans = applicationContext.getBeansWithAnnotation(EntityResource.class);
+        Map<String, Object> relationResourceBeans = applicationContext.getBeansWithAnnotation(RelationshipResource.class);
+        locator.setDictionary(ResourceDictionaryBuilder.build(entityResourceBeans.values(), relationResourceBeans.values()));
+    }
+
+    @Test(expected=org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException.class)
+    public void testLocateResourcesByType()
+    {
+
+        Api api1 = Api.valueOf("alfrescomock", "private", "1");
+        ResourceWithMetadata entityResource = locator.locateEntityResource(api1,"sheep", HttpMethod.GET);
+        assertNotNull(entityResource);
+        assertEquals(SheepEntityResource.class, entityResource.getResource().getClass());
+        assertTrue(ResourceMetadata.RESOURCE_TYPE.ENTITY.equals(entityResource.getMetaData().getType()));
+
+        Api api2 = Api.valueOf("alfrescomock", "private", "2");
+        locateByVersion(api1);
+        locateByVersion(api2);
+        @SuppressWarnings("unused")
+        ResourceWithMetadata relationResource = locator.locateRelationResource(api1, "sheep", "baah", HttpMethod.GET);
+    }
+
+    protected void locateByVersion(Api api)
+    {
+        ResourceWithMetadata relationResource = locator.locateRelationResource(api, "sheep", "baaahh", HttpMethod.GET);
+        assertNotNull(relationResource);
+        assertEquals(SheepBaaaahResource.class, relationResource.getResource().getClass());
+        assertTrue(ResourceMetadata.RESOURCE_TYPE.RELATIONSHIP.equals(relationResource.getMetaData().getType()));
+        
+        relationResource = locator.locateRelationResource(api, "sheep", "blacksheep", HttpMethod.GET);
+        assertNotNull(relationResource);
+        assertEquals(SheepBlackSheepResource.class, relationResource.getResource().getClass());
+        assertTrue(ResourceMetadata.RESOURCE_TYPE.RELATIONSHIP.equals(relationResource.getMetaData().getType()));
+    }
+    
+    @Test(expected=org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException.class)
+    public void testLocateResource()
+    {
+        Map<String, String> templateVars = new HashMap<String, String>();
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "sheep");
+        ResourceWithMetadata collResource = locator.locateResource(api, templateVars, HttpMethod.GET);
+        assertNotNull(collResource);
+        assertNotNull(collResource.getMetaData().getOperation(HttpMethod.GET));
+
+        collResource = locator.locateResource(api, templateVars, HttpMethod.POST);
+        assertNotNull(collResource);
+        assertNotNull(collResource.getMetaData().getOperation(HttpMethod.POST));
+        
+        templateVars.put(ResourceLocator.ENTITY_ID, "farmersUniqueId");
+        ResourceWithMetadata entityResource = locator.locateResource(api,templateVars, HttpMethod.GET);
+        assertNotNull(entityResource);
+        assertNotNull(entityResource.getMetaData().getOperation(HttpMethod.GET));
+        
+        entityResource = locator.locateResource(api, templateVars, HttpMethod.PUT);
+        assertNotNull(entityResource);
+        assertNotNull(entityResource.getMetaData().getOperation(HttpMethod.PUT));
+        
+        templateVars.clear();
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "sheepnoaction");
+        collResource = locator.locateResource(api,templateVars, HttpMethod.GET);
+        
+    }
+
+    @Test
+    public void testLocateActions()
+    {
+        Map<String, String> templateVars = new HashMap<String, String>();
+        ResourceWithMetadata collResource = null;
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "grass");
+        templateVars.put(ResourceLocator.ENTITY_ID, "grassId");
+        templateVars.put(ResourceLocator.RELATIONSHIP_RESOURCE, "cut");
+        try
+        {
+            collResource = locator.locateResource(api, templateVars, HttpMethod.GET);
+            fail("Should throw an UnsupportedResourceOperationException");
+        }
+        catch (UnsupportedResourceOperationException error)
+        {
+            //this is correct
+        }
+
+        collResource = locator.locateResource(api, templateVars, HttpMethod.POST);
+        assertEquals(GrassEntityResource.class, collResource.getResource().getClass());
+        assertEquals(ResourceMetadata.RESOURCE_TYPE.OPERATION, collResource.getMetaData().getType());
+
+        templateVars = new HashMap<String, String>();
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "sheep");
+        templateVars.put(ResourceLocator.ENTITY_ID, "sheepId");
+        templateVars.put(ResourceLocator.RELATIONSHIP_RESOURCE, "baaahh");
+        templateVars.put(ResourceLocator.PROPERTY, "chew");
+        collResource = locator.locateResource(api, templateVars, HttpMethod.POST);
+        assertEquals(SheepBaaaahResource.class, collResource.getResource().getClass());
+        assertEquals(ResourceMetadata.RESOURCE_TYPE.OPERATION, collResource.getMetaData().getType());
+    }
+
+    @Test
+    public void testLocateProperties()
+    {
+        Api api3 = Api.valueOf("alfrescomock", "private", "3");
+        Map<String, String> templateVars = new HashMap<String, String>();
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "flock");
+        templateVars.put(ResourceLocator.ENTITY_ID, "flockId");
+        templateVars.put(ResourceLocator.RELATIONSHIP_RESOURCE, "photo");
+        ResourceWithMetadata collResource = locator.locateResource(api3, templateVars, HttpMethod.GET);
+        assertNotNull(collResource);
+        assertNotNull(collResource.getMetaData().getOperation(HttpMethod.GET));
+        assertEquals(FlockEntityResource.class, collResource.getResource().getClass());
+        
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "flocket");
+        templateVars.put(ResourceLocator.RELATIONSHIP_RESOURCE, "madeUpProp");
+        try
+        {
+            collResource = locator.locateResource(api3, templateVars, HttpMethod.PUT);
+            fail("Should throw an UnsupportedResourceOperationException");
+        }
+        catch (UnsupportedResourceOperationException error)
+        {
+            //this is correct
+        }
+        try
+        {
+            collResource = locator.locateResource(api3, templateVars, HttpMethod.DELETE);
+            fail("Should throw an UnsupportedResourceOperationException");
+        }
+        catch (UnsupportedResourceOperationException error)
+        {
+            //this is correct
+        }
+        collResource = locator.locateResource(api3, templateVars, HttpMethod.GET);
+        assertNotNull(collResource);
+        assertNotNull(collResource.getMetaData().getOperation(HttpMethod.GET));
+        assertEquals(FlocketEntityResource.class, collResource.getResource().getClass());
+        
+        templateVars.put(ResourceLocator.RELATIONSHIP_RESOURCE, "album");
+        try
+        {
+            collResource = locator.locateResource(api3, templateVars, HttpMethod.DELETE);
+            fail("Should throw an UnsupportedResourceOperationException");
+        }
+        catch (UnsupportedResourceOperationException error)
+        {
+            //this is correct
+        }
+        collResource = locator.locateResource(api3, templateVars, HttpMethod.GET);
+        assertNotNull(collResource);
+        assertNotNull(collResource.getMetaData().getOperation(HttpMethod.GET));
+        assertEquals(FlocketEntityResource.class, collResource.getResource().getClass());
+        collResource = locator.locateResource(api3, templateVars, HttpMethod.PUT);
+        assertNotNull(collResource);
+        assertNotNull(collResource.getMetaData().getOperation(HttpMethod.PUT));
+        assertEquals(FlocketEntityResource.class, collResource.getResource().getClass());
+    }
+
+    @Test
+    public void testLocateRelationshipProperties()
+    {
+        Api api3 = Api.valueOf("alfrescomock", "private", "3");
+        Map<String, String> templateVars = new HashMap<String, String>();
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "goat");
+        templateVars.put(ResourceLocator.ENTITY_ID, "herdId");
+        templateVars.put(ResourceLocator.RELATIONSHIP_RESOURCE, "herd");
+
+        ResourceWithMetadata collResource;
+        try
+        {
+            collResource = locator.locateResource(api3, templateVars, HttpMethod.PUT);
+            fail("Should throw an UnsupportedResourceOperationException");
+        }
+        catch (UnsupportedResourceOperationException error)
+        {
+            //this is correct
+        }
+
+        templateVars.put(ResourceLocator.PROPERTY, "content");
+        collResource = locator.locateResource(api3, templateVars, HttpMethod.GET);
+        assertNotNull(collResource);
+        assertNotNull(collResource.getMetaData().getOperation(HttpMethod.GET));
+
+        templateVars = new HashMap<String, String>();
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "sheep");
+        templateVars.put(ResourceLocator.ENTITY_ID, "sheepId");
+        templateVars.put(ResourceLocator.RELATIONSHIP_RESOURCE, "baaahh");
+        templateVars.put(ResourceLocator.PROPERTY, "content");
+
+        try
+        {
+            //Tests by passing invalid propery
+            collResource = locator.locateResource(api, templateVars, HttpMethod.GET);
+            fail("Should throw an NotFoundException");
+        }
+        catch (NotFoundException error)
+        {
+            //this is correct
+        }
+
+        templateVars.put(ResourceLocator.PROPERTY, "photo");
+        collResource = locator.locateResource(api, templateVars, HttpMethod.GET);
+        assertNotNull(collResource);
+        assertNotNull(collResource.getMetaData().getOperation(HttpMethod.GET));
+        assertNotNull(collResource.getMetaData().getOperation(HttpMethod.PUT));
+        assertNotNull(collResource.getMetaData().getOperation(HttpMethod.DELETE));
+    }
+    
+    @Test
+    public void testApiValues()
+    {
+
+        Api testApi;
+        try
+        {
+            //Tests by passing invalid values
+            testApi = Api.valueOf(null,null,null);
+            fail("Should throw an InvalidArgumentException");
+        }
+        catch (InvalidArgumentException error)
+        {
+            //this is correct
+        }
+        
+        try
+        {
+            //version as 0
+            testApi = Api.valueOf("alfrescomock", "public","0"); 
+            fail("Should throw an InvalidArgumentException");
+        }
+        catch (InvalidArgumentException error)
+        {
+            //this is correct
+        }
+        
+        try
+        {
+            //name as upper case
+            testApi = Api.valueOf("AlfrescoMock", "public","1");
+            fail("Should throw an InvalidArgumentException");
+        }
+        catch (InvalidArgumentException error)
+        {
+            //this is correct
+        }
+
+        try
+        {
+            //scope as anything
+            testApi = Api.valueOf("alfrescomock", "nonsense","1");
+            fail("Should throw an InvalidArgumentException");
+        }
+        catch (InvalidArgumentException error)
+        {
+            //this is correct
+        }        
+        
+        //scope as mixed case
+        testApi = Api.valueOf("alfrescomock", "Public","1");
+        assertNotNull(testApi);
+    }
+
+    @Test
+    public void testInvalidApis()
+    {
+        ResourceWithMetadata entityResource = null;
+        
+        try
+        {
+            entityResource = locator.locateEntityResource(Api.valueOf("alfrescomock", "public", "1"),"sheep", HttpMethod.GET);
+            fail("Should throw an NotFoundException");
+        }
+        catch (NotFoundException error)
+        {
+            //this is correct
+        }
+        
+        try
+        {
+            entityResource = locator.locateEntityResource(Api.valueOf("alfrescomock", "public", "999"),"sheep", HttpMethod.GET);
+            fail("Should throw an NotFoundException");
+        }
+        catch (NotFoundException error)
+        {
+            //this is correct
+        }
+        
+        entityResource = locator.locateEntityResource(Api.valueOf("alfrescomock", "private", "1"),"sheep", HttpMethod.GET);
+        assertNotNull(entityResource);
+
+    }
+    
+    @Test
+    public void testResourceVersions()
+    {
+        ResourceWithMetadata aResource = null;
+        
+        try
+        {
+            aResource = locator.locateEntityResource(api, "sheepnoaction", HttpMethod.GET);
+            fail("Should throw an NotFoundException");
+        }
+        catch (NotFoundException error)
+        {
+            //this is correct
+        }
+        
+        //Previously no actions for this entity, with v2 now have a GET action
+        Api v2 = Api.valueOf(api.getName(), api.getScope().toString(), "2");
+        aResource = locator.locateEntityResource(v2, "sheepnoaction", HttpMethod.GET);
+        assertNotNull(aResource);
+        
+        //Not defined in v2 but now available because all v1 are available in v2.
+        aResource = locator.locateEntityResource(v2, "sheep", HttpMethod.GET);
+        assertNotNull(aResource);
+        
+        try
+        {
+            //Not defined in v1
+            aResource = locator.locateRelationResource(api, "sheepnoaction","v3isaresource", HttpMethod.GET);
+            fail("Only available in v3");
+        }
+        catch (NotFoundException error)
+        {
+            //this is correct
+        }
+        
+        try
+        {
+            //Not defined in v2
+            aResource = locator.locateRelationResource(v2, "sheepnoaction","v3isaresource", HttpMethod.GET);
+            fail("Only available in v3");
+        }
+        catch (NotFoundException error)
+        {
+            //this is correct
+        }
+        
+        //Only defined in V3
+        Api v3 = Api.valueOf(api.getName(), api.getScope().toString(), "3");
+        aResource = locator.locateRelationResource(v3, "sheepnoaction","v3isaresource", HttpMethod.GET);
+        assertNotNull("This resource is only available in v3",aResource);
+        
+        //Defined in v1 but available in v3
+        aResource = locator.locateEntityResource(v3, "sheep", HttpMethod.GET);
+        assertNotNull("This resource should be available in v3",aResource);
+        
+    }
+    
+    @Test
+    public void testGetEmbeddedResources()
+    {
+        Map<String,Pair<String,Method>> embeddded = ResourceInspector.findEmbeddedResources(Farmer.class);
+        assertNotNull(embeddded);
+        final Map<String,ResourceWithMetadata> results = new HashMap<String,ResourceWithMetadata>(embeddded.size());
+        for (Entry<String, Pair<String,Method>> embeddedEntry : embeddded.entrySet())
+        {
+            ResourceWithMetadata res = locator.locateEntityResource(api,embeddedEntry.getValue().getFirst(), HttpMethod.GET);
+            results.put(embeddedEntry.getKey(),res);
+        }
+        assertNotNull(results);
+        assertTrue(results.size() == 2);
+        assertTrue(SheepEntityResource.class.equals(results.get("sheep").getResource().getClass()));
+        Object goatResource = results.get("goat").getResource();
+        assertTrue(GoatEntityResource.class.equals(goatResource.getClass()));
+    }
+   
+    
+    @Test
+    public void testFindEntityCollectionName()
+    {
+        ResourceWithMetadata collResource =  locator.locateEntityResource(api,"sheep", HttpMethod.GET);
+        String name = ResourceInspector.findEntityCollectionNameName(collResource.getMetaData());
+        assertEquals ("sheep", name);
+        
+        ResourceWithMetadata relationResource = locator.locateRelationResource(api, "sheep", "baaahh", HttpMethod.GET);
+        name = ResourceInspector.findEntityCollectionNameName(relationResource.getMetaData());
+        assertEquals ("sheep", name);
+        
+        relationResource = locator.locateRelationResource(api, "sheep", "blacksheep", HttpMethod.GET);
+        name = ResourceInspector.findEntityCollectionNameName(relationResource.getMetaData());
+        assertEquals ("sheep", name);
+
+        Api v2 = Api.valueOf(api.getName(), api.getScope().toString(), "2");
+        Map<String, String> templateVars = new HashMap<String, String>();
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "sheepnoaction");
+        collResource = locator.locateResource(v2, templateVars, HttpMethod.GET);
+        name = ResourceInspector.findEntityCollectionNameName(collResource.getMetaData());
+        assertEquals ("sheepnoaction", name);
+    }
+    
+    @Test(expected=org.alfresco.rest.framework.core.exceptions.NotFoundException.class)
+    public void testLocateRelationResource()
+    {
+        Collection<String> relKeys = Arrays.asList("blacksheep","baaahh");
+        Map<String,ResourceWithMetadata> embeds = locator.locateRelationResource(api,"sheep", relKeys, HttpMethod.GET);
+        assertNotNull(embeds);
+        
+        relKeys = Arrays.asList("nonsense");
+        embeds = locator.locateRelationResource(api,"sheep", relKeys, HttpMethod.GET);
+        assertNotNull(embeds);
+        
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/SecondLevelRelationshipTests.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/SecondLevelRelationshipTests.java
new file mode 100644
index 00000000000..8ac586ab1b2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/SecondLevelRelationshipTests.java
@@ -0,0 +1,139 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.tests.core;
+
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.ResourceDictionary;
+import org.alfresco.rest.framework.core.ResourceDictionaryBuilder;
+import org.alfresco.rest.framework.core.ResourceInspector;
+import org.alfresco.rest.framework.core.ResourceLocator;
+import org.alfresco.rest.framework.core.ResourceLookupDictionary;
+import org.alfresco.rest.framework.core.ResourceMetadata;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.NotFoundException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.alfresco.rest.framework.tests.api.mocks.Farmer;
+import org.alfresco.rest.framework.tests.api.mocks.GoatEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks.GrassEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks.SheepBaaaahResource;
+import org.alfresco.rest.framework.tests.api.mocks.SheepBlackSheepResource;
+import org.alfresco.rest.framework.tests.api.mocks.SheepEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks3.FlockEntityResource;
+import org.alfresco.rest.framework.tests.api.mocks3.FlocketEntityResource;
+import org.alfresco.util.Pair;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.http.HttpMethod;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ *
+ * @author janv
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:test-rest-context.xml" })
+public class SecondLevelRelationshipTests
+{
+    @Autowired
+    ResourceLookupDictionary locator;
+
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    private static Api api = Api.valueOf("alfrescomockabc", "private", "1");
+
+    @Before
+    public void setUp() throws Exception
+    {
+        Map<String, Object> entityResourceBeans = applicationContext.getBeansWithAnnotation(EntityResource.class);
+        Map<String, Object> relationResourceBeans = applicationContext.getBeansWithAnnotation(RelationshipResource.class);
+        locator.setDictionary(ResourceDictionaryBuilder.build(entityResourceBeans.values(), relationResourceBeans.values()));
+    }
+
+    @Test
+    public void testLocateRelationResource()
+    {
+        Map<String, String> templateVars = new HashMap<String, String>();
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "type-a1");
+        ResourceWithMetadata collResource = locator.locateResource(api, templateVars, HttpMethod.GET);
+        assertNotNull(collResource);
+        assertNotNull(collResource.getMetaData().getOperation(HttpMethod.GET));
+
+        templateVars = new HashMap<String, String>();
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "type-b1");
+        collResource = locator.locateResource(api, templateVars, HttpMethod.GET);
+        assertNotNull(collResource);
+        assertNotNull(collResource.getMetaData().getOperation(HttpMethod.GET));
+
+        templateVars = new HashMap<String, String>();
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "type-b2");
+        collResource = locator.locateResource(api, templateVars, HttpMethod.GET);
+        assertNotNull(collResource);
+        assertNotNull(collResource.getMetaData().getOperation(HttpMethod.GET));
+
+        templateVars = new HashMap<String, String>();
+        templateVars.put(ResourceLocator.COLLECTION_RESOURCE, "type-c1");
+        collResource = locator.locateResource(api, templateVars, HttpMethod.GET);
+        assertNotNull(collResource);
+        assertNotNull(collResource.getMetaData().getOperation(HttpMethod.GET));
+
+        Collection<String> relKeys = Arrays.asList("relation-a1-b1", "relation-a1-b2");
+        Map<String,ResourceWithMetadata> embeds = locator.locateRelationResource(api,"type-a1", relKeys, HttpMethod.GET);
+        assertNotNull(embeds);
+    }
+
+    @Test
+    public void testLocateRelationResource2()
+    {
+        // /relation-b1-c1/{entityId}/relation-b1-c1
+        String relKey = ResourceDictionary.resourceKey("relation-a1-b1", "relation-b1-c1");
+        Collection<String> relKeys = Arrays.asList(relKey);
+
+        // /type-a1/{entityId}/relation-b1-c1/{entityId}/relation-b1-c1
+        Map<String,ResourceWithMetadata> embeds = locator.locateRelationResource(api,"type-a1", relKeys, HttpMethod.GET);
+        assertNotNull(embeds);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/SerializeTests.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/SerializeTests.java
new file mode 100644
index 00000000000..00744b3fed5
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/SerializeTests.java
@@ -0,0 +1,510 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsonschema.JsonSchema;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder.FileData;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder.MultiPartRequest;
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
+import org.alfresco.rest.framework.jacksonextensions.BeanPropertiesFilter;
+import org.alfresco.rest.framework.jacksonextensions.ExecutionResult;
+import org.alfresco.rest.framework.jacksonextensions.JacksonHelper.Writer;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction.Read;
+import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction.ReadById;
+import org.alfresco.rest.framework.resource.actions.interfaces.MultiPartResourceAction;
+import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
+import org.alfresco.rest.framework.resource.content.BinaryProperty;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.tests.api.mocks.Farmer;
+import org.alfresco.rest.framework.tests.api.mocks.Goat;
+import org.alfresco.rest.framework.tests.api.mocks.Grass;
+import org.alfresco.rest.framework.tests.api.mocks.Sheep;
+import org.alfresco.rest.framework.tests.api.mocks3.Flock;
+import org.alfresco.rest.framework.tests.api.mocks3.SlimGoat;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+import org.alfresco.rest.framework.webscripts.AbstractResourceWebScript;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.util.GUID;
+import org.alfresco.util.TempFileProvider;
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.junit.Test;
+import org.springframework.extensions.webscripts.Format;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.servlet.FormData;
+import org.springframework.http.HttpMethod;
+import org.springframework.mock.web.MockHttpServletRequest;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+public class SerializeTests extends AbstractContextTest implements RecognizedParamsExtractor
+{
+
+    @Test
+    public void testInvokeEntity() throws IOException
+    {
+        ResourceWithMetadata entityResource = locator.locateEntityResource(api,"sheep", HttpMethod.GET);
+        assertNotNull(entityResource);
+        EntityResourceAction.ReadById<?> getter = (ReadById<?>) entityResource.getResource();
+
+        String out = writeResponse(helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null, NOT_USED, getter.readById("1234A3", NOT_USED)));
+        assertTrue("There must be json output", StringUtils.startsWith(out, "{\"entry\":"));
+        
+        EntityResourceAction.Read<?> getAll = (Read<?>) entityResource.getResource();
+        CollectionWithPagingInfo<?> resources = getAll.readAll(null);
+        out = writeResponse(helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null, Params.valueOf("notUsed", null, null), resources));
+        assertTrue("There must be json output as List", StringUtils.startsWith(out, "{\"list\":"));
+    }
+
+    @Test
+    public void testInvokeMultiPartEntity() throws IOException
+    {
+        ResourceWithMetadata entityResource = locator.locateEntityResource(api,"multiparttest", HttpMethod.POST);
+        assertNotNull(entityResource);
+        MultiPartResourceAction.Create<?> resource = (MultiPartResourceAction.Create<?>) entityResource.getResource();
+
+        File file = TempFileProvider.createTempFile("ParamsExtractorTests-", ".txt");
+        PrintWriter writer = new PrintWriter(file);
+        writer.println("Multipart Mock test2.");
+        writer.close();
+
+        MultiPartRequest reqBody = MultiPartBuilder.create()
+                    .setFileData(new FileData(file.getName(), file, MimetypeMap.MIMETYPE_TEXT_PLAIN))
+                    .build();
+
+        MockHttpServletRequest mockRequest = new MockHttpServletRequest("POST", "");
+        mockRequest.setContent(reqBody.getBody());
+        mockRequest.setContentType(reqBody.getContentType());
+
+        String out = writeResponse(helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null, NOT_USED, resource.create(new FormData(mockRequest), NOT_USED, callBack)));
+        assertTrue("There must be json output", StringUtils.startsWith(out, "{\"entry\":"));
+    }
+
+    @Test
+    public void testSerializeResponse() throws IOException
+    {
+        ResourceWithMetadata relationResource = locator.locateRelationResource(api,"sheep", "baaahh", HttpMethod.GET);
+        assertNotNull(relationResource);
+        RelationshipResourceAction.Read<?> getter = (RelationshipResourceAction.Read<?>) relationResource.getResource();
+        CollectionWithPagingInfo<?> resources = getter.readAll("123",Params.valueOf("", null, null));
+        String out = writeResponse(helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null, Params.valueOf("notUsed", null, null), resources));
+        assertTrue("There must be json output as List", StringUtils.startsWith(out, "{\"list\":"));
+    }
+    
+    @Test
+    public void testPagedCollection() throws IOException
+    {
+        ResourceWithMetadata relationResource = locator.locateRelationResource(api,"sheep", "baaahh", HttpMethod.GET);
+        assertNotNull(relationResource);
+        RelationshipResourceAction.Read<?> getter = (RelationshipResourceAction.Read<?>) relationResource.getResource();
+        CollectionWithPagingInfo<?> resources = getter.readAll("123",Params.valueOf("", null, null));
+        assertNotNull(resources);
+        assertTrue(resources.getTotalItems().intValue() == 3);
+        assertFalse(resources.hasMoreItems());
+        String out = writeResponse(helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null, Params.valueOf("notUsed", null, null), resources));
+        assertTrue("There must be json output as List with pagination", StringUtils.startsWith(out, "{\"list\":{\"pagination\":{\"count\":3,"));
+        
+        resources = getter.readAll("123",ParamsExtender.valueOf(Paging.valueOf(0, 1),"123"));
+        assertTrue(resources.getCollection().size() == 1);
+        assertTrue(resources.hasMoreItems());
+        out = writeResponse(helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null, Params.valueOf("notUsed", null, null), resources));
+        assertTrue("There must be json output as List with pagination", StringUtils.startsWith(out, "{\"list\":{\"pagination\":{\"count\":1,"));
+
+    }
+       
+    @Test
+    public void testExpandEmbedded() throws IOException
+    {
+        assertNotNull(helper);
+        Farmer aFarmer = new Farmer("180");
+        aFarmer.setGoatId("1111");
+        aFarmer.setSheepId("2222");
+        ExecutionResult res = (ExecutionResult) helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null,Params.valueOf("notUsed", null, null),aFarmer);
+        assertNotNull(res);
+        assertTrue(Farmer.class.equals(res.getRoot().getClass()));
+        Map<String,Object> embeds = res.getEmbedded();
+        assertNotNull(embeds);
+        assertTrue(embeds.size()>0);
+        ExecutionResult goat = (ExecutionResult) embeds.get("goat");
+        assertTrue(Goat.class.equals(goat.getRoot().getClass()));
+        ExecutionResult grassEmbed = (ExecutionResult) goat.getEmbedded().get("grass");
+        Grass grass = (Grass) grassEmbed.getRoot();
+        assertNotNull(grass);
+        assertTrue("Goat1111".equals(grass.getId()));
+        ExecutionResult sheep = (ExecutionResult) embeds.get("sheep");
+        assertTrue(Sheep.class.equals(sheep.getRoot().getClass()));
+        Sheep aSheep = (Sheep) sheep.getRoot();
+        assertTrue("2222".equals(aSheep.getId()));
+        String out = writeResponse(res);
+        assertTrue("There must be json output", StringUtils.isNotBlank(out));
+    }
+    
+    @Test
+    public void testExpandRelations() throws IOException
+    {
+        assertNotNull(helper);
+        Map<String, BeanPropertiesFilter> rFilter = getRelationFilter("blacksheep,baaahh");
+        ExecutionResult res = (ExecutionResult) helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,"sheep",ParamsExtender.valueOf(rFilter,"1"),new Farmer("180"));
+        assertNotNull(res);
+        String out = writeResponse(res);
+        assertTrue(Farmer.class.equals(res.getRoot().getClass()));
+        assertTrue("There must be json output", StringUtils.isNotBlank(out));
+        Paging pageRequest = Paging.valueOf(1, 2);
+        
+        Object resultCollection =  helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,"sheep",ParamsExtender.valueOf(rFilter,"1"),CollectionWithPagingInfo.asPaged(pageRequest,Arrays.asList(new Farmer("180"), new Farmer("190"), new Farmer("280"))));
+        assertNotNull(resultCollection);
+        out = writeResponse(resultCollection);
+        assertTrue("There must be json output", StringUtils.isNotBlank(out));
+    }
+
+    @Test
+    public void testIncludeSource() throws IOException
+    {
+        ExecutionResult exec1 = new ExecutionResult(new Farmer("180"),null);
+        ExecutionResult exec2 = new ExecutionResult(new Farmer("456"), null);
+        CollectionWithPagingInfo<ExecutionResult> coll = CollectionWithPagingInfo.asPaged(null, Arrays.asList(exec1, exec2));
+
+        Object resultCollection =  helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,"sheep",ParamsExtender.valueOf(true,"1"),coll);
+        assertNotNull(resultCollection);
+        String out = writeResponse(resultCollection);
+        assertTrue("There must 'source' json output", StringUtils.contains(out, "\"source\":{\"name\":\"Dolly\",\"age\":3,\"sheepGuid\":\"1\"}"));
+
+        resultCollection =  helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,"sheep",ParamsExtender.valueOf(false,"1"),coll);
+        assertNotNull(resultCollection);
+        out = writeResponse(resultCollection);
+        assertFalse("There must not 'source' json output", StringUtils.contains(out, "\"source\":{\"name\":\"Dolly\",\"age\":3,\"sheepGuid\":\"1\"}"));
+
+        coll = CollectionWithPagingInfo.asPaged(null, Arrays.asList(exec1, exec2), false, 2, new Sheep("barbie"));
+        resultCollection =  helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,"sheep",ParamsExtender.valueOf(true,"1"),coll);
+        assertNotNull(resultCollection);
+        out = writeResponse(resultCollection);
+        assertTrue("There must 'source' json output", StringUtils.contains(out, "\"source\":{\"name\":\"Dolly\",\"age\":3,\"sheepGuid\":\"barbie\""));
+    }
+
+    @Test
+    public void testExpandRecursiveRelations() throws IOException
+    {
+        ExecutionResult exec1 = new ExecutionResult(new Farmer("180"),null);
+        ExecutionResult exec2 = new ExecutionResult(new Farmer("456"),getFilter("age"));
+        CollectionWithPagingInfo<ExecutionResult> coll = CollectionWithPagingInfo.asPaged(null, Arrays.asList(exec1, exec2));
+        ExecutionResult execResult = new ExecutionResult(new Sheep("ssheep"),null);
+        Map<String,Object> related = new HashMap<String,Object>();
+        related.put("farmers", coll);
+        execResult.addRelated(related);
+        String out = writeResponse(execResult);
+        assertTrue("There must be json output", StringUtils.isNotBlank(out));
+        assertFalse("collections should be serialized correctly.  There may be a problem with this one.",StringUtils.contains(out, "\"collection\":["));
+        assertTrue("collections should be serialized correctly.  There should be embed relations",StringUtils.contains(out, "\"relations\":{\"farmers\":{\"list\":"));
+    }
+    
+    @Test
+    public void testSerializeExecutionResult() throws IOException
+    {
+        assertNotNull(helper);
+        Object res = helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null,Params.valueOf("notUsed", null, null),new Farmer("180"));
+        String out = writeResponse(res);
+        assertTrue("There must be json output", StringUtils.isNotBlank(out));
+       
+    }
+   
+    @SuppressWarnings({ "rawtypes" })
+    @Test
+    public void testSerializePagedCollection() throws IOException
+    {
+        assertNotNull(helper);
+        CollectionWithPagingInfo paged = CollectionWithPagingInfo.asPaged(null,null);
+        String out = writeResponse(helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null, Params.valueOf("notUsed", null, null), paged));
+        assertTrue("There must be json output as List with pagination", StringUtils.startsWith(out, "{\"list\":{\"pagination\":{\"count\":0,"));
+        Paging pageRequest = Paging.valueOf(1, 2);
+        
+        paged = CollectionWithPagingInfo.asPaged(pageRequest,Arrays.asList(new Goat(), new Sheep("ABCD"), new Sheep("XYZ")));
+        out = writeResponse(helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null, Params.valueOf("notUsed", null, null), paged));
+        assertTrue("There must be json output as List with pagination", StringUtils.startsWith(out, "{\"list\":{\"pagination\":{\"count\":3,"));
+        
+        paged = CollectionWithPagingInfo.asPaged(pageRequest,Arrays.asList(new Goat(), new Sheep("ABCD"), new Sheep("XYZ")),true,5000);
+        out = writeResponse(helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null, Params.valueOf("notUsed", null, null), paged));
+        assertTrue("There must be json output as List with pagination", StringUtils.startsWith(out, "{\"list\":{\"pagination\":{\"count\":3,\"hasMoreItems\":true,\"totalItems\":5000"));
+       
+    }
+  
+    @Test
+    public void testSerializeMap() throws IOException
+    {
+        assertNotNull(helper);
+        Map<String,Object> aMap = new HashMap<String,Object>();
+        aMap.put("goatie", new Goat());
+        aMap.put("sheepie", new Sheep("ABCD"));
+        aMap.put("sheepy", new Sheep("XYZ"));
+        Object res = helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null,Params.valueOf("notUsed", null, null),aMap);
+        String out = writeResponse(res);
+        assertTrue("There must be json output", StringUtils.isNotBlank(out));
+       
+    }
+    
+    @Test
+    public void testSerializeSet() throws IOException
+    {
+        assertNotNull(helper);
+        Set<Object> aSet = new HashSet<Object>();
+        aSet.add(new Goat());
+        aSet.add(new Sheep("ABCD"));
+        aSet.add(new Sheep("XYZ"));
+        Object res = helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null,Params.valueOf("notUsed", null, null),aSet);
+        String out = writeResponse(res);
+        assertTrue("There must be json output", StringUtils.isNotBlank(out));
+       
+    }
+    
+    @Test
+    public void testSerializeListOfSimpleType() throws IOException
+    {
+        assertNotNull(helper);
+        CollectionWithPagingInfo<String> pString = CollectionWithPagingInfo.asPaged(null,Arrays.asList("goat", "sheep", "horse")); 
+        Object res = helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null,Params.valueOf("notUsed", null, null),pString);
+        String out = writeResponse(res);
+        assertTrue("There must be json output", StringUtils.isNotBlank(out));
+        CollectionWithPagingInfo<Integer> pInts = CollectionWithPagingInfo.asPaged(null,Arrays.asList(234, 45, 890, 3456)); 
+        res = helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null,Params.valueOf("notUsed", null, null),pInts);
+        out = writeResponse(res);
+        assertTrue("There must be json output", StringUtils.isNotBlank(out));
+    } 
+        
+    @Test
+    public void testSerializeList() throws IOException
+    {
+        assertNotNull(helper);
+        Object res = helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null,Params.valueOf("notUsed", null, null),Arrays.asList(new Goat(), new Sheep("ABCD"), new Sheep("XYZ")));
+        String out = writeResponse(res);
+        assertTrue("There must be json output", StringUtils.isNotBlank(out));
+       
+    }
+
+    @Test
+    public void testSerializeCustom() throws IOException
+    {
+        assertNotNull(helper);
+        String uuid = GUID.generate();
+        String out = writeResponse(uuid);
+        NodeRef n = jsonHelper.construct(new StringReader(out),NodeRef.class);
+        assertNotNull(n);
+        assertEquals(uuid, n.getId());
+    }
+
+    @Test
+    public void testSerializeUniqueId() throws IOException
+    {
+        assertNotNull(helper);
+        Object res = helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null,Params.valueOf("notUsed", null, null), new Sheep("ABCD"));
+        String out = writeResponse(res);
+        assertTrue("Id field must be called sheepGuid.",  StringUtils.contains(out, "\"sheepGuid\":\"ABCD\""));      
+    }
+    
+    @Test
+    public void testInvokeRelation() throws IOException
+    {
+        ResourceWithMetadata relationResource = locator.locateRelationResource(api,"sheep", "baaahh", HttpMethod.GET);
+        assertNotNull(relationResource);
+        RelationshipResourceAction.Read<?> getter = (RelationshipResourceAction.Read<?>) relationResource.getResource();
+        String out = writeResponse(helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), api,null, Params.valueOf("notUsed", null, null), getter.readAll("1234A3", Params.valueOf("notUsed", null, null))));
+        assertTrue("There must be json output", StringUtils.isNotBlank(out));
+    }
+
+    @Test
+    public void testSerializeBinaryProperty() throws IOException
+    {
+        BinaryProperty prop = new BinaryProperty(Format.JSON.mimetype(),"UTF-8");      
+        String out = writeResponse(prop);
+        assertTrue("Only show the mimeType",  out.equals("{\"mimeType\":\"application/json\"}"));
+        prop = new BinaryProperty(Format.XML.mimetype(),"UTF-8", 45, null);      
+        out = writeResponse(prop);
+        assertTrue("Type is xml.",  StringUtils.contains(out, "\"mimeType\":\"text/xml\""));
+        assertTrue("Size must be serialized.",  StringUtils.contains(out, "\"sizeInBytes\":45"));
+        
+        prop = new BinaryProperty(Format.XML.mimetype(),"UTF-8", 99, Locale.CANADA_FRENCH);      
+        out = writeResponse(prop);
+        assertFalse("Locale should not be serialized",  StringUtils.contains(out, "\"locale\""));
+        
+        //Check binary properties serialize ok as part of a bean.
+        Flock flock = new Flock("myflock", 50, null, prop);
+        out = writeResponse(flock);
+        assertFalse("Locale should not be serialized",  StringUtils.contains(out, "\"locale\""));
+        assertTrue("Type is xml.",  StringUtils.contains(out, "\"mimeType\":\"text/xml\""));
+        assertTrue("Size must be serialized.",  StringUtils.contains(out, "\"sizeInBytes\":99"));
+    }
+    
+    @Test
+    public void testInvokeProperty() throws IOException
+    {        
+        Api api3 = Api.valueOf("alfrescomock", "private", "3");
+        ResourceWithMetadata propResource = locator.locateRelationResource(api3,"flock", "photo", HttpMethod.GET);
+        AbstractResourceWebScript executor = getExecutor();
+        Object result = executor.execute(propResource,  Params.valueOf("234", null, null),  mock(WebScriptResponse.class), true);
+        assertNotNull(result);
+    }
+
+        @Test
+    public void testInvokeVersions() throws IOException
+    {
+        final Map<String, Object> respons = new HashMap<String, Object>();
+        ResourceWithMetadata entityResource = locator.locateEntityResource(api,"goat", HttpMethod.GET);
+        assertNotNull(entityResource);
+        EntityResourceAction.ReadById<?> getter = (ReadById<?>) entityResource.getResource();
+        Object readById = getter.readById("1234A3", NOT_USED);
+        assertTrue("Version 1 must be a goat.", Goat.class.equals(readById.getClass()));
+        String out = writeResponse(readById);
+        assertNotNull(out);
+        
+        Api v3 = Api.valueOf(api.getName(), api.getScope().toString(), "3");
+        entityResource = locator.locateEntityResource(v3,"goat", HttpMethod.GET);
+        assertNotNull(entityResource);
+        getter = (ReadById<?>) entityResource.getResource();
+        Object readByIdForNewVersion = getter.readById("1234A3", NOT_USED);
+        assertTrue("Version 3 must be a slim goat.", SlimGoat.class.equals(readByIdForNewVersion.getClass()));
+        respons.put("v3Goat",readByIdForNewVersion);
+        out = writeResponse(readByIdForNewVersion);
+        
+        entityResource = locator.locateEntityResource(api,"grass", HttpMethod.GET);
+        assertNotNull(entityResource);  //ok for version 1
+        
+        try
+        {
+            entityResource = locator.locateEntityResource(v3,"grass", HttpMethod.GET);
+            fail("Should throw an UnsupportedResourceOperationException");
+        }
+        catch (UnsupportedResourceOperationException error)
+        {
+            //this is correct
+        }
+    }
+
+    // note: exposed as "properties" query param
+    @Test
+    public void testFilter() throws IOException, JSONException
+    {
+        assertNotNull(helper);
+        BeanPropertiesFilter theFilter  = getFilter("age");
+        Object res = new ExecutionResult(new Sheep("bob"),theFilter);      
+        String out = writeResponse(res);
+        assertTrue("Filter must only return the age.",  StringUtils.contains(out, "{\"age\":3}"));
+       
+        theFilter = getFilter("age,name");
+        res = new ExecutionResult(new Sheep("bob"),theFilter);  
+        out = writeResponse(res);
+        JSONObject jsonRsp = new JSONObject(new JSONTokener(out));
+        assertEquals(1, jsonRsp.length());
+        JSONObject entry = jsonRsp.getJSONObject("entry");
+        assertEquals(2, entry.length());
+        assertEquals("The name should be 'Dolly'", "Dolly", entry.getString("name"));
+        assertTrue("The age should be 3", entry.getInt("age") == 3);
+
+        // unit test filter with "include" taking precendence over "fields" filter
+        List<String> theInclude = getIncludeClause("name");
+        theFilter  = getFilter("age", theInclude);
+        res = new ExecutionResult(new Sheep("bob"),theFilter);
+        out = writeResponse(res);
+        jsonRsp = new JSONObject(new JSONTokener(out));
+        assertEquals(1, jsonRsp.length());
+        entry = jsonRsp.getJSONObject("entry");
+        assertEquals(2, entry.length());
+        assertEquals("The name should be 'Dolly'", "Dolly", entry.getString("name"));
+        assertTrue("The age should be 3", entry.getInt("age") == 3);
+        
+        Api v3 = Api.valueOf(api.getName(), api.getScope().toString(), "3");
+        Map<String, BeanPropertiesFilter> relFiler = getRelationFilter("herd");
+        res = helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), v3,"goat",ParamsExtender.valueOf(relFiler, "notUsed"),new SlimGoat());
+        out = writeResponse(res);
+        jsonRsp = new JSONObject(new JSONTokener(out));
+        entry = jsonRsp.getJSONObject("relations")
+                .getJSONObject("herd")
+                .getJSONObject("list")
+                .getJSONArray("entries").getJSONObject(0)
+                .getJSONObject("entry");
+        assertEquals("The name should be 'bigun'", "bigun", entry.getString("name"));
+        assertTrue("The quantity should be 56", entry.getInt("quantity") == 56);
+
+        relFiler = getRelationFilter("herd(name)");
+        res = helper.processAdditionsToTheResponse(mock(WebScriptResponse.class), v3,"goat",ParamsExtender.valueOf(relFiler, "notUsed"),new SlimGoat());
+        out = writeResponse(res);
+        assertTrue("Must return only the herd name.", StringUtils.contains(out, "{\"name\":\"bigun\"}"));
+    }
+    
+    @Test
+    public void schema() throws IOException
+    {
+        ObjectMapper objectMapper = new ObjectMapper();
+        JsonSchema schema = objectMapper.generateJsonSchema(Farmer.class);
+        assertNotNull(schema);
+        System.out.println("\nschema:");
+        System.out.println(schema.toString());
+    }
+    
+    private String writeResponse(final Object respons) throws IOException
+    {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        jsonHelper.withWriter(out, new Writer()
+        {
+            @Override
+            public void writeContents(JsonGenerator generator, ObjectMapper objectMapper)
+                        throws JsonGenerationException, JsonMappingException, IOException
+            {
+                objectMapper.writeValue(generator, respons);
+            }
+        });
+        System.out.println(out.toString());
+        return out.toString();
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/WhereTests.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/WhereTests.java
new file mode 100644
index 00000000000..6161f7d3fc2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/WhereTests.java
@@ -0,0 +1,591 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tests.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+
+import org.alfresco.rest.antlr.WhereClauseParser;
+import org.alfresco.rest.framework.resource.parameters.where.InvalidQueryException;
+import org.alfresco.rest.framework.resource.parameters.where.Query;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
+import org.alfresco.rest.framework.resource.parameters.where.QueryHelper.WalkerCallbackAdapter;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+import org.antlr.runtime.tree.CommonTree;
+import org.junit.Test;
+
+public class WhereTests implements RecognizedParamsExtractor
+{
+
+	@Test
+	public void basicTest() throws IOException {
+		
+		Query theQuery  = getWhereClause(" ( fred   > g ) ");
+		CommonTree ast = theQuery.getTree();
+		//check AST structure
+		assertEquals(WhereClauseParser.GREATERTHAN, ast.getType());
+		assertEquals(WhereClauseParser.PROPERTYNAME, ast.getChild(0).getType());
+		assertEquals(WhereClauseParser.PROPERTYVALUE, ast.getChild(1).getType());
+	}
+
+	@Test
+	public void existClauseTest()
+	{
+	    Query theQuery  = getWhereClause(null);
+	    assertNotNull(theQuery);
+	    assertTrue("Null passed in so nothing to theQuery.", theQuery.getTree() == null);
+	    
+	    try
+	    {
+	        theQuery  = getWhereClause("fred");
+	        fail("Should throw an InvalidQueryException");
+	    }
+	    catch (InvalidQueryException error)
+	    {
+	        //this is correct
+	    }
+	    
+	    try
+	    {
+	        theQuery  = getWhereClause("(noClosingBracket");
+	        fail("Should throw an InvalidQueryException");
+	    }
+	    catch (InvalidQueryException error)
+	    {
+	        //this is correct
+	    }
+	    
+	    try
+	    {
+	        theQuery  = getWhereClause("noOpeningBracket)");
+	        fail("Should throw an InvalidQueryException");
+	    }
+	    catch (InvalidQueryException error)
+	    {
+	        //this is correct
+	    }
+
+	    
+	    try
+	    {
+	    	 theQuery  = getWhereClause("(EXISTS(target.file))");
+	        fail("Should throw an InvalidQueryException");
+	    }
+	    catch (InvalidQueryException error)
+	    {
+	        //this is correct
+	    }
+	    
+	    theQuery  = getWhereClause("(exists(/target/file))");
+	    assertExistsPropertyEquals("/target/file", theQuery, false);
+	
+	    
+	    theQuery  = getWhereClause("(EXISTS(b))");
+	    assertExistsPropertyEquals("b", theQuery, false);
+	    
+	    theQuery  = getWhereClause("  ( EXISTS ( whitespace ) )  ");
+	    assertExistsPropertyEquals("whitespace", theQuery, false);
+	    
+	    theQuery  = getWhereClause("(exists ( folder ))");
+	    assertExistsPropertyEquals("folder", theQuery, false);
+	    
+	    theQuery  = getWhereClause("(NOT EXISTS(b))");
+	    assertExistsPropertyEquals("b", theQuery, true);
+	
+	    theQuery  = getWhereClause(" (NOT EXISTS(b))");
+	    assertExistsPropertyEquals("b", theQuery, true);
+	    
+	    theQuery  = getWhereClause("(  NOT EXISTS(b))");
+	    assertExistsPropertyEquals("b", theQuery, true);
+
+	    theQuery  = getWhereClause("  (  NOT EXISTS(b))");
+	    assertExistsPropertyEquals("b", theQuery, true);
+	    
+	    try
+	    {
+	      theQuery  = getWhereClause("(exists  folder)");
+	      fail("Should throw an InvalidQueryException, 'folder' should have a bracket around it");
+	    }
+	    catch (InvalidQueryException error)
+	    {
+	        //this is correct
+	    }
+	    
+        theQuery  = getWhereClause("(EXISTS(/target/folder) AND NOT EXISTS(/target/site))");
+	    assertNotNull(theQuery);
+	    CommonTree tree = theQuery.getTree();
+	    assertNotNull(tree);
+		QueryHelper.walk(theQuery, new WalkerCallbackAdapter(){
+			int i=0;
+			@Override
+			public void exists(String propertyName, boolean negated) {
+				if (i==0)
+				{
+					assertTrue("/target/folder".equals(propertyName));
+				} 
+				else 
+				{
+					assertTrue("/target/site".equals(propertyName));			
+				}
+				i++;
+			}
+
+			@Override
+			public void and() {
+				//We don't need to do anything in this method.  However, overriding the method indicates that AND is 
+				//supported.  OR is not supported at the same time.
+			}
+			
+		});
+	    
+	    try
+	    {
+	        theQuery  = getWhereClause("(EXISTS(/target/folder)OR EXISTS(/target/site))");
+	        fail("Should throw an InvalidQueryException, the OR should have a space before it.");
+	    }
+	    catch (InvalidQueryException error)
+	    {
+	        //this is correct
+	    }
+	    
+	    theQuery  = getWhereClause("(NOT EXISTS(/target/folder) OR EXISTS(/target/site))");
+		QueryHelper.walk(theQuery, new WalkerCallbackAdapter(){
+			@Override
+			public void exists(String propertyName, boolean negated) {
+				if (negated) 
+				{
+					assertTrue("/target/folder".equals(propertyName));
+				} 
+				else 
+				{
+					assertTrue("/target/site".equals(propertyName));			
+				}
+			}
+
+			@Override
+			public void or() {
+				//We don't need to do anything in this method.  However, overriding the method indicates that OR is 
+				//supported.  AND is not supported at the same time.
+			}
+			
+		});
+	    
+	    theQuery  = getWhereClause("(EXISTS   (  /target/folder  )   OR   EXISTS(  /target/site  )  )");
+		QueryHelper.walk(theQuery, new WalkerCallbackAdapter(){
+			int i=0;
+			@Override
+			public void exists(String propertyName, boolean negated) {
+				if (i==0)
+				{
+					assertTrue("/target/folder".equals(propertyName));			
+				}
+				else
+				{
+					assertTrue("/target/site".equals(propertyName));			
+				}
+				i++;
+			}
+
+			@Override
+			public void or() {
+				//We don't need to do anything in this method.  However, overriding the method indicates that OR is 
+				//supported.  AND is not supported at the same time.
+			}
+			
+		});
+	    
+	    theQuery  = getWhereClause("(EXISTS(target/file) AND EXISTS(target/folder) AND EXISTS(target/site))");
+		QueryHelper.walk(theQuery, new WalkerCallbackAdapter(){
+			int i=0;
+			@Override
+			public void exists(String propertyName, boolean negated) {
+				switch (i) {
+				case 0:
+					assertTrue("target/file".equals(propertyName));				
+					break;
+				case 1:
+					assertTrue("target/folder".equals(propertyName));					
+					break;
+				case 2:
+					assertTrue("target/site".equals(propertyName));						
+					break;					
+				default:
+					break;
+				}
+				i++;
+			}
+
+			@Override
+			public void and() {
+				//We don't need to do anything in this method.  However, overriding the method indicates that AND is 
+				//supported.  OR is not supported at the same time.
+			}
+			
+		});
+	}
+
+
+	@Test
+	public void inClauseTest()
+	{
+	    Query theQuery  = getWhereClause("( dueAt in (5,8) )");
+	    inChecks(theQuery, "dueAt", "5", "8");
+
+	    theQuery  = getWhereClause("( fred/bloggs in (head,elbow) )");
+	    inChecks(theQuery, "fred/bloggs", "head", "elbow");
+
+		theQuery  = getWhereClause("( nextOne in (5,8,4) )");
+	    inChecks(theQuery, "nextOne", "5", "8", "4");
+	    
+		theQuery  = getWhereClause("( nextOne in (5,56,fred) )");
+	    inChecks(theQuery, "nextOne", "5", "56", "fred");
+	    
+		theQuery  = getWhereClause("( nextOne in (5,56,'fred&') )");
+	    inChecks(theQuery, "nextOne", "5", "56", "fred&");
+	    
+		theQuery  = getWhereClause("( nextOne in ('me , you',56,egg) )");
+	    inChecks(theQuery, "nextOne", "me , you", "56", "egg");
+	    
+		theQuery  = getWhereClause("( NOT nextOne in (5,56,fred, king, kong, 'fred\\'^') )");
+	    CommonTree tree = theQuery.getTree();
+	    assertNotNull(tree);
+		QueryHelper.walk(theQuery, new WalkerCallbackAdapter(){
+			@Override
+			public void in(String property, boolean negated, String... propertyValues) {
+				assertTrue("Property name should be "+"nextOne","nextOne".equals(property));
+				assertTrue(negated);
+				String[] values = {"5","56","fred","king", "kong", "fred\\'^"};
+				for (int i = 0; i < values.length; i++) {
+					assertTrue("Value must match:"+values[i],values[i].equals(propertyValues[i]));				
+				}
+			}
+			
+		});
+	}
+
+
+	@Test
+	public void betweenClauseTest()
+	{
+	    Query theQuery  = getWhereClause("( dueAt between (5,8) )");
+	    betweenChecks(theQuery, "dueAt", "5", "8");
+
+	    theQuery  = getWhereClause("( fred/bloggs between (head,elbow) )");
+	    betweenChecks(theQuery, "fred/bloggs", "head", "elbow");
+
+	    try
+	    {
+		    theQuery  = getWhereClause("( nextOne between (5,8,4) )");
+	        fail("Should throw an InvalidQueryException, between can have only two values.");
+	    }
+	    catch (InvalidQueryException error)
+	    {
+	        //this is correct
+	    }
+	    
+	    try
+	    {
+		    theQuery  = getWhereClause("( nextOne between 5,8 )");
+	        fail("Should throw an InvalidQueryException, Need brackets.");
+	    }
+	    catch (InvalidQueryException error)
+	    {
+	        //this is correct
+	    }
+	    
+	    theQuery  = getWhereClause("(NOT dueAt between (5,8) AND nextOne between (green,blue))");
+		QueryHelper.walk(theQuery, new WalkerCallbackAdapter(){
+			@Override
+			public void between(String property, String firstVal, String secondVal, boolean negated) {
+				if (negated)
+				{
+					assertTrue("Property name should be "+"dueAt","dueAt".equals(property));
+					assertTrue("First value should be "+"5","5".equals(firstVal));
+					assertTrue("Second value should be "+"8","8".equals(secondVal));	
+				} 
+				else 
+				{
+					assertTrue("Property name should be "+"nextOne","nextOne".equals(property));
+					assertTrue("First value should be "+"green","green".equals(firstVal));
+					assertTrue("Second value should be "+"blue","blue".equals(secondVal));					
+				}
+			}
+
+			@Override
+			public void and() {
+				//do nothing
+			}
+			
+		});
+	}
+
+
+	@Test
+	public void matchesClauseTest()
+	{
+		Query theQuery  = getWhereClause("(fred matches(bob))");
+		matchesChecks(theQuery, "fred", "bob");
+		
+	    theQuery  = getWhereClause("( king/kong/hair/shoulders/knees/toes matches ('fred%') )");
+		matchesChecks(theQuery, "king/kong/hair/shoulders/knees/toes", "fred%");
+		
+	    theQuery  = getWhereClause("( niceone matches (bob) )");
+		matchesChecks(theQuery, "niceone", "bob");
+		
+	    try
+	    {
+			theQuery  = getWhereClause("( fred matches bob )");
+	        fail("Should throw an InvalidQueryException, Need brackets.");
+	    }
+	    catch (InvalidQueryException error)
+	    {
+	        //this is correct
+	    }
+
+	}
+	
+	@Test
+	public void comparisonClauseTest()
+	{
+	    Query theQuery  = getWhereClause("( dueAt > '12.04.345' )");
+	    int comparisonOperator = WhereClauseParser.GREATERTHAN;
+		comparisonChecks(theQuery, comparisonOperator, "dueAt", "12.04.345");
+		
+		theQuery  = getWhereClause("( dueAt >= '12.04.345' )");
+	    comparisonOperator = WhereClauseParser.GREATERTHANOREQUALS;
+		comparisonChecks(theQuery, comparisonOperator, "dueAt", "12.04.345");
+		
+		theQuery  = getWhereClause("( dueAt < '12.04.345' )");
+	    comparisonOperator = WhereClauseParser.LESSTHAN;
+		comparisonChecks(theQuery, comparisonOperator, "dueAt", "12.04.345");
+		
+		theQuery  = getWhereClause("( dueAt <= '12.04.345' )");
+	    comparisonOperator = WhereClauseParser.LESSTHANOREQUALS;
+		comparisonChecks(theQuery, comparisonOperator, "dueAt", "12.04.345");
+		
+	    try
+	    {
+			theQuery  = getWhereClause("( Fred/Bloggs = %$NICE&* )");
+	        fail("Should throw an InvalidQueryException, needs single quotes");
+	    }
+	    catch (InvalidQueryException error)
+	    {
+	        //this is correct
+	    }
+	    
+		theQuery  = getWhereClause("( Fred/Bloggs = '%$NICE&*' )");
+	    comparisonOperator = WhereClauseParser.EQUALS;
+		comparisonChecks(theQuery, comparisonOperator, "Fred/Bloggs", "%$NICE&*");
+		
+	    try
+	    {
+			theQuery  = getWhereClause("( Ken = (456) )");
+	        fail("Should throw an InvalidQueryException, needs single quotes no brackets");
+	    }
+	    catch (InvalidQueryException error)
+	    {
+	        //this is correct
+	    }
+	    
+		theQuery  = getWhereClause("( Ken = '456' )");
+	    comparisonOperator = WhereClauseParser.EQUALS;
+		comparisonChecks(theQuery, comparisonOperator, "Ken", "456");
+			
+		theQuery  = getWhereClause("( DogHouse = 'Cat\\\'s House' )");
+	    comparisonOperator = WhereClauseParser.EQUALS;
+		comparisonChecks(theQuery, comparisonOperator, "DogHouse", "Cat\\\'s House");
+		
+		theQuery  = getWhereClause("( KING_KONG >= 'Mighty Mouse' )");
+	    comparisonOperator = WhereClauseParser.GREATERTHANOREQUALS;
+		comparisonChecks(theQuery, comparisonOperator, "KING_KONG", "Mighty Mouse");
+		
+	 // dueAt > and < + also string "like"
+	}
+
+	@Test
+	public void stripLeadingTrailingQuotesTests()
+	{
+		assertTrue("".equals(QueryHelper.stripQuotes("")));
+		assertTrue("g".equals(QueryHelper.stripQuotes("g")));
+		assertTrue("  bob ".equals(QueryHelper.stripQuotes("  bob ")));
+		assertTrue("  bob '".equals(QueryHelper.stripQuotes("  bob '")));
+		assertTrue("  bob ".equals(QueryHelper.stripQuotes("'  bob '")));
+		assertTrue("bob".equals(QueryHelper.stripQuotes("'bob'")));
+	}
+	
+	@Test
+	public void getChildrenTests()
+	{
+		Query theQuery  = getWhereClause("(fred matches(bob))");
+	    assertNotNull(theQuery);
+	    CommonTree tree = theQuery.getTree();
+	    assertNotNull(tree);
+	    assertTrue(2 == QueryHelper.getChildren(tree).size());
+	    
+	    theQuery  = getWhereClause("( dueAt between (5,8) )");
+	    assertNotNull(theQuery);
+	    tree = theQuery.getTree();
+	    assertNotNull(tree);
+	    assertTrue(3 == QueryHelper.getChildren(tree).size());
+	    
+	    theQuery  = getWhereClause("(NOT EXISTS(b))");
+	    assertNotNull(theQuery);
+	    tree = theQuery.getTree();
+	    assertNotNull(tree);
+	    assertTrue(1  == QueryHelper.getChildren(tree).size());
+	    
+        theQuery  = getWhereClause("(EXISTS(/target/folder) AND EXISTS(/target/site))");
+	    assertNotNull(theQuery);
+	    tree = theQuery.getTree();
+	    assertNotNull(tree);
+	    assertTrue(2 == QueryHelper.getChildren(tree).size());
+	}
+	
+	/**
+	 * Used by ComparisonClauseTest, validates the clause
+	 * @param theQuery Query
+	 * @param comparisonOperator One of EQUALS LESSTHAN GREATERTHAN LESSTHANOREQUALS GREATERTHANOREQUALS
+     * @param propName String
+     * @param propVal String
+     */
+	private void comparisonChecks(Query theQuery, final int comparisonOperator, final String propName, final String propVal) {
+	    assertNotNull(theQuery);
+	    CommonTree tree = theQuery.getTree();
+	    assertNotNull(tree);
+		assertEquals(comparisonOperator, tree.getType());
+		assertEquals(WhereClauseParser.PROPERTYNAME, tree.getChild(0).getType());
+		assertTrue(propName.equals(tree.getChild(0).getText()));
+		assertEquals(WhereClauseParser.PROPERTYVALUE, tree.getChild(1).getType());
+		QueryHelper.walk(theQuery, new WalkerCallbackAdapter(){
+			@Override
+			public void comparison(int comparisonType, String propertyName, String propertyValue, boolean negated) {
+				assertTrue("Property name should be "+propName,propName.equals(propertyName));
+				assertTrue(comparisonOperator == comparisonType);
+				assertTrue("Property value should be "+propVal,propVal.equals(propertyValue));
+			}
+			
+		});
+	}
+
+	/**
+	 * Used by BetweenClauseTest, validates the clause
+	 * @param theQuery Query
+	 * @param propName String
+	 * @param firstValue String
+	 * @param secondValue String
+	 */
+	private void betweenChecks(Query theQuery, final String propName, final String firstValue, final String secondValue) {
+	    assertNotNull(theQuery);
+	    CommonTree tree = theQuery.getTree();
+	    assertNotNull(tree);
+		assertEquals(WhereClauseParser.BETWEEN, tree.getType());
+		assertEquals(WhereClauseParser.PROPERTYNAME, tree.getChild(0).getType());
+		assertTrue(propName.equals(tree.getChild(0).getText()));
+		assertEquals(WhereClauseParser.PROPERTYVALUE, tree.getChild(1).getType());
+		assertEquals(WhereClauseParser.PROPERTYVALUE, tree.getChild(2).getType());
+		QueryHelper.walk(theQuery, new WalkerCallbackAdapter(){
+			@Override
+			public void between(String property, String firstVal, String secondVal, boolean negated) {
+				assertTrue("Property name should be "+propName,propName.equals(property));
+				assertTrue("First value should be "+firstValue,firstValue.equals(firstVal));
+				assertTrue("Second value should be "+secondValue,secondValue.equals(secondVal));
+			}
+			
+		});
+	}
+	
+	/**
+	 * Used by the matchesClauseTest
+	 * @param theQuery Query
+	 * @param propName String
+	 * @param propVal String
+	 */
+	private void matchesChecks(Query theQuery, final String propName, final String propVal) {
+	    assertNotNull(theQuery);
+	    CommonTree tree = theQuery.getTree();
+	    assertNotNull(tree);
+		assertEquals(WhereClauseParser.PROPERTYNAME, tree.getChild(0).getType());
+		assertTrue(propName.equals(tree.getChild(0).getText()));
+		assertEquals(WhereClauseParser.PROPERTYVALUE, tree.getChild(1).getType());
+		QueryHelper.walk(theQuery, new WalkerCallbackAdapter(){
+			@Override
+			public void matches(String propertyName, String propertyValue, boolean negated) {
+				assertTrue("Property name should be "+propName,propName.equals(propertyName));
+				assertTrue("Property value should be "+propVal,propVal.equals(propertyValue));
+			}
+			
+		});
+	}
+	
+	/**
+	 * Use by the inClauseTest
+	 * @param theQuery Query
+	 * @param propName String
+	 * @param values String...
+	 */
+	private void inChecks(Query theQuery, final String propName, final String... values) {
+	    assertNotNull(theQuery);
+	    CommonTree tree = theQuery.getTree();
+	    assertNotNull(tree);
+		assertEquals(WhereClauseParser.IN, tree.getType());
+		assertEquals(WhereClauseParser.PROPERTYNAME, tree.getChild(0).getType());
+		assertTrue(propName.equals(tree.getChild(0).getText()));
+		QueryHelper.walk(theQuery, new WalkerCallbackAdapter(){
+			@Override
+			public void in(String property, boolean negated, String... propertyValues) {
+				assertTrue("Property name should be "+propName,propName.equals(property));
+				for (int i = 0; i < values.length; i++) {
+					assertTrue("Value must match:"+values[i],values[i].equals(propertyValues[i]));				
+				}
+			}
+			
+		});
+	}
+	
+    /**
+     * Helper class for walking the query.
+     */
+    private void assertExistsPropertyEquals(final String property, Query theQuery, final boolean isNegated)
+    {
+	    assertNotNull(theQuery);
+	    CommonTree tree = theQuery.getTree();
+	    assertNotNull(tree);
+		QueryHelper.walk(theQuery, new WalkerCallbackAdapter(){
+
+			@Override
+			public void exists(String propertyName, boolean negated) {
+				assertTrue(property.equals(propertyName));
+				assertTrue(isNegated == negated);
+			}
+			
+		});
+    }
+    
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/WithResponseTest.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/WithResponseTest.java
new file mode 100644
index 00000000000..239ac2e3a77
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/core/WithResponseTest.java
@@ -0,0 +1,190 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+ 
+package org.alfresco.rest.framework.tests.core;
+
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.alfresco.rest.framework.resource.content.ContentInfo;
+import org.alfresco.rest.framework.resource.content.ContentInfoImpl;
+import org.alfresco.rest.framework.tools.ApiAssistant;
+import org.alfresco.rest.framework.tools.ResponseWriter;
+import org.alfresco.rest.framework.webscripts.AbstractResourceWebScript;
+import org.alfresco.rest.framework.webscripts.ApiWebScript;
+import org.alfresco.rest.framework.webscripts.ResourceWebScriptDelete;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.Description;
+import org.springframework.extensions.webscripts.Format;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Tests the interactions with WithResponse
+ *
+ * @author Gethin James
+ */
+public class WithResponseTest
+{
+
+    @Test
+    public void testDefaults() throws Exception
+    {
+        WithResponse callBack = new WithResponse(Status.STATUS_OK, ResponseWriter.DEFAULT_JSON_CONTENT, ResponseWriter.CACHE_NEVER);
+        assertEquals(Status.STATUS_OK, callBack.getStatus());
+        assertEquals(ResponseWriter.DEFAULT_JSON_CONTENT, callBack.getContentInfo());
+        assertEquals(ResponseWriter.CACHE_NEVER, callBack.getCache());
+        assertTrue(callBack.getHeaders().isEmpty());
+    }
+
+    @Test
+    public void testSetHeader() throws Exception
+    {
+        WithResponse callBack = new WithResponse(Status.STATUS_OK,ResponseWriter.DEFAULT_JSON_CONTENT, ResponseWriter.CACHE_NEVER);
+        callBack.setHeader("king", "can");
+        callBack.setHeader("king", "kong");
+        assertTrue(callBack.getHeaders().size() == 1);
+        List<String> vals = callBack.getHeaders().get("king");
+        assertTrue(vals.size() == 1);
+        assertEquals("kong", vals.get(0));
+    }
+
+    @Test
+    public void testAddHeader() throws Exception
+    {
+        WithResponse callBack = new WithResponse(Status.STATUS_OK,ResponseWriter.DEFAULT_JSON_CONTENT, ResponseWriter.CACHE_NEVER);
+        callBack.addHeader("king", "can");
+        callBack.addHeader("king", "kong");
+        assertTrue(callBack.getHeaders().size() == 1);
+        List<String> vals = callBack.getHeaders().get("king");
+        assertTrue(vals.size() == 2);
+        assertEquals(vals, Arrays.asList("can", "kong"));
+    }
+
+
+    @Test
+    public void testSetters() throws Exception
+    {
+        WithResponse callBack = new WithResponse(Status.STATUS_OK, ResponseWriter.DEFAULT_JSON_CONTENT, ResponseWriter.CACHE_NEVER);
+        callBack.setStatus(Status.STATUS_GONE);
+        Cache myCache = new Cache(new Description.RequiredCache()
+        {
+            @Override
+            public boolean getNeverCache()
+            {
+                return false;
+            }
+
+            @Override
+            public boolean getIsPublic()
+            {
+                return true;
+            }
+
+            @Override
+            public boolean getMustRevalidate()
+            {
+                return true;
+            }
+        });
+        callBack.setCache(myCache);
+        ContentInfo myContent = new ContentInfoImpl(Format.HTML.mimetype(),"UTF-16", 12, Locale.FRENCH);
+        callBack.setContentInfo(myContent);
+
+        assertEquals(Status.STATUS_GONE, callBack.getStatus());
+        assertEquals(myCache, callBack.getCache());
+        assertEquals(myContent, callBack.getContentInfo());
+    }
+
+
+    @Test
+    public void testSetResponse() throws Exception
+    {
+        AbstractResourceWebScript responseWriter = new ResourceWebScriptDelete();
+        responseWriter.setAssistant(new ApiAssistant());
+        WithResponse wr = new WithResponse(Status.STATUS_OK, ResponseWriter.DEFAULT_JSON_CONTENT, ResponseWriter.CACHE_NEVER);
+
+        WebScriptResponse response = mock(WebScriptResponse.class);
+
+        responseWriter.setResponse(response,wr.getStatus(), wr.getCache(), wr.getContentInfo(), wr.getHeaders());
+        verify(response, times(1)).setStatus(anyInt());
+        verify(response, times(1)).setCache((Cache) any());
+        verify(response, times(1)).setContentType(anyString());
+        verify(response, times(0)).setHeader(anyString(), anyString());
+
+        response = mock(WebScriptResponse.class);
+
+        responseWriter.setResponse(response,wr.getStatus(), null, null, null);
+        verify(response, times(1)).setStatus(anyInt());
+        verify(response, times(0)).setCache((Cache) any());
+        verify(response, times(0)).setContentType(anyString());
+        verify(response, times(0)).setHeader(anyString(), anyString());
+
+        response = mock(WebScriptResponse.class);
+
+        wr.addHeader("king", "can");
+        wr.addHeader("king", "kong");
+        responseWriter.setResponse(response,wr.getStatus(), null, null, wr.getHeaders());
+        verify(response, times(1)).setStatus(anyInt());
+        verify(response, times(0)).setCache((Cache) any());
+        verify(response, times(0)).setContentType(anyString());
+        verify(response, times(1)).setHeader(eq("king"), anyString());
+        verify(response, times(1)).addHeader(eq("king"), anyString());
+
+        response = mock(WebScriptResponse.class);
+
+        wr.addHeader("king", "kin");
+        wr.setHeader("ping", "ping");
+        responseWriter.setResponse(response,wr.getStatus(), null, null, wr.getHeaders());
+        verify(response, times(1)).setStatus(anyInt());
+        verify(response, times(0)).setCache((Cache) any());
+        verify(response, times(0)).setContentType(anyString());
+        verify(response, times(1)).setHeader(eq("king"), anyString());
+        verify(response, times(1)).setHeader(eq("ping"), anyString());
+        verify(response, times(2)).addHeader(eq("king"), anyString());
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tests/metadata/WriterTests.java b/remote-api/src/test/java/org/alfresco/rest/framework/tests/metadata/WriterTests.java
new file mode 100644
index 00000000000..23b50c7d2ec
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tests/metadata/WriterTests.java
@@ -0,0 +1,106 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.framework.tests.metadata;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Map;
+
+import org.alfresco.rest.framework.Api;
+import org.alfresco.rest.framework.core.ResourceDictionary;
+import org.alfresco.rest.framework.core.ResourceDictionaryBuilder;
+import org.alfresco.rest.framework.core.ResourceLookupDictionary;
+import org.alfresco.rest.framework.core.ResourceWithMetadata;
+import org.alfresco.rest.framework.metadata.ResourceMetaDataWriter;
+import org.alfresco.rest.framework.resource.EntityResource;
+import org.alfresco.rest.framework.resource.RelationshipResource;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Test rest writer classes
+ * 
+ * @author Gethin James
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:test-rest-context.xml" })
+public class WriterTests
+{
+    @Autowired
+    ResourceLookupDictionary locator;
+
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    @Autowired
+    @Qualifier("defaultMetaWriter")
+    private ResourceMetaDataWriter defaultMetaWriter;
+
+    private static Api api = Api.valueOf("alfrescomock", "private", "1");
+    
+    @Before
+    public void setUp() throws Exception
+    {
+        Map<String, Object> entityResourceBeans = applicationContext.getBeansWithAnnotation(EntityResource.class);
+        Map<String, Object> relationResourceBeans = applicationContext.getBeansWithAnnotation(RelationshipResource.class);
+        locator.setDictionary(ResourceDictionaryBuilder.build(entityResourceBeans.values(), relationResourceBeans.values()));
+    }
+    
+    @Test
+    public void testWriters() throws IOException
+    {
+        ResourceDictionary resourceDic = locator.getDictionary();
+        Map<String, ResourceWithMetadata> apiResources = resourceDic.getAllResources().get(api);
+        String writtenOut = testWriter(defaultMetaWriter, apiResources.get("/sheep"), apiResources);
+        assertTrue(writtenOut.startsWith("{\"list\":{\"pagination\":{\"count\":5"));
+        
+//        ResourceMetaDataWriter wadlWriter = new WebScriptOptionsMetaData();
+//        writtenOut = testWriter(wadlWriter, apiResources.get("/sheep"), apiResources);
+//        assertTrue(writtenOut.startsWith("{\"list\":{\"pagination\":{\"count\":4"));
+    }
+
+    private String testWriter(ResourceMetaDataWriter defaultWriter,
+                ResourceWithMetadata resourceWithMetadata,
+                Map<String, ResourceWithMetadata> apiResources) throws IOException
+    {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        defaultWriter.writeMetaData(out, apiResources.get("/sheep"), apiResources);
+        String outResult = out.toString();
+        System.out.println(outResult);
+        return outResult;
+    }
+    
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/framework/tools/RecognizedParamsExtractorTest.java b/remote-api/src/test/java/org/alfresco/rest/framework/tools/RecognizedParamsExtractorTest.java
new file mode 100644
index 00000000000..92e15a03735
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/framework/tools/RecognizedParamsExtractorTest.java
@@ -0,0 +1,574 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.framework.tools;
+
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.jacksonextensions.BeanPropertiesFilter;
+import org.alfresco.rest.framework.resource.parameters.InvalidSelectException;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
+import org.alfresco.rest.framework.tests.core.ParamsExtender;
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Test the RecognizedParamsExtractor
+ *
+ * @author Gethin James
+ */
+public class RecognizedParamsExtractorTest implements RecognizedParamsExtractor
+{
+    @Test
+    public void getFilterTest()
+    {
+        BeanPropertiesFilter theFilter  = getFilter(null);
+        assertNotNull(theFilter);
+        assertTrue("Null passed in so must return the default BeanPropertiesFilter.ALLOW_ALL class", BeanPropertiesFilter.AllProperties.class.equals(theFilter.getClass()));
+        assertTrue(theFilter.isAllowed("bob"));
+        assertTrue(theFilter.isAllowed("fred"));
+        assertTrue(theFilter.isAllowed("50"));
+        assertTrue(theFilter.isAllowed("b.z"));
+        
+        theFilter  = getFilter("bob");
+        assertNotNull(theFilter);
+        assertTrue("Must return the BeanPropertiesFilter class", theFilter instanceof BeanPropertiesFilter);
+        assertTrue(theFilter.isAllowed("bob"));
+        assertFalse(theFilter.isAllowed("fred"));
+        assertFalse(theFilter.isAllowed("50"));
+        assertFalse(theFilter.isAllowed("b.z"));
+
+        theFilter  = getFilter("50,fred,b.z");
+        assertNotNull(theFilter);
+        assertTrue("Must return the BeanPropertiesFilter class", theFilter instanceof BeanPropertiesFilter);
+        assertFalse(theFilter.isAllowed("bob"));
+        assertTrue(theFilter.isAllowed("fred"));
+        assertTrue(theFilter.isAllowed("50"));
+        assertTrue(theFilter.isAllowed("b.z"));
+        
+        theFilter  = getFilter("50,fred,");
+        assertNotNull(theFilter);
+        assertTrue("Must return the BeanPropertiesFilter class", theFilter instanceof BeanPropertiesFilter);
+        assertFalse(theFilter.isAllowed("bob"));
+        assertTrue(theFilter.isAllowed("fred"));
+        assertTrue(theFilter.isAllowed("50"));
+        assertFalse(theFilter.isAllowed("b.z"));
+
+        theFilter  = getFilter("50, bob, fred ,");
+        assertNotNull(theFilter);
+        assertTrue("Must return the BeanPropertiesFilter class", theFilter instanceof BeanPropertiesFilter);
+        assertTrue(theFilter.isAllowed("bob"));
+        assertTrue(theFilter.isAllowed("fred"));
+        assertTrue(theFilter.isAllowed("50"));
+        assertFalse(theFilter.isAllowed("b.z"));
+    }
+
+
+    @Test
+    public void getSortingTest()
+    {
+        List<SortColumn> theSort  = getSort(null);
+        assertNotNull(theSort);
+        assertTrue("Null passed in so empty sort list should be returned.", theSort.isEmpty());
+
+        theSort  = getSort("name ASC");
+        assertNotNull(theSort);
+        assertTrue("Must have a value for column: NAME", !theSort.isEmpty());
+        assertTrue(theSort.size() == 1);
+        assertEquals("name", theSort.get(0).column);
+        assertTrue(theSort.get(0).asc);
+
+        theSort  = getSort("name ");
+        assertNotNull(theSort);
+        assertTrue("Must have a value for column: NAME", !theSort.isEmpty());
+        assertTrue(theSort.size() == 1);
+        assertEquals("name", theSort.get(0).column);
+        assertTrue(theSort.get(0).asc);
+
+        theSort  = getSort("name DESC");
+        assertNotNull(theSort);
+        assertTrue("Must have a value for column: NAME", !theSort.isEmpty());
+        assertTrue(theSort.size() == 1);
+        assertEquals("name", theSort.get(0).column);
+        assertTrue(!theSort.get(0).asc);  //desc
+
+        theSort  = getSort("name desc");
+        assertNotNull(theSort);
+        assertTrue("Must have a value for column: NAME", !theSort.isEmpty());
+        assertTrue(theSort.size() == 1);
+        assertEquals("name", theSort.get(0).column);
+        assertTrue(!theSort.get(0).asc);  //desc
+
+        theSort  = getSort("name,age desc");
+        assertNotNull(theSort);
+        assertTrue("Must have a value for column: NAME", !theSort.isEmpty());
+        assertTrue(theSort.size() == 2);
+        assertEquals("name", theSort.get(0).column);
+        assertTrue(theSort.get(0).asc);
+        assertEquals("age", theSort.get(1).column);
+        assertTrue(!theSort.get(1).asc);  //desc
+
+        theSort  = getSort(" name, age desc");
+        assertNotNull(theSort);
+        assertTrue("Must have a value for column: NAME", !theSort.isEmpty());
+        assertTrue(theSort.size() == 2);
+        assertEquals("name", theSort.get(0).column);
+        assertTrue(theSort.get(0).asc);
+        assertEquals("age", theSort.get(1).column);
+        assertTrue(!theSort.get(1).asc);  //desc
+
+        theSort  = getSort("name DESC, age desc");
+        assertNotNull(theSort);
+        assertTrue("Must have a value for column: NAME", !theSort.isEmpty());
+        assertTrue(theSort.size() == 2);
+        assertEquals("name", theSort.get(0).column);
+        assertTrue(!theSort.get(0).asc);  //desc
+        assertEquals("age", theSort.get(1).column);
+        assertTrue(!theSort.get(1).asc);  //desc
+
+        theSort  = getSort("age DeSc, name AsC");
+        assertNotNull(theSort);
+        assertTrue("Must have a value for column: NAME", !theSort.isEmpty());
+        assertTrue(theSort.size() == 2);
+        assertEquals("age", theSort.get(0).column);
+        assertTrue(!theSort.get(0).asc);  //desc
+        assertEquals("name", theSort.get(1).column);
+        assertTrue(theSort.get(1).asc);
+        
+        theSort  = getSort("name asc,");  // ok for now, trailing comma is ignored
+        assertNotNull(theSort);
+        assertTrue("Must have a value for column: NAME", !theSort.isEmpty());
+        assertTrue(theSort.size() == 1);
+        assertEquals("name", theSort.get(0).column);
+        assertTrue(theSort.get(0).asc);
+        
+        try
+        {
+            getSort("age asc, name des");  // invalid, should be desc
+            fail("Should throw an InvalidArgumentException");
+        }
+        catch (InvalidArgumentException error)
+        {
+            // this is correct
+        }
+        
+        try
+        {
+            getSort("age asc name");  // invalid, missing comma
+            fail("Should throw an InvalidArgumentException");
+        }
+        catch (InvalidArgumentException error)
+        {
+            // this is correct
+        }
+    }
+
+    @Test
+    public void getIncludeClauseTest()
+    {
+        getClauseTest("include");
+    }
+
+    @Test
+    public void getSelectClauseTest()
+    {
+        getClauseTest("select");
+    }
+
+    // at the moment select and include are parsed the same way, hence common/shared test
+    private void getClauseTest(String paramName)
+    {
+        List<String> theClause = getCorrectClause(paramName, null);
+        assertNotNull(theClause);
+        assertFalse("Null passed in so nothing in the "+paramName, theClause.size() > 0);
+
+        try
+        {
+            theClause = getCorrectClause(paramName, ",,,");
+            fail("Should throw an InvalidSelectException");
+        }
+        catch (InvalidSelectException error)
+        {
+            //this is correct
+        }
+
+        try
+        {
+            theClause = getCorrectClause(paramName, "(,,,");
+            fail("Should throw an InvalidSelectException");
+        }
+        catch (InvalidSelectException error)
+        {
+            //this is correct
+        }
+
+        try
+        {
+            theClause = getCorrectClause(paramName, "(,,,)");
+            fail("Should throw an InvalidSelectException");
+        }
+        catch (InvalidSelectException error)
+        {
+            //this is correct
+        }
+
+        try
+        {
+            theClause = getCorrectClause(paramName, "x/,z");
+            fail("Should throw an InvalidSelectException");
+        }
+        catch (InvalidSelectException error)
+        {
+            //this is correct
+        }
+
+        try
+        {
+            theClause = getCorrectClause(paramName, "/x'n,/z");
+            fail("Should throw an InvalidSelectException");
+        }
+        catch (InvalidSelectException error)
+        {
+            //this is correct
+        }
+
+        try
+        {
+            theClause = getCorrectClause(paramName, "/foo/0");
+            fail("Should throw an InvalidSelectException. Legal identifiers must start with a letter not zero");
+        }
+        catch (InvalidSelectException error)
+        {
+            //this is correct
+        }
+
+        try
+        {
+            theClause = getCorrectClause(paramName, "/");
+            fail("Should throw an InvalidSelectException. No identifier specified.");
+        }
+        catch (InvalidSelectException error)
+        {
+            //this is correct
+        }
+
+        try
+        {
+            theClause = getCorrectClause(paramName,  "path, isLink");
+            fail("Should throw an InvalidSelectException. No identifier specified.");
+        }
+        catch (InvalidSelectException error)
+        {
+            //this is correct
+        }
+
+        theClause = getCorrectClause(paramName, "king/kong");
+        assertTrue("has a valid "+paramName, theClause.size() == 1);
+        assertEquals("king/kong",theClause.get(0));
+
+        theClause = getCorrectClause(paramName, "x,y");
+        assertTrue("has a valid "+paramName, theClause.size() == 2);
+        assertEquals("x",theClause.get(0));
+        assertEquals("y",theClause.get(1));
+
+        theClause = getCorrectClause(paramName, "x,/z");
+        assertTrue("has a valid "+paramName, theClause.size() == 2);
+        assertEquals("x",theClause.get(0));
+        assertEquals("/z",theClause.get(1));
+
+        theClause = getCorrectClause(paramName, "/b");
+        assertTrue("has a valid "+paramName, theClause.size() == 1);
+        assertEquals("/b",theClause.get(0));
+
+        theClause = getCorrectClause(paramName, "/be,/he");
+        assertTrue("has a valid "+paramName, theClause.size() == 2);
+        assertEquals("/be",theClause.get(0));
+        assertEquals("/he",theClause.get(1));
+
+        theClause = getCorrectClause(paramName, "/king/kong");
+        assertTrue("has a valid "+paramName, theClause.size() == 1);
+        assertEquals("/king/kong",theClause.get(0));
+
+        theClause = getCorrectClause(paramName, "/name,/person/age");
+        assertTrue("has a valid "+paramName, theClause.size() == 2);
+        assertEquals("/name",theClause.get(0));
+        assertEquals("/person/age",theClause.get(1));
+
+        theClause = getCorrectClause(paramName, "/foo");
+        assertTrue("has a valid select",theClause.size() == 1);
+        assertEquals("/foo",theClause.get(0));
+
+        theClause = getCorrectClause(paramName, "/foo/anArray/x");
+        assertTrue("has a valid "+paramName, theClause.size() == 1);
+        assertEquals("/foo/anArray/x",theClause.get(0));
+
+        theClause = getCorrectClause(paramName, "/foo/anArray/x,/person/age,/eggs/bacon/sausage,/p");
+        assertTrue("has a valid "+paramName, theClause.size() == 4);
+        assertEquals("/foo/anArray/x",theClause.get(0));
+        assertEquals("/person/age",theClause.get(1));
+        assertEquals("/eggs/bacon/sausage",theClause.get(2));
+        assertEquals("/p",theClause.get(3));
+
+        theClause = getCorrectClause(paramName, "/foo/_bar ");
+        assertTrue("has a valid "+paramName, theClause.size() == 1);
+        assertEquals("/foo/_bar",theClause.get(0));
+    }
+
+    private List<String> getCorrectClause(String paramName, String paramValue)
+    {
+        if (paramName.equalsIgnoreCase("include"))
+        {
+            return getIncludeClause(paramValue);
+        }
+        else if (paramName.equalsIgnoreCase("select"))
+        {
+            return getSelectClause(paramValue);
+        }
+
+        fail("Unexpected clause: "+paramName);
+        return null;
+    }
+
+    @Test
+    public void getRelationFilterTest()
+    {
+        Map<String, BeanPropertiesFilter> theFilter  = getRelationFilter(null);
+        assertNotNull(theFilter);
+        assertTrue("Null passed in so nothing to filter.",theFilter.isEmpty());
+
+        theFilter  = getRelationFilter("bob");
+        assertNotNull(theFilter);
+        assertTrue("Must be a single relationship", theFilter.size() == 1);
+        assertTrue("Must be a single relationship called bob", theFilter.containsKey("bob"));
+        BeanPropertiesFilter aFilter = theFilter.get("bob");
+        assertTrue("No bean properties specified so need a BeanPropertiesFilter.ALLOW_ALL class", BeanPropertiesFilter.AllProperties.class.equals(aFilter.getClass()));
+
+        theFilter  = getRelationFilter("bob,hope");
+        assertNotNull(theFilter);
+        assertTrue("Must be a two relationships", theFilter.size() == 2);
+        assertTrue("Must have hope.", theFilter.containsKey("hope"));
+        aFilter = theFilter.get("hope");
+        assertTrue("No bean properties specified so need a BeanPropertiesFilter.ALLOW_ALL class", BeanPropertiesFilter.AllProperties.class.equals(aFilter.getClass()));
+
+        theFilter  = getRelationFilter("bob(name),hope");
+        assertNotNull(theFilter);
+        assertTrue("Must be a two relationships", theFilter.size() == 2);
+        assertTrue("Must have bob.", theFilter.containsKey("bob"));
+        aFilter = theFilter.get("bob");
+        assertTrue("Bean properties specified so must be an BeanPropertiesFilter class", BeanPropertiesFilter.class.equals(aFilter.getClass()));
+
+        theFilter  = getRelationFilter("bob,hope(age,name)");
+        assertNotNull(theFilter);
+        assertTrue("Must be a two relationships", theFilter.size() == 2);
+        aFilter = theFilter.get("bob");
+        assertTrue("No bean properties specified so need a BeanPropertiesFilter.ALLOW_ALL class", BeanPropertiesFilter.AllProperties.class.equals(aFilter.getClass()));
+        aFilter = theFilter.get("hope");
+        assertTrue("Bean properties specified so must be an BeanPropertiesFilter class", BeanPropertiesFilter.class.equals(aFilter.getClass()));
+
+
+        theFilter  = getRelationFilter("bob(name,age),nohope,hope(height,width)");
+        assertNotNull(theFilter);
+        assertTrue("Must be a three relationships", theFilter.size() == 3);
+        aFilter = theFilter.get("bob");
+        assertTrue("Bean properties specified so must be an BeanPropertiesFilter class", BeanPropertiesFilter.class.equals(aFilter.getClass()));
+        aFilter = theFilter.get("nohope");
+        assertTrue("No bean properties specified so need a ReturnAllBeanProperties class", BeanPropertiesFilter.AllProperties.class.equals(aFilter.getClass()));
+        aFilter = theFilter.get("hope");
+        assertTrue("Bean properties specified so must be an BeanPropertiesFilter class", BeanPropertiesFilter.class.equals(aFilter.getClass()));
+
+    }
+
+
+    @Test
+    public void findPagingTest()
+    {
+        WebScriptRequest request = mock(WebScriptRequest.class);
+        when(request.getParameter("skipCount")).thenReturn("34");
+        when(request.getParameter("maxItems")).thenReturn("50");
+
+        Paging pagin = findPaging(request);
+        assertNotNull(pagin);
+        assertTrue(pagin.getSkipCount() == 34);
+        assertTrue(pagin.getMaxItems() == 50);
+
+        request = mock(WebScriptRequest.class);
+        when(request.getParameter("skipCount")).thenReturn(null);
+        when(request.getParameter("maxItems")).thenReturn(null);
+        pagin = findPaging(request);
+        assertNotNull(pagin);
+        assertTrue(pagin.getSkipCount() == Paging.DEFAULT_SKIP_COUNT);
+        assertTrue(pagin.getMaxItems() == Paging.DEFAULT_MAX_ITEMS);
+
+        request = mock(WebScriptRequest.class);
+        when(request.getParameter("skipCount")).thenReturn("55");
+        pagin = findPaging(request);
+        assertNotNull(pagin);
+        assertTrue(pagin.getSkipCount() == 55);
+        assertTrue(pagin.getMaxItems() == Paging.DEFAULT_MAX_ITEMS);
+
+        request = mock(WebScriptRequest.class);
+        when(request.getParameter("skipCount")).thenReturn(null);
+        when(request.getParameter("maxItems")).thenReturn("45");
+        pagin = findPaging(request);
+        assertNotNull(pagin);
+        assertTrue(pagin.getMaxItems() == 45);
+        assertTrue(pagin.getSkipCount() == Paging.DEFAULT_SKIP_COUNT);
+
+        request = mock(WebScriptRequest.class);
+        when(request.getParameter("skipCount")).thenReturn("apple");
+        when(request.getParameter("maxItems")).thenReturn("pear");
+        try
+        {
+            pagin = findPaging(request);
+            fail("Should not get here.");
+        }
+        catch (InvalidArgumentException iae)
+        {
+            assertNotNull(iae); // Must throw this exceptions
+        }
+
+        request = mock(WebScriptRequest.class);
+        when(request.getParameter("skipCount")).thenReturn("0");
+        when(request.getParameter("maxItems")).thenReturn("0");
+        try
+        {
+            pagin = findPaging(request);
+            fail("Should not get here.");
+        }
+        catch (InvalidArgumentException iae)
+        {
+            assertNotNull(iae); // Must throw this exceptions
+        }
+
+        //Test Case cloud-2198
+        request = mock(WebScriptRequest.class);
+        when(request.getParameter("skipCount")).thenReturn("0");
+        when(request.getParameter("maxItems")).thenReturn("a");
+        try
+        {
+            pagin = findPaging(request);
+            fail("Should not get here.");
+        }
+        catch (InvalidArgumentException iae)
+        {
+            assertNotNull(iae); // Must throw this exceptions
+        }
+
+        request = mock(WebScriptRequest.class);
+        when(request.getParameter("skipCount")).thenReturn("s");
+        when(request.getParameter("maxItems")).thenReturn("5");
+        try
+        {
+            pagin = findPaging(request);
+            fail("Should not get here.");
+        }
+        catch (InvalidArgumentException iae)
+        {
+            assertNotNull(iae); // Must throw this exceptions
+        }
+
+        request = mock(WebScriptRequest.class);
+        when(request.getParameter("skipCount")).thenReturn("0");
+        when(request.getParameter("maxItems")).thenReturn("-2");
+        try
+        {
+            pagin = findPaging(request);
+            fail("Should not get here.");
+        }
+        catch (InvalidArgumentException iae)
+        {
+            assertNotNull(iae); // Must throw this exceptions
+        }
+
+        request = mock(WebScriptRequest.class);
+        when(request.getParameter("skipCount")).thenReturn("-3");
+        when(request.getParameter("maxItems")).thenReturn("5");
+        try
+        {
+            pagin = findPaging(request);
+            fail("Should not get here.");
+        }
+        catch (InvalidArgumentException iae)
+        {
+            assertNotNull(iae); // Must throw this exceptions
+        }
+
+        request = mock(WebScriptRequest.class);
+        when(request.getParameter("maxItems")).thenReturn("5");
+        pagin = findPaging(request);
+        assertNotNull(pagin);
+        assertTrue("skip count defaults to 0", pagin.getSkipCount() == Paging.DEFAULT_SKIP_COUNT);
+
+        //End of Test Case cloud-2198
+    }
+
+    @Test
+    public void paramsTest()
+    {
+        Map<String,List<String>> mockParams = new HashMap<String,List<String>>();
+        mockParams.put("age", Arrays.asList("23","45"));
+        mockParams.put("name", Arrays.asList("fred"));
+        WebScriptRequest request = mockRequest(mockParams);
+        Map<String, String[]> params = getRequestParameters(request);
+        assertNotNull(params);
+        Params paramObj = ParamsExtender.valueOf(params);
+        assertNotNull(paramObj);
+        String aValue = paramObj.getParameter("age");
+        assertEquals("23", aValue);
+
+        aValue = paramObj.getParameter("name");
+        assertEquals("fred", aValue);
+
+    }
+
+    private WebScriptRequest mockRequest(final Map<String,List<String>> params)
+    {
+        final String[] paramNames = params.keySet().toArray(new String[]{});
+        WebScriptRequest request = mock(WebScriptRequest.class);
+        when(request.getParameterNames()).thenReturn(paramNames);
+        when(request.getParameterValues(anyString())).thenAnswer(new Answer<String[]>() {
+            @Override
+            public String[] answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                return params.get((String) args[0]).toArray(new String[]{});
+            }
+        });
+        return request;
+    }
+
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/test/workflow/api/impl/ProcessesImplTest.java b/remote-api/src/test/java/org/alfresco/rest/test/workflow/api/impl/ProcessesImplTest.java
new file mode 100644
index 00000000000..1efabb3c2bd
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/test/workflow/api/impl/ProcessesImplTest.java
@@ -0,0 +1,259 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.test.workflow.api.impl;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.transaction.Status;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.workflow.WorkflowModel;
+import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
+import org.alfresco.rest.framework.resource.parameters.Paging;
+import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.Params;
+import org.alfresco.rest.framework.resource.parameters.Params.RecognizedParams;
+import org.alfresco.rest.framework.resource.parameters.where.Query;
+import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
+import org.alfresco.rest.workflow.api.Processes;
+import org.alfresco.rest.workflow.api.impl.ProcessesImpl;
+import org.alfresco.rest.workflow.api.model.ProcessInfo;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.workflow.WorkflowDefinition;
+import org.alfresco.service.cmr.workflow.WorkflowService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.springframework.context.ApplicationContext;
+
+import junit.framework.TestCase;
+
+/**
+ * Test for {@link ProcessesImpl} class
+ * 
+ * @author Dmitry Velichkevich
+ */
+@Category(LuceneTests.class)
+public class ProcessesImplTest extends TestCase implements RecognizedParamsExtractor
+{
+    private static final String[] CONFIG_LOCATIONS = new String[ApplicationContextHelper.CONFIG_LOCATIONS.length + 2];
+    static
+    {
+        System.arraycopy(ApplicationContextHelper.CONFIG_LOCATIONS, 0, CONFIG_LOCATIONS, 0, ApplicationContextHelper.CONFIG_LOCATIONS.length);
+        int index = ApplicationContextHelper.CONFIG_LOCATIONS.length;
+        CONFIG_LOCATIONS[index++] = "classpath:alfresco/public-rest-context.xml";
+        CONFIG_LOCATIONS[index++] = "classpath:alfresco/web-scripts-application-context.xml";
+    }
+
+
+    private static final int ACTIVE_WORKFLOWS_INITIAL_AMOUNT = 25;
+
+
+    private static final String PROCESSES_BEAN_NAME = "processes";
+
+    private static final String DESIRED_WORKFLOW_ID_PREFIX = "activiti$activitiReview";
+
+
+    private static final String QUERY_STATUS_ACTIVE = "(status=active)";
+    
+    private static final String QUERY_WORKFLOWDESCRIPTION_MATCHES = "(variables/bpm_workflowDescription MATCHES ('%s'))";
+
+
+    private ApplicationContext applicationContext;
+
+    private WorkflowService workflowService;
+
+    private PersonService personService;
+
+    private Processes processes;
+
+
+    private UserTransaction transaction;
+
+
+    @Before
+    public void setUp() throws Exception
+    {
+        applicationContext = ApplicationContextHelper.getApplicationContext(CONFIG_LOCATIONS);
+
+        processes = (Processes) applicationContext.getBean(PROCESSES_BEAN_NAME);
+
+        ServiceRegistry registry = (ServiceRegistry) applicationContext.getBean(ServiceRegistry.SERVICE_REGISTRY);
+        workflowService = registry.getWorkflowService();
+        personService = registry.getPersonService();
+
+        transaction = registry.getTransactionService().getUserTransaction();
+        transaction.begin();
+
+        AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+        AuthenticationUtil.setRunAsUser(AuthenticationUtil.getAdminUserName());
+
+        NodeRef adminUserNodeRef = personService.getPerson(AuthenticationUtil.getAdminUserName());
+
+        WorkflowDefinition workflowDefinition = findAppropriateWorkflowDefinitionId();
+
+        for (int i = 0; i < ACTIVE_WORKFLOWS_INITIAL_AMOUNT; i++)
+        {
+            startWorkflow(workflowDefinition, adminUserNodeRef);
+        }
+    }
+
+    private void startWorkflow(WorkflowDefinition neededDefinition, NodeRef assignee)
+    {
+        Map<QName, Serializable> parameters = new HashMap<QName, Serializable>();
+        parameters.put(WorkflowModel.ASSOC_ASSIGNEE, (Serializable) Collections.singletonList(assignee));
+        parameters.put(WorkflowModel.PROP_WORKFLOW_DESCRIPTION, "Test workflow api calls review and approve"); // MNT-14631
+        //parameters.put(WorkflowModel.ASSOC_PACKAGE, workflowService.createPackage(null));
+
+        workflowService.startWorkflow(neededDefinition.getId(), parameters);
+    }
+
+    private WorkflowDefinition findAppropriateWorkflowDefinitionId()
+    {
+        WorkflowDefinition result = null;
+        List<WorkflowDefinition> definitions = workflowService.getDefinitions();
+
+        for (WorkflowDefinition definition : definitions)
+        {
+            if (definition.getId().startsWith(DESIRED_WORKFLOW_ID_PREFIX))
+            {
+                result = definition;
+                break;
+            }
+        }
+
+        return (null != result) ? (result) : (definitions.iterator().next());
+    }
+
+    @After
+    public void tearDown() throws Exception
+    {
+        AuthenticationUtil.clearCurrentSecurityContext();
+
+        if ((null != transaction) && (Status.STATUS_COMMITTED != transaction.getStatus()) && (Status.STATUS_ROLLEDBACK != transaction.getStatus()))
+        {
+            transaction.rollback();
+        }
+    }
+
+    @Test
+    public void testHasMoreItemsTrue() throws Exception
+    {
+        CollectionWithPagingInfo<ProcessInfo> actualProcesses = queryActiveProcessesAndAssertResult(0, (ACTIVE_WORKFLOWS_INITIAL_AMOUNT - 5));
+        assertTrue(actualProcesses.hasMoreItems());
+
+        actualProcesses = queryActiveProcessesAndAssertResult(10, (ACTIVE_WORKFLOWS_INITIAL_AMOUNT - 15));
+        assertTrue(actualProcesses.hasMoreItems());
+    }
+
+    @Test
+    public void testHasMoreFalseAsPerMnt10977() throws Exception
+    {
+        CollectionWithPagingInfo<ProcessInfo> actualProcesses = queryActiveProcessesAndAssertResult(5, ACTIVE_WORKFLOWS_INITIAL_AMOUNT);
+        assertFalse(actualProcesses.hasMoreItems());
+    }
+    
+    @Test
+    public void testHasMoreFalseAsPerMnt13567() throws Exception
+    {
+        CollectionWithPagingInfo<ProcessInfo> actualProcesses = queryActiveProcessesAndAssertResult(ACTIVE_WORKFLOWS_INITIAL_AMOUNT, ACTIVE_WORKFLOWS_INITIAL_AMOUNT);
+        assertFalse(actualProcesses.hasMoreItems());
+        
+        actualProcesses = queryActiveProcessesAndAssertResult(ACTIVE_WORKFLOWS_INITIAL_AMOUNT + 1, ACTIVE_WORKFLOWS_INITIAL_AMOUNT);
+        assertFalse(actualProcesses.hasMoreItems());
+    }
+
+    @Test
+    public void testGetProcessesMatchesIgnoreCase()
+    {       
+        CollectionWithPagingInfo<ProcessInfo> result = queryMatchesProcesses("(?i)test workflow api calls review and approve");
+
+        assertNotNull(result);
+        assertNotNull(result.getCollection());
+        assertTrue(result.getTotalItems() > 0 );
+    }
+    
+    @Test
+    public void testGetProcessesMatchesIgnoreCaseNoResults()
+    {
+        // the tests are always run on PostgreSQL only
+//        Dialect dialect = (Dialect) applicationContext.getBean("dialect");
+//        if (dialect instanceof AlfrescoSQLServerDialect)
+//        {
+            // REPO-1104: we do not run this test on MS SQL server because it will fail 
+            // until the Activiti defect related to REPO-1104 will be fixed
+            // this test could fail on other DBs where the LIKE operator behaves as case insensitive
+//            return;
+//        }
+        CollectionWithPagingInfo<ProcessInfo> result = queryMatchesProcesses("test workflow api calls review and approve");
+
+        assertNotNull(result);
+        assertNotNull(result.getCollection());
+        assertTrue(result.getTotalItems() == 0 );
+    }
+    
+    private CollectionWithPagingInfo<ProcessInfo> queryMatchesProcesses(String matchesString)
+    {
+        Query query = getWhereClause(String.format(QUERY_WORKFLOWDESCRIPTION_MATCHES, matchesString));
+        Parameters parameters = Params.valueOf(new RecognizedParams(null, Paging.valueOf(0, ACTIVE_WORKFLOWS_INITIAL_AMOUNT), null, null, null, null, query, null, false), null, null, null);
+        
+        return processes.getProcesses(parameters);
+    }
+    
+    private CollectionWithPagingInfo<ProcessInfo> queryActiveProcessesAndAssertResult(int skipCount, int maxItems)
+    {
+        Query query = getWhereClause(QUERY_STATUS_ACTIVE);
+        Parameters parameters = Params.valueOf(new RecognizedParams(null, Paging.valueOf(skipCount, maxItems), null, null, null, null, query, null, false), null, null, null);
+
+        CollectionWithPagingInfo<ProcessInfo> result = processes.getProcesses(parameters);
+
+        assertNotNull(result);
+        assertNotNull(result.getCollection());
+
+        int remainingProcessesAmount = skipCount > ACTIVE_WORKFLOWS_INITIAL_AMOUNT ? 0 : ACTIVE_WORKFLOWS_INITIAL_AMOUNT - skipCount;
+        if (maxItems >= remainingProcessesAmount)
+        {
+            assertEquals(remainingProcessesAmount, result.getCollection().size());
+        }
+        else
+        {
+            assertEquals(maxItems, result.getCollection().size());
+        }
+
+        return result;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ClientDeployment.java b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ClientDeployment.java
new file mode 100644
index 00000000000..e0b4e3ae0e9
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ClientDeployment.java
@@ -0,0 +1,42 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tests;
+
+
+public class ClientDeployment
+{
+    String name;
+    
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/DeploymentParser.java b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/DeploymentParser.java
new file mode 100644
index 00000000000..7b692b47b6b
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/DeploymentParser.java
@@ -0,0 +1,44 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tests;
+
+import org.alfresco.rest.workflow.api.model.Deployment;
+import org.json.simple.JSONObject;
+
+public class DeploymentParser extends ListParser<Deployment>
+{
+    public static DeploymentParser INSTANCE = new DeploymentParser();
+
+    @Override
+    public Deployment parseEntry(JSONObject entry)
+    {
+        Deployment deployment = new Deployment();
+        deployment.setId((String) entry.get("id"));
+        deployment.setName((String) entry.get("name"));
+        deployment.setDeployedAt(WorkflowApiClient.parseDate(entry, "deployedAt"));
+        return deployment;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/DeploymentWorkflowApiTest.java b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/DeploymentWorkflowApiTest.java
new file mode 100644
index 00000000000..b74af43523e
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/DeploymentWorkflowApiTest.java
@@ -0,0 +1,284 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tests;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.rest.api.tests.AbstractTestFixture;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.workflow.api.model.Deployment;
+import org.alfresco.rest.workflow.api.tests.WorkflowApiClient.DeploymentsClient;
+import org.alfresco.util.testing.category.LuceneTests;
+import org.json.simple.JSONObject;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.springframework.http.HttpStatus;
+
+/**
+ * Rest api tests using http client to communicate with the rest apis in the repository.
+ * 
+ * Note: currently certain tests work only with lucene search subsystem e.g. tags.
+ * 
+ * @author steveglover
+ *
+ */
+@Category(LuceneTests.class)
+public class DeploymentWorkflowApiTest extends EnterpriseWorkflowTestApi
+{   
+    protected static HashSet<String> alfrescoPublicDeploymentNames = new HashSet<String>(Arrays.asList(new String[]{
+            "review-pooled.bpmn20.xml",
+            "review.bpmn20.xml",
+            "parallel-review-group.bpmn20.xml",
+            "parallel-review.bpmn20.xml",
+            "adhoc.bpmn20.xml"}));
+    
+    protected static HashSet<String> alfrescoPublicProcessDefinitionKeys = new HashSet<String>(Arrays.asList(new String[]{
+            "activitiReviewPooled",
+            "activitiReview",
+            "activitiParallelGroupReview",
+            "activitiParallelReview",
+            "activitiAdhoc"}));
+    
+    @Test
+    public void testGetDeploymentsWithNonAdminUser() throws Exception
+    {
+        // deployments-get#1 
+        initApiClientWithTestUser();
+        DeploymentsClient deploymentsClient = publicApiClient.deploymentsClient();
+        
+        try {
+            deploymentsClient.getDeployments();
+            fail("Exception expected");
+        } catch(PublicApiException expected) {
+            assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+            assertErrorSummary("Permission was denied", expected.getHttpResponse());
+        }
+    }
+    
+    
+    @Test
+    public void testGetDeployments() throws Exception
+    {
+        // testGetDeployments#1: Getting deployments with admin-user
+        RequestContext requestContext = initApiClientWithTestUser();
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+
+        DeploymentsClient deploymentsClient = publicApiClient.deploymentsClient();
+
+        ListResponse<Deployment> deploymentResponse = deploymentsClient.getDeployments();
+        Map<String, Deployment> deploymentMap = new HashMap<String, Deployment>();
+        for (Deployment deployment : deploymentResponse.getList())
+        {
+            deploymentMap.put(deployment.getName(), deployment);
+        }
+        assertEquals(5, deploymentResponse.getList().size());
+        
+        assertTrue(deploymentMap.containsKey("review-pooled.bpmn20.xml"));
+        assertTrue(deploymentMap.containsKey("review.bpmn20.xml"));
+        assertTrue(deploymentMap.containsKey("parallel-review-group.bpmn20.xml"));
+        assertTrue(deploymentMap.containsKey("parallel-review.bpmn20.xml"));
+        assertTrue(deploymentMap.containsKey("adhoc.bpmn20.xml"));
+        
+        // testGetDeployments#2: Check all deployment fields in resulting deployment
+        org.activiti.engine.repository.Deployment activitiDeployment = activitiProcessEngine.getRepositoryService()
+            .createDeploymentQuery()
+            .deploymentName("adhoc.bpmn20.xml")
+            .processDefinitionKey("@" + requestContext.getNetworkId() + "@activitiAdhoc")
+            .singleResult();
+        
+        assertNotNull(activitiDeployment);
+        Deployment adhocDeployment = deploymentMap.get("adhoc.bpmn20.xml");
+        
+        assertEquals(activitiDeployment.getId(), adhocDeployment.getId());
+        assertEquals(activitiDeployment.getCategory(), adhocDeployment.getCategory());
+        assertEquals(activitiDeployment.getName(), adhocDeployment.getName());
+        assertEquals(activitiDeployment.getDeploymentTime(), adhocDeployment.getDeployedAt());
+        
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("maxItems", "2");
+        JSONObject deploymentsListObject = deploymentsClient.getDeploymentsWithRawResponse(params);
+        assertNotNull(deploymentsListObject);
+        JSONObject paginationJSON = (JSONObject) deploymentsListObject.get("pagination");
+        assertEquals(2l, paginationJSON.get("count"));
+        assertEquals(5l, paginationJSON.get("totalItems"));
+        assertEquals(0l, paginationJSON.get("skipCount"));
+        assertEquals(true, paginationJSON.get("hasMoreItems"));
+        
+        params = new HashMap<String, String>();
+        deploymentsListObject = deploymentsClient.getDeploymentsWithRawResponse(params);
+        assertNotNull(deploymentsListObject);
+        paginationJSON = (JSONObject) deploymentsListObject.get("pagination");
+        assertEquals(5l, paginationJSON.get("count"));
+        assertEquals(5l, paginationJSON.get("totalItems"));
+        assertEquals(0l, paginationJSON.get("skipCount"));
+        assertEquals(false, paginationJSON.get("hasMoreItems"));
+        
+        params = new HashMap<String, String>();
+        params.put("skipCount", "2");
+        params.put("maxItems", "2");
+        deploymentsListObject = deploymentsClient.getDeploymentsWithRawResponse(params);
+        assertNotNull(deploymentsListObject);
+        paginationJSON = (JSONObject) deploymentsListObject.get("pagination");
+        assertEquals(2l, paginationJSON.get("count"));
+        assertEquals(5l, paginationJSON.get("totalItems"));
+        assertEquals(2l, paginationJSON.get("skipCount"));
+        assertEquals(true, paginationJSON.get("hasMoreItems"));
+        
+        params = new HashMap<String, String>();
+        params.put("skipCount", "2");
+        params.put("maxItems", "5");
+        deploymentsListObject = deploymentsClient.getDeploymentsWithRawResponse(params);
+        assertNotNull(deploymentsListObject);
+        paginationJSON = (JSONObject) deploymentsListObject.get("pagination");
+        assertEquals(3l, paginationJSON.get("count"));
+        assertEquals(5l, paginationJSON.get("totalItems"));
+        assertEquals(2l, paginationJSON.get("skipCount"));
+        assertEquals(false, paginationJSON.get("hasMoreItems"));
+        
+        params = new HashMap<String, String>();
+        params.put("skipCount", "0");
+        params.put("maxItems", "7");
+        deploymentsListObject = deploymentsClient.getDeploymentsWithRawResponse(params);
+        assertNotNull(deploymentsListObject);
+        paginationJSON = (JSONObject) deploymentsListObject.get("pagination");
+        assertEquals(5l, paginationJSON.get("count"));
+        assertEquals(5l, paginationJSON.get("totalItems"));
+        assertEquals(0l, paginationJSON.get("skipCount"));
+        assertEquals(false, paginationJSON.get("hasMoreItems"));
+    }
+    
+    @Test
+    public void testGetDeploymentsEmpty() throws Exception
+    {
+        // Create a new test-network, not added to the test-fixture to prevent being used
+        // in other tests
+        String networkName = AbstractTestFixture.TEST_DOMAIN_PREFIX + "999";
+        final TestNetwork testNetwork = repoService.createNetworkWithAlias(networkName, true);
+        transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+        {
+            @SuppressWarnings("synthetic-access")
+            public Void execute() throws Throwable
+            {
+                AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
+
+                testNetwork.create();
+
+                return null;
+            }
+        }, false, true);
+        
+        // Delete all deployments in the network
+        List<org.activiti.engine.repository.Deployment> deployments = activitiProcessEngine.getRepositoryService()
+            .createDeploymentQuery()
+            .processDefinitionKeyLike("@" + testNetwork.getId() + "@%")
+            .list();
+        
+        for(org.activiti.engine.repository.Deployment deployment : deployments) 
+        {
+            activitiProcessEngine.getRepositoryService().deleteDeployment(deployment.getId(), true);
+        }
+        
+        // Fetch deployments using tenant-admin
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + testNetwork.getId();
+        publicApiClient.setRequestContext(new RequestContext(testNetwork.getId(), tenantAdmin));
+
+        DeploymentsClient deploymentsClient = publicApiClient.deploymentsClient();
+
+        ListResponse<Deployment> deploymentResponse = deploymentsClient.getDeployments();
+        assertEquals(0, deploymentResponse.getList().size());
+    }
+    
+    @Test
+    public void testGetDeploymentById() throws Exception
+    {
+        // Use admin-user for tenant
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+        
+        // Fetch the actual deployment from activiti
+        org.activiti.engine.repository.Deployment activitiDeployment = activitiProcessEngine.getRepositoryService()
+            .createDeploymentQuery()
+            .deploymentName("adhoc.bpmn20.xml")
+            .processDefinitionKey("@" + requestContext.getNetworkId() + "@activitiAdhoc")
+            .singleResult();
+        
+        assertNotNull(activitiDeployment);
+
+        // Do the actual API-call
+        DeploymentsClient deploymentsClient = publicApiClient.deploymentsClient();
+        Deployment deployment = deploymentsClient.findDeploymentById(activitiDeployment.getId());
+        
+        assertNotNull(deployment);
+        
+        assertEquals(activitiDeployment.getId(), deployment.getId());
+        assertEquals(activitiDeployment.getCategory(), deployment.getCategory());
+        assertEquals(activitiDeployment.getName(), deployment.getName());
+        assertEquals(activitiDeployment.getDeploymentTime(), deployment.getDeployedAt());
+        
+        try
+        {
+            deploymentsClient.findDeploymentById("fakeid");
+            fail("Expected exception");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(404, e.getHttpResponse().getStatusCode());
+        }
+        
+        // get deployment with default user
+        try
+        {
+            publicApiClient.setRequestContext(requestContext);
+            deploymentsClient.findDeploymentById(activitiDeployment.getId());
+            fail("Expected exception");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(403, e.getHttpResponse().getStatusCode());
+        }
+    }
+
+    protected String createProcessDefinitionKey(String key, RequestContext requestContext) {
+        return "@" + requestContext.getNetworkId() + "@" + key;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/EnterpriseWorkflowTestApi.java b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/EnterpriseWorkflowTestApi.java
new file mode 100644
index 00000000000..8789b4276b1
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/EnterpriseWorkflowTestApi.java
@@ -0,0 +1,375 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tests;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.InputStream;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.repository.DeploymentBuilder;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.workflow.activiti.ActivitiScriptNode;
+import org.alfresco.rest.api.tests.EnterpriseTestApi;
+import org.alfresco.rest.api.tests.RepoService.SiteInformation;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.TestFixture;
+import org.alfresco.rest.api.tests.client.AuthenticatedHttp;
+import org.alfresco.rest.api.tests.client.AuthenticationDetailsProvider;
+import org.alfresco.rest.api.tests.client.HttpClientProvider;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.UserAuthenticationDetailsProviderImpl;
+import org.alfresco.rest.api.tests.client.UserData;
+import org.alfresco.rest.api.tests.client.UserDataService;
+import org.alfresco.rest.api.tests.client.data.MemberOfSite;
+import org.alfresco.rest.workflow.api.model.ProcessInfo;
+import org.alfresco.rest.workflow.api.tests.WorkflowApiClient.ProcessesClient;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.util.GUID;
+import org.alfresco.util.ISO8601DateFormat;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.junit.Before;
+
+public class EnterpriseWorkflowTestApi extends EnterpriseTestApi
+{
+    protected ProcessEngine activitiProcessEngine;
+    protected WorkflowApiClient publicApiClient;
+    protected PersonService personService;
+    protected ServiceRegistry serviceRegistry;
+    protected NodeService nodeService;
+    protected TestNetwork currentNetwork;
+    
+    @Before
+    public void before() throws Exception
+    {
+        this.applicationContext = getTestFixture().getApplicationContext();
+        this.repoService = getTestFixture().getRepoService();
+        this.transactionHelper = (RetryingTransactionHelper)applicationContext.getBean("retryingTransactionHelper");
+        this.personService = (PersonService) applicationContext.getBean("PersonService");
+        this.nodeService = (NodeService) applicationContext.getBean("NodeService");
+        this.serviceRegistry = (ServiceRegistry) applicationContext.getBean("ServiceRegistry");
+        
+        HttpClientProvider httpClientProvider = (HttpClientProvider)applicationContext.getBean("httpClientProvider");
+        
+        UserDataService userDataService = new UserDataService()
+        {
+            @Override
+            public UserData findUserByUserName(String userName)
+            {
+                UserData userData = new UserData();
+                if(userName.startsWith("admin")) 
+                {
+                    userData.setUserName(userName);
+                    userData.setPassword("admin");
+                    userData.setId(userName);
+                }
+                else
+                {
+                    TestPerson person = getRepoService().getPerson(userName.toLowerCase());
+                    userData.setUserName(person.getId());
+                    userData.setPassword(person.getPassword());
+                    userData.setId(person.getId());
+                }
+                return userData;
+            }
+        };
+        AuthenticationDetailsProvider authenticationDetailsProvider = new UserAuthenticationDetailsProviderImpl(userDataService, "admin", "admin");
+        AuthenticatedHttp authenticatedHttp = new AuthenticatedHttp(httpClientProvider, authenticationDetailsProvider);
+        this.httpClient = new WorkflowApiHttpClient("localhost", TestFixture.PORT, TestFixture.CONTEXT_PATH,
+                TestFixture.PUBLIC_API_SERVLET_NAME, authenticatedHttp);
+        this.publicApiClient = new WorkflowApiClient(httpClient, userDataService);
+        activitiProcessEngine = (ProcessEngine) applicationContext.getBean("activitiProcessEngine");
+    }
+    
+    protected String deployProcessDefinition(String... artifacts) {
+        DeploymentBuilder deploymentBuilder = activitiProcessEngine.getRepositoryService().createDeployment();
+        boolean firstArtifact = true;
+        for (String artifact : artifacts)
+        {
+            InputStream bpmnInputStream = getClass().getClassLoader().getResourceAsStream(artifact);
+            String name = artifact.substring(artifact.lastIndexOf("/") + 1);
+            if (firstArtifact)
+            {
+                deploymentBuilder.name(name);
+            }
+            deploymentBuilder.addInputStream(name, bpmnInputStream);
+        }
+        String deploymentId = deploymentBuilder.deploy().getId();
+        return deploymentId;
+    }
+    
+    protected RequestContext initApiClientWithTestUser() throws Exception {
+        currentNetwork = getTestFixture().getRandomNetwork();
+        final String personId = currentNetwork.getPeople().iterator().next().getId();
+        RequestContext requestContext = new RequestContext(currentNetwork.getId(), personId);
+        publicApiClient.setRequestContext(requestContext);
+        return requestContext;
+    }
+    
+    protected TestNetwork getOtherNetwork(String usedNetworkId) throws Exception {
+        Iterator<TestNetwork> networkIt = getTestFixture().getNetworksIt();
+        while(networkIt.hasNext()) {
+            TestNetwork network = networkIt.next();
+            if(!usedNetworkId.equals(network.getId())) {
+                return network;
+            }
+        }
+        fail("Need more than one network to test permissions");
+        return null;
+    }
+    
+    protected TestPerson getOtherPersonInNetwork(String usedPerson, String networkId) throws Exception {
+        TestNetwork usedNetwork = getTestFixture().getNetwork(networkId);
+        for(TestPerson person : usedNetwork.getPeople()) {
+            if(!person.getId().equals(usedPerson)) {
+                return person;
+            }
+        }
+        fail("Network doesn't have additonal users, cannot perform test");
+        return null;
+    }
+    
+    protected Date parseDate(JSONObject entry, String fieldName) {
+       String dateText = (String) entry.get(fieldName);
+       if (dateText!=null) {
+        try
+        {
+            return WorkflowApiClient.DATE_FORMAT_ISO8601.parse(dateText);
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("couldn't parse date "+dateText+": "+e.getMessage(), e);
+        }
+      }
+      return null;
+   }
+      
+   protected String formatDate(Date date) {
+       if(date == null)
+       {
+           return null;
+       }
+      return WorkflowApiClient.DATE_FORMAT_ISO8601.format(date);
+   }
+   
+   protected ActivitiScriptNode getPersonNodeRef(String name)
+   {
+       ActivitiScriptNode authority = null;
+       if (name != null)
+       {
+           if (personService.personExists(name))
+           {
+               authority = new ActivitiScriptNode(personService.getPerson(name), serviceRegistry);
+           }
+       }
+       return authority;
+   }
+   
+   protected void assertErrorSummary(String expectedBriefSummary, HttpResponse response) 
+   {
+       JSONObject error = (JSONObject) response.getJsonResponse().get("error");
+       assertNotNull(error);
+       
+       String actualBriefSummary = (String) error.get("briefSummary");
+       assertNotNull(actualBriefSummary);
+       
+       // Error starts with exception-number, check if actual message part matches
+       assertTrue("Wrong summary of error: " + actualBriefSummary, actualBriefSummary.endsWith(expectedBriefSummary));
+   }
+   
+   protected NodeRef[] createTestDocuments(final RequestContext requestContext) {
+       NodeRef[] docNodeRefs = TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef[]>()
+       {
+           @Override
+           public NodeRef[] doWork() throws Exception
+           {
+               String siteName = "site" + GUID.generate();
+               SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, SiteVisibility.PUBLIC);
+               TestSite site = currentNetwork.createSite(siteInfo);
+               NodeRef nodeRefDoc1 = getTestFixture().getRepoService().createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc1", "Test Doc1 Title", "Test Doc1 Description", "Test Content");
+               NodeRef nodeRefDoc2 = getTestFixture().getRepoService().createDocument(site.getContainerNodeRef("documentLibrary"), "Test Doc2", "Test Doc2 Title", "Test Doc2 Description", "Test Content");
+               
+               NodeRef[] result = new NodeRef[2];
+               result[0] = nodeRefDoc1;
+               result[1] = nodeRefDoc2;
+               
+               return result;
+           }
+       }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+       
+       return docNodeRefs;
+   }
+   
+   /**
+    * Start an adhoc-process without business key through the public REST-API.
+    */
+   protected ProcessInfo startAdhocProcess(final RequestContext requestContext, NodeRef[] documentRefs) throws PublicApiException {
+       return startAdhocProcess(requestContext, documentRefs, null);
+   }
+   
+   /**
+    * Start an adhoc-process with possible business key through the public REST-API.
+    */
+   @SuppressWarnings("unchecked")
+   protected ProcessInfo startAdhocProcess(final RequestContext requestContext, NodeRef[] documentRefs, String businessKey) throws PublicApiException {
+       org.activiti.engine.repository.ProcessDefinition processDefinition = activitiProcessEngine
+               .getRepositoryService()
+               .createProcessDefinitionQuery()
+               .processDefinitionKey("@" + requestContext.getNetworkId() + "@activitiAdhoc")
+               .singleResult();
+
+       ProcessesClient processesClient = publicApiClient.processesClient();
+       
+       final JSONObject createProcessObject = new JSONObject();
+       createProcessObject.put("processDefinitionId", processDefinition.getId());
+       if (businessKey != null)
+       {
+           createProcessObject.put("businessKey", businessKey);
+       }
+       final JSONObject variablesObject = new JSONObject();
+       variablesObject.put("bpm_priority", 1);
+       variablesObject.put("wf_notifyMe", Boolean.FALSE);
+       
+       TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+       {
+           @Override
+           public Void doWork() throws Exception
+           {
+               variablesObject.put("bpm_assignee", requestContext.getRunAsUser());
+               return null;
+           }
+       }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+       
+       if (documentRefs != null && documentRefs.length > 0)
+       {
+           final JSONArray itemsObject = new JSONArray();
+           for (NodeRef nodeRef : documentRefs)
+           {
+               itemsObject.add(nodeRef.getId());
+           }
+           createProcessObject.put("items", itemsObject);
+       }
+       
+       createProcessObject.put("variables", variablesObject);
+       
+       return processesClient.createProcess(createProcessObject.toJSONString());
+   }
+   
+   /**
+    * Start a review pooled process through the public REST-API.
+    */
+   @SuppressWarnings("unchecked")
+   protected ProcessInfo startReviewPooledProcess(final RequestContext requestContext) throws PublicApiException {
+       org.activiti.engine.repository.ProcessDefinition processDefinition = activitiProcessEngine
+               .getRepositoryService()
+               .createProcessDefinitionQuery()
+               .processDefinitionKey("@" + requestContext.getNetworkId() + "@activitiReviewPooled")
+               .singleResult();
+
+       ProcessesClient processesClient = publicApiClient.processesClient();
+       
+       final JSONObject createProcessObject = new JSONObject();
+       createProcessObject.put("processDefinitionId", processDefinition.getId());
+       
+       final JSONObject variablesObject = new JSONObject();
+       variablesObject.put("bpm_priority", 1);
+       variablesObject.put("bpm_workflowDueDate", ISO8601DateFormat.format(new Date()));
+       variablesObject.put("wf_notifyMe", Boolean.FALSE);
+       
+       TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+       {
+           @Override
+           public Void doWork() throws Exception
+           {
+               List<MemberOfSite> memberships = getTestFixture().getNetwork(requestContext.getNetworkId()).getSiteMemberships(requestContext.getRunAsUser());
+               assertTrue(memberships.size() > 0);
+               MemberOfSite memberOfSite = memberships.get(0);
+               String group = "GROUP_site_" + memberOfSite.getSiteId() + "_" + memberOfSite.getRole().name();
+               variablesObject.put("bpm_groupAssignee", group);
+               return null;
+           }
+       }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+       
+       createProcessObject.put("variables", variablesObject);
+       
+       return processesClient.createProcess(createProcessObject.toJSONString());
+   }
+   
+   /**
+    * Start a review pooled process through the public REST-API.
+    */
+   @SuppressWarnings("unchecked")
+   protected ProcessInfo startParallelReviewProcess(final RequestContext requestContext) throws PublicApiException {
+       org.activiti.engine.repository.ProcessDefinition processDefinition = activitiProcessEngine
+               .getRepositoryService()
+               .createProcessDefinitionQuery()
+               .processDefinitionKey("@" + requestContext.getNetworkId() + "@activitiParallelReview")
+               .singleResult();
+
+       ProcessesClient processesClient = publicApiClient.processesClient();
+       
+       final JSONObject createProcessObject = new JSONObject();
+       createProcessObject.put("processDefinitionId", processDefinition.getId());
+       
+       final JSONObject variablesObject = new JSONObject();
+       variablesObject.put("bpm_priority", 1);
+       variablesObject.put("wf_notifyMe", Boolean.FALSE);
+       
+       TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+       {
+           @Override
+           public Void doWork() throws Exception
+           {
+               JSONArray assigneeArray = new JSONArray();
+               assigneeArray.add(requestContext.getRunAsUser());
+               TestPerson otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId());
+               assigneeArray.add(otherPerson.getId());
+               variablesObject.put("bpm_assignees", assigneeArray);
+               return null;
+           }
+       }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+       
+       createProcessObject.put("variables", variablesObject);
+       
+       return processesClient.createProcess(createProcessObject.toJSONString());
+   }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ListParser.java b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ListParser.java
new file mode 100644
index 00000000000..cda0a139756
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ListParser.java
@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tests;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public abstract class ListParser<T>
+{
+
+    public ListResponse<T> parseList(JSONObject jsonResponse)
+    {
+        List<T> entries = new ArrayList<T>();
+
+        JSONObject jsonList = (JSONObject)jsonResponse.get("list");
+        assertNotNull(jsonList);
+
+        JSONArray jsonEntries = (JSONArray)jsonList.get("entries");
+        assertNotNull(jsonEntries);
+
+        for(int i = 0; i < jsonEntries.size(); i++)
+        {
+            JSONObject jsonEntry = (JSONObject)jsonEntries.get(i);
+            JSONObject entry = (JSONObject)jsonEntry.get("entry");
+            entries.add(parseEntry(entry));
+        }
+
+        ExpectedPaging paging = ExpectedPaging.parsePagination(jsonList);
+
+        ListResponse<T> resp = new ListResponse<T>(paging, entries);
+        return resp;
+    }
+
+    public abstract T parseEntry(JSONObject entry);
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ProcessDefinitionParser.java b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ProcessDefinitionParser.java
new file mode 100644
index 00000000000..a5781a5587c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ProcessDefinitionParser.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tests;
+
+import org.alfresco.rest.workflow.api.model.ProcessDefinition;
+import org.json.simple.JSONObject;
+
+public class ProcessDefinitionParser extends ListParser<ProcessDefinition>
+{
+    public static ProcessDefinitionParser INSTANCE = new ProcessDefinitionParser();
+
+    @Override
+    public ProcessDefinition parseEntry(JSONObject entry)
+    {
+        ProcessDefinition processDefinition = new ProcessDefinition();
+        processDefinition.setId((String) entry.get("id"));
+        processDefinition.setKey((String) entry.get("key"));
+        processDefinition.setVersion(((Number) entry.get("version")).intValue());
+        processDefinition.setName((String) entry.get("name"));
+        processDefinition.setDeploymentId((String) entry.get("deploymentId"));
+        processDefinition.setTitle((String) entry.get("title"));
+        processDefinition.setDescription((String) entry.get("description"));
+        processDefinition.setCategory((String) entry.get("category"));
+        processDefinition.setStartFormResourceKey((String) entry.get("startFormResourceKey"));
+        processDefinition.setGraphicNotationDefined((Boolean) entry.get("graphicNotationDefined"));
+        return processDefinition;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ProcessDefinitionWorkflowApiTest.java b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ProcessDefinitionWorkflowApiTest.java
new file mode 100644
index 00000000000..085f528d87c
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ProcessDefinitionWorkflowApiTest.java
@@ -0,0 +1,832 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tests;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.workflow.api.model.ProcessDefinition;
+import org.alfresco.rest.workflow.api.tests.WorkflowApiClient.ProcessDefinitionsClient;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.junit.Test;
+import org.springframework.http.HttpStatus;
+
+/**
+ * @author Tijs Rademakers 
+ * @author Frederik Heremans
+ */
+public class ProcessDefinitionWorkflowApiTest extends EnterpriseWorkflowTestApi
+{   
+    
+    @Test
+    public void testGetProcessDefinitions() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        // Get all process definitions
+        ProcessDefinitionsClient processDefinitionsClient = publicApiClient.processDefinitionsClient();
+        ListResponse<ProcessDefinition> processDefinitionsResponse = processDefinitionsClient.getProcessDefinitions(null);
+        Map<String, ProcessDefinition>  processDefinitionMap = getProcessDefinitionMapByKey(processDefinitionsResponse.getList());
+        
+        assertTrue(processDefinitionMap.containsKey("activitiReviewPooled"));
+        assertTrue(processDefinitionMap.containsKey("activitiReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiParallelGroupReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiParallelReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiAdhoc"));
+        assertEquals(5, processDefinitionMap.size());
+        
+        
+        // Check fields of a resulting process-definition
+        String adhocKey = createProcessDefinitionKey("activitiAdhoc", requestContext);
+        org.activiti.engine.repository.ProcessDefinition activitiDefinition = activitiProcessEngine.getRepositoryService()
+            .createProcessDefinitionQuery()
+            .processDefinitionKey(adhocKey)
+            .singleResult();
+        
+        assertNotNull(activitiDefinition);
+        
+        ProcessDefinition adhocDefinitionRest = processDefinitionMap.get("activitiAdhoc");
+        
+        assertEquals(activitiDefinition.getId(), adhocDefinitionRest.getId());
+        assertEquals("activitiAdhoc", adhocDefinitionRest.getKey());
+        assertEquals(activitiDefinition.getDeploymentId(), adhocDefinitionRest.getDeploymentId());
+        assertEquals(activitiDefinition.getCategory(), adhocDefinitionRest.getCategory());
+        assertEquals(activitiDefinition.getName(), adhocDefinitionRest.getName());
+        assertEquals(activitiDefinition.getVersion(), adhocDefinitionRest.getVersion());
+        assertEquals(((ProcessDefinitionEntity) activitiDefinition).isGraphicalNotationDefined(), adhocDefinitionRest.isGraphicNotationDefined());
+        assertEquals("wf:submitAdhocTask", adhocDefinitionRest.getStartFormResourceKey());
+        assertEquals("New Task", adhocDefinitionRest.getTitle());
+        assertEquals("Assign a new task to yourself or a colleague", adhocDefinitionRest.getDescription());
+        
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("maxItems", "2");
+        JSONObject definitionListObject = processDefinitionsClient.getProcessDefinitionsWithRawResponse(params);
+        assertNotNull(definitionListObject);
+        JSONObject paginationJSON = (JSONObject) definitionListObject.get("pagination");
+        assertEquals(2l, paginationJSON.get("count"));
+        assertEquals(5l, paginationJSON.get("totalItems"));
+        assertEquals(0l, paginationJSON.get("skipCount"));
+        assertEquals(true, paginationJSON.get("hasMoreItems"));
+        
+        params = new HashMap<String, String>();
+        definitionListObject = processDefinitionsClient.getProcessDefinitionsWithRawResponse(params);
+        assertNotNull(definitionListObject);
+        paginationJSON = (JSONObject) definitionListObject.get("pagination");
+        assertEquals(5l, paginationJSON.get("count"));
+        assertEquals(5l, paginationJSON.get("totalItems"));
+        assertEquals(0l, paginationJSON.get("skipCount"));
+        assertEquals(false, paginationJSON.get("hasMoreItems"));
+        
+        params = new HashMap<String, String>();
+        params.put("skipCount", "2");
+        params.put("maxItems", "2");
+        definitionListObject = processDefinitionsClient.getProcessDefinitionsWithRawResponse(params);
+        assertNotNull(definitionListObject);
+        paginationJSON = (JSONObject) definitionListObject.get("pagination");
+        assertEquals(2l, paginationJSON.get("count"));
+        assertEquals(5l, paginationJSON.get("totalItems"));
+        assertEquals(2l, paginationJSON.get("skipCount"));
+        assertEquals(true, paginationJSON.get("hasMoreItems"));
+        
+        params = new HashMap<String, String>();
+        params.put("skipCount", "2");
+        params.put("maxItems", "5");
+        definitionListObject = processDefinitionsClient.getProcessDefinitionsWithRawResponse(params);
+        assertNotNull(definitionListObject);
+        paginationJSON = (JSONObject) definitionListObject.get("pagination");
+        assertEquals(3l, paginationJSON.get("count"));
+        assertEquals(5l, paginationJSON.get("totalItems"));
+        assertEquals(2l, paginationJSON.get("skipCount"));
+        assertEquals(false, paginationJSON.get("hasMoreItems"));
+        
+        params = new HashMap<String, String>();
+        params.put("skipCount", "0");
+        params.put("maxItems", "7");
+        definitionListObject = processDefinitionsClient.getProcessDefinitionsWithRawResponse(params);
+        assertNotNull(definitionListObject);
+        paginationJSON = (JSONObject) definitionListObject.get("pagination");
+        assertEquals(5l, paginationJSON.get("count"));
+        assertEquals(5l, paginationJSON.get("totalItems"));
+        assertEquals(0l, paginationJSON.get("skipCount"));
+        assertEquals(false, paginationJSON.get("hasMoreItems"));
+    }
+
+    @Test
+    public void testGetProcessDefinitionsSorting() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        String adhocKey = createProcessDefinitionKey("activitiAdhoc", requestContext);
+        org.activiti.engine.repository.ProcessDefinition activitiDefinition = activitiProcessEngine.getRepositoryService()
+                .createProcessDefinitionQuery()
+                .processDefinitionKey(adhocKey)
+                .singleResult();
+
+        assertNotNull(activitiDefinition);
+
+        ProcessDefinitionsClient processDefinitionsClient = publicApiClient.processDefinitionsClient();
+
+        List<ProcessDefinition> processDefinitions = getProcessDefinitions(processDefinitionsClient, "(category = 'http://alfresco.org')", "name");
+        assertEquals(5, processDefinitions.size());
+        List<String> expectedNames = Arrays.asList("Adhoc Activiti Process",
+                "Parallel Group Review And Approve Activiti Process",
+                "Parallel Review And Approve Activiti Process",
+                "Pooled Review And Approve Activiti Process",
+                "Review And Approve Activiti Process");
+
+        List<String> names = collect(processDefinitions, new Collector()
+        {
+            @Override
+            public String collect(ProcessDefinition definition)
+            {
+                return definition.getName();
+            }
+        });
+        assertEquals(expectedNames, names);
+
+        processDefinitions = getProcessDefinitions(processDefinitionsClient, "(category = 'http://alfresco.org')", "name DESC");
+        assertEquals(5, processDefinitions.size());
+        names = collect(processDefinitions, new Collector()
+        {
+            @Override
+            public String collect(ProcessDefinition definition)
+            {
+                return definition.getName();
+            }
+        });
+        Collections.reverse(expectedNames);
+        assertEquals(expectedNames, names);
+
+        processDefinitions = getProcessDefinitions(processDefinitionsClient, "(category = 'http://alfresco.org')", "version DESC");
+        assertEquals(5, processDefinitions.size()); //all the same version so no sorting
+
+        processDefinitions = getProcessDefinitions(processDefinitionsClient, "(category = 'http://alfresco.org')", "id ASC");
+        assertEquals(5, processDefinitions.size());
+        List<String> ids = collect(processDefinitions, new Collector()
+        {
+            @Override
+            public String collect(ProcessDefinition definition)
+            {
+                return definition.getId();
+            }
+        });
+        List<String> sortedIds = new ArrayList<>(ids);
+        Collections.sort(sortedIds);
+        assertEquals(sortedIds, ids);
+
+        processDefinitions = getProcessDefinitions(processDefinitionsClient, "(category = 'http://alfresco.org')", "category ASC");
+        assertEquals(5, processDefinitions.size()); //all the same
+
+        processDefinitions = getProcessDefinitions(processDefinitionsClient, "(category = 'http://alfresco.org')", "key DESC");
+        assertEquals(5, processDefinitions.size());
+        List<String> keys = collect(processDefinitions, new Collector()
+        {
+            @Override
+            public String collect(ProcessDefinition definition)
+            {
+                return definition.getKey();
+            }
+        });
+        List<String> sortedKeys = new ArrayList<>(keys);
+        Collections.sort(sortedKeys); //order
+        Collections.reverse(sortedKeys); //reverse order
+        assertEquals(sortedKeys, keys);
+
+        processDefinitions = getProcessDefinitions(processDefinitionsClient, "(category = 'http://alfresco.org')", "deploymentId ASC");
+        assertEquals(5, processDefinitions.size());
+        List<String> deploymentIds = collect(processDefinitions, new Collector()
+        {
+            @Override
+            public String collect(ProcessDefinition definition)
+            {
+                return definition.getDeploymentId();
+            }
+        });
+        List<String> sortedDeploymentIds = new ArrayList<>(deploymentIds);
+        Collections.sort(sortedDeploymentIds);
+        assertEquals(sortedDeploymentIds, deploymentIds);
+
+        try
+        {
+            processDefinitions = getProcessDefinitions(processDefinitionsClient, "(category = 'http://alfresco.org')", "sausage ASC");
+            fail("Expected exception");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(400, e.getHttpResponse().getStatusCode());
+            assertTrue(e.getMessage().contains("OrderBy sausage is not supported, supported items are"));
+        }
+
+        try
+        {
+            processDefinitions = getProcessDefinitions(processDefinitionsClient, "(category = 'http://alfresco.org')", "deploymentId ASC, key");
+            fail("Expected exception");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(400, e.getHttpResponse().getStatusCode());
+            assertTrue(e.getHttpResponse().getResponse().contains("Only one orderBy parameter is supported"));
+        }
+    }
+
+    private List<String> collect(List<ProcessDefinition> processDefinitions, Collector collector)
+    {
+        List<String> collected = new ArrayList<>();
+        for (ProcessDefinition definition:processDefinitions)
+        {
+            collected.add(collector.collect(definition));
+        }
+
+        return collected;
+    }
+
+    @Test
+    public void testGetProcessDefinitionsWhereClause() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String adhocKey = createProcessDefinitionKey("activitiAdhoc", requestContext);
+        org.activiti.engine.repository.ProcessDefinition activitiDefinition = activitiProcessEngine.getRepositoryService()
+            .createProcessDefinitionQuery()
+            .processDefinitionKey(adhocKey)
+            .singleResult();
+        
+        assertNotNull(activitiDefinition);
+
+        ProcessDefinitionsClient processDefinitionsClient = publicApiClient.processDefinitionsClient();
+        
+        // Filter on category equals
+        Map<String, ProcessDefinition>  processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(category = 'http://alfresco.org')");
+
+        assertTrue(processDefinitionMap.containsKey("activitiReviewPooled"));
+        assertTrue(processDefinitionMap.containsKey("activitiReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiParallelGroupReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiParallelReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiAdhoc"));
+        assertEquals(5, processDefinitionMap.size());
+        
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(category = 'unexisting')");
+        assertEquals(0, processDefinitionMap.size());
+        
+        // Filter on name equals
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(name = 'Adhoc Activiti Process')");
+        assertTrue(processDefinitionMap.containsKey("activitiAdhoc"));
+        assertEquals(1, processDefinitionMap.size());
+        
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(name = 'unexisting')");
+        assertEquals(0, processDefinitionMap.size());
+        
+        // Filter on key equals
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(key='activitiAdhoc')");
+        assertTrue(processDefinitionMap.containsKey("activitiAdhoc"));
+        assertEquals(1, processDefinitionMap.size());
+        
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(key='unexisting')");
+        assertEquals(0, processDefinitionMap.size());
+        
+        // Filter on version equals
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(version='1')");
+        assertEquals(5, processDefinitionMap.size());
+        
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(version='2')");
+        assertEquals(0, processDefinitionMap.size());
+        
+        // Filter on deploymentId equals
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(deploymentId='" + activitiDefinition.getDeploymentId() + "')");
+        assertTrue(processDefinitionMap.containsKey("activitiAdhoc"));
+        assertEquals(1, processDefinitionMap.size());
+        
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(deploymentId='unexisting')");
+        assertEquals(0, processDefinitionMap.size());
+        
+        // Filter on category matches
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(category matches('%alfresco.o%'))");
+        
+        assertTrue(processDefinitionMap.containsKey("activitiReviewPooled"));
+        assertTrue(processDefinitionMap.containsKey("activitiReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiParallelGroupReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiParallelReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiAdhoc"));
+        assertEquals(5, processDefinitionMap.size());
+        
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(category matches('unexisting'))");
+        assertEquals(0, processDefinitionMap.size());
+        
+        // Filter on name matches
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(name matches('Adhoc Activiti %'))");
+        assertTrue(processDefinitionMap.containsKey("activitiAdhoc"));
+        assertEquals(1, processDefinitionMap.size());
+        
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(name matches('unexisting'))");
+        assertEquals(0, processDefinitionMap.size());
+        
+        // Filter on key matches
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(key matches('activitiAd%'))");
+        assertTrue(processDefinitionMap.containsKey("activitiAdhoc"));
+        assertEquals(1, processDefinitionMap.size());
+        
+        // Use AND operator
+        processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(category = 'http://alfresco.org' AND name = 'Adhoc Activiti Process')");
+        assertTrue(processDefinitionMap.containsKey("activitiAdhoc"));
+        assertEquals(1, processDefinitionMap.size());
+        
+        // Use OR operator
+        try
+        {
+            processDefinitionMap = getProcessDefinitions(processDefinitionsClient, "(category = 'http://alfresco.org' OR name = 'Adhoc Activiti Process')");
+            fail("Expected exception");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(400, e.getHttpResponse().getStatusCode());
+        }
+    }
+    
+    @Test
+    public void testGetProcessDefinitionById() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+
+        String adhocKey = createProcessDefinitionKey("activitiAdhoc", requestContext);
+        org.activiti.engine.repository.ProcessDefinition activitiDefinition = activitiProcessEngine.getRepositoryService()
+            .createProcessDefinitionQuery()
+            .processDefinitionKey(adhocKey)
+            .singleResult();
+
+        assertNotNull(activitiDefinition);
+
+        // Get a single process definitions
+        ProcessDefinitionsClient processDefinitionsClient = publicApiClient.processDefinitionsClient();
+        ProcessDefinition adhocDefinition = processDefinitionsClient.findProcessDefinitionById(activitiDefinition.getId());
+        assertNotNull(adhocDefinition);
+        
+        // Check fields of a resulting process-definition
+        assertEquals(activitiDefinition.getId(), adhocDefinition.getId());
+        assertEquals("activitiAdhoc", adhocDefinition.getKey());
+        assertEquals(activitiDefinition.getDeploymentId(), adhocDefinition.getDeploymentId());
+        assertEquals(activitiDefinition.getCategory(), adhocDefinition.getCategory());
+        assertEquals(activitiDefinition.getName(), adhocDefinition.getName());
+        assertEquals(activitiDefinition.getVersion(), adhocDefinition.getVersion());
+        assertEquals(((ProcessDefinitionEntity) activitiDefinition).isGraphicalNotationDefined(), adhocDefinition.isGraphicNotationDefined());
+        assertEquals("wf:submitAdhocTask", adhocDefinition.getStartFormResourceKey());
+        
+        // get process definition with admin
+        publicApiClient.setRequestContext(adminContext);
+        adhocDefinition = processDefinitionsClient.findProcessDefinitionById(activitiDefinition.getId());
+        assertNotNull(adhocDefinition);
+        
+        // Check fields of a resulting process-definition
+        assertEquals(activitiDefinition.getId(), adhocDefinition.getId());
+        assertEquals("activitiAdhoc", adhocDefinition.getKey());
+    }
+
+
+    @Test
+    public void testGetProcessDefinitionsImage() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        ProcessDefinitionsClient processDefinitionsClient = publicApiClient.processDefinitionsClient();
+
+        String adhocKey = createProcessDefinitionKey("activitiAdhoc", requestContext);
+        org.activiti.engine.repository.ProcessDefinition activitiDefinition = activitiProcessEngine.getRepositoryService()
+                .createProcessDefinitionQuery()
+                .processDefinitionKey(adhocKey)
+                .singleResult();
+
+        assertNotNull(activitiDefinition);
+        try
+        {
+            HttpResponse response = processDefinitionsClient.findImageById(activitiDefinition.getId());
+            fail("Exception expected");
+        }
+        catch(PublicApiException expected)
+        {
+            assertEquals(HttpStatus.INTERNAL_SERVER_ERROR.value(), expected.getHttpResponse().getStatusCode());
+            assertTrue(expected.getMessage().contains("No image available"));
+        }
+
+
+    }
+
+    @Test
+    public void testGetProcessDefinitionByIdUnexisting() throws Exception
+    {
+        initApiClientWithTestUser();
+        ProcessDefinitionsClient processDefinitionsClient = publicApiClient.processDefinitionsClient();
+        try 
+        {
+            processDefinitionsClient.findProcessDefinitionById("unexisting");
+            fail("Exception expected");
+        }
+        catch(PublicApiException expected)
+        {
+            assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+            assertErrorSummary("The entity with id: unexisting was not found", expected.getHttpResponse());
+        }
+    }
+    
+    @Test
+    public void testGetProcessDefinitionStartModel() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+        
+        ProcessDefinitionsClient processDefinitionsClient = publicApiClient.processDefinitionsClient();
+        
+        String adhocKey = createProcessDefinitionKey("activitiAdhoc", requestContext);
+        org.activiti.engine.repository.ProcessDefinition activitiDefinition = activitiProcessEngine.getRepositoryService()
+            .createProcessDefinitionQuery()
+            .processDefinitionKey(adhocKey)
+            .singleResult();
+        
+        assertNotNull(activitiDefinition);
+        
+        JSONObject model = processDefinitionsClient.findStartFormModel(activitiDefinition.getId());
+        assertNotNull(model);
+        
+        JSONArray entries = (JSONArray) model.get("entries");
+        assertNotNull(entries);
+        
+        // Add all entries to a map, to make lookup easier
+        Map<String, JSONObject> modelFieldsByName = new HashMap<String, JSONObject>();
+        JSONObject entry = null;
+        for(int i=0; i<entries.size(); i++) 
+        {
+            entry = (JSONObject) entries.get(i);
+            assertNotNull(entry);
+            entry = (JSONObject) entry.get("entry");
+            assertNotNull(entry);
+            modelFieldsByName.put((String) entry.get("name"), entry);
+        }
+        
+        // Check well-known properties and their types
+        
+        // Validate bpm:description
+        JSONObject modelEntry = modelFieldsByName.get("bpm_workflowDescription");
+        assertNotNull(modelEntry);
+        assertEquals("Description", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/bpm/1.0}workflowDescription", modelEntry.get("qualifiedName"));
+        assertEquals("d:text", modelEntry.get("dataType"));
+        assertFalse((Boolean)modelEntry.get("required"));
+        
+        // Validate bpm:description
+        modelEntry = modelFieldsByName.get("bpm_completionDate");
+        assertNotNull(modelEntry);
+        assertEquals("Completion Date", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/bpm/1.0}completionDate", modelEntry.get("qualifiedName"));
+        assertEquals("d:date", modelEntry.get("dataType"));
+        assertFalse((Boolean)modelEntry.get("required"));
+        
+        // Validate cm:owner
+        modelEntry = modelFieldsByName.get("cm_owner");
+        assertNotNull(modelEntry);
+        assertEquals("Owner", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/content/1.0}owner", modelEntry.get("qualifiedName"));
+        assertEquals("d:text", modelEntry.get("dataType"));
+        assertFalse((Boolean)modelEntry.get("required"));
+        
+        // Validate bpm:sendEmailNotifications
+        modelEntry = modelFieldsByName.get("bpm_sendEMailNotifications");
+        assertNotNull(modelEntry);
+        assertEquals("Send Email Notifications", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/bpm/1.0}sendEMailNotifications", modelEntry.get("qualifiedName"));
+        assertEquals("d:boolean", modelEntry.get("dataType"));
+        assertFalse((Boolean)modelEntry.get("required"));
+        
+        // Validate bpm:priority
+        modelEntry = modelFieldsByName.get("bpm_workflowPriority");
+        assertNotNull(modelEntry);
+        assertEquals("Workflow Priority", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/bpm/1.0}workflowPriority", modelEntry.get("qualifiedName"));
+        assertEquals("d:int", modelEntry.get("dataType"));
+        assertEquals("2", modelEntry.get("defaultValue"));
+        assertFalse((Boolean)modelEntry.get("required"));
+        
+        // Validate bpm:package
+        modelEntry = modelFieldsByName.get("bpm_package");
+        assertNotNull(modelEntry);
+        assertEquals("Content Package", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/bpm/1.0}package", modelEntry.get("qualifiedName"));
+        assertEquals("bpm:workflowPackage", modelEntry.get("dataType"));
+        assertFalse((Boolean)modelEntry.get("required"));
+        
+        // Validate bpm:status
+        modelEntry = modelFieldsByName.get("bpm_status");
+        assertNotNull(modelEntry);
+        assertEquals("Status", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/bpm/1.0}status", modelEntry.get("qualifiedName"));
+        assertEquals("d:text", modelEntry.get("dataType"));
+        assertEquals("Not Yet Started", modelEntry.get("defaultValue"));
+        assertTrue((Boolean)modelEntry.get("required"));
+        JSONArray allowedValues = (JSONArray) modelEntry.get("allowedValues");
+        assertNotNull(allowedValues);
+        assertEquals(5, allowedValues.size());
+        assertTrue(allowedValues.contains("Not Yet Started"));
+        assertTrue(allowedValues.contains("In Progress"));
+        assertTrue(allowedValues.contains("On Hold"));
+        assertTrue(allowedValues.contains("Cancelled"));
+        assertTrue(allowedValues.contains("Completed"));
+        
+        // get start form model with admin
+        publicApiClient.setRequestContext(adminContext);
+        model = processDefinitionsClient.findStartFormModel(activitiDefinition.getId());
+        assertNotNull(model);
+        
+        entries = (JSONArray) model.get("entries");
+        assertNotNull(entries);
+        
+        // Add all entries to a map, to make lookup easier
+        modelFieldsByName = new HashMap<String, JSONObject>();
+        for(int i=0; i<entries.size(); i++) 
+        {
+            entry = (JSONObject) entries.get(i);
+            assertNotNull(entry);
+            entry = (JSONObject) entry.get("entry");
+            assertNotNull(entry);
+            modelFieldsByName.put((String) entry.get("name"), entry);
+        }
+        
+        // Check well-known properties and their types
+        
+        // Validate bpm:description
+        modelEntry = modelFieldsByName.get("bpm_workflowDescription");
+        assertNotNull(modelEntry);
+        assertEquals("Description", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/bpm/1.0}workflowDescription", modelEntry.get("qualifiedName"));
+        assertEquals("d:text", modelEntry.get("dataType"));
+        assertFalse((Boolean)modelEntry.get("required"));
+        
+        // Validate bpm:description
+        modelEntry = modelFieldsByName.get("bpm_completionDate");
+        assertNotNull(modelEntry);
+        assertEquals("Completion Date", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/bpm/1.0}completionDate", modelEntry.get("qualifiedName"));
+        assertEquals("d:date", modelEntry.get("dataType"));
+        assertFalse((Boolean)modelEntry.get("required"));
+    }
+    
+    @Test
+    public void testGetProcessDefinitionStartModelUnexisting() throws Exception
+    {
+        initApiClientWithTestUser();
+        ProcessDefinitionsClient processDefinitionsClient = publicApiClient.processDefinitionsClient();
+        try 
+        {
+            processDefinitionsClient.findStartFormModel("unexisting");
+            fail("Exception expected");
+        }
+        catch(PublicApiException expected)
+        {
+            assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+            assertErrorSummary("The entity with id: unexisting was not found", expected.getHttpResponse());
+        }
+    }
+    
+    @Test
+    public void testMethodNotAllowedURIs() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        HttpResponse response = publicApiClient.get("public", "process-definitions", null, null, null, null);
+        assertEquals(200, response.getStatusCode());
+        response = publicApiClient.post("public", "process-definitions", null, null, null, null);
+        assertEquals(405, response.getStatusCode());
+        response = publicApiClient.delete("public", "process-definitions", null, null, null);
+        assertEquals(405, response.getStatusCode());
+        response = publicApiClient.put("public", "process-definitions", null, null, null, null, null);
+        assertEquals(405, response.getStatusCode());
+  
+        String adhocKey = createProcessDefinitionKey("activitiAdhoc", requestContext);
+        org.activiti.engine.repository.ProcessDefinition processDefinition = activitiProcessEngine.getRepositoryService()
+            .createProcessDefinitionQuery()
+            .processDefinitionKey(adhocKey)
+            .singleResult();
+        
+        assertNotNull(processDefinition);
+        
+        response = publicApiClient.get("public", "process-definitions", processDefinition.getId(), null, null, null);
+        assertEquals(200, response.getStatusCode());
+        response = publicApiClient.post("public", "process-definitions", processDefinition.getId(), null, null, null);
+        assertEquals(405, response.getStatusCode());
+        response = publicApiClient.delete("public", "process-definitions", processDefinition.getId(), null, null);
+        assertEquals(405, response.getStatusCode());
+        response = publicApiClient.put("public", "process-definitions", processDefinition.getId(), null, null, null, null);
+        assertEquals(405, response.getStatusCode());
+        
+        response = publicApiClient.get("public", "process-definitions", processDefinition.getId(), "start-form-model", null, null);
+        assertEquals(200, response.getStatusCode());
+        response = publicApiClient.post("public", "process-definitions", processDefinition.getId(), "start-form-model", null, null);
+        assertEquals(405, response.getStatusCode());
+        response = publicApiClient.delete("public", "process-definitions", processDefinition.getId(), "start-form-model", null);
+        assertEquals(405, response.getStatusCode());
+        response = publicApiClient.put("public", "process-definitions", processDefinition.getId(), "start-form-model", null, null, null);
+        assertEquals(405, response.getStatusCode());
+    }
+    
+    @Test
+    public void testAuthenticationAndAuthorization() throws Exception
+    {
+        // Fetching process definitions as admin should be possible
+        RequestContext requestContext = initApiClientWithTestUser();
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        publicApiClient.setRequestContext(new RequestContext(requestContext.getNetworkId(), tenantAdmin));
+        
+        ProcessDefinitionsClient processDefinitionsClient = publicApiClient.processDefinitionsClient();
+        ListResponse<ProcessDefinition> processDefinitionsResponse = processDefinitionsClient.getProcessDefinitions(null);
+        Map<String, ProcessDefinition>  processDefinitionMap = getProcessDefinitionMapByKey(processDefinitionsResponse.getList());
+        
+        assertTrue(processDefinitionMap.containsKey("activitiReviewPooled"));
+        assertTrue(processDefinitionMap.containsKey("activitiReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiParallelGroupReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiParallelReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiAdhoc"));
+        assertEquals(5, processDefinitionMap.size());
+        
+        // Fetching process definitions as admin from another tenant shouldn't be possible
+        TestNetwork anotherNetwork = getOtherNetwork(requestContext.getNetworkId());
+        tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + anotherNetwork.getId();
+        RequestContext otherContext = new RequestContext(anotherNetwork.getId(), tenantAdmin);
+        publicApiClient.setRequestContext(otherContext);
+        
+        processDefinitionsResponse = processDefinitionsClient.getProcessDefinitions(null);
+        processDefinitionMap = getProcessDefinitionMapByKey(processDefinitionsResponse.getList());
+        
+        // the response should contain process definitions from the new tenant
+        assertTrue(processDefinitionMap.containsKey("activitiReviewPooled"));
+        assertTrue(processDefinitionMap.containsKey("activitiReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiParallelGroupReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiParallelReview"));
+        assertTrue(processDefinitionMap.containsKey("activitiAdhoc"));
+        assertEquals(5, processDefinitionMap.size());
+        
+        // Fetching a specific process definitions as admin should be possible
+        publicApiClient.setRequestContext(requestContext);
+        
+        String adhocKey = createProcessDefinitionKey("activitiAdhoc", requestContext);
+        org.activiti.engine.repository.ProcessDefinition activitiDefinition = activitiProcessEngine.getRepositoryService()
+            .createProcessDefinitionQuery()
+            .processDefinitionKey(adhocKey)
+            .singleResult();
+        
+        assertNotNull(activitiDefinition);
+        
+        // Get a single process definitions
+        ProcessDefinition adhocDefinition = processDefinitionsClient.findProcessDefinitionById(activitiDefinition.getId());
+        assertNotNull(adhocDefinition);
+        
+        // Check fields of a resulting process-definition
+        assertEquals(activitiDefinition.getId(), adhocDefinition.getId());
+        assertEquals("activitiAdhoc", adhocDefinition.getKey());
+        assertEquals(activitiDefinition.getDeploymentId(), adhocDefinition.getDeploymentId());
+        assertEquals(activitiDefinition.getCategory(), adhocDefinition.getCategory());
+        assertEquals(activitiDefinition.getName(), adhocDefinition.getName());
+        assertEquals(activitiDefinition.getVersion(), adhocDefinition.getVersion());
+        assertEquals(((ProcessDefinitionEntity) activitiDefinition).isGraphicalNotationDefined(), adhocDefinition.isGraphicNotationDefined());
+        assertEquals("wf:submitAdhocTask", adhocDefinition.getStartFormResourceKey());
+        
+        // Fetching a specific process definitions as admin from another tenant should not be possible
+        publicApiClient.setRequestContext(otherContext);
+        try
+        {
+            adhocDefinition = processDefinitionsClient.findProcessDefinitionById(activitiDefinition.getId());
+            fail("not found expected");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.NOT_FOUND.value(), e.getHttpResponse().getStatusCode());
+        }
+        
+        // Fetching the start form model of a process definition as admin should be possible
+        publicApiClient.setRequestContext(requestContext);
+        JSONObject model = processDefinitionsClient.findStartFormModel(activitiDefinition.getId());
+        assertNotNull(model);
+        
+        JSONArray entries = (JSONArray) model.get("entries");
+        assertNotNull(entries);
+        
+        // Add all entries to a map, to make lookup easier
+        Map<String, JSONObject> modelFieldsByName = new HashMap<String, JSONObject>();
+        JSONObject entry = null;
+        for(int i=0; i<entries.size(); i++) 
+        {
+            entry = (JSONObject) entries.get(i);
+            assertNotNull(entry);
+            entry = (JSONObject) entry.get("entry");
+            assertNotNull(entry);
+            modelFieldsByName.put((String) entry.get("name"), entry);
+        }
+        
+        // Check well-known properties and their types
+        
+        // Validate bpm:description
+        JSONObject modelEntry = modelFieldsByName.get("bpm_workflowDescription");
+        assertNotNull(modelEntry);
+        assertEquals("Description", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/bpm/1.0}workflowDescription", modelEntry.get("qualifiedName"));
+        assertEquals("d:text", modelEntry.get("dataType"));
+        assertFalse((Boolean)modelEntry.get("required"));
+        
+        // Fetching a specific process definitions as admin from another tenant should not be possible
+        publicApiClient.setRequestContext(otherContext);
+        try
+        {
+            model = processDefinitionsClient.findStartFormModel(activitiDefinition.getId());
+            fail("not found expected");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.NOT_FOUND.value(), e.getHttpResponse().getStatusCode());
+        }
+    }
+    
+    protected String createProcessDefinitionKey(String key, RequestContext requestContext) 
+    {
+        return "@" + requestContext.getNetworkId() + "@" + key;
+    }
+    
+    protected Map<String, ProcessDefinition> getProcessDefinitionMapByKey(List<ProcessDefinition> processDefinitions) 
+    {
+        Map<String, ProcessDefinition>  processDefinitionMap = new HashMap<String, ProcessDefinition>();
+        for (ProcessDefinition processDefinition : processDefinitions)
+        {
+            processDefinitionMap.put(processDefinition.getKey(), processDefinition);
+        }
+        return processDefinitionMap;
+    }
+    
+    protected Map<String, ProcessDefinition> getProcessDefinitions(ProcessDefinitionsClient processDefinitionsClient, String whereClause) throws PublicApiException
+    {
+        Map<String, String> params = null;
+        if(whereClause != null)
+        {
+            params = Collections.singletonMap("where", whereClause);
+        }
+
+        ListResponse<ProcessDefinition> processDefinitionsResponse = processDefinitionsClient.getProcessDefinitions(params);
+        return getProcessDefinitionMapByKey(processDefinitionsResponse.getList());
+    }
+
+    protected List<ProcessDefinition> getProcessDefinitions(ProcessDefinitionsClient processDefinitionsClient, String whereClause, String sort) throws PublicApiException
+    {
+        Map<String, String> params = null;
+        if(whereClause != null)
+        {
+            params = Collections.singletonMap("where", whereClause);
+        }
+        if(sort != null)
+        {
+            params = Collections.singletonMap("orderBy", sort);
+        }
+        
+        return processDefinitionsClient.getProcessDefinitions(params).getList();
+    }
+
+    interface Collector
+    {
+        public String collect (ProcessDefinition processDefinitions);
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ProcessWorkflowApiTest.java b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ProcessWorkflowApiTest.java
new file mode 100644
index 00000000000..29b3b2561c2
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ProcessWorkflowApiTest.java
@@ -0,0 +1,2421 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tests;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.activiti.engine.TaskService;
+import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.task.Task;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.workflow.activiti.ActivitiScriptNode;
+import org.alfresco.rest.api.tests.PersonInfo;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Document;
+import org.alfresco.rest.api.tests.client.data.FavouriteDocument;
+import org.alfresco.rest.api.tests.client.data.MemberOfSite;
+import org.alfresco.rest.api.tests.client.data.SiteRole;
+import org.alfresco.rest.workflow.api.model.ProcessInfo;
+import org.alfresco.rest.workflow.api.model.Variable;
+import org.alfresco.rest.workflow.api.tests.WorkflowApiClient.ProcessesClient;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.util.ISO8601DateFormat;
+import org.alfresco.util.Pair;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+import org.springframework.http.HttpStatus;
+/**
+ * Process related Rest api tests using http client to communicate with the rest apis in the repository.
+ * 
+ * @author Tijs Rademakers
+ *
+ */
+@Category(OwnJVMTestsCategory.class)
+public class ProcessWorkflowApiTest extends EnterpriseWorkflowTestApi
+{   
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testCreateProcessInstanceWithId() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        org.activiti.engine.repository.ProcessDefinition processDefinition = activitiProcessEngine
+                .getRepositoryService()
+                .createProcessDefinitionQuery()
+                .processDefinitionKey("@" + requestContext.getNetworkId() + "@activitiAdhoc")
+                .singleResult();
+
+        ProcessesClient processesClient = publicApiClient.processesClient();
+        
+        JSONObject createProcessObject = new JSONObject();
+        createProcessObject.put("processDefinitionId", processDefinition.getId());
+        final JSONObject variablesObject = new JSONObject();
+        variablesObject.put("bpm_dueDate", ISO8601DateFormat.format(new Date()));
+        variablesObject.put("bpm_priority", 1);
+        variablesObject.put("bpm_description", "test description");
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                variablesObject.put("bpm_assignee", requestContext.getRunAsUser());
+                return null;
+            }
+        }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+        
+        
+        createProcessObject.put("variables", variablesObject);
+        
+        ProcessInfo processRest = processesClient.createProcess(createProcessObject.toJSONString());
+        assertNotNull(processRest);
+        assertNotNull(processRest.getId());
+        
+        HistoricProcessInstance processInstance = activitiProcessEngine.getHistoryService().createHistoricProcessInstanceQuery()
+                .processInstanceId(processRest.getId()).singleResult();
+        
+        assertEquals(processInstance.getId(), processRest.getId());
+        assertEquals(processInstance.getStartActivityId(), processRest.getStartActivityId());
+        assertEquals(processInstance.getStartUserId(), processRest.getStartUserId());
+        assertEquals(processInstance.getStartTime(), processRest.getStartedAt());
+        assertEquals(processInstance.getProcessDefinitionId(), processRest.getProcessDefinitionId());
+        assertEquals("activitiAdhoc", processRest.getProcessDefinitionKey());
+        assertNull(processRest.getBusinessKey());
+        assertNull(processRest.getDeleteReason());
+        assertNull(processRest.getDurationInMs());
+        assertNull(processRest.getEndActivityId());
+        assertNull(processRest.getEndedAt());
+        assertNull(processRest.getSuperProcessInstanceId());
+        
+        Map<String, Object> variables = activitiProcessEngine.getRuntimeService().getVariables(processRest.getId());
+       
+        assertEquals("test description", variables.get("bpm_description"));
+        assertEquals(1, variables.get("bpm_priority"));
+        
+        cleanupProcessInstance(processRest.getId());
+        
+        // Test same create method with an admin user
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        publicApiClient.setRequestContext(new RequestContext(requestContext.getNetworkId(), tenantAdmin));
+        
+        processRest = processesClient.createProcess(createProcessObject.toJSONString());
+        assertNotNull(processRest);
+        
+        variables = activitiProcessEngine.getRuntimeService().getVariables(processRest.getId());
+       
+        assertEquals("test description", variables.get("bpm_description"));
+        assertEquals(1, variables.get("bpm_priority"));
+        
+        cleanupProcessInstance(processRest.getId());
+        
+        // Try with unexisting process definition ID
+        publicApiClient.setRequestContext(requestContext);
+        createProcessObject = new JSONObject();
+        createProcessObject.put("processDefinitionId", "unexisting");
+        try 
+        {
+            processesClient.createProcess(createProcessObject.toJSONString());
+            fail();
+        } 
+        catch(PublicApiException e)
+        {
+            // Exception expected because of wrong process definition id
+            assertEquals(HttpStatus.BAD_REQUEST.value(), e.getHttpResponse().getStatusCode());
+            assertErrorSummary("No workflow definition could be found with id 'unexisting'.", e.getHttpResponse());
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testCreateProcessInstanceWithKey() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        ProcessesClient processesClient = publicApiClient.processesClient();
+        
+        JSONObject createProcessObject = new JSONObject();
+        createProcessObject.put("processDefinitionKey", "activitiAdhoc");
+        final JSONObject variablesObject = new JSONObject();
+        variablesObject.put("bpm_dueDate", "2013-09-30T00:00:00.000+0300");
+        variablesObject.put("bpm_priority", 1);
+        variablesObject.put("bpm_description", "test description");
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                variablesObject.put("bpm_assignee", requestContext.getRunAsUser());
+                return null;
+            }
+        }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+        
+        
+        createProcessObject.put("variables", variablesObject);
+        
+        ProcessInfo processRest = processesClient.createProcess(createProcessObject.toJSONString());
+        assertNotNull(processRest);
+        
+        Map<String, Object> variables = activitiProcessEngine.getRuntimeService().getVariables(processRest.getId());
+       
+        assertEquals("test description", variables.get("bpm_description"));
+        assertEquals(1, variables.get("bpm_priority"));
+        
+        cleanupProcessInstance(processRest.getId());
+        
+        // Test same create method with an admin user
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        publicApiClient.setRequestContext(new RequestContext(requestContext.getNetworkId(), tenantAdmin));
+        
+        processRest = processesClient.createProcess(createProcessObject.toJSONString());
+        assertNotNull(processRest);
+        
+        variables = activitiProcessEngine.getRuntimeService().getVariables(processRest.getId());
+       
+        assertEquals("test description", variables.get("bpm_description"));
+        assertEquals(1, variables.get("bpm_priority"));
+        
+        cleanupProcessInstance(processRest.getId());
+        
+        // Test create process with wrong key
+        publicApiClient.setRequestContext(requestContext);
+        createProcessObject = new JSONObject();
+        createProcessObject.put("processDefinitionKey", "activitiAdhoc2");
+        
+        try 
+        {
+            processRest = processesClient.createProcess(createProcessObject.toJSONString());
+            fail();
+        } 
+        catch(PublicApiException e)
+        {
+            // Exception expected because of wrong process definition key
+            assertEquals(HttpStatus.BAD_REQUEST.value(), e.getHttpResponse().getStatusCode());
+            assertErrorSummary("No workflow definition could be found with key 'activitiAdhoc2'.", e.getHttpResponse());
+        }
+    }
+    
+    @Test
+    public void testCreateProcessInstanceWithNoParams() throws Exception
+    {
+        initApiClientWithTestUser();
+        
+        ProcessesClient processesClient = publicApiClient.processesClient();
+        
+        JSONObject createProcessObject = new JSONObject();
+        try
+        {
+            processesClient.createProcess(createProcessObject.toJSONString());
+            fail("Exception excpected");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(400, e.getHttpResponse().getStatusCode());
+        }
+    }
+    
+    @Test
+    public void testMethodNotAllowedURIs() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        HttpResponse response = publicApiClient.get("public", "processes", null, null, null, null);
+        assertEquals(200, response.getStatusCode());
+        response = publicApiClient.put("public", "processes", null, null, null, null, null);
+        assertEquals(405, response.getStatusCode());
+  
+        final ProcessInfo processInfo = startAdhocProcess(requestContext, null);
+        
+        try
+        {
+            response = publicApiClient.get("public", "processes", processInfo.getId(), null, null, null);
+            assertEquals(200, response.getStatusCode());
+            response = publicApiClient.post("public", "processes", processInfo.getId(), null, null, null);
+            assertEquals(405, response.getStatusCode());
+            response = publicApiClient.put("public", "processes", processInfo.getId(), null, null, null, null);
+            assertEquals(405, response.getStatusCode());
+            
+            response = publicApiClient.get("public", "processes", processInfo.getId(), "activities", null, null);
+            assertEquals(200, response.getStatusCode());
+            response = publicApiClient.post("public", "processes", processInfo.getId(), "activities", null, null);
+            assertEquals(405, response.getStatusCode());
+            response = publicApiClient.delete("public", "processes", processInfo.getId(), "activities", null);
+            assertEquals(405, response.getStatusCode());
+            response = publicApiClient.put("public", "processes", processInfo.getId(), "activities", null, null, null);
+            assertEquals(405, response.getStatusCode());
+            
+            response = publicApiClient.get("public", "processes", processInfo.getId(), "tasks", null, null);
+            assertEquals(200, response.getStatusCode());
+            response = publicApiClient.post("public", "processes", processInfo.getId(), "tasks", null, null);
+            assertEquals(405, response.getStatusCode());
+            response = publicApiClient.delete("public", "processes", processInfo.getId(), "tasks", null);
+            assertEquals(405, response.getStatusCode());
+            response = publicApiClient.put("public", "processes", processInfo.getId(), "tasks", null, null, null);
+            assertEquals(405, response.getStatusCode());
+        }
+        finally
+        {
+            cleanupProcessInstance(processInfo.getId());
+        }
+    }
+    
+    @Test
+    public void testCreateProcessInstanceForPooledReview() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        final ProcessInfo processInfo = startReviewPooledProcess(requestContext);
+        assertNotNull(processInfo);
+        assertNotNull(processInfo.getId());
+        cleanupProcessInstance(processInfo.getId());
+    }
+    
+    @Test
+    public void testCreateProcessInstanceForParallelReview() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        final ProcessInfo processInfo = startParallelReviewProcess(requestContext);
+        assertNotNull(processInfo);
+        assertNotNull(processInfo.getId());
+        cleanupProcessInstance(processInfo.getId());
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testCreateProcessInstanceFromOtherNetwork() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        org.activiti.engine.repository.ProcessDefinition processDefinition = activitiProcessEngine
+                .getRepositoryService()
+                .createProcessDefinitionQuery()
+                .processDefinitionKey("@" + requestContext.getNetworkId() + "@activitiAdhoc")
+                .singleResult();
+
+        TestNetwork anotherNetwork = getOtherNetwork(requestContext.getNetworkId());
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + anotherNetwork.getId();
+        RequestContext otherContext = new RequestContext(anotherNetwork.getId(), tenantAdmin);
+        publicApiClient.setRequestContext(otherContext);
+        
+        ProcessesClient processesClient = publicApiClient.processesClient();
+        
+        JSONObject createProcessObject = new JSONObject();
+        createProcessObject.put("processDefinitionId", processDefinition.getId());
+        final JSONObject variablesObject = new JSONObject();
+        variablesObject.put("bpm_dueDate", ISO8601DateFormat.format(new Date()));
+        variablesObject.put("bpm_priority", 1);
+        variablesObject.put("bpm_description", "test description");
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                variablesObject.put("bpm_assignee", requestContext.getRunAsUser());
+                return null;
+            }
+        }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+        
+        
+        createProcessObject.put("variables", variablesObject);
+        
+        try
+        {
+            processesClient.createProcess(createProcessObject.toJSONString());
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.BAD_REQUEST.value(), e.getHttpResponse().getStatusCode());
+        }
+    }
+    
+    @Test
+    public void testCreateProcessInstanceWithItems() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        NodeRef[] docNodeRefs = createTestDocuments(requestContext);
+        final ProcessInfo processRest = startAdhocProcess(requestContext, docNodeRefs);
+        assertNotNull(processRest);
+        
+        final Map<String, Object> variables = activitiProcessEngine.getRuntimeService().getVariables(processRest.getId());
+        assertEquals(1, variables.get("bpm_priority"));
+        final ActivitiScriptNode packageScriptNode = (ActivitiScriptNode) variables.get("bpm_package");
+        assertNotNull(packageScriptNode);
+        
+        final Map<String, FavouriteDocument> documentMap = new HashMap<>();
+        
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                List<ChildAssociationRef> documentList = nodeService.getChildAssocs(packageScriptNode.getNodeRef());
+                for (ChildAssociationRef childAssociationRef : documentList)
+                {
+                    FavouriteDocument doc = getTestFixture().getRepoService().getDocument(requestContext.getNetworkId(), childAssociationRef.getChildRef());
+                    documentMap.put(doc.getName(), doc);
+                }
+                
+                final Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processRest.getId()).singleResult();
+                assertEquals(requestContext.getRunAsUser(), task.getAssignee());
+                
+                activitiProcessEngine.getTaskService().complete(task.getId());
+                
+                final Task task2 = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processRest.getId()).singleResult();
+                assertEquals(requestContext.getRunAsUser(), task2.getAssignee());
+                
+                activitiProcessEngine.getTaskService().complete(task2.getId());
+                return null;
+            }
+            
+        }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+        
+        assertEquals(2, documentMap.size());
+        assertTrue(documentMap.containsKey("Test Doc1"));
+        FavouriteDocument doc = documentMap.get("Test Doc1");
+        assertEquals("Test Doc1", doc.getName());
+        assertEquals("Test Doc1 Title", doc.getTitle());
+        
+        assertTrue(documentMap.containsKey("Test Doc2"));
+        doc = documentMap.get("Test Doc2");
+        assertEquals("Test Doc2", doc.getName());
+        assertEquals("Test Doc2 Title", doc.getTitle());
+        
+        cleanupProcessInstance(processRest.getId());
+    }
+    
+    @Test
+    public void testGetProcessInstanceById() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        ProcessesClient processesClient = publicApiClient.processesClient();
+        
+        final ProcessInfo process = startAdhocProcess(requestContext, null);
+        try 
+        {
+            ProcessInfo processInfo = processesClient.findProcessById(process.getId());
+            assertNotNull(processInfo);
+            
+            final Map<String, Object> variables = activitiProcessEngine.getRuntimeService().getVariables(processInfo.getId());
+            assertEquals(1, variables.get("bpm_priority"));
+
+            HistoricProcessInstance processInstance = activitiProcessEngine.getHistoryService().createHistoricProcessInstanceQuery()
+                    .processInstanceId(processInfo.getId()).singleResult();
+            
+            assertNotNull(processInfo.getId());
+            assertEquals(processInstance.getId(), processInfo.getId());
+            assertNotNull(processInfo.getStartActivityId());
+            assertEquals(processInstance.getStartActivityId(), processInfo.getStartActivityId());
+            assertNotNull(processInfo.getStartUserId());
+            assertEquals(processInstance.getStartUserId(), processInfo.getStartUserId());
+            assertNotNull(processInfo.getStartedAt());
+            assertEquals(processInstance.getStartTime(), processInfo.getStartedAt());
+            assertNotNull(processInfo.getProcessDefinitionId());
+            assertEquals(processInstance.getProcessDefinitionId(), processInfo.getProcessDefinitionId());
+            assertNotNull(processInfo.getProcessDefinitionKey());
+            assertEquals("activitiAdhoc", processInfo.getProcessDefinitionKey());
+            assertNull(processInfo.getBusinessKey());
+            assertNull(processInfo.getDeleteReason());
+            assertNull(processInfo.getDurationInMs());
+            assertNull(processInfo.getEndActivityId());
+            assertNull(processInfo.getEndedAt());
+            assertNull(processInfo.getSuperProcessInstanceId());
+            assertFalse(processInfo.isCompleted());
+            
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    // now complete the process and see if ending info is available in the REST response
+                    Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(process.getId()).singleResult();
+                    activitiProcessEngine.getTaskService().complete(task.getId());
+                    task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(process.getId()).singleResult();
+                    activitiProcessEngine.getTaskService().complete(task.getId());
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            
+            processInstance = activitiProcessEngine.getHistoryService().createHistoricProcessInstanceQuery()
+                    .processInstanceId(processInfo.getId()).singleResult();
+            
+            processInfo = processesClient.findProcessById(processInfo.getId());
+            
+            assertNotNull(processInfo.getId());
+            assertEquals(processInstance.getId(), processInfo.getId());
+            assertNotNull(processInfo.getStartActivityId());
+            assertEquals(processInstance.getStartActivityId(), processInfo.getStartActivityId());
+            assertNotNull(processInfo.getStartUserId());
+            assertEquals(processInstance.getStartUserId(), processInfo.getStartUserId());
+            assertNotNull(processInfo.getStartedAt());
+            assertEquals(processInstance.getStartTime(), processInfo.getStartedAt());
+            assertNotNull(processInfo.getProcessDefinitionId());
+            assertEquals(processInstance.getProcessDefinitionId(), processInfo.getProcessDefinitionId());
+            assertNotNull(processInfo.getProcessDefinitionKey());
+            assertEquals("activitiAdhoc", processInfo.getProcessDefinitionKey());
+            assertNull(processInfo.getBusinessKey());
+            assertNull(processInfo.getDeleteReason());
+            assertNotNull(processInfo.getDurationInMs());
+            assertEquals(processInstance.getDurationInMillis(), processInfo.getDurationInMs());
+            assertNotNull(processInfo.getEndActivityId());
+            assertEquals(processInstance.getEndActivityId(), processInfo.getEndActivityId());
+            assertNotNull(processInfo.getEndedAt());
+            assertEquals(processInstance.getEndTime(), processInfo.getEndedAt());
+            assertNull(processInfo.getSuperProcessInstanceId());
+            assertTrue(processInfo.isCompleted());
+        }
+        finally
+        {
+            cleanupProcessInstance(process.getId());
+        }
+    }
+    
+    @Test
+    public void testGetProcessInstanceByIdUnexisting() throws Exception
+    {
+        initApiClientWithTestUser();
+        ProcessesClient processesClient = publicApiClient.processesClient();
+        
+        try 
+        {
+            processesClient.findProcessById("unexisting");
+            fail("Exception expected");
+        } 
+        catch(PublicApiException expected) 
+        {
+            assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+            assertErrorSummary("The entity with id: unexisting was not found", expected.getHttpResponse());
+        }
+    }
+    
+    @Test
+    public void testDeleteProcessInstanceById() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        final RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+        
+        TestNetwork anotherNetwork = getOtherNetwork(requestContext.getNetworkId());
+        tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + anotherNetwork.getId();
+        final RequestContext otherContext = new RequestContext(anotherNetwork.getId(), tenantAdmin);
+        
+        ProcessesClient processesClient = publicApiClient.processesClient();
+        
+        // delete with user starting the process instance
+        ProcessInfo process = startAdhocProcess(requestContext, null);
+        try 
+        {
+            processesClient.deleteProcessById(process.getId());
+            
+            // Check if the process was actually deleted
+            assertNull(activitiProcessEngine.getRuntimeService().createProcessInstanceQuery()
+                        .processInstanceId(process.getId()).singleResult());
+            
+            HistoricProcessInstance deletedInstance = activitiProcessEngine.getHistoryService()
+                .createHistoricProcessInstanceQuery().processInstanceId(process.getId()).singleResult();
+            assertNotNull(deletedInstance);
+            assertNotNull(deletedInstance.getEndTime());
+            assertEquals("deleted through REST API call", deletedInstance.getDeleteReason());
+            
+            try
+            {
+                processesClient.deleteProcessById(process.getId());
+                fail("expected exeception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.NOT_FOUND.value(), e.getHttpResponse().getStatusCode());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(process.getId());
+        }
+        
+        // delete with admin in same network as the user starting the process instance
+        process = startAdhocProcess(requestContext, null);
+        try 
+        {
+            publicApiClient.setRequestContext(adminContext);
+            processesClient.deleteProcessById(process.getId());
+            
+            // Check if the process was actually deleted
+            assertNull(activitiProcessEngine.getRuntimeService().createProcessInstanceQuery()
+                        .processInstanceId(process.getId()).singleResult());
+            
+            HistoricProcessInstance deletedInstance = activitiProcessEngine.getHistoryService()
+                .createHistoricProcessInstanceQuery().processInstanceId(process.getId()).singleResult();
+            assertNotNull(deletedInstance);
+            assertNotNull(deletedInstance.getEndTime());
+            assertEquals("deleted through REST API call", deletedInstance.getDeleteReason());
+        }
+        finally
+        {
+            cleanupProcessInstance(process.getId());
+        }
+        
+        // delete with admin from other network as the user starting the process instance
+        process = startAdhocProcess(requestContext, null);
+        try 
+        {
+            publicApiClient.setRequestContext(otherContext);
+            processesClient.deleteProcessById(process.getId());
+            fail("Expect permission exception");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(HttpStatus.FORBIDDEN.value(), e.getHttpResponse().getStatusCode());
+        }
+        finally
+        {
+            cleanupProcessInstance(process.getId());
+        }
+    }
+    
+    @Test
+    public void testDeleteProcessInstanceByIdUnexisting() throws Exception
+    {
+        initApiClientWithTestUser();
+        ProcessesClient processesClient = publicApiClient.processesClient();
+        
+        try {
+            processesClient.deleteProcessById("unexisting");
+            fail("Exception expected");
+        } catch(PublicApiException expected) {
+            assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+            assertErrorSummary("The entity with id: unexisting was not found", expected.getHttpResponse());
+        }
+    }
+    
+    @Test
+    public void testGetProcessInstances() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        final ProcessInfo process1 = startAdhocProcess(requestContext, null);
+        final ProcessInfo process2 = startAdhocProcess(requestContext, null);
+        final ProcessInfo process3 = startAdhocProcess(requestContext, null);
+        
+        try
+        {
+            ProcessesClient processesClient = publicApiClient.processesClient();
+            Map<String, String> paramMap = new HashMap<String, String>();
+            ListResponse<ProcessInfo> processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(3, processList.getList().size());
+            
+            Map<String, ProcessInfo> processMap = new HashMap<String, ProcessInfo>();
+            for (ProcessInfo processRest : processList.getList())
+            {
+                processMap.put(processRest.getId(), processRest);
+            }
+            
+            assertTrue(processMap.containsKey(process1.getId()));
+            assertTrue(processMap.containsKey(process2.getId()));
+            assertTrue(processMap.containsKey(process3.getId()));
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(processDefinitionKey = 'activitiAdhoc')");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(3, processList.getList().size());
+            assertNull(processList.getList().get(0).getProcessVariables());
+
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(processDefinitionKey = 'activitiAdhoc2')");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(0, processList.getList().size());
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(processDefinitionKey = 'activitiAdhoc')");
+            paramMap.put("maxItems", "2");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(2, processList.getList().size());
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(processDefinitionKey = 'activitiAdhoc')");
+            paramMap.put("maxItems", "3");
+            paramMap.put("skipCount", "1");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(2, processList.getList().size());
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(processDefinitionKey = 'activitiAdhoc')");
+            paramMap.put("maxItems", "5");
+            paramMap.put("skipCount", "2");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(1, processList.getList().size());
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(processDefinitionKey = 'activitiAdhoc')");
+            paramMap.put("maxItems", "5");
+            paramMap.put("skipCount", "5");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(0, processList.getList().size());
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(status = 'completed')");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(0, processList.getList().size());
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(status = 'any')");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(3, processList.getList().size());
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(status = 'active')");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(3, processList.getList().size());
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(status = 'active2')");
+            try 
+            {
+                processList = processesClient.getProcesses(paramMap);
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                // expected exception
+            }
+            
+            // Test the variable where-clause
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(variables/bpm_priority = 'd_int 1')");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(3, processList.getList().size());
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(variables/bpm_priority = 'd:int 1')");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(3, processList.getList().size());
+
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(variables/bpm_priority > 'd:int 1')");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(0, processList.getList().size());
+
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(variables/bpm_priority >= 'd:int 1')");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(3, processList.getList().size());
+
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(variables/bpm_priority < 'd:int 5')");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(3, processList.getList().size());
+
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(variables/bpm_priority <= 'd:int 4')");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(3, processList.getList().size());
+
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(variables/bpm_priority = 'd_int 5')");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(0, processList.getList().size());
+            
+            // test with date variable
+            Calendar dateCal = Calendar.getInstance();
+            Map<String, Object> variablesToSet = new HashMap<String, Object>();
+            variablesToSet.put("testVarDate", dateCal.getTime());
+            
+            activitiProcessEngine.getRuntimeService().setVariables(process1.getId(), variablesToSet);
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(variables/testVarDate = 'd_datetime " + ISO8601DateFormat.format(dateCal.getTime())+ "')");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(1, processList.getList().size());
+            
+            // include process variables as well
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(includeVariables=true)");
+            paramMap.put("maxItems", "1");
+            paramMap.put("skipCount", "0");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            
+            assertEquals(1, processList.getList().size());
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(processDefinitionKey = 'activitiAdhoc' AND includeVariables = true)");
+            paramMap.put("maxItems", "1");
+            paramMap.put("skipCount", "0");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            
+            assertEquals(1, processList.getList().size());
+            
+            ProcessInfo processInfo = processList.getList().get(0);
+            assertNotNull(processInfo.getProcessVariables());
+            
+            boolean foundDescription = false;
+            boolean foundAssignee = false;
+            for (Variable variable : processInfo.getProcessVariables()) 
+            {
+                if ("bpm_description".equals(variable.getName())) 
+                {
+                    assertEquals("d:text", variable.getType());
+                    assertNull(variable.getValue());
+                    foundDescription = true;
+                }
+                else if ("bpm_assignee".equals(variable.getName())) 
+                {
+                    assertEquals("cm:person", variable.getType());
+                    assertEquals(requestContext.getRunAsUser(), variable.getValue());
+                    foundAssignee = true;
+                }
+            }
+            
+            assertTrue(foundDescription);
+            assertTrue(foundAssignee);
+            
+            // include process variables with paging
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(processDefinitionKey = 'activitiAdhoc' AND includeVariables = true)");
+            paramMap.put("maxItems", "3");
+            paramMap.put("skipCount", "1");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            
+            assertEquals(2, processList.getList().size());
+            
+            processInfo = processList.getList().get(0);
+            assertNotNull(processInfo.getProcessVariables());
+            
+            foundDescription = false;
+            foundAssignee = false;
+            for (Variable variable : processInfo.getProcessVariables()) 
+            {
+                if ("bpm_description".equals(variable.getName())) 
+                {
+                    assertEquals("d:text", variable.getType());
+                    assertNull(variable.getValue());
+                    foundDescription = true;
+                }
+                else if ("bpm_assignee".equals(variable.getName())) 
+                {
+                    assertEquals("cm:person", variable.getType());
+                    assertEquals(requestContext.getRunAsUser(), variable.getValue());
+                    foundAssignee = true;
+                }
+            }
+            
+            assertTrue(foundDescription);
+            assertTrue(foundAssignee);
+            
+            // include process variables with paging outside boundaries
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(processDefinitionKey = 'activitiAdhoc' AND includeVariables = true)");
+            paramMap.put("maxItems", "4");
+            paramMap.put("skipCount", "5");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            
+            assertEquals(0, processList.getList().size());
+            
+        } 
+        finally
+        {
+            cleanupProcessInstance(process1.getId(), process2.getId(), process3.getId());
+        }
+    }
+    
+    @Test
+    public void testGetProcessInstancesWithDifferentProcessDefs() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        final ProcessInfo process1 = startAdhocProcess(requestContext, null);
+        final ProcessInfo process2 = startParallelReviewProcess(requestContext);
+        final ProcessInfo process3 = startReviewPooledProcess(requestContext);
+        
+        try
+        {
+            ProcessesClient processesClient = publicApiClient.processesClient();
+            Map<String, String> paramMap = new HashMap<String, String>();
+            ListResponse<ProcessInfo> processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(3, processList.getList().size());
+            
+            // include process variables as well
+            paramMap = new HashMap<String, String>();
+            paramMap.put("where", "(includeVariables=true)");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            
+            assertEquals(3, processList.getList().size());
+        } 
+        finally
+        {
+            cleanupProcessInstance(process1.getId(), process2.getId(), process3.getId());
+        }
+    }
+    
+    @Test
+    public void testGetProcessInstancesWithPaging() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        final ProcessInfo process1 = startAdhocProcess(requestContext, null);
+        final ProcessInfo process2 = startAdhocProcess(requestContext, null);
+        final ProcessInfo process3 = startAdhocProcess(requestContext, null);
+        
+        try
+        {
+            ProcessesClient processesClient = publicApiClient.processesClient();
+            
+            // Test with existing processDefinitionId
+            Map<String, String> params = new HashMap<String, String>();
+            params.put("processDefinitionId", process1.getProcessDefinitionId());
+            JSONObject processListJSONObject = processesClient.getProcessesJSON(params);
+            assertNotNull(processListJSONObject);
+            JSONObject paginationJSON = (JSONObject) processListJSONObject.get("pagination");
+            assertEquals(3l, paginationJSON.get("count"));
+            assertEquals(3l, paginationJSON.get("totalItems"));
+            assertEquals(0l, paginationJSON.get("skipCount"));
+            assertEquals(false, paginationJSON.get("hasMoreItems"));
+            JSONArray jsonEntries = (JSONArray) processListJSONObject.get("entries");
+            assertEquals(3, jsonEntries.size());
+            
+            // Test with existing processDefinitionId and max items
+            params.clear();
+            params.put("maxItems", "2");
+            params.put("processDefinitionId",  process1.getProcessDefinitionId());
+            processListJSONObject = processesClient.getProcessesJSON(params);
+            assertNotNull(processListJSONObject);
+            paginationJSON = (JSONObject) processListJSONObject.get("pagination");
+            assertEquals(2l, paginationJSON.get("count"));
+            assertEquals(3l, paginationJSON.get("totalItems"));
+            assertEquals(0l, paginationJSON.get("skipCount"));
+            assertEquals(true, paginationJSON.get("hasMoreItems"));
+            jsonEntries = (JSONArray) processListJSONObject.get("entries");
+            assertEquals(2, jsonEntries.size());
+            
+            // Test with existing processDefinitionId and skip count
+            params.clear();
+            params.put("skipCount", "1");
+            params.put("processDefinitionId", process1.getProcessDefinitionId());
+            processListJSONObject = processesClient.getProcessesJSON(params);
+            assertNotNull(processListJSONObject);
+            paginationJSON = (JSONObject) processListJSONObject.get("pagination");
+            assertEquals(2l, paginationJSON.get("count"));
+            assertEquals(3l, paginationJSON.get("totalItems"));
+            assertEquals(1l, paginationJSON.get("skipCount"));
+
+            // MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
+            // Repository must answer 'false' for 'hasMoreItems' since the total number of items is 3, 2 items are requested and 1 is skipped
+            assertEquals(false, paginationJSON.get("hasMoreItems"));
+            jsonEntries = (JSONArray) processListJSONObject.get("entries");
+            assertEquals(2, jsonEntries.size());
+            
+            // Test with existing processDefinitionId and max items and skip count
+            params.clear();
+            params.put("maxItems", "3");
+            params.put("skipCount", "2");
+            params.put("processDefinitionId", process1.getProcessDefinitionId());
+            processListJSONObject = processesClient.getProcessesJSON(params);
+            assertNotNull(processListJSONObject);
+            paginationJSON = (JSONObject) processListJSONObject.get("pagination");
+            assertEquals(1l, paginationJSON.get("count"));
+            assertEquals(3l, paginationJSON.get("totalItems"));
+            assertEquals(2l, paginationJSON.get("skipCount"));
+
+            // MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
+            // Repository must answer 'false' for 'hasMoreItems' since the total number of items is 3 and 2 items are skipped
+            assertEquals(false, paginationJSON.get("hasMoreItems"));
+            jsonEntries = (JSONArray) processListJSONObject.get("entries");
+            assertEquals(1, jsonEntries.size());
+        } 
+        finally
+        {
+            cleanupProcessInstance(process1.getId(), process2.getId(), process3.getId());
+        }
+    }
+    
+    @Test
+    public void testGetProcessInstancesWithSorting() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        final ProcessInfo process1 = startAdhocProcess(requestContext, null, "akey");
+        final ProcessInfo process2 = startAdhocProcess(requestContext, null, "bkey");
+        final ProcessInfo process3 = startAdhocProcess(requestContext, null, "aakey");
+        
+        try
+        {
+            // sort on business key ascending
+            ProcessesClient processesClient = publicApiClient.processesClient();
+            Map<String, String> paramMap = new HashMap<String, String>();
+            paramMap.put("orderBy", "businessKey ASC");
+            ListResponse<ProcessInfo> processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(3, processList.getList().size());
+            
+            assertEquals(process3.getId(), processList.getList().get(0).getId());
+            assertEquals(process1.getId(), processList.getList().get(1).getId());
+            assertEquals(process2.getId(), processList.getList().get(2).getId());
+            
+            // sort on business key descending
+            paramMap.put("orderBy", "businessKey DESC");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+            assertEquals(3, processList.getList().size());
+            
+            assertEquals(process2.getId(), processList.getList().get(0).getId());
+            assertEquals(process1.getId(), processList.getList().get(1).getId());
+            assertEquals(process3.getId(), processList.getList().get(2).getId());
+
+            paramMap.put("orderBy", "startedAt ASC");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+
+            paramMap.put("orderBy", "endedAt ASC");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+
+            paramMap.put("orderBy", "durationInMillis ASC");
+            processList = processesClient.getProcesses(paramMap);
+            assertNotNull(processList);
+
+            // sort on more than 1.
+            paramMap.put("orderBy", "startedAt, endedAt");
+            try
+            {
+                processList = processesClient.getProcesses(paramMap);
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), e.getHttpResponse().getStatusCode());
+            }
+
+            // sort on non existing key
+            paramMap.put("orderBy", "businessKey2 ASC");
+            try 
+            {
+                processList = processesClient.getProcesses(paramMap);
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), e.getHttpResponse().getStatusCode());
+            }
+
+            // sort on non existing sort order
+            try
+            {
+                
+                paramMap.put("orderBy", "businessKey ASC2");
+                processList = processesClient.getProcesses(paramMap);
+                fail("forbidden expected");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), e.getHttpResponse().getStatusCode());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(process1.getId(), process2.getId(), process3.getId());
+        }
+    }
+    
+    @Test
+    public void testGetProcessTasks() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        final RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+        
+        TestNetwork anotherNetwork = getOtherNetwork(requestContext.getNetworkId());
+        tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + anotherNetwork.getId();
+        final RequestContext otherContext = new RequestContext(anotherNetwork.getId(), tenantAdmin);
+        
+        String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        RequestContext otherPersonContext = new RequestContext(requestContext.getNetworkId(), otherPerson);
+        
+        final ProcessInfo process1 = startAdhocProcess(requestContext, null);
+        
+        try
+        {
+            ProcessesClient processesClient = publicApiClient.processesClient();
+            Map<String, String> paramMap = new HashMap<String, String>();
+            JSONObject tasksJSON = processesClient.getTasks(process1.getId(), paramMap);
+            assertNotNull(tasksJSON);
+            JSONArray entriesJSON = (JSONArray) tasksJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 1);
+            JSONObject taskJSONObject = (JSONObject) ((JSONObject) entriesJSON.get(0)).get("entry");
+            assertNotNull(taskJSONObject.get("id"));
+            assertEquals(process1.getId(), taskJSONObject.get("processId"));
+            assertEquals(process1.getProcessDefinitionId(), taskJSONObject.get("processDefinitionId"));
+            assertEquals("adhocTask", taskJSONObject.get("activityDefinitionId"));
+            assertEquals("Adhoc Task", taskJSONObject.get("name"));
+            assertEquals(requestContext.getRunAsUser(), taskJSONObject.get("assignee"));
+            assertEquals(2l, taskJSONObject.get("priority"));
+            assertEquals("wf:adhocTask", taskJSONObject.get("formResourceKey"));
+            assertNull(taskJSONObject.get("endedAt"));
+            assertNull(taskJSONObject.get("durationInMs"));
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("status", "active");
+            tasksJSON = processesClient.getTasks(process1.getId(), paramMap);
+            assertNotNull(tasksJSON);
+            entriesJSON = (JSONArray) tasksJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 1);
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("status", "completed");
+            tasksJSON = processesClient.getTasks(process1.getId(), paramMap);
+            assertNotNull(tasksJSON);
+            entriesJSON = (JSONArray) tasksJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 0);
+            
+            paramMap = new HashMap<String, String>();
+            try {
+                processesClient.getTasks("fakeid", paramMap);
+                fail("Exception expected");
+            } catch(PublicApiException expected) {
+                assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("The entity with id: fakeid was not found", expected.getHttpResponse());
+            }
+            
+            // get tasks with admin from the same tenant as the process initiator
+            publicApiClient.setRequestContext(adminContext);
+            paramMap = new HashMap<String, String>();
+            tasksJSON = processesClient.getTasks(process1.getId(), paramMap);
+            assertNotNull(tasksJSON);
+            entriesJSON = (JSONArray) tasksJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 1);
+            
+            // get tasks with admin from another tenant as the process initiator
+            publicApiClient.setRequestContext(otherContext);
+            paramMap = new HashMap<String, String>();
+            try
+            {
+                tasksJSON = processesClient.getTasks(process1.getId(), paramMap);
+                fail("forbidden expected");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), e.getHttpResponse().getStatusCode());
+            }
+            
+            // get task with other not-involved person
+            publicApiClient.setRequestContext(otherPersonContext);
+            paramMap = new HashMap<String, String>();
+            try
+            {
+                tasksJSON = processesClient.getTasks(process1.getId(), paramMap);
+                fail("forbidden expected");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), e.getHttpResponse().getStatusCode());
+            }
+            
+            // involve other person and get task
+            final Task task = activitiProcessEngine.getTaskService().createTaskQuery().
+                    processInstanceId(process1.getId())
+                    .singleResult();
+            
+            activitiProcessEngine.getTaskService().addCandidateUser(task.getId(), otherPersonContext.getRunAsUser());
+            
+            publicApiClient.setRequestContext(otherPersonContext);
+            paramMap = new HashMap<String, String>();
+            tasksJSON = processesClient.getTasks(process1.getId(), paramMap);
+            assertNotNull(tasksJSON);
+            entriesJSON = (JSONArray) tasksJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 1);
+            
+            // complete task and get tasks
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    activitiProcessEngine.getTaskService().complete(task.getId());
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            
+            publicApiClient.setRequestContext(requestContext);
+            paramMap = new HashMap<String, String>();
+            paramMap.put("status", "any");
+            tasksJSON = processesClient.getTasks(process1.getId(), paramMap);
+            assertNotNull(tasksJSON);
+            entriesJSON = (JSONArray) tasksJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 2);
+            
+            publicApiClient.setRequestContext(otherPersonContext);
+            paramMap = new HashMap<String, String>();
+            paramMap.put("status", "any");
+            tasksJSON = processesClient.getTasks(process1.getId(), paramMap);
+            assertNotNull(tasksJSON);
+            entriesJSON = (JSONArray) tasksJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 2);
+            
+        }
+        finally
+        {
+            cleanupProcessInstance(process1.getId());
+        }
+    }
+    
+    @Test
+    public void testGetProcessActivities() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        final RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+        
+        TestNetwork anotherNetwork = getOtherNetwork(requestContext.getNetworkId());
+        tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + anotherNetwork.getId();
+        final RequestContext otherContext = new RequestContext(anotherNetwork.getId(), tenantAdmin);
+        
+        final ProcessInfo process1 = startAdhocProcess(requestContext, null);
+        
+        try
+        {
+            ProcessesClient processesClient = publicApiClient.processesClient();
+            Map<String, String> paramMap = new HashMap<String, String>();
+            JSONObject activitiesJSON = processesClient.getActivities(process1.getId(), paramMap);
+            assertNotNull(activitiesJSON);
+            JSONArray entriesJSON = (JSONArray) activitiesJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 2);
+            
+            Map<String, JSONObject> activitiesMap = new HashMap<String, JSONObject>();
+            for (Object entry : entriesJSON) {
+                JSONObject jsonEntry = (JSONObject) entry;
+                JSONObject activityJSONObject = (JSONObject) jsonEntry.get("entry");
+                activitiesMap.put((String) activityJSONObject.get("activityDefinitionId"), activityJSONObject);
+            }
+            
+            JSONObject activityJSONObject = activitiesMap.get("start");
+            assertNotNull(activityJSONObject);
+            assertNotNull(activityJSONObject.get("id"));
+            assertEquals("start", activityJSONObject.get("activityDefinitionId"));
+            assertNull(activityJSONObject.get("activityDefinitionName"));
+            assertEquals("startEvent", activityJSONObject.get("activityDefinitionType"));
+            assertNotNull(activityJSONObject.get("startedAt"));
+            assertNotNull(activityJSONObject.get("endedAt"));
+            assertNotNull(activityJSONObject.get("durationInMs"));
+            
+            activityJSONObject = activitiesMap.get("adhocTask");
+            assertNotNull(activityJSONObject);
+            assertNotNull(activityJSONObject.get("id"));
+            assertEquals("adhocTask", activityJSONObject.get("activityDefinitionId"));
+            assertEquals("Adhoc Task", activityJSONObject.get("activityDefinitionName"));
+            assertEquals("userTask", activityJSONObject.get("activityDefinitionType"));
+            assertNotNull(activityJSONObject.get("startedAt"));
+            assertNull(activityJSONObject.get("endedAt"));
+            assertNull(activityJSONObject.get("durationInMs"));
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("status", "active");
+            activitiesJSON = processesClient.getActivities(process1.getId(), paramMap);
+            assertNotNull(activitiesJSON);
+            entriesJSON = (JSONArray) activitiesJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 1);
+            
+            paramMap = new HashMap<String, String>();
+            paramMap.put("status", "completed");
+            activitiesJSON = processesClient.getActivities(process1.getId(), paramMap);
+            assertNotNull(activitiesJSON);
+            entriesJSON = (JSONArray) activitiesJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 1);
+            
+            paramMap = new HashMap<String, String>();
+            try {
+                processesClient.getActivities("fakeid", paramMap);
+                fail("Exception expected");
+            } catch(PublicApiException expected) {
+                assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("The entity with id: fakeid was not found", expected.getHttpResponse());
+            }
+            
+            // get activities with admin from the same tenant as the process initiator
+            publicApiClient.setRequestContext(adminContext);
+            paramMap = new HashMap<String, String>();
+            activitiesJSON = processesClient.getActivities(process1.getId(), paramMap);
+            assertNotNull(activitiesJSON);
+            entriesJSON = (JSONArray) activitiesJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 2);
+            
+            // get tasks with admin from another tenant as the process initiator
+            publicApiClient.setRequestContext(otherContext);
+            paramMap = new HashMap<String, String>();
+            try
+            {
+                processesClient.getActivities(process1.getId(), paramMap);
+                fail("forbidden expected");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), e.getHttpResponse().getStatusCode());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(process1.getId());
+        }
+    }
+    
+    @Test
+    public void getProcessImage() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        final ProcessInfo processRest = startAdhocProcess(requestContext, null);
+        HttpResponse response = publicApiClient.processesClient().getImage(processRest.getId());
+        assertEquals(200, response.getStatusCode());
+        cleanupProcessInstance(processRest.getId());
+        try
+        {
+            response = publicApiClient.processesClient().getImage("fakeId");
+            fail("Exception expected");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(404, e.getHttpResponse().getStatusCode());
+        }
+    }
+    
+    @Test
+    public void testMNT12382() throws Exception
+    {
+        currentNetwork = getTestFixture().getRandomNetwork();
+        TestPerson initiator = currentNetwork.getPeople().get(0);
+        RequestContext requestContext = new RequestContext(currentNetwork.getId(), initiator.getId());
+        publicApiClient.setRequestContext(requestContext);
+        ProcessInfo processInfo = startReviewPooledProcess(requestContext);
+
+        final List<TestPerson> persons = transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<List<TestPerson>>()
+        {
+            @SuppressWarnings("synthetic-access")
+            public List<TestPerson> execute() throws Throwable
+            {
+                ArrayList<TestPerson> persons = new ArrayList<TestPerson>();
+                persons.add(currentNetwork.createUser(new PersonInfo("Maxim0", "Bobyleu0", "maxim0.bobyleu0", "password", null, "skype", "location", "telephone", "mob", "instant", "google")));
+                persons.add(currentNetwork.createUser(new PersonInfo("Maxim1", "Bobyleu1", "maxim1.bobyleu1", "password", null, "skype", "location", "telephone", "mob", "instant", "google")));
+                persons.add(currentNetwork.createUser(new PersonInfo("Maxim2", "Bobyleu2", "maxim2.bobyleu2", "password", null, "skype", "location", "telephone", "mob", "instant", "google")));
+                return persons;
+            }
+        }, false, true);
+
+        final MemberOfSite memberOfSite = currentNetwork.getSiteMemberships(initiator.getId()).get(0);
+        
+        // startReviewPooledProcess() uses initiator's site id and role name for construct bpm_groupAssignee, thus we need appropriate things for created users
+        transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+        {
+            public Void execute() throws Throwable
+            {
+                TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+                {
+                    @Override
+                    public Void doWork() throws Exception
+                    {
+                        TestSite initiatorSite = (TestSite) memberOfSite.getSite();
+                        initiatorSite.inviteToSite(persons.get(0).getId(), memberOfSite.getRole());
+                        initiatorSite.inviteToSite(persons.get(1).getId(), memberOfSite.getRole());
+                        // this user wouldn't be in group
+                        initiatorSite.inviteToSite(persons.get(2).getId(), SiteRole.SiteConsumer == memberOfSite.getRole() ? SiteRole.SiteCollaborator : SiteRole.SiteConsumer);
+                        return null;
+                    }
+                }, AuthenticationUtil.getAdminUserName(), currentNetwork.getId());
+
+                return null;
+            }
+        }, false, true);
+
+        String processId = processInfo.getId();
+
+        // getting process items by workflow initiator
+        ProcessesClient processesClient = publicApiClient.processesClient();
+        JSONObject initiatorItems = processesClient.findProcessItems(processId);
+
+        // getting unclaimed process items by user in group
+        requestContext = new RequestContext(currentNetwork.getId(), persons.get(0).getId());
+        publicApiClient.setRequestContext(requestContext);
+        JSONObject items1 = processesClient.findProcessItems(processId);
+        assertEquals(initiatorItems.toJSONString(), items1.toJSONString());
+
+        // getting unclaimed process items by user not in group
+        requestContext = new RequestContext(currentNetwork.getId(), persons.get(2).getId());
+        publicApiClient.setRequestContext(requestContext);
+        try
+        {
+            JSONObject items2 = processesClient.findProcessItems(processId);
+            fail("User not from group should not see items.");
+        }
+        catch (PublicApiException e)
+        {
+            // expected
+            assertEquals(403, e.getHttpResponse().getStatusCode());
+        }
+
+        // claim task
+        TaskService taskService = activitiProcessEngine.getTaskService();
+        Task task = taskService.createTaskQuery().processInstanceId(processId).singleResult();
+        TestPerson assignee = persons.get(1);
+        taskService.setAssignee(task.getId(), assignee.getId());
+
+        // getting claimed process items by assignee
+        requestContext = new RequestContext(currentNetwork.getId(), assignee.getId());
+        publicApiClient.setRequestContext(requestContext);
+        JSONObject items3 = processesClient.findProcessItems(processId);
+        assertEquals(initiatorItems.toJSONString(), items3.toJSONString());
+
+        // getting claimed process items by user in group
+        requestContext = new RequestContext(currentNetwork.getId(), persons.get(0).getId());
+        publicApiClient.setRequestContext(requestContext);
+        try
+        {
+            JSONObject items4 = processesClient.findProcessItems(processId);
+            fail("User from group should not see items for claimed task by another user.");
+        }
+        catch (PublicApiException e)
+        {
+            // expected
+            assertEquals(403, e.getHttpResponse().getStatusCode());
+        }
+        finally
+        {
+            cleanupProcessInstance(processId);
+        }
+    }
+
+    @Test
+    public void testGetProcessItems() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        NodeRef[] docNodeRefs = createTestDocuments(requestContext);
+        final ProcessInfo processRest = startAdhocProcess(requestContext, docNodeRefs);
+        assertNotNull(processRest);
+        
+        final String newProcessInstanceId = processRest.getId();
+        ProcessesClient processesClient = publicApiClient.processesClient();
+        JSONObject itemsJSON = processesClient.findProcessItems(newProcessInstanceId);
+        assertNotNull(itemsJSON);
+        JSONArray entriesJSON = (JSONArray) itemsJSON.get("entries");
+        assertNotNull(entriesJSON);
+        assertTrue(entriesJSON.size() == 2);
+        boolean doc1Found = false;
+        boolean doc2Found = false;
+        for (Object entryObject : entriesJSON)
+        {
+            JSONObject entryObjectJSON = (JSONObject) entryObject;
+            JSONObject entryJSON = (JSONObject) entryObjectJSON.get("entry");
+            if (entryJSON.get("name").equals("Test Doc1")) {
+                doc1Found = true;
+                assertEquals(docNodeRefs[0].getId(), entryJSON.get("id"));
+                assertEquals("Test Doc1", entryJSON.get("name"));
+                assertEquals("Test Doc1 Title", entryJSON.get("title"));
+                assertEquals("Test Doc1 Description", entryJSON.get("description"));
+                assertNotNull(entryJSON.get("createdAt"));
+                assertEquals(requestContext.getRunAsUser(), entryJSON.get("createdBy"));
+                assertNotNull(entryJSON.get("modifiedAt"));
+                assertEquals(requestContext.getRunAsUser(), entryJSON.get("modifiedBy"));
+                assertNotNull(entryJSON.get("size"));
+                assertNotNull(entryJSON.get("mimeType"));
+            } else {
+                doc2Found = true;
+                assertEquals(docNodeRefs[1].getId(), entryJSON.get("id"));
+                assertEquals("Test Doc2", entryJSON.get("name"));
+                assertEquals("Test Doc2 Title", entryJSON.get("title"));
+                assertEquals("Test Doc2 Description", entryJSON.get("description"));
+                assertNotNull(entryJSON.get("createdAt"));
+                assertEquals(requestContext.getRunAsUser(), entryJSON.get("createdBy"));
+                assertNotNull(entryJSON.get("modifiedAt"));
+                assertEquals(requestContext.getRunAsUser(), entryJSON.get("modifiedBy"));
+                assertNotNull(entryJSON.get("size"));
+                assertNotNull(entryJSON.get("mimeType"));
+            }
+        }
+        assertTrue(doc1Found);
+        assertTrue(doc2Found);
+        
+        cleanupProcessInstance(processRest.getId());
+        
+        try
+        {
+            processesClient.findProcessItems("fakeid");
+            fail("Exception expected");
+        }
+        catch (PublicApiException e)
+        {
+            assertEquals(404, e.getHttpResponse().getStatusCode());
+        }
+    }
+    
+    @Test
+    public void testGetProcessItem() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        NodeRef[] docNodeRefs = createTestDocuments(requestContext);
+        final ProcessInfo processRest = startAdhocProcess(requestContext, docNodeRefs);
+        assertNotNull(processRest);
+        
+        final String newProcessInstanceId = processRest.getId();
+        ProcessesClient processesClient = publicApiClient.processesClient();
+        JSONObject itemJSON = processesClient.findProcessItem(newProcessInstanceId, docNodeRefs[0].getId());
+        assertNotNull(itemJSON);
+        
+        assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+        assertEquals("Test Doc1", itemJSON.get("name"));
+        assertEquals("Test Doc1 Title", itemJSON.get("title"));
+        assertEquals("Test Doc1 Description", itemJSON.get("description"));
+        assertNotNull(itemJSON.get("createdAt"));
+        assertEquals(requestContext.getRunAsUser(), itemJSON.get("createdBy"));
+        assertNotNull(itemJSON.get("modifiedAt"));
+        assertEquals(requestContext.getRunAsUser(), itemJSON.get("modifiedBy"));
+        assertNotNull(itemJSON.get("size"));
+        assertNotNull(itemJSON.get("mimeType"));
+        
+        cleanupProcessInstance(processRest.getId());
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testAddProcessItem() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        NodeRef[] docNodeRefs = createTestDocuments(requestContext);
+        final ProcessInfo processRest = startAdhocProcess(requestContext, null);
+        try
+        {
+            assertNotNull(processRest);
+            
+            final String newProcessInstanceId = processRest.getId();
+            ProcessesClient processesClient = publicApiClient.processesClient();
+            
+            JSONObject createItemObject = new JSONObject();
+            createItemObject.put("id", docNodeRefs[0].getId());
+            
+            // Add the item
+            processesClient.addProcessItem(newProcessInstanceId, createItemObject.toJSONString());
+            
+            // Fetching the item
+            JSONObject itemJSON = publicApiClient.processesClient().findProcessItem(newProcessInstanceId, docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            assertEquals("Test Doc1", itemJSON.get("name"));
+            assertEquals("Test Doc1 Title", itemJSON.get("title"));
+            assertEquals("Test Doc1 Description", itemJSON.get("description"));
+            assertNotNull(itemJSON.get("createdAt"));
+            assertEquals(requestContext.getRunAsUser(), itemJSON.get("createdBy"));
+            assertNotNull(itemJSON.get("modifiedAt"));
+            assertEquals(requestContext.getRunAsUser(), itemJSON.get("modifiedBy"));
+            assertNotNull(itemJSON.get("size"));
+            assertNotNull(itemJSON.get("mimeType"));
+            
+            // add non existing item
+            createItemObject = new JSONObject();
+            createItemObject.put("id", "blablabla");
+            
+            // Add the item
+            try
+            {
+                processesClient.addProcessItem(newProcessInstanceId, createItemObject.toJSONString());
+                fail("not found expected");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.NOT_FOUND.value(), e.getHttpResponse().getStatusCode());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processRest.getId());
+        }
+    }
+    
+    @Test
+    public void testDeleteProcessItem() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        NodeRef[] docNodeRefs = createTestDocuments(requestContext);
+        final ProcessInfo processRest = startAdhocProcess(requestContext, docNodeRefs);
+        try
+        {
+            assertNotNull(processRest);
+            
+            final String newProcessInstanceId = processRest.getId();
+            ProcessesClient processesClient = publicApiClient.processesClient();
+            
+            // Delete the item
+            processesClient.deleteProcessItem(newProcessInstanceId, docNodeRefs[0].getId());
+            
+            // Fetching the item should result in 404
+            try 
+            {
+                publicApiClient.processesClient().findProcessItem(newProcessInstanceId, docNodeRefs[0].getId());
+                fail("Exception expected");
+            } 
+            catch(PublicApiException expected) 
+            {
+                assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("The entity with id: " + docNodeRefs[0].getId() + " was not found", expected.getHttpResponse());
+            }
+            
+            // Deleting the item again should give an error
+            try
+            {
+                processesClient.deleteProcessItem(newProcessInstanceId, docNodeRefs[0].getId());
+                fail("Expected not found");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.NOT_FOUND.value(), e.getHttpResponse().getStatusCode());
+            }
+            
+        }
+        finally
+        {
+            cleanupProcessInstance(processRest.getId());
+        }
+    }
+    
+    @Test
+    public void testDeleteProcessItemWithAdmin() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        final RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+        publicApiClient.setRequestContext(adminContext);
+        
+        // start process with admin user
+        NodeRef[] docNodeRefs = createTestDocuments(adminContext);
+        final ProcessInfo processRest = startAdhocProcess(adminContext, docNodeRefs);
+        try
+        {
+            assertNotNull(processRest);
+            
+            final String newProcessInstanceId = processRest.getId();
+            ProcessesClient processesClient = publicApiClient.processesClient();
+            
+            // Delete the item
+            processesClient.deleteProcessItem(newProcessInstanceId, docNodeRefs[0].getId());
+            
+            // Fetching the item should result in 404
+            try 
+            {
+                publicApiClient.processesClient().findProcessItem(newProcessInstanceId, docNodeRefs[0].getId());
+                fail("Exception expected");
+            } 
+            catch(PublicApiException expected) 
+            {
+                assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("The entity with id: " + docNodeRefs[0].getId() + " was not found", expected.getHttpResponse());
+            }
+            
+        }
+        finally
+        {
+            cleanupProcessInstance(processRest.getId());
+        }
+        
+        // start process with default user and delete item with admin
+        publicApiClient.setRequestContext(requestContext);
+        docNodeRefs = createTestDocuments(requestContext);
+        final ProcessInfo processRestDefaultUser = startAdhocProcess(requestContext, docNodeRefs);
+        try
+        {
+            assertNotNull(processRestDefaultUser);
+            
+            publicApiClient.setRequestContext(adminContext);
+            final String newProcessInstanceId = processRestDefaultUser.getId();
+            ProcessesClient processesClient = publicApiClient.processesClient();
+            
+            // Delete the item
+            processesClient.deleteProcessItem(newProcessInstanceId, docNodeRefs[0].getId());
+            
+            // Fetching the item should result in 404
+            try 
+            {
+                publicApiClient.processesClient().findProcessItem(newProcessInstanceId, docNodeRefs[0].getId());
+                fail("Exception expected");
+            } 
+            catch(PublicApiException expected) 
+            {
+                assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("The entity with id: " + docNodeRefs[0].getId() + " was not found", expected.getHttpResponse());
+            }
+            
+        }
+        finally
+        {
+            cleanupProcessInstance(processRestDefaultUser.getId());
+        }
+    }
+    
+    @Test
+    public void testGetProcessVariables() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+        
+        TestNetwork anotherNetwork = getOtherNetwork(requestContext.getNetworkId());
+        tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + anotherNetwork.getId();
+        final RequestContext otherContext = new RequestContext(anotherNetwork.getId(), tenantAdmin);
+        
+        ProcessInfo processRest = startAdhocProcess(requestContext, null);
+        
+        try
+        {
+            assertNotNull(processRest);
+            String processInstanceId = processRest.getId();
+            
+            JSONObject processvariables = publicApiClient.processesClient().getProcessvariables(processInstanceId);
+            assertNotNull(processvariables);
+            validateVariablesResponse(processvariables, requestContext.getRunAsUser());
+            
+            // get variables with admin from same network
+            publicApiClient.setRequestContext(adminContext);
+            processvariables = publicApiClient.processesClient().getProcessvariables(processInstanceId);
+            assertNotNull(processvariables);
+            validateVariablesResponse(processvariables, requestContext.getRunAsUser());
+            
+            // get variables with admin from other network
+            publicApiClient.setRequestContext(otherContext);
+            try
+            {
+                processvariables = publicApiClient.processesClient().getProcessvariables(processInstanceId);
+                fail("forbidden expected");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), e.getHttpResponse().getStatusCode());
+            }
+            
+            // get variables with non existing process id
+            try
+            {
+                processvariables = publicApiClient.processesClient().getProcessvariables("fakeid");
+                fail("not found expected");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.NOT_FOUND.value(), e.getHttpResponse().getStatusCode());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processRest.getId());
+        }
+    }
+    
+    protected void validateVariablesResponse(JSONObject processvariables, String user) 
+    {
+        // Add process variables to map for easy lookup
+        Map<String, JSONObject> variablesByName = new HashMap<String, JSONObject>();
+        JSONObject entry = null;
+        JSONArray entries = (JSONArray) processvariables.get("entries");
+        assertNotNull(entries);
+        for(int i=0; i<entries.size(); i++) 
+        {
+            entry = (JSONObject) entries.get(i);
+            assertNotNull(entry);
+            entry = (JSONObject) entry.get("entry");
+            assertNotNull(entry);
+            variablesByName.put((String) entry.get("name"), entry);
+        }
+        
+        // Test some well-known variables
+        JSONObject variable = variablesByName.get("bpm_description");
+        assertNotNull(variable);
+        assertEquals("d:text", variable.get("type"));
+        assertNull(variable.get("value"));
+        
+        variable = variablesByName.get("bpm_percentComplete");
+        assertNotNull(variable);
+        assertEquals("d:int", variable.get("type"));
+        assertEquals(0L, variable.get("value"));
+        
+        variable = variablesByName.get("bpm_sendEMailNotifications");
+        assertNotNull(variable);
+        assertEquals("d:boolean", variable.get("type"));
+        assertEquals(Boolean.FALSE, variable.get("value"));
+        
+        variable = variablesByName.get("bpm_package");
+        assertNotNull(variable);
+        assertEquals("bpm:workflowPackage", variable.get("type"));
+        assertNotNull(variable.get("value"));
+        
+        variable = variablesByName.get("bpm_assignee");
+        assertNotNull(variable);
+        assertEquals("cm:person", variable.get("type"));
+        assertEquals(user, variable.get("value"));
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testCreateVariablesPresentInModel() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        ProcessInfo processInstance = startAdhocProcess(requestContext, null);
+        try
+        {
+            JSONArray variablesArray = new JSONArray();
+            JSONObject variableBody = new JSONObject();
+            variableBody.put("name", "bpm_percentComplete");
+            variableBody.put("value", 20);
+            variableBody.put("type", "d:int");
+            variablesArray.add(variableBody);
+            variableBody = new JSONObject();
+            variableBody.put("name", "bpm_workflowPriority");
+            variableBody.put("value", 50);
+            variableBody.put("type", "d:int");
+            variablesArray.add(variableBody);
+            
+            JSONObject result = publicApiClient.processesClient().createVariables(processInstance.getId(), variablesArray);
+            assertNotNull(result);
+            JSONObject resultObject = (JSONObject) result.get("list");
+            JSONArray resultList = (JSONArray) resultObject.get("entries");
+            assertEquals(2, resultList.size());
+            JSONObject firstResultObject = (JSONObject) ((JSONObject) resultList.get(0)).get("entry");
+            assertEquals("bpm_percentComplete", firstResultObject.get("name"));
+            assertEquals(20L, firstResultObject.get("value"));
+            assertEquals("d:int", firstResultObject.get("type"));
+            assertEquals(20, activitiProcessEngine.getRuntimeService().getVariable(processInstance.getId(), "bpm_percentComplete"));
+            
+            JSONObject secondResultObject = (JSONObject) ((JSONObject) resultList.get(1)).get("entry");
+            assertEquals("bpm_workflowPriority", secondResultObject.get("name"));
+            assertEquals(50L, secondResultObject.get("value"));
+            assertEquals("d:int", secondResultObject.get("type"));
+            assertEquals(50, activitiProcessEngine.getRuntimeService().getVariable(processInstance.getId(), "bpm_workflowPriority"));
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance.getId());
+        }
+    }
+    
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testUpdateProcessVariables() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+        
+        ProcessInfo processRest = startAdhocProcess(requestContext, null);
+        
+        try
+        {
+            assertNotNull(processRest);
+            String processId = processRest.getId();
+            
+            // Update an unexisting variable, creates a new one using explicit typing (d:long)
+            JSONObject variableJson = new JSONObject();
+            variableJson.put("name", "newVariable");
+            variableJson.put("value", 1234L);
+            variableJson.put("type", "d:long");
+            
+            JSONObject resultEntry = publicApiClient.processesClient().updateVariable(processId, "newVariable", variableJson);
+            assertNotNull(resultEntry);
+            JSONObject result = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("newVariable", result.get("name"));
+            assertEquals(1234L, result.get("value"));
+            assertEquals("d:long", result.get("type"));
+            assertEquals(1234L, activitiProcessEngine.getRuntimeService().getVariable(processId, "newVariable"));
+            
+            // Update an unexisting variable, creates a new one using no tying
+            variableJson = new JSONObject();
+            variableJson.put("name", "stringVariable");
+            variableJson.put("value", "This is a string value");
+            
+            resultEntry = publicApiClient.processesClient().updateVariable(processId, "stringVariable", variableJson);
+            assertNotNull(resultEntry);
+            result = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("stringVariable", result.get("name"));
+            assertEquals("This is a string value", result.get("value"));
+            assertEquals("d:text", result.get("type"));
+            assertEquals("This is a string value", activitiProcessEngine.getRuntimeService().getVariable(processId, "stringVariable"));
+            
+            // Update an existing variable, creates a new one using explicit typing (d:long)
+            variableJson = new JSONObject();
+            variableJson.put("name", "newVariable");
+            variableJson.put("value", 4567L);
+            variableJson.put("type", "d:long");
+            
+            resultEntry = publicApiClient.processesClient().updateVariable(processId, "newVariable", variableJson);
+            assertNotNull(resultEntry);
+            result = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("newVariable", result.get("name"));
+            assertEquals(4567L, result.get("value"));
+            assertEquals("d:long", result.get("type"));
+            assertEquals(4567L, activitiProcessEngine.getRuntimeService().getVariable(processId, "newVariable"));
+            
+            JSONObject processvariables = publicApiClient.processesClient().getProcessvariables(processId);
+            assertNotNull(processvariables);
+            JSONObject newVariableEntry = null;
+            JSONArray entries = (JSONArray) processvariables.get("entries");
+            assertNotNull(entries);
+            for(int i=0; i<entries.size(); i++) 
+            {
+                JSONObject entry = (JSONObject) entries.get(i);
+                assertNotNull(entry);
+                entry = (JSONObject) entry.get("entry");
+                assertNotNull(entry);
+                if ("newVariable".equals((String) entry.get("name"))) {
+                    newVariableEntry = entry;
+                }
+            }
+            
+            assertNotNull(newVariableEntry);
+            assertEquals(4567L, newVariableEntry.get("value"));
+            
+            // Update an existing variable, creates a new one using no explicit typing 
+            variableJson = new JSONObject();
+            variableJson.put("name", "stringVariable");
+            variableJson.put("value", "Updated string variable");
+            
+            resultEntry = publicApiClient.processesClient().updateVariable(processId, "stringVariable", variableJson);
+            assertNotNull(resultEntry);
+            result = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("stringVariable", result.get("name"));
+            assertEquals("Updated string variable", result.get("value"));
+            assertEquals("d:text", result.get("type"));
+            assertEquals("Updated string variable", activitiProcessEngine.getRuntimeService().getVariable(processId, "stringVariable"));
+            
+            // Update an unexisting variable with wrong variable data
+            variableJson = new JSONObject();
+            variableJson.put("name", "newLongVariable");
+            variableJson.put("value", "text");
+            variableJson.put("type", "d:long");
+            
+            try
+            {
+                publicApiClient.processesClient().updateVariable(processId, "newLongVariable", variableJson);
+                fail("Expected server error exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), e.getHttpResponse().getStatusCode());
+            }
+            
+            // Update an unexisting variable with no variable data
+            variableJson = new JSONObject();
+            variableJson.put("name", "newNoValueVariable");
+            variableJson.put("type", "d:datetime");
+            
+            resultEntry = publicApiClient.processesClient().updateVariable(processId, "newNoValueVariable", variableJson);
+            assertNotNull(resultEntry);
+            result = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("newNoValueVariable", result.get("name"));
+            assertNotNull(result.get("value"));
+            assertEquals("d:datetime", result.get("type"));
+            assertNotNull(activitiProcessEngine.getRuntimeService().getVariable(processId, "newNoValueVariable"));
+            
+            // Test update variable with admin user
+            publicApiClient.setRequestContext(adminContext);
+            variableJson = new JSONObject();
+            variableJson.put("name", "newVariable");
+            variableJson.put("value", 1234L);
+            variableJson.put("type", "d:long");
+            
+            resultEntry = publicApiClient.processesClient().updateVariable(processId, "newVariable", variableJson);
+            assertNotNull(resultEntry);
+            result = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("newVariable", result.get("name"));
+            assertEquals(1234L, result.get("value"));
+            assertEquals("d:long", result.get("type"));
+            assertEquals(1234L, activitiProcessEngine.getRuntimeService().getVariable(processId, "newVariable"));
+        }
+        finally
+        {
+            cleanupProcessInstance(processRest.getId());
+        }
+        
+        // test update variable with admin user that also started the process instance
+        
+        processRest = startAdhocProcess(adminContext, null);
+        
+        try
+        {
+            assertNotNull(processRest);
+            String processId = processRest.getId();
+            
+            // Update an unexisting variable, creates a new one using explicit typing (d:long)
+            JSONObject variableJson = new JSONObject();
+            variableJson.put("name", "newVariable");
+            variableJson.put("value", 1234L);
+            variableJson.put("type", "d:long");
+            
+            JSONObject resultEntry = publicApiClient.processesClient().updateVariable(processId, "newVariable", variableJson);
+            assertNotNull(resultEntry);
+            JSONObject result = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("newVariable", result.get("name"));
+            assertEquals(1234L, result.get("value"));
+            assertEquals("d:long", result.get("type"));
+            assertEquals(1234L, activitiProcessEngine.getRuntimeService().getVariable(processId, "newVariable"));
+            
+            // test update variable with user not involved in the process instance
+            publicApiClient.setRequestContext(requestContext);
+            try
+            {
+                publicApiClient.processesClient().updateVariable(processId, "newVariable", variableJson);
+                fail("Expected forbidden exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), e.getHttpResponse().getStatusCode());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processRest.getId());
+        }
+    }
+    
+    // MNT-17918
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testUpdateInitiatorAndGetProcessVariables() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+
+        ProcessInfo processRest = startAdhocProcess(requestContext, null);
+
+        try
+        {
+            assertNotNull(processRest);
+            String processId = processRest.getId();
+
+            // Update initiator variable to "admin"
+            JSONObject variableJson = new JSONObject();
+            variableJson.put("name", "initiator");
+            variableJson.put("type", "d:noderef");
+
+            NodeRef personRef = TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
+            {
+                @Override
+                public NodeRef doWork() throws Exception
+                {
+                    String assignee = adminContext.getRunAsUser();
+                    NodeRef personRef = getPersonNodeRef(assignee).getNodeRef();
+                    variableJson.put("value", personRef.toString());
+                    return personRef;
+                }
+            }, adminContext.getRunAsUser(), adminContext.getNetworkId());
+
+            JSONObject resultEntry = publicApiClient.processesClient().updateVariable(processId, "initiator", variableJson);
+            assertNotNull(resultEntry);
+            final JSONObject updateInitiatorResult = (JSONObject) resultEntry.get("entry");
+
+            assertEquals("initiator", updateInitiatorResult.get("name"));
+            assertEquals("d:noderef", updateInitiatorResult.get("type"));
+            assertNotNull("Variable value should be returned", updateInitiatorResult.get("value"));
+            assertEquals(personRef.getId(), updateInitiatorResult.get("value"));
+
+            // Get process variables after updating "initiator"
+            publicApiClient.setRequestContext(adminContext);
+            resultEntry = publicApiClient.processesClient().getProcessvariables(processId);
+            assertNotNull(resultEntry);
+            validateVariableField(resultEntry, "initiator", adminContext.getRunAsUser());
+        }
+        finally
+        {
+            cleanupProcessInstance(processRest.getId());
+        }
+    }
+
+    protected void validateVariableField(JSONObject processvariables, String name, String value)
+    {
+        JSONObject entry = null;
+        JSONArray entries = (JSONArray) processvariables.get("entries");
+        assertNotNull(entries);
+
+        int i = 0;
+        do
+        {
+            entry = (JSONObject) ((JSONObject) entries.get(i)).get("entry");
+            i++;
+        } while (!entry.containsValue(name) && i < entries.size());
+
+        // Test variable value
+        assertEquals(value, entry.get("value"));
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testUpdateProcessVariableWithWrongType() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        ProcessInfo processRest = startParallelReviewProcess(requestContext);
+        
+        try
+        {
+            assertNotNull(processRest);
+            String processId = processRest.getId();
+            
+            // Update an existing variable with wrong type
+            JSONObject variableJson = new JSONObject();
+            variableJson.put("name", "wf_requiredApprovePercent");
+            variableJson.put("value", 55.99);
+            variableJson.put("type", "d:double");
+            
+            try 
+            {
+                publicApiClient.processesClient().updateVariable(processId, "wf_requiredApprovePercent", variableJson);
+                fail("Exception expected");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), e.getHttpResponse().getStatusCode());
+            }
+            
+            variableJson = new JSONObject();
+            variableJson.put("name", "wf_requiredApprovePercent");
+            variableJson.put("value", 55.99);
+            variableJson.put("type", "d:int");
+            
+            JSONObject resultEntry = publicApiClient.processesClient().updateVariable(processId, "wf_requiredApprovePercent", variableJson);
+            assertNotNull(resultEntry);
+            JSONObject result = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("wf_requiredApprovePercent", result.get("name"));
+            assertEquals(55l, result.get("value"));
+            assertEquals("d:int", result.get("type"));
+            assertEquals(55, activitiProcessEngine.getRuntimeService().getVariable(processId, "wf_requiredApprovePercent"));
+            
+            JSONObject processvariables = publicApiClient.processesClient().getProcessvariables(processId);
+            assertNotNull(processvariables);
+            
+            // Add process variables to map for easy lookup
+            Map<String, JSONObject> variablesByName = new HashMap<String, JSONObject>();
+            JSONObject entry = null;
+            JSONArray entries = (JSONArray) processvariables.get("entries");
+            assertNotNull(entries);
+            for(int i=0; i<entries.size(); i++) 
+            {
+                entry = (JSONObject) entries.get(i);
+                assertNotNull(entry);
+                entry = (JSONObject) entry.get("entry");
+                assertNotNull(entry);
+                variablesByName.put((String) entry.get("name"), entry);
+            }
+            
+            JSONObject approvePercentObject = variablesByName.get("wf_requiredApprovePercent");
+            assertNotNull(approvePercentObject);
+            assertEquals(55l, approvePercentObject.get("value"));
+            assertEquals("d:int", approvePercentObject.get("type"));
+            
+            // set a new variable
+            variableJson = new JSONObject();
+            variableJson.put("name", "testVariable");
+            variableJson.put("value", "text");
+            variableJson.put("type", "d:text");
+            
+            resultEntry = publicApiClient.processesClient().updateVariable(processId, "testVariable", variableJson);
+            assertNotNull(resultEntry);
+            result = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("testVariable", result.get("name"));
+            assertEquals("text", result.get("value"));
+            assertEquals("d:text", result.get("type"));
+            assertEquals("text", activitiProcessEngine.getRuntimeService().getVariable(processId, "testVariable"));
+            
+            // change the variable value and type (should be working because no content model type)
+            variableJson = new JSONObject();
+            variableJson.put("name", "testVariable");
+            variableJson.put("value", 123);
+            variableJson.put("type", "d:int");
+            
+            resultEntry = publicApiClient.processesClient().updateVariable(processId, "testVariable", variableJson);
+            assertNotNull(resultEntry);
+            result = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("testVariable", result.get("name"));
+            assertEquals(123l, result.get("value"));
+            assertEquals("d:int", result.get("type"));
+            assertEquals(123, activitiProcessEngine.getRuntimeService().getVariable(processId, "testVariable"));
+            
+            // change the variable value for a list of noderefs (bpm_assignees)
+            final JSONObject updateAssigneesJson = new JSONObject();
+            updateAssigneesJson.put("name", "bpm_assignees");
+            updateAssigneesJson.put("type", "d:noderef");
+            
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    JSONArray assigneeArray = new JSONArray();
+                    assigneeArray.add(requestContext.getRunAsUser());
+                    updateAssigneesJson.put("value", assigneeArray);
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            
+            resultEntry = publicApiClient.processesClient().updateVariable(processId, "bpm_assignees", updateAssigneesJson);
+            assertNotNull(resultEntry);
+            final JSONObject updateAssigneeResult = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("bpm_assignees", updateAssigneeResult.get("name"));
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    JSONArray assigneeArray = (JSONArray) updateAssigneeResult.get("value");
+                    assertNotNull(assigneeArray);
+                    assertEquals(1, assigneeArray.size());
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            
+            assertEquals("d:noderef", updateAssigneeResult.get("type"));
+            
+            // update the bpm_assignees with a single entry, should result in an error
+            final JSONObject updateAssigneeJson = new JSONObject();
+            updateAssigneeJson.put("name", "bpm_assignees");
+            updateAssigneeJson.put("type", "d:noderef");
+            
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    updateAssigneeJson.put("value", requestContext.getRunAsUser());
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            
+            try 
+            {
+                publicApiClient.processesClient().updateVariable(processId, "bpm_assignees", updateAssigneeJson);
+                fail("Exception expected");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), e.getHttpResponse().getStatusCode());
+            }
+            
+            // change the variable value with a non-existing person
+            variableJson = new JSONObject();
+            variableJson.put("name", "bpm_assignees");
+            JSONArray assigneeArray = new JSONArray();
+            assigneeArray.add("nonExistingPerson");
+            variableJson.put("value", assigneeArray);
+            variableJson.put("type", "d:noderef");
+            
+            try 
+            {
+                publicApiClient.processesClient().updateVariable(processId, "bpm_assignees", variableJson);
+                fail("Exception expected");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), e.getHttpResponse().getStatusCode());
+            }
+            
+        }
+        finally
+        {
+            cleanupProcessInstance(processRest.getId());
+        }
+    }
+    
+    @Test
+    public void testDeleteProcessVariable() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        ProcessInfo processRest = startAdhocProcess(requestContext, null);
+        
+        try
+        {
+            assertNotNull(processRest);
+            String processId = processRest.getId();
+            
+            // Create a variable to be deleted
+            activitiProcessEngine.getRuntimeService().setVariable(processId, "deleteMe", "This is a string");
+            
+            // Delete variable
+            publicApiClient.processesClient().deleteVariable(processId, "deleteMe");
+            assertFalse(activitiProcessEngine.getRuntimeService().hasVariable(processId, "deleteMe"));
+            
+            // Deleting again should fail with 404, as variable doesn't exist anymore
+            try {
+                publicApiClient.processesClient().deleteVariable(processId, "deleteMe");
+                fail("Exception expected");
+            } catch(PublicApiException expected) {
+                assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("The entity with id: deleteMe was not found", expected.getHttpResponse());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processRest.getId());
+        }
+    }
+    
+    
+    @Test
+    public void testDeleteProcessVariableUnexistingProcess() throws Exception
+    {
+        initApiClientWithTestUser();
+        
+        try 
+        {
+            publicApiClient.processesClient().deleteVariable("unexisting", "deleteMe");
+            fail("Exception expected");
+        } 
+        catch(PublicApiException expected) 
+        {
+            assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+            assertErrorSummary("The entity with id: unexisting was not found", expected.getHttpResponse());
+        }
+    }
+    
+    protected void completeAdhocTasks(String instanceId, RequestContext requestContext) 
+    {
+        final Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(instanceId).singleResult();
+        assertEquals(requestContext.getRunAsUser(), task.getAssignee());
+        
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                activitiProcessEngine.getTaskService().complete(task.getId());
+                return null;
+            }
+        }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+        
+        final Task task2 = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(instanceId).singleResult();
+        assertEquals(requestContext.getRunAsUser(), task2.getAssignee());
+        
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+        {
+            @Override
+            public Void doWork() throws Exception
+            {
+                activitiProcessEngine.getTaskService().complete(task2.getId());
+                return null;
+            }
+        }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+        
+        assertEquals(0, activitiProcessEngine.getRuntimeService().createProcessInstanceQuery().processInstanceId(instanceId).count());
+        cleanupProcessInstance(instanceId);
+    }
+    
+    protected void cleanupProcessInstance(String... processInstances)
+    {
+        // Clean up process-instance regardless of test success/failure
+        try 
+        {
+            for (String processInstanceId : processInstances)
+            {
+                // try catch because runtime process may not exist anymore
+                try 
+                {
+                    activitiProcessEngine.getRuntimeService().deleteProcessInstance(processInstanceId, null);
+                } 
+                catch(Exception e) 
+                {
+                    log("Error while cleaning up process instance", e);
+                }
+                activitiProcessEngine.getHistoryService().deleteHistoricProcessInstance(processInstanceId);
+            }
+        }
+        catch (Throwable t)
+        {
+            // Ignore error during cleanup
+            log("Error while cleaning up process instance", t);
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ProcessesParser.java b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ProcessesParser.java
new file mode 100644
index 00000000000..d1946d07c3f
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/ProcessesParser.java
@@ -0,0 +1,80 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tests;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.rest.workflow.api.model.ProcessInfo;
+import org.alfresco.rest.workflow.api.model.Variable;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class ProcessesParser extends ListParser<ProcessInfo>
+{
+    public static ProcessesParser INSTANCE = new ProcessesParser();
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public ProcessInfo parseEntry(JSONObject entry)
+    {
+        ProcessInfo processesRest = new ProcessInfo();
+        processesRest.setId((String) entry.get("id"));
+        processesRest.setProcessDefinitionId((String) entry.get("processDefinitionId"));
+        processesRest.setProcessDefinitionKey((String) entry.get("processDefinitionKey"));
+        processesRest.setStartedAt(WorkflowApiClient.parseDate(entry, "startedAt"));
+        processesRest.setEndedAt(WorkflowApiClient.parseDate(entry, "endedAt"));
+        processesRest.setDurationInMs((Long) entry.get("durationInMs"));
+        processesRest.setDeleteReason((String) entry.get("deleteReason"));
+        processesRest.setBusinessKey((String) entry.get("businessKey"));
+        processesRest.setSuperProcessInstanceId((String) entry.get("superProcessInstanceId"));
+        processesRest.setStartActivityId((String) entry.get("startActivityId"));
+        processesRest.setStartUserId((String) entry.get("startUserId"));
+        processesRest.setEndActivityId((String) entry.get("endActivityId"));
+        processesRest.setCompleted((Boolean) entry.get("completed"));
+        processesRest.setVariables((Map<String,Object>) entry.get("variables"));
+        processesRest.setItems((Set<String>) entry.get("item"));
+        
+        if (entry.get("processVariables") != null) {
+            List<Variable> processVariables = new ArrayList<Variable>();
+            JSONArray variables = (JSONArray) entry.get("processVariables");
+            for (int i = 0; i < variables.size(); i++) 
+            {
+                JSONObject variableJSON = (JSONObject) variables.get(i);
+                Variable variable = new Variable();
+                variable.setName((String) variableJSON.get("name"));
+                variable.setType((String) variableJSON.get("type"));
+                variable.setValue(variableJSON.get("value"));
+                processVariables.add(variable);
+            }
+            processesRest.setProcessVariables(processVariables);
+        }
+        
+        return processesRest;
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java
new file mode 100644
index 00000000000..6a1b55d9f00
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java
@@ -0,0 +1,4267 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tests;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import org.activiti.engine.TaskService;
+import org.activiti.engine.history.HistoricTaskInstance;
+import org.activiti.engine.runtime.Clock;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.DelegationState;
+import org.activiti.engine.task.IdentityLinkType;
+import org.activiti.engine.task.Task;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.workflow.WorkflowConstants;
+import org.alfresco.repo.workflow.activiti.ActivitiConstants;
+import org.alfresco.repo.workflow.activiti.ActivitiScriptNode;
+import org.alfresco.rest.api.tests.PersonInfo;
+import org.alfresco.rest.api.tests.RepoService.TestNetwork;
+import org.alfresco.rest.api.tests.RepoService.TestPerson;
+import org.alfresco.rest.api.tests.RepoService.TestSite;
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.MemberOfSite;
+import org.alfresco.rest.api.tests.client.data.SiteRole;
+import org.alfresco.rest.workflow.api.model.ProcessInfo;
+import org.alfresco.rest.workflow.api.tests.WorkflowApiClient.TasksClient;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.util.ISO8601DateFormat;
+import org.apache.commons.lang3.StringUtils;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.springframework.http.HttpStatus;
+
+/**
+ * Task related Rest api tests using http client to communicate with the rest apis in the repository.
+ * 
+ * @author Tijs Rademakers
+ * @author Frederik Heremans
+ *
+ */
+@Category(OwnJVMTestsCategory.class)
+public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
+{   
+    @Test
+    public void testGetTaskById() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        RequestContext otherContext = new RequestContext(requestContext.getNetworkId(), otherPerson);
+
+        // Alter current engine date
+        Calendar createdCal = Calendar.getInstance();
+        createdCal.set(Calendar.MILLISECOND, 0);
+        Clock actiClock = activitiProcessEngine.getProcessEngineConfiguration().getClock();
+        actiClock.setCurrentTime(createdCal.getTime());
+           
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        
+        try
+        {
+            final Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            
+            // Set some task-properties not set by process-definition
+            Calendar dueDateCal = Calendar.getInstance();
+            dueDateCal.set(Calendar.MILLISECOND, 0);
+            dueDateCal.add(Calendar.DAY_OF_YEAR, 1);
+            Date dueDate = dueDateCal.getTime();
+            
+            task.setDescription("This is a test description");
+            task.setAssignee(requestContext.getRunAsUser());
+            task.setOwner("john");
+            task.setDueDate(dueDate);
+            activitiProcessEngine.getTaskService().saveTask(task);
+
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Check resulting task
+            JSONObject taskJSONObject = tasksClient.findTaskById(task.getId());
+            assertNotNull(taskJSONObject);
+            assertEquals(task.getId(), taskJSONObject.get("id"));
+            assertEquals(processInstance.getId(), taskJSONObject.get("processId"));
+            assertEquals(processInstance.getProcessDefinitionId(), taskJSONObject.get("processDefinitionId"));
+            assertEquals("adhocTask", taskJSONObject.get("activityDefinitionId"));
+            assertEquals("Adhoc Task", taskJSONObject.get("name"));
+            assertEquals("This is a test description", taskJSONObject.get("description"));
+            assertEquals(requestContext.getRunAsUser(), taskJSONObject.get("assignee"));
+            assertEquals("john", taskJSONObject.get("owner"));
+            assertEquals(dueDate, parseDate(taskJSONObject, "dueAt"));
+            assertEquals(createdCal.getTime(), parseDate(taskJSONObject, "startedAt"));
+            assertEquals(2l, taskJSONObject.get("priority"));
+            assertEquals("wf:adhocTask", taskJSONObject.get("formResourceKey"));
+            assertNull(taskJSONObject.get("endedAt"));
+            assertNull(taskJSONObject.get("durationInMs"));
+            
+            // get unclaimed task
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), null);
+            taskJSONObject = tasksClient.findTaskById(task.getId());
+            assertNotNull(taskJSONObject);
+            assertEquals(task.getId(), taskJSONObject.get("id"));
+            
+            // get delegated task
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), requestContext.getRunAsUser());
+            activitiProcessEngine.getTaskService().setOwner(task.getId(), requestContext.getRunAsUser());
+            activitiProcessEngine.getTaskService().delegateTask(task.getId(), otherContext.getRunAsUser());
+            taskJSONObject = tasksClient.findTaskById(task.getId());
+            assertNotNull(taskJSONObject);
+            assertEquals(task.getId(), taskJSONObject.get("id"));
+            assertEquals(otherContext.getRunAsUser(), taskJSONObject.get("assignee"));
+            assertEquals(requestContext.getRunAsUser(), taskJSONObject.get("owner"));
+            
+            // get resolved task
+            activitiProcessEngine.getTaskService().resolveTask(task.getId());
+            taskJSONObject = tasksClient.findTaskById(task.getId());
+            assertNotNull(taskJSONObject);
+            assertEquals(task.getId(), taskJSONObject.get("id"));
+            assertEquals(requestContext.getRunAsUser(), taskJSONObject.get("assignee"));
+            assertEquals(requestContext.getRunAsUser(), taskJSONObject.get("owner"));
+            
+            // get completed task
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    activitiProcessEngine.getTaskService().complete(task.getId());
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            taskJSONObject = tasksClient.findTaskById(task.getId());
+            assertNotNull(taskJSONObject);
+            assertEquals(task.getId(), taskJSONObject.get("id"));
+            assertEquals(requestContext.getRunAsUser(), taskJSONObject.get("assignee"));
+            assertEquals(requestContext.getRunAsUser(), taskJSONObject.get("owner"));
+            assertNotNull(taskJSONObject.get("endedAt"));
+            
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    public void testGetTaskByIdAuthorization() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String initiator = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        
+        // Start process by one user and try to access the task as the task assignee instead of the process
+        // initiator to see if the assignee is authorized to get the task
+        ProcessInstance processInstance = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Try accessing task when NOT involved in the task
+            try {
+                tasksClient.findTaskById(task.getId());
+                fail("Exception expected");
+            } catch(PublicApiException expected) {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+            
+            // Set assignee, task should be accessible now
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), requestContext.getRunAsUser());
+            JSONObject jsonObject = tasksClient.findTaskById(task.getId());
+            assertNotNull(jsonObject);
+            
+            // Fetching task as admin should be possible
+            String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+            publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+            jsonObject = tasksClient.findTaskById(task.getId());
+            assertNotNull(jsonObject);
+            
+            // Fetching the task as a admin from another tenant shouldn't be possible
+            TestNetwork anotherNetwork = getOtherNetwork(requestContext.getNetworkId());
+            tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + anotherNetwork.getId();
+            publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+            try {
+                tasksClient.findTaskById(task.getId());
+                fail("Exception expected");
+            } catch(PublicApiException expected) {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    
+    @Test
+    public void testGetUnexistingTaskById() throws Exception
+    {
+        initApiClientWithTestUser();
+        TasksClient tasksClient = publicApiClient.tasksClient();
+        try 
+        {
+            tasksClient.findTaskById("unexisting");
+            fail("Exception expected");
+        }
+        catch(PublicApiException expected)
+        {
+            assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+            assertErrorSummary("The entity with id: unexisting was not found", expected.getHttpResponse());
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testUpdateTask() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        RequestContext otherContext = new RequestContext(requestContext.getNetworkId(), otherPerson);
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+        
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        
+        try 
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+
+            TasksClient tasksClient = publicApiClient.tasksClient();
+
+            Calendar dueDateCal = Calendar.getInstance();
+            dueDateCal.set(Calendar.MILLISECOND, 0);
+            dueDateCal.add(Calendar.DAY_OF_YEAR, 1);
+            Date dueDate = dueDateCal.getTime();
+            
+            JSONObject taskBody = new JSONObject();
+            taskBody.put("name", "Updated name");
+            taskBody.put("description", "Updated description");
+            taskBody.put("dueAt", formatDate(dueDate));
+            taskBody.put("priority", 1234);
+            taskBody.put("assignee", "john");
+            taskBody.put("owner", "james");
+            
+            List<String> selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "name", "description", "dueAt", "priority", "assignee", "owner"}));
+            
+            JSONObject result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("Updated name", result.get("name"));
+            assertEquals("Updated description", result.get("description"));
+            assertEquals(1234, Integer.valueOf(result.get("priority").toString()).intValue());
+            assertEquals("john", result.get("assignee"));
+            assertEquals("james", result.get("owner"));
+            assertEquals(dueDate, parseDate(result, "dueAt"));
+            
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            assertEquals("Updated name", task.getName());
+            assertEquals("Updated description", task.getDescription());
+            assertEquals(1234, task.getPriority());
+            assertEquals("john", task.getAssignee());
+            assertEquals("james", task.getOwner());
+            assertEquals(dueDate, task.getDueDate());
+            
+            // update owner with admin user id
+            taskBody = new JSONObject();
+            taskBody.put("owner", adminContext.getRunAsUser());
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "owner"}));
+            
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals(adminContext.getRunAsUser(), result.get("owner"));
+            
+            // update owner with initiator user id
+            taskBody = new JSONObject();
+            taskBody.put("owner", requestContext.getRunAsUser());
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "owner"}));
+            
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals(requestContext.getRunAsUser(), result.get("owner"));
+            
+            // update owner with other user id
+            taskBody = new JSONObject();
+            taskBody.put("owner", otherContext.getRunAsUser());
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "owner"}));
+            
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals(otherContext.getRunAsUser(), result.get("owner"));
+            
+            // update due date to date more in the future
+            dueDateCal.add(Calendar.DAY_OF_YEAR, 1);
+            dueDate = dueDateCal.getTime();
+            
+            taskBody = new JSONObject();
+            taskBody.put("dueAt", formatDate(dueDate));
+            
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "dueAt" }));
+            
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals(dueDate, parseDate(result, "dueAt"));
+            
+            // update due date to date a day less in the future
+            dueDateCal.add(Calendar.DAY_OF_YEAR, -1);
+            dueDate = dueDateCal.getTime();
+            
+            taskBody = new JSONObject();
+            taskBody.put("dueAt", formatDate(dueDate));
+            
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "dueAt" }));
+            
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals(dueDate, parseDate(result, "dueAt"));
+            
+            // update due date to current time
+            dueDateCal = Calendar.getInstance();
+            dueDateCal.set(Calendar.MILLISECOND, 0);
+            dueDate = dueDateCal.getTime();
+            
+            taskBody = new JSONObject();
+            taskBody.put("dueAt", formatDate(dueDate));
+            
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "dueAt" }));
+            
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals(dueDate, parseDate(result, "dueAt"));
+            
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testUpdateTaskMnt13276() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        String initiatorId = requestContext.getRunAsUser();
+        ProcessInfo processInfo = startReviewPooledProcess(requestContext);
+        
+        // create test users
+        final List<TestPerson> persons = transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<List<TestPerson>>()
+        {
+            @SuppressWarnings("synthetic-access")
+            public List<TestPerson> execute() throws Throwable
+            {
+                ArrayList<TestPerson> persons = new ArrayList<TestPerson>();
+                String temp = "_" + System.currentTimeMillis();
+                persons.add(currentNetwork.createUser(new PersonInfo("user0", "user0", "user0" + temp, "password", null, "skype", "location", "telephone", "mob", "instant", "google")));
+                persons.add(currentNetwork.createUser(new PersonInfo("user1", "user1", "user1" + temp, "password", null, "skype", "location", "telephone", "mob", "instant", "google")));
+                persons.add(currentNetwork.createUser(new PersonInfo("user2", "user2", "user2" + temp, "password", null, "skype", "location", "telephone", "mob", "instant", "google")));
+                return persons;
+            }
+        }, false, true);
+
+        final MemberOfSite memberOfSite = currentNetwork.getSiteMemberships(initiatorId).get(0);
+
+        // startReviewPooledProcess() uses initiator's site id and role name for construct bpm_groupAssignee, thus we need appropriate things for created users
+        transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
+        {
+            public Void execute() throws Throwable
+            {
+                TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+                {
+                    @Override
+                    public Void doWork() throws Exception
+                    {
+                        TestSite initiatorSite = (TestSite) memberOfSite.getSite();
+                        initiatorSite.inviteToSite(persons.get(0).getId(), memberOfSite.getRole());
+                        initiatorSite.inviteToSite(persons.get(1).getId(), memberOfSite.getRole());
+                        // this user wouldn't be in group
+                        initiatorSite.inviteToSite(persons.get(2).getId(), SiteRole.SiteConsumer == memberOfSite.getRole() ? SiteRole.SiteCollaborator : SiteRole.SiteConsumer);
+                        return null;
+                    }
+                }, AuthenticationUtil.getAdminUserName(), currentNetwork.getId());
+                return null;
+            }
+        }, false, true);
+
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInfo.getId()).singleResult();
+            TasksClient tasksClient = publicApiClient.tasksClient();
+
+            // Updating the task by user in group
+            JSONObject taskBody = new JSONObject();
+            taskBody.put("name", "Updated name by user in group");
+            List<String> selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "name" }));
+            requestContext.setRunAsUser(persons.get(0).getId());
+            JSONObject result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("Updated name by user in group", result.get("name"));
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInfo.getId()).singleResult();
+            assertNotNull(task);
+            assertEquals("Updated name by user in group", task.getName());
+
+            // Updating the task by user not in group
+            try
+            {
+                taskBody.put("name", "Updated name by user not in group");
+                requestContext.setRunAsUser(persons.get(2).getId());
+                tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+                fail("User not from group should not see items.");
+            }
+            catch (PublicApiException expected)
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+            
+            // claim task
+            TaskService taskService = activitiProcessEngine.getTaskService();
+            task = taskService.createTaskQuery().processInstanceId(processInfo.getId()).singleResult();
+            taskService.setAssignee(task.getId(), persons.get(1).getId());
+            // Updating by user in group for claimed task by another user
+            try
+            {
+                taskBody = new JSONObject();
+                taskBody.put("name", "Updated name by user in group for claimed task");
+                selectedFields.addAll(Arrays.asList(new String[] { "name" }));
+                requestContext.setRunAsUser(persons.get(0).getId());
+                result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+                fail("User from group should not see items for claimed task by another user.");
+            }
+            catch (PublicApiException expected)
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processInfo.getId());
+        }
+    }
+
+   /* 
+    * Test association definition extraction from the dictionary as per MNT-11472.
+    *  
+    * We are going to test association definition extraction through dictionary, when one is not retrieved in context.
+    * Context doesn't contains all type definitions, because it requires entire history extraction of a process that causes performance implications.   
+    * Type definition extraction from the dictionary is quite fast and it doesn't affect performance.
+    * 
+    */
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testAssociationDefinitionExtraction() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        // The "wbpm:delegatee" custom association is defined in bpmDelegateeModel.xml. This association has "cm:person" target type.
+        final String delegatee = "wbpm_delegatee";
+        final String user = requestContext.getRunAsUser();
+        final String networkId = requestContext.getNetworkId();
+        
+        // Get person
+        final ActivitiScriptNode person = TenantUtil.runAsUserTenant(new TenantRunAsWork<ActivitiScriptNode>()
+        {
+            @Override
+            public ActivitiScriptNode doWork() throws Exception
+            {
+                return getPersonNodeRef(user);
+            }
+        }, user, networkId);
+        
+        // Start custom process instance
+        ProcessInstance processInstance = TenantUtil.runAsUserTenant(new TenantRunAsWork<ProcessInstance>()
+        {
+            @Override
+            public ProcessInstance doWork() throws Exception
+            {
+                deployProcessDefinition("workflow/testCustomDelegatee.bpmn20.xml");
+                String processDefinitionKey = "@" + networkId + "@myProcess";
+                Map<String, Object> variables = new HashMap<String, Object>();
+                variables.put("bpm_assignee", person);
+                variables.put("wf_notifyMe", Boolean.FALSE);
+                variables.put(WorkflowConstants.PROP_INITIATOR, person);
+                return activitiProcessEngine.getRuntimeService().startProcessInstanceByKey(processDefinitionKey, "myProcessKey", variables);
+            }
+        }, user, networkId);
+        
+        // Get task 
+        Task activeTask = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+        assertNotNull(activeTask);
+        try
+        {
+            TasksClient tasksClient = publicApiClient.tasksClient();
+
+            // Define the "wbpm_delegatee" variable for the taskDefine delegatee user name. POST request will be executed.
+            JSONArray variablesArray = new JSONArray();
+            JSONObject variableBody = new JSONObject();
+            variableBody.put("name", delegatee);
+            variableBody.put("value", user);
+            variableBody.put("scope", "local");
+            variablesArray.add(variableBody);
+
+            try
+            {
+                // Set variable for the task.
+                JSONObject response = tasksClient.createTaskVariables(activeTask.getId(), variablesArray);
+                assertNotNull(response);
+                JSONObject variable = (JSONObject) response.get("entry");
+                assertEquals(delegatee, variable.get("name"));
+                
+                // Check that d:noderef type was returned with appropriate nodeRef Id value. 
+                assertEquals("d:noderef", variable.get("type"));
+                assertEquals(person.getNodeRef().getId(), variable.get("value"));
+                
+                // Get process variables. GET request will be executed.
+                response = publicApiClient.processesClient().getProcessvariables(processInstance.getId());
+                assertNotNull(response);
+                assertTrue(delegatee + " variable was not set", response.toJSONString().contains(delegatee));
+                JSONArray entries = (JSONArray) response.get("entries");
+
+                // Find "wbpm_delegatee" variable.
+                for (Object entry : entries)
+                {
+                    variable = (JSONObject) ((JSONObject) entry).get("entry");
+                    if (variable.get("name").equals(delegatee))
+                    {
+                        // Check that type corresponds to the target class. 
+                        // It means that assoc type def was retrieved successfully from the dictionary.
+                        assertEquals("cm:person", variable.get("type"));
+                        // Value should be an actual user name.
+                        assertEquals(user, variable.get("value"));
+                    }
+                }
+            }
+            catch (PublicApiException ex)
+            {
+                fail("Unexpected result " + ex);
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testUpdateTaskAuthorization() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        String initiator = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        
+        ProcessInstance processInstance = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        try 
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Updating the task when NOT assignee/owner or initiator results in an error
+            JSONObject taskBody = new JSONObject();
+            taskBody.put("name", "Updated name");
+            List<String> selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "name" }));
+            try 
+            {
+                tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+            
+            // Set assignee to current user, update should succeed
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), requestContext.getRunAsUser());
+            taskBody.put("name", "Updated name by assignee");
+            
+            JSONObject result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("Updated name by assignee", result.get("name"));
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            assertEquals("Updated name by assignee", task.getName());
+            
+            // Set owner to current user, update should succeed
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), null);
+            activitiProcessEngine.getTaskService().setOwner(task.getId(), requestContext.getRunAsUser());
+            taskBody.put("name", "Updated name by owner");
+            
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("Updated name by owner", result.get("name"));
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            assertEquals("Updated name by owner", task.getName());
+            
+            // Update as process initiator
+            taskBody.put("name", "Updated name by initiator");
+            requestContext.setRunAsUser(initiator);
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("Updated name by initiator", result.get("name"));
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            assertEquals("Updated name by initiator", task.getName());
+            
+            // Update as administrator
+            String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+            publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+            
+            taskBody.put("name", "Updated name by admin");
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("Updated name by admin", result.get("name"));
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            assertEquals("Updated name by admin", task.getName());
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testUpdateUnexistingTask() throws Exception
+    {
+        initApiClientWithTestUser();
+        TasksClient tasksClient = publicApiClient.tasksClient();
+        try 
+        {
+            JSONObject taskBody = new JSONObject();
+            taskBody.put("name", "Updated name");
+            List<String> selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "name" }));
+            
+            tasksClient.updateTask("unexisting", taskBody, selectedFields);
+            fail("Exception expected");
+        }
+        catch (PublicApiException expected)
+        {
+            assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+            assertErrorSummary("The entity with id: unexisting was not found", expected.getHttpResponse());
+        }
+    }
+    
+    @Test
+    public void testUpdateTaskInvalidProperty() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Try updating an unexisting property
+            try 
+            {
+                JSONObject taskBody = new JSONObject();
+                List<String> selectedFields = new ArrayList<String>();
+                selectedFields.add("unexisting");
+                tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("The property selected for update does not exist for this resource: unexisting", expected.getHttpResponse());
+            }
+            
+            // Try updating a readonly-property
+            try 
+            {
+                JSONObject taskBody = new JSONObject();
+                List<String> selectedFields = new ArrayList<String>();
+                selectedFields.add("id");
+                tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("The property selected for update is read-only: id", expected.getHttpResponse());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testClaimTask() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        String initiator = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        
+        ProcessInstance processInstance = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        try 
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Claiming the task when NOT part of candidate-group results in an error
+            JSONObject taskBody = new JSONObject();
+            taskBody.put("state", "claimed");
+            List<String> selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "state", "assignee" }));
+            try 
+            {
+                tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+            
+            // Set candidate for task, but keep assignee
+            List<MemberOfSite> memberships = getTestFixture().getNetwork(requestContext.getNetworkId()).getSiteMemberships(requestContext.getRunAsUser());
+            assertTrue(memberships.size() > 0);
+            MemberOfSite memberOfSite = memberships.get(0);
+            String group = "GROUP_site_" + memberOfSite.getSiteId() + "_" + memberOfSite.getRole().name();
+            activitiProcessEngine.getTaskService().addCandidateGroup(task.getId(), group);
+            
+            // Claiming the task when part of candidate-group but another person has this task assigned results in conflict
+            try 
+            {
+                tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.CONFLICT.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("The task is already claimed by another user.", expected.getHttpResponse());
+            }
+            
+            // Claiming the task when part of candidate-group and NO assignee is currenlty set should work
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), null);
+            taskBody = new JSONObject();
+            taskBody.put("state", "claimed");
+            JSONObject result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertNotNull(result);
+            assertEquals(requestContext.getRunAsUser(), result.get("assignee"));
+            assertEquals(requestContext.getRunAsUser(), activitiProcessEngine.getTaskService().createTaskQuery().taskId(task.getId()).singleResult().getAssignee());
+            
+            // Re-claiming the same task with the current assignee shouldn't be a problem
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertNotNull(result);
+            assertEquals(requestContext.getRunAsUser(), result.get("assignee"));
+            assertEquals(requestContext.getRunAsUser(), activitiProcessEngine.getTaskService().createTaskQuery().taskId(task.getId()).singleResult().getAssignee());
+            
+            // Claiming as a candidateUser should also work
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), null);
+            activitiProcessEngine.getTaskService().deleteGroupIdentityLink(task.getId(), group, IdentityLinkType.CANDIDATE);
+            activitiProcessEngine.getTaskService().addCandidateUser(task.getId(), requestContext.getRunAsUser());
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertNotNull(result);
+            assertEquals(requestContext.getRunAsUser(), result.get("assignee"));
+            assertEquals(requestContext.getRunAsUser(), activitiProcessEngine.getTaskService().createTaskQuery().taskId(task.getId()).singleResult().getAssignee());
+            
+            // Claiming as a task owner should also work
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), null);
+            activitiProcessEngine.getTaskService().setOwner(task.getId(), requestContext.getRunAsUser());
+            activitiProcessEngine.getTaskService().deleteUserIdentityLink(task.getId(), requestContext.getRunAsUser(), IdentityLinkType.CANDIDATE);
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertNotNull(result);
+            assertEquals(requestContext.getRunAsUser(), result.get("assignee"));
+            assertEquals(requestContext.getRunAsUser(), activitiProcessEngine.getTaskService().createTaskQuery().taskId(task.getId()).singleResult().getAssignee());
+            
+            // Claiming as admin should work
+            String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+            publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+            
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), null);
+            activitiProcessEngine.getTaskService().deleteUserIdentityLink(task.getId(), requestContext.getRunAsUser(), IdentityLinkType.CANDIDATE);
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertNotNull(result);
+            assertEquals(tenantAdmin, result.get("assignee"));
+            assertEquals(tenantAdmin, activitiProcessEngine.getTaskService().createTaskQuery().taskId(task.getId()).singleResult().getAssignee());
+            
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testUnClaimTask() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        String user = requestContext.getRunAsUser();
+        String initiator = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        
+        ProcessInstance processInstance = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        try 
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Unclaiming the task when NOT assignee, owner, initiator or admin results in error
+            JSONObject taskBody = new JSONObject();
+            taskBody.put("state", "unclaimed");
+            List<String> selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "state" }));
+            try 
+            {
+                tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+            
+            // Unclaiming as process initiator
+            requestContext.setRunAsUser(initiator);
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), null);
+            JSONObject result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertNull(result.get("assignee"));
+            assertNull(activitiProcessEngine.getTaskService().createTaskQuery().taskId(task.getId()).singleResult().getAssignee());
+            
+            // Unclaiming as assignee
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), user);
+            requestContext.setRunAsUser(user);
+            assertNotNull(activitiProcessEngine.getTaskService().createTaskQuery().taskId(task.getId()).singleResult().getAssignee());
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertNull(result.get("assignee"));
+            assertNull(activitiProcessEngine.getTaskService().createTaskQuery().taskId(task.getId()).singleResult().getAssignee());
+            
+            // Unclaim as owner
+            activitiProcessEngine.getTaskService().setOwner(task.getId(), user);
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), initiator);
+            assertNotNull(activitiProcessEngine.getTaskService().createTaskQuery().taskId(task.getId()).singleResult().getAssignee());
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertNull(result.get("assignee"));
+            assertNull(activitiProcessEngine.getTaskService().createTaskQuery().taskId(task.getId()).singleResult().getAssignee());
+            
+            // Unclaim as admin
+            String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+            publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+            
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), initiator);
+            activitiProcessEngine.getTaskService().deleteUserIdentityLink(task.getId(), requestContext.getRunAsUser(), IdentityLinkType.CANDIDATE);
+            assertNotNull(activitiProcessEngine.getTaskService().createTaskQuery().taskId(task.getId()).singleResult().getAssignee());
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertNull(result.get("assignee"));
+            assertNull(activitiProcessEngine.getTaskService().createTaskQuery().taskId(task.getId()).singleResult().getAssignee());
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testCompleteTask() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        String user = requestContext.getRunAsUser();
+        String initiator = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        
+        ProcessInstance processCompleteAsAssignee = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        ProcessInstance processCompleteAsOwner = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        ProcessInstance processCompleteAsInitiator = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        ProcessInstance processCompleteAsAdmin = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        ProcessInstance processCompleteWithVariables = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        try 
+        {
+            Task asAssigneeTask = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processCompleteAsAssignee.getId()).singleResult();
+            Task asOwnerTask = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processCompleteAsOwner.getId()).singleResult();
+            Task asInitiatorTask = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processCompleteAsInitiator.getId()).singleResult();
+            Task asAdminTask = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processCompleteAsAdmin.getId()).singleResult();
+            Task withVariablesTask = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processCompleteWithVariables.getId()).singleResult();
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Unclaiming the task when NOT assignee, owner, initiator or admin results in error
+            JSONObject taskBody = new JSONObject();
+            taskBody.put("state", "completed");
+            List<String> selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "state" }));
+            try 
+            {
+                tasksClient.updateTask(asAssigneeTask.getId(), taskBody, selectedFields);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+            
+            // Completing as assignee initiator
+            activitiProcessEngine.getTaskService().setAssignee(asAssigneeTask.getId(), user);
+            JSONObject result = tasksClient.updateTask(asAssigneeTask.getId(), taskBody, selectedFields);
+            assertEquals("completed", result.get("state"));
+            assertNotNull(result.get("endedAt"));
+            assertNull(activitiProcessEngine.getTaskService().createTaskQuery().taskId(asAssigneeTask.getId()).singleResult());
+            
+            // Completing as process initiator
+            requestContext.setRunAsUser(initiator);
+            activitiProcessEngine.getTaskService().setAssignee(asInitiatorTask.getId(), null);
+            result = tasksClient.updateTask(asInitiatorTask.getId(), taskBody, selectedFields);
+            assertEquals("completed", result.get("state"));
+            assertNotNull(result.get("endedAt"));
+            assertNull(activitiProcessEngine.getTaskService().createTaskQuery().taskId(asInitiatorTask.getId()).singleResult());
+            
+            // Completing as owner
+            requestContext.setRunAsUser(user);
+            asOwnerTask.setOwner(user);
+            activitiProcessEngine.getTaskService().saveTask(asOwnerTask);
+            result = tasksClient.updateTask(asOwnerTask.getId(), taskBody, selectedFields);
+            assertEquals("completed", result.get("state"));
+            assertNotNull(result.get("endedAt"));
+            assertNull(activitiProcessEngine.getTaskService().createTaskQuery().taskId(asOwnerTask.getId()).singleResult());
+            
+            // Complete as admin
+            String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+            publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+            asAdminTask.setOwner(null);
+            activitiProcessEngine.getTaskService().saveTask(asAdminTask);
+            result = tasksClient.updateTask(asAdminTask.getId(), taskBody, selectedFields);
+            assertEquals("completed", result.get("state"));
+            assertNotNull(result.get("endedAt"));
+            assertNull(activitiProcessEngine.getTaskService().createTaskQuery().taskId(asAdminTask.getId()).singleResult());
+            
+            // Complete with variables
+            requestContext.setRunAsUser(initiator);
+            activitiProcessEngine.getTaskService().setAssignee(withVariablesTask.getId(), null);
+            
+            JSONArray variablesArray = new JSONArray();
+            JSONObject variableBody = new JSONObject();
+            variableBody.put("name", "newGlobalVariable");
+            variableBody.put("value", 1234);
+            variableBody.put("scope", "global");
+            variablesArray.add(variableBody);
+            variableBody = new JSONObject();
+            variableBody.put("name", "newLocalVariable");
+            variableBody.put("value", 5678);
+            variableBody.put("scope", "local");
+            variablesArray.add(variableBody);
+            
+            taskBody.put("variables", variablesArray);
+            selectedFields.add("variables");
+            result = tasksClient.updateTask(withVariablesTask.getId(), taskBody, selectedFields);
+            assertEquals("completed", result.get("state"));
+            assertNotNull(result.get("endedAt"));
+            assertNull(activitiProcessEngine.getTaskService().createTaskQuery().taskId(withVariablesTask.getId()).singleResult());
+            HistoricTaskInstance historyTask = activitiProcessEngine.getHistoryService().createHistoricTaskInstanceQuery()
+                    .taskId(withVariablesTask.getId())
+                    .includeProcessVariables()
+                    .includeTaskLocalVariables()
+                    .singleResult();
+            
+            assertEquals(1234, historyTask.getProcessVariables().get("newGlobalVariable"));
+            assertEquals(5678, historyTask.getTaskLocalVariables().get("newLocalVariable"));
+            assertNotNull("The outcome should not be null for completed task.", historyTask.getTaskLocalVariables().get("bpm_outcome"));
+            JSONObject variables = tasksClient.findTaskVariables(withVariablesTask.getId());
+            assertNotNull(variables);
+            JSONObject list = (JSONObject) variables.get("list");
+            assertNotNull(list);
+            JSONArray entries = (JSONArray) list.get("entries");
+            assertNotNull(entries);
+            
+            boolean foundGlobal = false;
+            boolean foundLocal = false;
+            for (Object entry : entries)
+            {
+                JSONObject variableObject = (JSONObject) ((JSONObject) entry).get("entry");
+                if ("newGlobalVariable".equals(variableObject.get("name")))
+                {
+                    assertEquals(1234L, variableObject.get("value"));
+                    foundGlobal = true;
+                }
+                else if ("newLocalVariable".equals(variableObject.get("name")))
+                {
+                    assertEquals(5678L, variableObject.get("value"));
+                    foundLocal = true;
+                }
+            }
+            
+            assertTrue(foundGlobal);
+            assertTrue(foundLocal);
+        }
+        finally
+        {
+            cleanupProcessInstance(processCompleteAsAssignee, processCompleteAsAdmin, processCompleteAsInitiator, 
+                    processCompleteAsOwner, processCompleteWithVariables);
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testDelegateTask() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        String user = requestContext.getRunAsUser();
+        String initiator = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        
+        ProcessInstance processInstance = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        try 
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Delegating as non-assignee/owner/initiator/admin should result in an error
+            JSONObject taskBody = new JSONObject();
+            taskBody.put("state", "delegated");
+            taskBody.put("assignee", initiator);
+            List<String> selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "state",  "assignee"}));
+            try 
+            {
+                tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+            
+            // Delegating (as assignee) and not passing in an asisgnee should result in an error
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), user);
+            taskBody = new JSONObject();
+            taskBody.put("state", "delegated");
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "state" }));
+            try 
+            {
+                tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("When delegating a task, assignee should be selected and provided in the request.", expected.getHttpResponse());
+            }
+            
+            // Delegating as assignee
+            taskBody.put("state", "delegated");
+            taskBody.put("assignee", initiator);
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "state", "assignee" }));
+            assertNull(task.getDelegationState());
+            JSONObject result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("delegated", result.get("state"));
+            assertEquals(initiator, result.get("assignee"));
+            assertEquals(requestContext.getRunAsUser(), result.get("owner"));
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertEquals(DelegationState.PENDING, task.getDelegationState());
+            assertEquals(initiator, task.getAssignee());
+            assertEquals(requestContext.getRunAsUser(), task.getOwner());
+            
+            // Delegating as owner
+            task.setDelegationState(null);
+            task.setOwner(requestContext.getRunAsUser());
+            task.setAssignee(null);
+            activitiProcessEngine.getTaskService().saveTask(task);
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("delegated", result.get("state"));
+            assertEquals(initiator, result.get("assignee"));
+            assertEquals(requestContext.getRunAsUser(), result.get("owner"));
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertEquals(DelegationState.PENDING, task.getDelegationState());
+            assertEquals(initiator, task.getAssignee());
+            assertEquals(requestContext.getRunAsUser(), task.getOwner());
+            
+            // Delegating as process initiator
+            task.setDelegationState(null);
+            task.setOwner(null);
+            task.setAssignee(null);
+            activitiProcessEngine.getTaskService().saveTask(task);
+            requestContext.setRunAsUser(initiator);
+            taskBody.put("assignee", user);
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("delegated", result.get("state"));
+            assertEquals(user, result.get("assignee"));
+            assertEquals(initiator, result.get("owner"));
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertEquals(DelegationState.PENDING, task.getDelegationState());
+            assertEquals(user, task.getAssignee());
+            assertEquals(initiator, task.getOwner());
+            
+            // Delegating as administrator
+            String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+            task.setDelegationState(null);
+            task.setOwner(null);
+            task.setAssignee(null);
+            activitiProcessEngine.getTaskService().saveTask(task);
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            requestContext.setRunAsUser(tenantAdmin);
+            taskBody.put("assignee", user);
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("delegated", result.get("state"));
+            assertEquals(user, result.get("assignee"));
+            assertEquals(tenantAdmin, result.get("owner"));
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertEquals(DelegationState.PENDING, task.getDelegationState());
+            assertEquals(user, task.getAssignee());
+            assertEquals(tenantAdmin, task.getOwner());
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testSetOutcome() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        ProcessInfo processInf = startReviewPooledProcess(requestContext);
+        Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInf.getId()).singleResult();
+        TasksClient tasksClient = publicApiClient.tasksClient();
+        activitiProcessEngine.getTaskService().saveTask(task);
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("select", "state,variables");
+        HttpResponse response = tasksClient.update("tasks",
+                        task.getId(),
+                        null,
+                        null,
+                        "{\"state\":\"completed\",\"variables\":[{\"name\":\"wf_reviewOutcome\",\"value\":\"Approve\",\"scope\":\"local\"},{\"name\":\"bpm_comment\",\"value\":\"approved by me\",\"scope\":\"local\"}]}",
+                        params,
+                        "Failed to update task",
+                        200);
+        HistoricTaskInstance historyTask = activitiProcessEngine.getHistoryService().createHistoricTaskInstanceQuery().taskId(task.getId()).includeProcessVariables().includeTaskLocalVariables().singleResult();
+        String outcome = (String) historyTask.getTaskLocalVariables().get("bpm_outcome");
+        assertEquals("Approve", outcome);
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testResolveTask() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        String user = requestContext.getRunAsUser();
+        String initiator = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        
+        ProcessInstance processInstance = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        try 
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Resolving as non-assignee/owner/initiator/admin should result in an error
+            JSONObject taskBody = new JSONObject();
+            taskBody.put("state", "resolved");
+            taskBody.put("assignee", initiator);
+            List<String> selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "state",  "assignee"}));
+            try 
+            {
+                tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+            
+            // Resolving as assignee
+            task.delegate(user);
+            activitiProcessEngine.getTaskService().saveTask(task);
+            taskBody.put("state", "resolved");
+            taskBody.put("assignee", initiator);
+            selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "state", "assignee" }));
+            JSONObject result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("resolved", result.get("state"));
+            assertEquals(initiator, result.get("assignee"));
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertEquals(DelegationState.RESOLVED, task.getDelegationState());
+            assertEquals(initiator, task.getAssignee());
+            HistoricTaskInstance historyTask = activitiProcessEngine.getHistoryService().createHistoricTaskInstanceQuery()
+                     .taskId(task.getId())
+                     .includeProcessVariables()
+                     .includeTaskLocalVariables()
+                     .singleResult();
+            assertNotNull("The outcome should not be null for resolved task.", historyTask.getTaskLocalVariables().get("bpm_outcome"));
+            
+            // Resolving as owner
+            task.setDelegationState(null);
+            task.setOwner(requestContext.getRunAsUser());
+            task.setAssignee(null);
+            activitiProcessEngine.getTaskService().saveTask(task);
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("resolved", result.get("state"));
+            assertEquals(user, result.get("assignee"));
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertEquals(DelegationState.RESOLVED, task.getDelegationState());
+            assertEquals(user, task.getAssignee());
+            
+            // Resolving as process initiator
+            task.setDelegationState(null);
+            task.setOwner(null);
+            task.setAssignee(null);
+            activitiProcessEngine.getTaskService().saveTask(task);
+            requestContext.setRunAsUser(initiator);
+            taskBody.put("assignee", user);
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("resolved", result.get("state"));
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertEquals(DelegationState.RESOLVED, task.getDelegationState());
+            
+            // Resolving as administrator
+            String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+            task.setDelegationState(null);
+            task.setOwner(initiator);
+            task.setAssignee(null);
+            activitiProcessEngine.getTaskService().saveTask(task);
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            requestContext.setRunAsUser(tenantAdmin);
+            taskBody.put("assignee", user);
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("resolved", result.get("state"));
+            assertEquals(initiator, result.get("assignee"));
+            task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertEquals(DelegationState.RESOLVED, task.getDelegationState());
+            assertEquals(initiator, task.getAssignee());
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testTaskStateTransitions() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        ProcessInfo processInstance = startAdhocProcess(requestContext, null);
+        try 
+        {
+            Task task = activitiProcessEngine.getTaskService()
+                    .createTaskQuery()
+                    .processInstanceId(processInstance.getId())
+                    .singleResult();
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Unclaimed to claimed
+            JSONObject taskBody = new JSONObject();
+            taskBody.put("state", "claimed");
+            List<String> selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "state", "assignee" }));
+            JSONObject result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("claimed", result.get("state"));
+            
+            // claimed to unclaimed
+            taskBody = new JSONObject();
+            taskBody.put("state", "unclaimed");
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertEquals("unclaimed", result.get("state"));
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance.getId());
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testChangeDueDate() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        try 
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            JSONObject taskObject = tasksClient.findTaskById(task.getId());
+            assertNull(taskObject.get("dueAt"));
+            
+            List<String> selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "name", "description", "dueAt", "priority", "assignee", "owner"}));
+            
+            // set due date
+            JSONObject taskBody = new JSONObject();
+            String dueAt = formatDate(new Date());
+            taskBody.put("dueAt", dueAt);
+            JSONObject result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertNotNull(result.get("dueAt"));
+            
+            taskObject = tasksClient.findTaskById(task.getId());
+            assertNotNull(taskObject.get("dueAt"));
+            
+            taskBody = new JSONObject();
+            taskBody.put("dueAt", taskObject.get("dueAt"));
+            result = tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            assertNotNull(result.get("dueAt"));
+            
+            taskObject = tasksClient.findTaskById(task.getId());
+            assertNotNull(taskObject.get("dueAt"));
+            
+            JSONObject variableBody = new JSONObject();
+            variableBody.put("name", "bpm_workflowDueDate");
+            variableBody.put("value", formatDate(new Date()));
+            variableBody.put("type", "d:date");
+            variableBody.put("scope", "global");
+            
+            tasksClient.updateTaskVariable(task.getId(), "bpm_workflowDueDate", variableBody);
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testGetTasks() throws Exception
+    {
+        // Alter current engine date
+        Calendar createdCal = Calendar.getInstance();
+        createdCal.set(Calendar.MILLISECOND, 0);
+        Clock actiClock = activitiProcessEngine.getProcessEngineConfiguration().getClock();
+        actiClock.setCurrentTime(createdCal.getTime());
+        
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        RequestContext otherContext = new RequestContext(requestContext.getNetworkId(), otherPerson);
+        
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            
+            // Set some task-properties not set by process-definition
+            Calendar dueDateCal = Calendar.getInstance();
+            dueDateCal.set(Calendar.MILLISECOND, 0);
+            dueDateCal.add(Calendar.DAY_OF_YEAR, 1);
+            Date dueDate = dueDateCal.getTime();
+            
+            task.setDescription("This is a test description");
+            task.setAssignee(requestContext.getRunAsUser());
+            task.setOwner("john");
+            task.setDueDate(dueDate);
+            activitiProcessEngine.getTaskService().saveTask(task);
+
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Check resulting task
+            JSONObject taskListJSONObject = tasksClient.findTasks(null);
+            assertNotNull(taskListJSONObject);
+            JSONArray jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+            assertEquals(1, jsonEntries.size());
+            
+            JSONObject taskJSONObject = (JSONObject) ((JSONObject) jsonEntries.get(0)).get("entry");
+            assertNotNull(taskJSONObject);
+            assertEquals(task.getId(), taskJSONObject.get("id"));
+            assertEquals(processInstance.getId(), taskJSONObject.get("processId"));
+            assertEquals(processInstance.getProcessDefinitionId(), taskJSONObject.get("processDefinitionId"));
+            assertEquals("adhocTask", taskJSONObject.get("activityDefinitionId"));
+            assertEquals("Adhoc Task", taskJSONObject.get("name"));
+            assertEquals("This is a test description", taskJSONObject.get("description"));
+            assertEquals(requestContext.getRunAsUser(), taskJSONObject.get("assignee"));
+            assertEquals("john", taskJSONObject.get("owner"));
+            assertEquals(dueDate, parseDate(taskJSONObject, "dueAt"));
+            // experiment
+            assertEquals(createdCal.getTime().toString(), parseDate(taskJSONObject, "startedAt").toString());
+            assertEquals(createdCal.getTime(), parseDate(taskJSONObject, "startedAt"));
+            assertEquals(2l, taskJSONObject.get("priority"));
+            assertEquals("wf:adhocTask", taskJSONObject.get("formResourceKey"));
+            assertNull(taskJSONObject.get("endedAt"));
+            assertNull(taskJSONObject.get("durationInMs"));
+            
+            // get tasks with user that has no assigned tasks
+            publicApiClient.setRequestContext(otherContext);
+            taskListJSONObject = tasksClient.findTasks(null);
+            assertNotNull(taskListJSONObject);
+            jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+            assertEquals(0, jsonEntries.size());
+            
+            // get tasks for user which has one task assigned by somebody else
+            publicApiClient.setRequestContext(requestContext);
+            JSONObject taskBody = new JSONObject();
+            taskBody.put("assignee", otherContext.getRunAsUser());
+            
+            List<String> selectedFields = new ArrayList<String>();
+            selectedFields.addAll(Arrays.asList(new String[] { "assignee" }));
+            
+            tasksClient.updateTask(task.getId(), taskBody, selectedFields);
+            
+            publicApiClient.setRequestContext(otherContext);
+            taskListJSONObject = tasksClient.findTasks(null);
+            assertNotNull(taskListJSONObject);
+            jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+            assertEquals(1, jsonEntries.size());
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    public void testGetTasksWithParams() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        RequestContext otherContext = new RequestContext(requestContext.getNetworkId(), otherPerson);
+        
+        Calendar taskCreated = Calendar.getInstance();
+        taskCreated.set(Calendar.MILLISECOND, 0);
+        String businessKey = UUID.randomUUID().toString();
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), businessKey);
+        
+        ProcessInfo otherInstance = startReviewPooledProcess(otherContext);
+        
+        try
+        {
+            // Complete the adhoc task
+            final Task completedTask = activitiProcessEngine.getTaskService().createTaskQuery()
+                .processInstanceId(processInstance.getId()).singleResult();
+            
+            assertNotNull(completedTask);
+            
+            // Find the review pooled task
+            final Task reviewPooledTask = activitiProcessEngine.getTaskService().createTaskQuery()
+                .processInstanceId(otherInstance.getId()).singleResult();
+            
+            assertNotNull(reviewPooledTask);
+            // MNT-12221 case, due date should be set as task property, not as variable!!!
+            assertNotNull("Due date was not set for review pooled task.", reviewPooledTask.getDueDate());
+            
+            String anotherUserId = UUID.randomUUID().toString();
+            
+            Calendar completedTaskDue = Calendar.getInstance();
+            completedTaskDue.add(Calendar.HOUR, 1);
+            completedTaskDue.set(Calendar.MILLISECOND, 0);
+            completedTask.setOwner(requestContext.getRunAsUser());
+            completedTask.setPriority(3);
+            completedTask.setDueDate(completedTaskDue.getTime());
+            completedTask.setAssignee(anotherUserId);
+            completedTask.setName("Another task name");
+            completedTask.setDescription("This is another test description");
+            activitiProcessEngine.getTaskService().saveTask(completedTask);
+            
+            // Complete task in correct tenant
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    activitiProcessEngine.getTaskService().complete(completedTask.getId());
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            
+            // Active task is the second task in the adhoc-process (Verify task completed)
+            Task activeTask = activitiProcessEngine.getTaskService().createTaskQuery()
+                .processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(activeTask);
+        
+            Calendar activeTaskDue = Calendar.getInstance();
+
+            activeTaskDue.add(Calendar.HOUR, 2);
+            activeTaskDue.set(Calendar.MILLISECOND, 0);
+            activeTask.setDueDate(activeTaskDue.getTime());
+            activeTask.setName("Task name");
+            activeTask.setDescription("This is a test description");
+            activeTask.setOwner(requestContext.getRunAsUser());
+            activeTask.setPriority(2);
+            activeTask.setAssignee(requestContext.getRunAsUser());
+            activitiProcessEngine.getTaskService().saveTask(activeTask);
+            activitiProcessEngine.getTaskService().addCandidateUser(activeTask.getId(), anotherUserId);
+            activitiProcessEngine.getTaskService().addCandidateGroup(activeTask.getId(), "sales");
+            activitiProcessEngine.getTaskService().setVariableLocal(activeTask.getId(), "numberVar", 10);
+            
+            final Task otherTask = activitiProcessEngine.getTaskService().createTaskQuery()
+                    .processInstanceId(otherInstance.getId()).singleResult();
+           
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Test status filtering - active
+            Map<String, String> params = new HashMap<String, String>();
+            params.put("where", "(status = 'active' AND processId = '" + processInstance.getId() + "')");
+            assertTasksPresentInTaskQuery(params, tasksClient, false, activeTask.getId());
+            
+            // Test status filtering - completed
+            params.clear();
+            params.put("where", "(status = 'completed' AND processId = '" + processInstance.getId() + "')");
+            params.put("orderBy", "dueAt DESC");
+            assertTasksPresentInTaskQuery(params, tasksClient, false, completedTask.getId());
+            
+            // Test status filtering - any
+            params.clear();
+            params.put("where", "(status = 'any' AND processId = '" + processInstance.getId() + "')");
+            assertTasksPresentInTaskQuery(params, tasksClient, false, activeTask.getId(), completedTask.getId());
+            
+            // Test status filtering - no value should default to 'active'
+            params.clear();
+            params.put("where", "(processId = '" + processInstance.getId() + "')");
+            assertTasksPresentInTaskQuery(params, tasksClient, false, activeTask.getId());
+            
+            // Test status filtering - illegal status
+            params.clear();
+            params.put("where", "(status = 'alfrescorocks')");
+            try
+            {
+                tasksClient.findTasks(params);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Invalid status parameter: alfrescorocks", expected.getHttpResponse());
+            }
+            
+            // Next, we test all filtering for active, complete and any tasks
+            
+            // Assignee filtering
+            params.clear();
+            params.put("where", "(status = 'active' AND assignee = '" + requestContext.getRunAsUser() + "')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.put("where", "(status = 'completed' AND assignee = '" + anotherUserId + "')");
+            params.put("orderBy", "endedAt");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            params.put("where", "(status = 'any' AND assignee = '" + anotherUserId + "')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            // Owner filtering
+            params.clear();
+            params.put("where", "(status = 'active' AND owner = '" + requestContext.getRunAsUser() + "')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.put("where", "(status = 'completed' AND owner = '" + requestContext.getRunAsUser() + "')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            params.put("where", "(status = 'any' AND owner = '" + requestContext.getRunAsUser() + "')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId(), completedTask.getId());
+            
+            // Candidate user filtering, only available for active tasks. When used with completed/any 400 is returned
+            params.clear();
+            params.put("where", "(status = 'active' AND candidateUser = '" + anotherUserId + "')");
+            // No tasks expected since assignee is set
+            assertEquals(0L, getResultSizeForTaskQuery(params, tasksClient));
+            
+            // Clear assignee
+            activitiProcessEngine.getTaskService().setAssignee(activeTask.getId(), null);
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            // Candidate user with candidate group
+            params.clear();
+            params.put("where", "(status = 'active' AND candidateUser = '" + otherContext.getRunAsUser() + "')");
+            // No tasks expected since assignee is set
+            assertEquals(1L, getResultSizeForTaskQuery(params, tasksClient));
+            
+            params.clear();
+            params.put("where", "(status = 'completed' AND candidateUser = '" + anotherUserId + "')");
+            try
+            {
+                tasksClient.findTasks(params);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Filtering on candidateUser is only allowed in combination with status-parameter 'active'", expected.getHttpResponse());
+            }
+            
+            params.clear();
+            params.put("where", "(status = 'any' AND candidateUser = '" + anotherUserId + "')");
+            try
+            {
+                tasksClient.findTasks(params);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Filtering on candidateUser is only allowed in combination with status-parameter 'active'", expected.getHttpResponse());
+            }
+            
+            // Candidate group filtering, only available for active tasks. When used with completed/any 400 is returned
+            params.clear();
+            params.put("where", "(status = 'active' AND candidateGroup = 'sales' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'completed' AND candidateGroup = 'sales' AND processId='" + processInstance.getId() +"')");
+            try
+            {
+                tasksClient.findTasks(params);
+                fail("Exception expected");
+            }
+            catch (PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Filtering on candidateGroup is only allowed in combination with status-parameter 'active'", expected.getHttpResponse());
+            }
+            
+            params.clear();
+            params.put("where", "(status = 'any' AND candidateGroup = 'sales' AND processId='" + processInstance.getId() +"')");
+            try
+            {
+                tasksClient.findTasks(params);
+                fail("Exception expected");
+            }
+            catch (PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Filtering on candidateGroup is only allowed in combination with status-parameter 'active'", expected.getHttpResponse());
+            }
+            
+            // Name filtering
+            params.clear();
+            params.put("where", "(status = 'active' AND name = 'Task name' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'completed' AND name = 'Another task name' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'any' AND name = 'Another task name' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            // Description filtering
+            params.clear();
+            params.put("where", "(status = 'active' AND description = 'This is a test description' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'completed' AND description = 'This is another test description' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'any' AND description = 'This is another test description' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            // Priority filtering
+            params.clear();
+            params.put("where", "(status = 'active' AND priority = 2 AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.put("where", "(status = 'completed' AND priority = 3 AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            params.put("where", "(status = 'any' AND priority = 3 AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            // Process instance business-key filtering
+            params.clear();
+            params.put("where", "(status = 'active' AND processBusinessKey = '" + businessKey + "')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'completed' AND processBusinessKey = '" + businessKey + "')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+             
+            params.clear();
+            params.put("where", "(status = 'any' AND processBusinessKey = '" + businessKey + "')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId(), activeTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'any' AND processBusinessKey MATCHES('" + businessKey + "'))");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId(), activeTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'any' AND processBusinessKey MATCHES('" + businessKey.substring(0, businessKey.length() - 2) + "%'))");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId(), activeTask.getId());
+            
+            // Activity definition id filtering
+            params.clear();
+            params.put("where", "(status = 'active' AND activityDefinitionId = 'verifyTaskDone' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'completed' AND activityDefinitionId = 'adhocTask' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'any' AND activityDefinitionId = 'adhocTask' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            // Process definition id filtering
+            params.clear();
+            params.put("where", "(status = 'active' AND processDefinitionId = '" + processInstance.getProcessDefinitionId() + 
+                        "' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'completed' AND processDefinitionId = '" + processInstance.getProcessDefinitionId() + 
+                        "' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'any' AND processDefinitionId = '" + processInstance.getProcessDefinitionId() + 
+                        "' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId(), completedTask.getId());
+            
+            // Process definition name filtering 
+            params.clear();
+            params.put("where", "(status = 'active' AND processDefinitionName = 'Adhoc Activiti Process' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'completed' AND processDefinitionName = 'Adhoc Activiti Process' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'any' AND processDefinitionName = 'Adhoc Activiti Process' AND processId='" + processInstance.getId() +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId(), completedTask.getId());
+            
+            // Due date filtering
+            params.clear();
+            params.put("where", "(status = 'active' AND dueAt = '" + ISO8601DateFormat.format(activeTaskDue.getTime()) +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'completed' AND dueAt = '" + ISO8601DateFormat.format(completedTaskDue.getTime()) +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'any' AND dueAt = '" + ISO8601DateFormat.format(completedTaskDue.getTime()) +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            // Started filtering
+            Calendar compareCal = Calendar.getInstance();
+            compareCal.set(Calendar.MILLISECOND, 0);
+            compareCal.add(Calendar.DAY_OF_YEAR, -1);
+            params.clear();
+            params.put("where", "(status = 'active' AND startedAt > '" + ISO8601DateFormat.format(compareCal.getTime()) +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId(), otherTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'completed' AND startedAt > '" + ISO8601DateFormat.format(compareCal.getTime()) +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'any' AND startedAt > '" + ISO8601DateFormat.format(compareCal.getTime()) +"')");
+            assertTasksPresentInTaskQuery(params, tasksClient, completedTask.getId(), activeTask.getId(), otherTask.getId());
+            
+            params.clear();
+            params.put("where", "(status = 'any' AND startedAt < '" + ISO8601DateFormat.format(compareCal.getTime()) +"')");
+            assertEquals(0, getResultSizeForTaskQuery(params, tasksClient));
+            
+            params.clear();
+            params.put("where", "(variables/local/numberVar > 'd:int 5')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.clear();
+            params.put("where", "(variables/local/numberVar > 'd:int 10')");
+            assertEquals(0, getResultSizeForTaskQuery(params, tasksClient));
+            
+            params.clear();
+            params.put("where", "(variables/local/numberVar >= 'd_int 10')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.clear();
+            params.put("where", "(variables/local/numberVar >= 'd:int 11')");
+            assertEquals(0, getResultSizeForTaskQuery(params, tasksClient));
+            
+            params.clear();
+            params.put("where", "(variables/local/numberVar <= 'd:int 10')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.clear();
+            params.put("where", "(variables/local/numberVar <= 'd:int 9')");
+            assertEquals(0, getResultSizeForTaskQuery(params, tasksClient));
+            
+            params.clear();
+            params.put("where", "(variables/local/numberVar < 'd_int 15')");
+            assertTasksPresentInTaskQuery(params, tasksClient, activeTask.getId());
+            
+            params.clear();
+            params.put("where", "(variables/local/numberVar < 'd:int 10')");
+            assertEquals(0, getResultSizeForTaskQuery(params, tasksClient));
+            
+            params.clear();
+            params.put("where", "(variables/global/numberVar > 'd:int 5')");
+            assertEquals(0, getResultSizeForTaskQuery(params, tasksClient));
+            
+            params.clear();
+            params.put("where", "(variables/numberVar > 'd:int 5')");
+            assertEquals(0, getResultSizeForTaskQuery(params, tasksClient));
+            
+            params.clear();
+            params.put("where", "(variables/bpm_dueDate = 'd:datetime " + ISO8601DateFormat.format(new Date()) + "')");
+            assertEquals(0, getResultSizeForTaskQuery(params, tasksClient));
+            
+            params.clear();
+            params.put("where", "(variables/bpm_dueDate = 'd:datetime 2013-09-15T12:22:31.866+0000')");
+            assertEquals(0, getResultSizeForTaskQuery(params, tasksClient));
+            
+            params.clear();
+            params.put("where", "(variables/bpm_dueDate > 'd:datetime 2013-09-15T12:22:31.866+0000')");
+            // MNT-12221 fix, due date is not saved as variable for review pooled workflow, so nothing should be found
+            assertEquals(0, getResultSizeForTaskQuery(params, tasksClient));
+            
+            params.clear();
+            params.put("where", "(dueAt = '" + ISO8601DateFormat.format(reviewPooledTask.getDueDate()) + "')");
+            assertEquals(1, getResultSizeForTaskQuery(params, tasksClient));
+            
+            params.clear();
+            params.put("where", "(variables/bpm_comment MATCHES ('test%'))");
+            assertEquals(0, getResultSizeForTaskQuery(params, tasksClient));
+            
+            // test with OR operator
+            params.clear();
+            params.put("where", "(status = 'any' OR candidateGroup = 'sales')");
+            try
+            {
+                tasksClient.findTasks(params);
+                fail("Exception expected");
+            }
+            catch (PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+            }
+
+            params.clear();
+            params.put("where", "(status = 'completed' AND processDefinitionName = 'Adhoc Activiti Process')");
+            JSONObject response = publicApiClient.processesClient().getTasks(processInstance.getId(), params);
+            assertNotNull(response);
+            JSONObject paginationJSON = (JSONObject) response.get("pagination");
+            assertEquals(1l, paginationJSON.get("count"));
+
+            params.clear();
+            params.put("where", "(status = 'any' AND variables/numberVar < 'd:int 5')");
+            assertEquals(0, getResultSizeForTaskQuery(params, tasksClient));
+
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance.getId(), otherInstance.getId());
+        }
+    }
+    
+    @Test
+    public void testGetTasksWithPaging() throws Exception 
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        // Start 6 processes
+        List<ProcessInstance> startedProcesses = new ArrayList<ProcessInstance>();
+        try
+        {
+            int numberOfTasks = 6;
+            for (int i = 0; i < numberOfTasks; i++) 
+            {
+                startedProcesses.add(startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null));
+            }
+            
+            String processDefinitionId = startedProcesses.get(0).getProcessDefinitionId();
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Test with existing processDefinitionId
+            Map<String, String> params = new HashMap<String, String>();
+            params.put("where", "(processDefinitionId = '" + processDefinitionId + "' AND includeProcessVariables = true AND includeTaskVariables = true)");
+            JSONObject taskListJSONObject = tasksClient.findTasks(params);
+            assertNotNull(taskListJSONObject);
+            JSONObject paginationJSON = (JSONObject) taskListJSONObject.get("pagination");
+            assertEquals(6l, paginationJSON.get("count"));
+            assertEquals(6l, paginationJSON.get("totalItems"));
+            assertEquals(0l, paginationJSON.get("skipCount"));
+            assertEquals(false, paginationJSON.get("hasMoreItems"));
+            JSONArray jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+            assertEquals(6, jsonEntries.size());
+            validateVariables((JSONObject) jsonEntries.get(0), requestContext);
+            
+            // Test with existing processDefinitionId and max items
+            params.clear();
+            params.put("maxItems", "3");
+            params.put("where", "(processDefinitionId = '" + processDefinitionId + "' AND includeProcessVariables = true AND includeTaskVariables = true)");
+            taskListJSONObject = tasksClient.findTasks(params);
+            assertNotNull(taskListJSONObject);
+            paginationJSON = (JSONObject) taskListJSONObject.get("pagination");
+            assertEquals(3l, paginationJSON.get("count"));
+            assertEquals(6l, paginationJSON.get("totalItems"));
+            assertEquals(0l, paginationJSON.get("skipCount"));
+            assertEquals(true, paginationJSON.get("hasMoreItems"));
+            jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+            assertEquals(3, jsonEntries.size());
+            validateVariables((JSONObject) jsonEntries.get(0), requestContext);
+            
+            // Test with existing processDefinitionId and skip count
+            params.clear();
+            params.put("skipCount", "2");
+            params.put("where", "(processDefinitionId = '" + processDefinitionId + "' AND includeProcessVariables = true AND includeTaskVariables = true)");
+            taskListJSONObject = tasksClient.findTasks(params);
+            assertNotNull(taskListJSONObject);
+            paginationJSON = (JSONObject) taskListJSONObject.get("pagination");
+            assertEquals(4l, paginationJSON.get("count"));
+            assertEquals(6l, paginationJSON.get("totalItems"));
+            assertEquals(2l, paginationJSON.get("skipCount"));
+            assertEquals(false, paginationJSON.get("hasMoreItems"));
+            jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+            assertEquals(4, jsonEntries.size());
+            
+            // Test with existing processDefinitionId and max items and skip count
+            params.clear();
+            params.put("maxItems", "3");
+            params.put("skipCount", "2");
+            params.put("where", "(processDefinitionId = '" + processDefinitionId + "' AND includeProcessVariables = true AND includeTaskVariables = true)");
+            taskListJSONObject = tasksClient.findTasks(params);
+            assertNotNull(taskListJSONObject);
+            paginationJSON = (JSONObject) taskListJSONObject.get("pagination");
+            assertEquals(3l, paginationJSON.get("count"));
+            assertEquals(6l, paginationJSON.get("totalItems"));
+            assertEquals(2l, paginationJSON.get("skipCount"));
+            assertEquals(true, paginationJSON.get("hasMoreItems"));
+            jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+            assertEquals(3, jsonEntries.size());
+            
+            // Test with existing processDefinitionId and max items and skip count
+            params.clear();
+            params.put("maxItems", "3");
+            params.put("skipCount", "4");
+            params.put("where", "(processDefinitionId = '" + processDefinitionId + "' AND includeProcessVariables = true AND includeTaskVariables = true)");
+            taskListJSONObject = tasksClient.findTasks(params);
+            assertNotNull(taskListJSONObject);
+            paginationJSON = (JSONObject) taskListJSONObject.get("pagination");
+            assertEquals(2l, paginationJSON.get("count"));
+            assertEquals(6l, paginationJSON.get("totalItems"));
+            assertEquals(4l, paginationJSON.get("skipCount"));
+            assertEquals(false, paginationJSON.get("hasMoreItems"));
+            jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+            assertEquals(2, jsonEntries.size());
+        }
+        finally
+        {
+            cleanupProcessInstance(startedProcesses.toArray(new ProcessInstance[] {}));
+        }
+    }
+    
+    @Test
+    public void testGetTasksWithPagingAndVariablesLimit() throws Exception 
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        List<ProcessInstance> startedProcesses = new ArrayList<ProcessInstance>();
+        
+        // system.workflow.engine.activiti.taskvariableslimit is set to 200 in test-resources/alfresco-global.properties
+        try
+        {
+            // MNT-16040: Create tasks with a number of variables just below the taskvariableslimit and test that skipCount is working as expected.
+            int numberOfTasks = 15;
+            for (int i = 0; i < numberOfTasks; i++) 
+            {
+                startedProcesses.add(startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null));
+            }
+            TaskService taskService = activitiProcessEngine.getTaskService();
+            List<Task> taskList = new ArrayList<Task>();
+            for (int i = 0; i < numberOfTasks; i++) 
+            {
+                Task task = taskService.createTaskQuery().processInstanceId(startedProcesses.get(i).getProcessInstanceId()).singleResult();
+                taskService.setPriority(task.getId(), (i + 1) * 10);
+                
+                // Add an extra variable to the task, there are other 12 added, so a total of 13 variables for each task.
+                taskService.setVariableLocal(task.getId(), "test1", "test1");
+                taskList.add(task);
+            }
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Test without skipCount
+            Map<String, String> params = new HashMap<String, String>();
+            params.put("where", "(includeProcessVariables = true AND includeTaskVariables = true)");
+            JSONObject taskListJSONObject = tasksClient.findTasks(params);
+            assertNotNull(taskListJSONObject);
+            JSONObject paginationJSON = (JSONObject) taskListJSONObject.get("pagination");
+            assertEquals(15l, paginationJSON.get("count"));
+            assertEquals(15l, paginationJSON.get("totalItems"));
+            assertEquals(0l, paginationJSON.get("skipCount"));
+            assertEquals(false, paginationJSON.get("hasMoreItems"));
+            JSONArray jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+            assertEquals(15, jsonEntries.size());
+            
+            // Test with skipCount
+            params.clear();
+            params.put("skipCount", "5");
+            params.put("where", "(includeProcessVariables = true AND includeTaskVariables = true)");
+            taskListJSONObject = tasksClient.findTasks(params);
+            assertNotNull(taskListJSONObject);
+            paginationJSON = (JSONObject) taskListJSONObject.get("pagination");
+            assertEquals(10l, paginationJSON.get("count"));
+            assertEquals(15l, paginationJSON.get("totalItems"));
+            assertEquals(5l, paginationJSON.get("skipCount"));
+            assertEquals(false, paginationJSON.get("hasMoreItems"));
+            jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+            assertEquals(10, jsonEntries.size());
+            
+            params.clear();
+            params.put("maxItems", "10");
+            params.put("where", "(includeProcessVariables = true AND includeTaskVariables = true)");
+            taskListJSONObject = tasksClient.findTasks(params);
+            assertNotNull(taskListJSONObject);
+            paginationJSON = (JSONObject) taskListJSONObject.get("pagination");
+            assertEquals(10l, paginationJSON.get("count"));
+            assertEquals(15l, paginationJSON.get("totalItems"));
+            assertEquals(0l, paginationJSON.get("skipCount"));
+            assertEquals(true, paginationJSON.get("hasMoreItems"));
+            jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+            assertEquals(10, jsonEntries.size());
+        }
+        finally
+        {
+            cleanupProcessInstance(startedProcesses.toArray(new ProcessInstance[] {}));
+        }
+    }
+    
+    protected void validateVariables(JSONObject entry, RequestContext requestContext) {
+        JSONObject taskObject = (JSONObject) entry.get("entry");
+        JSONArray variables = (JSONArray) taskObject.get("variables");
+        boolean foundInitiator = false;
+        boolean foundAssignee = false;
+        boolean foundPercentageComplete = false;
+        boolean foundReassignable = false;
+        for (int i = 0; i < variables.size(); i++) 
+        {
+            JSONObject variableJSON = (JSONObject) variables.get(i);
+            if ("initiator".equals(variableJSON.get("name"))) 
+            {
+                assertEquals("d:noderef", variableJSON.get("type"));
+                assertEquals(requestContext.getRunAsUser(), variableJSON.get("value"));
+                foundInitiator = true;
+            }
+            else if ("bpm_assignee".equals(variableJSON.get("name"))) 
+            {
+                assertEquals("cm:person", variableJSON.get("type"));
+                assertEquals(requestContext.getRunAsUser(), variableJSON.get("value"));
+                foundAssignee = true;
+            }
+            else if ("bpm_percentComplete".equals(variableJSON.get("name"))) 
+            {
+                assertEquals("d:int", variableJSON.get("type"));
+                assertEquals(0L, variableJSON.get("value"));
+                foundPercentageComplete = true;
+            }
+            else if ("bpm_reassignable".equals(variableJSON.get("name"))) 
+            {
+                assertEquals("d:boolean", variableJSON.get("type"));
+                assertEquals(Boolean.TRUE, variableJSON.get("value"));
+                foundReassignable = true;
+            }
+        }
+        
+        assertTrue(foundInitiator);
+        assertTrue(foundAssignee); 
+        assertTrue(foundPercentageComplete);
+        assertTrue(foundReassignable);
+    }
+    
+    @Test
+    public void testGetTasksWithSorting() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        // Start 6 processes
+        List<ProcessInstance> startedProcesses = new ArrayList<ProcessInstance>();
+        try
+        {
+            int numberOfTasks = 6;
+            for (int i = 0; i < numberOfTasks; i++) 
+            {
+                startedProcesses.add(startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null));
+            }
+            
+            List<Task> taskList = new ArrayList<Task>();
+            for (int i = 0; i < numberOfTasks; i++) 
+            {
+                Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(startedProcesses.get(i).getProcessInstanceId()).singleResult();
+                activitiProcessEngine.getTaskService().setPriority(task.getId(), (i + 1) * 10);
+                taskList.add(task);
+            }
+            
+            // set last task priority to 1
+            activitiProcessEngine.getTaskService().setPriority(taskList.get(numberOfTasks - 1).getId(), 1);
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Test with existing processDefinitionId
+            Map<String, String> params = new HashMap<String, String>();
+            params.put("where", "(processDefinitionId = '" + startedProcesses.get(0).getProcessDefinitionId() + "')");
+            params.put("orderBy", "priority ASC");
+            JSONObject tasksResponseJSON = tasksClient.findTasks(params);
+            
+            JSONObject paginationJSON = (JSONObject) tasksResponseJSON.get("pagination");
+            assertEquals(6l, paginationJSON.get("count"));
+            assertEquals(6l, paginationJSON.get("totalItems"));
+            JSONArray tasksListJSON = (JSONArray) tasksResponseJSON.get("entries");
+            assertEquals(6, tasksListJSON.size());
+            JSONObject taskJSON = (JSONObject) ((JSONObject) tasksListJSON.get(0)).get("entry");
+            assertEquals(taskList.get(numberOfTasks - 1).getId(), taskJSON.get("id"));
+            taskJSON = (JSONObject) ((JSONObject) tasksListJSON.get(1)).get("entry");
+            assertEquals(taskList.get(0).getId(), taskJSON.get("id"));
+            taskJSON = (JSONObject) ((JSONObject) tasksListJSON.get(2)).get("entry");
+            assertEquals(taskList.get(1).getId(), taskJSON.get("id"));
+            taskJSON = (JSONObject) ((JSONObject) tasksListJSON.get(3)).get("entry");
+            assertEquals(taskList.get(2).getId(), taskJSON.get("id"));
+            taskJSON = (JSONObject) ((JSONObject) tasksListJSON.get(4)).get("entry");
+            assertEquals(taskList.get(3).getId(), taskJSON.get("id"));
+            taskJSON = (JSONObject) ((JSONObject) tasksListJSON.get(5)).get("entry");
+            assertEquals(taskList.get(4).getId(), taskJSON.get("id"));
+            
+            params.put("orderBy", "priority DESC");
+            tasksResponseJSON = tasksClient.findTasks(params);
+            
+            paginationJSON = (JSONObject) tasksResponseJSON.get("pagination");
+            assertEquals(6l, paginationJSON.get("count"));
+            assertEquals(6l, paginationJSON.get("totalItems"));
+            tasksListJSON = (JSONArray) tasksResponseJSON.get("entries");
+            assertEquals(6, tasksListJSON.size());
+            taskJSON = (JSONObject) ((JSONObject) tasksListJSON.get(0)).get("entry");
+            assertEquals(taskList.get(4).getId(), taskJSON.get("id"));
+            taskJSON = (JSONObject) ((JSONObject) tasksListJSON.get(1)).get("entry");
+            assertEquals(taskList.get(3).getId(), taskJSON.get("id"));
+            taskJSON = (JSONObject) ((JSONObject) tasksListJSON.get(2)).get("entry");
+            assertEquals(taskList.get(2).getId(), taskJSON.get("id"));
+            taskJSON = (JSONObject) ((JSONObject) tasksListJSON.get(3)).get("entry");
+            assertEquals(taskList.get(1).getId(), taskJSON.get("id"));
+            taskJSON = (JSONObject) ((JSONObject) tasksListJSON.get(4)).get("entry");
+            assertEquals(taskList.get(0).getId(), taskJSON.get("id"));
+            taskJSON = (JSONObject) ((JSONObject) tasksListJSON.get(5)).get("entry");
+            assertEquals(taskList.get(numberOfTasks - 1).getId(), taskJSON.get("id"));
+
+            params.put("orderBy", "dueAt DESC");
+            tasksResponseJSON = tasksClient.findTasks(params);
+            tasksListJSON = (JSONArray) tasksResponseJSON.get("entries");
+            assertEquals(6, tasksListJSON.size());
+
+        }
+        finally
+        {
+            cleanupProcessInstance(startedProcesses.toArray(new ProcessInstance[] {}));
+        }
+    }
+    
+    @Test
+    public void testGetTasksAuthorization() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        String initiator = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        
+        // Start process by one user and try to access the task as the task assignee instead of the process
+        // initiator to see if the assignee is authorized to get the task
+        ProcessInstance processInstance = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            Map<String, String> params = new HashMap<String, String>();
+            params.put("processId", processInstance.getId());
+            
+            JSONObject resultingTasks = tasksClient.findTasks(params);
+            assertNotNull(resultingTasks);
+            JSONArray jsonEntries = (JSONArray) resultingTasks.get("entries");
+            assertNotNull(jsonEntries);
+            assertEquals(0, jsonEntries.size());
+            
+            // Set assignee, task should be in the result now
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), requestContext.getRunAsUser());
+            
+            resultingTasks = tasksClient.findTasks(params);
+            assertNotNull(resultingTasks);
+            jsonEntries = (JSONArray) resultingTasks.get("entries");
+            assertNotNull(jsonEntries);
+            assertEquals(1, jsonEntries.size());
+            
+            // Fetching task as admin should be possible
+            String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+            publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+            resultingTasks = tasksClient.findTasks(params);
+            assertNotNull(resultingTasks);
+            jsonEntries = (JSONArray) resultingTasks.get("entries");
+            assertNotNull(jsonEntries);
+            assertEquals(1, jsonEntries.size());
+            
+            // Fetching the task as a admin from another tenant shouldn't be possible
+            TestNetwork anotherNetwork = getOtherNetwork(requestContext.getNetworkId());
+            tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + anotherNetwork.getId();
+            publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+            resultingTasks = tasksClient.findTasks(params);
+            assertNotNull(resultingTasks);
+            jsonEntries = (JSONArray) resultingTasks.get("entries");
+            assertNotNull(jsonEntries);
+            assertEquals(0, jsonEntries.size());
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    public void testGetTaskCandidates() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            activitiProcessEngine.getTaskService().addCandidateUser(task.getId(), "testuser");
+            activitiProcessEngine.getTaskService().addCandidateUser(task.getId(), "testuser2");
+            activitiProcessEngine.getTaskService().addCandidateGroup(task.getId(), "testgroup");
+
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            JSONObject taskCandidatesJSONObject = tasksClient.findTaskCandidates(task.getId());
+            assertNotNull(taskCandidatesJSONObject);
+            JSONArray candidateArrayJSON = (JSONArray) ((JSONObject) taskCandidatesJSONObject.get("list")).get("entries");
+            assertEquals(3, candidateArrayJSON.size());
+            
+            boolean testUser1Found = false;
+            boolean testUser2Found = false;
+            boolean testGroupFound = false;
+            
+            for(int i=0; i < candidateArrayJSON.size(); i++) {
+                JSONObject entry = (JSONObject) ((JSONObject) candidateArrayJSON.get(i)).get("entry");
+                if("group".equals(entry.get("candidateType"))) 
+                {
+                    testGroupFound = true;
+                    assertEquals("testgroup", entry.get("candidateId"));
+                } else if("user".equals(entry.get("candidateType"))) 
+                {
+                    if("testuser".equals(entry.get("candidateId"))) 
+                    {
+                        testUser1Found = true;
+                    } 
+                    else if("testuser2".equals(entry.get("candidateId"))) 
+                    {
+                        testUser2Found = true;
+                    }
+                }
+            }
+            
+            assertTrue(testUser1Found);
+            assertTrue(testUser2Found);
+            assertTrue(testGroupFound);
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    public void testGetTaskVariablesAuthentication() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String initiator = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        
+        // Start process by one user and try to access the task variables as the task assignee instead of the process
+        // initiator to see if the assignee is authorized to get the task
+        ProcessInstance processInstance = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Try accessing task variables when NOT involved in the task
+            try {
+                tasksClient.findTaskVariables(task.getId());
+                fail("Exception expected");
+            } catch(PublicApiException expected) {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+            
+            // Set assignee, task variables should be accessible now
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), requestContext.getRunAsUser());
+            JSONObject jsonObject = tasksClient.findTaskVariables(task.getId());
+            assertNotNull(jsonObject);
+            
+            // Fetching task variables as admin should be possible
+            String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+            publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+            jsonObject = tasksClient.findTaskVariables(task.getId());
+            assertNotNull(jsonObject);
+            
+            // Fetching the task variables as a admin from another tenant shouldn't be possible
+            TestNetwork anotherNetwork = getOtherNetwork(requestContext.getNetworkId());
+            tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + anotherNetwork.getId();
+            publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+            try {
+                tasksClient.findTaskVariables(task.getId());
+                fail("Exception expected");
+            } catch(PublicApiException expected) {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    public void testGetTaskVariables() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            
+            Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId());
+            Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId());
+            assertEquals(5, actualGlobalVariables.size());
+            assertEquals(8, actualLocalVariables.size());
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            JSONObject variables = tasksClient.findTaskVariables(task.getId());
+            assertNotNull(variables);
+            JSONObject list = (JSONObject) variables.get("list");
+            assertNotNull(list);
+            JSONArray entries = (JSONArray) list.get("entries");
+            assertNotNull(entries);
+            
+            // Check pagination object for size
+            JSONObject pagination = (JSONObject) list.get("pagination");
+            assertNotNull(pagination);
+            assertEquals(12L, pagination.get("count"));
+            assertEquals(12L, pagination.get("totalItems"));
+            assertEquals(0L, pagination.get("skipCount"));
+            assertFalse((Boolean) pagination.get("hasMoreItems"));
+            
+            // Should contain one variable less than the actual variables in the engine, tenant-domain var is filtered out
+            assertEquals(actualLocalVariables.size() + actualGlobalVariables.size() - 1, entries.size());
+            
+            List<JSONObject> localResults = new ArrayList<JSONObject>();
+            List<JSONObject> globalResults = new ArrayList<JSONObject>();
+            
+            Set<String> expectedLocalVars = new HashSet<String>();
+            expectedLocalVars.addAll(actualLocalVariables.keySet());
+            
+            Set<String> expectedGlobalVars = new HashSet<String>();
+            expectedGlobalVars.addAll(actualGlobalVariables.keySet());
+            expectedGlobalVars.remove(ActivitiConstants.VAR_TENANT_DOMAIN);
+            
+            // Add JSON entries to map for easy access when asserting values
+            Map<String, JSONObject> entriesByName = new HashMap<String, JSONObject>();
+            for(int i=0; i < entries.size(); i++) 
+            {
+                JSONObject entry = (JSONObject) ((JSONObject) entries.get(i)).get("entry");
+                assertNotNull(entry);
+                
+                // Check if full entry is present
+                assertNotNull(entry.get("scope"));
+                assertNotNull(entry.get("name"));
+                assertNotNull(entry.get("type"));
+                if(!entry.get("name").equals("bpm_hiddenTransitions")) {
+                    assertNotNull(entry.get("value"));
+                }
+                
+                if("local".equals(entry.get("scope"))) 
+                {
+                    localResults.add(entry);
+                    expectedLocalVars.remove(entry.get("name"));
+                } 
+                else if("global".equals(entry.get("scope"))) 
+                {
+                    globalResults.add(entry);
+                    expectedGlobalVars.remove(entry.get("name"));
+                }
+                
+                entriesByName.put((String) entry.get("name"), entry);
+            }
+            
+            // Check correct count of globas vs. local
+            assertEquals(4, globalResults.size());
+            assertEquals(8, localResults.size());
+            
+            // Check if all variables are present
+            assertEquals(0, expectedGlobalVars.size());
+            assertEquals(0, expectedLocalVars.size());
+            
+            // Check if types are returned, based on content-model
+            JSONObject var = entriesByName.get("bpm_percentComplete");
+            assertNotNull(var);
+            assertEquals("d:int", var.get("type"));
+            assertEquals(0L, var.get("value"));
+            
+            var = entriesByName.get("bpm_reassignable");
+            assertNotNull(var);
+            assertEquals("d:boolean", var.get("type"));
+            assertEquals(Boolean.TRUE, var.get("value"));
+            
+            var = entriesByName.get("bpm_status");
+            assertNotNull(var);
+            assertEquals("d:text", var.get("type"));
+            assertEquals("Not Yet Started", var.get("value"));
+            
+            var = entriesByName.get("bpm_assignee");
+            assertNotNull(var);
+            assertEquals("cm:person", var.get("type"));
+            
+            final String userName = requestContext.getRunAsUser();
+            assertEquals(userName, var.get("value"));
+            
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testUpdateTaskVariablesPresentInModel() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            
+            Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId());
+            Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId());
+            assertEquals(5, actualGlobalVariables.size());
+            assertEquals(8, actualLocalVariables.size());
+            
+            // Update a global value that is present in the model with type given
+            JSONObject variableBody = new JSONObject();
+            variableBody.put("name", "bpm_percentComplete");
+            variableBody.put("value", 20);
+            variableBody.put("type", "d:int");
+            variableBody.put("scope", "global");
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            JSONObject resultEntry = tasksClient.updateTaskVariable(task.getId(), "bpm_percentComplete", variableBody);
+            assertNotNull(resultEntry);
+            JSONObject result = (JSONObject) resultEntry.get("entry");
+            assertEquals("bpm_percentComplete", result.get("name"));
+            assertEquals(20L, result.get("value"));
+            assertEquals("d:int", result.get("type"));
+            assertEquals("global", result.get("scope")); 
+            assertEquals(20, activitiProcessEngine.getRuntimeService().getVariable(processInstance.getId(), "bpm_percentComplete"));
+            
+            // Update a local value that is present in the model with name and scope, omitting type to see if type is deducted from model
+            variableBody = new JSONObject();
+            variableBody.put("name", "bpm_percentComplete");
+            variableBody.put("value", 30);
+            variableBody.put("scope", "local");
+            
+            result = resultEntry = tasksClient.updateTaskVariable(task.getId(), "bpm_percentComplete", variableBody);
+            assertNotNull(resultEntry);
+            result = (JSONObject) resultEntry.get("entry");
+            assertEquals("bpm_percentComplete", result.get("name"));
+            assertEquals(30L, result.get("value"));
+            assertEquals("d:int", result.get("type"));
+            assertEquals("local", result.get("scope"));
+            assertEquals(30, activitiProcessEngine.getTaskService().getVariable(task.getId(), "bpm_percentComplete"));
+            // Global variable should remain unaffected
+            assertEquals(20, activitiProcessEngine.getRuntimeService().getVariable(processInstance.getId(), "bpm_percentComplete"));
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testUpdateTaskVariablesExplicitTyped() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            
+            Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId());
+            Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId());
+            assertEquals(5, actualGlobalVariables.size());
+            assertEquals(8, actualLocalVariables.size());
+            
+            // Set a new global value that is NOT present in the model with type given
+            JSONObject variableBody = new JSONObject();
+            variableBody.put("name", "newVariable");
+            variableBody.put("value", 1234L);
+            variableBody.put("type", "d:long");
+            variableBody.put("scope", "global");
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            JSONObject resultEntry = tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
+            assertNotNull(resultEntry);
+            JSONObject result = (JSONObject) resultEntry.get("entry");
+            assertEquals("newVariable", result.get("name"));
+            assertEquals(1234L, result.get("value"));
+            assertEquals("d:long", result.get("type"));
+            assertEquals("global", result.get("scope")); 
+            assertEquals(1234L, activitiProcessEngine.getRuntimeService().getVariable(processInstance.getId(), "newVariable"));
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testUpdateTaskVariablesNoExplicitType() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            
+            Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId());
+            Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId());
+            assertEquals(5, actualGlobalVariables.size());
+            assertEquals(8, actualLocalVariables.size());
+            
+            // Raw number value
+            JSONObject variableBody = new JSONObject();
+            variableBody.put("name", "newVariable");
+            variableBody.put("value", 1234);
+            variableBody.put("scope", "global");
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            JSONObject resultEntry = tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
+            assertNotNull(resultEntry);
+            JSONObject result = (JSONObject) resultEntry.get("entry");
+            assertEquals("newVariable", result.get("name"));
+            assertEquals(1234L, result.get("value"));
+            assertEquals("d:int", result.get("type"));
+            assertEquals("global", result.get("scope")); 
+            assertEquals(1234, activitiProcessEngine.getRuntimeService().getVariable(processInstance.getId(), "newVariable"));
+            
+            
+            // Raw boolean value
+            variableBody = new JSONObject();
+            variableBody.put("name", "newVariable");
+            variableBody.put("value", Boolean.TRUE);
+            variableBody.put("scope", "local");
+            
+            resultEntry = tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
+            assertNotNull(resultEntry);
+            result = (JSONObject) resultEntry.get("entry");
+            assertEquals("newVariable", result.get("name"));
+            assertEquals(Boolean.TRUE, result.get("value"));
+            assertEquals("d:boolean", result.get("type"));
+            assertEquals("local", result.get("scope")); 
+            assertEquals(Boolean.TRUE, activitiProcessEngine.getTaskService().getVariable(task.getId(), "newVariable"));
+            
+            
+            // Raw string value
+            variableBody = new JSONObject();
+            variableBody.put("name", "newVariable");
+            variableBody.put("value", "test value");
+            variableBody.put("scope", "global");
+            
+            resultEntry = tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
+            assertNotNull(resultEntry);
+            result = (JSONObject) resultEntry.get("entry");
+            assertEquals("newVariable", result.get("name"));
+            assertEquals("test value", result.get("value"));
+            assertEquals("d:text", result.get("type"));
+            assertEquals("global", result.get("scope")); 
+            assertEquals("test value", activitiProcessEngine.getRuntimeService().getVariable(processInstance.getId(), "newVariable"));
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testUpdateTaskVariablesExceptions() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            
+            // Update without name
+            JSONObject variableBody = new JSONObject();
+            variableBody.put("value", 1234);
+            variableBody.put("scope", "global");
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            try 
+            {
+                tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Variable name is required.", expected.getHttpResponse());
+            }
+            
+            // Update without scope
+            variableBody = new JSONObject();
+            variableBody.put("value", 1234);
+            variableBody.put("name", "newVariable");
+            
+            try 
+            {
+                tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Variable scope is required and can only be 'local' or 'global'.", expected.getHttpResponse());
+            }
+            
+            // Update in 'any' scope
+            variableBody = new JSONObject();
+            variableBody.put("value", 1234);
+            variableBody.put("name", "newVariable");
+            variableBody.put("scope", "any");
+            
+            try 
+            {
+                tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Variable scope is required and can only be 'local' or 'global'.", expected.getHttpResponse());
+            }
+            
+            // Update in illegal scope
+            variableBody = new JSONObject();
+            variableBody.put("value", 1234);
+            variableBody.put("name", "newVariable");
+            variableBody.put("scope", "illegal");
+            
+            try 
+            {
+                tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Illegal value for variable scope: 'illegal'.", expected.getHttpResponse());
+            }
+            
+            // Update using unsupported type
+            variableBody = new JSONObject();
+            variableBody.put("value", 1234);
+            variableBody.put("name", "newVariable");
+            variableBody.put("scope", "local");
+            variableBody.put("type", "d:unexisting");
+            
+            try 
+            {
+                tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Unsupported type of variable: 'd:unexisting'.", expected.getHttpResponse());
+            }
+            
+            // Update using unsupported type (invalid QName)
+            variableBody = new JSONObject();
+            variableBody.put("value", 1234);
+            variableBody.put("name", "newVariable");
+            variableBody.put("scope", "local");
+            variableBody.put("type", " 12unexisting");
+            
+            try 
+            {
+                tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Unsupported type of variable: ' 12unexisting'.", expected.getHttpResponse());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testUpdateTaskVariableWithWrongType() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        ProcessInfo processRest = startParallelReviewProcess(requestContext);
+        
+        try
+        {
+            List<Task> tasks = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processRest.getId()).list();
+            assertNotNull(tasks);
+            
+            String taskId = tasks.get(0).getId();
+            
+            // Update an existing variable with wrong type
+            JSONObject variableJson = new JSONObject();
+            variableJson.put("name", "wf_requiredApprovePercent");
+            variableJson.put("value", 55.99);
+            variableJson.put("type", "d:double");
+            variableJson.put("scope", "global");
+            
+            try 
+            {
+                publicApiClient.tasksClient().updateTaskVariable(taskId, "wf_requiredApprovePercent", variableJson);
+                fail("Exception expected");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), e.getHttpResponse().getStatusCode());
+            }
+            
+            variableJson = new JSONObject();
+            variableJson.put("name", "wf_requiredApprovePercent");
+            variableJson.put("value", 55.99);
+            variableJson.put("type", "d:int");
+            variableJson.put("scope", "global");
+            
+            JSONObject resultEntry = publicApiClient.tasksClient().updateTaskVariable(taskId, "wf_requiredApprovePercent", variableJson);
+            assertNotNull(resultEntry);
+            JSONObject result = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("wf_requiredApprovePercent", result.get("name"));
+            assertEquals(55l, result.get("value"));
+            assertEquals("d:int", result.get("type"));
+            assertEquals(55, activitiProcessEngine.getRuntimeService().getVariable(processRest.getId(), "wf_requiredApprovePercent"));
+            
+            JSONObject taskVariables = publicApiClient.tasksClient().findTaskVariables(taskId);
+            assertNotNull(taskVariables);
+            JSONObject list = (JSONObject) taskVariables.get("list");
+            assertNotNull(list);
+            
+            // Add process variables to map for easy lookup
+            Map<String, JSONObject> variablesByName = new HashMap<String, JSONObject>();
+            JSONObject entry = null;
+            JSONArray entries = (JSONArray) list.get("entries");
+            assertNotNull(entries);
+            for(int i=0; i<entries.size(); i++) 
+            {
+                entry = (JSONObject) entries.get(i);
+                assertNotNull(entry);
+                entry = (JSONObject) entry.get("entry");
+                assertNotNull(entry);
+                variablesByName.put((String) entry.get("name"), entry);
+            }
+            
+            JSONObject approvePercentObject = variablesByName.get("wf_requiredApprovePercent");
+            assertNotNull(approvePercentObject);
+            assertEquals(55l, approvePercentObject.get("value"));
+            assertEquals("d:int", approvePercentObject.get("type"));
+            
+            // set a new variable
+            variableJson = new JSONObject();
+            variableJson.put("name", "testVariable");
+            variableJson.put("value", "text");
+            variableJson.put("type", "d:text");
+            variableJson.put("scope", "local");
+            
+            resultEntry = publicApiClient.tasksClient().updateTaskVariable(taskId, "testVariable", variableJson);
+            assertNotNull(resultEntry);
+            result = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("testVariable", result.get("name"));
+            assertEquals("text", result.get("value"));
+            assertEquals("d:text", result.get("type"));
+            assertEquals("text", activitiProcessEngine.getTaskService().getVariable(taskId, "testVariable"));
+            
+            // change the variable value and type (should be working because no content model type)
+            variableJson = new JSONObject();
+            variableJson.put("name", "testVariable");
+            variableJson.put("value", 123);
+            variableJson.put("type", "d:int");
+            variableJson.put("scope", "local");
+            
+            resultEntry = publicApiClient.tasksClient().updateTaskVariable(taskId, "testVariable", variableJson);
+            assertNotNull(resultEntry);
+            result = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("testVariable", result.get("name"));
+            assertEquals(123l, result.get("value"));
+            assertEquals("d:int", result.get("type"));
+            assertEquals(123, activitiProcessEngine.getTaskService().getVariable(taskId, "testVariable"));
+            
+            // change the variable value for a list of noderefs (bpm_assignees)
+            final JSONObject updateAssigneesJson = new JSONObject();
+            updateAssigneesJson.put("name", "bpm_assignees");
+            updateAssigneesJson.put("type", "d:noderef");
+            updateAssigneesJson.put("scope", "global");
+            
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    JSONArray assigneeArray = new JSONArray();
+                    assigneeArray.add(requestContext.getRunAsUser());
+                    updateAssigneesJson.put("value", assigneeArray);
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            
+            resultEntry = publicApiClient.tasksClient().updateTaskVariable(taskId, "bpm_assignees", updateAssigneesJson);
+            assertNotNull(resultEntry);
+            final JSONObject updateAssigneeResult = (JSONObject) resultEntry.get("entry");
+            
+            assertEquals("bpm_assignees", updateAssigneeResult.get("name"));
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    JSONArray assigneeArray = (JSONArray) updateAssigneeResult.get("value");
+                    assertNotNull(assigneeArray);
+                    assertEquals(1, assigneeArray.size());
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            
+            assertEquals("d:noderef", updateAssigneeResult.get("type"));
+            
+            // update the bpm_assignees with a single entry, should result in an error
+            final JSONObject updateAssigneeJson = new JSONObject();
+            updateAssigneeJson.put("name", "bpm_assignees");
+            updateAssigneeJson.put("type", "d:noderef");
+            updateAssigneeJson.put("scope", "global");
+            
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    updateAssigneeJson.put("value", requestContext.getRunAsUser());
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            
+            try 
+            {
+                publicApiClient.tasksClient().updateTaskVariable(taskId, "bpm_assignees", updateAssigneeJson);
+                fail("Exception expected");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.BAD_REQUEST.value(), e.getHttpResponse().getStatusCode());
+            }
+            
+        }
+        finally
+        {
+            cleanupProcessInstance(processRest.getId());
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testUpdateTaskVariablesAuthentication() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String initiator = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        
+        // Start process by one user and try to access the task variables as the task assignee instead of the process
+        // initiator to see if the assignee is authorized to get the task
+        ProcessInstance processInstance = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        try
+        {
+            JSONObject variableBody = new JSONObject();
+            variableBody.put("name", "newVariable");
+            variableBody.put("value", 1234);
+            variableBody.put("scope", "global");
+            
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Try updating task variables when NOT involved in the task
+            try 
+            {
+                tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
+                fail("Exception expected");
+            } 
+            catch(PublicApiException expected) 
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+            
+            // Set assignee, task variables should be updatable now
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), requestContext.getRunAsUser());
+            JSONObject jsonObject = tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
+            assertNotNull(jsonObject);
+            
+            // Updating task variables as admin should be possible
+            String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+            publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+            jsonObject = tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
+            assertNotNull(jsonObject);
+            
+            // Updating the task variables as a admin from another tenant shouldn't be possible
+            TestNetwork anotherNetwork = getOtherNetwork(requestContext.getNetworkId());
+            tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + anotherNetwork.getId();
+            publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+            try 
+            {
+                jsonObject = tasksClient.updateTaskVariable(task.getId(), "newVariable", variableBody);
+                fail("Exception expected");
+            } 
+            catch(PublicApiException expected) 
+            {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testCreateTaskVariablesPresentInModel() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            
+            Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId());
+            Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId());
+            assertEquals(5, actualGlobalVariables.size());
+            assertEquals(8, actualLocalVariables.size());
+            
+            // Update a global value that is present in the model with type given
+            JSONArray variablesArray = new JSONArray();
+            JSONObject variableBody = new JSONObject();
+            variableBody.put("name", "bpm_percentComplete");
+            variableBody.put("value", 20);
+            variableBody.put("type", "d:int");
+            variableBody.put("scope", "global");
+            variablesArray.add(variableBody);
+            variableBody = new JSONObject();
+            variableBody.put("name", "bpm_workflowPriority");
+            variableBody.put("value", 50);
+            variableBody.put("type", "d:int");
+            variableBody.put("scope", "local");
+            variablesArray.add(variableBody);
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            JSONObject result = tasksClient.createTaskVariables(task.getId(), variablesArray);
+            assertNotNull(result);
+            JSONObject resultObject = (JSONObject) result.get("list");
+            JSONArray resultList = (JSONArray) resultObject.get("entries");
+            assertEquals(2, resultList.size());
+            JSONObject firstResultObject = (JSONObject) ((JSONObject) resultList.get(0)).get("entry");
+            assertEquals("bpm_percentComplete", firstResultObject.get("name"));
+            assertEquals(20L, firstResultObject.get("value"));
+            assertEquals("d:int", firstResultObject.get("type"));
+            assertEquals("global", firstResultObject.get("scope")); 
+            assertEquals(20, activitiProcessEngine.getRuntimeService().getVariable(processInstance.getId(), "bpm_percentComplete"));
+            
+            JSONObject secondResultObject = (JSONObject) ((JSONObject) resultList.get(1)).get("entry");
+            assertEquals("bpm_workflowPriority", secondResultObject.get("name"));
+            assertEquals(50L, secondResultObject.get("value"));
+            assertEquals("d:int", secondResultObject.get("type"));
+            assertEquals("local", secondResultObject.get("scope")); 
+            assertEquals(50, activitiProcessEngine.getTaskService().getVariable(task.getId(), "bpm_workflowPriority"));
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    public void testGetTaskVariablesRawVariableTypes() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            
+            Calendar dateCal = Calendar.getInstance();
+            
+            // Set all supported variables on the task to check the resulting types
+            Map<String, Object> variablesToSet = new HashMap<String, Object>();
+            variablesToSet.put("testVarString", "string");
+            variablesToSet.put("testVarInteger", 1234);
+            variablesToSet.put("testVarLong", 123456789L);
+            variablesToSet.put("testVarDouble", 1234.5678D);
+            variablesToSet.put("testVarFloat", 1234.0F);
+            variablesToSet.put("testVarBoolean", Boolean.TRUE);
+            variablesToSet.put("testVarDate", dateCal.getTime());
+            variablesToSet.put("testVarQName", ContentModel.TYPE_AUTHORITY);
+            variablesToSet.put("testVarNodeRef", new ActivitiScriptNode(new NodeRef("workspace:///testNode"), serviceRegistry));
+            variablesToSet.put("testVarRawNodeRef", new NodeRef("workspace:///testNode"));
+            
+            activitiProcessEngine.getTaskService().setVariablesLocal(task.getId(), variablesToSet);
+            Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId());
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Get all local variables
+            JSONObject variables = tasksClient.findTaskVariables(task.getId(), Collections.singletonMap("where", "(scope = local)"));
+            assertNotNull(variables);
+            JSONObject list = (JSONObject) variables.get("list");
+            assertNotNull(list);
+            JSONArray entries = (JSONArray) list.get("entries");
+            assertNotNull(entries);
+            
+            // Check pagination object for size
+            JSONObject pagination = (JSONObject) list.get("pagination");
+            assertNotNull(pagination);
+            assertEquals(actualLocalVariables.size(), ((Long)pagination.get("count")).intValue());
+            assertEquals(actualLocalVariables.size(), ((Long)pagination.get("totalItems")).intValue());
+            assertEquals(0L, pagination.get("skipCount"));
+            assertFalse((Boolean) pagination.get("hasMoreItems"));
+            
+            assertEquals(actualLocalVariables.size(), entries.size());
+            
+            // Add JSON entries to map for easy access when asserting values
+            Map<String, JSONObject> entriesByName = new HashMap<String, JSONObject>();
+            for (int i = 0; i < entries.size(); i++)
+            {
+                JSONObject var = (JSONObject) entries.get(i);
+                entriesByName.put((String) ((JSONObject) var.get("entry")).get("name"), (JSONObject) var.get("entry"));
+            }
+            
+            // Check all values and types
+            JSONObject var = entriesByName.get("testVarString");
+            assertNotNull(var);
+            assertEquals("d:text", var.get("type"));
+            assertEquals("string", var.get("value"));
+            
+            var = entriesByName.get("testVarInteger");
+            assertNotNull(var);
+            assertEquals("d:int", var.get("type"));
+            assertEquals(1234L, var.get("value"));
+            
+            var = entriesByName.get("testVarLong");
+            assertNotNull(var);
+            assertEquals("d:long", var.get("type"));
+            assertEquals(123456789L, var.get("value"));
+            
+            var = entriesByName.get("testVarDouble");
+            assertNotNull(var);
+            assertEquals("d:double", var.get("type"));
+            assertEquals(1234.5678D, var.get("value"));
+            
+            var = entriesByName.get("testVarFloat");
+            assertNotNull(var);
+            assertEquals("d:float", var.get("type"));
+            assertEquals(1234.0D, var.get("value"));
+            
+            var = entriesByName.get("testVarBoolean");
+            assertNotNull(var);
+            assertEquals("d:boolean", var.get("type"));
+            assertEquals(Boolean.TRUE, var.get("value"));
+            
+            var = entriesByName.get("testVarDate");
+            assertNotNull(var);
+            assertEquals("d:datetime", var.get("type"));
+            assertEquals(dateCal.getTime(), parseDate(var, "value"));
+            
+            var = entriesByName.get("testVarQName");
+            assertNotNull(var);
+            assertEquals("d:qname", var.get("type"));
+            assertEquals("cm:authority", var.get("value"));
+            
+            var = entriesByName.get("testVarRawNodeRef");
+            assertNotNull(var);
+            assertEquals("d:noderef", var.get("type"));
+            assertEquals("workspace:///testNode", var.get("value"));
+            
+            var = entriesByName.get("testVarNodeRef");
+            assertNotNull(var);
+            assertEquals("d:noderef", var.get("type"));
+            assertEquals("workspace:///testNode", var.get("value"));
+               
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    public void testGetTaskVariablesScoped() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            
+            Map<String, Object> actualLocalVariables = activitiProcessEngine.getTaskService().getVariablesLocal(task.getId());
+            Map<String, Object> actualGlobalVariables = activitiProcessEngine.getRuntimeService().getVariables(processInstance.getId());
+            assertEquals(5, actualGlobalVariables.size());
+            assertEquals(8, actualLocalVariables.size());
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            JSONObject variables = tasksClient.findTaskVariables(task.getId(), Collections.singletonMap("where", "(scope = local)"));
+            assertNotNull(variables);
+            JSONObject list = (JSONObject) variables.get("list");
+            assertNotNull(list);
+            JSONArray entries = (JSONArray) list.get("entries");
+            assertNotNull(entries);
+            
+            // Check pagination object for size
+            JSONObject pagination = (JSONObject) list.get("pagination");
+            assertNotNull(pagination);
+            assertEquals(8L, pagination.get("count"));
+            assertEquals(8L, pagination.get("totalItems"));
+            assertEquals(0L, pagination.get("skipCount"));
+            assertFalse((Boolean) pagination.get("hasMoreItems"));
+            
+            assertEquals(actualLocalVariables.size(), entries.size());
+            
+            Set<String> expectedLocalVars = new HashSet<String>();
+            expectedLocalVars.addAll(actualLocalVariables.keySet());
+            
+            for(int i=0; i < entries.size(); i++) 
+            {
+                JSONObject entry = (JSONObject) ((JSONObject) entries.get(i)).get("entry");
+                assertNotNull(entry);
+                
+                // Check if full entry is present with correct scope
+                assertEquals("local", entry.get("scope"));
+                assertNotNull(entry.get("name"));
+                assertNotNull(entry.get("type"));
+                if(!entry.get("name").equals("bpm_hiddenTransitions")) {
+                    assertNotNull(entry.get("value"));
+                }
+                expectedLocalVars.remove(entry.get("name"));
+            }
+            
+            assertEquals(0, expectedLocalVars.size());
+            
+            // Now check the global scope
+            variables = tasksClient.findTaskVariables(task.getId(), Collections.singletonMap("where", "(scope = global)"));
+            assertNotNull(variables);
+            list = (JSONObject) variables.get("list");
+            assertNotNull(list);
+            entries = (JSONArray) list.get("entries");
+            assertNotNull(entries);
+            
+            // Check pagination object for size
+            pagination = (JSONObject) list.get("pagination");
+            assertNotNull(pagination);
+            assertEquals(4L, pagination.get("count"));
+            assertEquals(4L, pagination.get("totalItems"));
+            assertEquals(0L, pagination.get("skipCount"));
+            assertFalse((Boolean) pagination.get("hasMoreItems"));
+            
+            // Should contain one variable less than the actual variables in the engine, tenant-domain var is filtered out
+            assertEquals(actualGlobalVariables.size() - 1, entries.size());
+            
+            Set<String> expectedGlobalVars = new HashSet<String>();
+            expectedGlobalVars.addAll(actualGlobalVariables.keySet());
+            expectedGlobalVars.remove(ActivitiConstants.VAR_TENANT_DOMAIN);
+            
+            for(int i=0; i < entries.size(); i++) 
+            {
+                JSONObject entry = (JSONObject) ((JSONObject) entries.get(i)).get("entry");
+                assertNotNull(entry);
+                
+                // Check if full entry is present with correct scope
+                assertEquals("global", entry.get("scope"));
+                assertNotNull(entry.get("name"));
+                assertNotNull(entry.get("type"));
+                assertNotNull(entry.get("value"));
+                expectedGlobalVars.remove(entry.get("name"));
+            }
+            
+            // Check if all variables are present
+            assertEquals(0, expectedGlobalVars.size());
+            
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    public void testGetTaskVariablesReview() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+
+        ProcessInfo processInstance = startParallelReviewProcess(requestContext);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery()
+                    .processInstanceId(processInstance.getId())
+                    .taskAssignee(requestContext.getRunAsUser())
+                    .singleResult();
+            
+            assertNotNull(task);
+            
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            JSONObject variables = tasksClient.findTaskVariables(task.getId());
+            assertNotNull(variables);
+            JSONObject list = (JSONObject) variables.get("list");
+            assertNotNull(list);
+            JSONArray entries = (JSONArray) list.get("entries");
+            assertNotNull(entries);
+            
+            // Check pagination object for size
+            JSONObject pagination = (JSONObject) list.get("pagination");
+            assertNotNull(pagination);
+            assertEquals(42L, pagination.get("count"));
+            assertEquals(42L, pagination.get("totalItems"));
+            assertEquals(0L, pagination.get("skipCount"));
+            assertFalse((Boolean) pagination.get("hasMoreItems"));
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance.getId());
+        }
+    }
+    
+    @Test
+    public void testDeleteTaskVariable() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        activitiProcessEngine.getRuntimeService().setVariable(processInstance.getId(), "overlappingVariable", "Value set in process");
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            activitiProcessEngine.getTaskService().setVariableLocal(task.getId(), "myVariable", "This is a variable");
+            activitiProcessEngine.getTaskService().setVariableLocal(task.getId(), "overlappingVariable", "Value set in task");
+            
+            // Delete a task-variable
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            tasksClient.deleteTaskVariable(task.getId(), "myVariable");
+            assertFalse(activitiProcessEngine.getTaskService().hasVariableLocal(task.getId(), "myVariable"));
+            
+            // Delete a task-variable that has the same name as a global process-variable - which should remain untouched after delete
+            tasksClient.deleteTaskVariable(task.getId(), "overlappingVariable");
+            assertFalse(activitiProcessEngine.getTaskService().hasVariableLocal(task.getId(), "overlappingVariable"));
+            assertTrue(activitiProcessEngine.getRuntimeService().hasVariable(processInstance.getId(), "overlappingVariable"));
+            assertEquals("Value set in process", activitiProcessEngine.getRuntimeService().getVariable(processInstance.getId(), "overlappingVariable"));
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    public void testDeleteTaskVariableExceptions() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        activitiProcessEngine.getRuntimeService().setVariable(processInstance.getId(), "overlappingVariable", "Value set in process");
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+           
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            
+            // Delete a variable on an unexisting task
+            try 
+            {
+                tasksClient.deleteTaskVariable("unexisting", "myVar");
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("The entity with id: unexisting was not found", expected.getHttpResponse());
+            }
+            
+            // Delete an unexisting variable on an existing task
+            try 
+            {
+                tasksClient.deleteTaskVariable(task.getId(), "unexistingVarName");
+                fail("Exception expected");
+            }
+            catch(PublicApiException expected)
+            {
+                assertEquals(HttpStatus.NOT_FOUND.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("The entity with id: unexistingVarName was not found", expected.getHttpResponse());
+            }
+            
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    public void testDeleteTaskVariableAuthentication() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String initiator = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        
+        // Start process by one user and try to access the task variables as the task assignee instead of the process
+        // initiator to see if the assignee is authorized to get the task
+        ProcessInstance processInstance = startAdhocProcess(initiator, requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            activitiProcessEngine.getTaskService().setVariableLocal(task.getId(), "existingVariable", "Value");
+            
+            // Try updating task variables when NOT involved in the task
+            try {
+                tasksClient.deleteTaskVariable(task.getId(), "existingVariable");
+                fail("Exception expected");
+            } catch(PublicApiException expected) {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+            assertTrue(activitiProcessEngine.getTaskService().hasVariableLocal(task.getId(), "existingVariable"));
+            
+            // Set assignee, task variables should be updatable now
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), requestContext.getRunAsUser());
+            tasksClient.deleteTaskVariable(task.getId(), "existingVariable");
+            assertFalse(activitiProcessEngine.getTaskService().hasVariableLocal(task.getId(), "existingVariable"));
+            activitiProcessEngine.getTaskService().setVariableLocal(task.getId(), "existingVariable", "Value");
+            
+            // Updating task variables as admin should be possible
+            String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+            publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+            tasksClient.deleteTaskVariable(task.getId(), "existingVariable");
+            assertFalse(activitiProcessEngine.getTaskService().hasVariableLocal(task.getId(), "existingVariable"));
+            activitiProcessEngine.getTaskService().setVariableLocal(task.getId(), "existingVariable", "Value");
+            
+            // Updating the task variables as a admin from another tenant shouldn't be possible
+            TestNetwork anotherNetwork = getOtherNetwork(requestContext.getNetworkId());
+            tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + anotherNetwork.getId();
+            publicApiClient.setRequestContext(new RequestContext(TenantUtil.DEFAULT_TENANT, tenantAdmin));
+            try {
+                tasksClient.deleteTaskVariable(task.getId(), "existingVariable");
+                fail("Exception expected");
+            } catch(PublicApiException expected) {
+                assertEquals(HttpStatus.FORBIDDEN.value(), expected.getHttpResponse().getStatusCode());
+                assertErrorSummary("Permission was denied", expected.getHttpResponse());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    @Test
+    public void testGetTaskModel() throws Exception
+    {
+        RequestContext requestContext = initApiClientWithTestUser();
+        
+        String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        RequestContext otherContext = new RequestContext(requestContext.getNetworkId(), otherPerson);
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+        
+        ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
+        try
+        {
+            Task task = activitiProcessEngine.getTaskService().createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+            assertNotNull(task);
+            
+            JSONObject model = publicApiClient.tasksClient().findTaskFormModel(task.getId());
+            assertNotNull(model);
+            
+            JSONArray entries = (JSONArray) model.get("entries");
+            assertNotNull(entries);
+            
+            // Add all entries to a map, to make lookup easier
+            Map<String, JSONObject> modelFieldsByName = createEntryMap(entries);
+            testModelEntries(modelFieldsByName);
+            
+            // get task form model with admin
+            publicApiClient.setRequestContext(adminContext);
+            model = publicApiClient.tasksClient().findTaskFormModel(task.getId());
+            assertNotNull(model);
+            
+            entries = (JSONArray) model.get("entries");
+            assertNotNull(entries);
+            
+            modelFieldsByName = createEntryMap(entries);
+            testModelEntries(modelFieldsByName);
+            
+            // get task form model with non involved user
+            publicApiClient.setRequestContext(otherContext);
+            try
+            {
+                publicApiClient.tasksClient().findTaskFormModel(task.getId());
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(403, e.getHttpResponse().getStatusCode());
+            }
+            
+            // get task form model with invalid task id
+            publicApiClient.setRequestContext(requestContext);
+            try
+            {
+                publicApiClient.tasksClient().findTaskFormModel("fakeid");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processInstance);
+        }
+    }
+    
+    protected Map<String, JSONObject> createEntryMap(JSONArray entries)
+    {
+        Map<String, JSONObject> modelFieldsByName = new HashMap<String, JSONObject>();
+        JSONObject entry = null;
+        for(int i=0; i<entries.size(); i++) 
+        {
+            entry = (JSONObject) entries.get(i);
+            assertNotNull(entry);
+            entry = (JSONObject) entry.get("entry");
+            assertNotNull(entry);
+            modelFieldsByName.put((String) entry.get("name"), entry);
+        }
+        return modelFieldsByName;
+    }
+    
+    protected void testModelEntries(Map<String, JSONObject> modelFieldsByName)
+    {
+        // Check well-known properties and their types
+        
+        // Validate bpm:completionDate
+        JSONObject modelEntry = modelFieldsByName.get("bpm_completionDate");
+        assertNotNull(modelEntry);
+        assertEquals("Completion Date", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/bpm/1.0}completionDate", modelEntry.get("qualifiedName"));
+        assertEquals("d:date", modelEntry.get("dataType"));
+        assertFalse((Boolean)modelEntry.get("required"));
+        
+        // Validate cm:owner
+        modelEntry = modelFieldsByName.get("cm_owner");
+        assertNotNull(modelEntry);
+        assertEquals("Owner", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/content/1.0}owner", modelEntry.get("qualifiedName"));
+        assertEquals("d:text", modelEntry.get("dataType"));
+        assertFalse((Boolean)modelEntry.get("required"));
+        
+        // Validate bpm:package
+        modelEntry = modelFieldsByName.get("bpm_package");
+        assertNotNull(modelEntry);
+        assertEquals("Content Package", modelEntry.get("title"));
+        assertEquals("{http://www.alfresco.org/model/bpm/1.0}package", modelEntry.get("qualifiedName"));
+        assertEquals("bpm:workflowPackage", modelEntry.get("dataType"));
+        assertFalse((Boolean)modelEntry.get("required"));
+    }
+    
+    @Test
+    public void testGetTaskItems() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        RequestContext otherContext = new RequestContext(requestContext.getNetworkId(), otherPerson);
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+        
+        // Create test-document and add to package
+        NodeRef[] docNodeRefs = createTestDocuments(requestContext);
+        ProcessInfo processInfo = startAdhocProcess(requestContext, docNodeRefs);
+        
+        final Task task = activitiProcessEngine.getTaskService().createTaskQuery()
+            .processInstanceId(processInfo.getId()).singleResult();
+        
+        assertNotNull(task);
+        activitiProcessEngine.getTaskService().setAssignee(task.getId(), null);
+        
+        try
+        {
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            JSONObject itemsJSON = tasksClient.findTaskItems(task.getId());
+            assertNotNull(itemsJSON);
+            JSONArray entriesJSON = (JSONArray) itemsJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 2);
+            boolean doc1Found = false;
+            boolean doc2Found = false;
+            for (Object entryObject : entriesJSON)
+            {
+                JSONObject entryObjectJSON = (JSONObject) entryObject;
+                JSONObject entryJSON = (JSONObject) entryObjectJSON.get("entry");
+                if (entryJSON.get("name").equals("Test Doc1")) {
+                    doc1Found = true;
+                    assertEquals(docNodeRefs[0].getId(), entryJSON.get("id"));
+                    assertEquals("Test Doc1", entryJSON.get("name"));
+                    assertEquals("Test Doc1 Title", entryJSON.get("title"));
+                    assertEquals("Test Doc1 Description", entryJSON.get("description"));
+                    assertNotNull(entryJSON.get("createdAt"));
+                    assertEquals(requestContext.getRunAsUser(), entryJSON.get("createdBy"));
+                    assertNotNull(entryJSON.get("modifiedAt"));
+                    assertEquals(requestContext.getRunAsUser(), entryJSON.get("modifiedBy"));
+                    assertNotNull(entryJSON.get("size"));
+                    assertNotNull(entryJSON.get("mimeType"));
+                } else {
+                    doc2Found = true;
+                    assertEquals(docNodeRefs[1].getId(), entryJSON.get("id"));
+                    assertEquals("Test Doc2", entryJSON.get("name"));
+                    assertEquals("Test Doc2 Title", entryJSON.get("title"));
+                    assertEquals("Test Doc2 Description", entryJSON.get("description"));
+                    assertNotNull(entryJSON.get("createdAt"));
+                    assertEquals(requestContext.getRunAsUser(), entryJSON.get("createdBy"));
+                    assertNotNull(entryJSON.get("modifiedAt"));
+                    assertEquals(requestContext.getRunAsUser(), entryJSON.get("modifiedBy"));
+                    assertNotNull(entryJSON.get("size"));
+                    assertNotNull(entryJSON.get("mimeType"));
+                }
+            }
+            assertTrue(doc1Found);
+            assertTrue(doc2Found);
+            
+            // get with admin
+            publicApiClient.setRequestContext(adminContext);
+            itemsJSON = tasksClient.findTaskItems(task.getId());
+            assertNotNull(itemsJSON);
+            entriesJSON = (JSONArray) itemsJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 2);
+            
+            // get with non involved user
+            publicApiClient.setRequestContext(otherContext);
+            try
+            {
+                tasksClient.findTaskItems(task.getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(403, e.getHttpResponse().getStatusCode());
+            }
+            
+            // get with candidate user
+            activitiProcessEngine.getTaskService().addCandidateUser(task.getId(), otherContext.getRunAsUser());
+            publicApiClient.setRequestContext(otherContext);
+            itemsJSON = tasksClient.findTaskItems(task.getId());
+            assertNotNull(itemsJSON);
+            entriesJSON = (JSONArray) itemsJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 2);
+            
+            // get with user from candidate group with no assignee
+            List<MemberOfSite> memberships = getTestFixture().getNetwork(otherContext.getNetworkId()).getSiteMemberships(otherContext.getRunAsUser());
+            assertTrue(memberships.size() > 0);
+            MemberOfSite memberOfSite = memberships.get(0);
+            String group = "GROUP_site_" + memberOfSite.getSiteId() + "_" + memberOfSite.getRole().name();
+            
+            activitiProcessEngine.getTaskService().deleteCandidateUser(task.getId(), otherContext.getRunAsUser());
+            activitiProcessEngine.getTaskService().addCandidateGroup(task.getId(), group);
+            publicApiClient.setRequestContext(otherContext);
+            itemsJSON = tasksClient.findTaskItems(task.getId());
+            assertNotNull(itemsJSON);
+            entriesJSON = (JSONArray) itemsJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 2);
+            
+            // get with user from candidate group with assignee
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), requestContext.getRunAsUser());
+            try
+            {
+                tasksClient.findTaskItems(task.getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(403, e.getHttpResponse().getStatusCode());
+            }
+            
+            // invalid task id
+            publicApiClient.setRequestContext(requestContext);
+            try
+            {
+                tasksClient.findTaskItems("fakeid");
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // get items from completed task with initiator
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    activitiProcessEngine.getTaskService().complete(task.getId());
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            
+            publicApiClient.setRequestContext(requestContext);
+            itemsJSON = tasksClient.findTaskItems(task.getId());
+            assertNotNull(itemsJSON);
+            entriesJSON = (JSONArray) itemsJSON.get("entries");
+            assertNotNull(entriesJSON);
+            assertTrue(entriesJSON.size() == 2);
+            
+            // get items from completed task with user from candidate group
+            publicApiClient.setRequestContext(otherContext);
+            try
+            {
+                tasksClient.findTaskItems(task.getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(403, e.getHttpResponse().getStatusCode());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processInfo.getId());
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testAddTaskItem() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        RequestContext otherContext = new RequestContext(requestContext.getNetworkId(), otherPerson);
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+        
+        // Create test-document and add to package
+        NodeRef[] docNodeRefs = createTestDocuments(requestContext);
+        ProcessInfo processInfo = startAdhocProcess(requestContext, null);
+        
+        final Task task = activitiProcessEngine.getTaskService()
+                .createTaskQuery()
+                .processInstanceId(processInfo.getId())
+                .singleResult();
+        
+        assertNotNull(task);
+        activitiProcessEngine.getTaskService().setAssignee(task.getId(), null);
+        
+        try
+        {
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            JSONObject createItemObject = new JSONObject();
+            createItemObject.put("id", docNodeRefs[0].getId());
+            JSONObject result = tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+            
+            assertNotNull(result);
+            assertEquals(docNodeRefs[0].getId(), result.get("id"));
+            assertEquals("Test Doc1", result.get("name"));
+            assertEquals("Test Doc1 Title", result.get("title"));
+            assertEquals("Test Doc1 Description", result.get("description"));
+            assertNotNull(result.get("createdAt"));
+            assertEquals(requestContext.getRunAsUser(), result.get("createdBy"));
+            assertNotNull(result.get("modifiedAt"));
+            assertEquals(requestContext.getRunAsUser(), result.get("modifiedBy"));
+            assertNotNull(result.get("size"));
+            assertNotNull(result.get("mimeType"));
+            
+            JSONObject itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            
+            tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+            try
+            {
+                tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // add item as admin
+            publicApiClient.setRequestContext(adminContext);
+            result = tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+            assertNotNull(result);
+            assertEquals(docNodeRefs[0].getId(), result.get("id"));
+            assertEquals("Test Doc1", result.get("name"));
+            
+            itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            
+            tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+            try
+            {
+                tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // add item with candidate user
+            activitiProcessEngine.getTaskService().addCandidateUser(task.getId(), otherPerson);
+            publicApiClient.setRequestContext(otherContext);
+            result = tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+            assertNotNull(result);
+            assertEquals(docNodeRefs[0].getId(), result.get("id"));
+            assertEquals("Test Doc1", result.get("name"));
+            
+            itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            
+            tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+            try
+            {
+                tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // add item with not involved user
+            activitiProcessEngine.getTaskService().deleteCandidateUser(task.getId(), otherPerson);
+            publicApiClient.setRequestContext(otherContext);
+            try
+            {
+                tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(403, e.getHttpResponse().getStatusCode());
+            }
+            
+            // add item with user from candidate group with no assignee
+            List<MemberOfSite> memberships = getTestFixture().getNetwork(otherContext.getNetworkId()).getSiteMemberships(otherContext.getRunAsUser());
+            assertTrue(memberships.size() > 0);
+            MemberOfSite memberOfSite = memberships.get(0);
+            String group = "GROUP_site_" + memberOfSite.getSiteId() + "_" + memberOfSite.getRole().name();
+            
+            activitiProcessEngine.getTaskService().deleteCandidateUser(task.getId(), otherContext.getRunAsUser());
+            activitiProcessEngine.getTaskService().addCandidateGroup(task.getId(), group);
+            publicApiClient.setRequestContext(otherContext);
+            result = tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+            assertNotNull(result);
+            assertEquals(docNodeRefs[0].getId(), result.get("id"));
+            assertEquals("Test Doc1", result.get("name"));
+            
+            itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            
+            tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+            try
+            {
+                tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // add item with user from candidate group with assignee
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), requestContext.getRunAsUser());
+            publicApiClient.setRequestContext(otherContext);
+            try
+            {
+                tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(403, e.getHttpResponse().getStatusCode());
+            }
+            
+            // invalid task id
+            publicApiClient.setRequestContext(requestContext);
+            try
+            {
+                tasksClient.addTaskItem("fakeid", createItemObject.toJSONString());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // invalid item id
+            createItemObject = new JSONObject();
+            createItemObject.put("id", "fakeid");
+            try
+            {
+                tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // add item to completed task
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    activitiProcessEngine.getTaskService().complete(task.getId());
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            
+            createItemObject = new JSONObject();
+            createItemObject.put("id", docNodeRefs[0].getId());
+            try
+            {
+                tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processInfo.getId());
+        }
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testDeleteTaskItem() throws Exception
+    {
+        final RequestContext requestContext = initApiClientWithTestUser();
+        
+        String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
+        RequestContext otherContext = new RequestContext(requestContext.getNetworkId(), otherPerson);
+        
+        String tenantAdmin = AuthenticationUtil.getAdminUserName() + "@" + requestContext.getNetworkId();
+        RequestContext adminContext = new RequestContext(requestContext.getNetworkId(), tenantAdmin);
+        
+        // Create test-document and add to package
+        NodeRef[] docNodeRefs = createTestDocuments(requestContext);
+        ProcessInfo processInfo = startAdhocProcess(requestContext, docNodeRefs);
+        
+        final Task task = activitiProcessEngine.getTaskService()
+                .createTaskQuery()
+                .processInstanceId(processInfo.getId())
+                .singleResult();
+        
+        assertNotNull(task);
+        activitiProcessEngine.getTaskService().setAssignee(task.getId(), null);
+        
+        try
+        {
+            TasksClient tasksClient = publicApiClient.tasksClient();
+            tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+            
+            try
+            {
+                tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // delete item as admin
+            JSONObject createItemObject = new JSONObject();
+            createItemObject.put("id", docNodeRefs[0].getId());
+            JSONObject result = tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+            
+            assertNotNull(result);
+            assertEquals(docNodeRefs[0].getId(), result.get("id"));
+            
+            JSONObject itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            
+            publicApiClient.setRequestContext(adminContext);
+            tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+            try
+            {
+                tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // delete item with candidate user
+            createItemObject = new JSONObject();
+            createItemObject.put("id", docNodeRefs[0].getId());
+            result = tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+            
+            assertNotNull(result);
+            assertEquals(docNodeRefs[0].getId(), result.get("id"));
+            
+            itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            
+            activitiProcessEngine.getTaskService().addCandidateUser(task.getId(), otherPerson);
+            publicApiClient.setRequestContext(otherContext);
+            tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+            try
+            {
+                tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // delete item with not involved user
+            createItemObject = new JSONObject();
+            createItemObject.put("id", docNodeRefs[0].getId());
+            result = tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+            
+            assertNotNull(result);
+            assertEquals(docNodeRefs[0].getId(), result.get("id"));
+            
+            itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            
+            activitiProcessEngine.getTaskService().deleteCandidateUser(task.getId(), otherPerson);
+            publicApiClient.setRequestContext(otherContext);
+            try
+            {
+                tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(403, e.getHttpResponse().getStatusCode());
+            }
+            
+            // delete item with user from candidate group with no assignee
+            List<MemberOfSite> memberships = getTestFixture().getNetwork(otherContext.getNetworkId()).getSiteMemberships(otherContext.getRunAsUser());
+            assertTrue(memberships.size() > 0);
+            MemberOfSite memberOfSite = memberships.get(0);
+            String group = "GROUP_site_" + memberOfSite.getSiteId() + "_" + memberOfSite.getRole().name();
+            
+            activitiProcessEngine.getTaskService().deleteCandidateUser(task.getId(), otherContext.getRunAsUser());
+            activitiProcessEngine.getTaskService().addCandidateGroup(task.getId(), group);
+            publicApiClient.setRequestContext(otherContext);
+            createItemObject = new JSONObject();
+            createItemObject.put("id", docNodeRefs[0].getId());
+            result = tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+            
+            assertNotNull(result);
+            assertEquals(docNodeRefs[0].getId(), result.get("id"));
+            
+            itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            
+            tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+            try
+            {
+                tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // delete item with user from candidate group with assignee
+            activitiProcessEngine.getTaskService().setAssignee(task.getId(), requestContext.getRunAsUser());
+            publicApiClient.setRequestContext(requestContext);
+            createItemObject = new JSONObject();
+            createItemObject.put("id", docNodeRefs[0].getId());
+            result = tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+            
+            assertNotNull(result);
+            assertEquals(docNodeRefs[0].getId(), result.get("id"));
+            
+            itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            
+            publicApiClient.setRequestContext(otherContext);
+            try
+            {
+                tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(403, e.getHttpResponse().getStatusCode());
+            }
+            
+            publicApiClient.setRequestContext(requestContext);
+            itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+            try
+            {
+                tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // invalid task id
+            publicApiClient.setRequestContext(requestContext);
+            try
+            {
+                tasksClient.deleteTaskItem("fakeid", docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // invalid item id
+            try
+            {
+                tasksClient.deleteTaskItem(task.getId(), "fakeid");
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+            
+            // delete item from completed task
+            createItemObject = new JSONObject();
+            createItemObject.put("id", docNodeRefs[0].getId());
+            result = tasksClient.addTaskItem(task.getId(), createItemObject.toJSONString());
+            
+            assertNotNull(result);
+            assertEquals(docNodeRefs[0].getId(), result.get("id"));
+            
+            itemJSON = tasksClient.findTaskItem(task.getId(), docNodeRefs[0].getId());
+            assertEquals(docNodeRefs[0].getId(), itemJSON.get("id"));
+            
+            TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
+            {
+                @Override
+                public Void doWork() throws Exception
+                {
+                    activitiProcessEngine.getTaskService().complete(task.getId());
+                    return null;
+                }
+            }, requestContext.getRunAsUser(), requestContext.getNetworkId());
+            
+            try
+            {
+                tasksClient.deleteTaskItem(task.getId(), docNodeRefs[0].getId());
+                fail("Expected exception");
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(404, e.getHttpResponse().getStatusCode());
+            }
+        }
+        finally
+        {
+            cleanupProcessInstance(processInfo.getId());
+        }
+    }
+    
+    protected ProcessInstance startAdhocProcess(final String user, final String networkId, final String businessKey)
+    {
+        return TenantUtil.runAsUserTenant(new TenantRunAsWork<ProcessInstance>()
+        {
+            @Override
+            public ProcessInstance doWork() throws Exception
+            {
+                String processDefinitionKey = "@" + networkId + "@activitiAdhoc";
+                // Set required variables for adhoc process and start
+                Map<String, Object> variables = new HashMap<String, Object>();
+                ActivitiScriptNode person = getPersonNodeRef(user);
+                variables.put("bpm_assignee", person);
+                variables.put("wf_notifyMe", Boolean.FALSE);
+                variables.put(WorkflowConstants.PROP_INITIATOR, person);
+                return activitiProcessEngine.getRuntimeService().startProcessInstanceByKey(processDefinitionKey, businessKey, variables);
+            }
+        }, user, networkId);
+    }
+    
+    protected int getResultSizeForTaskQuery(Map<String, String> params, TasksClient tasksClient) throws Exception 
+    {
+        JSONObject taskListJSONObject = tasksClient.findTasks(params);
+        assertNotNull(taskListJSONObject);
+        JSONArray jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+        return jsonEntries.size();
+    }
+    
+    protected void assertTasksPresentInTaskQuery(Map<String, String> params, TasksClient tasksClient, String ...taskIds) throws Exception 
+    {
+       assertTasksPresentInTaskQuery(params, tasksClient, true, taskIds);
+    }
+    
+    protected void assertTasksPresentInTaskQuery(Map<String, String> params, TasksClient tasksClient, boolean countShouldMatch, String ...taskIds) throws Exception 
+    {
+        JSONObject taskListJSONObject = tasksClient.findTasks(params);
+        assertNotNull(taskListJSONObject);
+        JSONArray jsonEntries = (JSONArray) taskListJSONObject.get("entries");
+        if(countShouldMatch) {
+            assertEquals("Wrong amount of tasks returned by query", taskIds.length, jsonEntries.size());
+        }
+        
+        List<String> tasksToFind = new ArrayList<String>();
+        tasksToFind.addAll(Arrays.asList(taskIds));
+        
+        for(int i=0; i< jsonEntries.size(); i++) 
+        {
+            JSONObject entry = (JSONObject) ((JSONObject)jsonEntries.get(i)).get("entry");
+            assertNotNull(entry);
+            String taskId = (String) entry.get("id");
+            tasksToFind.remove(taskId);
+        }
+        assertEquals("Not all tasks have been found in query response, missing: " + StringUtils.join(tasksToFind, ","), 
+                    0, tasksToFind.size());
+    }
+    
+    protected void cleanupProcessInstance(ProcessInstance... processInstances)
+    {
+        // Clean up process-instance regardless of test success/failure
+        try 
+        {
+            for(ProcessInstance processInstance : processInstances)
+            {
+                if(processInstance != null)
+                {
+                    activitiProcessEngine.getRuntimeService().deleteProcessInstance(processInstance.getId(), null);
+                    activitiProcessEngine.getHistoryService().deleteHistoricProcessInstance(processInstance.getId());
+                }
+            }
+        }
+        catch(Throwable t)
+        {
+            // Ignore error during cleanup to prevent swallowing potential assetion-exception
+            log("Error while cleaning up process instance", t);
+        }
+    }
+    
+    protected void cleanupProcessInstance(String... processInstances)
+    {
+        // Clean up process-instance regardless of test success/failure
+        try 
+        {
+            for (String instanceId : processInstances)
+            {
+                activitiProcessEngine.getRuntimeService().deleteProcessInstance(instanceId, null);
+                activitiProcessEngine.getHistoryService().deleteHistoricProcessInstance(instanceId);
+            }
+        }
+        catch(Throwable t)
+        {
+            // Ignore error during cleanup to prevent swallowing potential assetion-exception
+            log("Error while cleaning up process instance", t);
+        }
+    }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/WorkflowApiClient.java b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/WorkflowApiClient.java
new file mode 100644
index 00000000000..ccc53737d1a
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/WorkflowApiClient.java
@@ -0,0 +1,387 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tests;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.rest.api.tests.client.HttpResponse;
+import org.alfresco.rest.api.tests.client.PublicApiClient;
+import org.alfresco.rest.api.tests.client.PublicApiException;
+import org.alfresco.rest.api.tests.client.PublicApiHttpClient;
+import org.alfresco.rest.api.tests.client.UserDataService;
+import org.alfresco.rest.workflow.api.model.Deployment;
+import org.alfresco.rest.workflow.api.model.ProcessDefinition;
+import org.alfresco.rest.workflow.api.model.ProcessInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+public class WorkflowApiClient extends PublicApiClient
+{
+    public static final DateFormat DATE_FORMAT_ISO8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+    
+    private DeploymentsClient deploymentsClient;
+    private ProcessDefinitionsClient processDefinitionsClient;
+    private ProcessesClient processesClient;
+    private TasksClient tasksClient;
+    
+    public WorkflowApiClient(PublicApiHttpClient client, UserDataService userDataService) {
+        super(client, userDataService);
+        initWorkflowClients();
+    }
+    
+    public void initWorkflowClients()
+    {
+        deploymentsClient = new DeploymentsClient();
+        processDefinitionsClient = new ProcessDefinitionsClient();
+        processesClient = new ProcessesClient();
+        tasksClient = new TasksClient();
+    }
+
+    public DeploymentsClient deploymentsClient()
+    {
+        return deploymentsClient;
+    }
+    
+
+    public ProcessDefinitionsClient processDefinitionsClient()
+    {
+        return processDefinitionsClient;
+    }
+    
+    public ProcessesClient processesClient()
+    {
+        return processesClient;
+    }
+    
+    public TasksClient tasksClient()
+    {
+        return tasksClient;
+    }
+    
+    public class DeploymentsClient extends AbstractProxy
+    {
+        public ListResponse<Deployment> getDeployments(Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("deployments", null, null, null, params, "Failed to get deploymentsClient");
+            return DeploymentParser.INSTANCE.parseList(response.getJsonResponse());
+        }
+        
+        public JSONObject getDeploymentsWithRawResponse(Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("deployments", null, null, null, params, "Failed to get deploymentsClient");
+            JSONObject list = (JSONObject) response.getJsonResponse().get("list");
+            return list;
+        }
+
+        public ListResponse<Deployment> getDeployments() throws PublicApiException
+        {
+            return getDeployments(null);
+        }
+
+        /*public ListResponse<Deployment> createNewDeployment(String name, byte[] bytes) throws PublicApiException
+        {
+            Part[] parts = new Part[]{
+                    new StringPart("name", name),
+                    new FilePart("file", new ByteArrayPartSource("bytes", bytes))
+            };
+            RequestEntity requestEntity = new MultipartRequestEntity(parts, null);
+            HttpResponse response = create("deployments", null, null, null, requestEntity, "Failed to create new deployment");
+            return DeploymentParser.INSTANCE.parseList(response.getJsonResponse());
+        }*/
+
+        public Deployment findDeploymentById(String deploymentId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("deployments", deploymentId, null, null, "Failed to get deployment");
+            JSONObject entry = (JSONObject) response.getJsonResponse().get("entry");
+            return DeploymentParser.INSTANCE.parseEntry(entry);
+        }
+
+        public void deleteDeployment(String deploymentId) throws PublicApiException
+        {
+            remove("deployments", deploymentId, null, null, "Failed to delete deployment");
+        }
+    }
+    
+    public class ProcessDefinitionsClient extends AbstractProxy
+    {
+        public ListResponse<ProcessDefinition> getProcessDefinitions(Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("process-definitions", null, null, null, params, "Failed to get process definitions");
+            return ProcessDefinitionParser.INSTANCE.parseList(response.getJsonResponse());
+        }
+        
+        public JSONObject getProcessDefinitionsWithRawResponse(Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("process-definitions", null, null, null, params, "Failed to get process definitions");
+            JSONObject list = (JSONObject) response.getJsonResponse().get("list");
+            return list;
+        }
+
+        public ProcessDefinition findProcessDefinitionById(String processDefinitionId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("process-definitions", processDefinitionId, null, null, "Failed to get process definition");
+            JSONObject entry = (JSONObject) response.getJsonResponse().get("entry");
+            return ProcessDefinitionParser.INSTANCE.parseEntry(entry);
+        }
+
+        public HttpResponse findImageById(String processDefinitionId) throws PublicApiException
+        {
+            return getSingle("process-definitions", processDefinitionId, "image", null, "Failed to get process definition");
+        }
+
+        public JSONObject findStartFormModel(String processDefinitionId) throws PublicApiException
+        {
+            HttpResponse response = getAll("process-definitions", processDefinitionId, "start-form-model", null, null,
+                    "Failed to get the start form model of the process definition");
+            JSONObject list = (JSONObject) response.getJsonResponse().get("list");
+            return list;
+        }
+    }
+
+    public class ProcessesClient extends AbstractProxy
+    {
+        public ProcessInfo createProcess(String body) throws PublicApiException
+        {
+            HttpResponse response = create("processes", null, null, null, body, "Failed to start new process instance");
+            return ProcessesParser.INSTANCE.parseEntry((JSONObject) response.getJsonResponse().get("entry"));
+        }
+
+        public ListResponse<ProcessInfo> getProcesses(Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("processes", null, null, null, params, "Failed to get process instances");
+            return ProcessesParser.INSTANCE.parseList(response.getJsonResponse());
+        }
+        
+        public JSONObject getProcessesJSON(Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("processes", null, null, null, params, "Failed to get process instances");
+            JSONObject list = (JSONObject) response.getJsonResponse().get("list");
+            return list;
+        }
+
+        public ProcessInfo findProcessById(String processInstanceId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("processes", processInstanceId, null, null, "Failed to find process instance by id");
+            JSONObject entry = (JSONObject) response.getJsonResponse().get("entry");
+            return ProcessesParser.INSTANCE.parseEntry(entry);
+        }
+        
+        public JSONObject getTasks(String processInstanceId, Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("processes", processInstanceId, "tasks", null, params, "Failed to get task instances of processInstanceId " + processInstanceId);
+            JSONObject list = (JSONObject) response.getJsonResponse().get("list");
+            return list;
+        }
+        
+        public JSONObject getActivities(String processInstanceId, Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("processes", processInstanceId, "activities", null, params, "Failed to get activity instances of processInstanceId " + processInstanceId);
+            JSONObject list = (JSONObject) response.getJsonResponse().get("list");
+            return list;
+        }
+        
+        public HttpResponse getImage(String processInstanceId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("processes", processInstanceId, "image", null, "Failed to get image of processInstanceId " + processInstanceId);
+            return response;
+        }
+        
+        public JSONObject findProcessItems(String processInstanceId) throws PublicApiException
+        {
+            HttpResponse response = getAll("processes", processInstanceId, "items", null, null,
+                    "Failed to get the items of the process instance");
+            JSONObject list = (JSONObject) response.getJsonResponse().get("list");
+            return list;
+        }
+        
+        public JSONObject getProcessvariables(String processInstanceId) throws PublicApiException
+        {
+            HttpResponse response = getAll("processes", processInstanceId, "variables", null, null,
+                    "Failed to get the variables of the process instance");
+            JSONObject list = (JSONObject) response.getJsonResponse().get("list");
+            return list;
+        }
+        
+        public JSONObject createVariables(String processId, JSONArray variables) throws PublicApiException
+        {
+            HttpResponse response = create("processes", processId, "variables", null, variables.toJSONString(), "Failed to create variables");
+            return response.getJsonResponse();
+        }
+        
+        public JSONObject updateVariable(String processId, String variableName, JSONObject variable) throws PublicApiException
+        {
+            HttpResponse response = update("processes", processId, "variables", variableName, variable.toJSONString(), "Failed to update variable");
+            return response.getJsonResponse();
+        }
+        
+        public void deleteVariable(String processId, String variableName) throws PublicApiException
+        {
+            remove("processes", processId, "variables", variableName, "Failed to delete variable");
+        }
+        
+        public void addProcessItem(String processId, String body) throws PublicApiException
+        {
+            create("processes", processId, "items", null, body, "Failed to add item");
+        }
+        
+        public void deleteProcessItem(String processId, String itemId) throws PublicApiException
+        {
+            remove("processes", processId, "items", itemId, "Failed to delete item");
+        }
+        
+        public JSONObject findProcessItem(String processInstanceId, String itemId) throws PublicApiException
+        {
+            HttpResponse response = getAll("processes", processInstanceId, "items", itemId, null,
+                    "Failed to get the item of the process instance");
+            JSONObject entry = (JSONObject) response.getJsonResponse().get("entry");
+            return entry;
+        }
+
+        public void deleteProcessById(String processId) throws PublicApiException
+        {
+            remove("processes", processId, null, null, "Failed to delete process");
+        }
+    }
+    
+    public class TasksClient extends AbstractProxy
+    {
+        public JSONObject findTaskById(String taskId) throws PublicApiException
+        {
+            HttpResponse response = getSingle("tasks", taskId, null, null, "Failed to get task");
+            JSONObject entry = (JSONObject) response.getJsonResponse().get("entry");
+            return entry;
+        }
+        
+        public JSONObject updateTask(String taskId, JSONObject task, List<String> selectedFields) throws PublicApiException
+        {
+            String selectedFieldsValue = StringUtils.join(selectedFields, ",");
+            Map<String, String> params = new HashMap<String, String>();
+            params.put("select", selectedFieldsValue);
+            
+            HttpResponse response = update("tasks", taskId, null, null, task.toJSONString(), params, "Failed to update task", 200);
+            
+            JSONObject entry = (JSONObject) response.getJsonResponse().get("entry");
+            return entry;
+        }
+        
+        public JSONObject findTasks(Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("tasks", null, null, null, params, "Failed to get all tasks");
+            JSONObject list = (JSONObject) response.getJsonResponse().get("list");
+            return list;
+        }
+        
+        public JSONObject findTaskCandidates(String taskId) throws PublicApiException
+        {
+            HttpResponse response = getAll("tasks", taskId, "candidates", null, null, "Failed to get task candidates");
+            return response.getJsonResponse();
+        }
+        
+        public JSONObject findTaskVariables(String taskId, Map<String, String> params) throws PublicApiException
+        {
+            HttpResponse response = getAll("tasks", taskId, "variables", null, params, "Failed to get task variables");
+            return response.getJsonResponse();
+        }
+        
+        public JSONObject findTaskVariables(String taskId) throws PublicApiException
+        {
+            return findTaskVariables(taskId, null);
+        }
+        
+        public JSONObject createTaskVariables(String taskId, JSONArray variables) throws PublicApiException
+        {
+            HttpResponse response = create("tasks", taskId, "variables", null, variables.toJSONString(), "Failed to create task variables");
+            return response.getJsonResponse();
+        }
+        
+        public JSONObject updateTaskVariable(String taskId, String variableName, JSONObject variable) throws PublicApiException
+        {
+            HttpResponse response = update("tasks", taskId, "variables", variableName, variable.toJSONString(), "Failed to update task variable");
+            return response.getJsonResponse();
+        }
+        
+        public void deleteTaskVariable(String taskId, String variableName) throws PublicApiException
+        {
+            remove("tasks", taskId, "variables", variableName, "Failed to delete task variable");
+        }
+
+        public JSONObject findTaskFormModel(String taskId) throws PublicApiException
+        {
+            HttpResponse response = getAll("tasks", taskId, "task-form-model", null, null, "Failed to get task form model");
+            JSONObject list = (JSONObject) response.getJsonResponse().get("list");
+            return list;
+        }
+        
+        public JSONObject findTaskItems(String taskId) throws PublicApiException
+        {
+            HttpResponse response = getAll("tasks", taskId, "items", null, null,
+                    "Failed to get the items of the task");
+            JSONObject list = (JSONObject) response.getJsonResponse().get("list");
+            return list;
+        }
+        
+        public JSONObject addTaskItem(String taskId, String body) throws PublicApiException
+        {
+            HttpResponse response = create("tasks", taskId, "items", null, body, "Failed to add item");
+            JSONObject entry = (JSONObject) response.getJsonResponse().get("entry");
+            return entry;
+        }
+        
+        public void deleteTaskItem(String taskId, String itemId) throws PublicApiException
+        {
+            remove("tasks", taskId, "items", itemId, "Failed to delete item");
+        }
+        
+        public JSONObject findTaskItem(String taskId, String itemId) throws PublicApiException
+        {
+            HttpResponse response = getAll("tasks", taskId, "items", itemId, null,
+                    "Failed to get the item of the task");
+            JSONObject entry = (JSONObject) response.getJsonResponse().get("entry");
+            return entry;
+        }
+    }
+    
+    public static Date parseDate(JSONObject entry, String fieldName) {
+        String dateText = (String) entry.get(fieldName);
+        if (dateText!=null) {
+          try
+          {
+              return DATE_FORMAT_ISO8601.parse(dateText);
+          }
+          catch (Exception e)
+          {
+              throw new RuntimeException("couldn't parse date "+dateText+": "+e.getMessage(), e);
+          }
+        }
+        return null;
+      }
+}
diff --git a/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/WorkflowApiHttpClient.java b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/WorkflowApiHttpClient.java
new file mode 100644
index 00000000000..ae69c71d875
--- /dev/null
+++ b/remote-api/src/test/java/org/alfresco/rest/workflow/api/tests/WorkflowApiHttpClient.java
@@ -0,0 +1,44 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.workflow.api.tests;
+
+import org.alfresco.rest.api.tests.client.AuthenticatedHttp;
+import org.alfresco.rest.api.tests.client.PublicApiHttpClient;
+
+public class WorkflowApiHttpClient extends PublicApiHttpClient
+{
+    public WorkflowApiHttpClient(String host, int port, String contextPath, String servletName, AuthenticatedHttp authenticatedHttp)
+    {
+        this("http", host, port, contextPath, servletName, authenticatedHttp);
+    }
+
+    public WorkflowApiHttpClient(String scheme, String host, int port, String contextPath, String servletName, AuthenticatedHttp authenticatedHttp)
+    {
+        super(scheme, host, port, contextPath, servletName, authenticatedHttp);
+        apiName = "workflow";
+    }
+
+}
diff --git a/remote-api/src/test/resources/alfresco-global.properties b/remote-api/src/test/resources/alfresco-global.properties
new file mode 100644
index 00000000000..654011a248d
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco-global.properties
@@ -0,0 +1,4 @@
+opencmis.tck.readtimeout=10000
+opencmis.tck.connecttimeout=10000
+
+system.workflow.engine.activiti.taskvariableslimit=200
\ No newline at end of file
diff --git a/remote-api/src/test/resources/alfresco/declarative-spreadsheet-webscript-application-context.xml b/remote-api/src/test/resources/alfresco/declarative-spreadsheet-webscript-application-context.xml
new file mode 100644
index 00000000000..7e1ab6651a9
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco/declarative-spreadsheet-webscript-application-context.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+   <import resource="classpath:alfresco/application-context.xml"/>
+   <import resource="classpath:alfresco/web-scripts-application-context.xml"/>
+
+   <bean id="webscript.org.alfresco.repository.test.declarativeSpreadsheetWebScript.get"
+         class="org.alfresco.repo.web.scripts.TestDeclarativeSpreadsheetWebScriptGet"
+         parent="declarativeSpreadsheetWebScript">
+         <property name="dictionaryService" ref="DictionaryService"/>
+   </bean>
+
+</beans>
\ No newline at end of file
diff --git a/remote-api/src/test/resources/alfresco/module/simple/module.properties b/remote-api/src/test/resources/alfresco/module/simple/module.properties
new file mode 100644
index 00000000000..5d27eba48da
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco/module/simple/module.properties
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# ==== Beginning of Alfresco required/optional properties ====== #
+# NB: These properties are filtered at build time by Maven, single
+# sourcing from POM properties  
+module.id=alfresco-simple-module
+#module.aliases=myModule-123, my-module
+module.title=Alfresco JAR Module Project
+module.description=UNSUPPORTED experiment
+module.version=1.0.0-SNAPSHOT
+
+# The following optional properties can be used to prevent the module from being added
+# to inappropriate versions of the WAR file.
+module.repo.version.min=1.0
\ No newline at end of file
diff --git a/remote-api/src/test/resources/alfresco/quick-share-turned-off-test-context.xml b/remote-api/src/test/resources/alfresco/quick-share-turned-off-test-context.xml
new file mode 100644
index 00000000000..d6afdc081af
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco/quick-share-turned-off-test-context.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="org.alfresco.repository.quickshare.abstract" class="org.alfresco.repo.web.scripts.quickshare.AbstractQuickShareContent" abstract="true">
+        <property name="quickShareService" ref="QuickShareService" />
+        <property name="enabled" value="false" />
+    </bean>
+</beans>
diff --git a/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/repository/test/declarativeSpreadsheetWebScript.get.csv.ftl b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/repository/test/declarativeSpreadsheetWebScript.get.csv.ftl
new file mode 100644
index 00000000000..e823644fbf2
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/repository/test/declarativeSpreadsheetWebScript.get.csv.ftl
@@ -0,0 +1 @@
+${csv}
\ No newline at end of file
diff --git a/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/repository/test/declarativeSpreadsheetWebScript.get.desc.xml b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/repository/test/declarativeSpreadsheetWebScript.get.desc.xml
new file mode 100644
index 00000000000..e92ef6e3d4d
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/repository/test/declarativeSpreadsheetWebScript.get.desc.xml
@@ -0,0 +1,8 @@
+<webscript>
+   <shortname>Declarative Spreadsheet Webscript Test</shortname>
+   <description>Declarative Spreadsheet Webscript Test</description>
+   <url>/api/test/getcsv</url>
+   <format default="csv">argument</format>
+   <authentication>admin</authentication>
+   <transaction allow="readonly">required</transaction>
+</webscript>
diff --git a/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/largecontent.put.desc.xml b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/largecontent.put.desc.xml
new file mode 100644
index 00000000000..d3aa6fa3e8a
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/largecontent.put.desc.xml
@@ -0,0 +1,8 @@
+<webscript>
+  <shortname>Large Request Test</shortname>
+  <description>Large Request Test </description>
+  <url>/test/largecontenttest</url>
+  <format default="html">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+</webscript>
diff --git a/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/largecontent.put.html.ftl b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/largecontent.put.html.ftl
new file mode 100644
index 00000000000..967faeb9950
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/largecontent.put.html.ftl
@@ -0,0 +1 @@
+${result}
\ No newline at end of file
diff --git a/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runas.get.desc.xml b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runas.get.desc.xml
new file mode 100644
index 00000000000..d57ea115ac0
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runas.get.desc.xml
@@ -0,0 +1,8 @@
+<webscript>
+  <shortname>Runas Test</shortname>
+  <description>Runas Test</description>
+  <url>/test/runas</url>
+  <format default="html">argument</format>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+</webscript>
diff --git a/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runas.get.html.ftl b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runas.get.html.ftl
new file mode 100644
index 00000000000..ab4abdc8c4d
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runas.get.html.ftl
@@ -0,0 +1 @@
+${testPerson.properties['userName']}
\ No newline at end of file
diff --git a/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runas.get.js b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runas.get.js
new file mode 100644
index 00000000000..813ba7e9870
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runas.get.js
@@ -0,0 +1 @@
+model.testPerson=person;
\ No newline at end of file
diff --git a/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runasadmin.get.desc.xml b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runasadmin.get.desc.xml
new file mode 100644
index 00000000000..9c167d9b605
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runasadmin.get.desc.xml
@@ -0,0 +1,8 @@
+<webscript>
+  <shortname>Runas Admin Test</shortname>
+  <description>Runas Admin Test</description>
+  <url>/test/runasadmin</url>
+  <format default="html">argument</format>
+  <authentication runas="admin">user</authentication>
+  <transaction>required</transaction>
+</webscript>
diff --git a/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runasadmin.get.html.ftl b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runasadmin.get.html.ftl
new file mode 100644
index 00000000000..ab4abdc8c4d
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runasadmin.get.html.ftl
@@ -0,0 +1 @@
+${testPerson.properties['userName']}
\ No newline at end of file
diff --git a/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runasadmin.get.js b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runasadmin.get.js
new file mode 100644
index 00000000000..813ba7e9870
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco/templates/webscripts/org/alfresco/runas/runasadmin.get.js
@@ -0,0 +1 @@
+model.testPerson=person;
\ No newline at end of file
diff --git a/remote-api/src/test/resources/alfresco/web-scripts-application-context-test.xml b/remote-api/src/test/resources/alfresco/web-scripts-application-context-test.xml
new file mode 100644
index 00000000000..f47e5cedbda
--- /dev/null
+++ b/remote-api/src/test/resources/alfresco/web-scripts-application-context-test.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+
+   <!--              -->   
+   <!--  API Testing -->
+   <!--              -->   
+
+   <bean id="webscripts.test" class="org.alfresco.repo.web.scripts.TestWebScriptRepoServer">
+      <property name="container" ref="webscripts.container" />
+      <property name="authenticationService" ref="authenticationService" />
+      <property name="configService" ref="web.config" />
+      <property name="transactionHelper" ref="retryingTransactionHelper" />
+      <property name="messages">
+         <bean class="org.springframework.context.support.ResourceBundleMessageSource">
+            <property name="basenames">
+               <list>
+                  <value>webscripts/messages/webscripts</value>
+               </list>
+            </property>
+         </bean>
+      </property>
+   </bean>
+
+   <bean id="webscript.org.alfresco.runas.largecontent.put" class="org.alfresco.repo.web.scripts.test.LargeContentTestPut" parent="webscript">
+   </bean>
+
+  <!-- Beans used for testing that overide funtionality in the core product -->
+  <bean id="eventPublisher" class="org.alfresco.repo.events.EventPublisherForTestingOnly" />
+  
+</beans>
\ No newline at end of file
diff --git a/remote-api/src/test/resources/custommodel/validExtModule.zip b/remote-api/src/test/resources/custommodel/validExtModule.zip
new file mode 100644
index 00000000000..2929e87fce1
Binary files /dev/null and b/remote-api/src/test/resources/custommodel/validExtModule.zip differ
diff --git a/remote-api/src/test/resources/custommodel/validModel.zip b/remote-api/src/test/resources/custommodel/validModel.zip
new file mode 100644
index 00000000000..66bc534d48d
Binary files /dev/null and b/remote-api/src/test/resources/custommodel/validModel.zip differ
diff --git a/remote-api/src/test/resources/custommodel/validModelAndExtModule.zip b/remote-api/src/test/resources/custommodel/validModelAndExtModule.zip
new file mode 100644
index 00000000000..a67211f4086
Binary files /dev/null and b/remote-api/src/test/resources/custommodel/validModelAndExtModule.zip differ
diff --git a/remote-api/src/test/resources/davLockInfoAdmin.xml b/remote-api/src/test/resources/davLockInfoAdmin.xml
new file mode 100644
index 00000000000..d6693fdcc89
--- /dev/null
+++ b/remote-api/src/test/resources/davLockInfoAdmin.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:lockinfo xmlns:D="DAV:">
+    <D:lockscope>
+        <D:exclusive/>
+    </D:lockscope>
+    <D:locktype>
+        <D:write/>
+    </D:locktype>
+    <D:owner>
+        <D:href>admin</D:href>
+    </D:owner>
+</D:lockinfo>
\ No newline at end of file
diff --git a/remote-api/src/test/resources/davLockInfoUser2.xml b/remote-api/src/test/resources/davLockInfoUser2.xml
new file mode 100644
index 00000000000..1b5cd54d1f2
--- /dev/null
+++ b/remote-api/src/test/resources/davLockInfoUser2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:lockinfo xmlns:D="DAV:">
+    <D:lockscope>
+        <D:exclusive/>
+    </D:lockscope>
+    <D:locktype>
+        <D:write/>
+    </D:locktype>
+    <D:owner>
+        <D:href>user2-org.alfresco.repo.webdav.PutMethodTest</D:href>
+    </D:owner>
+</D:lockinfo>
\ No newline at end of file
diff --git a/remote-api/src/test/resources/filewithdata.txt b/remote-api/src/test/resources/filewithdata.txt
new file mode 100644
index 00000000000..204d17564cb
--- /dev/null
+++ b/remote-api/src/test/resources/filewithdata.txt
@@ -0,0 +1 @@
+testData
\ No newline at end of file
diff --git a/remote-api/src/test/resources/log4j.properties b/remote-api/src/test/resources/log4j.properties
new file mode 100644
index 00000000000..ae6e69fa4eb
--- /dev/null
+++ b/remote-api/src/test/resources/log4j.properties
@@ -0,0 +1,9 @@
+log4j.rootLogger=error, Console
+
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
+log4j.appender.Console.layout=org.apache.log4j.PatternLayout
+log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n 
+
+log4j.logger.org.alfresco=WARN
+log4j.logger.org.alfresco.rest.api=DEBUG
+log4j.logger.org.eclipse.jetty.util.log=INFO
\ No newline at end of file
diff --git a/remote-api/src/test/resources/models/bpmDelegateeModel.xml b/remote-api/src/test/resources/models/bpmDelegateeModel.xml
new file mode 100755
index 00000000000..8c597913194
--- /dev/null
+++ b/remote-api/src/test/resources/models/bpmDelegateeModel.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"               
+       xsi:schemaLocation="http://www.alfresco.org/model/dictionary/1.0 ../../../../webapps/alfresco/WEB-INF/classes/alfresco/model/modelSchema.xsd"      
+       xmlns="http://www.alfresco.org/model/dictionary/1.0" name="wbpm:AssigneeTest">
+
+  <description>BPM Assignee Test Model</description>
+  <author>Workdesk</author>
+  <version>1.0</version>
+  <imports>
+     <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+     <import uri="http://www.alfresco.org/model/bpm/1.0" prefix="bpm"/>
+	 <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+  </imports>
+  <namespaces>
+     <namespace uri="workdesk.alf.bpm" prefix="wbpm"/>
+  </namespaces>
+  <constraints>
+   <constraint name="wbpm:listDelegation" type="LIST">
+     <parameter name="allowedValues">
+     	<list>
+     	<value>Expression</value>
+     	<value>OnCreate</value>
+     	<value>Other</value>
+     	</list>
+     </parameter>
+   </constraint>
+  </constraints>  
+  <types>   
+     <type name="wbpm:DelegateTask">
+        <title>Delegation Task (Assignee)</title>
+        <parent>bpm:workflowTask</parent>
+        <properties>
+         <property name="wbpm:nextStep">
+         	<title>Next Step</title>
+         	<type>d:text</type>
+         	<protected>false</protected>
+         	<mandatory>false</mandatory>
+         	<multiple>false</multiple>
+         	<default>Expression</default>
+         	<constraints>
+         	 <constraint ref="wbpm:listDelegation" />
+         	</constraints>
+         </property>
+        </properties>
+		<associations>
+		 <association name="wbpm:delegatee">
+		 	<title>Responsible person</title>
+		 	<source>
+		 	 <mandatory>false</mandatory>
+		 	 <many>false</many>
+		 	</source>
+		 	<target>
+		 	 <class>cm:person</class>
+		 	 <mandatory>true</mandatory>
+		 	 <many>false</many>
+		 	</target>
+		 </association>
+		</associations>
+     </type>
+      <type name="wbpm:expressionTask">
+        <title>Expression Task (Assignee)</title>
+        <parent>bpm:workflowTask</parent>
+		<mandatory-aspects>
+			<aspect>wbpm:CommentAspect</aspect>
+		</mandatory-aspects>
+     </type>
+     <type name="wbpm:onCreateTask">
+        <title>On Create (Assignee)</title>
+        <parent>bpm:workflowTask</parent>
+		<mandatory-aspects>
+			<aspect>wbpm:CommentAspect</aspect>
+		</mandatory-aspects>
+     </type>
+     <type name="wbpm:otherTask">
+        <title>Other Task (Assignee)</title>
+        <parent>bpm:workflowTask</parent>
+		<mandatory-aspects>
+			<aspect>wbpm:CommentAspect</aspect>
+		</mandatory-aspects>
+     </type>
+   </types>
+   <aspects>
+   	<aspect name="wbpm:CommentAspect">
+   	  <title>Step Comment</title>
+         <properties>
+            <property name="wbpm:comment">
+               <title>Comment</title>
+         		<type>d:text</type>
+         		<protected>false</protected>
+         		<mandatory>false</mandatory>
+         		<multiple>true</multiple>
+            </property>
+         </properties>
+   	</aspect>
+   </aspects>
+</model>
diff --git a/remote-api/src/test/resources/models/custom-model.xml b/remote-api/src/test/resources/models/custom-model.xml
new file mode 100644
index 00000000000..53f08fd074e
--- /dev/null
+++ b/remote-api/src/test/resources/models/custom-model.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Custom Model -->
+
+<!-- Note: This model is pre-configured to load at startup of the Repository.  So, all custom -->
+<!--       types and aspects added here will automatically be registered -->
+
+<model name="custom:customModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+
+   <!-- Optional meta-data about the model -->   
+   <description>Custom Model</description>
+   <author></author>
+   <version>1.0</version>
+
+   <imports>
+   	  <!-- Import Alfresco Dictionary Definitions -->
+      <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+      <!-- Import Alfresco Content Domain Model Definitions -->
+      <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+   </imports>
+
+   <!-- Introduction of new namespaces defined by this model -->
+   <!-- NOTE: The following namespace custom.model should be changed to reflect your own namespace -->
+   <namespaces>
+      <namespace uri="custom.model" prefix="custom"/>
+   </namespaces>
+   
+   <types>   
+	       <!-- Definition of new Content Type: Standard Operating Procedure -->
+      <type name="custom:sop">
+         <title>Standard Operating Procedure</title>
+         <parent>cm:content</parent>
+         <properties>
+            <property name="custom:publishedDate">
+               <type>d:date</type>
+            </property>
+			<property name="custom:multiText">
+               <type>d:text</type>
+			   <multiple>true</multiple>
+            </property>
+         </properties>
+      </type> 
+      
+      <type name="custom:destination">
+      	<title>Standard Destination</title>
+      	<parent>cm:content</parent>
+      	<properties>
+      		<property name="custom:name">
+      			 <type>d:text</type>
+      		</property>
+      		<property name="custom:locations">
+      			<type>d:text</type>
+      			<multiple>true</multiple>
+      		</property>
+         </properties>
+      </type>
+	  
+	</types>
+	 
+	
+	<aspects>
+      
+      <!-- Definition of new Content Aspect: Image Classification -->
+      <aspect name="custom:imageClassification">
+         <title>Image Classfication</title>
+         <properties>
+            <property name="custom:width">
+               <type>d:int</type>
+            </property>
+            <property name="custom:height">
+               <type>d:int</type>
+            </property>
+            <property name="custom:resolution">
+               <type>d:int</type>
+            </property>
+         </properties>
+      </aspect>
+	  
+	 <aspect name="custom:marker">
+      <title>marker</title>
+     </aspect>
+      
+   </aspects>
+      
+</model>
\ No newline at end of file
diff --git a/remote-api/src/test/resources/models/people-api.xml b/remote-api/src/test/resources/models/people-api.xml
new file mode 100644
index 00000000000..199caa2998a
--- /dev/null
+++ b/remote-api/src/test/resources/models/people-api.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Custom model for testing the People API -->
+
+<!-- Note: This model is pre-configured to load at startup of the Repository.  So, all custom -->
+<!--       types and aspects added here will automatically be registered -->
+
+<model name="papi:peopleApiTestModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+    <description>Custom model for testing the People API</description>
+    <author>Matt Ward</author>
+    <version>1.0</version>
+
+    <imports>
+        <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+        <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+    </imports>
+
+    <namespaces>
+        <namespace uri="test.people.api" prefix="papi"/>
+    </namespaces>
+
+    <types>
+    </types>
+
+    <aspects>
+        <!--
+            Fictional aspect to allow some custom communications preferences, such as a user's
+            telehash hashname or their jabber ID.
+          -->
+        <aspect name="papi:comms">
+            <title>Custom Communications Channels</title>
+            <properties>
+                <property name="papi:telehash">
+                    <type>d:text</type>
+                    <mandatory>false</mandatory>
+                </property>
+                <property name="papi:jabber">
+                    <type>d:text</type>
+                    <mandatory>false</mandatory>
+                </property>
+            </properties>
+        </aspect>
+
+        <!-- Is this person lunchable? Optionally, what lunch do they partake in? -->
+        <aspect name="papi:lunchable">
+            <title>Favourite lunch</title>
+            <properties>
+                <property name="papi:lunch">
+                    <type>d:text</type>
+                    <mandatory>false</mandatory>
+                </property>
+                <property name="papi:lunchcomments">
+                    <type>d:text</type>
+                    <mandatory>false</mandatory>
+                </property>
+            </properties>
+        </aspect>
+        
+        <!-- Is this person partial to dessert? Optionally, what dessert do they prefer? -->
+        <aspect name="papi:dessertable">
+            <title>Favourite dessert</title>
+            <properties>
+                <property name="papi:dessert">
+                    <type>d:text</type>
+                    <mandatory>false</mandatory>
+                </property>
+            </properties>
+        </aspect>
+    </aspects>
+
+</model>
\ No newline at end of file
diff --git a/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/Alfresco-Core.xsd b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/Alfresco-Core.xsd
new file mode 100644
index 00000000000..f67f50d219b
--- /dev/null
+++ b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/Alfresco-Core.xsd
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.alfresco.org"
+    xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+    xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" jaxb:extensionBindingPrefixes="xjc" jaxb:version="2.1"
+    xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/" version="1.0">
+
+    <xs:import schemaLocation="CMIS-Core.xsd" namespace="http://docs.oasis-open.org/ns/cmis/core/200908/" />
+
+    <xs:element name="setAspects">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="aspectsToAdd" type="xs:string" />
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="aspectsToRemove" type="xs:string" />
+                <xs:element name="properties" type="cmis:cmisPropertiesType" minOccurs="0" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="aspects">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="appliedAspects" type="xs:string" />
+                <xs:element minOccurs="0" name="properties" type="cmis:cmisPropertiesType" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+</xs:schema>
\ No newline at end of file
diff --git a/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/AspectTest.addAspects.cmisatomentry.xml b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/AspectTest.addAspects.cmisatomentry.xml
new file mode 100644
index 00000000000..1408a419305
--- /dev/null
+++ b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/AspectTest.addAspects.cmisatomentry.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/"
+    xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
+    <id>urn:uuid:00000000-0000-0000-0000-000000000000</id>
+    <title>Aspect Test</title>
+    <updated>2010-01-01T00:00:00Z</updated>
+    <author>admin</author>
+    <summary>Aspect Test (summary)</summary>
+    <content type="text">Content</content>
+    <cmisra:object>
+        <cmis:properties>
+            <cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
+                <cmis:value>cmis:document</cmis:value>
+            </cmis:propertyId>
+            <alf:setAspects xmlns:alf="http://www.alfresco.org">
+                <alf:aspectsToAdd>P:cm:syndication</alf:aspectsToAdd>
+                <alf:aspectsToAdd>P:cm:summarizable</alf:aspectsToAdd>
+                <alf:properties>
+                    <cmis:propertyString propertyDefinitionId="cm:summary">
+                        <cmis:value>Aspect Test (summary)</cmis:value>
+                    </cmis:propertyString>
+                    <!--  Add a property without explicitly adding its aspect. Should be automatically added. -->
+                    <cmis:propertyString propertyDefinitionId="cm:author">
+                        <cmis:value>David Ward</cmis:value>
+                    </cmis:propertyString>
+                </alf:properties>
+            </alf:setAspects>
+        </cmis:properties>
+    </cmisra:object>
+</entry>
diff --git a/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/AspectTest.removeAndAddAspects.cmisatomentry.xml b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/AspectTest.removeAndAddAspects.cmisatomentry.xml
new file mode 100644
index 00000000000..10026e5ed33
--- /dev/null
+++ b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/AspectTest.removeAndAddAspects.cmisatomentry.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/"
+    xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
+    <id>urn:uuid:00000000-0000-0000-0000-000000000000</id>
+    <title>Aspect Test</title>
+    <updated>2010-01-01T00:00:00Z</updated>
+    <author>admin</author>
+    <summary>Aspect Test (summary)</summary>
+    <content type="text">Content</content>
+    <cmisra:object>
+        <cmis:properties>
+            <cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
+                <cmis:value>cmis:document</cmis:value>
+            </cmis:propertyId>
+            <alf:setAspects xmlns:alf="http://www.alfresco.org">
+                <alf:aspectsToAdd>P:cm:countable</alf:aspectsToAdd>
+                <alf:aspectsToRemove>P:cm:author</alf:aspectsToRemove>
+                <alf:properties>
+                    <cmis:propertyString propertyDefinitionId="cm:summary">
+                        <cmis:value>Aspect Test (new summary)</cmis:value>
+                    </cmis:propertyString>
+                </alf:properties>
+            </alf:setAspects>
+        </cmis:properties>
+    </cmisra:object>
+</entry>
diff --git a/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/BaseCMISTest.createObject.atomentry.xml b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/BaseCMISTest.createObject.atomentry.xml
new file mode 100644
index 00000000000..04b49f51d64
--- /dev/null
+++ b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/BaseCMISTest.createObject.atomentry.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/"
+    xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
+    <id>urn:uuid:00000000-0000-0000-0000-000000000000</id>
+    <title>${NAME}</title>
+    <updated>2010-01-01T00:00:00Z</updated>
+    <author>admin</author>
+    <link rel="alternate" href="" />
+    <summary>${NAME} (summary)</summary>
+    <cmisra:object>
+        <cmis:properties>
+            <cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
+                <cmis:value>${TYPE}</cmis:value>
+            </cmis:propertyId>
+        </cmis:properties>
+    </cmisra:object>
+</entry>
diff --git a/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/CMIS-Core.xsd b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/CMIS-Core.xsd
new file mode 100644
index 00000000000..8ad3d7d9db9
--- /dev/null
+++ b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/CMIS-Core.xsd
@@ -0,0 +1,1368 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	<!--
+		CMIS 1.1 Core Schema
+	-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" targetNamespace="http://docs.oasis-open.org/ns/cmis/core/200908/"
+	xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+	jaxb:extensionBindingPrefixes="xjc" jaxb:version="2.1"
+	xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/" version="1.0">
+
+	<!--  enums -->
+	<xs:simpleType name="enumDecimalPrecision">
+		<xs:restriction base="xs:integer">
+			<xs:enumeration value="32" />
+			<xs:enumeration value="64" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="enumContentStreamAllowed">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="notallowed" />
+			<xs:enumeration value="allowed" />
+			<xs:enumeration value="required" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="enumCardinality">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="single" />
+			<xs:enumeration value="multi" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="enumUpdatability">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="readonly" />
+			<xs:enumeration value="readwrite" />
+			<xs:enumeration value="whencheckedout" />
+			<xs:enumeration value="oncreate" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="enumDateTimeResolution">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="year" />
+			<xs:enumeration value="date" />
+			<xs:enumeration value="time" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="enumPropertyType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="boolean" />
+			<xs:enumeration value="id" />
+			<xs:enumeration value="integer" />
+			<xs:enumeration value="datetime" />
+			<xs:enumeration value="decimal" />
+			<xs:enumeration value="html" />
+			<xs:enumeration value="string" />
+			<xs:enumeration value="uri" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="enumBaseObjectTypeIds">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="cmis:document" />
+			<xs:enumeration value="cmis:folder" />
+			<xs:enumeration value="cmis:relationship" />
+			<xs:enumeration value="cmis:policy" />
+			<xs:enumeration value="cmis:secondary" />
+			<xs:enumeration value="cmis:item" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="enumCapabilityQuery">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="none" />
+			<xs:enumeration value="metadataonly" />
+			<xs:enumeration value="fulltextonly" />
+			<xs:enumeration value="bothseparate" />
+			<xs:enumeration value="bothcombined" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="enumCapabilityJoin">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="none" />
+			<xs:enumeration value="inneronly" />
+			<xs:enumeration value="innerandouter" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="enumCapabilityContentStreamUpdates">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="anytime" />
+			<xs:enumeration value="pwconly" />
+			<xs:enumeration value="none" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="enumVersioningState">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="none" />
+			<xs:enumeration value="checkedout" />
+			<xs:enumeration value="minor" />
+			<xs:enumeration value="major" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="enumUnfileObject">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="unfile" />
+			<xs:enumeration value="deletesinglefiled" />
+			<xs:enumeration value="delete" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="enumRelationshipDirection">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="source" />
+			<xs:enumeration value="target" />
+			<xs:enumeration value="either" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="enumIncludeRelationships">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="none" />
+			<xs:enumeration value="source" />
+			<xs:enumeration value="target" />
+			<xs:enumeration value="both" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!--  properties in CMIS -->
+	<xs:simpleType name="enumPropertiesBase">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="cmis:name" />
+			<xs:enumeration value="cmis:objectId" />
+			<xs:enumeration value="cmis:objectTypeId" />
+			<xs:enumeration value="cmis:baseTypeId" />
+			<xs:enumeration value="cmis:createdBy" />
+			<xs:enumeration value="cmis:creationDate" />
+			<xs:enumeration value="cmis:lastModifiedBy" />
+			<xs:enumeration value="cmis:lastModificationDate" />
+			<xs:enumeration value="cmis:changeToken" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="enumPropertiesDocument">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="cmis:isImmutable" />
+			<xs:enumeration value="cmis:isLatestVersion" />
+			<xs:enumeration value="cmis:isMajorVersion" />
+			<xs:enumeration value="cmis:isLatestMajorVersion" />
+			<xs:enumeration value="cmis:versionLabel" />
+			<xs:enumeration value="cmis:versionSeriesId" />
+			<xs:enumeration value="cmis:isVersionSeriesCheckedOut" />
+			<xs:enumeration value="cmis:versionSeriesCheckedOutBy" />
+			<xs:enumeration value="cmis:versionSeriesCheckedOutId" />
+			<xs:enumeration value="cmis:checkinComment" />
+			<xs:enumeration value="cmis:contentStreamLength" />
+			<xs:enumeration value="cmis:contentStreamMimeType" />
+			<xs:enumeration value="cmis:contentStreamFileName" />
+			<xs:enumeration value="cmis:contentStreamId" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="enumPropertiesFolder">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="cmis:parentId" />
+			<xs:enumeration value="cmis:allowedChildObjectTypeIds" />
+			<xs:enumeration value="cmis:path" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="enumPropertiesRelationship">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="cmis:sourceId" />
+			<xs:enumeration value="cmis:targetId" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="enumPropertiesPolicy">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="cmis:policyText" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:attributeGroup name="cmisUndefinedAttribute">
+		<xs:anyAttribute namespace="##other" processContents="lax" />
+	</xs:attributeGroup>
+
+	<!--  main cmis object -->
+	<xs:complexType name="cmisObjectType">
+		<xs:sequence>
+			<xs:element name="properties" type="cmis:cmisPropertiesType"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="allowableActions" type="cmis:cmisAllowableActionsType"
+				minOccurs="0" maxOccurs="1" />
+
+			<xs:element name="relationship" type="cmis:cmisObjectType"
+				minOccurs="0" maxOccurs="unbounded" />
+
+			<!--  if change log -->
+			<xs:element name="changeEventInfo" type="cmis:cmisChangeEventType"
+				minOccurs="0" maxOccurs="1" />
+
+			<!--  ACL -->
+			<xs:element name="acl" type="cmis:cmisAccessControlListType"
+				minOccurs="0" maxOccurs="1" />
+
+			<xs:element name="exactACL" type="xs:boolean" minOccurs="0"
+				maxOccurs="1" />
+
+			<!-- Applied Policy IDs -->
+			<xs:element name="policyIds" type="cmis:cmisListOfIdsType"
+				minOccurs="0" maxOccurs="1" />
+
+			<!--  Rendition -->
+			<xs:element name="rendition" type="cmis:cmisRenditionType"
+				minOccurs="0" maxOccurs="unbounded" />
+
+			<!--  extensions -->
+			<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"
+				namespace="##other" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+
+
+	<!-- property bag -->
+	<xs:attribute name="key" type="xs:string" />
+	<xs:attribute name="index" type="xs:integer" />
+
+	<xs:complexType name="cmisPropertiesType">
+		<xs:sequence>
+			<xs:choice minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:property name="property" />
+					</xs:appinfo>
+				</xs:annotation>
+				<xs:element name="propertyBoolean" type="cmis:cmisPropertyBoolean"
+					nillable="true" />
+				<xs:element name="propertyId" type="cmis:cmisPropertyId"
+					nillable="true" />
+				<xs:element name="propertyInteger" type="cmis:cmisPropertyInteger"
+					nillable="true" />
+				<xs:element name="propertyDateTime" type="cmis:cmisPropertyDateTime"
+					nillable="true" />
+				<xs:element name="propertyDecimal" type="cmis:cmisPropertyDecimal"
+					nillable="true" />
+				<xs:element name="propertyHtml" type="cmis:cmisPropertyHtml"
+					nillable="true" />
+				<xs:element name="propertyString" type="cmis:cmisPropertyString"
+					nillable="true" />
+				<xs:element name="propertyUri" type="cmis:cmisPropertyUri"
+					nillable="true" />
+			</xs:choice>
+			<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
+				processContents="lax" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+
+
+	<!-- start the prop definitions -->
+	<xs:complexType name="cmisProperty">
+		<xs:attribute name="propertyDefinitionId" type="xs:string" use="optional">
+			<xs:annotation>
+				<xs:documentation>
+					This is the property definition id for this
+					property instance. This is
+					not required to be set when used as a
+					default value. This is
+					required to be set when used for query result
+					set or returning
+					properties on an object.
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="localName" type="xs:string" use="optional">
+			<xs:annotation>
+				<xs:documentation>
+					This is the localname as defined by the property
+					definition
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="displayName" type="xs:string" use="optional">
+			<xs:annotation>
+				<xs:documentation>
+					This is the displayname as defined by the property
+					definition
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="queryName" type="xs:string" use="optional">
+			<xs:annotation>
+				<xs:documentation>
+					This is the queryName. This must be specified if
+					this is the result of a query. If aliases are used, the alias is to
+					be specified here instead of the queryName.
+				</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+	<xs:complexType name="cmisPropertyBoolean">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisProperty">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:boolean" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisPropertyId">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisProperty">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:string" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisPropertyInteger">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisProperty">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:integer" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisPropertyDateTime">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisProperty">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:dateTime" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisPropertyDecimal">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisProperty">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:decimal" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisPropertyHtml">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisProperty">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:string" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+
+	<xs:complexType name="cmisPropertyString">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisProperty">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:string" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisPropertyUri">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisProperty">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:anyURI" />
+					<xs:any processContents="lax" namespace="##other" minOccurs="0"
+						maxOccurs="unbounded" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+
+	<!-- cmis choice -->
+	<xs:complexType name="cmisChoice">
+		<xs:attribute name="displayName" type="xs:string" use="required" />
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+	<xs:complexType name="cmisChoiceBoolean">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisChoice">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:boolean" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceBoolean" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisChoiceId">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisChoice">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:string" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceId" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisChoiceInteger">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisChoice">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:integer" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceInteger" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisChoiceDateTime">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisChoice">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:dateTime" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceDateTime" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisChoiceDecimal">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisChoice">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:decimal" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceDecimal" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisChoiceHtml">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisChoice">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:string" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceHtml" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:complexType name="cmisChoiceString">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisChoice">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:string" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceString" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisChoiceUri">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisChoice">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="value"
+						type="xs:anyURI" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceUri" />
+				</xs:sequence>
+
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+
+	<!--  allowable actions -->
+	<xs:complexType name="cmisAllowableActionsType">
+		<xs:sequence>
+			<xs:element name="canDeleteObject" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canUpdateProperties" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canGetFolderTree" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canGetProperties" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canGetObjectRelationships" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canGetObjectParents" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canGetFolderParent" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canGetDescendants" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canMoveObject" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canDeleteContentStream" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canCheckOut" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canCancelCheckOut" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canCheckIn" type="xs:boolean" minOccurs="0"
+				maxOccurs="1" />
+			<xs:element name="canSetContentStream" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canGetAllVersions" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canAddObjectToFolder" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canRemoveObjectFromFolder" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canGetContentStream" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canApplyPolicy" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canGetAppliedPolicies" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canRemovePolicy" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canGetChildren" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canCreateDocument" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canCreateFolder" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canCreateRelationship" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canCreateItem" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="canDeleteTree" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+
+			<!-- renditions -->
+			<xs:element name="canGetRenditions" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+
+			<!-- ACL -->
+			<xs:element name="canGetACL" type="xs:boolean" minOccurs="0"
+				maxOccurs="1" />
+			<xs:element name="canApplyACL" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+
+			<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
+				processContents="lax" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+
+
+	<xs:complexType name="cmisListOfIdsType">
+		<xs:sequence>
+			<xs:element name="id" type="xs:string" minOccurs="1"
+				maxOccurs="unbounded" />
+
+			<!--  extension -->
+			<xs:any processContents="lax" namespace="##other" minOccurs="0"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+
+	<!-- bulkUpdateProperties -->
+	<xs:complexType name="cmisObjectIdAndChangeTokenType">
+		<xs:sequence>
+			<xs:element name="id" type="xs:string" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="newId" type="xs:string" minOccurs="0"
+				maxOccurs="1" />
+			<xs:element name="changeToken" type="xs:string" minOccurs="0"
+				maxOccurs="1" />
+
+			<xs:any processContents="lax" namespace="##other" minOccurs="0"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+
+	<xs:complexType name="cmisBulkUpdateType">
+		<xs:sequence>
+			<xs:element name="objectIdAndChangeToken" type="cmis:cmisObjectIdAndChangeTokenType"
+				minOccurs="1" maxOccurs="unbounded" />
+			<xs:element name="properties" type="cmis:cmisPropertiesType"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="addSecondaryTypeIds" type="xs:string"
+				minOccurs="0" maxOccurs="unbounded" />
+			<xs:element name="removeSecondaryTypeIds" type="xs:string"
+				minOccurs="0" maxOccurs="unbounded" />
+				
+			<!--  extension -->
+			<xs:any processContents="lax" namespace="##other" minOccurs="0"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+
+
+	<!-- Property Attributes -->
+	<xs:complexType name="cmisPropertyDefinitionType">
+		<xs:sequence>
+			<xs:element name="id" type="xs:string" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="localName" type="xs:string" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="localNamespace" type="xs:anyURI"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="displayName" type="xs:string" minOccurs="0"
+				maxOccurs="1" />
+			<xs:element name="queryName" type="xs:string" minOccurs="0"
+				maxOccurs="1" />
+			<xs:element name="description" type="xs:string" minOccurs="0"
+				maxOccurs="1" />
+			<xs:element name="propertyType" type="cmis:enumPropertyType"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="cardinality" type="cmis:enumCardinality"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="updatability" type="cmis:enumUpdatability"
+				minOccurs="1" maxOccurs="1" />
+
+			<!-- flags -->
+			<xs:element name="inherited" type="xs:boolean" minOccurs="0"
+				maxOccurs="1" />
+			<xs:element name="required" type="xs:boolean" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="queryable" type="xs:boolean" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="orderable" type="xs:boolean" minOccurs="1"
+				maxOccurs="1" />
+
+			<xs:element name="openChoice" type="xs:boolean" minOccurs="0"
+				maxOccurs="1" />
+
+			<!--  extension -->
+			<xs:any processContents="lax" namespace="##other" minOccurs="0"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+
+	<!--  type specific definitions -->
+	<xs:complexType name="cmisPropertyBooleanDefinitionType">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisPropertyDefinitionType">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
+						type="cmis:cmisPropertyBoolean" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceBoolean" />
+
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisPropertyIdDefinitionType">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisPropertyDefinitionType">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
+						type="cmis:cmisPropertyId" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceId" />
+
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisPropertyIntegerDefinitionType">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisPropertyDefinitionType">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
+						type="cmis:cmisPropertyInteger" />
+					<xs:element name="maxValue" type="xs:integer" minOccurs="0"
+						maxOccurs="1" />
+					<xs:element name="minValue" type="xs:integer" minOccurs="0"
+						maxOccurs="1" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceInteger" />
+
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisPropertyDateTimeDefinitionType">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisPropertyDefinitionType">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
+						type="cmis:cmisPropertyDateTime" />
+					<xs:element minOccurs="0" maxOccurs="1" name="resolution"
+						type="cmis:enumDateTimeResolution" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceDateTime" />
+
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisPropertyDecimalDefinitionType">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisPropertyDefinitionType">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
+						type="cmis:cmisPropertyDecimal" />
+					<xs:element name="maxValue" type="xs:decimal" minOccurs="0"
+						maxOccurs="1" />
+					<xs:element name="minValue" type="xs:decimal" minOccurs="0"
+						maxOccurs="1" />
+					<xs:element name="precision" type="cmis:enumDecimalPrecision"
+						minOccurs="0" maxOccurs="1" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceDecimal" />
+
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisPropertyHtmlDefinitionType">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisPropertyDefinitionType">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
+						type="cmis:cmisPropertyHtml" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceHtml" />
+
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisPropertyStringDefinitionType">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisPropertyDefinitionType">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
+						type="cmis:cmisPropertyString" />
+					<xs:element name="maxLength" type="xs:integer"
+						minOccurs="0" maxOccurs="1" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceString" />
+
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisPropertyUriDefinitionType">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisPropertyDefinitionType">
+				<xs:sequence>
+					<xs:element minOccurs="0" maxOccurs="1" name="defaultValue"
+						type="cmis:cmisPropertyUri" />
+					<xs:element minOccurs="0" maxOccurs="unbounded" name="choice"
+						type="cmis:cmisChoiceUri" />
+
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+
+	<!-- type definition -->
+	<xs:complexType name="cmisTypeDefinitionType">
+		<xs:sequence>
+			<!--  primary identifying attribute -->
+			<xs:element name="id" type="xs:string" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="localName" type="xs:string" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="localNamespace" type="xs:anyURI"
+				minOccurs="1" maxOccurs="1" nillable="true" />
+			<xs:element name="displayName" type="xs:string" minOccurs="0"
+				maxOccurs="1" />
+			<xs:element name="queryName" type="xs:string" minOccurs="0"
+				maxOccurs="1" />
+			<xs:element name="description" type="xs:string" minOccurs="0"
+				maxOccurs="1" />
+
+			<!--  base type -->
+			<xs:element name="baseId" type="cmis:enumBaseObjectTypeIds"
+				minOccurs="1" maxOccurs="1" />
+
+			<!-- parent -->
+			<xs:element name="parentId" type="xs:string" minOccurs="0"
+				maxOccurs="1">
+				<xs:annotation>
+					<xs:documentation>
+						This is the id for the parent type definition. If
+						this is a base type,
+						this is not present.
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+
+			<!-- flags -->
+			<xs:element name="creatable" type="xs:boolean" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="fileable" type="xs:boolean" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="queryable" type="xs:boolean" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="fulltextIndexed" type="xs:boolean"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="includedInSupertypeQuery" type="xs:boolean"
+				minOccurs="1" maxOccurs="1" default="true" />
+
+			<!-- controllable -->
+			<xs:element name="controllablePolicy" type="xs:boolean"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="controllableACL" type="xs:boolean"
+				minOccurs="1" maxOccurs="1" />
+
+			<!-- property definitions -->
+			<xs:choice minOccurs="0" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:property name="propertyDefinition" />
+					</xs:appinfo>
+				</xs:annotation>
+				<xs:element name="propertyBooleanDefinition" type="cmis:cmisPropertyBooleanDefinitionType" />
+				<xs:element name="propertyDateTimeDefinition"
+					type="cmis:cmisPropertyDateTimeDefinitionType" />
+				<xs:element name="propertyDecimalDefinition" type="cmis:cmisPropertyDecimalDefinitionType" />
+				<xs:element name="propertyIdDefinition" type="cmis:cmisPropertyIdDefinitionType" />
+				<xs:element name="propertyIntegerDefinition" type="cmis:cmisPropertyIntegerDefinitionType" />
+				<xs:element name="propertyHtmlDefinition" type="cmis:cmisPropertyHtmlDefinitionType" />
+				<xs:element name="propertyStringDefinition" type="cmis:cmisPropertyStringDefinitionType" />
+				<xs:element name="propertyUriDefinition" type="cmis:cmisPropertyUriDefinitionType" />
+			</xs:choice>
+
+			<!-- extension -->
+			<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
+				processContents="lax" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+
+
+	<!-- type specific typedefs -->
+	<xs:complexType name="cmisTypeDocumentDefinitionType">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisTypeDefinitionType">
+				<xs:sequence>
+					<xs:element name="versionable" type="xs:boolean"
+						minOccurs="1" maxOccurs="1" />
+					<xs:element name="contentStreamAllowed" type="cmis:enumContentStreamAllowed"
+						minOccurs="1" maxOccurs="1" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisTypeFolderDefinitionType">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisTypeDefinitionType">
+				<xs:sequence>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisTypeRelationshipDefinitionType">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisTypeDefinitionType">
+				<xs:sequence>
+					<xs:element name="allowedSourceTypes" type="xs:string"
+						minOccurs="0" maxOccurs="unbounded" />
+					<xs:element name="allowedTargetTypes" type="xs:string"
+						minOccurs="0" maxOccurs="unbounded" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="cmisTypePolicyDefinitionType">
+		<xs:complexContent>
+			<xs:extension base="cmis:cmisTypeDefinitionType">
+				<xs:sequence>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<!--  query -->
+	<xs:complexType name="cmisQueryType">
+		<xs:sequence>
+			<xs:element name="statement" type="xs:string" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="searchAllVersions" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+
+			<xs:element name="includeAllowableActions" type="xs:boolean"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="includeRelationships" type="cmis:enumIncludeRelationships"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="renditionFilter" type="xs:string"
+				minOccurs="0" maxOccurs="1" />
+
+			<xs:element name="maxItems" type="xs:integer" minOccurs="0"
+				maxOccurs="1" />
+			<xs:element name="skipCount" type="xs:integer" minOccurs="0"
+				maxOccurs="1" />
+
+			<xs:any maxOccurs="unbounded" minOccurs="0" namespace="##other"
+				processContents="lax" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+
+
+
+	<!--  repository info -->
+	<xs:complexType name="cmisRepositoryInfoType">
+		<xs:sequence minOccurs="1">
+			<xs:element name="repositoryId" type="xs:string"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="repositoryName" type="xs:string"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="repositoryDescription" type="xs:string"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="vendorName" type="xs:string" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="productName" type="xs:string" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="productVersion" type="xs:string"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="rootFolderId" type="xs:string" />
+			<xs:element name="latestChangeLogToken" type="xs:string"
+				minOccurs="0" />
+			<xs:element name="capabilities" type="cmis:cmisRepositoryCapabilitiesType"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="aclCapability" type="cmis:cmisACLCapabilityType"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="cmisVersionSupported" type="xs:string"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="thinClientURI" type="xs:anyURI"
+				minOccurs="0" maxOccurs="1" />
+			<xs:element name="changesIncomplete" type="xs:boolean"
+				maxOccurs="1" minOccurs="0" />
+			<xs:element name="changesOnType" type="cmis:enumBaseObjectTypeIds"
+				minOccurs="0" maxOccurs="unbounded" />
+
+			<xs:element name="principalAnonymous" type="xs:string"
+				minOccurs="0" maxOccurs="1">
+				<xs:annotation>
+					<xs:documentation>
+						If set, this field holds the principal who is
+						used for anonymous
+						access. This principal can then be passed to the
+						ACL services to
+						specify what permissions anonymous users should
+						have
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+
+			<xs:element name="principalAnyone" type="xs:string"
+				minOccurs="0" maxOccurs="1">
+				<xs:annotation>
+					<xs:documentation>
+						If set, this field holds the principal who is
+						used for everyone's access. This principal can then be passed to
+						the
+						ACL services to
+						specify what permissions everyone should
+						have
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+
+			<xs:element name="extendedFeatures"
+				type="cmis:cmisExtensionFeatureType" maxOccurs="unbounded" minOccurs="0">
+			</xs:element>
+
+			<xs:any namespace="##other" processContents="lax" minOccurs="0"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+
+	<xs:complexType name="cmisRepositoryCapabilitiesType">
+		<xs:sequence>
+			<xs:element name="capabilityACL" type="cmis:enumCapabilityACL"
+				maxOccurs="1" minOccurs="1" />
+			<xs:element name="capabilityAllVersionsSearchable" type="xs:boolean"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="capabilityChanges" type="cmis:enumCapabilityChanges" />
+
+			<xs:element name="capabilityContentStreamUpdatability"
+				type="cmis:enumCapabilityContentStreamUpdates" minOccurs="1"
+				maxOccurs="1" />
+			<xs:element name="capabilityGetDescendants" type="xs:boolean"
+				maxOccurs="1" minOccurs="1" />
+			<xs:element name="capabilityGetFolderTree" type="xs:boolean"
+				maxOccurs="1" minOccurs="1" />
+
+			<xs:element name="capabilityMultifiling" type="xs:boolean"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="capabilityPWCSearchable" type="xs:boolean"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="capabilityPWCUpdatable" type="xs:boolean"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="capabilityQuery" type="cmis:enumCapabilityQuery"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="capabilityRenditions" type="cmis:enumCapabilityRendition"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="capabilityUnfiling" type="xs:boolean"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="capabilityVersionSpecificFiling" type="xs:boolean"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="capabilityJoin" type="cmis:enumCapabilityJoin"
+				minOccurs="1" maxOccurs="1" />
+
+			<xs:element name="capabilityCreatablePropertiesList"
+				type="cmis:cmisCreatablePropertyTypeListType" maxOccurs="1" minOccurs="0">
+			</xs:element>
+			<xs:element name="capabilitySettableAttributesForNewTypes"
+				type="cmis:cmisNewTypeSettableAttributes" maxOccurs="1" minOccurs="0">
+			</xs:element>
+
+			<!-- extension -->
+			<xs:any namespace="##other" processContents="skip" minOccurs="0"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+
+	<!-- Unified Search -->
+	<xs:simpleType name="enumTypeOfChanges">
+		<xs:restriction base="xs:string">
+			<!-- content with a new ID has been created -->
+			<xs:enumeration value="created" />
+			<!-- content with an existing ID has been modified -->
+			<xs:enumeration value="updated" />
+			<!-- content with an existing ID has been deleted -->
+			<xs:enumeration value="deleted" />
+			<!-- content with an existing ID has had its security policy changed-->
+			<xs:enumeration value="security" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="enumCapabilityChanges">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="none" />
+			<xs:enumeration value="objectidsonly" />
+			<xs:enumeration value="properties" />
+			<xs:enumeration value="all" />
+		</xs:restriction>
+	</xs:simpleType>
+
+
+
+	<xs:complexType name="cmisChangeEventType">
+		<xs:sequence>
+			<xs:element name="changeType" type="cmis:enumTypeOfChanges" />
+			<xs:element name="changeTime" type="xs:dateTime" />
+
+			<!--  extension -->
+			<xs:any processContents="lax" namespace="##other" minOccurs="0"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- ACL -->
+	<xs:simpleType name="enumACLPropagation">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="repositorydetermined" />
+			<xs:enumeration value="objectonly" />
+			<xs:enumeration value="propagate" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="enumCapabilityACL">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="none" />
+			<xs:enumeration value="discover" />
+			<xs:enumeration value="manage" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="enumBasicPermissions">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="cmis:read" />
+			<xs:enumeration value="cmis:write" />
+			<xs:enumeration value="cmis:all" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="cmisPermissionDefinition">
+		<xs:sequence>
+			<xs:element name="permission" type="xs:string" />
+			<xs:element name="description" type="xs:string" minOccurs="0"
+				maxOccurs="1" />
+			<xs:any namespace="##other" minOccurs="0" processContents="lax"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="cmisPermissionMapping">
+		<xs:sequence>
+			<xs:element name="key" type="cmis:enumAllowableActionsKey"
+				minOccurs="1" maxOccurs="1" />
+			<xs:element name="permission" type="xs:string" minOccurs="1"
+				maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>
+						Multiple entries are OR'ed together. Any
+						permission that specified is
+						sufficient to provide rights required
+						in key
+					</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
+				processContents="lax" />
+		</xs:sequence>
+	</xs:complexType>
+
+
+	<xs:simpleType name="enumAllowableActionsKey">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="canGetDescendents.Folder" />
+			<xs:enumeration value="canGetChildren.Folder" />
+			<xs:enumeration value="canGetParents.Folder" />
+			<xs:enumeration value="canGetFolderParent.Object" />
+			<xs:enumeration value="canCreateDocument.Folder" />
+			<xs:enumeration value="canCreateFolder.Folder" />
+			<xs:enumeration value="canCreateRelationship.Source" />
+			<xs:enumeration value="canCreateRelationship.Target" />
+			<xs:enumeration value="canGetProperties.Object" />
+			<xs:enumeration value="canViewContent.Object" />
+			<xs:enumeration value="canUpdateProperties.Object" />
+			<xs:enumeration value="canMove.Object" />
+			<xs:enumeration value="canMove.Target" />
+			<xs:enumeration value="canMove.Source" />
+			<xs:enumeration value="canDelete.Object" />
+			<xs:enumeration value="canDeleteTree.Folder" />
+			<xs:enumeration value="canSetContent.Document" />
+			<xs:enumeration value="canDeleteContent.Document" />
+			<xs:enumeration value="canAddToFolder.Object" />
+			<xs:enumeration value="canAddToFolder.Folder" />
+			<xs:enumeration value="canRemoveFromFolder.Object" />
+			<xs:enumeration value="canRemoveFromFolder.Folder" />
+			<xs:enumeration value="canCheckout.Document" />
+			<xs:enumeration value="canCancelCheckout.Document" />
+			<xs:enumeration value="canCheckin.Document" />
+			<xs:enumeration value="canGetAllVersions.VersionSeries" />
+			<xs:enumeration value="canGetObjectRelationships.Object" />
+			<xs:enumeration value="canAddPolicy.Object" />
+			<xs:enumeration value="canAddPolicy.Policy" />
+			<xs:enumeration value="canRemovePolicy.Object" />
+			<xs:enumeration value="canRemovePolicy.Policy" />
+			<xs:enumeration value="canGetAppliedPolicies.Object" />
+			<xs:enumeration value="canGetACL.Object" />
+			<xs:enumeration value="canApplyACL.Object" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="enumUsers">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="cmis:user">
+				<xs:annotation>
+					<xs:documentation>
+						This user can be used on setting ACLs to specify
+						the permission this
+						user context should have.
+			</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- ACL on objects -->
+	<xs:complexType name="cmisAccessControlPrincipalType">
+		<xs:sequence>
+			<xs:element name="principalId" type="xs:string" />
+
+			<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
+				processContents="lax" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="cmisAccessControlEntryType">
+		<xs:sequence>
+			<xs:element name="principal" type="cmis:cmisAccessControlPrincipalType" />
+			<xs:element name="permission" type="xs:string" minOccurs="1"
+				maxOccurs="unbounded" />
+			<xs:element name="direct" type="xs:boolean" />
+
+			<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
+				processContents="lax" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="cmisAccessControlListType">
+		<xs:sequence>
+			<xs:element name="permission" type="cmis:cmisAccessControlEntryType"
+				minOccurs="0" maxOccurs="unbounded" />
+			<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
+				processContents="lax" />
+		</xs:sequence>
+	</xs:complexType>
+
+
+	<xs:complexType name="cmisACLCapabilityType">
+		<xs:sequence>
+			<xs:element name="supportedPermissions" type="cmis:enumSupportedPermissions" />
+			<xs:element name="propagation" type="cmis:enumACLPropagation" />
+			<xs:element name="permissions" type="cmis:cmisPermissionDefinition"
+				minOccurs="1" maxOccurs="unbounded" />
+			<xs:element name="mapping" type="cmis:cmisPermissionMapping"
+				minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:simpleType name="enumSupportedPermissions">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="basic" />
+			<xs:enumeration value="repository" />
+			<xs:enumeration value="both" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- renditions -->
+	<xs:simpleType name="enumCapabilityRendition">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="none" />
+			<xs:enumeration value="read" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="enumRenditionKind">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="cmis:thumbnail" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="cmisRenditionType">
+		<xs:sequence>
+			<xs:element name="streamId" type="xs:string" />
+			<xs:element name="mimetype" type="xs:string" />
+			<xs:element name="length" type="xs:integer" />
+			<xs:element name="kind" type="xs:string" />
+			<xs:element name="title" type="xs:string" minOccurs="0" />
+			<xs:element name="height" type="xs:integer" minOccurs="0" />
+			<xs:element name="width" type="xs:integer" minOccurs="0" />
+			<xs:element name="renditionDocumentId" type="xs:string"
+				minOccurs="0" />
+
+			<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
+				processContents="lax" />
+		</xs:sequence>
+	</xs:complexType>
+
+
+	<!-- elements -->
+	<xs:element name="allowableActions" type="cmis:cmisAllowableActionsType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the root tag for a CMIS AllowableActions
+				Document Type
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="query" type="cmis:cmisQueryType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the root tag for a CMIS Query Document Type
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+	<xs:element name="acl" type="cmis:cmisAccessControlListType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the root tag for a CMIS ACL Document Type
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+	
+	<!-- type mutability -->
+	<xs:complexType name="cmisTypeMutabilityCapabilitiesType"> 
+		<xs:sequence> 
+			<xs:element name="create" type="xs:boolean"/> 
+			<xs:element name="update" type="xs:boolean"/> 
+			<xs:element name="delete" type="xs:boolean"/> 
+			<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
+				processContents="lax" />
+		</xs:sequence> 
+	</xs:complexType> 
+
+	<xs:complexType name="cmisCreatablePropertyTypeListType">
+		<xs:sequence maxOccurs="unbounded" minOccurs="0">
+			<xs:element name="canCreate"
+				type="cmis:enumPropertyType">
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<xs:complexType name="cmisNewTypeSettableAttributes">
+		<xs:sequence>
+			<xs:element name="id" type="xs:boolean" minOccurs="1" maxOccurs="1" />
+			<xs:element name="localName" type="xs:boolean" minOccurs="1" maxOccurs="1" />
+			<xs:element name="localNamespace" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="displayName" type="xs:boolean" minOccurs="1" maxOccurs="1" />
+			<xs:element name="queryName" type="xs:boolean" minOccurs="1" maxOccurs="1" />
+			<xs:element name="description" type="xs:boolean" minOccurs="1" maxOccurs="1" />
+			<xs:element name="creatable" type="xs:boolean" minOccurs="1" maxOccurs="1" />
+			<xs:element name="fileable" type="xs:boolean" minOccurs="1" maxOccurs="1" />
+			<xs:element name="queryable" type="xs:boolean" minOccurs="1" maxOccurs="1" />
+			<xs:element name="fulltextIndexed" type="xs:boolean" minOccurs="1" maxOccurs="1" />
+			<xs:element name="includedInSupertypeQuery" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="controllablePolicy" type="xs:boolean" minOccurs="1" maxOccurs="1" />
+			<xs:element name="controllableACL" type="xs:boolean" minOccurs="1" maxOccurs="1" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- feature extensions -->
+	<xs:complexType name="cmisExtensionFeatureKeyValuePair">	
+		<xs:sequence>
+			<xs:element minOccurs="1" maxOccurs="1" name="key" type="xs:string" />
+			<xs:element minOccurs="1" maxOccurs="1" name="value" type="xs:string" />
+		</xs:sequence>
+	</xs:complexType> 
+
+	<xs:complexType name="cmisExtensionFeatureType">	
+	    <xs:sequence>
+			<!-- id is the only mandatory field - typically will be a URN-->
+			<xs:element minOccurs="1" maxOccurs="1" name="id" type="xs:anyURI" />
+			<!-- optional url for a site describing the extension -->
+			<xs:element minOccurs="0" maxOccurs="1" name="url" type="xs:anyURI" />
+			<!-- optional short name for standard i.e. FooStandard -->
+			<xs:element minOccurs="0" maxOccurs="1" name="commonName" type="xs:string" />
+			<!-- optional version label-->
+			<xs:element minOccurs="0" maxOccurs="1" name="versionLabel" type="xs:string" />
+			<xs:element minOccurs="0" maxOccurs="1" name="description" type="xs:string" />
+			<xs:element name="featureData" type="cmis:cmisExtensionFeatureKeyValuePair" minOccurs="0" maxOccurs="unbounded" />
+			<xs:any processContents="lax" namespace="##other" minOccurs="0" maxOccurs="unbounded" />
+	    </xs:sequence>
+	</xs:complexType> 
+	
+</xs:schema>
+	<!-- EOF -->
\ No newline at end of file
diff --git a/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/CMIS-RestAtom.xsd b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/CMIS-RestAtom.xsd
new file mode 100644
index 00000000000..d5e12c3ab4d
--- /dev/null
+++ b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/CMIS-RestAtom.xsd
@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+     Content Management Interoperability Services (CMIS) Version 1.1
+     OASIS Standard
+     23 May 2013
+     Copyright (c) OASIS Open 2013. All Rights Reserved.
+     Source: http://docs.oasis-open.org/cmis/CMIS/v1.1/os/schema/
+     
+     -->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified"
+	targetNamespace="http://docs.oasis-open.org/ns/cmis/restatom/200908/"
+	xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+	jaxb:extensionBindingPrefixes="xjc" jaxb:version="2.1"
+	xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/"
+	xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/"
+	version="1.0">
+
+	<xs:import namespace="http://docs.oasis-open.org/ns/cmis/core/200908/"
+		schemaLocation="CMIS-Core.xsd" />
+
+	<xs:attribute name="id" type="xs:string">
+		<xs:annotation>
+			<xs:documentation>
+				This attribute MAY be used on XML elements that
+				refer to a CMIS resources. Examples are:
+				- atom:link
+				- cmis:type
+			</xs:documentation>
+		</xs:annotation>
+	</xs:attribute>
+
+	<xs:attribute name="renditionKind" type="xs:string">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension attribute that will be
+				used to specify the rendition kind of a link with relation
+				alternate if it is a CMIS Rendition.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:attribute>
+
+	<xs:element name="repositoryInfo" type="cmis:cmisRepositoryInfoType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to contain CMIS repository information inside an
+				AtomPub workspace element inside an AtomPub Service
+				document.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="collectionType" type="xs:string">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to express the CMIS collection type.
+				This is only valid inside an app:collection element.
+				Valid values are in enumCollectionType. If
+				the value is not in enumCollectionType, then
+				it denotes a repository-specific relationship.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="type" type="cmis:cmisTypeDefinitionType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the Atom extension element that will be
+				used to contain a type definition (document, folder, 
+				relationship, policy, or item) inside an atom entry element.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+
+	<xs:complexType name="cmisChildrenType">
+		<xs:sequence>
+			<xs:any processContents="lax" namespace="##other" minOccurs="0"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+
+	<xs:element name="children" type="cmisra:cmisChildrenType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the Atom extension element that will be
+				used to contain a feed inside an atom entry element. 
+				This element MUST contain an atom:feed element.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="numItems" type="xs:integer">
+		<xs:annotation>
+			<xs:documentation>
+				This is the Atom extension element that will be
+				used to express the number of items in a feed if known.
+				This may only be used as an extension to the Feed.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+	
+	<xs:element name="bulkUpdate" type="cmis:cmisBulkUpdateType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to transport bulk update data inside an Atom entry element.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:simpleType name="enumCollectionType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="root" />
+			<xs:enumeration value="unfiled" />
+			<xs:enumeration value="checkedout" />
+			<xs:enumeration value="types" />
+			<xs:enumeration value="query" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="enumUriTemplateType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="objectbyid" />
+			<xs:enumeration value="objectbypath" />
+			<xs:enumeration value="query" />
+			<xs:enumeration value="typebyid" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="cmisUriTemplateType">
+		<xs:sequence>
+			<xs:element name="template" type="xs:string" />
+			<xs:element name="type" type="xs:string" />
+			<xs:element name="mediatype" type="xs:string" />
+			<xs:any processContents="lax" namespace="##other" minOccurs="0"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+	
+	<xs:element name="uritemplate" type="cmisra:cmisUriTemplateType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to contain CMIS URI Templates inside an AtomPub
+				workspace element inside an AtomPub Service document
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="object" type="cmis:cmisObjectType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to contain a CMIS object instance inside an 
+				Atom entry element.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="pathSegment" type="xs:string">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to contain the path segment for this object in a particular
+				folder. This element MAY only be specified in an atom:entry inside
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:element name="relativePathSegment" type="xs:string">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to contain the path segment for this object for the
+				particular folder returned in the Object Parents feed.
+				Unlike pathSegment which is set on the atom entry when contained
+				in a feed for a folder, this is set on an atom entry representing
+				a folder for a parents feed on the object.
+
+				This element MAY only be specified in an atom:entry
+				representing a folder inside an object parents feed.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:complexType name="cmisContentType">
+		<xs:sequence>
+			<xs:element name="mediatype" type="xs:string" />
+			<xs:element name="base64" type="xs:string" />
+			<xs:any processContents="lax" namespace="##other" minOccurs="0"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attributeGroup ref="cmis:cmisUndefinedAttribute" />
+	</xs:complexType>
+
+	<xs:element name="content" type="cmisra:cmisContentType">
+		<xs:annotation>
+			<xs:documentation>
+				This is the AtomPub extension element that will be
+				used to contain the base64 content inside an atom entry.
+
+				This is used to convey the content on creation or update
+				via AtomPub as an alternate mechanism.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+
+	<xs:simpleType name="enumReturnVersion">
+		<xs:annotation>
+			<xs:documentation>
+				This is an enumeration used for specifying the
+				version to return on a GET of an atom entry via URI argument.
+			</xs:documentation>
+		</xs:annotation>
+
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="this">
+				<xs:annotation>
+					<xs:documentation>
+						This is getObject service for the version
+						specified
+			</xs:documentation>
+				</xs:annotation>
+
+			</xs:enumeration>
+			<xs:enumeration value="latest">
+				<xs:annotation>
+					<xs:documentation>
+						This is the same as major==false on
+						getObjectOfLatestVersion
+					</xs:documentation>
+				</xs:annotation>
+
+			</xs:enumeration>
+			<xs:enumeration value="latestmajor">
+				<xs:annotation>
+					<xs:documentation>
+						This is the same as major==true on
+						getObjectOfLatestVersion
+					</xs:documentation>
+				</xs:annotation>
+			</xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+
+
+	<xs:simpleType name="enumLinkRelations">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="self" />
+			<xs:enumeration value="edit" />
+			<xs:enumeration value="edit-media" />
+			<xs:enumeration value="via" />
+			<xs:enumeration value="up" />
+			<xs:enumeration value="down" />
+			<xs:enumeration value="alternate" />
+			<xs:enumeration value="version-history" />
+			<xs:enumeration value="current-version" />
+			<xs:enumeration value="working-copy" />
+			<xs:enumeration value="service" />
+			<xs:enumeration value="describedby" />
+
+			<!--  paging -->
+			<xs:enumeration value="first" />
+			<xs:enumeration value="last" />
+			<xs:enumeration value="next" />
+			<xs:enumeration value="previous" />
+
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/allowableactions">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_ALLOWABLEACTIONS" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/relationships">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_RELATIONSHIPS" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/source">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_SOURCE" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/target">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_TARGET" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/policies">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_POLICIES" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+			<xs:enumeration value="http://docs.oasis-open.org/ns/cmis/link/200908/acl">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_ACL" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+
+			<!--  changes -->
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/changes">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_CHANGES" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+
+			<!--  folder tree -->
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/foldertree">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_FOLDERTREE" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+
+			<!--  types descendants -->
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/typedescendants">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_TYPEDESCENDANTS" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+			<xs:enumeration
+				value="http://docs.oasis-open.org/ns/cmis/link/200908/rootdescendants">
+				<xs:annotation>
+					<xs:appinfo>
+						<jaxb:typesafeEnumMember name="CMIS_ROOTDESCENDANTS" />
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:enumeration>
+
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!--  CMIS Rest Arguments -->
+	<xs:simpleType name="enumArguments">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="allVersions" />
+			<xs:enumeration value="append" />
+			<xs:enumeration value="continueOnFailure" />
+			<xs:enumeration value="changeLogToken" />
+			<xs:enumeration value="checkin" />
+			<xs:enumeration value="checkinComment" />
+			<xs:enumeration value="depth" />
+			<xs:enumeration value="direction" />
+			<xs:enumeration value="filter" />
+			<xs:enumeration value="folderId" />
+			<xs:enumeration value="includeACL" />
+			<xs:enumeration value="includeAllowableActions" />
+			<xs:enumeration value="includeProperties" />
+			<xs:enumeration value="includePathSegment" />
+			<xs:enumeration value="includeRelativePathSegment" />
+			<xs:enumeration value="includePropertyDefinitions" />
+			<xs:enumeration value="includePolicyIds" />
+			<xs:enumeration value="includeRelationships" />
+			<xs:enumeration value="includeSubRelationshipTypes" />
+			<xs:enumeration value="isLastChunk" />
+			<xs:enumeration value="major" />
+			<xs:enumeration value="maxItems" />
+			<xs:enumeration value="onlyBasicPermissions" />
+			<xs:enumeration value="orderBy" />
+			<xs:enumeration value="overwriteFlag" />
+			<xs:enumeration value="relationshipDirection" />
+			<xs:enumeration value="relationshipType" />
+			<xs:enumeration value="renditionFilter" />
+			<xs:enumeration value="removeFrom" />
+			<xs:enumeration value="repositoryId" />
+			<xs:enumeration value="returnVersion" />
+			<xs:enumeration value="skipCount" />
+			<xs:enumeration value="sourceFolderId" />
+			<xs:enumeration value="streamId" />
+			<xs:enumeration value="targetFolderId" />
+			<xs:enumeration value="typeId" />
+			<xs:enumeration value="unfileObjects" />
+			<xs:enumeration value="versioningState" />
+		</xs:restriction>
+	</xs:simpleType>
+
+</xs:schema>
+	<!-- EOF -->
\ No newline at end of file
diff --git a/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/PolicyTest.applyPolicy.atomentry.xml b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/PolicyTest.applyPolicy.atomentry.xml
new file mode 100644
index 00000000000..1918046898f
--- /dev/null
+++ b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/PolicyTest.applyPolicy.atomentry.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/"
+    xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
+    <id>urn:uuid:00000000-0000-0000-0000-000000000000</id>
+    <title>${OBJECTID}</title>
+    <updated>2010-01-01T00:00:00Z</updated>
+    <author>admin</author>
+    <link rel="alternate" href="" />
+    <summary>${OBJECTID} (summary)</summary>
+    <cmisra:object>
+        <cmis:properties>
+            <cmis:propertyId propertyDefinitionId="cmis:objectId">
+                <cmis:value>${OBJECTID}</cmis:value>
+            </cmis:propertyId>
+        </cmis:properties>
+    </cmisra:object>
+</entry>
diff --git a/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/app.xsd b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/app.xsd
new file mode 100644
index 00000000000..e7246d533f7
--- /dev/null
+++ b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/app.xsd
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	<!--
+		-*- rnc -*- RELAX NG Compact Syntax Grammar for the Atom Format
+		Specification Version 11
+	-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" targetNamespace="http://www.w3.org/2007/app"
+	xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app"
+	xmlns:cmisc="http://docs.oasis-open.org/ns/cmis/core/200908/"
+	xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/"
+	version="0.62d">
+	<xs:import namespace="http://www.w3.org/2005/Atom"
+		schemaLocation="atom.xsd" />
+	<xs:import namespace="http://docs.oasis-open.org/ns/cmis/core/200908/"
+		schemaLocation="CMIS-Core.xsd" />
+	<xs:import namespace="http://docs.oasis-open.org/ns/cmis/restatom/200908/"
+		schemaLocation="CMIS-RestAtom.xsd" />
+
+	<xs:element name="service" type="app:appServiceType"></xs:element>
+	<xs:complexType name="appServiceType">
+		<xs:sequence>
+			<xs:element ref="atom:author" minOccurs="0" maxOccurs="1"></xs:element>
+			<xs:element ref="app:workspace" minOccurs="1" maxOccurs="unbounded"></xs:element>
+			<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"
+				namespace="##other" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:element name="workspace" type="app:appWorkspaceType"></xs:element>
+	<xs:complexType name="appWorkspaceType">
+		<xs:sequence>
+			<xs:element ref="atom:title"></xs:element>
+			<xs:element ref="app:collection" minOccurs="0" maxOccurs="unbounded"></xs:element>
+			<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"
+				namespace="##other" />
+		</xs:sequence>
+		<xs:attributeGroup ref="atom:undefinedAttribute"></xs:attributeGroup>
+	</xs:complexType>
+	<xs:element name="collection" type="app:appCollectionType"></xs:element>
+	<xs:complexType name="appCollectionType">
+		<xs:sequence>
+			<xs:element ref="atom:title"></xs:element>
+			<xs:element name="accept" type="xs:string" minOccurs="0"
+				maxOccurs="unbounded" />
+			<xs:element name="categories" type="app:appCategoriesType"
+				minOccurs="0" maxOccurs="unbounded" />
+			<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"
+				namespace="##other" />
+		</xs:sequence>
+		<xs:attribute name="href" type="xs:anyURI"></xs:attribute>
+		<xs:attributeGroup ref="atom:undefinedAttribute"></xs:attributeGroup>
+	</xs:complexType>
+	<xs:complexType name="appCategoriesType">
+		<xs:sequence>
+			<xs:element name="category" type="app:appCategoryType"
+				minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+		<xs:attribute name="fixed" type="xs:boolean" />
+	</xs:complexType>
+	<xs:complexType name="appCategoryType">
+		<xs:sequence>
+		</xs:sequence>
+		<xs:attribute name="scheme" type="xs:anyURI" />
+		<xs:attribute name="term" type="xs:string" />
+		<xs:attribute name="label" type="xs:string" />
+	</xs:complexType>
+
+	<!--  -->
+	<xs:element name="edited" type="atom:atomDateConstruct" />
+	<xs:complexType name="appControlType">
+		<xs:sequence>
+			<xs:element name="draft" type="app:enumYesNo" minOccurs="0"
+				maxOccurs="1" />
+			<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"
+				namespace="##other" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:element name="control" type="app:appControlType" />
+
+	<!-- rfc5023 13.1.1 -->
+	<xs:simpleType name="enumYesNo">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="yes" />
+			<xs:enumeration value="no" />
+		</xs:restriction>
+	</xs:simpleType>
+</xs:schema>
+	<!-- EOF -->
\ No newline at end of file
diff --git a/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/atom.xsd b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/atom.xsd
new file mode 100644
index 00000000000..e1f8e59b0f5
--- /dev/null
+++ b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/atom.xsd
@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+		-*- rnc -*- RELAX NG Compact Syntax Grammar for the Atom Format
+		Specification Version 11
+-->
+<!--
+		$Revision: 34 $
+		$Date: 2009-08-07 18:20:47 -0400 (Fri, 07 Aug 2009) $
+		$Author: albertcbrown $
+		$HeadURL: file:///var/lib/subversion/cmis/trunk/SchemaProject/schema/ATOM.xsd $
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        elementFormDefault="qualified" targetNamespace="http://www.w3.org/2005/Atom"
+        xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+        xmlns:xml="http://www.w3.org/XML/1998/namespace"
+        xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+        jaxb:extensionBindingPrefixes="xjc" jaxb:version="2.1" version="0.62d">
+
+        <xs:import namespace="http://www.w3.org/XML/1998/namespace"
+                schemaLocation="xml.xsd" />
+
+        <!-- Common attributes -->
+        <xs:attributeGroup name="atomCommonAttributes">
+                <xs:attribute ref="xml:base" />
+                <xs:attribute ref="xml:lang" />
+                <xs:attributeGroup ref="atom:undefinedAttribute" />
+        </xs:attributeGroup>
+        <!-- Text Constructs -->
+        <xs:attributeGroup name="atomPlainTextConstruct">
+                <xs:attributeGroup ref="atom:atomCommonAttributes" />
+                <xs:attribute name="type">
+                        <xs:simpleType>
+                                <xs:restriction base="xs:token">
+                                        <xs:enumeration value="text" />
+                                        <xs:enumeration value="html" />
+                                </xs:restriction>
+                        </xs:simpleType>
+                </xs:attribute>
+        </xs:attributeGroup>
+        <xs:group name="atomXHTMLTextConstruct">
+                <xs:sequence>
+                        <xs:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/1999/xhtml" />
+                </xs:sequence>
+        </xs:group>
+        <xs:attributeGroup name="atomXHTMLTextConstruct">
+                <xs:attributeGroup ref="atom:atomCommonAttributes" />
+                <xs:attribute name="type" use="required">
+                        <xs:simpleType>
+                                <xs:restriction base="xs:token">
+                                        <xs:enumeration value="xhtml" />
+                                </xs:restriction>
+                        </xs:simpleType>
+                </xs:attribute>
+        </xs:attributeGroup>
+        <xs:complexType name="atomTextConstruct" mixed="true">
+                <xs:group minOccurs="0" ref="atom:atomXHTMLTextConstruct" />
+                <xs:attribute name="type">
+                        <xs:simpleType>
+                                <xs:restriction base="xs:token">
+                                        <xs:enumeration value="text" />
+                                        <xs:enumeration value="html" />
+                                        <xs:enumeration value="xhtml" />
+                                </xs:restriction>
+                        </xs:simpleType>
+                </xs:attribute>
+                <xs:attributeGroup ref="atom:atomCommonAttributes" />
+        </xs:complexType>
+        <!-- Person Construct -->
+        <xs:complexType name="atomPersonConstruct">
+                <xs:sequence>
+                        <xs:element ref="atom:name" minOccurs="0" maxOccurs="1" />
+                        <xs:element ref="atom:uri" minOccurs="0" maxOccurs="1" />
+                        <xs:element ref="atom:email" minOccurs="0" maxOccurs="1" />
+                        <xs:group ref="atom:extensionElement" minOccurs="0"
+                                maxOccurs="unbounded" />
+                </xs:sequence>
+                <xs:attributeGroup ref="atom:atomCommonAttributes" />
+        </xs:complexType>
+        <xs:element name="name" type="xs:string" />
+        <xs:element name="uri" type="xs:string" />
+        <xs:element name="email" type="atom:atomEmailAddress" />
+        <!-- Date Construct -->
+        <xs:complexType name="atomDateConstruct">
+                <xs:simpleContent>
+                        <xs:extension base="xs:dateTime">
+                                <xs:attributeGroup ref="atom:atomCommonAttributes" />
+                        </xs:extension>
+                </xs:simpleContent>
+        </xs:complexType>
+        <!-- atom:feed -->
+        <xs:element name="feed" type="atom:feedType"></xs:element>
+        <xs:complexType name="feedType">
+                <xs:sequence>
+                        <xs:choice maxOccurs="unbounded">
+                                <xs:annotation>
+                                        <xs:appinfo>
+                                                <jaxb:property name="items" />
+                                        </xs:appinfo>
+                                </xs:annotation>
+                                <xs:element ref="atom:author" />
+                                <xs:element ref="atom:category" />
+                                <xs:element ref="atom:contributor" />
+                                <xs:element ref="atom:generator" />
+                                <xs:element ref="atom:icon" />
+                                <xs:element ref="atom:id" />
+                                <xs:element ref="atom:link" />
+                                <xs:element ref="atom:logo" />
+                                <xs:element ref="atom:rights" />
+                                <xs:element ref="atom:subtitle" />
+                                <xs:element ref="atom:title" />
+                                <xs:element ref="atom:updated" />
+                        </xs:choice>
+
+                        <!--  original atom extension element -->
+                        <xs:group ref="atom:extensionElement" />
+
+                        <xs:element minOccurs="0" maxOccurs="unbounded" ref="atom:entry" />
+                </xs:sequence>
+                <xs:attributeGroup ref="atom:atomCommonAttributes" />
+        </xs:complexType>
+        <!-- atom:entry -->
+        <xs:element name="entry" type="atom:entryType">
+        </xs:element>
+        <xs:complexType name="entryType">
+                <xs:sequence>
+                        <xs:choice maxOccurs="unbounded">
+                                <xs:annotation>
+                                        <xs:appinfo>
+                                                <jaxb:property name="items" />
+                                        </xs:appinfo>
+                                </xs:annotation>
+                                <xs:element ref="atom:author" />
+                                <xs:element ref="atom:category" />
+                                <xs:element ref="atom:content" />
+                                <xs:element ref="atom:contributor" />
+                                <xs:element ref="atom:id" />
+                                <xs:element ref="atom:link" />
+                                <xs:element ref="atom:published" />
+                                <xs:element ref="atom:rights" />
+                                <xs:element ref="atom:source" />
+                                <xs:element ref="atom:summary" />
+                                <xs:element ref="atom:title" />
+                                <xs:element ref="atom:updated" />
+                        </xs:choice>
+
+                        <!-- Normal ATOM extension element -->
+                        <xs:group ref="atom:extensionElement" />
+                </xs:sequence>
+                <xs:attributeGroup ref="atom:atomCommonAttributes" />
+        </xs:complexType>
+
+        <!-- atom:content -->
+        <xs:attributeGroup name="atomInlineTextConstruct">
+                <xs:attributeGroup ref="atom:atomCommonAttributes" />
+                <xs:attribute name="type">
+                        <xs:simpleType>
+                                <xs:restriction base="xs:token">
+                                        <xs:enumeration value="text" />
+                                        <xs:enumeration value="html" />
+                                </xs:restriction>
+                        </xs:simpleType>
+                </xs:attribute>
+        </xs:attributeGroup>
+        <xs:group name="atomInlineOtherConstruct">
+                <xs:sequence>
+                        <xs:group minOccurs="0" maxOccurs="unbounded" ref="atom:anyElement" />
+                </xs:sequence>
+        </xs:group>
+        <xs:attributeGroup name="atomInlineOtherConstruct">
+                <xs:attributeGroup ref="atom:atomCommonAttributes" />
+                <xs:attribute name="type">
+                        <xs:simpleType>
+                                <xs:union memberTypes="atom:atomMediaType">
+                                        <xs:simpleType>
+                                                <xs:restriction base="xs:token">
+                                                        <xs:enumeration value="xhtml" />
+                                                </xs:restriction>
+                                        </xs:simpleType>
+                                </xs:union>
+                        </xs:simpleType>
+                </xs:attribute>
+        </xs:attributeGroup>
+        <xs:attributeGroup name="atomOutOfLineConstruct">
+                <xs:attributeGroup ref="atom:atomCommonAttributes" />
+                <xs:attribute name="type" type="atom:atomMediaType" />
+                <xs:attribute name="src" use="required" />
+        </xs:attributeGroup>
+        <xs:element name="content">
+                <xs:complexType mixed="true">
+                        <xs:group minOccurs="0" ref="atom:atomInlineOtherConstruct" />
+                        <xs:attribute name="type">
+                                <xs:simpleType>
+                                        <xs:union memberTypes="atom:atomMediaType">
+                                                <xs:simpleType>
+                                                        <xs:restriction base="xs:token">
+                                                                <xs:enumeration value="text" />
+                                                                <xs:enumeration value="html" />
+                                                        </xs:restriction>
+                                                </xs:simpleType>
+                                                <xs:simpleType>
+                                                        <xs:union memberTypes="atom:atomMediaType">
+                                                                <xs:simpleType>
+                                                                        <xs:restriction base="xs:token">
+                                                                                <xs:enumeration value="xhtml" />
+                                                                        </xs:restriction>
+                                                                </xs:simpleType>
+                                                        </xs:union>
+                                                </xs:simpleType>
+                                        </xs:union>
+                                </xs:simpleType>
+                        </xs:attribute>
+                        <xs:attributeGroup ref="atom:atomCommonAttributes" />
+                        <xs:attribute name="src" />
+                </xs:complexType>
+        </xs:element>
+        <!-- atom:author -->
+        <xs:element name="author" type="atom:atomPersonConstruct" />
+        <!-- atom:category -->
+        <xs:element name="category">
+                <xs:complexType>
+                        <xs:complexContent>
+                                <xs:extension base="atom:undefinedContent">
+                                        <xs:attributeGroup ref="atom:atomCommonAttributes" />
+                                        <xs:attribute name="term" use="required" />
+                                        <xs:attribute name="scheme" />
+                                        <xs:attribute name="label" />
+                                </xs:extension>
+                        </xs:complexContent>
+                </xs:complexType>
+        </xs:element>
+        <!-- atom:contributor -->
+        <xs:element name="contributor" type="atom:atomPersonConstruct" />
+        <!-- atom:generator -->
+        <xs:element name="generator">
+                <xs:complexType mixed="true">
+                        <xs:attributeGroup ref="atom:atomCommonAttributes" />
+                        <xs:attribute name="uri" />
+                        <xs:attribute name="version" />
+                </xs:complexType>
+        </xs:element>
+        <!-- atom:icon -->
+        <xs:element name="icon">
+                <xs:complexType mixed="true">
+                        <xs:attributeGroup ref="atom:atomCommonAttributes" />
+                </xs:complexType>
+        </xs:element>
+        <!-- atom:id -->
+        <xs:element name="id">
+                <xs:complexType mixed="true">
+                        <xs:attributeGroup ref="atom:atomCommonAttributes" />
+                </xs:complexType>
+        </xs:element>
+        <!-- atom:logo -->
+        <xs:element name="logo">
+                <xs:complexType mixed="true">
+                        <xs:attributeGroup ref="atom:atomCommonAttributes" />
+                </xs:complexType>
+        </xs:element>
+        <!-- atom:link -->
+        <xs:element name="link">
+                <xs:annotation>
+                        <xs:documentation>
+                                The "atom:link" element defines a reference from an
+                                entry or feed to a Web resource. This specification
+                                assigns no
+                                meaning to the content (if any) of this
+                                element.
+                        </xs:documentation>
+                </xs:annotation>
+
+                <xs:complexType>
+                        <xs:complexContent>
+                                <xs:extension base="atom:undefinedContent">
+                                        <xs:attributeGroup ref="atom:atomCommonAttributes" />
+                                        <xs:attribute name="href" use="required" />
+                                        <xs:attribute name="rel"></xs:attribute>
+                                        <xs:attribute name="type" type="atom:atomMediaType" />
+                                        <xs:attribute name="hreflang" type="atom:atomLanguageTag" />
+                                        <xs:attribute name="title" />
+                                        <xs:attribute name="length" />
+                                </xs:extension>
+                        </xs:complexContent>
+                </xs:complexType>
+        </xs:element>
+        <!-- atom:published -->
+        <xs:element name="published" type="atom:atomDateConstruct" />
+        <!-- atom:rights -->
+        <xs:element name="rights" type="atom:atomTextConstruct" />
+        <!-- atom:source -->
+        <xs:element name="source">
+                <xs:annotation>
+                        <xs:documentation>
+                                atom:source is used to preserve metadata of a feed
+                                when
+                                an entry is copied from a feed to another feed.
+                        </xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                        <xs:choice minOccurs="0" maxOccurs="unbounded">
+                                <xs:element ref="atom:author" />
+                                <xs:element ref="atom:category" />
+                                <xs:element ref="atom:contributor" />
+                                <xs:element ref="atom:generator" />
+                                <xs:element ref="atom:icon" />
+                                <xs:element ref="atom:id" />
+                                <xs:element ref="atom:link" />
+                                <xs:element ref="atom:logo" />
+                                <xs:element ref="atom:rights" />
+                                <xs:element ref="atom:subtitle" />
+                                <xs:element ref="atom:title" />
+                                <xs:element ref="atom:updated" />
+                                <xs:group ref="atom:extensionElement" />
+                        </xs:choice>
+                        <xs:attributeGroup ref="atom:atomCommonAttributes" />
+                </xs:complexType>
+        </xs:element>
+        <!-- atom:subtitle -->
+        <xs:element name="subtitle" type="atom:atomTextConstruct" />
+        <!-- atom:summary -->
+        <xs:element name="summary" type="atom:atomTextConstruct" />
+        <!-- atom:title -->
+        <xs:element name="title" type="atom:atomTextConstruct">
+                <xs:annotation>
+                        <xs:documentation>
+                                The "atom:title" element is a Text construct that
+                                conveys a human- readable title for an entry or feed.
+                                atomTitle =
+                                element atom:title { atomTextConstruct }.
+                        </xs:documentation>
+                </xs:annotation>
+        </xs:element>
+        <!-- atom:updated -->
+        <xs:element name="updated" type="atom:atomDateConstruct">
+                <xs:annotation>
+                        <xs:documentation>
+                                The "atom:updated" element is a Date construct
+                                indicating the most recent instant in time when an entry
+                                or feed was
+                                modified in a way the publisher considers
+                                significant. Therefore, not
+                                all modifications
+                                necessarily result in a changed atom:updated value.
+                                atomUpdated = element atom:updated { atomDateConstruct
+                                }. Publishers
+                                MAY change the value of this element over
+                                time.
+                        </xs:documentation>
+                </xs:annotation>
+        </xs:element>
+        <!-- Low-level simple types -->
+        <xs:simpleType name="atomNCName">
+                <xs:restriction base="xs:string">
+                        <xs:minLength value="1" />
+                        <xs:pattern value="[^:]*" />
+                </xs:restriction>
+        </xs:simpleType>
+        <!-- Whatever a media type is, it contains at least one slash -->
+        <xs:simpleType name="atomMediaType">
+                <xs:restriction base="xs:string">
+                        <xs:pattern value=".+/.+" />
+                </xs:restriction>
+        </xs:simpleType>
+        <!-- As defined in RFC 3066 -->
+        <xs:simpleType name="atomLanguageTag">
+                <xs:restriction base="xs:string">
+                        <xs:pattern value="[A-Za-z]{1,8}(-[A-Za-z0-9]{1,8})*" />
+                </xs:restriction>
+        </xs:simpleType>
+        <!--
+                Unconstrained; it's not entirely clear how IRI fit into xsd:anyURI so
+                let's not try to constrain it here
+        -->
+        <!-- Whatever an email address is, it contains at least one @ -->
+        <xs:simpleType name="atomEmailAddress">
+                <xs:restriction base="xs:string">
+                        <xs:pattern value=".+@.+" />
+                </xs:restriction>
+        </xs:simpleType>
+
+        <!-- Simple Extension -->
+        <xs:group name="extensionElement">
+                <xs:sequence>
+                        <xs:any namespace="##other" processContents="lax" minOccurs="0"
+                                maxOccurs="unbounded">
+                                <xs:annotation>
+                                        <xs:appinfo>
+                                                <jaxb:property name='anyOther' />
+                                        </xs:appinfo>
+                                </xs:annotation>
+                        </xs:any>
+                        <xs:any namespace="##local" processContents="lax" minOccurs="0"
+                                maxOccurs="unbounded">
+                                <xs:annotation>
+                                        <xs:appinfo>
+                                                <jaxb:property name='anyLocal' />
+                                        </xs:appinfo>
+                                </xs:annotation>
+                        </xs:any>
+                </xs:sequence>
+        </xs:group>
+        <xs:attributeGroup name="undefinedAttribute">
+                <xs:anyAttribute namespace="##other" processContents="lax" />
+        </xs:attributeGroup>
+        <xs:complexType name="undefinedContent">
+                <xs:sequence>
+                        <xs:any namespace="##other" processContents="lax" minOccurs="0"
+                                maxOccurs="unbounded">
+                                <xs:annotation>
+                                        <xs:appinfo>
+                                                <jaxb:property name='anyOther' />
+                                        </xs:appinfo>
+                                </xs:annotation>
+                        </xs:any>
+                        <xs:any namespace="##local" processContents="lax" minOccurs="0"
+                                maxOccurs="unbounded">
+                                <xs:annotation>
+                                        <xs:appinfo>
+                                                <jaxb:property name='anyLocal' />
+                                        </xs:appinfo>
+                                </xs:annotation>
+                        </xs:any>
+                </xs:sequence>
+
+                <!--
+                        <xs:group minOccurs="0" maxOccurs="unbounded"
+                        ref="atom:anyForeignElement" />
+                -->
+        </xs:complexType>
+        <xs:group name="anyElement">
+                <xs:sequence>
+                        <xs:any processContents="lax" />
+                </xs:sequence>
+        </xs:group>
+        <xs:group name="anyForeignElement">
+                <xs:sequence>
+                        <xs:any namespace="##other" processContents="lax" />
+                        <xs:any namespace="##local" processContents="lax" />
+                </xs:sequence>
+        </xs:group>
+        <!-- XHTML -->
+        <xs:group name="anyXHTML">
+                <xs:sequence>
+                        <xs:any namespace="http://www.w3.org/1999/xhtml"
+                                processContents="lax" />
+                </xs:sequence>
+        </xs:group>
+</xs:schema>
\ No newline at end of file
diff --git a/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/envelope.xsd b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/envelope.xsd
new file mode 100644
index 00000000000..b1a20e08eda
--- /dev/null
+++ b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/envelope.xsd
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!-- Schema for the SOAP/1.1 envelope
+
+Portions © 2001 DevelopMentor. 
+© 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.  
+ 
+This document is governed by the W3C Software License [1] as described in the FAQ [2].
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD 
+By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,  for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
+
+1.  The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. 
+
+2.  Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/" 
+
+3.  Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)   
+
+Original W3C files; http://www.w3.org/2001/06/soap-envelope
+Changes made: 
+     - reverted namespace to http://schemas.xmlsoap.org/soap/envelope/
+     - reverted mustUnderstand to only allow 0 and 1 as lexical values
+	 - made encodingStyle a global attribute 20020825
+	 - removed default value from mustUnderstand attribute declaration
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:tns="http://schemas.xmlsoap.org/soap/envelope/"
+           targetNamespace="http://schemas.xmlsoap.org/soap/envelope/" >
+
+     
+  <!-- Envelope, header and body -->
+  <xs:element name="Envelope" type="tns:Envelope" />
+  <xs:complexType name="Envelope" >
+    <xs:sequence>
+      <xs:element ref="tns:Header" minOccurs="0" />
+      <xs:element ref="tns:Body" minOccurs="1" />
+      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="Header" type="tns:Header" />
+  <xs:complexType name="Header" >
+    <xs:sequence>
+      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+  
+  <xs:element name="Body" type="tns:Body" />
+  <xs:complexType name="Body" >
+    <xs:sequence>
+      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##any" processContents="lax" >
+	  <xs:annotation>
+	    <xs:documentation>
+		  Prose in the spec does not specify that attributes are allowed on the Body element
+		</xs:documentation>
+	  </xs:annotation>
+	</xs:anyAttribute>
+  </xs:complexType>
+
+       
+  <!-- Global Attributes.  The following attributes are intended to be usable via qualified attribute names on any complex type referencing them.  -->
+  <xs:attribute name="mustUnderstand" >	
+     <xs:simpleType>
+     <xs:restriction base='xs:boolean'>
+	   <xs:pattern value='0|1' />
+	 </xs:restriction>
+   </xs:simpleType>
+  </xs:attribute>
+  <xs:attribute name="actor" type="xs:anyURI" />
+
+  <xs:simpleType name="encodingStyle" >
+    <xs:annotation>
+	  <xs:documentation>
+	    'encodingStyle' indicates any canonicalization conventions followed in the contents of the containing element.  For example, the value 'http://schemas.xmlsoap.org/soap/encoding/' indicates the pattern described in SOAP specification
+	  </xs:documentation>
+	</xs:annotation>
+    <xs:list itemType="xs:anyURI" />
+  </xs:simpleType>
+
+  <xs:attribute name="encodingStyle" type="tns:encodingStyle" />
+  <xs:attributeGroup name="encodingStyle" >
+    <xs:attribute ref="tns:encodingStyle" />
+  </xs:attributeGroup>
+
+  <xs:element name="Fault" type="tns:Fault" />
+  <xs:complexType name="Fault" final="extension" >
+    <xs:annotation>
+	  <xs:documentation>
+	    Fault reporting structure
+	  </xs:documentation>
+	</xs:annotation>
+    <xs:sequence>
+      <xs:element name="faultcode" type="xs:QName" />
+      <xs:element name="faultstring" type="xs:string" />
+      <xs:element name="faultactor" type="xs:anyURI" minOccurs="0" />
+      <xs:element name="detail" type="tns:detail" minOccurs="0" />      
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="detail">
+    <xs:sequence>
+      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##any" processContents="lax" /> 
+  </xs:complexType>
+
+</xs:schema>
+
+
+
+
+
+
diff --git a/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/xml.xsd b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/xml.xsd
new file mode 100644
index 00000000000..5dab60aef94
--- /dev/null
+++ b/remote-api/src/test/resources/org/alfresco/repo/cmis/rest/test/xml.xsd
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+		$Revision: 34 $
+		$Date: 2009-08-07 18:20:47 -0400 (Fri, 07 Aug 2009) $
+		$Author: albertcbrown $
+		$HeadURL: file:///var/lib/subversion/cmis/trunk/SchemaProject/schema/xml.xsd $
+-->
+<xsd:schema targetNamespace="http://www.w3.org/XML/1998/namespace" 
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+ xml:lang="en">
+ 
+ <xsd:attribute name="lang">
+  <xsd:simpleType>
+   <xsd:union memberTypes="xsd:language">
+    <xsd:simpleType>    
+     <xsd:restriction base="xsd:string">
+      <xsd:enumeration value=""/>
+     </xsd:restriction>
+    </xsd:simpleType>
+   </xsd:union>
+  </xsd:simpleType>
+ </xsd:attribute>
+
+ <xsd:attribute name="space">
+  <xsd:simpleType>
+   <xsd:restriction base="xsd:NCName">
+    <xsd:enumeration value="default"/>
+    <xsd:enumeration value="preserve"/>
+   </xsd:restriction>
+  </xsd:simpleType>
+ </xsd:attribute>
+
+ <xsd:attribute name="base" type="xsd:anyURI">
+  <xsd:annotation>
+   <xsd:documentation>See http://www.w3.org/TR/xmlbase/ for
+                     information about this attribute.</xsd:documentation>
+  </xsd:annotation>
+ </xsd:attribute>
+ 
+ <xsd:attribute name="id" type="xsd:ID">
+  <xsd:annotation>
+   <xsd:documentation>See http://www.w3.org/TR/xml-id/ for
+                     information about this attribute.</xsd:documentation>
+  </xsd:annotation>
+ </xsd:attribute>
+
+ <xsd:attributeGroup name="specialAttrs">
+  <xsd:attribute ref="xml:base"/>
+  <xsd:attribute ref="xml:lang"/>
+  <xsd:attribute ref="xml:space"/>
+  <xsd:attribute ref="xml:id"/>
+ </xsd:attributeGroup>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/remote-api/src/test/resources/org/alfresco/repo/web/scripts/thumbnail/test_doc.pdf b/remote-api/src/test/resources/org/alfresco/repo/web/scripts/thumbnail/test_doc.pdf
new file mode 100644
index 00000000000..9b033d052b5
Binary files /dev/null and b/remote-api/src/test/resources/org/alfresco/repo/web/scripts/thumbnail/test_doc.pdf differ
diff --git a/remote-api/src/test/resources/org/alfresco/repo/web/scripts/thumbnail/test_image.jpg b/remote-api/src/test/resources/org/alfresco/repo/web/scripts/thumbnail/test_image.jpg
new file mode 100644
index 00000000000..6db32ca1db0
Binary files /dev/null and b/remote-api/src/test/resources/org/alfresco/repo/web/scripts/thumbnail/test_image.jpg differ
diff --git a/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV.csv b/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV.csv
new file mode 100644
index 00000000000..3ceafc6cef5
--- /dev/null
+++ b/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV.csv
@@ -0,0 +1,2 @@
+MNT-171990-user-with-no-password,user1,user1,user1171990@alfresco.com,,
+MNT-171990-user-with-password,user2,user2,user2171990@alfresco.com,,user2
diff --git a/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV.csv1 b/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV.csv1
new file mode 100644
index 00000000000..3ceafc6cef5
--- /dev/null
+++ b/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV.csv1
@@ -0,0 +1,2 @@
+MNT-171990-user-with-no-password,user1,user1,user1171990@alfresco.com,,
+MNT-171990-user-with-password,user2,user2,user2171990@alfresco.com,,user2
diff --git a/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV.xls b/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV.xls
new file mode 100644
index 00000000000..dee3951df72
Binary files /dev/null and b/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV.xls differ
diff --git a/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV.xlsx b/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV.xlsx
new file mode 100644
index 00000000000..d3b5ca2489d
Binary files /dev/null and b/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV.xlsx differ
diff --git a/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV_header.csv b/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV_header.csv
new file mode 100644
index 00000000000..a53f8108aa3
--- /dev/null
+++ b/remote-api/src/test/resources/org/alfresco/repo/web/scripts/uploadcsv/userCSV_header.csv
@@ -0,0 +1,3 @@
+User Name,First Name,Last Name,E-mail Address,,Password,Company,Job Title,Location,Telephone,Mobile,Skype,IM,Google User Name,Address,Address Line 2,Address Line 3,Post Code,Telephone,Fax,Email
+MNT-171990-user-with-no-password,user1,user1,user1171990@alfresco.com,,
+MNT-171990-user-with-password,user2,user2,user2171990@alfresco.com,,user2
\ No newline at end of file
diff --git a/remote-api/src/test/resources/publicapi/solr/alfresco-global.properties b/remote-api/src/test/resources/publicapi/solr/alfresco-global.properties
new file mode 100644
index 00000000000..ccce9a52338
--- /dev/null
+++ b/remote-api/src/test/resources/publicapi/solr/alfresco-global.properties
@@ -0,0 +1 @@
+index.subsystem.name=solr
\ No newline at end of file
diff --git a/remote-api/src/test/resources/publicapi/test-model.xml b/remote-api/src/test/resources/publicapi/test-model.xml
new file mode 100644
index 00000000000..d41a8c0a23d
--- /dev/null
+++ b/remote-api/src/test/resources/publicapi/test-model.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model name="testCMIS:test-model" xmlns="http://www.alfresco.org/model/dictionary/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    
+    <description>Test model the cmis query tests</description>
+    <author>Alfresco</author>
+    <published>2010-01-22</published>
+    <version>0.1</version>
+    
+    <imports>
+      	<import uri="http://www.alfresco.org/model/action/1.0" prefix="act"/>
+    </imports>
+    
+    <namespaces>
+        <namespace uri="http://www.alfresco.org/test/testCMIS" prefix="testCMIS"/>
+    </namespaces>
+    
+    <types>
+        <type name="testCMIS:type1">
+            <title>Type 1</title>
+            <parent>act:actionbase</parent>
+            <properties>
+            </properties>
+        </type>
+    </types>
+    
+</model>
\ No newline at end of file
diff --git a/remote-api/src/test/resources/publicapi/upload/CMIS-Delete.json b/remote-api/src/test/resources/publicapi/upload/CMIS-Delete.json
new file mode 100644
index 00000000000..59d4581fbb5
--- /dev/null
+++ b/remote-api/src/test/resources/publicapi/upload/CMIS-Delete.json
@@ -0,0 +1,68 @@
+{
+	"id": "9703fafd-3041-c6fb-2f20-367eeb1b7697",
+	"name": "CMIS Delete",
+	"description": "",
+	"order": [
+		"7d4fa49e-125d-7f40-328d-6998fd383b1c",
+		"fb149dbf-4725-db4c-163a-a541ce0bb830"
+	],
+	"folders": [],
+	"timestamp": 1461678623161,
+	"owner": "250102",
+	"remoteLink": "",
+	"public": false,
+	"requests": [
+		{
+			"id": "7d4fa49e-125d-7f40-328d-6998fd383b1c",
+			"headers": "Authorization: Basic xxxx\n",
+			"url": "{{baseUrl}}/{{networkId}}/public/cmis/versions/1.1/browser/root?objectId=d57861c1-48a3-4e3f-b1e3-9822e52707d1",
+			"preRequestScript": "",
+			"pathVariables": {},
+			"method": "POST",
+			"data": [
+				{
+					"key": "cmisaction",
+					"value": "delete",
+					"type": "text",
+					"enabled": true
+				}
+			],
+			"dataMode": "urlencoded",
+			"tests": null,
+			"currentHelper": "normal",
+			"helperAttributes": {},
+			"time": 1461678196209,
+			"name": "Delete object",
+			"description": "NOTE: This will delete an empty folder but not a folder with children, use \"deletetree\" action for that!",
+			"collectionId": "9703fafd-3041-c6fb-2f20-367eeb1b7697",
+			"responses": []
+		},
+		{
+			"id": "fb149dbf-4725-db4c-163a-a541ce0bb830",
+			"headers": "Authorization: Basic xxxx\n",
+			"url": "{{baseUrl}}/{{networkId}}/public/cmis/versions/1.1/browser/root?objectId=14463495-b278-45f2-bef4-d9d2d0f91485",
+			"pathVariables": {},
+			"preRequestScript": "",
+			"method": "POST",
+			"collectionId": "9703fafd-3041-c6fb-2f20-367eeb1b7697",
+			"data": [
+				{
+					"key": "cmisaction",
+					"value": "deletetree",
+					"type": "text",
+					"enabled": true
+				}
+			],
+			"dataMode": "urlencoded",
+			"name": "Delete folder",
+			"description": "",
+			"descriptionFormat": "html",
+			"time": 1461678531597,
+			"version": 2,
+			"responses": [],
+			"tests": null,
+			"currentHelper": "normal",
+			"helperAttributes": {}
+		}
+	]
+}
\ No newline at end of file
diff --git a/remote-api/src/test/resources/publicapi/upload/example-1.txt b/remote-api/src/test/resources/publicapi/upload/example-1.txt
new file mode 100644
index 00000000000..d8aa4e97360
--- /dev/null
+++ b/remote-api/src/test/resources/publicapi/upload/example-1.txt
@@ -0,0 +1,3 @@
+The quick brown fox jumps over the lazy dog
+The quick brown fox jumps over the lazy dog
+The quick brown fox jumps over the lazy dog
\ No newline at end of file
diff --git a/remote-api/src/test/resources/publicapi/upload/example-1.xml b/remote-api/src/test/resources/publicapi/upload/example-1.xml
new file mode 100644
index 00000000000..67f9ad605cc
--- /dev/null
+++ b/remote-api/src/test/resources/publicapi/upload/example-1.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<text>
+The quick brown fox jumps over the lazy dog
+The quick brown fox jumps over the lazy dog
+</text>
+</xml>
diff --git a/remote-api/src/test/resources/publicapi/upload/example-2.txt b/remote-api/src/test/resources/publicapi/upload/example-2.txt
new file mode 100644
index 00000000000..8ebc16a0638
--- /dev/null
+++ b/remote-api/src/test/resources/publicapi/upload/example-2.txt
@@ -0,0 +1,3 @@
+The quick brown fox jumps over the lazy dog
+The á é í ó	ô ú jumps over the lazy dog
+The quick brown fox jumps over the lazy dog
\ No newline at end of file
diff --git a/remote-api/src/test/resources/publicapi/upload/example-2.xml b/remote-api/src/test/resources/publicapi/upload/example-2.xml
new file mode 100644
index 00000000000..5089f0e2eb3
--- /dev/null
+++ b/remote-api/src/test/resources/publicapi/upload/example-2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<text>
+The quick brown fox jumps over the lazy dog
+The á é í ó	ô ú jumps over the lazy dog
+The quick brown fox jumps over the lazy dog
+</text>
+</xml>
diff --git a/remote-api/src/test/resources/publicapi/upload/farmers_markets_list_2003.doc b/remote-api/src/test/resources/publicapi/upload/farmers_markets_list_2003.doc
new file mode 100644
index 00000000000..f6ce700a1aa
Binary files /dev/null and b/remote-api/src/test/resources/publicapi/upload/farmers_markets_list_2003.doc differ
diff --git a/remote-api/src/test/resources/publicapi/upload/quick-1.txt b/remote-api/src/test/resources/publicapi/upload/quick-1.txt
new file mode 100644
index 00000000000..ff3bb63948b
--- /dev/null
+++ b/remote-api/src/test/resources/publicapi/upload/quick-1.txt
@@ -0,0 +1 @@
+The quick brown fox jumps over the lazy dog
\ No newline at end of file
diff --git a/remote-api/src/test/resources/publicapi/upload/quick-2.pdf b/remote-api/src/test/resources/publicapi/upload/quick-2.pdf
new file mode 100644
index 00000000000..a0f82a602ed
Binary files /dev/null and b/remote-api/src/test/resources/publicapi/upload/quick-2.pdf differ
diff --git a/remote-api/src/test/resources/publicapi/upload/quick-2.txt b/remote-api/src/test/resources/publicapi/upload/quick-2.txt
new file mode 100644
index 00000000000..ca103eec211
--- /dev/null
+++ b/remote-api/src/test/resources/publicapi/upload/quick-2.txt
@@ -0,0 +1,2 @@
+Gym class featuring a brown fox and lazy dog
+The quick brown fox jumps over the lazy dog
\ No newline at end of file
diff --git a/remote-api/src/test/resources/publicapi/upload/quick.docx b/remote-api/src/test/resources/publicapi/upload/quick.docx
new file mode 100644
index 00000000000..64832464bb8
Binary files /dev/null and b/remote-api/src/test/resources/publicapi/upload/quick.docx differ
diff --git a/remote-api/src/test/resources/publicapi/upload/quick.jpg b/remote-api/src/test/resources/publicapi/upload/quick.jpg
new file mode 100644
index 00000000000..08473b8e8b6
Binary files /dev/null and b/remote-api/src/test/resources/publicapi/upload/quick.jpg differ
diff --git a/remote-api/src/test/resources/publicapi/upload/quick.pdf b/remote-api/src/test/resources/publicapi/upload/quick.pdf
new file mode 100644
index 00000000000..a1779afd8b4
Binary files /dev/null and b/remote-api/src/test/resources/publicapi/upload/quick.pdf differ
diff --git a/remote-api/src/test/resources/publicapi/upload/shift-jis.txt b/remote-api/src/test/resources/publicapi/upload/shift-jis.txt
new file mode 100644
index 00000000000..146d1d2c45f
--- /dev/null
+++ b/remote-api/src/test/resources/publicapi/upload/shift-jis.txt
@@ -0,0 +1,6 @@
+
+�d�q������i�G���N�g���j�b�N�R�}�[�X�j�A�I�����C�����񋟁A�C���^���N�e�B�u���f�B�A�i�o�����ʐM�j�B�C���^�[�l�b�g�ɑ�\�����R���s���[�^�[�ƃl�b�g���[�N�̏[���͎������̐�����傫���ς��Ă��܂��B
+
+�̃T�[�o�[�́A������C���^�[�l�b�g�r�W�l�X�ɑΉ����Ă��܂��B�C�[�R�}�[�X�A�R���e���c�T�[�r�X�A�摜�z�M�A����z�M�A�X�g���[�~���O���̑����I���A�v���t�F�b�V���i�����[�Y�Ȋ‹������񋟂������܂��B
+
+���Ђ̃e�N�j�J���́A�펞24���ԑ̐��őΉ����Ă���܂��̂ł����Ȃ鎖�Ԃɂ��v���ɑΉ��v���Ă���܂��B���X�̃����e�i���X�����S���Ă��C�������܂��B �����ɐ�p������������񋟂��Ă���܂��̂ŁA�G���h���[�U�[�l�ɂ͑��ł͑̊����邱�Ƃ̂ł��Ȃ��A�C���^�[�l�b�g�u���E�W���O�����񑩒v���܂��B
diff --git a/remote-api/src/test/resources/rest-api-test-context.xml b/remote-api/src/test/resources/rest-api-test-context.xml
new file mode 100644
index 00000000000..9e9a284cf40
--- /dev/null
+++ b/remote-api/src/test/resources/rest-api-test-context.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="httpClientProvider" class="org.alfresco.rest.api.tests.client.SharedHttpClientProvider">
+         <constructor-arg name="alfrescoUrl" value="http://localhost:8081/alfresco/" />
+         <constructor-arg name="maxNumberOfConnections" value="2" />
+    </bean>
+    
+    <!-- Registration of test models -->	
+    <bean id="testRemoteApiModelDictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
+        <property name="models">
+            <list>
+                <value>models/custom-model.xml</value>
+                <value>models/bpmDelegateeModel.xml</value>
+                <value>models/people-api.xml</value>
+            </list>
+        </property>
+    </bean>
+
+    <!--
+    <bean id="Search" class="org.alfresco.repo.management.subsystems.SwitchableApplicationContextFactory" parent="abstractPropertyBackedBean">
+        <property name="autoStart">
+            <value>false</value>
+        </property>
+        <property name="category">
+            <value>Search</value>
+        </property>
+        <property name="sourceBeanName">
+            <value>buildonly</value>
+        </property>
+        <property name="instancePath">
+            <list>
+                <value>manager</value>
+            </list>
+        </property>
+    </bean>
+    -->
+    
+</beans>
\ No newline at end of file
diff --git a/remote-api/src/test/resources/test-rest-context.xml b/remote-api/src/test/resources/test-rest-context.xml
new file mode 100644
index 00000000000..00b8f1b4993
--- /dev/null
+++ b/remote-api/src/test/resources/test-rest-context.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <bean id="apiLookup" class="org.alfresco.rest.framework.core.ResourceLookupDictionary">
+    </bean>
+      <bean id="frameworkMessageResourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
+        <property name="resourceBundles">
+            <list>
+                <value>alfresco.messages.rest-framework-messages</value>
+            </list>
+        </property>
+    </bean>
+    <bean id="restJsonModule" class="org.alfresco.rest.framework.jacksonextensions.RestJsonModule">
+        <property name="jsonSerializers">
+            <list>
+                <bean class="org.alfresco.rest.framework.jacksonextensions.SerializerOfExecutionResult" />
+                <bean class="org.alfresco.rest.framework.jacksonextensions.SerializerOfCollectionWithPaging" />
+                <bean class="org.alfresco.rest.framework.jacksonextensions.NodeRefSerializer" />
+            </list>
+        </property>
+        <property name="jsonDeserializers">
+            <map>
+                <entry key="org.alfresco.service.cmr.repository.NodeRef"><bean class="org.alfresco.rest.framework.jacksonextensions.NodeRefDeserializer" /></entry>            
+            </map>
+        </property>
+    </bean>
+    <bean id="jsonHelper" class="org.alfresco.rest.framework.jacksonextensions.JacksonHelper">
+         <property name="module" ref="restJsonModule" />
+    </bean>
+    <bean id="webScriptExceptionResolver" class="org.alfresco.rest.framework.core.exceptions.WebScriptExceptionResolver">
+    </bean>
+    <bean id="apiAssistant" class="org.alfresco.rest.framework.tools.ApiAssistant">
+        <property name="jsonHelper" ref="jsonHelper" />
+        <property name="resolver" ref="simpleMappingExceptionResolver" />
+        <property name="webScriptExceptionResolver" ref="webScriptExceptionResolver" />
+    </bean>
+    <bean id="simpleMappingExceptionResolver" class="org.alfresco.rest.framework.core.exceptions.SimpleMappingExceptionResolver">
+       <property name="exceptionMappings">
+           <map>
+               <entry key="org.alfresco.rest.framework.core.exceptions.ApiException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_INTERNAL_SERVER_ERROR}" />
+               <entry key="org.alfresco.rest.framework.core.exceptions.InvalidArgumentException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_BAD_REQUEST}" />
+               <entry key="org.alfresco.rest.framework.core.exceptions.NotFoundException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
+               <entry key="org.alfresco.rest.framework.core.exceptions.EntityNotFoundException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
+               <entry key="org.alfresco.rest.framework.core.exceptions.RelationshipResourceNotFoundException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_FOUND}" />
+               <entry key="org.alfresco.rest.framework.core.exceptions.PermissionDeniedException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_FORBIDDEN}" />
+               <entry key="org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_METHOD_NOT_ALLOWED}" />
+               <entry key="org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_CONFLICT}" />
+               <entry key="org.alfresco.rest.framework.core.exceptions.StaleEntityException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_CONFLICT}" />
+               <entry key="org.alfresco.rest.framework.core.exceptions.RequestEntityTooLargeException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_REQUEST_ENTITY_TOO_LARGE}" />
+               <entry key="org.alfresco.rest.framework.core.exceptions.DisabledServiceException" value="#{T(org.springframework.extensions.webscripts.Status).STATUS_NOT_IMPLEMENTED}" />
+               <entry key="org.alfresco.rest.framework.core.exceptions.InsufficientStorageException" value="507" />
+               <entry key="org.alfresco.repo.node.integrity.IntegrityException" value="422" />
+               <entry key="org.alfresco.repo.site.SiteServiceException" value="422" />
+           </map>
+        </property>
+    </bean>
+    <context:component-scan base-package="org.alfresco.rest.framework.tests.api"/> 
+    
+    <bean id="webscriptHelper" class="org.alfresco.rest.framework.webscripts.ResourceWebScriptHelper">
+        <property name="locator" ref="apiLookup" />
+        <property name="executor" ref="executorOfGets" />
+    </bean>
+    
+    <bean id="executorOfGets" class="org.alfresco.rest.framework.webscripts.ResourceWebScriptGet">
+         <property name="helper" ref="webscriptHelper" />
+    </bean>
+
+    <bean id="executorOfPost" class="org.alfresco.rest.framework.webscripts.ResourceWebScriptPost">
+        <property name="helper" ref="webscriptHelper" />
+    </bean>
+
+    <bean id="executorOfPut" class="org.alfresco.rest.framework.webscripts.ResourceWebScriptPut">
+        <property name="helper" ref="webscriptHelper" />
+    </bean>
+
+    <bean id="executorOfDelete" class="org.alfresco.rest.framework.webscripts.ResourceWebScriptDelete">
+        <property name="helper" ref="webscriptHelper" />
+    </bean>
+
+    <bean id="defaultMetaWriter" class="org.alfresco.rest.framework.webscripts.metadata.WebScriptOptionsMetaData">
+        <property name="lookupDictionary" ref="apiLookup" />
+        <property name="assistant" ref="apiAssistant" />
+   </bean>  
+</beans>
diff --git a/remote-api/src/test/resources/test.jpg b/remote-api/src/test/resources/test.jpg
new file mode 100644
index 00000000000..fb1b25168fb
Binary files /dev/null and b/remote-api/src/test/resources/test.jpg differ
diff --git a/remote-api/src/test/resources/workflow/test.task.query.bpmn20.xml b/remote-api/src/test/resources/workflow/test.task.query.bpmn20.xml
new file mode 100644
index 00000000000..827dcc4ac48
--- /dev/null
+++ b/remote-api/src/test/resources/workflow/test.task.query.bpmn20.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions id="taskAssigneeExample" 
+  xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+  xmlns:activiti="http://activiti.org/bpmn"
+  targetNamespace="TaskTest">
+	
+	<process id="TaskTest" name="Task Test Name" isExecutable="true">
+	
+		<startEvent id="theStart" />
+		
+		<sequenceFlow sourceRef="theStart" targetRef="fork" />
+
+      <parallelGateway id="fork" />
+		<sequenceFlow sourceRef="fork" targetRef="task1" />
+		<sequenceFlow sourceRef="fork" targetRef="task2" />
+      
+		<userTask id="task1" name="Task name" activiti:formKey="testFormKey" activiti:assignee="kermit" activiti:candidateUsers="fozzie" activiti:candidateGroups="sales">
+			<documentation>This is a test description</documentation>
+		</userTask>
+      
+      <userTask id="task2" name="Another task name" activiti:formKey="anotherFormKey" activiti:assignee="fozzie">
+         <documentation>This is another test description</documentation>
+      </userTask>
+		
+		<sequenceFlow sourceRef="task1" targetRef="join" />
+		<sequenceFlow sourceRef="task2" targetRef="join" />
+
+      <parallelGateway id="join" />
+		<sequenceFlow sourceRef="join" targetRef="theEnd" />
+      
+		<endEvent id="theEnd" />
+		
+	</process>
+
+</definitions>
diff --git a/remote-api/src/test/resources/workflow/testCustomDelegatee.bpmn20.xml b/remote-api/src/test/resources/workflow/testCustomDelegatee.bpmn20.xml
new file mode 100755
index 00000000000..63e023eb653
--- /dev/null
+++ b/remote-api/src/test/resources/workflow/testCustomDelegatee.bpmn20.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
+  <process id="myProcess" name="My process" isExecutable="true">
+    <startEvent id="alfrescoStartEv" name="Start Assignee Process" activiti:formKey="wf:submitAdhocTask"></startEvent>
+    <userTask id="delegateToAssignee" name="Delegate Task" activiti:candidateGroups="GROUP_ALFRESCO_ADMINISTRATORS" activiti:formKey="wbpm:DelegateTask">
+      <extensionElements>
+        <activiti:taskListener event="complete" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
+          <activiti:field name="script">
+            <activiti:string><![CDATA[execution.setVariable('wbpm_nextStep', task.getVariable('wbpm_nextStep'));
+execution.setVariable('wbpm_delegatee', task.getVariable('wbpm_delegatee'));]]></activiti:string>
+          </activiti:field>
+        </activiti:taskListener>
+      </extensionElements>
+    </userTask>
+    <sequenceFlow id="flow1" sourceRef="alfrescoStartEv" targetRef="delegateToAssignee"></sequenceFlow>
+    <exclusiveGateway id="DelegateeGateway" name="Exclusive Gateway" default="otherFlow"></exclusiveGateway>
+    <sequenceFlow id="flow2" sourceRef="delegateToAssignee" targetRef="DelegateeGateway"></sequenceFlow>
+    <userTask id="oncreateUT" name="On Create Assignee" activiti:formKey="wbpm:onCreateTask">
+      <extensionElements>
+        <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
+          <activiti:field name="script">
+            <activiti:string><![CDATA[task.assignee = execution.getVariable("wbpm_delegatee");]]></activiti:string>
+          </activiti:field>
+        </activiti:taskListener>
+      </extensionElements>
+    </userTask>
+    <sequenceFlow id="OnCreateFlow" sourceRef="DelegateeGateway" targetRef="oncreateUT">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${wbpm_nextStep == 'OnCreate'}]]></conditionExpression>
+    </sequenceFlow>
+    <userTask id="expressionUT" name="Expression Assignee" activiti:assignee="${wbpm_delegatee.properties.userName}" activiti:formKey="wbpm:expressionTask"></userTask>
+    <sequenceFlow id="ExpressionFlow" sourceRef="DelegateeGateway" targetRef="expressionUT">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${wbpm_nextStep == 'Expression'}]]></conditionExpression>
+    </sequenceFlow>
+    <userTask id="otherUT" name="Default Assgnee Task" activiti:candidateGroups="GROUP_ALFRESCO_ADMINISTRATORS" activiti:formKey="wbpm:otherTask"></userTask>
+    <sequenceFlow id="otherFlow" sourceRef="DelegateeGateway" targetRef="otherUT"></sequenceFlow>
+    <endEvent id="endevent1" name="End"></endEvent>
+    <sequenceFlow id="flow3" sourceRef="expressionUT" targetRef="endevent1"></sequenceFlow>
+    <sequenceFlow id="flow4" sourceRef="oncreateUT" targetRef="endevent1"></sequenceFlow>
+    <sequenceFlow id="flow5" sourceRef="otherUT" targetRef="endevent1"></sequenceFlow>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_myProcess">
+    <bpmndi:BPMNPlane bpmnElement="myProcess" id="BPMNPlane_myProcess">
+      <bpmndi:BPMNShape bpmnElement="alfrescoStartEv" id="BPMNShape_alfrescoStartEv">
+        <omgdc:Bounds height="35.0" width="35.0" x="170.0" y="190.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="delegateToAssignee" id="BPMNShape_delegateToAssignee">
+        <omgdc:Bounds height="55.0" width="105.0" x="250.0" y="180.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="DelegateeGateway" id="BPMNShape_DelegateeGateway">
+        <omgdc:Bounds height="40.0" width="40.0" x="400.0" y="188.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="oncreateUT" id="BPMNShape_oncreateUT">
+        <omgdc:Bounds height="55.0" width="105.0" x="485.0" y="181.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="expressionUT" id="BPMNShape_expressionUT">
+        <omgdc:Bounds height="55.0" width="105.0" x="485.0" y="90.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="otherUT" id="BPMNShape_otherUT">
+        <omgdc:Bounds height="55.0" width="105.0" x="485.0" y="270.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
+        <omgdc:Bounds height="35.0" width="35.0" x="660.0" y="197.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
+        <omgdi:waypoint x="205.0" y="207.0"></omgdi:waypoint>
+        <omgdi:waypoint x="250.0" y="207.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2">
+        <omgdi:waypoint x="355.0" y="207.0"></omgdi:waypoint>
+        <omgdi:waypoint x="400.0" y="208.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="OnCreateFlow" id="BPMNEdge_OnCreateFlow">
+        <omgdi:waypoint x="440.0" y="208.0"></omgdi:waypoint>
+        <omgdi:waypoint x="485.0" y="208.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="ExpressionFlow" id="BPMNEdge_ExpressionFlow">
+        <omgdi:waypoint x="420.0" y="188.0"></omgdi:waypoint>
+        <omgdi:waypoint x="419.0" y="117.0"></omgdi:waypoint>
+        <omgdi:waypoint x="485.0" y="117.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="otherFlow" id="BPMNEdge_otherFlow">
+        <omgdi:waypoint x="420.0" y="228.0"></omgdi:waypoint>
+        <omgdi:waypoint x="420.0" y="297.0"></omgdi:waypoint>
+        <omgdi:waypoint x="485.0" y="297.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3">
+        <omgdi:waypoint x="537.0" y="145.0"></omgdi:waypoint>
+        <omgdi:waypoint x="677.0" y="197.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4">
+        <omgdi:waypoint x="590.0" y="208.0"></omgdi:waypoint>
+        <omgdi:waypoint x="660.0" y="214.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow5" id="BPMNEdge_flow5">
+        <omgdi:waypoint x="537.0" y="270.0"></omgdi:waypoint>
+        <omgdi:waypoint x="677.0" y="232.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>
\ No newline at end of file